From 2ab19787ce2ac77f7b33e85247b9b28159b4bb95 Mon Sep 17 00:00:00 2001 From: Mauro Bieg Date: Mon, 26 Aug 2019 14:38:18 +0200 Subject: [PATCH 001/268] Docs: clarify Rust overlay on non-NixOS --- doc/languages-frameworks/rust.section.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 2d9338f2e89..fe2a71c35ef 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -384,12 +384,13 @@ in the `~/.config/nixpkgs/overlays` directory. The latest version can be installed with the following command: - $ nix-env -Ai nixos.latest.rustChannels.stable.rust + $ nix-env -Ai nixpkgs.latest.rustChannels.stable.rust Or using the attribute with nix-shell: - $ nix-shell -p nixos.latest.rustChannels.stable.rust + $ nix-shell -p nixpkgs.latest.rustChannels.stable.rust +Substitute the `nixpkgs` prefix with `nixos` on NixOS. To install the beta or nightly channel, "stable" should be substituted by "nightly" or "beta", or use the function provided by this overlay to pull a version based on a From 1b77edf66465105bc3996d3aaaf939b6bf06ce24 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 27 Nov 2019 16:32:48 +0200 Subject: [PATCH 002/268] muon: init at 2019-11-27 --- pkgs/development/compilers/muon/default.nix | 34 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/compilers/muon/default.nix diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muon/default.nix new file mode 100644 index 00000000000..275e308235c --- /dev/null +++ b/pkgs/development/compilers/muon/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "muon"; + version = "2019-11-27"; + + src = fetchFromGitHub { + owner = "nickmqb"; + repo = pname; + rev = "6d3a5054ae75b0e5a0ae633cf8cbc3e2a054f8b3"; + sha256 = "1sb1i08421jxlx791g8nh4l239syaj730hagkzc159g0z65614zz"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildPhase = '' + mkdir -p $out/bin $out/share/mu + cp -r lib $out/share/mu + gcc -O3 -o $out/bin/mu-unwrapped bootstrap/mu64.c + ''; + + installPhase = '' + makeWrapper $out/bin/mu-unwrapped $out/bin/mu \ + --add-flags $out/share/mu/lib/core.mu + ''; + + meta = with lib; { + description = "Modern low-level programming language"; + homepage = "https://github.com/nickmqb/muon"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f49075972e..4845d9f6723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8525,6 +8525,8 @@ in mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; + muon = callPackage ../development/compilers/muon { }; + nim = callPackage ../development/compilers/nim { }; nrpl = callPackage ../development/tools/nrpl { }; From 2b0ee787dd38414101d4b76b5a1818c9a21c57cd Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Mon, 13 Apr 2020 10:43:32 +0200 Subject: [PATCH 003/268] mosquitto: systemd service sandboxing running the service in a sandbox. read-only root file system, with tmpfs mounted in /tmp, hidden /root and /home, temporary /dev. the only writeable path is the data directory, which according to my experiments is enough for the service to work correctly. --- nixos/modules/services/networking/mosquitto.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index d2feb93e2b7..ec109c4e634 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -204,6 +204,16 @@ in Restart = "on-failure"; ExecStart = "${pkgs.mosquitto}/bin/mosquitto -c ${mosquittoConf}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateDevices = true; + PrivateTmp = true; + ReadWritePaths = "${cfg.dataDir}"; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + NoNewPrivileges = true; }; preStart = '' rm -f ${cfg.dataDir}/passwd From 950ac2bc8fa13a7557d931123c24c93418662a2d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 19 Apr 2020 12:04:58 +0200 Subject: [PATCH 004/268] meta: expose availability flags in derivation metadata Currently it's not possible to determine the reason why a package is unavailable without evaluating nixpkgs multiple times with different settings. eg. nix-repl> :p android-studio.meta { available = false; broken = false; unfree = true; unsupported = true; ... } The following snippet is an example that uses this information to query the availability information of all packages in nixpkgs, giving an overview of all the packages currently marked as broken, etc. { pkgs }: with import ; let mapPkgs = let mapPkgs' = path: f: mapAttrs (n: v: let result = builtins.tryEval (v ? meta); in if !result.success then {} else if isDerivation v then f (path ++ [n]) v else if isAttrs v && v.recurseForDerivations or false then mapPkgs' (path ++ [n]) f v else {} ); in mapPkgs' []; getMeta = path: drv: if drv.meta ? available then let meta = { pkg = concatStringsSep "." path; inherit (drv.meta) broken unfree unsupported insecure; }; in builtins.trace meta.pkg meta else {}; metaToList = attrs: flatten (map (v: if v ? pkg then v else metaToList v) (attrValues attrs)); in metaToList (mapPkgs getMeta pkgs) --- pkgs/stdenv/generic/check-meta.nix | 39 ++++++++++++++++++------- pkgs/stdenv/generic/make-derivation.nix | 3 +- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 21ae809a222..e6e90a6df1e 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -49,6 +49,18 @@ let isUnfree = licenses: lib.lists.any (l: !l.free or true) licenses; + hasUnfreeLicense = attrs: + hasLicense attrs && + isUnfree (lib.lists.toList attrs.meta.license); + + isMarkedBroken = attrs: attrs.meta.broken or false; + + hasUnsupportedPlatform = attrs: + (!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) || + lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or [])); + + isMarkedInsecure = attrs: (attrs.meta.knownVulnerabilities or []) != []; + # Alow granular checks to allow only some unfree packages # Example: # {pkgs, ...}: @@ -62,16 +74,15 @@ let # package has an unfree license and is not explicitely allowed by the # `allowUnfreePredicate` function. hasDeniedUnfreeLicense = attrs: + hasUnfreeLicense attrs && !allowUnfree && - hasLicense attrs && - isUnfree (lib.lists.toList attrs.meta.license) && !allowUnfreePredicate attrs; allowInsecureDefaultPredicate = x: builtins.elem (getName x) (config.permittedInsecurePackages or []); allowInsecurePredicate = x: (config.allowInsecurePredicate or allowInsecureDefaultPredicate) x; hasAllowedInsecure = attrs: - (attrs.meta.knownVulnerabilities or []) == [] || + !(isMarkedInsecure attrs) || allowInsecurePredicate attrs || builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; @@ -173,6 +184,9 @@ let platforms = listOf str; hydraPlatforms = listOf str; broken = bool; + unfree = bool; + unsupported = bool; + insecure = bool; # TODO: refactor once something like Profpatsch's types-simple will land # This is currently dead code due to https://github.com/NixOS/nix/issues/2532 tests = attrsOf (mkOptionType { @@ -224,17 +238,22 @@ let # # Return { valid: Bool } and additionally # { reason: String; errormsg: String } if it is not valid, where - # reason is one of "unfree", "blacklisted" or "broken". + # reason is one of "unfree", "blacklisted", "broken", "insecure", ... + # Along with a boolean flag for each reason checkValidity = attrs: - if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then + { + unfree = hasUnfreeLicense attrs; + broken = isMarkedBroken attrs; + unsupported = hasUnsupportedPlatform attrs; + insecure = isMarkedInsecure attrs; + } + // (if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; } else if hasBlacklistedLicense attrs then { valid = false; reason = "blacklisted"; errormsg = "has a blacklisted license (‘${showLicense attrs.meta.license}’)"; } else if !allowBroken && attrs.meta.broken or false then { valid = false; reason = "broken"; errormsg = "is marked as broken"; } - else if !allowUnsupportedSystem && - (!lib.lists.elem hostPlatform.system (attrs.meta.platforms or lib.platforms.all) || - lib.lists.elem hostPlatform.system (attrs.meta.badPlatforms or [])) then + else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; } else if !(hasAllowedInsecure attrs) then { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; } @@ -242,14 +261,14 @@ let { valid = false; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; } else let res = checkMeta (attrs.meta or {}); in if res != [] then { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; } - else { valid = true; }; + else { valid = true; }); assertValidity = { meta, attrs }: let validity = checkValidity attrs; in validity // { # Throw an error if trying to evaluate an non-valid derivation handled = if !validity.valid - then handleEvalIssue { inherit meta attrs; } (removeAttrs validity ["valid"]) + then handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; } else true; }; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index a11b280b047..7eb41b314db 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -302,8 +302,9 @@ in rec { # Fill `meta.position` to identify the source location of the package. // lib.optionalAttrs (pos != null) { position = pos.file + ":" + toString pos.line; - # Expose the result of the checks for everyone to see. } // { + # Expose the result of the checks for everyone to see. + inherit (validity) unfree broken unsupported insecure; available = validity.valid && (if config.checkMetaRecursively or false then lib.all (d: d.meta.available or true) references From 03f116eaa037ce30670da482f12006d24c49206e Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Fri, 22 May 2020 08:18:51 -0700 Subject: [PATCH 005/268] unison-ucm: 1.0.M1l-alpha -> 1.0.M1m-alpha [Release notes](https://github.com/unisonweb/unison/releases/tag/release%2FM1m) --- pkgs/development/compilers/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index c17f85b4936..c7266614e49 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1l"; + milestone_id = "M1m"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr"; + sha256 = "06pxvp753j8pr0pn02l7cswmmas5pk1vlkw83yd04h3f2rx1s61v"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x"; + sha256 = "1qspvfq805d34kz031pf9sqw8kzz7h637kc8lnbjlgvwixxkxc7c"; }; # The tarball is just the prebuilt binary, in the archive root. From d557de50338ea872e4223da749bc8271fca12c98 Mon Sep 17 00:00:00 2001 From: Dominik Michael Rauh Date: Mon, 2 Dec 2019 18:45:42 +0100 Subject: [PATCH 006/268] dsf2flac: init at 0.1Rev54 --- pkgs/applications/audio/dsf2flac/default.nix | 34 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/audio/dsf2flac/default.nix diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix new file mode 100644 index 00000000000..031203dda75 --- /dev/null +++ b/pkgs/applications/audio/dsf2flac/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, boost, flac, id3lib, pkg-config +, taglib, zlib }: + +stdenv.mkDerivation rec { + pname = "dsf2flac"; + version = "unstable-2018-01-02"; + + src = fetchFromGitHub { + owner = "hank"; + repo = pname; + rev = "b0cf5aa6ddc60df9bbfeed25548e443c99f5cb16"; + sha256 = "15j5f82v7lgs0fkgyyynl82cb1rsxyr9vw3bpzra63nacbi9g8lc"; + }; + + buildInputs = [ boost flac id3lib taglib zlib ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + enableParallelBuilding = true; + + preConfigure = '' + export LIBS="$LIBS -lz" + ''; + + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; + + meta = with stdenv.lib; { + description = "A DSD to FLAC transcoding tool"; + homepage = "https://github.com/hank/dsf2flac"; + license = licenses.gpl2; + maintainers = with maintainers; [ dmrauh ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47f8ceb07e0..9aa53d2be82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19225,6 +19225,8 @@ in drumgizmo = callPackage ../applications/audio/drumgizmo { }; + dsf2flac = callPackage ../applications/audio/dsf2flac { }; + dunst = callPackage ../applications/misc/dunst { }; du-dust = callPackage ../tools/misc/dust { }; From e12768b0fed2c45630eea6d1f3c39ac9fd47b602 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Mon, 1 Jun 2020 17:33:04 +0200 Subject: [PATCH 007/268] vim-async: Init at 2020-03-17 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index dd105b8e74c..962c0eb9a03 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3853,6 +3853,18 @@ let meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; + vim-async = buildVimPluginFrom2Nix { + pname = "vim-async"; + version = "2020-03-17"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "async.vim"; + rev = "42371b5fb2cc07254295ff6beb3ca7cf235b7ede"; + sha256 = "1c6ymxm28hpai1ki5y5a2m6qh5129nqn1fxiq9xnlzfrlbjl8vil"; + }; + meta.homepage = "https://github.com/prabirshrestha/async.vim"; + }; + vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; version = "2019-03-19"; From 224e56bc6e27b60fdcab1e652f0751189a0cd68b Mon Sep 17 00:00:00 2001 From: Matt Snider Date: Sat, 6 Jun 2020 12:06:24 +0200 Subject: [PATCH 008/268] vimPlugins.investigate-vim: init at 2020-02-29 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 4ecfa222de7..0251c4032c1 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1822,6 +1822,18 @@ let meta.homepage = "https://github.com/parsonsmatt/intero-neovim/"; }; + investigate-vim = buildVimPluginFrom2Nix { + pname = "investigate-vim"; + version = "2020-02-29"; + src = fetchFromGitHub { + owner = "keith"; + repo = "investigate.vim"; + rev = "aef9332ba3cfc070fb59fd7a4ac82bae2b42cd7b"; + sha256 = "1jiipch8jr66h1cywwj0zdlx45p70d359s8ljdwcndjwicrqslmk"; + }; + meta.homepage = "https://github.com/keith/investigate.vim/"; + }; + iosvkem = buildVimPluginFrom2Nix { pname = "iosvkem"; version = "2020-01-18"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index e22ddc50ddd..2e23c949962 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -212,6 +212,7 @@ kbenzie/vim-spirv kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/swift.vim +keith/investigate.vim kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold From d6197e48c5bfedcc286528c87b8aacd6166aaadf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 10:35:21 +0000 Subject: [PATCH 009/268] bosun: 0.5.0 -> 0.8.0-preview --- pkgs/servers/monitoring/bosun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 22c741024b2..b0ab129fc84 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "bosun"; - version = "0.5.0"; + version = "0.8.0-preview"; src = fetchFromGitHub { owner = "bosun-monitor"; repo = "bosun"; rev = version; - sha256 = "1qj97wiqj6awivvac1n00k0x8wdv4ambzdj4502nmmnr5rdbqq88"; + sha256 = "172mm006jarc2zm2yq7970k2a9akmyzvsrr8aqym4wk5v9x8kk0r"; }; subPackages = [ "cmd/bosun" "cmd/scollector" ]; From 6a380c4ea227df1213bcf33c3384b45810ed3056 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Jun 2020 23:14:59 +0000 Subject: [PATCH 010/268] nats-streaming-server: 0.16.2 -> 0.17.0 --- pkgs/servers/nats-streaming-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index efaec689a1a..bc89e9e3a1e 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.16.2"; + version = "0.17.0"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "0xrgwsw4xrn6fjy1ra4ycam50kdhyqqsms4yxblj5c5z7w4hnlmk"; + sha256 = "1dla70k6rxg34qzspq0j12zcjk654jrf3gm7gd45w4qdg8h2fyyg"; }; meta = { From ec1fd469c1949fe310f389f4a3b3ec9968965bfd Mon Sep 17 00:00:00 2001 From: Konstantin Alekseev Date: Thu, 25 Jun 2020 23:58:51 +0300 Subject: [PATCH 011/268] greg: add setuptools to propagatedBuildInputs --- pkgs/applications/audio/greg/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix index e027680f5fe..c243a81ac2e 100644 --- a/pkgs/applications/audio/greg/default.nix +++ b/pkgs/applications/audio/greg/default.nix @@ -13,8 +13,7 @@ with pythonPackages; buildPythonApplication rec { sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v"; }; - buildInputs = with pythonPackages; [ feedparser ]; - propagatedBuildInputs = buildInputs; + propagatedBuildInputs = [ setuptools feedparser ]; meta = with stdenv.lib; { homepage = "https://github.com/manolomartinez/greg"; From ebb18acd825d5ef3f9cbe92e14a2d7d943047b1e Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Wed, 1 Jul 2020 19:48:18 +0200 Subject: [PATCH 012/268] =?UTF-8?q?keysmith:=200.1=20=E2=86=92=200.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/security/keysmith/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/keysmith/default.nix b/pkgs/tools/security/keysmith/default.nix index b9ab7bb0b4a..142e9c1e4a0 100644 --- a/pkgs/tools/security/keysmith/default.nix +++ b/pkgs/tools/security/keysmith/default.nix @@ -10,30 +10,25 @@ , qtgraphicaleffects , kirigami2 , oathToolkit +, ki18n +, libsodium }: mkDerivation rec { pname = "keysmith"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "KDE"; repo = "keysmith"; rev = "v${version}"; - sha256 = "15fzf0bvarivm32zqa5w71mscpxdac64ykiawc5hx6kplz93bsgx"; + sha256 = "1gvzw23mly8cp7ag3xpbngpid9gqrfj8cyv9dar6i9j660bh03km"; }; nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ]; - buildInputs = [ oathToolkit kirigami2 qtquickcontrols2 qtbase ]; - - postInstall = '' - mv $out/bin/org.kde.keysmith $out/bin/.org.kde.keysmith-wrapped - makeWrapper $out/bin/.org.kde.keysmith-wrapped $out/bin/org.kde.keysmith \ - --set QML2_IMPORT_PATH "${lib.getLib kirigami2}/lib/qt-5.12.7/qml:${lib.getBin qtquickcontrols2}/lib/qt-5.12.7/qml:${lib.getBin qtdeclarative}/lib/qt-5.12.7/qml:${qtgraphicaleffects}/lib/qt-5.12.7/qml" \ - --set QT_PLUGIN_PATH "${lib.getBin qtbase}/lib/qt-5.12.7/plugins" - ln -s $out/bin/org.kde.keysmith $out/bin/keysmith - ''; + buildInputs = [ libsodium ki18n oathToolkit kirigami2 qtquickcontrols2 qtbase ]; + propagatedBuildInput = [ oathToolkit ]; meta = with lib; { description = "OTP client for Plasma Mobile and Desktop"; From fcc7272cc03f9c9ff118af7a5e1a4fdd62793602 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 24 Aug 2020 19:58:24 +0300 Subject: [PATCH 013/268] multimc: remove unneeded flag --- pkgs/games/multimc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index bcdd950de4a..43f86fc10df 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -24,7 +24,7 @@ in mkDerivation rec { install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - wrapProgram $out/bin/multimc --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/ + wrapProgram $out/bin/multimc --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/:${xorg.xrandr}/bin/ ''; meta = with stdenv.lib; { From a9def8ddbc71033476fe68c358d81524b820d7f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= Date: Sun, 6 Sep 2020 04:04:19 +0100 Subject: [PATCH 014/268] rainloop: allow multiple instances to use the same package --- pkgs/servers/rainloop/default.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index bff5d2ea306..42c68d5608e 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -24,7 +24,8 @@ */ function __get_custom_data_full_path() { - return '${dataPath}'; // custom data folder path + $v = getenv('RAINLOOP_DATA_DIR', TRUE); + return $v === FALSE ? '${dataPath}' : $v; } ''; @@ -33,6 +34,8 @@ cp -r rainloop/* $out rm -rf $out/data cp ${includeScript} $out/include.php + mkdir $out/data + chmod 700 $out/data ''; meta = with stdenv.lib; { @@ -44,13 +47,13 @@ maintainers = with maintainers; [ das_j ]; }; }); - in { - rainloop-community = common { - edition = "community"; - sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; - }; - rainloop-standard = common { - edition = ""; - sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; - }; - } +in { + rainloop-community = common { + edition = "community"; + sha256 = "0a8qafm4khwj8cnaiaxvjb9073w6fr63vk1b89nks4hmfv10jn6y"; + }; + rainloop-standard = common { + edition = ""; + sha256 = "0961g4mci080f7y98zx9r4qw620l4z3na1ivvlyhhr1v4dywqvch"; + }; +} From ebd199184d7273753e9ee51553927cd22a9ffd61 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Tue, 28 Apr 2020 18:32:22 +0200 Subject: [PATCH 015/268] nixos/proxychains: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/proxychains.nix | 165 +++++++++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 nixos/modules/programs/proxychains.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c54bc6098d3..d70d95f61c4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -143,6 +143,7 @@ ./programs/npm.nix ./programs/oblogout.nix ./programs/plotinus.nix + ./programs/proxychains.nix ./programs/qt5ct.nix ./programs/screen.nix ./programs/sedutil.nix diff --git a/nixos/modules/programs/proxychains.nix b/nixos/modules/programs/proxychains.nix new file mode 100644 index 00000000000..7743f79c1c0 --- /dev/null +++ b/nixos/modules/programs/proxychains.nix @@ -0,0 +1,165 @@ +{ config, lib, pkgs, ... }: +with lib; +let + + cfg = config.programs.proxychains; + + configFile = '' + ${cfg.chain.type}_chain + ${optionalString (cfg.chain.type == "random") + "chain_len = ${builtins.toString cfg.chain.length}"} + ${optionalString cfg.proxyDNS "proxy_dns"} + ${optionalString cfg.quietMode "quiet_mode"} + remote_dns_subnet ${builtins.toString cfg.remoteDNSSubnet} + tcp_read_time_out ${builtins.toString cfg.tcpReadTimeOut} + tcp_connect_time_out ${builtins.toString cfg.tcpConnectTimeOut} + localnet ${cfg.localnet} + [ProxyList] + ${builtins.concatStringsSep "\n" + (lib.mapAttrsToList (k: v: "${v.type} ${v.host} ${builtins.toString v.port}") + (lib.filterAttrs (k: v: v.enable) cfg.proxies))} + ''; + + proxyOptions = { + options = { + enable = mkEnableOption "this proxy"; + + type = mkOption { + type = types.enum [ "http" "socks4" "socks5" ]; + description = "Proxy type."; + }; + + host = mkOption { + type = types.str; + description = "Proxy host or IP address."; + }; + + port = mkOption { + type = types.port; + description = "Proxy port"; + }; + }; + }; + +in { + + ###### interface + + options = { + + programs.proxychains = { + + enable = mkEnableOption "installing proxychains configuration"; + + chain = { + type = mkOption { + type = types.enum [ "dynamic" "strict" "random" ]; + default = "strict"; + description = '' + dynamic - Each connection will be done via chained proxies + all proxies chained in the order as they appear in the list + at least one proxy must be online to play in chain + (dead proxies are skipped) + otherwise EINTR is returned to the app. + + strict - Each connection will be done via chained proxies + all proxies chained in the order as they appear in the list + all proxies must be online to play in chain + otherwise EINTR is returned to the app. + + random - Each connection will be done via random proxy + (or proxy chain, see ) from the list. + ''; + }; + length = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Chain length for random chain. + ''; + }; + }; + + proxyDNS = mkOption { + type = types.bool; + default = true; + description = "Proxy DNS requests - no leak for DNS data."; + }; + + quietMode = mkEnableOption "Quiet mode (no output from the library)."; + + remoteDNSSubnet = mkOption { + type = types.enum [ 10 127 224 ]; + default = 224; + description = '' + Set the class A subnet number to use for the internal remote DNS mapping, uses the reserved 224.x.x.x range by default. + ''; + }; + + tcpReadTimeOut = mkOption { + type = types.int; + default = 15000; + description = "Connection read time-out in milliseconds."; + }; + + tcpConnectTimeOut = mkOption { + type = types.int; + default = 8000; + description = "Connection time-out in milliseconds."; + }; + + localnet = mkOption { + type = types.str; + default = "127.0.0.0/255.0.0.0"; + description = "By default enable localnet for loopback address ranges."; + }; + + proxies = mkOption { + type = types.attrsOf (types.submodule proxyOptions); + description = '' + Proxies to be used by proxychains. + ''; + + example = literalExample '' + { myproxy = + { type = "socks4"; + host = "127.0.0.1"; + port = 1337; + }; + } + ''; + }; + + }; + + }; + + ###### implementation + + meta.maintainers = with maintainers; [ sorki ]; + + config = mkIf cfg.enable { + + assertions = singleton { + assertion = cfg.chain.type != "random" && cfg.chain.length == null; + message = '' + Option `programs.proxychains.chain.length` + only makes sense with `programs.proxychains.chain.type` = "random". + ''; + }; + + programs.proxychains.proxies = mkIf config.services.tor.client.enable + { + torproxy = mkDefault { + enable = true; + type = "socks4"; + host = "127.0.0.1"; + port = 9050; + }; + }; + + environment.etc."proxychains.conf".text = configFile; + environment.systemPackages = [ pkgs.proxychains ]; + }; + +} From e6b5d5401e42346a0a2190ab10a7ef6442620452 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Tue, 8 Sep 2020 09:38:29 +0200 Subject: [PATCH 016/268] proxychains: copy src/proxychains.conf to /etc As requested by Infinisil in #86225. --- pkgs/tools/networking/proxychains/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 6f00c7fc8b7..6ace8e139e1 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { # Temporary work-around; most likely fixed by next upstream release sed -i Makefile -e '/-lpthread/a LDFLAGS+=-ldl' ''; + postInstall = '' + cp src/proxychains.conf $out/etc + ''; meta = { description = "Proxifier for SOCKS proxies"; From 43b32e6f487619a916f71d30dff8d66eacda236a Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Wed, 30 Sep 2020 16:35:34 -0400 Subject: [PATCH 017/268] fractal: mark broken on Darwin --- .../networking/instant-messengers/fractal/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 68e7282870b..67a40b1dc33 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -92,6 +92,7 @@ rustPlatform.buildRustPackage rec { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; + broken = stdenv.isDarwin; maintainers = with maintainers; [ dtzWill worldofpeace ]; }; } From c41302d262e7cc6f27abbc5b942384bb02ea901a Mon Sep 17 00:00:00 2001 From: Joe Lancaster Date: Thu, 1 Oct 2020 10:34:23 +0100 Subject: [PATCH 018/268] maintainers: add joelancaster --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33e34fbab33..39ca5a000c9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4035,6 +4035,12 @@ githubId = 60272884; name = "Jonathan Jeppener-Haltenhoff"; }; + joelancaster = { + email = "joe.a.lancas@gmail.com"; + github = "joelancaster"; + githubId = 16760945; + name = "Joe Lancaster"; + }; joelburget = { email = "joelburget@gmail.com"; github = "joelburget"; From 5778446619ef4fd1b73e0274d98c387f1151d3ae Mon Sep 17 00:00:00 2001 From: Pawel Kruszewski Date: Sat, 3 Oct 2020 23:00:35 +0200 Subject: [PATCH 019/268] bcompare: 4.3.5.24893 -> 4.3.7.25118 --- pkgs/applications/version-management/bcompare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index 1af64f8e6df..5da3aee5d7b 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bcompare"; - version = "4.3.5.24893"; + version = "4.3.7.25118"; src = fetchurl { url = "https://www.scootersoftware.com/${pname}-${version}_amd64.deb"; - sha256 = "1gm8d6hgdg8f3hd83wqac28gkvz5nyn62wj7x44vmr60dh4i2jfn"; + sha256 = "165d6d81vy29pr62y4rcvl4abqqhfwdzcsx77p0dqlzgqswj88v8"; }; unpackPhase = '' From 4bf5dd0d3c0ecb0af528dc3846ac71f3c3f296e0 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Wed, 23 Oct 2019 19:09:33 +0200 Subject: [PATCH 020/268] fdroidserver: fix gradlew-fdroid interpreter --- pkgs/development/tools/fdroidserver/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 2b96830b002..1b0c44f5754 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -23,6 +23,7 @@ python.pkgs.buildPythonApplication rec { ${python.interpreter} setup.py compile_catalog ''; postInstall = '' + patchShebangs gradlew-fdroid install -m 0755 gradlew-fdroid $out/bin ''; From 3a5b3ef85e8ef3cf7ecfa3ae7b1823d068e04933 Mon Sep 17 00:00:00 2001 From: Joe Lancaster Date: Thu, 1 Oct 2020 10:35:05 +0100 Subject: [PATCH 021/268] dnadd: init at v1.0.0 --- pkgs/tools/nix/dnadd/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/nix/dnadd/default.nix diff --git a/pkgs/tools/nix/dnadd/default.nix b/pkgs/tools/nix/dnadd/default.nix new file mode 100644 index 00000000000..eff99743f1e --- /dev/null +++ b/pkgs/tools/nix/dnadd/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "dnadd"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "JoeLancaster"; + repo = pname; + rev = "v${version}"; + sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/joelancaster/dnadd"; + description = "Adds packages declaratively on the command line"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ joelancaster ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d1f7f04255..1f2ccc9dd65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27243,6 +27243,8 @@ in nixdoc = callPackage ../tools/nix/nixdoc {}; + dnadd = callPackage ../tools/nix/dnadd { }; + nix-doc = callPackage ../tools/package-management/nix-doc { }; nix-bundle = callPackage ../tools/package-management/nix-bundle { }; From b125b88783c6d7aa39e98cd4d9d8f857c257c398 Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Tue, 6 Oct 2020 22:47:34 +0300 Subject: [PATCH 022/268] datagrip: remove loskutov from maintainers I haven't been actively maintaining this derivation; provided that updates are made by scripts, it looks like it's time to finally abandon it. --- pkgs/applications/editors/jetbrains/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d54513971a8..ed2720ffa6e 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -90,7 +90,7 @@ let It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more. ''; - maintainers = with maintainers; [ loskutov ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }); From 921b15efe75dbde8b6f2e3bb85fe648cba73f0db Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 7 Oct 2020 13:49:17 -0400 Subject: [PATCH 023/268] python3Packages.nipype: remove Python 2 support (dependency nibabel already unsupported) --- pkgs/development/python-modules/nipype/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 80ee7691a1a..c621341b2f8 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -1,23 +1,19 @@ { stdenv , buildPythonPackage , fetchPypi -, isPy3k -, isPy38 +, isPy27 # python dependencies , click -, configparser ? null , dateutil , etelemetry , filelock , funcsigs , future -, futures , mock , networkx , nibabel , numpy , packaging -, pathlib2 , prov , psutil , pybids @@ -39,8 +35,6 @@ , callPackage }: -assert !isPy3k -> configparser != null; - let # This is a temporary convenience package for changes waiting to be merged into the primary rdflib repo. @@ -51,6 +45,7 @@ in buildPythonPackage rec { pname = "nipype"; version = "1.5.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -85,10 +80,6 @@ buildPythonPackage rec { simplejson traits xvfbwrapper - ] ++ stdenv.lib.optionals (!isPy3k) [ - configparser - futures - pathlib2 # darwin doesn't receive this transitively, but it is in install_requires ]; checkInputs = [ From f31be2ec2576f787811ae1ddd900c322b84a5ab2 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 7 Oct 2020 14:02:26 -0400 Subject: [PATCH 024/268] python3Packages.nipype: avoid use of neurdflib by default since it causes a package collision when rdflib is in the closure --- pkgs/development/python-modules/nipype/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index c621341b2f8..2d8eaecf775 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -21,6 +21,7 @@ , pytest , pytest_xdist , pytest-forked +, rdflib , scipy , simplejson , traits @@ -33,6 +34,10 @@ , bash , glibcLocales , callPackage +# causes Python packaging conflict with any package requiring rdflib, +# so use the unpatched rdflib by default (disables Nipype provenance tracking); +# see https://github.com/nipy/nipype/issues/2888: +, useNeurdflib ? false }: let @@ -69,7 +74,6 @@ buildPythonPackage rec { funcsigs future networkx - neurdflib nibabel numpy packaging @@ -80,7 +84,7 @@ buildPythonPackage rec { simplejson traits xvfbwrapper - ]; + ] ++ [ (if useNeurdflib then neurdflib else rdflib) ]; checkInputs = [ pybids From 8094b8a95331c97552e3eae54e2ebbeb6e0e2326 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 8 Oct 2020 14:41:36 +0200 Subject: [PATCH 025/268] ikiwiki: add highlight dependency IkiWiki's highlight plugin requires this. Note that the current highlight version (3.57) is not compatible with ikiwiki version in nixpkgs. This will be fixed in the next commit. --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 0c2abbd9f58..20e271bc58d 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which +{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight , gitSupport ? false, git ? null , docutilsSupport ? false, python ? null, docutils ? null , monotoneSupport ? false, monotone ? null @@ -31,7 +31,7 @@ stdenv.mkDerivation { sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh"; }; - buildInputs = [ which ] + buildInputs = [ which highlight ] ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase From b06290ffd0c3efe2d9ee0de8f9a6c22336e7f998 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 8 Oct 2020 14:48:22 +0200 Subject: [PATCH 026/268] ikiwiki: 3.20190228 -> 3.20200202.3 This fixes (among others) incompatibility with highlight from nixpkgs. See http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce --- pkgs/applications/misc/ikiwiki/default.nix | 4 +- .../misc/ikiwiki/remove-markdown-tests.patch | 46 +++++++++---------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 20e271bc58d..105e1d59b36 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20190228"; + version = "3.20200202.3"; lib = stdenv.lib; in @@ -28,7 +28,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz"; - sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh"; + sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr"; }; buildInputs = [ which highlight ] diff --git a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch b/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch index c981857a248..bae63a10bf6 100644 --- a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch +++ b/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch @@ -1,10 +1,28 @@ diff --git a/t/mdwn.t b/t/mdwn.t -index ca3180139..d64750403 100755 +index 966aad2..2756173 100755 --- a/t/mdwn.t +++ b/t/mdwn.t -@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn", - "C. S. Lewis wrote books\n"), - "

C. S. Lewis wrote books

\n", "alphalist off by default"); +@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) { + "

C. S. Lewis wrote books

\n", + "alphalist off by default for multimarkdown = $multimarkdown"); + +- like(IkiWiki::htmlize("foo", "foo", "mdwn", +- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), +- qr{

This works.*fnref:1.*}, +- "footnotes on by default for multimarkdown = $multimarkdown"); +- + $config{mdwn_footnotes} = 0; + unlike(IkiWiki::htmlize("foo", "foo", "mdwn", + "An unusual link label: [^1]\n\n[^1]: http://example.com/\n"), + qr{

An unusual link label: .*fnref:1.*}, + "footnotes can be disabled for multimarkdown = $multimarkdown"); +- +- $config{mdwn_footnotes} = 1; +- like(IkiWiki::htmlize("foo", "foo", "mdwn", +- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), +- qr{

This works.*fnref:1.*}, +- "footnotes can be enabled for multimarkdown = $multimarkdown"); + } -$config{mdwn_alpha_lists} = 1; -like(IkiWiki::htmlize("foo", "foo", "mdwn", @@ -15,23 +33,3 @@ index ca3180139..d64750403 100755 $config{mdwn_alpha_lists} = 0; like(IkiWiki::htmlize("foo", "foo", "mdwn", "A. One\n". - "B. Two\n"), - qr{

A. One\sB. Two

\n}, "alphalist can be disabled"); - --like(IkiWiki::htmlize("foo", "foo", "mdwn", -- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), -- qr{

This works\^1}, "footnotes can be disabled"); - --$config{mdwn_footnotes} = 1; --like(IkiWiki::htmlize("foo", "foo", "mdwn", -- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), -- qr{

This works Date: Thu, 8 Oct 2020 14:54:19 +0200 Subject: [PATCH 027/268] ikiwiki: Fix postInstall script to work with optional dependencies The line-continuation backslash should not be a part of optional string because it can lead to errors like this: /nix/store/333six1faw9bhccsx9qw5718k6b1wiq2-stdenv-linux/setup: line 90: --prefix: command not found builder for '/nix/store/lb07r900fpg7r1555zpf0j8n1n7g3wlx-ikiwiki-3.20200202.3.drv' failed with exit code 127 --- pkgs/applications/misc/ikiwiki/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 105e1d59b36..c940f824f37 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -62,13 +62,13 @@ stdenv.mkDerivation { postInstall = '' for a in "$out/bin/"*; do wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \ - ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''} - ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''} - ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''} - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''} - ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''} - ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''} - ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''} + ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \ + ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \ + ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \ + ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \ + ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \ + ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \ + ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \ ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done ''; From 40a5a4c46ed512423685f9ab8ae25ec88d675496 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 8 Oct 2020 15:00:30 +0200 Subject: [PATCH 028/268] ikiwiki: Fix docutils support Without this, the rst plugin complains as follows: cannot import docutils.core Also, python3 is needed for the rst plugin to work. --- pkgs/applications/misc/ikiwiki/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index c940f824f37..c97ea3d4b77 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation { ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \ ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \ ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \ + ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \ ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bc1ab0f1c08..f3eaa453677 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21310,6 +21310,7 @@ in ike = callPackage ../applications/networking/ike { }; ikiwiki = callPackage ../applications/misc/ikiwiki { + python = python3; inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; From f8ea4e0c3dabd9551066bc8e74d225d90f8bf4f6 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Thu, 8 Oct 2020 14:32:49 -0700 Subject: [PATCH 029/268] makeRustPlatform: support custom targets --- pkgs/build-support/rust/default.nix | 35 ++++++++++++---- pkgs/build-support/rust/sysroot/Cargo.lock | 20 +++++++++ pkgs/build-support/rust/sysroot/cargo.py | 44 ++++++++++++++++++++ pkgs/build-support/rust/sysroot/default.nix | 45 +++++++++++++++++++++ 4 files changed, 137 insertions(+), 7 deletions(-) create mode 100644 pkgs/build-support/rust/sysroot/Cargo.lock create mode 100644 pkgs/build-support/rust/sysroot/cargo.py create mode 100644 pkgs/build-support/rust/sysroot/default.nix diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index f6177ce198d..10488f4d372 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -4,6 +4,10 @@ , cargo , diffutils , fetchCargoTarball +, runCommandNoCC +, rustPlatform +, callPackage +, remarshal , git , rust , rustc @@ -26,12 +30,15 @@ , cargoBuildFlags ? [] , buildType ? "release" , meta ? {} -, target ? null +, target ? rust.toRustTarget stdenv.hostPlatform , cargoVendorDir ? null , checkType ? buildType , depsExtraArgs ? {} , cargoParallelTestThreads ? true +# Toggles whether a custom sysroot is created when the target is a .json file. +, __internal_dontAddSysroot ? false + # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the # case for `rustfmt`/etc from the `rust-sources). @@ -68,14 +75,26 @@ let else '' cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; + + targetIsJSON = stdenv.lib.hasSuffix ".json" target; - rustTarget = if target == null then rust.toRustTarget stdenv.hostPlatform else target; + # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 + # the "${}" is needed to transform the path into a /nix/store path before baseNameOf + shortTarget = if targetIsJSON then + (stdenv.lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) + else target; + + sysroot = (callPackage ./sysroot {}) { + inherit target shortTarget; + RUSTFLAGS = args.RUSTFLAGS or ""; + originalCargoToml = src + /Cargo.toml; # profile info is later extracted + }; ccForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc"; cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++"; ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; - releaseDir = "target/${rustTarget}/${buildType}"; + releaseDir = "target/${shortTarget}/${buildType}"; tmpDir = "${releaseDir}-tmp"; # Specify the stdenv's `diff` by abspath to ensure that the user's build @@ -115,7 +134,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { [target."${rust.toRustTarget stdenv.buildPlatform}"] "linker" = "${ccForBuild}" ${stdenv.lib.optionalString (stdenv.buildPlatform.config != stdenv.hostPlatform.config) '' - [target."${rustTarget}"] + [target."${shortTarget}"] "linker" = "${ccForHost}" ${# https://github.com/rust-lang/rust/issues/46651#issuecomment-433611633 stdenv.lib.optionalString (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64) '' @@ -183,9 +202,11 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ - cargo build -j $NIX_BUILD_CORES \ + ${stdenv.lib.optionalString + (targetIsJSON && !__internal_dontAddSysroot) "RUSTFLAGS=\"--sysroot ${sysroot} $RUSTFLAGS\" " + }cargo build -j $NIX_BUILD_CORES \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ - --target ${rustTarget} \ + --target ${target} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) @@ -205,7 +226,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { ''; checkPhase = args.checkPhase or (let - argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; + argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${target} --frozen"; threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} diff --git a/pkgs/build-support/rust/sysroot/Cargo.lock b/pkgs/build-support/rust/sysroot/Cargo.lock new file mode 100644 index 00000000000..3b576f6657f --- /dev/null +++ b/pkgs/build-support/rust/sysroot/Cargo.lock @@ -0,0 +1,20 @@ +[[package]] +name = "alloc" +version = "0.0.0" +dependencies = ["compiler_builtins", "core"] + +[[package]] +name = "compiler_builtins" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc4ac2c824d2bfc612cba57708198547e9a26943af0632aff033e0693074d5c" +dependencies = ["rustc-std-workspace-core"] + +[[package]] +name = "core" +version = "0.0.0" + +[[package]] +name = "rustc-std-workspace-core" +version = "1.99.0" +dependencies = ["core"] diff --git a/pkgs/build-support/rust/sysroot/cargo.py b/pkgs/build-support/rust/sysroot/cargo.py new file mode 100644 index 00000000000..10ad94e4c54 --- /dev/null +++ b/pkgs/build-support/rust/sysroot/cargo.py @@ -0,0 +1,44 @@ +import os +import toml + +rust_src = os.environ['RUSTC_SRC'] +orig_cargo = os.environ['ORIG_CARGO'] + +base = { + 'package': { + 'name': 'alloc', + 'version': '0.0.0', + 'authors': ['The Rust Project Developers'], + 'edition': '2018', + }, + 'dependencies': { + 'compiler_builtins': { + 'version': '0.1.0', + 'features': ['rustc-dep-of-std', 'mem'], + }, + 'core': { + 'path': os.path.join(rust_src, 'libcore'), + }, + }, + 'lib': { + 'name': 'alloc', + 'path': os.path.join(rust_src, 'liballoc/lib.rs'), + }, + 'patch': { + 'crates-io': { + 'rustc-std-workspace-core': { + 'path': os.path.join(rust_src, 'tools/rustc-std-workspace-core'), + }, + }, + }, +} + +with open(orig_cargo, 'r') as f: + src = toml.loads(f.read()) + if 'profile' in src: + base['profile'] = src['profile'] + +out = toml.dumps(base) + +with open('Cargo.toml', 'x') as f: + f.write(out) diff --git a/pkgs/build-support/rust/sysroot/default.nix b/pkgs/build-support/rust/sysroot/default.nix new file mode 100644 index 00000000000..3bb86e9ad9a --- /dev/null +++ b/pkgs/build-support/rust/sysroot/default.nix @@ -0,0 +1,45 @@ +{ stdenv, rust, rustPlatform, buildPackages }: + +{ shortTarget, originalCargoToml, target, RUSTFLAGS }: + +let rustSrc = stdenv.mkDerivation { + name = "rust-src"; + src = rustPlatform.rust.rustc.src; + preferLocalBuild = true; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = "cp -r src $out"; + }; + cargoSrc = stdenv.mkDerivation { + name = "cargo-src"; + preferLocalBuild = true; + phases = [ "installPhase" ]; + installPhase = '' + RUSTC_SRC=${rustSrc} ORIG_CARGO=${originalCargoToml} \ + ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} + mkdir -p $out + cp Cargo.toml $out/Cargo.toml + cp ${./Cargo.lock} $out/Cargo.lock + ''; + }; +in rustPlatform.buildRustPackage { + inherit target RUSTFLAGS; + + name = "custom-sysroot"; + src = cargoSrc; + + RUSTC_BOOTSTRAP = 1; + __internal_dontAddSysroot = true; + cargoSha256 = "1snkfsx3jb1p5izwlfwkgp8hxhgpa35nmx939sp5730vf9whqqwg"; + + installPhase = '' + export LIBS_DIR=$out/lib/rustlib/${shortTarget}/lib + mkdir -p $LIBS_DIR + for f in target/${shortTarget}/release/deps/*.{rlib,rmeta}; do + cp $f $LIBS_DIR + done + + export RUST_SYSROOT=$(rustc --print=sysroot) + export HOST=${rust.toRustTarget stdenv.buildPlatform} + cp -r $RUST_SYSROOT/lib/rustlib/$HOST $out + ''; +} From a68766978de8f4e9d83d89f6a3512a6183555079 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 9 Oct 2020 10:56:17 -0400 Subject: [PATCH 030/268] python3Packages.scikit-fuzzy: init at unstable-2020-10-03 --- .../python-modules/scikit-fuzzy/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/scikit-fuzzy/default.nix diff --git a/pkgs/development/python-modules/scikit-fuzzy/default.nix b/pkgs/development/python-modules/scikit-fuzzy/default.nix new file mode 100644 index 00000000000..7923565c3f4 --- /dev/null +++ b/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, matplotlib +, networkx +, nose +, numpy +, scipy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "scikit-fuzzy"; + version = "unstable-2020-10-03"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "eecf303b701e3efacdc9b9066207ef605d4facaa"; + sha256 = "18dl0017iqwc7446hqgabhibgjwdakhmycpis6zpvvkkv4ip5062"; + }; + + propagatedBuildInputs = [ networkx numpy scipy ]; + checkInputs = [ matplotlib nose pytestCheckHook ]; + + meta = with lib; { + homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy"; + description = "Fuzzy logic toolkit for scientific Python"; + license = licenses.bsd3; + maintainers = [ maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c334f9ab1a3..ecaa1d8892a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6341,6 +6341,8 @@ in { scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; From 6048a3c1f593fd99b1b5b46a81b2930b3c2f99c1 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Fri, 10 Jan 2020 15:44:58 +1100 Subject: [PATCH 031/268] xen: Remove unsupported Xen version (4.8) --- pkgs/applications/virtualization/xen/4.8.nix | 198 ------------------ .../virtualization/xen/packages.nix | 54 +---- pkgs/top-level/all-packages.nix | 5 - 3 files changed, 4 insertions(+), 253 deletions(-) delete mode 100644 pkgs/applications/virtualization/xen/4.8.nix diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix deleted file mode 100644 index 6fa30462df0..00000000000 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit -, ocaml-ng -, withInternalQemu ? true -, withInternalTraditionalQemu ? true -, withInternalSeabios ? true -, withSeabios ? !withInternalSeabios, seabios ? null -, withInternalOVMF ? false # FIXME: tricky to build -, withOVMF ? false, OVMF -, withLibHVM ? true - -# qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir -, alsaLib -, ... } @ args: - -assert withInternalSeabios -> !withSeabios; -assert withInternalOVMF -> !withOVMF; - -with stdenv.lib; - -# Patching XEN? Check the XSAs at -# https://xenbits.xen.org/xsa/ -# and try applying all the ones we don't have yet. - -let - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; - - xenlockprofpatch = (fetchpatch { - name = "xenlockprof-gcc7.patch"; - url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=f49fa658b53580cf2ad354d2bf1796766cc11222"; - sha256 = "1lvzfvkqirknivm8q4cg5byfqz49s16zjk65fkwl3kwb03chky70"; - }); - - xenpmdpatch = (fetchpatch { - name = "xenpmd-gcc7.patch"; - url = "https://xenbits.xen.org/gitweb/?p=xen.git;a=patch;h=2d78f78a14528752266982473c07118f1bc336e3"; - sha256 = "1ki295pymbcfc64sjb9wqfwpv19p8vwgmnxankada3vm4fxg2rhq"; - }); - - qemuMemfdBuildFix = fetchpatch { - name = "xen-4.8-memfd-build-fix.patch"; - url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"; - sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; - }; - - # Ported from - #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=e014dbe74e0484188164c61ff6843f8a04a8cb9d"; - #"https://xenbits.xen.org/gitweb/?p=qemu-xen.git;a=patch;h=0e3b891fefacc0e49f3c8ffa3a753b69eb7214d2"; - qemuGlusterfs6Fix = ./qemu-gluster-6-compat.diff; - - qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir - alsaLib - ]; -in - -callPackage (import ./generic.nix (rec { - version = "4.8.5"; - - src = fetchurl { - url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "04xcf01jad1lpqnmjblzhnjzp0bss9fjd9awgcycjx679arbaxqz"; - }; - - # Sources needed to build tools and firmwares. - xenfiles = optionalAttrs withInternalQemu { - qemu-xen = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen.git"; - rev = "refs/tags/qemu-xen-${version}"; - sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4"; - }; - patches = [ - qemuMemfdBuildFix - qemuGlusterfs6Fix - ]; - buildInputs = qemuDeps; - meta.description = "Xen's fork of upstream Qemu"; - }; - } // optionalAttrs withInternalTraditionalQemu { - qemu-xen-traditional = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; - rev = "refs/tags/xen-${version}"; - sha256 = "0mryap5y53r09m7qc0b821f717ghwm654r8c3ik1w7adzxr0l5qk"; - }; - buildInputs = qemuDeps; - patches = [ - ]; - postPatch = '' - substituteInPlace xen-hooks.mak \ - --replace /usr/include/pci ${pciutils}/include/pci - ''; - meta.description = "Xen's fork of upstream Qemu that uses old device model"; - }; - } // optionalAttrs withInternalSeabios { - "firmware/seabios-dir-remote" = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/seabios.git"; - rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; - sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; - }; - patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; - meta.description = "Xen's fork of Seabios"; - }; - } // optionalAttrs withInternalOVMF { - "firmware/ovmf-dir-remote" = { - src = fetchgit { - url = "https://xenbits.xen.org/git-http/ovmf.git"; - rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; - sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; - }; - meta.description = "Xen's fork of OVMF"; - }; - } // { - # TODO: patch Xen to make this optional? - "firmware/etherboot/ipxe.git" = { - src = fetchgit { - url = "https://git.ipxe.org/ipxe.git"; - rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; - sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; - }; - meta.description = "Xen's fork of iPXE"; - }; - } // optionalAttrs withLibHVM { - xen-libhvm-dir-remote = { - src = fetchgit { - name = "xen-libhvm"; - url = "https://github.com/michalpalka/xen-libhvm"; - rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; - sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; - }; - buildPhase = '' - make - cd biospt - cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm - ''; - installPhase = '' - make install - cp biospt/biospt $out/bin/ - ''; - meta = { - description = '' - Helper library for reading ACPI and SMBIOS firmware values - from the host system for use with the HVM guest firmware - pass-through feature in Xen''; - license = licenses.bsd2; - }; - }; - }; - - configureFlags = [] - ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH - ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" - ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" - - ++ optional (withSeabios) "--with-system-seabios=${seabios}" - ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" - - ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" - ++ optional (withInternalOVMF) "--enable-ovmf"; - - patches = with xsa; flatten [ - # 253: 4.8 not affected - # 254: no patch supplied by xen project (Meltdown/Spectre) - xenlockprofpatch - xenpmdpatch - ]; - - NIX_CFLAGS_COMPILE = toString [ - # Fix build on Glibc 2.24 - "-Wno-error=deprecated-declarations" - # Fix build with GCC8 - "-Wno-error=maybe-uninitialized" - "-Wno-error=stringop-truncation" - "-Wno-error=format-truncation" - "-Wno-error=array-bounds" - # Fix build with GCC9 - "-Wno-error=address-of-packed-member" - "-Wno-error=format-overflow" - "-Wno-error=absolute-value" - ]; - - postPatch = '' - # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. - sed 1i'#include ' \ - -i tools/blktap2/control/tap-ctl-allocate.c \ - -i tools/libxl/libxl_device.c \ - ${optionalString withInternalQemu "-i tools/qemu-xen/hw/9pfs/9p.c"} - - sed -i -e '/sys\/sysctl\.h/d' tools/blktap2/drivers/block-remus.c - ''; - - passthru.qemu-system-i386 = if withInternalQemu - then "lib/xen/bin/qemu-system-i386" - else throw "this xen has no qemu builtin"; - -})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_05; } // args) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index e30006fbcc1..55e3b12c3b7 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -1,57 +1,11 @@ { callPackage -, stdenv, overrideCC +, stdenv }: # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim # light] for each ./.nix. rec { - xen_4_8-vanilla = callPackage ./4.8.nix { - meta = { - description = "vanilla"; - longDescription = '' - Vanilla version of Xen. Uses forks of Qemu and Seabios bundled - with Xen. This gives vanilla experince, but wastes space and - build time: typical NixOS setup that runs lots of VMs will - build three different versions of Qemu when using this (two - forks and upstream). - ''; - }; - }; - - xen_4_8-slim = xen_4_8-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = true; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "slim"; - longDescription = '' - Slimmed-down version of Xen that reuses nixpkgs packages as - much as possible. Different parts may get out of sync, but - this builds faster and uses less space than vanilla. Use with - `qemu_xen` from nixpkgs. - ''; - }; - }; - - xen_4_8-light = xen_4_8-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = false; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "light"; - longDescription = '' - Slimmed-down version of Xen without `qemu-traditional` (you - don't need it if you don't know what it is). Use with - `qemu_xen-light` from nixpkgs. - ''; - }; - }; - xen_4_10-vanilla = callPackage ./4.10.nix { meta = { description = "vanilla"; @@ -98,8 +52,8 @@ rec { }; }; - xen-vanilla = xen_4_8-vanilla; - xen-slim = xen_4_8-slim; - xen-light = xen_4_8-light; + xen-vanilla = xen_4_10-vanilla; + xen-slim = xen_4_10-slim; + xen-light = xen_4_10-light; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2371e455b0..20fa3c866dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18502,8 +18502,6 @@ in # Building with `xen` instead of `xen-slim` is possible, but makes no sense. qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; }); - qemu_xen_4_8 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-slim; }); - qemu_xen_4_8-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-light; }); qemu_xen_4_10 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-slim; }); qemu_xen_4_10-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_10-light; }); @@ -24408,9 +24406,6 @@ in xen-slim = xenPackages.xen-slim; xen-light = xenPackages.xen-light; - xen_4_8 = xenPackages.xen_4_8-vanilla; - xen_4_8-slim = xenPackages.xen_4_8-slim; - xen_4_8-light = xenPackages.xen_4_8-light; xen_4_10 = xenPackages.xen_4_10-vanilla; xen_4_10-slim = xenPackages.xen_4_10-slim; xen_4_10-light = xenPackages.xen_4_10-light; From 22fdd2465cb463fe685caae107e3785fadb5b276 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Tue, 30 Apr 2019 12:22:53 +1000 Subject: [PATCH 032/268] xen: Build Xen EFI binary --- .../xen/0004-makefile-use-efi-ld.patch | 36 +++++++++++++++++++ .../0005-makefile-fix-efi-mountdir-use.patch | 35 ++++++++++++++++++ .../virtualization/xen/generic.nix | 26 +++++++++++--- 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch create mode 100644 pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch diff --git a/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch b/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch new file mode 100644 index 00000000000..a103cb16171 --- /dev/null +++ b/pkgs/applications/virtualization/xen/0004-makefile-use-efi-ld.patch @@ -0,0 +1,36 @@ +diff -Naur xen-4.10.4-orig/xen/arch/x86/Makefile xen-4.10.4-patched/xen/arch/x86/Makefile +--- xen-4.10.4-orig/xen/arch/x86/Makefile 2019-07-04 01:28:50.000000000 +1000 ++++ xen-4.10.4-patched/xen/arch/x86/Makefile 2020-03-03 13:32:34.607951507 +1100 +@@ -166,7 +166,7 @@ + # Check if the compiler supports the MS ABI. + export XEN_BUILD_EFI := $(shell $(CC) $(filter-out $(CFLAGS-y) .%.d,$(CFLAGS)) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) + # Check if the linker supports PE. +-XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) ++XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(EFI_LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) + CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI + + $(TARGET).efi: VIRT_BASE = 0x$(shell $(NM) efi/relocs-dummy.o | sed -n 's, A VIRT_START$$,,p') +@@ -188,20 +188,20 @@ + + $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o $(BASEDIR)/common/symbols-dummy.o efi/mkreloc + $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ +- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ ++ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< efi/relocs-dummy.o \ + $(BASEDIR)/common/symbols-dummy.o $(note_file) -o $(@D)/.$(@F).$(base).0 &&) : + $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).0) >$(@D)/.$(@F).0r.S + $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).0 \ + | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).0s.S + $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o + $(foreach base, $(VIRT_BASE) $(ALT_BASE), \ +- $(guard) $(LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ ++ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(base)) -T efi.lds -N $< \ + $(@D)/.$(@F).0r.o $(@D)/.$(@F).0s.o $(note_file) -o $(@D)/.$(@F).$(base).1 &&) : + $(guard) efi/mkreloc $(foreach base,$(VIRT_BASE) $(ALT_BASE),$(@D)/.$(@F).$(base).1) >$(@D)/.$(@F).1r.S + $(guard) $(NM) -pa --format=sysv $(@D)/.$(@F).$(VIRT_BASE).1 \ + | $(guard) $(BASEDIR)/tools/symbols $(all_symbols) --sysv --sort >$(@D)/.$(@F).1s.S + $(guard) $(MAKE) -f $(BASEDIR)/Rules.mk $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o +- $(guard) $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ ++ $(guard) $(EFI_LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ + $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file) -o $@ + if $(guard) false; then rm -f $@; echo 'EFI support disabled'; \ + else $(NM) -pa --format=sysv $(@D)/$(@F) \ diff --git a/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch b/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch new file mode 100644 index 00000000000..11989e86c77 --- /dev/null +++ b/pkgs/applications/virtualization/xen/0005-makefile-fix-efi-mountdir-use.patch @@ -0,0 +1,35 @@ +EFI_MOUNTPOINT is conventionally /boot/efi or /boot/EFI or something +like that, and (on my machine) has directories within that called +{Boot, nixos, gummiboot}. + +This patch does two things: + +1) Xen apparently wants to put files in +$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR) - we remove the duplicate 'efi' name +because I can't see why we have it + +2) Ensures the said directory exists + + +--- a/xen/Makefile 2016-01-08 01:50:58.028045657 +0000 ++++ b/xen/Makefile 2016-01-08 01:51:33.560268718 +0000 +@@ -49,7 +49,9 @@ + ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi; \ + ln -sf $(T)-$(XEN_FULLVERSION).efi $(D)$(EFI_DIR)/$(T).efi; \ + if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \ +- $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ ++ [ -d $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ] || \ ++ $(INSTALL_DIR) $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR) ;\ ++ $(INSTALL_DATA) $(TARGET).efi $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \ + elif [ "$(D)" = "$(patsubst $(shell cd $(XEN_ROOT) && pwd)/%,%,$(D))" ]; then \ + echo 'EFI installation only partially done (EFI_VENDOR not set)' >&2; \ + fi; \ +@@ -69,7 +69,7 @@ + rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION).efi + rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi + rm -f $(D)$(EFI_DIR)/$(T).efi +- rm -f $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi ++ rm -f $(D)$(EFI_MOUNTPOINT)/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi + + .PHONY: _debug + _debug: diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 854debc458a..f19d25ac431 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -20,6 +20,8 @@ config: # python2Packages.markdown , transfig, ghostscript, texinfo, pandoc +, binutils-unwrapped + , ...} @ args: with stdenv.lib; @@ -42,6 +44,17 @@ let } ( __do ) ''); + + # We don't want to use the wrapped version, because this version of ld is + # only used for linking the Xen EFI binary, and the build process really + # needs control over the LDFLAGS used + efiBinutils = binutils-unwrapped.overrideAttrs (oldAttrs: { + name = "efi-binutils"; + configureFlags = oldAttrs.configureFlags ++ [ + "--enable-targets=x86_64-pep" + ]; + doInstallCheck = false; # We get a spurious failure otherwise, due to host/target mis-match + }); in stdenv.mkDerivation (rec { @@ -119,10 +132,12 @@ stdenv.mkDerivation (rec { '')} ''; - patches = [ ./0000-fix-ipxe-src.patch - ./0000-fix-install-python.patch - ] ++ optional (versionOlder version "4.8.5") ./acpica-utils-20180427.patch - ++ (config.patches or []); + patches = [ + ./0000-fix-ipxe-src.patch + ./0000-fix-install-python.patch + ./0004-makefile-use-efi-ld.patch + ./0005-makefile-fix-efi-mountdir-use.patch + ] ++ (config.patches or []); postPatch = '' ### Hacks @@ -186,6 +201,9 @@ stdenv.mkDerivation (rec { --replace /bin/ls ls ''; + EFI_LD = "${efiBinutils}/bin/ld"; + EFI_VENDOR = "nixos"; + # TODO: Flask needs more testing before enabling it by default. #makeFlags = [ "XSM_ENABLE=y" "FLASK_ENABLE=y" "PREFIX=$(out)" "CONFIG_DIR=/etc" "XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files" ]; makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ] From 0fca6ba580107406429821c0cd40c674025096aa Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Mon, 12 Oct 2020 14:48:07 -0700 Subject: [PATCH 033/268] fix compile error --- pkgs/build-support/rust/sysroot/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/sysroot/default.nix b/pkgs/build-support/rust/sysroot/default.nix index 3bb86e9ad9a..8cfe2d55152 100644 --- a/pkgs/build-support/rust/sysroot/default.nix +++ b/pkgs/build-support/rust/sysroot/default.nix @@ -29,7 +29,9 @@ in rustPlatform.buildRustPackage { RUSTC_BOOTSTRAP = 1; __internal_dontAddSysroot = true; - cargoSha256 = "1snkfsx3jb1p5izwlfwkgp8hxhgpa35nmx939sp5730vf9whqqwg"; + cargoSha256 = "1l5z44dw5h7lbwmpjqax2g40cf4h27yai3wlj0p5di5v1xf25rng"; + + doCheck = false; installPhase = '' export LIBS_DIR=$out/lib/rustlib/${shortTarget}/lib From 3f3491d64d24e87534a11d0f78e2ffea13150749 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Mon, 12 Oct 2020 18:41:13 -0700 Subject: [PATCH 034/268] fix some whitespace --- pkgs/build-support/rust/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 10488f4d372..0f3ff2b70e6 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -75,7 +75,7 @@ let else '' cargoDepsCopy="$sourceRoot/${cargoVendorDir}" ''; - + targetIsJSON = stdenv.lib.hasSuffix ".json" target; # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 From 8d8cd8908b58cb7018220d20dd33bea7404fe843 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Tue, 13 Oct 2020 14:19:38 +0100 Subject: [PATCH 035/268] pasystray: ayatana appindicators instead of libappindicator --- pkgs/tools/audio/pasystray/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 8b0580ba98c..d80f1af4182 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook -, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook +, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -17,12 +17,18 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701 ./fix-wayland.patch + + # https://github.com/christophgysin/pasystray/issues/98 + (fetchpatch { + url = "https://sources.debian.org/data/main/p/pasystray/0.7.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch"; + sha256 = "0hijphrf52n2zfwdnrmxlp3a7iwznnkb79awvpzplz0ia2lqywpw"; + }) ]; nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme - avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper + avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper gsettings-desktop-schemas ]; From 65c9bb252dcfab942fb52038dd0f514479177d4a Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Sun, 24 May 2020 16:30:25 +0100 Subject: [PATCH 036/268] clipit: enable appindicator support --- pkgs/applications/misc/clipit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 02207fb9580..cc6d7d29fcd 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, fetchpatch, stdenv , autoreconfHook, intltool, pkgconfig -, gtk3, xdotool, which, wrapGAppsHook }: +, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "clipit"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ]; - configureFlags = [ "--with-gtk3" ]; - buildInputs = [ gtk3 ]; + configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; + buildInputs = [ gtk3 libayatana-appindicator ]; gappsWrapperArgs = [ "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" From 9de5bf446a55936dfd8b2abbfd38eadff6aa0aed Mon Sep 17 00:00:00 2001 From: Marcos Benevides Date: Sun, 11 Oct 2020 21:48:39 -0300 Subject: [PATCH 037/268] ugtrain: init at v0.4.1 --- pkgs/tools/misc/ugtrain/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/ugtrain/default.nix diff --git a/pkgs/tools/misc/ugtrain/default.nix b/pkgs/tools/misc/ugtrain/default.nix new file mode 100644 index 00000000000..0645645ae2b --- /dev/null +++ b/pkgs/tools/misc/ugtrain/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, scanmem +}: + +stdenv.mkDerivation rec { + version = "0.4.1"; + pname = "ugtrain"; + + src = fetchFromGitHub { + owner = "ugtrain"; + repo = "ugtrain"; + rev = "v${version}"; + sha256 = "0pw9lm8y83mda7x39874ax2147818h1wcibi83pd2x4rp1hjbkkn"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config scanmem ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ugtrain/ugtrain"; + description = "The Universal Elite Game Trainer for CLI (Linux game trainer research project)"; + maintainers = with maintainers; [ mtrsk ]; + platforms = platforms.linux; + license = licenses.gpl3Only; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f636f0fd894..cd275c5baaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18640,6 +18640,8 @@ in udisks_glue = callPackage ../os-specific/linux/udisks-glue { }; + ugtrain = callPackage ../tools/misc/ugtrain { }; + untie = callPackage ../os-specific/linux/untie { }; upower = callPackage ../os-specific/linux/upower { }; From c0df12de5d938e1c263c992ebd648c4100e8c0a2 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 14 Oct 2020 03:37:29 +0000 Subject: [PATCH 038/268] rust: Add support for managing target JSON in Nix --- doc/languages-frameworks/rust.section.md | 53 ++++++++++++++++++- .../rust/build-rust-crate/build-crate.nix | 2 +- .../rust/build-rust-crate/configure-crate.nix | 4 +- pkgs/build-support/rust/default.nix | 2 +- pkgs/build-support/rust/sysroot/default.nix | 4 +- pkgs/development/compilers/rust/default.nix | 10 +++- pkgs/development/compilers/rust/rustc.nix | 6 +-- pkgs/development/libraries/relibc/default.nix | 3 +- 8 files changed, 71 insertions(+), 13 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 0e1d59e1a95..0f3cc5d8efb 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -63,9 +63,52 @@ The fetcher will verify that the `Cargo.lock` file is in sync with the `src` attribute, and fail the build if not. It will also will compress the vendor directory into a tar.gz archive. -### Building a crate for a different target +### Cross compilation -To build your crate with a different cargo `--target` simply specify the `target` attribute: +By default, Rust packages are compiled for the host platform, just like any +other package is. The `--target` passed to rust tools is computed from this. +By default, it takes the `stdenv.hostPlatform.config` and replaces components +where they are known to differ. But there are ways to customize the argument: + + - To choose a different target by name, define + `stdenv.hostPlatform.rustc.arch.config` as that name (a string), and that + name will be used instead. + + For example: + ```nix + import { + crossSystem = (import ).systems.examples.armhf-embedded // { + rustc.arch.config = "thumbv7em-none-eabi"; + }; + } + ``` + will result in: + ```shell + --target thumbv7em-none-eabi + ``` + + - To pass a completely custom target, define + `stdenv.hostPlatform.rustc.arch.config` with its name, and + `stdenv.hostPlatform.rustc.arch.custom` with the value. The value will be + serialized to JSON in a file called + `${stdenv.hostPlatform.rustc.arch.config}.json`, and the path of that file + will be used instead. + + For example: + ```nix + import { + crossSystem = (import ).systems.examples.armhf-embedded // { + rustc.arch.config = "thumb-crazy"; + rustc.arch.custom = { foo = ""; bar = ""; }; + }; + } + will result in: + ```shell + --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""} + ``` + +Finally, as an ad-hoc escape hatch, a computed target (string or JSON file +path) can be passed directly to `buildRustPackage`: ```nix pkgs.rustPlatform.buildRustPackage { @@ -74,6 +117,12 @@ pkgs.rustPlatform.buildRustPackage { } ``` +This is useful to avoid rebuilding Rust tools, since they are actually target +agnostic and don't need to be rebuilt. But in the future, we should always +build the Rust tools and standard library crates separately so there is no +reason not to take the `stdenv.hostPlatform.rustc`-modifying approach, and the +ad-hoc escape hatch to `buildRustPackage` can be removed. + ### Running package tests When using `buildRustPackage`, the `checkPhase` is enabled by default and runs diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 142109cef49..84d1b2300f1 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -15,7 +15,7 @@ ++ [(mkRustcDepArgs dependencies crateRenames)] ++ [(mkRustcFeatureArgs crateFeatures)] ++ extraRustcOpts - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTarget stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--target ${rust.toRustTargetSpec stdenv.hostPlatform} -C linker=${stdenv.hostPlatform.config}-gcc" # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 ++ lib.optional (lib.elem "proc-macro" crateType) "--extern proc_macro" diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 18587f7047c..5ada40b3b9b 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -135,8 +135,8 @@ in '' export CARGO_MANIFEST_DIR=$(pwd) export DEBUG="${toString (!release)}" export OPT_LEVEL="${toString optLevel}" - export TARGET="${rust.toRustTarget stdenv.hostPlatform}" - export HOST="${rust.toRustTarget stdenv.buildPlatform}" + export TARGET="${rust.toRustTargetSpec stdenv.hostPlatform}" + export HOST="${rust.toRustTargetSpec stdenv.buildPlatform}" export PROFILE=${if release then "release" else "debug"} export OUT_DIR=$(pwd)/target/build/${crateName}.out export CARGO_PKG_VERSION_MAJOR=${lib.elemAt version 0} diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 0f3ff2b70e6..3f6a84b8aed 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -30,7 +30,7 @@ , cargoBuildFlags ? [] , buildType ? "release" , meta ? {} -, target ? rust.toRustTarget stdenv.hostPlatform +, target ? rust.toRustTargetSpec stdenv.hostPlatform , cargoVendorDir ? null , checkType ? buildType , depsExtraArgs ? {} diff --git a/pkgs/build-support/rust/sysroot/default.nix b/pkgs/build-support/rust/sysroot/default.nix index 8cfe2d55152..2625306b246 100644 --- a/pkgs/build-support/rust/sysroot/default.nix +++ b/pkgs/build-support/rust/sysroot/default.nix @@ -41,7 +41,7 @@ in rustPlatform.buildRustPackage { done export RUST_SYSROOT=$(rustc --print=sysroot) - export HOST=${rust.toRustTarget stdenv.buildPlatform} - cp -r $RUST_SYSROOT/lib/rustlib/$HOST $out + host=${rust.toRustTarget stdenv.buildPlatform} + cp -r $RUST_SYSROOT/lib/rustlib/$host $out ''; } diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 0fbe5b8c0ed..fc1af5a3f94 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -24,7 +24,8 @@ if platform.isDarwin then "macos" else platform.parsed.kernel.name; - # Target triple. Rust has slightly different naming conventions than we use. + # Returns the name of the rust target, even if it is custom. Adjustments are + # because rust has slightly different naming conventions than we do. toRustTarget = platform: with platform.parsed; let cpu_ = platform.rustc.arch or { "armv7a" = "armv7"; @@ -34,6 +35,13 @@ in platform.rustc.config or "${cpu_}-${vendor.name}-${kernel.name}${lib.optionalString (abi.name != "unknown") "-${abi.name}"}"; + # Returns the name of the rust target if it is standard, or the json file + # containing the custom target spec. + toRustTargetSpec = platform: + if (platform.rustc.arch or {}) ? custom + then builtins.toFile (platform.rustc.config + ".json") (builtins.toJSON platform.rustc.arch.custom) + else toRustTarget platform; + # This just contains tools for now. But it would conceivably contain # libraries too, say if we picked some default/recommended versions from # `cratesIO` to build by Hydra and/or try to prefer/bias in Cargo.lock for diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 65d8920c4a4..a5a49f8c3c0 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -70,9 +70,9 @@ in stdenv.mkDerivation rec { "--set=build.cargo=${rustPlatform.rust.cargo}/bin/cargo" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTarget stdenv.buildPlatform}" - "--host=${rust.toRustTarget stdenv.hostPlatform}" - "--target=${rust.toRustTarget stdenv.targetPlatform}" + "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" + "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--target=${rust.toRustTargetSpec stdenv.targetPlatform}" "${setBuild}.cc=${ccForBuild}" "${setHost}.cc=${ccForHost}" diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 43e02fc8758..24d434bf715 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -63,7 +63,8 @@ redoxRustPlatform.buildRustPackage rec { DESTDIR=$out make install ''; - TARGET = buildPackages.rust.toRustTarget stdenvNoCC.targetPlatform; + # TODO: should be hostPlatform + TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; cargoSha256 = "1fzz7ba3ga57x1cbdrcfrdwwjr70nh4skrpxp4j2gak2c3scj6rz"; From 015d4e2e98368b44cdf3a6d424ef35f0fed5072e Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Wed, 14 Oct 2020 14:23:37 -0700 Subject: [PATCH 039/268] fix whitespace --- pkgs/development/libraries/relibc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 24d434bf715..808d9154711 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -7,7 +7,7 @@ let ]; bootstrapCrossRust = stdenvNoCC.mkDerivation { name = "binary-redox-rust"; - + src = fetchTarball { name = "redox-rust-toolchain-bin.tar.gz"; url = "https://www.dropbox.com/s/33r92en0t47l1ei/redox-rust-toolchain-bin.tar.gz?dl=1"; From ec34ce96d089badcb5113cd89d5b844e0704dfd3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Oct 2020 04:27:07 +0000 Subject: [PATCH 040/268] pyditz: 0.10.3 -> 0.11 --- pkgs/applications/misc/pyditz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 05338b38dfe..d8b2b2ec602 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -6,11 +6,11 @@ let cerberus_1_1 = callPackage ./cerberus.nix { }; in buildPythonApplication rec { pname = "pyditz"; - version = "0.10.3"; + version = "0.11"; src = fetchPypi { inherit pname version; - sha256 = "0hxxz7kxv9gsrr86ccsc31g7bc2agw1ihbxhd659c2m6nrqq5qaf"; + sha256 = "da0365ae9064e30c4a27526fb0d7a802fda5c8651cda6990d17be7ede89a2551"; }; nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; From a153be896f275e5f394c55bdbbd267356d49f7b2 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Wed, 14 Oct 2020 22:54:04 -0700 Subject: [PATCH 041/268] use rustcSrc --- pkgs/build-support/rust/sysroot/default.nix | 28 ++++++++------------ pkgs/development/compilers/rust/rust-src.nix | 2 +- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/rust/sysroot/default.nix b/pkgs/build-support/rust/sysroot/default.nix index 2625306b246..de82f2bf30a 100644 --- a/pkgs/build-support/rust/sysroot/default.nix +++ b/pkgs/build-support/rust/sysroot/default.nix @@ -2,24 +2,18 @@ { shortTarget, originalCargoToml, target, RUSTFLAGS }: -let rustSrc = stdenv.mkDerivation { - name = "rust-src"; - src = rustPlatform.rust.rustc.src; - preferLocalBuild = true; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = "cp -r src $out"; - }; +let cargoSrc = stdenv.mkDerivation { - name = "cargo-src"; - preferLocalBuild = true; - phases = [ "installPhase" ]; - installPhase = '' - RUSTC_SRC=${rustSrc} ORIG_CARGO=${originalCargoToml} \ - ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} - mkdir -p $out - cp Cargo.toml $out/Cargo.toml - cp ${./Cargo.lock} $out/Cargo.lock - ''; + name = "cargo-src"; + preferLocalBuild = true; + phases = [ "installPhase" ]; + installPhase = '' + RUSTC_SRC=${rustPlatform.rustcSrc} ORIG_CARGO=${originalCargoToml} \ + ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} + mkdir -p $out + cp Cargo.toml $out/Cargo.toml + cp ${./Cargo.lock} $out/Cargo.lock + ''; }; in rustPlatform.buildRustPackage { inherit target RUSTFLAGS; diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix index 8977fb84caf..db48d9a95df 100644 --- a/pkgs/development/compilers/rust/rust-src.nix +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -6,6 +6,6 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mv src $out - rm -rf $out/{ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch} + rm -rf $out/{ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor} ''; } From e14a3598962dbe5d7eac89d8f4759807f1847aa1 Mon Sep 17 00:00:00 2001 From: piegames Date: Thu, 15 Oct 2020 01:24:45 +0200 Subject: [PATCH 042/268] treewide: Fix broken desktop files and mark packages as broken This fixes all packages that are failed `nixpkgs-review` in #91790. Packages that were broken prior to that PR were marked as broken. Packages that failed because of #75729 were fixed. --- pkgs/applications/misc/toggldesktop/default.nix | 1 + pkgs/applications/networking/ostinato/default.nix | 1 + pkgs/applications/networking/termius/default.nix | 1 + pkgs/applications/science/math/sage/sage.nix | 1 + pkgs/games/frogatto/default.nix | 1 + pkgs/games/tdm/default.nix | 1 + pkgs/games/tome2/default.nix | 1 + 7 files changed, 7 insertions(+) diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index 410c17be803..eb49853885b 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -139,6 +139,7 @@ buildEnv { paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; meta = with lib; { + broken = true; # libtoggl is broken description = "Client for Toggl time tracking service"; homepage = "https://github.com/toggl/toggldesktop"; license = licenses.bsd3; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index aa9d94ad5b6..dd1a7481d46 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { GenericName[it]=Generatore ed Analizzatore di pacchetti di rete Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole ''; + fileValidation = false; }; postInstall = '' diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 09b9bfa571b..92f667a4362 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + broken = true; description = "A cross-platform SSH client with cloud data sync and more"; homepage = "https://termius.com/"; downloadPage = "https://termius.com/linux/"; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 4fa8ae6270b..e130d5f4cdc 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + broken = true; description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; license = licenses.gpl2; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index efcff024a54..f6d4789c30b 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -34,6 +34,7 @@ in buildEnv { ''; meta = with stdenv.lib; { + broken = true; homepage = "https://frogatto.com"; description = description; license = with licenses; [ cc-by-30 unfree ]; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index 055ab9d38e8..98b7ecdc477 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -16,6 +16,7 @@ let type = "Application"; categories = "Game;"; genericName = pname; + fileValidation = false; }; in stdenv.mkDerivation { name = "${pname}-${version}"; diff --git a/pkgs/games/tome2/default.nix b/pkgs/games/tome2/default.nix index fa73697ab42..1fc80b1764d 100644 --- a/pkgs/games/tome2/default.nix +++ b/pkgs/games/tome2/default.nix @@ -14,6 +14,7 @@ let type = "Application"; categories = "Game;RolePlaying;"; genericName = pname; + fileValidation = false; }; in stdenv.mkDerivation { From d906fda8d2b467e16d1b41842bf3b63aee3da449 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Thu, 15 Oct 2020 17:27:51 -0700 Subject: [PATCH 043/268] parameterize rustcSrc --- pkgs/build-support/rust/sysroot/default.nix | 2 +- pkgs/development/compilers/rust/rust-src.nix | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/rust/sysroot/default.nix b/pkgs/build-support/rust/sysroot/default.nix index de82f2bf30a..c32b6577e35 100644 --- a/pkgs/build-support/rust/sysroot/default.nix +++ b/pkgs/build-support/rust/sysroot/default.nix @@ -8,7 +8,7 @@ let preferLocalBuild = true; phases = [ "installPhase" ]; installPhase = '' - RUSTC_SRC=${rustPlatform.rustcSrc} ORIG_CARGO=${originalCargoToml} \ + RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} ORIG_CARGO=${originalCargoToml} \ ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} mkdir -p $out cp Cargo.toml $out/Cargo.toml diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix index db48d9a95df..54691f5fdf0 100644 --- a/pkgs/development/compilers/rust/rust-src.nix +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -1,4 +1,4 @@ -{ stdenv, rustc }: +{ lib, stdenv, rustc, minimalContent ? true }: stdenv.mkDerivation { name = "rust-src"; @@ -6,6 +6,9 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mv src $out - rm -rf $out/{ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor} + rm -rf $out/{${if minimalContent + then "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch" + else "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor" + }} ''; } From ccbc9988ce41334495f643fc65596a2ee4c09ecd Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Thu, 15 Oct 2020 17:31:32 -0700 Subject: [PATCH 044/268] remove unused import --- pkgs/development/compilers/rust/rust-src.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix index 54691f5fdf0..489795ecec4 100644 --- a/pkgs/development/compilers/rust/rust-src.nix +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustc, minimalContent ? true }: +{ stdenv, rustc, minimalContent ? true }: stdenv.mkDerivation { name = "rust-src"; From e745f9333e8ccd63db4dcb7701ea362b57e410aa Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Thu, 15 Oct 2020 19:03:10 -0700 Subject: [PATCH 045/268] fix whitespace --- pkgs/build-support/rust/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 3f6a84b8aed..2575c7f3107 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -202,7 +202,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ - ${stdenv.lib.optionalString + ${stdenv.lib.optionalString (targetIsJSON && !__internal_dontAddSysroot) "RUSTFLAGS=\"--sysroot ${sysroot} $RUSTFLAGS\" " }cargo build -j $NIX_BUILD_CORES \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ From 116ac11652659c0f896fda4a2477152b92e5326a Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:43:33 -0700 Subject: [PATCH 046/268] add test --- pkgs/test/default.nix | 2 ++ pkgs/test/rust-sysroot/default.nix | 41 ++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/test/rust-sysroot/default.nix diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 85142090dd4..c0a810fa01a 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -35,6 +35,8 @@ with pkgs; cross = callPackage ./cross {}; + rustCustomSysroot = callPackage ./rust-sysroot {}; + nixos-functions = callPackage ./nixos-functions {}; patch-shebangs = callPackage ./patch-shebangs {}; diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix new file mode 100644 index 00000000000..c6e9ecb89d9 --- /dev/null +++ b/pkgs/test/rust-sysroot/default.nix @@ -0,0 +1,41 @@ +{ rustPlatform, fetchFromGitHub, writeText }: + +rustPlatform.buildRustPackage rec { + name = "blog_os-sysroot-test"; + + src = fetchFromGitHub { + owner = "phil-opp"; + repo = "blog_os"; + rev = "4e38e7ddf8dd021c3cd7e4609dfa01afb827797b"; + sha256 = "0k9ipm9ddm1bad7bs7368wzzp6xwrhyfzfpckdax54l4ffqwljcg"; + }; + + cargoSha256 = "1cbcplgz28yxshyrp2krp1jphbrcqdw6wxx3rry91p7hiqyibd30"; + + # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. + # The justification in the book for using rust-lld suggests that gcc can still be used for testing: + # > Instead of using the platform's default linker (which might not support Linux targets), + # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. + # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 + target = writeText "x86_64-blog_os.json" '' + { + "llvm-target": "x86_64-unknown-none", + "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", + "arch": "x86_64", + "target-endian": "little", + "target-pointer-width": "64", + "target-c-int-width": "32", + "os": "none", + "executables": true, + "linker-flavor": "gcc", + "panic-strategy": "abort", + "disable-redzone": true, + "features": "-mmx,-sse,+soft-float" + } + ''; + + RUSTFLAGS = "-C link-arg=-nostartfiles"; + + # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ + doCheck = false; +} From dec97eb3e99be60cbf865d079e1d3215578bbf73 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:45:27 -0700 Subject: [PATCH 047/268] minor clean up --- pkgs/build-support/rust/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2575c7f3107..e027853255c 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -77,6 +77,7 @@ let ''; targetIsJSON = stdenv.lib.hasSuffix ".json" target; + useSysroot = targetIsJSON && !__internal_dontAddSysroot; # see https://github.com/rust-lang/cargo/blob/964a16a28e234a3d397b2a7031d4ab4a428b1391/src/cargo/core/compiler/compile_kind.rs#L151-L168 # the "${}" is needed to transform the path into a /nix/store path before baseNameOf @@ -202,8 +203,8 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ - ${stdenv.lib.optionalString - (targetIsJSON && !__internal_dontAddSysroot) "RUSTFLAGS=\"--sysroot ${sysroot} $RUSTFLAGS\" " + ${stdenv.lib.optionalString useSysroot + "RUSTFLAGS=\"--sysroot ${sysroot} $RUSTFLAGS\" " }cargo build -j $NIX_BUILD_CORES \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ --target ${target} \ From 7c92361028555ea0fcb0da0a8ce059e52ee4d1a8 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:47:14 -0700 Subject: [PATCH 048/268] enforce noCheck when useSysroot --- pkgs/build-support/rust/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index e027853255c..ae390816d0a 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -105,6 +105,10 @@ let in +# Tests don't currently work for `no_std`, and all custom sysroots are currently built without `std`. +# See https://os.phil-opp.com/testing/ for more information. +assert useSysroot -> !(args.doCheck or true); + stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { inherit cargoDeps; From 2bccf2e554d8fdb630f44181cf1ef787df6fb6b6 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:48:07 -0700 Subject: [PATCH 049/268] add documentation --- doc/languages-frameworks/rust.section.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 0f3cc5d8efb..784a4603098 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -123,6 +123,9 @@ build the Rust tools and standard library crates separately so there is no reason not to take the `stdenv.hostPlatform.rustc`-modifying approach, and the ad-hoc escape hatch to `buildRustPackage` can be removed. +Note that currently custom targets aren't compiled with `std`, so `cargo test` +will fail. This can be ignored by adding `doCheck = false;` to your derivation. + ### Running package tests When using `buildRustPackage`, the `checkPhase` is enabled by default and runs From d884b2d877cfda8247a6ee49f5c26ba3133c3889 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:48:38 -0700 Subject: [PATCH 050/268] NEEDS REVIEW: enable sysroot differently --- pkgs/build-support/rust/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index ae390816d0a..8e47a2b0bf2 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -109,7 +109,9 @@ in # See https://os.phil-opp.com/testing/ for more information. assert useSysroot -> !(args.doCheck or true); -stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { +stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // stdenv.lib.optionalAttrs useSysroot { + RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); +} // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; @@ -207,9 +209,7 @@ stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ - ${stdenv.lib.optionalString useSysroot - "RUSTFLAGS=\"--sysroot ${sysroot} $RUSTFLAGS\" " - }cargo build -j $NIX_BUILD_CORES \ + cargo build -j $NIX_BUILD_CORES \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ --target ${target} \ --frozen ${concatStringsSep " " cargoBuildFlags} From 0ac33bf3f89c843803bce45ebe5b5a8865b67948 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:58:09 -0700 Subject: [PATCH 051/268] add `meta` to rust-sysroot test --- pkgs/test/rust-sysroot/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index c6e9ecb89d9..10b37278af9 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, writeText }: +{ lib, rustPlatform, fetchFromGitHub, writeText }: rustPlatform.buildRustPackage rec { name = "blog_os-sysroot-test"; @@ -38,4 +38,9 @@ rustPlatform.buildRustPackage rec { # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ doCheck = false; + + meta = with lib; { + description = "Test for using custom sysroots with buildRustPackage."; + maintainers = with maintainers; [ aaronjanse ]; + }; } From 7ebcb6ee483cea2152622b980a0b20fe7a4568cb Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 00:58:27 -0700 Subject: [PATCH 052/268] remove trailing period --- pkgs/test/rust-sysroot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index 10b37278af9..dd10807e3aa 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - description = "Test for using custom sysroots with buildRustPackage."; + description = "Test for using custom sysroots with buildRustPackage"; maintainers = with maintainers; [ aaronjanse ]; }; } From 512458c68a18f3910fffb3578dbdf987d0740b64 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 01:34:51 -0700 Subject: [PATCH 053/268] add sysroot lockfile update script then run it --- pkgs/build-support/rust/sysroot/Cargo.lock | 19 ++++++++++++----- pkgs/build-support/rust/sysroot/cargo.py | 11 +++++----- pkgs/build-support/rust/sysroot/default.nix | 2 +- .../rust/sysroot/update-lockfile.sh | 21 +++++++++++++++++++ 4 files changed, 42 insertions(+), 11 deletions(-) create mode 100755 pkgs/build-support/rust/sysroot/update-lockfile.sh diff --git a/pkgs/build-support/rust/sysroot/Cargo.lock b/pkgs/build-support/rust/sysroot/Cargo.lock index 3b576f6657f..61fcef61744 100644 --- a/pkgs/build-support/rust/sysroot/Cargo.lock +++ b/pkgs/build-support/rust/sysroot/Cargo.lock @@ -1,14 +1,21 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. [[package]] name = "alloc" version = "0.0.0" -dependencies = ["compiler_builtins", "core"] +dependencies = [ + "compiler_builtins", + "core", +] [[package]] name = "compiler_builtins" -version = "0.1.32" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc4ac2c824d2bfc612cba57708198547e9a26943af0632aff033e0693074d5c" -dependencies = ["rustc-std-workspace-core"] +checksum = "7cd0782e0a7da7598164153173e5a5d4d9b1da094473c98dce0ff91406112369" +dependencies = [ + "rustc-std-workspace-core", +] [[package]] name = "core" @@ -17,4 +24,6 @@ version = "0.0.0" [[package]] name = "rustc-std-workspace-core" version = "1.99.0" -dependencies = ["core"] +dependencies = [ + "core", +] diff --git a/pkgs/build-support/rust/sysroot/cargo.py b/pkgs/build-support/rust/sysroot/cargo.py index 10ad94e4c54..09f6fba6d1c 100644 --- a/pkgs/build-support/rust/sysroot/cargo.py +++ b/pkgs/build-support/rust/sysroot/cargo.py @@ -2,7 +2,7 @@ import os import toml rust_src = os.environ['RUSTC_SRC'] -orig_cargo = os.environ['ORIG_CARGO'] +orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None base = { 'package': { @@ -33,10 +33,11 @@ base = { }, } -with open(orig_cargo, 'r') as f: - src = toml.loads(f.read()) - if 'profile' in src: - base['profile'] = src['profile'] +if orig_cargo is not None: + with open(orig_cargo, 'r') as f: + src = toml.loads(f.read()) + if 'profile' in src: + base['profile'] = src['profile'] out = toml.dumps(base) diff --git a/pkgs/build-support/rust/sysroot/default.nix b/pkgs/build-support/rust/sysroot/default.nix index c32b6577e35..4db7cf0dc39 100644 --- a/pkgs/build-support/rust/sysroot/default.nix +++ b/pkgs/build-support/rust/sysroot/default.nix @@ -23,7 +23,7 @@ in rustPlatform.buildRustPackage { RUSTC_BOOTSTRAP = 1; __internal_dontAddSysroot = true; - cargoSha256 = "1l5z44dw5h7lbwmpjqax2g40cf4h27yai3wlj0p5di5v1xf25rng"; + cargoSha256 = "0y6dqfhsgk00y3fv5bnjzk0s7i30nwqc1rp0xlrk83hkh80x81mw"; doCheck = false; diff --git a/pkgs/build-support/rust/sysroot/update-lockfile.sh b/pkgs/build-support/rust/sysroot/update-lockfile.sh new file mode 100755 index 00000000000..83d29832384 --- /dev/null +++ b/pkgs/build-support/rust/sysroot/update-lockfile.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p python3 python3.pkgs.toml cargo + +set -e + +HERE=$(dirname "${BASH_SOURCE[0]}") +NIXPKGS_ROOT="$HERE/../../../.." + +# https://unix.stackexchange.com/a/84980/390173 +tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile') + +cd "$tempdir" +nix-build -E "with import (/. + \"${NIXPKGS_ROOT}\") {}; pkgs.rustPlatform.rustcSrc.override { minimalContent = false; }" +RUSTC_SRC="$(pwd)/result" python3 "$HERE/cargo.py" +RUSTC_BOOTSTRAP=1 cargo build || echo "Build failure is expected. All that's needed is the lockfile." + +cp Cargo.lock "$HERE" + +rm -rf "$tempdir" + + From 29cdd8ae609d107889469610176aa53676382eb1 Mon Sep 17 00:00:00 2001 From: Aaron Janse Date: Sat, 17 Oct 2020 14:38:36 -0700 Subject: [PATCH 054/268] fix whitespace --- pkgs/test/rust-sysroot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index dd10807e3aa..cd07ef53c32 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-C link-arg=-nostartfiles"; # Tests don't work for `no_std`. See https://os.phil-opp.com/testing/ - doCheck = false; + doCheck = false; meta = with lib; { description = "Test for using custom sysroots with buildRustPackage"; From 48c7d89f74e200d848d7a944f9da3365b35b0d20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 00:44:26 +0000 Subject: [PATCH 055/268] cppzmq: 4.6.0 -> 4.7.1 --- pkgs/development/libraries/cppzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 240710b5a50..fdd98cb00bf 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cppzmq"; - version = "4.6.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; rev = "v${version}"; - sha256 = "19acx2bzi4n6fdnfgkja1nds7m1bwg8lw5vfcijrx9fv75pa7m8h"; + sha256 = "00lb3pv923nbpaf7ric2cv6lbpspknj0pxj6yj5jyah7r3zw692m"; }; nativeBuildInputs = [ cmake ]; From e6e8e7282f1a48aa49b4772bf4f582c5a5dbf9d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 09:51:08 +0000 Subject: [PATCH 056/268] go-migrate: 4.12.2 -> 4.13.0 --- pkgs/development/tools/go-migrate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-migrate/default.nix b/pkgs/development/tools/go-migrate/default.nix index ee942beb92c..e1e0d8c897c 100644 --- a/pkgs/development/tools/go-migrate/default.nix +++ b/pkgs/development/tools/go-migrate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.12.2"; + version = "4.13.0"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "0vrc9y90aamj618sfipq2sgzllhdr4hmicj4yvl147klwb1rxlz6"; + sha256 = "0rzx974cxsipbnggl3n4q6zsvm313svrg718gscydygk41m9nql9"; }; - vendorSha256 = "0jpz5xvwsw4l7nmi7s1grvbfy4xjp50hrjycwicgv2ll719gz5v0"; + vendorSha256 = "1107syipynlfibzljyfgz81v1avi8axvsjpmrpj990pm83r9svc6"; subPackages = [ "cmd/migrate" ]; From a54f2e42eac289374f9df1f76d1a46c96c7aa5e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 11:05:26 +0000 Subject: [PATCH 057/268] gtk-layer-shell: 0.2.0 -> 0.3.0 --- pkgs/development/libraries/gtk-layer-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 14f822432ee..086f6472ee0 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.2.0"; + version = "0.3.0"; outputs = [ "out" "dev" "devdoc" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg"; + sha256 = "1f7hfwik7a9kzw0q1k3xc1yisrgg8lbp5pjr337phc9hm38lhq3c"; }; nativeBuildInputs = [ From d22229eda33d8e55518fad2b31171d9aae4d9b1b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 13:23:55 +0000 Subject: [PATCH 058/268] ibus: 1.5.22 -> 1.5.23 --- pkgs/tools/inputmethods/ibus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 238e133495c..32db4850391 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -60,13 +60,13 @@ in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.22"; + version = "1.5.23"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "09ynn7gq84q18hhbg6wq2yrliwil42qbzxbwbpggry1s955jg5xb"; + sha256 = "0qnblqhz8wyhchnm36zrxhbvi9g4fcwcgmw7p60yjybdlhq4asc7"; }; patches = [ From 67f965d586621dd6db756b89cff94a0d6b24e064 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 31 Oct 2020 12:00:00 +0000 Subject: [PATCH 059/268] python3.pkgs.matrix-nio: 0.15.1 -> 0.15.2 https://github.com/poljar/matrix-nio/blob/0.15.2/CHANGELOG.md --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 59c3f47d2ca..69774b58eb6 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "127n4sqdcip1ld42w9wz49pxkpvi765qzvivvwl26720n11zq5cd"; + sha256 = "190xw3cvk4amr9pl8ip2i7k3xdjd0231kn2zl6chny5axx22p1dv"; }; nativeBuildInputs = [ From 7e698fb8fe47f205b12277015697a39def24c36e Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 31 Oct 2020 12:00:00 +0000 Subject: [PATCH 060/268] pantalaimon: 0.7.0 -> 0.8.0 https://github.com/matrix-org/pantalaimon/blob/0.8.0/CHANGELOG.md --- .../networking/instant-messengers/pantalaimon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 3b1fb255b6e..9c99741823a 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.7.0"; + version = "0.8.0"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2"; + sha256 = "0n86cdpw85qzlcr1ynvar0f0zbphmdz1jia9r75lmj07iw4r5hk9"; }; propagatedBuildInputs = [ From 9167c807fbc40ee37f65ddc6e63d0a8e30f296f8 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sun, 8 Nov 2020 22:16:10 +0100 Subject: [PATCH 061/268] pugixml: move check steps to preCheck hook --- pkgs/development/libraries/pugixml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index d9b04781ba1..8b070671fe4 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { # Hack to be able to run the test, broken because we use # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + preCheck = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" '' else '' - export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; preConfigure = '' From 2d9c6679d1f979d62379b6dc8662bd6cc29146c6 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 10 Nov 2020 18:35:45 +0900 Subject: [PATCH 062/268] postgresql: add debug versions --- pkgs/servers/sql/postgresql/default.nix | 57 ++++++++++++++++++++++++- pkgs/top-level/all-packages.nix | 6 +++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 31c60303c03..0ba98455fac 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -13,7 +13,7 @@ let , this, self, newScope, buildEnv # source specification - , version, sha256, psqlSchema + , version, sha256, psqlSchema, enableDebug ? false }: let atLeast = lib.versionAtLeast version; @@ -55,6 +55,7 @@ let "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" (lib.optionalString enableSystemd "--with-systemd") + (lib.optionalString enableDebug "--enable-debug") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals icuEnabled [ "--with-icu" ]; @@ -191,6 +192,15 @@ in self: { inherit self; }; + postgresql_9_5_debug = self.callPackage generic { + version = "9.5.23"; + psqlSchema = "9.5"; + sha256 = "0rl31jc3kg2wq6hazyd297gnmx3cibjvivllbsivii2m6dzgl573"; + this = self.postgresql_9_5; + enableDebug = true; + inherit self; + }; + postgresql_9_6 = self.callPackage generic { version = "9.6.19"; psqlSchema = "9.6"; @@ -199,6 +209,15 @@ in self: { inherit self; }; + postgresql_9_6_debug = self.callPackage generic { + version = "9.6.19"; + psqlSchema = "9.6"; + sha256 = "1c2wnl5bbpjs1s1rpzvlnzsqlpb0p823zw7s38nhpgnxrja3myb1"; + this = self.postgresql_9_6; + enableDebug = true; + inherit self; + }; + postgresql_10 = self.callPackage generic { version = "10.14"; psqlSchema = "10.0"; # should be 10, but changing it is invasive @@ -207,6 +226,15 @@ in self: { inherit self; }; + postgresql_10_debug = self.callPackage generic { + version = "10.14"; + psqlSchema = "10.0"; # should be 10, but changing it is invasive + sha256 = "0fxj30jvwq5pqpbj97vhlxgmn2ah59a78s9jyjr7vxyqj7sdh71q"; + this = self.postgresql_10; + enableDebug = true; + inherit self; + }; + postgresql_11 = self.callPackage generic { version = "11.9"; psqlSchema = "11.1"; # should be 11, but changing it is invasive @@ -215,6 +243,15 @@ in self: { inherit self; }; + postgresql_11_debug = self.callPackage generic { + version = "11.9"; + psqlSchema = "11.1"; # should be 11, but changing it is invasive + sha256 = "0db6pfphc5rp12abnkvv2l9pbl7bdyf3hhiwj8ghjwh35skqlq9m"; + this = self.postgresql_11; + enableDebug = true; + inherit self; + }; + postgresql_12 = self.callPackage generic { version = "12.4"; psqlSchema = "12"; @@ -223,6 +260,15 @@ in self: { inherit self; }; + postgresql_12_debug = self.callPackage generic { + version = "12.4"; + psqlSchema = "12"; + sha256 = "1k06wryy8p4s1fim9qafcjlak3f58l0wqaqnrccr9x9j5jz3zsdy"; + this = self.postgresql_12; + enableDebug = true; + inherit self; + }; + postgresql_13 = self.callPackage generic { version = "13.0"; psqlSchema = "13"; @@ -231,4 +277,13 @@ in self: { inherit self; }; + postgresql_13_debug = self.callPackage generic { + version = "13.0"; + psqlSchema = "13"; + sha256 = "15i2b7m9a9430idqdgvrcyx66cpxz0v2d81nfqcm8ss3inz51rw0"; + this = self.postgresql_13; + enableDebug = true; + inherit self; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9254fadb87..5cbc472a4ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17213,11 +17213,17 @@ in inherit (import ../servers/sql/postgresql pkgs) postgresql_9_5 + postgresql_9_5_debug postgresql_9_6 + postgresql_9_6_debug postgresql_10 + postgresql_10_debug postgresql_11 + postgresql_11_debug postgresql_12 + postgresql_12_debug postgresql_13 + postgresql_13_debug ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; From 4c5931efb8c63a575115b6a025b8acfa818ae95b Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 10 Nov 2020 20:43:09 +0900 Subject: [PATCH 063/268] postgresql: use separateDebugInfo --- pkgs/servers/sql/postgresql/default.nix | 61 ++----------------------- pkgs/top-level/all-packages.nix | 8 +--- 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 0ba98455fac..6108818de28 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -13,7 +13,7 @@ let , this, self, newScope, buildEnv # source specification - , version, sha256, psqlSchema, enableDebug ? false + , version, sha256, psqlSchema }: let atLeast = lib.versionAtLeast version; @@ -54,8 +54,8 @@ let "--sysconfdir=/etc" "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" + "--enable-debug" (lib.optionalString enableSystemd "--with-systemd") - (lib.optionalString enableDebug "--enable-debug") (if stdenv.isDarwin then "--with-uuid=e2fs" else "--with-ossp-uuid") ] ++ lib.optionals icuEnabled [ "--with-icu" ]; @@ -163,6 +163,8 @@ let ]; buildInputs = [ makeWrapper ]; + separateDebugInfo = true; + # We include /bin to ensure the $out/bin directory is created, which is # needed because we'll be removing the files from that directory in postBuild # below. See #22653 @@ -192,15 +194,6 @@ in self: { inherit self; }; - postgresql_9_5_debug = self.callPackage generic { - version = "9.5.23"; - psqlSchema = "9.5"; - sha256 = "0rl31jc3kg2wq6hazyd297gnmx3cibjvivllbsivii2m6dzgl573"; - this = self.postgresql_9_5; - enableDebug = true; - inherit self; - }; - postgresql_9_6 = self.callPackage generic { version = "9.6.19"; psqlSchema = "9.6"; @@ -209,15 +202,6 @@ in self: { inherit self; }; - postgresql_9_6_debug = self.callPackage generic { - version = "9.6.19"; - psqlSchema = "9.6"; - sha256 = "1c2wnl5bbpjs1s1rpzvlnzsqlpb0p823zw7s38nhpgnxrja3myb1"; - this = self.postgresql_9_6; - enableDebug = true; - inherit self; - }; - postgresql_10 = self.callPackage generic { version = "10.14"; psqlSchema = "10.0"; # should be 10, but changing it is invasive @@ -226,15 +210,6 @@ in self: { inherit self; }; - postgresql_10_debug = self.callPackage generic { - version = "10.14"; - psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0fxj30jvwq5pqpbj97vhlxgmn2ah59a78s9jyjr7vxyqj7sdh71q"; - this = self.postgresql_10; - enableDebug = true; - inherit self; - }; - postgresql_11 = self.callPackage generic { version = "11.9"; psqlSchema = "11.1"; # should be 11, but changing it is invasive @@ -243,15 +218,6 @@ in self: { inherit self; }; - postgresql_11_debug = self.callPackage generic { - version = "11.9"; - psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "0db6pfphc5rp12abnkvv2l9pbl7bdyf3hhiwj8ghjwh35skqlq9m"; - this = self.postgresql_11; - enableDebug = true; - inherit self; - }; - postgresql_12 = self.callPackage generic { version = "12.4"; psqlSchema = "12"; @@ -260,15 +226,6 @@ in self: { inherit self; }; - postgresql_12_debug = self.callPackage generic { - version = "12.4"; - psqlSchema = "12"; - sha256 = "1k06wryy8p4s1fim9qafcjlak3f58l0wqaqnrccr9x9j5jz3zsdy"; - this = self.postgresql_12; - enableDebug = true; - inherit self; - }; - postgresql_13 = self.callPackage generic { version = "13.0"; psqlSchema = "13"; @@ -276,14 +233,4 @@ in self: { this = self.postgresql_13; inherit self; }; - - postgresql_13_debug = self.callPackage generic { - version = "13.0"; - psqlSchema = "13"; - sha256 = "15i2b7m9a9430idqdgvrcyx66cpxz0v2d81nfqcm8ss3inz51rw0"; - this = self.postgresql_13; - enableDebug = true; - inherit self; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5cbc472a4ef..13d6f9dceb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17213,17 +17213,11 @@ in inherit (import ../servers/sql/postgresql pkgs) postgresql_9_5 - postgresql_9_5_debug postgresql_9_6 - postgresql_9_6_debug postgresql_10 - postgresql_10_debug - postgresql_11 - postgresql_11_debug + postgresql_11_local postgresql_12 - postgresql_12_debug postgresql_13 - postgresql_13_debug ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; From b433c7950584ebac09b28368d622c329abce6de8 Mon Sep 17 00:00:00 2001 From: Raphael Megzari Date: Tue, 10 Nov 2020 20:50:32 +0900 Subject: [PATCH 064/268] postgresql: remove local name change --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13d6f9dceb4..b9254fadb87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17215,7 +17215,7 @@ in postgresql_9_5 postgresql_9_6 postgresql_10 - postgresql_11_local + postgresql_11 postgresql_12 postgresql_13 ; From ef08d4cf0bf9770389d7d2431f8b8761ecdeef92 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 11 Nov 2020 09:11:01 +0900 Subject: [PATCH 065/268] postgresql: use separateDebugInfo correctly --- pkgs/servers/sql/postgresql/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 6108818de28..9bfc4e7dca5 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -41,6 +41,8 @@ let enableParallelBuilding = !stdenv.isDarwin; + separateDebugInfo = true; + buildFlags = [ "world" ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; @@ -163,7 +165,6 @@ let ]; buildInputs = [ makeWrapper ]; - separateDebugInfo = true; # We include /bin to ensure the $out/bin directory is created, which is # needed because we'll be removing the files from that directory in postBuild From f25912ac1e44382ad7301a31ae77071c2ff09fb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Nov 2020 19:46:13 +0000 Subject: [PATCH 066/268] toxic: 0.8.4 -> 0.9.0 --- .../networking/instant-messengers/toxic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 8560a8b9447..c9dd22f1831 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "0p1cmj1kyp506y5xm04mhlznhf5wcylvgsn6b307ms91vjqs3fg2"; + sha256 = "1y0k9vfb4818b3s313jlxbpjwdxd62cc4kc1vpxdjvs8mx543vrv"; }; makeFlags = [ "PREFIX=$(out)"]; From c132add6ce8c49a1450d86bea44dc8166af11f17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Nov 2020 09:57:19 +0000 Subject: [PATCH 067/268] highlight: 3.57 -> 3.59 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index a918770aa7b..e4e80e694fe 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "3.57"; + version = "3.59"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "1xrk7c7akjiwh3wh9bll0qh4g0kqvbzjz9ancpadnk0k7bqi0kxf"; + sha256 = "0sqdzivnak3gcinvkf6rkgp1p5gjx5my6cb2790nh0v53y67v2pb"; }; enableParallelBuilding = true; From 00b385c61226a3f3c396581fd7b4851d99e20910 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 18 Nov 2020 15:36:03 +0100 Subject: [PATCH 068/268] dsview: 0.99 -> 1.12 Adapted the patches and took a commit from upstream master branch to allow the migration to Qt5.15. Had to copy the patch because of the custom sourceRoot. --- .../science/electronics/dsview/default.nix | 32 +++++++++++-------- .../science/electronics/dsview/install.patch | 8 ++--- .../science/electronics/dsview/qt515.patch | 13 ++++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 pkgs/applications/science/electronics/dsview/qt515.patch diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 4d3acb331d5..e61017ea330 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,42 +1,46 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, -libzip, boost, fftw, qtbase, -libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl +{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake +, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl +, libsigrokdecode4dsl, python3, fetchpatch }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "dsview"; - version = "0.99"; + version = "1.12"; src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; - rev = version; - sha256 = "189i3baqgn8k3aypalayss0g489xi0an9hmvyggvxmgg1cvcwka2"; + rev = "v${version}"; + sha256 = "q7F4FuK/moKkouXTNPZDVon/W/ZmgtNHJka4MiTxA0U="; }; - postUnpack = '' - export sourceRoot=$sourceRoot/DSView - ''; + sourceRoot = "source/DSView"; patches = [ # Fix absolute install paths ./install.patch + + # Fix buld with Qt5.15 already merged upstream for future release + # Using local file instead of content of commit #33e3d896a47 because + # sourceRoot make it unappliable + ./qt515.patch ]; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl + python3 ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.bachp ]; + maintainers = with maintainers; [ bachp ]; }; } diff --git a/pkgs/applications/science/electronics/dsview/install.patch b/pkgs/applications/science/electronics/dsview/install.patch index e30a28d80fa..75c3e962865 100644 --- a/pkgs/applications/science/electronics/dsview/install.patch +++ b/pkgs/applications/science/electronics/dsview/install.patch @@ -2,10 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c1c33e1..208a184 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -403,8 +403,8 @@ install(DIRECTORY res DESTINATION share/${PROJECT_NAME}) - install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png) - install(FILES ../NEWS DESTINATION share/${PROJECT_NAME} RENAME NEWS) - install(FILES ../ug.pdf DESTINATION share/${PROJECT_NAME} RENAME ug.pdf) +@@ -427,8 +427,8 @@ + install(FILES ../NEWS31 DESTINATION share/${PROJECT_NAME} RENAME NEWS31) + install(FILES ../ug25.pdf DESTINATION share/${PROJECT_NAME} RENAME ug25.pdf) + install(FILES ../ug31.pdf DESTINATION share/${PROJECT_NAME} RENAME ug31.pdf) -install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/) -install(FILES DSView.desktop DESTINATION /usr/share/applications/) +install(FILES DreamSourceLab.rules DESTINATION etc/udev/rules.d/) diff --git a/pkgs/applications/science/electronics/dsview/qt515.patch b/pkgs/applications/science/electronics/dsview/qt515.patch new file mode 100644 index 00000000000..552f2062ec5 --- /dev/null +++ b/pkgs/applications/science/electronics/dsview/qt515.patch @@ -0,0 +1,13 @@ +diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp +index 921d3db..16cdce9 100755 +--- a/pv/view/viewport.cpp ++++ b/pv/view/viewport.cpp +@@ -37,7 +37,7 @@ + + #include + #include +- ++#include + + #include + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2efe9633b9..e97d83dcfd3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3414,7 +3414,7 @@ in dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; From bd6a7d4fa3d71a14bb26d605460d4f45e0a855ad Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 18 Nov 2020 16:11:55 +0100 Subject: [PATCH 069/268] akonadi: disable Qt5 <5.13 --- pkgs/applications/kde/akonadi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 7bb4e921794..6ffe1e2de8a 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared-mime-info, + extra-cmake-modules, shared-mime-info, qtbase, boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, }: @@ -10,6 +10,7 @@ mkDerivation { meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13"; }; patches = [ ./0001-akonadi-paths.patch From 6aec7072b70159cf88c3fd4e42c905642eea5f82 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 18 Nov 2020 16:46:47 +0100 Subject: [PATCH 070/268] kpkpass: remove before Qt5.13 --- pkgs/applications/kde/kpkpass.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index e9505a72e85..15dfe7f2e49 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -8,6 +8,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; + broken = lib.versionOlder qtbase.version "5.13"; }; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase karchive ]; From 6bc59577144521f43a9d4877662c3bd60713fa97 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 19 Nov 2020 00:12:02 +0100 Subject: [PATCH 071/268] python3Packages.youtube-dlc: init at 2020.11.11.post3 --- .../python-modules/youtube-dlc/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/youtube-dlc/default.nix diff --git a/pkgs/development/python-modules/youtube-dlc/default.nix b/pkgs/development/python-modules/youtube-dlc/default.nix new file mode 100644 index 00000000000..9599828e65e --- /dev/null +++ b/pkgs/development/python-modules/youtube-dlc/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "youtube_dlc"; + version = "2020.11.11.post3"; + + src = fetchPypi { + inherit pname version; + sha256 = "WqoKpfvVPZrN+pW6s8JoApJusn5CXyPcg9VcsY8R0FM="; + }; + + # They are broken + doCheck = false; + + pythonImportsCheck = [ "youtube_dlc" ]; + + meta = with lib; { + homepage = "Media downloader supporting various sites such as youtube"; + description = "https://github.com/blackjack4494/yt-dlc"; + platforms = platforms.linux; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4fef3c3946f..c7e5ea27974 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7839,6 +7839,8 @@ in { phantomjsSupport = false; }; + youtube-dlc = callPackage ../development/python-modules/youtube-dlc { }; + yowsup = callPackage ../development/python-modules/yowsup { }; yq = callPackage ../development/python-modules/yq { }; From 442bd5b4d18b0aba779e61acb6f01b141d3ab78c Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 19 Nov 2020 00:12:55 +0100 Subject: [PATCH 072/268] python3Packages.tubeup: unbreak wrong youtube dep There are two packages used to download from youtube: youtube-dl and youtube-dlc, this packaged was using the wrong one --- pkgs/development/python-modules/tubeup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 02269cdbfb2..29764259910 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , internetarchive , fetchPypi -, youtube-dl +, youtube-dlc , docopt , isPy27 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "docopt==0.6.2" "docopt" ''; - propagatedBuildInputs = [ internetarchive docopt youtube-dl ]; + propagatedBuildInputs = [ internetarchive docopt youtube-dlc ]; pythonImportsCheck = [ "tubeup" ]; From 746efadcce6ce729225c9a6e51f6721bc52ae340 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Thu, 19 Nov 2020 04:29:03 -0800 Subject: [PATCH 073/268] home-assistant: add allowlist_external_dirs to systemd unit ReadWritePaths --- nixos/modules/services/misc/home-assistant.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index 0477254e7c1..1f2e13f3732 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -245,7 +245,11 @@ in { Group = "hass"; Restart = "on-failure"; ProtectSystem = "strict"; - ReadWritePaths = "${cfg.configDir}"; + ReadWritePaths = let + cfgPath = [ "config" "homeassistant" "allowlist_external_dirs" ]; + value = attrByPath cfgPath [] cfg; + allowPaths = if isList value then value else singleton value; + in [ "${cfg.configDir}" ] ++ allowPaths; KillSignal = "SIGINT"; PrivateTmp = true; RemoveIPC = true; From d78ef1f3b5ce66cc6667b87ce376a607882f4a14 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 20 Nov 2020 10:33:42 +0300 Subject: [PATCH 074/268] unit: 1.20.0 -> 1.21.0 --- pkgs/servers/http/unit/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 318fcd498ab..f4379aa6fa2 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, nixosTests, which +, pcre2 , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses , withPHP73 ? false, php73 @@ -30,19 +31,19 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.20.0"; + version = "1.21.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; - repo = "unit"; + repo = pname; rev = version; - sha256 = "1qmcz01ifmd80qgpvf1y8nhad6yk56772xdhqvwfxn3mdjfqvcs8"; + sha256 = "1jczdxixxyj16w10pkcplchbqvx3m32nkmcl0hqap5ffqj08mmf7"; }; nativeBuildInputs = [ which ]; - buildInputs = [ ] + buildInputs = [ pcre2.dev ] ++ optional withPython2 python2 ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP73 php73-unit From ca959b6a2dab1173c053f2589ad0f50609e8c382 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 21 Nov 2020 00:23:38 +0100 Subject: [PATCH 075/268] partition-manager: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2b3d51431f..b104a960ed7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5020,7 +5020,7 @@ in krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; From 3189230412469d089757933e2b3d8ca0986123e2 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 21 Nov 2020 02:34:40 +0100 Subject: [PATCH 076/268] heaptrack: migrate to Qt5.15 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2b3d51431f..fe117c7a468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4585,7 +4585,7 @@ in hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; From 62910c587383293ef53482ec35b673962aaa8201 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 07:05:23 +0000 Subject: [PATCH 077/268] python37Packages.sphinxcontrib-spelling: 5.2.2 -> 7.1.0 --- .../python-modules/sphinxcontrib-spelling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 6b366ee517c..44e19997569 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "5.2.2"; + version = "7.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c"; + sha256 = "5b4240808a6d21eab9c49e69ad5ac0cb3efb03fe2e94763d23c860f85ec6a799"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ] From d4663ee0d3e7d502fc520c32e879db6a6bdae202 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 07:21:24 +0000 Subject: [PATCH 078/268] python37Packages.inflect: 4.1.0 -> 5.0.2 --- pkgs/development/python-modules/inflect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inflect/default.nix b/pkgs/development/python-modules/inflect/default.nix index b7fbe41f691..c0f6fe92050 100644 --- a/pkgs/development/python-modules/inflect/default.nix +++ b/pkgs/development/python-modules/inflect/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "inflect"; - version = "4.1.0"; + version = "5.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "def6f3791be9181f0c01e0bf5949304007ec6e04c6674fbef7cc49c657b8a9a5"; + sha256 = "d284c905414fe37c050734c8600fe170adfb98ba40f72fc66fed393f5b8d5ea0"; }; nativeBuildInputs = [ setuptools_scm toml ]; From a829cdd3140533b6856b8b9f9ed618206d1b84a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 08:18:59 +0000 Subject: [PATCH 079/268] python37Packages.pytest-html: 2.1.1 -> 3.0.0 --- pkgs/development/python-modules/pytest-html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 2c0c23ebdca..3ad238f553d 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "2.1.1"; + version = "3.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1iap9rzxx9pkvz6im3px8xj37pb098lvvf9yiqh93qq5w68w6jka"; + sha256 = "407adfe8c748a6bb7e68a430ebe3766ffe51e43fc5442f78b261229c03078be4"; }; nativeBuildInputs = [ setuptools_scm ]; From 3e3306f6d9977c1d740d7d508dace1a0793c1271 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 23:15:07 +0000 Subject: [PATCH 080/268] gqrx: 2.13.5 -> 2.14 --- pkgs/applications/radio/gqrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 106d2103ec4..7aab2b8fd64 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -9,13 +9,13 @@ assert pulseaudioSupport -> libpulseaudio != null; mkDerivation rec { pname = "gqrx"; - version = "2.13.5"; + version = "2.14"; src = fetchFromGitHub { owner = "csete"; repo = "gqrx"; rev = "v${version}"; - sha256 = "168wjad5g0ka555hwsciwbj7fqx1c89q59hq1yxj8aiyp5kfcahx"; + sha256 = "1iz4lgk99v5bwzk35wi4jg8nn3gbp0vm1p6svs42mxxxf9f99j7i"; }; nativeBuildInputs = [ cmake ]; From 3b608f6ebb7afeb14c4c32cf49b7edfba1e922d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 03:43:16 +0000 Subject: [PATCH 081/268] minio-client: 2020-10-03T02-54-56Z -> 2020-11-17T00-39-14Z --- 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 ba715571000..2c626e81cd2 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-10-03T02-54-56Z"; + version = "2020-11-17T00-39-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "0pc08w0xdkk9w8xya0q7d1601wprshq852419pwpi8hd7y3q381h"; + sha256 = "122fb9ghxwjifhvwiw07pm3szqfj3pc55m4bhq3v8nshzwrbcjf4"; }; - vendorSha256 = "0bkidqcdfjyqjlzxy9w564c6s3vw850wgq6ksx5y1p8f5r4plzxs"; + vendorSha256 = "148fb86v059skcf8dgcrqibwkl1h4lbwi60qnwmdi03q6rvaw33m"; doCheck = false; From 04830655d7b72f40fdab3fb1ec29b40598b7508c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 05:10:07 +0000 Subject: [PATCH 082/268] nudoku: 2.0.0 -> 2.1.0 --- pkgs/games/nudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix index b9e521bce36..06a858a42d1 100644 --- a/pkgs/games/nudoku/default.nix +++ b/pkgs/games/nudoku/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nudoku"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jubalh"; repo = pname; rev = version; - sha256 = "0rj8ajni7gssj0qbf1jn51699sadxwsr6ca2718w74psv7acda8h"; + sha256 = "12v00z3p0ymi8f3w4b4bgl4c76irawn3kmd147r0ap6s9ssx2q6m"; }; # Allow gettext 0.20 From cfe1f2d9ac767fe623287177fc47bbe3ac353a84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 20:51:51 +0000 Subject: [PATCH 083/268] blis: 0.7.0 -> 0.8.0 --- pkgs/development/libraries/science/math/blis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 42ba4f25204..3943c4dbbca 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -17,13 +17,13 @@ let blasIntSize = if blas64 then "64" else "32"; in stdenv.mkDerivation rec { pname = "blis"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; rev = version; - sha256 = "13g9kg7x8j9icg4frdq3wpl2cmp0jnh93mw48daa7ym399w17423"; + sha256 = "0fp0nskydan3i7sj7qkabwc9sjh7mw73pjpgzh50qchkkcv0s3n1"; }; inherit blas64; From 1cd7039e15ebef76addeb5bbb5f85ed66756bb3d Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Sun, 22 Nov 2020 20:42:20 -0500 Subject: [PATCH 084/268] brave: 1.16.76 -> 1.17.73 --- pkgs/applications/networking/browsers/brave/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ac924730989..613943cf15f 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -26,6 +26,7 @@ , libXext , libXfixes , libXi +, libxkbcommon , libXrandr , libXrender , libXScrnSaver @@ -68,6 +69,7 @@ rpath = lib.makeLibraryPath [ libXext libXfixes libXi + libxkbcommon libXrandr libXrender libXtst @@ -86,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.16.76"; + version = "1.17.73"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1nbgiwflmr3ik428yarmnpx10dmqai2m4k910miqd92mwmfb0pib"; + sha256 = "18bd6kgzfza5r0y2ggfy82pdpnfr2hzgjcfy9vxqq658z7q3jpqy"; }; dontConfigure = true; From ca03063a0b01694d6f783d6bc2408163f6b924bb Mon Sep 17 00:00:00 2001 From: Poscat Date: Mon, 23 Nov 2020 15:21:34 +0800 Subject: [PATCH 085/268] maintainers: add poscat --- maintainers/maintainer-list.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f2e33938e05..0684b8d596d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6953,6 +6953,18 @@ githubId = 138074; name = "Pedro Pombeiro"; }; + poscat = { + email = "poscat@mail.poscat.moe"; + github = "poscat0x04"; + githubId = 53291983; + name = "Poscat Tarski"; + keys = [ + { + longkeyid = "rsa4096/2D2595A00D08ACE0"; + fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; + } + ]; + }; pradeepchhetri = { email = "pradeep.chhetri89@gmail.com"; github = "pradeepchhetri"; From 7489594a0707e3048d2c3df076beb35532208b52 Mon Sep 17 00:00:00 2001 From: Poscat Date: Mon, 23 Nov 2020 17:50:03 +0800 Subject: [PATCH 086/268] qv2ray: Init at 2.6.3 --- .../networking/qv2ray/default.nix | 66 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/networking/qv2ray/default.nix diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix new file mode 100644 index 00000000000..f4d41ee79e6 --- /dev/null +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, qttools +, cmake +, clang +, grpc +, protobuf +, openssl +, pkgconfig +, c-ares +, abseil-cpp +, libGL +, zlib +}: + +mkDerivation rec { + pname = "qv2ray"; + version = "2.6.3"; + + src = fetchFromGitHub { + owner = "Qv2ray"; + repo = "Qv2ray"; + rev = "v${version}"; + sha256 = "sha256-zf3IlpRbZGDZMEny0jp7S+kWtcE1Z10U9GzKC0W0mZI="; + fetchSubmodules = true; + }; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DQV2RAY_DISABLE_AUTO_UPDATE=on" + "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" + ]; + + preConfigure = '' + export _QV2RAY_BUILD_INFO_="Qv2ray Nixpkgs" + export _QV2RAY_BUILD_EXTRA_INFO_="(Nixpkgs build) nixpkgs" + ''; + + buildInputs = [ + libGL + zlib + grpc + protobuf + openssl + abseil-cpp + c-ares + ]; + + nativeBuildInputs = [ + cmake + clang + pkgconfig + qmake + qttools + ]; + + meta = with stdenv.lib; { + description = "An GUI frontend to v2ray"; + homepage = "https://qv2ray.github.io/en/"; + license = licenses.gpl3; + maintainers = with maintainers; [ poscat ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a4e623d213..c0c78e6370e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15536,6 +15536,8 @@ in quicksynergy = callPackage ../applications/misc/quicksynergy { }; + qv2ray = libsForQt5.callPackage ../applications/networking/qv2ray {}; + qwt = callPackage ../development/libraries/qwt {}; qwt6_qt4 = callPackage ../development/libraries/qwt/6_qt4.nix { From c4ab2f4f7de305cf2cc4d271b4a3a39f2d774c69 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 21 Nov 2020 03:11:41 +0100 Subject: [PATCH 087/268] iannix: 2016-01-31 -> 0.9.20-b --- pkgs/applications/audio/iannix/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index fa779a7f0f4..b0c7040ddcb 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,14 +1,15 @@ -{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake +{ mkDerivation, lib, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: -mkDerivation { +mkDerivation rec { pname = "iannix"; - version = "2016-01-31"; + version = "0.9.20-b"; + src = fetchFromGitHub { owner = "iannix"; repo = "IanniX"; - rev = "f84becdcbe154b20a53aa2622068cb8f6fda0755"; - sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj"; + rev = "v${version}"; + sha256 = "6jjgMvD2VkR3ztU5LguqhtNd+4/ZqRy5pVW5xQ6K20Q="; }; nativeBuildInputs = [ pkgconfig qmake ]; @@ -20,11 +21,11 @@ mkDerivation { enableParallelBuilding = true; - meta = { - description = "Graphical open-source sequencer,"; + meta = with lib; { + description = "Graphical open-source sequencer"; homepage = "https://www.iannix.org/"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nico202 ]; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ nico202 ]; }; } From bfaf30c5e7d0120f740329090ee8e636c26b8859 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Mon, 23 Nov 2020 14:04:26 +0100 Subject: [PATCH 088/268] iannix: set myself as maintainer --- pkgs/applications/audio/iannix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index b0c7040ddcb..3765d2ca678 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -26,6 +26,6 @@ mkDerivation rec { homepage = "https://www.iannix.org/"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nico202 ]; + maintainers = with maintainers; [ freezeboy ]; }; } From 3ebd278b2eb63c916d8569df0cd604faa34a0ee3 Mon Sep 17 00:00:00 2001 From: Merkhad Luigton Date: Mon, 23 Nov 2020 13:36:22 -0300 Subject: [PATCH 089/268] ghc8102: bootstrap with ghc8102BinaryMinimal on aarch32 ghc refuses to evaluate on armhf even tho ghc does provide binaries for the arch --- pkgs/top-level/haskell-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e613b931d63..2d25ea149a9 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -96,7 +96,7 @@ in { }; ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar - bootPkgs = if stdenv.isAarch64 then + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then packages.ghc8102BinaryMinimal else packages.ghc865Binary; From 4d5ab8d9f72140348859a3180d98d1983927c070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 24 Nov 2020 19:49:42 +0100 Subject: [PATCH 090/268] autofs: fix compilation fail due to libtirpc changes --- pkgs/os-specific/linux/autofs/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index baf3cc6ad55..ab78c590017 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs -, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }: +, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto }: let version = "5.1.6"; @@ -28,13 +28,16 @@ in stdenv.mkDerivation { unset STRIP # Makefile.rules defines a usable STRIP only without the env var. ''; + # configure script is not finding the right path + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + installPhase = '' make install SUBDIRS="lib daemon modules man" # all but samples #make install SUBDIRS="samples" # impure! ''; buildInputs = [ linuxHeaders libtirpc libxml2 kerberos kmod openldap sssd - openssl cyrus_sasl ]; + openssl cyrus_sasl rpcsvc-proto ]; nativeBuildInputs = [ flex bison ]; From db17db5318fbb2520f55df888c7c34f570364ecb Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 25 Nov 2020 00:21:44 +0100 Subject: [PATCH 091/268] nginx: 1.19.4 -> 1.19.5 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 7b7de1a00f4..edb87258d6b 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.4"; - sha256 = "03h0hhrbfy3asla9gki2cp97zjn7idxbp5lk9xi0snlh4xlm9pv1"; + version = "1.19.5"; + sha256 = "173rv8gacd9bakb0r9jmkr4pqgjw9mzpdh3f7x2d8ln4ssplc2jw"; } From 1431c3cc601df3f2f10389e2a8fc4869ebb3bdd5 Mon Sep 17 00:00:00 2001 From: Red Davies Date: Tue, 24 Nov 2020 21:21:56 -0500 Subject: [PATCH 092/268] cassandra_3_0: 3.0.17 -> 3.0.23 Reason: Fixes CVE-2020-13946 Apache Cassandra RMI Rebind Vulnerability Description: It is possible for a local attacker without access to the Apache Cassandra process or configuration files to manipulate the RMI registry to perform a man-in-the-middle attack and capture user names and passwords used to access the JMX interface. The attacker can then use these credentials to access the JMX interface and perform unauthorised operations. Users should also be aware of CVE-2019-2684, a JRE vulnerability that enables this issue to be exploited remotely. 3.0.x users should upgrade to 3.0.22 --- pkgs/servers/nosql/cassandra/3.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/cassandra/3.0.nix b/pkgs/servers/nosql/cassandra/3.0.nix index a1aad75ce3f..bb81d0ca791 100644 --- a/pkgs/servers/nosql/cassandra/3.0.nix +++ b/pkgs/servers/nosql/cassandra/3.0.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "3.0.17"; - sha256 = "0568r5xdy78pl29zby5g4m9qngf29cb9222sc1q1wisapb7zkl2p"; + version = "3.0.23"; + sha256 = "0cbia20bggq85q2p6gsybw045qdfqxd5xv8ihppq1hwl21sb2klz"; }) From 252fdbe2e0e91031664ae723df845b5a3f30e3ab Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 Nov 2020 04:20:00 +0000 Subject: [PATCH 093/268] nudoku: add platforms --- pkgs/games/nudoku/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix index 06a858a42d1..0e1bd9eb4a9 100644 --- a/pkgs/games/nudoku/default.nix +++ b/pkgs/games/nudoku/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { description = "An ncurses based sudoku game"; homepage = "http://jubalh.github.io/nudoku/"; license = licenses.gpl3; + platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; } From d28f3cacde2ff8e9cd31f3f44f0550d628c93cc7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 Nov 2020 04:20:00 +0000 Subject: [PATCH 094/268] postgresqlPackages.plpgsql_check: 1.13.1 -> 1.15.1 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index b95ef73308d..665cb1dc069 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "1.13.1"; + version = "1.15.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "19vcvfhxh0922qgibahmkyf7czniycqbzccxdw65j1ia7fd8yyc3"; + sha256 = "0rjbzcdvwx19ql0ilccr47inilf7kh5hn7aacjqs1nxk91g3x7yf"; }; buildInputs = [ postgresql ]; From 3533c4f5176d70346a20ea1fe8a523cb063d2b43 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 21 Nov 2020 15:10:50 +0100 Subject: [PATCH 095/268] droopy: remove macpath to migrate to py3.8 --- pkgs/applications/networking/droopy/default.nix | 9 ++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index f3f5f54f409..63afa5ce76f 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, wrapPython }: +{ stdenv, lib, fetchFromGitHub, wrapPython, fetchpatch }: with lib; @@ -13,6 +13,13 @@ stdenv.mkDerivation { sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff"; }; + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stackp/Droopy/pull/30.patch"; + sha256 = "Y6jBraKvVQAiScbvLwezSKeWY3vaAbhaNXEGNaItigQ="; + }) + ]; + nativeBuildInputs = [ wrapPython ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d97b6d88007..a2396976d05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20714,7 +20714,7 @@ in buildServerGui = false; }; - droopy = python37Packages.callPackage ../applications/networking/droopy { }; + droopy = python3Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; From 79698482665dbc0baffab28aa0b7604ea920f92d Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 25 Nov 2020 20:15:00 +0100 Subject: [PATCH 096/268] libfaketime: fix build with clang The options -Wno-nonnull-compare, -Wno-error=cast-function-type and -Wno-error=format-truncation are unsupported by clang, letting the build fail. --- .../0001-Remove-unsupported-clang-flags.patch | 25 +++++++++++++++++++ .../libraries/libfaketime/default.nix | 7 ++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch diff --git a/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch b/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch new file mode 100644 index 00000000000..84ee18084c2 --- /dev/null +++ b/pkgs/development/libraries/libfaketime/0001-Remove-unsupported-clang-flags.patch @@ -0,0 +1,25 @@ +From f974fe07de9e6820bb1de50b31e480296d1d97b7 Mon Sep 17 00:00:00 2001 +From: Christian Kampka +Date: Wed, 25 Nov 2020 20:09:50 +0100 +Subject: [PATCH] Remove unsupported clang flags + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index f13a6bb..b305150 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -69,7 +69,7 @@ PREFIX ?= /usr/local + LIBDIRNAME ?= /lib/faketime + PLATFORM ?=$(shell uname) + +-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) ++CFLAGS += -std=gnu99 -Wall -Wextra -DFAKE_PTHREAD -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"' $(FAKETIME_COMPILE_CFLAGS) + ifeq ($(PLATFORM),SunOS) + CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 + endif +-- +2.28.0 + diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index 10cc5cace7b..6c751e07b83 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./no-date-in-gzip-man-page.patch - ]; + ] ++ (stdenv.lib.optionals stdenv.cc.isClang [ + # https://github.com/wolfcw/libfaketime/issues/277 + ./0001-Remove-unsupported-clang-flags.patch + ]); postPatch = '' patchShebangs test src @@ -24,7 +27,7 @@ stdenv.mkDerivation rec { PREFIX = placeholder "out"; LIBDIRNAME = "/lib"; - NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type -Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; checkInputs = [ perl ]; From 42e09c2134add3ae66c6579478c474aeffd8443d Mon Sep 17 00:00:00 2001 From: Joshua Tacoma Date: Thu, 26 Nov 2020 02:49:08 -0500 Subject: [PATCH 097/268] dart: support x86_64-darwin platform --- .../development/interpreters/dart/default.nix | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index b9485fdcab1..99e6d966283 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -12,6 +12,10 @@ let aarch64 = "arm64"; in { + "1.24.3-x86_64-darwin" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "1n4cq4jrms4j0yl54b3w14agcgy8dbipv5788jziwk8q06a8c69l"; + }; "1.24.3-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "16sm02wbkj328ni0z1z4n4msi12lb8ijxzmbbfamvg766mycj8z3"; @@ -24,6 +28,10 @@ let url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh"; }; + "2.7.2-x86_64-darwin" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "111zl075qdk2zd4d4mmfkn30jmzsri9nq3nspnmc2l245gdq34jj"; + }; "2.7.2-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v"; @@ -36,10 +44,18 @@ let url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p"; }; + "2.10.0-x86_64-darwin" = fetchurl { + url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "1n4qgsax5wi7krgvvs0dy7fz39nlykiw8gr0gdacc85hgyhqg09j"; + }; "2.10.0-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "0dncmsfbwcn3ygflhp83i6z4bvc02fbpaq1vzdzw8xdk3sbynchb"; }; + "2.9.0-4.0.dev-x86_64-darwin" = fetchurl { + url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "0gj91pbvqrxsvxaj742cllqha2z65867gggzq9hq5139vkkpfj9s"; + }; "2.9.0-4.0.dev-x86_64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r"; @@ -52,6 +68,10 @@ let url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc"; }; + "2.11.0-161.0.dev-x86_64-darwin" = fetchurl { + url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip"; + sha256 = "0mlwxp7jkkjafxkc4vqlgwl62y0hk1arhfrvc9hpm9dv98g3bdjj"; + }; "2.11.0-161.0.dev-x86_64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; sha256 = "05difz4w2fyh2yq5p5pkrqk59jqljlxhc1i6lmy5kihh6z69r12i"; @@ -93,7 +113,7 @@ stdenv.mkDerivation { with C-style syntax. It offers compilation to JavaScript, interfaces, mixins, abstract classes, reified generics, and optional typing. ''; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; license = licenses.bsd3; }; } From 5183864d1863332188e0c1f8fb080beda886c2c3 Mon Sep 17 00:00:00 2001 From: Gaute Ravndal Date: Tue, 24 Nov 2020 11:44:22 +0100 Subject: [PATCH 098/268] linux: explicitly enable RAS This is needed for EDAC support. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 94558b890de..47e49dbe01d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -775,6 +775,8 @@ let X86_CHECK_BIOS_CORRUPTION = yes; X86_MCE = yes; + RAS = yes; # Needed for EDAC support + # Our initrd init uses shebang scripts, so can't be modular. BINFMT_SCRIPT = yes; # For systemd-binfmt From fb1f518c01d0d717af53ed179eb33ca07a591c55 Mon Sep 17 00:00:00 2001 From: tbenst Date: Thu, 26 Nov 2020 02:32:16 -0800 Subject: [PATCH 099/268] virtualgl: 2.6.2 -> 2.6.5 --- pkgs/tools/X11/virtualgl/lib.nix | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index a2a7e5e6922..054e061c4ac 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,12 +1,16 @@ -{ stdenv, fetchurl, cmake, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk }: +{ stdenv, fetchurl, cmake +, libGL, libGLU, libX11, libXv, libXtst, libjpeg_turbo, fltk +, xorg +, opencl-headers, opencl-clhpp, ocl-icd +}: stdenv.mkDerivation rec { pname = "virtualgl-lib"; - version = "2.6.2"; + version = "2.6.5"; src = fetchurl { url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz"; - sha256 = "0ngqwsm9bml6lis0igq3bn92amh04rccd6jhjibj3418hrbzipvr"; + sha256 = "1giin3jmcs6y616bb44bpz30frsmj9f8pz2vg7jvb9vcfc9456rr"; }; cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ]; @@ -15,7 +19,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg_turbo libGL libGLU fltk libX11 libXv libXtst ]; + buildInputs = [ libjpeg_turbo libGL libGLU fltk + libX11 libXv libXtst xorg.xcbutilkeysyms + opencl-headers opencl-clhpp ocl-icd + ]; + + fixupPhase = '' + substituteInPlace $out/bin/vglrun \ + --replace "LD_PRELOAD=libvglfaker" "LD_PRELOAD=$out/lib/libvglfaker" \ + --replace "LD_PRELOAD=libdlfaker" "LD_PRELOAD=$out/lib/libdlfaker" \ + --replace "LD_PRELOAD=libgefaker" "LD_PRELOAD=$out/lib/libgefaker" + ''; enableParallelBuilding = true; From 63a60bf31a88ea3ecd51a88b19fd41d337e2d36a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Nov 2020 11:52:20 +0100 Subject: [PATCH 100/268] zsh-powerlevel10k: 1.13.0 -> 1.14.3 Update gitstatus pin 1.2.0 -> 1.3.1. https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.0 https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.1 https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.2 https://github.com/romkatv/powerlevel10k/releases/tag/v1.14.3 --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index a978ac93a9b..c8e845eec99 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -7,25 +7,25 @@ let # match gitstatus version with given `gitstatus_version`: # https://github.com/romkatv/powerlevel10k/blob/master/gitstatus/build.info gitstatus = pkgs.gitAndTools.gitstatus.overrideAttrs (oldAtttrs: rec { - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0xi5ab0rsj6xs4vqgn2j5rih1nncghr83yn395mk1is1f4bsmp0s"; + sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf"; }; }); in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.13.0"; + version = "1.14.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "0w5rv7z47nys3x113mdddpb2pf1d9pmz9myh4xjzrcy4hp4qv421"; + sha256 = "073d9hlf6x1nq63mzpywc1b8cljbm1dd8qr07fdf0hsk2fcjiqg7"; }; patches = [ From bab529c9fffabc4abd21181f05a6be057219fc3b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 26 Nov 2020 13:06:35 +0100 Subject: [PATCH 101/268] linuxPackages.akvcam: init at 1.1.1 --- pkgs/os-specific/linux/akvcam/default.nix | 31 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/linux/akvcam/default.nix diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix new file mode 100644 index 00000000000..9e745077514 --- /dev/null +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, kernel, qmake }: + +stdenv.mkDerivation rec { + pname = "akvcam"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "webcamoid"; + repo = "akvcam"; + rev = version; + sha256 = "ULEhfF+uC/NcVUGAtmP1+BnrcgRgftNS97nLp81avQ8="; + }; + + nativeBuildInputs = [ qmake ]; + + qmakeFlags = [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + install -m644 -b -D src/akvcam.ko $out/lib/modules/${kernel.modDirVersion}/akvcam.ko + ''; + + meta = with lib; { + description = "Virtual camera driver for Linux"; + homepage = "https://github.com/webcamoid/akvcam"; + maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2aba74388a..e471d42352e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18266,6 +18266,10 @@ in acpi_call = callPackage ../os-specific/linux/acpi-call {}; + akvcam = callPackage ../os-specific/linux/akvcam { + inherit (qt5) qmake; + }; + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; From fdad84f0922febe425659d4357072eb354378b59 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 21 Nov 2020 15:50:37 +0100 Subject: [PATCH 102/268] tautulli: 2.2.4 -> 2.6.1 --- pkgs/servers/tautulli/default.nix | 50 ++++++++++++++----------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 23 insertions(+), 29 deletions(-) diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index 1fbf94beb18..c7e88eb0c46 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -1,54 +1,48 @@ -{stdenv, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python, buildPythonApplication, bash, setuptools, wrapPython, makeWrapper }: -stdenv.mkDerivation rec { - version = "2.2.4"; +buildPythonApplication rec { pname = "Tautulli"; + version = "2.6.1"; + format = "other"; - pythonPath = [ python.pkgs.setuptools ]; - buildInputs = [ python.pkgs.setuptools ]; - nativeBuildInputs = [ python.pkgs.wrapPython ]; + pythonPath = [ setuptools ]; + nativeBuildInputs = [ wrapPython makeWrapper ]; src = fetchFromGitHub { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "0yg7r7yscx6jbs1lnl9nbax3v9r6ppvhr4igdm3gbvd2803j8fs7"; + sha256 = "QHpVIOtGFzNqAEcBCv48YWO4pYatbTe/CWwcwjbj+34="; }; - buildPhase = ":"; + doBuild = false; installPhase = '' - mkdir -p $out - cp -R * $out/ + mkdir -p $out/bin $out/libexec/tautulli + cp -R contrib data lib plexpy Tautulli.py $out/libexec/tautulli - # Remove the PlexPy.py compatibility file as it won't work after wrapping. - # We still have the plexpy executable in bin for compatibility. - rm $out/PlexPy.py - - # Remove superfluous Python checks from main script; - # prepend shebang - echo "#!${python.interpreter}" > $out/Tautulli.py - tail -n +7 Tautulli.py >> $out/Tautulli.py - - - mkdir $out/bin # Can't just symlink to the main script, since it uses __file__ to # import bundled packages and manage the service - echo "#!/bin/bash" > $out/bin/tautulli - echo "$out/Tautulli.py \$*" >> $out/bin/tautulli - chmod +x $out/bin/tautulli + makeWrapper $out/libexec/tautulli/Tautulli.py $out/bin/tautulli + wrapPythonProgramsIn "$out/libexec/tautulli" "$pythonPath" # Creat backwards compatibility symlink to bin/plexpy ln -s $out/bin/tautulli $out/bin/plexpy - - wrapPythonProgramsIn "$out" "$out $pythonPath" ''; - meta = with stdenv.lib; { + checkPhase = '' + runHook preCheck + + $out/bin/tautulli --help + + runHook postCheck + ''; + + meta = with lib; { description = "A Python based monitoring and tracking tool for Plex Media Server"; homepage = "https://tautulli.com/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ csingley ]; + maintainers = with maintainers; [ csingley ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a4e623d213..1c1b319487a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6507,7 +6507,7 @@ in tab = callPackage ../tools/text/tab { }; - tautulli = callPackage ../servers/tautulli { python = python2; }; + tautulli = python3Packages.callPackage ../servers/tautulli { }; ploticus = callPackage ../tools/graphics/ploticus { libpng = libpng12; From d9d8c8a7fc5c46aff67d500297e3c5a53e055d73 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Nov 2020 14:49:33 -0500 Subject: [PATCH 103/268] blender: use ffmpeg instead of ffmpeg_3 build_files/cmake/Modules/FindFFmpeg.cmake currently searches for libavcodec/ac3_parser.h which is not present in ffmpeg_3 (at least on darwin). --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 718765e6efe..882139794c9 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg_3, gettext, glew +{ config, stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile , libtiff, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio2, openjpeg, python3Packages @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ optional cudaSupport addOpenGLRunpath; buildInputs = - [ boost ffmpeg_3 gettext glew ilmbase + [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff opencolorio openexr openimagedenoise openimageio2 openjpeg python zlib fftw jemalloc alembic From 492f3b80abad67261d1da0fbc415749f9a51c2ee Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 26 Nov 2020 14:51:18 -0500 Subject: [PATCH 104/268] blender: fix on darwin --- pkgs/applications/misc/blender/darwin.patch | 85 ++++++--------------- pkgs/applications/misc/blender/default.nix | 18 ++--- 2 files changed, 30 insertions(+), 73 deletions(-) diff --git a/pkgs/applications/misc/blender/darwin.patch b/pkgs/applications/misc/blender/darwin.patch index c426c0b6607..bfbfb5e48e0 100644 --- a/pkgs/applications/misc/blender/darwin.patch +++ b/pkgs/applications/misc/blender/darwin.patch @@ -1,24 +1,26 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake -@@ -35,7 +35,6 @@ else() +@@ -80,7 +80,6 @@ else() message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") endif() if(NOT EXISTS "${LIBDIR}/") - message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'") endif() - if(WITH_OPENAL) -@@ -86,7 +85,7 @@ endif() - if(WITH_CODEC_SNDFILE) - set(LIBSNDFILE ${LIBDIR}/sndfile) - set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include) -- set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc) -+ set(LIBSNDFILE_LIBRARIES sndfile) - set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate - endif() + # ------------------------------------------------------------------------- +@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE) + find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) + find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) + list(APPEND LIBSNDFILE_LIBRARIES +- ${_sndfile_FLAC_LIBRARY} +- ${_sndfile_OGG_LIBRARY} +- ${_sndfile_VORBIS_LIBRARY} +- ${_sndfile_VORBISENC_LIBRARY} + ) -@@ -97,7 +96,7 @@ if(WITH_PYTHON) + print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") +@@ -132,7 +127,7 @@ if(WITH_PYTHON) # normally cached but not since we include them with blender set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m") @@ -27,40 +29,18 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}") # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled else() -@@ -162,10 +161,7 @@ if(WITH_CODEC_FFMPEG) - set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) - set(FFMPEG_LIBRARIES +@@ -173,9 +168,7 @@ endif() + if(WITH_CODEC_FFMPEG) + set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil -- mp3lame swscale x264 xvidcore -- theora theoradec theoraenc -- vorbis vorbisenc vorbisfile ogg opus -- vpx swresample) -+ swscale swresample) - set(FFMPEG_LIBPATH ${FFMPEG}/lib) +- mp3lame ogg opus swresample swscale +- theora theoradec theoraenc vorbis vorbisenc +- vorbisfile vpx x264 xvidcore) ++ swresample swscale) + find_package(FFmpeg) endif() -@@ -206,14 +202,14 @@ if(WITH_OPENCOLLADA) - set(OPENCOLLADA ${LIBDIR}/opencollada) - - set(OPENCOLLADA_INCLUDE_DIRS -- ${LIBDIR}/opencollada/include/COLLADAStreamWriter -- ${LIBDIR}/opencollada/include/COLLADABaseUtils -- ${LIBDIR}/opencollada/include/COLLADAFramework -- ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader -- ${LIBDIR}/opencollada/include/GeneratedSaxParser -+ ${LIBDIR}/opencollada/include/opencollada/COLLADAStreamWriter -+ ${LIBDIR}/opencollada/include/opencollada/COLLADABaseUtils -+ ${LIBDIR}/opencollada/include/opencollada/COLLADAFramework -+ ${LIBDIR}/opencollada/include/opencollada/COLLADASaxFrameworkLoader -+ ${LIBDIR}/opencollada/include/opencollada/GeneratedSaxParser - ) - -- set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib) -+ set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada) - set(OPENCOLLADA_LIBRARIES - OpenCOLLADASaxFrameworkLoader - -lOpenCOLLADAFramework -@@ -277,14 +273,13 @@ if(WITH_BOOST) +@@ -266,7 +259,6 @@ if(WITH_BOOST) endif() if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) @@ -68,25 +48,8 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf endif() if(WITH_OPENIMAGEIO) - set(OPENIMAGEIO ${LIBDIR}/openimageio) - set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include) - set(OPENIMAGEIO_LIBRARIES -- ${OPENIMAGEIO}/lib/libOpenImageIO.a -+ ${OPENIMAGEIO}/lib/libOpenImageIO.dylib - ${PNG_LIBRARIES} - ${JPEG_LIBRARIES} - ${TIFF_LIBRARY} -@@ -307,7 +302,7 @@ endif() - if(WITH_OPENCOLORIO) - set(OPENCOLORIO ${LIBDIR}/opencolorio) - set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) -- set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp) -+ set(OPENCOLORIO_LIBRARIES OpenColorIO) - set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib) - endif() - -@@ -443,7 +438,7 @@ else() - set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing") +@@ -439,7 +431,7 @@ else() + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic") endif() -if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 882139794c9..9796aef9b7c 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -8,7 +8,7 @@ , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada , makeWrapper -, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL , embree, gmp }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { openvdb ] else [ - pugixml SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL + pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit @@ -61,7 +61,9 @@ stdenv.mkDerivation rec { : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ - '${python}' + '${python}' \ + --replace '${"$"}{LIBDIR}/openmp' \ + '${llvmPackages.openmp}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ --replace 'set(PYTHON_VERSION 3.7)' \ 'set(PYTHON_VERSION ${python.pythonVersion})' \ @@ -72,15 +74,7 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/opencollada' \ '${opencollada}' \ --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python3Packages.numpy}/${python.sitePackages}/numpy' \ - --replace 'set(OPENJPEG_INCLUDE_DIRS ' \ - 'set(OPENJPEG_INCLUDE_DIRS "'$(echo ${openjpeg.dev}/include/openjpeg-*)'") #' \ - --replace 'set(OPENJPEG_LIBRARIES ' \ - 'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \ - --replace 'set(OPENIMAGEIO ' \ - 'set(OPENIMAGEIO "${openimageio2.out}") #' \ - --replace 'set(OPENEXR_INCLUDE_DIRS ' \ - 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' + '${python3Packages.numpy}/${python.sitePackages}/numpy' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' ''); From 4a5c49363a58e711c2016b9ebb6f642e3c9c1be5 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Wed, 21 Oct 2020 18:55:55 -0400 Subject: [PATCH 105/268] fetchzip: remove write permissions for unpacked files Fixes https://github.com/NixOS/nixpkgs/issues/38649 --- pkgs/applications/editors/eclipse/plugins.nix | 3 --- pkgs/applications/misc/ipmicfg/default.nix | 1 - pkgs/applications/office/atlassian-cli/default.nix | 1 - pkgs/build-support/fetchzip/default.nix | 9 +++++++-- pkgs/servers/web-apps/engelsystem/default.nix | 2 -- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index cdf36bc3c21..43ab2a796eb 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -355,9 +355,6 @@ rec { url = "https://download.jboss.org/drools/release/${version}/droolsjbpm-tools-distribution-${version}.zip"; sha512 = "2qzc1iszqfrfnw8xip78n3kp6hlwrvrr708vlmdk7nv525xhs0ssjaxriqdhcr0s6jripmmazxivv3763rnk2bfkh31hmbnckpx4r3m"; extraPostFetch = '' - # work around https://github.com/NixOS/nixpkgs/issues/38649 - chmod go-w $out; - # update site is a couple levels deep, alongside some other irrelevant stuff cd $out; find . -type f -not -path ./binaries/org.drools.updatesite/\* -exec rm {} \; diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix index f561f15ab3e..f3d8d5cbc20 100644 --- a/pkgs/applications/misc/ipmicfg/default.nix +++ b/pkgs/applications/misc/ipmicfg/default.nix @@ -8,7 +8,6 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://www.supermicro.com/wftp/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip"; sha256 = "0srkzivxa4qlf3x9zdkri7xfq7kjj4fsmn978vzmzsvbxkqswd5a"; - extraPostFetch = "chmod u+rwX,go-rwx+X $out/"; }; installPhase = '' diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 1140bb9bee2..ec8e2b396c5 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; sha256 = "091dhjkx7fdn23cj7c4071swncsbmknpvidmmjzhc0355l3p4k2g"; - extraPostFetch = "chmod go-w $out"; }; tools = [ diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index c61df8ceb00..44748f231bc 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -44,8 +44,13 @@ mv "$unpackDir/$fn" "$out" '' else '' mv "$unpackDir" "$out" - '') #*/ - + extraPostFetch; + '') + + extraPostFetch + # Remove write permissions for files unpacked with write bits set + # Fixes https://github.com/NixOS/nixpkgs/issues/38649 + + '' + chmod -R a-w "$out" + ''; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too nativeBuildInputs = x.nativeBuildInputs ++ [ unzip ]; diff --git a/pkgs/servers/web-apps/engelsystem/default.nix b/pkgs/servers/web-apps/engelsystem/default.nix index ad3a6995800..92d50ff67c8 100644 --- a/pkgs/servers/web-apps/engelsystem/default.nix +++ b/pkgs/servers/web-apps/engelsystem/default.nix @@ -11,8 +11,6 @@ in stdenv.mkDerivation rec { url = "https://github.com/engelsystem/engelsystem/releases/download/v3.1.0/engelsystem-v3.1.0.zip"; sha256 = "01wra7li7n5kn1l6xkrmw4vlvvyqh089zs43qzn98hj0mw8gw7ai"; - # This is needed, because the zip contains a directory with world write access, which is not allowed in nix - extraPostFetch = "chmod -R a-w $out"; }; buildInputs = [ phpExt ]; From c97d0d50e1b0b94df872610ea340c66f331e07a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Nov 2020 23:23:59 +0000 Subject: [PATCH 106/268] tpm2-tss: 3.0.2 -> 3.0.3 --- pkgs/development/libraries/tpm2-tss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 6b83b5c051d..fa506733c16 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "07yz459xnj7cs99mfhnq8wr9cvkrnbd479scqyxz55nlimrg8dc9"; + sha256 = "106yhsjwjadxsl9dqxywg287mdwsksman02hdalhav18vcnvnlpj"; }; nativeBuildInputs = [ From 94981389b1f863bb540eae217f2e9fef86280a34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 00:07:01 +0000 Subject: [PATCH 107/268] utf8proc: 2.5.0 -> 2.6.0 --- pkgs/development/libraries/utf8proc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index e08aea2e1ee..05b23e25aff 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"; + sha256 = "0czk8xw1jra0fjf6w4bcaridyz3wz2br3v7ik1g7z0j5grx9n8r1"; }; nativeBuildInputs = [ cmake ]; From f0dfa241905e18bf5d0bb64c911e65777606b771 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Thu, 26 Nov 2020 20:14:14 -0500 Subject: [PATCH 108/268] bottom: 0.5.1 -> 0.5.3 --- pkgs/tools/system/bottom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index ac03bd4119f..12367949e9e 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "0bw83l3s7yraxiwbwcm0nfqqhv2dkd208qz7nm89whzdjzf340gj"; + sha256 = "sha256-Gc2bL7KqDqab0hCCOi2rtEw+5r0bSETzTipLLdX/ipk="; }; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "11ywms0vgrm4ildsgl99agjimk5f3l56hlr5aa70kagxam4k6vmn"; + cargoSha256 = "sha256-Bdkq3cTuziTQ7/BkvuBHbfuxRIXnz4h2OadoAGNTBc0="; doCheck = false; From cab7e2cef6bd118adc6cd8b62c673a3b056ff3a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 02:25:37 +0000 Subject: [PATCH 109/268] xmrig: 6.5.3 -> 6.6.1 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 16aa4f2f730..35a19cb3063 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.5.3"; + version = "6.6.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "0hywdb6zzkmiik93bnsw6pzir7189mnm46brg4v8fyn56vxskfmi"; + sha256 = "03phq1c6fylvkg5x7l0bskspr9jdfx61jy67yx2lxhymqgpbf64z"; }; nativeBuildInputs = [ cmake ]; From 736db6273b4a9b5a9ce462c80e9bb8537e9a39a9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Nov 2020 04:20:00 +0000 Subject: [PATCH 110/268] postgresqlPackages.pg_topn: 2.3.0 -> 2.3.1 --- pkgs/servers/sql/postgresql/ext/pg_topn.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index 0f8e2f61a6e..03d571c03ba 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_topn"; - version = "2.3.0"; + version = "2.3.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = "postgresql-topn"; rev = "refs/tags/v${version}"; - sha256 = "05mjzm7rz5j7byzag23526hhsqsg4dsyxxsg8q9ray1rwxjbr392"; + sha256 = "0ai07an90ywhk10q52hajgb33va5q76j7h8vj1r0rvq6dyii0wal"; }; installPhase = '' @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Efficient querying of 'top values' for PostgreSQL"; homepage = "https://github.com/citusdata/postgresql-topn"; + changelog = "https://github.com/citusdata/postgresql-topn/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.agpl3; From b07f6b10243d7c2398edec56342cf83ca5cfa384 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 27 Nov 2020 04:20:00 +0000 Subject: [PATCH 111/268] bottom: install completions --- pkgs/tools/system/bottom/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 12367949e9e..8c5e2833212 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, darwin }: +{ stdenv, fetchFromGitHub, rustPlatform, darwin, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "bottom"; @@ -11,12 +11,18 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-Gc2bL7KqDqab0hCCOi2rtEw+5r0bSETzTipLLdX/ipk="; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; cargoSha256 = "sha256-Bdkq3cTuziTQ7/BkvuBHbfuxRIXnz4h2OadoAGNTBc0="; doCheck = false; + postInstall = '' + installShellCompletion $releaseDir/build/bottom-*/out/btm.{bash,fish} --zsh $releaseDir/build/bottom-*/out/_btm + ''; + meta = with stdenv.lib; { description = "A cross-platform graphical process/system monitor with a customizable interface"; homepage = "https://github.com/ClementTsang/bottom"; @@ -25,4 +31,3 @@ rustPlatform.buildRustPackage rec { platforms = platforms.unix; }; } - From 8f46b51e86610892f642ccd51f97a72733d25f54 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Fri, 27 Nov 2020 06:38:46 +0100 Subject: [PATCH 112/268] ammonite: 2.2.0 -> 2.3.8 --- pkgs/development/tools/ammonite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index c3a578f18b8..87a7afde5eb 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -9,7 +9,7 @@ let common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; - version = "2.2.0"; + version = "2.3.8"; src = fetchurl { url = @@ -75,10 +75,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk="; + sha256 = "1kzk0437h2wd9jhwkvjkiaj6mscz4bh85iv266x9zz4zssb355hs"; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A="; + sha256 = "0js84m6yqjd7d77md38z6nk3qzlm1ms8brzczaw05zq2c90pdbz7"; }; } From 2f2166f40d39bdf062e47f459377c62cdc6e81ce Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 26 Nov 2020 16:27:31 +0100 Subject: [PATCH 113/268] gitAndTools.glab: init at 1.11.1 --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/glab/default.nix | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/glab/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 477d9ca3ea6..bf6591a8cb9 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -203,6 +203,8 @@ let inherit (darwin.apple_sdk.frameworks) Security AppKit; }; + glab = callPackage ./glab { }; + grv = callPackage ./grv { }; hub = callPackage ./hub { }; diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix new file mode 100644 index 00000000000..9c2e4f00ca7 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "glab"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "profclems"; + repo = pname; + rev = "v${version}"; + sha256 = "mmrTuldU2WDe9t2nC3DYfqwb28uh6qjAaaveR221mjw="; + }; + + vendorSha256 = "B4RKcKUTdGkonsKhL7NIKzVpZq6XD6cMMWed4wr/Moc="; + runVend = true; + + # Tests are trying to access /homeless-shelter + doCheck = false; + + subPackages = [ "cmd/glab" ]; + + meta = with lib; { + description = "An open-source GitLab command line tool"; + license = licenses.mit; + homepage = "https://glab.readthedocs.io/"; + maintainers = with maintainers; [ freezeboy ]; + }; +} From 4caeb90cd393fa889e59683f027db9e265a48aa5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 07:57:14 +0000 Subject: [PATCH 114/268] abcm2ps: 8.14.9 -> 8.14.10 --- pkgs/tools/audio/abcm2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 099ccc6f4cb..5088cdeb960 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.9"; + version = "8.14.10"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0h4qzj9k5ng09nbkfipvr82piq68c576akjwmhsqn05rvgirmhx7"; + sha256 = "0x20vmf94n9s4r2q45543yi39fkc0jg9wd1imihjcqmb2sz3x3vm"; }; configureFlags = [ From a7a00824e44e38734e11c8894018d5327a21692a Mon Sep 17 00:00:00 2001 From: Andreas Fehn Date: Fri, 27 Nov 2020 09:28:35 +0100 Subject: [PATCH 115/268] maintainers: add fehnomenal --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2838f60ad00..e753fdf8d84 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2885,6 +2885,12 @@ githubId = 541748; name = "Felipe Espinoza"; }; + fehnomenal = { + email = "fehnomenal@fehn.systems"; + github = "fehnomenal"; + githubId = 9959940; + name = "Andreas Fehn"; + }; felschr = { email = "dev@felschr.com"; github = "felschr"; From 68a379e36456b20629ed0edf2ce82c021c260548 Mon Sep 17 00:00:00 2001 From: Andreas Fehn Date: Fri, 27 Nov 2020 09:48:32 +0100 Subject: [PATCH 116/268] pythonPackages.ifcopenshell: init at 0.6.0b --- .../python-modules/ifcopenshell/default.nix | 67 +++++++++++++++++++ .../ifcopenshell/site-packages.patch | 32 +++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 101 insertions(+) create mode 100644 pkgs/development/python-modules/ifcopenshell/default.nix create mode 100644 pkgs/development/python-modules/ifcopenshell/site-packages.patch diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix new file mode 100644 index 00000000000..16ee8dcbace --- /dev/null +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, python +, gcc10 +, cmake +, boost172 +, icu +, swig +, pcre +, opencascade-occt +, opencollada +, libxml2 +}: + +buildPythonPackage rec { + pname = "ifcopenshell"; + version = "0.6.0b0"; + format = "other"; + + src = fetchFromGitHub { + owner = "IfcOpenShell"; + repo = "IfcOpenShell"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "1ad1s9az41z2f46rbi1jnr46mgc0q4h5kz1jm9xdlwifqv9y04g1"; + }; + + patches = [ + (substituteAll { + name = "site-packages.patch"; + src = ./site-packages.patch; + site_packages = "lib/${python.libPrefix}/site-packages"; + }) + ]; + + nativeBuildInputs = [ gcc10 cmake ]; + + buildInputs = [ + boost172 + icu + pcre + libxml2 + ]; + + preConfigure = '' + cd cmake + ''; + + cmakeFlags = [ + "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" + "-DOCC_LIBRARY_DIR=${opencascade-occt}/lib" + "-DOPENCOLLADA_INCLUDE_DIR=${opencollada}/include/opencollada" + "-DOPENCOLLADA_LIBRARY_DIR=${opencollada}/lib/opencollada" + "-DSWIG_EXECUTABLE=${swig}/bin/swig" + "-DLIBXML2_INCLUDE_DIR=${libxml2.dev}/include/libxml2" + "-DLIBXML2_LIBRARIES=${libxml2.out}/lib/${if stdenv.isDarwin then "libxml2.dylib" else "libxml2.so"}" + ]; + + meta = with stdenv.lib; { + description = "Open source IFC library and geometry engine"; + homepage = http://ifcopenshell.org/; + license = licenses.lgpl3; + maintainers = with maintainers; [ fehnomenal ]; + }; +} diff --git a/pkgs/development/python-modules/ifcopenshell/site-packages.patch b/pkgs/development/python-modules/ifcopenshell/site-packages.patch new file mode 100644 index 00000000000..e61fe2056f7 --- /dev/null +++ b/pkgs/development/python-modules/ifcopenshell/site-packages.patch @@ -0,0 +1,32 @@ +--- a/src/ifcwrap/CMakeLists.txt ++++ b/src/ifcwrap/CMakeLists.txt +@@ -68,26 +68,17 @@ endif() + # directory in which the wrapper can be installed. + FIND_PACKAGE(PythonInterp) + IF(PYTHONINTERP_FOUND AND NOT "${PYTHON_EXECUTABLE}" STREQUAL "") +- EXECUTE_PROCESS( +- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import get_python_lib; sys.stdout.write(get_python_lib(1))" +- OUTPUT_VARIABLE python_package_dir +- ) +- +- IF("${python_package_dir}" STREQUAL "") +- MESSAGE(WARNING "Unable to locate Python site-package directory, unable to install the Python wrapper") +- ELSE() + FILE(GLOB_RECURSE sourcefiles "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/*.py") + FOREACH(file ${sourcefiles}) + FILE(RELATIVE_PATH relative "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/" "${file}") + GET_FILENAME_COMPONENT(dir "${relative}" DIRECTORY) + INSTALL(FILES "${file}" +- DESTINATION "${python_package_dir}/ifcopenshell/${dir}") ++ DESTINATION "@site_packages@/ifcopenshell/${dir}") + ENDFOREACH() + INSTALL(FILES "${CMAKE_BINARY_DIR}/ifcwrap/ifcopenshell_wrapper.py" +- DESTINATION "${python_package_dir}/ifcopenshell") ++ DESTINATION "@site_packages@/ifcopenshell") + INSTALL(TARGETS _ifcopenshell_wrapper +- DESTINATION "${python_package_dir}/ifcopenshell") +- ENDIF() ++ DESTINATION "@site_packages@/ifcopenshell") + ELSE() + MESSAGE(WARNING "No Python interpreter found, unable to install the Python wrapper") + ENDIF() diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d84b4c36624..754460dd696 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2879,6 +2879,8 @@ in { ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + ifcopenshell = callPackage ../development/python-modules/ifcopenshell { }; + ignite = callPackage ../development/python-modules/ignite { }; ihatemoney = callPackage ../development/python-modules/ihatemoney { }; From 12d78f746930d7282bcba8e1e48ff5f82db9adae Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 27 Nov 2020 10:16:57 +0100 Subject: [PATCH 117/268] goreleaser: 0.145.0 -> 0.147.2 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 652dce15c42..95944d566df 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.145.0"; + version = "0.147.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "1w2mbyywr3zsn068cshkx502x0zrxrbrgaw23x4spfri0nk6v4fd"; + sha256 = "1pzbwjqnb2l1845dqmx5s2xyxv7088yz2888bjwm0qs8pm1l6spi"; }; - vendorSha256 = "0drk58bhcvx75cd6s0xnyh6swph1vlvpzp2nngr7agvjdcrbady6"; + vendorSha256 = "1qwggbgfvgx1anh55jx2lj0x59h5j3wixb8r2ylaynrrxx1b167w"; buildFlagsArray = [ "-ldflags=" From 3ed321dfabb152f7c72b6dbcef65374a1c6e7747 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 27 Nov 2020 11:52:07 +0100 Subject: [PATCH 118/268] z3: enable build on non-x86_64 unix; checked the build on aarch64-linux --- pkgs/applications/science/logic/z3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index dd71cf2cb1a..48512eff530 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { description = "A high-performance theorem prover and SMT solver"; homepage = "https://github.com/Z3Prover/z3"; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.x86_64; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ttuegel ]; }; } From 06f2fd5fb9f7def14154a7b80e7676e641dd56f9 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 27 Nov 2020 12:04:23 +0100 Subject: [PATCH 119/268] jetbrains: updates --- .../editors/jetbrains/default.nix | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 9fbab346907..80528617d64 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.2.5"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0xkra8l3ga8qsmzbvfisn99lxm5wxa8c4d4jzljjwn8855bs20a3"; /* updated by script */ + sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +281,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "0iv1zmdpbqk8f4cjd6dhgj9mrvxli4dg83jzkhv566sy8wrrx7kb"; /* updated by script */ + sha256 = "1j0mlsiqh80mspi2x9mi0h5hxhg5gw6395hyl9w33q8dxm95mx2d"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -307,12 +307,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "092swkz7l1p3asrna6fxj6j324sh7pdbgzrlapdwka8kq9y40ajz"; /* updated by script */ + sha256 = "1rlw01aq6ci46xv4d4877k30309jjws29kwhriy98xf804msyzyb"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1416ikna169d2hx77yd0bb8hpxkpnf27jgyq5yrgla1w6h1fp1p0"; /* updated by script */ + sha256 = "05qr8jiasqxmkgi9v52g7hgpdf7pkkjcp42bbkh1f4zgvq81p5py"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0bdxmxml6337cdpb2amhdqlvxicng50cgzlnmiw0wqnmwj5ihpih"; /* updated by script */ + sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0wqhcag32fxqxg6aml2a3d0rpds0d48rgbcl7cp0ah8xj6x72047"; /* updated by script */ + sha256 = "196hhb4n52a50w50awx01ksyl5dkrbdmnz8sb9di5ihni7043p97"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0g7bki4bzi3a1w3rlwik2w0ma10xb4g450qxm4fr4fp8dy2xaysc"; /* updated by script */ + sha256 = "0dwd9gvi8n3igza95pil3mf7azxn131830rvfzdvnvrzj9yb2q8l"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -398,12 +398,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "03f1z7xhz90j9l8xp3il115yvb15kda0i6ba5ndhby7nf52vnphk"; /* updated by script */ + sha256 = "0bpkl8phc16yjm7qjfbg42rm7sbfwbrjva7w0qiwiw9ibwvs90id"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +411,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.2.4"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "1c60k38ai63s4779fs55vaiswfc6bi7ki6p96hrmmkrnpzgsipg5"; /* updated by script */ + sha256 = "0l97nk9psb8g0sxm148fcz0x2v9mwqblffigrz2rmac3gd275s7f"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From 0229bebd37caf01cad975090895a5ba2c5973226 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 12:11:36 +0000 Subject: [PATCH 120/268] cimg: 2.9.3 -> 2.9.4 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 400326f6fca..61d3996a4f5 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.3"; + version = "2.9.4"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "1pkjbwpi0047lbc55cva99rj6p70gbw09l14vrym0igwipnxxx0z"; + sha256 = "1sb0z5ryh34y80ghlr2agsl64gayjmxpl96l9fjaylf5k2m3fg2b"; }; installPhase = '' From 9c012584650fa17434617cdc082362ba60700e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Fri, 27 Nov 2020 14:20:41 +0100 Subject: [PATCH 121/268] racket: Update source hashes Upstream has replaced the tarballs in place to fix racket/racket#3499. --- pkgs/development/interpreters/racket/default.nix | 2 +- pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 6de4ab6da31..2c51c691a8b 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "18pz6gjzqy6a62xkcmjanhr7kgxpvpmc0blrk4igz8ldcybz44if"; + sha256 = "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 656546dcb63..9fd220e5b98 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0xvnd7afx058sg7j51bmbikqgn4sl0246nkhr8zlqcrbr3nqi6p4"; + sha256 = "0yc5zkpq1bavj64h67pllw6mfjhmdp65fgdpyqcaan3syy6b5cia"; }; meta = oldAttrs.meta // { From 0d6bc2f7c25214ecd83806b38f781c8d3599ce85 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 13:43:34 +0000 Subject: [PATCH 122/268] broot: 1.0.5 -> 1.0.6 --- 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 b46d6490c4c..e5c528596b0 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.5"; + version = "1.0.6"; src = fetchCrate { inherit pname version; - sha256 = "0b28xdc3dwhr4vb3w19fsrbj2m82zwkg44l4an3r4mi2vgb25nv2"; + sha256 = "1yzj1k09yd3q2dff6a6m0xv2v6z681x25g0x5ak41lm5rn3hj8vl"; }; - cargoSha256 = "07gsga5hf4l64kyjadqvmbg5bay7mad9kg2pi4grjxdw6lsxky0f"; + cargoSha256 = "1axcnr7bzplchpz4cdy5872fmrnzrs1p665c0vmxzs9bgnml5sl8"; nativeBuildInputs = [ makeWrapper From 9448602120730a5cec867a6e3704c7721c779745 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 13:52:08 +0000 Subject: [PATCH 123/268] enlightenment.evisum: 0.5.7 -> 0.5.8 --- pkgs/desktops/enlightenment/evisum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/evisum/default.nix b/pkgs/desktops/enlightenment/evisum/default.nix index fef15ce79fe..f89ff2cee30 100644 --- a/pkgs/desktops/enlightenment/evisum/default.nix +++ b/pkgs/desktops/enlightenment/evisum/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "evisum"; - version = "0.5.7"; + version = "0.5.8"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0pm63n3rls8vkjv3awq0f3zlqk33ddql3g0rl2bc46n48g2mcmbd"; + sha256 = "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx"; }; nativeBuildInputs = [ From 58fd07cc7b7e38c24427ea2fed8f8d86b3ccc7f1 Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Fri, 27 Nov 2020 12:50:45 +0000 Subject: [PATCH 124/268] uwc: Init at 1.0.4 uwc is a Unicode-aware word counter with per-line mode written in Rust If applied, users will be able to count the number of unicode characters and words (e.g. Chinese characters) from files or through the pipe. --- pkgs/tools/text/uwc/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/text/uwc/default.nix diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/tools/text/uwc/default.nix new file mode 100644 index 00000000000..cf8e5658f76 --- /dev/null +++ b/pkgs/tools/text/uwc/default.nix @@ -0,0 +1,24 @@ +{ rustPlatform, lib, fetchFromGitLab }: + +rustPlatform.buildRustPackage rec { + pname = "uwc"; + version = "1.0.4"; + + src = fetchFromGitLab { + owner = "dead10ck"; + repo = pname; + rev = "v${version}"; + sha256 = "1ywqq9hrrm3frvd2sswknxygjlxi195kcy7g7phwq63j7hkyrn50"; + }; + + cargoSha256 = "0ra62cf75b1c4knxxpbdg8m0sy2k02r52j606fp5l9crp0fml8l0"; + + doCheck = true; + + meta = with lib; { + description = "Like wc, but unicode-aware, and with per-line mode"; + homepage = "https://gitlab.com/dead10ck/uwc"; + license = licenses.mit; + maintainers = with maintainers; [ ShamrockLee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55ebbab69b0..cdd74098391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7901,6 +7901,8 @@ in usync = callPackage ../applications/misc/usync { }; + uwc = callPackage ../tools/text/uwc { }; + uwsgi = callPackage ../servers/uwsgi { }; v2ray = callPackage ../tools/networking/v2ray { }; From 64939cff96e1be0dd85ccdfe175e01ada23543ed Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 27 Nov 2020 15:10:02 +0100 Subject: [PATCH 125/268] neomutt: 20201120 -> 20201127 ChangeLog: https://github.com/neomutt/neomutt/releases/tag/20201127 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index c068357a0f6..cf78da9a504 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "20201120"; + version = "20201127"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0z6xavgd0zv9pqvfsdyvhhi1q3y7zxhgg24isbnn9r6mldafqwna"; + sha256 = "sha256-BkDGKZmpwahDw1vD67CyWfxD93H83kcpv5JBGVL5F/o="; }; buildInputs = [ From 6ad593d6d3756562c27dd60daa41bbb2b0de0af5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 14:14:05 +0000 Subject: [PATCH 126/268] dfu-util: 0.9 -> 0.10 --- pkgs/development/tools/misc/dfu-util/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index ecd40f20fd4..9af9ddc0df7 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "dfu-util"; - version = "0.9"; + version = "0.10"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb1 ]; src = fetchurl { url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; - sha256 = "0czq73m92ngf30asdzrfkzraag95hlrr74imbanqq25kdim8qhin"; + sha256 = "0hlvc47ccf5hry13saqhc1j5cdq5jyjv4i05kj0mdh3rzj6wagd0"; }; meta = with stdenv.lib; { From 763e838049c4d5d7e005ed3711998534bb7ea234 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 18 Oct 2020 03:58:56 +0000 Subject: [PATCH 127/268] ephemeral: 6.4.1 -> 7.0.4 --- pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 55007678778..6d8aa3649a9 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.4.1"; + version = "7.0.4"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1lzcwaczh601kwbx7fzg32nrzlg67asby7p86qy10qz86xf4g608"; + sha256 = "18chvfdmka21zvjgqfpinm3nrj0ba09szxhhm39anpvpbj92ra8j"; }; nativeBuildInputs = [ From 34d2819831d356eb4353658fc7e290d2b0c26eec Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Nov 2020 09:58:00 -0500 Subject: [PATCH 128/268] ammonite: Fix arguments --- pkgs/development/tools/ammonite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 87a7afde5eb..20b26437e75 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -23,7 +23,7 @@ let install -Dm755 $src $out/bin/amm sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm '' + optionalString (disableRemoteLogging) '' - sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm + sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm sed -i '1i #!/bin/sh' $out/bin/amm ''; From 7dc96e90b129a8d1baddcc29651d373adb14b014 Mon Sep 17 00:00:00 2001 From: Christian Mainka Date: Fri, 27 Nov 2020 16:01:47 +0100 Subject: [PATCH 129/268] joplin-desktop: 1.3.18 -> 1.4.15 --- pkgs/applications/misc/joplin-desktop/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index de68e90a4f1..fccf15c0241 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.3.18"; + version = "1.4.15"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "1dldy137ia8qxhf7d5xzq5slm12bhnmw4kx7fm37n1ajjdcn5sf7"; - x86_64-darwin = "0zm9vhxlfs1ldd8za4yha54psqwl0al4hzdfxjfp7ir98i9a4cj7"; + x86_64-linux = "12wh7f1a9sn250lqnb8c9b5gqr8r76kxrhl0kgsm2lg93jgpvvbb"; + x86_64-darwin = "1jzfqwyz3vkmmkdzx3iw36fbjq7fns46v8crmg5n09w9kvf22qil"; }.${system} or throwSystem; }; @@ -52,9 +52,9 @@ let extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' mv $out/bin/{${name},${pname}} - install -Dm444 ${appimageContents}/joplin.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/joplin.png -t $out/share/pixmaps - substituteInPlace $out/share/applications/joplin.desktop \ + install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/@joplinapp-desktop.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/@joplinapp-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; }; From f98df98db3bd87254c9e5d25f9ef032356b2a2fb Mon Sep 17 00:00:00 2001 From: msteen Date: Fri, 27 Nov 2020 16:44:59 +0100 Subject: [PATCH 130/268] google-chrome: Remove msteen from the list of maintainers (#105152) --- .../networking/browsers/google-chrome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index f2e10f32330..543d5925547 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -150,10 +150,10 @@ in stdenv.mkDerivation { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; - maintainers = with maintainers; [ primeos msteen ]; + maintainers = with maintainers; [ primeos ]; # Note from primeos: By updating Chromium I also update Google Chrome and # will try to merge PRs and respond to issues but I'm not actually using - # Google Chrome. msteen is the actual user/maintainer. + # Google Chrome. platforms = [ "x86_64-linux" ]; }; } From d73a3ecdac582d3ef8beef3d7f61f7370bcc9a49 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 16:06:43 +0000 Subject: [PATCH 131/268] gnome3.evolution: 3.38.1 -> 3.38.2 --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 2390498ce78..6bb2e139cba 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1z68vhbqnm34axx4zcrds45nz2ppwzr4z1lczxrdiq0zf0cmxyfh"; + sha256 = "1whjgfhcxpb5yhhvyqb8pv71vprw6fv02czin4k4z6dxrxsq32qx"; }; nativeBuildInputs = [ From eb7d36720048f6df6f830ab61f143f823b43e073 Mon Sep 17 00:00:00 2001 From: iko Date: Fri, 27 Nov 2020 20:32:29 +0300 Subject: [PATCH 132/268] runLaTeX: rerun at least twice + refactor (#104185) Building a simple LaTeX document without bibTeX with a table of contents yielded a document with an empty table of contents since LaTeX was only run once --- pkgs/tools/typesetting/tex/nix/run-latex.sh | 27 +++++++++------------ 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh index 7a5767f9c06..3f8a16580ea 100644 --- a/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -41,7 +41,11 @@ showError() { exit 1 } +pass=0 + runLaTeX() { + ((pass=pass+1)) + echo "PASS $pass..." if ! $latex $latexFlags $rootName >$tmpFile 2>&1; then showError; fi runNeeded= if fgrep -q \ @@ -51,6 +55,7 @@ runLaTeX() { "$tmpFile"; then runNeeded=1 fi + echo } echo @@ -61,10 +66,7 @@ if test -n "$copySources"; then fi -echo "PASS 1..." runLaTeX -echo - for auxFile in $(find . -name "*.aux"); do # Run bibtex to process all bibliographies. There may be several @@ -89,11 +91,8 @@ for auxFile in $(find . -name "*.aux"); do fi done - if test "$runNeeded"; then - echo "PASS 2..." runLaTeX - echo fi @@ -105,20 +104,18 @@ if test -f $rootNameBase.idx; then makeindex $makeindexFlags $rootNameBase.idx runNeeded=1 echo -fi - - -if test "$runNeeded"; then - echo "PASS 3..." - runLaTeX - echo fi +# We check that pass is less than 2 to catch situations where the document is +# simple enough (no bibtex, etc.) so that it would otherwise require only one +# pass but also contains a ToC. +# In essence this check ensures that we do at least two passes on all documents. +if test "$runNeeded" = 1 -o "$pass" -lt 2 ; then + runLaTeX +fi if test "$runNeeded"; then - echo "PASS 4..." runLaTeX - echo fi From 77e367e9153d4e7b5cc91d5487e569ad85087404 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 17:38:55 +0000 Subject: [PATCH 133/268] datovka: 4.15.5 -> 4.15.6 --- pkgs/applications/networking/datovka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 2e598b1a763..22bf982ec4c 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.15.5"; + version = "4.15.6"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "1mnw1m3wjkw8rfh6fwwrhfmkna6j19pza9cs7kyp8qj1fzzqi8my"; + sha256 = "1qs1yd9qqsf56jm9w6sffkqb2l8s3i9qgi2q8vd59ss19ym6yky2"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; From 09a0f4ca312045fbd1a7962e74e271124ada3054 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 17:46:28 +0000 Subject: [PATCH 134/268] discord-ptb: 0.0.22 -> 0.0.23 --- .../networking/instant-messengers/discord/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index bb37380a682..9b89634f0b3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,20 +17,20 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.22"; + version = "0.0.23"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "06qyh8i9d7il6q7q7iaymbbcmdcgrj6rc4z4xik1ay3fr7qy299j"; + sha256 = "0vxz68vldrbmmw1alpwl7blfcy6byd6zg9m0851dm0p0ldyhsp5j"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.115"; + version = "0.0.116"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0w9i3plbiiy2kp4yahsdvz0f4wpszsgqdnlgzbnx7wj0xk4qrkcx"; + sha256 = "14kg85gz91f9mvvnl5p1lwz40rm47bca3a8dwv4618zv6vncgmkp"; }; }; }.${branch} From df1c8e3f0f01b6b8996b52f62bfd1d01dcbf8855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Nov 2020 10:42:23 +0100 Subject: [PATCH 135/268] python3Packages.snowflake-connector-python: Fix boto3 replace --- .../python-modules/snowflake-connector-python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index c8f874d4c10..3e958a3076c 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'boto3>=1.4.4,<1.15'," "'boto3~=1.15'," \ + --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \ --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \ --replace "'idna<2.10'," "'idna'," \ --replace "'requests<2.24.0'," "'requests'," From 08c74a2d56261a34d5827ffebd820cff4a0bd733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Nov 2020 10:42:40 +0100 Subject: [PATCH 136/268] python3Packages.snowflake-sqlalchemy: Disable running tests --- .../development/python-modules/snowflake-sqlalchemy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 99c5822f350..bccca3ee6b6 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { snowflake-connector-python ]; + # Pypi does not include tests + doCheck = false; pythonImportsCheck = [ "snowflake.sqlalchemy" ]; meta = with lib; { From d0f04c7c82e3757bfe32940e284ab91bb00cc5b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 19:05:47 +0000 Subject: [PATCH 137/268] frostwire-bin: 6.8.7 -> 6.8.8 --- pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index b9ee526bbe5..364aeac550e 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.8.7"; + version = "6.8.8"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "1m9v4abm8jbyz46hin63vi6irs32n1xzg85bdyb48vpdxh6iwv04"; + sha256 = "0zxk0nv7m1k4n8n82h1rkh239a58s7j643lgqbw3qx45bdy4sf4k"; }; nativeBuildInputs = [ makeWrapper ]; From c5d585bab57912abe8ecda2860c41c86a1fb809d Mon Sep 17 00:00:00 2001 From: Massimo Redaelli Date: Fri, 27 Nov 2020 19:32:36 +0100 Subject: [PATCH 138/268] tickrs: init at 0.7.1 --- pkgs/applications/misc/tickrs/default.nix | 24 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/tickrs/default.nix diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix new file mode 100644 index 00000000000..754de71f1ae --- /dev/null +++ b/pkgs/applications/misc/tickrs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub, perl }: + +rustPlatform.buildRustPackage rec { + pname = "tickrs"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "tarkah"; + repo = pname; + rev = "v${version}"; + sha256 = "159smcjrf5193yijfpvy1g9b1gin72xwbjghfyrrphwscwhb215z"; + }; + + cargoSha256 = "1s95b3x7vs1z8xs7j6j80y6mfpy5bdgnzmzn3qa9zr6cghabbf6n"; + + nativeBuildInputs = [ perl ]; + + meta = with stdenv.lib; { + description = "Realtime ticker data in your terminal"; + homepage = "https://github.com/tarkah/tickrs"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3431e6bb33c..f26dd50cc40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24080,6 +24080,8 @@ in ticpp = callPackage ../development/libraries/ticpp { }; + tickrs = callPackage ../applications/misc/tickrs { }; + tig = gitAndTools.tig; timbreid = callPackage ../applications/audio/pd-plugins/timbreid { From de2188fc1cc67e315fe9f2089a8d70595d8c98bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 19:12:23 +0000 Subject: [PATCH 139/268] fetchmail: 6.4.13 -> 6.4.14 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 83d4103bc0c..ce6b7c64693 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.13"; + version = "6.4.14"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1qablzgwx3a516vdhckx3pv716x9r7nyfyr6fbncif861c3cya3x"; + sha256 = "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2"; }; buildInputs = [ openssl ]; From 944e59be778b81ef3faf1eb3a571c4a3478d825a Mon Sep 17 00:00:00 2001 From: Alexandre Macabies Date: Sun, 25 Oct 2020 18:54:00 +0100 Subject: [PATCH 140/268] python3Packages.pycmarkgfm: init at v1.0.1 --- .../python-modules/pycmarkgfm/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pycmarkgfm/default.nix diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix new file mode 100644 index 00000000000..f1d92a63d40 --- /dev/null +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -0,0 +1,32 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27, cffi, pytest }: + +buildPythonPackage rec { + pname = "pycmarkgfm"; + version = "1.0.1"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0wkbbma214f927ikn3cijxsrzkmm5cqz1x4fimrwx9s2wfphj250"; + }; + + propagatedBuildInputs = [ cffi ]; + + # I would gladly use pytestCheckHook, but pycmarkgfm relies on a native + # extension (cmark.so, built through setup.py), and pytestCheckHook runs + # pytest in an environment that does not contain this extension, which fails. + # cmarkgfm has virtually the same build setup as this package, and uses the + # same trick: pkgs/development/python-modules/cmarkgfm/default.nix + checkInputs = [ pytest ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + homepage = "https://github.com/zopieux/pycmarkgfm"; + description = "Bindings to GitHub's Flavored Markdown (cmark-gfm), with enhanced support for task lists"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ zopieux ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcbc6a9ba98..f99578dc0ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4864,6 +4864,8 @@ in { pycm = callPackage ../development/python-modules/pycm { }; + pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { }; + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; pycognito = callPackage ../development/python-modules/pycognito { }; From 67d7a671799c0d61a5393f2f1076fcbb0d99b5fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Nov 2020 22:47:21 +0000 Subject: [PATCH 141/268] tilt: 0.17.11 -> 0.17.12 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index ae47545ae4e..d362500ff59 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.17.11"; + version = "0.17.12"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0ggr8l93xpfm4ljjxw0g6kbm0q64hviaamcb5r2vrx9nabz95n95"; + sha256 = "0l70nmxvk30h56bs46cgakddzdf3laj1y88d0jchij0yy7ixa61f"; }; vendorSha256 = null; From 2b6a4a9fd2b747267da1bef9f9dde5cbaa66a7ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Nov 2020 22:48:58 +0100 Subject: [PATCH 142/268] Stackage Nightly 2020-11-23 --- .../configuration-hackage2nix.yaml | 105 +++++++++++------- 1 file changed, 66 insertions(+), 39 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ca49b17ee90..f0d66e28121 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -76,7 +76,7 @@ default-package-overrides: # haskell-language-server 0.5.0.0 doesn't accept newer versions - fourmolu ==0.2.* - refinery ==0.2.* - # Stackage Nightly 2020-11-11 + # Stackage Nightly 2020-11-23 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -91,6 +91,7 @@ default-package-overrides: - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 - aeson-combinators ==0.0.4.0 + - aeson-commit ==1.3 - aeson-compat ==0.3.9 - aeson-default ==0.9.1.0 - aeson-diff ==1.1.0.9 @@ -273,7 +274,7 @@ default-package-overrides: - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 - backtracking ==0.1.0 - - bank-holidays-england ==0.2.0.5 + - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 - base-compat ==0.11.2 - base-compat-batteries ==0.11.2 @@ -359,7 +360,7 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.57 + - brick ==0.57.1 - broadcast-chan ==0.2.1.1 - bsb-http-chunked ==0.0.0.4 - bson ==0.4.0.1 @@ -368,10 +369,11 @@ default-package-overrides: - buffer-pipe ==0.0 - bugsnag-hs ==0.2.0.3 - bugzilla-redhat ==0.3.0 - - burrito ==1.1.0.2 + - burrito ==1.2.0.0 - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 + - byte-count-reader ==0.10.1.2 - byte-order ==0.1.2.0 - byteable ==0.1.1 - bytedump ==1.0 @@ -393,7 +395,7 @@ default-package-overrides: - ca-province-codes ==1.0.0.0 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - - cabal-file ==0.1.0 + - cabal-file ==0.1.1 - cabal-flatpak ==0.1.0.2 - cabal-plan ==0.7.2.0 - cabal-rpm ==2.0.7 @@ -549,7 +551,7 @@ default-package-overrides: - crackNum ==2.4 - crc32c ==0.0.0 - credential-store ==0.1.2 - - criterion ==1.5.7.0 + - criterion ==1.5.9.0 - criterion-measurement ==0.1.2.0 - cron ==0.7.0 - crypto-api ==0.13.3 @@ -725,7 +727,7 @@ default-package-overrides: - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm2nix ==0.2 + - elm2nix ==0.2.1 - elynx ==0.5.0 - elynx-markov ==0.5.0 - elynx-nexus ==0.5.0 @@ -787,6 +789,8 @@ default-package-overrides: - failable ==1.2.4.0 - fakedata ==0.8.0 - fakedata-parser ==0.1.0.0 + - fakefs ==0.3.0.2 + - fakepull ==0.3.0.2 - fast-digits ==0.3.0.0 - fast-logger ==3.0.2 - fast-math ==1.0.2 @@ -873,6 +877,7 @@ default-package-overrides: - gd ==3000.7.3 - gdp ==0.0.3.0 - general-games ==1.1.1 + - generic-aeson ==0.2.0.11 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.0 @@ -913,10 +918,10 @@ default-package-overrides: - geojson ==4.0.2 - getopt-generics ==0.13.0.4 - ghc-byteorder ==4.11.0.0.10 - - ghc-check ==0.5.0.2 + - ghc-check ==0.5.0.3 - ghc-core ==0.5.6 - - ghc-events ==0.13.0 - - ghc-exactprint ==0.6.3.2 + - ghc-events ==0.14.0 + - ghc-exactprint ==0.6.3.3 - ghc-lib ==8.10.2.20200916 - ghc-lib-parser ==8.10.2.20200916 - ghc-lib-parser-ex ==8.10.0.16 @@ -956,7 +961,8 @@ default-package-overrides: - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - githash ==0.1.5.0 - - github-release ==1.3.3 + - github ==0.26 + - github-release ==1.3.5 - github-rest ==1.0.3 - github-types ==0.2.1 - github-webhooks ==0.15.0 @@ -992,6 +998,7 @@ default-package-overrides: - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - hadoop-streaming ==0.2.0.3 + - hakyll-convert ==0.3.0.3 - half ==0.3 - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 @@ -1044,6 +1051,7 @@ default-package-overrides: - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - hedis ==0.12.15 + - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.4 @@ -1070,7 +1078,7 @@ default-package-overrides: - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 - - hmatrix ==0.20.0.0 + - hmatrix ==0.20.1 - hmatrix-gsl ==0.19.0.1 - hmatrix-gsl-stats ==0.4.1.8 - hmatrix-morpheus ==0.1.1.2 @@ -1215,7 +1223,7 @@ default-package-overrides: - hxt-tagsoup ==9.1.4 - hxt-unicode ==9.0.2.4 - hybrid-vectors ==0.2.2 - - hyper ==0.1.0.3 + - hyper ==0.2.1.0 - hyperloglog ==0.4.3 - hyphenation ==0.8 - iconv ==0.4.1.3 @@ -1272,7 +1280,7 @@ default-package-overrides: - io-streams ==1.5.2.0 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.1 - - iproute ==1.7.9 + - iproute ==1.7.10 - IPv6Addr ==1.1.5 - ipynb ==0.1.0.1 - ipython-kernel ==0.10.2.1 @@ -1280,7 +1288,7 @@ default-package-overrides: - irc-client ==1.1.2.0 - irc-conduit ==0.3.0.4 - irc-ctcp ==0.1.3.0 - - isbn ==1.1.0.1 + - isbn ==1.1.0.2 - islink ==0.1.0.0 - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 @@ -1293,9 +1301,11 @@ default-package-overrides: - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 - jack ==0.7.1.4 + - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 - jose ==0.8.4 - jose-jwt ==0.8.0 + - js-chart ==2.9.4.1 - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 @@ -1433,9 +1443,9 @@ default-package-overrides: - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.5.5.0 + - massiv ==0.5.6.0 - massiv-io ==0.4.0.0 - - massiv-test ==0.1.4 + - massiv-test ==0.1.5 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 - mathexpr ==0.3.0.0 @@ -1472,7 +1482,7 @@ default-package-overrides: - microlens-mtl ==0.2.0.1 - microlens-platform ==0.4.1 - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.6 + - microlens-th ==0.4.3.8 - microspec ==0.2.1.3 - microstache ==1.0.1.1 - midair ==0.2.0.1 @@ -1519,6 +1529,7 @@ default-package-overrides: - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.3 - monad-peel ==0.2.1.2 + - monad-primitive ==0.1 - monad-products ==4.0.1 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 @@ -1542,6 +1553,7 @@ default-package-overrides: - morpheus-graphql-client ==0.16.0 - morpheus-graphql-core ==0.16.0 - morpheus-graphql-subscriptions ==0.16.0 + - moss ==0.2.0.0 - mountpoints ==1.0.2 - mpi-hs ==0.7.2.0 - mpi-hs-binary ==0.1.1.0 @@ -1561,6 +1573,7 @@ default-package-overrides: - mutable-containers ==0.3.4 - mwc-probability ==2.3.1 - mwc-random ==0.14.0.0 + - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.1.7.2 - mysql-simple ==0.4.5 @@ -1609,7 +1622,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - nonempty-containers ==0.3.4.1 - - nonempty-vector ==0.2.0.2 + - nonempty-vector ==0.2.1.0 - nonemptymap ==0.0.6.0 - not-gloss ==0.7.7.0 - nowdoc ==0.1.1.0 @@ -1669,7 +1682,7 @@ default-package-overrides: - optparse-simple ==0.1.1.3 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - - ormolu ==0.1.3.1 + - ormolu ==0.1.4.1 - overhang ==1.0.0 - packcheck ==0.5.1 - packdeps ==0.6.0.0 @@ -1677,9 +1690,10 @@ default-package-overrides: - pagination ==0.2.1 - pagure-cli ==0.2 - pandoc-types ==1.22 - - pantry ==0.5.1.3 + - pantry ==0.5.1.4 - parallel ==3.2.2.0 - parallel-io ==0.3.3 + - parameterized ==0.5.0.0 - paripari ==0.7.0.0 - parseargs ==0.2.0.9 - parsec-class ==1.0.0.0 @@ -1706,7 +1720,7 @@ default-package-overrides: - pathwalk ==0.3.1.2 - pattern-arrows ==0.0.2 - pava ==0.1.0.0 - - pcg-random ==0.1.3.6 + - pcg-random ==0.1.3.7 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.1.0 - pcre-utils ==0.1.8.1.1 @@ -1774,7 +1788,7 @@ default-package-overrides: - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-orm ==0.5.1 - - postgresql-simple ==0.6.2 + - postgresql-simple ==0.6.3 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 - pptable ==0.3.0.0 @@ -1801,7 +1815,9 @@ default-package-overrides: - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 + - primitive-extras ==0.8 - primitive-unaligned ==0.1.1.1 + - primitive-unlifted ==0.1.3.0 - print-console-colors ==0.1.0.0 - probability ==0.2.7 - process-extras ==0.7.4 @@ -1879,7 +1895,7 @@ default-package-overrides: - range-set-list ==0.1.3.1 - Ranged-sets ==0.4.0 - rank1dynamic ==0.4.1 - - rank2classes ==1.4.0.1 + - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - rate-limit ==1.4.2 @@ -2028,20 +2044,22 @@ default-package-overrides: - sequenceTools ==1.4.0.5 - serf ==0.1.1.0 - serialise ==0.2.3.0 - - servant ==0.18.1 + - servant ==0.18.2 - servant-blaze ==0.9.1 - - servant-client ==0.18.1 - - servant-client-core ==0.18.1 + - servant-client ==0.18.2 + - servant-client-core ==0.18.2 - servant-conduit ==0.15.1 - - servant-docs ==0.11.7 - - servant-foreign ==0.15.2 - - servant-http-streams ==0.18.1 + - servant-docs ==0.11.8 + - servant-errors ==0.1.6.0 + - servant-foreign ==0.15.3 + - servant-github-webhook ==0.4.2.0 + - servant-http-streams ==0.18.2 - servant-machines ==0.15.1 - servant-multipart ==0.12 - servant-openapi3 ==2.0.1.0 - servant-pipes ==0.15.2 - servant-rawm ==1.0.0.0 - - servant-server ==0.18.1 + - servant-server ==0.18.2 - servant-swagger ==1.1.10 - servant-swagger-ui ==0.3.4.3.36.1 - servant-swagger-ui-core ==0.3.3 @@ -2151,8 +2169,11 @@ default-package-overrides: - step-function ==0.2 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 + - stm-containers ==1.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 + - stm-hamt ==1.2.0.4 + - stm-lifted ==2.5.0.0 - stm-split ==0.0.2.1 - STMonadTrans ==0.4.4 - stopwatch ==0.1.0.6 @@ -2173,7 +2194,7 @@ default-package-overrides: - strict ==0.4 - strict-concurrency ==0.2.4.3 - strict-list ==0.1.5 - - strict-tuple ==0.1.3 + - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 @@ -2233,7 +2254,7 @@ default-package-overrides: - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.3.2 - tasty-hedgehog ==1.0.0.2 - - tasty-hspec ==1.1.5.1 + - tasty-hspec ==1.1.6 - tasty-hunit ==0.10.0.2 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 @@ -2282,7 +2303,7 @@ default-package-overrides: - text-regex-replace ==0.1.1.3 - text-region ==0.3.1.0 - text-short ==0.1.3 - - text-show ==3.8.5 + - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.10.1 - textlocal ==0.1.0.5 @@ -2298,7 +2319,7 @@ default-package-overrides: - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 - - th-lift-instances ==0.1.17 + - th-lift-instances ==0.1.18 - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 @@ -2332,7 +2353,7 @@ default-package-overrides: - timeit ==2.0 - timelens ==0.2.0.2 - timer-wheel ==0.3.0 - - timerep ==2.0.0.2 + - timerep ==2.0.1.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2350,7 +2371,8 @@ default-package-overrides: - topograph ==1.0.0.1 - torsor ==0.1 - tostring ==0.2.1.1 - - tracing ==0.0.5.1 + - tracing ==0.0.5.2 + - tracing-control ==0.0.6 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 @@ -2381,6 +2403,7 @@ default-package-overrides: - type-map ==0.1.6.0 - type-natural ==0.9.0.0 - type-of-html ==1.6.1.2 + - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - type-spec ==0.4.0.0 - TypeCompose ==0.9.14 @@ -2496,6 +2519,8 @@ default-package-overrides: - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 - wai-middleware-static ==0.9.0 + - wai-rate-limit ==0.1.0.0 + - wai-rate-limit-redis ==0.1.0.0 - wai-saml2 ==0.2.1.2 - wai-session ==0.3.3 - wai-slack-middleware ==0.2.0 @@ -2521,6 +2546,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 + - witch ==0.0.0.3 - with-location ==0.1.0 - with-utf8 ==1.0.2.1 - witherable-class ==0 @@ -2581,7 +2607,7 @@ default-package-overrides: - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 - yesod-bin ==1.6.0.6 - - yesod-core ==1.6.18.6 + - yesod-core ==1.6.18.7 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 @@ -2602,7 +2628,7 @@ default-package-overrides: - zeromq4-haskell ==0.8.0 - zeromq4-patterns ==0.3.1.0 - zim-parser ==0.2.1.0 - - zio ==0.1.0.0 + - zio ==0.1.0.2 - zip ==1.6.0 - zip-archive ==0.4.1 - zip-stream ==0.2.0.1 @@ -2614,6 +2640,7 @@ default-package-overrides: - zot ==0.0.3 - zstd ==0.1.2.0 - ztail ==1.2.0.2 + - zydiskell ==0.2.0.0 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. From 88593d9c707a0a8188d1caf8d1e8f21d34c01ba9 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 21 Nov 2020 20:47:18 +0100 Subject: [PATCH 143/268] haskellPackages.pcg-random: Activate tests --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aa1d0be1bb3..1854024ca59 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1483,10 +1483,6 @@ self: super: { # Due to tests restricting base in 0.8.0.0 release http-media = doJailbreak super.http-media; - # 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10 - # Issue has been fixed in 0.1.3.7, we can enable tests again, once stackage bumps the version - pcg-random = assert super.pcg-random.version == "0.1.3.6"; dontCheck super.pcg-random; - # Use an already merged upstream patch fixing the build with primitive >= 0.7.2 # The version bounds were correctly specified before, so we need to jailbreak as well streamly = appendPatch (doJailbreak super.streamly) (pkgs.fetchpatch { From 37e26436b69dd006ee4ebbc52659a064cb014f17 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 22 Nov 2020 01:23:10 +0100 Subject: [PATCH 144/268] haskellPackages: Fix a round of eval errors --- .../configuration-hackage2nix.yaml | 21 ++++++++++ .../haskell-modules/hackage-packages.nix | 42 +++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f0d66e28121..5c911126145 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8032,6 +8032,7 @@ broken-packages: - mu-protobuf - mu-rpc - mu-schema + - mu-servant-server - mu-tracing - MuCheck - MuCheck-Hspec @@ -9150,6 +9151,7 @@ broken-packages: - rclient - rdioh - react-flux + - react-flux-servant - react-haskell - react-tutorial-haskell-server - reaction-logic @@ -9359,6 +9361,7 @@ broken-packages: - rfc-prelude - rfc-psql - rfc-redis + - rfc-servant - rg - rhythm-game-tutorial - rib @@ -9623,6 +9626,23 @@ broken-packages: - serpentine - serv - serv-wai + - servant-auth-cookie + - servant-auth-token + - servant-auth-token-acid + - servant-auth-token-api + - servant-auth-token-leveldb + - servant-auth-token-persistent + - servant-auth-token-rocksdb + - servant-cli + - servant-csharp + - servant-db-postgresql + - servant-examples + - servant-iCalendar + - servant-jquery + - servant-js + - servant-openapi3 + - servant-snap + - servant-waargonaut - server-generic - serversession-backend-acid-state - serversession-backend-persistent @@ -10893,6 +10913,7 @@ broken-packages: - verilog - verismith - versioning + - versioning-servant - vflow-types - vfr-waypoints - vgrep diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a1fcd89803a..2fb34b3f788 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -176275,6 +176275,8 @@ self: { ]; description = "Servant servers for Mu definitions"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mu-tracing" = callPackage @@ -211476,6 +211478,8 @@ self: { libraryHaskellDepends = [ aeson base react-flux servant text ]; description = "Allow react-flux stores to send requests to a servant server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "react-haskell" = callPackage @@ -217587,6 +217591,8 @@ self: { ]; description = "The Servant extensions from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rfc1413-server" = callPackage @@ -225539,6 +225545,8 @@ self: { ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-docs" = callPackage @@ -225665,6 +225673,8 @@ self: { ]; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-acid" = callPackage @@ -225686,6 +225696,8 @@ self: { ]; description = "Acid-state backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-api" = callPackage @@ -225702,6 +225714,8 @@ self: { ]; description = "Servant based API for token based authorisation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-leveldb" = callPackage @@ -225723,6 +225737,8 @@ self: { ]; description = "Leveldb backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-persistent" = callPackage @@ -225742,6 +225758,8 @@ self: { ]; description = "Persistent backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-token-rocksdb" = callPackage @@ -225764,6 +225782,8 @@ self: { ]; description = "RocksDB backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-wordpress" = callPackage @@ -225903,6 +225923,8 @@ self: { ]; description = "Command line interface for Servant API clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-client" = callPackage @@ -226037,6 +226059,8 @@ self: { ]; description = "Generate servant client library for C#"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-db" = callPackage @@ -226073,6 +226097,8 @@ self: { ]; description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-dhall" = callPackage @@ -226260,6 +226286,8 @@ self: { ]; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-exceptions" = callPackage @@ -226523,6 +226551,8 @@ self: { ]; description = "Servant support for iCalendar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-jquery" = callPackage @@ -226541,6 +226571,8 @@ self: { ]; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-js" = callPackage @@ -226564,6 +226596,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-jsonrpc" = callPackage @@ -226837,6 +226871,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-options" = callPackage @@ -227363,6 +227399,8 @@ self: { ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-stache" = callPackage @@ -227711,6 +227749,8 @@ self: { ]; description = "Servant Integration for Waargonaut JSON Package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-wasm" = callPackage @@ -267412,6 +267452,8 @@ self: { ]; description = "Servant combinators for the versioning library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "versions" = callPackage From 07ae57e2b1ccb9db63dbfe1944602e10b23f1acf Mon Sep 17 00:00:00 2001 From: Arseniy Chekanov Date: Sat, 21 Nov 2020 19:48:25 +0300 Subject: [PATCH 145/268] haskellPackages.tart: unmark as broken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5c911126145..08ca097d548 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -10306,7 +10306,6 @@ broken-packages: - Tape - tapioca - target - - tart - task - task-distribution - taskell From 6c5f5cdb0fe53280adc41a9522b32634acef688f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Nov 2020 07:23:39 +1000 Subject: [PATCH 146/268] Revert "haskellPackages.trifecta: dontCheck on darwin" This reverts commit 10e961cdf942fb181bdb0bec8edbf0c6a95c17c1. Fixed by 473b341fb1aa01c23eb0ed942a03463cf029e21b. --- pkgs/development/haskell-modules/configuration-common.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1854024ca59..3ed5eac616f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -394,9 +394,7 @@ self: super: { tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; - # Aarch64 affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 - # Darwin https://hydra.nixos.org/build/129070963/nixlog/1 - trifecta = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.isDarwin) then dontCheck super.trifecta else super.trifecta; + trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; wai-logger = dontCheck super.wai-logger; From 8bf26dad96c1d9906b334f9314c7a31013e38153 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 22 Nov 2020 14:31:47 +0100 Subject: [PATCH 147/268] haskellPackages.update-nix-fetchgit: Remove eval error --- .../haskell-modules/configuration-common.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3ed5eac616f..878240229ba 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -85,11 +85,6 @@ self: super: { url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; }); - optparse-applicative_0_16_0_0 = appendPatch super.optparse-applicative_0_16_0_0 (pkgs.fetchpatch { - name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff"; - url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff"; - sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql"; - }); # Fix test trying to access /home directory shell-conduit = overrideCabal super.shell-conduit (drv: { @@ -1378,7 +1373,7 @@ self: super: { in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal (addTestToolDepends (super.update-nix-fetchgit.overrideScope (self: super: { optparse-generic = self.optparse-generic_1_4_4; - optparse-applicative = self.optparse-applicative_0_16_0_0; + optparse-applicative = self.optparse-applicative_0_16_1_0; })) deps) (drv: { buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; postInstall = drv.postInstall or "" + '' @@ -1388,10 +1383,6 @@ self: super: { ''; })); - optparse-generic_1_4_4 = super.optparse-generic_1_4_4.override { - optparse-applicative = self.optparse-applicative_0_16_0_0; - }; - # Our quickcheck-instances is too old for the newer binary-instances, but # quickcheck-instances is only used in the tests of binary-instances. binary-instances = dontCheck super.binary-instances; From 79e9ab2828eacba50ea524c4d9bd8fcbef765f83 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Mon, 23 Nov 2020 23:07:24 -0500 Subject: [PATCH 148/268] haskellPackages.pipes-text: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 878240229ba..b560deacb8c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1502,4 +1502,7 @@ self: super: { excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ]; }); + # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29 + pipes-text = doJailbreak super.pipes-text; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 08ca097d548..e9b0aeaf760 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8703,7 +8703,6 @@ broken-packages: - pipes-s3 - pipes-shell - pipes-sqlite-simple - - pipes-text - pipes-transduce - pipes-vector - pipes-zeromq4 From b8896bc35dbb9218b404edb0223dfa7858decda5 Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 24 Nov 2020 22:51:57 -0500 Subject: [PATCH 149/268] haskellPackages.blas-hs: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b560deacb8c..23bcfb79b32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1505,4 +1505,7 @@ self: super: { # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29 pipes-text = doJailbreak super.pipes-text; + # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8 + blas-hs = dontCheck super.blas-hs; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e9b0aeaf760..de9249f3e06 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3545,7 +3545,6 @@ broken-packages: - blakesum - blakesum-demo - blas - - blas-hs - BlastHTTP - blastxml - blatex From 9c3d2dda0125a140a4f1f070e73484cbdead028b Mon Sep 17 00:00:00 2001 From: Siva Mahadevan Date: Tue, 24 Nov 2020 22:52:15 -0500 Subject: [PATCH 150/268] haskellPackages.fmt: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 23bcfb79b32..63b7d9c79ad 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1508,4 +1508,7 @@ self: super: { # 2020-11-23: https://github.com/Rufflewind/blas-hs/issues/8 blas-hs = dontCheck super.blas-hs; + # 2020-11-23: https://github.com/cdornan/fmt/issues/30 + fmt = dontCheck super.fmt; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index de9249f3e06..92e8fa316cc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5170,7 +5170,6 @@ broken-packages: - FM-SBLEX - fmark - FModExRaw - - fmt - fmt-for-rio - fmt-terminal-colors - fn-extra From 0197ed239b26d844b75fa201c562630945af759d Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Tue, 24 Nov 2020 12:36:00 +0000 Subject: [PATCH 151/268] haskellPackages.irc-core: unbreak --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 92e8fa316cc..82963663a89 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2694,6 +2694,7 @@ package-maintainers: # - pipes-mongodb - streaming-wai kiwi: + - irc-core - Unique psibi: - path-pieces @@ -6994,7 +6995,6 @@ broken-packages: - iptadmin - IPv6DB - Irc - - irc-core - irc-dcc - irc-fun-bot - irc-fun-client From 9d4ce7a57bbb53b2524bd1c32a44c346b099ed4b Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Tue, 24 Nov 2020 12:41:33 +0000 Subject: [PATCH 152/268] haskellPackages.random_1_2_0: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 63b7d9c79ad..6ab43b67e41 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -399,6 +399,7 @@ self: super: { xsd = dontCheck super.xsd; zip-archive = dontCheck super.zip-archive; # https://github.com/jgm/zip-archive/issues/57 + random_1_2_0 = super.random_1_2_0.override ({ splitmix = self.splitmix_0_1_0_3; }); # These test suites run for ages, even on a fast machine. This is nuts. Random123 = dontCheck super.Random123; systemd = dontCheck super.systemd; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 82963663a89..000c7cf90c1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2695,6 +2695,7 @@ package-maintainers: - streaming-wai kiwi: - irc-core + - random_1_2_0 - Unique psibi: - path-pieces From 37d9f941e743372d5a7e70173b4c1dd5e63990e1 Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Tue, 24 Nov 2020 12:49:22 +0000 Subject: [PATCH 153/268] haskellPackages.QuickCheck_2_14_2: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6ab43b67e41..cda3504f04e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -366,6 +366,9 @@ self: super: { punycode = dontCheck super.punycode; pwstore-cli = dontCheck super.pwstore-cli; quantities = dontCheck super.quantities; + QuickCheck_2_14_2 = super.QuickCheck_2_14_2.override( { + splitmix = self.splitmix_0_1_0_3; + }); redis-io = dontCheck super.redis-io; rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 000c7cf90c1..a6a064b4675 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2695,6 +2695,7 @@ package-maintainers: - streaming-wai kiwi: - irc-core + - QuickCheck_2_14_2 - random_1_2_0 - Unique psibi: From 29416adfe89da883b667f602d735ee28975e4efd Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Tue, 24 Nov 2020 12:56:04 +0000 Subject: [PATCH 154/268] haskellPackages.config-value: unbreak haskellPackages.config-schema: unbreak --- .../haskell-modules/configuration-hackage2nix.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a6a064b4675..a53ceb4e12d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2694,6 +2694,8 @@ package-maintainers: # - pipes-mongodb - streaming-wai kiwi: + - config-schema + - config-value - irc-core - QuickCheck_2_14_2 - random_1_2_0 @@ -4142,9 +4144,7 @@ broken-packages: - conffmt - confide - config-parser - - config-schema - config-select - - config-value - config-value-getopt - ConfigFileTH - Configger From 30c00260776e2c0aaf7565469939d08debe0ed2d Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Tue, 24 Nov 2020 13:10:43 +0000 Subject: [PATCH 155/268] haskellPackages.glirc: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../development/haskell-modules/configuration-hackage2nix.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cda3504f04e..885ea2dde70 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -295,6 +295,9 @@ self: super: { github-rest = dontCheck super.github-rest; # test suite needs the network gitlib-cmdline = dontCheck super.gitlib-cmdline; GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 + #next release supports random 1.1; jailbroken because i didn't know about vty when glguy was updating the bounds + #should be fixed soon. maybe even before this is merged. currently glirc is 2.37 + glirc = doJailbreak (super.glirc.override { random = self.random_1_2_0; }); hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a53ceb4e12d..479dfb1374d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2696,6 +2696,7 @@ package-maintainers: kiwi: - config-schema - config-value + - glirc - irc-core - QuickCheck_2_14_2 - random_1_2_0 @@ -5533,7 +5534,6 @@ broken-packages: - gli - glicko - glider-nlp - - glirc - GLMatrix - glob-posix - global From 6d32709b2497316ad44bce185fc01828ac48babf Mon Sep 17 00:00:00 2001 From: Robert Djubek Date: Tue, 24 Nov 2020 13:17:26 +0000 Subject: [PATCH 156/268] haskellPackages.matterhorn: unbreak haskellPackages.mattermost-api: unbreak haskellPackages.mattermost-api-qc: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- .../haskell-modules/configuration-hackage2nix.yaml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 885ea2dde70..44af72af1cf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -338,7 +338,8 @@ self: super: { then dontCheck super.math-functions # "erf table" test fails on Darwin https://github.com/bos/math-functions/issues/63 else super.math-functions; matplotlib = dontCheck super.matplotlib; - + # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage + matterhorn = doJailbreak super.matterhorn; # this is needed until the end of time :') memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 479dfb1374d..b34826bf309 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2698,6 +2698,9 @@ package-maintainers: - config-value - glirc - irc-core + - matterhorn + - mattermost-api + - mattermost-api-qc - QuickCheck_2_14_2 - random_1_2_0 - Unique @@ -7739,9 +7742,6 @@ broken-packages: - matrix-market - matrix-sized - matsuri - - matterhorn - - mattermost-api - - mattermost-api-qc - maude - maxent - maxent-learner-hw From 69c69dfe9ad0d7553f7b2726044adc1f6899d854 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 27 Nov 2020 10:28:20 +0900 Subject: [PATCH 157/268] haskellPackages: remove QuickCheck_2_14_2 and random_1_2_0 from kiwi maintainer --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b34826bf309..a2df3f84670 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2701,8 +2701,6 @@ package-maintainers: - matterhorn - mattermost-api - mattermost-api-qc - - QuickCheck_2_14_2 - - random_1_2_0 - Unique psibi: - path-pieces From 2cc48d915f708e022b9d8b830b0c4335a1faf8d7 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 27 Nov 2020 12:45:26 +0100 Subject: [PATCH 158/268] haskellPackages.servant-swagger: dontCheck MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tests did not compile. Message: test/Servant/SwaggerSpec.hs:44:14: error: • No instance for (HasSwagger (Fragment Int :> Servant.Test.ComprehensiveAPI.GET)) arising from a use of ‘toSwagger’ • In the expression: toSwagger comprehensiveAPI In an equation for ‘_x’: _x = toSwagger comprehensiveAPI In the second argument of ‘($)’, namely ‘do let _x = toSwagger comprehensiveAPI True `shouldBe` True’ | 44 | let _x = toSwagger comprehensiveAPI | ^^^^^^^^^^^^^^^^^^^^^^^^^^ --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5080472666b..0bea1287392 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -73,6 +73,9 @@ self: super: { shellmet = doJailbreak super.shellmet; shower = doJailbreak super.shower; + # Broken test compile + servant-swagger = dontCheck super.servant-swagger; + # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); From 5598ed7480c0ac863536e12ae886dd3d322e3ea3 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 27 Nov 2020 13:19:31 +0100 Subject: [PATCH 159/268] haskellPackages.hercules-ci-agent: Update Cabal for Setup --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 0bea1287392..3c628a7a453 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -96,4 +96,7 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; + # cxx-options is broken in Cabal 3.2.0.0 + hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; + } From f1f8539583051c5bb90121344041d978c9bf98da Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 27 Nov 2020 13:20:11 +0100 Subject: [PATCH 160/268] haskellPackages.hercules-ci-agent: Configure unbroken --- .../haskell-modules/configuration-hackage2nix.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a2df3f84670..da45b4124bf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2712,6 +2712,9 @@ package-maintainers: - Agda roberth: - arion-compose + - hercules-ci-agent + - hercules-ci-api-agent + - hercules-ci-api-core cdepillabout: - pretty-simple - spago @@ -6208,9 +6211,6 @@ broken-packages: - HERA - herbalizer - HerbiePlugin - - hercules-ci-agent - - hercules-ci-api-agent - - hercules-ci-api-core - heredocs - Hermes - hermit From 505d721c3c8fc8768db5ab0de11d980536593737 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 27 Nov 2020 17:32:13 +0100 Subject: [PATCH 161/268] haskellPackages: Move some overrides and update affected derivations This is a follow-up to https://github.com/NixOS/nixpkgs/pull/105140 --- .../haskell-modules/configuration-common.nix | 8 ++++++++ .../haskell-modules/configuration-ghc-8.10.x.nix | 7 ------- .../haskell-modules/hackage-packages.nix | 13 +++++-------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 44af72af1cf..4d37668fd01 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1519,4 +1519,12 @@ self: super: { # 2020-11-23: https://github.com/cdornan/fmt/issues/30 fmt = dontCheck super.fmt; + + # 2020-11-27: Tests broken + # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 + servant-swagger = dontCheck super.servant-swagger; + + # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0 + hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 3c628a7a453..60d3f423246 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -73,9 +73,6 @@ self: super: { shellmet = doJailbreak super.shellmet; shower = doJailbreak super.shower; - # Broken test compile - servant-swagger = dontCheck super.servant-swagger; - # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); @@ -95,8 +92,4 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; - - # cxx-options is broken in Cabal 3.2.0.0 - hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; - } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2fb34b3f788..b3fc865fa8f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -123186,8 +123186,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.7.4"; - sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l"; + version = "0.7.5"; + sha256 = "0v3wyz8fm3n6rwanjgfxws6f18kp3qmgwx5g4f0xy00mxjzswjrq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123225,8 +123225,7 @@ self: { doHaddock = false; description = "Runs Continuous Integration tasks on your machines"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; "hercules-ci-api-agent" = callPackage @@ -123257,8 +123256,7 @@ self: { ]; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "hercules-ci-api-core" = callPackage @@ -123281,8 +123279,7 @@ self: { ]; description = "Types and convenience modules use across Hercules CI API packages"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "here" = callPackage From 87ad0a0674227dc9aee689770d1c88b193c4d666 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Fri, 27 Nov 2020 21:01:32 +0100 Subject: [PATCH 162/268] metals: 0.9.6 -> 0.9.7 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 37c99eaca85..0d8911e5b21 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.6"; + version = "0.9.7"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0cjivkrykvp2m8bj3x9fsk7nsr5vxf87jfh4rjn24kfliljwfh2w"; + outputHash = "0aky4vbbm5hi6jnd2n1aimqznbbaya05c7vdgaqhy3630ks3w4k9"; }; nativeBuildInputs = [ makeWrapper ]; From 9ba2fb7994d6effc6fbc6d1dc8d0b51fecc51906 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Nov 2020 19:59:38 +0100 Subject: [PATCH 163/268] hackage2nix: update list of broken packages to fix evaluation errors on Hydra Ping @roberth because of broken package arion-compose. Ping @rkrzr because of broken package icepeak. --- .../configuration-hackage2nix.yaml | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index da45b4124bf..93c4daac224 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3177,6 +3177,7 @@ broken-packages: - arbor-monad-metric-datadog - arbtt - arch-hs + - archive-libarchive - archiver - archlinux - archlinux-web @@ -3459,6 +3460,7 @@ broken-packages: - bindings-apr-util - bindings-bfd - bindings-cctools + - bindings-common - bindings-dc1394 - bindings-eskit - bindings-EsounD @@ -3780,6 +3782,7 @@ broken-packages: - call-haskell-from-anything - camfort - campfire + - candid - canon - canonical-filepath - canonical-json @@ -3936,6 +3939,9 @@ broken-packages: - citeproc-hs-pandoc-filter - cj-token - cjk + - cl3 + - cl3-hmatrix-interface + - cl3-linear-interface - clac - clafer - claferIG @@ -4226,6 +4232,7 @@ broken-packages: - CoreDump - CoreErlang - CoreFoundation + - corenlp-parser - Coroutine - coroutine-enumerator - coroutine-iteratee @@ -4243,6 +4250,7 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit + - cpkg - CPL - cplusplus-th - cprng-aes-effect @@ -4332,6 +4340,7 @@ broken-packages: - curry-frontend - CurryDB - cursedcsv + - cursor-fuzzy-time-gen - curves - custom-prelude - CV @@ -5022,6 +5031,7 @@ broken-packages: - fastirc - fastly - FastPush + - fastsum - FastxPipe - fathead-util - fault-tree @@ -5206,6 +5216,7 @@ broken-packages: - FormalGrammars - format - format-status + - formatn - formattable - forml - formlets @@ -5323,6 +5334,7 @@ broken-packages: - fusion - futun - future + - fuzzy-time-gen - fuzzy-timings - fwgl - fwgl-glfw @@ -6082,6 +6094,7 @@ broken-packages: - hasql-postgres-options - hasql-queue - hasql-simple + - hasql-th - hastache - hastache-aeson - haste @@ -6163,6 +6176,7 @@ broken-packages: - hdr-histogram - HDRUtils - headergen + - heap-console - heapsort - heart-app - heart-core @@ -6181,6 +6195,7 @@ broken-packages: - hedgehog-gen-json - hedgehog-generic - hedgehog-golden + - hedgehog-servant - Hedi - hedis-config - hedis-pile @@ -6779,6 +6794,7 @@ broken-packages: - hw-json-simd - hw-json-simple-cursor - hw-json-standard-cursor + - hw-prim-bits - hw-simd - hw-uri - hwall-auth-iitk @@ -7418,6 +7434,7 @@ broken-packages: - lhe - lhs2TeX-hl - lhslatex + - libarchive - LibClang - libconfig - libcspm @@ -7835,6 +7852,10 @@ broken-packages: - midimory - midisurface - mighttpd + - migrant-core + - migrant-hdbc + - migrant-postgresql-simple + - migrant-sqlite-simple - mikmod - mikrokosmos - miku @@ -7908,6 +7929,7 @@ broken-packages: - monad-log - monad-lrs - monad-mersenne-random + - monad-metrics-extensible - monad-mock - monad-open - monad-parallel-progressbar @@ -8114,6 +8136,9 @@ broken-packages: - nagios-plugin-ekg - nakadi-client - named-lock + - named-servant + - named-servant-client + - named-servant-server - named-sop - namelist - namespace @@ -8190,6 +8215,7 @@ broken-packages: - network-hans - network-house - network-interfacerequest + - network-messagepack-rpc-websocket - network-minihttp - network-msgpack-rpc - network-netpacket @@ -8815,6 +8841,7 @@ broken-packages: - postgresql-simple-queue - postgresql-simple-sop - postgresql-simple-typed + - postgresql-syntax - postgresql-tx-query - postgresql-tx-squeal - postgresql-typed-lifted @@ -9220,6 +9247,8 @@ broken-packages: - reflex-gloss - reflex-gloss-scene - reflex-libtelnet + - reflex-localize + - reflex-localize-dom - reflex-orphans - reflex-process - reflex-sdl2 @@ -9400,6 +9429,7 @@ broken-packages: - roc-cluster - roc-cluster-demo - rock + - rocksdb-haskell - roku-api - rollbar - rollbar-hs @@ -9571,6 +9601,7 @@ broken-packages: - sdl2-cairo-image - sdl2-compositor - sdl2-fps + - sdr - seakale - seakale-postgresql - seakale-tests @@ -9623,23 +9654,78 @@ broken-packages: - serpentine - serv - serv-wai + - servant-aeson-specs - servant-auth-cookie + - servant-auth-hmac - servant-auth-token - servant-auth-token-acid - servant-auth-token-api - servant-auth-token-leveldb - servant-auth-token-persistent - servant-auth-token-rocksdb + - servant-auth-wordpress + - servant-avro + - servant-cassava - servant-cli + - servant-client-js + - servant-client-namedargs - servant-csharp + - servant-db - servant-db-postgresql + - servant-dhall + - servant-docs-simple + - servant-ede + - servant-ekg + - servant-elm - servant-examples + - servant-fiat-content + - servant-generate + - servant-generic + - servant-github + - servant-haxl-client + - servant-hmac-auth + - servant-http2-client - servant-iCalendar - servant-jquery - servant-js + - servant-JuicyPixels + - servant-kotlin + - servant-matrix-param + - servant-mock + - servant-namedargs + - servant-nix - servant-openapi3 + - servant-pagination + - servant-pandoc + - servant-pool + - servant-postgresql + - servant-proto-lens + - servant-purescript + - servant-pushbullet-client + - servant-py + - servant-quickcheck + - servant-rawm-client + - servant-reason + - servant-reflex + - servant-router + - servant-scotty + - servant-seo + - servant-serf + - servant-server-namedargs + - servant-smsc-ru - servant-snap + - servant-streaming + - servant-streaming-client + - servant-streaming-docs + - servant-streaming-server + - servant-swagger-tags + - servant-to-elm - servant-waargonaut + - servant-yaml + - servant-zeppelin + - servant-zeppelin-client + - servant-zeppelin-server + - servant-zeppelin-swagger - server-generic - serversession-backend-acid-state - serversession-backend-persistent @@ -9795,6 +9881,7 @@ broken-packages: - skeletons - skell - skemmtun + - skews - skulk - skylark-client - skylighting-lucid @@ -10538,6 +10625,7 @@ broken-packages: - tomato-rubato-openal - toml - tonatona-google-server-api + - tonatona-servant - too-many-cells - toodles - top @@ -10720,6 +10808,9 @@ broken-packages: - typesafe-precure - typescript-docs - typograffiti + - typson-beam + - typson-esqueleto + - typson-selda - tyro - u2f - uber @@ -11135,6 +11226,7 @@ broken-packages: - wsedit - wshterm - wsjtx-udp + - wss-client - wstunnel - wtk - wtk-gtk @@ -11405,6 +11497,7 @@ broken-packages: - zeromq3-haskell - zeromq4-clone-pattern - zeromq4-conduit + - zeromq4-patterns - zeroth - zettelkast - ZFS From e5f1bf5613808889a31c1ef88c4f658e3f8a57b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 20 Nov 2020 22:50:02 +0100 Subject: [PATCH 164/268] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-28-gd194902 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/b5541c17abfc109ebcae8027b28b176a2966fa68. --- .../haskell-modules/hackage-packages.nix | 2166 ++++++++++------- 1 file changed, 1296 insertions(+), 870 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b3fc865fa8f..154c9ec14cb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -20659,8 +20659,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.9"; - sha256 = "1y4mchf317bkhwivnppnsk9r567c0cjymg3mc1n6h0cn799rx7bk"; + version = "0.3.10"; + sha256 = "16m08h11c8wwi159ppn698m60nk54k4dgxa2di2j02g58l16pmcn"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21834,24 +21834,25 @@ self: { }) {}; "Z-IO" = callPackage - ({ mkDerivation, base, bytestring, exceptions, hashable, hspec - , hspec-discover, HUnit, primitive, QuickCheck + ({ mkDerivation, base, bytestring, containers, exceptions, hashable + , hspec, hspec-discover, HUnit, primitive, QuickCheck , quickcheck-instances, scientific, stm, time, unix-time , unordered-containers, word8, Z-Data, zlib }: mkDerivation { pname = "Z-IO"; - version = "0.1.8.0"; - sha256 = "14xh727r7zasm92ah0a6wccn1zksg0pmrvh8xdaldh4qkj706ga7"; + version = "0.1.9.0"; + sha256 = "1f9774065arknwm8f1avq7v769cfa610dy45winva3ys4345xcyy"; libraryHaskellDepends = [ - base exceptions primitive stm time unix-time unordered-containers - Z-Data + base containers exceptions primitive stm time unix-time + unordered-containers Z-Data ]; libraryToolDepends = [ hspec-discover ]; testHaskellDepends = [ base bytestring hashable hspec HUnit primitive QuickCheck quickcheck-instances scientific word8 Z-Data zlib ]; + testToolDepends = [ hspec-discover ]; description = "Simple and high performance IO toolkit for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -24076,6 +24077,37 @@ self: { broken = true; }) {}; + "advent-of-code-ocr" = callPackage + ({ mkDerivation, base, containers, criterion, data-default-class + , heredoc, hspec, optparse-applicative, template-haskell, th-lift + , th-lift-instances + }: + mkDerivation { + pname = "advent-of-code-ocr"; + version = "0.1.0.0"; + sha256 = "03qak7hic0kbmxz7krq5z2a8ah6z7pzr7r3sybd5h778m4sgvdca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default-class heredoc template-haskell th-lift + th-lift-instances + ]; + executableHaskellDepends = [ + base containers data-default-class heredoc optparse-applicative + template-haskell th-lift th-lift-instances + ]; + testHaskellDepends = [ + base containers data-default-class heredoc hspec template-haskell + th-lift th-lift-instances + ]; + benchmarkHaskellDepends = [ + base containers criterion data-default-class heredoc + template-haskell th-lift th-lift-instances + ]; + description = "Parse Advent of Code ASCII art letters"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aern2-mp" = callPackage ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens , mixed-types-num, QuickCheck, regex-tdfa, rounded @@ -31960,6 +31992,8 @@ self: { libraryToolDepends = [ cpphs ]; description = "Common interface using libarchive"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "archive-sig" = callPackage @@ -33405,8 +33439,8 @@ self: { ({ mkDerivation, async, base, process, text }: mkDerivation { pname = "aspell-pipe"; - version = "0.5"; - sha256 = "19qgw7nwbbkw1p40ljmjgbb00i44nmqy41m2bcs74w076izz51mf"; + version = "0.6"; + sha256 = "09dw4v4j5pmqi8pdh3p7kk7f8pph5w33s7vd21fgvhv3arnrj6p8"; libraryHaskellDepends = [ async base process text ]; description = "Pipe-based interface to the Aspell program"; license = stdenv.lib.licenses.bsd3; @@ -37143,18 +37177,6 @@ self: { }) {}; "bank-holidays-england" = callPackage - ({ mkDerivation, base, containers, hspec, QuickCheck, time }: - mkDerivation { - pname = "bank-holidays-england"; - version = "0.2.0.5"; - sha256 = "0n7q9s1vsmh5adkhpgycz8y6q49xqf77fpmm73cw0iqgjly4x9hp"; - libraryHaskellDepends = [ base containers time ]; - testHaskellDepends = [ base containers hspec QuickCheck time ]; - description = "Calculation of bank holidays in England and Wales"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bank-holidays-england_0_2_0_6" = callPackage ({ mkDerivation, base, containers, hspec, QuickCheck, time }: mkDerivation { pname = "bank-holidays-england"; @@ -37164,7 +37186,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "banwords" = callPackage @@ -37224,6 +37245,8 @@ self: { pname = "barbly"; version = "0.1.0.0"; sha256 = "1mmbvgw5g2jb8qv7vd00iym9xyb07jx03wi6x1ldqvzfn2vcc22l"; + revision = "1"; + editedCabalFile = "09xb9p2ik8kpa2gras9jqs4rr55bsbd7xnmgijxxzwf9hl00k0by"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38599,8 +38622,8 @@ self: { }: mkDerivation { pname = "beam-automigrate"; - version = "0.1.0.0"; - sha256 = "1a9pjmzzyibp6fgrn0p9scczzc2afx5n1947qn5ifcz23hnwnj55"; + version = "0.1.0.1"; + sha256 = "0sjp09wfp6qlrbl6w8ddwngsnrwvp225msqgnv0l1x4nwxia5kpz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -40606,6 +40629,8 @@ self: { libraryHaskellDepends = [ base ]; description = "This package is obsolete. Look for bindings-DSL instead."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bindings-dc1394" = callPackage @@ -42522,6 +42547,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) gmp;}; + "bitvec_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, gauge + , ghc-prim, integer-gmp, primitive, quickcheck-classes, random + , tasty, tasty-hunit, tasty-quickcheck, vector + }: + mkDerivation { + pname = "bitvec"; + version = "1.1.0.0"; + sha256 = "1blfi62immsx7hvg9krdbcp9n1p2a9qyhm9j30lc0g2jcl1n11mz"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp primitive vector + ]; + testHaskellDepends = [ + base integer-gmp primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base containers gauge integer-gmp random vector + ]; + description = "Space-efficient bit vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bitwise" = callPackage ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }: mkDerivation { @@ -42896,8 +42945,6 @@ self: { testHaskellDepends = [ base vector ]; description = "Low-level Haskell bindings to Blas"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) blas;}; "blastxml" = callPackage @@ -44690,18 +44737,20 @@ self: { "box" = callPackage ({ mkDerivation, attoparsec, base, comonad, concurrency , contravariant, dejafu, doctest, exceptions, generic-lens, lens - , mmorph, mtl, numhask, optparse-generic, profunctors, random, text - , time, transformers, transformers-base, websockets + , mmorph, mtl, numhask, numhask-space, optparse-generic + , profunctors, random, text, time, transformers, transformers-base + , websockets }: mkDerivation { pname = "box"; - version = "0.6.0"; - sha256 = "0kv3j0fh2ahn4x2lgpghhkrbw5y1cy5mdlrriycqv4slrdzaqyks"; + version = "0.6.2"; + sha256 = "1mwmz97s8mvan8fn8ps0gnzsidar1ygjfkgrcjglfklh5bmm8823"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base comonad concurrency contravariant exceptions lens - mmorph numhask profunctors text time transformers transformers-base + mmorph numhask numhask-space profunctors text time transformers + transformers-base ]; executableHaskellDepends = [ base concurrency dejafu exceptions generic-lens lens mtl numhask @@ -44720,8 +44769,8 @@ self: { }: mkDerivation { pname = "box-csv"; - version = "0.0.2"; - sha256 = "09qmxd9mxyag6zx8y5yv7bphycbs35zfkkf7kvkdmjqdk7l7b0fd"; + version = "0.0.3"; + sha256 = "16kg45hma04r6slw2fic5jbamkcbv6mgqybw081w76hckcg72522"; libraryHaskellDepends = [ attoparsec base box generic-lens lens numhask scientific text time ]; @@ -44733,18 +44782,19 @@ self: { }) {}; "box-socket" = callPackage - ({ mkDerivation, base, box, concurrency, doctest, exceptions - , generic-lens, lens, numhask, optparse-generic, websockets + ({ mkDerivation, base, box, bytestring, concurrency, doctest + , exceptions, generic-lens, lens, network, network-simple, numhask + , optparse-generic, websockets }: mkDerivation { pname = "box-socket"; - version = "0.0.2"; - sha256 = "0wf7smpzczqm0yqnphmp46bgm67nyhj0swn0vxhdgb8z0362szsp"; + version = "0.1.1"; + sha256 = "162c3rnr5h5a8sixwnsbvf6fdbghsxx1ckvgdn4pd4b5xfa287j0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base box concurrency exceptions generic-lens lens numhask - websockets + base box bytestring concurrency exceptions generic-lens lens + network network-simple numhask websockets ]; executableHaskellDepends = [ base box concurrency generic-lens lens numhask optparse-generic @@ -44954,34 +45004,6 @@ self: { }) {}; "brick" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers - , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap - }: - mkDerivation { - pname = "brick"; - version = "0.57"; - sha256 = "15481cmm208gxcs96rcvg6qgx87b2fk7ws82675viasw64mhvmg1"; - revision = "1"; - editedCabalFile = "0vi6a3m6i4x6pndmcc39x37pyd9ar7m6z7b0lahnw6ayssxiq3pq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap - ]; - testHaskellDepends = [ - base containers microlens QuickCheck vector - ]; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "brick_0_57_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -45007,7 +45029,6 @@ self: { ]; description = "A declarative terminal user interface library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "brick-dropdownmenu" = callPackage @@ -46264,23 +46285,6 @@ self: { }) {}; "burrito" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, parsec - , QuickCheck, template-haskell, text, transformers - }: - mkDerivation { - pname = "burrito"; - version = "1.1.0.2"; - sha256 = "1k625j5syyiq66i88zy6q0mvwkjl5jsj79sxdmd1rbam3m39whx1"; - libraryHaskellDepends = [ - base bytestring containers parsec template-haskell text - transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck text ]; - description = "Parse and render URI templates"; - license = stdenv.lib.licenses.isc; - }) {}; - - "burrito_1_2_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, hspec, parsec , QuickCheck, template-haskell, text, transformers }: @@ -46295,7 +46299,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck text ]; description = "Parse and render URI templates"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "burst-detection" = callPackage @@ -48006,29 +48009,6 @@ self: { }) {}; "cabal-file" = callPackage - ({ mkDerivation, base, bytestring, Cabal, directory, extra - , filepath, hackage-security, optparse-applicative, simple-cabal - , simple-cmd, simple-cmd-args, time - }: - mkDerivation { - pname = "cabal-file"; - version = "0.1.0"; - sha256 = "1khf39awvpnqxs0rlqa6n5810x9kkn31975v6kbmwwdrjjp2qlqw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal directory extra filepath hackage-security - optparse-applicative simple-cabal simple-cmd time - ]; - executableHaskellDepends = [ - base bytestring Cabal directory extra filepath optparse-applicative - simple-cabal simple-cmd simple-cmd-args - ]; - description = "Cabal file access"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-file_0_1_1" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, extra , filepath, hackage-security, optparse-applicative, simple-cabal , simple-cmd, simple-cmd-args, time @@ -48049,7 +48029,6 @@ self: { ]; description = "Cabal file access"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-file-th" = callPackage @@ -49790,6 +49769,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "candid" = callPackage + ({ mkDerivation, base, base32, bytestring, cereal, constraints + , containers, crc, directory, dlist, doctest, filepath, hex-text + , leb128-cereal, megaparsec, mtl, optparse-applicative + , prettyprinter, row-types, scientific, smallcheck, split, tasty + , tasty-hunit, tasty-rerun, tasty-smallcheck, template-haskell + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "candid"; + version = "0.1"; + sha256 = "0mg7h936if93wdrhnri07530rnz7mnwlz5hpj1qp4bcwknsjs3b4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base32 bytestring cereal constraints containers crc dlist + hex-text leb128-cereal megaparsec mtl prettyprinter row-types + scientific split template-haskell text transformers + unordered-containers vector + ]; + executableHaskellDepends = [ + base bytestring hex-text optparse-applicative prettyprinter text + ]; + testHaskellDepends = [ + base bytestring directory doctest filepath leb128-cereal + prettyprinter row-types smallcheck tasty tasty-hunit tasty-rerun + tasty-smallcheck template-haskell text unordered-containers vector + ]; + description = "Candid integration"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "canon" = callPackage ({ mkDerivation, arithmoi, array, base, containers, random }: mkDerivation { @@ -50067,19 +50080,19 @@ self: { }) {}; "capnp" = callPackage - ({ mkDerivation, async, base, bytes, bytestring, containers, cpu - , data-default, data-default-instances-vector, deepseq, directory - , exceptions, filepath, focus, hashable, heredoc, hspec, list-t - , monad-stm, mtl, network, network-simple, pretty-show, primitive - , process, process-extras, QuickCheck, quickcheck-instances - , quickcheck-io, reinterpret-cast, resourcet, safe-exceptions, stm - , stm-containers, supervisors, text, transformers, vector - , wl-pprint-text + ({ mkDerivation, async, base, bifunctors, bytes, bytestring + , containers, cpu, data-default, data-default-instances-vector + , deepseq, directory, exceptions, filepath, focus, hashable + , heredoc, hspec, list-t, monad-stm, mtl, network, network-simple + , pretty-show, primitive, process, process-extras, QuickCheck + , quickcheck-instances, quickcheck-io, reinterpret-cast, resourcet + , safe-exceptions, stm, stm-containers, supervisors, text + , transformers, vector, wl-pprint-text }: mkDerivation { pname = "capnp"; - version = "0.7.0.0"; - sha256 = "1mzs7f50840jbyzdipff47rwjmxv7i0rk6w4rdljzkw36yz4kj4v"; + version = "0.8.0.0"; + sha256 = "0jqq1yal41rnc8z66b24kiycyxdzwpqykx1p8v1rc3qbn4i3n255"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50090,9 +50103,9 @@ self: { text transformers vector ]; executableHaskellDepends = [ - base bytes bytestring containers data-default directory exceptions - filepath monad-stm mtl primitive reinterpret-cast safe-exceptions - text transformers vector wl-pprint-text + base bifunctors bytes bytestring containers data-default directory + exceptions filepath monad-stm mtl primitive reinterpret-cast + safe-exceptions text transformers vector wl-pprint-text ]; testHaskellDepends = [ async base bytes bytestring containers data-default deepseq @@ -54305,6 +54318,8 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Clifford Algebra of three dimensional space"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cl3-hmatrix-interface" = callPackage @@ -54316,6 +54331,8 @@ self: { libraryHaskellDepends = [ base cl3 hmatrix ]; description = "Interface to/from Cl3 and HMatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cl3-linear-interface" = callPackage @@ -54327,6 +54344,8 @@ self: { libraryHaskellDepends = [ base cl3 linear ]; description = "Interface to/from Cl3 and Linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "clac" = callPackage @@ -55342,16 +55361,17 @@ self: { "cli-extras" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , exceptions, io-streams, lens, logging-effect, monad-loops, mtl - , process, terminal-size, text, time, transformers, which + , exceptions, io-streams, lens, logging-effect, monad-logger + , monad-loops, mtl, process, terminal-size, text, time + , transformers, which }: mkDerivation { pname = "cli-extras"; - version = "0.1.0.0"; - sha256 = "14li1rkkaihklq62m9v9in2lbsr19v1h228a77ik25qarqw4xp9d"; + version = "0.1.0.1"; + sha256 = "1fggrnhdbr2ialdd93d0m81b85izs1gvcs8bkmwm8wdxgw4v7hsi"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions - io-streams lens logging-effect monad-loops mtl process + io-streams lens logging-effect monad-logger monad-loops mtl process terminal-size text time transformers which ]; description = "Miscellaneous utilities for building and working with command line interfaces"; @@ -55366,8 +55386,8 @@ self: { }: mkDerivation { pname = "cli-git"; - version = "0.1.0.0"; - sha256 = "1d9b8wyxzi233lq8qh3fh6v7icikjy4ryhhw033s5207biqqrifh"; + version = "0.1.0.1"; + sha256 = "0jchv1j7dgay6xzny9rinsybavs4ggk93450cka6sp7015z06ysr"; libraryHaskellDepends = [ base cli-extras containers data-default exceptions lens logging-effect megaparsec mtl text @@ -55384,8 +55404,8 @@ self: { }: mkDerivation { pname = "cli-nix"; - version = "0.1.0.0"; - sha256 = "0z858fjsrnfb9cwzq8hxyhpwn61m50rjv1916c7zf8nrfsa82z0y"; + version = "0.1.0.1"; + sha256 = "1ynrni7zyhw8g70bdmd5vamnkw5vac4n5nmxwyka52nqy3zrrlwj"; libraryHaskellDepends = [ base cli-extras data-default exceptions lens logging-effect mtl text @@ -55881,8 +55901,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "2.0.0"; - sha256 = "0jkikp92k6pdqpa0c2mda81pplshyn7rdw1g2h2hhpjjg0g9npd1"; + version = "2.0.1"; + sha256 = "0s01582a2iyibwhlkmmf4n9h0fs3w0sjip65j78c4hldc91ylvqd"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -60127,6 +60147,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_3_4" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hspec, kan-extensions + , mono-traversable, mtl, mwc-random, primitive, QuickCheck + , resourcet, safe, silently, split, text, transformers, unix + , unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.3.4"; + sha256 = "1w30chhqryhkv82mvwqi1q09fvfxva70280q3nf4h97amld860lz"; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath mono-traversable mtl + primitive resourcet text transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + mono-traversable mtl QuickCheck resourcet safe silently split text + transformers unliftio vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge hspec kan-extensions mwc-random + transformers vector + ]; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers @@ -60946,8 +60995,7 @@ self: { testHaskellDepends = [ base config-value text ]; description = "Schema definitions for the config-value package"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "config-select" = callPackage @@ -60974,13 +61022,14 @@ self: { pname = "config-value"; version = "0.8"; sha256 = "1l2w2ylxx9d48pjnc9490kisawz48mf038f108g3zvb0j3iz9vyn"; + revision = "1"; + editedCabalFile = "0s121lvv1bv658ig1r3gdkf37wjyvgy958ll1497r8hsc6y73f4m"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; description = "Simple, layout-based value language similar to YAML or JSON"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "config-value-getopt" = callPackage @@ -63092,6 +63141,8 @@ self: { librarySystemDepends = [ rocksdb ]; description = "Launches CoreNLP and parses the JSON output"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) rocksdb;}; "cornea" = callPackage @@ -63499,6 +63550,8 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cplex-hs" = callPackage @@ -64401,43 +64454,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat - , base-compat-batteries, binary, binary-orphans, bytestring - , cassava, code-page, containers, criterion-measurement, deepseq - , directory, exceptions, filepath, Glob, HUnit, js-flot, js-jquery - , microstache, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-compat, vector - , vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.5.7.0"; - sha256 = "1qzn2k1b2all543v47p93p15a5y8lps002vbxmkr6xrinp91cvqk"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base base-compat-batteries binary - binary-orphans bytestring cassava code-page containers - criterion-measurement deepseq directory exceptions filepath Glob - js-flot js-jquery microstache mtl mwc-random optparse-applicative - parsec statistics text time transformers transformers-compat vector - vector-algorithms - ]; - executableHaskellDepends = [ - base base-compat-batteries optparse-applicative - ]; - testHaskellDepends = [ - aeson base base-compat base-compat-batteries bytestring deepseq - directory HUnit QuickCheck statistics tasty tasty-hunit - tasty-quickcheck vector - ]; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_5_9_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat , base-compat-batteries, binary, binary-orphans, bytestring , cassava, code-page, containers, criterion-measurement, deepseq @@ -64472,7 +64488,6 @@ self: { ]; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-compare" = callPackage @@ -66602,6 +66617,8 @@ self: { base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cursor-gen" = callPackage @@ -67588,6 +67605,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-as" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "data-as"; + version = "0.0.0.2"; + sha256 = "1rqdffwyxrnvsrqchnknjdmdz7afzhplyalnrclrm5zm6gj0dlia"; + libraryHaskellDepends = [ base profunctors ]; + description = "Simple extensible sum"; + license = stdenv.lib.licenses.mit; + }) {}; + "data-ascii" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , hashable, semigroups, text @@ -71050,6 +71078,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "deferred-folds_0_9_15" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, hashable + , primitive, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "deferred-folds"; + version = "0.9.15"; + sha256 = "0jijnjy6x6f86dmlhiaj9gl13zbwzaz4gpb8svzdwwws48bwwyqr"; + libraryHaskellDepends = [ + base bytestring containers foldl hashable primitive text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + QuickCheck quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + description = "Abstractions over deferred folds"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "definitive-base" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector @@ -71415,8 +71466,8 @@ self: { }: mkDerivation { pname = "dense"; - version = "0.1.0.0"; - sha256 = "1cyprx6z66cmg98j2zijjjznicfvybr678h4vaj4ppmfxgalkz99"; + version = "0.1.0.1"; + sha256 = "00hm40myj6m7hh9v5w75252wi7azf5fq6ldmpn7p0cv4sxj8mnmg"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq ghc-prim hashable lens linear primitive semigroupoids template-haskell transformers @@ -74970,8 +75021,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.8.0"; - sha256 = "1zh4xf5a8ppfhcnkhai4mi0a7aj7m8qp8hcnyfi6s3nc86k7wj2w"; + version = "1.8.1"; + sha256 = "07rhg7r4v05q1y6rin4b5v49231r2w35jfwnrbg7b7s1skdld9g3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81666,8 +81717,8 @@ self: { }: mkDerivation { pname = "elm2nix"; - version = "0.2"; - sha256 = "1bv2sid1adrg3327h9611kspfxkhgwcawjq59iapp776n74x2iq4"; + version = "0.2.1"; + sha256 = "1lgqbmd5419apak7hy22p0fpjzcki74snpgqsq2qmhpvyi5qbf3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87521,6 +87572,8 @@ self: { ]; description = "A fast open-union type suitable for 100+ contained alternatives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fathead-util" = callPackage @@ -91723,8 +91776,6 @@ self: { ]; description = "A new formatting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fmt-for-rio" = callPackage @@ -92500,6 +92551,25 @@ self: { broken = true; }) {}; + "formatn" = callPackage + ({ mkDerivation, attoparsec, base, containers, doctest, foldl + , generic-lens, numhask, scientific, tdigest, text, transformers + }: + mkDerivation { + pname = "formatn"; + version = "0.0.1"; + sha256 = "0rw1xli4df72wxylf211jhm0v2y842rfn8nalrp04yzklvyrri84"; + libraryHaskellDepends = [ + attoparsec base containers foldl generic-lens numhask scientific + tdigest text transformers + ]; + testHaskellDepends = [ base doctest numhask ]; + description = "Number text formatting"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "formattable" = callPackage ({ mkDerivation, base, bytestring, data-default-class , double-conversion, hspec, HUnit, lens, old-locale, QuickCheck @@ -95680,6 +95750,8 @@ self: { base criterion fuzzy-time genvalidity-criterion ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fuzzy-timings" = callPackage @@ -98762,23 +98834,6 @@ self: { }) {}; "ghc-check" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc - , ghc-paths, process, safe-exceptions, template-haskell - , transformers - }: - mkDerivation { - pname = "ghc-check"; - version = "0.5.0.2"; - sha256 = "1pncxn9lvwcxlgwf18yr20xbh2qxf80samf2laaxjhx09d31w8h2"; - libraryHaskellDepends = [ - base containers directory filepath ghc ghc-paths process - safe-exceptions template-haskell transformers - ]; - description = "detect mismatches between compile-time and run-time versions of the ghc api"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-check_0_5_0_3" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-paths, process, safe-exceptions, template-haskell , transformers @@ -98793,7 +98848,6 @@ self: { ]; description = "detect mismatches between compile-time and run-time versions of the ghc api"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-clippy-plugin" = callPackage @@ -98973,25 +99027,6 @@ self: { }) {}; "ghc-events" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, text - , vector - }: - mkDerivation { - pname = "ghc-events"; - version = "0.13.0"; - sha256 = "1b4d1h71czskm2vgbhkrkdkj5h218b34zn7pjhyp314wfqkmn935"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers text vector - ]; - executableHaskellDepends = [ base containers ]; - testHaskellDepends = [ base ]; - description = "Library and tool for parsing .eventlog files from GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-events_0_14_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: @@ -99008,7 +99043,6 @@ self: { testHaskellDepends = [ base ]; description = "Library and tool for parsing .eventlog files from GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-events-analyze" = callPackage @@ -99062,29 +99096,6 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, bytestring, containers, Diff, directory - , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl - , silently, syb - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.6.3.2"; - sha256 = "1bzf8mafz20pn7cq2483b9w3hjrwfbb0ahbcb3y7xy5yy52qvmln"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base bytestring containers Diff directory filemanip filepath ghc - ghc-boot ghc-paths HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-exactprint_0_6_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, Diff, directory , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl , silently, syb @@ -99105,7 +99116,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -100929,6 +100939,26 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_25" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.25"; + sha256 = "0yz80wcxhy1mm441507qsj2f7380l2iwh4s1miwpd8kb5m147n9w"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-graphene" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base @@ -101133,7 +101163,7 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) gtk3;}; - "gi-gtk_4_0_2" = callPackage + "gi-gtk_4_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-graphene, gi-gsk, gi-pango, gtk4, haskell-gi, haskell-gi-base @@ -101141,8 +101171,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "4.0.2"; - sha256 = "1lmbb3q4f73f7yihnl4qjv7qvzrys3jqsh3dg9wwdg9bxg900ghp"; + version = "4.0.3"; + sha256 = "1zfqnjnzlrry7cbrzfamrh5465h06y6px0b1xh1yz7iaacg0739z"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-graphene gi-gsk gi-pango haskell-gi @@ -101948,8 +101978,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20201116"; - sha256 = "0xv7n9f6l90l4k964675v0lgs22gcy97ic86mbfb40rl0fk0jalr"; + version = "8.20201127"; + sha256 = "0n9m5ffgbzms0nh9dskrc7vjgwwwi9f9gxyh498wnspf96729zz7"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -102574,26 +102604,6 @@ self: { }) {}; "github-release" = callPackage - ({ mkDerivation, aeson, base, burrito, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers - }: - mkDerivation { - pname = "github-release"; - version = "1.3.3"; - sha256 = "15im4vsz04sx0iq83xmvk5ak4p7rj33jawk5lxkmv1ajwvklbpk7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; - executableHaskellDepends = [ base ]; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_3_5" = callPackage ({ mkDerivation, aeson, base, burrito, bytestring, http-client , http-client-tls, http-types, mime-types, optparse-generic, text , unordered-containers @@ -102611,7 +102621,6 @@ self: { executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-rest" = callPackage @@ -103521,6 +103530,8 @@ self: { pname = "glirc"; version = "2.37"; sha256 = "1222dz42lyk44xgs10wwjpd2qn4l0ak3v98vj103xh535hki9ibn"; + revision = "1"; + editedCabalFile = "19y9hhn24w6lqdwv1skijrvj5plqs3xqcz3h8wv1ax8g8ak07xsx"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -103535,8 +103546,7 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "gll" = callPackage @@ -112584,7 +112594,7 @@ self: { , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa , resourcet, scientific, tagsoup, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, unordered-containers, util-linux, vector, wai + , time-locale-compat, unordered-containers, utillinux, vector, wai , wai-app-static, warp, yaml }: mkDerivation { @@ -112608,12 +112618,12 @@ self: { base bytestring containers filepath QuickCheck tasty tasty-hunit tasty-quickcheck text unordered-containers yaml ]; - testToolDepends = [ util-linux ]; + testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) util-linux;}; + }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process @@ -112748,6 +112758,31 @@ self: { broken = true; }) {}; + "hakyll-contrib-i18n" = callPackage + ({ mkDerivation, base, binary-instances, bytestring, filepath + , hakyll, pandoc, pandoc-include-code, pandoc-types, text, time + , time-locale-compat, unordered-containers, yaml + }: + mkDerivation { + pname = "hakyll-contrib-i18n"; + version = "0.1.1.0"; + sha256 = "1jmw3ns8s0l974b2xb6ylwd0swjcq69fwpakb4g4k2rvhqnzd6jg"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary-instances bytestring filepath hakyll text time + time-locale-compat unordered-containers yaml + ]; + executableHaskellDepends = [ + base filepath hakyll pandoc pandoc-include-code pandoc-types + unordered-containers + ]; + description = "A Hakyll library for internationalization"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hakyll-contrib-links" = callPackage ({ mkDerivation, base, binary, containers, hakyll, pandoc , pandoc-types, parsec, QuickCheck, test-framework @@ -116391,6 +116426,29 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi_0_24_7" = callPackage + ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, filepath, glib + , gobject-introspection, haskell-gi-base, mtl, pretty-show, process + , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.24.7"; + sha256 = "10xp6z6whfx3iad09l83mcszzj99cc9wcnvk593ypx6zhjv0r555"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ansi-terminal attoparsec base bytestring Cabal containers directory + filepath haskell-gi-base mtl pretty-show process regex-tdfa safe + text transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobject-introspection ]; + testHaskellDepends = [ base doctest process ]; + description = "Generate Haskell bindings for GObject Introspection capable libraries"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { @@ -116403,6 +116461,19 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_24_5" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.24.5"; + sha256 = "0fd5bsf2bnjaq9j8zs9l5837z9x2iryivs57y96c7fx6vxxb9xai"; + libraryHaskellDepends = [ base bytestring containers text ]; + libraryPkgconfigDepends = [ glib ]; + description = "Foundation for libraries generated by haskell-gi"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading" = callPackage ({ mkDerivation }: mkDerivation { @@ -117834,19 +117905,26 @@ self: { }) {}; "haskell-xmpp" = callPackage - ({ mkDerivation, array, base, HaXml, html, mtl, network, polyparse - , pretty, random, regex-compat, stm, utf8-string + ({ mkDerivation, aeson, array, base, blaze-markup, bytestring + , HaXml, hspec, hspec-discover, html, http-client, http-conduit + , mtl, network, network-bsd, polyparse, pretty, random + , regex-compat, singlethongs, stm, text, time, unliftio + , utf8-string, uuid, xml-conduit, xml-hamlet }: mkDerivation { pname = "haskell-xmpp"; - version = "1.0.2"; - sha256 = "1z4x4mn0vry8mwq6ily668ignmf4s9m92fmga15dr83y7aq5wd59"; + version = "2.0.1"; + sha256 = "0x06a43h930ad17shvc8iwibkpgbfk6lkkr9mnp0xnwaf6kzrf47"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base HaXml html mtl network polyparse pretty random - regex-compat stm utf8-string + aeson array base blaze-markup bytestring HaXml html http-client + http-conduit mtl network network-bsd polyparse pretty random + regex-compat singlethongs stm text time unliftio utf8-string uuid + xml-conduit xml-hamlet ]; + executableHaskellDepends = [ base hspec text ]; + executableToolDepends = [ hspec-discover ]; description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -120058,6 +120136,8 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasql-transaction" = callPackage @@ -121885,6 +121965,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "headroom_0_3_2_0" = callPackage + ({ mkDerivation, aeson, base, data-default-class, doctest, either + , file-embed, hspec, hspec-discover, microlens, microlens-th + , mustache, optparse-applicative, pcre-heavy, pcre-light + , QuickCheck, rio, template-haskell, time, yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.3.2.0"; + sha256 = "0770d1b8ikijkmqqnb6nygqj7cv6fphz1165x478ry61sr3i6hs3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base data-default-class either file-embed microlens + microlens-th mustache optparse-applicative pcre-heavy pcre-light + rio template-haskell time yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec optparse-applicative pcre-light QuickCheck + rio time + ]; + testToolDepends = [ hspec-discover ]; + description = "License Header Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -121897,6 +122005,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heap-console" = callPackage + ({ mkDerivation, base, containers, exceptions, ghc-heap, ghc-prim + , haskeline, hspec, hspec-discover, mtl, show-combinators + }: + mkDerivation { + pname = "heap-console"; + version = "0.1.0.1"; + sha256 = "1z2sdw64w50q2353ccsjpahncdp8czihpkizclgvx1gkqiv9mv02"; + libraryHaskellDepends = [ + base containers exceptions ghc-heap ghc-prim haskeline mtl + show-combinators + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + description = "interactively inspect Haskell values at runtime"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "heaps" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -122421,6 +122549,8 @@ self: { ]; description = "Hedgehog property testing for Servant APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis" = callPackage @@ -127218,8 +127348,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.2.2"; - sha256 = "1jb4yr9piyq2l4d6xxn6vywa1ghvws97qkzymnmldzxpyqiixnl8"; + version = "3.2.3"; + sha256 = "1y6drmvcz90cpih446k1kjbyhin652wi9b9x7xjylxxp8jksd8x0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -127452,25 +127582,6 @@ self: { }) {}; "hmatrix" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, semigroups, split, storable-complex - , vector - }: - mkDerivation { - pname = "hmatrix"; - version = "0.20.0.0"; - sha256 = "1sqy1aci5zfagkb34mz3xdil7cl96z4b4cx28cha54vc5sx1lhpg"; - configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; - libraryHaskellDepends = [ - array base binary bytestring deepseq random semigroups split - storable-complex vector - ]; - librarySystemDepends = [ openblasCompat ]; - description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openblasCompat;}; - - "hmatrix_0_20_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , openblasCompat, primitive, random, semigroups, split , storable-complex, vector @@ -127487,7 +127598,6 @@ self: { librarySystemDepends = [ openblasCompat ]; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-backprop" = callPackage @@ -128249,6 +128359,8 @@ self: { pname = "hnn"; version = "0.3"; sha256 = "0hqmzl95riis1m6f0zfp303f2k0j8szkcb6rcfmx6d3grm38b7fr"; + revision = "1"; + editedCabalFile = "18lmh6fpkpxa9lfcygzag60nrxl5qab1gllpfamgz0l5ydph9f3z"; libraryHaskellDepends = [ base binary bytestring hmatrix mwc-random random vector vector-binary-instances zlib @@ -128514,6 +128626,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "hocon" = callPackage + ({ mkDerivation, base, hspec, MissingH, parsec, split }: + mkDerivation { + pname = "hocon"; + version = "0.1.0.1"; + sha256 = "06xk118q1f5cik98w3swqw61nc7skx0bvf7mj8iyji8wm6sb1p1w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hspec MissingH parsec split ]; + executableHaskellDepends = [ base hspec MissingH parsec split ]; + testHaskellDepends = [ base hspec MissingH parsec split ]; + description = "Small library for typesafe's configuration specification"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hodatime" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , directory, exceptions, filepath, fingertree, mtl, parsec @@ -134527,8 +134654,8 @@ self: { }: mkDerivation { pname = "hspec-hashable"; - version = "0.1.0.0"; - sha256 = "1gqlw2k6k37m25292dpm8j8k0f2jdqz7lmsisa2f1mqlqxpm9k0i"; + version = "0.1.0.1"; + sha256 = "0gvqi8600vm3ms1b45qvx32kw7g7pgwxkmbfbdmicxxlbp2da6qy"; libraryHaskellDepends = [ base hashable hspec QuickCheck ]; testHaskellDepends = [ base hashable hspec hspec-core QuickCheck silently @@ -134781,12 +134908,16 @@ self: { }) {}; "hspec-slow" = callPackage - ({ mkDerivation, base, hspec, mtl, stm, time, transformers }: + ({ mkDerivation, base, hspec, hspec-core, mtl, stm, time + , transformers + }: mkDerivation { pname = "hspec-slow"; - version = "0.1.0.0"; - sha256 = "1nvhvxqmvlkg7zjh0b59rfdjghcinal7ncf3l1jin21zrjcwzfhq"; - libraryHaskellDepends = [ base hspec mtl stm time transformers ]; + version = "0.2.0.1"; + sha256 = "1rik9r0y6zzc92dzdzhmxj05hr1yacvdrfvsxqqqavxd7v0pp6y6"; + libraryHaskellDepends = [ + base hspec hspec-core mtl stm time transformers + ]; testHaskellDepends = [ base hspec mtl stm ]; description = "Find slow test cases"; license = stdenv.lib.licenses.bsd3; @@ -139514,6 +139645,8 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Primitive support for bit manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hw-rankselect" = callPackage @@ -140734,19 +140867,6 @@ self: { }) {}; "hyper" = callPackage - ({ mkDerivation, base, blaze-html, deepseq, text }: - mkDerivation { - pname = "hyper"; - version = "0.1.0.3"; - sha256 = "0bc2mvxaggdyikdx51qc1li8idmnlw3ha2n3qli6jf1zz8mlqx0s"; - revision = "1"; - editedCabalFile = "1qfavgvdlmsip57grhxs0mawh82nxrq4m0mv9z3vam1b9j6nw2cc"; - libraryHaskellDepends = [ base blaze-html deepseq text ]; - description = "Display class for the HyperHaskell graphical Haskell interpreter"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hyper_0_2_1_0" = callPackage ({ mkDerivation, base, blaze-html, deepseq, text }: mkDerivation { pname = "hyper"; @@ -140755,7 +140875,6 @@ self: { libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyper-extra" = callPackage @@ -142914,8 +143033,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.2.3"; - sha256 = "0gz2rrzlj6031w837whpsh932jjihf49yk7rh05dw13zxvn19fl8"; + version = "0.1.2.4"; + sha256 = "1jjw64pdz3jgd4jys1rg95bhrjyiizjdi0rwwqldc27a7misd2ca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145896,8 +146015,8 @@ self: { }: mkDerivation { pname = "ipfs"; - version = "1.1.5.0"; - sha256 = "050zj21m4pg8jnpd594p2wc5m3nn4j6cmmv0069mi7kg473dqz2m"; + version = "1.1.5.1"; + sha256 = "0c93s1s3l72yw2lb28v37bnhmvcn5s2w1620fsx0z4ij1z8dnk19"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob http-media ip lens monad-logger regex-compat rio servant servant-client servant-server @@ -145910,7 +146029,7 @@ self: { text vector yaml ]; description = "Access IPFS locally and remotely"; - license = stdenv.lib.licenses.agpl3Plus; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -145992,27 +146111,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, bytestring, containers - , doctest, hspec, network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.9"; - sha256 = "1m306fi39ifqq53sklwn81q96wam8nvx7mr5hv4m9f26kiczlism"; - revision = "1"; - editedCabalFile = "1vbzch9lainl05ydym5z8x0kz0a0ywwba45d7xgg5fb8cp2n5zxh"; - libraryHaskellDepends = [ - appar base byteorder bytestring containers network - ]; - testHaskellDepends = [ - appar base byteorder bytestring containers doctest hspec network - QuickCheck safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_10" = callPackage ({ mkDerivation, appar, base, byteorder, bytestring, containers , doctest, hspec, network, QuickCheck, safe }: @@ -146029,7 +146127,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -146208,6 +146305,8 @@ self: { pname = "irc-core"; version = "2.9"; sha256 = "1n1fd46am795bsb96jnq2kj3gn787q5j41115g1smfp01zbnjp1b"; + revision = "1"; + editedCabalFile = "12z28f96iw9jni57rdzy8kz7sa1zwfs5k3fvfmf6sgx6wzhwcm6h"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -146215,8 +146314,7 @@ self: { testHaskellDepends = [ base hashable HUnit text ]; description = "IRC core library for glirc"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "irc-ctcp" = callPackage @@ -146508,18 +146606,6 @@ self: { }) {}; "isbn" = callPackage - ({ mkDerivation, base, hspec, text }: - mkDerivation { - pname = "isbn"; - version = "1.1.0.1"; - sha256 = "0s7b06a0d37bhb38k2my6g6brn6bywxr59kw2c103dp4y4kzrcpn"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base hspec text ]; - description = "ISBN Validation and Manipulation"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "isbn_1_1_0_2" = callPackage ({ mkDerivation, base, hspec, text }: mkDerivation { pname = "isbn"; @@ -146529,7 +146615,6 @@ self: { testHaskellDepends = [ base hspec text ]; description = "ISBN Validation and Manipulation"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isdicom" = callPackage @@ -147571,6 +147656,8 @@ self: { pname = "j"; version = "0.2.1.0"; sha256 = "1r2lldy35sfzqrd82v2fj113l10mhvllf4yxbkrfy0y7wv0c5v8n"; + revision = "1"; + editedCabalFile = "022ah42q1ba8ank33jn5r9h7fbs3579mlrk6ks8q7vbcm4rnalj0"; libraryHaskellDepends = [ base bytestring repa unix ]; testHaskellDepends = [ base bytestring repa tasty tasty-hunit ]; description = "J in Haskell"; @@ -154468,8 +154555,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.4.0.0"; - sha256 = "139y3kgbrjv8x16rda9ixhcdl6xs26blq0sgcz7zpzwgbp60yflb"; + version = "1.4.1.1"; + sha256 = "0bc3qzhyip8dq7w8gf3wxlrlfd8swd1n6y6nbj2pnp7710jj8gb9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -157959,6 +158046,8 @@ self: { ]; description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libarchive;}; "libarchive-conduit" = callPackage @@ -163565,10 +163654,8 @@ self: { }: mkDerivation { pname = "lsp"; - version = "1.0.0.0"; - sha256 = "05m9kxcf7g2xb4bhbn08bfbf09b8vvvw3nvpcfldpx180yz3n02r"; - revision = "1"; - editedCabalFile = "1pgxvwfn7avkpdl6f3p7rqaivdz438yqkzsz0rp1y0s80mymvz1i"; + version = "1.0.0.1"; + sha256 = "1h7ymzzm00dnvbqxz4g0zp3mvm6v9bjbgkazz514wqrcmma27cm1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166755,8 +166842,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.5.0"; - sha256 = "1nlx8lakwnpplmgiiv692jbs03b52wqvclfyvaxcaf8yqdjms3r9"; + version = "0.5.6.0"; + sha256 = "13vzprqhyjz1qvsq6b29d8h9xgsrifbpbs2c5cw702hi7mw5zjhp"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive scheduler unliftio-core vector @@ -166769,6 +166856,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "massiv_0_5_7_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.5.7.0"; + sha256 = "04vv16h048gkfgqsdf3a42qrg62cik9j30p4s13rykq0shzcaf62"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Color, data-default-class , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels @@ -166819,8 +166929,10 @@ self: { }: mkDerivation { pname = "massiv-test"; - version = "0.1.4"; - sha256 = "1qhvph2s6bkw3zb43arq1zvrfyr09phqjwxhzsqxi2x2fcrdyvyn"; + version = "0.1.5"; + sha256 = "0n9fcdz9v7j1r2iln9h0wkjr7jkghi3r3a3lm0713p6hwy6cpgff"; + revision = "1"; + editedCabalFile = "0v6vnjsqklb8yaf63zhx9ni0ak83zyjq2l3mb8zazp54inyyfjr0"; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions hspec massiv primitive QuickCheck scheduler unliftio vector @@ -167455,8 +167567,7 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "mattermost-api" = callPackage @@ -167485,8 +167596,7 @@ self: { ]; description = "Client API for Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "mattermost-api-qc" = callPackage @@ -167502,8 +167612,7 @@ self: { ]; description = "QuickCheck instances for the Mattermost client API library"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "maude" = callPackage @@ -169935,23 +170044,6 @@ self: { }) {}; "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell - , th-abstraction, transformers - }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.3.6"; - sha256 = "1pw0ljpyhpj4jsgs25i4mi1a07vpbwfik84fc2kip1pzajflrcql"; - libraryHaskellDepends = [ - base containers microlens template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base microlens ]; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_3_8" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell , th-abstraction, transformers }: @@ -169966,7 +170058,6 @@ self: { testHaskellDepends = [ base microlens ]; description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "micrologger" = callPackage @@ -170319,6 +170410,85 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "migrant-core" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "migrant-core"; + version = "0.1.0.2"; + sha256 = "1na0vcrmw3vy6v9qxxpprhga9ja7izwbp856pdpqiq98p4h8xmiw"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck text + ]; + description = "Semi-automatic database schema migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "migrant-hdbc" = callPackage + ({ mkDerivation, base, HDBC, HDBC-sqlite3, HUnit, migrant-core + , process, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , text + }: + mkDerivation { + pname = "migrant-hdbc"; + version = "0.1.0.2"; + sha256 = "084vqb1z0ipxn07nswlcw0bbh0bfywm7hyvakb75xg8rv5kfak15"; + libraryHaskellDepends = [ base HDBC migrant-core text ]; + testHaskellDepends = [ + base HDBC HDBC-sqlite3 HUnit migrant-core process QuickCheck random + tasty tasty-hunit tasty-quickcheck text + ]; + description = "Semi-automatic database schema migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "migrant-postgresql-simple" = callPackage + ({ mkDerivation, base, HUnit, migrant-core, postgresql-simple + , process, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , text + }: + mkDerivation { + pname = "migrant-postgresql-simple"; + version = "0.1.0.2"; + sha256 = "1x1gsf0vp82n6dmyiamj1cvs9fww7j1ffh6d9qr075z5sj8zbhzx"; + libraryHaskellDepends = [ + base migrant-core postgresql-simple text + ]; + testHaskellDepends = [ + base HUnit migrant-core postgresql-simple process QuickCheck random + tasty tasty-hunit tasty-quickcheck text + ]; + description = "Semi-automatic database schema migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "migrant-sqlite-simple" = callPackage + ({ mkDerivation, base, HUnit, migrant-core, QuickCheck + , sqlite-simple, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "migrant-sqlite-simple"; + version = "0.1.0.2"; + sha256 = "140fchiid0kjp1cdw114w497h0fsrskn9195bkjv44sdmq2l8car"; + libraryHaskellDepends = [ base migrant-core sqlite-simple text ]; + testHaskellDepends = [ + base HUnit migrant-core QuickCheck sqlite-simple tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Semi-automatic database schema migrations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mikmod" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -172863,6 +173033,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_36" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, fast-logger, lifted-base, monad-control, monad-loops + , mtl, resourcet, stm, stm-chans, template-haskell, text + , transformers, transformers-base, transformers-compat + , unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.36"; + sha256 = "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh"; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra exceptions fast-logger + lifted-base monad-control monad-loops mtl resourcet stm stm-chans + template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -173045,6 +173237,8 @@ self: { ]; description = "An extensible and type-safe wrapper around EKG metrics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-mock" = callPackage @@ -176194,8 +176388,8 @@ self: { }: mkDerivation { pname = "mu-protobuf"; - version = "0.4.0.2"; - sha256 = "0d33d7nw5rfmyyrahv0sc0mdwzp5ywm040hfm9c1wm9h1miahx4n"; + version = "0.4.0.3"; + sha256 = "0wc562fw89l3qmyf28axj41cyj88ppkg0jsif9rsrdgj4ypq2zrj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -177724,18 +177918,19 @@ self: { }) {}; "mutable-lens" = callPackage - ({ mkDerivation, base, containers, doctest, lens, primitive, stm - , tasty, tasty-hunit, transformers + ({ mkDerivation, base, containers, doctest, extra, lens, primitive + , stm, tasty, tasty-hunit, transformers }: mkDerivation { pname = "mutable-lens"; - version = "0.4.0.0"; - sha256 = "14mywx7lh3yw8gfqy8h2hml2vr3vjfnxnvfvcg37kfskkfyaf6lm"; + version = "0.4.1.0"; + sha256 = "013z1jj8g996vzwal7vlkfy4h3s67y03k5j1sg78dc9abpc87l2z"; libraryHaskellDepends = [ base lens primitive stm ]; testHaskellDepends = [ base containers doctest lens primitive stm tasty tasty-hunit transformers ]; + benchmarkHaskellDepends = [ base extra primitive ]; description = "Interoperate mutable references with regular lens"; license = stdenv.lib.licenses.asl20; }) {}; @@ -178735,6 +178930,8 @@ self: { sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53"; libraryHaskellDepends = [ base named servant ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-servant-client" = callPackage @@ -178750,6 +178947,8 @@ self: { ]; description = "client support for named-servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-servant-server" = callPackage @@ -178765,6 +178964,8 @@ self: { ]; description = "server support for named-servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "named-sop" = callPackage @@ -180496,16 +180697,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "network_3_1_2_0" = callPackage + "network_3_1_2_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.0"; - sha256 = "07zbaaa4f0rnc4xqg5kbzqivmr9lqz2g6bw01gmqkmh9k9svsap0"; - revision = "1"; - editedCabalFile = "079svy0nr035xhz4gd6cila0wvsjl23hi3hq5407m3qdmcf4rkis"; + version = "3.1.2.1"; + sha256 = "0jlx8dls0h95znpcb66bd95k4mp3aaa733h89pq5ymyb8m29bapw"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -181020,6 +181219,8 @@ self: { ]; description = "WebSocket backend for MessagePack RPC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "network-metrics" = callPackage @@ -182152,19 +182353,20 @@ self: { "ngx-export-tools-extra" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, array, base, base64, binary , bytestring, case-insensitive, containers, ede - , enclosed-exceptions, http-client, http-types, ngx-export + , enclosed-exceptions, http-client, http-types, network, ngx-export , ngx-export-tools, safe, snap-core, snap-server, template-haskell , text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.5.8.0"; - sha256 = "15jqvrbsabwcix1pkvqc1q9gwfskyil9v995109rzfasw9aihaqk"; + version = "0.5.9.0"; + sha256 = "073zzhrv9g7q8miqxws79h2hiqi3yssyb7smsb1mrx4y1rsmq4ss"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client - http-types ngx-export ngx-export-tools safe snap-core snap-server - template-haskell text time trifecta unordered-containers + http-types network ngx-export ngx-export-tools safe snap-core + snap-server template-haskell text time trifecta + unordered-containers ]; description = "More extra tools for Nginx haskell module"; license = stdenv.lib.licenses.bsd3; @@ -182584,22 +182786,23 @@ self: { "nix-thunk" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cli-extras - , cli-git, cli-nix, containers, data-default, directory, either - , exceptions, extra, filepath, git, github, here, lens - , logging-effect, megaparsec, modern-uri, mtl, optparse-applicative - , temporary, text, time, unix, which, yaml + , cli-git, cli-nix, containers, cryptonite, data-default, directory + , either, exceptions, extra, filepath, github, here, lens + , logging-effect, megaparsec, memory, modern-uri, monad-logger, mtl + , optparse-applicative, temporary, text, time, unix, which, yaml }: mkDerivation { pname = "nix-thunk"; - version = "0.2.0.0"; - sha256 = "1bkdcq4qvgnavpkvfvy6il691wwpw6lyba0hhxzjxbm132q46v2y"; + version = "0.2.0.2"; + sha256 = "1jxdxb8ri0cd7ni9z80xlb86d81bb83c6ki5wj7jx7sn9inzz8z7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base bytestring cli-extras cli-git cli-nix - containers data-default directory either exceptions extra filepath - git github here lens logging-effect megaparsec modern-uri mtl - optparse-applicative temporary text time unix which yaml + containers cryptonite data-default directory either exceptions + extra filepath github here lens logging-effect megaparsec memory + modern-uri monad-logger mtl optparse-applicative temporary text + time unix which yaml ]; executableHaskellDepends = [ base cli-extras optparse-applicative text @@ -183370,21 +183573,6 @@ self: { }) {}; "nonempty-vector" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest - , primitive, vector - }: - mkDerivation { - pname = "nonempty-vector"; - version = "0.2.0.2"; - sha256 = "1w7nmjqlrrymgpainzm7fx4fc6jfl45j7rx73xfcwjsdxl0fl3c2"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base deepseq primitive vector ]; - testHaskellDepends = [ base doctest ]; - description = "Non-empty vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "nonempty-vector_0_2_1_0" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest , primitive, vector }: @@ -183397,7 +183585,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Non-empty vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonemptymap" = callPackage @@ -184437,19 +184624,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "numhask_0_7_0_0" = callPackage + ({ mkDerivation, base, bifunctors, doctest, mmorph, protolude + , QuickCheck, random, text, transformers + }: + mkDerivation { + pname = "numhask"; + version = "0.7.0.0"; + sha256 = "03rf8yk30kqbmq4jdvm3jnqdfx09nmki0kd7y9g2v7g07j2y1qx9"; + revision = "1"; + editedCabalFile = "1n1kilds4c98swbjrybl18d7z82bq4m56nlv03an7b9002wv8xn4"; + libraryHaskellDepends = [ + base bifunctors mmorph protolude random text transformers + ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "A numeric class hierarchy"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "numhask-array" = callPackage ({ mkDerivation, adjunctions, base, deepseq, distributive, doctest - , hmatrix, numhask, vector + , numhask, vector }: mkDerivation { pname = "numhask-array"; - version = "0.7.0"; - sha256 = "1izfym0y9920i2pbzil3z3sn8rzk23lj1rbgj0x0hc7y2p0w5lbm"; + version = "0.8.0"; + sha256 = "03c12d34s20f01vc9kpgrm3n4xi8h4kqzlndj1ncpqb69xx3fhc5"; libraryHaskellDepends = [ - adjunctions base deepseq distributive hmatrix numhask vector + adjunctions base deepseq distributive numhask vector ]; testHaskellDepends = [ base doctest numhask ]; - description = "n-dimensional arrays"; + description = "Multi-dimensional array interface for numhask"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -184549,14 +184755,14 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.6.1"; - sha256 = "0kqq2p0j7p7my33lw0alcc6il3chvsaj75cm1py0wa681jfmzxcv"; + version = "0.7.0.0"; + sha256 = "1vvm6px9wlqm07sc2p2df100x1pg2rgy363c59v1c910120lpdjd"; libraryHaskellDepends = [ adjunctions base containers distributive numhask semigroupoids tdigest text time ]; testHaskellDepends = [ base doctest numhask ]; - description = "numerical spaces"; + description = "Numerical spaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -187798,18 +188004,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-applicative_0_16_0_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, process - , QuickCheck, transformers, transformers-compat + "optparse-applicative_0_16_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck + , transformers, transformers-compat }: mkDerivation { pname = "optparse-applicative"; - version = "0.16.0.0"; - sha256 = "0aybamakg9zjac0b78lhfa1bvilkb76yryis6h0pf5j1khrkri89"; + version = "0.16.1.0"; + sha256 = "16nnrkmgd28h540f17nb017ziq4gbzgkxpdraqicaczkca1jf1b2"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; - testHaskellDepends = [ base bytestring QuickCheck ]; + testHaskellDepends = [ base QuickCheck ]; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -188419,33 +188625,6 @@ self: { }) {}; "ormolu" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, exceptions - , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, syb, text - }: - mkDerivation { - pname = "ormolu"; - version = "0.1.3.1"; - sha256 = "1qad2s270rhgm2chhrmjd5zsv6bqykba978vn0hakm29mgck2zgw"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring containers dlist exceptions ghc-lib-parser mtl syb - text - ]; - executableHaskellDepends = [ - base ghc-lib-parser gitrev optparse-applicative text - ]; - testHaskellDepends = [ - base containers filepath hspec path path-io text - ]; - testToolDepends = [ hspec-discover ]; - description = "A formatter for Haskell source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ormolu_0_1_4_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec , hspec-discover, mtl, optparse-applicative, path, path-io, syb @@ -188471,7 +188650,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orthotope" = callPackage @@ -189536,8 +189714,10 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.3"; - sha256 = "0x6l3318g2x3q69drbnk2dkzn8l6c5m0msfnmwzbq6g6952gnsam"; + version = "0.3.8.4"; + sha256 = "098xp2n6rmg2vhaip8yyvrr534cllb1s6kj9p6r4iqqv4w3nc2sb"; + revision = "1"; + editedCabalFile = "1p1gkq4sgyxnfnna1avjmbw4ifrsmw920qhnaa4nkmbpgmccdca2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -190001,8 +190181,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.3.1"; - sha256 = "0b6xh5fzxw5v9hh1xjksh2bwzmlnv7wra5l1s9gzfwl623xgh445"; + version = "0.3.2"; + sha256 = "1dj07dnljy1b7m9sq5dlxvvl8rbla8cf129s2wcw24x31j3ga96b"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -190154,47 +190334,6 @@ self: { }) {}; "pantry" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , casa-client, casa-types, conduit, conduit-extra, containers - , cryptonite, cryptonite-conduit, digest, exceptions, filelock - , generic-deriving, hackage-security, hedgehog, hpack, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, mtl, network-uri, path, path-io, persistent - , persistent-sqlite, persistent-template, primitive, QuickCheck - , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint - , tar-conduit, text, text-metrics, time, transformers, unix-compat - , unliftio, unordered-containers, vector, yaml, zip-archive - }: - mkDerivation { - pname = "pantry"; - version = "0.5.1.3"; - sha256 = "0yx30zhyq0wbda6z8a9lvp8c83b3nj4l2s8lcxnvwgnzkanvlkss"; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest filelock generic-deriving hackage-security hpack http-client - http-client-tls http-conduit http-download http-types memory mtl - network-uri path path-io persistent persistent-sqlite - persistent-template primitive resourcet rio rio-orphans - rio-prettyprint tar-conduit text text-metrics time transformers - unix-compat unliftio unordered-containers vector yaml zip-archive - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest exceptions filelock generic-deriving hackage-security - hedgehog hpack hspec http-client http-client-tls http-conduit - http-download http-types memory mtl network-uri path path-io - persistent persistent-sqlite persistent-template primitive - QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint - tar-conduit text text-metrics time transformers unix-compat - unliftio unordered-containers vector yaml zip-archive - ]; - description = "Content addressable Haskell package management"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pantry_0_5_1_4" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -190233,7 +190372,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pantry-tmp" = callPackage @@ -192770,23 +192908,6 @@ self: { }) {}; "pcg-random" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest - , entropy, primitive, random - }: - mkDerivation { - pname = "pcg-random"; - version = "0.1.3.6"; - sha256 = "1m8xnic207ajbpz0q81h7xr9xmp1dzm6474vyvack6iidbzi4l08"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base bytestring entropy primitive random - ]; - testHaskellDepends = [ base doctest ]; - description = "Haskell bindings to the PCG random number generator"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pcg-random_0_1_3_7" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest , entropy, primitive, random }: @@ -192801,7 +192922,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Haskell bindings to the PCG random number generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pcgen" = callPackage @@ -195517,12 +195637,12 @@ self: { }) {}; "phonetic-languages-common" = callPackage - ({ mkDerivation, base, subG, vector }: + ({ mkDerivation, base, subG, subG-instances, vector }: mkDerivation { pname = "phonetic-languages-common"; - version = "0.1.1.0"; - sha256 = "08i9g7yaiwryy9ndd0adbl3cskqva71mi45x55knc6r9wdhnprph"; - libraryHaskellDepends = [ base subG vector ]; + version = "0.1.2.0"; + sha256 = "16m215rydybgn7wi5g3lh694z8zja2yr7b5p1rn33vgph2h5i8v7"; + libraryHaskellDepends = [ base subG subG-instances vector ]; description = "A generalization of the uniqueness-periods-vector-common package"; license = stdenv.lib.licenses.mit; }) {}; @@ -195539,12 +195659,12 @@ self: { }) {}; "phonetic-languages-constraints" = callPackage - ({ mkDerivation, base, vector }: + ({ mkDerivation, base, subG, subG-instances, vector }: mkDerivation { pname = "phonetic-languages-constraints"; - version = "0.3.2.0"; - sha256 = "16gq0vr20bk3mg8b1w7gdlv32wr5vf9q0dj4f6x42x476fd4dcj3"; - libraryHaskellDepends = [ base vector ]; + version = "0.4.0.0"; + sha256 = "11m389rpz7ddvmkf5wrasc41kmy67fki234fjcgi1djk8iawp5pw"; + libraryHaskellDepends = [ base subG subG-instances vector ]; description = "Constraints to filter the needed permutations"; license = stdenv.lib.licenses.mit; }) {}; @@ -195560,8 +195680,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-examples"; - version = "0.6.2.0"; - sha256 = "1gjlbzd7hy280sy7qpzdrljpr59rmln8g0s7rsmkhzqbvfbyfgfj"; + version = "0.6.2.1"; + sha256 = "0k9cwvfdxf13izbww7g08p0x702xgmm7dck3mjk4maajjfia34zm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195588,8 +195708,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-general"; - version = "0.3.0.0"; - sha256 = "0ay0814py6kxq4r64jlzpr1nkjdpkh5vdiw0kxn6ifzrh382681h"; + version = "0.3.0.1"; + sha256 = "1b99xf5glwdas2s8wsdgpwnzg5gmybdp6c3q547mi5xd7w6flh99"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-plus print-info subG vector @@ -195635,8 +195755,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-properties"; - version = "0.3.0.0"; - sha256 = "1bf0k2wlypaiff84alnf94c5adbkbz1d3bkdbmd04bq937yc3rfq"; + version = "0.3.0.1"; + sha256 = "0b3wnzlka9dapk1478jr35pnd3ykj3mn5nkhvmwjdsxigzzaa1wf"; libraryHaskellDepends = [ base phonetic-languages-common phonetic-languages-rhythmicity phonetic-languages-vector ukrainian-phonetics-basic vector @@ -195662,8 +195782,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-common"; - version = "0.2.0.0"; - sha256 = "0yksj6zinpyj1a61gikdkyh6f5xiqjlk66yywip3hgfigg809k8g"; + version = "0.3.0.0"; + sha256 = "1l5czk3ncwbv324k96gyc77lx8nvxxqpqggbyxw18wrwpmyn46i8"; libraryHaskellDepends = [ base phonetic-languages-permutations subG subG-instances vector ]; @@ -195671,6 +195791,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-simplified-properties-lists" = callPackage + ({ mkDerivation, base, phonetic-languages-rhythmicity + , phonetic-languages-simplified-common, ukrainian-phonetics-basic + , vector + }: + mkDerivation { + pname = "phonetic-languages-simplified-properties-lists"; + version = "0.1.3.1"; + sha256 = "1cbai5vi33fp7l3vpd4n0adjh0dbazhy7sms7716zd7vi4b2zm6s"; + libraryHaskellDepends = [ + base phonetic-languages-rhythmicity + phonetic-languages-simplified-common ukrainian-phonetics-basic + vector + ]; + description = "A generalization of the uniqueness-periods-vector-properties package"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-ukrainian" = callPackage ({ mkDerivation, base, mmsyn2, mmsyn5, vector }: mkDerivation { @@ -197454,8 +197592,6 @@ self: { ]; description = "properly streaming text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-transduce" = callPackage @@ -200744,6 +200880,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_12_3_3" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, bytestring-strict-builder, containers, conversion + , conversion-bytestring, conversion-text, criterion, json-ast + , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck + , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.12.3.3"; + sha256 = "0aivmhzs1cnr86j6xv6nix913walqfvgirydzrp09l5ppp5i2sps"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring + bytestring-strict-builder containers loch-th network-ip + placeholders scientific text time transformers unordered-containers + uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th network-ip placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ criterion rerebase ]; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-common" = callPackage ({ mkDerivation, attoparsec, base, bytestring, postgresql-simple }: mkDerivation { @@ -201060,36 +201226,6 @@ self: { }) {}; "postgresql-simple" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, bytestring-builder, case-insensitive, containers - , cryptohash-md5, filepath, hashable, HUnit, inspection-testing - , Only, postgresql-libpq, scientific, tasty, tasty-golden - , tasty-hunit, template-haskell, text, time, transformers - , uuid-types, vector - }: - mkDerivation { - pname = "postgresql-simple"; - version = "0.6.2"; - sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv"; - revision = "4"; - editedCabalFile = "03s0cbwqgkvzr1wkan7icfjb9qlz95pbs3pqv2mkpf117m3y1yb0"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring bytestring-builder - case-insensitive containers hashable Only postgresql-libpq - scientific template-haskell text time transformers uuid-types - vector - ]; - testHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive containers - cryptohash-md5 filepath HUnit inspection-testing postgresql-libpq - tasty tasty-golden tasty-hunit text time vector - ]; - benchmarkHaskellDepends = [ base vector ]; - description = "Mid-Level PostgreSQL client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "postgresql-simple_0_6_3" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, bytestring-builder, case-insensitive, containers , cryptohash-md5, filepath, hashable, HUnit, inspection-testing @@ -201115,7 +201251,6 @@ self: { benchmarkHaskellDepends = [ base vector ]; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple-bind" = callPackage @@ -201324,6 +201459,8 @@ self: { ]; description = "PostgreSQL AST parsing and rendering"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "postgresql-transactional" = callPackage @@ -202197,26 +202334,23 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring , comonad, containers, deepseq, directory, doctest, hashable, lens , lens-action, pcre-heavy, pcre-light, pretty-terminal, QuickCheck - , safe, stm, string-conversions, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, th-lift - , th-lift-instances, these, time + , safe, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, these, time }: mkDerivation { pname = "predicate-typed"; - version = "0.7.4.4"; - sha256 = "0ynlwwh8x5zmr8i3vijdava61ixyv7c0cqb2i9y89pbc4nn72pcm"; + version = "0.7.4.5"; + sha256 = "00q5q7s4b208lr3r8nlnchi3racmdcbvqrr7xyzslz6fr4dih112"; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad containers deepseq directory hashable lens pcre-heavy pcre-light - pretty-terminal QuickCheck safe string-conversions template-haskell - text th-lift th-lift-instances these time + pretty-terminal QuickCheck safe template-haskell text these time ]; testHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad containers deepseq directory doctest hashable lens lens-action pcre-heavy - pcre-light pretty-terminal QuickCheck safe stm string-conversions - tasty tasty-hunit tasty-quickcheck template-haskell text th-lift - th-lift-instances these time + pcre-light pretty-terminal QuickCheck safe tasty tasty-hunit + tasty-quickcheck template-haskell text these time ]; description = "Predicates, Refinement types and Dsl"; license = stdenv.lib.licenses.bsd3; @@ -203581,6 +203715,18 @@ self: { }) {}; "primitive-unlifted" = callPackage + ({ mkDerivation, base, bytestring, primitive, stm, text-short }: + mkDerivation { + pname = "primitive-unlifted"; + version = "0.1.3.0"; + sha256 = "1q7scarsdv51x74g6ahvc5znk9h628s984a7bawig0lnx67wzwih"; + libraryHaskellDepends = [ base bytestring primitive text-short ]; + testHaskellDepends = [ base primitive stm ]; + description = "Primitive GHC types with unlifted types inside"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "primitive-unlifted_1_0_0_0" = callPackage ({ mkDerivation, array, base, bytestring, primitive, QuickCheck , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short }: @@ -203597,6 +203743,7 @@ self: { ]; description = "Primitive GHC types with unlifted types inside"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primula-board" = callPackage @@ -204825,18 +204972,18 @@ self: { "prolude" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, containers - , generic-random, mongoDB, persistent, persistent-mongoDB + , generic-random, mongoDB, mtl, persistent, persistent-mongoDB , QuickCheck, quickcheck-instances, safe-exceptions, scientific - , text, time, vector + , swagger2, text, time, vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.9"; - sha256 = "0fnahs81xv2nx6cv6avp8bkhbprhy9vyhq5y3d0mna8iw06s0xfs"; + version = "0.0.0.11"; + sha256 = "0y9x5layrwd1na7rzrpc9syngcpg4h5cyd6lgg10xvbjkxqjz19v"; libraryHaskellDepends = [ - aeson base bytestring cassava containers generic-random mongoDB + aeson base bytestring cassava containers generic-random mongoDB mtl persistent persistent-mongoDB QuickCheck quickcheck-instances - safe-exceptions scientific text time vector + safe-exceptions scientific swagger2 text time vector ]; description = "ITProTV's custom prelude"; license = stdenv.lib.licenses.mit; @@ -205949,8 +206096,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.9.0"; sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; - revision = "2"; - editedCabalFile = "1njlypxh9p0dfqywgqgyzgx9h822d37jbnnd9zbl0ci99k1247g6"; + revision = "3"; + editedCabalFile = "0x0a5rjylmh4pdmr9iyadywzh06qxypq48b78skvm09bkkvrxghq"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -208282,8 +208429,8 @@ self: { }: mkDerivation { pname = "quickcheck-arbitrary-template"; - version = "0.2.1.0"; - sha256 = "1g9b39bhjcx44l8mwj5hwbjkd575prd46v16jz895q4f3ibqnfvp"; + version = "0.2.1.1"; + sha256 = "0cmk6kp895qrirdavbfp96k9yggs83bjcknyvwbkfzx5zbdc87y7"; libraryHaskellDepends = [ base QuickCheck safe template-haskell ]; testHaskellDepends = [ base QuickCheck safe tasty tasty-golden tasty-hunit @@ -210531,27 +210678,6 @@ self: { }) {}; "rank2classes" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest - , markdown-unlit, tasty, tasty-hunit, template-haskell - , transformers - }: - mkDerivation { - pname = "rank2classes"; - version = "1.4.0.1"; - sha256 = "1r72z98jvnih16x074izb0wp9gwbsjs2ihvj8a72xxyakdad71r9"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - base distributive template-haskell transformers - ]; - testHaskellDepends = [ - base distributive doctest tasty tasty-hunit - ]; - testToolDepends = [ markdown-unlit ]; - description = "standard type constructor class hierarchy, only with methods of rank 2 types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rank2classes_1_4_1" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest , markdown-unlit, tasty, tasty-hunit, template-haskell , transformers @@ -210570,7 +210696,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "standard type constructor class hierarchy, only with methods of rank 2 types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rapid" = callPackage @@ -212051,22 +212176,22 @@ self: { "readme-lhs" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, containers, doctest - , foldl, numhask, pandoc, pandoc-types, scientific, tdigest, text + , foldl, generic-lens, numhask, pandoc, pandoc-types, text , transformers }: mkDerivation { pname = "readme-lhs"; - version = "0.7.0"; - sha256 = "0sgfqx34yzlvn2999wh2681gk6dan9nrlkzd3indybkmal9mc80b"; + version = "0.8.0"; + sha256 = "1yircw8xhrzj40y6026bjb8jx7mm3zkkss7bzvbph1vbpgcazsc4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base blaze-html containers foldl numhask pandoc - pandoc-types scientific tdigest text transformers + attoparsec base blaze-html containers foldl generic-lens numhask + pandoc pandoc-types text transformers ]; - executableHaskellDepends = [ base numhask text ]; - testHaskellDepends = [ base containers doctest ]; - description = "See readme.md"; + executableHaskellDepends = [ base numhask ]; + testHaskellDepends = [ base doctest numhask ]; + description = "Literate programming support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -213498,8 +213623,8 @@ self: { }: mkDerivation { pname = "reflex-dom-retractable"; - version = "0.1.6.0"; - sha256 = "0xmxbyf72jnlyyr1iqgms43has4z3qv7ini5jrn1xkyhjmdanrcw"; + version = "0.1.7.0"; + sha256 = "0f40hxnlv7fpdjws0c720dz91zjxg8fxjl9qsmlilhapjzrjz9d2"; libraryHaskellDepends = [ base containers jsaddle mtl ref-tf reflex reflex-dom ]; @@ -213550,6 +213675,17 @@ self: { broken = true; }) {}; + "reflex-external-ref" = callPackage + ({ mkDerivation, base, deepseq, reflex }: + mkDerivation { + pname = "reflex-external-ref"; + version = "1.0.3.1"; + sha256 = "0mv17j5g0h7y1ym4563xr1vc0sdvw0g4wdpx0a9aryk3i0k0i4mx"; + libraryHaskellDepends = [ base deepseq reflex ]; + description = "External reference with reactivity support"; + license = stdenv.lib.licenses.mit; + }) {}; + "reflex-fsnotify" = callPackage ({ mkDerivation, base, containers, directory, filepath, fsnotify , reflex @@ -213703,6 +213839,57 @@ self: { broken = true; }) {}; + "reflex-localize" = callPackage + ({ mkDerivation, base, jsaddle, mtl, reflex, reflex-external-ref + , text + }: + mkDerivation { + pname = "reflex-localize"; + version = "1.0.2.0"; + sha256 = "0iwxj8shik06r1wdhl8p5spvvn43xswilzhid8mfc3hj5khpzdzm"; + libraryHaskellDepends = [ + base jsaddle mtl reflex reflex-external-ref text + ]; + description = "Localization library for reflex"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "reflex-localize-dom" = callPackage + ({ mkDerivation, base, containers, reflex, reflex-dom + , reflex-localize, text + }: + mkDerivation { + pname = "reflex-localize-dom"; + version = "1.0.0.0"; + sha256 = "1y2m15l6xxcmhhpn5jq3dfvzd04s5d84pm5s7iff9s0gkikhz4ga"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers reflex reflex-dom reflex-localize text + ]; + description = "Helper widgets for reflex-localize"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "reflex-monad-auth" = callPackage + ({ mkDerivation, base, jsaddle, mtl, reflex, reflex-external-ref }: + mkDerivation { + pname = "reflex-monad-auth"; + version = "0.1.0.1"; + sha256 = "1gfhh462rd401rmcnb7lgn9443y2fg16xpyp4kgkzi8c4l8ja4af"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base jsaddle mtl reflex reflex-external-ref + ]; + description = "Utilities to split reflex app to authorized and not authorized contexts"; + license = stdenv.lib.licenses.mit; + }) {}; + "reflex-orphans" = callPackage ({ mkDerivation, base, deepseq, dependent-map, mtl, ref-tf, reflex , tasty, tasty-hunit, these @@ -216268,6 +216455,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "req_3_8_0" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder + , bytestring, case-insensitive, connection, exceptions, hspec + , hspec-core, hspec-discover, http-api-data, http-client + , http-client-tls, http-types, modern-uri, monad-control, mtl + , QuickCheck, retry, template-haskell, text, time, transformers + , transformers-base, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "req"; + version = "3.8.0"; + sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson authenticate-oauth base blaze-builder bytestring + case-insensitive connection exceptions http-api-data http-client + http-client-tls http-types modern-uri monad-control mtl retry + template-haskell text time transformers transformers-base + unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive hspec + hspec-core http-client http-types modern-uri monad-control mtl + QuickCheck retry template-haskell text time unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + doCheck = false; + description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "req-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , http-client, req, resourcet, temporary, transformers, weigh @@ -216776,6 +216995,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet-pool" = callPackage + ({ mkDerivation, base, resource-pool, resourcet }: + mkDerivation { + pname = "resourcet-pool"; + version = "0.1.0.0"; + sha256 = "1jf6sbyhxrqbkdxiv330rk46kdvbrr0c4pybnm9cmij9wdqs15bd"; + libraryHaskellDepends = [ base resource-pool resourcet ]; + description = "A small library to convert a Pool into an Acquire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -218780,6 +219010,8 @@ self: { ]; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) rocksdb;}; "rocksdb-haskell-jprupp" = callPackage @@ -219604,8 +219836,8 @@ self: { ({ mkDerivation, base, hspec, rowdy, yesod-core }: mkDerivation { pname = "rowdy-yesod"; - version = "0.0.1.0"; - sha256 = "17k9bbxwpmxpswkmax6jrlcfrp6qhgdkjixsp4d6rn7mj676010g"; + version = "0.0.1.1"; + sha256 = "120n4n17n3pkpc23bpjn2vc7w3zaifmyd4mr86n16hn993482b1s"; libraryHaskellDepends = [ base rowdy yesod-core ]; testHaskellDepends = [ base hspec rowdy yesod-core ]; description = "An EDSL for web application routes"; @@ -219851,10 +220083,8 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.6.0.0"; - sha256 = "0crp7z6s5xch5jggyyg1a2jcijgl5cg17wiiqkcfmwjdkraz7ax9"; - revision = "1"; - editedCabalFile = "1xgqfn7dlzz79j4krmqg4d2xlybm6x4b0s8gklphn3lccwpicfy8"; + version = "0.6.0.1"; + sha256 = "07fmf5d93ywgqz4fp0aw5n1vzqlphrhcmiqrc0xpcphi17ig9m7l"; libraryHaskellDepends = [ atom-conduit base base-compat-batteries conduit conduit-combinators containers dublincore-xml-conduit microlens microlens-th safe @@ -223721,6 +223951,8 @@ self: { description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "seacat" = callPackage @@ -225413,8 +225645,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.18.1"; - sha256 = "15brknvia5kd1fiyxlqghhhnajwrgai9yspkg5nd0v2k1g9dllky"; + version = "0.18.2"; + sha256 = "18mfjj9za8g9rgj7a6j0ly6lf1ykfwrlpy3cf53lv1gxvb19gmk5"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive deepseq http-api-data http-media http-types mmorph @@ -225448,6 +225680,8 @@ self: { ]; description = "Servant support for JuicyPixels"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-aeson-specs" = callPackage @@ -225473,6 +225707,8 @@ self: { ]; description = "generic tests for aeson serialization in servant"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth" = callPackage @@ -225501,6 +225737,8 @@ self: { pname = "servant-auth-client"; version = "0.4.1.0"; sha256 = "16rmwdrx0qyqa821ipayczzl3gv8gvqgx8k9q8qaw19w87hwkh83"; + revision = "1"; + editedCabalFile = "0q7bazq4ilijclpz23fshpjcspnrfalh7jhqi5gg03m00wwibn4n"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -225603,6 +225841,8 @@ self: { ]; description = "Authentication via HMAC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-auth-server" = callPackage @@ -225796,6 +226036,8 @@ self: { ]; description = "Authenticate Routes Using Wordpress Cookies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-avro" = callPackage @@ -225813,6 +226055,8 @@ self: { ]; description = "Avro content type for Servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-blaze" = callPackage @@ -225848,6 +226092,8 @@ self: { ]; description = "Servant CSV content-type for cassava"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-checked-exceptions" = callPackage @@ -225935,10 +226181,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.18.1"; - sha256 = "0pv9xj5a6caqxsnlnv4ijzavgmsgi0n3zri4h84mrjki2h2z1837"; - revision = "1"; - editedCabalFile = "1d2f8l2zs2gy880g3i9l3jwjrxygb705qz1f81ral7ik56465m83"; + version = "0.18.2"; + sha256 = "0acwpjmi5r62jgmpw508jq942kq5dhdy5602w9v7g318inxzwwi1"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -225964,10 +226208,10 @@ self: { }: mkDerivation { pname = "servant-client-core"; - version = "0.18.1"; - sha256 = "1pp4r8l1130ph680kcw7zpk1p76z88ip21cf4dghckmj0lflyw9h"; + version = "0.18.2"; + sha256 = "0b449c28z20sx98pc2d4p65jr3m9glsa47jjc2w4gf90jisl173r"; revision = "1"; - editedCabalFile = "04lk4zwx5g652krn561fd02wbrsg9jrj93hw7gv6z2xay8dr05m1"; + editedCabalFile = "0vwj97h6x7zwvyx3ra09yhpi37mnn2kw5m27wnkzwwvk487swqxd"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -225996,6 +226240,8 @@ self: { ]; description = "A servant client for frontend JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-client-namedargs" = callPackage @@ -226017,6 +226263,8 @@ self: { ]; description = "Automatically derive API client functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-conduit" = callPackage @@ -226069,6 +226317,8 @@ self: { libraryHaskellDepends = [ base servant ]; description = "Servant types for defining API with relational DBs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-db-postgresql" = callPackage @@ -226117,6 +226367,8 @@ self: { ]; description = "Servant Dhall content-type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-docs" = callPackage @@ -226127,8 +226379,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.7"; - sha256 = "01m8ixxs310mcmnd1c5na2ycbnc9xwizdnzzcjdbli5r1mngpgc8"; + version = "0.11.8"; + sha256 = "0zbsv75zyfg44l4822qnmvw2naxcxwgnpzc55jnvz766l2dydjrb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226167,6 +226419,8 @@ self: { ]; description = "Generate endpoints overview for Servant API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-ede" = callPackage @@ -226190,6 +226444,8 @@ self: { ]; description = "Combinators for rendering EDE templates in servant web applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-ekg" = callPackage @@ -226216,6 +226472,8 @@ self: { ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-elm" = callPackage @@ -226238,6 +226496,8 @@ self: { ]; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-errors" = callPackage @@ -226288,22 +226548,32 @@ self: { }) {}; "servant-exceptions" = callPackage - ({ mkDerivation, aeson, base, exceptions, http-media, http-types - , mtl, servant, servant-server, text, wai, warp + ({ mkDerivation, aeson, base, exceptions, http-types, servant, text }: mkDerivation { pname = "servant-exceptions"; - version = "0.1.1"; - sha256 = "1qdb6ins7l0ryyrmg9j5pw428rlhkmzpbq5jqawfn01j8vf9yav5"; - isLibrary = true; - isExecutable = true; + version = "0.2.1"; + sha256 = "1bzxac87x3nfg5hllqxfi2qrdkiy2zfxwzkcg6vyjirnwpqvn49b"; libraryHaskellDepends = [ - aeson base exceptions http-media http-types mtl servant - servant-server text wai + aeson base exceptions http-types servant text ]; - executableHaskellDepends = [ - aeson base exceptions http-types servant-server text warp + description = "Extensible exceptions for servant APIs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-exceptions-server" = callPackage + ({ mkDerivation, base, exceptions, http-media, http-types, mtl + , servant, servant-exceptions, servant-server, text, wai + }: + mkDerivation { + pname = "servant-exceptions-server"; + version = "0.2.1"; + sha256 = "1cx9d2hx09mx1kypdhwyqhl6s1aipvxi4ak4xy4jrd0fy8r8wy9g"; + libraryHaskellDepends = [ + base exceptions http-media http-types mtl servant + servant-exceptions servant-server text wai ]; + description = "Extensible exceptions for servant API servers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -226318,6 +226588,8 @@ self: { ]; description = "Fiat content types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-flatten" = callPackage @@ -226337,8 +226609,8 @@ self: { }: mkDerivation { pname = "servant-foreign"; - version = "0.15.2"; - sha256 = "0vxm80cnd4w8zpyq7brnnjmcarb0vj7xgikwpc0il1w6hjgis7vl"; + version = "0.15.3"; + sha256 = "1bz2ry5pd8cx5pmsvg7q29r9gd5kqjjv9nd97f7abwjqi8as2413"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -226359,6 +226631,8 @@ self: { libraryHaskellDepends = [ base servant servant-server ]; description = "Utilities for generating mock server implementations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-generic" = callPackage @@ -226375,6 +226649,8 @@ self: { ]; description = "Specify Servant APIs with records"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-github" = callPackage @@ -226398,6 +226674,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings to GitHub API using servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-github-webhook" = callPackage @@ -226447,6 +226725,8 @@ self: { ]; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-hmac-auth" = callPackage @@ -226473,6 +226753,8 @@ self: { testHaskellDepends = [ base ]; description = "Servant authentication with HMAC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-http-streams" = callPackage @@ -226487,10 +226769,8 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.18.1"; - sha256 = "05ji6zg6v8cysfbh0850cmwrian0n2clvqn3b348cz3qms0ijrpg"; - revision = "1"; - editedCabalFile = "0xpscs5y480n19n3i4sn7xmb6kra7cyjxq64ic18cpqijv1jwlm1"; + version = "0.18.2"; + sha256 = "1kyiv8qamw9dxv2ax7hx9n7w9507vjvwn89x4nvlsc87nq91hvg0"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -226532,6 +226812,8 @@ self: { ]; description = "Generate HTTP2 clients from Servant API descriptions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-iCalendar" = callPackage @@ -226661,6 +226943,8 @@ self: { ]; description = "Automatically derive Kotlin class to query servant webservices"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-lucid" = callPackage @@ -226729,6 +227013,8 @@ self: { ]; description = "Matrix parameter combinator for servant"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-mock" = callPackage @@ -226757,6 +227043,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-multipart" = callPackage @@ -226819,6 +227107,8 @@ self: { testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-nix" = callPackage @@ -226840,6 +227130,8 @@ self: { ]; description = "Servant Nix content-type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-openapi3" = callPackage @@ -226872,6 +227164,36 @@ self: { broken = true; }) {}; + "servant-openapi3_2_0_1_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , Cabal, cabal-doctest, directory, doctest, filepath, hspec + , hspec-discover, http-media, insert-ordered-containers, lens + , lens-aeson, openapi3, QuickCheck, servant, singleton-bool + , template-haskell, text, time, unordered-containers, utf8-string + , vector + }: + mkDerivation { + pname = "servant-openapi3"; + version = "2.0.1.1"; + sha256 = "1cyzyljmdfr3gigdszcpj1i7l698fnxpc9hr83mzspm6qcmbqmgf"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring hspec http-media + insert-ordered-containers lens openapi3 QuickCheck servant + singleton-bool text unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat directory doctest filepath hspec lens + lens-aeson openapi3 QuickCheck servant template-haskell text time + utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "servant-options" = callPackage ({ mkDerivation, base, bytestring, http-types, servant-foreign , servant-server, text, wai @@ -226903,6 +227225,8 @@ self: { testHaskellDepends = [ base hspec QuickCheck servant-server text ]; description = "Type-safe pagination for Servant APIs"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pandoc" = callPackage @@ -226920,6 +227244,8 @@ self: { ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pipes" = callPackage @@ -226954,6 +227280,8 @@ self: { libraryHaskellDepends = [ base resource-pool servant time ]; description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-postgresql" = callPackage @@ -226970,6 +227298,8 @@ self: { ]; description = "Useful functions and instances for using servant with a PostgreSQL context"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-proto-lens" = callPackage @@ -226992,6 +227322,8 @@ self: { ]; description = "Servant Content-Type for proto-lens protobuf modules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-purescript" = callPackage @@ -227015,6 +227347,8 @@ self: { ]; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-pushbullet-client" = callPackage @@ -227034,6 +227368,8 @@ self: { ]; description = "Bindings to the Pushbullet API using servant-client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-py" = callPackage @@ -227055,6 +227391,8 @@ self: { ]; description = "Automatically derive python functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-quickcheck" = callPackage @@ -227083,6 +227421,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-rawm" = callPackage @@ -227105,6 +227445,8 @@ self: { libraryHaskellDepends = [ base servant-client-core servant-rawm ]; description = "The client implementation of servant-rawm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-rawm-docs" = callPackage @@ -227156,6 +227498,8 @@ self: { ]; description = "Derive Reason types to interact with a Haskell backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-reflex" = callPackage @@ -227178,6 +227522,8 @@ self: { ]; description = "servant API generator for reflex apps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-response" = callPackage @@ -227210,6 +227556,8 @@ self: { ]; description = "Servant router for non-server applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-ruby" = callPackage @@ -227242,6 +227590,8 @@ self: { ]; description = "Generate a web service for servant 'Resource's using scotty and JSON"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-seo" = callPackage @@ -227264,6 +227614,8 @@ self: { ]; description = "Generate Robots.txt and Sitemap.xml specification for your servant API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-serf" = callPackage @@ -227283,6 +227635,8 @@ self: { doHaddock = false; description = "Generates a servant API module"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-server" = callPackage @@ -227296,10 +227650,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.18.1"; - sha256 = "1azyaprki2mxqxb67h792qrjzxy8cy9m9f7zxg22g60l3j197df5"; - revision = "1"; - editedCabalFile = "1z136vqfbxliq141y4i6m9d3bif4k0ay34xximlnnfxjazx4r0ph"; + version = "0.18.2"; + sha256 = "05ricb3w1app6c094zwaq2jnqv53jpf4n89ffynm31dvf6h9qdih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -227337,6 +227689,8 @@ self: { ]; description = "Automatically derive API server functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-smsc-ru" = callPackage @@ -227359,6 +227713,8 @@ self: { ]; description = "Servant client for smsc.ru service for sending SMS to cell phones"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-snap" = callPackage @@ -227460,6 +227816,8 @@ self: { testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-client" = callPackage @@ -227485,6 +227843,8 @@ self: { ]; description = "Client instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-docs" = callPackage @@ -227502,6 +227862,8 @@ self: { ]; description = "Client instances for the 'servant-docs' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-streaming-server" = callPackage @@ -227528,6 +227890,8 @@ self: { ]; description = "Server instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-subscriber" = callPackage @@ -227598,6 +227962,8 @@ self: { ]; description = "Swagger Tags for Servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-swagger-ui" = callPackage @@ -227692,6 +228058,8 @@ self: { ]; description = "Automatically generate Elm clients for Servant APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-tracing" = callPackage @@ -227824,6 +228192,8 @@ self: { ]; description = "Servant support for yaml"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin" = callPackage @@ -227835,6 +228205,8 @@ self: { libraryHaskellDepends = [ base singletons ]; description = "Types and definitions of servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-client" = callPackage @@ -227858,6 +228230,8 @@ self: { ]; description = "Client library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-server" = callPackage @@ -227881,6 +228255,8 @@ self: { ]; description = "Server library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "servant-zeppelin-swagger" = callPackage @@ -227902,6 +228278,8 @@ self: { ]; description = "Swagger instances for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "server-generic" = callPackage @@ -232591,6 +232969,8 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "skip-list" = callPackage @@ -232679,6 +233059,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_10_1" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , directory, filepath, pretty-show, skylighting-core, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.10.1"; + sha256 = "0zpf6p3c0byp3pv9bgg77ndq89n3fhcazyln44pq8lxnmjy0x15v"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers skylighting-core + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers directory filepath + pretty-show text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -232710,6 +233113,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_10_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe + , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text + , transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.10.1"; + sha256 = "10da31x6zj1b3kydr63g36zmmqpqmgcbwdalhxvbmxliw1m5kfvx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl safe text transformers utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text utf8-string + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -238242,8 +238677,8 @@ self: { }: mkDerivation { pname = "sr-extra"; - version = "1.80"; - sha256 = "03xm9km8wzvz8g1czj320k00xf2dzdi8rm74l7xdr9h7bxcwyh84"; + version = "1.85.1"; + sha256 = "15x8d413m8ldl81b5yx13nprr4k0aszx33mjm880za0k90s8r65x"; libraryHaskellDepends = [ base base64-bytestring bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data @@ -242558,20 +242993,6 @@ self: { }) {}; "strict-tuple" = callPackage - ({ mkDerivation, base, bifunctors, deepseq, hashable }: - mkDerivation { - pname = "strict-tuple"; - version = "0.1.3"; - sha256 = "0dyiwgkbr1d97jbri7a2q4by7g0wiszpw3hgfgqv4rfp25lsv39j"; - revision = "1"; - editedCabalFile = "1bkizfki8v5p0n8sy59s4zqjmv1mnv3s45327cig9cr081ibv9yy"; - libraryHaskellDepends = [ base bifunctors deepseq hashable ]; - testHaskellDepends = [ base ]; - description = "Strict tuples"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "strict-tuple_0_1_4" = callPackage ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { pname = "strict-tuple"; @@ -242581,7 +243002,6 @@ self: { testHaskellDepends = [ base ]; description = "Strict tuples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-tuple-lens" = callPackage @@ -247825,8 +248245,8 @@ self: { }: mkDerivation { pname = "tart"; - version = "0.2"; - sha256 = "03pi46lr5b9qcc35ffwxwzv9ll51cyv526kjcvaags3ky917rxxn"; + version = "0.3"; + sha256 = "0zqj8cz4q1447an9fak73vzandd497xa745km3w4y3cffnc0zwyw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -247838,8 +248258,6 @@ self: { ]; description = "Terminal Art"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "task" = callPackage @@ -248270,24 +248688,6 @@ self: { }) {}; "tasty-hspec" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty - , tasty-quickcheck, tasty-smallcheck - }: - mkDerivation { - pname = "tasty-hspec"; - version = "1.1.5.1"; - sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"; - revision = "6"; - editedCabalFile = "0xa7h0p5r41m2a3l5r9ggmm4bc2a6wzgb4qvcqfl0dd2yb922bkz"; - libraryHaskellDepends = [ - base hspec hspec-core QuickCheck tasty tasty-quickcheck - tasty-smallcheck - ]; - description = "Hspec support for the Tasty test framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tasty-hspec_1_1_6" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty , tasty-quickcheck, tasty-smallcheck }: @@ -248301,7 +248701,6 @@ self: { ]; description = "Hspec support for the Tasty test framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-html" = callPackage @@ -251936,38 +252335,6 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers, criterion - , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim - , hspec, hspec-discover, integer-gmp, QuickCheck - , quickcheck-instances, template-haskell, text, th-abstraction - , th-lift, transformers, transformers-compat - }: - mkDerivation { - pname = "text-show"; - version = "3.8.5"; - sha256 = "0xc2269v0bfcvlwm60l2zs6l6lwljfnq5n05n9kp580qybvynzjg"; - revision = "3"; - editedCabalFile = "13gqszvlbqpgb2am8ny8v1p56yx5l9vqs2w45g8ld53f50ll62rv"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers generic-deriving ghc-boot-th ghc-prim - integer-gmp template-haskell text th-abstraction th-lift - transformers transformers-compat - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - QuickCheck quickcheck-instances template-haskell text transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-show_3_9" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -251995,7 +252362,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -252744,25 +253110,6 @@ self: { }) {}; "th-lift-instances" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, th-lift, transformers, vector - }: - mkDerivation { - pname = "th-lift-instances"; - version = "0.1.17"; - sha256 = "0k59j460dcr9vidmww2has78g3zx2wl0cjlpqc1laqai9w8klda5"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text th-lift - transformers vector - ]; - testHaskellDepends = [ - base bytestring containers QuickCheck template-haskell text vector - ]; - description = "Lift instances for template-haskell for common data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift-instances_0_1_18" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector }: @@ -252779,7 +253126,6 @@ self: { ]; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-nowq" = callPackage @@ -254091,14 +254437,14 @@ self: { broken = true; }) {}; - "time_1_11" = callPackage + "time_1_11_1" = callPackage ({ mkDerivation, base, criterion, deepseq, QuickCheck, random , tasty, tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.11"; - sha256 = "16kmc754gz73plwb7lnk206r9v99va8y4ilbm347h6xmi5z7avp9"; + version = "1.11.1"; + sha256 = "0l0nqqg38xz2q78pi4i4jsbrb1jkn9ch0xlq17kn7824dh0j21vw"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -254735,8 +255081,8 @@ self: { }: mkDerivation { pname = "timerep"; - version = "2.0.0.2"; - sha256 = "0fakjs6fgva6i035jiyr8hcgnrivw601cy8n3ja232d07izl2khx"; + version = "2.0.1.0"; + sha256 = "1l67gbfjydq0xapry5k9pwzxmp6z7ixzyvwshnszryspcckagxif"; libraryHaskellDepends = [ attoparsec base monoid-subclasses text time ]; @@ -256157,6 +256503,8 @@ self: { ]; description = "tonatona plugin for servant"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "too-many-cells" = callPackage @@ -256788,26 +257136,6 @@ self: { }) {}; "tracing" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, hspec, http-client, mtl, network - , random, stm, text, time, transformers, unliftio - }: - mkDerivation { - pname = "tracing"; - version = "0.0.5.1"; - sha256 = "06d4fik133jbwbznk6fccwhw21n750gnigw9gj25sgjkghydmllb"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive containers - http-client mtl network random stm text time transformers unliftio - ]; - testHaskellDepends = [ - base containers hspec mtl stm text unliftio - ]; - description = "Distributed tracing"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tracing_0_0_5_2" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, hspec, http-client, mtl, network , random, stm, text, time, transformers, unliftio @@ -256825,7 +257153,6 @@ self: { ]; description = "Distributed tracing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracing-control" = callPackage @@ -261283,8 +261610,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.9.1"; - sha256 = "0vw0mbkii7j5rr5fp370j8grq355cg0ddw55f24gbjw1z0wc71hx"; + version = "0.7.10.1"; + sha256 = "0zq0bl4j1hwf2q0ipl0vp0q19lhs0bnwmrh7qh1qn53g078aj5ga"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -261372,6 +261699,95 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "typson-beam" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-migrate + , beam-postgres, bytestring, exceptions, hedgehog, HUnit, microlens + , postgresql-simple, tasty, tasty-hedgehog, tasty-hunit + , test-fixture, typson-core + }: + mkDerivation { + pname = "typson-beam"; + version = "0.1.0.1"; + sha256 = "0zhi81hvas561c1qxnnbyrdsc3di8iakrhyz59ppc551cgzf28da"; + libraryHaskellDepends = [ + aeson base beam-core beam-postgres postgresql-simple typson-core + ]; + testHaskellDepends = [ + aeson base beam-core beam-migrate beam-postgres bytestring + exceptions hedgehog HUnit microlens postgresql-simple tasty + tasty-hedgehog tasty-hunit test-fixture typson-core + ]; + description = "Typson Beam Integration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "typson-core" = callPackage + ({ mkDerivation, aeson, base, containers, profunctors, text + , unordered-containers, vector + }: + mkDerivation { + pname = "typson-core"; + version = "0.1.0.1"; + sha256 = "1mgpr6j1q18ky6acpg9zahvb07lr3902cwawizp399k25d7s7a9q"; + libraryHaskellDepends = [ + aeson base containers profunctors text unordered-containers vector + ]; + description = "Type-safe PostgreSQL JSON Querying"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "typson-esqueleto" = callPackage + ({ mkDerivation, aeson, base, bytestring, esqueleto, exceptions + , hedgehog, microlens, persistent, persistent-postgresql + , persistent-template, postgresql-simple, tasty, tasty-hedgehog + , tasty-hunit, test-fixture, text, typson-core + }: + mkDerivation { + pname = "typson-esqueleto"; + version = "0.1.0.1"; + sha256 = "15dw1vp676sg8d1iyfcr1psx4vaix8mi4mbp4p431138yqa56qx4"; + libraryHaskellDepends = [ + aeson base esqueleto persistent persistent-template text + typson-core + ]; + testHaskellDepends = [ + aeson base bytestring esqueleto exceptions hedgehog microlens + persistent persistent-postgresql persistent-template + postgresql-simple tasty tasty-hedgehog tasty-hunit test-fixture + text typson-core + ]; + description = "Typson Esqueleto Integration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "typson-selda" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, hedgehog + , HUnit, microlens, selda, selda-json, selda-postgresql, tasty + , tasty-hedgehog, tasty-hunit, test-fixture, text, typson-core + }: + mkDerivation { + pname = "typson-selda"; + version = "0.1.0.0"; + sha256 = "09jp1p82d0vv879rnxmingbdph6qcfszlywrn6h8r26apmh9v5pr"; + libraryHaskellDepends = [ + aeson base bytestring selda selda-json selda-postgresql text + typson-core + ]; + testHaskellDepends = [ + aeson base bytestring exceptions hedgehog HUnit microlens selda + selda-json selda-postgresql tasty tasty-hedgehog tasty-hunit + test-fixture text typson-core + ]; + description = "Typson Selda Integration"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tyro" = callPackage ({ mkDerivation, aeson, base, bytestring, HUnit, protolude , reflection, singletons, test-framework, test-framework-hunit @@ -261868,8 +262284,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "ukrainian-phonetics-basic"; - version = "0.2.0.2"; - sha256 = "016q1wq4wbwxjd3a4fbj68h525q8gc2v1gn211mq3divhzc3rhwz"; + version = "0.3.1.2"; + sha256 = "0a4fdf64wv23kpnmz0jggm7vc0iazzsv8kpip3qjpnyfq2yqw06r"; libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = stdenv.lib.licenses.mit; @@ -262083,6 +262499,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unbounded-delays_0_1_1_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "unbounded-delays"; + version = "0.1.1.1"; + sha256 = "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar"; + libraryHaskellDepends = [ base ]; + description = "Unbounded thread delays and timeouts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unbounded-delays-units" = callPackage ({ mkDerivation, base, unbounded-delays, units, units-defs }: mkDerivation { @@ -265556,19 +265984,18 @@ self: { }) {}; "uusi" = callPackage - ({ mkDerivation, base, Cabal, HUnit, microlens, microlens-th, text + ({ mkDerivation, base, Cabal, filepath, HUnit, microlens + , microlens-th, text }: mkDerivation { pname = "uusi"; - version = "0.2.0.0"; - sha256 = "0ycl5nml9v9dxksi2bcl5bff0nirn9g5cs8p0f09lxg81kis2zjl"; - revision = "1"; - editedCabalFile = "13w8xn1mqjjjb3ismi0l78xm7bkhrvyph0wgyfvf6pyn1866qzmn"; + version = "0.2.1.0"; + sha256 = "11r7p2g4pkxd57xvnbids3r6gwr76ar8c2kpdvpi9jlp01p0rfbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal microlens microlens-th text ]; executableHaskellDepends = [ - base Cabal microlens microlens-th text + base Cabal filepath microlens microlens-th text ]; testHaskellDepends = [ base Cabal HUnit microlens microlens-th text @@ -268506,8 +268933,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.15"; - sha256 = "1jg6d8k06dz2nnbddxis83hlrwjhdf735q8zr4gv7sx6wnl60f3n"; + version = "3.7"; + sha256 = "1d2fdlgnzrjhd59niw0qm4qiqa8zcpjxj340r82018n06w4v5vsy"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -268535,8 +268962,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.2"; - sha256 = "0xzh76lmyhd43myghnw9w7cil38jiryrbz19myp5krr9r1g6rwyb"; + version = "0.3"; + sha256 = "1q5qy4ah75xq4imr28i97f07qmbwaaisb7zc25ms6vr0cz4ijg7w"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring extra file-embed filepath resourcet @@ -268956,6 +269383,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_1_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , bytestring, call-stack, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, http2, HUnit, iproute, network, old-locale, resourcet + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, void, wai, wai-logger, word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.1.3"; + sha256 = "17s8cf0fdbkg9z2pvpsbhxg2cy5yy3c94513gkgf81lfl38zdrn7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring bytestring call-stack + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types http2 HUnit iproute network + old-locale resourcet streaming-commons text time transformers unix + unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive cookie fast-logger hspec + http-types http2 HUnit resourcet text time transformers wai zlib + ]; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-feature-flags" = callPackage ({ mkDerivation, aeson, base, bytestring, random, text , unordered-containers, wai, warp @@ -274587,6 +275044,8 @@ self: { testHaskellDepends = [ base bytestring envy hspec skews text ]; description = "A-little-higher-level WebSocket client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "wstunnel" = callPackage @@ -279292,43 +279751,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, fast-logger - , gauge, hspec, hspec-expectations, http-types, HUnit, memory - , monad-logger, mtl, network, parsec, path-pieces, primitive - , random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.18.6"; - sha256 = "1iay7lrc52krhnlkvr6bxchnwk9lj316fv2d47bh3bfay69wqc69"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_6_18_7" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, bytestring, case-insensitive, cereal, clientsession , conduit, conduit-extra, containers, cookie, deepseq, fast-logger @@ -279363,7 +279785,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -281986,18 +282407,20 @@ self: { "zeolite-lang" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable - , mtl, parsec, regex-tdfa, transformers, unix + , mtl, parsec, regex-tdfa, time, transformers, unix }: mkDerivation { pname = "zeolite-lang"; - version = "0.8.0.0"; - sha256 = "1ahr69w65hd70jc0jrc3dfz1gnjqxlg9w24djzm6826wskg31fa9"; + version = "0.9.0.0"; + sha256 = "0gcjjxavsc763a218rswzk7zrx917qg5sid7gpy81yw054kfp6ws"; + revision = "1"; + editedCabalFile = "0c76xxaxqwsh0ybvf5r6wza9gq7y7hiqm75pazmrhkzvm48q1dl8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers directory filepath hashable mtl parsec regex-tdfa - transformers unix + time transformers unix ]; executableHaskellDepends = [ base containers directory filepath unix @@ -282228,6 +282651,8 @@ self: { ]; description = "Haskell implementation of several ZeroMQ patterns"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "zeromq4-simple" = callPackage @@ -282488,14 +282913,15 @@ self: { }: mkDerivation { pname = "zio"; - version = "0.1.0.0"; - sha256 = "001bkysr4n5azly7cmn7xbgw0bg00ib4yg83klz0k0b5217wg982"; + version = "0.1.0.2"; + sha256 = "15ka58l6xv3v4x5rcam75gq37mfcxjngm0frz9k0rmzqyf07l06k"; libraryHaskellDepends = [ base mtl transformers unexceptionalio unexceptionalio-trans ]; testHaskellDepends = [ base mtl transformers unexceptionalio unexceptionalio-trans ]; + description = "App-centric Monad-transformer based on Scala ZIO (UIO + ReaderT + ExceptT)"; license = stdenv.lib.licenses.mpl20; }) {}; @@ -283291,18 +283717,18 @@ self: { }) {}; "zydiskell" = callPackage - ({ mkDerivation, base, bytestring, fixed-vector, storable-record - , vector + ({ mkDerivation, base, bytestring, containers, fixed-vector + , storable-record }: mkDerivation { pname = "zydiskell"; - version = "0.1.1.0"; - sha256 = "16fc3k0m0aln0ssy6nl2fjgl6l8svpyddyr0hrvzm0h5lbnk3h0w"; + version = "0.2.0.0"; + sha256 = "0pbwhvl6mff5k0rvpjijqpncqbm5g53ij1bc3ckq66q2v5ikswk8"; libraryHaskellDepends = [ - base bytestring fixed-vector storable-record vector + base bytestring containers fixed-vector storable-record ]; testHaskellDepends = [ - base bytestring fixed-vector storable-record vector + base bytestring containers fixed-vector storable-record ]; description = "Haskell language binding for the Zydis library, a x86/x86-64 disassembler"; license = stdenv.lib.licenses.gpl3; From 855c7fb6da9316caffe3f6395cb8c99091139d34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 27 Nov 2020 20:03:30 +0100 Subject: [PATCH 165/268] git-annex: update sha256 hash for the new 8.20201127 version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4d37668fd01..272332e33ea 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "13s6czv4p6n6s16kr5r255vldrn9038qjd5yl5xrh91xk6z410cd"; + sha256 = "1l2syrslba4mrxjzj0iblflz72siw3ibqri6p5hf59fk7rmm30a8"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From c8c6cdb48bcc8b16028f58e45575b77980204b8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 20:22:39 +0000 Subject: [PATCH 166/268] fastjet-contrib: 1.042 -> 1.045 --- .../development/libraries/physics/fastjet-contrib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 2bc5b12dfb7..68e07e7b42d 100644 --- a/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.042"; + version = "1.045"; src = fetchurl { url = "http://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "0cc8dn6g7adj2pgs8hvczg68i3xhlk6978m4gxamgibilf9jw1av"; + sha256 = "1y45jx7i30ik2pjv33y16fi5i5jpmi0zp1jh32pwywd3diaiazv6"; }; buildInputs = [ fastjet ]; From 0ce6c50370bad08950e3c7824cecd0927bf56bd4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Nov 2020 15:43:09 -0500 Subject: [PATCH 167/268] minecraft: Skip desktop file validation --- pkgs/games/minecraft/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 60f89bea0e8..7ef2f533476 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -37,6 +37,7 @@ let comment = "Official launcher for Minecraft, a sandbox-building game"; desktopName = "Minecraft Launcher"; categories = "Game;"; + fileValidation = false; }; envLibPath = stdenv.lib.makeLibraryPath [ From 00aabed73c73dd053ab182ca1a726b111db9ebf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 21:27:37 +0000 Subject: [PATCH 168/268] inter: 3.11 -> 3.15 --- pkgs/data/fonts/inter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index 9c7ef62c769..ed8e9eb13a6 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.11"; + version = "3.15"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1"; + sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0"; meta = with lib; { homepage = "https://rsms.me/inter/"; From e007728c922d468180e93e9ca5ce1a52a0076404 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 21:33:29 +0000 Subject: [PATCH 169/268] agave: 30 -> 35 --- pkgs/data/fonts/agave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index ea64cf34578..39ef6e34aaa 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -2,7 +2,7 @@ let pname = "agave"; - version = "30"; + version = "35"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; @@ -13,7 +13,7 @@ in fetchurl { install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf ''; - sha256 = "1f2f1fycwi8xbf8x03yfq78nv11b2msl4ll9flw8rkg023h9vwg7"; + sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; From 0acf2268f33ffdb6c0fed4db89cbca6032c8134a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 21:42:59 +0000 Subject: [PATCH 170/268] gitAndTools.gitstatus: 1.3.1 -> 1.4.3 --- .../version-management/git-and-tools/gitstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 47d095b0f1c..a99ff3c2e08 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.3.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "03zaywncds7pjrl07rvdf3fh39gnp2zfvgsf0afqwv317sgmgpzf"; + sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; From f4c44e6314fe429853f32ec259abf3e71467e42c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 14:05:32 +0000 Subject: [PATCH 171/268] etcd_3_4: 3.4.13 -> 3.4.14 --- pkgs/servers/etcd/3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index be52b1bf1a5..dc9fc0898df 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.13"; + version = "3.4.14"; deleteVendor = true; vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc"; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "0bvky593241i60qf6793sxzsxwfl3f56cgscnva9f2jfhk157wmy"; + sha256 = "0s6xwc8yczjdf6xysb6m0pp31hxjqdqjw24bliq08094jprhj31f"; }; buildPhase = '' From 831c700c5d04c791c9384991d38ac146067daa64 Mon Sep 17 00:00:00 2001 From: Roosembert Palacios Date: Fri, 27 Nov 2020 22:42:03 +0100 Subject: [PATCH 172/268] firejail: fix -overlay and -build functionality on NixOS - The `-overlay` flag runs the specified binary inside an OverlayFS, since the /nix store may be in a different mount point than the user home, this patch explicitly bind mounts it so it's available inside the overlay. - profile builder: firejail provides facilities to build a new profiles. To do so, it execute the helper binary `fbuilder`, which in turn will execute firejail back with different options. This patch makes it use the binary available in PATH instead of the one produced at compile time. The compiled firejail binary doesn't have the necessary permissions, so the firejail NixOS module wraps it in a SUID wrapper available on PATH at runtime. Signed-off-by: Roosembert Palacios --- pkgs/os-specific/linux/firejail/default.nix | 9 +++++++ .../fbuilder-call-firejail-on-path.patch | 11 ++++++++ .../firejail/mount-nix-dir-on-overlay.patch | 27 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch create mode 100644 pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index fadf5df7140..a3be5484a04 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation { name = "${s.name}.tar.bz2"; }; + patches = [ + # Adds the /nix directory when using an overlay. + # Required to run any programs under this mode. + ./mount-nix-dir-on-overlay.patch + # By default fbuilder hardcodes the firejail binary to the install path. + # On NixOS the firejail binary is a setuid wrapper available in $PATH. + ./fbuilder-call-firejail-on-path.patch + ]; + prePatch = '' # Allow whitelisting ~/.nix-profile substituteInPlace etc/firejail.config --replace \ diff --git a/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch b/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch new file mode 100644 index 00000000000..6016891655b --- /dev/null +++ b/pkgs/os-specific/linux/firejail/fbuilder-call-firejail-on-path.patch @@ -0,0 +1,11 @@ +--- a/src/fbuilder/build_profile.c ++++ b/src/fbuilder/build_profile.c +@@ -67,7 +67,7 @@ + errExit("asprintf"); + + char *cmdlist[] = { +- BINDIR "/firejail", ++ "firejail", + "--quiet", + "--noprofile", + "--caps.drop=all", diff --git a/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch b/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch new file mode 100644 index 00000000000..685314f9075 --- /dev/null +++ b/pkgs/os-specific/linux/firejail/mount-nix-dir-on-overlay.patch @@ -0,0 +1,27 @@ +--- a/src/firejail/fs.c ++++ b/src/firejail/fs.c +@@ -1143,6 +1143,16 @@ + errExit("mounting /dev"); + fs_logger("whitelist /dev"); + ++ // mount-bind /nix ++ if (arg_debug) ++ printf("Mounting /nix\n"); ++ char *nix; ++ if (asprintf(&nix, "%s/nix", oroot) == -1) ++ errExit("asprintf"); ++ if (mount("/nix", nix, NULL, MS_BIND|MS_REC, NULL) < 0) ++ errExit("mounting /nix"); ++ fs_logger("whitelist /nix"); ++ + // mount-bind run directory + if (arg_debug) + printf("Mounting /run\n"); +@@ -1201,6 +1211,7 @@ + free(odiff); + free(owork); + free(dev); ++ free(nix); + free(run); + free(tmp); + } From d607ea474061e59f4e48ee873d4c0b73f0b357a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Nov 2020 23:19:16 +0100 Subject: [PATCH 173/268] ursadb: mark broken on darwin --- pkgs/servers/ursadb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/ursadb/default.nix b/pkgs/servers/ursadb/default.nix index 8a2f768443f..6a3a1cff5b5 100644 --- a/pkgs/servers/ursadb/default.nix +++ b/pkgs/servers/ursadb/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { license = licenses.bsd3; maintainers = with maintainers; [ msm ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } From 1d2d1271d6d7d2d2170fb00ba47d67ceb91c7d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 27 Nov 2020 23:19:26 +0100 Subject: [PATCH 174/268] irods: mark platforms.linux cause upstream does not mention darwin anywhere --- pkgs/tools/filesystems/irods/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index fb90c3b0aeb..dfa7530ac64 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -51,6 +51,6 @@ with stdenv; homepage = "https://irods.org"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bzizou ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } From 2197ec8e83c5ee6be5c7532ce1fd00ba6d62f629 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 22:13:21 +0000 Subject: [PATCH 175/268] gmic: 2.9.3 -> 2.9.4 --- pkgs/tools/graphics/gmic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 6787ff2e8f8..e8e9472cabd 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.3"; + version = "2.9.4"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1pj3rwycwnspw2lm5j0w4647677y6s3446zsx9s6br9bc7v7w5s6"; + sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr"; }; nativeBuildInputs = [ From ba38fdd8f4b50d2662c53d1c0ec4f2effe17fd10 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 25 Nov 2020 14:10:40 -0800 Subject: [PATCH 176/268] nodePackages: update --- .../development/node-packages/composition.nix | 2 +- .../node-packages/node-packages.nix | 736 ++++++++++-------- 2 files changed, 414 insertions(+), 324 deletions(-) diff --git a/pkgs/development/node-packages/composition.nix b/pkgs/development/node-packages/composition.nix index 17879f381d5..027a981ea57 100644 --- a/pkgs/development/node-packages/composition.nix +++ b/pkgs/development/node-packages/composition.nix @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index bbec98b42cc..c26a6e07f17 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -328,13 +328,13 @@ let sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; }; }; - "@babel/core-7.12.8" = { + "@babel/core-7.12.9" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.8"; + version = "7.12.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.8.tgz"; - sha512 = "ra28JXL+5z73r1IC/t+FT1ApXU5LsulFDnTDntNfLQaScJUJmcHL5Qxm/IWanCToQk3bPWQo5bflbplU5r15pg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.9.tgz"; + sha512 = "gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ=="; }; }; "@babel/core-7.9.0" = { @@ -1354,13 +1354,13 @@ let sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; }; }; - "@babel/traverse-7.12.8" = { + "@babel/traverse-7.12.9" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.8"; + version = "7.12.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.8.tgz"; - sha512 = "EIRQXPTwFEGRZyu6gXbjfpNORN1oZvwuzJbxcXjAgWV0iqXYDszN1Hx3FVm6YgZfu1ZQbCVAk3l+nIw95Xll9Q=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.9.tgz"; + sha512 = "iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw=="; }; }; "@babel/types-7.10.4" = { @@ -2056,13 +2056,13 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.152.2" = { + "@fluentui/react-7.153.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.152.2"; + version = "7.153.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.152.2.tgz"; - sha512 = "NQzXzwNLwPHdM7VbpRU4ZOzmGd3UElBikQtJcvqTV0wC605auiqS/s6S6v93/9rh+fOXbppY8tZmVXSXWCsLvA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.153.1.tgz"; + sha512 = "+k1oPrvBTpmJ03PhfbaPB8oEhD57TWIGdxPajyvkJzSMgmcPOxVA5nAz2MiPdou1vtTuOgNSTDHsAQSeqVqtGA=="; }; }; "@fluentui/react-compose-0.19.12" = { @@ -3460,13 +3460,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-5.3.2" = { + "@netlify/build-5.3.3" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.2.tgz"; - sha512 = "haRUNAWfLpF/xFXFSpTB7GjzbvQRYsfu3lUHWXMsopWncIP507mfBnMrTj9sXPhmtiTGiDCZo96IbTbGWne+tw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-5.3.3.tgz"; + sha512 = "PgAPLFZeHeR45mM2km/UHXfg/3K9NtrGKAaoG7vwU36XYEaVaB/psBp0PzrfJbRiBER+vqnxrDTOyHJc4Z0w1g=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3541,103 +3541,103 @@ let sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q=="; }; }; - "@netlify/traffic-mesh-agent-0.26.0" = { + "@netlify/traffic-mesh-agent-0.27.0" = { name = "_at_netlify_slash_traffic-mesh-agent"; packageName = "@netlify/traffic-mesh-agent"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.26.0.tgz"; - sha512 = "FVmxKUxKoF9JY7qgZ93SwjhUkEYgod2dcsgVhYNuf2p/UbxZDJI0tCtaajj3XvHoaNRHq1tCuXmhH+oMZD5Wpw=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.27.0.tgz"; + sha512 = "a+jXM75Ir9PavNTzDRkZWQT7jHc02wWF8mRYXWbvku+VLqmmkA61RyhAgSeo5dMWSdMofSRkoifnW7leyv7Obw=="; }; }; - "@netlify/traffic-mesh-agent-darwin-x64-0.26.0" = { + "@netlify/traffic-mesh-agent-darwin-x64-0.27.0" = { name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; packageName = "@netlify/traffic-mesh-agent-darwin-x64"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.26.0.tgz"; - sha512 = "F1eOp1kN3dd1z0iPdd3jI6gVpyrG5jhnq1pg7/ez29Y5P+E+kBE+9qkyRdP5Kq2EPxPFNtnNU8teug3gNpBI7g=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.27.0.tgz"; + sha512 = "a0EDNrdLBjxp+GYj/WQSifuQZorFQkY6spO4wuOl3mQV3tKTkBmu09+FsfitYpgZHDMoPzfhvURJrUtJIHTgqQ=="; }; }; - "@netlify/traffic-mesh-agent-linux-x64-0.26.0" = { + "@netlify/traffic-mesh-agent-linux-x64-0.27.0" = { name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; packageName = "@netlify/traffic-mesh-agent-linux-x64"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.26.0.tgz"; - sha512 = "2+gzwcz9XhhX2DgOzIUxQOVDH58e8blbatdlQqwkZ8iLzmQq1UWws4WOPcierfSJv+m2QIoNkSubhZoI9M9DEg=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.27.0.tgz"; + sha512 = "m7p/0eTXKILxCpTqQOmBkYdIjYKwSC2KZbPpDJ4sYfnMIF3qa9uMp8qrK9At/oGPckeiTq4Id775veldhwt2lw=="; }; }; - "@netlify/traffic-mesh-agent-win32-x64-0.26.0" = { + "@netlify/traffic-mesh-agent-win32-x64-0.27.0" = { name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; packageName = "@netlify/traffic-mesh-agent-win32-x64"; - version = "0.26.0"; + version = "0.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.26.0.tgz"; - sha512 = "s+rON64IkiD/Qp5KyNA3/D9kpnvEpWw3JTYR5NVw6qwg2exc5unXe+D5mCCSu2wBR2zsRKvL53hbiXEbQ6S3ug=="; + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.27.0.tgz"; + sha512 = "u6Beazs0KWRcEx9q2n417Sj7+WGrDTtDGmmKPTE6WexFt6uY1oiq3AR+ohCtu1lIIsmAfAYd8O5dSOnyAT8dFg=="; }; }; - "@netlify/zip-it-and-ship-it-1.4.1" = { + "@netlify/zip-it-and-ship-it-1.4.2" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.1.tgz"; - sha512 = "LlYqpKdaYdN8b2To8xS4Uye9ALOw0dXye/vwPvLYWY6nLTigJEajqPpt1D0YUJdV+4FD2KmzIhzgMU/l7jQSTQ=="; + 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=="; }; }; - "@node-red/editor-api-1.2.5" = { + "@node-red/editor-api-1.2.6" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.5.tgz"; - sha512 = "ZoWCBDPtuP9wxKxC/SK5hzTMTg6QQlvouoZelZ5h2nS2UGL3Mk+udsJL56FwSYrb/w4JfqG58wmG+DEsmjBKGg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.6.tgz"; + sha512 = "RM243A8AgpoHEc8cu8STCYsJVx790clVxvRUCaLfbAyb+dKn+9b0TOKWsmLUW4fhrMqwwVlFOMulVHPhg0HhGg=="; }; }; - "@node-red/editor-client-1.2.5" = { + "@node-red/editor-client-1.2.6" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.5.tgz"; - sha512 = "pqf+JSp0mNQ3o8fnEH6NKJQNj7/QJQKAHGKjmm1uAnaOJMGpOeO7Wap6/obPKzf0o67uVteYKD81LfhsI0afgQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.6.tgz"; + sha512 = "2hMnMVcqhR77mHqHzVj3hNJGZ8VcaO+lhggNYhORJXEqYCeAULj92hMCeoA4pjHDqGBn2F+gldli1WOs1/JgJg=="; }; }; - "@node-red/nodes-1.2.5" = { + "@node-red/nodes-1.2.6" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.5.tgz"; - sha512 = "4rHYyIGYrLSZWlxX/KWyOQ4+M6srPd/0i3Idw/68PMBCw9ygyn9DpcBGd6IEqbkSa4BRdcjkomOpmmGsRuCDkw=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.6.tgz"; + sha512 = "1LlECIzKKBHUOsWGLw31FT1mWL2mSecr9gBh2FqwnP7gNejebYjwP2zuHKOYs9sPRm3550zOJ5mlutXiiFKwYg=="; }; }; - "@node-red/registry-1.2.5" = { + "@node-red/registry-1.2.6" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.5.tgz"; - sha512 = "NPF+9abbj2bF/WKgV6sC+hskAJh1AUZPUx1aM/x6xk0tCtotOqx7KRDZlbzKMqT1hKb7V1tsBYtzdIMmCdJncQ=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.6.tgz"; + sha512 = "+zwHxnMr9Adve627dtw2jl/KSjTY+a5JrwJN10TSKMxVLwYeBLm/ugRTA9tkGiCjr2w9pgsnMUZRFFLfdyRZCQ=="; }; }; - "@node-red/runtime-1.2.5" = { + "@node-red/runtime-1.2.6" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.5.tgz"; - sha512 = "5RR90HtNAs194+hqh803MmaKZxmfUboGYHMO5dcAhv+e1Fh5SM2lDpGJDLM7j3QI4bWRqdi82qd1y2kXvLqgYA=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.6.tgz"; + sha512 = "zfQGK4Hqssv5TV8S5WLZ77BHYmyylarZvEScVQpivhJHg6HeZL+MffqqtPIyTM1ulklPZvO6fPmq/f5T/CgAgw=="; }; }; - "@node-red/util-1.2.5" = { + "@node-red/util-1.2.6" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.5.tgz"; - sha512 = "V+/bWsEg8PIZemgzpjqcpq+/zcjuj/fJ3qoJNRDWFYQ+6VU24W+cGiz795z1KfmyloeMLw3LPikp7lQGikTtIw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.6.tgz"; + sha512 = "CYUCS8iqcaZFBf0vwtVPqqNXX0XY0ajFW69smtDItbxslyZL3A0qRMiTTv0qMPA1uvOCEw4wQRSIQV7j/nd0yw=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -5431,6 +5431,15 @@ let sha512 = "d/aS/lPOnUSruPhgNtT8jW39fHRVTLQy9sodysP1kkG8EdAtdZu1vt8NJaYA8w/6Z9j8izkAsx1A/yJhcYR1CA=="; }; }; + "@types/component-emitter-1.2.10" = { + name = "_at_types_slash_component-emitter"; + packageName = "@types/component-emitter"; + version = "1.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz"; + sha512 = "bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg=="; + }; + }; "@types/configstore-2.1.1" = { name = "_at_types_slash_configstore"; packageName = "@types/configstore"; @@ -6079,13 +6088,13 @@ let sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; }; }; - "@types/node-10.17.46" = { + "@types/node-10.17.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.46"; + version = "10.17.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.46.tgz"; - sha512 = "Tice8a+sJtlP9C1EUo0DYyjq52T37b3LexVu3p871+kfIBIN+OQ7PKPei1oF3MgF39olEpUfxaLtD+QFc1k69Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.47.tgz"; + sha512 = "YZ1mMAdUPouBZCdeugjV8y1tqqr28OyL8DYbH5ePCfe9zcXtvbh1wDBy7uzlHkXo3Qi07kpzXfvycvrkby/jXw=="; }; }; "@types/node-12.7.12" = { @@ -6097,13 +6106,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.32" = { + "@types/node-13.13.33" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.32"; + version = "13.13.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.32.tgz"; - sha512 = "sPBvDnrwZE1uePhkCEyI/qQlgZM5kePPAhHIFDWNsOrWBFRBOk3LKJYmVCLeLZlL9Ub/FzMJb31OTWCg2F+06g=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.33.tgz"; + sha512 = "1B3GM1yuYsFyEvBb+ljBqWBOylsWDYioZ5wpu8AhXdIhq20neXS7eaSC8GkwHE0yQYGiOIV43lMsgRYTgKZefQ=="; }; }; "@types/node-14.11.1" = { @@ -6115,13 +6124,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.9" = { + "@types/node-14.14.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.9"; + version = "14.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.9.tgz"; - sha512 = "JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.10.tgz"; + sha512 = "J32dgx2hw8vXrSbu4ZlVhn1Nm3GbeCFNw2FWL8S5QKucHGY0cyNwjdQdO+KMBZ4wpmC7KhLCiNsdk1RFRIYUQQ=="; }; }; "@types/node-6.14.13" = { @@ -6754,76 +6763,76 @@ let sha512 = "mFdUlfDGxoyreCQWO/SX4DvM/6epn37AimVGzLJLpSPJdWUerCnvxwzB6zL83SiYC6O6++cWEdzgz7EtKViFlA=="; }; }; - "@vue/compiler-core-3.0.2" = { + "@vue/compiler-core-3.0.3" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.2.tgz"; - sha512 = "GOlEMTlC/OdzBkKaKOniYErbkjoKxkBOmulxGmMR10I2JJX6TvXd/peaO/kla2xhpliV/M6Z4TLJp0yjAvRIAw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.3.tgz"; + sha512 = "iWlRT8RYLmz7zkg84pTOriNUzjH7XACWN++ImFkskWXWeev29IKi7p76T9jKDaMZoPiGcUZ0k9wayuASWVxOwg=="; }; }; - "@vue/compiler-dom-3.0.2" = { + "@vue/compiler-dom-3.0.3" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.2.tgz"; - sha512 = "jvaL4QF2yXBJVD+JLbM2YA3e5fNfflJnfQ+GtfYk46ENGsEetqbkZqcX7fO+RHdG8tZBo7LCNBvgD0QLr+V4sg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.3.tgz"; + sha512 = "6GdUbDPjsc0MDZGAgpi4lox+d+aW9/brscwBOLOFfy9wcI9b6yLPmBbjdIsJq3pYdJWbdvACdJ77avBBdHEP8A=="; }; }; - "@vue/compiler-sfc-3.0.2" = { + "@vue/compiler-sfc-3.0.3" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.2.tgz"; - sha512 = "viYjT5ehDSLM3v0jQ9hbTs4I5e/7lSlYsDOp7TQ1qcwHRvzoTQMTkFpY/Iae+LFKM124Ld17tBfXgfrZl9dt+g=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.3.tgz"; + sha512 = "YocHSirye85kRVC4lU0+SE6uhrwGJzbhwkrqG4g6kmsAUopZ0qUjbICMlej5bYx2+AUz9yBIM7hpK8nIKFVFjg=="; }; }; - "@vue/compiler-ssr-3.0.2" = { + "@vue/compiler-ssr-3.0.3" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.2.tgz"; - sha512 = "gOgK1lf+0bFl+kQj6TU0TU1jIDFlsPRlSBZaUUA16DGeeiJrFanhsMuIs/l9U0IBFr/VJcHgzYpTXqHp95luHw=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.3.tgz"; + sha512 = "IjJMoHCiDk939Ix7Q5wrex59TVJr6JFQ95gf36f4G4UrVau0GGY/3HudnWT/6eyWJ7267+odqQs1uCZgDfL/Ww=="; }; }; - "@vue/reactivity-3.0.2" = { + "@vue/reactivity-3.0.3" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.2.tgz"; - sha512 = "GdRloNcBar4yqWGXOcba1t//j/WizwfthfPUYkjcIPHjYnA/vTEQYp0C9+ZjPdinv1WRK1BSMeN/xj31kQES4A=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.3.tgz"; + sha512 = "t39Qmc42MX7wJtf8L6tHlu17eP9Rc5w4aRnxpLHNWoaRxddv/7FBhWqusJ2Bwkk8ixFHOQeejcLMt5G469WYJw=="; }; }; - "@vue/runtime-core-3.0.2" = { + "@vue/runtime-core-3.0.3" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.2.tgz"; - sha512 = "3m/jOs2xSipEFah9FgpEzvC9nERFonVGLN06+pf8iYPIy54Nlv7D2cyrk3Lhbjz4w3PbIrkxJnoTJYvJM7HDfA=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.3.tgz"; + sha512 = "Fd1JVnYI6at0W/2ERwJuTSq4S22gNt8bKEbICcvCAac7hJUZ1rylThlrhsvrgA+DVkWU01r0niNZQ4UddlNw7g=="; }; }; - "@vue/runtime-dom-3.0.2" = { + "@vue/runtime-dom-3.0.3" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.2.tgz"; - sha512 = "vqC1KK1yWthTw1FKzajT0gYQaEqAq7bpeeXQC473nllGC5YHbJhNAJLSmrDun1tjXqGF0UNCWYljYm+++BJv6w=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.3.tgz"; + sha512 = "ytTvSlRaEYvLQUkkpruIBizWIwuIeHER0Ch/evO6kUaPLjZjX3NerVxA40cqJx8rRjb9keQso21U2Jcpk8GsTg=="; }; }; - "@vue/shared-3.0.2" = { + "@vue/shared-3.0.3" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.2.tgz"; - sha512 = "Zx869zlNoujFOclKIoYmkh8ES2RcS/+Jn546yOiPyZ+3+Ejivnr+fb8l+DdXUEFjo+iVDNR3KyLzg03aBFfZ4Q=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.3.tgz"; + sha512 = "yGgkF7u4W0Dmwri9XdeY50kOowN4UIX7aBQ///jbxx37itpzVjK7QzvD3ltQtPfWaJDGBfssGL0wpAgwX9OJpQ=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -9220,13 +9229,13 @@ let sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; }; }; - "array-includes-3.1.1" = { + "array-includes-3.1.2" = { name = "array-includes"; packageName = "array-includes"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz"; - sha512 = "c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ=="; + url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.2.tgz"; + sha512 = "w2GspexNQpx+PutG3QpT437/BenZBj0M/MZGn5mzv/MofYqo0xmRHzn4lFsoDlWJ+THYsGJmFlW68WlDFx7VRw=="; }; }; "array-initial-1.1.0" = { @@ -10021,13 +10030,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.798.0" = { + "aws-sdk-2.799.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.798.0"; + version = "2.799.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.798.0.tgz"; - sha512 = "7BMCH90yFpMmCF5uxZiiKMMzIAFibZz8b6CLGw/92FgMd86ZedpNqDyaikcGv1yOVtOlNCCnXN6OglC8/vwm4Q=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.799.0.tgz"; + sha512 = "NYAoiNU+bJXhlJsC0rFqrmD5t5ho7/VxldmziP6HLPYHfOCI9Uvk6UVjfPmhLWPm0mHnIxhsHqmsNGyjhHNYmw=="; }; }; "aws-sign2-0.6.0" = { @@ -12460,6 +12469,15 @@ let sha512 = "95try3p/vMRkIAAnJDaGkFhGpT/65NoeW6XelEPjAomWYR58RQtW4khn0SwKj34kZoE7uxL7w2koZSwbnszvQQ=="; }; }; + "buffer-queue-1.0.0" = { + name = "buffer-queue"; + packageName = "buffer-queue"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-queue/-/buffer-queue-1.0.0.tgz"; + sha1 = "3d253fe2f0ab70e851d728712e8cd6f914a8c002"; + }; + }; "buffer-writer-2.0.0" = { name = "buffer-writer"; packageName = "buffer-writer"; @@ -15608,7 +15626,7 @@ let src = fetchgit { url = "https://github.com/wikimedia/content-type.git"; rev = "47b2632d0a2ee79a7d67268e2f6621becd95d05b"; - sha256 = "18eb299165567b0a97e9d5576f7c189fe57072b8b8323ac179571c9e6a10fdd9"; + sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; "content-types-0.1.0" = { @@ -15998,13 +16016,13 @@ let sha512 = "gzTLeBQzNP8aM/nG0/7sSfICfNazUgwvEU2kiDaybbYXmxwioo2v96h4tzE0XOyA64beyYwAyRYEEqWA4AMZjw=="; }; }; - "core-js-2.6.11" = { + "core-js-2.6.12" = { name = "core-js"; packageName = "core-js"; - version = "2.6.11"; + version = "2.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; "core-js-3.6.5" = { @@ -16016,22 +16034,22 @@ let sha512 = "vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="; }; }; - "core-js-3.7.0" = { + "core-js-3.8.0" = { name = "core-js"; packageName = "core-js"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz"; - sha512 = "NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.8.0.tgz"; + sha512 = "W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA=="; }; }; - "core-js-compat-3.7.0" = { + "core-js-compat-3.8.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz"; - sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.8.0.tgz"; + sha512 = "o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ=="; }; }; "core-util-is-1.0.2" = { @@ -19868,13 +19886,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.606" = { + "electron-to-chromium-1.3.607" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.606"; + version = "1.3.607"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.606.tgz"; - sha512 = "+/2yPHwtNf6NWKpaYt0KoqdSZ6Qddt6nDfH/pnhcrHq9hSb23e5LFy06Mlf0vF2ykXvj7avJ597psqcbKnG5YQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz"; + sha512 = "h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -19884,7 +19902,7 @@ let src = fetchgit { url = "git://github.com/janoside/electrum-client"; rev = "d98e929028d2b05c88a41fe37652737912bead79"; - sha256 = "db3e28ff127c4ffe0c5740e22266b345056f06462479ec07d6f5e9e833fea555"; + sha256 = "d6dfc396ae69eba6efa303039d6ebb46a5cd51d1b79a293f915609057b9062be"; }; }; "elegant-spinner-1.0.1" = { @@ -19923,6 +19941,15 @@ let sha512 = "x+p+XNxLk8ittsYN7294mCnQ2i48udu3UGdHBv2gw1u1MVigXctcfbp5H9ebqTJnDxkbs6PdOSBOAdYGGDN7uA=="; }; }; + "elfy-1.0.0" = { + name = "elfy"; + packageName = "elfy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/elfy/-/elfy-1.0.0.tgz"; + sha512 = "4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ=="; + }; + }; "elliptic-6.5.3" = { name = "elliptic"; packageName = "elliptic"; @@ -20158,6 +20185,15 @@ let sha512 = "buHTb5c8AC9NshtP6dgmNLYkiT+olskbq1z6cEGvfGCF3Qphbu/1zz5Xu+yjTDln8RbxNhPoUyJ5H8MSrp1olQ=="; }; }; + "endian-reader-0.3.0" = { + name = "endian-reader"; + packageName = "endian-reader"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/endian-reader/-/endian-reader-0.3.0.tgz"; + sha1 = "84eca436b80aed0d0639c47291338b932efe50a0"; + }; + }; "ends-with-0.2.0" = { name = "ends-with"; packageName = "ends-with"; @@ -22289,7 +22325,7 @@ let src = fetchgit { url = "https://github.com/fauna/faunadb-js.git"; rev = "135256ed60a8043201085f18ed6fd2032cc9dd88"; - sha256 = "db68519d85618095fa9666496a51abf94981a38f4bcd406df5287cc1e1b10255"; + sha256 = "0c7dae0478258a6cc72621ea148471492616b8b03e79cf975aee9fdc3bd480a0"; }; }; "faye-websocket-0.10.0" = { @@ -26647,7 +26683,7 @@ let src = fetchgit { url = "git://github.com/feross/http-node"; rev = "342ef8624495343ffd050bd0808b3750cf0e3974"; - sha256 = "031176ff1f6ceb8f650cbf2c36863f417e699f0610f83fbd94a74159cb8eba8f"; + sha256 = "d7408d01b05fcbd5bb4fb44fd3d7d71463bafd5124d7e69c6f3e97cef8c65368"; }; }; "http-parser-js-0.4.13" = { @@ -30770,7 +30806,7 @@ let src = fetchgit { url = "https://github.com/wikimedia/kad.git"; rev = "96f8f5c8e5a88f5dffed47abc20756e93e16387e"; - sha256 = "801c2201565fb46ad591d4cf717eb30842ca76725c1d19f301418796f39d668e"; + sha256 = "12e5b6430f57389c974e7a393f2c7ac9a26df06a58cfe1afbcb5a5f3f00249ea"; }; }; "kad-localstorage-0.0.7" = { @@ -33293,13 +33329,13 @@ let sha512 = "/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ=="; }; }; - "loglevel-1.7.0" = { + "loglevel-1.7.1" = { name = "loglevel"; packageName = "loglevel"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz"; - sha512 = "i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz"; + sha512 = "Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -35939,13 +35975,13 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-4.2.5" = { + "mqtt-4.2.6" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.5"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.5.tgz"; - sha512 = "l19iRa4en8qM19xYCsdkt2VWg/JPTQTUL0Gq//p1rRUSEBxywicylfGZQy4Ru2Pl/nN5gI0q5E66DIVybGSaRg=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.6.tgz"; + sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; }; }; "mqtt-packet-6.6.0" = { @@ -36837,7 +36873,7 @@ let src = fetchgit { url = "https://github.com/arlolra/negotiator.git"; rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a"; - sha256 = "0cee71d4f5ad49a14f8ff9b33d1e5b1ac9fbcd3866ab7a95068283e1f7d860b6"; + sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394"; }; }; "neo-async-2.6.2" = { @@ -37180,7 +37216,7 @@ let src = fetchgit { url = "https://github.com/laurent22/node-emoji.git"; rev = "9fa01eac463e94dde1316ef8c53089eeef4973b5"; - sha256 = "1499424a28a49687c150369075d5ea3794f18454291078760a6c761e6576d8a3"; + sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; "node-environment-flags-1.0.6" = { @@ -38606,13 +38642,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.152.2" = { + "office-ui-fabric-react-7.153.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.152.2"; + version = "7.153.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.152.2.tgz"; - sha512 = "kAC40mQQZ3+W7ciUcsI2z66BFb/2dDkYuksMYvmjQ/RtSBw8ZMgsoIjTjgRpWKdEdvkbFwsjHK7fHOeR1OJOpA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.153.1.tgz"; + sha512 = "g7FRbvG7LEDck+pgOpmuaQXYI95doypxmlDeDUcXs9XF6YBoIL3g6FUar92P4h1UXHxXQTe8ko/v7C2ef79o2Q=="; }; }; "omggif-1.0.10" = { @@ -39587,6 +39623,15 @@ let sha512 = "iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg=="; }; }; + "p-limit-3.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + }; "p-locate-2.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -41619,7 +41664,7 @@ let src = fetchgit { url = "git://github.com/anmonteiro/node-getopt"; rev = "a3123885e3559c9b70903948d6e5c34852520d74"; - sha256 = "aec063ab02e2782e6587759b4c7dfd8d8e27f174bbc62dd65842658e30e56720"; + sha256 = "0092766ac49279342f7d17677359880b44b245ad9d32237a11a5ea45cb0d03fa"; }; }; "postcss-5.2.18" = { @@ -46707,6 +46752,15 @@ let sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; }; }; + "s3-stream-upload-2.0.2" = { + name = "s3-stream-upload"; + packageName = "s3-stream-upload"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/s3-stream-upload/-/s3-stream-upload-2.0.2.tgz"; + sha1 = "60342f12d4aa06ea8f389fb761a5393aedca017f"; + }; + }; "s3signed-0.1.0" = { name = "s3signed"; packageName = "s3signed"; @@ -47580,13 +47634,13 @@ let sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; - "seventh-0.7.36" = { + "seventh-0.7.37" = { name = "seventh"; packageName = "seventh"; - version = "0.7.36"; + version = "0.7.37"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.36.tgz"; - sha512 = "JeOf8Xybc1QeKhb0Hrj4w9WWYpmgGrjhvV48f0Ap/K2jra1TAnVYvKuJfpW01YFuRtwan6Jc3dN6t1JJrIPxcQ=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.37.tgz"; + sha512 = "RvoWTZOzL2RpYZtqW+6QMkOqJY6ljiddSvT64lqvVawPCWJo8Se6EOY8jjpPAmUAB7IsnrvAuYRh7xxnn3a5mg=="; }; }; "sha.js-2.4.11" = { @@ -48372,13 +48426,13 @@ let sha512 = "NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ=="; }; }; - "snyk-docker-plugin-4.9.0" = { + "snyk-docker-plugin-4.12.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.9.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.9.0.tgz"; - sha512 = "vjUsat9NdP2kAicQWVuB7vJ0MnJ2e+Y59MzaXdJWkfrSyTnIeuMzTg1vJ8GUrfdG+l5KaYZTUy7p1r1dYbmrZw=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.12.0.tgz"; + sha512 = "iN5GUTpMR4dx/hmjxh1GnJ9vrMpbOUhD8gsdWgFPZ5Qg+ImPQ2WBJBal/hyfkauM0TaKQEAgIwT6xZ1ovaIvWQ=="; }; }; "snyk-go-parser-1.4.1" = { @@ -48660,13 +48714,13 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; - "socket.io-parser-4.0.1" = { + "socket.io-parser-4.0.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.1.tgz"; - sha512 = "5JfNykYptCwU2lkOI0ieoePWm+6stEhkZ2UnLDjqnE1YEjUlXXLd1lpxPZ+g+h3rtaytwWkWrLQCaJULlGqjOg=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.2.tgz"; + sha512 = "Bs3IYHDivwf+bAAuW/8xwJgIiBNtlvnjYRc4PbXgniLmcP1BrakBoq/QhO24rgtgW7VZ7uAaswRGxutUnlAK7g=="; }; }; "sockjs-0.3.20" = { @@ -51495,13 +51549,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.30.1" = { + "systeminformation-4.30.4" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.30.1"; + version = "4.30.4"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.1.tgz"; - sha512 = "FrZISqs8G/oZfnzodPU/zCk41JIfa0os2WY6CJKuk9FwIVc9UWMJfRlgP307AkFu8IRjuVI/HiCNiP4dAnURTA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.4.tgz"; + sha512 = "hUkT0zOIJ8YfzbEierK7oTfTgDs+qjVihkbDlGRVYcBEUNr4XDcGd63lGgZ6RC5vDPkfbUgVrDrqor9NOIZxGA=="; }; }; "syswide-cas-5.3.0" = { @@ -51601,7 +51655,7 @@ let src = fetchgit { url = "https://github.com/mixu/node-tabtab.git"; rev = "94af2b878b174527b6636aec88acd46979247755"; - sha256 = "6e84c406481c826d85e946e9dc09ed1e71ecfa405f60dd6209e5c835aacf32c1"; + sha256 = "c824206b33da96cf5c01c21f1b133a0e3568e07ee4dcc9beefa8226864cd0272"; }; }; "tabula-1.10.0" = { @@ -55220,7 +55274,7 @@ let src = fetchgit { url = "https://github.com/laurent22/uslug.git"; rev = "ba2834d79beb0435318709958b2f5e817d96674d"; - sha256 = "9f64413fac2052a07323c54475be269280ab1c5d174e88bd1542e24091be0259"; + sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489"; }; }; "ut_metadata-3.5.2" = { @@ -56861,13 +56915,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.2" = { + "vue-3.0.3" = { name = "vue"; packageName = "vue"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.2.tgz"; - sha512 = "ciKFjutKRs+2Vbvgrist1oDd5wZQqtOel/K//ku54zLbf8tcTV+XbyAfanTHcTkML9CUj09vnC+y+5uaOz2/9g=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.3.tgz"; + sha512 = "BZG5meD5vLWdvfnRL5WqfDy+cnXO1X/SweModGUna78bdFPZW6+ZO1tU9p0acrskX3DKFcfSp2s4SZnMjABx6w=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -59202,6 +59256,15 @@ let sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + }; "yoga-layout-prebuilt-1.10.0" = { name = "yoga-layout-prebuilt"; packageName = "yoga-layout-prebuilt"; @@ -60216,7 +60279,7 @@ in sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -60288,7 +60351,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.606" + sources."electron-to-chromium-1.3.607" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" @@ -60462,7 +60525,7 @@ in }) (sources."terser-webpack-plugin-5.0.3" // { dependencies = [ - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."schema-utils-3.0.0" sources."source-map-0.6.1" ]; @@ -60507,6 +60570,7 @@ in sources."windows-release-4.0.0" sources."wrappy-1.0.2" sources."yaml-1.10.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -60531,7 +60595,7 @@ in sources."@apollo/federation-0.20.4" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.46" + sources."@types/node-10.17.47" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -60542,7 +60606,7 @@ in sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.8" // { + (sources."@babel/core-7.12.9" // { dependencies = [ sources."@babel/generator-7.12.5" sources."@babel/types-7.12.7" @@ -60715,7 +60779,7 @@ in sources."@babel/types-7.12.7" ]; }) - (sources."@babel/traverse-7.12.8" // { + (sources."@babel/traverse-7.12.9" // { dependencies = [ sources."@babel/generator-7.12.5" sources."@babel/types-7.12.7" @@ -60855,7 +60919,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -60876,24 +60940,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.9" sources."@vue/cli-ui-addon-widgets-4.5.9" - (sources."@vue/compiler-core-3.0.2" // { + (sources."@vue/compiler-core-3.0.3" // { dependencies = [ sources."@babel/types-7.12.7" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.2" - (sources."@vue/compiler-sfc-3.0.2" // { + sources."@vue/compiler-dom-3.0.3" + (sources."@vue/compiler-sfc-3.0.3" // { dependencies = [ sources."@babel/types-7.12.7" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.2" - sources."@vue/reactivity-3.0.2" - sources."@vue/runtime-core-3.0.2" - sources."@vue/runtime-dom-3.0.2" - sources."@vue/shared-3.0.2" + sources."@vue/compiler-ssr-3.0.3" + sources."@vue/reactivity-3.0.3" + sources."@vue/runtime-core-3.0.3" + sources."@vue/runtime-dom-3.0.3" + sources."@vue/shared-3.0.3" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -61213,8 +61277,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.7.0" - (sources."core-js-compat-3.7.0" // { + sources."core-js-3.8.0" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -61305,7 +61369,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.606" + sources."electron-to-chromium-1.3.607" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -61718,7 +61782,7 @@ in sources."wrap-ansi-3.0.1" ]; }) - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" sources."long-4.0.0" sources."lowdb-1.0.0" sources."lower-case-2.0.1" @@ -62312,7 +62376,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.2" + sources."vue-3.0.3" ]; }) sources."watch-1.0.2" @@ -62582,7 +62646,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.12.8" // { + (sources."@babel/core-7.12.9" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -62606,7 +62670,7 @@ in sources."@babel/highlight-7.10.4" sources."@babel/parser-7.12.7" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.8" + sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" @@ -62714,7 +62778,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -63346,7 +63410,7 @@ in sources."cookie-0.4.0" sources."cookie-parser-1.4.5" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -63718,7 +63782,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.32" + sources."@types/node-13.13.33" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -64816,7 +64880,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.7.0" + sources."core-js-3.8.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -64856,7 +64920,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.606" + sources."electron-to-chromium-1.3.607" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -65130,7 +65194,7 @@ in sources."lodash-4.17.20" sources."lodash.merge-4.6.2" sources."log-symbols-2.2.0" - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -65772,7 +65836,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.8" + sources."@babel/core-7.12.9" sources."@babel/generator-7.12.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" @@ -65792,7 +65856,7 @@ in }) sources."@babel/parser-7.12.7" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.8" + sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -65857,7 +65921,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.606" + sources."electron-to-chromium-1.3.607" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -67069,7 +67133,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.1" + sources."systeminformation-4.30.4" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -67156,7 +67220,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -67527,7 +67591,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -68601,15 +68665,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.54.0"; + version = "6.56.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.54.0.tgz"; - sha512 = "R1TL7LZi2s0HrtxpYJ169m/ALstWSk04e9YbwSLxrOI6o5dYqcE0KmoE3jzGmE56SHdxp8QrMBQInt6A2yz9Mg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.56.0.tgz"; + sha512 = "xgJH1i6nINcRVAGW1ek+NQJOyOgsS9VDGsWW0sN51v3IUGbPgHSZXTpBtqykVjkb+KoiP1V3NkiKY76n7zd+Kw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.3" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -68623,6 +68687,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" sources."buffer-4.9.2" + sources."buffer-queue-1.0.0" sources."bytes-3.1.0" sources."caseless-0.12.0" sources."combined-stream-1.0.8" @@ -68646,6 +68711,7 @@ in sources."http-signature-1.2.0" sources."http-status-1.5.0" sources."ieee754-1.1.13" + sources."inherits-2.0.4" sources."ini-1.3.5" (sources."ip-address-6.1.0" // { dependencies = [ @@ -68680,12 +68746,19 @@ in sources."p-queue-6.6.2" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.1" sources."psl-1.8.0" sources."punycode-1.3.2" sources."qs-6.5.2" sources."querystring-0.2.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."request-2.88.2" sources."requestretry-4.1.2" + sources."s3-stream-upload-2.0.2" sources."s3signed-0.1.0" sources."s3urls-1.5.2" sources."safe-buffer-5.2.1" @@ -68697,6 +68770,11 @@ in sources."socks5-https-client-1.2.1" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."through-2.3.8" (sources."tough-cookie-2.5.0" // { dependencies = [ @@ -68711,6 +68789,7 @@ in ]; }) sources."url-0.10.3" + sources."util-deprecate-1.0.2" sources."uuid-3.3.2" sources."verror-1.10.0" sources."when-3.7.8" @@ -68755,7 +68834,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.12.8" + sources."@babel/core-7.12.9" sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" @@ -68781,7 +68860,7 @@ in sources."@babel/plugin-transform-parameters-7.12.1" sources."@babel/plugin-transform-react-jsx-7.12.7" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.8" + sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" @@ -68789,7 +68868,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -69114,7 +69193,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.152.2" + sources."@fluentui/react-7.153.1" sources."@fluentui/react-compose-0.19.12" sources."@fluentui/react-focus-7.16.19" sources."@fluentui/react-stylesheets-0.2.4" @@ -69484,7 +69563,7 @@ in }) sources."copy-descriptor-0.1.1" sources."copy-props-2.0.4" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."create-ecdh-4.0.4" // { @@ -70151,7 +70230,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.152.2" + sources."office-ui-fabric-react-7.153.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -70185,7 +70264,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" (sources."p-locate-4.1.0" // { dependencies = [ sources."p-limit-2.3.0" @@ -70718,6 +70797,7 @@ in }) sources."yargs-parser-5.0.0-security.0" sources."yeast-0.1.2" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -71181,7 +71261,7 @@ in sources."@babel/preset-typescript-7.12.7" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - (sources."@babel/traverse-7.12.8" // { + (sources."@babel/traverse-7.12.9" // { dependencies = [ sources."lodash-4.17.20" ]; @@ -71638,7 +71718,7 @@ in sources."babel-preset-fbjs-3.3.0" (sources."babel-runtime-6.26.0" // { dependencies = [ - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."regenerator-runtime-0.11.1" ]; }) @@ -71853,14 +71933,14 @@ in sources."globby-11.0.1" sources."loader-utils-2.0.0" sources."make-dir-3.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."pkg-dir-4.2.0" sources."semver-6.3.0" sources."slash-3.0.0" ]; }) - sources."core-js-3.7.0" - (sources."core-js-compat-3.7.0" // { + sources."core-js-3.8.0" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -71995,7 +72075,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.606" + sources."electron-to-chromium-1.3.607" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72502,7 +72582,7 @@ in ]; }) sources."logkitty-0.7.1" - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" sources."loose-envify-1.4.0" sources."lower-case-2.0.1" sources."lowercase-keys-1.0.1" @@ -73426,7 +73506,7 @@ in dependencies = [ sources."find-cache-dir-3.3.1" sources."make-dir-3.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."pkg-dir-4.2.0" sources."semver-6.3.0" sources."source-map-0.6.1" @@ -73780,6 +73860,7 @@ in sources."yallist-4.0.0" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" + sources."yocto-queue-0.1.0" sources."zen-observable-0.8.15" sources."zen-observable-ts-0.8.21" ]; @@ -75784,7 +75865,7 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -76668,7 +76749,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.30.1" + sources."systeminformation-4.30.4" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -79073,7 +79154,7 @@ in }) sources."@babel/parser-7.12.7" sources."@babel/template-7.12.7" - (sources."@babel/traverse-7.12.8" // { + (sources."@babel/traverse-7.12.9" // { dependencies = [ sources."debug-4.3.1" ]; @@ -79125,7 +79206,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.798.0" // { + (sources."aws-sdk-2.799.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -79623,7 +79704,7 @@ in sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" - sources."seventh-0.7.36" + sources."seventh-0.7.37" (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.1.3" @@ -81020,7 +81101,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -82822,7 +82903,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" - sources."@babel/core-7.12.8" + sources."@babel/core-7.12.9" sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" @@ -82920,7 +83001,7 @@ in sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.8" + sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" @@ -82942,7 +83023,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.10" @@ -83188,8 +83269,8 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" - (sources."core-js-compat-3.7.0" // { + sources."core-js-2.6.12" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -83240,7 +83321,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.606" + sources."electron-to-chromium-1.3.607" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -84081,7 +84162,7 @@ in version = "1.10.2"; src = fetchurl { url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.10.2.tgz"; - sha512 = "1hljd0khxrskgjjm6mhj2s90x5xmwzfrnxzirnhrcrc5sbmrj0xrabwdfp23c9iqc5p1hp8q2a53pryhr58nhl8i53svsyzmsph3s6i"; + sha512 = "0egBr67f661HiYhCi0qGPt9RlMDownALwzGxIa5rfKncgcx16cIyy9Dm+LvN7vPaSwdJCwmrqVK+qXOHEzRJYQ=="; }; dependencies = [ sources."acorn-5.7.4" @@ -84428,13 +84509,13 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "8.8.2-beta.8"; + version = "8.8.3-2"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.2-beta.8.tgz"; - sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-8.8.3-2.tgz"; + sha512 = "8tXy9R4hcUKgyRS2EOOZzQYlM3jDBIrC04w8YiiTBhTUpm0UuDYpzO+VDjFjxEGBj+KyAzEI3/7oAdV6kYHUMg=="; }; dependencies = [ - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -84518,7 +84599,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.152.2" + sources."@fluentui/react-7.153.1" sources."@fluentui/react-compose-0.19.12" sources."@fluentui/react-focus-7.16.19" sources."@fluentui/react-stylesheets-0.2.4" @@ -84577,7 +84658,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."crc-3.8.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" @@ -84662,7 +84743,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.152.2" + sources."office-ui-fabric-react-7.153.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -84856,7 +84937,7 @@ in sources."nanoid-3.1.12" sources."normalize-path-3.0.0" sources."once-1.4.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" @@ -84910,6 +84991,7 @@ in sources."decamelize-4.0.0" ]; }) + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -85048,15 +85130,15 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.68.7"; + version = "2.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.68.7.tgz"; - sha512 = "HbOaT0RL+AHXaeQYEiJlTC0IIYkaYgpCK8ByHrwUYCXunHW9/MWMSXs5Cg9grVMgD36qL1A5E7ljrJjWUFvwcA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.69.0.tgz"; + sha512 = "QFlOsS2wTEdAkFXMG5PWbR2SNALOv+n4z4+yQYFEt+TbAHn0NUwbpDT/UxR/NdQtwvzY0NpyjSZSQou5n4mpKg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.8" // { + (sources."@babel/core-7.12.9" // { dependencies = [ sources."semver-5.7.1" ]; @@ -85157,7 +85239,7 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.8" + sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" sources."@bugsnag/browser-7.5.1" sources."@bugsnag/core-7.3.5" @@ -85168,7 +85250,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-5.3.2" // { + (sources."@netlify/build-5.3.3" // { dependencies = [ sources."chalk-3.0.0" sources."resolve-2.0.0-next.2" @@ -85193,11 +85275,11 @@ in sources."@netlify/open-api-0.18.1" sources."@netlify/plugin-edge-handlers-1.10.0" sources."@netlify/run-utils-1.0.5" - sources."@netlify/traffic-mesh-agent-0.26.0" - sources."@netlify/traffic-mesh-agent-darwin-x64-0.26.0" - sources."@netlify/traffic-mesh-agent-linux-x64-0.26.0" - sources."@netlify/traffic-mesh-agent-win32-x64-0.26.0" - (sources."@netlify/zip-it-and-ship-it-1.4.1" // { + 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" // { dependencies = [ sources."resolve-2.0.0-next.2" ]; @@ -85367,7 +85449,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -85437,7 +85519,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.798.0" // { + (sources."aws-sdk-2.799.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -85624,7 +85706,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."core-js-compat-3.7.0" // { + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -85766,7 +85848,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.606" + sources."electron-to-chromium-1.3.607" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -87427,16 +87509,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.5.tgz"; - sha512 = "Z/f5ZjZVQgQSP+UU/RN5mJvTR875R3Fgb1lWd2kBxy44gVxxbtfN66ndgV9oV2S1h8nDTj0s+UhXvEXgo0PlqQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.6.tgz"; + sha512 = "Sy6ZNRFxN4KwT/eGFBt9L6aMXK0XGRwBNlhoFMPObSujLJVMUKHxirHAMst5CvUYigijFXM6ILRC6p/XqYHZRg=="; }; dependencies = [ sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.5" - sources."@node-red/editor-client-1.2.5" - (sources."@node-red/nodes-1.2.5" // { + sources."@node-red/editor-api-1.2.6" + sources."@node-red/editor-client-1.2.6" + (sources."@node-red/nodes-1.2.6" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -87450,9 +87532,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.5" - sources."@node-red/runtime-1.2.5" - sources."@node-red/util-1.2.5" + sources."@node-red/registry-1.2.6" + sources."@node-red/runtime-1.2.6" + sources."@node-red/util-1.2.6" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -87716,7 +87798,7 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moment-timezone-0.5.32" - (sources."mqtt-4.2.5" // { + (sources."mqtt-4.2.6" // { dependencies = [ sources."concat-stream-2.0.0" sources."debug-4.3.1" @@ -88511,7 +88593,7 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."p-cancelable-1.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-4.0.0" sources."p-try-2.2.0" @@ -88607,6 +88689,7 @@ in sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -88625,7 +88708,7 @@ in src = fetchgit { url = "git://github.com/NixOS/npm2nix.git"; rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5"; - sha256 = "ac58ebe43b62e42cdc1754f4d6c6795de9c33fe12b72a858522c9f0ba10b5cee"; + sha256 = "e1b252cd883fd8c5c4618b157d03b3fb869fa6aad4170ef51e34681069d50bf5"; }; dependencies = [ sources."abbrev-1.1.1" @@ -88844,7 +88927,7 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.8" // { + (sources."@babel/core-7.12.9" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" @@ -88948,7 +89031,7 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.8" + sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -89090,8 +89173,8 @@ in sources."constants-browserify-1.0.0" sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" - (sources."core-js-compat-3.7.0" // { + sources."core-js-2.6.12" + (sources."core-js-compat-3.8.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -89199,7 +89282,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.606" + sources."electron-to-chromium-1.3.607" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89864,7 +89947,7 @@ in sources."content-type-git+https://github.com/wikimedia/content-type.git#master" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."debug-2.6.9" @@ -91314,7 +91397,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.30.1" + sources."systeminformation-4.30.4" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -91905,10 +91988,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.87"; + version = "1.1.88"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.87.tgz"; - sha512 = "yiZ79Jzv0bIAQW3rlJip8a4Wy8IRU1zABG1/eOOWN3s7yn8jTWTld5QhraIRVID/YhkzmNj3sox43SeCj6yelA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.88.tgz"; + sha512 = "1bjnvqNd5xlqTzlwr1W0/WLj+fKItMpQuBr2fvI3OPnWz5iRNcIdj30pR5yCP5ddThSW8xHjQmutf/aked2I8w=="; }; buildInputs = globalBuildInputs; meta = { @@ -92243,7 +92326,7 @@ in sources."@babel/parser-7.12.7" sources."@babel/runtime-7.12.5" sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.8" + sources."@babel/traverse-7.12.9" sources."@babel/types-7.12.7" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" @@ -92251,7 +92334,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.32" + sources."@types/node-13.13.33" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -92309,7 +92392,7 @@ in sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.7.0" + sources."core-js-3.8.0" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -92832,7 +92915,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" @@ -92956,6 +93039,7 @@ in }) sources."yauzl-2.10.0" sources."yazl-2.5.1" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -93338,7 +93422,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.165" sources."@types/long-4.0.1" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -93395,7 +93479,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.798.0" // { + (sources."aws-sdk-2.799.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93876,9 +93960,8 @@ in sources."p-event-2.3.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" sources."p-timeout-2.0.1" - sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ sources."got-9.6.0" @@ -93910,7 +93993,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.32" + sources."@types/node-13.13.33" sources."long-4.0.0" ]; }) @@ -94114,6 +94197,7 @@ in sources."yargs-parser-20.2.4" sources."yauzl-2.10.0" sources."yeast-0.1.2" + sources."yocto-queue-0.1.0" sources."zip-stream-4.0.4" ]; buildInputs = globalBuildInputs; @@ -94753,10 +94837,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.430.2"; + version = "1.431.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.430.2.tgz"; - sha512 = "EVIwMTcf4FbJ+/j5PoRQgMJdgZfgGaIsN8XorRu0+rXnB1TIAJnjqi1RoVee6j4MEVGMZgxV3H5uN66YRqfCPw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.431.1.tgz"; + sha512 = "OW48lG89ffLsSZPHwsjfdqQcu3XG6aRQOkwASPCgTAGcVcnXzS9XHB89h0gLsDzk0fZRskEVgYpvXdh4RFjNqA=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -94786,7 +94870,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -94897,9 +94981,11 @@ in sources."dotnet-deps-parser-5.0.0" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" + sources."elfy-1.0.0" sources."email-validator-2.0.4" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" + sources."endian-reader-0.3.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-goat-2.1.1" @@ -95136,7 +95222,7 @@ in sources."tslib-2.0.3" ]; }) - (sources."snyk-docker-plugin-4.9.0" // { + (sources."snyk-docker-plugin-4.12.0" // { dependencies = [ sources."rimraf-3.0.2" sources."tmp-0.2.1" @@ -95369,13 +95455,14 @@ in }; dependencies = [ sources."@types/body-parser-1.19.0" + sources."@types/component-emitter-1.2.10" sources."@types/connect-3.4.33" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.8" sources."@types/express-4.17.9" sources."@types/express-serve-static-core-4.17.14" sources."@types/mime-2.0.3" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.8" @@ -95393,7 +95480,7 @@ in sources."negotiator-0.6.2" sources."object-assign-4.1.1" sources."socket.io-adapter-2.0.3" - sources."socket.io-parser-4.0.1" + sources."socket.io-parser-4.0.2" sources."vary-1.1.2" sources."ws-7.4.0" ]; @@ -96489,7 +96576,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.798.0" // { + (sources."aws-sdk-2.799.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -96583,7 +96670,7 @@ in sources."depd-2.0.0" ]; }) - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."cross-spawn-4.0.2" @@ -97458,7 +97545,7 @@ in sources."content-type-1.0.4" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" (sources."cross-spawn-5.1.0" // { @@ -97980,7 +98067,7 @@ in src = fetchgit { url = "https://github.com/TediCross/TediCross.git"; rev = "80ec2189cbda51eec9f3cd3f7f551b7a71474d38"; - sha256 = "1d3e9fb2a35f366e6fb4cf46699d21a58cbdde3b7a41130d0eb1aa1f4dceabb9"; + sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ sources."ajv-6.12.6" @@ -99144,10 +99231,10 @@ in sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ - sources."array-includes-3.1.1" + sources."array-includes-3.1.2" sources."call-bind-1.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.0.1" @@ -99156,6 +99243,7 @@ in sources."is-callable-1.2.2" sources."is-capitalized-1.0.0" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" @@ -99234,7 +99322,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -99310,7 +99398,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.7.0" + sources."core-js-3.8.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -99668,10 +99756,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.122.0"; + version = "0.123.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.122.0.tgz"; - sha512 = "bgYMo0WdaQhf7DhLE8OSNN/rVFO5J4K1A2VeeKqoV4MjjuHjfCP6xLpg8Xedhns7NlEnN3sZ6VJROq19Qyl6Sg=="; + url = "https://registry.npmjs.org/three/-/three-0.123.0.tgz"; + sha512 = "KNnx/IbilvoHRkxOtL0ouozoDoElyuvAXhFB21RK7F5IPWSmqyFelICK6x3hJerLNSlAdHxR0hkuvMMhH9pqXg=="; }; buildInputs = globalBuildInputs; meta = { @@ -100198,7 +100286,7 @@ in sources."@primer/octicons-11.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -102037,7 +102125,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -102185,7 +102273,7 @@ in sources."config-chain-1.1.12" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -102445,7 +102533,7 @@ in sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" sources."lodash.unescape-4.0.1" - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -102983,7 +103071,7 @@ in sources."@types/download-6.2.4" sources."@types/got-8.3.5" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" sources."accepts-1.3.7" @@ -103171,7 +103259,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" (sources."crc32-stream-4.0.1" // { @@ -104085,7 +104173,7 @@ in sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -104115,7 +104203,7 @@ in sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.606" + sources."electron-to-chromium-1.3.607" sources."enhanced-resolve-5.3.2" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -104164,13 +104252,14 @@ in }) (sources."terser-webpack-plugin-5.0.3" // { dependencies = [ - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" ]; }) sources."tslib-1.14.1" sources."uri-js-4.4.0" sources."watchpack-2.0.1" sources."webpack-sources-2.2.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -104275,7 +104364,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -104551,7 +104640,7 @@ in sources."kind-of-6.0.3" sources."locate-path-3.0.0" sources."lodash-4.17.20" - sources."loglevel-1.7.0" + sources."loglevel-1.7.1" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" @@ -104926,7 +105015,7 @@ in sources."mkdirp-1.0.4" sources."normalize-path-3.0.0" sources."once-1.4.0" - sources."p-limit-3.0.2" + sources."p-limit-3.1.0" (sources."p-locate-4.1.0" // { dependencies = [ sources."p-limit-2.3.0" @@ -104961,6 +105050,7 @@ in sources."webpack-sources-1.4.3" sources."wrappy-1.0.2" sources."yallist-4.0.0" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -104992,7 +105082,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.32" + sources."@types/node-13.13.33" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -105424,7 +105514,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.9" + sources."@types/node-14.14.10" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -105544,7 +105634,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" - sources."core-js-3.7.0" + sources."core-js-3.8.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" From e0c286769750c246b1ac5ad23cd8ab9dad59bd52 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 25 Nov 2020 14:47:40 -0800 Subject: [PATCH 177/268] nodePackages.coc-vimlsp: init at 1.10.2 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 10f74023244..0fc819938e9 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -49,6 +49,7 @@ , "coc-tslint-plugin" , "coc-tsserver" , "coc-vetur" +, "coc-vimlsp" , "coc-vimtex" , "coc-wxml" , "coc-yaml" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c26a6e07f17..f38a27df294 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -66455,6 +66455,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-vimlsp = nodeEnv.buildNodePackage { + name = "coc-vimlsp"; + packageName = "coc-vimlsp"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.10.2.tgz"; + sha512 = "g6jCDkNRJwuPmqMN2czK90BMLec8Sdnx6uR3RZDZO2NThIduezrSbsFBpICKW93vmIprk1CvC+Pry+kRY3Mhrw=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "vim language server extension for coc.nvim"; + homepage = "https://github.com/iamcco/coc-vim#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-vimtex = nodeEnv.buildNodePackage { name = "coc-vimtex"; packageName = "coc-vimtex"; From 2e524698f6ec2ec9a1336243113b292213af8f1a Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 26 Nov 2020 13:05:57 -0800 Subject: [PATCH 178/268] nodePackages.coc-markdownlint: init at 1.8.0 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 0fc819938e9..4c3d20a6010 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -33,6 +33,7 @@ , "coc-jest" , "coc-json" , "coc-lists" +, "coc-markdownlint" , "coc-metals" , "coc-pairs" , "coc-prettier" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index f38a27df294..3526d4e35d7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -64547,6 +64547,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-markdownlint = nodeEnv.buildNodePackage { + name = "coc-markdownlint"; + packageName = "coc-markdownlint"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.8.0.tgz"; + sha512 = "HgdVA3F61GPN4sPxVNyeVWQd0p8oykchGgpovcX5QAVveAcWpUpxYXquX1y2B+EhBFZYNEOQVsr5zdVPzrko6w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Markdownlint extension for coc.nvim"; + homepage = "https://github.com/fannheyward/coc-markdownlint#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; From 2c2ddbd819f489a9e2d7b87ad4df442d1701d3ec Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 27 Nov 2020 11:14:31 -0800 Subject: [PATCH 179/268] vimPlugins.coc-markdownlint: fix by using nodePackage override --- pkgs/misc/vim-plugins/generated.nix | 12 ------------ pkgs/misc/vim-plugins/overrides.nix | 3 ++- pkgs/misc/vim-plugins/vim-plugin-names | 1 - 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 56915741665..400c9d3ffaa 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -447,18 +447,6 @@ let meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; - coc-markdownlint = buildVimPluginFrom2Nix { - pname = "coc-markdownlint"; - version = "2020-11-12"; - src = fetchFromGitHub { - owner = "fannheyward"; - repo = "coc-markdownlint"; - rev = "a9304f7b096871e15c2992d0d09e7c7f3a3675d4"; - sha256 = "0r7mr4qmw04hhxihfn4pndpv0dakwjcj6jf1jccgydxc35qv14vj"; - }; - meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; - }; - coc-neco = buildVimPluginFrom2Nix { pname = "coc-neco"; version = "2020-04-07"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0ee45658a2a..60d2fe91925 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -648,12 +648,12 @@ self: super: { } // ( let nodePackageNames = [ - "coc-go" "coc-css" "coc-diagnostic" "coc-emmet" "coc-eslint" "coc-git" + "coc-go" "coc-highlight" "coc-html" "coc-imselect" @@ -661,6 +661,7 @@ self: super: { "coc-jest" "coc-json" "coc-lists" + "coc-markdownlint" "coc-metals" "coc-pairs" "coc-prettier" diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6f8d82e27ec..07aef3b38a0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -109,7 +109,6 @@ ervandew/supertab esneider/YUNOcommit.vim euclidianAce/BetterLua.vim euclio/vim-markdown-composer -fannheyward/coc-markdownlint farmergreg/vim-lastplace fatih/vim-go fcpg/vim-osc52 From da8bd7747d143d81718ea4fdff971479ad027b94 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 27 Nov 2020 11:21:43 -0800 Subject: [PATCH 180/268] vimPlugins.coc-vimlsp: fix by using nodePackage override --- pkgs/misc/vim-plugins/generated.nix | 12 ------------ pkgs/misc/vim-plugins/overrides.nix | 1 + pkgs/misc/vim-plugins/vim-plugin-names | 1 - 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 400c9d3ffaa..9763da3b924 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -471,18 +471,6 @@ let meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; - coc-vimlsp = buildVimPluginFrom2Nix { - pname = "coc-vimlsp"; - version = "2020-08-01"; - src = fetchFromGitHub { - owner = "iamcco"; - repo = "coc-vimlsp"; - rev = "efb672fe82d8619d83d3978714393e13aee8e296"; - sha256 = "16whzvyzbx8zh7z33w7pir264dmbapkanb15mkazfhkh0wm3sfvf"; - }; - meta.homepage = "https://github.com/iamcco/coc-vimlsp/"; - }; - coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; version = "2020-11-17"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 60d2fe91925..a5a40d5eeae 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -678,6 +678,7 @@ self: super: { "coc-tslint-plugin" "coc-tsserver" "coc-vetur" + "coc-vimlsp" "coc-vimtex" "coc-wxml" "coc-yaml" diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 07aef3b38a0..a9b028efb67 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -161,7 +161,6 @@ hsanson/vim-android hsitz/VimOrganizer hugolgst/vimsence iamcco/coc-spell-checker -iamcco/coc-vimlsp ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim From d595620c386706376d7ec9dcf8c983e3f83fe6a8 Mon Sep 17 00:00:00 2001 From: Reed Date: Fri, 27 Nov 2020 18:10:18 -0500 Subject: [PATCH 181/268] papermc: 1.16.2r141 -> 1.16.4r296 --- pkgs/games/papermc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index c5f7dc37925..15b05b56d84 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, bash, jre }: let - mcVersion = "1.16.2"; - buildNum = "141"; + mcVersion = "1.16.4"; + buildNum = "296"; jar = fetchurl { url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "1qhhnaysw9r73fpvj9qcmjah722a6a4s6g4cblna56n1hpz4lw1s"; + sha256 = "0885417w7qahk2fwlzvggbwrhvwgpd7xas8lzzb7ar469vyvd9dz"; }; in stdenv.mkDerivation { pname = "papermc"; From 259766943005aa3aa7cc534bc604e7c696eafa51 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 23:35:27 +0000 Subject: [PATCH 182/268] hwinfo: 21.70 -> 21.71 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 6b6aa40a0f7..7a212f5bbee 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.70"; + version = "21.71"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z"; + sha256 = "1g671fvkg6r30n9vwwlqpdd6yn6jf7n9ynjmslblk7kbnabzayby"; }; patchPhase = '' From c0d38133dd350d08590b1854468716f9297410ba Mon Sep 17 00:00:00 2001 From: Matthew Piziak Date: Fri, 27 Nov 2020 19:13:42 -0500 Subject: [PATCH 183/268] mdl: 0.5.0 -> 0.11.0 --- pkgs/development/tools/misc/mdl/Gemfile.lock | 25 +++++--- pkgs/development/tools/misc/mdl/gemset.nix | 67 ++++++++++++++++---- 2 files changed, 72 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock index 04268d3306c..0e5b7b01672 100644 --- a/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -1,15 +1,24 @@ GEM remote: https://rubygems.org/ specs: - kramdown (1.17.0) - mdl (0.5.0) - kramdown (~> 1.12, >= 1.12.0) - mixlib-cli (~> 1.7, >= 1.7.0) - mixlib-config (~> 2.2, >= 2.2.1) - mixlib-cli (1.7.0) - mixlib-config (2.2.18) + chef-utils (16.7.61) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + mdl (0.11.0) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) + mixlib-cli (~> 2.1, >= 2.1.1) + mixlib-config (>= 2.2.1, < 4) + mixlib-shellout + mixlib-cli (2.1.8) + mixlib-config (3.0.9) tomlrb - tomlrb (1.2.8) + mixlib-shellout (3.2.2) + chef-utils + rexml (3.2.4) + tomlrb (2.0.0) PLATFORMS ruby diff --git a/pkgs/development/tools/misc/mdl/gemset.nix b/pkgs/development/tools/misc/mdl/gemset.nix index 6d48be1cbcb..f2d332a95bb 100644 --- a/pkgs/development/tools/misc/mdl/gemset.nix +++ b/pkgs/development/tools/misc/mdl/gemset.nix @@ -1,34 +1,56 @@ { - kramdown = { + chef-utils = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "14xd2md3cda42afl28hr5q4ng195zmqfn04w2bxr4s2fb0gglbrz"; type = "gem"; }; - version = "1.17.0"; + version = "16.7.61"; + }; + kramdown = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; + type = "gem"; + }; + version = "2.3.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; }; mdl = { - dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; + dependencies = ["kramdown" "kramdown-parser-gfm" "mixlib-cli" "mixlib-config" "mixlib-shellout"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; + sha256 = "0vgzq6v2scd8n4cmx8rrypqmchnhg4wccrhiakg2i8fzv7wxplqq"; type = "gem"; }; - version = "0.5.0"; + version = "0.11.0"; }; mixlib-cli = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; type = "gem"; }; - version = "1.7.0"; + version = "2.1.8"; }; mixlib-config = { dependencies = ["tomlrb"]; @@ -36,19 +58,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; + sha256 = "1askip583sfnz25gywd508l3vj5wnvx9vp7gm1sfnixm7amssrwq"; type = "gem"; }; - version = "2.2.18"; + version = "3.0.9"; + }; + mixlib-shellout = { + dependencies = ["chef-utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y1z0phkdhpbsn8vz7a86nhkr7ra619j86z5p75amz61kfpw42z9"; + type = "gem"; + }; + version = "3.2.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; }; tomlrb = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; + sha256 = "0ssyvjcvaisv70f21arlmnw5a1ryzmxzz4538vdwfslz9xxl27sr"; type = "gem"; }; - version = "1.2.8"; + version = "2.0.0"; }; } \ No newline at end of file From 389fbdbec43446e4ca6b3d5d832e77e94f7744cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Nov 2020 23:51:09 +0000 Subject: [PATCH 184/268] gnome3.gnome-tetravex: 3.38.1 -> 3.38.2 --- pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index afa12f1cf17..420943580c0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0s70swm2acgydz77nxyzn9xv8p03la7sl3cq87s7b8g7lyw943mv"; + sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; passthru = { From 83215635d0b70fb26821e5d24ea943f3308baaa2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 00:27:56 +0000 Subject: [PATCH 185/268] hdparm: 9.58 -> 9.60 --- pkgs/os-specific/linux/hdparm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 8d3a967d683..012cfb7e603 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdparm"; - version = "9.58"; + version = "9.60"; src = fetchurl { url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; - sha256 = "03z1qm8zbgpxagk3994lvp24yqsshjibkwg05v9p3q1w7y48xrws"; + sha256 = "1k1mcv7naiacw1y6bdd1adnjfiq1kkx2ivsadjwmlkg4fff775w3"; }; preBuild = '' From 21a4bdb00f3cfb43cf74aad9869780159688f2a2 Mon Sep 17 00:00:00 2001 From: alypeng <6505987+alypeng@users.noreply.github.com> Date: Tue, 29 Sep 2020 21:01:04 +0100 Subject: [PATCH 186/268] nodePackages.stylelint: init at 13.8.0 --- pkgs/development/node-packages/node-packages.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 4c3d20a6010..8604015d88b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -189,6 +189,7 @@ , "ssb-server" , "stackdriver-statsd-backend" , "stf" +, "stylelint" , "svgo" , "swagger" , {"tedicross": "git+https://github.com/TediCross/TediCross.git#v0.8.7"} From da98de7a7e17f2b41ffa9bf7dc09886e96120e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 Nov 2020 01:50:30 +0100 Subject: [PATCH 187/268] nodePackages: Regenerate --- .../node-packages/node-packages.nix | 1739 +++++++++-------- 1 file changed, 963 insertions(+), 776 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3526d4e35d7..1c88382c29b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -310,15 +310,6 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/code-frame-7.8.3" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; - }; - }; "@babel/compat-data-7.12.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; @@ -1705,22 +1696,31 @@ let sha512 = "y2IZFynVtRxMQ4uxXYUnrnXZa+pvSH1R1aSUAfC6RsUb2UNOxC6zRehdLGSOyF4s9Wy+j3/CPm6fC0T5UJYoQg=="; }; }; - "@expo/bunyan-3.0.2" = { + "@expo/bunyan-4.0.0" = { name = "_at_expo_slash_bunyan"; packageName = "@expo/bunyan"; - version = "3.0.2"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/bunyan/-/bunyan-3.0.2.tgz"; - sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg=="; + url = "https://registry.npmjs.org/@expo/bunyan/-/bunyan-4.0.0.tgz"; + sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.14" = { + "@expo/config-3.3.16" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.14"; + version = "3.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.14.tgz"; - sha512 = "nYnnNJRr3UZlBsUk4esbeYS2AfR3EFw4x9bVZQbbWKgDapFj26QIjGYeolZrO0yFhllSC/TU+2YNIyt6sQwRpw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.16.tgz"; + sha512 = "iEjyV8OfaA0fPPsKYkkcod6wCd6sAtWOxAAT+7xriGqJV5aYnpL1hcBxPkPKavYzWMJUEEOwajmqoJy1uVP6ig=="; + }; + }; + "@expo/config-plugins-1.0.3" = { + name = "_at_expo_slash_config-plugins"; + packageName = "@expo/config-plugins"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.3.tgz"; + sha512 = "Tc17MLfNIHl7h+YmE4cEvIK4WZq5fFShdrXJGNoNmubJ6xPeqDTLL7qCVNSzckkU4+XgfV1qt5uU+qezZLvbCw=="; }; }; "@expo/config-types-40.0.0-beta.1" = { @@ -1741,22 +1741,22 @@ let sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; }; }; - "@expo/dev-server-0.1.39" = { + "@expo/dev-server-0.1.41" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.39"; + version = "0.1.41"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.39.tgz"; - sha512 = "PTNrPQ7z3yYLijePiqOKTtjTtzpn9HECE0LQKFcf/IVHxxVe/ScRWJAu6xndL51sXWJgE3PXg8r47UMLHb7Y2w=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.41.tgz"; + sha512 = "Mgqm79SE01bXiOG5DsJyuP/FAszkGKC22rfvjGb0tCVHbcvuVLjxm2fnnylBj9FRcTW6Rz3hAB1RaC5RayqNcg=="; }; }; - "@expo/dev-tools-0.13.58" = { + "@expo/dev-tools-0.13.62" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.58"; + version = "0.13.62"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.58.tgz"; - sha512 = "CdlCPWEzvA69ZucdeCYFoM0fEBVufcSwOOs2xcEJo2cVHGJkCUFhEwASXHdPOGt773DF1ISF4mKQAUsLtmA7qw=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.62.tgz"; + sha512 = "6DeV6VxdJFPz7xYwNgIvb5GGRweHC9dS/XkkKic7Nm0c8FV+BPEm0Z/JThJ76fliTFiUPB6L7hNNCLbzObW9Zw=="; }; }; "@expo/eas-build-job-0.1.2" = { @@ -1768,31 +1768,31 @@ let sha512 = "hBYVWlEWi8Iu+jWmbzKy2bMsYoWvRwY7MZ+SdKpNvAl+sMpp8rwvxRyRs7cRTa6DuiQ2sdOxqemnw9MJ6S5cRA=="; }; }; - "@expo/image-utils-0.3.7" = { + "@expo/image-utils-0.3.9" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.7"; + version = "0.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.7.tgz"; - sha512 = "Vo1p5uv1JlRacgVIiVa+83oRoHfC7grSU8cypAtgvOYpbmdCWR8+3F4v+vaabHe6ktvIKRE78jh6vHMGwv2aOA=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.9.tgz"; + sha512 = "VarvpeNXtvPexmJSEllDF1RRHrjznsgf2Y0bZ2IehmOZwxdqz/YssGxY2ztMx5pn3utuhc9Enx140BHDBOp8UQ=="; }; }; - "@expo/json-file-8.2.24" = { + "@expo/json-file-8.2.25" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.24"; + version = "8.2.25"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.24.tgz"; - sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.25.tgz"; + sha512 = "KFX6grWVzttaDskq/NK8ByqFPgpDZGFnyeZVeecGoKx5kU61zuR7/xQM04OvN6BNXq3jTUst1TyS8fXEfJuscA=="; }; }; - "@expo/metro-config-0.1.39" = { + "@expo/metro-config-0.1.41" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.39"; + version = "0.1.41"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.39.tgz"; - sha512 = "oCeBGyLPmo65HeUPKEBMiZCbh2RfEbH8AO7Apwitn1zs8LZf9DvVtpEh7mlYRJlmKCrxaM4NjuFZMcquh72aiQ=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.41.tgz"; + sha512 = "eq2FT7/KCwQSW5R5iMLu2a8amwZ7Oz3tUIKWZtbpj6LCPbRyrF+htnjsO1eIQJ02QDE1HIs2cxFeUHjoWJSh7g=="; }; }; "@expo/ngrok-2.4.3" = { @@ -1921,13 +1921,13 @@ let sha512 = "oqar3vmvxkVx1OBG7hTjTbCaVVUX2o+aEMLxZWLUiubL0ly1qxgQKEt5p3g3pzkxTft+b1oMf8bT7jMi6iOv+Q=="; }; }; - "@expo/package-manager-0.0.33" = { + "@expo/package-manager-0.0.34" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.33"; + version = "0.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.33.tgz"; - sha512 = "zhY1a67/Fsg9FjKj2AajNDywpcbERACA7kw9eR3uJEzQwdwYiqX9cmMO8K69UKJUY2kpba4edJY9/PEMJFfPiQ=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.34.tgz"; + sha512 = "/zxESSNAjeBI7BlrFlmmLbEDNblJhR0fd9rZGPOwNlRoeojCJ0yh+nTUWXQtBgolffQMYq0LkTTjTDszqs4M+g=="; }; }; "@expo/plist-0.0.10" = { @@ -1948,13 +1948,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.21" = { + "@expo/schemer-1.3.22" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.21"; + version = "1.3.22"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.21.tgz"; - sha512 = "8rk1P9bFmTLZa4yr/6rNMP5QOJy/BDu+73c/vKpAr/JXgJwxRnlaLYe/rZkwQFMl5aPyaa4JsattVBU4IdxAiA=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.22.tgz"; + sha512 = "ALB9FB0DwypyNT0sL4zlM6ncQxado8eT46MOTclGoWNkVWNeeZC8O0GYHoEXLOjvfNUP5j02ATtnXCqyXAz5Hg=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -1993,22 +1993,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.43" = { + "@expo/webpack-config-0.12.46" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.43"; + version = "0.12.46"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.43.tgz"; - sha512 = "2XNqppNrngC4WrJJRnKpST6Xzez6GbUxB+SwhKVef8qf4Uw2vE50p0zpGTcIzs+aAIaKW3cFSIRQnhxkVrGXww=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.46.tgz"; + sha512 = "lVOmaBAKrw2PO1TsEOkeCFLLxGuWcoHpAeN/SgVKcQCKZuSAYqTG5qf4Rino7TdVjbCOu+Apec4AIyg2oW6Y8w=="; }; }; - "@expo/xdl-58.0.19" = { + "@expo/xdl-59.0.2" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "58.0.19"; + version = "59.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.19.tgz"; - sha512 = "+YWCOSJi6CoBLSgktJfy8/ijQGK3WbPUmujndcxY/WPmCe+Wek6kajmxclMMuDVAjg4RFXdH/fuLwOb/abOU5g=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-59.0.2.tgz"; + sha512 = "hTwJkac/+y5arWDZnQCb3lbOsgiz5tyY+ikr1LHcO8emiPpctY98H9v7MKwsxu6GsXfmwrztqgtkVBRviKh56A=="; }; }; "@fast-csv/format-4.3.5" = { @@ -2056,13 +2056,13 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.153.1" = { + "@fluentui/react-7.153.2" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.153.1"; + version = "7.153.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.153.1.tgz"; - sha512 = "+k1oPrvBTpmJ03PhfbaPB8oEhD57TWIGdxPajyvkJzSMgmcPOxVA5nAz2MiPdou1vtTuOgNSTDHsAQSeqVqtGA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.153.2.tgz"; + sha512 = "8D/zFzv9WaHqX5qu5oT20rjxkKf3GMhc40AOK+wloIfqzGe/OOXpg2zr0Hz+OXEijkGU7UPsjZ6uys/UAcXERQ=="; }; }; "@fluentui/react-compose-0.19.12" = { @@ -2200,13 +2200,13 @@ let sha512 = "T2UEm7L5MeS1ggbGKBkdV9kTqLqSHQM13RrjPzIAYzkFL/mK837sf+oq8h2+R8B+senuHX8akUhMTcU85kcMvw=="; }; }; - "@graphql-tools/schema-7.0.0" = { + "@graphql-tools/schema-7.1.0" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.0.0.tgz"; - sha512 = "yDKgoT2+Uf3cdLYmiFB9lRIGsB6lZhILtCXHgZigYgURExrEPmfj3ZyszfEpPKYcPmKaO9FI4coDhIN0Toxl3w=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.0.tgz"; + sha512 = "1TwaRfWOfxtTqk8ckBrLi3283Sl0tQmUleAnelID1mql4YgYyArrKRkHfWZs9DbydngTxj/uV10aLYioJMR6tQ=="; }; }; "@graphql-tools/url-loader-6.4.0" = { @@ -2227,13 +2227,13 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/utils-7.0.2" = { + "@graphql-tools/utils-7.1.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "7.0.2"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.0.2.tgz"; - sha512 = "VQQ7krHeoXO0FS3qbWsb/vZb8c8oyiCYPIH4RSgeK9SKOUpatWYt3DW4jmLmyHZLVVMk0yjUbsOhKTBEMejKSA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.1.0.tgz"; + sha512 = "lMTgy08BdqQ31zyyCRrxcKZ6gAKQB9amGKJGg0mb3b4I3iJQKeaw9a7T96yGe1frGak1UK9y7OoYqx8RG7KitA=="; }; }; "@graphql-tools/wrap-7.0.1" = { @@ -2524,283 +2524,283 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; - "@jimp/bmp-0.9.8" = { + "@jimp/bmp-0.12.1" = { name = "_at_jimp_slash_bmp"; packageName = "@jimp/bmp"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.9.8.tgz"; - sha512 = "CZYQPEC3iUBMuaGWrtIG+GKNl93q/PkdudrCKJR/B96dfNngsmoosEm3LuFgJHEcJIfvnJkNqKw74l+zEiqCbg=="; + url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.12.1.tgz"; + sha512 = "t16IamuBMv4GiGa1VAMzsgrVKVANxXG81wXECzbikOUkUv7pKJ2vHZDgkLBEsZQ9sAvFCneM1+yoSRpuENrfVQ=="; }; }; - "@jimp/core-0.9.8" = { + "@jimp/core-0.12.1" = { name = "_at_jimp_slash_core"; packageName = "@jimp/core"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/core/-/core-0.9.8.tgz"; - sha512 = "N4GCjcXb0QwR5GBABDK2xQ3cKyaF7LlCYeJEG9mV7G/ynBoRqJe4JA6YKU9Ww9imGkci/4A594nQo8tUIqdcBw=="; + url = "https://registry.npmjs.org/@jimp/core/-/core-0.12.1.tgz"; + sha512 = "mWfjExYEjHxBal+1gPesGChOQBSpxO7WUQkrO9KM7orboitOdQ15G5UA75ce7XVZ+5t+FQPOLmVkVZzzTQSEJA=="; }; }; - "@jimp/custom-0.9.8" = { + "@jimp/custom-0.12.1" = { name = "_at_jimp_slash_custom"; packageName = "@jimp/custom"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.9.8.tgz"; - sha512 = "1UpJjI7fhX02BWLJ/KEqPwkHH60eNkCNeD6hEd+IZdTwLXfZCfFiM5BVlpgiZYZJSsVoRiAL4ne2Q5mCiKPKyw=="; + url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.12.1.tgz"; + sha512 = "bVClp8FEJ/11GFTKeRTrfH7NgUWvVO5/tQzO/68aOwMIhbz9BOYQGh533K9+mSy29VjZJo8jxZ0C9ZwYHuFwfA=="; }; }; - "@jimp/gif-0.9.8" = { + "@jimp/gif-0.12.1" = { name = "_at_jimp_slash_gif"; packageName = "@jimp/gif"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.9.8.tgz"; - sha512 = "LEbfpcO1sBJIQCJHchZjNlyNxzPjZQQ4X32klpQHZJG58n9FvL7Uuh1rpkrJRbqv3cU3P0ENNtTrsBDxsYwcfA=="; + url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.12.1.tgz"; + sha512 = "cGn/AcvMGUGcqR6ByClGSnrja4AYmTwsGVXTQ1+EmfAdTiy6ztGgZCTDpZ/tq4SpdHXwm9wDHez7damKhTrH0g=="; }; }; - "@jimp/jpeg-0.9.8" = { + "@jimp/jpeg-0.12.1" = { name = "_at_jimp_slash_jpeg"; packageName = "@jimp/jpeg"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.9.8.tgz"; - sha512 = "5u29SUzbZ32ZMmOaz3gO0hXatwSCnsvEAXRCKZoPPgbsPoyFAiZKVxjfLzjkeQF6awkvJ8hZni5chM15SNMg+g=="; + url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.12.1.tgz"; + sha512 = "UoCUHbKLj2CDCETd7LrJnmK/ExDsSfJXmc1pKkfgomvepjXogdl2KTHf141wL6D+9CfSD2VBWQLC5TvjMvcr9A=="; }; }; - "@jimp/plugin-blit-0.9.8" = { + "@jimp/plugin-blit-0.12.1" = { name = "_at_jimp_slash_plugin-blit"; packageName = "@jimp/plugin-blit"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.9.8.tgz"; - sha512 = "6xTDomxJybhBcby1IUVaPydZFhxf+V0DRgfDlVK81kR9kSCoshJpzWqDuWrMqjNEPspPE7jRQwHMs0FdU7mVwQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.12.1.tgz"; + sha512 = "VRBB6bx6EpQuaH0WX8ytlGNqUQcmuxXBbzL3e+cD0W6MluYibzQy089okvXcyUS72Q+qpSMmUDCVr3pDqLAsSA=="; }; }; - "@jimp/plugin-blur-0.9.8" = { + "@jimp/plugin-blur-0.12.1" = { name = "_at_jimp_slash_plugin-blur"; packageName = "@jimp/plugin-blur"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.9.8.tgz"; - sha512 = "dqbxuNFBRbmt35iIRacdgma7nlXklmPThsKcGWNTDmqb/hniK5IC+0xSPzBV4qMI2fLGP39LWHqqDZ0xDz14dA=="; + url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.12.1.tgz"; + sha512 = "rTFY0yrwVJFNgNsAlYGn2GYCRLVEcPQ6cqAuhNylXuR/7oH3Acul+ZWafeKtvN8D8uMlth/6VP74gruXvwffZw=="; }; }; - "@jimp/plugin-circle-0.9.8" = { + "@jimp/plugin-circle-0.12.1" = { name = "_at_jimp_slash_plugin-circle"; packageName = "@jimp/plugin-circle"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.9.8.tgz"; - sha512 = "+UStXUPCzPqzTixLC8eVqcFcEa6TS+BEM/6/hyM11TDb9sbiMGeUtgpwZP/euR5H5gfpAQDA1Ppzqhh5fuMDlw=="; + url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.12.1.tgz"; + sha512 = "+/OiBDjby7RBbQoDX8ZsqJRr1PaGPdTaaKUVGAsrE7KCNO9ODYNFAizB9lpidXkGgJ4Wx5R4mJy21i22oY/a4Q=="; }; }; - "@jimp/plugin-color-0.9.8" = { + "@jimp/plugin-color-0.12.1" = { name = "_at_jimp_slash_plugin-color"; packageName = "@jimp/plugin-color"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.9.8.tgz"; - sha512 = "SDHxOQsJHpt75hk6+sSlCPc2B3UJlXosFW+iLZ11xX1Qr0IdDtbfYlIoPmjKQFIDUNzqLSue/z7sKQ1OMZr/QA=="; + url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.12.1.tgz"; + sha512 = "xlnK/msWN4uZ+Bu7+UrCs9oMzTSA9QE0jWFnF3h0aBsD8t1LGxozkckHe8nHtC/y/sxIa8BGKSfkiaW+r6FbnA=="; }; }; - "@jimp/plugin-contain-0.9.8" = { + "@jimp/plugin-contain-0.12.1" = { name = "_at_jimp_slash_plugin-contain"; packageName = "@jimp/plugin-contain"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.9.8.tgz"; - sha512 = "oK52CPt7efozuLYCML7qOmpFeDt3zpU8qq8UZlnjsDs15reU6L8EiUbwYpJvzoEnEOh1ZqamB8F/gymViEO5og=="; + url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.12.1.tgz"; + sha512 = "WZ/D6G0jhnBh2bkBh610PEh/caGhAUIAxYLsQsfSSlOxPsDhbj3S6hMbFKRgnDvf0hsd5zTIA0j1B0UG4kh18A=="; }; }; - "@jimp/plugin-cover-0.9.8" = { + "@jimp/plugin-cover-0.12.1" = { name = "_at_jimp_slash_plugin-cover"; packageName = "@jimp/plugin-cover"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.9.8.tgz"; - sha512 = "nnamtHzMrNd5j5HRSPd1VzpZ8v9YYtUJPtvCdHOOiIjqG72jxJ2kTBlsS3oG5XS64h/2MJwpl/fmmMs1Tj1CmQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.12.1.tgz"; + sha512 = "ddWwTQO40GcabJ2UwUYCeuNxnjV4rBTiLprnjGMqAJCzdz3q3Sp20FkRf+H+E22k2v2LHss8dIOFOF4i6ycr9Q=="; }; }; - "@jimp/plugin-crop-0.9.8" = { + "@jimp/plugin-crop-0.12.1" = { name = "_at_jimp_slash_plugin-crop"; packageName = "@jimp/plugin-crop"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.9.8.tgz"; - sha512 = "Nv/6AIp4aJmbSIH2uiIqm+kSoShKM8eaX2fyrUTj811kio0hwD3f/vIxrWebvAqwDZjAFIAmMufFoFCVg6caoQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.12.1.tgz"; + sha512 = "CKjVkrNO8FDZKYVpMireQW4SgKBSOdF+Ip/1sWssHHe77+jGEKqOjhYju+VhT3dZJ3+75rJNI9II7Kethp+rTw=="; }; }; - "@jimp/plugin-displace-0.9.8" = { + "@jimp/plugin-displace-0.12.1" = { name = "_at_jimp_slash_plugin-displace"; packageName = "@jimp/plugin-displace"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.9.8.tgz"; - sha512 = "0OgPjkOVa2xdbqI8P6gBKX/UK36RbaYVrFyXL8Jy9oNF69+LYWyTskuCu9YbGxzlCVjY/JFqQOvrKDbxgMYAKA=="; + url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.12.1.tgz"; + sha512 = "MQAw2iuf1/bVJ6P95WWTLA+WBjvIZ7TeGBerkvBaTK8oWdj+NSLNRIYOIoyPbZ7DTL8f1SN4Vd6KD6BZaoWrwg=="; }; }; - "@jimp/plugin-dither-0.9.8" = { + "@jimp/plugin-dither-0.12.1" = { name = "_at_jimp_slash_plugin-dither"; packageName = "@jimp/plugin-dither"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.9.8.tgz"; - sha512 = "jGM/4ByniZJnmV2fv8hKwyyydXZe/YzvgBcnB8XxzCq8kVR3Imcn+qnd2PEPZzIPKOTH4Cig/zo9Vk9Bs+m5FQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.12.1.tgz"; + sha512 = "mCrBHdx2ViTLJDLcrobqGLlGhZF/Mq41bURWlElQ2ArvrQ3/xR52We9DNDfC08oQ2JVb6q3v1GnCCdn0KNojGQ=="; }; }; - "@jimp/plugin-fisheye-0.9.8" = { + "@jimp/plugin-fisheye-0.12.1" = { name = "_at_jimp_slash_plugin-fisheye"; packageName = "@jimp/plugin-fisheye"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.9.8.tgz"; - sha512 = "VnsalrD05f4pxG1msjnkwIFi5QveOqRm4y7VkoZKNX+iqs4TvRnH5+HpBnfdMzX/RXBi+Lf/kpTtuZgbOu/QWw=="; + url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.12.1.tgz"; + sha512 = "CHvYSXtHNplzkkYzB44tENPDmvfUHiYCnAETTY+Hx58kZ0w8ERZ+OiLhUmiBcvH/QHm/US1iiNjgGUAfeQX6dg=="; }; }; - "@jimp/plugin-flip-0.9.8" = { + "@jimp/plugin-flip-0.12.1" = { name = "_at_jimp_slash_plugin-flip"; packageName = "@jimp/plugin-flip"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.9.8.tgz"; - sha512 = "XbiZ4OfHD6woc0f6Sk7XxB6a7IyMjTRQ4pNU7APjaNxsl3L6qZC8qfCQphWVe3DHx7f3y7jEiPMvNnqRDP1xgA=="; + url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.12.1.tgz"; + sha512 = "xi+Yayrnln8A/C9E3yQBExjxwBSeCkt/ZQg1CxLgszVyX/3Zo8+nkV8MJYpkTpj8LCZGTOKlsE05mxu/a3lbJQ=="; }; }; - "@jimp/plugin-gaussian-0.9.8" = { + "@jimp/plugin-gaussian-0.12.1" = { name = "_at_jimp_slash_plugin-gaussian"; packageName = "@jimp/plugin-gaussian"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.8.tgz"; - sha512 = "ZBl5RA6+4XAD+mtqLfiG7u+qd8W5yqq3RBNca8eFqUSVo1v+eB2tzeLel0CWfVC/z6cw93Awm/nVnm6/CL2Oew=="; + url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.12.1.tgz"; + sha512 = "7O6eKlhL37hsLfV6WAX1Cvce7vOqSwL1oWbBveC1agutDlrtvcTh1s2mQ4Pde654hCJu55mq1Ur10+ote5j3qw=="; }; }; - "@jimp/plugin-invert-0.9.8" = { + "@jimp/plugin-invert-0.12.1" = { name = "_at_jimp_slash_plugin-invert"; packageName = "@jimp/plugin-invert"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.9.8.tgz"; - sha512 = "ESploqCoF6qUv5IWhVLaO5fEcrYZEsAWPFflh6ROiD2mmFKQxfeK+vHnk3IDLHtUwWTkAZQNbk89BVq7xvaNpQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.12.1.tgz"; + sha512 = "JTAs7A1Erbxwl+7ph7tgcb2PZ4WzB+3nb2WbfiWU8iCrKj17mMDSc5soaCCycn8wfwqvgB1vhRfGpseOLWxsuQ=="; }; }; - "@jimp/plugin-mask-0.9.8" = { + "@jimp/plugin-mask-0.12.1" = { name = "_at_jimp_slash_plugin-mask"; packageName = "@jimp/plugin-mask"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.9.8.tgz"; - sha512 = "zSvEisTV4iGsBReitEdnQuGJq9/1xB5mPATadYZmIlp8r5HpD72HQb0WdEtb51/pu9Odt8KAxUf0ASg/PRVUiQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.12.1.tgz"; + sha512 = "bnDdY0RO/x5Mhqoy+056SN1wEj++sD4muAKqLD2CIT8Zq5M/0TA4hkdf/+lwFy3H2C0YTK39PSE9xyb4jPX3kA=="; }; }; - "@jimp/plugin-normalize-0.9.8" = { + "@jimp/plugin-normalize-0.12.1" = { name = "_at_jimp_slash_plugin-normalize"; packageName = "@jimp/plugin-normalize"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.9.8.tgz"; - sha512 = "dPFBfwTa67K1tRw1leCidQT25R3ozrTUUOpO4jcGFHqXvBTWaR8sML1qxdfOBWs164mE5YpfdTvu6MM/junvCg=="; + url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.12.1.tgz"; + sha512 = "4kSaI4JLM/PNjHwbnAHgyh51V5IlPfPxYvsZyZ1US32pebWtocxSMaSuOaJUg7OGSkwSDBv81UR2h5D+Dz1b5A=="; }; }; - "@jimp/plugin-print-0.9.8" = { + "@jimp/plugin-print-0.12.1" = { name = "_at_jimp_slash_plugin-print"; packageName = "@jimp/plugin-print"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.9.8.tgz"; - sha512 = "nLLPv1/faehRsOjecXXUb6kzhRcZzImO55XuFZ0c90ZyoiHm4UFREwO5sKxHGvpLXS6RnkhvSav4+IWD2qGbEQ=="; + url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.12.1.tgz"; + sha512 = "T0lNS3qU9SwCHOEz7AGrdp50+gqiWGZibOL3350/X/dqoFs1EvGDjKVeWncsGCyLlpfd7M/AibHZgu8Fx2bWng=="; }; }; - "@jimp/plugin-resize-0.9.8" = { + "@jimp/plugin-resize-0.12.1" = { name = "_at_jimp_slash_plugin-resize"; packageName = "@jimp/plugin-resize"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.9.8.tgz"; - sha512 = "L80NZ+HKsiKFyeDc6AfneC4+5XACrdL2vnyAVfAAsb3pmamgT/jDInWvvGhyI0Y76vx2w6XikplzEznW/QQvWg=="; + url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.12.1.tgz"; + sha512 = "sbNn4tdBGcgGlPt9XFxCuDl4ZOoxa8/Re8nAikyxYhRss2Dqz91ARbBQxOf1vlUGeicQMsjEuWbPQAogTSJRug=="; }; }; - "@jimp/plugin-rotate-0.9.8" = { + "@jimp/plugin-rotate-0.12.1" = { name = "_at_jimp_slash_plugin-rotate"; packageName = "@jimp/plugin-rotate"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.9.8.tgz"; - sha512 = "bpqzQheISYnBXKyU1lIj46uR7mRs0UhgEREWK70HnvFJSlRshdcoNMIrKamyrJeFdJrkYPSfR/a6D0d5zsWf1Q=="; + url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.12.1.tgz"; + sha512 = "RYkLzwG2ervG6hHy8iepbIVeWdT1kz4Qz044eloqo6c66MK0KAqp228YI8+CAKm0joQnVDC/A0FgRIj/K8uyAw=="; }; }; - "@jimp/plugin-scale-0.9.8" = { + "@jimp/plugin-scale-0.12.1" = { name = "_at_jimp_slash_plugin-scale"; packageName = "@jimp/plugin-scale"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.9.8.tgz"; - sha512 = "QU3ZS4Lre8nN66U9dKCOC4FNfaOh/QJFYUmQPKpPS924oYbtnm4OlmsdfpK2hVMSVVyVOis8M+xpA1rDBnIp7w=="; + url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.12.1.tgz"; + sha512 = "zjNVI1fUj+ywfG78T1ZU33g9a5sk4rhEQkkhtny8koAscnVsDN2YaZEKoFli54kqaWh5kSS5DDL7a/9pEfXnFQ=="; }; }; - "@jimp/plugin-shadow-0.9.8" = { + "@jimp/plugin-shadow-0.12.1" = { name = "_at_jimp_slash_plugin-shadow"; packageName = "@jimp/plugin-shadow"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.9.8.tgz"; - sha512 = "t/pE+QS3r1ZUxGIQNmwWDI3c5+/hLU+gxXD+C3EEC47/qk3gTBHpj/xDdGQBoObdT/HRjR048vC2BgBfzjj2hg=="; + url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.12.1.tgz"; + sha512 = "Z82IwvunXWQ2jXegd3W3TYUXpfJcEvNbHodr7Z+oVnwhM1OoQ5QC6RSRQwsj2qXIhbGffQjH8eguHgEgAV+u5w=="; }; }; - "@jimp/plugin-threshold-0.9.8" = { + "@jimp/plugin-threshold-0.12.1" = { name = "_at_jimp_slash_plugin-threshold"; packageName = "@jimp/plugin-threshold"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.9.8.tgz"; - sha512 = "WWmC3lnIwOTPvkKu55w4DUY8Ehlzf3nU98bY0QtIzkqxkAOZU5m+lvgC/JxO5FyGiA57j9FLMIf0LsWkjARj7g=="; + url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.12.1.tgz"; + sha512 = "PFezt5fSk0q+xKvdpuv0eLggy2I7EgYotrK8TRZOT0jimuYFXPF0Z514c6szumoW5kEsRz04L1HkPT1FqI97Yg=="; }; }; - "@jimp/plugins-0.9.8" = { + "@jimp/plugins-0.12.1" = { name = "_at_jimp_slash_plugins"; packageName = "@jimp/plugins"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.9.8.tgz"; - sha512 = "tD+cxS9SuEZaQ1hhAkNKw9TkUAqfoBAhdWPBrEZDr/GvGPrvJR4pYmmpSYhc5IZmMbXfQayHTTGqjj8D18bToA=="; + url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.12.1.tgz"; + sha512 = "7+Yp29T6BbYo+Oqnc+m7A5AH+O+Oy5xnxvxlfmsp48+SuwEZ4akJp13Gu2PSmRlylENzR7MlWOxzhas5ERNlIg=="; }; }; - "@jimp/png-0.9.8" = { + "@jimp/png-0.12.1" = { name = "_at_jimp_slash_png"; packageName = "@jimp/png"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/png/-/png-0.9.8.tgz"; - sha512 = "9CqR8d40zQCDhbnXHqcwkAMnvlV0vk9xSyE6LHjkYHS7x18Unsz5txQdsaEkEcXxCrOQSoWyITfLezlrWXRJAA=="; + url = "https://registry.npmjs.org/@jimp/png/-/png-0.12.1.tgz"; + sha512 = "tOUSJMJzcMAN82F9/Q20IToquIVWzvOe/7NIpVQJn6m+Lq6TtVmd7d8gdcna9AEFm2FIza5lhq2Kta6Xj0KXhQ=="; }; }; - "@jimp/tiff-0.9.8" = { + "@jimp/tiff-0.12.1" = { name = "_at_jimp_slash_tiff"; packageName = "@jimp/tiff"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.9.8.tgz"; - sha512 = "eMxcpJivJqMByn2dZxUHLeh6qvVs5J/52kBF3TFa3C922OJ97D9l1C1h0WKUCBqFMWzMYapQQ4vwnLgpJ5tkow=="; + url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.12.1.tgz"; + sha512 = "bzWDgv3202TKhaBGzV9OFF0PVQWEb4194h9kv5js348SSnbCusz/tzTE1EwKrnbDZThZPgTB1ryKs7D+Q9Mhmg=="; }; }; - "@jimp/types-0.9.8" = { + "@jimp/types-0.12.1" = { name = "_at_jimp_slash_types"; packageName = "@jimp/types"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/types/-/types-0.9.8.tgz"; - sha512 = "H5y/uqt0lqJ/ZN8pWqFG+pv8jPAppMKkTMByuC8YBIjWSsornwv44hjiWl93sbYhduLZY8ubz/CbX9jH2X6EwA=="; + url = "https://registry.npmjs.org/@jimp/types/-/types-0.12.1.tgz"; + sha512 = "hg5OKXpWWeKGuDrfibrjWWhr7hqb7f552wqnPWSLQpVrdWgjH+hpOv6cOzdo9bsU78qGTelZJPxr0ERRoc+MhQ=="; }; }; - "@jimp/utils-0.9.8" = { + "@jimp/utils-0.12.1" = { name = "_at_jimp_slash_utils"; packageName = "@jimp/utils"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.9.8.tgz"; - sha512 = "UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw=="; + url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.12.1.tgz"; + sha512 = "EjPkDQOzV/oZfbolEUgFT6SE++PtCccVBvjuACkttyCfl0P2jnpR49SwstyVLc2u8AwBAZEHHAw9lPYaMjtbXQ=="; }; }; "@joplinapp/fork-htmlparser2-4.1.8" = { @@ -4945,13 +4945,13 @@ let sha512 = "h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw=="; }; }; - "@snyk/dep-graph-1.20.0" = { + "@snyk/dep-graph-1.21.0" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.20.0.tgz"; - sha512 = "/TOzXGh+JFgAu8pWdo1oLFKDNfFk99TnSQG2lbEu+vKLI2ZrGAk9oGO0geNogAN7Ib4EDQOEhgb7YwqwL7aA7w=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.21.0.tgz"; + sha512 = "+xwiU1zw+Z1V6RaIL7oWUqZo8jDIpoKfzvv8xGiq0hYxsiP9tGSUNuFXwQzAFEP60kJyD2a/nptdRPjsKD0jPw=="; }; }; "@snyk/docker-registry-v2-client-1.13.9" = { @@ -5350,13 +5350,13 @@ let sha512 = "NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A=="; }; }; - "@types/babel__traverse-7.0.15" = { + "@types/babel__traverse-7.0.16" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.15"; + version = "7.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; - sha512 = "Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.16.tgz"; + sha512 = "S63Dt4CZOkuTmpLGGWtT/mQdVORJOpx6SZWGVaP56dda/0Nx5nEe82K7/LAm8zYr6SfMq+1N2OreIOrHAx656w=="; }; }; "@types/babylon-6.16.5" = { @@ -10255,13 +10255,13 @@ let sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; - "babel-loader-8.2.1" = { + "babel-loader-8.2.2" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz"; - sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz"; + sha512 = "JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -11047,13 +11047,13 @@ let sha512 = "2uhEl8FdjSBUyb69qDTgOEeeqDTa+n3yMQzLW0cOzNf1Ow5bwcg3idf+qsWisIKRH8Bk8oC7UXL8irRcPA8ZEQ=="; }; }; - "bep53-range-1.0.0" = { + "bep53-range-1.1.0" = { name = "bep53-range"; packageName = "bep53-range"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.0.0.tgz"; - sha512 = "CNsnREjxe2/wD559wzFXMycUnbmUDA9C2Bs6Z2tm++amSma7JowAAxAnaZJMuDq3cWSx9HSIbV04H06QQ11zTA=="; + url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.1.0.tgz"; + sha512 = "yGQTG4NtwTciX0Bkgk1FqQL4p+NiCQKpTSFho2lrxvUkXIlzyJDwraj8aYxAxRZMnnOhRr7QlIBoMRPEnIR34Q=="; }; }; "better-ajv-errors-0.6.7" = { @@ -12154,13 +12154,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.10.0" = { + "browserslist-4.14.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.10.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.10.0.tgz"; - sha512 = "TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; + sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; "browserslist-4.14.7" = { @@ -14584,13 +14584,13 @@ let sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA=="; }; }; - "codecs-2.1.0" = { + "codecs-2.2.0" = { name = "codecs"; packageName = "codecs"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-2.1.0.tgz"; - sha512 = "nSWYToViFEpZXOxhtMQ6IDs76TN9xKIkHOu1KCr/iFiBcgzKuY1AFPZktuXN8r82FbZ/TXP9fwITszLgcp3eQg=="; + url = "https://registry.npmjs.org/codecs/-/codecs-2.2.0.tgz"; + sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; "codepage-1.4.0" = { @@ -16349,15 +16349,6 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; - "cross-spawn-7.0.1" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz"; - sha512 = "u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg=="; - }; - }; "cross-spawn-7.0.3" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -16610,13 +16601,13 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-tree-1.1.1" = { + "css-tree-1.1.2" = { name = "css-tree"; packageName = "css-tree"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.1.tgz"; - sha512 = "NVN42M2fjszcUNpDbdkvutgQSlFYsr1z7kqeuCagHnNLBfYor6uP1WL1KrkmdYZ5Y1vTBCIOI/C/+8T98fJ71w=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz"; + sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ=="; }; }; "css-what-1.0.0" = { @@ -16736,13 +16727,13 @@ let sha1 = "178b43a44621221c27756086f531e02f42900ee8"; }; }; - "csso-4.1.1" = { + "csso-4.2.0" = { name = "csso"; packageName = "csso"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.1.1.tgz"; - sha512 = "Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA=="; + url = "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"; + sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; }; }; "cssom-0.3.8" = { @@ -19886,13 +19877,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.607" = { + "electron-to-chromium-1.3.610" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.607"; + version = "1.3.610"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.607.tgz"; - sha512 = "h2SYNaBnlplGS0YyXl8oJWokfcNxVjJANQfMCsQefG6OSuAuNIeW+A8yGT/ci+xRoBb3k2zq1FrOvkgoKBol8g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz"; + sha512 = "eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20050,15 +20041,6 @@ let sha512 = "5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw=="; }; }; - "emojis-list-2.1.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; - }; - }; "emojis-list-3.0.0" = { name = "emojis-list"; packageName = "emojis-list"; @@ -20590,15 +20572,6 @@ let sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; }; - "es6-error-3.2.0" = { - name = "es6-error"; - packageName = "es6-error"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-error/-/es6-error-3.2.0.tgz"; - sha1 = "e567cfdcb324d4e7ae5922a3700ada5de879a0ca"; - }; - }; "es6-error-4.1.1" = { name = "es6-error"; packageName = "es6-error"; @@ -21607,15 +21580,6 @@ let sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; }; }; - "exeunt-1.1.0" = { - name = "exeunt"; - packageName = "exeunt"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/exeunt/-/exeunt-1.1.0.tgz"; - sha1 = "af72db6f94b3cb75e921aee375d513049843d284"; - }; - }; "exif-parser-0.1.12" = { name = "exif-parser"; packageName = "exif-parser"; @@ -21706,13 +21670,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.49" = { + "expo-pwa-0.0.52" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.49"; + version = "0.0.52"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.49.tgz"; - sha512 = "HzwUGdnN9g5Ov/3r2uXwyjYP0xNtgOre1Z+Cywxg7GQWoFiklBfvYraIQFfwOjXVnsgo7bF4GFd4QW4v5vi9wA=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.52.tgz"; + sha512 = "LzpcL/nzFrBJqCCEaDOmWx4BfvmQFhAetUSG8/WcyMcTvqTC/WlboK+mlSj0mN5vw1/H/UCMqj6GoT07QIaUWQ=="; }; }; "express-2.5.11" = { @@ -22688,15 +22652,6 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; - "filesize-6.0.1" = { - name = "filesize"; - packageName = "filesize"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz"; - sha512 = "u4AYWPgbI5GBhs6id1KdImZWn5yfyFrrQ8OWZdN7ZMfA8Bf4HcO0BGo9bmUIEV8yrp8I1xVfJ/dn90GtFNNJcg=="; - }; - }; "filesize-6.1.0" = { name = "filesize"; packageName = "filesize"; @@ -23381,13 +23336,13 @@ let sha512 = "7YGDo0UlbMy++6G3lzncWISDaT5CVp+yPVAkZ7FDFF0ec+0HKgBOWOhPGKpMF0hjcm3Ps/HbtrETrQLYREZ7YQ=="; }; }; - "fork-ts-checker-webpack-plugin-3.1.1" = { + "fork-ts-checker-webpack-plugin-4.1.6" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "3.1.1"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; - sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz"; + sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; }; }; "fork-ts-checker-webpack-plugin-6.0.2" = { @@ -27235,15 +27190,6 @@ let sha512 = "y5AxkxqpPTj2dkaAEkDnrMuSX4JNicXHD6yTpLfFnflVejL6yJpzf27obrnlf2PSSQiWUf3735Y9tJEjxvqnoA=="; }; }; - "immer-1.10.0" = { - name = "immer"; - packageName = "immer"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-1.10.0.tgz"; - sha512 = "O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="; - }; - }; "immer-7.0.15" = { name = "immer"; packageName = "immer"; @@ -27253,6 +27199,15 @@ let sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA=="; }; }; + "immer-7.0.9" = { + name = "immer"; + packageName = "immer"; + version = "7.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/immer/-/immer-7.0.9.tgz"; + sha512 = "Vs/gxoM4DqNAYR7pugIxi0Xc8XAun/uy7AQu4fLLqaTBHxjOP9pJ266Q9MWA/ly4z6rAFZbvViOtihxUZ7O28A=="; + }; + }; "import-cwd-3.0.0" = { name = "import-cwd"; packageName = "import-cwd"; @@ -27649,15 +27604,6 @@ let sha512 = "cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ=="; }; }; - "inquirer-7.0.4" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz"; - sha512 = "Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ=="; - }; - }; "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; @@ -28261,13 +28207,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.1.0" = { + "is-core-module-2.2.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz"; - sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; + sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; }; }; "is-data-descriptor-0.1.4" = { @@ -29755,13 +29701,13 @@ let sha1 = "2cf9fbae46d8074fc16b7de0071c8efebca473a6"; }; }; - "jimp-0.9.8" = { + "jimp-0.12.1" = { name = "jimp"; packageName = "jimp"; - version = "0.9.8"; + version = "0.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/jimp/-/jimp-0.9.8.tgz"; - sha512 = "DHN4apKMwLIvD/TKO9tFfPuankNuVK98vCwHm/Jv9z5cJnrd38xhi+4I7IAGmDU3jIDlrEVhzTkFH1Ymv5yTQQ=="; + url = "https://registry.npmjs.org/jimp/-/jimp-0.12.1.tgz"; + sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; "jju-1.4.0" = { @@ -29827,15 +29773,6 @@ let sha512 = "qL4+1iycQjZ1fs8zk3jSRk7cg3ROBUHk7GKtiLAQLFzLPKErnILUvz5DLszSQvz3s1sTjPbywLDISVUtBY6HaA=="; }; }; - "jpeg-js-0.3.7" = { - name = "jpeg-js"; - packageName = "jpeg-js"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.7.tgz"; - sha512 = "9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ=="; - }; - }; "jpeg-js-0.4.2" = { name = "jpeg-js"; packageName = "jpeg-js"; @@ -29872,13 +29809,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.19.2" = { + "jquery.terminal-2.20.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.19.2"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.19.2.tgz"; - sha512 = "oljqqqN19/tqmsSdr4exz75DlQQ35c/FhP0EkrmQUt1NCXtYGujb8G5uCATDV+EhbDpF6nleH8YsOmzpqpKT/g=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.0.tgz"; + sha512 = "8Wq9i5mwj8MnkFHEFZebn+l4K4HEsRXSanrQwq/u6lEP39/44b1vJzmYsqJLq57JALrY6Cp9b5fC4hMlWhi1Zw=="; }; }; "js-base64-2.6.4" = { @@ -31898,15 +31835,6 @@ let sha512 = "oR4lB4WvwFoC70ocraKhn5nkKSs23t57h9udUgw8o0iH8hMXeEoRuUgfcvgUwAJ1ZpRqBvcou4N2SMvM1DwMrA=="; }; }; - "loader-utils-1.2.3" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz"; - sha512 = "fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA=="; - }; - }; "loader-utils-1.4.0" = { name = "loader-utils"; packageName = "loader-utils"; @@ -38408,13 +38336,13 @@ let sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; }; }; - "object-is-1.1.3" = { + "object-is-1.1.4" = { name = "object-is"; packageName = "object-is"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz"; - sha512 = "teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz"; + sha512 = "1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg=="; }; }; "object-keys-0.2.0" = { @@ -38462,13 +38390,13 @@ let sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w=="; }; }; - "object-treeify-1.1.29" = { + "object-treeify-1.1.30" = { name = "object-treeify"; packageName = "object-treeify"; - version = "1.1.29"; + version = "1.1.30"; src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.29.tgz"; - sha512 = "XnPIMyiv6fJeb/z3Bz+u43Fcw3C9fs1uoRITd8x3mau/rsSAUhx7qpIO10Q/dzJeMleJesccUSMiFx8FF+ruBA=="; + url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.30.tgz"; + sha512 = "BhsTZj8kbeCnyBKWuAgAakbGgrcVV/IJhUAGF25lOSwDZoHoDmnynUtXfyrrDn8A1Xy3G9k5uLP+V5onOOq3WA=="; }; }; "object-visit-1.0.1" = { @@ -38507,22 +38435,22 @@ let sha1 = "3a7f868334b407dea06da16d88d5cd29e435fecf"; }; }; - "object.entries-1.1.2" = { + "object.entries-1.1.3" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz"; - sha512 = "BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz"; + sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg=="; }; }; - "object.getownpropertydescriptors-2.1.0" = { + "object.getownpropertydescriptors-2.1.1" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; - sha512 = "Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz"; + sha512 = "6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng=="; }; }; "object.map-1.0.1" = { @@ -38561,13 +38489,13 @@ let sha1 = "6fe348f2ac7fa0f95ca621226599096825bb03ad"; }; }; - "object.values-1.1.1" = { + "object.values-1.1.2" = { name = "object.values"; packageName = "object.values"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz"; - sha512 = "WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz"; + sha512 = "MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag=="; }; }; "objectorarray-1.0.4" = { @@ -38642,13 +38570,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.153.1" = { + "office-ui-fabric-react-7.153.2" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.153.1"; + version = "7.153.2"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.153.1.tgz"; - sha512 = "g7FRbvG7LEDck+pgOpmuaQXYI95doypxmlDeDUcXs9XF6YBoIL3g6FUar92P4h1UXHxXQTe8ko/v7C2ef79o2Q=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.153.2.tgz"; + sha512 = "IIGn6k5698tq8mAWNq1SfJjgTh6Aa1S/8jmR1rRlxJ1fwdAtzW09RxVc1f6R3akkE7sPEb3r3q+POSGGAZNXaQ=="; }; }; "omggif-1.0.10" = { @@ -44511,13 +44439,13 @@ let sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; - "react-dev-utils-10.2.1" = { + "react-dev-utils-11.0.1" = { name = "react-dev-utils"; packageName = "react-dev-utils"; - version = "10.2.1"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-10.2.1.tgz"; - sha512 = "XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ=="; + url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz"; + sha512 = "rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA=="; }; }; "react-devtools-core-4.10.0" = { @@ -45600,13 +45528,13 @@ let sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="; }; }; - "render-media-4.0.1" = { + "render-media-4.1.0" = { name = "render-media"; packageName = "render-media"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/render-media/-/render-media-4.0.1.tgz"; - sha512 = "sQxUHqJMAEopS/UCdCQuhTJ6TUEp2P+bnEMCV3ZaFcGMoyc7he//XP6Zy9PwIjfm0nQ5D0Z6ZTGRkx8DXCXBEA=="; + url = "https://registry.npmjs.org/render-media/-/render-media-4.1.0.tgz"; + sha512 = "F5BMWDmgATEoyPCtKjmGNTGN1ghoZlfRQ3MJh8dS/MrvIUIxupiof/Y9uahChipXcqQ57twVbgMmyQmuO1vokw=="; }; }; "renderkid-2.0.4" = { @@ -47634,13 +47562,13 @@ let sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; - "seventh-0.7.37" = { + "seventh-0.7.38" = { name = "seventh"; packageName = "seventh"; - version = "0.7.37"; + version = "0.7.38"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.37.tgz"; - sha512 = "RvoWTZOzL2RpYZtqW+6QMkOqJY6ljiddSvT64lqvVawPCWJo8Se6EOY8jjpPAmUAB7IsnrvAuYRh7xxnn3a5mg=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.38.tgz"; + sha512 = "dYQGR+HQcuOtKytJ8/R4UFiPY3RIYLrniKRcqLjJCHOnccyJTpu52lBpPdyS6TpXNH13MJhtzh8GHUi/OmRUhw=="; }; }; "sha.js-2.4.11" = { @@ -48012,13 +47940,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.23.0" = { + "simple-git-2.24.0" = { name = "simple-git"; packageName = "simple-git"; - version = "2.23.0"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.23.0.tgz"; - sha512 = "s/gEkxFV2WGTN4kO1uQoA4cE4rq0FRzQPR5Yhgg8JUuA4IhOeccjlKSFhwF3rrpo7797ZvQc7L6hJJNA4szHCw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.24.0.tgz"; + sha512 = "nF31Xai5lTYgRCiSJ1lHzK0Vk9jWOvAFW12bdBaWy2bhodio04eOWYurvyM/nTBYsPIiQl3PFvdod5TRcPvzww=="; }; }; "simple-markdown-0.4.4" = { @@ -51432,13 +51360,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.37.0" = { + "swagger-ui-dist-3.37.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.37.0"; + version = "3.37.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.37.0.tgz"; - sha512 = "ySYfsGTSxuyIAAynncQew9WLRsKu6bI3/tWTqcuXYSqTLCjz3ROtUbNj2zRNs7i37V8CteKE9CUMkYnNklGi2g=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.37.2.tgz"; + sha512 = "XIT4asxgeL4GUNPPsqpEqLt20M/u6OhFYqTh42IoEAvAyv5e9EGw5uhP9dLAD10opcMYqdkJ5qU+MpN2HZ5xyA=="; }; }; "swagger2openapi-6.2.3" = { @@ -51549,13 +51477,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.30.4" = { + "systeminformation-4.30.6" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.30.4"; + version = "4.30.6"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.4.tgz"; - sha512 = "hUkT0zOIJ8YfzbEierK7oTfTgDs+qjVihkbDlGRVYcBEUNr4XDcGd63lGgZ6RC5vDPkfbUgVrDrqor9NOIZxGA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.30.6.tgz"; + sha512 = "NV7zo9NU7fWSuiCORZmMLe90cFrrTS6jfalrQ0/5B7JGQ2ei15c2gmfICBwWdmviyv/FXAFVReySxOtDDkppqw=="; }; }; "syswide-cas-5.3.0" = { @@ -52054,13 +51982,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.5.0" = { + "terser-5.5.1" = { name = "terser"; packageName = "terser"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.5.0.tgz"; - sha512 = "eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g=="; + url = "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz"; + sha512 = "6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -53593,13 +53521,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.15.3" = { + "twig-1.15.4" = { name = "twig"; packageName = "twig"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.15.3.tgz"; - sha512 = "ePfzzS7vzzn/Kb8vs/IkCvCNZltBPeBW8B/1blN/Bxh5ubxnZEGI5ysgr8t1Dr0/We9ahLDfqC78fNzDvCMkpw=="; + url = "https://registry.npmjs.org/twig/-/twig-1.15.4.tgz"; + sha512 = "gRpGrpdf+MswqF6eSjEdYZTa/jt3ZWHK/NU59IbTYJMBQXJ1W+7IxaGEwLkQjd+mNT15j9sQTzQumxUBkuQueQ=="; }; }; "twitter-1.7.1" = { @@ -56393,13 +56321,13 @@ let sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="; }; }; - "vls-0.5.9" = { + "vls-0.5.10" = { name = "vls"; packageName = "vls"; - version = "0.5.9"; + version = "0.5.10"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.5.9.tgz"; - sha512 = "9IGH1YFto0XvLHRKzdOQmkzqnIQOO/yTe77ieaOTJM4Zrr5dDqZKEBwboJyEpx5jy4R1TNUh7HTI+DwhWUtiLQ=="; + url = "https://registry.npmjs.org/vls/-/vls-0.5.10.tgz"; + sha512 = "/zXdkUatCptsDGmrEVh0A/LEQ48qEwrKe+7HiIwUOmiz+0DkoHsyf/j6eppXMVRWMcHWopwd9/VTNCRlFf2NFw=="; }; }; "vm-browserify-1.1.2" = { @@ -57383,13 +57311,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.111.0" = { + "webtorrent-0.112.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.111.0"; + version = "0.112.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.111.0.tgz"; - sha512 = "DrQVuFSLEB54dm+5tuRclXaeuH5tx7qlp0DYE0mCK7vbYEmn1UJr5GLXztYW/y4Yxie4CSSGeo5LjTxy59z0og=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.112.0.tgz"; + sha512 = "3Fe4tzeXhZKI0KXGGkr9gyzlx7eKjfU9Se2VJhdE1AcpHppxApuechaWu/KS24amUv4j+xPXE7f3Lc4wF+7QSQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -59522,7 +59450,7 @@ in sources."ini-1.3.5" sources."inquirer-7.3.3" sources."ip-1.1.5" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -60351,7 +60279,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.607" + sources."electron-to-chromium-1.3.610" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" @@ -60408,7 +60336,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -60518,7 +60446,7 @@ in sources."supports-color-7.2.0" sources."symbol-observable-2.0.3" sources."tapable-1.1.3" - (sources."terser-5.5.0" // { + (sources."terser-5.5.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -61369,7 +61297,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.607" + sources."electron-to-chromium-1.3.610" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -61643,7 +61571,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-1.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -61655,6 +61583,7 @@ in sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" sources."is-natural-number-4.0.1" + sources."is-negative-zero-2.0.0" sources."is-npm-1.0.0" sources."is-number-7.0.0" sources."is-obj-1.0.1" @@ -61891,10 +61820,14 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" - sources."object-treeify-1.1.29" + sources."object-treeify-1.1.30" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" + (sources."object.getownpropertydescriptors-2.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."object.pick-1.3.0" sources."on-finished-2.3.0" sources."once-1.4.0" @@ -62712,7 +62645,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."is-3.3.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" (sources."jake-10.8.2" // { @@ -63007,7 +62940,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -63207,7 +63140,7 @@ in sources."is-arguments-1.0.4" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-generator-function-1.0.7" sources."is-regex-1.1.1" @@ -63518,7 +63451,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -63802,7 +63735,7 @@ in sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" sources."bencode-2.0.1" - sources."bep53-range-1.0.0" + sources."bep53-range-1.1.0" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -63924,7 +63857,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -64324,10 +64257,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.13.0.tgz"; - sha512 = "09jUr50HgKBPxlK88p6CrJXGdu5owMT5c951Ajxwp2lhmFlo26NYn5eVo69shEaZvkpFvlskQWn5lqvrDox0Vw=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.14.0.tgz"; + sha512 = "ccxtSRTqVIuIQrtS5SI0uevO2WC7cSA9dNtiZ/PveDKyxhqyQlfRs9n0bdOJdXteYt6BKUIiqFV8Q48Z71y89A=="; }; buildInputs = globalBuildInputs; meta = { @@ -64382,10 +64315,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.4.tgz"; - sha512 = "Ej4dq5XOkMfnJkHIgUj2FlARz3sU3ACsrSq4YmLD3zj11uf/1nkPf5or89GOngQ1/KyCa1Llj1ai8+oTHyJAQw=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.5.tgz"; + sha512 = "MwoSWGr8mco+/Bth/4zr0kNRuG9rXYgyAEI1mGOuRsMqy2G9LEr4azSP68V2EuIPzYVcYx6ZZk2o5e8b/ux0/w=="; }; buildInputs = globalBuildInputs; meta = { @@ -64532,10 +64465,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.13"; + version = "1.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.13.tgz"; - sha512 = "D/3AiEE5Zhs7D9aDPdjX6radmiphWXIfprAyC9AMgMFfZU0KvcNavVWe74/z+G0imFrTt5EZdWlc+SGkkMi1RA=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.14.tgz"; + sha512 = "vFv90gkUJr9xICYCT4NXFd1EQDGWjJfpcnHqTcgd8A8og5yKfL5cqoSxuwcT15nP4nx06sKBCmnkjMB2DPKn9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -64568,10 +64501,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.7.tgz"; - sha512 = "XY4e1FWtaxw/ruaRBTVoJYzNIvI7J5YlYm+l/63adFKFk83fmu18fUa4IrkW4YMDP1rfbDSNTw6+99dI6x4zoA=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.8.tgz"; + sha512 = "3mkLfoTaPWT7u2oELILGGtS8jofBsb1MzATB8T4tNJODbrZFXQf5KIV4GBk81RVM1MLGvNtvD/VO/pmwUhrSxQ=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.10" @@ -64938,7 +64871,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.607" + sources."electron-to-chromium-1.3.610" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -65145,7 +65078,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -65777,10 +65710,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.16.0.tgz"; - sha512 = "fZk7sIDnex4PCibUZX14cIkJZvMb4ibZtdLHvSF1dtQsRvxxifSPHsnUsLwvHMm/rxStFTD2q27B20ZXaFbpgg=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.17.0.tgz"; + sha512 = "fL8O5Is3mvXiWPckw0vrGTldP8oMiNB8pjN/YGiDd/o5M8gQPc0N8a6urSByEHzEoFaV9hf7Lm0ZjK7muS0hjg=="; }; buildInputs = globalBuildInputs; meta = { @@ -65939,7 +65872,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.607" + sources."electron-to-chromium-1.3.610" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -65993,7 +65926,7 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -66232,7 +66165,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."minimatch-3.0.4" @@ -66342,6 +66275,7 @@ in sources."astral-regex-1.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."builtin-modules-1.1.1" sources."callsites-3.1.0" (sources."chalk-4.1.0" // { dependencies = [ @@ -66354,10 +66288,12 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."commander-2.20.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.1" sources."deep-is-0.1.3" + sources."diff-4.0.2" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" @@ -66396,16 +66332,19 @@ in sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."ignore-4.0.6" sources."import-fresh-3.2.2" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -66426,10 +66365,13 @@ in sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + sources."path-parse-1.0.6" sources."prelude-ls-1.2.1" + sources."prettier-2.2.0" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.1.0" + sources."resolve-1.19.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" sources."semver-7.3.2" @@ -66448,11 +66390,20 @@ in sources."supports-color-5.5.0" sources."table-5.4.6" sources."text-table-0.2.0" + sources."tslib-1.14.1" + (sources."tslint-6.1.3" // { + dependencies = [ + sources."chalk-2.4.2" + sources."semver-5.7.1" + ]; + }) + sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.8.1" + sources."typescript-4.1.2" sources."uri-js-4.4.0" sources."v8-compile-cache-2.2.0" - sources."vls-0.5.9" + sources."vls-0.5.10" (sources."vue-eslint-parser-7.1.1" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" @@ -66476,10 +66427,10 @@ in coc-vimlsp = nodeEnv.buildNodePackage { name = "coc-vimlsp"; packageName = "coc-vimlsp"; - version = "0.10.2"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.10.2.tgz"; - sha512 = "g6jCDkNRJwuPmqMN2czK90BMLec8Sdnx6uR3RZDZO2NThIduezrSbsFBpICKW93vmIprk1CvC+Pry+kRY3Mhrw=="; + url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.11.0.tgz"; + sha512 = "tcou7cmYgzjLLPfLEyuea5umVkITER0IqDsJCc/3IeuPFyL03D7EDyeXIcyR+fJwXpJ0AzO6rzoLBMqpt4hYGg=="; }; buildInputs = globalBuildInputs; meta = { @@ -66971,7 +66922,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -67169,7 +67120,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.4" + sources."systeminformation-4.30.6" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -67396,7 +67347,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -68163,7 +68114,7 @@ in sources."http-signature-1.2.0" (sources."hypercore-7.7.1" // { dependencies = [ - sources."codecs-2.1.0" + sources."codecs-2.2.0" sources."unordered-set-2.0.1" ]; }) @@ -69024,7 +68975,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -69229,7 +69180,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.153.1" + sources."@fluentui/react-7.153.2" sources."@fluentui/react-compose-0.19.12" sources."@fluentui/react-focus-7.16.19" sources."@fluentui/react-stylesheets-0.2.4" @@ -69970,7 +69921,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -70266,7 +70217,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.153.1" + sources."office-ui-fabric-react-7.153.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -70636,7 +70587,7 @@ in sources."mkdirp-0.5.5" ]; }) - (sources."terser-5.5.0" // { + (sources."terser-5.5.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -71169,10 +71120,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "3.28.5"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.5.tgz"; - sha512 = "Lam0JkBx57gs1xhlI+rXx3aJqOebIPBPf9sWAvUpTFDSVkyZN86rFXJWud6QnAFBLGqUgGFZJDC1tMq+l7Mgng=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.0.3.tgz"; + sha512 = "yoPZo7QCrjJY08r0YQtNQ+FzfTI0+PCoDf6Uqk/cLxLfTVc/LwXAn2RNXdjmz6+MnCtowjciYYrcuqaizDPOdg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -71308,14 +71259,14 @@ in ]; }) sources."@expo/babel-preset-cli-0.2.18" - (sources."@expo/bunyan-3.0.2" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."@expo/config-3.3.14" // { + sources."@expo/bunyan-4.0.0" + (sources."@expo/config-3.3.16" // { dependencies = [ sources."semver-7.3.2" + ]; + }) + (sources."@expo/config-plugins-1.0.3" // { + dependencies = [ sources."slash-3.0.0" sources."uuid-3.4.0" sources."xcode-2.1.0" @@ -71328,7 +71279,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.39" // { + (sources."@expo/dev-server-0.1.41" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -71345,20 +71296,20 @@ in sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.58" + sources."@expo/dev-tools-0.13.62" sources."@expo/eas-build-job-0.1.2" - (sources."@expo/image-utils-0.3.7" // { + (sources."@expo/image-utils-0.3.9" // { dependencies = [ sources."semver-6.1.1" sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.24" // { + (sources."@expo/json-file-8.2.25" // { dependencies = [ sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.39" + sources."@expo/metro-config-0.1.41" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -71377,7 +71328,7 @@ in sources."@expo/ngrok-bin-win32-ia32-2.2.8-beta.1" sources."@expo/ngrok-bin-win32-x64-2.2.8-beta.1" sources."@expo/osascript-2.0.24" - (sources."@expo/package-manager-0.0.33" // { + (sources."@expo/package-manager-0.0.34" // { dependencies = [ sources."ansi-regex-5.0.0" sources."npm-package-arg-7.0.0" @@ -71391,10 +71342,9 @@ in ]; }) sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.21" // { + (sources."@expo/schemer-1.3.22" // { dependencies = [ sources."ajv-5.5.2" - sources."es6-error-4.1.1" sources."fast-deep-equal-1.1.0" sources."get-stream-3.0.0" sources."got-6.7.1" @@ -71406,17 +71356,16 @@ 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.43" // { + (sources."@expo/webpack-config-0.12.46" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-58.0.19" // { + (sources."@expo/xdl-59.0.2" // { dependencies = [ sources."chownr-1.1.4" - sources."es6-error-4.1.1" (sources."fs-minipass-1.2.7" // { dependencies = [ sources."minipass-2.9.0" @@ -71476,38 +71425,37 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jimp/bmp-0.9.8" - sources."@jimp/core-0.9.8" - sources."@jimp/custom-0.9.8" - sources."@jimp/gif-0.9.8" - sources."@jimp/jpeg-0.9.8" - sources."@jimp/plugin-blit-0.9.8" - sources."@jimp/plugin-blur-0.9.8" - sources."@jimp/plugin-circle-0.9.8" - sources."@jimp/plugin-color-0.9.8" - sources."@jimp/plugin-contain-0.9.8" - sources."@jimp/plugin-cover-0.9.8" - sources."@jimp/plugin-crop-0.9.8" - sources."@jimp/plugin-displace-0.9.8" - sources."@jimp/plugin-dither-0.9.8" - sources."@jimp/plugin-fisheye-0.9.8" - sources."@jimp/plugin-flip-0.9.8" - sources."@jimp/plugin-gaussian-0.9.8" - sources."@jimp/plugin-invert-0.9.8" - sources."@jimp/plugin-mask-0.9.8" - sources."@jimp/plugin-normalize-0.9.8" - sources."@jimp/plugin-print-0.9.8" - sources."@jimp/plugin-resize-0.9.8" - sources."@jimp/plugin-rotate-0.9.8" - sources."@jimp/plugin-scale-0.9.8" - sources."@jimp/plugin-shadow-0.9.8" - sources."@jimp/plugin-threshold-0.9.8" - sources."@jimp/plugins-0.9.8" - sources."@jimp/png-0.9.8" - sources."@jimp/tiff-0.9.8" - sources."@jimp/types-0.9.8" - sources."@jimp/utils-0.9.8" - sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@jimp/bmp-0.12.1" + sources."@jimp/core-0.12.1" + sources."@jimp/custom-0.12.1" + sources."@jimp/gif-0.12.1" + sources."@jimp/jpeg-0.12.1" + sources."@jimp/plugin-blit-0.12.1" + sources."@jimp/plugin-blur-0.12.1" + sources."@jimp/plugin-circle-0.12.1" + sources."@jimp/plugin-color-0.12.1" + sources."@jimp/plugin-contain-0.12.1" + sources."@jimp/plugin-cover-0.12.1" + sources."@jimp/plugin-crop-0.12.1" + sources."@jimp/plugin-displace-0.12.1" + sources."@jimp/plugin-dither-0.12.1" + sources."@jimp/plugin-fisheye-0.12.1" + sources."@jimp/plugin-flip-0.12.1" + sources."@jimp/plugin-gaussian-0.12.1" + sources."@jimp/plugin-invert-0.12.1" + sources."@jimp/plugin-mask-0.12.1" + sources."@jimp/plugin-normalize-0.12.1" + sources."@jimp/plugin-print-0.12.1" + sources."@jimp/plugin-resize-0.12.1" + sources."@jimp/plugin-rotate-0.12.1" + sources."@jimp/plugin-scale-0.12.1" + sources."@jimp/plugin-shadow-0.12.1" + sources."@jimp/plugin-threshold-0.12.1" + sources."@jimp/plugins-0.12.1" + sources."@jimp/png-0.12.1" + sources."@jimp/tiff-0.12.1" + sources."@jimp/types-0.12.1" + sources."@jimp/utils-0.12.1" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -71683,7 +71631,6 @@ in sources."apollo-utilities-1.3.4" sources."application-config-path-0.1.0" sources."aproba-1.2.0" - sources."arch-2.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -71735,16 +71682,6 @@ in ]; }) sources."axios-retry-3.1.9" - (sources."babel-code-frame-6.26.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."js-tokens-3.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) sources."babel-extract-comments-1.0.0" sources."babel-loader-8.1.0" sources."babel-plugin-dynamic-import-node-2.3.3" @@ -71840,7 +71777,6 @@ in ]; }) sources."call-bind-1.0.0" - sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsite-1.0.0" @@ -71864,7 +71800,6 @@ in sources."supports-color-7.2.0" ]; }) - sources."chardet-0.4.2" sources."charenc-0.0.2" sources."chokidar-3.4.3" sources."chownr-2.0.0" @@ -71899,13 +71834,14 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.5.0" sources."cli-table3-0.6.0" - sources."cli-width-2.2.1" - (sources."clipboardy-2.3.0" // { + (sources."cliui-6.0.0" // { dependencies = [ - sources."is-wsl-2.2.0" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" ]; }) - sources."cliui-6.0.0" sources."clone-2.1.2" sources."clone-response-1.0.2" sources."co-4.6.0" @@ -72027,9 +71963,9 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.1.1" // { + (sources."csso-4.2.0" // { dependencies = [ - sources."css-tree-1.1.1" + sources."css-tree-1.1.2" sources."mdn-data-2.0.14" sources."source-map-0.6.1" ]; @@ -72111,7 +72047,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.607" + sources."electron-to-chromium-1.3.610" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72148,7 +72084,6 @@ in sources."es-abstract-1.18.0-next.1" sources."es-get-iterator-1.1.1" sources."es-to-primitive-1.2.1" - sources."es6-error-3.2.0" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -72168,7 +72103,6 @@ in sources."evp_bytestokey-1.0.3" sources."exec-async-2.2.0" sources."execa-1.0.0" - sources."exeunt-1.1.0" sources."exif-parser-0.1.12" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -72190,7 +72124,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.49" // { + (sources."expo-pwa-0.0.52" // { dependencies = [ sources."commander-2.20.0" ]; @@ -72207,7 +72141,6 @@ in sources."is-extendable-1.0.1" ]; }) - sources."external-editor-2.2.0" (sources."extglob-2.0.4" // { dependencies = [ sources."define-property-1.0.0" @@ -72229,7 +72162,7 @@ in }) sources."file-type-9.0.0" sources."file-uri-to-path-1.0.0" - sources."filesize-6.0.1" + sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.1" // { dependencies = [ @@ -72245,7 +72178,7 @@ in sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" - (sources."fork-ts-checker-webpack-plugin-3.1.1" // { + (sources."fork-ts-checker-webpack-plugin-4.1.6" // { dependencies = [ sources."braces-2.3.2" sources."chalk-2.4.2" @@ -72306,7 +72239,6 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."glob-to-regexp-0.3.0" sources."global-4.3.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -72345,11 +72277,6 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) sources."has-flag-3.0.0" sources."has-symbols-1.0.1" sources."has-unicode-2.0.1" @@ -72435,7 +72362,7 @@ in sources."iferr-0.1.5" sources."ignore-5.1.8" sources."ignore-walk-3.0.3" - sources."immer-1.10.0" + sources."immer-7.0.9" (sources."import-fresh-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -72449,16 +72376,6 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - (sources."inquirer-5.2.0" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" - sources."chalk-2.4.2" - sources."figures-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) sources."internal-ip-4.3.0" sources."invariant-2.2.4" sources."ip-1.1.5" @@ -72474,7 +72391,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -72549,10 +72466,10 @@ in ]; }) sources."jetifier-1.6.6" - sources."jimp-0.9.8" + sources."jimp-0.12.1" sources."joi-11.4.0" sources."join-component-1.1.0" - sources."jpeg-js-0.3.7" + sources."jpeg-js-0.4.2" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsbn-0.1.1" @@ -72579,7 +72496,6 @@ in sources."keyv-3.1.0" sources."killable-1.0.1" sources."kind-of-6.0.3" - sources."klaw-sync-6.0.0" sources."kleur-3.0.3" sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" @@ -72721,7 +72637,6 @@ in ]; }) sources."mkdirp-0.5.5" - sources."moment-2.29.1" (sources."move-concurrently-1.0.1" // { dependencies = [ sources."rimraf-2.7.1" @@ -72730,7 +72645,6 @@ in sources."ms-2.1.2" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."mute-stream-0.0.7" sources."mv-2.1.1" sources."mz-2.7.0" sources."nan-2.14.2" @@ -72811,26 +72725,14 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - (sources."object.entries-1.1.2" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."object.getownpropertydescriptors-2.1.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.entries-1.1.3" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" - (sources."object.values-1.1.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.values-1.1.2" sources."obuf-1.1.2" sources."omggif-1.0.10" sources."on-finished-2.3.0" @@ -73143,57 +73045,26 @@ in }) sources."raw-body-2.3.3" sources."rc-1.2.8" - (sources."react-dev-utils-10.2.1" // { + (sources."react-dev-utils-11.0.1" // { dependencies = [ - sources."@babel/code-frame-7.8.3" - sources."@nodelib/fs.stat-1.1.3" - sources."arrify-1.0.1" - sources."braces-2.3.2" - sources."browserslist-4.10.0" + sources."array-union-2.1.0" + sources."browserslist-4.14.2" (sources."chalk-2.4.2" // { dependencies = [ sources."escape-string-regexp-1.0.5" ]; }) - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cross-spawn-7.0.1" - sources."dir-glob-2.0.0" - sources."emojis-list-2.1.0" + sources."cross-spawn-7.0.3" sources."escape-string-regexp-2.0.0" - sources."extend-shallow-2.0.1" - sources."external-editor-3.1.0" - sources."fast-glob-2.2.7" - sources."fill-range-4.0.0" - sources."glob-parent-3.1.0" - sources."globby-8.0.2" - sources."iconv-lite-0.4.24" - sources."ignore-3.3.10" - (sources."inquirer-7.0.4" // { - dependencies = [ - sources."strip-ansi-5.2.0" - ]; - }) - sources."is-glob-3.1.0" - sources."is-number-3.0.0" + sources."globby-11.0.1" sources."is-wsl-2.2.0" - sources."json5-1.0.1" - sources."kind-of-3.2.2" - sources."loader-utils-1.2.3" - sources."micromatch-3.1.10" - sources."mimic-fn-2.1.0" - sources."mute-stream-0.0.8" - sources."onetime-5.1.2" + sources."loader-utils-2.0.0" sources."open-7.3.0" sources."path-key-3.1.1" - sources."path-type-3.0.0" - sources."pify-3.0.0" - sources."restore-cursor-3.1.0" - sources."rxjs-6.6.3" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.7.2" - sources."to-regex-range-2.1.1" + sources."slash-3.0.0" sources."which-2.0.2" ]; }) @@ -73287,14 +73158,8 @@ in }) sources."ripemd160-2.0.2" sources."router-ips-1.0.0" - sources."run-async-2.4.1" sources."run-parallel-1.1.10" sources."run-queue-1.0.3" - (sources."rxjs-5.5.12" // { - dependencies = [ - sources."symbol-observable-1.0.1" - ]; - }) sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" @@ -73814,7 +73679,11 @@ in }) (sources."webpackbar-4.0.0" // { dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-2.4.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" ]; }) sources."websocket-driver-0.6.5" @@ -73865,7 +73734,7 @@ in ]; }) sources."worker-rpc-0.1.1" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -73979,7 +73848,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -74735,7 +74604,7 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -74945,7 +74814,7 @@ in sources."defined-0.0.0" sources."director-1.2.7" sources."duplexer-0.1.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" sources."eventemitter2-6.4.3" @@ -75026,7 +74895,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -75083,7 +74951,7 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" @@ -75110,11 +74978,7 @@ in sources."readable-stream-2.3.7" sources."readdirp-2.2.1" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -75667,7 +75531,7 @@ in sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" @@ -75853,45 +75717,45 @@ in sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.0.0" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) (sources."@graphql-tools/delegate-7.0.5" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) (sources."@graphql-tools/graphql-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) sources."@graphql-tools/import-6.2.5" (sources."@graphql-tools/json-file-loader-6.2.6" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) sources."@graphql-tools/load-6.2.4" (sources."@graphql-tools/merge-6.2.5" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) - (sources."@graphql-tools/schema-7.0.0" // { + (sources."@graphql-tools/schema-7.1.0" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) (sources."@graphql-tools/url-loader-6.4.0" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) sources."@graphql-tools/utils-6.2.4" (sources."@graphql-tools/wrap-7.0.1" // { dependencies = [ - sources."@graphql-tools/utils-7.0.2" + sources."@graphql-tools/utils-7.1.0" ]; }) sources."@kwsites/file-exists-1.1.1" @@ -76208,7 +76072,7 @@ in sources."oas-validator-5.0.4" sources."oauth-sign-0.9.0" sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -76495,7 +76359,7 @@ in sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -76785,7 +76649,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.30.4" + sources."systeminformation-4.30.6" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -77019,7 +76883,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -77412,7 +77276,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -78317,7 +78181,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.19.2" + sources."jquery.terminal-2.20.0" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -78835,7 +78699,7 @@ in sources."inherits-2.0.4" sources."invert-kv-1.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -79167,10 +79031,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.4.3"; + version = "1.4.9"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.4.3.tgz"; - sha512 = "29r23EaeUT0HupQVr5xNN1WuUpT+vn9agxrjbSwVJCYhV++kpkf2zvmuFe7fcTI3oAVu5yXLiK388DlJ7vaFPQ=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.4.9.tgz"; + sha512 = "4JjZOpv5WyJ3VbtcxrOf5FYQBYPjbBsrIGLG+DoYNFPLsOWEOJeZH24XO2UnNKb5YopcsCzR+iaTXVCPNQ2tAw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -79509,7 +79373,7 @@ in sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -79740,7 +79604,7 @@ in sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" - sources."seventh-0.7.37" + sources."seventh-0.7.38" (sources."sharp-0.26.3" // { dependencies = [ sources."color-3.1.3" @@ -81334,7 +81198,7 @@ in sources."envinfo-7.7.3" sources."err-code-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -81547,7 +81411,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -81557,6 +81421,7 @@ in sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -81721,7 +81586,7 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" sources."once-1.4.0" @@ -83052,7 +82917,7 @@ in sources."@types/babel__core-7.1.12" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" - sources."@types/babel__traverse-7.0.15" + sources."@types/babel__traverse-7.0.16" sources."@types/estree-0.0.45" sources."@types/graceful-fs-4.1.4" sources."@types/istanbul-lib-coverage-2.0.3" @@ -83133,11 +82998,7 @@ in sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" sources."babel-jest-25.5.1" - (sources."babel-loader-8.2.1" // { - dependencies = [ - sources."make-dir-2.1.0" - ]; - }) + sources."babel-loader-8.2.2" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" sources."babel-plugin-jest-hoist-25.5.0" @@ -83357,7 +83218,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.607" + sources."electron-to-chromium-1.3.610" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -83435,11 +83296,7 @@ in sources."extend-shallow-2.0.1" ]; }) - (sources."find-cache-dir-2.1.0" // { - dependencies = [ - sources."make-dir-2.1.0" - ]; - }) + sources."find-cache-dir-3.3.1" sources."find-up-4.1.0" (sources."findup-sync-3.0.0" // { dependencies = [ @@ -83514,7 +83371,15 @@ in sources."https-browserify-1.0.0" sources."ieee754-1.2.1" sources."iferr-0.1.5" - sources."import-local-2.0.0" + (sources."import-local-2.0.0" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" + ]; + }) sources."imurmurhash-0.1.4" sources."infer-owner-1.0.4" sources."inflight-1.0.6" @@ -83528,7 +83393,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -83715,14 +83580,7 @@ in sources."pinkie-1.0.0" sources."pinkie-promise-1.0.0" sources."pirates-4.0.1" - (sources."pkg-dir-3.0.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."pkg-dir-4.2.0" sources."posix-character-classes-0.1.1" sources."posix-getopt-git://github.com/anmonteiro/node-getopt#master" sources."prettier-1.19.1" @@ -83931,6 +83789,13 @@ in }) (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."make-dir-2.1.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + sources."pkg-dir-3.0.0" sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; @@ -84342,7 +84207,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -84635,7 +84500,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.153.1" + sources."@fluentui/react-7.153.2" sources."@fluentui/react-compose-0.19.12" sources."@fluentui/react-focus-7.16.19" sources."@fluentui/react-stylesheets-0.2.4" @@ -84779,7 +84644,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.153.1" + sources."office-ui-fabric-react-7.153.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -84878,7 +84743,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.37.0" + sources."swagger-ui-dist-3.37.2" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -85884,7 +85749,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.607" + sources."electron-to-chromium-1.3.610" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -86199,7 +86064,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -86212,6 +86077,7 @@ in sources."is-interactive-1.0.0" sources."is-module-1.0.0" sources."is-natural-number-4.0.1" + sources."is-negative-zero-2.0.0" sources."is-npm-4.0.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -86474,10 +86340,14 @@ in }) sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object-treeify-1.1.29" + sources."object-treeify-1.1.30" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" + (sources."object.getownpropertydescriptors-2.1.1" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."object.pick-1.3.0" sources."octal-1.0.0" sources."octokit-pagination-methods-1.1.0" @@ -86843,7 +86713,7 @@ in ]; }) sources."term-size-2.2.1" - (sources."terser-5.5.0" // { + (sources."terser-5.5.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -87271,7 +87141,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -88105,7 +87975,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -89256,9 +89126,9 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.1.1" // { + (sources."csso-4.2.0" // { dependencies = [ - sources."css-tree-1.1.1" + sources."css-tree-1.1.2" sources."mdn-data-2.0.14" ]; }) @@ -89318,7 +89188,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.607" + sources."electron-to-chromium-1.3.610" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -89328,7 +89198,7 @@ in sources."entities-1.1.2" sources."envinfo-7.7.3" sources."error-ex-1.3.2" - (sources."es-abstract-1.17.7" // { + (sources."es-abstract-1.18.0-next.1" // { dependencies = [ sources."object-inspect-1.8.0" ]; @@ -89454,7 +89324,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -89471,6 +89341,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-html-1.1.0" + sources."is-negative-zero-2.0.0" sources."is-number-3.0.0" sources."is-obj-2.0.0" sources."is-plain-object-2.0.4" @@ -89584,9 +89455,9 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" - sources."object.values-1.1.1" + sources."object.values-1.1.2" sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -89890,7 +89761,12 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + sources."object-inspect-1.8.0" + ]; + }) sources."uuid-3.4.0" sources."v8-compile-cache-2.2.0" sources."vendors-1.0.4" @@ -90498,7 +90374,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."bep53-range-1.0.0" + sources."bep53-range-1.1.0" sources."big-integer-1.6.48" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { @@ -90558,7 +90434,7 @@ in sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."external-editor-2.2.0" @@ -90610,11 +90486,10 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-callable-1.2.2" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" @@ -90652,7 +90527,7 @@ in sources."numeral-2.0.6" sources."object-assign-4.1.1" sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -90706,11 +90581,7 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.7" sources."redent-1.0.0" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."repeating-2.0.1" sources."resolve-1.19.0" sources."restore-cursor-2.0.0" @@ -91346,7 +91217,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -91433,7 +91304,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.30.4" + sources."systeminformation-4.30.6" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -91458,7 +91329,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Production process manager for Node.JS applications with a built-in load balancer."; - homepage = "https://pm2.keymetrics.io/"; + homepage = http://pm2.keymetrics.io/; license = "AGPL-3.0"; }; production = true; @@ -91638,10 +91509,10 @@ in prettier = nodeEnv.buildNodePackage { 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=="; }; buildInputs = globalBuildInputs; meta = { @@ -91819,7 +91690,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -92105,7 +91976,7 @@ in sources."mute-stream-0.0.8" sources."ncp-0.4.2" sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -92897,7 +92768,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -93378,10 +93249,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.12.0.tgz"; - sha512 = "T36JRXVwIqB0FNV7h8n9vG2EnfwuznQnIH4ICmnfIZ2UcfE+cF2IBU98W1j6Pebh1qYUIM4uDZ7SnyvaGfGImw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.13.0.tgz"; + sha512 = "MOz0JYlPrWGwuyVUIncyaNRSlwOzVUFj5T/ITRjtO5PYXUWr+BB+yhZ97KoOhuL/hVnQ7ZjsmYgOvzo8hHwv9w=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -94079,7 +93950,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.23.0" // { + (sources."simple-git-2.24.0" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" @@ -94873,10 +94744,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.431.1"; + version = "1.431.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.431.1.tgz"; - sha512 = "OW48lG89ffLsSZPHwsjfdqQcu3XG6aRQOkwASPCgTAGcVcnXzS9XHB89h0gLsDzk0fZRskEVgYpvXdh4RFjNqA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.431.2.tgz"; + sha512 = "DGm/bxtCSI/ReGK0vMphicQyZtVXiLgLvWkdDbRmsMb4Q7VRylAq9z+5lursLriED7eTjxlkgFMjOdGOuIoxpg=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -95327,7 +95198,7 @@ in }) (sources."snyk-poetry-lockfile-parser-1.1.1" // { dependencies = [ - (sources."@snyk/dep-graph-1.20.0" // { + (sources."@snyk/dep-graph-1.21.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -95597,7 +95468,7 @@ in sources."ini-1.3.5" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -95850,7 +95721,7 @@ in }) sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.7" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" (sources."es-get-iterator-1.1.1" // { dependencies = [ sources."isarray-2.0.5" @@ -95885,6 +95756,7 @@ in (sources."flumeview-links-1.0.1" // { dependencies = [ sources."deep-equal-2.0.4" + sources."es-abstract-1.18.0-next.1" sources."isarray-2.0.5" sources."map-filter-reduce-3.2.2" ]; @@ -96007,11 +95879,7 @@ in sources."is-set-2.0.1" sources."is-string-1.0.5" sources."is-symbol-1.0.3" - (sources."is-typed-array-1.1.3" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."is-typed-array-1.1.3" sources."is-typedarray-1.0.0" sources."is-valid-domain-0.0.17" sources."is-weakmap-2.0.1" @@ -96120,7 +95988,7 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ @@ -96286,11 +96154,7 @@ in }) sources."regex-cache-0.4.4" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."relative-url-1.0.2" (sources."remark-3.2.3" // { dependencies = [ @@ -96330,7 +96194,11 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."side-channel-1.0.3" + (sources."side-channel-1.0.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -96435,7 +96303,11 @@ in ]; }) sources."string-width-1.0.2" - sources."string.prototype.trim-1.2.3" + (sources."string.prototype.trim-1.2.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."string.prototype.trimend-1.0.3" sources."string.prototype.trimstart-1.0.3" sources."string_decoder-1.1.1" @@ -96504,11 +96376,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.1" sources."which-collection-1.0.1" - (sources."which-typed-array-1.1.2" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."which-typed-array-1.1.2" sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" @@ -96867,7 +96735,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -97386,6 +97254,333 @@ in bypassCache = true; reconstructLock = true; }; + stylelint = nodeEnv.buildNodePackage { + name = "stylelint"; + packageName = "stylelint"; + version = "13.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz"; + sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ=="; + }; + dependencies = [ + sources."@babel/code-frame-7.10.4" + sources."@babel/core-7.12.9" + sources."@babel/generator-7.12.5" + sources."@babel/helper-function-name-7.10.4" + sources."@babel/helper-get-function-arity-7.10.4" + sources."@babel/helper-member-expression-to-functions-7.12.7" + sources."@babel/helper-module-imports-7.12.5" + sources."@babel/helper-module-transforms-7.12.1" + sources."@babel/helper-optimise-call-expression-7.12.7" + sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-split-export-declaration-7.11.0" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/helpers-7.12.5" + (sources."@babel/highlight-7.10.4" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + sources."@babel/parser-7.12.7" + sources."@babel/template-7.12.7" + sources."@babel/traverse-7.12.9" + sources."@babel/types-7.12.7" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@stylelint/postcss-css-in-js-0.37.2" + sources."@stylelint/postcss-markdown-0.36.2" + sources."@types/mdast-3.0.3" + sources."@types/minimist-1.2.1" + sources."@types/normalize-package-data-2.4.0" + sources."@types/parse-json-4.0.0" + sources."@types/unist-2.0.3" + sources."ajv-6.12.6" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."array-union-2.1.0" + sources."arrify-1.0.1" + sources."astral-regex-2.0.0" + sources."autoprefixer-9.8.6" + sources."bail-1.0.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browserslist-4.14.7" + sources."callsites-3.1.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."caniuse-lite-1.0.30001161" + (sources."chalk-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."character-entities-1.2.4" + sources."character-entities-legacy-1.1.4" + sources."character-reference-invalid-1.1.4" + sources."clone-regexp-2.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."colorette-1.2.1" + sources."concat-map-0.0.1" + sources."convert-source-map-1.7.0" + sources."cosmiconfig-7.0.0" + sources."cssesc-3.0.0" + sources."debug-4.3.1" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."dir-glob-3.0.1" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.0.2" + sources."entities-2.1.0" + ]; + }) + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.7.0" + sources."electron-to-chromium-1.3.610" + sources."emoji-regex-8.0.0" + sources."entities-1.1.2" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."execall-2.0.0" + sources."extend-3.0.2" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" + sources."fast-json-stable-stringify-2.1.0" + sources."fastest-levenshtein-1.0.12" + sources."fastq-1.9.0" + sources."file-entry-cache-6.0.0" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + sources."flat-cache-3.0.4" + sources."flatted-3.1.0" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.2" + sources."get-stdin-8.0.0" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."global-modules-2.0.0" + sources."global-prefix-3.0.0" + sources."globals-11.12.0" + sources."globby-11.0.1" + sources."globjoin-0.1.4" + sources."gonzales-pe-4.3.0" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."hosted-git-info-3.0.7" + sources."html-tags-3.1.0" + sources."htmlparser2-3.10.1" + sources."ignore-5.1.8" + (sources."import-fresh-3.2.2" // { + dependencies = [ + sources."resolve-from-4.0.0" + ]; + }) + sources."import-lazy-4.0.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."indexes-of-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."is-alphabetical-1.0.4" + sources."is-alphanumerical-1.0.4" + sources."is-arrayish-0.2.1" + sources."is-buffer-2.0.5" + sources."is-core-module-2.2.0" + sources."is-decimal-1.0.4" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-hexadecimal-1.0.4" + sources."is-number-7.0.0" + sources."is-plain-obj-2.1.0" + sources."is-regexp-2.1.0" + sources."is-typedarray-1.0.0" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."jsesc-2.5.2" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-traverse-0.4.1" + sources."json5-2.1.3" + sources."kind-of-6.0.3" + sources."known-css-properties-0.20.0" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."log-symbols-4.0.0" + sources."longest-streak-2.0.4" + sources."lru-cache-6.0.0" + sources."map-obj-4.1.0" + sources."mathml-tag-names-2.1.3" + sources."mdast-util-from-markdown-0.8.1" + (sources."mdast-util-to-markdown-0.5.4" // { + dependencies = [ + sources."mdast-util-to-string-2.0.0" + ]; + }) + sources."mdast-util-to-string-1.1.0" + sources."meow-8.0.0" + sources."merge2-1.4.1" + sources."micromark-2.10.1" + sources."micromatch-4.0.2" + sources."min-indent-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + sources."ms-2.1.2" + sources."node-releases-1.1.67" + (sources."normalize-package-data-3.0.0" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) + sources."normalize-range-0.1.2" + sources."normalize-selector-0.2.0" + sources."num2fraction-1.2.2" + sources."once-1.4.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-entities-2.0.0" + sources."parse-json-5.1.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + (sources."postcss-7.0.35" // { + dependencies = [ + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-html-0.36.0" + sources."postcss-less-3.1.4" + sources."postcss-media-query-parser-0.2.3" + sources."postcss-resolve-nested-selector-0.1.1" + sources."postcss-safe-parser-4.0.2" + sources."postcss-sass-0.4.4" + sources."postcss-scss-2.1.1" + sources."postcss-selector-parser-6.0.4" + sources."postcss-syntax-0.36.2" + sources."postcss-value-parser-4.1.0" + sources."punycode-2.1.1" + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-2.5.0" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" + sources."remark-13.0.0" + sources."remark-parse-9.0.0" + sources."remark-stringify-9.0.0" + sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" + sources."resolve-1.19.0" + sources."resolve-from-5.0.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.1.10" + sources."safe-buffer-5.1.2" + sources."semver-5.7.1" + sources."signal-exit-3.0.3" + sources."slash-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."source-map-0.5.7" + 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."specificity-0.4.1" + sources."string-width-4.2.0" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-indent-3.0.0" + sources."style-search-0.1.0" + sources."sugarss-2.0.0" + sources."supports-color-5.5.0" + sources."svg-tags-1.0.0" + sources."table-6.0.4" + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."trim-newlines-3.0.0" + sources."trough-1.0.5" + sources."type-fest-0.18.1" + sources."typedarray-to-buffer-3.1.5" + 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-stringify-position-2.0.3" + sources."uri-js-4.4.0" + sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.2.0" + sources."validate-npm-package-license-3.0.4" + sources."vfile-4.2.0" + sources."vfile-message-2.0.4" + sources."which-1.3.1" + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."yallist-4.0.0" + sources."yaml-1.10.0" + sources."yargs-parser-20.2.4" + sources."zwitch-1.0.5" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A mighty, modern CSS linter."; + homepage = https://stylelint.io/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; @@ -97408,9 +97603,9 @@ in sources."css-select-base-adapter-0.1.1" sources."css-tree-1.0.0-alpha.37" sources."css-what-3.4.2" - (sources."csso-4.1.1" // { + (sources."csso-4.2.0" // { dependencies = [ - sources."css-tree-1.1.1" + sources."css-tree-1.1.2" sources."mdn-data-2.0.14" ]; }) @@ -97423,7 +97618,7 @@ in sources."domelementtype-1.3.1" sources."domutils-1.7.0" sources."entities-2.1.0" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -97434,6 +97629,7 @@ in sources."has-symbols-1.0.1" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" sources."js-yaml-3.14.0" @@ -97444,8 +97640,8 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.0" - sources."object.values-1.1.1" + sources."object.getownpropertydescriptors-2.1.1" + sources."object.values-1.1.2" sources."q-1.5.1" sources."sax-1.2.4" sources."source-map-0.6.1" @@ -97455,7 +97651,11 @@ in sources."string.prototype.trimstart-1.0.3" sources."supports-color-5.5.0" sources."unquote-1.1.1" - sources."util.promisify-1.0.1" + (sources."util.promisify-1.0.1" // { + dependencies = [ + sources."es-abstract-1.17.7" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -98326,7 +98526,7 @@ in sources."define-properties-1.1.3" sources."diff-4.0.2" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -98356,13 +98556,12 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-hexadecimal-1.0.4" - sources."is-negative-zero-2.0.0" sources."is-plain-obj-1.1.0" sources."is-regex-1.1.1" sources."is-symbol-1.0.3" @@ -98390,7 +98589,7 @@ in sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" sources."once-1.4.0" @@ -98424,11 +98623,7 @@ in ]; }) sources."readable-stream-2.3.7" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."remark-frontmatter-1.3.3" sources."remark-parse-5.0.0" sources."repeat-string-1.6.1" @@ -98720,7 +98915,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -99117,7 +99312,7 @@ in sources."call-bind-1.0.0" sources."concat-stream-2.0.0" sources."define-properties-1.1.3" - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."get-intrinsic-1.0.1" @@ -99126,13 +99321,14 @@ in sources."inherits-2.0.4" sources."is-callable-1.2.2" sources."is-date-object-1.0.2" + sources."is-negative-zero-2.0.0" 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-keys-1.1.1" sources."object.assign-4.1.2" - sources."object.values-1.1.1" + sources."object.values-1.1.2" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."sentence-splitter-3.2.0" @@ -100700,7 +100896,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."mimic-response-2.1.0" @@ -100861,10 +101057,10 @@ in vim-language-server = nodeEnv.buildNodePackage { name = "vim-language-server"; packageName = "vim-language-server"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.1.tgz"; - sha512 = "au7F9BKmsbBY8zaZ9LELonc0XbvutejtWcR4mlEIOQiDLl+2kDfAOaQoQ/EZSOKo/GaOgZURUk7uQknQlgivAA=="; + url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.1.2.tgz"; + sha512 = "i+IVvvla+7oyXU3Mb1Vc4hCymCEUbRRhJE7/So+wZNZZgtVH4SNWwhtjzNV2l9egYAyCqJnJKKtErwgJnfAHsA=="; }; buildInputs = globalBuildInputs; meta = { @@ -101242,7 +101438,7 @@ in sources."enhanced-resolve-4.3.0" sources."entities-1.1.2" sources."errno-0.1.7" - (sources."es-abstract-1.17.7" // { + (sources."es-abstract-1.18.0-next.1" // { dependencies = [ sources."object.assign-4.1.2" ]; @@ -101400,6 +101596,7 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" + sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" @@ -101505,7 +101702,7 @@ in sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" - sources."object.getownpropertydescriptors-2.1.0" + sources."object.getownpropertydescriptors-2.1.1" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-0.1.1" @@ -102510,7 +102707,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -103385,7 +103582,7 @@ in sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."es6-error-4.1.1" sources."es6-promise-2.3.0" @@ -103611,7 +103808,6 @@ in sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" sources."is-natural-number-4.0.1" - sources."is-negative-zero-2.0.0" sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" @@ -103789,7 +103985,7 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ @@ -103878,11 +104074,7 @@ in sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."regexpp-3.1.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -104199,10 +104391,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.6.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.6.0.tgz"; - sha512 = "SIeFuBhuheKElRbd84O35UhKc0nxlgSwtzm2ksZ0BVhRJqxVJxEguT/pYhfiR0le/pxTa1VsCp7EOYyTsa6XOA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.8.0.tgz"; + sha512 = "X2yosPiHip3L0TE+ylruzrOqSgEgsdGyBOGFWKYChcwlKChaw9VodZIUovG1oo7s0ss6e3ZxBMn9tXR+nkPThA=="; }; dependencies = [ sources."@types/eslint-7.2.5" @@ -104239,7 +104431,7 @@ in sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.607" + sources."electron-to-chromium-1.3.610" sources."enhanced-resolve-5.3.2" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -104281,7 +104473,7 @@ in sources."source-map-support-0.5.19" sources."supports-color-7.2.0" sources."tapable-2.1.1" - (sources."terser-5.5.0" // { + (sources."terser-5.5.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -104342,7 +104534,7 @@ in sources."human-signals-1.1.1" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."leven-3.1.0" @@ -104529,7 +104721,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."errno-0.1.7" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" @@ -104652,7 +104844,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -104717,7 +104908,7 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" @@ -104774,11 +104965,7 @@ in }) sources."readdirp-2.2.1" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -105124,7 +105311,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."bencode-2.0.1" - sources."bep53-range-1.0.0" + sources."bep53-range-1.1.0" sources."binary-search-1.3.6" sources."bitfield-4.0.0" (sources."bittorrent-dht-10.0.0" // { @@ -105314,7 +105501,7 @@ in sources."range-slice-stream-2.0.0" sources."readable-stream-3.6.0" sources."record-cache-1.1.0" - (sources."render-media-4.0.1" // { + (sources."render-media-4.1.0" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" @@ -105386,7 +105573,7 @@ in sources."utp-native-2.2.1" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.111.0" // { + (sources."webtorrent-0.112.0" // { dependencies = [ sources."debug-4.3.1" sources."decompress-response-6.0.0" @@ -105863,7 +106050,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.1.0" + sources."is-core-module-2.2.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" @@ -106324,7 +106511,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.15.3" + sources."twig-1.15.4" sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."union-value-1.0.1" @@ -106496,4 +106683,4 @@ in bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file From 5dfefc39c5dec743346c51a52498c1594a612840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 Nov 2020 03:08:50 +0100 Subject: [PATCH 188/268] thin-provisioning-tools: remove unused input --- pkgs/tools/misc/thin-provisioning-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 8df030eafad..3eccb488361 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost, binutils }: +{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost, binutils }: stdenv.mkDerivation rec { pname = "thin-provisioning-tools"; From 212ba486d67e078ad8e31a7ca53de964d8bae826 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 02:18:00 +0000 Subject: [PATCH 189/268] igv: 2.8.12 -> 2.8.13 --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 86a16c4f047..3f9cb1a288b 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.8.12"; + version = "2.8.13"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; - sha256 = "0zxmk417j9s5nms0np1fsip7r0jhwkj1d1x424ljr9krcb2zwcyq"; + sha256 = "0sab478jq96iw3fv0560hrrj8qbh40r8m4ncypdb7991j9haxl09"; }; installPhase = '' From 495c2b5112b51faab8f5999b1cdab85f6b6de32b Mon Sep 17 00:00:00 2001 From: Kamron Mahmoodzadeh Date: Sun, 9 Aug 2020 18:16:58 -0700 Subject: [PATCH 190/268] doc: use newer ruby documentation With the addition of ruby.withPackages, manveru rewrote the nixpkgs manual section for the ruby language but did not add it to the manual. This commit replaces the previous documentation with manveru's updated version. --- doc/languages-frameworks/index.xml | 2 +- doc/languages-frameworks/ruby.section.md | 26 ++++++++++-------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 300c4cd2687..7342877fc5c 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -27,7 +27,7 @@ - + diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index e4c4ffce043..61550ddfbbb 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -6,11 +6,7 @@ date: 2019-05-23 # Ruby -## User Guide - -### Using Ruby - -#### Overview +## Using Ruby Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently @@ -37,7 +33,7 @@ Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual. -#### Temporary Ruby environment with `nix-shell` +### Temporary Ruby environment with `nix-shell` Rather than having a single Ruby environment shared by all Ruby development projects on a system, Nix allows you to create separate @@ -64,7 +60,7 @@ Again, it's possible to launch the interpreter from the shell. The Ruby interpreter has the attribute `gems` which contains all Ruby gems for that specific interpreter. -##### Load environment from `.nix` expression +#### Load Ruby environment from `.nix` expression As explained in the Nix manual, `nix-shell` can also load an expression from a `.nix` file. Say we want to have Ruby 2.5, `nokogori`, and `pry`. Consider a @@ -87,7 +83,7 @@ What's happening here? in the environment. Here, we select the packages `nokogiri` and `pry` from the package set. -##### Execute command with `--run` +#### Execute command with `--run` A convenient flag for `nix-shell` is `--run`. It executes a command in the `nix-shell`. We can e.g. directly open a `pry` REPL: @@ -108,7 +104,7 @@ Or run a script using this environment: nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb" ``` -##### Using `nix-shell` as shebang +#### Using `nix-shell` as shebang In fact, for the last case, there is a more convenient method. You can add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script @@ -126,9 +122,9 @@ body = RestClient.get('http://example.com').body puts Nokogiri::HTML(body).at('h1').text ``` -### Developing with Ruby +## Developing with Ruby -#### Using an existing Gemfile +### Using an existing Gemfile In most cases, you'll already have a `Gemfile.lock` listing all your dependencies. This can be used to generate a `gemset.nix` which is used to fetch the gems and @@ -187,7 +183,7 @@ mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; } ``` -#### Gem-specific configurations and workarounds +### Gem-specific configurations and workarounds In some cases, especially if the gem has native extensions, you might need to modify the way the gem is built. @@ -276,7 +272,7 @@ Of course for this use-case one could also use overlays since the configuration for `pg` depends on the `postgresql` alias, but for demonstration purposes this has to suffice. -#### Adding a gem to the default gemset +### Adding a gem to the default gemset Now that you know how to get a working Ruby environment with Nix, it's time to go forward and start actually developing with Ruby. @@ -297,7 +293,7 @@ To test that it works, you can then try using the gem with: NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])" ``` -#### Packaging applications +### Packaging applications A common task is to add a ruby executable to nixpkgs, popular examples would be `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` @@ -334,7 +330,7 @@ bundlerApp { All that's left to do is to generate the corresponding `Gemfile.lock` and `gemset.nix` as described above in the `Using an existing Gemfile` section. -##### Packaging executables that require wrapping +#### Packaging executables that require wrapping Sometimes your app will depend on other executables at runtime, and tries to find it through the `PATH` environment variable. From 6c70fdfd07bbd2547b7788a29bfefbb922caae97 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Fri, 27 Nov 2020 17:26:10 -0800 Subject: [PATCH 191/268] doc: ruby improvements * no hard wrapping * use ShellSession and nix info strings * preserve old section anchor link * update references to present default version --- doc/languages-frameworks/ruby.section.md | 195 ++++++----------------- doc/languages-frameworks/ruby.xml | 107 ------------- 2 files changed, 52 insertions(+), 250 deletions(-) delete mode 100644 doc/languages-frameworks/ruby.xml diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index 61550ddfbbb..e292b3110ff 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -1,70 +1,38 @@ ---- -title: Ruby -author: Michael Fellinger -date: 2019-05-23 ---- - -# Ruby +# Ruby {#sec-language-ruby} ## Using Ruby -Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. -The attribute `ruby` refers to the default Ruby interpreter, which is currently -MRI 2.5. It's also possible to refer to specific versions, e.g. `ruby_2_6`, `jruby`, or `mruby`. +Several versions of Ruby interpreters are available on Nix, as well as over 250 gems and many applications written in Ruby. The attribute `ruby` refers to the default Ruby interpreter, which is currently MRI 2.6. It's also possible to refer to specific versions, e.g. `ruby_2_y`, `jruby`, or `mruby`. -In the nixpkgs tree, Ruby packages can be found throughout, depending on what -they do, and are called from the main package set. Ruby gems, however are -separate sets, and there's one default set for each interpreter (currently MRI -only). +In the Nixpkgs tree, Ruby packages can be found throughout, depending on what they do, and are called from the main package set. Ruby gems, however are separate sets, and there's one default set for each interpreter (currently MRI only). -There are two main approaches for using Ruby with gems. -One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. -The other is to depend on the common gems, which we'll explain further down, and -rely on them being updated regularly. +There are two main approaches for using Ruby with gems. One is to use a specifically locked `Gemfile` for an application that has very strict dependencies. The other is to depend on the common gems, which we'll explain further down, and rely on them being updated regularly. -The interpreters have common attributes, namely `gems`, and `withPackages`. So -you can refer to `ruby.gems.nokogiri`, or `ruby_2_5.gems.nokogiri` to get the -Nokogiri gem already compiled and ready to use. +The interpreters have common attributes, namely `gems`, and `withPackages`. So you can refer to `ruby.gems.nokogiri`, or `ruby_2_6.gems.nokogiri` to get the Nokogiri gem already compiled and ready to use. -Since not all gems have executables like `nokogiri`, it's usually more -convenient to use the `withPackages` function like this: -`ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the -Ruby in your environment will be able to find the gem and it can be used in your -Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` -as usual. +Since not all gems have executables like `nokogiri`, it's usually more convenient to use the `withPackages` function like this: `ruby.withPackages (p: with p; [ nokogiri ])`. This will also make sure that the Ruby in your environment will be able to find the gem and it can be used in your Ruby code (for example via `ruby` or `irb` executables) via `require "nokogiri"` as usual. ### Temporary Ruby environment with `nix-shell` -Rather than having a single Ruby environment shared by all Ruby -development projects on a system, Nix allows you to create separate -environments per project. `nix-shell` gives you the possibility to -temporarily load another environment akin to a combined `chruby` or -`rvm` and `bundle exec`. +Rather than having a single Ruby environment shared by all Ruby development projects on a system, Nix allows you to create separate environments per project. `nix-shell` gives you the possibility to temporarily load another environment akin to a combined `chruby` or `rvm` and `bundle exec`. -There are two methods for loading a shell with Ruby packages. The first and -recommended method is to create an environment with `ruby.withPackages` and load -that. +There are two methods for loading a shell with Ruby packages. The first and recommended method is to create an environment with `ruby.withPackages` and load that. -```shell -nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" +```ShellSession +$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" ``` -The other method, which is not recommended, is to create an environment and list -all the packages directly. +The other method, which is not recommended, is to create an environment and list all the packages directly. -```shell -nix-shell -p ruby.gems.nokogiri ruby.gems.pry +```ShellSession +$ nix-shell -p ruby.gems.nokogiri ruby.gems.pry ``` -Again, it's possible to launch the interpreter from the shell. The Ruby -interpreter has the attribute `gems` which contains all Ruby gems for that -specific interpreter. +Again, it's possible to launch the interpreter from the shell. The Ruby interpreter has the attribute `gems` which contains all Ruby gems for that specific interpreter. #### Load Ruby environment from `.nix` expression -As explained in the Nix manual, `nix-shell` can also load an expression from a -`.nix` file. Say we want to have Ruby 2.5, `nokogori`, and `pry`. Consider a -`shell.nix` file with: +As explained in the Nix manual, `nix-shell` can also load an expression from a `.nix` file. Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with: ```nix with import {}; @@ -73,43 +41,33 @@ ruby.withPackages (ps: with ps; [ nokogiri pry ]) What's happening here? -1. We begin with importing the Nix Packages collections. `import ` - imports the `` function, `{}` calls it and the `with` statement - brings all attributes of `nixpkgs` in the local scope. These attributes form - the main package set. +1. We begin with importing the Nix Packages collections. `import ` imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. 2. Then we create a Ruby environment with the `withPackages` function. -3. The `withPackages` function expects us to provide a function as an argument - that takes the set of all ruby gems and returns a list of packages to include - in the environment. Here, we select the packages `nokogiri` and `pry` from - the package set. +3. The `withPackages` function expects us to provide a function as an argument that takes the set of all ruby gems and returns a list of packages to include in the environment. Here, we select the packages `nokogiri` and `pry` from the package set. #### Execute command with `--run` -A convenient flag for `nix-shell` is `--run`. It executes a command in the -`nix-shell`. We can e.g. directly open a `pry` REPL: +A convenient flag for `nix-shell` is `--run`. It executes a command in the `nix-shell`. We can e.g. directly open a `pry` REPL: -```shell -nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry" +```ShellSession +$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry" ``` Or immediately require `nokogiri` in pry: -```shell -nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry -rnokogiri" +```ShellSession +$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "pry -rnokogiri" ``` Or run a script using this environment: -```shell -nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb" +```ShellSession +$ nix-shell -p "ruby.withPackages (ps: with ps; [ nokogiri pry ])" --run "ruby example.rb" ``` #### Using `nix-shell` as shebang -In fact, for the last case, there is a more convenient method. You can add a -[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script -specifying which dependencies `nix-shell` needs. With the following shebang, you -can just execute `./example.rb`, and it will run with all dependencies. +In fact, for the last case, there is a more convenient method. You can add a [shebang]() to your script specifying which dependencies `nix-shell` needs. With the following shebang, you can just execute `./example.rb`, and it will run with all dependencies. ```ruby #! /usr/bin/env nix-shell @@ -126,31 +84,20 @@ puts Nokogiri::HTML(body).at('h1').text ### Using an existing Gemfile -In most cases, you'll already have a `Gemfile.lock` listing all your dependencies. -This can be used to generate a `gemset.nix` which is used to fetch the gems and -combine them into a single environment. -The reason why you need to have a separate file for this, is that Nix requires -you to have a checksum for each input to your build. -Since the `Gemfile.lock` that `bundler` generates doesn't provide us with -checksums, we have to first download each gem, calculate its SHA256, and store -it in this separate file. +In most cases, you'll already have a `Gemfile.lock` listing all your dependencies. This can be used to generate a `gemset.nix` which is used to fetch the gems and combine them into a single environment. The reason why you need to have a separate file for this, is that Nix requires you to have a checksum for each input to your build. Since the `Gemfile.lock` that `bundler` generates doesn't provide us with checksums, we have to first download each gem, calculate its SHA256, and store it in this separate file. So the steps from having just a `Gemfile` to a `gemset.nix` are: -```shell -bundle lock -bundix +```ShellSession +$ bundle lock +$ bundix ``` -If you already have a `Gemfile.lock`, you can simply run `bundix` and it will -work the same. +If you already have a `Gemfile.lock`, you can simply run `bundix` and it will work the same. -To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag, -which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent -time of modification. +To update the gems in your `Gemfile.lock`, you may use the `bundix -l` flag, which will create a new `Gemfile.lock` in case the `Gemfile` has a more recent time of modification. -Once the `gemset.nix` is generated, it can be used in a -`bundlerEnv` derivation. Here is an example you could use for your `shell.nix`: +Once the `gemset.nix` is generated, it can be used in a `bundlerEnv` derivation. Here is an example you could use for your `shell.nix`: ```nix # ... @@ -162,41 +109,26 @@ let in mkShell { buildInputs = [ gems gems.wrappedRuby ]; } ``` -With this file in your directory, you can run `nix-shell` to build and use the gems. -The important parts here are `bundlerEnv` and `wrappedRuby`. +With this file in your directory, you can run `nix-shell` to build and use the gems. The important parts here are `bundlerEnv` and `wrappedRuby`. -The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that -all the `/lib` and `/bin` directories will be available, and the executables of -all gems (even of indirect dependencies) will end up in your `$PATH`. -The `wrappedRuby` provides you with all executables that come with Ruby itself, -but wrapped so they can easily find the gems in your gemset. +The `bundlerEnv` is a wrapper over all the gems in your gemset. This means that all the `/lib` and `/bin` directories will be available, and the executables of all gems (even of indirect dependencies) will end up in your `$PATH`. The `wrappedRuby` provides you with all executables that come with Ruby itself, but wrapped so they can easily find the gems in your gemset. -One common issue that you might have is that you have Ruby 2.6, but also -`bundler` in your gemset. That leads to a conflict for `/bin/bundle` and -`/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems -in a `lowPrio` call. So in order to give the `bundler` from your gemset -priority, it would be used like this: +One common issue that you might have is that you have Ruby 2.6, but also `bundler` in your gemset. That leads to a conflict for `/bin/bundle` and `/bin/bundler`. You can resolve this by wrapping either your Ruby or your gems in a `lowPrio` call. So in order to give the `bundler` from your gemset priority, it would be used like this: ```nix # ... mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; } ``` - ### Gem-specific configurations and workarounds -In some cases, especially if the gem has native extensions, you might need to -modify the way the gem is built. +In some cases, especially if the gem has native extensions, you might need to modify the way the gem is built. -This is done via a common configuration file that includes all of the -workarounds for each gem. +This is done via a common configuration file that includes all of the workarounds for each gem. -This file lives at `/pkgs/development/ruby-modules/gem-config/default.nix`, -since it already contains a lot of entries, it should be pretty easy to add the -modifications you need for your needs. +This file lives at `/pkgs/development/ruby-modules/gem-config/default.nix`, since it already contains a lot of entries, it should be pretty easy to add the modifications you need for your needs. -In the meanwhile, or if the modification is for a private gem, you can also add -the configuration to only your own environment. +In the meanwhile, or if the modification is for a private gem, you can also add the configuration to only your own environment. Two places that allow this modification are the `ruby` derivation, or `bundlerEnv`. @@ -257,10 +189,9 @@ let in pkgs.ruby.withPackages (ps: with ps; [ pg ]) ``` -Then we can get whichever postgresql version we desire and the `pg` gem will -always reference it correctly: +Then we can get whichever postgresql version we desire and the `pg` gem will always reference it correctly: -```shell +```ShellSession $ nix-shell --argstr pg_version 9_4 --run 'ruby -rpg -e "puts PG.library_version"' 90421 @@ -268,24 +199,15 @@ $ nix-shell --run 'ruby -rpg -e "puts PG.library_version"' 100007 ``` -Of course for this use-case one could also use overlays since the configuration -for `pg` depends on the `postgresql` alias, but for demonstration purposes this -has to suffice. +Of course for this use-case one could also use overlays since the configuration for `pg` depends on the `postgresql` alias, but for demonstration purposes this has to suffice. ### Adding a gem to the default gemset -Now that you know how to get a working Ruby environment with Nix, it's time to -go forward and start actually developing with Ruby. -We will first have a look at how Ruby gems are packaged on Nix. Then, we will -look at how you can use development mode with your code. +Now that you know how to get a working Ruby environment with Nix, it's time to go forward and start actually developing with Ruby. We will first have a look at how Ruby gems are packaged on Nix. Then, we will look at how you can use development mode with your code. -All gems in the standard set are automatically generated from a single -`Gemfile`. The dependency resolution is done with `bundler` and makes it more -likely that all gems are compatible to each other. +All gems in the standard set are automatically generated from a single `Gemfile`. The dependency resolution is done with `bundler` and makes it more likely that all gems are compatible to each other. -In order to add a new gem to nixpkgs, you can put it into the -`/pkgs/development/ruby-modules/with-packages/Gemfile` and run -`./maintainers/scripts/update-ruby-packages`. +In order to add a new gem to nixpkgs, you can put it into the `/pkgs/development/ruby-modules/with-packages/Gemfile` and run `./maintainers/scripts/update-ruby-packages`. To test that it works, you can then try using the gem with: @@ -295,14 +217,9 @@ NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-yo ### Packaging applications -A common task is to add a ruby executable to nixpkgs, popular examples would be -`chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` -function, that allows you to make a package that only exposes the listed -executables, otherwise the package may cause conflicts through common paths like -`bin/rake` or `bin/bundler` that aren't meant to be used. +A common task is to add a ruby executable to nixpkgs, popular examples would be `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` function, that allows you to make a package that only exposes the listed executables, otherwise the package may cause conflicts through common paths like `bin/rake` or `bin/bundler` that aren't meant to be used. -The absolute easiest way to do that is to write a -`Gemfile` along these lines: +The absolute easiest way to do that is to write a `Gemfile` along these lines: ```ruby source 'https://rubygems.org' do @@ -310,10 +227,7 @@ source 'https://rubygems.org' do end ``` -If you want to package a specific version, you can use the standard Gemfile -syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable -version anyway, it's easier to update by simply running the `bundle lock` and -`bundix` steps again. +If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again. Now you can also also make a `default.nix` that looks like this: @@ -327,20 +241,15 @@ bundlerApp { } ``` -All that's left to do is to generate the corresponding `Gemfile.lock` and -`gemset.nix` as described above in the `Using an existing Gemfile` section. +All that's left to do is to generate the corresponding `Gemfile.lock` and `gemset.nix` as described above in the `Using an existing Gemfile` section. #### Packaging executables that require wrapping -Sometimes your app will depend on other executables at runtime, and tries to -find it through the `PATH` environment variable. +Sometimes your app will depend on other executables at runtime, and tries to find it through the `PATH` environment variable. -In this case, you can provide a `postBuild` hook to `bundlerApp` that wraps the -gem in another script that prefixes the `PATH`. +In this case, you can provide a `postBuild` hook to `bundlerApp` that wraps the gem in another script that prefixes the `PATH`. -Of course you could also make a custom `gemConfig` if you know exactly how to -patch it, but it's usually much easier to maintain with a simple wrapper so the -patch doesn't have to be adjusted for each version. +Of course you could also make a custom `gemConfig` if you know exactly how to patch it, but it's usually much easier to maintain with a simple wrapper so the patch doesn't have to be adjusted for each version. Here's another example: diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml deleted file mode 100644 index 9b579d6804f..00000000000 --- a/doc/languages-frameworks/ruby.xml +++ /dev/null @@ -1,107 +0,0 @@ -

- Ruby - - - There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a Gemfile, let bundler create a Gemfile.lock, and then convert this into a nix expression that contains all Gem dependencies automatically. - - - - For example, to package sensu, we did: - - - -$ cd pkgs/servers/monitoring -$ mkdir sensu -$ cd sensu -$ cat > Gemfile -source 'https://rubygems.org' -gem 'sensu' -$ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic -$ cat > default.nix -{ lib, bundlerEnv, ruby }: - -bundlerEnv rec { - name = "sensu-${version}"; - - version = (import gemset).sensu.version; - inherit ruby; - # expects Gemfile, Gemfile.lock and gemset.nix in the same directory - gemdir = ./.; - - meta = with lib; { - description = "A monitoring framework that aims to be simple, malleable, and scalable"; - homepage = "http://sensuapp.org/"; - license = with licenses; mit; - maintainers = with maintainers; [ theuni ]; - platforms = platforms.unix; - }; -} - - - - Please check in the Gemfile, Gemfile.lock and the gemset.nix so future updates can be run easily. - - - - Updating Ruby packages can then be done like this: - - - -$ cd pkgs/servers/monitoring/sensu -$ nix-shell -p bundler --run 'bundle lock --update' -$ nix-shell -p bundix --run 'bundix' - - - - For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. rake at the command line, there is an alternative builder called bundlerApp. Set up the gemset.nix the same way, and then, for example: - - - - - - - - The chief advantage of bundlerApp over bundlerEnv is the executables introduced in the environment are precisely those selected in the exes list, as opposed to bundlerEnv which adds all the executables made available by gems in the gemset, which can mean e.g. rspec or rake in unpredictable versions available from various packages. - - - - Resulting derivations for both builders also have two helpful attributes, env and wrappedRuby. The first one allows one to quickly drop into nix-shell with the specified environment present. E.g. nix-shell -A sensu.env would give you an environment with Ruby preset so it has all the libraries necessary for sensu in its paths. The second one can be used to make derivations from custom Ruby scripts which have Gemfiles with their dependencies specified. It is a derivation with ruby wrapped so it can find all the needed dependencies. For example, to make a derivation my-script for a my-script.rb (which should be placed in bin) you should run bundix as specified above and then use bundlerEnv like this: - - - - - -
From 698111962ec18eff348cf660c01b4bebe945a1ce Mon Sep 17 00:00:00 2001 From: applePrincess Date: Sat, 28 Nov 2020 12:06:50 +0900 Subject: [PATCH 192/268] doc/python: Fix shebang link (#105196) --- doc/languages-frameworks/python.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 59f7389b9ad..8a2fe2711c7 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -153,7 +153,7 @@ The dot product of [1 2] and [3 4] is: 11 But if we maintain the script ourselves, and if there are more dependencies, it may be nice to encode those dependencies in source to make the script re-usable without that bit of knowledge. That can be done by using `nix-shell` as a -[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix), like so: +[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)), like so: ```python #!/usr/bin/env nix-shell From 2b4b716984acfbc6e2b07a2c6bb7a1a4faa88d1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 03:34:56 +0000 Subject: [PATCH 193/268] haproxy: 2.3.0 -> 2.3.1 --- pkgs/tools/networking/haproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 80b135e524b..2c1732007b5 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "1z3qzwm2brpi36kxhvw2xvm1ld9yz9c373rcixw3z21pw1cxrfh8"; + sha256 = "0jyaxwgghvgd599acxr91hr2v4wyv3bd1j45k0gb4q2v58jz2fwd"; }; buildInputs = [ openssl zlib ] From 258bbbfa4012a1c5d29dfb1003a951ae4e9b90fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 04:20:53 +0000 Subject: [PATCH 194/268] gpxsee: 7.36 -> 7.37 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 11b373ac131..a081076ac83 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.36"; + version = "7.37"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j"; + sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8"; }; patches = (substituteAll { From 646355184687f606e81bb1c09064baf96000fd5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 04:41:04 +0000 Subject: [PATCH 195/268] ipset: 7.7 -> 7.9 --- pkgs/os-specific/linux/ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index dada5c35f71..647e5e3597d 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.7"; + version = "7.9"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "0ckc678l1431mb0q5ilfgy0ajjwi8n135c72h606imm43dc0v9a5"; + sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p"; }; nativeBuildInputs = [ pkgconfig ]; From f373212ee356e5c0cc0e6363afb834995fd43fad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 04:05:10 +0000 Subject: [PATCH 196/268] gnome3.gnome-initial-setup: 3.38.1 -> 3.38.2 --- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index b4771641adb..eba9ed1334f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-5V1PQHOZjg+3s9/MRw4qTH2VCpa+2rFQEbkITryBNnY="; + hash = "sha256-qliJJ0+LC23moFErR3Qrgqw0ANrsgt1O/+LuonRko7g="; }; nativeBuildInputs = [ From d97bc34f5541a0df81e5f97d592e34e14bdc1b42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 04:14:11 +0000 Subject: [PATCH 197/268] gnome3.gnome-maps: 3.38.1.1 -> 3.38.2 --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index ffc9c7cb443..47e03c0b070 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "3.38.1.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1y59afvfrylkikqd0ax0nj41zs6b54219l7k5bp5gzh9lxq06xgk"; + sha256 = "0pa6h3md688752l7cjggncnxv13c07nj584gbz9asdblljk3r9x1"; }; doCheck = true; From 5b48bc8aae913c00b91968c47999cec725656c36 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 28 Nov 2020 14:50:21 +1000 Subject: [PATCH 198/268] fix eval --- pkgs/development/compilers/muon/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/muon/default.nix b/pkgs/development/compilers/muon/default.nix index 275e308235c..2e178f775b6 100644 --- a/pkgs/development/compilers/muon/default.nix +++ b/pkgs/development/compilers/muon/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Modern low-level programming language"; homepage = "https://github.com/nickmqb/muon"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; platforms = [ "x86_64-linux" ]; }; } From 57bd035ca68839f8dd7ff23870f35b1137398cf4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 05:03:25 +0000 Subject: [PATCH 199/268] ircdHybrid: 8.2.24 -> 8.2.35 --- pkgs/servers/irc/ircd-hybrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 5499d2bb8cb..582bf94b0de 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "ircd-hybrid-8.2.24"; + name = "ircd-hybrid-8.2.35"; src = fetchurl { url = "mirror://sourceforge/ircd-hybrid/${name}.tgz"; - sha256 = "03nmzrhqfsxwry316nm80m9p285v65fz75ns7fg623hcy65jv97a"; + sha256 = "045wd3wa4i1hl7i4faksaj8l5r70ld55bggryaf1ml28ijwjwpca"; }; buildInputs = [ openssl zlib ]; From 1d1ae0f8a7219f4da805d6f6983865b8ee89ee5d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 05:33:01 +0000 Subject: [PATCH 200/268] jamulus: 3.6.0 -> 3.6.1 --- pkgs/applications/audio/jamulus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index 1839aa9c7ad..4cc48b89f9c 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "06x9b2kjsgk8kddhif0x59nwzhnwjmq40x3w5nrphqaimqlrhlcf"; + sha256 = "11rwgd2car7ziqa0vancb363m4ca94pj480jfxywd6d81139jl15"; }; nativeBuildInputs = [ pkg-config qmake ]; From 5df56b087d59b62cadb8e3e70f3c2ba87dac0e98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 05:54:25 +0000 Subject: [PATCH 201/268] jetty: 9.4.34.v20201102 -> 9.4.35.v20201120 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index b8374d62ddf..72e6c00278a 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.34.v20201102"; + version = "9.4.35.v20201120"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0c5zsnzcg2bz6z1s6hdzwzn813cgs26h1hwjjfhh1msfzyig30ma"; + sha256 = "1cpdrqz6wi7fd228lh4ijs82jq51qr5aym6vff464w3y2sd0jbav"; }; phases = [ "unpackPhase" "installPhase" ]; From 80b395015b7813cd9adf3ae2d50db15453485bef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 26 Nov 2020 12:31:42 +0100 Subject: [PATCH 202/268] doc/go: convert to markdown --- doc/languages-frameworks/go.section.md | 140 ++++++++++++++ doc/languages-frameworks/go.xml | 248 ------------------------- doc/languages-frameworks/index.xml | 2 +- 3 files changed, 141 insertions(+), 249 deletions(-) create mode 100644 doc/languages-frameworks/go.section.md delete mode 100644 doc/languages-frameworks/go.xml diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md new file mode 100644 index 00000000000..b4228d9d313 --- /dev/null +++ b/doc/languages-frameworks/go.section.md @@ -0,0 +1,140 @@ +# Go {#sec-language-go} + +## Go modules {#ssec-language-go} + +The function `buildGoModule` builds Go programs managed with Go modules. It builds a [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build: + +- An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module. +- A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output. + +### Example for `buildGoModule` {#ex-buildGoModule} + +In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function: + +- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;` +- `runVend`: runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. + +```nix +pet = buildGoModule rec { + pname = "pet"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "knqyf263"; + repo = "pet"; + rev = "v${version}"; + sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; + }; + + vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; + + runVend = true; + + meta = with lib; { + description = "Simple command-line snippet manager, written in Go"; + homepage = "https://github.com/knqyf263/pet"; + license = licenses.mit; + maintainers = with maintainers; [ kalbasit ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} +``` + +## `buildGoPackage` (legacy) {#ssec-go-legacy} + +The function `buildGoPackage` builds legacy Go programs, not supporting Go modules. + +### Example for `buildGoPackage` + +In the following is an example expression using buildGoPackage, the following arguments are of special significance to the function: + +- `goPackagePath` specifies the package's canonical Go import path. +- `goDeps` is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate `deps.nix` file for readability. The dependency data structure is described below. + +```nix +deis = buildGoPackage rec { + pname = "deis"; + version = "1.13.0"; + + goPackagePath = "github.com/deis/deis"; + + src = fetchFromGitHub { + owner = "deis"; + repo = "deis"; + rev = "v${version}"; + sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; + }; + + goDeps = ./deps.nix; +} +``` + +The `goDeps` attribute can be imported from a separate `nix` file that defines which Go libraries are needed and should be included in `GOPATH` for `buildPhase`: + +```nix +# deps.nix +[ # goDeps is a list of Go dependencies. + { + # goPackagePath specifies Go package import path. + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + # `fetch type` that needs to be used to get package source. + # If `git` is used there should be `url`, `rev` and `sha256` defined next to it. + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } +] +``` + +To extract dependency information from a Go package in automated way use [go2nix](https://github.com/kamilchm/go2nix). It can produce complete derivation and `goDeps` file for Go programs. + +You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: + +```bash +for p in $NIX_PROFILES; do + GOPATH="$p/share/go:$GOPATH" +done +``` + +## Attributes used by the builders {#ssec-go-common-attributes} + +Both `buildGoModule` and `buildGoPackage` can be tweaked to behave slightly differently, if the following attributes are used: + +### `buildFlagsArray` and `buildFlags`: {#ex-goBuildFlags-noarray} + +These attributes set build flags supported by `go build`. We recommend using `buildFlagsArray`. The most common use case of these attributes is to make the resulting executable aware of its own version. For example: + +```nix + buildFlagsArray = [ + # Note: single quotes are not needed. + "-ldflags=-X main.Version=${version} -X main.Commit=${version}" + ]; +``` + +```nix + buildFlagsArray = '' + -ldflags= + -X main.Version=${version} + -X main.Commit=${version} + ''; +``` + +### `deleteVendor` {#var-go-deleteVendor} + +Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. + +### `subPackages` {#var-go-subPackages} + +Limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml deleted file mode 100644 index ebdcf616054..00000000000 --- a/doc/languages-frameworks/go.xml +++ /dev/null @@ -1,248 +0,0 @@ -
- Go - -
- Go modules - - - The function buildGoModule builds Go programs managed with Go modules. It builds a Go modules through a two phase build: - - - - An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module. - - - - - A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output. - - - - - - - buildGoModule - -pet = buildGoModule rec { - pname = "pet"; - version = "0.3.4"; - - src = fetchFromGitHub { - owner = "knqyf263"; - repo = "pet"; - rev = "v${version}"; - sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; - }; - - vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; - - runVend = true; - - meta = with lib; { - description = "Simple command-line snippet manager, written in Go"; - homepage = "https://github.com/knqyf263/pet"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} - - - - - is an example expression using buildGoModule, the following arguments are of special significance to the function: - - - - vendorSha256 is the hash of the output of the intermediate fetcher derivation. - - - - - runVend runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. - - - - - - - vendorSha256 can also take null as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set 'vendorSha256 = null;' - -
- -
- Go legacy - - - The function buildGoPackage builds legacy Go programs, not supporting Go modules. - - - - buildGoPackage - -deis = buildGoPackage rec { - pname = "deis"; - version = "1.13.0"; - - goPackagePath = "github.com/deis/deis"; - - src = fetchFromGitHub { - owner = "deis"; - repo = "deis"; - rev = "v${version}"; - sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; - }; - - goDeps = ./deps.nix; -} - - - - - is an example expression using buildGoPackage, the following arguments are of special significance to the function: - - - - goPackagePath specifies the package's canonical Go import path. - - - - - goDeps is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate deps.nix file for readability. The dependency data structure is described below. - - - - - - - The goDeps attribute can be imported from a separate nix file that defines which Go libraries are needed and should be included in GOPATH for buildPhase. - - - - deps.nix - -[ - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; - sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; - }; - } - { - goPackagePath = "github.com/docopt/docopt-go"; - fetch = { - type = "git"; - url = "https://github.com/docopt/docopt-go"; - rev = "784ddc588536785e7299f7272f39101f7faccc3f"; - sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; - }; - } -] - - - - - - - - goDeps is a list of Go dependencies. - - - - - goPackagePath specifies Go package import path. - - - - - fetch type that needs to be used to get package source. If git is used there should be url, rev and sha256 defined next to it. - - - - - - - To extract dependency information from a Go package in automated way use go2nix. It can produce complete derivation and goDeps file for Go programs. - - - - You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: - -for p in $NIX_PROFILES; do - GOPATH="$p/share/go:$GOPATH" -done - - -
- -
- Attributes used by the builders - - - Both buildGoModule and buildGoPackage can be tweaked to behave slightly differently, if the following attributes are used: - - - - - - buildFlagsArray and buildFlags - - - - These attributes set build flags supported by go build. We recommend using buildFlagsArray. The most common use case of these attributes is to make the resulting executable aware of its own version. For example: - - - buildFlagsArray - - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Commit=${version}" - ]; - - - - - - Note: single quotes are not needed. - - - - - buildFlagsArray - - buildFlagsArray = '' - -ldflags= - -X main.Version=${version} - -X main.Commit=${version} - ''; - - - - - - - deleteVendor - - - - Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. - - - - - - subPackages - - - - Limits the builder from building child packages that have not been listed. If subPackages is not specified, all child packages will be built. - - - - -
-
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 3366108cd93..7347de4f704 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -13,7 +13,7 @@ - + From e5f757954a2602cd145c6fc158eeae46718187bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 06:51:19 +0000 Subject: [PATCH 203/268] jmol: 14.31.17 -> 14.31.18 --- pkgs/applications/science/chemistry/jmol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 9adb8e3674b..e09abccad12 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.17"; + version = "14.31.18"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "1cg3a56bbvlq5wfjgwclg9vsj61kmj6fnqvgf7fdvklhdvnijla2"; + sha256 = "0hkc7c08azbw3k91ygwz6r5y4yw6k8l7h4gcq5p71knd5k1fa5jd"; }; patchPhase = '' From 2356095b78ddb928ef3e0eafa1b6e180ba2ec13b Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:43:18 +0100 Subject: [PATCH 204/268] manim: migrate to Python38 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b35894772d..cdc31afd9ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21424,8 +21424,8 @@ in m32edit = callPackage ../applications/audio/midas/m32edit.nix {}; - manim = python37Packages.callPackage ../applications/video/manim { - opencv = python37Packages.opencv3; + manim = python3Packages.callPackage ../applications/video/manim { + opencv = python3Packages.opencv3; }; manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; From fed997f561dfa7f22a4fe2df42168d767efc5d09 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 20:44:39 +0100 Subject: [PATCH 205/268] html5validator: migrate to Python38 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdc31afd9ce..9457ce295e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -210,7 +210,7 @@ in hobbes = callPackage ../development/tools/hobbes { }; - html5validator = python36Packages.callPackage ../applications/misc/html5validator { }; + html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; proto-contrib = callPackage ../development/tools/proto-contrib {}; From a35390d92b32a708390f52fde0e8bb888b2af473 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 21:00:39 +0100 Subject: [PATCH 206/268] azure-cli: migrate to Python38 --- pkgs/tools/admin/azure-cli/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 820fef1a74a..dbd8de5fe55 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, python, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let version = "2.14.2"; @@ -10,12 +10,14 @@ let }; # put packages that needs to be overriden in the py package scope - py = import ./python-packages.nix { inherit stdenv python lib src version; }; + py = import ./python-packages.nix { + inherit stdenv lib src version; + python = python3; + }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { pname = "azure-cli"; inherit version src; - disabled = python.isPy27; # namespacing assumes PEP420, which isn't compat with py2 sourceRoot = "source/src/azure-cli"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9457ce295e9..c38e68e1a3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -944,7 +944,7 @@ in iamy = callPackage ../tools/admin/iamy { }; - azure-cli = callPackage ../tools/admin/azure-cli { python = python37; }; + azure-cli = callPackage ../tools/admin/azure-cli { }; azure-storage-azcopy = callPackage ../development/tools/azcopy { }; From 3e8e10ab4f2fb651bb40707e9efe83c7b8d7ffd5 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 21:56:05 +0100 Subject: [PATCH 207/268] precice: migrate to Python38 --- pkgs/development/libraries/precice/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index f0064dbd362..e8ae15ed31f 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { "-DPRECICE_PETScMapping=OFF" "-DBUILD_SHARED_LIBS=ON" "-DPYTHON_LIBRARIES=${python3.libPrefix}" - "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m" + "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" ]; NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c38e68e1a3c..2f10898539d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2508,7 +2508,7 @@ in psstop = callPackage ../tools/system/psstop { }; - precice = callPackage ../development/libraries/precice { python3 = python37; }; + precice = callPackage ../development/libraries/precice { }; pueue = callPackage ../applications/misc/pueue { }; From d47bd890e7d29f922a06704301b57dfcfc6ff1ef Mon Sep 17 00:00:00 2001 From: freezeboy Date: Fri, 13 Nov 2020 21:56:29 +0100 Subject: [PATCH 208/268] syncplay: migrate to Python38 --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f10898539d..d06e1d7f9e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23934,8 +23934,7 @@ in symlinks = callPackage ../tools/system/symlinks { }; - # this can be changed to python3 once pyside2 is updated to support the latest python version - syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; + syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; inherit (callPackages ../applications/networking/syncthing { }) syncthing From abfbb842b5e6a2301d0df5bc74d4a4cec022ae32 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Tue, 24 Nov 2020 16:44:33 +0100 Subject: [PATCH 209/268] fixup sam --- pkgs/development/tools/aws-sam-cli/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index f123aa79a10..52b1a26d814 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -1,11 +1,11 @@ { fetchFromGitHub , lib -, python +, python3 , enableTelemetry ? false }: let - py = python.override { + py = python3.override { packageOverrides = self: super: { flask = super.flask.overridePythonAttrs (oldAttrs: rec { version = "1.0.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d06e1d7f9e4..fefdf4746ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -938,7 +938,7 @@ in aws-rotate-key = callPackage ../tools/admin/aws-rotate-key { }; - aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; + aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; aws-vault = callPackage ../tools/admin/aws-vault { }; From d6dfd173f93c8cb48e250627ac967cfca10385e1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Nov 2020 09:01:01 +0100 Subject: [PATCH 210/268] =?UTF-8?q?ocamlPackages.rpclib:=207.0.0=20?= =?UTF-8?q?=E2=86=92=208.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ppx_deriving_rpc/default.nix | 11 ++++++---- .../ocaml-modules/rpclib/default.nix | 22 ++++++++++--------- pkgs/top-level/ocaml-packages.nix | 4 +--- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index 92d73e540f4..b7d1986c30d 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, rpclib, ppxlib, ppx_deriving }: +{ lib, buildDunePackage, rpclib, alcotest, ppxlib, ppx_deriving, yojson }: buildDunePackage rec { pname = "ppx_deriving_rpc"; - inherit (rpclib) version src; + inherit (rpclib) version useDune2 src; - buildInputs = [ ppxlib ]; + minimumOCamlVersion = "4.08"; - propagatedBuildInputs = [ rpclib ppx_deriving ]; + propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ]; + + checkInputs = [ alcotest yojson ]; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-rpc"; diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix index 9216a489248..53b559257be 100644 --- a/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/pkgs/development/ocaml-modules/rpclib/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }: +{ lib, fetchurl, buildDunePackage +, alcotest +, base64, cmdliner, rresult, xmlm, yojson +}: buildDunePackage rec { pname = "rpclib"; - version = "7.0.0"; + version = "8.0.0"; - minimumOCamlVersion = "4.04"; + useDune2 = true; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-rpc"; - rev = "v${version}"; - sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz"; + sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz"; }; - buildInputs = [ alcotest cmdliner yojson ]; - propagatedBuildInputs = [ rresult result xmlm ]; + buildInputs = [ cmdliner yojson ]; + propagatedBuildInputs = [ base64 rresult xmlm ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e4f350099a..316666ca6d8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -878,9 +878,7 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { - ppxlib = ppxlib.override { legacy = true; }; - }; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; From 8256fc2da56b573411144030c48812c12798676b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 21 Nov 2020 09:01:06 +0100 Subject: [PATCH 211/268] ocamlPackages.rpclib-lwt: init at 8.0.0 --- pkgs/development/ocaml-modules/rpclib/lwt.nix | 18 ++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/ocaml-modules/rpclib/lwt.nix diff --git a/pkgs/development/ocaml-modules/rpclib/lwt.nix b/pkgs/development/ocaml-modules/rpclib/lwt.nix new file mode 100644 index 00000000000..49f71847498 --- /dev/null +++ b/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, rpclib +, lwt +, alcotest-lwt, ppx_deriving_rpc, yojson +}: + +buildDunePackage { + pname = "rpclib-lwt"; + inherit (rpclib) version useDune2 src; + + propagatedBuildInputs = [ lwt rpclib ]; + + checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; + doCheck = true; + + meta = rpclib.meta // { + description = "A library to deal with RPCs in OCaml - Lwt interface"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 316666ca6d8..a72b5218070 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -936,6 +936,8 @@ let rpclib = callPackage ../development/ocaml-modules/rpclib { }; + rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { }; + rresult = callPackage ../development/ocaml-modules/rresult { }; safepass = callPackage ../development/ocaml-modules/safepass { }; From 52f74c9d032b1f2398e0b2e34c1c9f1c1d560de0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 07:55:44 +0000 Subject: [PATCH 212/268] lemonbar: 1.3 -> 1.4 --- pkgs/applications/window-managers/lemonbar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 89b4fecc206..5bdb04688ca 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, libxcb }: stdenv.mkDerivation { - name = "lemonbar-1.3"; + name = "lemonbar-1.4"; src = fetchurl { - url = "https://github.com/LemonBoy/bar/archive/v1.3.tar.gz"; - sha256 = "0zd3v8ys4jzi60pm3wq7p3pbbd5y0acimgiq46qx1ckmwg2q9rza"; + url = "https://github.com/LemonBoy/bar/archive/v1.4.tar.gz"; + sha256 = "0fa91vb968zh6fyg97kdaix7irvqjqhpsb6ks0ggcl59lkbkdzbv"; }; buildInputs = [ libxcb perl ]; From b5ebc0cfb2d5f75a02ac0274cdee0c09be1b775a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 08:01:17 +0000 Subject: [PATCH 213/268] libburn: 1.5.2 -> 1.5.2.pl01 --- pkgs/development/libraries/libburn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index f436f947d0a..42c680835f1 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libburn"; - version = "1.5.2"; + version = "1.5.2.pl01"; src = fetchurl { url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "09sjrvq8xsj1gnl2wwyv4lbmicyzzl6x1ac2rrn53xnp34bxnckv"; + sha256 = "1xrp9c2sppbds0agqzmdym7rvdwpjrq6v6q2c3718cwvbjmh66c8"; }; meta = with stdenv.lib; { From 56b9f8c4b38af141617c79481bddca54df042124 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 25 Nov 2020 15:38:34 +0100 Subject: [PATCH 214/268] ocamlPackages.lwt: use ocaml-migrate-parsetree 2.1.0 --- pkgs/top-level/ocaml-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index a72b5218070..f35577c2b6f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -493,7 +493,9 @@ let lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; - lwt = callPackage ../development/ocaml-modules/lwt { }; + lwt = callPackage ../development/ocaml-modules/lwt { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; ocaml_lwt = lwt; From 50898b3b071acc3009d124a0be3e18d080a10a3c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 25 Nov 2020 15:38:45 +0100 Subject: [PATCH 215/268] ocamlPackages.ocaml-monadic: use ocaml-migrate-parsetree 2.1.0 --- pkgs/top-level/ocaml-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f35577c2b6f..ac48ade7206 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -672,7 +672,9 @@ let ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; - ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; + ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; From 78d2aa55ef3e473291b9d2addeeefadb54c4d70b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 25 Nov 2020 15:39:00 +0100 Subject: [PATCH 216/268] ocamlPackages.sqlexpr: use ocaml-migrate-parsetree 2.1.0 --- pkgs/top-level/ocaml-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ac48ade7206..c7d805d4c74 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -820,7 +820,9 @@ let spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; - sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; + sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + }; tsort = callPackage ../development/ocaml-modules/tsort { }; From 6771aa309328f5d46295d829ed24149b34e77e16 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Sat, 28 Nov 2020 10:25:13 +0100 Subject: [PATCH 217/268] doc: clarify whitelistedLicenses see the following for more info: https://github.com/NixOS/nixpkgs/blob/076860e0340a5e4a909b9a710e186508b14d1c90/pkgs/stdenv/generic/check-meta.nix#L229 --- doc/using/configuration.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index 3e21b0e2284..336bdf5b265 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -169,6 +169,9 @@ } + + Note that whitelistedLicenses only applies to unfree licenses unless allowUnfree is enabled. It is not a generic whitelist for all types of licenses. blacklistedLicenses applies to all licenses. + From 757ab447015123013fcbd0422b1317c18e0704bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 10:30:28 +0000 Subject: [PATCH 218/268] libavif: 0.8.3 -> 0.8.4 --- pkgs/development/libraries/libavif/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 09456433c1a..25422c8b7d9 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libavif"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - sha256 = "1d6ql4vq338dvz61d5im06dh8m9rqfk37f9i356j3njpq604i1f6"; + sha256 = "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d"; }; # reco: encode libaom slowest but best, decode dav1d fastest From cfb36403959da8b2e7b107249a7949306751488f Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sat, 28 Nov 2020 13:42:35 +0100 Subject: [PATCH 219/268] teamspeak_server: 3.12.1 -> 3.13.2 --- .../networking/instant-messengers/teamspeak/server.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 761d7cfcbd4..521e60c78f0 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, autoPatchelfHook, writeScript }: +{ stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let arch = if stdenv.is64bit then "amd64" else "x86"; in stdenv.mkDerivation rec { pname = "teamspeak-server"; - version = "3.12.1"; + version = "3.13.2"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2"; sha256 = if stdenv.is64bit - then "1dxbnk12ry6arn1p38hpv5jfak55pmfmxkkl7aihn3sp1aizpgyg" - else "0nfzx7pbzd95a7v08g29l84sc0lnv9fx8vz3mrmzhs0xqn9gxdkq"; + then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz" + else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g"; }; - buildInputs = [ stdenv.cc.cc ]; + buildInputs = [ stdenv.cc.cc postgresql.lib ]; nativeBuildInputs = [ autoPatchelfHook ]; From 6b882ee0eb78db08ea82f57e91bd17fea2c45da3 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Sat, 28 Nov 2020 13:49:38 +0100 Subject: [PATCH 220/268] linuxPackages.bpftrace: 0.11.0 -> 0.11.4 --- pkgs/os-specific/linux/bpftrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index fc7c8ecba2d..9fbeda708e0 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.11.0"; + version = "0.11.4"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y"; + sha256 = "0y4qgm2cpccrsm20rnh92hqplddqsc5q5zhw9nqn2igm3h9i0z7h"; }; enableParallelBuilding = true; From c3f2f8ff1cdb109d27c20b2706ad9e6340a31e52 Mon Sep 17 00:00:00 2001 From: nyanotech Date: Sat, 28 Nov 2020 14:28:47 +0000 Subject: [PATCH 221/268] factorio-experimental, factorio-headless-experimental: 1.1.1 -> 1.1.2 --- pkgs/games/factorio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 07361f1c742..f5f12b47dd7 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -63,11 +63,11 @@ let x86_64-linux = let bdist = bdistForArch { inUrl = "linux64"; inTar = "x64"; }; in { alpha = { stable = bdist { sha256 = "0zixscff0svpb0yg8nzczp2z4filqqxi1k0z0nrpzn2hhzhf1464"; version = "1.0.0"; withAuth = true; }; - experimental = bdist { sha256 = "0z7krilzk91sblik2i9lvsifwq9j5j6jv7jhmndkz4qmp845w1ax"; version = "1.1.1"; withAuth = true; }; + experimental = bdist { sha256 = "0cmia16d5dhy3f8mck926d7rrnavxmvb6a72ymjllxm37slsx60j"; version = "1.1.2"; withAuth = true; }; }; headless = { stable = bdist { sha256 = "0r0lplns8nxna2viv8qyx9mp4cckdvx6k20w2g2fwnj3jjmf3nc1"; version = "1.0.0"; }; - experimental = bdist { sha256 = "1nb9w876dij3ar14s5y96k04nbh9i4a7rggbbck5xmr7pa6snqx4"; version = "1.1.1"; }; + experimental = bdist { sha256 = "0x3lwz11z8cczqr5i799m4yg8x3yk6h5qz48pfzw4l2ikrrwgahd"; version = "1.1.2"; }; }; demo = { stable = bdist { sha256 = "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn"; version = "1.0.0"; }; From 1c414c565baeac77a81d781a51e1f3b34de5fc04 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Nov 2020 15:58:55 +0100 Subject: [PATCH 222/268] x11vnc: fix CVE-2020-29074 scan.c in x11vnc 0.9.16 uses IPC_CREAT|0777 in shmget calls, which allows access by actors other than the current user. Fixes: CVE-2020-29074 --- pkgs/tools/X11/x11vnc/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index 2f7b0d7697e..5ed827b5a54 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, +{ stdenv, fetchFromGitHub, fetchpatch, openssl, zlib, libjpeg, xorg, coreutils, libvncserver, autoreconfHook, pkgconfig }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "1g652mmi79pfq4p5p7spaswa164rpzjhc5rn2phy5pm71lm0vib1"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-29074.patch"; + url = "https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a.patch"; + sha256 = "0hdhp32g2i5m0ihmaxkxhsn3d5f2qasadvwpgxify4xnzabmyb2d"; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = From b9bcbf6071c2eec0b4bcddcb6849564eca895bc2 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Sat, 28 Nov 2020 07:13:07 -0800 Subject: [PATCH 223/268] gnome-passwordsafe: fix build --- pkgs/applications/misc/gnome-passwordsafe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnome-passwordsafe/default.nix b/pkgs/applications/misc/gnome-passwordsafe/default.nix index 7b0553f7f9e..dc84b312626 100644 --- a/pkgs/applications/misc/gnome-passwordsafe/default.nix +++ b/pkgs/applications/misc/gnome-passwordsafe/default.nix @@ -5,7 +5,7 @@ , gettext , fetchFromGitLab , python3 -, libhandy +, libhandy_0 , libpwquality , wrapGAppsHook , gtk3 @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 glib gdk-pixbuf - libhandy + libhandy_0 ]; propagatedBuildInputs = with python3.pkgs; [ From 2e72a7b6c6554cdf1bcc3b5eba44c28990fa7573 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 15:20:05 +0000 Subject: [PATCH 224/268] metabase: 0.37.1 -> 0.37.2 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index fb86600eaa6..fe16eae04c8 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.37.1"; + version = "0.37.2"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1mqkaagd452kygch47jsqzcjcsian4pp5xcvr3nnm3p3mah79wyi"; + sha256 = "0rhwnma8p3lgdld9nslmnii2v83g8gac6ybgk58af9gpypivwpvr"; }; nativeBuildInputs = [ makeWrapper ]; From cce2fd547be73f6a709d86751b67e9ae798f5d46 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 27 Nov 2020 16:24:42 +0100 Subject: [PATCH 225/268] Python: use pythonPackagesBuildHost instead of pythonForBuild Follow-up to #104201, related to #105113. --- .../interpreters/python/cpython/2.7/default.nix | 11 ++++++----- .../interpreters/python/cpython/default.nix | 11 +++++------ .../development/interpreters/python/default.nix | 8 ++++---- .../interpreters/python/pypy/default.nix | 17 +++++++++++------ 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 26bd8a8f360..d7bc5094859 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -18,8 +18,8 @@ , ucsEncoding ? 4 # For the Python package set , packageOverrides ? (self: super: {}) -, buildPackages , pkgsBuildBuild +, pkgsBuildHost , pkgsBuildTarget , pkgsHostHost , pkgsTargetTarget @@ -28,6 +28,7 @@ , passthruFun , static ? false , enableOptimizations ? (!stdenv.isDarwin) +, pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: assert x11Support -> tcl != null @@ -38,9 +39,8 @@ assert x11Support -> tcl != null with stdenv.lib; let - - pythonAttr = "python${sourceVersion.major}${sourceVersion.minor}"; - pythonForBuild = buildPackages.${pythonAttr}; + buildPackages = pkgsBuildHost; + inherit (passthru) pythonForBuild; passthru = passthruFun rec { inherit self sourceVersion packageOverrides; @@ -49,8 +49,9 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch pythonForBuild; + inherit hasDistutilsCxxPatch; pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; + pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 02777063a77..5e7668deea3 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -19,12 +19,11 @@ , nukeReferences # For the Python package set , packageOverrides ? (self: super: {}) -, buildPackages , pkgsBuildBuild +, pkgsBuildHost , pkgsBuildTarget , pkgsHostHost , pkgsTargetTarget -, pythonForBuild ? buildPackages.${pythonAttr} , sourceVersion , sha256 , passthruFun @@ -58,7 +57,8 @@ assert bluezSupport -> bluez != null; with stdenv.lib; let - + buildPackages = pkgsBuildHost; + inherit (passthru) pythonForBuild; passthru = passthruFun rec { inherit self sourceVersion packageOverrides; @@ -67,8 +67,9 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch pythonForBuild; + inherit hasDistutilsCxxPatch; pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; + pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; @@ -95,8 +96,6 @@ let hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); - inherit pythonForBuild; - pythonForBuildInterpreter = if stdenv.hostPlatform == stdenv.buildPlatform then "$out/bin/python" else pythonForBuild.interpreter; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 19a7f44de36..876cfd20fb9 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -15,7 +15,7 @@ with pkgs; , sitePackages , hasDistutilsCxxPatch , pythonPackagesBuildBuild - , pythonForBuild # provides pythonPackagesBuildHost + , pythonPackagesBuildHost , pythonPackagesBuildTarget , pythonPackagesHostHost , self # is pythonPackagesHostTarget @@ -29,7 +29,7 @@ with pkgs; }; otherSplices = { selfBuildBuild = pythonPackagesBuildBuild; - selfBuildHost = pythonForBuild.pkgs; + selfBuildHost = pythonPackagesBuildHost; selfBuildTarget = pythonPackagesBuildTarget; selfHostHost = pythonPackagesHostHost; selfTargetTarget = pythonPackagesTargetTarget; @@ -99,7 +99,8 @@ with pkgs; inherit sourceVersion; pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; - inherit hasDistutilsCxxPatch pythonForBuild; + inherit hasDistutilsCxxPatch; + pythonForBuild = pythonPackagesBuildHost; tests = callPackage ./tests.nix { python = self; @@ -188,7 +189,6 @@ in { # Minimal versions of Python (built without optional dependencies) python3Minimal = (python38.override { self = python3Minimal; - pythonForBuild = pkgs.buildPackages.python3Minimal; # strip down that python version as much as possible openssl = null; readline = null; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 0647ce87864..b941750eb4e 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -5,10 +5,16 @@ , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget , sourceVersion , pythonVersion , sha256 , passthruFun +, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}" }: assert zlibSupport -> zlib != null; @@ -25,12 +31,11 @@ let sitePackages = "site-packages"; hasDistutilsCxxPatch = false; - # No cross-compiling for now. - pythonForBuild = self; - pythonPackagesBuildBuild = {}; - pythonPackagesBuildTarget = {}; - pythonPackagesHostHost = {}; - pythonPackagesTargetTarget = {}; + pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; + pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; + pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; + pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; + pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; }; pname = passthru.executable; version = with sourceVersion; "${major}.${minor}.${patch}"; From 2c8d956608165c0e67d54ff369e851f598f7dfe2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 15:45:52 +0000 Subject: [PATCH 226/268] gnome3.nautilus: 3.38.1 -> 3.38.2 --- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 2107cad4a5b..79334e5b194 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zfh48ibap6jnw20rxls7nbv4zzqs6n5abr2dzyvfx5p2cmq2gha"; + sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h"; }; patches = [ From f7b9d904135937d2a8ba8fb6a6ffd02a703ab4a9 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 28 Nov 2020 16:55:00 +0100 Subject: [PATCH 227/268] cypress: 5.3.0 -> 6.0.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index c3d1c07c2a4..7802bd6ebcb 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "5.3.0"; + version = "6.0.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0f3sw71ridpwcy0m8xl9gs76zl9zfsrfwzbqjidvlnszvx3177bl"; + sha256 = "0hii7kp48ba07gsd521wwl288p808xr2wqgk1iidxkzj2v6g71by"; }; # don't remove runtime deps From 8220b0449cffd3c97597aa187b36d05c1257f68b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 22 Nov 2020 13:17:19 +0100 Subject: [PATCH 228/268] python.tests: use self.callPackage instead of super.callPackage super was incorrectly possible until https://github.com/NixOS/nixpkgs/pull/104201 got merged. --- .../interpreters/python/tests/test_nix_pythonprefix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix index 05798cbaf1b..572cbdccbfb 100644 --- a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix @@ -4,7 +4,7 @@ let python = let packageOverrides = self: super: { - typeddep = super.callPackage ./typeddep {}; + typeddep = self.callPackage ./typeddep {}; }; in interpreter.override {inherit packageOverrides; self = python;}; From 54e419e076ec95b4b083e0738f1b1bdaecb68343 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 28 Nov 2020 17:00:26 +0100 Subject: [PATCH 229/268] electron: 9.3.4 -> 9.3.5 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d394103cb70..81178393c0e 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -70,12 +70,12 @@ rec { aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; }; - electron_9 = mkElectron "9.3.4" { - x86_64-linux = "4791d854886cba4f461f37db41e6be1fbd8e41e7da01f215324f1fe19ad18ebf"; - x86_64-darwin = "d6878093683ef901727d3b557f1ac928de86b7fffd2abd2c8315d0a9cfe20375"; - i686-linux = "bd3cc9ddab3a9e54499f98e68b12f0aa30554c6527e1434b78743041aaae9417"; - armv7l-linux = "1b175fe3e83494015714afb298b756187053dd84604746c60649a2abbb49ee36"; - aarch64-linux = "626e4f79e9de57aef9e33f9788bf64375095ef43089eda6c6a87835ba58a7aa3"; + electron_9 = mkElectron "9.3.5" { + x86_64-linux = "9db6610289a4e0ce39c71501384baef5a58dde24d947fdead577f2a6b59123aa"; + x86_64-darwin = "d30aca66a0280a47284a3625d781c62fd0bb9b7f318bb05b8b34751ee14a3a78"; + i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61"; + armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f"; + aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30"; }; electron_10 = mkElectron "10.1.6" { From 428582c6b928beb716a3f8b3b192e835863da15e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 28 Nov 2020 17:01:33 +0100 Subject: [PATCH 230/268] electron: 11.0.2 -> 11.0.3 --- pkgs/development/tools/electron/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 81178393c0e..36c219bda00 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -86,11 +86,11 @@ rec { aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da"; }; - electron_11 = mkElectron "11.0.2" { - x86_64-linux = "a6e4f789d99e2ed879b48e7cbca2051805c3727360074edfe903231756eb5636"; - x86_64-darwin = "4a562646440c3f4fa1ec4bbdb238da420158e19f294a0fbcdf32004465dbd516"; - i686-linux = "ffcb2e40f98ee521ac50aa849cd911e62dae8a610bcca3f6d393b3f8d9bb85d8"; - armv7l-linux = "7552f0c2aad05844ceacaaf13588b06b16e9aadd947084e8249214b24d1da38d"; - aarch64-linux = "56b5ae4a33a9aa666fbe1463c7780d4c737c84119eff77d403fb969e8ff90ce0"; + electron_11 = mkElectron "11.0.3" { + x86_64-linux = "e2b397142ea10f494c9922ee0176fef1ea4a1899a3064feb038c9505e57fb1ff"; + x86_64-darwin = "32d5eeb03447203e1ae797bf273baf6fb7775ef0db9a3cfa875fdcddf7286027"; + i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729"; + armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e"; + aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0"; }; } From 9e779b0a43c7f807e7c76d09af99c588eb587882 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 28 Nov 2020 16:57:31 +0100 Subject: [PATCH 231/268] electron: passthru headers --- pkgs/development/tools/electron/generic.nix | 6 ++++++ pkgs/development/tools/electron/print-hashes.sh | 3 +++ 2 files changed, 9 insertions(+) diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 4e3f3511b96..ee3609783c2 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -33,6 +33,11 @@ let sha256 = hash; }; + headersFetcher = vers: hash: fetchurl { + url = "https://atom.io/download/electron/v${vers}/node-v${vers}-headers.tar.gz"; + sha256 = hash; + }; + tags = { i686-linux = "linux-ia32"; x86_64-linux = "linux-x64"; @@ -47,6 +52,7 @@ let common = platform: { inherit name version meta; src = fetcher version (get tags platform) (get hashes platform); + passthru.headers = headersFetcher version hashes.headers; }; electronLibPath = with stdenv.lib; makeLibraryPath ( diff --git a/pkgs/development/tools/electron/print-hashes.sh b/pkgs/development/tools/electron/print-hashes.sh index de380fd5223..d6c5d94ec41 100755 --- a/pkgs/development/tools/electron/print-hashes.sh +++ b/pkgs/development/tools/electron/print-hashes.sh @@ -20,6 +20,7 @@ SYSTEMS=( ) hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null | tail -n1)" +headers="$(nix-prefetch-url "https://atom.io/download/electron/v${VERSION}/node-v${VERSION}-headers.tar.gz")" # Entry similar to the following goes in default.nix: @@ -30,4 +31,6 @@ for S in "${!SYSTEMS[@]}"; do echo " $S = \"$hash\";" done +echo " headers = \"$headers\";" + echo " };" From a3302065df7527c72329307757536a316f0c78f7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 28 Nov 2020 17:18:13 +0100 Subject: [PATCH 232/268] electron: add header hashes --- pkgs/development/tools/electron/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 36c219bda00..48250d7ceb3 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -36,6 +36,7 @@ rec { i686-linux = "bf96b1736141737bb064e48bdb543302fd259de634b1790b7cf930525f47859f"; armv7l-linux = "2d970b3020627e5381fd4916dd8fa50ca9556202c118ab4cba09c293960689e9"; aarch64-linux = "938b7cc5f917247a120920df30374f86414b0c06f9f3dc7ab02be1cadc944e55"; + headers = "0943wc2874s58pkpzm1l55ycgbhv60m62r8aix88gl45i6zngb2g"; }; electron_5 = mkElectron "5.0.13" { @@ -44,6 +45,7 @@ rec { i686-linux = "ccf4a5ed226928a30bd3ea830913d99853abb089bd4a6299ffa9fa0daa8d026a"; armv7l-linux = "96ad83802bc61d87bb952027d49e5dd297f58e4493e66e393b26e51e09065add"; aarch64-linux = "01f0fd313b060fb28a1022d68fb224d415fa22986e2a8f4aded6424b65e35add"; + headers = "0najajj1kjj0rbqzjvk9ipq0pgympwad77hs019cz2m8ssaxqfrv"; }; electron_6 = mkElectron "6.1.12" { @@ -52,6 +54,7 @@ rec { i686-linux = "4e61dc4aed1c1b933b233e02833948f3b17f81f3444f02e9108a78c0540159ab"; armv7l-linux = "06071b4dc59a6773ff604550ed9e7a7ae8722b5343cbb5d4b94942fe537211dc"; aarch64-linux = "4ae23b75be821044f7e5878fe8e56ab3109cbd403ecd88221effa6abf850260b"; + headers = "0im694h8wqp31yzncwfnhz5g1ijrmqnypcakl0h7xcn7v25yp7s3"; }; electron_7 = mkElectron "7.3.3" { @@ -60,6 +63,7 @@ rec { i686-linux = "5fb756900af43a9daa6c63ccd0ac4752f5a479b8c6ae576323fd925dbe5ecbf5"; armv7l-linux = "830678f6db27fa4852cf456d8b2828a3e4e3c63fe2bced6b358eae88d1063793"; aarch64-linux = "03d06120464c353068e2ac6c40f89eedffd6b5b3c4c96efdb406c96a6136a066"; + headers = "0ink72nac345s54ws6vlij2mjixglyn5ygx14iizpskn4ka1vr4b"; }; electron_8 = mkElectron "8.5.5" { @@ -68,6 +72,7 @@ rec { i686-linux = "c8ee6c3d86576fe7546fb31b9318cb55a9cd23c220357a567d1cb4bf1b8d7f74"; armv7l-linux = "0130d1fcd741552d2823bc8166eae9f8fc9f17cd7c0b2a7a5889d753006c0874"; aarch64-linux = "ca16d8f82b3cb47716dc9db273681e9b7cd79df39894a923929c99dd713c45f5"; + headers = "18frb1z5qkyff5z1w44mf4iz9aw9j4lq0h9yxgfnp33zf7sl9qb5"; }; electron_9 = mkElectron "9.3.5" { @@ -76,6 +81,7 @@ rec { i686-linux = "b69614b1d34f9a98e182cc43bf8d35626038d300ee9fb886f7501dbb597c7e61"; armv7l-linux = "d929dabe7a83df232ec08b138ed2b0540b86e7dfa33f2f45f60b9949fa1ca88f"; aarch64-linux = "41fafb72f0d18d3b9f34e6f4638f551d914aae6eb6f9ea463ace5ee4bf90bb30"; + headers = "10snhi8q0izd3aqdfymhidfja34n4xbmd7h3lzghcczp77is2i5b"; }; electron_10 = mkElectron "10.1.6" { @@ -84,6 +90,7 @@ rec { i686-linux = "009bbee26ddbf748b33588714ccc565257ff697cde2110e6b6547e3f510da85e"; armv7l-linux = "e8999af21f7e58c4dc27594cd75438e1a5922d3cea62be63c927d29cba120951"; aarch64-linux = "b906998ddaf96da94a43bbe38108d83250846222de2727c268ad50f24c55f0da"; + headers = "1qj6s0h612hwmh4nzafz406vybr1rhskal2mcm1ll62rnzf98k3z"; }; electron_11 = mkElectron "11.0.3" { @@ -92,5 +99,6 @@ rec { i686-linux = "c1a773140d251938e2a2acd2ef52f64fc4185ea0dcab1c34c8fa07e08ec25729"; armv7l-linux = "932e6499289b97c33ab239a72b4cf1d0a7152d1ff9ade01058d3219481da0c2e"; aarch64-linux = "db92e96c03dfbc56159dad5d87ff11f2a1ff208730e9821788bd45ddb5db63c0"; + headers = "1r2s7088g72nanjc0fqrz1gqrbf1akrq6b7a9w6x7wj95ysc85q0"; }; } From 6cf25f9dbdef12c36748f322f7414a1d04c8dcd7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 28 Nov 2020 16:56:51 +0100 Subject: [PATCH 233/268] Python: rename parameters and arguments passed to passthru As part of the splicing the build/host/target combinations of the interpreter need to be passed around internally. The chosen names were not very clear, implying they were package sets whereas actually there were derivations. --- .../python/cpython/2.7/default.nix | 10 ++++---- .../interpreters/python/cpython/default.nix | 10 ++++---- .../interpreters/python/default.nix | 24 +++++++++---------- .../interpreters/python/pypy/default.nix | 10 ++++---- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index d7bc5094859..e6ab1f21879 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -50,11 +50,11 @@ let pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; inherit hasDistutilsCxxPatch; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; } // { inherit ucsEncoding; }; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 5e7668deea3..cd06c2b6367 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -68,11 +68,11 @@ let pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; inherit hasDistutilsCxxPatch; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; }; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 876cfd20fb9..91a464ea463 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -14,12 +14,12 @@ with pkgs; , packageOverrides , sitePackages , hasDistutilsCxxPatch - , pythonPackagesBuildBuild - , pythonPackagesBuildHost - , pythonPackagesBuildTarget - , pythonPackagesHostHost - , self # is pythonPackagesHostTarget - , pythonPackagesTargetTarget + , pythonOnBuildForBuild + , pythonOnBuildForHost + , pythonOnBuildForTarget + , pythonOnHostForHost + , pythonOnTargetForTarget + , self # is pythonOnHostForTarget }: let pythonPackages = callPackage ({ pkgs, stdenv, python, overrides }: let @@ -28,11 +28,11 @@ with pkgs; python = self; }; otherSplices = { - selfBuildBuild = pythonPackagesBuildBuild; - selfBuildHost = pythonPackagesBuildHost; - selfBuildTarget = pythonPackagesBuildTarget; - selfHostHost = pythonPackagesHostHost; - selfTargetTarget = pythonPackagesTargetTarget; + selfBuildBuild = pythonOnBuildForBuild; + selfBuildHost = pythonOnBuildForHost; + selfBuildTarget = pythonOnBuildForTarget; + selfHostHost = pythonOnHostForHost; + selfTargetTarget = pythonOnTargetForTarget; }; keep = self: { # TODO maybe only define these here so nothing is needed to be kept in sync. @@ -100,7 +100,7 @@ with pkgs; pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; inherit hasDistutilsCxxPatch; - pythonForBuild = pythonPackagesBuildHost; + pythonForBuild = pythonOnBuildForHost; tests = callPackage ./tests.nix { python = self; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index b941750eb4e..8feeb3c51bf 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -31,11 +31,11 @@ let sitePackages = "site-packages"; hasDistutilsCxxPatch = false; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; }; pname = passthru.executable; version = with sourceVersion; "${major}.${minor}.${patch}"; From 5804c8a7f5f0db0ebefb4aa612cc7a254debd57a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 28 Nov 2020 17:06:08 +0100 Subject: [PATCH 234/268] Python splicing: splice package sets, not Python derivation In the original commit the various builds of Python were added to `otherSplices`, instead of the intended Python package sets. --- pkgs/development/interpreters/python/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 91a464ea463..e98cb89b77d 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -28,11 +28,11 @@ with pkgs; python = self; }; otherSplices = { - selfBuildBuild = pythonOnBuildForBuild; - selfBuildHost = pythonOnBuildForHost; - selfBuildTarget = pythonOnBuildForTarget; - selfHostHost = pythonOnHostForHost; - selfTargetTarget = pythonOnTargetForTarget; + selfBuildBuild = pythonOnBuildForBuild.pkgs; + selfBuildHost = pythonOnBuildForHost.pkgs; + selfBuildTarget = pythonOnBuildForTarget.pkgs; + selfHostHost = pythonOnHostForHost.pkgs; + selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget. }; keep = self: { # TODO maybe only define these here so nothing is needed to be kept in sync. From 455774e5466681a90f864125424871bfe2a504d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 28 Nov 2020 17:33:28 +0100 Subject: [PATCH 235/268] Python: add todo note regarding pythonForBuild --- pkgs/development/interpreters/python/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index e98cb89b77d..2f350738238 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -100,6 +100,8 @@ with pkgs; pythonAtLeast = lib.versionAtLeast pythonVersion; pythonOlder = lib.versionOlder pythonVersion; inherit hasDistutilsCxxPatch; + # TODO: rename to pythonOnBuild + # Not done immediately because its likely used outside Nixpkgs. pythonForBuild = pythonOnBuildForHost; tests = callPackage ./tests.nix { From 66ea689e1a33c2fe50132425b298c73eeb16f6c4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 28 Nov 2020 11:49:55 -0500 Subject: [PATCH 236/268] kodiPlugins.inputstream-adaptive: 2.3.12 -> 2.4.6 --- pkgs/applications/video/kodi/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 0e23eac9a86..6863ef9ca62 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -481,12 +481,12 @@ let self = rec { plugin = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "2.3.12"; + version = "2.4.6"; src = fetchFromGitHub { owner = "peak3d"; repo = "inputstream.adaptive"; - rev = version; + rev = "${version}-${rel}"; sha256 = "09d9b35mpaf3g5m51viyan9hv7d2i8ndvb9wm0j7rs5gwsf0k71z"; }; From 79b10ee8c487395f02e31a06c9cfb1c0dcb3eb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 Nov 2020 17:48:28 +0100 Subject: [PATCH 237/268] vimPlugins: Add prabirshrestha/async.vim to vim-plugin-names Missed that in review :) --- pkgs/misc/vim-plugins/vim-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 935d640b074..0cddc4e5d10 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -413,6 +413,7 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +prabirshrestha/async.vim prabirshrestha/asyncomplete.vim prabirshrestha/vim-lsp preservim/nerdcommenter From 4e8abe37433cfe191aa17e300b5d85e2ccadfb8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 28 Nov 2020 18:06:12 +0100 Subject: [PATCH 238/268] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 444 ++++++++++++------------- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 223 insertions(+), 223 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 9d721ef3eb0..a026dc79ad3 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -41,12 +41,12 @@ let agda-vim = buildVimPluginFrom2Nix { pname = "agda-vim"; - version = "2020-07-26"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "derekelkins"; repo = "agda-vim"; - rev = "3c92e212a05eb254849a597d8d002abf69699aa0"; - sha256 = "0m3kinhzjk0cky372j1kw6hhy14khshkh9jbw35a5q18c4xvy4pq"; + rev = "81b0a1a612621f3b8d9ce30c48527cc85a950f1c"; + sha256 = "1yqvcyw8zaryqy2hbbq4iaf5af0n4wpw07i8508z7dp9ib92w85v"; }; meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-11-14"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "48fe0dd4f629bb1282277ba8a6757a84c13a4dda"; - sha256 = "192wb50cv7yv6c4gmjmlmh8b5891v51xcxm396sm4d5y9pzw52mc"; + rev = "1365dce921c1fb84a668ae121d5d5aeebef99fbc"; + sha256 = "0dfdcs8pcplnam7qiynykabn4k8s3wnp4vny5q4ij6b6yxjzd9km"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -135,14 +135,26 @@ let meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + async-vim = buildVimPluginFrom2Nix { + pname = "async-vim"; + version = "2020-06-20"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "async.vim"; + rev = "6102020b4690f05ab6509a37fa25bc53e2d799a9"; + sha256 = "1b39nnym8lwdwhpbrbl6438s7ragnfm3n2lbs8acp78jl4jraiwz"; + }; + meta.homepage = "https://github.com/prabirshrestha/async.vim/"; + }; + asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2020-11-04"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "ed75b1c92fb144bbe236bfb4d60a98dccf637c58"; - sha256 = "1szxam9hq3s1s542i5fk5pkr5kdpdlz5849yq68i2nnkkh8xwrar"; + rev = "c5f5808581bd3a41ee379836ebf804eb46a189a5"; + sha256 = "1izxr4lx6nncajaiszff3w38qc8c6hrpkd6rj8q7wasqcsxd3fcj"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -221,12 +233,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2020-11-14"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "2122af3641f138281a351611861900ca823a2324"; - sha256 = "1wqkq6cwhwbr6cypn05mbb2n7ry6b5b7ic7ad8s1hmc4gxgfxk6h"; + rev = "447a5863f91ac4e2b1e843829e3e200f59d687bb"; + sha256 = "1x7jjh444ddn1rxyvn5sn2cpm6xdag05x2kj4lm14q96przi5f90"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -305,12 +317,12 @@ let calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; - version = "2020-10-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "84335b66be1e323002380280f265983dc635fd99"; - sha256 = "0p9f7hy751ayjh6pna8gi0vi09lk0dwpi69rh21nidiqiph6n5l5"; + rev = "9eb05f05f11ce281bff8b2ee980e70244e29d7ae"; + sha256 = "15d763gv1939jhxg8431pxjxq8a86bfz898hdscakq7wf3wsc6kr"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -365,12 +377,12 @@ let ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2020-11-07"; + version = "2020-08-20"; src = fetchFromGitHub { owner = "chuling"; repo = "ci_dark"; - rev = "8a53f6267dffd1dea3f50adc4b61653178c00115"; - sha256 = "1bwprg23d593pplm5cwfkg5yj0i8k2gqb3aj8yp8sdiccikfbswk"; + rev = "d105c5978eb983d44461f83fc3b1033eb11d1a55"; + sha256 = "1nbb8zq2nhsbxn3lzh9sdhds2hv4n91vxafia7ydmzmyz9gyh6qw"; }; meta.homepage = "https://github.com/chuling/ci_dark/"; }; @@ -413,36 +425,36 @@ let coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2020-09-10"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "8ff425faab53e8bb8c53eec1afdf19a29c8086f6"; - sha256 = "06ddv9brb4zy8ylas36dkmblr93n6c5dp6vpp3c7asxc1kx58gc5"; + rev = "ea22e4462f9ac77f9c0cf3b1413bcd4d3b86a135"; + sha256 = "15rx4ws7hvssi7z1fkh7mzadc9xifi4hzb9g91lbinds12v19gg9"; }; meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-11-18"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "654fe4ece0ff49b62d3f19d678436522f92c3a08"; - sha256 = "1j38g0c81rnk502vr6n7zf7r1v3p48mimsd13dc7cqsvnhrh34ix"; + rev = "942152abc7907a0a82ce364bc50a4a463a6e925c"; + sha256 = "15pzzv6s8vks6xdms3pz5mcd8qb0lv89wnnpbipsyxlkz393yj36"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-11-17"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "f3d792518982d58a7d7f846f31f01f0ef0c5434a"; - sha256 = "10xl2gx1n9c34amca7zq4chczfc126dwz7733fi55ks29fdl708c"; + rev = "ce0cdfd91b184da76874024265d6e7d1ac06e073"; + sha256 = "07v094rn7vh8sa5psw0cg47m5v2qypzndd4ddcpgmxdr64z8xqgs"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -473,12 +485,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-11-17"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "103d5e995127937bdeb42cf248c2325cce93b9eb"; - sha256 = "1llgy5m8smrvbsaafirx4a0sdzvia2rxwk57jylm5hh376kll6kl"; + rev = "708aaad11cb2b7a6473f2d527182647f889fee66"; + sha256 = "0z3si82c3kzvm1kc4a96nmcs77dyhv1ym1kqw86al5nlpz5iadvp"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -558,24 +570,24 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-11-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "8c028d007ca314d7734d83dcc05db1ed103db9b5"; - sha256 = "0ym17vamf5hk4lqmkfknkf0mm91vsjayhjnjyvnvc0qhyyhgsi67"; + rev = "936bbd17577101a4ffb07ea7f860f77dd8007d43"; + sha256 = "1z399q3v36hx2ipj1fhxcc051pi4q0lifyglmclxi5zkbmm0z6a7"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; completion-tabnine = buildVimPluginFrom2Nix { pname = "completion-tabnine"; - version = "2020-10-03"; + version = "2020-10-31"; src = fetchFromGitHub { owner = "aca"; repo = "completion-tabnine"; - rev = "a7e6e2e249fec79f4260f388cd0c8adb38c0b3ad"; - sha256 = "1hnbhr4sgl7a8mj2ygma9avc7hfsv18wxrxypik62x7vijsnv9aq"; + rev = "373b556ce383da4cd35eae87c615cc4806af96d8"; + sha256 = "05n1vlyjis6wr08k11zfbz6lic8c9gmplsfq8h0zskq01n7gs044"; }; meta.homepage = "https://github.com/aca/completion-tabnine/"; }; @@ -630,12 +642,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2020-11-13"; + version = "2020-11-18"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "5e40da6c7119bfc31b3737d7ced2b8098f56a99f"; - sha256 = "0ggp8sw1dym9zlr8q0qhshjdgh83wr91cv5yh9b6im08rf89ddxf"; + rev = "2556bf597c7230bf89fbe2c2d842192a212b05e2"; + sha256 = "1g5g74s6g90rard81h467wrs0piz0x5nin34z7pn5z04v6jv80mq"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -774,12 +786,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-11-16"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c5b0eaa606af67fccd0d0e972ae5e8f16678ef9e"; - sha256 = "0d54gg0brcflijv2xq3x06d561z9vj2b2y658pcv9bwjmbr3pwyy"; + rev = "c5f1a646122eb4f6048f97b1ef8a936ad49f18eb"; + sha256 = "08j9msy49i1lz12bg2z98r7226c1khdixnj81c0pfnq4m8mprfz5"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -810,12 +822,12 @@ let denite-git = buildVimPluginFrom2Nix { pname = "denite-git"; - version = "2020-09-10"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "denite-git"; - rev = "2c80ef41fa56bbb4a0d48c4153404be694368141"; - sha256 = "08kdhn4kry8sc8gyffp8zl609nlajhd1x6qi50n5216r9dk03jlk"; + rev = "df995dae2ea31a2af5df12e1d405d9f1cf702ab1"; + sha256 = "14fcr2i3nq1x6rcjw3bqd4qdxdns7z67q92pj4w349qnqzr8pd0m"; }; meta.homepage = "https://github.com/neoclide/denite-git/"; }; @@ -1064,12 +1076,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-11-17"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "27c5ddba448e50e182985e1582dd519342986cef"; - sha256 = "09i3p0r4vjc5xipqrykm83wa9p96k609c1p1c2frakskhy7zkidz"; + rev = "a39f78f5e599ef29cc15c46c352ec5560e0f8e73"; + sha256 = "0g0n1xbz2429ghsys06ij4csd88y2nx0yz7lqpp8924nhzlw2355"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1112,12 +1124,12 @@ let direnv-vim = buildVimPluginFrom2Nix { pname = "direnv-vim"; - version = "2020-11-16"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv.vim"; - rev = "def4982fa3a613cfb59a4cd8d35d4c99e4e1688c"; - sha256 = "1xrr8pdxmpxz79qgw1kl5wdb4i2afmvl5zjxhkjinvpqnmimx0xz"; + rev = "ff37d76da391e1ef299d2f5eb84006cb27a67799"; + sha256 = "136z8axjd66l4yy6rkjr6gqm86zxnqpbw9pzkvii0lsaz11w9wak"; }; meta.homepage = "https://github.com/direnv/direnv.vim/"; }; @@ -1367,12 +1379,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-11-11"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "53b3aea0da5e3581e224c958dbc13558cbe5daee"; - sha256 = "0r19v3431ps7mmq2vb0vf1phwmgi1xp0n7z43wa68i4ilyjhbnr6"; + rev = "cc13a4b728c7b76c63e6dc42f320cec955d74227"; + sha256 = "1fg4vnya4mbxn268hx5qvl77qyhqpgqyk0ypx2mpv5b2qsyhw4rn"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1403,12 +1415,12 @@ let ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-08-12"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "d6191a111a1160ddecb05292eefe28ae362ccbaa"; - sha256 = "17dp28a3ipbx8fwsj0h9imkrgd0nfjzpcsn1zjdbih1kfh494smf"; + rev = "2c82ecf78b709a60ce7b3023ff6f49e01fa4275d"; + sha256 = "0hfbz11g887kdn9zsry53gf5gfh0n84h3ww9bjn7fkq9qpkkq9mv"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1631,12 +1643,12 @@ let idris2-vim = buildVimPluginFrom2Nix { pname = "idris2-vim"; - version = "2020-05-25"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "edwinb"; repo = "idris2-vim"; - rev = "099129e08c89d9526ad092b7980afa355ddaa24c"; - sha256 = "1gip64ni2wdd5v4crl64f20pbrx24dmr3ci7w5c9da9hs85x1p29"; + rev = "964cebee493c85f75796e4f4e6bbb4ac54e2da9e"; + sha256 = "1hgil24c7zv7m1glzzm3an60pimd3l9dbma26xdxly7bv210ssmz"; }; meta.homepage = "https://github.com/edwinb/idris2-vim/"; }; @@ -1691,12 +1703,12 @@ let indentLine = buildVimPluginFrom2Nix { pname = "indentLine"; - version = "2020-11-11"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "indentLine"; - rev = "9662ef8f0443211b11fd87919343d12179bca548"; - sha256 = "1mdbppz3xb8dzbw61fcv3gn3ad4hgia9i5s96vyw5frwxlkfyqpm"; + rev = "a03953d4e89ebc372674f88303c5d4933709fea6"; + sha256 = "0yxx925wrxf3hyllvqnbyiy39bw075vmzzys9jx0aimk7dmf1w9l"; }; meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; @@ -1944,36 +1956,36 @@ let lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2020-10-13"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "e541328a67fe10f1323630a30a37b58c934d7819"; - sha256 = "09w33f4cyg9wdj8jas5h43cc7byqfmmm9wyc0xjaw9jxcp78ygg9"; + rev = "72c5c03ea2fa8e3f0003c3dbdd5d6431bb2cb863"; + sha256 = "1niswynnsnl2fhfy2hlvqngikm87i49il92vaj83hnkn93p7jc83"; }; meta.homepage = "https://github.com/ptzz/lf.vim/"; }; lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2020-09-30"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "5b43087089798be70de0119e4f2476d2a2c0f6cb"; - sha256 = "04iw79ahfxm4ym5caj8iirs02l7qw9b49igzpg9vxs2ylqyfk3pn"; + rev = "16520df9bcb57a5c150efff5a8bf2cd64f659f07"; + sha256 = "0hnn7hw1a7a5ld742mlw070xnj2zyvyq2kzrzsp2ky7ir3lhn7x2"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2020-11-10"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "38a20127dc8aaf76f686b0b96023b51c466969b9"; - sha256 = "19pw4mmhp4cj2xjb6ygiahmix2wq123a738whjg5137zkrzfqz2j"; + rev = "0edb04acd77b9e5e498314b6345d422d93921ffa"; + sha256 = "1cndwbwx9pg6550k7j2z0pw91dll0idspd0jpd0kycpxm4330jy9"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -1992,24 +2004,24 @@ let lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2020-11-17"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "ad6f73578316dc6d1e016f9083ef35a4538c02d9"; - sha256 = "19496bhdzyrykxs8j2mx69ml9a8548jdz0s0n5qq72cxhm2b3p03"; + rev = "087893a9c67fb5f49ad209866194a128e00f95f1"; + sha256 = "0savwpgnff4sm7ij3ii2mkrd9lv4nmihyab7mcp9w66i8zdq1kyh"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2020-11-14"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "543ee323a4a63fd32cc17dc57edea9c00962bb12"; - sha256 = "1x75hd3ibnlrqnshhhrcg1z3i6z0gk58sfvjys22dvirv1r6lg37"; + rev = "709b2d8dc88fa622d6c076f34b05b58fcccf393f"; + sha256 = "08v68ymwj6rralfmjpjggd29sc2pvan4yg1y7sysylwlmwl7nhlp"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -2508,12 +2520,12 @@ let nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2020-10-30"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "85750560a680907c50c1545abc4dd0e0b2452ff4"; - sha256 = "1395m95ry4c52bj2zpxryks70c3abfwhb140kpx4rifl2ccpnwwp"; + rev = "253eafd3a71ce2a48306fe4a7bdfc4208d0c2eb5"; + sha256 = "1v6rwsndnl9g77vscxyy8lffb3viydk9r44vkikdrdqwl4h6h0n2"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -2544,12 +2556,12 @@ let neuron-vim = buildVimPluginFrom2Nix { pname = "neuron-vim"; - version = "2020-11-17"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "neuron.vim"; - rev = "ccaf20fdd028f21cf7281e7b94a0687ecf4e203b"; - sha256 = "1c5dk3xr4lgnc8226rhjmz4c1wjv18p5iqbc4z4bk3m32bq7rhxp"; + rev = "853fbe273f9f40defe69a9d50d267fee1bbc6b5a"; + sha256 = "0l6qxmd1y67jam8np37ywks95nbs53bvmh51y4ak4078mz2n1nji"; }; meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; @@ -2604,12 +2616,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2020-11-15"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "de6b08e0e2f4dc8b8fd0c862a36cb17b9faecf14"; - sha256 = "1a7ygblpwgrnnwqjrwmc7ppgla22z1yr1n33qw5h2wp0hlvy7z3l"; + rev = "f94ec5a9259b4fd2deb495ead0341a38c19c2799"; + sha256 = "1f7z23dn7vnldc82d6x1j8wqvj9vsi169rbcg0scfphh79fq61pc"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -2640,12 +2652,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2020-11-15"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "52f38f925a3116c6bad0b7f4d54d5daa576a5cdf"; - sha256 = "0806zbrwc1la4k6nnwih5kx8zv97dw9p9hnpyxqd3s45rnb7izsa"; + rev = "07538909ab5934313d8bdb234481d05d6cefa565"; + sha256 = "0jvz0j0pp53r080cz4r2z81vx73czhis9a5yl7p3xaw88sr5s23g"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -2676,12 +2688,12 @@ let nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2020-11-18"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b8b78237b8002f6a1cda1a205db11770ca748777"; - sha256 = "136zd50kj3mzvh5m1f73spbfl7wsmac7676p8yhw4mhg9wv0vv7w"; + rev = "c4f98237c54bd2478bb3826500f9c9b654612801"; + sha256 = "0x82fsc9hvydyhi31wh7if2gdi8azgls88klc4hn476jx7rm5n58"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -2700,24 +2712,24 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2020-11-18"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "4f19567fb76438d39ed196ae5b4e06b749e75e16"; - sha256 = "16iddpk10mgh4pah9lc35ijh7idinc7v37pkbyaixnljjm64jwqw"; + rev = "09fc9449e88b8a4f97d14e87af3685a48df2137f"; + sha256 = "0fygy2qnsk8kqlb5233hb16rq3xyqqr00nn5nxzrhbqsdwy2xw7r"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2020-11-13"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "6abfc5411c8292eea756816b2db9f0ee9ab344ff"; - sha256 = "07s3psv27nr99f6d6173cykvqqiv22dqljy89j8wnqkh2rskzfrq"; + rev = "7582dc5b176c8990d00d16a2d69b0555ead09051"; + sha256 = "0pwafd9hjkhxxn08nh2c1k01y67gdl3n2bx36k41452pkzxc8x9c"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; @@ -2736,36 +2748,36 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2020-10-31"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "ef893b523d366a0dde44b61d9cb327f2bea65f1d"; - sha256 = "0g4sz0q5mipa6f8hybbkd42jg6ayw3ih2lv1ml4pjyp378cqbkg6"; + rev = "d3eb9cc4c6f0a1e0d6dd376f45376ad4604c7cdc"; + sha256 = "1vl541h3dac5aixyqp7wfqz64p0fqg242x26kdffmfj54vk6q5jh"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-11-18"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "289cdc9da8f7f21dcbf814032e9277ef0e9790a0"; - sha256 = "0fqsl6rva6rb0zdpkv8myn7x5frxg5nmjykhx0jxc23zx5q65nj3"; + rev = "299b874d2fa96e193bd7bedd265e62b220a4cdb0"; + sha256 = "1zmqkxl7nxzl46hx6azkkxnih8chqzs8fiqii6ipvwwiwbzd9cqh"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2020-11-14"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "f70b9e30ff0b149c0eb2c1e4bdbdef594bdab30b"; - sha256 = "04mjl32gahaw2xky8yaghmgakiiy47dcjj6k4p793xfcs1kf4bsh"; + rev = "192baea80c5b1a98a267eb7f13769f33adab7de8"; + sha256 = "0bap7ckwha4halhdz0hv69iad0wrcdwd9843rnzvfkz3b1bdbvdn"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -2784,12 +2796,12 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2020-11-18"; + version = "2020-11-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "be31f77bcf66fdf07bef286382e7eb563c2643fc"; - sha256 = "02y4y4na91hjj6kw944wiww16xby7brd306jkhd5bzsb8asi223n"; + rev = "42bca9550fa6ad5389d6e95ba9876bf05a8d0406"; + sha256 = "0zvjjbffvpnmc9rgrkj8cx5jqbkw8yvjwnj0jk8ccxpl0s9v2yi6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -2832,12 +2844,12 @@ let oceanic-next = buildVimPluginFrom2Nix { pname = "oceanic-next"; - version = "2020-11-08"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "mhartington"; repo = "oceanic-next"; - rev = "9fa644b0f545cad22ee28ee3dd9a719a9a6bf75b"; - sha256 = "0xxc6im5rvd2c14i0jpnsgjhcsc7l5zs30razc4gqvv753g663qs"; + rev = "29d694b9f6323c90fb0f3f54239090370caa99fb"; + sha256 = "0lwwzfayv7ql1qpydqgyr0g024shzck2m8d04dn5g0vf5qqf3qi6"; }; meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; @@ -2964,12 +2976,12 @@ let playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2020-10-19"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "0cb0a18378db84c4c2bdb38c28e897958d2ec14d"; - sha256 = "1808kwf3ccrjaqxr43l23kfj8s0zijdk0rpriymqk143b29nk52c"; + rev = "86ad6e00dfbc80aeffa841043582f170c4c744ac"; + sha256 = "02ji6p77v85gq8df5fs9lnns6kyf41806iq38zd92y5blps04ihl"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; @@ -3000,12 +3012,12 @@ let popfix = buildVimPluginFrom2Nix { pname = "popfix"; - version = "2020-11-16"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "popfix"; - rev = "f7bb13a4e22716154904f8417928cb91e4284f22"; - sha256 = "1xmqhryr1san24386fxd60j7qrjlqx6zka87x3bjgg66rq4wqcrh"; + rev = "070461e65a69b8457da6e04ceb4b3836bdd79dbc"; + sha256 = "1s9947r1qgcg43b2g7qs0przrngbmw6i3k5xw7b07nvacz3za081"; }; meta.homepage = "https://github.com/RishabhRD/popfix/"; }; @@ -3613,12 +3625,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-11-13"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "68a77323cb707e227d16302d39d35949dbb0f85a"; - sha256 = "1038p1w7pfwg6ydqxbahb9plab8d40mdqmnbm6z36y7yrssmjhsj"; + rev = "ed1bbe554d7ce4d9b6286ee3514ed4d3021408ee"; + sha256 = "0h8ai0lhb52d279fw9fc06zmi5sxvjf468mwrbpfh0cq7fkb45yz"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3661,12 +3673,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2020-11-18"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "aff22f5bf107af69b0a6189debae613e36d3455f"; - sha256 = "1l1c8za5qffvz7klzmxbyk0sv6j0869cpq8njrqzgzzah301pmlq"; + rev = "7514137e2acade815fec910ceedd9a08b9d5200f"; + sha256 = "0q21yxssmsicy8nvq23j9b34p9sgfd5fkv6rsd46ia160rf4ssp9"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -3806,12 +3818,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2020-11-09"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "b837416c1ffe39b168baee35c0938739e96211c5"; - sha256 = "1c1ahpdw0d18x5g5s5mpv7mcf0igrpla33k2khmk4q739ywb21qc"; + rev = "8554371b57c8989cf73f73f288c456fb3f2a3a3a"; + sha256 = "0v3gyql3br11rl6ycl7i3zkx8kkc5f2w075y6cm6cslb9v124h6q"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -3830,12 +3842,12 @@ let unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-10-07"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "5f21e3e7e60f6d032daa4769e7ee84885fb0ce4d"; - sha256 = "0sfbv620zl8lqdzsypxcn9gasaaqpwarsynjxa25c4cd843cz3d2"; + rev = "631c0850dd0fa36d29c9cd20169735a60b41bd71"; + sha256 = "0ql1w6q8w48jxqf1fs1aphcjjfvh8br7sv26nk6kgsm9h4xamnp5"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -4154,12 +4166,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-11-14"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "536667191d5bdc0afa3a18d7df229731e778815e"; - sha256 = "0ay2bkqj92gzp2r36f5s92rb9gnhwkf09cx4y67gvd4b6rbqrkwi"; + rev = "06117a61e1218b2a866451d2ac4d8ddcd82c8543"; + sha256 = "0c3qgk248bkvmfh5rzhgnz0z0i1yxlmfcaz1bn91g41n9k1a50ab"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4178,12 +4190,12 @@ let vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-11-08"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "cd6f16978d5af4b9fb861be9d728732d72789df3"; - sha256 = "0ifb43q053grj2fvjjw52xsr79xnpc00k9302xnx1x4li9s5l64d"; + rev = "5cf03c355b64836ebcb681136539f48ada34f363"; + sha256 = "1wjsmm0bf6714rxnrvfb9080ycgcy4x3vp3qs46nznxsxrxx935n"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4224,18 +4236,6 @@ let meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; - vim-async = buildVimPluginFrom2Nix { - pname = "vim-async"; - version = "2020-03-17"; - src = fetchFromGitHub { - owner = "prabirshrestha"; - repo = "async.vim"; - rev = "42371b5fb2cc07254295ff6beb3ca7cf235b7ede"; - sha256 = "1c6ymxm28hpai1ki5y5a2m6qh5129nqn1fxiq9xnlzfrlbjl8vil"; - }; - meta.homepage = "https://github.com/prabirshrestha/async.vim"; - }; - vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; version = "2019-03-19"; @@ -4394,12 +4394,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-11-15"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "b2fe93fbee23c3dba24439e0e0bf8c5b77eb5447"; - sha256 = "03grw812c67m63gpdaayn7dfdlkzrhcki2fkcpfq3a80cwq1fvzf"; + rev = "4ca999b5c302610fb5de8ef8a74f77408a2c4a64"; + sha256 = "0as6mngcmn1g0d8lgrmrs1pazby31s5svydwr367ik0waqf9rl8s"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4802,12 +4802,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-09-27"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "c0f7b40260d6733c2c283407bea02806e6acb9e5"; - sha256 = "0h1vpswfxvl6kwinn4hk01qzmjzbbinkn2fhw4i9j5bpq0z3w8wp"; + rev = "1ad996e64dadf0d2a65c8a079d55a0ad057c08b4"; + sha256 = "1f4g7m09x67xfajanm9aw4z6rl1hcp24c5a01m1avn9594qgnh2c"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -4958,12 +4958,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-11-18"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "be20785a72925df1ff19a54ce5259d006bc92598"; - sha256 = "1ns9za11w2b5xvcbd8kh4a5pasy3dd4qx7zs4k4f2ay49f98c7v1"; + rev = "60facc9c12049b16015490ecff61a0dd4e580ee9"; + sha256 = "0fm43d2m0s07y5b448drf6smb7fpz38vv1wvd5r0ch6ac53mc74m"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5006,12 +5006,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-10-27"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "1a77f1c00e12e8460f39098ec3289c5433d32512"; - sha256 = "14w43j0gnh10kyshikz4cl6m3f04a6hpiqasn2n71isvdd1p24kp"; + rev = "7bcfe539beee5fe8c542092732b6fd3786c6080e"; + sha256 = "06z5l59x30pqz5sqkrz1v9q739i48hahrxhqyfwvj4bydg52nv30"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5066,12 +5066,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-11-05"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "987a33355ef424161fdbc4e5d625b5b5aed9704c"; - sha256 = "1qg5ri74wipf0krnwgii2jqdzy36hpwnx8nvgf7vkw8a3l90rswj"; + rev = "dfe55e2b924b86c654b63edb9bedc42aa4e08048"; + sha256 = "1b725iv0d2bgd2dqfjb36ifv1y5q4kybz4sj7vm3arvyqr0ly5j1"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5102,12 +5102,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-11-17"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "baaf2d6ebcffd8d5674c9c5518cc0e2b5cdd0db4"; - sha256 = "1kbmncrny39v671czcy7mmr7ighmjhr27zajq01xadr6sdmrrbr0"; + rev = "069113c1c03ec9330fbcccb36f79b268f8b88c1d"; + sha256 = "10423k7rxs34qxb7nfdyfs0yjhgnkmlkd33bwrv2zrahp342kfwv"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5560,12 +5560,12 @@ let vim-jsx-typescript = buildVimPluginFrom2Nix { pname = "vim-jsx-typescript"; - version = "2020-07-08"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "peitalin"; repo = "vim-jsx-typescript"; - rev = "07370d48c605ec027543b52762930165b1b27779"; - sha256 = "190nyy7kr6i3xr6nrjlfv643s1c48kxlbh8ynk8p53yf32gcxwz7"; + rev = "b099549ffd1810eb6f7979202202406939abb77e"; + sha256 = "1jlifxhwjarxqn1i22q3r7rh5z5ianmay91rrazjkahhji2701yy"; }; meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; @@ -5656,12 +5656,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2020-06-08"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "d5f2af4883351aa437ca1c3157d21917dc2bb1b0"; - sha256 = "0bdyhbablays384gssfdfavkxcrwcj89y8vn5kdk11xs0r78b5wr"; + rev = "532979346087c029badd02c9605a4efa84ac032a"; + sha256 = "1hjhwaw5bl37a2c9s0wd16z3x9pf0d26dwbrh6s3jk6ivwiz0v7p"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -5728,12 +5728,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-11-15"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "b8c9256f61fd0e1e1256f7f03eda386ebcfb4c93"; - sha256 = "067pzkxxjna3775za58v7g7lvzw9ykxc9lpkjxh5l35xph0dhw64"; + rev = "a56304f238f5368ad6c1b3b14b96308edd25a1f9"; + sha256 = "164sbwv6y9sf3isxp08zz1w05nz6aas63z1ib146di2r6wkslx57"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -5813,12 +5813,12 @@ let vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2020-09-07"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "9e0b6f37113e21fecd42ef6b04762de4aafe2cf3"; - sha256 = "0cy7k96458qk5fn7fbvki42b2pgrrk803shixs4ww43iipya6m5b"; + rev = "ac1d0f73a0eee3d2597f09789d45d9d332c64be5"; + sha256 = "1zi16whmc21iwbkvax65a883ylphcdjjhagmxihp1i52vx90vz5i"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -6305,12 +6305,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-11-18"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "c228e993ad6a8b79db5a5a77aecfdbd8e92ea31f"; - sha256 = "1cvdrisarw4yc4lwm80q99k7kb72zq9bd6w98786djas6asdfnll"; + rev = "73c518717741fb3ebb6822645d38f37ffae7c19b"; + sha256 = "08zwvnlg08v3h04iw754wl9wkirqcvqip86hh4m7bxxl0qkysnv6"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6377,12 +6377,12 @@ let vim-ps1 = buildVimPluginFrom2Nix { pname = "vim-ps1"; - version = "2020-07-31"; + version = "2020-11-25"; src = fetchFromGitHub { owner = "PProvost"; repo = "vim-ps1"; - rev = "21d8d9a9db864f230a2d12d5076351daf20d7a44"; - sha256 = "0s6mi1mzlk40sfdqghdsv709fs89hf9d6iqaw3arzs9lmin2i4ka"; + rev = "26a75886caef937bfad4201d5478571a992984c2"; + sha256 = "1qgwn57hs82a6pjilnqafd4c2za4r3vkys9i9apbxqhcxypx05hl"; }; meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; @@ -6749,12 +6749,12 @@ let vim-smoothie = buildVimPluginFrom2Nix { pname = "vim-smoothie"; - version = "2019-12-02"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "psliwka"; repo = "vim-smoothie"; - rev = "d3de4fbd7a9331b3eb05fa632611ebd34882cc83"; - sha256 = "1bsqnz02jaydr92mmcrdlva4zxs28zgxwgznr2bwk4wnn26i54p6"; + rev = "f3120afee5ee7cca5f3ccc2bac0933125d0a1efc"; + sha256 = "0ndvs48g68ygminnrjis847qcf7zi7mafhnjzvdz9x8kly2jp7pc"; }; meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; @@ -6797,12 +6797,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-11-15"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "e438b06d59115d4b491f7aa73d3140af44f86175"; - sha256 = "0z9c6rgix722d023jb53ynbns9zvibwaglzcb2q2h4jp1xbwq4qq"; + rev = "6fe515ee5778c4a704b581b2b9ad0f13dd803c25"; + sha256 = "1ikfkvh1jkijhzf12zaymzs67r6snadzsd5qjz9ws4pax84hi82g"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6833,12 +6833,12 @@ let vim-sourcetrail = buildVimPluginFrom2Nix { pname = "vim-sourcetrail"; - version = "2018-06-26"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "CoatiSoftware"; repo = "vim-sourcetrail"; - rev = "0fd679321ce51f65a37d04e4ea9031be6eaed85d"; - sha256 = "1xgvvmah3zn22rjaa093vghwrchmpm5wj30lwwl6h398dyywz8bg"; + rev = "103ad3f96ebf3518494350afaa72763e9e769eec"; + sha256 = "1hpin1x5l8k54qkckc8v3c2gkv1sbqj3hxikwa0vxr5mz0zaz2wc"; }; meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; }; @@ -6857,12 +6857,12 @@ let vim-spirv = buildVimPluginFrom2Nix { pname = "vim-spirv"; - version = "2020-06-12"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "9b005a0569fa5e18f71fcccbacda227c1cef7eaa"; - sha256 = "0qby4bfjav2xijh732l7d2jli0adnv6cc8kcalbh5315vi4mpnfk"; + rev = "50669efc68a0a8b455f12727753b2413dab96f07"; + sha256 = "19h3pavy65irchpy9xn3kkf3lb531479v6apfa5lg02c18gmxq1f"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -7098,12 +7098,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-11-18"; + version = "2020-11-19"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "5d65b4e4fba91b499dc3c7db47d2ca0491ae6084"; - sha256 = "0nv2a1wfykncyfr7k9whxybhi66v7y6f348jz4rjyvcl0996hzbb"; + rev = "01960ebe01e3999d2c5fc614cf85c1ec99d1cab1"; + sha256 = "0z1ypl4ks2wg3mh4fjvhz8984z7js2k9k2bgszd2n6jdma8xp4cw"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -7278,12 +7278,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-11-14"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "3b9c8c630daba920741f1fbf6696b7d32d020660"; - sha256 = "0hrsz624flscp8m6wjbr4sfqybw20ssbc78jdrh3q3n92gz1d50s"; + rev = "aa66db40e6c765fd6293c69e71b38b6a87dd3a08"; + sha256 = "048qir6djrbrpyg70b4scslc5scw3c3mxb1rvbmmnp4i3qmcmm4z"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -7302,12 +7302,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-11-16"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "70af9531f131b2f1e6674780dfe1e81893de02ab"; - sha256 = "0gjcifybfjwa33njy2pkfcmblgna922c5hg1sf8kwyahmn4v5ix8"; + rev = "7983a425d676e79d7fbd8e8870ecee3b15f9a78c"; + sha256 = "0c3rh0vkg65n2d2kmqfizigwn9jkb8azjla1ymgc49yzmy49jghf"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7566,12 +7566,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-11-16"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "b7de25e3d1e9d003df63d85a8781e16cbc7635ee"; - sha256 = "06wk6hgpb2n83g3bpn7cwsyz06mpxgc0wyjwbmh2skac81piilrv"; + rev = "4ac9785217557bb8ba063aa8c7f8320ac7a452fa"; + sha256 = "1vyzf5pixiv0glq8asmg7qicspn527yxij5xicaaih1c3x3sawks"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7579,12 +7579,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-11-12"; + version = "2020-11-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "01762d18f86422ddc85361c86b849f9707f23ef3"; - sha256 = "0ncgfd23x8g5n568amzd9x7bvvm5mgjs7qqmr9qn7hjpprad5icq"; + rev = "d19055bf318721b5a336c028687c6ff54a39b04c"; + sha256 = "1iqw9cdwaq58jycp7g3n2yrgpaxxszw52nwdy0bssy7fpszmqrzh"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7627,12 +7627,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-11-10"; + version = "2020-11-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "bc3b2a74efb253be4b79cc7b70b192e1360f26c1"; - sha256 = "0qfdykp7sf4p2h8gfx40qmnfj94p4hksngqqkzrhzi9z3i6fqk2a"; + rev = "d77828b043d980b99e386840d57629f6499e9995"; + sha256 = "084sy17xlly63m06pxb926rs4j3r1vqij2q7r815daaclsapmvq3"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7747,12 +7747,12 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-11-16"; + version = "2020-11-24"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "9404065e3ba943a1204d11d333980c9ae7ab2a22"; - sha256 = "1pfkbmy38ppl1fw0fw4zh53f7dazflvzfyb02gsj6bpyg6jvjqdz"; + rev = "49c70e60159e9607f8c787f4105133353d020dc0"; + sha256 = "116c7lyl0jpfqpzrwdsbpranbiw61f4vpq8nvpik2yx1wizv77lx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -7760,12 +7760,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-11-13"; + version = "2020-11-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "604a2a02e070bbd46f58c79a46f4df048e26a97c"; - sha256 = "0m9wfpm855cp9zzg0nsd6bb7ijmgj9vhfhm7x5nhmqjqjfyl8282"; + rev = "4496153a3efdb0891dac24510ac1ee519f1778a6"; + sha256 = "0j2mzq726fly457j8fjbvijgg50l497qbp6lq0vpfbiz4b3hm46k"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 0cddc4e5d10..dce8d948585 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -236,8 +236,8 @@ kassio/neoterm kbenzie/vim-spirv kchmck/vim-coffee-script KeitaNakamura/neodark.vim -keith/swift.vim keith/investigate.vim +keith/swift.vim kien/rainbow_parentheses.vim knubie/vim-kitty-navigator konfekt/fastfold From eb2a3a040cefc6649a117925832b23059fc79b7c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 27 Nov 2020 21:13:07 +0000 Subject: [PATCH 239/268] =?UTF-8?q?oh-my-zsh:=202020-11-25=20=E2=86=92=202?= =?UTF-8?q?020-11-26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 7062fc60783..8fbbfd47fb9 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-11-25"; + version = "2020-11-26"; pname = "oh-my-zsh"; - rev = "d88887195fd5535ef2fd95180baa73af2a8c88f8"; + rev = "05e2956dc61198d4767b96d97c5d10c93cedd6e3"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0p7j3y1g8x486g2fd2baap1nhfyg5hmcl9dyf4r4dj4l0xzb45wi"; + sha256 = "1Eh6L92hvSHcQeQL+1bCDrg/2FKaZshKTTF2PeVGhLs="; }; installPhase = '' From 0dc74a15ad55f0882895319eb16b0aa9a9f4f82d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Nov 2020 12:42:10 -0500 Subject: [PATCH 240/268] minecraft: Add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/minecraft.nix | 28 ++++++++++++++++++++++++++++ pkgs/games/minecraft/default.nix | 6 +++++- 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/minecraft.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 771ee9bdbd3..f6c0c248392 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -208,6 +208,7 @@ in mediawiki = handleTest ./mediawiki.nix {}; memcached = handleTest ./memcached.nix {}; metabase = handleTest ./metabase.nix {}; + minecraft = handleTest ./minecraft.nix {}; miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; minidlna = handleTest ./minidlna.nix {}; diff --git a/nixos/tests/minecraft.nix b/nixos/tests/minecraft.nix new file mode 100644 index 00000000000..e0c35f2d276 --- /dev/null +++ b/nixos/tests/minecraft.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "minecraft"; + meta = with lib.maintainers; { maintainers = [ nequissimus ]; }; + + nodes.client = { nodes, ... }: + let user = nodes.client.config.users.users.alice; + in { + imports = [ ./common/user-account.nix ./common/x11.nix ]; + + environment.systemPackages = [ pkgs.minecraft ]; + + nixpkgs.config.allowUnfree = true; + + test-support.displayManager.auto.user = user.name; + }; + + enableOCR = true; + + testScript = { nodes, ... }: + let user = nodes.client.config.users.users.alice; + in '' + client.wait_for_x() + client.execute("su - alice -c minecraft-launcher &") + client.wait_for_text("CONTINUE WITHOUT LOGIN") + client.sleep(10) + client.screenshot("launcher") + ''; +}) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 7ef2f533476..1b4cf319721 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, nixosTests , makeDesktopItem , makeWrapper , wrapGAppsHook @@ -147,5 +148,8 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) minecraft; }; + updateScript = ./update.sh; + }; } From 13ebb30910f45550bee4a898d8ef89b34522ffad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Nov 2020 12:42:46 -0500 Subject: [PATCH 241/268] minecraft-server: Add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/minecraft-server.nix | 37 +++++++++++++++++++++++++ pkgs/games/minecraft-server/default.nix | 7 +++-- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/minecraft-server.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f6c0c248392..7544975f04c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -209,6 +209,7 @@ in memcached = handleTest ./memcached.nix {}; metabase = handleTest ./metabase.nix {}; minecraft = handleTest ./minecraft.nix {}; + minecraft-server = handleTest ./minecraft-server.nix {}; miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; minidlna = handleTest ./minidlna.nix {}; diff --git a/nixos/tests/minecraft-server.nix b/nixos/tests/minecraft-server.nix new file mode 100644 index 00000000000..53780e4636c --- /dev/null +++ b/nixos/tests/minecraft-server.nix @@ -0,0 +1,37 @@ +let + seed = "2151901553968352745"; + rcon-pass = "foobar"; + rcon-port = 43000; +in import ./make-test-python.nix ({ pkgs, ... }: { + name = "minecraft-server"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + + nodes.server = { ... }: { + environment.systemPackages = [ pkgs.mcrcon ]; + + nixpkgs.config.allowUnfree = true; + + services.minecraft-server = { + declarative = true; + enable = true; + eula = true; + serverProperties = { + enable-rcon = true; + level-seed = seed; + online-mode = false; + "rcon.password" = rcon-pass; + "rcon.port" = rcon-port; + }; + }; + + virtualisation.memorySize = 2048; + }; + + testScript = '' + server.wait_for_unit("minecraft-server") + server.wait_for_open_port(${toString rcon-port}) + assert "${seed}" in server.succeed( + "mcrcon -H localhost -P ${toString rcon-port} -p '${rcon-pass}' -c 'seed'" + ) + ''; +}) diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 5cf39ec35b0..77181692ec2 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre_headless }: +{ stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; version = "1.16.4"; @@ -25,7 +25,10 @@ stdenv.mkDerivation { phases = "installPhase"; - passthru.updateScript = ./update.sh; + passthru = { + tests = { inherit (nixosTests) minecraft-server; }; + updateScript = ./update.sh; + }; meta = with stdenv.lib; { description = "Minecraft Server"; From 64a59a0854bef4bae6eced40a10cc757cfc99309 Mon Sep 17 00:00:00 2001 From: Alexander Krimm Date: Sat, 28 Nov 2020 18:58:39 +0100 Subject: [PATCH 242/268] vdirsyncer: disable flaky test Disables sync_test:test_create_collection, a flaky test which exceeds its deadline and breaks the build on hydra, e.g: https://hydra.nixos.org/build/130683519/nixlog/1 Upstream vdirsyncer issue: https://github.com/pimutils/vdirsyncer/issues/837 --- pkgs/development/python-modules/vdirsyncer/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 6e1dc982567..b93050144eb 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -53,7 +53,10 @@ buildPythonPackage rec { export DETERMINISTIC_TESTS=true ''; - disabledTests = [ "test_verbosity" ]; + disabledTests = [ + "test_verbosity" + "test_create_collections" # Flaky test exceeds deadline on hydra: https://github.com/pimutils/vdirsyncer/issues/837 + ]; meta = with stdenv.lib; { homepage = "https://github.com/pimutils/vdirsyncer"; From 2d85247086e1d870472602291a60a13cf445e6fa Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Nov 2020 13:19:46 -0500 Subject: [PATCH 243/268] lsd: Add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/lsd.nix | 12 ++++++++++++ pkgs/tools/misc/lsd/default.nix | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 nixos/tests/lsd.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7544975f04c..863031c04f8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -194,6 +194,7 @@ in limesurvey = handleTest ./limesurvey.nix {}; login = handleTest ./login.nix {}; loki = handleTest ./loki.nix {}; + lsd = handleTest ./lsd.nix {}; lxd = handleTest ./lxd.nix {}; lxd-nftables = handleTest ./lxd-nftables.nix {}; #logstash = handleTest ./logstash.nix {}; diff --git a/nixos/tests/lsd.nix b/nixos/tests/lsd.nix new file mode 100644 index 00000000000..fee8e95e14f --- /dev/null +++ b/nixos/tests/lsd.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "lsd"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + + nodes.lsd = { pkgs, ... }: { environment.systemPackages = [ pkgs.lsd ]; }; + + testScript = '' + lsd.succeed('echo "abc" > /tmp/foo') + assert "4 B /tmp/foo" in lsd.succeed('lsd --classic --blocks "size,name" /tmp/foo') + assert "lsd ${pkgs.lsd.version}" in lsd.succeed("lsd --version") + ''; +}) diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index ea80a299510..2acd5a789ab 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -1,4 +1,5 @@ { stdenv +, nixosTests , fetchFromGitHub , rustPlatform , installShellFiles @@ -26,6 +27,8 @@ rustPlatform.buildRustPackage rec { "--skip meta::filetype::test::test_socket_type" ]; + passthru.tests = { inherit (nixosTests) lsd; }; + meta = with stdenv.lib; { homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; From fe8fa45573b5eff05c44d6c70976c61e4b372cdd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Nov 2020 13:33:16 -0500 Subject: [PATCH 244/268] bat: Add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/bat.nix | 12 ++++++++++++ pkgs/tools/misc/bat/default.nix | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 nixos/tests/bat.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 863031c04f8..8cb27074f38 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -30,6 +30,7 @@ in avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; awscli = handleTest ./awscli.nix { }; babeld = handleTest ./babeld.nix {}; + bat = handleTest ./bat.nix {}; bazarr = handleTest ./bazarr.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 beanstalkd = handleTest ./beanstalkd.nix {}; diff --git a/nixos/tests/bat.nix b/nixos/tests/bat.nix new file mode 100644 index 00000000000..8e65e235d94 --- /dev/null +++ b/nixos/tests/bat.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "bat"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.bat ]; }; + + testScript = '' + machine.succeed("echo 'Foobar\n\n\n42' > /tmp/foo") + assert "Foobar" in machine.succeed("bat -p /tmp/foo") + assert "42" in machine.succeed("bat -p /tmp/foo -r 4:4") + ''; +}) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index da1f0d54f6f..5c60305a2e7 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,5 @@ { stdenv +, nixosTests , rustPlatform , fetchFromGitHub , pkg-config @@ -38,6 +39,8 @@ rustPlatform.buildRustPackage rec { --prefix PATH : "${stdenv.lib.makeBinPath [ less ]}" ''; + passthru.tests = { inherit (nixosTests) bat; }; + meta = with stdenv.lib; { description = "A cat(1) clone with syntax highlighting and Git integration"; homepage = "https://github.com/sharkdp/bat"; From 8529788e7341cc48feee77f281a581bf34637493 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 28 Nov 2020 13:42:00 -0500 Subject: [PATCH 245/268] jq: Add test --- nixos/tests/all-tests.nix | 1 + nixos/tests/jq.nix | 10 ++++++++++ pkgs/development/tools/jq/default.nix | 20 +++++++++++--------- 3 files changed, 22 insertions(+), 9 deletions(-) create mode 100644 nixos/tests/jq.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8cb27074f38..d746105ea64 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -172,6 +172,7 @@ in jenkins = handleTest ./jenkins.nix {}; jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; + jq = handleTest ./jq.nix {}; k3s = handleTest ./k3s.nix {}; kafka = handleTest ./kafka.nix {}; keepalived = handleTest ./keepalived.nix {}; diff --git a/nixos/tests/jq.nix b/nixos/tests/jq.nix new file mode 100644 index 00000000000..20b67522ee6 --- /dev/null +++ b/nixos/tests/jq.nix @@ -0,0 +1,10 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "jq"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; }; + + nodes.jq = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; }; + + testScript = '' + assert "world" in jq.succeed('echo \'{"values":["hello","world"]}\'| jq \'.values[1]\''') + ''; +}) diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 8605ef398a1..63c7e01a4b8 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchurl, oniguruma }: +{ stdenv, nixosTests, fetchurl, oniguruma }: stdenv.mkDerivation rec { pname = "jq"; - version="1.6"; + version = "1.6"; src = fetchurl { - url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; - sha256="0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; + url = + "https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; + sha256 = "0wmapfskhzfwranf6515nzmm84r7kwljgfs7dg6bjgxakbicis2x"; }; outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; buildInputs = [ oniguruma ]; - configureFlags = - [ + configureFlags = [ "--bindir=\${bin}/bin" "--sbindir=\${bin}/bin" "--datadir=\${doc}/share" "--mandir=\${man}/share/man" - ] - # jq is linked to libjq: + ] + # jq is linked to libjq: ++ stdenv.lib.optional (!stdenv.isDarwin) "LDFLAGS=-Wl,-rpath,\\\${libdir}"; doInstallCheck = true; @@ -30,8 +30,10 @@ stdenv.mkDerivation rec { $bin/bin/jq --help >/dev/null ''; + passthru.tests = { inherit (nixosTests) jq; }; + meta = with stdenv.lib; { - description = ''A lightweight and flexible command-line JSON processor''; + description = "A lightweight and flexible command-line JSON processor"; license = licenses.mit; maintainers = with maintainers; [ raskin globin ]; platforms = with platforms; linux ++ darwin; From e145bb2580ce69a2b7827bb2bd551023a8cbf6b0 Mon Sep 17 00:00:00 2001 From: Sherub Thakur Date: Sun, 29 Nov 2020 00:16:57 +0530 Subject: [PATCH 246/268] tmux-onedark-theme: init (#89623) Co-authored-by: Sandro --- pkgs/misc/tmux-plugins/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 5610b2c694c..f1ad962020f 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -246,6 +246,17 @@ in rec { }; }; + onedark-theme = mkDerivation { + pluginName = "onedark-theme"; + version = "unstable-2020-06-07"; + src = fetchFromGitHub { + owner = "odedlaz"; + repo = "tmux-onedark-theme"; + rev = "3607ef889a47dd3b4b31f66cda7f36da6f81b85c"; + sha256 = "19jljshwp2p83b634cd1mw69091x42jj0dg40ipw61qy6642h2m5"; + }; + }; + pain-control = mkDerivation { pluginName = "pain-control"; version = "unstable-2020-02-18"; From 22ecaa2d416964a263c43801f584fb884b559511 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 28 Nov 2020 19:48:45 +0100 Subject: [PATCH 247/268] cask: Enable on more platforms than Linux --- pkgs/development/tools/cask/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/cask/default.nix b/pkgs/development/tools/cask/default.nix index 71050356069..925d10b23b4 100644 --- a/pkgs/development/tools/cask/default.nix +++ b/pkgs/development/tools/cask/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.flexw ]; }; } From 6e8c5582c92c15732107df750185bc6b4efa00b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 19:14:10 +0000 Subject: [PATCH 248/268] memcached: 1.6.8 -> 1.6.9 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 182ca6bcd90..0435d0e1d40 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.8"; + version = "1.6.9"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "0fbrrn7mkhv5xci4cffxxb8qzr9c0n3y58jymq2aqlpzyq8klfz2"; + sha256 = "1lcjy1b9krnb2gk72qd1fvivlfiyfvknfi3wngyvyk9ifzijr9nm"; }; configureFlags = [ From 5d1125ede5885dbfc0707aa95dd8dd76d2d976a8 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 28 Nov 2020 20:10:48 +0100 Subject: [PATCH 249/268] dysnomia: 0.9.1 -> 0.10 --- .../disnix/dysnomia/default.nix | 26 +++++++++++++------ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 2485becc9e5..031e926e78a 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null +{ stdenv, fetchurl, netcat +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -9,6 +9,9 @@ , enableTomcatWebApplication ? false , enableMongoDatabase ? false , enableInfluxDatabase ? false +, enableSupervisordProgram ? false +, enableDockerContainer ? true +, enableLegacy ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" , getopt @@ -20,12 +23,14 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; +assert enableSupervisordProgram -> supervisor != null; +assert enableDockerContainer -> docker != null; stdenv.mkDerivation { - name = "dysnomia-0.9.1"; + name = "dysnomia-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9.1/dysnomia-0.9.1.tar.gz"; - sha256 = "1rrq9jnmpsjg1rrjbnq7znm4gma2ga5j4nlykvxwkylp72dq12ks"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; + sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -40,17 +45,22 @@ stdenv.mkDerivation { (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") + (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") + (if enableDockerContainer then "--with-docker" else "--without-docker") "--with-job-template=${jobTemplate}" - ]; + ] ++ stdenv.lib.optional enableLegacy "--enable-legacy"; - buildInputs = [ getopt ] + buildInputs = [ getopt netcat ] + ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql.out ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb ++ stdenv.lib.optional enableMongoDatabase mongodb-tools - ++ stdenv.lib.optional enableInfluxDatabase influxdb; + ++ stdenv.lib.optional enableInfluxDatabase influxdb + ++ stdenv.lib.optional enableSupervisordProgram supervisor + ++ stdenv.lib.optional enableDockerContainer docker; meta = { description = "Automated deployment of mutable components and services for Disnix"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94e18adbc2a..18a92786a2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27815,7 +27815,9 @@ in disnix = callPackage ../tools/package-management/disnix { }; - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {}); + dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { + inherit (pythonPackages) supervisor; + }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; From a5f63596a97a31e96ed77f45459b7aa9911d1d6e Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 28 Nov 2020 20:11:23 +0100 Subject: [PATCH 250/268] disnix: 0.9.1 -> 0.10 --- pkgs/tools/package-management/disnix/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 310ddc9b84e..f63c7dd737c 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,17 +1,13 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: stdenv.mkDerivation { - name = "disnix-0.9.1"; + name = "disnix-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz"; - sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf"; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; + sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; }; - configureFlags = [ - " --with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; From d69472f1b4b6750b93995dbb0e8d3ffe1aaeb0ed Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 28 Nov 2020 20:11:46 +0100 Subject: [PATCH 251/268] disnixos: 0.8 -> 0.9 --- pkgs/tools/package-management/disnix/disnixos/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 709c5454e10..2fa7d3ed9d7 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.8"; - + name = "disnixos-0.9"; + src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz"; - sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91"; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; + sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; }; nativeBuildInputs = [ pkgconfig ]; From 2a1d7f0d007e051b9abaf5885db97ed235cb336b Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 28 Nov 2020 20:12:15 +0100 Subject: [PATCH 252/268] DisnixWebService: 0.9 -> 0.10 --- .../package-management/disnix/DisnixWebService/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 5ede7af10bf..b4cb6d03041 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { - name = "DisnixWebService-0.9"; + name = "DisnixWebService-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz"; - sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl"; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; + sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; From 5e392940cfca8f8b99995096ffc56f2687a35407 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 28 Nov 2020 20:13:41 +0100 Subject: [PATCH 253/268] nixos/dysnomia: add InfluxDB configuration options, add option to use legacy modules, eliminate import from derivation hack --- nixos/modules/services/misc/dysnomia.nix | 86 +++++++++++++++++------- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/nixos/modules/services/misc/dysnomia.nix b/nixos/modules/services/misc/dysnomia.nix index 4b52963500d..eb94791fbbf 100644 --- a/nixos/modules/services/misc/dysnomia.nix +++ b/nixos/modules/services/misc/dysnomia.nix @@ -66,6 +66,19 @@ let ) (builtins.attrNames cfg.components)} ''; }; + + dysnomiaFlags = { + enableApacheWebApplication = config.services.httpd.enable; + enableAxis2WebService = config.services.tomcat.axis2.enable; + enableDockerContainer = config.virtualisation.docker.enable; + enableEjabberdDump = config.services.ejabberd.enable; + enableMySQLDatabase = config.services.mysql.enable; + enablePostgreSQLDatabase = config.services.postgresql.enable; + enableTomcatWebApplication = config.services.tomcat.enable; + enableMongoDatabase = config.services.mongodb.enable; + enableSubversionRepository = config.services.svnserve.enable; + enableInfluxDatabase = config.services.influxdb.enable; + }; in { options = { @@ -117,6 +130,12 @@ in description = "A list of paths containing additional modules that are added to the search folders"; default = []; }; + + enableLegacyModules = mkOption { + type = types.bool; + default = true; + description = "Whether to enable Dysnomia legacy process and wrapper modules"; + }; }; }; @@ -142,34 +161,48 @@ in environment.systemPackages = [ cfg.package ]; - dysnomia.package = pkgs.dysnomia.override (origArgs: { - enableApacheWebApplication = config.services.httpd.enable; - enableAxis2WebService = config.services.tomcat.axis2.enable; - enableEjabberdDump = config.services.ejabberd.enable; - enableMySQLDatabase = config.services.mysql.enable; - enablePostgreSQLDatabase = config.services.postgresql.enable; - enableSubversionRepository = config.services.svnserve.enable; - enableTomcatWebApplication = config.services.tomcat.enable; - enableMongoDatabase = config.services.mongodb.enable; - enableInfluxDatabase = config.services.influxdb.enable; + dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) { + enableLegacy = builtins.trace '' + WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper' + modules for compatibility reasons! If you rely on these modules, consider + migrating to better alternatives. + + More information: https://raw.githubusercontent.com/svanderburg/dysnomia/f65a9a84827bcc4024d6b16527098b33b02e4054/README-legacy.md + + If you have migrated already or don't rely on these Dysnomia modules, you can + disable legacy mode with the following NixOS configuration option: + + dysnomia.enableLegacyModules = false; + + In a future version of Dysnomia (and NixOS) the legacy option will go away! + '' true; }); dysnomia.properties = { hostname = config.networking.hostName; inherit (config.nixpkgs.localSystem) system; - supportedTypes = (import "${pkgs.stdenv.mkDerivation { - name = "supportedtypes"; - buildCommand = '' - ( echo -n "[ " - cd ${cfg.package}/libexec/dysnomia - for i in * - do - echo -n "\"$i\" " - done - echo -n " ]") > $out - ''; - }}"); + supportedTypes = [ + "echo" + "fileset" + "process" + "wrapper" + + # These are not base modules, but they are still enabled because they work with technology that are always enabled in NixOS + "systemd-unit" + "sysvinit-script" + "nixos-configuration" + ] + ++ optional (dysnomiaFlags.enableApacheWebApplication) "apache-webapplication" + ++ optional (dysnomiaFlags.enableAxis2WebService) "axis2-webservice" + ++ optional (dysnomiaFlags.enableDockerContainer) "docker-container" + ++ optional (dysnomiaFlags.enableEjabberdDump) "ejabberd-dump" + ++ optional (dysnomiaFlags.enableInfluxDatabase) "influx-database" + ++ optional (dysnomiaFlags.enableMySQLDatabase) "mysql-database" + ++ optional (dysnomiaFlags.enablePostgreSQLDatabase) "postgresql-database" + ++ optional (dysnomiaFlags.enableTomcatWebApplication) "tomcat-webapplication" + ++ optional (dysnomiaFlags.enableMongoDatabase) "mongo-database" + ++ optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository"; }; dysnomia.containers = lib.recursiveUpdate ({ @@ -185,9 +218,9 @@ in }; } // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = { mysqlPort = config.services.mysql.port; + mysqlSocket = "/run/mysqld/mysqld.sock"; } // lib.optionalAttrs cfg.enableAuthentication { mysqlUsername = "root"; - mysqlPassword = builtins.readFile (config.services.mysql.rootPassword); }; } // lib.optionalAttrs (config.services.postgresql.enable) { postgresql-database = { @@ -199,6 +232,13 @@ in tomcatPort = 8080; }; } // lib.optionalAttrs (config.services.mongodb.enable) { mongo-database = {}; } + // lib.optionalAttrs (config.services.influxdb.enable) { + influx-database = { + influxdbUsername = config.services.influxdb.user; + influxdbDataDir = "${config.services.influxdb.dataDir}/data"; + influxdbMetaDir = "${config.services.influxdb.dataDir}/meta"; + }; + } // lib.optionalAttrs (config.services.svnserve.enable) { subversion-repository = { svnBaseDir = config.services.svnserve.svnBaseDir; }; }) cfg.extraContainerProperties; From 336628268fd8306e5015bf8c5e8d4ef10f43625a Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sat, 28 Nov 2020 20:14:51 +0100 Subject: [PATCH 254/268] nixos/disnix: reorder startup to take MongoDB and InfluxDB into account, add option to add Disnix profile to the system PATH --- nixos/modules/services/misc/disnix.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 69386cdbb38..41483d80a2d 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -34,6 +34,14 @@ in defaultText = "pkgs.disnix"; }; + enableProfilePath = mkEnableOption "exposing the Disnix profiles in the system's PATH"; + + profiles = mkOption { + type = types.listOf types.string; + default = [ "default" ]; + example = [ "default" ]; + description = "Names of the Disnix profiles to expose in the system's PATH"; + }; }; }; @@ -44,6 +52,7 @@ in dysnomia.enable = true; environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; + environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); services.dbus.enable = true; services.dbus.packages = [ pkgs.disnix ]; @@ -68,7 +77,8 @@ in ++ optional config.services.postgresql.enable "postgresql.service" ++ optional config.services.tomcat.enable "tomcat.service" ++ optional config.services.svnserve.enable "svnserve.service" - ++ optional config.services.mongodb.enable "mongodb.service"; + ++ optional config.services.mongodb.enable "mongodb.service" + ++ optional config.services.influxdb.enable "influxdb.service"; restartIfChanged = false; From bb63906dad8c4cfd30b075de32bf0ddf42aa5876 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 19:27:54 +0000 Subject: [PATCH 255/268] nexus: 3.22.0-02 -> 3.28.1-01 --- pkgs/development/tools/repository-managers/nexus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 24722741184..e955a844dc8 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nexus"; - version = "3.22.0-02"; + version = "3.28.1-01"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "12433fgva03gsgi37xqgkdnbglgq4b66lmzk5cyxfg22szl4xvwz"; + sha256 = "0qba2qaz85hf0vgix3qyqdl8yzdb6qr91sgdmxv3fgjhyvnvqyy8"; }; preferLocalBuild = true; From b7650aaa77634e42d62ed6fc1a9081b10139618b Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sat, 28 Nov 2020 19:32:43 +0000 Subject: [PATCH 256/268] rust: Clean up target configs and test some more See the new docs for details. The difference is vis-a-vis older versions of this PR, not master. --- doc/languages-frameworks/rust.section.md | 14 ++--- pkgs/development/compilers/rust/default.nix | 6 +-- pkgs/test/rust-sysroot/default.nix | 60 +++++++++++++-------- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 28e488fe8a6..0230993d3f0 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -71,14 +71,14 @@ By default, it takes the `stdenv.hostPlatform.config` and replaces components where they are known to differ. But there are ways to customize the argument: - To choose a different target by name, define - `stdenv.hostPlatform.rustc.arch.config` as that name (a string), and that + `stdenv.hostPlatform.rustc.config` as that name (a string), and that name will be used instead. For example: ```nix import { crossSystem = (import ).systems.examples.armhf-embedded // { - rustc.arch.config = "thumbv7em-none-eabi"; + rustc.config = "thumbv7em-none-eabi"; }; } ``` @@ -88,18 +88,18 @@ where they are known to differ. But there are ways to customize the argument: ``` - To pass a completely custom target, define - `stdenv.hostPlatform.rustc.arch.config` with its name, and - `stdenv.hostPlatform.rustc.arch.custom` with the value. The value will be + `stdenv.hostPlatform.rustc.config` with its name, and + `stdenv.hostPlatform.rustc.platform` with the value. The value will be serialized to JSON in a file called - `${stdenv.hostPlatform.rustc.arch.config}.json`, and the path of that file + `${stdenv.hostPlatform.rustc.config}.json`, and the path of that file will be used instead. For example: ```nix import { crossSystem = (import ).systems.examples.armhf-embedded // { - rustc.arch.config = "thumb-crazy"; - rustc.arch.custom = { foo = ""; bar = ""; }; + rustc.config = "thumb-crazy"; + rustc.platform = { foo = ""; bar = ""; }; }; } will result in: diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 95febd8945d..25876cc6380 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -27,7 +27,7 @@ # Returns the name of the rust target, even if it is custom. Adjustments are # because rust has slightly different naming conventions than we do. toRustTarget = platform: with platform.parsed; let - cpu_ = platform.rustc.arch or { + cpu_ = platform.rustc.platform.arch or { "armv7a" = "armv7"; "armv7l" = "armv7"; "armv6l" = "arm"; @@ -38,8 +38,8 @@ # Returns the name of the rust target if it is standard, or the json file # containing the custom target spec. toRustTargetSpec = platform: - if (platform.rustc.arch or {}) ? custom - then builtins.toFile (platform.rustc.config + ".json") (builtins.toJSON platform.rustc.arch.custom) + if (platform.rustc or {}) ? platform + then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) else toRustTarget platform; # This just contains tools for now. But it would conceivably contain diff --git a/pkgs/test/rust-sysroot/default.nix b/pkgs/test/rust-sysroot/default.nix index cd07ef53c32..3a786ad6f00 100644 --- a/pkgs/test/rust-sysroot/default.nix +++ b/pkgs/test/rust-sysroot/default.nix @@ -1,6 +1,7 @@ -{ lib, rustPlatform, fetchFromGitHub, writeText }: +{ lib, rust, rustPlatform, fetchFromGitHub }: -rustPlatform.buildRustPackage rec { +let + mkBlogOsTest = target: rustPlatform.buildRustPackage rec { name = "blog_os-sysroot-test"; src = fetchFromGitHub { @@ -12,27 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1cbcplgz28yxshyrp2krp1jphbrcqdw6wxx3rry91p7hiqyibd30"; - # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. - # The justification in the book for using rust-lld suggests that gcc can still be used for testing: - # > Instead of using the platform's default linker (which might not support Linux targets), - # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. - # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 - target = writeText "x86_64-blog_os.json" '' - { - "llvm-target": "x86_64-unknown-none", - "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128", - "arch": "x86_64", - "target-endian": "little", - "target-pointer-width": "64", - "target-c-int-width": "32", - "os": "none", - "executables": true, - "linker-flavor": "gcc", - "panic-strategy": "abort", - "disable-redzone": true, - "features": "-mmx,-sse,+soft-float" - } - ''; + inherit target; RUSTFLAGS = "-C link-arg=-nostartfiles"; @@ -42,5 +23,38 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Test for using custom sysroots with buildRustPackage"; maintainers = with maintainers; [ aaronjanse ]; + platforms = lib.platforms.x86_64; }; + }; + + # The book uses rust-lld for linking, but rust-lld is not currently packaged for NixOS. + # The justification in the book for using rust-lld suggests that gcc can still be used for testing: + # > Instead of using the platform's default linker (which might not support Linux targets), + # > we use the cross platform LLD linker that is shipped with Rust for linking our kernel. + # https://github.com/phil-opp/blog_os/blame/7212ffaa8383122b1eb07fe1854814f99d2e1af4/blog/content/second-edition/posts/02-minimal-rust-kernel/index.md#L157 + targetContents = { + "llvm-target" = "x86_64-unknown-none"; + "data-layout" = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"; + "arch" = "x86_64"; + "target-endian" = "little"; + "target-pointer-width" = "64"; + "target-c-int-width" = "32"; + "os" = "none"; + "executables" = true; + "linker-flavor" = "gcc"; + "panic-strategy" = "abort"; + "disable-redzone" = true; + "features" = "-mmx,-sse,+soft-float"; + }; + +in { + blogOS-targetByFile = mkBlogOsTest (builtins.toFile "x86_64-blog_os.json" (builtins.toJSON targetContents)); + blogOS-targetByNix = let + plat = lib.systems.elaborate { config = "x86_64-none"; } // { + rustc = { + config = "x86_64-blog_os"; + platform = targetContents; + }; + }; + in mkBlogOsTest (rust.toRustTargetSpec plat); } From d6d2ff49b4a2b5e86117dc94f54f3e746c1cad29 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 19:37:46 +0000 Subject: [PATCH 257/268] mcelog: 169 -> 173 --- pkgs/os-specific/linux/mcelog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index f0ef1126154..2e97f9da1ea 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mcelog"; - version = "169"; + version = "173"; src = fetchFromGitHub { owner = "andikleen"; repo = "mcelog"; rev = "v${version}"; - sha256 = "0ghkwfaky026qwj6hmcvz2w2hm8qqj3ysbkxxi603vslmwj56chv"; + sha256 = "1ili11kqacn6jkjpk11vhycgygdl92mymgb1sx22lcwq2x0d248m"; }; postPatch = '' From 4b85ebac4142ecd668f32a6838c774232011e187 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova Date: Sat, 28 Nov 2020 19:48:22 +0000 Subject: [PATCH 258/268] perlPackages.LaTeXML: 0.8.4 -> 0.8.5 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7878f1910e..0d77ea96ed6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10703,12 +10703,12 @@ let }; }; - LaTeXML = buildPerlPackage { + LaTeXML = buildPerlPackage rec { pname = "LaTeXML"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz"; - sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc"; + url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; + sha256 = "0dr69rgl4si9i9ww1r4dc7apgb7y6f7ih808w4g0924cvz823s0x"; }; propagatedBuildInputs = [ shortenPerlShebang ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; doCheck = false; # epub test fails From 34f6d9e21d30e96358835026dc27ad9df930a9f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 19:55:23 +0000 Subject: [PATCH 259/268] minidlna: 1.2.1 -> 1.3.0 --- pkgs/tools/networking/minidlna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 6a14b5f1c82..d425e16782b 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, ffmpeg_3, flac, libvorbis, libogg, libid3tag, libexif, libjpeg, sqlite, gettext }: -let version = "1.2.1"; in +let version = "1.3.0"; in stdenv.mkDerivation { pname = "minidlna"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/project/minidlna/minidlna/${version}/minidlna-${version}.tar.gz"; - sha256 = "1v1ffhmaqxpvf2vv4yyvjsks4skr9y088853awsh7ixh7ai8nf37"; + sha256 = "0qrw5ny82p5ybccw4pp9jma8nwl28z927v0j2561m0289imv1na7"; }; preConfigure = '' From 26acfc708e9072d2fe65094a4b3ca337f50834f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 20:01:06 +0000 Subject: [PATCH 260/268] mill: 0.8.0 -> 0.9.3 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 384385356d0..a3865e2c52c 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.8.0"; + version = "0.9.3"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "04pf76iyrbq2h2hksx0r2fmnd0d9mi6an24zvfv7k79rch11cql1"; + sha256 = "0x9mvcm5znyi7w6cpiasj2v6f63y7d8qdck7lx03p2k6i9aa2f77"; }; nativeBuildInputs = [ makeWrapper ]; From 36de795b6c0c1a552afbce048caaa6486540b075 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 20:18:29 +0000 Subject: [PATCH 261/268] ocenaudio: 3.9.5 -> 3.9.6 --- pkgs/applications/audio/ocenaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/applications/audio/ocenaudio/default.nix index 0de043d35db..83b1ef3b043 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.9.5"; + version = "3.9.6"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "13hvdfydlgp2qf49ddhdzghz5jkyx1rhnsj8sf8khfxf9k8phkjd"; + sha256 = "07r49133kk99ya4grwby3admy892mkk9cfxz3wh0v81aznhpw4jg"; }; From 5f10cd5e0b1a3d0e610fb3f059f1aa15cbea52ca Mon Sep 17 00:00:00 2001 From: Dominik Michael Rauh Date: Wed, 10 Jun 2020 19:34:38 +0200 Subject: [PATCH 262/268] gretl: init at 2020b --- .../science/math/gretl/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/science/math/gretl/default.nix diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix new file mode 100644 index 00000000000..e1cf5a0f08d --- /dev/null +++ b/pkgs/applications/science/math/gretl/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, curl, fftw, gmp, gnuplot, gtk3, gtksourceview3, json-glib +, lapack, libxml2, mpfr, openblas, pkg-config, readline }: + +stdenv.mkDerivation rec { + pname = "gretl"; + version = "2020b"; + + src = fetchurl { + url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; + sha256 = "0mpb8gc0mcfql8lzwknpkf1sg7mj9ikzd8r1x5xniabd9mmdhplm"; + }; + + buildInputs = [ + curl + fftw + gmp + gnuplot + gtk3 + gtksourceview3 + json-glib + lapack + libxml2 + mpfr + openblas + readline + ]; + + nativeBuildInputs = [ pkg-config ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A software package for econometric analysis"; + longDescription = '' + gretl is a cross-platform software package for econometric analysis, + written in the C programming language. + ''; + homepage = "http://gretl.sourceforge.net"; + license = licenses.gpl3; + maintainers = with maintainers; [ dmrauh ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc405432704..d5d39d8807d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -211,6 +211,8 @@ in digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; + gretl = callPackage ../applications/science/math/gretl { }; + grsync = callPackage ../applications/misc/grsync { }; dockerTools = callPackage ../build-support/docker { }; From 6e39a67aecaa4ea6d92a7ace3670cec4a582c7c5 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 28 Nov 2020 20:38:40 +0000 Subject: [PATCH 263/268] clickhouse: use system LLVM Building LLVM pieces is a huge contributor to build times, and probably bloats binary size as well. Fortunately, there's a knob for this specific thing (-DUNBUNDLED=ON seems broken and requires some libraries which aren't packaged for Nix at the moment). Hopefully this will make clickhouse able to build on OfBorg. --- pkgs/servers/clickhouse/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 4fd5b6c4751..8bb7aafc3c5 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TESTS=OFF" + "-DUSE_INTERNAL_LLVM_LIBRARY=OFF" ]; postInstall = '' From 73868f32c6503e924ffaa9df80ee6804ecd4550e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 28 Nov 2020 17:58:56 -0300 Subject: [PATCH 264/268] theme-jade1: 1.9 -> 1.10 --- pkgs/data/themes/jade1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index c9a549462c1..03dd7a49cda 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.9"; + version = "1.10"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "11fzd44ysy76iwyiwkshpf0vf6m3i3hcxyyihl0lg68nb3cv0g9y"; + sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2"; }; sourceRoot = "."; From ca5424b750912c89afdd53869504c12e90a38a0d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 28 Nov 2020 13:17:48 -0500 Subject: [PATCH 265/268] perlPackages.LaTeXML: patch shebangs to use full path to perl on darwin --- pkgs/top-level/perl-packages.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f7878f1910e..8e20d022372 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10710,14 +10710,16 @@ let url = "mirror://cpan/authors/id/B/BR/BRMILLER/LaTeXML-0.8.4.tar.gz"; sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc"; }; - propagatedBuildInputs = [ shortenPerlShebang ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; + propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; doCheck = false; # epub test fails - postInstall = '' - shortenPerlShebang $out/bin/latexml - shortenPerlShebang $out/bin/latexmlc - shortenPerlShebang $out/bin/latexmlfind - shortenPerlShebang $out/bin/latexmlmath - shortenPerlShebang $out/bin/latexmlpost + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + # shebangs need to be patched before executables are copied to $out + preBuild = '' + patchShebangs bin/ + '' + stdenv.lib.optionalString stdenv.isDarwin '' + for file in bin/*; do + shortenPerlShebang "$file" + done ''; meta = { description = "Transforms TeX and LaTeX into XML/HTML/MathML"; From 1211f2b78ef7b018116585116545bad006289b2d Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova Date: Sun, 27 Sep 2020 17:35:25 +0100 Subject: [PATCH 266/268] perlPackages.LaTeXML: reenable tests except for epub Co-authored-by: Stig P --- pkgs/top-level/perl-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8e20d022372..21e5c64b4bb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10711,7 +10711,9 @@ let sha256 = "92599b45fb587ac14b2ba9cc84b85d9ddc2deaf1cbdc2e89e7a6559e1fbb34cc"; }; propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; - doCheck = false; # epub test fails + preCheck = '' + rm t/931_epub.t # epub test fails + ''; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; # shebangs need to be patched before executables are copied to $out preBuild = '' From c165a6e52d5386500f4b5d900e021d364bc64a9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Nov 2020 22:33:28 +0000 Subject: [PATCH 267/268] ocamlPackages.ocaml_extlib: 1.7.6 -> 1.7.7 --- pkgs/development/ocaml-modules/extlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 546fc904ffc..5e04c73c302 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml${ocaml.version}-extlib-1.7.6"; + name = "ocaml${ocaml.version}-extlib-1.7.7"; src = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz"; - sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"; + url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; + sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; buildInputs = [ ocaml findlib cppo ]; From 1f6d64de276c874e48f547f4ecb2760d209f2458 Mon Sep 17 00:00:00 2001 From: nasirhm Date: Sun, 29 Nov 2020 05:29:31 +0500 Subject: [PATCH 268/268] brave: version updated: 1.16.76 -> 1.17.73 Version updated for Brave Browser from 1.16.76 to 1.17.73: - Added a dependency for libxkbcommon. - Updated SHA256 for the version bumped brave browser. Signed-off-by: nasirhm --- pkgs/applications/networking/browsers/brave/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index ac924730989..4a17762e3bd 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -26,6 +26,7 @@ , libXext , libXfixes , libXi +, libxkbcommon , libXrandr , libXrender , libXScrnSaver @@ -61,6 +62,7 @@ rpath = lib.makeLibraryPath [ libdrm libpulseaudio libX11 + libxkbcommon libXScrnSaver libXcomposite libXcursor @@ -86,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.16.76"; + version = "1.17.73"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1nbgiwflmr3ik428yarmnpx10dmqai2m4k910miqd92mwmfb0pib"; + sha256 = "18bd6kgzfza5r0y2ggfy82pdpnfr2hzgjcfy9vxqq658z7q3jpqy"; }; dontConfigure = true;