From 671dd83a29a69aab6fd7f9ac133d115a35516435 Mon Sep 17 00:00:00 2001 From: "Shestakov, Aleksandr" Date: Tue, 10 Nov 2020 22:41:08 +0300 Subject: [PATCH 001/188] ruby-modules gem-config: add exif --- pkgs/development/ruby-modules/gem-config/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9ccc369429d..eb7c73e9256 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -25,7 +25,7 @@ , cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk -, bundler, libsass, libselinux ? null, libsepol ? null +, bundler, libsass, libexif, libselinux ? null, libsepol ? null }@args: let @@ -179,6 +179,11 @@ in buildInputs = [ openssl ]; }; + exif = attrs: { + buildFlags = [ "--with-exif-dir=${libexif}" ]; + buildInputs = [ libexif ]; + }; + ffi = attrs: { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libffi ]; From 098977ab6a7c49ab0d7903d818b413e9f79fecba Mon Sep 17 00:00:00 2001 From: rsynnest Date: Thu, 22 Apr 2021 22:39:32 -0700 Subject: [PATCH 002/188] maintainers: add rsynnest --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b8de823c9af..208635fbb46 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8563,6 +8563,12 @@ githubId = 1387224; name = "Richard Szibele"; }; + rsynnest = { + email = "contact@rsynnest.com"; + github = "rsynnest"; + githubId = 4392850; + name = "Roland Synnestvedt"; + }; rtburns-jpl = { email = "rtburns@jpl.nasa.gov"; github = "rtburns-jpl"; From e1438cae539544ce5117f9d6a1ed8d8fcabdd70a Mon Sep 17 00:00:00 2001 From: rsynnest Date: Thu, 22 Apr 2021 22:17:24 -0700 Subject: [PATCH 003/188] jsvc: init at 1.2.4 --- pkgs/tools/system/jsvc/default.nix | 40 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/tools/system/jsvc/default.nix diff --git a/pkgs/tools/system/jsvc/default.nix b/pkgs/tools/system/jsvc/default.nix new file mode 100644 index 00000000000..442f8d90419 --- /dev/null +++ b/pkgs/tools/system/jsvc/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, commonsDaemon, jdk, makeWrapper, jre }: + +stdenv.mkDerivation rec { + pname = "jsvc"; + version = "1.2.4"; + + src = fetchurl { + url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; + sha256 = "1nrr6ggy6h20r9zyv14vx6vc9p1w6l8fl9fn6i8dx2hrq6kk2bjw"; + }; + + buildInputs = [ commonsDaemon ]; + nativeBuildInputs = [ jdk makeWrapper ]; + + preConfigure = '' + cd ./src/native/unix/ + sh ./support/buildconf.sh + ''; + + preBuild = '' + export JAVA_HOME=${jre} + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp jsvc $out/bin/jsvc + chmod +x $out/bin/jsvc + wrapProgram $out/bin/jsvc --set JAVA_HOME "${jre}" + runHook postInstall + ''; + + meta = { + homepage = "https://commons.apache.org/proper/commons-daemon"; + description = "JSVC is part of the Apache Commons Daemon software, a set of utilities and Java support classes for running Java applications as server processes."; + maintainers = with lib.maintainers; [ rsynnest ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e90dcf0345f..b124f2dae5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5740,6 +5740,8 @@ in jnettop = callPackage ../tools/networking/jnettop { }; + jsvc = callPackage ../tools/system/jsvc { }; + jumpnbump = callPackage ../games/jumpnbump { }; junkie = callPackage ../tools/networking/junkie { }; From 7659fca548e36a81cf33c74cc7d67a20a5b61d17 Mon Sep 17 00:00:00 2001 From: rsynnest Date: Thu, 22 Apr 2021 22:18:32 -0700 Subject: [PATCH 004/188] commonsDaemon: init at 1.2.4 --- .../libraries/java/commons/daemon/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/java/commons/daemon/default.nix diff --git a/pkgs/development/libraries/java/commons/daemon/default.nix b/pkgs/development/libraries/java/commons/daemon/default.nix new file mode 100644 index 00000000000..f6f909904cf --- /dev/null +++ b/pkgs/development/libraries/java/commons/daemon/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "1.2.4"; + pname = "commons-daemon"; + + src = fetchurl { + url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; + sha256 = "0bsy4xn3gncgrxj3vkpplvyhx06c1470kycj0j5gwq46ylgady9s"; + }; + + installPhase = '' + tar xf ${src} + mkdir -p $out/share/java + cp *.jar $out/share/java/ + ''; + + meta = { + homepage = "https://commons.apache.org/proper/commons-daemon"; + description = "Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes."; + maintainers = with lib.maintainers; [ rsynnest ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b124f2dae5b..c526c3706ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18110,6 +18110,8 @@ in commonsCompress = callPackage ../development/libraries/java/commons/compress { }; + commonsDaemon = callPackage ../development/libraries/java/commons/daemon { }; + commonsFileUpload = callPackage ../development/libraries/java/commons/fileupload { }; commonsLang = callPackage ../development/libraries/java/commons/lang { }; From 73609958b5282f512a11664898f2f2752d6fbc0b Mon Sep 17 00:00:00 2001 From: rsynnest Date: Thu, 22 Apr 2021 21:39:09 -0700 Subject: [PATCH 005/188] unifi-video: init at 3.10.13 --- pkgs/servers/unifi-video/default.nix | 61 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100755 pkgs/servers/unifi-video/default.nix diff --git a/pkgs/servers/unifi-video/default.nix b/pkgs/servers/unifi-video/default.nix new file mode 100755 index 00000000000..4c55d510259 --- /dev/null +++ b/pkgs/servers/unifi-video/default.nix @@ -0,0 +1,61 @@ +{ dpkg +, stdenv +, lib +, fetchurl +, jre8 +, jsvc +, lsb-release +, libcap +, util-linux +, makeWrapper +, autoPatchelfHook +, glibc +, gcc-unwrapped +}: + +stdenv.mkDerivation rec { + pname = "unifi-video"; + version = "3.10.13"; + src = fetchurl { + urls = [ "https://dl.ui.com/firmwares/ufv/v${version}/unifi-video.Debian9_amd64.v${version}.deb" "https://archive.org/download/unifi-video.Debian9_amd64.v${version}/unifi-video.Debian9_amd64.v${version}.deb" ]; + sha256 = "06mxjdizs4mhm1by8kj4pg5hhdi8ns6x75ggwyp1k6zb26jvvdny"; + }; + + buildInputs = [ jre8 jsvc lsb-release libcap util-linux ]; + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook glibc gcc-unwrapped ]; + + unpackCmd = '' + runHook preUnpack + + dpkg-deb -x $src . + rm -r etc + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -ar sbin $out/bin + cp -ar lib share $out + chmod +x $out/bin/* + wrapProgram $out/bin/unifi-video --set JAVA_HOME "${jre8}" --prefix PATH : ${lib.makeBinPath [ jre8 lsb-release libcap util-linux]} + + runHook postInstall + ''; + + meta = with lib; { + description = "Unifi Video NVR (aka Airvision) is a software package for controlling Unifi cameras"; + longDescription = '' + Unifi Video is the NVR server software which can monitor and + record footage from supported Unifi video cameras + ''; + homepage = "https://www.ui.com"; + downloadPage = "https://www.ui.com/download/unifi-video/"; + license = licenses.unfree; + maintainers = [ maintainers.rsynnest ]; + platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ "Upstream support for Unifi Video ended January 1st, 2021." ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c526c3706ab..7045912fb33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19328,6 +19328,8 @@ in unifi6; unifi = unifi6; + unifi-video = callPackage ../servers/unifi-video { }; + urserver = callPackage ../servers/urserver { }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; From aeec6cbdb18ea8b5df94778483da1320c2a60c3c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 18:50:55 +0200 Subject: [PATCH 006/188] libwebsockets: add 4.2.0 --- pkgs/development/libraries/libwebsockets/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index c62aa77c61a..c4703aeb632 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -20,6 +20,8 @@ let "-DLWS_WITH_PLUGINS=ON" "-DLWS_WITH_IPV6=ON" "-DLWS_WITH_SOCKS5=ON" + # Required since v4.2.0 + "-DLWS_BUILD_HASH=no_hash" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; @@ -61,4 +63,9 @@ rec { version = "4.1.6"; sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"; }; + + libwebsockets_4_2 = generic { + version = "4.2.0"; + sha256 = "glnLGXniero/5CW/1TBPZngdOM6gww8DnT5wiX66sW0="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 177e25ea3c9..2a8309fbe87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6502,7 +6502,8 @@ in libwebsockets_3_1 libwebsockets_3_2 libwebsockets_4_0 - libwebsockets_4_1; + libwebsockets_4_1 + libwebsockets_4_2; libwebsockets = libwebsockets_3_2; licensee = callPackage ../tools/package-management/licensee { }; From 7d0eb78bee718f96a13ab6520b985a3d0165343b Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 18:52:29 +0200 Subject: [PATCH 007/188] libwebsockets: 3.2.2 -> 4.2.0 --- 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 2a8309fbe87..66481c5e037 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6504,7 +6504,7 @@ in libwebsockets_4_0 libwebsockets_4_1 libwebsockets_4_2; - libwebsockets = libwebsockets_3_2; + libwebsockets = libwebsockets_4_2; licensee = callPackage ../tools/package-management/licensee { }; From 0891da9bf52c7da1c56b63be036e822ec2135cbc Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 15 May 2021 20:34:01 +0200 Subject: [PATCH 008/188] libwebsockets: remove older 4.x packages --- pkgs/development/libraries/libwebsockets/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index c4703aeb632..7d8355112db 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -54,16 +54,6 @@ rec { sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; }; - libwebsockets_4_0 = generic { - version = "4.0.21"; - sha256 = "01k05x4711ngin598jr9dag4ml3m7hi6pkgr4dsb02ryh1kc6146"; - }; - - libwebsockets_4_1 = generic { - version = "4.1.6"; - sha256 = "0x56v4hsx92vm1zibfmnqb5g3v23kzciffn3fjlsc3sly2pknhsg"; - }; - libwebsockets_4_2 = generic { version = "4.2.0"; sha256 = "glnLGXniero/5CW/1TBPZngdOM6gww8DnT5wiX66sW0="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66481c5e037..ca15eef8dfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6501,8 +6501,6 @@ in inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets_4_0 - libwebsockets_4_1 libwebsockets_4_2; libwebsockets = libwebsockets_4_2; From a863d6d8b18dde419bbc99b0a1b794c18172fdfb Mon Sep 17 00:00:00 2001 From: Viacheslav Lotsmanov Date: Fri, 28 May 2021 01:15:56 +0300 Subject: [PATCH 009/188] =?UTF-8?q?Add=20=E2=80=9Cjson2yaml=E2=80=9D=20to?= =?UTF-8?q?=20top-level?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db768bed3a3..e76ffd4ba1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15567,6 +15567,8 @@ in json2hcl = callPackage ../development/tools/json2hcl { }; + json2yaml = haskell.lib.justStaticExecutables haskellPackages.json2yaml; + json-glib = callPackage ../development/libraries/json-glib { }; json_c = callPackage ../development/libraries/json-c { }; From b562ae6c319a0ee47f297c3b71ed13385c4549d8 Mon Sep 17 00:00:00 2001 From: rsynnest Date: Thu, 22 Apr 2021 21:39:47 -0700 Subject: [PATCH 010/188] nixos/unifi-video: init at 3.10.13 --- nixos/modules/module-list.nix | 1 + nixos/modules/services/video/unifi-video.nix | 265 +++++++++++++++++++ 2 files changed, 266 insertions(+) create mode 100644 nixos/modules/services/video/unifi-video.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 11c18a9df4b..b7d00582dcc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -822,6 +822,7 @@ ./services/networking/tvheadend.nix ./services/networking/unbound.nix ./services/networking/unifi.nix + ./services/video/unifi-video.nix ./services/networking/v2ray.nix ./services/networking/vsftpd.nix ./services/networking/wakeonlan.nix diff --git a/nixos/modules/services/video/unifi-video.nix b/nixos/modules/services/video/unifi-video.nix new file mode 100644 index 00000000000..d4c0268ed66 --- /dev/null +++ b/nixos/modules/services/video/unifi-video.nix @@ -0,0 +1,265 @@ +{ config, lib, pkgs, utils, ... }: +with lib; +let + cfg = config.services.unifi-video; + mainClass = "com.ubnt.airvision.Main"; + cmd = '' + ${pkgs.jsvc}/bin/jsvc \ + -cwd ${stateDir} \ + -debug \ + -verbose:class \ + -nodetach \ + -user unifi-video \ + -home ${cfg.jrePackage}/lib/openjdk \ + -cp ${pkgs.commonsDaemon}/share/java/commons-daemon-1.2.4.jar:${stateDir}/lib/airvision.jar \ + -pidfile ${cfg.pidFile} \ + -procname unifi-video \ + -Djava.security.egd=file:/dev/./urandom \ + -Xmx${cfg.maximumJavaHeapSize}M \ + -Xss512K \ + -XX:+UseG1GC \ + -XX:+UseStringDeduplication \ + -XX:MaxMetaspaceSize=768M \ + -Djava.library.path=${stateDir}/lib \ + -Djava.awt.headless=true \ + -Djavax.net.ssl.trustStore=${stateDir}/etc/ufv-truststore \ + -Dfile.encoding=UTF-8 \ + -Dav.tempdir=/var/cache/unifi-video + ''; + + mongoConf = pkgs.writeTextFile { + name = "mongo.conf"; + executable = false; + text = '' + # for documentation of all options, see http://docs.mongodb.org/manual/reference/configuration-options/ + + storage: + dbPath: ${cfg.dataDir}/db + journal: + enabled: true + syncPeriodSecs: 60 + + systemLog: + destination: file + logAppend: true + path: ${stateDir}/logs/mongod.log + + net: + port: 7441 + bindIp: 127.0.0.1 + http: + enabled: false + + operationProfiling: + slowOpThresholdMs: 500 + mode: off + ''; + }; + + + mongoWtConf = pkgs.writeTextFile { + name = "mongowt.conf"; + executable = false; + text = '' + # for documentation of all options, see: + # http://docs.mongodb.org/manual/reference/configuration-options/ + + storage: + dbPath: ${cfg.dataDir}/db-wt + journal: + enabled: true + wiredTiger: + engineConfig: + cacheSizeGB: 1 + + systemLog: + destination: file + logAppend: true + path: logs/mongod.log + + net: + port: 7441 + bindIp: 127.0.0.1 + + operationProfiling: + slowOpThresholdMs: 500 + mode: off + ''; + }; + + stateDir = "/var/lib/unifi-video"; + +in + { + + options.services.unifi-video = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether or not to enable the unifi-video service. + ''; + }; + + jrePackage = mkOption { + type = types.package; + default = pkgs.jre8; + defaultText = "pkgs.jre8"; + description = '' + The JRE package to use. Check the release notes to ensure it is supported. + ''; + }; + + unifiVideoPackage = mkOption { + type = types.package; + default = pkgs.unifi-video; + defaultText = "pkgs.unifi-video"; + description = '' + The unifi-video package to use. + ''; + }; + + mongodbPackage = mkOption { + type = types.package; + default = pkgs.mongodb-4_0; + defaultText = "pkgs.mongodb"; + description = '' + The mongodb package to use. + ''; + }; + + logDir = mkOption { + type = types.str; + default = "${stateDir}/logs"; + description = '' + Where to store the logs. + ''; + }; + + dataDir = mkOption { + type = types.str; + default = "${stateDir}/data"; + description = '' + Where to store the database and other data. + ''; + }; + + openPorts = mkOption { + type = types.bool; + default = true; + description = '' + Whether or not to open the required ports on the firewall. + ''; + }; + + maximumJavaHeapSize = mkOption { + type = types.nullOr types.int; + default = 1024; + example = 4096; + description = '' + Set the maximimum heap size for the JVM in MB. + ''; + }; + + pidFile = mkOption { + type = types.path; + default = "${cfg.dataDir}/unifi-video.pid"; + description = "Location of unifi-video pid file."; + }; + +}; + +config = mkIf cfg.enable { + users = { + users.unifi-video = { + description = "UniFi Video controller daemon user"; + home = stateDir; + group = "unifi-video"; + isSystemUser = true; + }; + groups.unifi-video = {}; + }; + + networking.firewall = mkIf cfg.openPorts { + # https://help.ui.com/hc/en-us/articles/217875218-UniFi-Video-Ports-Used + allowedTCPPorts = [ + 7080 # HTTP portal + 7443 # HTTPS portal + 7445 # Video over HTTP (mobile app) + 7446 # Video over HTTPS (mobile app) + 7447 # RTSP via the controller + 7442 # Camera management from cameras to NVR over WAN + ]; + allowedUDPPorts = [ + 6666 # Inbound camera streams sent over WAN + ]; + }; + + systemd.tmpfiles.rules = [ + "d '${stateDir}' 0700 unifi-video unifi-video - -" + "d '/var/cache/unifi-video' 0700 unifi-video unifi-video - -" + + "d '${stateDir}/logs' 0700 unifi-video unifi-video - -" + "C '${stateDir}/etc' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/etc" + "C '${stateDir}/webapps' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/webapps" + "C '${stateDir}/email' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/email" + "C '${stateDir}/fw' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/fw" + "C '${stateDir}/lib' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/lib" + + "d '${stateDir}/data' 0700 unifi-video unifi-video - -" + "d '${stateDir}/data/db' 0700 unifi-video unifi-video - -" + "C '${stateDir}/data/system.properties' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/etc/system.properties" + + "d '${stateDir}/bin' 0700 unifi-video unifi-video - -" + "f '${stateDir}/bin/evostreamms' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/bin/evostreamms" + "f '${stateDir}/bin/libavcodec.so.54' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/bin/libavcodec.so.54" + "f '${stateDir}/bin/libavformat.so.54' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/bin/libavformat.so.54" + "f '${stateDir}/bin/libavutil.so.52' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/bin/libavutil.so.52" + "f '${stateDir}/bin/ubnt.avtool' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/bin/ubnt.avtool" + "f '${stateDir}/bin/ubnt.updater' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/bin/ubnt.updater" + "C '${stateDir}/bin/mongo' 0700 unifi-video unifi-video - ${cfg.mongodbPackage}/bin/mongo" + "C '${stateDir}/bin/mongod' 0700 unifi-video unifi-video - ${cfg.mongodbPackage}/bin/mongod" + "C '${stateDir}/bin/mongoperf' 0700 unifi-video unifi-video - ${cfg.mongodbPackage}/bin/mongoperf" + "C '${stateDir}/bin/mongos' 0700 unifi-video unifi-video - ${cfg.mongodbPackage}/bin/mongos" + + "d '${stateDir}/conf' 0700 unifi-video unifi-video - -" + "C '${stateDir}/conf/evostream' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/evostream" + "Z '${stateDir}/conf/evostream' 0700 unifi-video unifi-video - -" + "L+ '${stateDir}/conf/mongodv3.0+.conf' 0700 unifi-video unifi-video - ${mongoConf}" + "L+ '${stateDir}/conf/mongodv3.6+.conf' 0700 unifi-video unifi-video - ${mongoConf}" + "L+ '${stateDir}/conf/mongod-wt.conf' 0700 unifi-video unifi-video - ${mongoWtConf}" + "L+ '${stateDir}/conf/catalina.policy' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/catalina.policy" + "L+ '${stateDir}/conf/catalina.properties' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/catalina.properties" + "L+ '${stateDir}/conf/context.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/context.xml" + "L+ '${stateDir}/conf/logging.properties' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/logging.properties" + "L+ '${stateDir}/conf/server.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/server.xml" + "L+ '${stateDir}/conf/tomcat-users.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/tomcat-users.xml" + "L+ '${stateDir}/conf/web.xml' 0700 unifi-video unifi-video - ${pkgs.unifi-video}/lib/unifi-video/conf/web.xml" + + ]; + + systemd.services.unifi-video = { + description = "UniFi Video NVR daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ] ; + unitConfig.RequiresMountsFor = stateDir; + # Make sure package upgrades trigger a service restart + restartTriggers = [ cfg.unifiVideoPackage cfg.mongodbPackage ]; + path = with pkgs; [ gawk coreutils busybox which jre8 lsb-release libcap util-linux ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${(removeSuffix "\n" cmd)} ${mainClass} start"; + ExecStop = "${(removeSuffix "\n" cmd)} stop ${mainClass} stop"; + Restart = "on-failure"; + UMask = "0077"; + User = "unifi-video"; + WorkingDirectory = "${stateDir}"; + }; + }; + + }; + + meta = { + maintainers = with lib.maintainers; [ rsynnest ]; + }; +} From 16f69cc5255ef7ff0ccd48d903f9a650876394d0 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 10 Jun 2021 19:53:36 -0700 Subject: [PATCH 011/188] spidermonkey68: Disable on RISC-V --- pkgs/development/interpreters/spidermonkey/68.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix index f867e606140..8019cae1b33 100644 --- a/pkgs/development/interpreters/spidermonkey/68.nix +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -90,6 +90,7 @@ in stdenv.mkDerivation rec { homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; + badPlatforms = [ "riscv32-linux" "riscv64-linux" ]; platforms = platforms.linux; }; } From 56f5cd3343aef57e750e6b93dabb693189abded2 Mon Sep 17 00:00:00 2001 From: V Date: Fri, 25 Jun 2021 02:49:13 +0200 Subject: [PATCH 012/188] git: add shellPath passthru git features a restricted login shell for allowing Git-only SSH access. --- .../version-management/git-and-tools/git/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 2db4b4ed7bd..c4db8a12543 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -335,8 +335,11 @@ stdenv.mkDerivation { stripDebugList = [ "lib" "libexec" "bin" "share/git/contrib/credential/libsecret" ]; - passthru.tests = { - buildbot-integration = nixosTests.buildbot; + passthru = { + shellPath = "/bin/git-shell"; + tests = { + buildbot-integration = nixosTests.buildbot; + }; }; meta = { From 87699227bb751dcab926296c351f918f7f40691c Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Fri, 2 Jul 2021 15:13:33 +0700 Subject: [PATCH 013/188] icecat-bin: init at 60.7.0 --- .../browsers/icecat-bin/default.nix | 135 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 137 insertions(+) create mode 100644 pkgs/applications/networking/browsers/icecat-bin/default.nix diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix new file mode 100644 index 00000000000..51d2516edb0 --- /dev/null +++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix @@ -0,0 +1,135 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, wrapGAppsHook +, gnome2 +, nss +, xdg-utils +, xorg +, alsa-lib +, atk +, cairo +, cups +, curl +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libX11 +, libxcb +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libdrm +, libnotify +, libopus +, libpulseaudio +, libuuid +, libxshmfence +, mesa +, nspr +, pango +, systemd +, at-spi2-atk +, at-spi2-core +, xlibs +}: + +let + mirror = "https://mirror.tochlab.net/pub/gnu/gnuzilla"; + name = "icecat"; +in + +stdenv.mkDerivation rec { + pname = "icecat-bin"; + version = "60.7.0"; + + src = fetchurl { + url = "${mirror}/${version}/${name}-${version}.en-US.gnulinux-x86_64.tar.bz2"; + sha256 = "sha256-Tw3/565dmKY71EsrDb05+T1gBWORIU6FZYkqsa3jaoU="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + nss + xdg-utils + xorg.libxkbfile + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig.lib + freetype + gdk-pixbuf + glib + gnome2.GConf + gnome2.gtk + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libdrm + libnotify + libopus + libuuid + libxcb + libxshmfence + mesa + nspr + nss + pango + xlibs.libXt + stdenv.cc.cc.lib + ]; + + unpackPhase = '' + mkdir -p $TMP/ $out/{opt,bin} + tar -xvf $src -C $TMP/ + ''; + + installPhase = '' + cp -r $TMP/icecat/* $out/opt/ + ln -sf $out/opt/icecat-bin $out/bin/icecat + ''; + + runtimeDependencies = [ + libpulseaudio.out + (lib.getLib systemd) + ]; + + meta = with lib; { + description = "Binary build of the GNU version of the Mozilla Firefox browser"; + homepage = "https://www.gnu.org/software/gnuzilla/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6961be94b8..1d1bc6df8a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24723,6 +24723,8 @@ in icewm = callPackage ../applications/window-managers/icewm {}; + icecat-bin = callPackage ../applications/networking/browsers/icecat-bin { }; + id3v2 = callPackage ../applications/audio/id3v2 { }; ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { }; From 16d173961d95261c645099a06327e7a0e2130cee Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Sat, 3 Jul 2021 12:34:33 +0700 Subject: [PATCH 014/188] icecat-bin: Fixed dependencies --- pkgs/applications/networking/browsers/icecat-bin/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix index 51d2516edb0..de5a852d186 100644 --- a/pkgs/applications/networking/browsers/icecat-bin/default.nix +++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix @@ -43,7 +43,6 @@ , systemd , at-spi2-atk , at-spi2-core -, xlibs }: let @@ -106,7 +105,7 @@ stdenv.mkDerivation rec { nspr nss pango - xlibs.libXt + xorg.libXt stdenv.cc.cc.lib ]; From 99509cff29b52daaa636b3e8220ece1b88b53ff7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 May 2021 16:08:46 +0000 Subject: [PATCH 015/188] gnustep.make: 2.8.0 -> 2.9.0 https://github.com/gnustep/tools-make/releases/tag/make-2_9_0 --- pkgs/desktops/gnustep/make/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index f96eb7388b3..ce2c1f2f144 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl, clang, which, libobjc }: -let - version = "2.9.0"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gnustep-make"; - inherit version; + version = "2.9.0"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; @@ -32,6 +28,7 @@ stdenv.mkDerivation { meta = { description = "A build manager for GNUstep"; homepage = "http://gnustep.org/"; + changelog = "https://github.com/gnustep/tools-make/releases/tag/make-${builtins.replaceStrings [ "." ] [ "_" ] version}"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ ashalkhakov matthewbauer ]; platforms = lib.platforms.unix; From 35ef05ce928497801bbf8e9d83bfbe5eba02c968 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 7 May 2021 19:02:37 +0200 Subject: [PATCH 016/188] gnustep.base: 1.27.0 -> 1.28.0 https://github.com/gnustep/libs-base/releases/tag/base-1_28_0 --- pkgs/desktops/gnustep/base/default.nix | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index e661dae9099..4fe005c3749 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -1,7 +1,7 @@ { aspell, audiofile , gsmakeDerivation , cups -, fetchurl, fetchpatch +, fetchzip , gmp, gnutls , libffi, binutils-unwrapped , libjpeg, libtiff, libpng, giflib @@ -11,14 +11,12 @@ , pkg-config, portaudio , libiberty }: -let - version = "1.27.0"; -in -gsmakeDerivation { - name = "gnustep-base-${version}"; - src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz"; - sha256 = "10xjrv5d443wzll6lf9y65p6v9kvx7xxklhsm1j05y93vwgzl0w8"; +gsmakeDerivation rec { + pname = "gnustep-base"; + version = "1.28.0"; + src = fetchzip { + url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + sha256 = "05vjz19v1w7yb7hm8qrc41bqh6xd8in7sgg2p0h1vldyyaa5sh90"; }; nativeBuildInputs = [ pkg-config ]; propagatedBuildInputs = [ @@ -35,13 +33,10 @@ gsmakeDerivation { ]; patches = [ ./fixup-paths.patch - (fetchpatch { # for icu68 compatibility, remove with next update(?) - url = "https://github.com/gnustep/libs-base/commit/06fa7792a51cb970e5d010a393cb88eb127830d7.patch"; - sha256 = "150n1sa34av9ywc04j36jvj7ic9x6pgr123rbn2mx5fj76q23852"; - }) ]; meta = { description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; + changelog = "https://github.com/gnustep/libs-base/releases/tag/base-${builtins.replaceStrings [ "." ] [ "_" ] version}"; }; } From 91c28faa93a7737e6b555bf20f176672ffbc48b4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 7 May 2021 19:08:30 +0200 Subject: [PATCH 017/188] gnustep.gui: 0.28.0 -> 0.29.0 https://github.com/gnustep/libs-gui/releases/tag/gui-0_29_0 --- pkgs/desktops/gnustep/gui/default.nix | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix index 8356a608c83..e8c3ea27fa4 100644 --- a/pkgs/desktops/gnustep/gui/default.nix +++ b/pkgs/desktops/gnustep/gui/default.nix @@ -1,22 +1,19 @@ -{ gsmakeDerivation, fetchurl, fetchpatch, base }: -let - version = "0.28.0"; -in -gsmakeDerivation { - name = "gnustep-gui-${version}"; - src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-${version}.tar.gz"; - sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z"; +{ gsmakeDerivation, fetchzip, base }: + +gsmakeDerivation rec { + version = "0.29.0"; + pname = "gnustep-gui"; + + src = fetchzip { + url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + sha256 = "0x6n48p178r4zd8f4sqjfqd6rp49w00wr59w19lpwlmrdv7bn538"; }; buildInputs = [ base ]; patches = [ ./fixup-all.patch - (fetchpatch { # for icu68 compatibility, remove with next update(?) - url = "https://github.com/gnustep/libs-gui/commit/05572b2d01713f5caf07f334f17ab639be8a1cff.patch"; - sha256 = "04z287dk8jf3hdwzk8bpnv49qai2dcdlh824yc9bczq291pjy2xc"; - }) ]; meta = { description = "A GUI class library of GNUstep"; + changelog = "https://github.com/gnustep/libs-gui/releases/tag/gui-${builtins.replaceStrings [ "." ] [ "_" ] version}"; }; } From 3fe546a5d2f4e0be21da7c9cab0f70e4a5973490 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 7 May 2021 19:12:10 +0200 Subject: [PATCH 018/188] gnustep.back: 0.28.0 -> 0.29.0 https://github.com/gnustep/libs-back/releases/tag/back-0_29_0 --- pkgs/desktops/gnustep/back/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 18986400c00..03ef891d710 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -1,21 +1,22 @@ { gsmakeDerivation , cairo -, fetchurl +, fetchzip , base, gui , xlibsWrapper , freetype , pkg-config , libXmu }: -let + +gsmakeDerivation rec { + pname = "gnustep-back"; version = "0.28.0"; -in -gsmakeDerivation { - name = "gnustep-back-${version}"; - src = fetchurl { - url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${version}.tar.gz"; - sha256 = "1ynd27zwga17mp2qlym90k2xsypdvz24w6gyy2rfvmv0gkvlgrjr"; + + src = fetchzip { + url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; + sha256 = "1nkmk7qli2ld6gw9h4kqa199i8q2m9x9d46idxh1k0rb41kf3i2c"; }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo base gui freetype xlibsWrapper libXmu ]; meta = { From 2db931fb49d59847dc5ed41b46de2379abe33981 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 7 May 2021 19:13:27 +0200 Subject: [PATCH 019/188] gnustep.gorm: align with other packages --- pkgs/desktops/gnustep/gorm/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix index 3817edad36b..bacb822c5ff 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/desktops/gnustep/gorm/default.nix @@ -1,13 +1,11 @@ -{ fetchurl, base, back, gsmakeDerivation, gui }: -let +{ fetchzip, base, back, gsmakeDerivation, gui }: +gsmakeDerivation rec { + pname = "gorm"; version = "1.2.26"; -in -gsmakeDerivation { - name = "gorm-${version}"; - src = fetchurl { + src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; - sha256 = "063f8rlz8py931hfrh95jxvr68bzs33bvckfigzbagp73n892jnw"; + sha256 = "1j0n8rdwvp9082vgkw8w430gvljli04zclkxi9gpdr43nj97gwdf"; }; buildInputs = [ base back gui ]; From 4ceb4858377a8fe332d1f0d1c23c7ed2fa3e88f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 May 2021 01:21:50 +0000 Subject: [PATCH 020/188] gnustep.gorm: 1.2.26 -> 1.2.28 --- pkgs/desktops/gnustep/gorm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix index bacb822c5ff..6320d0d2ff2 100644 --- a/pkgs/desktops/gnustep/gorm/default.nix +++ b/pkgs/desktops/gnustep/gorm/default.nix @@ -1,11 +1,11 @@ { fetchzip, base, back, gsmakeDerivation, gui }: gsmakeDerivation rec { pname = "gorm"; - version = "1.2.26"; + version = "1.2.28"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${version}.tar.gz"; - sha256 = "1j0n8rdwvp9082vgkw8w430gvljli04zclkxi9gpdr43nj97gwdf"; + sha256 = "0n92xr16w0wnwfzh7i9xhsly61pyz9l9f615dp324a6r3444hn0z"; }; buildInputs = [ base back gui ]; From d569ee3a08f771ba776f36ff779b3d8169685a79 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 6 Jul 2021 12:45:48 +0700 Subject: [PATCH 021/188] icecat-bin: fix default.nix --- .../networking/browsers/icecat-bin/default.nix | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-bin/default.nix b/pkgs/applications/networking/browsers/icecat-bin/default.nix index de5a852d186..6f5da5b92a6 100644 --- a/pkgs/applications/networking/browsers/icecat-bin/default.nix +++ b/pkgs/applications/networking/browsers/icecat-bin/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchurl +, fetchzip , autoPatchelfHook , wrapGAppsHook , gnome2 @@ -45,18 +45,13 @@ , at-spi2-core }: -let - mirror = "https://mirror.tochlab.net/pub/gnu/gnuzilla"; - name = "icecat"; -in - stdenv.mkDerivation rec { pname = "icecat-bin"; version = "60.7.0"; - src = fetchurl { - url = "${mirror}/${version}/${name}-${version}.en-US.gnulinux-x86_64.tar.bz2"; - sha256 = "sha256-Tw3/565dmKY71EsrDb05+T1gBWORIU6FZYkqsa3jaoU="; + src = fetchzip { + url = "https://mirror.tochlab.net/pub/gnu/gnuzilla/${version}/icecat-${version}.en-US.gnulinux-x86_64.tar.bz2"; + sha256 = "sha256-bEapbQIcZXQ0Tip/X1Q0guowpr3wNDYsFbHGmTbc5mE="; }; nativeBuildInputs = [ @@ -111,11 +106,11 @@ stdenv.mkDerivation rec { unpackPhase = '' mkdir -p $TMP/ $out/{opt,bin} - tar -xvf $src -C $TMP/ + cp $src/* $TMP/ -r ''; installPhase = '' - cp -r $TMP/icecat/* $out/opt/ + cp -r $TMP/* $out/opt/ ln -sf $out/opt/icecat-bin $out/bin/icecat ''; From 7904fffeefcdb673753defbc03564e9627f50531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 6 Jul 2021 13:05:32 +0200 Subject: [PATCH 022/188] GHA: add basic eval checks --- .github/workflows/basic-eval.yml | 20 +++++++ pkgs/top-level/make-tarball.nix | 54 +++---------------- .../nixpkgs-basic-release-checks.nix | 53 ++++++++++++++++++ 3 files changed, 80 insertions(+), 47 deletions(-) create mode 100644 .github/workflows/basic-eval.yml create mode 100644 pkgs/top-level/nixpkgs-basic-release-checks.nix diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml new file mode 100644 index 00000000000..3d12eda314f --- /dev/null +++ b/.github/workflows/basic-eval.yml @@ -0,0 +1,20 @@ +name: Basic evaluation checks + +on: + pull_request: + branches: + - master + - release-** + push: + branches: + - master + - release-** +jobs: + tests: + runs-on: ubuntu-latest + # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback + steps: + - uses: actions/checkout@v2 + - uses: cachix/install-nix-action@v13 + # explicit list of supportedSystems is needed until aarch64-darwin becomes part of the trunk jobset + - run: nix-build pkgs/top-level/release.nix -A tarball.nixpkgs-basic-release-checks --arg supportedSystems '[ "aarch64-darwin" "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]' diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index d0728c5d1b2..ac6648374ab 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -10,9 +10,7 @@ , lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; } }: -with pkgs; - -releaseTools.sourceTarball { +pkgs.releaseTools.sourceTarball { name = "nixpkgs-tarball"; src = nixpkgs; @@ -23,7 +21,7 @@ releaseTools.sourceTarball { then builtins.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified) else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; - buildInputs = [ nix.out jq lib-tests pkgs.brotli ]; + buildInputs = with pkgs; [ nix.out jq lib-tests pkgs.brotli ]; configurePhase = '' eval "$preConfigure" @@ -34,6 +32,9 @@ releaseTools.sourceTarball { echo "git-revision is $(cat .git-revision)" ''; + nixpkgs-basic-release-checks = import ./nixpkgs-basic-release-checks.nix + { inherit nix pkgs nixpkgs supportedSystems; }; + dontBuild = false; doCheck = true; @@ -46,47 +47,6 @@ releaseTools.sourceTarball { opts=(--option build-users-group "") nix-store --init - echo 'abort "Illegal use of in Nixpkgs."' > $TMPDIR/barf.nix - - # Make sure that Nixpkgs does not use . - badFiles=$(find pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]* to refer to itself." - echo "The offending files: $badFiles" - exit 1 - fi - - # Make sure that derivation paths do not depend on the Nixpkgs path. - mkdir $TMPDIR/foo - ln -s $(readlink -f .) $TMPDIR/foo/bar - p1=$(nix-instantiate ./. --dry-run -A firefox --show-trace) - p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace) - if [ "$p1" != "$p2" ]; then - echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" - exit 1 - fi - - # Check that all-packages.nix evaluates on a number of platforms without any warnings. - for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do - header "checking Nixpkgs on $platform" - - nix-env -f . \ - --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system \ - "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log - - if [ -s eval-warnings.log ]; then - echo "Nixpkgs on $platform evaluated with warnings, aborting" - exit 1 - fi - rm eval-warnings.log - - nix-env -f . \ - --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system --meta --xml \ - "''${opts[@]}" > /dev/null - done - header "checking eval-release.nix" nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null @@ -104,7 +64,7 @@ releaseTools.sourceTarball { header "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp - nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp + nix-env -f . -I nixpkgs=$src -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages @@ -121,6 +81,6 @@ releaseTools.sourceTarball { ''; meta = { - maintainers = [ lib.maintainers.all ]; + maintainers = [ pkgs.lib.maintainers.all ]; }; } diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix new file mode 100644 index 00000000000..ffd92d587ba --- /dev/null +++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -0,0 +1,53 @@ +{ supportedSystems, nixpkgs, pkgs, nix }: + +pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } '' + set -o pipefail + + export NIX_STATE_DIR=$TMPDIR + export NIX_PATH=nixpkgs=$TMPDIR/barf.nix + opts=(--option build-users-group "") + nix-store --init + + echo 'abort "Illegal use of in Nixpkgs."' > $TMPDIR/barf.nix + + # Make sure that Nixpkgs does not use . + badFiles=$(find $src/pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]* to refer to itself." + echo "The offending files: $badFiles" + exit 1 + fi + + # Make sure that derivation paths do not depend on the Nixpkgs path. + mkdir $TMPDIR/foo + ln -s $(readlink -f $src) $TMPDIR/foo/bar + p1=$(nix-instantiate $src --dry-run -A firefox --show-trace) + p2=$(nix-instantiate $TMPDIR/foo/bar --dry-run -A firefox --show-trace) + if [ "$p1" != "$p2" ]; then + echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" + exit 1 + fi + + # Check that all-packages.nix evaluates on a number of platforms without any warnings. + for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do + header "checking Nixpkgs on $platform" + + nix-env -f $src \ + --show-trace --argstr system "$platform" \ + -qa --drv-path --system-filter \* --system \ + "''${opts[@]}" 2>&1 >/dev/null | tee eval-warnings.log + + if [ -s eval-warnings.log ]; then + echo "Nixpkgs on $platform evaluated with warnings, aborting" + exit 1 + fi + rm eval-warnings.log + + nix-env -f $src \ + --show-trace --argstr system "$platform" \ + -qa --drv-path --system-filter \* --system --meta --xml \ + "''${opts[@]}" > /dev/null + done + + touch $out +'' From 538937f56e11667e9de964341a2c9f7e0357136b Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 7 Jul 2021 23:00:45 +0300 Subject: [PATCH 023/188] wineUnstable: 6.11 -> 6.12 Staging updated as well --- pkgs/misc/emulators/wine/sources.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 72a5240dfc6..f2e61d18ee2 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,9 +44,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.11"; + version = "6.12"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "02v725qjsibiv6ad6hxsc6199dvlmnp7983286a4k8rygqnvqln9"; + sha256 = "1a6fnxb4rci310m0wjcs9cnmpj88775q70qk7xi3k06z1qqbx4pv"; inherit (stable) gecko32 gecko64; ## see http://wiki.winehq.org/Mono @@ -65,10 +65,11 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "0gbci8fjvl1bdz7fj4bh25mqrgi1i04q5na2ckv9hj9nh9x7crbm"; + sha256 = "1mg5yrw5jk2nbdp9mcqc3iar01lr76lmm1py95wify9p2bqzavpp"; owner = "wine-staging"; repo = "wine-staging"; - rev = "v${version}"; + # Replace back on next release: rev = "v${version}"; + rev = "v6.12.1"; disabledPatchsets = [ ]; }; From 765c1b314412b5073818c8b981117325da46a865 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier <32938211+bbenno@users.noreply.github.com> Date: Thu, 8 Jul 2021 09:56:39 +0200 Subject: [PATCH 024/188] nextcloud: 21.0.2 -> 21.0.3 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3f2b1798a2c..3d32549e314 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -60,8 +60,8 @@ in { }; nextcloud21 = generic { - version = "21.0.2"; - sha256 = "5e5b38109a3485db5fd2d248f24478eabe6c0790ec10b030acbbee207d5511fe"; + version = "21.0.3"; + sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee"; }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' From d45672d059cbcc106c3d3d52e4a185859b6c6635 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 8 Jul 2021 12:13:38 +0200 Subject: [PATCH 025/188] nextcloud20: 20.0.7 -> 20.0.11 ChangeLog: https://nextcloud.com/changelog/#20-0-11 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3d32549e314..a08b2bd4dd5 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -55,8 +55,8 @@ in { }; nextcloud20 = generic { - version = "20.0.7"; - sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; + version = "20.0.11"; + sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A="; }; nextcloud21 = generic { From 81a35d65500707f87d884cf156ac2bde70881cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 8 Jul 2021 13:03:57 +0200 Subject: [PATCH 026/188] Update pkgs/top-level/make-tarball.nix Co-authored-by: Sandro --- pkgs/top-level/make-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index ac6648374ab..c5a5a437699 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -21,7 +21,7 @@ pkgs.releaseTools.sourceTarball { then builtins.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified) else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; - buildInputs = with pkgs; [ nix.out jq lib-tests pkgs.brotli ]; + buildInputs = with pkgs; [ nix.out jq lib-tests brotli ]; configurePhase = '' eval "$preConfigure" From b922990a8eb4dbee8f9e7428572d2230a86c2a55 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 8 Jul 2021 16:29:45 +0200 Subject: [PATCH 027/188] nextcloud19: remove I'm very sorry, this should've happened before the release, but we can still mark it as insecure on 21.05 and remove it on `master`. --- pkgs/servers/nextcloud/default.nix | 19 ++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index a08b2bd4dd5..399294ce519 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,27 +33,16 @@ let }; }; in { - nextcloud18 = throw '' - Nextcloud v18 has been removed from `nixpkgs` as the support for it was dropped - by upstream in 2021-01. Please upgrade to at least Nextcloud v19 by + nextcloud19 = throw '' + Nextcloud v19 has been removed from `nixpkgs` as the support for it was dropped + by upstream in 2021-06. Please upgrade to at least Nextcloud v20 by declaring - services.nextcloud.package = pkgs.nextcloud19; + services.nextcloud.package = pkgs.nextcloud20; in your NixOS config. - - [1] https://docs.nextcloud.com/server/18/admin_manual/release_schedule.html ''; - # FIXME(@Ma27) remove on 21.05 - nextcloud19 = generic { - version = "19.0.6"; - sha256 = "sha256-pqqIayE0OyTailtd2zeYi+G1APjv/YHqyO8jCpq7KJg="; - extraVulnerabilities = [ - "Nextcloud 19 is still supported, but CVE-2020-8259 & CVE-2020-8152 are unfixed! Please note that both CVEs only affect the file encryption module which is turned off by default. Alternatively, `pkgs.nextcloud20` can be used." - ]; - }; - nextcloud20 = generic { version = "20.0.11"; sha256 = "sha256-CLrJH5eNTiJJrDzfCg+re3J2qmwxFOe12nUU/QgtD6A="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a6ad9fe9d3..9bf8f552a5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7264,7 +7264,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud18 nextcloud19 nextcloud20 nextcloud21; + nextcloud19 nextcloud20 nextcloud21; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From e05f4101c16f08058a14ac4335886567e1ffe987 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 8 Jul 2021 16:43:27 +0200 Subject: [PATCH 028/188] nextcloud22: init at 22.0.0 --- nixos/modules/services/web-apps/nextcloud.nix | 16 +++++++--------- nixos/modules/services/web-apps/nextcloud.xml | 2 +- pkgs/servers/nextcloud/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 545deaa905f..111b3173469 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -92,7 +92,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud19" "nextcloud20" "nextcloud21" ]; + relatedPackages = [ "nextcloud20" "nextcloud21" "nextcloud22" ]; }; maxUploadSize = mkOption { @@ -385,7 +385,7 @@ in { ]; warnings = let - latest = 21; + latest = 22; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. @@ -403,9 +403,9 @@ in { Using config.services.nextcloud.poolConfig is deprecated and will become unsupported in a future release. Please migrate your configuration to config.services.nextcloud.poolSettings. '') - ++ (optional (versionOlder cfg.package.version "19") (upgradeWarning 18 "20.09")) ++ (optional (versionOlder cfg.package.version "20") (upgradeWarning 19 "21.05")) - ++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05")); + ++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05")) + ++ (optional (versionOlder cfg.package.version "22") (upgradeWarning 21 "21.11")); services.nextcloud.package = with pkgs; mkDefault ( @@ -415,13 +415,13 @@ in { nextcloud defined in an overlay, please set `services.nextcloud.package` to `pkgs.nextcloud`. '' - else if versionOlder stateVersion "20.09" then nextcloud18 # 21.03 will not be an official release - it was instead 21.05. # This versionOlder statement remains set to 21.03 for backwards compatibility. # See https://github.com/NixOS/nixpkgs/pull/108899 and # https://github.com/NixOS/rfcs/blob/master/rfcs/0080-nixos-release-schedule.md. else if versionOlder stateVersion "21.03" then nextcloud19 - else nextcloud21 + else if versionOlder stateVersion "21.11" then nextcloud21 + else nextcloud22 ); } @@ -616,9 +616,7 @@ in { services.nginx.enable = mkDefault true; - services.nginx.virtualHosts.${cfg.hostName} = let - major = toInt (versions.major cfg.package.version); - in { + services.nginx.virtualHosts.${cfg.hostName} = { root = cfg.package; locations = { "= /robots.txt" = { diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 83a6f68edcb..3af37b15dd5 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -11,7 +11,7 @@ desktop client is packaged at pkgs.nextcloud-client. - The current default by NixOS is nextcloud21 which is also the latest + The current default by NixOS is nextcloud22 which is also the latest major version available.
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 399294ce519..1776987bae0 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -52,6 +52,11 @@ in { version = "21.0.3"; sha256 = "8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee"; }; + + nextcloud22 = generic { + version = "22.0.0"; + sha256 = "sha256-ORHTdUw3rKfJtfOys3UTwPK1u5ea8AgWwRF7Hu28XXo="; + }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bf8f552a5a..502a2e9e348 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7264,7 +7264,7 @@ in grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud19 nextcloud20 nextcloud21; + nextcloud19 nextcloud20 nextcloud21 nextcloud22; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; From c39040195f991fcf8ea962d8512df5e1b9977647 Mon Sep 17 00:00:00 2001 From: pandaman64 Date: Fri, 9 Jul 2021 22:54:03 +0900 Subject: [PATCH 029/188] build-rust-crate: disable incremental builds According to rustc implementation[1], `-C incremental=no` enables incremental builds with directory name `no`. This patch removes the `-C incremental` argument to disable incremental builds. [1]: https://github.com/rust-lang/rust/blob/ee86f96ba176f598d64dc9f3bb7e074d5b8b86b6/compiler/rustc_session/src/options.rs#L918-L919 --- pkgs/build-support/rust/build-rust-crate/build-crate.nix | 1 - pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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 df3129d536d..3441e2c5e7b 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -12,7 +12,6 @@ [ (if release then "-C opt-level=3" else "-C debuginfo=2") "-C codegen-units=$NIX_BUILD_CORES" - "-C incremental=no" "--remap-path-prefix=$NIX_BUILD_TOP=/" (mkRustcDepArgs dependencies crateRenames) (mkRustcFeatureArgs crateFeatures) 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 3eaba1736fc..d1010ac1adb 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -24,7 +24,7 @@ let version_ = lib.splitString "-" crateVersion; version = lib.splitVersion (lib.head version_); rustcOpts = lib.foldl' (opts: opt: opts + " " + opt) (if release then "-C opt-level=3" else "-C debuginfo=2") - (["-C codegen-units=$NIX_BUILD_CORES -C incremental=no"] ++ extraRustcOpts); + (["-C codegen-units=$NIX_BUILD_CORES"] ++ extraRustcOpts); buildDeps = mkRustcDepArgs buildDependencies crateRenames; authors = lib.concatStringsSep ":" crateAuthors; optLevel = if release then 3 else 0; From 66811ee570135af3217c855a138c1a788cf6bd0c Mon Sep 17 00:00:00 2001 From: Dawid Gliwka Date: Wed, 19 May 2021 20:56:11 +0200 Subject: [PATCH 030/188] maintainers: add dgliwka --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98ac2f8dfac..ef102e3a7a3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2571,6 +2571,12 @@ githubId = 4708206; name = "Daniel Fox Franke"; }; + dgliwka = { + email = "dawid.gliwka@gmail.com"; + github = "dgliwka"; + githubId = 33262214; + name = "Dawid Gliwka"; + }; dgonyeo = { email = "derek@gonyeo.com"; github = "dgonyeo"; From b06b59fdb71dad25ff2db660288078cbc6b600fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 10 Jul 2021 11:05:26 +0000 Subject: [PATCH 031/188] cargo-make: 0.34.0 -> 0.35.0 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index d5fd7ee4a83..01173474db6 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.34.0"; + version = "0.35.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-/9v9nedLoXwuFuqw3W4RjTwvNIlisbiPCcVF/0oH4fw="; + sha256 = "sha256-pC3iX5jAPBArxs+YECDyUW5+MP+/f2HMLZNjo+BoKOE="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-clav4lGDuWvwzq78Kw+vtz+boNcZnNH+NHH7ZaZYSC4="; + cargoSha256 = "sha256-Zp2LoeCnpYupi/QY3Ft1VQ+O/y3I96UaouEFs9QpbLg="; # Some tests fail because they need network access. # However, Travis ensures a proper build. From c1d907220af7aa1a018d7ae2d1f27abe2357857b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 30 Dec 2020 10:21:44 -0400 Subject: [PATCH 032/188] omnisharp-roslyn: build from source - use links for internal msbuild - add dotnet-sdk to PATH https://github.com/NixOS/nixpkgs/pull/98435#issuecomment-715508615 - build from source - add myself as maintainer --- .../tools/omnisharp-roslyn/create-deps.sh | 66 + .../tools/omnisharp-roslyn/default.nix | 104 +- .../tools/omnisharp-roslyn/deps.nix | 2178 +++++++++++++++++ 3 files changed, 2327 insertions(+), 21 deletions(-) create mode 100755 pkgs/development/tools/omnisharp-roslyn/create-deps.sh create mode 100644 pkgs/development/tools/omnisharp-roslyn/deps.nix diff --git a/pkgs/development/tools/omnisharp-roslyn/create-deps.sh b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh new file mode 100755 index 00000000000..402d64c9b61 --- /dev/null +++ b/pkgs/development/tools/omnisharp-roslyn/create-deps.sh @@ -0,0 +1,66 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p msbuild -p jq -p xmlstarlet -p curl +set -euo pipefail + +cat << EOL +{ fetchurl }: [ +EOL + +tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root +trap 'rm -rf "$tmpdir"' EXIT + +mapfile -t repos < <( + xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.Config | + while IFS= read index + do + curl --compressed -fsL "$index" | \ + jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' + done + ) + +msbuild -t:restore -p:Configuration=Release -p:RestorePackagesPath="$tmpdir" \ + -p:RestoreNoCache=true -p:RestoreForce=true \ + src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj >&2 + +cd "$tmpdir" +for package in * +do + cd "$package" + for version in * + do + found=false + for repo in "${repos[@]}" + do + url="$repo$package/$version/$package.$version.nupkg" + if curl -fsL "$url" -o /dev/null + then + found=true + break + fi + done + + if ! $found + then + echo "couldn't find $package $version" >&2 + exit 1 + fi + + sha256=$(nix-prefetch-url "$url" 2>/dev/null) + cat << EOL + { + name = "$package"; + version = "$version"; + src = fetchurl { + url = "$url"; + sha256 = "$sha256"; + }; + } +EOL + done + cd .. +done +cd .. + +cat << EOL +] +EOL diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index e0710079b62..a07f2f91156 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -1,42 +1,104 @@ { lib, stdenv +, fetchFromGitHub , fetchurl -, mono +, mono6 , msbuild , dotnet-sdk , makeWrapper -, dotnetPackages +, unzip +, writeText }: -stdenv.mkDerivation rec { +let + + deps = map (package: stdenv.mkDerivation (with package; { + pname = name; + inherit version src; + + buildInputs = [ unzip ]; + unpackPhase = '' + unzip $src + chmod -R u+r . + function traverseRename () { + for e in * + do + t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")" + [ "$t" != "$e" ] && mv -vn "$e" "$t" + if [ -d "$t" ] + then + cd "$t" + traverseRename + cd .. + fi + done + } + + traverseRename + ''; + + installPhase = '' + runHook preInstall + + package=$out/lib/dotnet/${name}/${version} + mkdir -p $package + cp -r . $package + echo "{}" > $package/.nupkg.metadata + + runHook postInstall + ''; + + dontFixup = true; + })) + (import ./deps.nix { inherit fetchurl; }); + + nuget-config = writeText "NuGet.Config" '' + + + + + + + ${lib.concatStringsSep "\n" (map (package: "") deps)} + + + ''; + +in stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; version = "1.37.8"; - src = fetchurl { - url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0kgv4l15rli9a7grmcsbv72csmxi7vqa7lrrr8bd4cq9ighh54q3"; + src = fetchFromGitHub { + owner = "OmniSharp"; + repo = pname; + rev = "v${version}"; + sha256 = "1zi31m6ngk4rm7444n6q7mim096w5h4j2biwmvwmcf5yvig845za"; }; - nativeBuildInputs = [ makeWrapper dotnet-sdk dotnetPackages.Nuget ]; + nativeBuildInputs = [ makeWrapper msbuild ]; - preUnpack = '' - mkdir src - cd src - sourceRoot=. + buildPhase = '' + runHook preBuild + + HOME=$(pwd)/fake-home msbuild -r -p:Configuration=Release -p:RestoreConfigFile=${nuget-config} src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj + + runHook postBuild ''; installPhase = '' mkdir -p $out/bin - cd .. - cp -r src $out/ - rm -r $out/src/.msbuild - cp -r ${msbuild}/lib/mono/msbuild $out/src/.msbuild + cp -r bin/Release/OmniSharp.Stdio.Driver/net472 $out/src + cp bin/Release/OmniSharp.Host/net472/SQLitePCLRaw* $out/src + mkdir $out/src/.msbuild + ln -s ${msbuild}/lib/mono/xbuild/* $out/src/.msbuild/ + rm $out/src/.msbuild/Current + mkdir $out/src/.msbuild/Current + ln -s ${msbuild}/lib/mono/xbuild/Current/* $out/src/.msbuild/Current/ + ln -s ${msbuild}/lib/mono/msbuild/Current/bin $out/src/.msbuild/Current/Bin - chmod -R u+w $out/src - mv $out/src/.msbuild/Current/{bin,Bin} - - makeWrapper ${mono}/bin/mono $out/bin/omnisharp \ - --add-flags "$out/src/OmniSharp.exe" + makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \ + --prefix PATH : ${dotnet-sdk}/bin \ + --add-flags "$out/src/OmniSharp.exe" ''; meta = with lib; { @@ -44,7 +106,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; platforms = platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ tesq0 ericdallo ]; + maintainers = with maintainers; [ tesq0 ericdallo corngood ]; }; } diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix new file mode 100644 index 00000000000..de6761045d4 --- /dev/null +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -0,0 +1,2178 @@ +{ fetchurl }: [ + { + name = "cake.scripting.abstractions"; + version = "0.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.abstractions/0.3.0/cake.scripting.abstractions.0.3.0.nupkg"; + sha256 = "009yca6zskcwx9hg3gpgapvzl5mvisl8ni737plbznx033bhw8s8"; + }; + } + { + name = "cake.scripting.transport"; + version = "0.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/cake.scripting.transport/0.3.0/cake.scripting.transport.0.3.0.nupkg"; + sha256 = "0sc7rlnrqq30753h5cg3fndrlmix4vp2sxqb4sl044296mzcszl4"; + }; + } + { + name = "dotnet.script.dependencymodel"; + version = "1.0.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel/1.0.2/dotnet.script.dependencymodel.1.0.2.nupkg"; + sha256 = "0nqqplwykgbkpyidvkls9nrwxkpl1w1zrv8l7smjm62s18z5mqxb"; + }; + } + { + name = "dotnet.script.dependencymodel.nuget"; + version = "1.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/dotnet.script.dependencymodel.nuget/1.0.1/dotnet.script.dependencymodel.nuget.1.0.1.nupkg"; + sha256 = "1ja9wsc73l5bqx0nv8lzyj2l65h1i7sk77wc7biplb80wm1rvsj4"; + }; + } + { + name = "humanizer.core"; + version = "2.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/humanizer.core/2.2.0/humanizer.core.2.2.0.nupkg"; + sha256 = "08mzg65y9d3zvq16rsmpapcdan71ggq2mpks6k777h3wlm2sh3p5"; + }; + } + { + name = "icsharpcode.decompiler"; + version = "7.0.0.6372-preview3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/icsharpcode.decompiler/7.0.0.6372-preview3/icsharpcode.decompiler.7.0.0.6372-preview3.nupkg"; + sha256 = "0g7ki0ia1qcp9z9hgs2f63yffx66y8zi43k7nrf2n122ll1f0hsg"; + }; + } + { + name = "mcmaster.extensions.commandlineutils"; + version = "2.2.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/mcmaster.extensions.commandlineutils/2.2.4/mcmaster.extensions.commandlineutils.2.2.4.nupkg"; + sha256 = "0hy45iacm9zlrj6p2j2i2gkbs4k52mncnlnjvwgh6b6523p9msfy"; + }; + } + { + name = "mediatr"; + version = "8.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/mediatr/8.1.0/mediatr.8.1.0.nupkg"; + sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; + }; + } + { + name = "messagepack"; + version = "2.1.152"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/messagepack/2.1.152/messagepack.2.1.152.nupkg"; + sha256 = "1ks1w6pn96zm8nhz3ff6qdrmf0abppglwaa6vw83kj3d2qw74sw1"; + }; + } + { + name = "messagepackanalyzer"; + version = "2.1.152"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/messagepackanalyzer/2.1.152/messagepackanalyzer.2.1.152.nupkg"; + sha256 = "18iacmw5v3dp8lma9c0rh5jh8g1hkxnkq78kx7n00wkwxa58badx"; + }; + } + { + name = "messagepack.annotations"; + version = "2.1.152"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/messagepack.annotations/2.1.152/messagepack.annotations.2.1.152.nupkg"; + sha256 = "196swfxaz7l26hiyfv1mix0y80amhlq48krc4g5p9894wx1az3c3"; + }; + } + { + name = "microsoft.bcl.asyncinterfaces"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.0/microsoft.bcl.asyncinterfaces.1.1.0.nupkg"; + sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + }; + } + { + name = "microsoft.bcl.asyncinterfaces"; + version = "1.1.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/1.1.1/microsoft.bcl.asyncinterfaces.1.1.1.nupkg"; + sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; + }; + } + { + name = "microsoft.bcl.asyncinterfaces"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.bcl.asyncinterfaces/5.0.0/microsoft.bcl.asyncinterfaces.5.0.0.nupkg"; + sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; + }; + } + { + name = "microsoft.build"; + version = "16.9.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build/16.9.0/microsoft.build.16.9.0.nupkg"; + sha256 = "0kgfx3iqmc58f3a59ggc1wi486fjrqnzgayxldhpr2w7q5600w5p"; + }; + } + { + name = "microsoft.build.framework"; + version = "16.9.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.framework/16.9.0/microsoft.build.framework.16.9.0.nupkg"; + sha256 = "1yddq21q82p28k6cdq3hzic20l6dcma2fzfbm35zanfljxdsb4cf"; + }; + } + { + name = "microsoft.build.tasks.core"; + version = "16.9.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.core/16.9.0/microsoft.build.tasks.core.16.9.0.nupkg"; + sha256 = "1gpra00srwvwzi0a3d5nkjik9y8glh6qn0qdba4f5wiza1l2bdzw"; + }; + } + { + name = "microsoft.build.tasks.git"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.tasks.git/1.0.0/microsoft.build.tasks.git.1.0.0.nupkg"; + sha256 = "0avwja8vk56f2kr2pmrqx3h60bnwbs7ds062lhvhcxv87m5yfqnj"; + }; + } + { + name = "microsoft.build.utilities.core"; + version = "16.9.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.build.utilities.core/16.9.0/microsoft.build.utilities.core.16.9.0.nupkg"; + sha256 = "0g05hmpzj33bknigdz5samw5pqss1q0sscv34sr53w2aiki5nx2c"; + }; + } + { + name = "microsoft.codeanalysis.analyzers"; + version = "3.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzers/3.0.0/microsoft.codeanalysis.analyzers.3.0.0.nupkg"; + sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; + }; + } + { + name = "microsoft.codeanalysis.analyzerutilities"; + version = "3.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; + sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; + }; + } + { + name = "microsoft.codeanalysis.common"; + version = "3.10.0-1.21125.6"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/3.10.0-1.21125.6/microsoft.codeanalysis.common.3.10.0-1.21125.6.nupkg"; + sha256 = "0rj7210v3i16pwjswa6fz3ksg19ncn8g7nm8qp8ly3xf9v5j25kn"; + }; + } + { + name = "microsoft.codeanalysis.csharp"; + version = "3.10.0-1.21125.6"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.3.10.0-1.21125.6.nupkg"; + sha256 = "194h2r33f2w2ssbnrp21ly3m7md9mizhhanmccqbkqg3pbjd2lik"; + }; + } + { + name = "microsoft.codeanalysis.csharp.features"; + version = "3.10.0-1.21125.6"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.features.3.10.0-1.21125.6.nupkg"; + sha256 = "027njgyzc4w136sa9f68n8fx62qpzb4nigx50knljgk622k3acjl"; + }; + } + { + name = "microsoft.codeanalysis.csharp.scripting"; + version = "3.10.0-1.21125.6"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.scripting.3.10.0-1.21125.6.nupkg"; + sha256 = "1378ad9cfv5zlzix96q0viqylqzhgcb52zb8bc5y9k8rvnjqgppk"; + }; + } + { + name = "microsoft.codeanalysis.csharp.workspaces"; + version = "3.10.0-1.21125.6"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/3.10.0-1.21125.6/microsoft.codeanalysis.csharp.workspaces.3.10.0-1.21125.6.nupkg"; + sha256 = "1yhcm1qm7jjmp1fkpkkzq136frjqc558w49ygdiknyk253llqvm7"; + }; + } + { + name = "microsoft.codeanalysis.features"; + version = "3.10.0-1.21125.6"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/3.10.0-1.21125.6/microsoft.codeanalysis.features.3.10.0-1.21125.6.nupkg"; + sha256 = "1ydzx96a925a98zdxd6l9kgkl7b67sfbnkam61y0hkvgfdg1xg1a"; + }; + } + { + name = "microsoft.codeanalysis.scripting.common"; + version = "3.10.0-1.21125.6"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/3.10.0-1.21125.6/microsoft.codeanalysis.scripting.common.3.10.0-1.21125.6.nupkg"; + sha256 = "1blr101n2l7k0bmc248blh36a7nxbbjw3kirsn154zrbmc8s8m1m"; + }; + } + { + name = "microsoft.codeanalysis.workspaces.common"; + version = "3.10.0-1.21125.6"; + src = fetchurl { + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/3.10.0-1.21125.6/microsoft.codeanalysis.workspaces.common.3.10.0-1.21125.6.nupkg"; + sha256 = "029scic0mdbmw8gm6wmg5wsnjfx0s4wbfw5lbvyrpbfvdcagvyb2"; + }; + } + { + name = "microsoft.csharp"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.csharp/4.3.0/microsoft.csharp.4.3.0.nupkg"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + }; + } + { + name = "microsoft.diasymreader"; + version = "1.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.diasymreader/1.3.0/microsoft.diasymreader.1.3.0.nupkg"; + sha256 = "1nswah83z3pfibaqmjd8y96fgnkrak8005qqinc8nqs5mpkf5pfb"; + }; + } + { + name = "microsoft.dotnet.platformabstractions"; + version = "3.1.6"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.dotnet.platformabstractions/3.1.6/microsoft.dotnet.platformabstractions.3.1.6.nupkg"; + sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; + }; + } + { + name = "microsoft.extensions.caching.abstractions"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.abstractions/3.1.12/microsoft.extensions.caching.abstractions.3.1.12.nupkg"; + sha256 = "1p65fs9rjrygviwbqdd214p9y7acpln6zhbd6b741slvp2jwjmyg"; + }; + } + { + name = "microsoft.extensions.caching.memory"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.caching.memory/3.1.12/microsoft.extensions.caching.memory.3.1.12.nupkg"; + sha256 = "0ydrnqwnph5npf3rwzw1kzq0g3c2kajicdk251fdnjkx6yiw1vsp"; + }; + } + { + name = "microsoft.extensions.configuration"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/2.0.0/microsoft.extensions.configuration.2.0.0.nupkg"; + sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; + }; + } + { + name = "microsoft.extensions.configuration"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration/3.1.12/microsoft.extensions.configuration.3.1.12.nupkg"; + sha256 = "02bp53ahr98q3h8fzjl9rrxi48zja966dalrkbsqxqk1c5g1kl48"; + }; + } + { + name = "microsoft.extensions.configuration.abstractions"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/2.0.0/microsoft.extensions.configuration.abstractions.2.0.0.nupkg"; + sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; + }; + } + { + name = "microsoft.extensions.configuration.abstractions"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.abstractions/3.1.12/microsoft.extensions.configuration.abstractions.3.1.12.nupkg"; + sha256 = "0g35m4q03aag60pi3i5xi3p9q398w4jlq18n0n5qzq0xrlmny6k9"; + }; + } + { + name = "microsoft.extensions.configuration.binder"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/2.0.0/microsoft.extensions.configuration.binder.2.0.0.nupkg"; + sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; + }; + } + { + name = "microsoft.extensions.configuration.binder"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.binder/3.1.12/microsoft.extensions.configuration.binder.3.1.12.nupkg"; + sha256 = "18xizhcjwknwvj0fwdm91pssrpwndz7gzdlx48hph53z8cqqvkbv"; + }; + } + { + name = "microsoft.extensions.configuration.commandline"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.commandline/3.1.12/microsoft.extensions.configuration.commandline.3.1.12.nupkg"; + sha256 = "1c2qldblfp5m376a2nc82ljxjk0ljzrj48iwcvl6j48sjwcn3jl4"; + }; + } + { + name = "microsoft.extensions.configuration.environmentvariables"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.environmentvariables/3.1.12/microsoft.extensions.configuration.environmentvariables.3.1.12.nupkg"; + sha256 = "08wb14rp6pgsqwakvn0491mmarqhwbihq8gnri7bnf6chaaqbxml"; + }; + } + { + name = "microsoft.extensions.configuration.fileextensions"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.fileextensions/3.1.12/microsoft.extensions.configuration.fileextensions.3.1.12.nupkg"; + sha256 = "03qg5mjs2f6ihs5dp6d7gbv5bxd98xdvmpwzxp8qyqifjgpkprkj"; + }; + } + { + name = "microsoft.extensions.configuration.json"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.configuration.json/3.1.12/microsoft.extensions.configuration.json.3.1.12.nupkg"; + sha256 = "0mhq8d6iijhjyk9jv2k3fnqr6gpbxlzarb5m6y48dx5amnf89k42"; + }; + } + { + name = "microsoft.extensions.dependencyinjection"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/2.0.0/microsoft.extensions.dependencyinjection.2.0.0.nupkg"; + sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; + }; + } + { + name = "microsoft.extensions.dependencyinjection"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection/3.1.12/microsoft.extensions.dependencyinjection.3.1.12.nupkg"; + sha256 = "0fkcyxayj1mzdj124mabzvhl1p5irwab02rxnwf8bnvszkwgam8l"; + }; + } + { + name = "microsoft.extensions.dependencyinjection.abstractions"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/2.0.0/microsoft.extensions.dependencyinjection.abstractions.2.0.0.nupkg"; + sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; + }; + } + { + name = "microsoft.extensions.dependencyinjection.abstractions"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencyinjection.abstractions/3.1.12/microsoft.extensions.dependencyinjection.abstractions.3.1.12.nupkg"; + sha256 = "0flixm1physp9gxqzrrplzqkpfz4lljiak7fw87g65av0cksval2"; + }; + } + { + name = "microsoft.extensions.dependencymodel"; + version = "3.1.6"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.dependencymodel/3.1.6/microsoft.extensions.dependencymodel.3.1.6.nupkg"; + sha256 = "13m2na8a5mglbbjjp0dxb8ifkf23grkyk1g8585mr7v6cbj098ac"; + }; + } + { + name = "microsoft.extensions.fileproviders.abstractions"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.abstractions/3.1.12/microsoft.extensions.fileproviders.abstractions.3.1.12.nupkg"; + sha256 = "11plp1izss3sz03a76gpicwfs0l3jqad0yhz0dam6iirdniharvx"; + }; + } + { + name = "microsoft.extensions.fileproviders.physical"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.fileproviders.physical/3.1.12/microsoft.extensions.fileproviders.physical.3.1.12.nupkg"; + sha256 = "1lgqvpbqhq2izgq2cka9ls5l99gymhx1ynh1887rjb890cb9hg42"; + }; + } + { + name = "microsoft.extensions.filesystemglobbing"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.filesystemglobbing/3.1.12/microsoft.extensions.filesystemglobbing.3.1.12.nupkg"; + sha256 = "16binlxq56n6a3vkmxhlrhiyl01fb2zvyzfh00hwa4ixxfl1is8n"; + }; + } + { + name = "microsoft.extensions.logging"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/2.0.0/microsoft.extensions.logging.2.0.0.nupkg"; + sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; + }; + } + { + name = "microsoft.extensions.logging"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging/3.1.12/microsoft.extensions.logging.3.1.12.nupkg"; + sha256 = "12i0kvv4fl2y15dgzqzhqhj7fxy4qapqd78xwi1wsvrlbn9pp9h0"; + }; + } + { + name = "microsoft.extensions.logging.abstractions"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/1.1.0/microsoft.extensions.logging.abstractions.1.1.0.nupkg"; + sha256 = "0vgp0jqi7rik4p5i86ib1lzhwldc3kyf4w38a1pd3086gfz021ab"; + }; + } + { + name = "microsoft.extensions.logging.abstractions"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/2.0.0/microsoft.extensions.logging.abstractions.2.0.0.nupkg"; + sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; + }; + } + { + name = "microsoft.extensions.logging.abstractions"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.abstractions/3.1.12/microsoft.extensions.logging.abstractions.3.1.12.nupkg"; + sha256 = "0yv681ddcrsn8cf0fnfi3jgcrmganf05r8lsw82d8rk0ljbjivz5"; + }; + } + { + name = "microsoft.extensions.logging.configuration"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.configuration/3.1.12/microsoft.extensions.logging.configuration.3.1.12.nupkg"; + sha256 = "0nrijpk4azaw5xk4473yb9sc1aal7phjrbswdg7dr6yrfibpb3fn"; + }; + } + { + name = "microsoft.extensions.logging.console"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.logging.console/3.1.12/microsoft.extensions.logging.console.3.1.12.nupkg"; + sha256 = "0vr65vcw15kycbpxk5z04nwcxlkcq0ljsnb4njcbzdcj4p87bcmr"; + }; + } + { + name = "microsoft.extensions.options"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/2.0.0/microsoft.extensions.options.2.0.0.nupkg"; + sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; + }; + } + { + name = "microsoft.extensions.options"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options/3.1.12/microsoft.extensions.options.3.1.12.nupkg"; + sha256 = "0phxp1m5p2sfn7mgdb4dzb2rscda8wwzgr0hqqyh19faf0kg2msm"; + }; + } + { + name = "microsoft.extensions.options.configurationextensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/2.0.0/microsoft.extensions.options.configurationextensions.2.0.0.nupkg"; + sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; + }; + } + { + name = "microsoft.extensions.options.configurationextensions"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.options.configurationextensions/3.1.12/microsoft.extensions.options.configurationextensions.3.1.12.nupkg"; + sha256 = "1vvxhy31mf3z7al8gh9pvzn4z67ma6zc7wwc6f7bvbg6k235wz2v"; + }; + } + { + name = "microsoft.extensions.primitives"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/2.0.0/microsoft.extensions.primitives.2.0.0.nupkg"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + }; + } + { + name = "microsoft.extensions.primitives"; + version = "3.1.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.extensions.primitives/3.1.12/microsoft.extensions.primitives.3.1.12.nupkg"; + sha256 = "0ns4dsrfglas2qdn6qdyg004yjsk578fgfq76rs16hjr3iw9dkks"; + }; + } + { + name = "microsoft.netcore.app"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.app/2.1.0/microsoft.netcore.app.2.1.0.nupkg"; + sha256 = "1qgw6njwz30l5cwkvgf2fbsjqkc9vy0w3939c24iabmvjnzjr6a4"; + }; + } + { + name = "microsoft.netcore.dotnetapphost"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnetapphost/2.1.0/microsoft.netcore.dotnetapphost.2.1.0.nupkg"; + sha256 = "10hnhkix2av0c7djp2q88pw407m8gk3im4r06x762a3cs6f2jprd"; + }; + } + { + name = "microsoft.netcore.dotnethostpolicy"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethostpolicy/2.1.0/microsoft.netcore.dotnethostpolicy.2.1.0.nupkg"; + sha256 = "1xh8ij7zyfkrk20rgpwqs00mxdy2qiwr7qar2xk397zk2bh2d90n"; + }; + } + { + name = "microsoft.netcore.dotnethostresolver"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.dotnethostresolver/2.1.0/microsoft.netcore.dotnethostresolver.2.1.0.nupkg"; + sha256 = "1384k3cg4sjcn3hyalcm43fhmlfj5pnywpzd9zpgc4jsr2c16x76"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "1.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.0.1/microsoft.netcore.platforms.1.0.1.nupkg"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "2.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.0.0/microsoft.netcore.platforms.2.0.0.nupkg"; + sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.0/microsoft.netcore.platforms.2.1.0.nupkg"; + sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "2.1.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg"; + sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; + }; + } + { + name = "microsoft.netcore.platforms"; + version = "3.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/3.1.0/microsoft.netcore.platforms.3.1.0.nupkg"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + }; + } + { + name = "microsoft.netcore.targets"; + version = "1.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.0.1/microsoft.netcore.targets.1.0.1.nupkg"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }; + } + { + name = "microsoft.netcore.targets"; + version = "1.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + }; + } + { + name = "microsoft.netcore.targets"; + version = "2.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.targets/2.1.0/microsoft.netcore.targets.2.1.0.nupkg"; + sha256 = "1dav8x5551nwdqfigxf9zfsml5l9lakg86x38s9dvps81xs5d9zq"; + }; + } + { + name = "microsoft.netframework.referenceassemblies"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg"; + sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; + }; + } + { + name = "microsoft.netframework.referenceassemblies.net472"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.netframework.referenceassemblies.net472/1.0.0/microsoft.netframework.referenceassemblies.net472.1.0.0.nupkg"; + sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc"; + }; + } + { + name = "microsoft.sourcelink.common"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.common/1.0.0/microsoft.sourcelink.common.1.0.0.nupkg"; + sha256 = "1zxkpx01zdv17c39iiy8fx25ran89n14qwddh1f140v1s4dn8z9c"; + }; + } + { + name = "microsoft.sourcelink.github"; + version = "1.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.sourcelink.github/1.0.0/microsoft.sourcelink.github.1.0.0.nupkg"; + sha256 = "029ixyaqn48cjza87m5qf0g1ynyhlm6irgbx1n09src9g666yhpd"; + }; + } + { + name = "microsoft.testplatform.objectmodel"; + version = "16.6.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.objectmodel/16.6.1/microsoft.testplatform.objectmodel.16.6.1.nupkg"; + sha256 = "0q98q1nw6jl4bajm66z4a9vvh928w8ffsd3k6fpsps23ykpsky7h"; + }; + } + { + name = "microsoft.testplatform.translationlayer"; + version = "16.6.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.testplatform.translationlayer/16.6.1/microsoft.testplatform.translationlayer.16.6.1.nupkg"; + sha256 = "1j5pg3qdgqxila90x5h1hvq8wk53s4zf225x5zddmx6q26r9zq83"; + }; + } + { + name = "microsoft.visualstudio.debugger.contracts"; + version = "16.9.0-beta.20604.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.debugger.contracts/16.9.0-beta.20604.1/microsoft.visualstudio.debugger.contracts.16.9.0-beta.20604.1.nupkg"; + sha256 = "0sy1ahy1xv39mkk5inhb63lmfnmkcc6vjljhljx0l2lkrrc33k0h"; + }; + } + { + name = "microsoft.visualstudio.sdk.embedinteroptypes"; + version = "15.0.12"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.sdk.embedinteroptypes/15.0.12/microsoft.visualstudio.sdk.embedinteroptypes.15.0.12.nupkg"; + sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; + }; + } + { + name = "microsoft.visualstudio.setup.configuration.interop"; + version = "1.14.114"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.14.114/microsoft.visualstudio.setup.configuration.interop.1.14.114.nupkg"; + sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; + }; + } + { + name = "microsoft.visualstudio.setup.configuration.interop"; + version = "1.16.30"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.setup.configuration.interop/1.16.30/microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg"; + sha256 = "14022lx03vdcqlvbbdmbsxg5pqfx1rfq2jywxlyaz9v68cvsb0g4"; + }; + } + { + name = "microsoft.visualstudio.threading"; + version = "16.7.56"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading/16.7.56/microsoft.visualstudio.threading.16.7.56.nupkg"; + sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; + }; + } + { + name = "microsoft.visualstudio.threading.analyzers"; + version = "16.7.56"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.threading.analyzers/16.7.56/microsoft.visualstudio.threading.analyzers.16.7.56.nupkg"; + sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; + }; + } + { + name = "microsoft.visualstudio.validation"; + version = "15.5.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.validation/15.5.31/microsoft.visualstudio.validation.15.5.31.nupkg"; + sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; + }; + } + { + name = "microsoft.win32.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; + sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; + }; + } + { + name = "microsoft.win32.registry"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.3.0/microsoft.win32.registry.4.3.0.nupkg"; + sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; + }; + } + { + name = "microsoft.win32.registry"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.6.0/microsoft.win32.registry.4.6.0.nupkg"; + sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; + }; + } + { + name = "nerdbank.streams"; + version = "2.6.81"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nerdbank.streams/2.6.81/nerdbank.streams.2.6.81.nupkg"; + sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; + }; + } + { + name = "netstandard.library"; + version = "1.6.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/1.6.1/netstandard.library.1.6.1.nupkg"; + sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; + }; + } + { + name = "netstandard.library"; + version = "2.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; + sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; + }; + } + { + name = "newtonsoft.json"; + version = "11.0.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/11.0.2/newtonsoft.json.11.0.2.nupkg"; + sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; + }; + } + { + name = "newtonsoft.json"; + version = "12.0.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/12.0.3/newtonsoft.json.12.0.3.nupkg"; + sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; + }; + } + { + name = "newtonsoft.json"; + version = "9.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/newtonsoft.json/9.0.1/newtonsoft.json.9.0.1.nupkg"; + sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; + }; + } + { + name = "nuget.common"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.common/5.2.0/nuget.common.5.2.0.nupkg"; + sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac"; + }; + } + { + name = "nuget.configuration"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.configuration/5.2.0/nuget.configuration.5.2.0.nupkg"; + sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1"; + }; + } + { + name = "nuget.dependencyresolver.core"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.dependencyresolver.core/5.2.0/nuget.dependencyresolver.core.5.2.0.nupkg"; + sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; + }; + } + { + name = "nuget.frameworks"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.0.0/nuget.frameworks.5.0.0.nupkg"; + sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + }; + } + { + name = "nuget.frameworks"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.frameworks/5.2.0/nuget.frameworks.5.2.0.nupkg"; + sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp"; + }; + } + { + name = "nuget.librarymodel"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.librarymodel/5.2.0/nuget.librarymodel.5.2.0.nupkg"; + sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk"; + }; + } + { + name = "nuget.packaging"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging/5.2.0/nuget.packaging.5.2.0.nupkg"; + sha256 = "14frrbdkka9jd6g52bv4lbqnpckw09yynr08f9kfgbc3j8pklqqb"; + }; + } + { + name = "nuget.packaging.core"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.packaging.core/5.2.0/nuget.packaging.core.5.2.0.nupkg"; + sha256 = "16sm2amzvbpmisb6x6dz1pvj1h3xm67vd2byl1wl13vrda0az3xb"; + }; + } + { + name = "nuget.projectmodel"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.projectmodel/5.2.0/nuget.projectmodel.5.2.0.nupkg"; + sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h"; + }; + } + { + name = "nuget.protocol"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.protocol/5.2.0/nuget.protocol.5.2.0.nupkg"; + sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd"; + }; + } + { + name = "nuget.versioning"; + version = "5.2.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/nuget.versioning/5.2.0/nuget.versioning.5.2.0.nupkg"; + sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; + }; + } + { + name = "omnisharp.extensions.jsonrpc"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc/0.19.0/omnisharp.extensions.jsonrpc.0.19.0.nupkg"; + sha256 = "0m9lw21iz90ayl35f24ir3vbiydf4sjqw590qqgwknykpzsi1ai2"; + }; + } + { + name = "omnisharp.extensions.jsonrpc.generators"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.jsonrpc.generators/0.19.0/omnisharp.extensions.jsonrpc.generators.0.19.0.nupkg"; + sha256 = "17akjdh9dnyxr01lnlsa41ca52psqnny8j3wxz904zs15pz932ln"; + }; + } + { + name = "omnisharp.extensions.languageprotocol"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageprotocol/0.19.0/omnisharp.extensions.languageprotocol.0.19.0.nupkg"; + sha256 = "06d4wakdaj42c9qnlhdyqrjnm97azp4hrvfg70f96ldl765y9vrf"; + }; + } + { + name = "omnisharp.extensions.languageserver"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver/0.19.0/omnisharp.extensions.languageserver.0.19.0.nupkg"; + sha256 = "0k1z3zchl1d82fj0ha63i54g5j046iaz8vb3cyxpjb6kp7zah28v"; + }; + } + { + name = "omnisharp.extensions.languageserver.shared"; + version = "0.19.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/omnisharp.extensions.languageserver.shared/0.19.0/omnisharp.extensions.languageserver.shared.0.19.0.nupkg"; + sha256 = "0s3h9v5p043ip27g9jcvd0np9q3hn2pfv6gn539m45yb5d74a6i5"; + }; + } + { + name = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; + }; + } + { + name = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; + }; + } + { + name = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; + }; + } + { + name = "runtime.native.system"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }; + } + { + name = "runtime.native.system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.io.compression/4.3.0/runtime.native.system.io.compression.4.3.0.nupkg"; + sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; + }; + } + { + name = "runtime.native.system.net.http"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.net.http/4.3.0/runtime.native.system.net.http.4.3.0.nupkg"; + sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; + }; + } + { + name = "runtime.native.system.security.cryptography.apple"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.apple/4.3.0/runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; + sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; + }; + } + { + name = "runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; + }; + } + { + name = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; + }; + } + { + name = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; + }; + } + { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg"; + sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; + }; + } + { + name = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; + }; + } + { + name = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; + }; + } + { + name = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; + }; + } + { + name = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; + }; + } + { + name = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; + }; + } + { + name = "sqlitepclraw.bundle_green"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.bundle_green/2.0.4/sqlitepclraw.bundle_green.2.0.4.nupkg"; + sha256 = "1197ynpm4fl6il9vi0mi1s1pmw3rk3j0a05kwrxpqlfgp7iwhc22"; + }; + } + { + name = "sqlitepclraw.core"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.0.4/sqlitepclraw.core.2.0.4.nupkg"; + sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1"; + }; + } + { + name = "sqlitepclraw.lib.e_sqlite3"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.lib.e_sqlite3/2.0.4/sqlitepclraw.lib.e_sqlite3.2.0.4.nupkg"; + sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c"; + }; + } + { + name = "sqlitepclraw.provider.dynamic_cdecl"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.dynamic_cdecl/2.0.4/sqlitepclraw.provider.dynamic_cdecl.2.0.4.nupkg"; + sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j"; + }; + } + { + name = "sqlitepclraw.provider.e_sqlite3"; + version = "2.0.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.e_sqlite3/2.0.4/sqlitepclraw.provider.e_sqlite3.2.0.4.nupkg"; + sha256 = "1vm8w8xvqi11sihdz5s6y4w7ghq4pp5f2ksixdhlbycvs6m4h7i7"; + }; + } + { + name = "system.appcontext"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.appcontext/4.3.0/system.appcontext.4.3.0.nupkg"; + sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; + }; + } + { + name = "system.buffers"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.3.0/system.buffers.4.3.0.nupkg"; + sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; + }; + } + { + name = "system.buffers"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.4.0/system.buffers.4.4.0.nupkg"; + sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; + }; + } + { + name = "system.buffers"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.0/system.buffers.4.5.0.nupkg"; + sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; + }; + } + { + name = "system.buffers"; + version = "4.5.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; + sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; + }; + } + { + name = "system.codedom"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.codedom/4.4.0/system.codedom.4.4.0.nupkg"; + sha256 = "1zgbafm5p380r50ap5iddp11kzhr9khrf2pnai6k593wjar74p1g"; + }; + } + { + name = "system.collections"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.0.11/system.collections.4.0.11.nupkg"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }; + } + { + name = "system.collections"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections/4.3.0/system.collections.4.3.0.nupkg"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }; + } + { + name = "system.collections.concurrent"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections.concurrent/4.3.0/system.collections.concurrent.4.3.0.nupkg"; + sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; + }; + } + { + name = "system.collections.immutable"; + version = "1.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.5.0/system.collections.immutable.1.5.0.nupkg"; + sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; + }; + } + { + name = "system.collections.immutable"; + version = "1.7.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/1.7.1/system.collections.immutable.1.7.1.nupkg"; + sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; + }; + } + { + name = "system.collections.immutable"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.collections.immutable/5.0.0/system.collections.immutable.5.0.0.nupkg"; + sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; + }; + } + { + name = "system.componentmodel.annotations"; + version = "4.4.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.4.1/system.componentmodel.annotations.4.4.1.nupkg"; + sha256 = "1d46yx6h36bssqyshq44qxx0fsx43bjf09zrlbvqfigacfsp9mph"; + }; + } + { + name = "system.componentmodel.annotations"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.annotations/4.7.0/system.componentmodel.annotations.4.7.0.nupkg"; + sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; + }; + } + { + name = "system.componentmodel.composition"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.componentmodel.composition/4.5.0/system.componentmodel.composition.4.5.0.nupkg"; + sha256 = "196ihd17in5idnxq5l5xvpa1fhqamnihjg3mcmv1k4n8bjrrj5y7"; + }; + } + { + name = "system.composition"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition/1.0.31/system.composition.1.0.31.nupkg"; + sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61"; + }; + } + { + name = "system.composition.attributedmodel"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.attributedmodel/1.0.31/system.composition.attributedmodel.1.0.31.nupkg"; + sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv"; + }; + } + { + name = "system.composition.convention"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.convention/1.0.31/system.composition.convention.1.0.31.nupkg"; + sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r"; + }; + } + { + name = "system.composition.hosting"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.hosting/1.0.31/system.composition.hosting.1.0.31.nupkg"; + sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy"; + }; + } + { + name = "system.composition.runtime"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.runtime/1.0.31/system.composition.runtime.1.0.31.nupkg"; + sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws"; + }; + } + { + name = "system.composition.typedparts"; + version = "1.0.31"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.composition.typedparts/1.0.31/system.composition.typedparts.1.0.31.nupkg"; + sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63"; + }; + } + { + name = "system.console"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.console/4.3.0/system.console.4.3.0.nupkg"; + sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; + }; + } + { + name = "system.diagnostics.debug"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + }; + } + { + name = "system.diagnostics.diagnosticsource"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.diagnosticsource/4.3.0/system.diagnostics.diagnosticsource.4.3.0.nupkg"; + sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; + }; + } + { + name = "system.diagnostics.process"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; + sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; + }; + } + { + name = "system.diagnostics.tools"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tools/4.3.0/system.diagnostics.tools.4.3.0.nupkg"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + }; + } + { + name = "system.diagnostics.tracing"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; + sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; + }; + } + { + name = "system.dynamic.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.dynamic.runtime/4.3.0/system.dynamic.runtime.4.3.0.nupkg"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + }; + } + { + name = "system.globalization"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.0.11/system.globalization.4.0.11.nupkg"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }; + } + { + name = "system.globalization"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }; + } + { + name = "system.globalization.calendars"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.globalization.calendars/4.3.0/system.globalization.calendars.4.3.0.nupkg"; + sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; + }; + } + { + name = "system.globalization.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.globalization.extensions/4.3.0/system.globalization.extensions.4.3.0.nupkg"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; + }; + } + { + name = "system.io"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io/4.1.0/system.io.4.1.0.nupkg"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + }; + } + { + name = "system.io"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io/4.3.0/system.io.4.3.0.nupkg"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + }; + } + { + name = "system.io.compression"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.compression/4.3.0/system.io.compression.4.3.0.nupkg"; + sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; + }; + } + { + name = "system.io.compression.zipfile"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.compression.zipfile/4.3.0/system.io.compression.zipfile.4.3.0.nupkg"; + sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; + }; + } + { + name = "system.io.filesystem"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + }; + } + { + name = "system.io.filesystem.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + }; + } + { + name = "system.io.pipelines"; + version = "4.7.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/4.7.3/system.io.pipelines.4.7.3.nupkg"; + sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; + }; + } + { + name = "system.io.pipelines"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.0/system.io.pipelines.5.0.0.nupkg"; + sha256 = "1kdvbzr98sdddm18r3gbsbcxpv58gm1yy3iig8zg9dvp7mli7453"; + }; + } + { + name = "system.linq"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq/4.3.0/system.linq.4.3.0.nupkg"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + }; + } + { + name = "system.linq.expressions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.linq.expressions/4.3.0/system.linq.expressions.4.3.0.nupkg"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + }; + } + { + name = "system.memory"; + version = "4.5.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.2/system.memory.4.5.2.nupkg"; + sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; + }; + } + { + name = "system.memory"; + version = "4.5.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.3/system.memory.4.5.3.nupkg"; + sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; + }; + } + { + name = "system.memory"; + version = "4.5.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.4/system.memory.4.5.4.nupkg"; + sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; + }; + } + { + name = "system.net.http"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.http/4.3.0/system.net.http.4.3.0.nupkg"; + sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; + }; + } + { + name = "system.net.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; + sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; + }; + } + { + name = "system.net.sockets"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; + sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; + }; + } + { + name = "system.net.websockets"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.net.websockets/4.3.0/system.net.websockets.4.3.0.nupkg"; + sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; + }; + } + { + name = "system.numerics.vectors"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; + sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; + }; + } + { + name = "system.numerics.vectors"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; + sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; + }; + } + { + name = "system.objectmodel"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.objectmodel/4.3.0/system.objectmodel.4.3.0.nupkg"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + }; + } + { + name = "system.reactive"; + version = "4.4.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reactive/4.4.1/system.reactive.4.4.1.nupkg"; + sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; + }; + } + { + name = "system.reflection"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.1.0/system.reflection.4.1.0.nupkg"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }; + } + { + name = "system.reflection"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }; + } + { + name = "system.reflection.dispatchproxy"; + version = "4.5.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.dispatchproxy/4.5.1/system.reflection.dispatchproxy.4.5.1.nupkg"; + sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; + }; + } + { + name = "system.reflection.emit"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.3.0/system.reflection.emit.4.3.0.nupkg"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }; + } + { + name = "system.reflection.emit"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit/4.6.0/system.reflection.emit.4.6.0.nupkg"; + sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + }; + } + { + name = "system.reflection.emit.ilgeneration"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.3.0/system.reflection.emit.ilgeneration.4.3.0.nupkg"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + }; + } + { + name = "system.reflection.emit.ilgeneration"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.ilgeneration/4.6.0/system.reflection.emit.ilgeneration.4.6.0.nupkg"; + sha256 = "0jxc26k5q0rwrldi30bfbrfw4jh3kvribzwc8ryzr24kmhr3vv96"; + }; + } + { + name = "system.reflection.emit.lightweight"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.3.0/system.reflection.emit.lightweight.4.3.0.nupkg"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + }; + } + { + name = "system.reflection.emit.lightweight"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.emit.lightweight/4.6.0/system.reflection.emit.lightweight.4.6.0.nupkg"; + sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; + }; + } + { + name = "system.reflection.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.extensions/4.3.0/system.reflection.extensions.4.3.0.nupkg"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }; + } + { + name = "system.reflection.metadata"; + version = "1.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/1.6.0/system.reflection.metadata.1.6.0.nupkg"; + sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; + }; + } + { + name = "system.reflection.metadata"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.metadata/5.0.0/system.reflection.metadata.5.0.0.nupkg"; + sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; + }; + } + { + name = "system.reflection.primitives"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.0.1/system.reflection.primitives.4.0.1.nupkg"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + }; + } + { + name = "system.reflection.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + }; + } + { + name = "system.reflection.typeextensions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.1.0/system.reflection.typeextensions.4.1.0.nupkg"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + }; + } + { + name = "system.reflection.typeextensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.reflection.typeextensions/4.3.0/system.reflection.typeextensions.4.3.0.nupkg"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + }; + } + { + name = "system.resources.extensions"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.resources.extensions/4.6.0/system.resources.extensions.4.6.0.nupkg"; + sha256 = "0inch9jgchgmsg3xjivbhh9mpin40mhdd8dgf4i1p3g42i0hzc0j"; + }; + } + { + name = "system.resources.resourcemanager"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.0.1/system.resources.resourcemanager.4.0.1.nupkg"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + }; + } + { + name = "system.resources.resourcemanager"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + }; + } + { + name = "system.runtime"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.1.0/system.runtime.4.1.0.nupkg"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }; + } + { + name = "system.runtime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.4.0/system.runtime.compilerservices.unsafe.4.4.0.nupkg"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.5.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.2/system.runtime.compilerservices.unsafe.4.5.2.nupkg"; + sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.5.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.3/system.runtime.compilerservices.unsafe.4.5.3.nupkg"; + sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.0/system.runtime.compilerservices.unsafe.4.7.0.nupkg"; + sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "4.7.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.7.1/system.runtime.compilerservices.unsafe.4.7.1.nupkg"; + sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; + }; + } + { + name = "system.runtime.compilerservices.unsafe"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/5.0.0/system.runtime.compilerservices.unsafe.5.0.0.nupkg"; + sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; + }; + } + { + name = "system.runtime.extensions"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.1.0/system.runtime.extensions.4.1.0.nupkg"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + }; + } + { + name = "system.runtime.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + }; + } + { + name = "system.runtime.handles"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.0.1/system.runtime.handles.4.0.1.nupkg"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + }; + } + { + name = "system.runtime.handles"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; + }; + } + { + name = "system.runtime.interopservices"; + version = "4.1.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.1.0/system.runtime.interopservices.4.1.0.nupkg"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + }; + } + { + name = "system.runtime.interopservices"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + }; + } + { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.0.0/system.runtime.interopservices.runtimeinformation.4.0.0.nupkg"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }; + } + { + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }; + } + { + name = "system.runtime.interopservices.windowsruntime"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.interopservices.windowsruntime/4.3.0/system.runtime.interopservices.windowsruntime.4.3.0.nupkg"; + sha256 = "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9"; + }; + } + { + name = "system.runtime.numerics"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.runtime.numerics/4.3.0/system.runtime.numerics.4.3.0.nupkg"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + }; + } + { + name = "system.security.accesscontrol"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.5.0/system.security.accesscontrol.4.5.0.nupkg"; + sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; + }; + } + { + name = "system.security.accesscontrol"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.6.0/system.security.accesscontrol.4.6.0.nupkg"; + sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; + }; + } + { + name = "system.security.accesscontrol"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.accesscontrol/4.7.0/system.security.accesscontrol.4.7.0.nupkg"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + }; + } + { + name = "system.security.cryptography.algorithms"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.algorithms/4.3.0/system.security.cryptography.algorithms.4.3.0.nupkg"; + sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; + }; + } + { + name = "system.security.cryptography.cng"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.3.0/system.security.cryptography.cng.4.3.0.nupkg"; + sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; + }; + } + { + name = "system.security.cryptography.cng"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.cng/4.7.0/system.security.cryptography.cng.4.7.0.nupkg"; + sha256 = "00797sqbba8lys486ifxblz9j52m29kidclvmqpk531820k55x9j"; + }; + } + { + name = "system.security.cryptography.csp"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.csp/4.3.0/system.security.cryptography.csp.4.3.0.nupkg"; + sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; + }; + } + { + name = "system.security.cryptography.encoding"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.encoding/4.3.0/system.security.cryptography.encoding.4.3.0.nupkg"; + sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; + }; + } + { + name = "system.security.cryptography.openssl"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.openssl/4.3.0/system.security.cryptography.openssl.4.3.0.nupkg"; + sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; + }; + } + { + name = "system.security.cryptography.pkcs"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.pkcs/4.7.0/system.security.cryptography.pkcs.4.7.0.nupkg"; + sha256 = "1mwvzl5ask8kk0vdgchhqr90nl61kagg47warb7dxrb03cxjd4wm"; + }; + } + { + name = "system.security.cryptography.primitives"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.primitives/4.3.0/system.security.cryptography.primitives.4.3.0.nupkg"; + sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; + }; + } + { + name = "system.security.cryptography.protecteddata"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.3.0/system.security.cryptography.protecteddata.4.3.0.nupkg"; + sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; + }; + } + { + name = "system.security.cryptography.x509certificates"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.x509certificates/4.3.0/system.security.cryptography.x509certificates.4.3.0.nupkg"; + sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; + }; + } + { + name = "system.security.cryptography.xml"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.xml/4.7.0/system.security.cryptography.xml.4.7.0.nupkg"; + sha256 = "08c82yb1nhfqr15rrypc36c7pysp7jymkwnra84w72nd53h3dfgb"; + }; + } + { + name = "system.security.permissions"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.5.0/system.security.permissions.4.5.0.nupkg"; + sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; + }; + } + { + name = "system.security.permissions"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.permissions/4.7.0/system.security.permissions.4.7.0.nupkg"; + sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; + }; + } + { + name = "system.security.principal.windows"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.5.0/system.security.principal.windows.4.5.0.nupkg"; + sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; + }; + } + { + name = "system.security.principal.windows"; + version = "4.6.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.6.0/system.security.principal.windows.4.6.0.nupkg"; + sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; + }; + } + { + name = "system.security.principal.windows"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.security.principal.windows/4.7.0/system.security.principal.windows.4.7.0.nupkg"; + sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + }; + } + { + name = "system.text.encoding"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.0.11/system.text.encoding.4.0.11.nupkg"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + }; + } + { + name = "system.text.encoding"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + }; + } + { + name = "system.text.encoding.codepages"; + version = "4.0.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.0.1/system.text.encoding.codepages.4.0.1.nupkg"; + sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; + }; + } + { + name = "system.text.encoding.codepages"; + version = "4.5.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg"; + sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; + }; + } + { + name = "system.text.encoding.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }; + } + { + name = "system.text.encodings.web"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.0/system.text.encodings.web.4.7.0.nupkg"; + sha256 = "0sd3bihfar5rwm6nib4lhyys306nkm02qvk6p6sgzmnlfmma2wn3"; + }; + } + { + name = "system.text.encodings.web"; + version = "4.7.1"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.encodings.web/4.7.1/system.text.encodings.web.4.7.1.nupkg"; + sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb"; + }; + } + { + name = "system.text.json"; + version = "4.7.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.0/system.text.json.4.7.0.nupkg"; + sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; + }; + } + { + name = "system.text.json"; + version = "4.7.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.json/4.7.2/system.text.json.4.7.2.nupkg"; + sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + }; + } + { + name = "system.text.regularexpressions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.text.regularexpressions/4.3.0/system.text.regularexpressions.4.3.0.nupkg"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + }; + } + { + name = "system.threading"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.0.11/system.threading.4.0.11.nupkg"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }; + } + { + name = "system.threading"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading/4.3.0/system.threading.4.3.0.nupkg"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }; + } + { + name = "system.threading.tasks"; + version = "4.0.11"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.0.11/system.threading.tasks.4.0.11.nupkg"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + }; + } + { + name = "system.threading.tasks"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + }; + } + { + name = "system.threading.tasks.dataflow"; + version = "5.0.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.dataflow/5.0.0/system.threading.tasks.dataflow.5.0.0.nupkg"; + sha256 = "028fimgwn5j9fv6m547c975a8b90d9qcnb89k5crjyspsnjcqbhy"; + }; + } + { + name = "system.threading.tasks.extensions"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.3.0/system.threading.tasks.extensions.4.3.0.nupkg"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }; + } + { + name = "system.threading.tasks.extensions"; + version = "4.5.2"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.2/system.threading.tasks.extensions.4.5.2.nupkg"; + sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; + }; + } + { + name = "system.threading.tasks.extensions"; + version = "4.5.3"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.3/system.threading.tasks.extensions.4.5.3.nupkg"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }; + } + { + name = "system.threading.tasks.extensions"; + version = "4.5.4"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; + sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; + }; + } + { + name = "system.threading.thread"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; + sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; + }; + } + { + name = "system.threading.threadpool"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; + sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; + }; + } + { + name = "system.threading.timer"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.threading.timer/4.3.0/system.threading.timer.4.3.0.nupkg"; + sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; + }; + } + { + name = "system.valuetuple"; + version = "4.4.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.valuetuple/4.4.0/system.valuetuple.4.4.0.nupkg"; + sha256 = "1wydfgszs00yxga57sam66vzv9fshk2pw7gim57saplsnkfliaif"; + }; + } + { + name = "system.valuetuple"; + version = "4.5.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; + sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; + }; + } + { + name = "system.xml.readerwriter"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.readerwriter/4.3.0/system.xml.readerwriter.4.3.0.nupkg"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + }; + } + { + name = "system.xml.xdocument"; + version = "4.3.0"; + src = fetchurl { + url = "https://api.nuget.org/v3-flatcontainer/system.xml.xdocument/4.3.0/system.xml.xdocument.4.3.0.nupkg"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + }; + } +] From 1dbc93ad543121f66b0a5a812e2147895f482375 Mon Sep 17 00:00:00 2001 From: Dawid Gliwka Date: Sat, 10 Jul 2021 13:34:44 +0200 Subject: [PATCH 033/188] pythonPackages.ratelim: init at 0.1.6 --- .../python-modules/ratelim/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/ratelim/default.nix diff --git a/pkgs/development/python-modules/ratelim/default.nix b/pkgs/development/python-modules/ratelim/default.nix new file mode 100644 index 00000000000..8fc3323ce1b --- /dev/null +++ b/pkgs/development/python-modules/ratelim/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, decorator +}: + +buildPythonPackage rec { + pname = "ratelim"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "07dirdd8y23706110nb0lfz5pzbrcvd9y74h64la3y8igqbk4vc2"; + }; + + propagatedBuildInputs = [ + decorator + ]; + + pythonImportsCheck = [ "ratelim" ]; + + # package has no tests + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/themiurgo/ratelim"; + description = "Simple Python library that limits the number of times a function can be called during a time interval"; + license = licenses.mit; + maintainers = with maintainers; [ dgliwka ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e61983ead9..f040c561ee0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7418,6 +7418,8 @@ in { gdal = pkgs.gdal_2; }; + ratelim = callPackage ../development/python-modules/ratelim { }; + ratelimit = callPackage ../development/python-modules/ratelimit { }; ratelimiter = callPackage ../development/python-modules/ratelimiter { }; From 6c3c1e46a2a90c891920c9487598770a24d71922 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 9 Jul 2021 23:21:11 -0400 Subject: [PATCH 034/188] sx: init at 2.1.7 --- pkgs/tools/X11/sx/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/X11/sx/default.nix diff --git a/pkgs/tools/X11/sx/default.nix b/pkgs/tools/X11/sx/default.nix new file mode 100644 index 00000000000..c03d4443fcf --- /dev/null +++ b/pkgs/tools/X11/sx/default.nix @@ -0,0 +1,30 @@ +{ coreutils, fetchFromGitHub, lib, makeWrapper, stdenv, util-linux, xauth, xorgserver }: + +stdenv.mkDerivation rec { + pname = "sx"; + version = "2.1.7"; + + src = fetchFromGitHub { + owner = "earnestly"; + repo = pname; + rev = version; + sha256 = "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + wrapProgram $out/bin/sx \ + --prefix PATH : ${lib.makeBinPath [ coreutils util-linux xorgserver xauth ]} + ''; + + meta = with lib; { + description = "Simple alternative to both xinit and startx for starting a Xorg server"; + homepage = "https://github.com/earnestly/sx"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 786dd4e0dc2..22e7ba0bfc6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9114,6 +9114,10 @@ in squeekboard = callPackage ../applications/accessibility/squeekboard { }; + sx = callPackage ../tools/X11/sx { + inherit (xorg) xauth xorgserver; + }; + t = callPackage ../tools/misc/t { }; tabnine = callPackage ../development/tools/tabnine { }; From ea01f1499ad052ab782a690962ee15faacb7efdd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Jul 2021 04:45:40 +0000 Subject: [PATCH 035/188] eksctl: 0.55.0 -> 0.56.0 --- pkgs/tools/admin/eksctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 9af721f02e5..0bfedc2f036 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-5PrwOR70pSmNPHFSDHRvXNn0pksIQun5jJkcCFsYhCE="; + sha256 = "sha256-Wa6uvoAsPuswcrPgkLb8qTDEbUyeSeRSIO5t9z5/dqY="; }; vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs="; From 6fd6f2cafd73c76d5deb5851558b8cf6b83b96ff Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Sun, 11 Jul 2021 08:39:01 +0200 Subject: [PATCH 036/188] Update QOwnNotes to 21.7.4 --- pkgs/applications/office/qownnotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 71717c010dd..4f3fde81e98 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.5.2"; + version = "21.7.4"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "cf68dc78e641ca66403621cef4002ddd09463ead2eb060812d8124d6749ba03b"; + sha256 = "3957dc623b419582ef7ccc5cb04b8f97bed4e96e8ecc2e99bef9dca7ce255b8e"; }; nativeBuildInputs = [ qmake qttools ]; From 2e090199f60254009a5206e684f6b0aac5c43800 Mon Sep 17 00:00:00 2001 From: Malte Voos Date: Sun, 11 Jul 2021 10:20:59 +0200 Subject: [PATCH 037/188] n2n: init at 2.8 --- pkgs/tools/networking/n2n/default.nix | 32 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/networking/n2n/default.nix diff --git a/pkgs/tools/networking/n2n/default.nix b/pkgs/tools/networking/n2n/default.nix new file mode 100644 index 00000000000..aec4a1c5f53 --- /dev/null +++ b/pkgs/tools/networking/n2n/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config }: + +stdenv.mkDerivation rec { + pname = "n2n"; + version = "2.8"; + + src = fetchFromGitHub { + owner = "ntop"; + repo = "n2n"; + rev = version; + hash = "sha256-2xJ8gYVZJZoKs6PZ/9GacgxQ+/3tmnRntT1AbPe1At4="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + postPatch = '' + patchShebangs autogen.sh + ''; + + preAutoreconf = '' + ./autogen.sh + ''; + + PREFIX = placeholder "out"; + + meta = with lib; { + description = "Peer-to-peer VPN"; + homepage = "https://www.ntop.org/products/n2n/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ca6d840318..f53f08e1da9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3067,6 +3067,8 @@ in mq-cli = callPackage ../tools/system/mq-cli { }; + n2n = callPackage ../tools/networking/n2n { }; + nextdns = callPackage ../applications/networking/nextdns { }; ngadmin = callPackage ../applications/networking/ngadmin { }; From b1fdeba5408f65d5779af4423114f18b13022901 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sat, 1 May 2021 10:45:17 +0200 Subject: [PATCH 038/188] golden-cheetah: 3.5 -> 3.6-DEV2107 The licence has been modified upstream ([1]). [1] https://github.com/GoldenCheetah/GoldenCheetah/commit/d2a8951c93191dd665c76ec28014f3cdc4212713 --- .../misc/golden-cheetah/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index c3b9a3226a3..53c0a96060e 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools -, qtconnectivity, qtcharts, libusb-compat-0_1 +, qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas , bison, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -16,18 +16,18 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.5"; + version = "3.6-DEV2107"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - rev = "V${version}"; - sha256 = "1lyd0b2s3s9c2ppj7l4hf3s4gfzscaaam2pbiaby714bi9nr0ka7"; + rev = "v${version}"; + sha256 = "1d54x3pv27w1ys2f5l7gnfhyijhgcgdjnq1c1mj7hvg35dmh054d"; }; buildInputs = [ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib - qtconnectivity qtcharts libusb-compat-0_1 + qtconnectivity qtcharts libusb-compat-0_1 gsl blas ]; nativeBuildInputs = [ flex makeWrapper qmake bison ]; @@ -40,9 +40,9 @@ in mkDerivation rec { }) ]; - NIX_LDFLAGS = "-lz"; + NIX_LDFLAGS = "-lz -lgsl -lblas"; - qtWrapperArgs = [ "--set LD_LIBRARY_PATH ${zlib.out}/lib" ]; + qtWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" "${zlib.out}/lib" ]; preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri @@ -52,10 +52,6 @@ in mkDerivation rec { echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local - - # Use qtwebengine instead of qtwebkit - substituteInPlace src/gcconfig.pri \ - --replace "#DEFINES += NOWEBKIT" "DEFINES += NOWEBKIT" ''; installPhase = '' @@ -73,6 +69,6 @@ in mkDerivation rec { description = "Performance software for cyclists, runners and triathletes"; platforms = platforms.linux; maintainers = [ ]; - license = licenses.gpl3; + license = licenses.gpl2Plus; }; } From 930a460dc40724c6b3bea511f323522453bb927e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 10 Jul 2021 23:00:09 +0300 Subject: [PATCH 039/188] ocz-ssd-guru: remove source broken and no new source available --- pkgs/tools/misc/ocz-ssd-guru/default.nix | 53 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 pkgs/tools/misc/ocz-ssd-guru/default.nix diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix deleted file mode 100644 index 0c021591e5e..00000000000 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ fetchurl, lib, stdenv, xorg, freetype, fontconfig, libGLU, libGL, glibc, makeWrapper }: - -let - system = if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else "linux32"; -in -stdenv.mkDerivation rec { - pname = "ocz-ssd-guru"; - version = "1.0.1170"; - - src = fetchurl { - url = "http://ocz.com/consumer/download/ssd-guru/SSDGuru_${version}.tar.gz"; - sha256 = "0ri7qmpc1xpy12lpzl6k298c641wcibcwrzz8jn75wdg4rr176r5"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - libPath = lib.makeLibraryPath [ - xorg.libX11 - xorg.libxcb - freetype - fontconfig - xorg.libXext - xorg.libXi - xorg.libXrender - stdenv.cc.cc - glibc - libGLU libGL - ]; - - installPhase = '' - mkdir -p $out/bin - cp ${system}/SSDGuru $out/bin/ - rm -rf linux{32,64} - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath:$out \ - $out/bin/SSDGuru - - wrapProgram $out/bin/SSDGuru --prefix LD_LIBRARY_PATH : $libPath - ''; - - dontStrip = true; - dontPatchELF = true; - - meta = { - homepage = "http://ocz.com/ssd-guru"; - description = "SSD Management Tool for OCZ disks"; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ jagajaga ]; - }; - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0df082ff35c..0f171e57749 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -540,6 +540,7 @@ mapAliases ({ osxfuse = macfuse-stubs; # added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 owncloudclient = owncloud-client; # added 2016-08 + ocz-ssd-guru = throw "ocz-ssd-guru has been removed due to there being no source available"; # added 2021-07-12 p11_kit = p11-kit; # added 2018-02-25 parity = openethereum; # added 2020-08-01 parquet-cpp = arrow-cpp; # added 2018-09-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6b95e8f4a..61aa93f4131 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8216,8 +8216,6 @@ in quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; - ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; - q-text-as-data = callPackage ../tools/misc/q-text-as-data { }; qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; From 2da825f798af98e04307795d15196e4a483871d5 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 12 Jul 2021 04:41:26 +0200 Subject: [PATCH 040/188] betterdiscordctl: 2.0.0 -> 2.0.1 --- pkgs/tools/misc/betterdiscordctl/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/betterdiscordctl/default.nix b/pkgs/tools/misc/betterdiscordctl/default.nix index f75f3a6f822..6a20ebc10c5 100644 --- a/pkgs/tools/misc/betterdiscordctl/default.nix +++ b/pkgs/tools/misc/betterdiscordctl/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "betterdiscordctl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "bb010g"; repo = "betterdiscordctl"; rev = "v${version}"; - sha256 = "1wys3wbcz5hq8275ia2887kr5fzz4b3gkcp56667j9k0p3k3zfac"; + sha256 = "0p321rfcihz2779sdd6qfgpxgk5yd53d33vq5pvb50dbdgxww0bc"; }; postPatch = '' @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/betterdiscordctl --version + ''; + meta = with lib; { homepage = "https://github.com/bb010g/betterdiscordctl"; description = "A utility for managing BetterDiscord on Linux"; From ad28b7f10654ca2804270781e2b879e31b79b572 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 12 Jul 2021 03:48:36 +0000 Subject: [PATCH 041/188] git-cola: 3.9 -> 3.10.1 --- .../version-management/git-and-tools/git-cola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 707e0855d15..ba51824fe84 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "3.9"; + version = "3.10.1"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "11186pdgaw5p4iv10dqcnynf5pws2v9nhqqqca7z5b7m20fpfjl7"; + sha256 = "120hds7v29v70qxz20ppxf2glmgbah16v7jyy9i6hb6cfqp68vr8"; }; buildInputs = [ git gettext ]; From 3226db2a897c24913d2c261938b1945605608296 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 12 Jul 2021 04:07:50 +0000 Subject: [PATCH 042/188] go-task: 3.5.0 -> 3.6.0 --- pkgs/development/tools/go-task/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 280e0c1e986..d9b32c2c524 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-oXr98guqEvE/rpRJF5NMjQYZtzbrh1F/neXYbLaCGUg="; + sha256 = "sha256-3DTjxcMxgaTMunctHaCgOX5/P85lJDRin6RpMuv9Rfg="; }; vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI="; From b2867bc96f9ba313e23664683b6045eb42b9ee1f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 12 Jul 2021 05:02:18 +0000 Subject: [PATCH 043/188] html-tidy: 5.7.28 -> 5.8.0 --- pkgs/tools/text/html-tidy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index 6caa3d34a0c..d4bb26a0a77 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "html-tidy"; - version = "5.7.28"; + version = "5.8.0"; src = fetchFromGitHub { owner = "htacg"; repo = "tidy-html5"; rev = version; - sha256 = "sha256-Tny53PtaQWAMAEjqw4tKnmGURfZhhwFQNCJr9jjWZQY="; + sha256 = "sha256-ZMz0NySxzX2XHiqB8f5asvwjIG6kdIcq8Gb3EbAxBaU="; }; nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; From 7bea8f176278d32537ef919cd11981332dc42c73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Jul 2021 09:24:17 +0200 Subject: [PATCH 044/188] python3Packages.langdetect: 1.0.7 -> 1.0.9 --- .../python-modules/langdetect/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index 57fee2664cd..2b9f87fdd81 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -1,16 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi, six }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "langdetect"; - version = "1.0.7"; + version = "1.0.9"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "0c5zm6c7xzsigbb9c7v4r33fcpz911zscfwvh3dq1qxdy3ap18ci"; + sha256 = "1805svvb7xjm4sf1j7b6nc3409x37pd1xmabfwwjf1ldkzwgxhfb"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "langdetect" ]; meta = with lib; { description = "Python port of Google's language-detection library"; From 7e7c190af86b1c26917d0445ea8ca124fe42c617 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Jul 2021 09:32:02 +0200 Subject: [PATCH 045/188] python3Packages.libsass: 0.20.1 -> 0.21.0 --- .../python-modules/libsass/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 9feb5b1d242..5cc36906610 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -1,14 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, libsass, six, pytest, werkzeug }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, libsass +, six +, pytestCheckHook +, werkzeug +}: buildPythonPackage rec { pname = "libsass"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "sass"; repo = "libsass-python"; rev = version; - sha256 = "1r0kgl7i6nnhgjl44sjw57k08gh2qr7l8slqih550dyxbf1akbxh"; + sha256 = "sha256-4doz3kkRlyfVfeUarYw2tcybeDVeE2jpgmHxFJsPiVc="; }; buildInputs = [ libsass ]; @@ -20,16 +27,16 @@ buildPythonPackage rec { ''; checkInputs = [ - pytest + pytestCheckHook werkzeug ]; - checkPhase = '' - pytest sasstests.py - ''; + pytestFlagsArray = [ "sasstests.py" ]; + + pythonImportsCheck = [ "sass" ]; meta = with lib; { - description = "A straightforward binding of libsass for Python. Compile Sass/SCSS in Python with no Ruby stack at all!"; + description = "Python binding for libsass to compile Sass/SCSS"; homepage = "https://sass.github.io/libsass-python/"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; From 6ac9cb369d84f40998412b725b0985f81cbe5401 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Mon, 12 Jul 2021 09:50:31 +0200 Subject: [PATCH 046/188] bookstack: 21.05 -> 21.05.3 --- pkgs/servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 144 +++++++++--------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 139a8588eed..1c35ebeff3b 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -15,13 +15,13 @@ let in package.override rec { name = "bookstack"; - version = "21.05"; + version = "21.05.3"; src = fetchFromGitHub { owner = "bookstackapp"; repo = name; rev = "v${version}"; - sha256 = "0vn1n2l66xsv2qjhh53dm28vwm7d9ba62syx2gviznva1lsyn78z"; + sha256 = "0dymrmy771lv6h9432vw7d12x5xgchjn9s3z8maz3b9d5xlx9gw8"; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/bookstack/php-packages.nix b/pkgs/servers/web-apps/bookstack/php-packages.nix index aa3115ef955..69f39241f41 100644 --- a/pkgs/servers/web-apps/bookstack/php-packages.nix +++ b/pkgs/servers/web-apps/bookstack/php-packages.nix @@ -5,10 +5,10 @@ let "aws/aws-sdk-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "aws-aws-sdk-php-3b3aafdceac4cb820e2ae65a8785e4d07db471a7"; + name = "aws-aws-sdk-php-35310302912fdc3b4a0e829b84424c41e3fd9727"; src = fetchurl { - url = https://api.github.com/repos/aws/aws-sdk-php/zipball/3b3aafdceac4cb820e2ae65a8785e4d07db471a7; - sha256 = "0pyc5n1h9c12li03wk0p04k25rg1x8qlq4ns4wr8xbxcysdm6xi1"; + url = https://api.github.com/repos/aws/aws-sdk-php/zipball/35310302912fdc3b4a0e829b84424c41e3fd9727; + sha256 = "043ia45zlb3596cnh76yc7wvizr8acn5jrilnnqdv78v07s9c99i"; }; }; }; @@ -35,20 +35,20 @@ let "doctrine/cache" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-cache-3bb5588cec00a0268829cc4a518490df6741af9d"; + name = "doctrine-cache-c9622c6820d3ede1e2315a6a377ea1076e421d88"; src = fetchurl { - url = https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d; - sha256 = "0r9fhv0y79ma7a5llmj1skycflnwbxyyrblkavjj6svld46li94q"; + url = https://api.github.com/repos/doctrine/cache/zipball/c9622c6820d3ede1e2315a6a377ea1076e421d88; + sha256 = "0dw03i597mffza3bllsh89fqwa61zwhp0gvs8hh6qzkhwmsw9rk5"; }; }; }; "doctrine/dbal" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "doctrine-dbal-c800380457948e65bbd30ba92cc17cda108bf8c9"; + name = "doctrine-dbal-8dd39d2ead4409ce652fd4f02621060f009ea5e4"; src = fetchurl { - url = https://api.github.com/repos/doctrine/dbal/zipball/c800380457948e65bbd30ba92cc17cda108bf8c9; - sha256 = "1x6bij89yaj0d52ffx683rlpxrgxl0vx9q6a121mkz1zplnif647"; + url = https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4; + sha256 = "107k0qr3m34cjxy00yhdjmd8liqa8wg729zj4z2jifz26niiy8qs"; }; }; }; @@ -125,10 +125,10 @@ let "facade/flare-client-php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "facade-flare-client-php-69742118c037f34ee1ef86dc605be4a105d9e984"; + name = "facade-flare-client-php-47b639dc02bcfdfc4ebb83de703856fa01e35f5f"; src = fetchurl { - url = https://api.github.com/repos/facade/flare-client-php/zipball/69742118c037f34ee1ef86dc605be4a105d9e984; - sha256 = "1if56r0g9ymwankz40l5xhw5vch1qkjjy9914lz1vgbkj7ln9pvz"; + url = https://api.github.com/repos/facade/flare-client-php/zipball/47b639dc02bcfdfc4ebb83de703856fa01e35f5f; + sha256 = "1chpfxmnlpl98cg127i70ari7nb3w83l91l119hc2fhyjk0zrcy5"; }; }; }; @@ -165,10 +165,10 @@ let "filp/whoops" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "filp-whoops-c13c0be93cff50f88bbd70827d993026821914dd"; + name = "filp-whoops-2edbc73a4687d9085c8f20f398eebade844e8424"; src = fetchurl { - url = https://api.github.com/repos/filp/whoops/zipball/c13c0be93cff50f88bbd70827d993026821914dd; - sha256 = "0janbd93xvr5hy2bms05q1l31gmwbqrgjfvbzkmv3bfw4gcksq0i"; + url = https://api.github.com/repos/filp/whoops/zipball/2edbc73a4687d9085c8f20f398eebade844e8424; + sha256 = "1x79vnjdbjk9z2mix75ri56kyc5iwvjv3dyivncg6n3wd80nyfgg"; }; }; }; @@ -225,10 +225,10 @@ let "laravel/framework" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "laravel-framework-92c0417e60efc39bc556ba5dfc9b20a56f7848fb"; + name = "laravel-framework-00fa9c04aed10d68481f5757b89da0e6798f53b3"; src = fetchurl { - url = https://api.github.com/repos/laravel/framework/zipball/92c0417e60efc39bc556ba5dfc9b20a56f7848fb; - sha256 = "17wpm3fk6qakq4b8qf2bvmyzm7zfamiabdgqshzcnfjm7kj4rijy"; + url = https://api.github.com/repos/laravel/framework/zipball/00fa9c04aed10d68481f5757b89da0e6798f53b3; + sha256 = "1ryk6c23sa6lfsx2zpm8mcfng4ys474959kqg959cjaqzq47blq9"; }; }; }; @@ -245,20 +245,20 @@ let "league/commonmark" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-commonmark-7d70d2f19c84bcc16275ea47edabee24747352eb"; + name = "league-commonmark-44ffd8d3c4a9133e4bd0548622b09c55af39db5f"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/commonmark/zipball/7d70d2f19c84bcc16275ea47edabee24747352eb; - sha256 = "1clfi4k0xp15pzg8c344qj5jk54k9dm9xbg4sd6l6iv66md1xasn"; + url = https://api.github.com/repos/thephpleague/commonmark/zipball/44ffd8d3c4a9133e4bd0548622b09c55af39db5f; + sha256 = "1nlydxyfsh51hrvxg5c7c5lqphynvdclch6w8k9dh1whl8pwjf27"; }; }; }; "league/flysystem" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "league-flysystem-9be3b16c877d477357c015cec057548cf9b2a14a"; + name = "league-flysystem-f3ad69181b8afed2c9edf7be5a2918144ff4ea32"; src = fetchurl { - url = https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a; - sha256 = "0mhlr6l75j58xwbadq30x58s67434195zlpdax6ix4nkr7fc907j"; + url = https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32; + sha256 = "0s4sx4j7c16qkk7m6k2r4ajfjidlv15z18ybxhfmmz4jb4wsmv94"; }; }; }; @@ -305,20 +305,20 @@ let "mtdowling/jmespath.php" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "mtdowling-jmespath.php-42dae2cbd13154083ca6d70099692fef8ca84bfb"; + name = "mtdowling-jmespath.php-9b87907a81b87bc76d19a7fb2d61e61486ee9edb"; src = fetchurl { - url = https://api.github.com/repos/jmespath/jmespath.php/zipball/42dae2cbd13154083ca6d70099692fef8ca84bfb; - sha256 = "157pdx45dmkxwxyq8vdjfci24fw7kl3yc2gj1cifp9kaia7mwlkk"; + url = https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb; + sha256 = "1ig3gi6f8gisagcn876598ps48s86s6m0c82diyksylarg3yn0yd"; }; }; }; "nesbot/carbon" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "nesbot-carbon-8d1f50f1436fb4b05e7127360483dd9c6e73da16"; + name = "nesbot-carbon-f47f17d17602b2243414a44ad53d9f8b9ada5fdb"; src = fetchurl { - url = https://api.github.com/repos/briannesbitt/Carbon/zipball/8d1f50f1436fb4b05e7127360483dd9c6e73da16; - sha256 = "102pypd7x9l739qv2fp5lv4gw4sywr1jpgxlgpqyi1ww1dm3dch0"; + url = https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb; + sha256 = "0b7pr4cqg5l75fncw1lzxcpn4xjnjddyrz287lb4zrjgx1raz3ah"; }; }; }; @@ -555,10 +555,10 @@ let "socialiteproviders/microsoft-azure" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "socialiteproviders-microsoft-azure-7808764f777a01df88be9ca6b14d683e50aaf88a"; + name = "socialiteproviders-microsoft-azure-64779ec21db0bee3111039a67c0fa0ab550a3462"; src = fetchurl { - url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/7808764f777a01df88be9ca6b14d683e50aaf88a; - sha256 = "1lxsvb5pzqrm467a8737v98sgmsxs6mvxc683p19b2y30g4fyrlj"; + url = https://api.github.com/repos/SocialiteProviders/Microsoft-Azure/zipball/64779ec21db0bee3111039a67c0fa0ab550a3462; + sha256 = "00jjj7jwmhf2nypwwnmv5rbw6mw0phdlcz8rxybxzy72p2v51m1c"; }; }; }; @@ -615,30 +615,30 @@ let "symfony/console" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-console-1b15ca1b1bedda86f98064da9ff5d800560d4c6d"; + name = "symfony-console-9aa1eb46c1b12fada74dc0c529e93d1ccef22576"; src = fetchurl { - url = https://api.github.com/repos/symfony/console/zipball/1b15ca1b1bedda86f98064da9ff5d800560d4c6d; - sha256 = "0xpk6241vg866z56dksv384xmk0vkrz1by9vb8q2d6cbp6nw17y0"; + url = https://api.github.com/repos/symfony/console/zipball/9aa1eb46c1b12fada74dc0c529e93d1ccef22576; + sha256 = "0xsjpsgdm2x2avw92cgx90r5yvpgqfcy0ad8cviwcfdardqfh7z0"; }; }; }; "symfony/css-selector" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-css-selector-947cacaf1b3a2af6f13a435392873d5ddaba5f70"; + name = "symfony-css-selector-c1e29de6dc893b130b45d20d8051efbb040560a9"; src = fetchurl { - url = https://api.github.com/repos/symfony/css-selector/zipball/947cacaf1b3a2af6f13a435392873d5ddaba5f70; - sha256 = "1v5fl6vhbc2n9mm0y9m28i1gz12n1v0zqzc2sspymyq98921q3gp"; + url = https://api.github.com/repos/symfony/css-selector/zipball/c1e29de6dc893b130b45d20d8051efbb040560a9; + sha256 = "0af571s9i7inwsjbqpf5dkpghs2k5ds8ba8x7wdvad6hpgphify8"; }; }; }; "symfony/debug" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-debug-45b2136377cca5f10af858968d6079a482bca473"; + name = "symfony-debug-a8d2d5c94438548bff9f998ca874e202bb29d07f"; src = fetchurl { - url = https://api.github.com/repos/symfony/debug/zipball/45b2136377cca5f10af858968d6079a482bca473; - sha256 = "0p7g2mwrvg8x264kl9kn7a23adnqxh66jy1kjczq5c5xlpw2rxdb"; + url = https://api.github.com/repos/symfony/debug/zipball/a8d2d5c94438548bff9f998ca874e202bb29d07f; + sha256 = "0w0i66c42bvh5ss84jqgjzq81dx673sliaf7z7p60p3fxiy0fdsy"; }; }; }; @@ -655,20 +655,20 @@ let "symfony/error-handler" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-error-handler-21d75bfbdfdd3581a7f97080deb98926987f14a7"; + name = "symfony-error-handler-4001f01153d0eb5496fe11d8c76d1e56b47fdb88"; src = fetchurl { - url = https://api.github.com/repos/symfony/error-handler/zipball/21d75bfbdfdd3581a7f97080deb98926987f14a7; - sha256 = "0hdcvmid17xcm21crj3k2gxvnhfww3yaw3liiqrjrkwmny9pr73q"; + url = https://api.github.com/repos/symfony/error-handler/zipball/4001f01153d0eb5496fe11d8c76d1e56b47fdb88; + sha256 = "19pf2qk8nal0p59xvgvl04s2v2bcmi87wffml35qiks1pirn6znp"; }; }; }; "symfony/event-dispatcher" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-event-dispatcher-c352647244bd376bf7d31efbd5401f13f50dad0c"; + name = "symfony-event-dispatcher-047773e7016e4fd45102cedf4bd2558ae0d0c32f"; src = fetchurl { - url = https://api.github.com/repos/symfony/event-dispatcher/zipball/c352647244bd376bf7d31efbd5401f13f50dad0c; - sha256 = "1cxgn0y83i4qqx757kq96jadwwbc68h11snhvy175xvy8nvsmxkd"; + url = https://api.github.com/repos/symfony/event-dispatcher/zipball/047773e7016e4fd45102cedf4bd2558ae0d0c32f; + sha256 = "1cc2lm7fwwqjvx72990k8mzb1xiprpnc1lky13bc61jipdk49jq0"; }; }; }; @@ -685,10 +685,10 @@ let "symfony/finder" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-finder-a96bc19ed87c88eec78e1a4c803bdc1446952983"; + name = "symfony-finder-ed33314396d968a8936c95f5bd1b88bd3b3e94a3"; src = fetchurl { - url = https://api.github.com/repos/symfony/finder/zipball/a96bc19ed87c88eec78e1a4c803bdc1446952983; - sha256 = "065mk0cvby82wv799gl5n4xw75nm7q32g816kily39d70rfjwzrs"; + url = https://api.github.com/repos/symfony/finder/zipball/ed33314396d968a8936c95f5bd1b88bd3b3e94a3; + sha256 = "06m9xr0aik0y5f3j9rr0f23rwdr2b1ib55340myf0lah62as7nxm"; }; }; }; @@ -705,30 +705,30 @@ let "symfony/http-foundation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-foundation-2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5"; + name = "symfony-http-foundation-8759ed5c27c2a8a47cb60f367f4be6727f08d58b"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-foundation/zipball/2ffb43bd6c589a274ee1e93a5fd6b7ef1577b9c5; - sha256 = "02dras9h0h2g3xkibvpqfly7108qhg609cv16cgmw109m9d6rv7p"; + url = https://api.github.com/repos/symfony/http-foundation/zipball/8759ed5c27c2a8a47cb60f367f4be6727f08d58b; + sha256 = "0g47jlsz2p3np3mq4vdhj68jr7a84lwi8hifq132igzgdkbdg6ln"; }; }; }; "symfony/http-kernel" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-http-kernel-59925ee79f2541b4c6e990843e1a42768e898254"; + name = "symfony-http-kernel-e08b2fb8a6eedd81c70522e514bad9b2c1fff881"; src = fetchurl { - url = https://api.github.com/repos/symfony/http-kernel/zipball/59925ee79f2541b4c6e990843e1a42768e898254; - sha256 = "1v6ah9ibz6n2kdpmji1wfqzvb4cbndnwfz4hjqhhrysc0vffpbk4"; + url = https://api.github.com/repos/symfony/http-kernel/zipball/e08b2fb8a6eedd81c70522e514bad9b2c1fff881; + sha256 = "009w87c31vp5x7hcy77g1b03avm3wp0jznxbqqvdfrid0s42zz77"; }; }; }; "symfony/mime" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-mime-64258e870f8cc75c3dae986201ea2df58c210b52"; + name = "symfony-mime-47dd7912152b82d0d4c8d9040dbc93d6232d472a"; src = fetchurl { - url = https://api.github.com/repos/symfony/mime/zipball/64258e870f8cc75c3dae986201ea2df58c210b52; - sha256 = "14s26zam8dxhbskizcw6mpyizg6n4i1ambq5ni6r9gv3rs6cfr9p"; + url = https://api.github.com/repos/symfony/mime/zipball/47dd7912152b82d0d4c8d9040dbc93d6232d472a; + sha256 = "1xyk50qrd5hzpwp795adbc56pqxljy3yalsd7p2bfyhd1y5ihwdv"; }; }; }; @@ -815,20 +815,20 @@ let "symfony/process" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-process-f5481b22729d465acb1cea3455fc04ce84b0148b"; + name = "symfony-process-7e812c84c3f2dba173d311de6e510edf701685a8"; src = fetchurl { - url = https://api.github.com/repos/symfony/process/zipball/f5481b22729d465acb1cea3455fc04ce84b0148b; - sha256 = "1cz0gd7lkp07dlylf8c32fjpfsm9z3d66iwx45i7b5wh5gc96ns0"; + url = https://api.github.com/repos/symfony/process/zipball/7e812c84c3f2dba173d311de6e510edf701685a8; + sha256 = "1bayw4mnjxqr94y0w0mk1ch5ynvyz71v2hlxlp7w6xw15m9ccpsk"; }; }; }; "symfony/routing" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-routing-b42c3631fd9e3511610afb2ba081ea7e38d9fa38"; + name = "symfony-routing-3a3c2f197ad0846ac6413225fc78868ba1c61434"; src = fetchurl { - url = https://api.github.com/repos/symfony/routing/zipball/b42c3631fd9e3511610afb2ba081ea7e38d9fa38; - sha256 = "167lvg9n8qvgkz7hgx8hv7a53j4shqiriir03g5qz7zhvddlk7vp"; + url = https://api.github.com/repos/symfony/routing/zipball/3a3c2f197ad0846ac6413225fc78868ba1c61434; + sha256 = "0wbd206gn64q89kiz3fvpcynmpfrjrj081l5lfab0rfj50m80q4h"; }; }; }; @@ -845,10 +845,10 @@ let "symfony/translation" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-translation-424d29dfcc15575af05196de0100d7b52f650602"; + name = "symfony-translation-2f7fa60b8d10ca71c30dc46b0870143183a8f131"; src = fetchurl { - url = https://api.github.com/repos/symfony/translation/zipball/424d29dfcc15575af05196de0100d7b52f650602; - sha256 = "0fpbhbiix0yqvbq5iv5wy7b37wsfgnsay0g1292s339dil60i6a6"; + url = https://api.github.com/repos/symfony/translation/zipball/2f7fa60b8d10ca71c30dc46b0870143183a8f131; + sha256 = "0nhljcj0bmkdx5xsyyxyj32hdl2lirypr5yyy2n9w16bal9fxmc9"; }; }; }; @@ -865,10 +865,10 @@ let "symfony/var-dumper" = { targetDir = ""; src = composerEnv.buildZipPackage { - name = "symfony-var-dumper-c194bcedde6295f3ec3e9eba1f5d484ea97c41a7"; + name = "symfony-var-dumper-a586efdf2aa832d05b9249e9115d24f6a2691160"; src = fetchurl { - url = https://api.github.com/repos/symfony/var-dumper/zipball/c194bcedde6295f3ec3e9eba1f5d484ea97c41a7; - sha256 = "0wccbr4l03asdar89bss3fhy486wjjqgjsk5iypmxaiga12ac01b"; + url = https://api.github.com/repos/symfony/var-dumper/zipball/a586efdf2aa832d05b9249e9115d24f6a2691160; + sha256 = "12wnz5hrqcml2l28f1b5949rcvadhc8vigqcg9sqbkzzhxn6gli1"; }; }; }; From 0f52f4c36445d84b367a8b39d4d5323771bad24f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Jul 2021 09:53:24 +0200 Subject: [PATCH 047/188] python3Packages.geopy: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/geopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geopy/default.nix b/pkgs/development/python-modules/geopy/default.nix index 693a4221ee0..6b05bb72283 100644 --- a/pkgs/development/python-modules/geopy/default.nix +++ b/pkgs/development/python-modules/geopy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "geopy"; - version = "2.1.0"; + version = "2.2.0"; disabled = !isPy3k; # only Python 3 src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0239a4achk49ngagb6aqy6cgzfwgbxir07vwi13ysbpx78y0l4g9"; + sha256 = "sha256-zFz0T/M/CABKkChuiKsFkWj2pphZuFeE5gz0HxZYaz8="; }; propagatedBuildInputs = [ geographiclib ]; From d66917c4df5addb334a761d8e1e4279105e8c9ac Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 12 Jul 2021 13:11:14 +0200 Subject: [PATCH 048/188] gcc-arm-embedded: use numVersion as version, rename version to release followup to 009668465ed07712a51d0b00e33e2d9e00d203ad --- pkgs/development/compilers/gcc-arm-embedded/10/default.nix | 6 +++--- pkgs/development/compilers/gcc-arm-embedded/6/default.nix | 6 +++--- pkgs/development/compilers/gcc-arm-embedded/7/default.nix | 6 +++--- pkgs/development/compilers/gcc-arm-embedded/8/default.nix | 6 +++--- pkgs/development/compilers/gcc-arm-embedded/9/default.nix | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix index 88dd4d37f7b..441ce6cdcd5 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/10/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/10/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "10-2020-q4-major"; - numVersion = "10.2.1"; + version = "10.2.1"; + release = "10-2020-q4-major"; subdir = "10-2020q4"; suffix = { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { aarch64-linux = "0spkbh7vnda1w0nvavk342nb24nqxn8kln3k9j85mzil560qqg9l"; x86_64-darwin = "1h5xn0npwkilqxg7ifrymsl7kjpafr9r9gjqgcpb0kjxavijvldy"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix index 6dd6ab027f1..bab73948ace 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/6/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/6/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "6-2017-q2-update"; - numVersion = "6.3.1"; + version = "6.3.1"; + release = "6-2017-q2-update"; subdir = "6-2017q2"; suffix = { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "0019ylpq4inq7p5gydpmc9m8ni72fz2csrjlqmgx1698998q0c3x"; x86_64-linux = "1hvwi02mx34al525sngnl0cm7dkmzxfkb1brq9kvbv28wcplp3p6"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix index d2ff1c87550..ccd99e096f8 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/7/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/7/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "7-2018-q2-update"; - numVersion = "7.3.1"; + version = "7.3.1"; + release = "7-2018-q2-update"; subdir = "7-2018q2"; suffix = { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "0nc7m0mpa39qyhfyydxkkyqm7spfc27xf6ygi2vd2aym4r9azi61"; x86_64-linux = "0sgysp3hfpgrkcbfiwkp0a7ymqs02khfbrjabm52b5z61sgi05xv"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix index 4fbc58f15a8..363e87ecb65 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/8/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/8/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "8-2019-q3-update"; - numVersion = "8.3.1"; + version = "8.3.1"; + release = "8-2019-q3-update"; subdir = "8-2019q3/RC1.1"; suffix = { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { x86_64-darwin = "fc235ce853bf3bceba46eff4b95764c5935ca07fc4998762ef5e5b7d05f37085"; x86_64-linux = "b50b02b0a16e5aad8620e9d7c31110ef285c1dde28980b1a9448b764d77d8f92"; diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 073dc10dd44..6ff1567286d 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "9-2020-q2-update"; - numVersion = "9.3.1"; + version = "9.3.1"; + release = "9-2020-q2-update"; subdir = "9-2020q2"; suffix = { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchurl { - url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; + url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${release}-${suffix}.tar.bz2"; sha256 = { aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; From 97575deb7eba2458dbe56252a90deec6b54541c9 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Mon, 12 Jul 2021 13:52:25 +0200 Subject: [PATCH 049/188] istioctl: 1.9.4 -> 1.10.2 The `gen-charts` (`create_assets_gen.sh`) target is no longer required. See istio/istio#29963 for details. --- .../networking/cluster/istioctl/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 85b6c623ae3..3c69fe05cfc 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -1,26 +1,20 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "istioctl"; - version = "1.9.4"; + version = "1.10.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-QyiGDk9lA9Y49VpRNRGNbir/ql/Vzp6wsZ1LGodGTks="; + sha256 = "sha256-jzLffTAGlNeglzoJ3AG4d0pwrkXmT5ttJxr2z4MwP90="; }; - vendorSha256 = "sha256-N+7xajNkxuaC1yDTkPCg80bl2gRy2+Sa4Qq1A8zSGD8="; + vendorSha256 = "sha256-q/m1H6gcnn35ULi+e8fVuJg8eIXhzizGwXJmyf1Hfy4="; doCheck = false; - nativeBuildInputs = [ go-bindata installShellFiles ]; - - # Bundle charts - preBuild = '' - patchShebangs operator/scripts - operator/scripts/create_assets_gen.sh - ''; + nativeBuildInputs = [ installShellFiles ]; # Bundle release metadata buildFlagsArray = let From 797338de5067995243fc35d0f0c81b0fbc11c827 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Sat, 10 Jul 2021 08:58:20 +0200 Subject: [PATCH 050/188] rhythmbox: add support for DAAP --- pkgs/applications/audio/rhythmbox/default.nix | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 65499f58630..9e338e19813 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab , python3 , perl , perlPackages @@ -6,6 +6,7 @@ , intltool , libpeas , libsoup +, libdmapsharing , gnome , totem-pl-parser , tdb @@ -18,6 +19,25 @@ let pname = "rhythmbox"; version = "3.4.4"; + + # The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0. + + # This PR would solve the issue: + # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/12 + # Unfortunately applying this patch produces a rhythmbox which + # cannot fetch data from DAAP shares. + + libdmapsharing_3 = libdmapsharing.overrideAttrs (old: rec { + version = "2.9.41"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = old.pname; + rev = "${lib.toUpper old.pname}_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "05kvrzf0cp3mskdy6iv7zqq24qdczl800q2dn1h4bk3d9wchgm4p"; + }; + }); + in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -46,8 +66,12 @@ in stdenv.mkDerivation rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base + + libdmapsharing_3 # necessary for daap support ] ++ gst_plugins; + configureFlags = [ "--enable-daap" ]; + enableParallelBuilding = true; passthru = { From 6510a136119d9c24ba67e4133ab1d561f72a46f6 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 9 Jul 2021 11:03:17 +0200 Subject: [PATCH 051/188] gitlab: 14.0.2 -> 14.0.5 https://about.gitlab.com/releases/2021/07/06/gitlab-14-0-3-released/ https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/ https://about.gitlab.com/releases/2021/07/08/gitlab-14-0-5-released/ --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index bdc83b8e30b..b214b663ae6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.0.2", - "repo_hash": "1wnlkbjy7hm5lq6qc12dncmz321nhcnm8wvaz0ni1v5xpp3hv286", + "version": "14.0.5", + "repo_hash": "1rykrgzapqa3j2yqpd99fpyyrdp25h2xnx21gnjnkn58qljs4cgs", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.0.2-ee", + "rev": "v14.0.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.0.2", + "GITALY_SERVER_VERSION": "14.0.5", "GITLAB_PAGES_VERSION": "1.40.0", "GITLAB_SHELL_VERSION": "13.19.0", - "GITLAB_WORKHORSE_VERSION": "14.0.2" + "GITLAB_WORKHORSE_VERSION": "14.0.5" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5aff7a34365..ced652e68d9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "14.0.2"; + version = "14.0.5"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-0mLGtvRHgMN3TtH/g4XLDubwZvtB0xr2U30fufj//KY="; + sha256 = "sha256-aZ+EDF9BOdsbE+Xsde259eRmQhnb6H5piLQsvzgVpGM="; }; vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 94c14a739d3..e237c4fd480 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.0.2"; + version = "14.0.5"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 55839138c3a..62222b56396 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1667,4 +1667,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.1.4 + 2.2.20 From c5a0551dc49b287d12d043298f9b7a4c8c355885 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 12 Jul 2021 14:20:20 +0200 Subject: [PATCH 052/188] nixos/gitlab: improve psql assertion message --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 40e35ed1cd1..1514cc0665d 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -911,7 +911,7 @@ in { } { assertion = versionAtLeast postgresqlPackage.version "12.0.0"; - message = "PostgreSQL >=12 is required to run GitLab 14."; + message = "PostgreSQL >=12 is required to run GitLab 14. Follow the instructions in the manual section for upgrading PostgreSQL here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading"; } ]; From ae3826393746bdcda0058715d8931114c6b05fcf Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:49:13 -0300 Subject: [PATCH 053/188] linkerd_edge: 21.7.1 -> 21.7.2 --- pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 7b5e5810581..9bd9a8e7a18 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.7.1"; - sha256 = "sha256-VLq776A0H2IZLBeYjXpYzFixcydw/OcYsvKFxeLuewo="; - vendorSha256 = "sha256-xSOPMFHfyCmG+yTzBfKR7F5KYV0gcKRNM0UrxpGBpE4="; + version = "21.7.2"; + sha256 = "sha256-rEO84t6znNb59a9i+SHgT4r0xzja6eMYi9lWmdU24Cc="; + vendorSha256 = "sha256-esVy+oIZa/ucvucdNV7MfUGFkIql9T2zl0+eu3hZAt8="; }; } From cfd92fd38c3ee66c08242ec0b57d4f9737cd1ef8 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 12 Jul 2021 09:50:26 -0300 Subject: [PATCH 054/188] linkerd: set default channel release to stable + minor refactor --- 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 1615b634403..5cf6a61950e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25151,9 +25151,9 @@ in fluxcd = callPackage ../applications/networking/cluster/fluxcd { }; - linkerd_stable = (callPackage ../applications/networking/cluster/linkerd { }).stable; linkerd_edge = (callPackage ../applications/networking/cluster/linkerd { }).edge; - linkerd = linkerd_edge; + linkerd_stable = (callPackage ../applications/networking/cluster/linkerd { }).stable; + linkerd = linkerd_stable; kile-wl = callPackage ../applications/misc/kile-wl { }; From 88cf2e54db0b7cc4be1e3e77c9e0c7c079479f8c Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 12 Jul 2021 13:53:01 +0100 Subject: [PATCH 055/188] trivy: 0.18.3 -> 0.19.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 9507096335a..0c4dd2cb718 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.18.3"; + version = "0.19.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YQYDDg4rgLygswGl/IYb+USSsuXQ8kXh4NhQYvnaCko="; + sha256 = "sha256-jZwdSX24nipj5IijDxCwxj79f0vndsGbjmRsH2N/Qxk="; }; - vendorSha256 = "sha256-f1un8jWhx7VfbbYV0/t3SLFXp496Wt5aEHkcuj/U4KQ="; + vendorSha256 = "sha256-bIQSZ+QQ0CnyOQ692Wpy4nXIPDSkD3LmnjwHZRG6soY="; excludedPackages = "misc"; From b332794adf841262958424c623c442cc8fab92e8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 12 Jul 2021 15:38:03 +0200 Subject: [PATCH 056/188] firefox: 89.0.2 -> 90.0 make gtk3Support non-optional, because it hasn't been for a long time also make gtk2 conditional on firefox older than 90, because we can get rid of it with firefox 90, but it's still needed by the current ESR release --- .../networking/browsers/firefox/common.nix | 19 +++++++++---------- ...ffx84.patch => no-buildconfig-ffx90.patch} | 15 ++++++--------- .../networking/browsers/firefox/packages.nix | 4 ++-- 3 files changed, 17 insertions(+), 21 deletions(-) rename pkgs/applications/networking/browsers/firefox/{no-buildconfig-ffx84.patch => no-buildconfig-ffx90.patch} (61%) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2d2073b80b0..6942365d63d 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -12,6 +12,7 @@ , autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 +, gtk2, gtk3, wrapGAppsHook , debugBuild ? false ### optionals @@ -21,7 +22,6 @@ , alsaSupport ? stdenv.isLinux, alsa-lib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true -, gtk3Support ? true, gtk2, gtk3, wrapGAppsHook , waylandSupport ? true, libxkbcommon, libdrm , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 @@ -79,7 +79,7 @@ let flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")]; default-toolkit = if stdenv.isDarwin then "cairo-cocoa" - else "cairo-gtk${if gtk3Support then "3${lib.optionalString waylandSupport "-wayland"}" else "2"}"; + else "cairo-gtk3${lib.optionalString waylandSupport "-wayland"}"; binaryName = "firefox"; binaryNameCapitalized = lib.toUpper (lib.substring 0 1 binaryName) + lib.substring 1 (-1) binaryName; @@ -139,7 +139,7 @@ buildStdenv.mkDerivation ({ lib.optional (lib.versionOlder ffversion "86") ./env_var_for_system_dir-ff85.patch ++ lib.optional (lib.versionAtLeast ffversion "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ - lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++ + lib.optional (lib.versionAtLeast ffversion "90") ./no-buildconfig-ffx90.patch ++ lib.optional (ltoSupport && lib.versionOlder ffversion "84") ./lto-dependentlibs-generation-ffx83.patch ++ lib.optional (ltoSupport && lib.versionAtLeast ffversion "84" && lib.versionOlder ffversion "86") (fetchpatch { @@ -164,7 +164,7 @@ buildStdenv.mkDerivation ({ patchFlags = [ "-p1" "-l" ]; buildInputs = [ - gtk2 perl zip libjpeg zlib bzip2 + gtk3 perl zip libjpeg zlib bzip2 dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.pixman yasm libGLU libGL @@ -182,14 +182,14 @@ buildStdenv.mkDerivation ({ ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed - ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional pipewireSupport pipewire ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation - Foundation libobjc AddressBook cups ]; + Foundation libobjc AddressBook cups ] + ++ lib.optional (lib.versionOlder ffversion "90") gtk2; NIX_LDFLAGS = lib.optionalString ltoSupport '' -rpath ${llvmPackages.libunwind.out}/lib @@ -232,8 +232,8 @@ buildStdenv.mkDerivation ({ rustc which unzip + wrapGAppsHook ] - ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals buildStdenv.isDarwin [ xcbuild rsync ] ++ extraNativeBuildInputs; @@ -362,8 +362,6 @@ buildStdenv.mkDerivation ({ passthru = { inherit updateScript; version = ffversion; - isFirefox3Like = true; - gtk = gtk2; inherit alsaSupport; inherit pipewireSupport; inherit nspr; @@ -372,7 +370,8 @@ buildStdenv.mkDerivation ({ inherit execdir; inherit browserName; inherit tests; - } // lib.optionalAttrs gtk3Support { inherit gtk3; }; + inherit gtk3; + }; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch similarity index 61% rename from pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch rename to pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch index c4187fcda39..c8d2028f30b 100644 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx90.patch @@ -1,25 +1,22 @@ -diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp -index 10ac77b..0125d9b 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp -@@ -63,8 +63,6 @@ static const RedirEntry kRedirMap[] = { +@@ -66,8 +66,6 @@ static const RedirEntry kRedirMap[] = { {"about", "chrome://global/content/aboutAbout.html", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", + {"addons", "chrome://mozapps/content/extensions/aboutaddons.html", nsIAboutModule::ALLOW_SCRIPT}, - {"buildconfig", "chrome://global/content/buildconfig.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, {"checkerboard", "chrome://global/content/aboutCheckerboard.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, -diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index c83b3e2..d543140 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -40,7 +40,6 @@ toolkit.jar: +@@ -39,8 +39,6 @@ toolkit.jar: + content/global/plugins.html content/global/plugins.css content/global/plugins.js - content/global/browser-child.js -* content/global/buildconfig.html - content/global/buildconfig.css +- content/global/buildconfig.css content/global/contentAreaUtils.js content/global/datepicker.xhtml + #ifndef MOZ_FENNEC diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 01611fd41dd..f00f0bfeee2 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "89.0.2"; + ffversion = "90.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "ffd98ab0887611c5b4aba68346c49a7a31a58150fd8bbae610a4d941c4cff0acef0daaebfbb577787a759b4c1ef3c1199f02681148612f4f5b709983e07e0ccb"; + sha512 = "233ad59e4ab2f08d2253b49235b51b26fa32fb7c285928110573ccbe67c79965d9401a6c58a3af2ad22b8a58ca5d9b3154e3e8c9d29b153acd16152d9b75442c"; }; meta = { From c6e51d03695efa90a8d09b41fe6441953e21d52a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 12 Jul 2021 15:56:03 +0200 Subject: [PATCH 057/188] firefox-wrapper: also make gtk3-support non-optional here --- .../networking/browsers/firefox/wrapper.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f2fa787c17c..202821b0978 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ , replace, fetchurl, zip, unzip, jq, xdg-utils, writeText ## various stuff that can be plugged in -, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify +, ffmpeg, xorg, alsa-lib, libpulseaudio, libcanberra-gtk3, libglvnd, libnotify , gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native @@ -44,8 +44,6 @@ let , nixExtensions ? null }: - assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used - let ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; @@ -73,7 +71,7 @@ let ++ lib.optional (config.pulseaudio or true) libpulseaudio ++ lib.optional alsaSupport alsa-lib ++ pkcs11Modules; - gtk_modules = [ libcanberra-gtk2 ]; + gtk_modules = [ libcanberra-gtk3 ]; ######################### # # @@ -183,7 +181,7 @@ let }; nativeBuildInputs = [ makeWrapper lndir ]; - buildInputs = lib.optional (browser ? gtk3) browser.gtk3; + buildInputs = [ browser.gtk3 ]; buildCommand = lib.optionalString stdenv.isDarwin '' @@ -266,13 +264,11 @@ let --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \ --set MOZ_LEGACY_PROFILES 1 \ --set MOZ_ALLOW_DOWNGRADE 1 \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' \ ${lib.optionalString forceWayland '' --set MOZ_ENABLE_WAYLAND "1" \ - ''}${lib.optionalString (browser ? gtk3) - ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' - '' - } + ''} ############################# # # # END EXTRA PREF CHANGES # From 5494ab9fde91f7952645b15bf7a916a664c1cbde Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 23 Jun 2021 05:37:41 -0300 Subject: [PATCH 058/188] k3s: 1.21.0+k3s1 -> 1.21.2+k3s1 --- .../networking/cluster/k3s/default.nix | 6 +-- .../patches/0002-Add-nixpkgs-patches.patch | 41 +++++++++---------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 878d7e1184f..dfeb61915ee 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,8 +44,8 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.21.0+k3s1"; # k3s git tag - k3sCommit = "2705431d9645d128441c578309574cd262285ae6"; # k3s git commit at the above version + k3sVersion = "1.21.2+k3s1"; # k3s git tag + k3sCommit = "5a67e8dc473f8945e8e181f6f0b0dbbc387f6fca"; # k3s git commit at the above version traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION @@ -97,7 +97,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - sha256 = "sha256-xsXxf2ZYrkpOHlSFqTsHwWF3kChUjxWRjyDR3Dhg2ho="; + sha256 = "sha256-ZRkdHQ4RJ6XqE+DKE6wwpxetuKDG3k/4HaHyFxHev1U="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. diff --git a/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch b/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch index 244da314f59..dd26810a456 100644 --- a/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch +++ b/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch @@ -1,21 +1,19 @@ -From 1891be119e298ef7c86347a6b74d40ff539cf06e Mon Sep 17 00:00:00 2001 -From: Euan Kemp -Date: Sun, 31 May 2020 19:02:37 -0700 -Subject: [PATCH 2/2] Add nixpkgs patches - -These patches let us re-use the upstream build scripts when building for -nix. ---- - scripts/build | 20 ++++---------------- - scripts/package-cli | 10 ++++++---- - 2 files changed, 10 insertions(+), 20 deletions(-) - +-Subject: [PATCH 2/2] Add nixpkgs patches +-Original patch by: Euan Kemp +-Adapted by: superherointj +- +-This patch allows us to re-use upstream build scripts when building for nix. +---- +- 2 files changed: +- scripts/build +- scripts/package-cli +- diff --git a/scripts/build b/scripts/build -index 4ca6333c4a..df15f7db1d 100755 +index 2f3d1dc496..4f4e5aa897 100755 --- a/scripts/build +++ b/scripts/build @@ -12,7 +12,8 @@ PKG_CONTAINERD="github.com/containerd/containerd" - PKG_RANCHER_CONTAINERD="github.com/rancher/containerd" + PKG_K3S_CONTAINERD="github.com/k3s-io/containerd" PKG_CRICTL="github.com/kubernetes-sigs/cri-tools" -buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ') @@ -24,7 +22,7 @@ index 4ca6333c4a..df15f7db1d 100755 VENDOR_PREFIX="${PKG}/vendor/" VERSIONFLAGS=" -@@ -92,17 +93,7 @@ cleanup() { +@@ -89,17 +90,7 @@ cleanup() { } INSTALLBIN=$(pwd)/bin @@ -43,23 +41,23 @@ index 4ca6333c4a..df15f7db1d 100755 # echo Building agent # CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/k3s-agent ./cmd/agent/main.go echo Building server -@@ -118,10 +109,7 @@ ln -s containerd ./bin/ctr +@@ -116,10 +107,7 @@ ln -s containerd ./bin/ctr #CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC_SQLITE" -o bin/ctr ./cmd/ctr/main.go # echo Building containerd # CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/ -echo Building runc --rm -f ./vendor/github.com/opencontainers/runc/runc --make EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./vendor/github.com/opencontainers/runc $RUNC_STATIC --cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc +-rm -f ./build/src/github.com/opencontainers/runc/runc +-make GOPATH=$(pwd)/build EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./build/src/github.com/opencontainers/runc $RUNC_STATIC +-cp -f ./build/src/github.com/opencontainers/runc/runc ./bin/runc +# nixpkgs: we build runc separately echo Building containerd-shim rm -f ./vendor/github.com/containerd/containerd/bin/containerd-shim diff --git a/scripts/package-cli b/scripts/package-cli -index d1aad638d9..90479b6fa1 100755 +index ab4a6dac63..044b5587d0 100755 --- a/scripts/package-cli +++ b/scripts/package-cli -@@ -49,15 +49,18 @@ fi +@@ -50,15 +50,17 @@ fi CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} @@ -81,4 +79,3 @@ index d1aad638d9..90479b6fa1 100755 -./scripts/build-upload ${CMD_NAME} ${COMMIT} +# nixpkgs: skip uploading +# ./scripts/build-upload ${CMD_NAME} ${COMMIT} -+ From b3d89798be4a16c6e9f605ad8053daf5de510d2f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 12 Jul 2021 13:42:10 +0200 Subject: [PATCH 059/188] nodePackages.postcss: init at 8.3.5 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1029 +++++++++-------- 2 files changed, 529 insertions(+), 501 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 95f2527711b..75d98ac75e5 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -186,6 +186,7 @@ , "pm2" , "pnpm" , "poor-mans-t-sql-formatter-cli" +, "postcss" , "postcss-cli" , "prettier" , "prettier-plugin-toml" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index ac6f8d7d90f..f8d14701048 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2245,13 +2245,13 @@ let sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; - "@fluentui/date-time-utilities-8.2.0" = { + "@fluentui/date-time-utilities-8.2.1" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.0.tgz"; - sha512 = "OunpRZ8hyDPLNWwrx8w17eUwGdNYjG4kGR9+jzvQQJjswk94KMxc6SY33mlTLVEbagjdHMHw9jR7STS+JCQNcA=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.1.tgz"; + sha512 = "0AYXaXFQ3bPsOtiOi3bJSihzf+w3L44iQK38EiQgp3uAXei/i36VtDCToHZehYV+eS4s1qb/QGksoL0F4G6WCQ=="; }; }; "@fluentui/dom-utilities-1.1.2" = { @@ -2263,31 +2263,31 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; - "@fluentui/dom-utilities-2.1.2" = { + "@fluentui/dom-utilities-2.1.3" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.2.tgz"; - sha512 = "9LxI3iLbBkyoudRyk0nPTjMdMB2+ClDfM8V3A0SM82e5cDss5qlo0fog/2T2aoaon+hwfeinpiY4e3znx+Nn0w=="; + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.3.tgz"; + sha512 = "i2YECSldnkzPAhVmrxksuKSbqBKfMbHrexGqDJm7dy6KoIx+JSilbA5Lz0YNhA7VEgCy1X01GHlWBvqhCNQW8g=="; }; }; - "@fluentui/font-icons-mdl2-8.1.4" = { + "@fluentui/font-icons-mdl2-8.1.5" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.1.4"; + version = "8.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.4.tgz"; - sha512 = "v0NRk+W2qJQtBsH9hqYNG5Xnic8C1kfB0I+OTGasFYPvxdd0APcWw2vajrlE49ijgVjXS0AByCgF6mu8LiYlHg=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.5.tgz"; + sha512 = "xwjLgoT6pl2EIWEIOsR3rc36isN5vjRLt4gYxKY3cmYCjjpkgCsOtxXtDsd9ck6JR0lr6cPIDp8O3Y1R8YILvQ=="; }; }; - "@fluentui/foundation-legacy-8.1.4" = { + "@fluentui/foundation-legacy-8.1.5" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.1.4"; + version = "8.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.4.tgz"; - sha512 = "Kd+XpHsv3UEnDTwEnUm93Au+QGpYZ5x/VuQsv8K1sDM+gjb3BDohuwR6MWgzgCMJiVW0NMlbS4I2OpUZa6k5eg=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.5.tgz"; + sha512 = "tzsCaowUqyxsvB/MORaHbpkIBvftrr5ERtAJbr6ZZmLNWkQ4r7UOVTZk608/ZHn4L/ZEKKespgYzSWshriqDPw=="; }; }; "@fluentui/keyboard-key-0.2.17" = { @@ -2299,31 +2299,31 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/keyboard-key-0.3.2" = { + "@fluentui/keyboard-key-0.3.3" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.2.tgz"; - sha512 = "Hjes+WUgVRqikyvmBEuyovw89inYZ1qVmdp4kKi/6BGvQlAcHgGIVfmdnlFumP4lmFpBW8uUh2K1ZmfY0xwQ6Q=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.3.tgz"; + sha512 = "3qX1WNCgJlKq7uGH76rLC4cdESgwdLhMH9WjcQUkQNJKtBpL4vs5O99M1keEhd3pfooW7zasr6AcYcWq4BRB4g=="; }; }; - "@fluentui/merge-styles-8.1.2" = { + "@fluentui/merge-styles-8.1.3" = { name = "_at_fluentui_slash_merge-styles"; packageName = "@fluentui/merge-styles"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.2.tgz"; - sha512 = "r0EGKfJUjZw9yJ21VMXjaqLoujvBkRIWRQVMM6CUxbY+02dhKUt6Sa9QA/8m8klsEWBENOaKZ4uX5U2vWWBlyw=="; + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.3.tgz"; + sha512 = "5vZUyXnbOb9M1rMLzQ7Kj5uadHgSTsp3gv0xDv6bfPvzB9RgQa3dEuJ6TA34tLezw8sFYuA6NnKd57nlb4aXMA=="; }; }; - "@fluentui/react-7.172.4" = { + "@fluentui/react-7.173.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.172.4"; + version = "7.173.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.172.4.tgz"; - sha512 = "eFmw1npSTj/6JeP99KltrRIThqilU2HpOmddwmMA77wwt9GjgxUZm1igfTyyfd3RbuqfLgHGK9OhFqAH5Eo9wg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.173.0.tgz"; + sha512 = "ngJG5ES3vbI9/gZKgTyJo7gpwBe/UDHT6Hhs7TJyKLd+h2mQaZ60PZjlIMVtrkCaCVVkY+sSE3rV/goyYSFrQQ=="; }; }; "@fluentui/react-8.22.0" = { @@ -2344,22 +2344,22 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; - "@fluentui/react-focus-8.1.5" = { + "@fluentui/react-focus-8.1.6" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.1.5"; + version = "8.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.5.tgz"; - sha512 = "zvHwta+lRmw2kYRif0Zz6+skmfxUzagd15iMlUPRIVAcsj+rxOkoE7g8NlhXym7HsgMiKRAYJM0CdfMauCnkvQ=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.6.tgz"; + sha512 = "OJeFOGlvDCh/PHVz+IWEQo8ls0viNgFF0qQAp8KAPZxxxhsIkGkVRkMhj1rMtfub0dZlqP6QxjmjX22bQfzu9A=="; }; }; - "@fluentui/react-hooks-8.2.3" = { + "@fluentui/react-hooks-8.2.4" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.2.3"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.3.tgz"; - sha512 = "JqQNLIc0WOwwMZ3rAnBkcy0oHZD83Bi1hs7qpvwGUW1OrL3QoJqEnmiKPowxWb8NUeKEP51cBfGi+/7aqbDZAg=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.4.tgz"; + sha512 = "qc/j0YdxC0zAWVqh8BJppZuK3o9/rfyu5psY4N/AL9dmKrTFWszRgTSB5uiRShN99L88UUEV9RtlfknnLDGrUg=="; }; }; "@fluentui/react-window-provider-1.0.2" = { @@ -2371,31 +2371,31 @@ let sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; - "@fluentui/react-window-provider-2.1.2" = { + "@fluentui/react-window-provider-2.1.3" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.2.tgz"; - sha512 = "VWtesIAZR5fdlZMwYco/M5EBb3jawUkslQYOKsneNq+mq8ThkUs1Bol5bpK6jwmouROscu76HD1QfjdACAfkLQ=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.3.tgz"; + sha512 = "3NWL3Kkqp3elD/aTrUaEufRUrN7K7hYsXEsOY2bDCDjPadLGtZlTGWNYFbUYNsaL/v79gZHhH+voCECP85HqRg=="; }; }; - "@fluentui/set-version-8.1.2" = { + "@fluentui/set-version-8.1.3" = { name = "_at_fluentui_slash_set-version"; packageName = "@fluentui/set-version"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.2.tgz"; - sha512 = "uCPwdBsahBbLuN8UkbmXtp+u8Gxqtm5+fZ1UuOUBhEL7MKl86LrWmxoy4IW3JD2rcbaYpCb7KFpnMB5s0Nx0ZA=="; + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.3.tgz"; + sha512 = "QYLFBnwa6xJj0phEy6r+iO5bXWXxkhS1uNngUwfWsHaTskDa4PXDDdjZAXjTVV935xqmoM4GZhZk+Tcoe/OaXA=="; }; }; - "@fluentui/style-utilities-8.1.4" = { + "@fluentui/style-utilities-8.1.5" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.1.4"; + version = "8.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.1.4.tgz"; - sha512 = "tR/ntfobJvuCtLyi7jpEbsq67iTaBNq/lpq+tYuvIqI8Gl90L9a8g8344ADP4+9/i3TKsrAZgnV9vze66ybHOw=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.1.5.tgz"; + sha512 = "2MUjnVGuEAheGpnszmbWktxd5Haay8RsY2Y4patzFJcuFuK8ttk8m7Ghd0a5yDTz4BLRQjNLtjmj0ns1LJBFSw=="; }; }; "@fluentui/theme-1.7.4" = { @@ -2407,22 +2407,22 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; - "@fluentui/theme-2.1.3" = { + "@fluentui/theme-2.1.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.3.tgz"; - sha512 = "o/So4091GtwtEkxujd6QT9M8kuLOde0Z7by/zLNQBU00wX3PeBxM4mpSLmnz2vt5CN5IT7OWhRRsiyve/7hLAg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.4.tgz"; + sha512 = "Y4FWgnYldvAFOo24tfsREMb8/3Tn5uDoYgGO7AAdrksP7VAaavaEVQCOgvHWy3l89Bsxf00/fE+QJ/AHv5Z4CA=="; }; }; - "@fluentui/utilities-8.2.0" = { + "@fluentui/utilities-8.2.1" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.0.tgz"; - sha512 = "kq8xyFHkWUbzzbkGLuDACEhH+K5oqM/wEU9+zRuM/qI2bIS1B6Cr0ruq7FHxVrtAnMhvXKzM8DPn0W8uf775qQ=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.1.tgz"; + sha512 = "ezRkBUDhHQjrqAWA6H1TwWU3STauW/EjthDAe/upJbmXeP3ynn7tTpx1gpNi/vHjJlRkO1JjNoiSc6P4MZWkYw=="; }; }; "@google-cloud/paginator-3.0.5" = { @@ -3325,13 +3325,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.30.0" = { + "@jsii/spec-1.31.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.30.0.tgz"; - sha512 = "oXIwvZyHHc/TrwA/3pzQ3gkqBe916EWBvaexNI3rnKZujlHZT4vVVHMCjQ/kUJhcR0GEaahvwlNhiPTu6roC2g=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.31.0.tgz"; + sha512 = "qpJqZ+xj4lnKfk/HJYdYURDmHzh9aBIVOTgwd314AxKmwubDAajlAup+D2F9z9kylAB7GsQiva/SXgUlFjBeQw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -4027,13 +4027,13 @@ let sha512 = "mlRYq9FSsOd4m+3wZWatemn3hGFZPWNJ4JQOdrir4rrMK2PyIk26idKBoUWrqF3HJJHl+5GpRU+M0wEruJwecg=="; }; }; - "@nestjs/schematics-8.0.0" = { + "@nestjs/schematics-8.0.1" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.0.tgz"; - sha512 = "TldaYlm40CDANGzAugcqkN9N2O4pAA67EMy7qREym8W2o57co7AiEsYUl1CD3zPhBfhVcFRWfnQHs06IbXxPFw=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.1.tgz"; + sha512 = "rD/eqpguJpjOVI4uK1MOpqC1vPz+XvC/xT1IYiWDFU9rdJMVhHC5maTKVs/RjkwYRmPzNRTWAoMV3yOD/jC+gw=="; }; }; "@netflix/nerror-1.1.3" = { @@ -4081,13 +4081,13 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.6.0" = { + "@netlify/framework-info-5.7.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.6.0.tgz"; - sha512 = "NjGejntulKj6mBnnJjrIfrM8QKaFaoko2TWNc61vatHlTG7BwYmoMHYcfsL3lm2SnGxL1KtUt382IIRD0I1g2A=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.7.0.tgz"; + sha512 = "9uPUtRM+vwpCR+JYQiRorAw9nWVZRHfvrlbu4aowLCIkHXeQPo8IsT2++z+6zK72E5IJDKF01Qqv6uZ/Y6se9w=="; }; }; "@netlify/functions-utils-1.4.4" = { @@ -4117,13 +4117,13 @@ let sha512 = "KiXfYPO/X24p7EYQjcjBTizoyfY3U8zPv68Rte0EtayW2ZSqIslLLpNNd2gteqdh0Q83mzSiESdhlQHd0Ckjjg=="; }; }; - "@netlify/plugin-edge-handlers-1.11.20" = { + "@netlify/plugin-edge-handlers-1.11.21" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.11.20"; + version = "1.11.21"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.20.tgz"; - sha512 = "i9hGh29dAU5uFJ51v3Aah9wJC88P/uE2LVSg8JRcK+ZPTnu82kdMkq9qrVSYXfqLBGm8w54bRT0LFUv5IDXjVg=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.11.21.tgz"; + sha512 = "shUFM+l1ALeGCgy4Lag2wQzOD3zcHW0+HFdWXCRsvtjHdNwTMBnbYg7ztnWurwgMthwiQ1jiTmWr8hFrui7Vng=="; }; }; "@netlify/plugins-list-2.19.1" = { @@ -5944,112 +5944,112 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.0.0" = { + "@textlint/ast-tester-12.0.2" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.0.0.tgz"; - sha512 = "mcAqaOJnAhay8QtDC/na5S72XPxmqGCntOwcLwuSjEmPGAIuLC3GsumLQo4nWSQ2LGnWd6CwLDZT4eBlRWetNA=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.0.2.tgz"; + sha512 = "kHta27+SJC0YxEyEdlNux6m2JepX920gc5x98lVBVYK6Wq6cAF67EEGl1o9ynqroIHEc3wTSEDOFwxXpnlfsNA=="; }; }; - "@textlint/ast-traverse-12.0.0" = { + "@textlint/ast-traverse-12.0.2" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.0.0.tgz"; - sha512 = "Mu0il8qWS9YkzVAqwmrTd+ga5S0LJVWOGjE6d9yADf5xObUDFk4g8ITlfEOiicpX5bTUxT4e1bORxPveCJ8iKQ=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.0.2.tgz"; + sha512 = "OrbGnwtqNAsX7jVSRKecc1Lp2tg54ntnTuvOHkYrZrlC72Hk7+7V/UFQBmFNQCe0cH6Tjb5FFFcgp6f8gM+ehw=="; }; }; - "@textlint/feature-flag-12.0.0" = { + "@textlint/feature-flag-12.0.2" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.0.0.tgz"; - sha512 = "xgK6tsf1Gg6xn8/X0HN4LXzSkJYgmByAvzItUPlI0dzvA4HhhT4gkBeshDCuXsHLc970nYgzy1TYHpyscu7PTw=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.0.2.tgz"; + sha512 = "yNq5uErjFrVq1gghg3A8D77+E36wLXRws5LwSsoRC4LVPIGR+LYZ9BlkoyNTas8dOzGwTs6XZIcWCIWXy77M8Q=="; }; }; - "@textlint/fixer-formatter-12.0.0" = { + "@textlint/fixer-formatter-12.0.2" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.0.0.tgz"; - sha512 = "y2PWue8PANhSF9cXwksxmjDs/n9exOq4daNMhN7VvJk9yrXL+nSuAoyDXjyp09gX4Nfwa/xsOrQRTDVRbizgcw=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.0.2.tgz"; + sha512 = "ii49bDLVcgnnxmnaZFX0rDFEIGH3o6DGKnr76cfqy6+DWkGQlhBPyRdbx2bIF65KT+7nAMU0JjfEK+n/WIYFTA=="; }; }; - "@textlint/kernel-12.0.0" = { + "@textlint/kernel-12.0.2" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.0.0.tgz"; - sha512 = "8UXHKhSAgn1aexPjyQE1CRVivCfSz+aFuNrktT9+JOMM3XsSd4JFcMKDhPA1utiiRR+4yDVH5be38vuuJOG9cQ=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.0.2.tgz"; + sha512 = "IVWC5xyHj58X3/sUXAOndOPMQMkvGaXXPCtLITm8rSwKRc4D/qF2hhwAisOu8XImIwBGzvhFlq+IM7cUW1qDtA=="; }; }; - "@textlint/linter-formatter-12.0.0" = { + "@textlint/linter-formatter-12.0.2" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.0.0.tgz"; - sha512 = "jRRZluLCBXcP8VlA90N8DJOPy890j7rVOVSuyyFn0ypuUK88X2qH9XoEd9yYbo/HmH9ky2h+TeA8CJtOAIjU2g=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.0.2.tgz"; + sha512 = "xRTkLmMUnxW5Y6UXsIc9iLo8hyj5toYXVA/u5ABO4t3QObgtUllWi9W2eauZeY19pLTXweBHYxqG/tl3jTCpJQ=="; }; }; - "@textlint/markdown-to-ast-12.0.0" = { + "@textlint/markdown-to-ast-12.0.2" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.0.0.tgz"; - sha512 = "XaiuePJVDGVIwdjIiITdbdRXZDFnAFY/so3Rb8qAId/Qq9fKPUvgefMkdIG73wUC7LzhrAzH6/CuEO+f77HR5g=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.0.2.tgz"; + sha512 = "xAJ4U/fOL7FoX4bYeYRCsSIeTxFqzKd944AsVxAYrz2ZfKH0TtBSNDDtN22uBEXOrSCCR12Z7QuMcp+URyYWlw=="; }; }; - "@textlint/module-interop-12.0.0" = { + "@textlint/module-interop-12.0.2" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.0.0.tgz"; - sha512 = "WSuwd3pd2xYDCYqpA6NE8FwMZS4WJ2gZmsSCXBpOh3qJ/pHbmrfEaiwOpGQJA4RfXVp8Fy5KfaAQJIr+wox98A=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.0.2.tgz"; + sha512 = "jnFx7B7Q/au49n5Kt/ttPhecvnJGj7643KzPxRNXy422nmafi1EfOZDMGkNEJhlVsQ9WzAnliTTXTFTrBhtVYA=="; }; }; - "@textlint/source-code-fixer-12.0.0" = { + "@textlint/source-code-fixer-12.0.2" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.0.0.tgz"; - sha512 = "+XMJ7unzezEqKh8euWIw1QUprvv7IJzOfV0UPVbkThX2d3ZOzBmK+AzlYbqzCwZ1jkV0QYaRqaptBE+iaaQjNg=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.0.2.tgz"; + sha512 = "lWNndH7Z+KGo8NhM4e3I5fR0SfZeS25AW7MRQGsKbxHL8NSi6KmCXVK8unEls82+DKXW4VdjTTgVYTTOVGa3BA=="; }; }; - "@textlint/text-to-ast-12.0.0" = { + "@textlint/text-to-ast-12.0.2" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.0.0.tgz"; - sha512 = "j73hF6BiwdZurNdzHfOtP5j3v+nTWaTP7RtJf5wpfQBigT4RA+EqmKxUd/OpO+gt/Xy1NkpceLFNllZGRLEvkw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.0.2.tgz"; + sha512 = "vgB4k4CpY59XVrcvWLyFkCoMIVpiUheuy2FC1+Qb44hmoEYT26uglX7SEkBRTQvlzsjChgryzA2PFf2c1wkL0Q=="; }; }; - "@textlint/textlint-plugin-markdown-12.0.0" = { + "@textlint/textlint-plugin-markdown-12.0.2" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.0.0.tgz"; - sha512 = "eo9deECYMkytoiJUqDxEwzugL8sLcCFUbeCpzV5IuIRwQBh85Hds3lp/mtW1B3Q/BxcSa08im2HAa9uRdcoe4Q=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.0.2.tgz"; + sha512 = "3qizGxt/cz0foqmUuqpk0hnQzXdDehG0CBrzUINJVa7btpDn8bD9fRYn88OdmGLtejVJR/pUDOOZk3RYYEVmlQ=="; }; }; - "@textlint/textlint-plugin-text-12.0.0" = { + "@textlint/textlint-plugin-text-12.0.2" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.0.0.tgz"; - sha512 = "brtexdqu7yvFLstYvVlotMZz5T7SwKfnFnV9Sm+uhg/d3Ddea9exzpiWWcXfRAhfOBd12mmEGM6gwAuSwzrhqg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.0.2.tgz"; + sha512 = "giCTwrioT6bYlOZ+xf/c9ML1GYitQVrtToHzWI6AAs8szg+Q5+h3KCG921sDEGgZfqnljuBaYcHJsW/iNG1+UA=="; }; }; "@textlint/types-1.5.5" = { @@ -6061,22 +6061,22 @@ let sha512 = "80P6fcqgsG9bP6JgR6W/E/oIx+71pplaicYCvvB4vMIeGk0OnWls4Q21kCpDYmq/C/ABtZ/Gy/Ov/8ExQPeQ7A=="; }; }; - "@textlint/types-12.0.0" = { + "@textlint/types-12.0.2" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.0.0.tgz"; - sha512 = "3sB22cGtN9nPViDrW7FJxWkDrpGtyJbvNsvZqzX83HJbAiOmzzeHDkRRLvz9tax76lcdjlNk+2rHY3iSnjhEag=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.0.2.tgz"; + sha512 = "w5aWSCd1sot1waiYw8KnmJNY1q+k9LDoaA6xjGbBuVBGJl0TLXIZoOP8HYFUcKFfJRpqGGob1geTHiyFdnyS0w=="; }; }; - "@textlint/utils-12.0.0" = { + "@textlint/utils-12.0.2" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.0.0.tgz"; - sha512 = "bnIr17iouc4MtVR+r7v8mBasNn3ZsQpfTLTi4RelrZJdICHMBUMOWRX70cVRV/xJck/nfY9igt325qI0y2ELoQ=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.0.2.tgz"; + sha512 = "IYmibhDMWd8EmRvk8ii9AA/ecrZk5Wj5NNcKuB78+ae2PIVI1zWzQoieSvQyX7DLPRVH4S22RORiEpruRcDzng=="; }; }; "@tokenizer/token-0.1.1" = { @@ -6358,13 +6358,13 @@ let sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; }; }; - "@types/cors-2.8.11" = { + "@types/cors-2.8.12" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.11"; + version = "2.8.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.11.tgz"; - sha512 = "64aQQZXPSo1fdLEE/utClOFVUqDUjyh5j3JorcCTlYQm4r5wsfggx6yhSY6hNudJLkbmIt+pO6xWyCnM0EQgPw=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; + sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; "@types/debug-4.1.6" = { @@ -7024,13 +7024,13 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; - "@types/node-15.14.1" = { + "@types/node-15.14.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "15.14.1"; + version = "15.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.14.1.tgz"; - sha512 = "wF6hazbsnwaW3GhK4jFuw5NaLDQVRQ6pWQUGAUrJzxixFkTaODSiAKMPXuHwPEPkAKQWHAzj6uJ5h+3zU9gQxg=="; + url = "https://registry.npmjs.org/@types/node/-/node-15.14.2.tgz"; + sha512 = "dvMUE/m2LbXPwlvVuzCyslTEtQ2ZwuuFClDrOQ6mp2CenCg971719PTILZ4I6bTP27xfFFc+o7x2TkLuun/MPw=="; }; }; "@types/node-15.6.1" = { @@ -7060,13 +7060,13 @@ let sha512 = "hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug=="; }; }; - "@types/node-16.3.0" = { + "@types/node-16.3.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.3.0"; + version = "16.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.3.0.tgz"; - sha512 = "OydMCocGMGqw/1BnWbhtK+AtwyWTOigtrQlRe57OQmTNcI3HKlVI5FGlh+c4mSqInMPLynFrTlYjfajPu9O/eQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.3.1.tgz"; + sha512 = "N87VuQi7HEeRJkhzovao/JviiqKjDKMVKxKMfUvSKw+MbkbW8R0nA3fi/MQhhlxV2fQ+2ReM+/Nt4efdrJx3zA=="; }; }; "@types/node-6.14.13" = { @@ -7195,15 +7195,6 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/readable-stream-2.3.11" = { - name = "_at_types_slash_readable-stream"; - packageName = "@types/readable-stream"; - version = "2.3.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.11.tgz"; - sha512 = "0z+/apYJwKFz/RHp6mOMxz/y7xOvWPYPevuCEyAY3gXsjtaac02E26RvxA+I96rfvmVH/dEMGXNvyJfViR1FSQ=="; - }; - }; "@types/request-2.48.5" = { name = "_at_types_slash_request"; packageName = "@types/request"; @@ -11047,13 +11038,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.942.0" = { + "aws-sdk-2.943.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.942.0"; + version = "2.943.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.942.0.tgz"; - sha512 = "9Y+DWSTvolTJe0nl55sKnsPgtfBCV8WKDE8cAUhgn9MIb4tAGpwejS14AUmqeZ12J58AsgPT3PffdI7Hq9IEtQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.943.0.tgz"; + sha512 = "1/WDupJrIB0SJEzIOf+UpqmG0AP5AXoDXhbW7CEujHerOd+/b5A1ubeHKGQJvBN4tAktgsvGpDiBRfB9MpJU5g=="; }; }; "aws-sign2-0.6.0" = { @@ -12505,13 +12496,13 @@ let sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; }; }; - "bit-field-1.5.1" = { + "bit-field-1.5.2" = { name = "bit-field"; packageName = "bit-field"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bit-field/-/bit-field-1.5.1.tgz"; - sha512 = "yDanqg5y7PNCzyYl2IPJayOuMt3HRKI8vJDlntSxIqLoKy9YTYUoABUAEuFbQrkzHoAIGfmhhv0M6VRIZ+F0xw=="; + url = "https://registry.npmjs.org/bit-field/-/bit-field-1.5.2.tgz"; + sha512 = "CYS3HRGgIlm7A6/zqGFd/KPSUIv4EoEQVQ8mWcvBEdlf0db1q3j/fj5W/PXJasBfsvN2jM0Tzw3w1C7HUoR/fg=="; }; }; "bitcoin-core-2.3.0" = { @@ -16114,13 +16105,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.30.0" = { + "codemaker-1.31.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.30.0.tgz"; - sha512 = "yntR55JhhVlZTfR4CPV6IrCULovPDrk3z0yQR7/ygEtNxEOQrHhX17djJ0rVmIwCJUawv+ODTJ1ipJY9CbxJQw=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.31.0.tgz"; + sha512 = "gyWhtZ4YU5b+pIijCfOZkGrH0DCkUQXyRG3BQtDlnwFJuXyJnDoz+dpM5ErkJuDD9w6Qns4aryyG/bU78huaSg=="; }; }; "codepage-1.4.0" = { @@ -20660,13 +20651,13 @@ let sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; }; }; - "diff2html-3.4.6" = { + "diff2html-3.4.7" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.6"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.6.tgz"; - sha512 = "0z22v5qc3FHyTO+7BJmZ2CS7KB3Tx8BtbDkrQJ90a9ITh8vdr4uAMrfmQsUiJAS3sd13r8cHhJuPxLZnV8NXLQ=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.7.tgz"; + sha512 = "QbQMz1qKFxQqqWvpDAxzD37iZb7i9ixVoBjHh7y5PLg1EagYgbrM4Fley4u5YM6i2elNrJNnKjNzyNtGBx3xjw=="; }; }; "diff3-0.0.3" = { @@ -21740,13 +21731,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.771" = { + "electron-to-chromium-1.3.772" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.771"; + version = "1.3.772"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.771.tgz"; - sha512 = "zHMomTqkpnAD9W5rhXE1aiU3ogGFrqWzdvM4C6222SREiqsWQb2w0S7P2Ii44qCaGimmAP1z+OydllM438uJyA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.772.tgz"; + sha512 = "X/6VRCXWALzdX+RjCtBU6cyg8WZgoxm9YA02COmDOiNJEZ59WkQggDbWZ4t/giHi/3GS+cvdrP6gbLISANAGYA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -24334,13 +24325,13 @@ let sha512 = "QJYT/i0QYoiZBQ71ivxdyTqkwKkQ0oxACXHYxH2zYHJEgzi2LsbjgvtzTbLi1SZcF190Db2YP7I7eTsU2egOlw=="; }; }; - "fast-safe-stringify-2.0.7" = { + "fast-safe-stringify-2.0.8" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; + url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz"; + sha512 = "lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag=="; }; }; "fast-stringify-1.1.2" = { @@ -24685,13 +24676,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.5.0" = { + "file-type-16.5.1" = { name = "file-type"; packageName = "file-type"; - version = "16.5.0"; + version = "16.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.0.tgz"; - sha512 = "OxgWA9tbL8N/WP00GD1z8O0MiwQKFyWRs1q+3FhjdvcGgKqwxcejyGWso3n4/IMU6DdwV+ARZ4A7TTnPkDcSiw=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.1.tgz"; + sha512 = "Pi1G43smrCy82Q3be3sfKaeS5uHdfj905dP88YqhroG6TYbVY2ljTdDXeXqa6Cn5nOk6znOjWM2uZptA8vH/qQ=="; }; }; "file-type-3.9.0" = { @@ -25126,13 +25117,13 @@ let sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; - "fkill-7.1.1" = { + "fkill-7.2.1" = { name = "fkill"; packageName = "fkill"; - version = "7.1.1"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.1.1.tgz"; - sha512 = "jFPrW3qmbPQxjbKUMGPTXbpWoX5plS0BMotAB7q9jwInFd/YdrY40/5Szt4gFroF2BfXHIVuMdQC40X8IcgL3w=="; + url = "https://registry.npmjs.org/fkill/-/fkill-7.2.1.tgz"; + sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; }; }; "flagged-respawn-1.0.1" = { @@ -26638,13 +26629,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "gh-release-fetch-2.0.0" = { + "gh-release-fetch-2.0.1" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.0.tgz"; - sha512 = "04eT1dMAW5dUgnb/zkOxXXHTLaQpWuZi1gM93sP6KMHtIqyNsCiALHnljh+aomm90L4t3VkSKaCdwottLgVLwQ=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.1.tgz"; + sha512 = "Ca5chpW8/yXeJPYdAxDLB8UShrWViOgnlYl4QTlQi4Y6sJnMXrXK9GMjKHyjJtNAw9IiSh0DbcTMiJZyp6vfMg=="; }; }; "git-apply-delta-0.0.7" = { @@ -27368,13 +27359,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.17.0" = { + "google-gax-2.17.1" = { name = "google-gax"; packageName = "google-gax"; - version = "2.17.0"; + version = "2.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.17.0.tgz"; - sha512 = "Ze/Oq0atVNKyKvDzQFU8B82V9w36GELQruXGsiY1jnySbieZ9vS75v98V/Z10PktmSVqis4sQ+FwK2gkgwIiiw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.17.1.tgz"; + sha512 = "CoR7OYuEzIDt3mp7cLYL+oGPmYdImS1WEwIvjF0zk0LhEBBmvRjWHTpBwazLGsT8hz+6zPh/4fjIjNaUxzIvzg=="; }; }; "google-p12-pem-3.1.0" = { @@ -32454,13 +32445,13 @@ let sha512 = "O7Uw+w/zEWgbL6OcHbyACKSj0PkQeUgmehdoXVSxt92QFCq4+1390Rwh5moI2K/OgC7D8RHRZqHZxT2husMJHA=="; }; }; - "joi-17.4.0" = { + "joi-17.4.1" = { name = "joi"; packageName = "joi"; - version = "17.4.0"; + version = "17.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz"; - sha512 = "F4WiW2xaV6wc1jxete70Rw4V/VuMd6IN+a5ilZsxG4uYtUXWu2kq9W5P2dz30e7Gmw8RCbY/u/uk+dMPma9tAg=="; + url = "https://registry.npmjs.org/joi/-/joi-17.4.1.tgz"; + sha512 = "gDPOwQ5sr+BUxXuPDGrC1pSNcVR/yGGcTI0aCnjYxZEa3za60K/iCQ+OFIkEHWZGVCUcUlXlFKvMmrlmxrG6UQ=="; }; }; "join-component-1.1.0" = { @@ -32805,40 +32796,40 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.30.0" = { + "jsii-1.31.0" = { name = "jsii"; packageName = "jsii"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.30.0.tgz"; - sha512 = "TfVHhGjP0QiTEkyfnxrDIE8Da+itxnNUK2YoD69qIPAzmZ58goKVqK4sbXrXz2urHSToGLDmWI8+H69cLeVjJw=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.31.0.tgz"; + sha512 = "q/p5a6OLO9V0pIcyzS5sygkU9lPskY57KM7KbmppLDPVi5nIqpsRyFfsbPnGWFfDBMk//nkcfj+dbKJIplVkgg=="; }; }; - "jsii-pacmak-1.30.0" = { + "jsii-pacmak-1.31.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.30.0.tgz"; - sha512 = "hYvISYBXZ5WL/+LtG3HpVrimguqAoWa3D8jaqsnoiIGrdmaxKCZ0VnioJYxEX7wVamYuCwXu5NFx/b31BspU6A=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.31.0.tgz"; + sha512 = "fGiAoooRPMadwTWU0vfHJdcNzeYdESnkU/8LmlI4k6yF1iIlFMIbWPulBxP6fV7SqV3CZQKGpUbcPD/Uzf1glg=="; }; }; - "jsii-reflect-1.30.0" = { + "jsii-reflect-1.31.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.30.0.tgz"; - sha512 = "t/1Zr1gGqQSYt94Lfq860VLnCr8y8MLvlLorWYqmBeWKCaSPhtYSC1blGhZhDrAW+CBXiT0Oy64j4Q++AntRmw=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.31.0.tgz"; + sha512 = "jKc3tryVeEyEBZFv5bDB8rOaEgW+yBPh0DE4GQCKQQLdkp76Lm9ZSkrnJk5e0gEuAWsmuc1DUs35OcVNr8QRWg=="; }; }; - "jsii-rosetta-1.30.0" = { + "jsii-rosetta-1.31.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.30.0.tgz"; - sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.31.0.tgz"; + sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; }; }; "jsii-srcmak-0.1.300" = { @@ -37000,15 +36991,6 @@ let sha512 = "p+NIGQbEBxlw/qWwG+NME98G/9kjOQI70hmaH8QEZtIWfTmfMYLKQW4PJChP4izPHNAxlOfv/qefP0+2ZXn84A=="; }; }; - "map-like-2.0.0" = { - name = "map-like"; - packageName = "map-like"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-like/-/map-like-2.0.0.tgz"; - sha1 = "94496d49ad333c0dc3234b27adbbd1e8535953b4"; - }; - }; "map-merge-1.1.0" = { name = "map-merge"; packageName = "map-merge"; @@ -42214,13 +42196,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.172.4" = { + "office-ui-fabric-react-7.173.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.172.4"; + version = "7.173.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.172.4.tgz"; - sha512 = "qjZguhw4GyfRADa69JKT/4/PF9plaNDo0rM8/gtCSPj6/yETLrdrfjupUKcS32nD7juVdCRkzepAbTEMm9IgMQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.173.0.tgz"; + sha512 = "CXiIneX2lGL1l9vQa2t0nHnngKGUeCnOb0xoK58aGUeWKZuDpiVmxguokkvmrVr8F4hNb8thLfbyqFWpa7VJHQ=="; }; }; "omggif-1.0.10" = { @@ -42394,13 +42376,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.30.0" = { + "oo-ascii-tree-1.31.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.30.0"; + version = "1.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.30.0.tgz"; - sha512 = "TzXuoCnha2QHFcAR+8+tBgD7Wnn6Uh+P3aZMoXKDJ3CVLXFnTnzHy4WMmmz01pTfv+f5haQMjhL9OIFJLEZ5kA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.31.0.tgz"; + sha512 = "gNb2MyP1ZcF7cX0WgsAjYe4gZcx7BMLBWKE2TJZZbQ9/j4D8gbJh5Aq6RlXBgev74ODlgAVVcPr2wKU4Dufhqg=="; }; }; "opal-runtime-1.0.11" = { @@ -44599,13 +44581,13 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; - "peek-readable-3.1.3" = { + "peek-readable-3.1.4" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz"; - sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; + sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; }; }; "peek-stream-1.1.3" = { @@ -46517,13 +46499,13 @@ let sha512 = "X11vso1oNLtyDa2j8fsMol2fph1+5PoQ4vpEc1it/rM8eLuRTmrmTg4jfn82WhNur241AYitgjKCgmlgMRZesw=="; }; }; - "process-exists-4.0.0" = { + "process-exists-4.1.0" = { name = "process-exists"; packageName = "process-exists"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/process-exists/-/process-exists-4.0.0.tgz"; - sha512 = "BnlcYPiZjSW+fye12g9B7UeCzMAOdMkxuTz3zcytJ2BHwYZf2RoKvuuwUcJLeXlGj58x9YQrvhT21PmKhUc4UQ=="; + url = "https://registry.npmjs.org/process-exists/-/process-exists-4.1.0.tgz"; + sha512 = "BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA=="; }; }; "process-nextick-args-1.0.7" = { @@ -47975,13 +47957,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.155" = { + "pyright-1.1.156" = { name = "pyright"; packageName = "pyright"; - version = "1.1.155"; + version = "1.1.156"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.155.tgz"; - sha512 = "y7VqgiOMiLqzFzQ6LCVUtyb8VCsVbwzOHw16A5YxidGmARRYvFn1kIf1uCDqj3ytxrOcVHyptq90/TSffU0hZg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.156.tgz"; + sha512 = "TIe7mK/BUTmdTBpmEYYT5XuRp8qwaFUxF2782HTTTe3hT2UU8UUN0wtIqwHpgFJZksIbahx4UeJyTaOi4ssq6A=="; }; }; "q-0.9.7" = { @@ -49154,13 +49136,13 @@ let sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="; }; }; - "readable-web-to-node-stream-3.0.1" = { + "readable-web-to-node-stream-3.0.2" = { name = "readable-web-to-node-stream"; packageName = "readable-web-to-node-stream"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.1.tgz"; - sha512 = "4zDC6CvjUyusN7V0QLsXVB7pJCD9+vtrM9bYDRv6uBQ+SKfx36rp5AFNPRgh9auKRul/a1iFZJYXcCbwRL+SaA=="; + url = "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz"; + sha512 = "ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw=="; }; }; "readdir-glob-1.1.1" = { @@ -50630,13 +50612,13 @@ let sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; }; }; - "retry-request-4.2.1" = { + "retry-request-4.2.2" = { name = "retry-request"; packageName = "retry-request"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.1.tgz"; - sha512 = "afiCoZZ7D/AR2mf+9ajr75dwGFgWmPEshv3h+oKtf9P1AsHfHvcVXumdbAEq2qNy4UXFEXsEX5HpyGj4axvoaA=="; + url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.2.tgz"; + sha512 = "xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg=="; }; }; "reusify-1.0.4" = { @@ -50837,13 +50819,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.0" = { + "rollup-2.53.1" = { name = "rollup"; packageName = "rollup"; - version = "2.53.0"; + version = "2.53.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.0.tgz"; - sha512 = "spgrY78Toh+m0+zaOoeaayJKuzFuWy6o1PdFIBMVwRcuxT0xCOX9A5rChyKe+2ruL4lePKWUMImS4mMW1QAkmQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.1.tgz"; + sha512 = "yiTCvcYXZEulNWNlEONOQVlhXA/hgxjelFSjNcrwAAIfYx/xqjSHwqg/cCaWOyFRKr+IQBaXwt723m8tCaIUiw=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -51251,15 +51233,6 @@ let sha512 = "b9wZ986HHCo/HbKrRpBJb2kqXMK9CEWIE1egeEvZsYn69ay3kdfl9nG3RyOcR+jInTDf7a86WQ1d4VJX7goSSQ=="; }; }; - "safe-join-0.1.3" = { - name = "safe-join"; - packageName = "safe-join"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-join/-/safe-join-0.1.3.tgz"; - sha512 = "Ylh1EWn4pmL57HRV/oi4Ye7ws5AxKkdGpyDdWsvZob5VLH8xnQpG8tqmHD5v4SdKlN7hyrBjYt7Jm3faeC+uJg=="; - }; - }; "safe-json-stringify-1.2.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; @@ -52430,13 +52403,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.40.0" = { + "simple-git-2.41.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.40.0"; + version = "2.41.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.40.0.tgz"; - sha512 = "7IO/eQwrN5kvS38TTu9ljhG9tx2nn0BTqZOmqpPpp51TvE44YIvLA6fETqEVA8w/SeEfPaVv6mk7Tsk9Jns+ag=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.41.1.tgz"; + sha512 = "n1STz1tfnemvYndzWakgKa0JB4s/LrUG4btXMetWB9N9ZoIAJQd0ZtWj9sBwWxIZ/X/tYdA/tq+KHfFNAGzZhQ=="; }; }; "simple-markdown-0.4.4" = { @@ -53087,13 +53060,13 @@ let sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; - "socket.io-4.1.2" = { + "socket.io-4.1.3" = { name = "socket.io"; packageName = "socket.io"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz"; - sha512 = "xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; + sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; }; }; "socket.io-adapter-0.2.0" = { @@ -55598,13 +55571,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.0.8" = { + "strtok3-6.1.2" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.8"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz"; - sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.2.tgz"; + sha512 = "ECqYgTe/FU1r2fSgXaCywfhoveNNxDWcGSaJesD7OvlrQLIwSck8mZT6xxYdnI4q0l8SwrrExx/01chzUM4Dzw=="; }; }; "structured-source-3.0.2" = { @@ -55976,13 +55949,13 @@ let sha512 = "N7bBZJH0iF24wsalFZF+fVYMUOigaAUQMIcEKHO3jstK/iL8VmP9xE+P0/a76+FkNcWt+TDv2Gx1taUoUscrvw=="; }; }; - "svelte-preprocess-4.7.3" = { + "svelte-preprocess-4.7.4" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.7.3"; + version = "4.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.3.tgz"; - sha512 = "Zx1/xLeGOIBlZMGPRCaXtlMe4ZA0faato5Dc3CosEqwu75MIEPuOstdkH6cy+RYTUYynoxzNaDxkPX4DbrPwRA=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.4.tgz"; + sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; "svelte2tsx-0.4.1" = { @@ -60126,13 +60099,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.2" = { + "url-toolkit-2.2.3" = { name = "url-toolkit"; packageName = "url-toolkit"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.2.tgz"; - sha512 = "l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug=="; + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.3.tgz"; + sha512 = "Da75SQoxsZ+2wXS56CZBrj2nukQ4nlGUZUP/dqUBG5E1su5GKThgT94Q00x81eVII7AyS1Pn+CtTTZ4Z0pLUtQ=="; }; }; "urlencode-1.1.0" = { @@ -62503,13 +62476,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.1.6" = { + "webtorrent-1.2.2" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.1.6"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.1.6.tgz"; - sha512 = "snRFoYjosyhFUE5pa7wY3JJ1Gjn7ietAC0+rprJKTkS/Ca4J4rHuwDWtG6KTr/DSkdna+sxHvlFXfxCHt+xObw=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.2.2.tgz"; + sha512 = "1pM8HsB4WG1MBRV7retGf6AtMQ5osngMvA6x/kUEGfqhQTAJXaBjqEOW19+48H0UbC9PtQuvSDHDDrNcjuzXDA=="; }; }; "well-known-symbols-2.0.0" = { @@ -63475,6 +63448,15 @@ let sha512 = "lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ=="; }; }; + "ws-7.5.3" = { + name = "ws"; + packageName = "ws"; + version = "7.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz"; + sha512 = "kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -65370,7 +65352,7 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."zxcvbn-4.4.2" @@ -65414,7 +65396,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.0" // { + (sources."@nestjs/schematics-8.0.1" // { dependencies = [ sources."@angular-devkit/core-12.0.5" sources."@angular-devkit/schematics-12.0.5" @@ -65428,7 +65410,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -65494,7 +65476,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65903,7 +65885,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -66174,7 +66156,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.771" + sources."electron-to-chromium-1.3.772" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66914,7 +66896,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.9" @@ -67195,7 +67177,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67289,7 +67271,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67324,14 +67306,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.942.0" // { + (sources."aws-sdk-2.943.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67535,10 +67517,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.6.0"; + version = "10.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.6.0.tgz"; - sha512 = "scuMBaNgv3fzqqf9uqgkEytIFgjmHACAjmRwLaTi3LjR2ooTkr/74kx9GtWnoj2jZ8ZDY1ivhDrgG74xoTVQPw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.6.1.tgz"; + sha512 = "aB78X9QuUsHuClTPJgVCKLxG+YVq3RQRs+6U1lO70VKe0lVkTVRmbIyhwi91jwH3Ddwm/7HF+bfJjO4yyRWwBg=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67551,7 +67533,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -68078,7 +68060,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" ]; }) sources."proxy-addr-2.0.7" @@ -68642,7 +68624,7 @@ in sources."es-to-primitive-1.2.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" @@ -69168,7 +69150,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.40.0" + sources."simple-git-2.41.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -69258,7 +69240,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69670,7 +69652,7 @@ in sha512 = "+ikLey611rDoxLBiYuFaNJZxZ1ytCppSEzW+wBIfV5mkyV8Ug5ldHuFzpeUxShZToyzqq8TwhQ5A3CGTU0tSJw=="; }; dependencies = [ - sources."@jsii/spec-1.30.0" + sources."@jsii/spec-1.31.0" sources."@types/node-10.17.60" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -69683,7 +69665,7 @@ in sources."cdk8s-plus-17-1.0.0-beta.30" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.30.0" // { + (sources."codemaker-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -69741,25 +69723,25 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.30.0" // { + (sources."jsii-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.30.0" // { + (sources."jsii-pacmak-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.30.0" // { + (sources."jsii-reflect-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.30.0" // { + (sources."jsii-rosetta-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -69787,7 +69769,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.30.0" + sources."oo-ascii-tree-1.31.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -69863,7 +69845,7 @@ in }; dependencies = [ sources."@cdktf/hcl2json-0.4.1" - sources."@jsii/spec-1.30.0" + sources."@jsii/spec-1.31.0" sources."@skorfmann/ink-confirm-input-3.0.0" sources."@skorfmann/terraform-cloud-1.10.1" sources."@types/node-14.17.5" @@ -70005,7 +69987,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.30.0" // { + (sources."jsii-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70013,10 +69995,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.30.0" // { + (sources."jsii-pacmak-1.31.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.30.0" + sources."codemaker-1.31.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" @@ -70025,7 +70007,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.30.0" // { + (sources."jsii-reflect-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70033,7 +70015,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.30.0" // { + (sources."jsii-rosetta-1.31.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -70083,7 +70065,7 @@ in sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.30.0" + sources."oo-ascii-tree-1.31.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -70163,7 +70145,7 @@ in sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" sources."y18n-5.0.8" @@ -70313,10 +70295,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.11.0.tgz"; - sha512 = "RxYUkfb1HO+ZI62tB0JhqmxYgTrtlS8f3a6+gbFDkEkOCdoCG3GiQBlbV6JjQwdoK7LwNWPxeocJjqoA53ZLnQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.12.0.tgz"; + sha512 = "nRKGxCQLNKvi38q8QIVM+tvGpqEpi1NugCcrRTQfTF78PXofct6ImtVu9aLKDqoq3cAJk9CmngXLPEj+sdgYzQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70425,10 +70407,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.18.6"; + version = "0.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.6.tgz"; - sha512 = "hch8jmuy563eW8glcDJ42yPpzRSSpd/8+8mJKgTDhJNsuv1lKvVP5/mIrPF+6aB5NKwu/+yjDv+l4Scar5CF6A=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.8.tgz"; + sha512 = "CjSVxlpHutTkycvsJyebL+7Om+okMCkffn6V2LC9/Ix68/RVTjhmvwmbZhVe8zg5G9uyjdNUW+UpDBQy/GAm9Q=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -71116,7 +71098,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -71921,7 +71903,7 @@ in sha512 = "8UgCdjUkXDc+cN45tuWnVVd3S04SoNv6JuB51BdPkzq2iWcpIfYNHepLIxdkzdCw0I0MQkAqWCo+buRbEVNW9g=="; }; dependencies = [ - sources."pyright-1.1.155" + sources."pyright-1.1.156" ]; buildInputs = globalBuildInputs; meta = { @@ -71995,10 +71977,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.47.0"; + version = "0.47.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.0.tgz"; - sha512 = "j9jwYXLlK769B01bwXPei29/pvBu2ulYFSJAr7kwJMCXPCusj9SN1EYpuuUmhBiG+qMvIuaew1xlohr8WhT32Q=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.47.1.tgz"; + sha512 = "ff5hTzmCPr3iqfc9XZ7KwxSSJWVT4KaCZHsz+Ue+PgY9PHY6X1E/ZHknXLXwbXx4JmOD8NPpMM0db/ShgeIMpA=="; }; buildInputs = globalBuildInputs; meta = { @@ -72165,7 +72147,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -72960,7 +72942,7 @@ in sources."core-util-is-1.0.2" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fecha-4.2.1" sources."fn.name-1.1.0" sources."follow-redirects-1.14.1" @@ -73628,7 +73610,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73999,7 +73981,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -75314,7 +75296,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -75946,7 +75928,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -76018,7 +76000,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76229,7 +76211,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -76279,7 +76261,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.172.4" + sources."@fluentui/react-7.173.0" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -77320,7 +77302,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.172.4" + sources."office-ui-fabric-react-7.173.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -77822,7 +77804,7 @@ in }) sources."url-join-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.2" + sources."url-toolkit-2.2.3" sources."use-3.1.1" sources."util-0.11.1" sources."util-deprecate-1.0.2" @@ -77917,7 +77899,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -79122,7 +79104,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.771" + sources."electron-to-chromium-1.3.772" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81663,7 +81645,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81937,7 +81919,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -82012,7 +81994,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.17.0" // { + (sources."google-gax-2.17.1" // { dependencies = [ sources."google-auth-library-7.3.0" ]; @@ -82312,7 +82294,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-0.12.0" - sources."retry-request-4.2.1" + sources."retry-request-4.2.2" sources."rimraf-3.0.2" (sources."router-1.3.5" // { dependencies = [ @@ -82509,7 +82491,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xdg-basedir-4.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" @@ -82582,10 +82564,10 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.1.0.tgz"; - sha512 = "untVuHgEQjwTXQGiWcwMTi0Uks6ht9R5hb1mDT4AEQitZ/z8UrhvseQsGEC3kVEjfxQ6bdmCMaA/hKTZ5aQDrA=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-6.2.0.tgz"; + sha512 = "HFv/ywCzDAVCxq1IL++lB96zxnUwspScZjqcWown87KPfWng3eJi+BDgXMie9PboXikxOcFoqfd+jJQHDgV3EQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -82634,7 +82616,7 @@ in sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" - sources."fkill-7.1.1" + sources."fkill-7.2.1" sources."function-bind-1.1.1" sources."get-stream-6.0.1" sources."hard-rejection-2.1.0" @@ -82689,7 +82671,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."pid-port-0.1.1" - (sources."process-exists-4.0.0" // { + (sources."process-exists-4.1.0" // { dependencies = [ sources."ps-list-6.3.0" ]; @@ -82769,7 +82751,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -83555,9 +83537,8 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/node-fetch-2.5.11" - sources."@types/readable-stream-2.3.11" sources."@types/unist-2.0.5" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" @@ -83719,7 +83700,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83772,7 +83753,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.5.0" + sources."file-type-16.5.1" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -83899,7 +83880,7 @@ in ]; }) sources."jest-get-type-25.2.6" - (sources."joi-17.4.0" // { + (sources."joi-17.4.1" // { dependencies = [ sources."@hapi/hoek-9.2.0" sources."@hapi/topo-5.1.0" @@ -84000,7 +83981,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.3" + sources."peek-readable-3.1.4" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -84033,7 +84014,7 @@ in sources."react-is-16.13.1" sources."read-1.0.7" sources."readable-stream-3.6.0" - sources."readable-web-to-node-stream-3.0.1" + sources."readable-web-to-node-stream-3.0.2" sources."readdirp-3.6.0" sources."redux-4.1.0" sources."regenerator-runtime-0.13.8" @@ -84130,7 +84111,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.0.8" + sources."strtok3-6.1.2" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -84197,7 +84178,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xdg-basedir-4.0.0" sources."xstate-4.22.0" sources."xtend-4.0.2" @@ -84454,7 +84435,7 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-to-buffer-4.0.0" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -84946,7 +84927,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -85061,7 +85042,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fastq-1.11.1" sources."figlet-1.5.0" sources."figures-3.2.0" @@ -87607,7 +87588,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -88049,7 +88030,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.942.0" // { + (sources."aws-sdk-2.943.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -88675,7 +88656,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -89510,8 +89491,8 @@ in dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.11" - sources."@types/node-16.3.0" + sources."@types/cors-2.8.12" + sources."@types/node-16.3.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -89763,7 +89744,7 @@ in sources."escalade-3.1.1" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."filter-obj-1.1.0" sources."foreach-2.0.5" sources."fs.realpath-1.0.0" @@ -92323,7 +92304,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -92620,7 +92601,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92689,7 +92670,7 @@ in sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fb-watchman-2.0.1" sources."figgy-pudding-3.5.2" sources."file-uri-to-path-1.0.0" @@ -93868,7 +93849,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93999,24 +93980,24 @@ in sha512 = "LrJqn/26CxH9aQ9j7iPqnk9fS6ywI3gpCt7HS26UXeycC3VBfhkoONLZQW/JXW3aJGoUHUlxunsQBI0h89EJIw=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-8.2.0" - sources."@fluentui/dom-utilities-2.1.2" - sources."@fluentui/font-icons-mdl2-8.1.4" - sources."@fluentui/foundation-legacy-8.1.4" - sources."@fluentui/keyboard-key-0.3.2" - sources."@fluentui/merge-styles-8.1.2" + sources."@fluentui/date-time-utilities-8.2.1" + sources."@fluentui/dom-utilities-2.1.3" + sources."@fluentui/font-icons-mdl2-8.1.5" + sources."@fluentui/foundation-legacy-8.1.5" + sources."@fluentui/keyboard-key-0.3.3" + sources."@fluentui/merge-styles-8.1.3" sources."@fluentui/react-8.22.0" - sources."@fluentui/react-focus-8.1.5" - sources."@fluentui/react-hooks-8.2.3" - sources."@fluentui/react-window-provider-2.1.2" - sources."@fluentui/set-version-8.1.2" - sources."@fluentui/style-utilities-8.1.4" - sources."@fluentui/theme-2.1.3" - sources."@fluentui/utilities-8.2.0" + sources."@fluentui/react-focus-8.1.6" + sources."@fluentui/react-hooks-8.2.4" + sources."@fluentui/react-window-provider-2.1.3" + sources."@fluentui/set-version-8.1.3" + sources."@fluentui/style-utilities-8.1.5" + sources."@fluentui/theme-2.1.4" + sources."@fluentui/utilities-8.2.1" sources."@microsoft/load-themed-styles-1.10.192" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/cors-2.8.11" + sources."@types/cors-2.8.12" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -94485,7 +94466,7 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fecha-2.3.3" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" @@ -94526,10 +94507,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.1.18"; + version = "4.1.23"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.1.18.tgz"; - sha512 = "urJ/UEOwS5jL+bhNccADuBBFbaewgIj5LZxTsFgM56bCPxNIGEwVrwW4kaVGZqujNYLaZrUn1BlhKaXW6nIUnA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.1.23.tgz"; + sha512 = "cppRgtCdYfp6dN4azxosLQeezhQ8XkYU9wFCvMN5BYx0FhXe7nb7szqYmTUSglErg9h3CPCVic34z/YlstTmlw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -94697,7 +94678,7 @@ in ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.6.0" // { + (sources."@netlify/framework-info-5.7.0" // { dependencies = [ sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -94715,7 +94696,7 @@ in ]; }) sources."@netlify/open-api-2.5.0" - (sources."@netlify/plugin-edge-handlers-1.11.20" // { + (sources."@netlify/plugin-edge-handlers-1.11.21" // { dependencies = [ sources."@types/node-14.17.5" ]; @@ -94902,7 +94883,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -95327,7 +95308,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95412,7 +95393,7 @@ in sources."fast-equals-2.0.3" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fast-stringify-1.1.2" sources."fastq-1.11.1" sources."fd-slicer-1.1.0" @@ -95497,7 +95478,7 @@ in sources."get-port-5.1.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" - sources."gh-release-fetch-2.0.0" + sources."gh-release-fetch-2.0.1" sources."git-repo-info-2.1.1" sources."gitconfiglocal-2.1.0" sources."glob-7.1.7" @@ -96145,7 +96126,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.0" + sources."rollup-2.53.1" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96162,7 +96143,6 @@ in sources."run-parallel-1.2.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" - sources."safe-join-0.1.3" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -97318,7 +97298,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.2" + sources."ws-7.5.3" ]; }) (sources."mqtt-packet-6.10.0" // { @@ -97705,10 +97685,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.10.tgz"; - sha512 = "369KB2EC1fLzz7hIuKSRSIVhh9PXqFAwh1stxlNX8DMyat9y/maswuRxRMttyelnduLDa04r4wgVZ4fgRwZWuQ=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz"; + sha512 = "egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -97901,7 +97881,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -99390,7 +99370,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.771" + sources."electron-to-chromium-1.3.772" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -101467,10 +101447,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.9.1.tgz"; - sha512 = "2qlbvmHB+ULAoTCMpJ75oADYoVQnsxD1ipCemdDJA2KW4auGwoTUzyowVYEiAe4DIDOqw3axhHVkNAo7P6goZA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.0.tgz"; + sha512 = "fHKtgvnp9CfT/3qijmjUCstOFSB45OAF5EoK6lJxfdpEDe9bgO4om4do8Ut3boV+atZbV6rlEk9vZOUK6BGclw=="; }; buildInputs = globalBuildInputs; meta = { @@ -101510,6 +101490,29 @@ in bypassCache = true; reconstructLock = true; }; + postcss = nodeEnv.buildNodePackage { + name = "postcss"; + packageName = "postcss"; + version = "8.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz"; + sha512 = "NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA=="; + }; + dependencies = [ + sources."colorette-1.2.2" + sources."nanoid-3.1.23" + sources."source-map-js-0.6.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Tool for transforming styles with JS plugins"; + homepage = "https://postcss.org/"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; @@ -101783,7 +101786,7 @@ in sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gaze-1.1.3" @@ -102016,10 +102019,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.155"; + version = "1.1.156"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.155.tgz"; - sha512 = "y7VqgiOMiLqzFzQ6LCVUtyb8VCsVbwzOHw16A5YxidGmARRYvFn1kIf1uCDqj3ytxrOcVHyptq90/TSffU0hZg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.156.tgz"; + sha512 = "TIe7mK/BUTmdTBpmEYYT5XuRp8qwaFUxF2782HTTTe3hT2UU8UUN0wtIqwHpgFJZksIbahx4UeJyTaOi4ssq6A=="; }; buildInputs = globalBuildInputs; meta = { @@ -102502,7 +102505,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -102919,7 +102922,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -104255,7 +104258,7 @@ in sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -104313,7 +104316,7 @@ in }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.8" - sources."@types/node-15.14.1" + sources."@types/node-15.14.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -104405,7 +104408,7 @@ in sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fill-range-7.0.1" sources."foreach-2.0.5" sources."fsevents-2.3.2" @@ -104789,10 +104792,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.0"; + version = "2.53.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.0.tgz"; - sha512 = "spgrY78Toh+m0+zaOoeaayJKuzFuWy6o1PdFIBMVwRcuxT0xCOX9A5rChyKe+2ruL4lePKWUMImS4mMW1QAkmQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.1.tgz"; + sha512 = "yiTCvcYXZEulNWNlEONOQVlhXA/hgxjelFSjNcrwAAIfYx/xqjSHwqg/cCaWOyFRKr+IQBaXwt723m8tCaIUiw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -105118,7 +105121,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.0" + sources."rollup-2.53.1" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -105594,8 +105597,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.3.0" - sources."@types/readable-stream-2.3.11" + sources."@types/node-16.3.1" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -105656,7 +105658,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.942.0" // { + (sources."aws-sdk-2.943.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105878,13 +105880,13 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fastest-levenshtein-1.0.12" sources."fastq-1.11.1" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-16.5.0" + sources."file-type-16.5.1" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" @@ -106130,7 +106132,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-3.1.3" + sources."peek-readable-3.1.4" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -106164,7 +106166,7 @@ in sources."ramda-0.26.1" sources."rc-1.2.8" sources."readable-stream-3.6.0" - sources."readable-web-to-node-stream-3.0.1" + sources."readable-web-to-node-stream-3.0.2" sources."readdir-glob-1.1.1" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" @@ -106200,7 +106202,7 @@ in sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.40.0" // { + (sources."simple-git-2.41.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -106241,7 +106243,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.0.8" + sources."strtok3-6.1.2" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -106361,7 +106363,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.6.3" @@ -107010,10 +107012,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.657.0"; + version = "1.658.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.657.0.tgz"; - sha512 = "wTJ5k49SopXL9Sm8Ltlp+HVVpakpaxkt//IRzOTEN75CMd/NpLtCSD34oAbUfo+tTrN1Ig8MSXGk5Z3XQm2d7w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.658.0.tgz"; + sha512 = "h39A1Y14Rr14o6Xfk78KwyLiuVGLCjpMwZQoK/6jNvaTPJAaxPG68HHuzjBJ5/j43w7AB8KBfqyf08+NKAIETA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -107762,16 +107764,16 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz"; - sha512 = "xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-4.1.3.tgz"; + sha512 = "tLkaY13RcO4nIRh1K2hT5iuotfTaIQw7cVIe0FUykN3SuQi0cm7ALxuyT5/CtDswOMWUzMGTibxYNx/gU7In+Q=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.11" - sources."@types/node-16.3.0" + sources."@types/cors-2.8.12" + sources."@types/node-16.3.1" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -108937,7 +108939,7 @@ in sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -109037,7 +109039,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.942.0" // { + (sources."aws-sdk-2.943.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -109913,7 +109915,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -110155,7 +110157,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -110197,7 +110199,7 @@ in sources."source-map-0.7.3" sources."strip-indent-3.0.0" sources."svelte-3.38.3" - sources."svelte-preprocess-4.7.3" + sources."svelte-preprocess-4.7.4" sources."svelte2tsx-0.4.1" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" @@ -111199,36 +111201,36 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.0.0"; + version = "12.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.0.0.tgz"; - sha512 = "hpXezTFR/BxNzc0iJqwspAuHYrCWF/nF7mBS9OGzgBJx5FfS1xfsAIityV65Ffcr+nxCExzTQqRHR6qSWOZmbg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-12.0.2.tgz"; + sha512 = "pg453CN2xtLoqss9YVSKkEFJtJ1AB/9SWTxl11fgdqFPCOK2W/320CJRqSxo5bJFpIn5+6bjqkuPHS0cZWLPvg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" sources."@textlint/ast-node-types-12.0.0" - sources."@textlint/ast-tester-12.0.0" - sources."@textlint/ast-traverse-12.0.0" - sources."@textlint/feature-flag-12.0.0" - sources."@textlint/fixer-formatter-12.0.0" - sources."@textlint/kernel-12.0.0" - sources."@textlint/linter-formatter-12.0.0" - sources."@textlint/markdown-to-ast-12.0.0" - sources."@textlint/module-interop-12.0.0" - sources."@textlint/source-code-fixer-12.0.0" - sources."@textlint/text-to-ast-12.0.0" - sources."@textlint/textlint-plugin-markdown-12.0.0" - sources."@textlint/textlint-plugin-text-12.0.0" - sources."@textlint/types-12.0.0" - sources."@textlint/utils-12.0.0" + sources."@textlint/ast-tester-12.0.2" + sources."@textlint/ast-traverse-12.0.2" + sources."@textlint/feature-flag-12.0.2" + sources."@textlint/fixer-formatter-12.0.2" + sources."@textlint/kernel-12.0.2" + sources."@textlint/linter-formatter-12.0.2" + sources."@textlint/markdown-to-ast-12.0.2" + sources."@textlint/module-interop-12.0.2" + sources."@textlint/source-code-fixer-12.0.2" + sources."@textlint/text-to-ast-12.0.2" + sources."@textlint/textlint-plugin-markdown-12.0.2" + sources."@textlint/textlint-plugin-text-12.0.2" + sources."@textlint/types-12.0.2" + sources."@textlint/utils-12.0.2" sources."@types/mdast-3.0.4" sources."@types/unist-2.0.5" - sources."ajv-4.11.8" - sources."ajv-keywords-1.5.1" + sources."ajv-8.6.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" + sources."astral-regex-2.0.0" sources."bail-1.0.5" sources."balanced-match-1.0.2" sources."boundary-1.0.1" @@ -111244,8 +111246,9 @@ in sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charenc-0.0.2" - sources."co-4.6.0" sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."crypt-0.0.2" sources."debug-4.3.2" @@ -111253,10 +111256,12 @@ in sources."deep-is-0.1.3" sources."define-properties-1.1.3" sources."diff-4.0.2" + sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."extend-3.0.2" + sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" sources."file-entry-cache-5.0.1" @@ -111292,16 +111297,15 @@ in sources."is-utf8-0.2.1" sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" - sources."json-stable-stringify-1.0.1" + sources."json-schema-traverse-1.0.0" sources."json5-2.2.0" - sources."jsonify-0.0.0" sources."levn-0.4.1" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.21" + sources."lodash.clonedeep-4.5.0" + sources."lodash.truncate-4.4.2" sources."log-symbols-1.0.2" sources."longest-streak-2.0.4" - sources."map-like-2.0.0" sources."markdown-table-2.0.0" (sources."md5-2.3.0" // { dependencies = [ @@ -111357,6 +111361,7 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" + sources."punycode-2.1.1" sources."rc-config-loader-3.0.0" sources."read-pkg-1.1.0" (sources."read-pkg-up-3.0.0" // { @@ -111379,7 +111384,12 @@ in sources."resolve-1.20.0" sources."rimraf-2.6.3" sources."semver-5.7.1" - sources."slice-ansi-0.0.4" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."is-fullwidth-code-point-3.0.0" + ]; + }) sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -111398,12 +111408,10 @@ in sources."strip-bom-2.0.0" sources."structured-source-3.0.2" sources."supports-color-2.0.0" - (sources."table-3.8.3" // { + (sources."table-6.7.1" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.2" ]; }) sources."text-table-0.2.0" @@ -111416,6 +111424,7 @@ in sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-parents-3.1.1" + sources."uri-js-4.4.1" sources."validate-npm-package-license-3.0.4" sources."vfile-4.2.1" sources."vfile-message-2.0.4" @@ -112307,7 +112316,7 @@ in sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -112607,7 +112616,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.3" + sources."peek-readable-3.1.4" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -112692,7 +112701,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.0.8" + sources."strtok3-6.1.2" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" @@ -112723,7 +112732,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -113319,7 +113328,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.11" + sources."@types/cors-2.8.12" sources."@types/node-14.17.5" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -113373,7 +113382,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-5.0.0" - sources."diff2html-3.4.6" + sources."diff2html-3.4.7" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -113401,7 +113410,7 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fecha-4.2.1" sources."finalhandler-1.1.2" sources."fn.name-1.1.0" @@ -113527,7 +113536,7 @@ in sources."signals-1.0.0" sources."simple-swizzle-0.2.2" sources."snapsvg-0.5.1" - (sources."socket.io-4.1.2" // { + (sources."socket.io-4.1.3" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -114285,7 +114294,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -114852,7 +114861,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-16.3.0" + sources."@types/node-16.3.1" sources."@types/unist-2.0.5" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -115797,7 +115806,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" - (sources."bit-field-1.5.1" // { + (sources."bit-field-1.5.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."fs-extra-10.0.0" @@ -115963,7 +115972,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -116024,7 +116033,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -116201,7 +116210,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-3.0.1" - sources."fast-safe-stringify-2.0.7" + sources."fast-safe-stringify-2.0.8" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" (sources."firefox-profile-4.2.0" // { @@ -116587,7 +116596,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -116614,7 +116623,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.771" + sources."electron-to-chromium-1.3.772" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -116752,7 +116761,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -117388,10 +117397,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.3.0.tgz"; - sha512 = "E0gb1fXb8xNScgewQmvAmNLrnEto6MOaKlfzITVzR+bbU80LeV/YdrLw536ffcwiUv0arKQyfR/WIweBFrKWbg=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.3.1.tgz"; + sha512 = "C29onCkDUhQORBMG4+0JPOEC5zDnkXXB7ZJjJaC3WqmXvTWH4P7FfYys5uSXr/UzT3JjoqnwTWPjhunJZZkYxA=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.2" @@ -117406,9 +117415,11 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bencode-2.0.1" @@ -117463,6 +117474,7 @@ in ]; }) sources."castv2-client-1.2.0" + sources."chalk-4.1.1" sources."charset-1.0.1" sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" @@ -117473,7 +117485,9 @@ in ]; }) sources."chunk-store-stream-4.3.0" - sources."clivas-0.2.0" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."common-tags-1.8.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" @@ -117500,8 +117514,10 @@ in sources."ecstatic-4.1.4" sources."ee-first-1.1.1" sources."elementtree-0.1.7" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."err-code-3.0.1" + sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" @@ -117513,8 +117529,10 @@ in }) sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.1.0" + sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" sources."glob-7.1.7" + sources."has-flag-4.0.0" sources."he-1.2.0" sources."http-node-git://github.com/feross/http-node#webtorrent" sources."http-parser-js-0.4.13" @@ -117528,6 +117546,7 @@ in sources."is-ascii-1.0.0" sources."is-docker-2.2.1" sources."is-file-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -117618,6 +117637,7 @@ in sources."ms-2.1.2" ]; }) + sources."require-directory-2.1.1" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" @@ -117646,12 +117666,15 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" + sources."string-width-4.2.2" (sources."string2compact-1.3.0" // { dependencies = [ sources."ipaddr.js-1.9.1" ]; }) sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.2.0" sources."thirty-two-1.0.2" sources."through-2.3.8" sources."thunky-0.1.0" @@ -117684,7 +117707,7 @@ in sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.1.6" // { + (sources."webtorrent-1.2.2" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -117694,11 +117717,15 @@ in ]; }) sources."winreg-1.2.4" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.2" + sources."ws-7.5.3" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" + sources."y18n-5.0.8" + sources."yargs-17.0.1" + sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; meta = { @@ -117867,7 +117894,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.5" - sources."@types/node-15.14.1" + sources."@types/node-15.14.2" sources."@types/vinyl-2.0.5" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -118765,7 +118792,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.0" + sources."@types/node-16.3.1" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" From 87f17088729d3303d6b60c079026c7891c676731 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 12 Jul 2021 13:49:12 +0200 Subject: [PATCH 060/188] nodePackages.postcss-cli: fix execution of binary Without this change, executing the postcss binary results in the following error: Error: Cannot find module 'postcss' --- pkgs/development/node-packages/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 19fff0c71f7..5c99ceab208 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -202,6 +202,15 @@ let ''; }; + postcss-cli = super.postcss-cli.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/postcss" \ + --prefix NODE_PATH : ${self.postcss}/lib/node_modules + ''; + meta.mainProgram = "postcss"; + }; + pulp = super.pulp.override { # tries to install purescript npmFlags = "--ignore-scripts"; From 100a01c272777f6e804cdbaff518ae434a8b8865 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Wed, 5 May 2021 23:52:53 -0400 Subject: [PATCH 061/188] kinect-audio-setup: init at v0.5 Co-authored-by: timokau --- .../linux/kinect-audio-setup/default.nix | 91 +++++++++++++++++++ .../libusb-1-import-path.patch | 23 +++++ .../udev-rules-extra-devices.patch | 15 +++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 131 insertions(+) create mode 100644 pkgs/os-specific/linux/kinect-audio-setup/default.nix create mode 100644 pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch create mode 100644 pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch diff --git a/pkgs/os-specific/linux/kinect-audio-setup/default.nix b/pkgs/os-specific/linux/kinect-audio-setup/default.nix new file mode 100644 index 00000000000..94ae4806cf2 --- /dev/null +++ b/pkgs/os-specific/linux/kinect-audio-setup/default.nix @@ -0,0 +1,91 @@ +{ lib +, stdenv +, fetchgit +, requireFile +, pkg-config +, libusb1 +, p7zip +}: + +let + # The last known good firmware package to have been tested + # by the upstream projet. + # The firmware URL is hardcoded in the upstream project's installation script + firmwareUrl = "https://download.microsoft.com/download/F/9/9/F99791F2-D5BE-478A-B77A-830AD14950C3/KinectSDK-v1.0-beta2-x86.msi"; + # The original URL "https://research.microsoft.com/en-us/um/legal/kinectsdk-tou_noncommercial.htm" + # redirects to the following url: + licenseUrl = "https://www.microsoft.com/en-us/legal/terms-of-use"; +in +stdenv.mkDerivation rec { + pname = "kinect-audio-setup"; + + # On update: Make sure that the `firmwareURL` is still in sync with upstream. + # If the project structure hasn't changed you can find the URL in the + # `kinect_fetch_fw` file in the project source. + version = "0.5"; + + # This is an MSI or CAB file + FIRMWARE = requireFile rec { + name = "UACFirmware"; + sha256 = "08a2vpgd061cmc6h3h8i6qj3sjvjr1fwcnwccwywqypz3icn8xw1"; + message = '' + In order to install the Kinect Audio Firmware, you need to download the + non-redistributable firmware from Microsoft. + The firmware is available at ${firmwareUrl} and the license at ${licenseUrl} . + Save the file as UACFirmware and use "nix-prefetch-url file://\$PWD/UACFirmware" to + add it to the Nix store. + ''; + }; + + src = fetchgit { + url = "git://git.ao2.it/kinect-audio-setup.git"; + rev = "v${version}"; + sha256 = "sha256-bFwmWh822KvFwP/0Gu097nF5K2uCwCLMB1RtP7k+Zt0="; + }; + + # These patches are not upstream because the project has seen no + # activity since 2016 + patches = [ + ./libusb-1-import-path.patch + ./udev-rules-extra-devices.patch + ]; + + nativeBuildInputs = [ p7zip libusb1 pkg-config ]; + + makeFlags = [ + "PREFIX=$(out)" + "DESTDIR=$(out)" + "FIRMWARE_PATH=$(out)/lib/firmware/UACFirmware" + "LOADER_PATH=$(out)/libexec/kinect_upload_fw" + ]; + + buildPhase = '' + runHook preBuild + make -C kinect_upload_fw kinect_upload_fw $makeFlags "''${makeFlagsArray[@]}" + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/libexec/ $out/lib/firmware $out/lib/udev/rules.d + + install -Dm755 kinect_upload_fw/kinect_upload_fw $out/libexec/ + + # 7z extract "assume yes on all queries" "only extract/keep files/directories matching UACFIRMWARE.* recursively" + 7z e -y -r "${FIRMWARE}" "UACFirmware.*" >/dev/null + # The filename is bound to change with the Firmware SDK + mv UACFirmware.* $out/lib/firmware/UACFirmware + + make install_udev_rules $makeFlags "''${makeFlagsArray[@]}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Tools to enable audio input from the Microsoft Kinect sensor device"; + homepage = "https://git.ao2.it/kinect-audio-setup.git"; + maintainers = with maintainers; [ berbiche ]; + platforms = platforms.linux; + license = licenses.unfree; + }; +} diff --git a/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch b/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch new file mode 100644 index 00000000000..a0c5ad99f9f --- /dev/null +++ b/pkgs/os-specific/linux/kinect-audio-setup/libusb-1-import-path.patch @@ -0,0 +1,23 @@ +commit 02fd6c4355809e1bff7c66d478e88f30bedde13b +Author: Nicolas Berbiche +Date: Wed May 5 23:14:56 2021 -0400 + + fix libusb include for Linux + +diff --git a/kinect_upload_fw/kinect_upload_fw.c b/kinect_upload_fw/kinect_upload_fw.c +index 1bd4102..351c94f 100644 +--- a/kinect_upload_fw/kinect_upload_fw.c ++++ b/kinect_upload_fw/kinect_upload_fw.c +@@ -35,7 +35,12 @@ + #include + #include + #include ++ ++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(_WIN32) + #include ++#else ++#include ++#endif + + #include "endian.h" + diff --git a/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch b/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch new file mode 100644 index 00000000000..d58b970c7c0 --- /dev/null +++ b/pkgs/os-specific/linux/kinect-audio-setup/udev-rules-extra-devices.patch @@ -0,0 +1,15 @@ +commit afaaa77b0a03811f86428cf264397b60dd795549 +Author: Nicolas Berbiche +Date: Thu May 6 00:10:37 2021 -0400 + + Add support for other Kinect device in udev + +diff --git a/contrib/55-kinect_audio.rules.in b/contrib/55-kinect_audio.rules.in +index 25ea713..9e1b69f 100644 +--- a/contrib/55-kinect_audio.rules.in ++++ b/contrib/55-kinect_audio.rules.in +@@ -1,2 +1,4 @@ + # Rule to load the Kinect UAC firmware on the "generic" usb device + ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02ad", RUN+="@LOADER_PATH@ @FIRMWARE_PATH@" ++# Rule to load the Kinect UAC firmware on another supported device ++ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", RUN+="@LOADER_PATH@ @FIRMWARE_PATH@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ae2cee9d8d..e34208ea7e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20583,6 +20583,8 @@ in kbdlight = callPackage ../os-specific/linux/kbdlight { }; + kinect-audio-setup = callPackage ../os-specific/linux/kinect-audio-setup { }; + kmscon = callPackage ../os-specific/linux/kmscon { }; kmscube = callPackage ../os-specific/linux/kmscube { }; From 2201e7d8ce73625b65b481feeea7b62cac7f970b Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Sun, 11 Jul 2021 00:30:04 +0000 Subject: [PATCH 062/188] vscodium: 1.57.1 -> 1.58.0 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 849f435eb36..62ce4aed9ea 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "16s3hznyrz9w0cns8fk3pzk9ai5dj9y5p4n1rf3hrpg5hi9yxi5j"; - x86_64-darwin = "133p032c8gv3hx4x7kxdfhz4xvkpjmjnvy02sf05dxqv5nly4xx4"; - aarch64-linux = "183f674qyrlz0wqx6x48z6jhl8z30zmwsj8021hqi8px5ny99l1f"; - armv7l-linux = "0rf3ybha861r5pfp6rvh21abfagaiwqlsbxm7fhphrc5382lmxbs"; + x86_64-linux = "12pghdkkaz4rc174b7hxkq801hjb3l0cimpm7rzbwxxpi3dkdmbl"; + x86_64-darwin = "00gs6r3qgf313fml02953dw96in4rcjddsrxrzk17i3ik1rb1ipn"; + aarch64-linux = "0pbm474630j4l4rsh3v7i535xawb2xgiyg995f55mhgza9cs7lvl"; + armv7l-linux = "1cgda38drpb35q036vqsidbvhwbmqchvyxj6qzvl2ibn5s5bdwpm"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.57.1"; + version = "1.58.0"; pname = "vscodium"; executableName = "codium"; From b24129f9c9cb5643234b9ac6d1237aafe6b29ed5 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 12 Jul 2021 10:38:56 -0700 Subject: [PATCH 063/188] fishPlugins.done: 1.16.1 -> 1.16.3 --- pkgs/shells/fish/plugins/done.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index 25065b21fb1..8d1a14e19f2 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.16.1"; + version = "1.16.3"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - sha256 = "NFysKzRZgDXXZW/sUlZNu7ZpMCKwbjAhIfspSK3UqCY="; + sha256 = "Xld66z9vVp3kxikndZ9k/zlNvP0YSoSCNTBkJ8rT3uo="; }; checkPlugins = [ fishtape ]; From e66e0d6ed39db364d398d41141b786d8c895d5e2 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 12 Jul 2021 20:06:10 +0100 Subject: [PATCH 064/188] trivy: 0.19.0 -> 0.19.1 --- pkgs/tools/admin/trivy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 0c4dd2cb718..f69909d8546 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "trivy"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jZwdSX24nipj5IijDxCwxj79f0vndsGbjmRsH2N/Qxk="; + sha256 = "sha256-oiaH0w7TEztR1i0wBuXXr+JN37UZOQ/zObBzQQvAnZY="; }; vendorSha256 = "sha256-bIQSZ+QQ0CnyOQ692Wpy4nXIPDSkD3LmnjwHZRG6soY="; From 061afaf4eda81f62dcf80420d6acfd4d3871caf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Kristian=20Lysh=C3=B8j=20Jensen?= Date: Mon, 12 Jul 2021 18:28:37 +0200 Subject: [PATCH 065/188] headscale: 0.2.2 -> 0.3.3 --- pkgs/servers/headscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 1a01ffe954b..8b9380c6baf 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.2.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "0iij4hdbdplai5c8kvcwiw11idrk04xbpwb3njdhqcg6pdyx3216"; + sha256 = "0nf2l8l23wzn3l3x4698rfr3g6lkx5qfzsbfl0rv25q1pqgybdzj"; }; - vendorSha256 = "sha256-8MCSN8wn2Y9ejHAIEwTdIXGITaa+FqX7WUMJEr0RcIk="; + vendorSha256 = "sha256-0Lqr/tWk31S01vi21sG2gtlGouOhecL4u8ScKG0nWLo="; # Ldflags are same as build target in the project's Makefile # https://github.com/juanfont/headscale/blob/main/Makefile From 9fb637ac66bc3036f1d550281dc1c82dafba7e32 Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Mon, 12 Jul 2021 16:20:44 -0300 Subject: [PATCH 066/188] clojure-lsp: 2021.06.01-16.19.44 -> 2021.07.12-12.30.59 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 12 +++++------- .../misc/clojure-lsp/disable-check-toolchain.patch | 12 ------------ 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 8783d217c1f..b99e8a73457 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,28 +1,26 @@ -{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub }: +{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure }: stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.06.01-16.19.44"; + version = "2021.07.12-12.30.59"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-dACvjm+uEVWotoeYhA4gCenKeprpF2dI0PGNRAVALao="; + sha256 = "0iky3yh548xn28285x8gnjzc00f3i2b415wb2dhd9p9y2bgzhkld"; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar"; - sha256 = "sha256-V12rSYv/Yu12ZpLSROd+4pyGiEGRfJ7lmRqCeikcQ5Q="; + sha256 = "02k1k0slh1lm7k43d52jvgl0fdyp9gcr8csbr6yi71qbhy0axrmp"; }; GRAALVM_HOME = graalvm11-ce; CLOJURE_LSP_JAR = jar; CLOJURE_LSP_XMX = "-J-Xmx4g"; - patches = lib.optionals stdenv.isDarwin [ ./disable-check-toolchain.patch ]; - - buildInputs = [ graalvm11-ce ]; + buildInputs = [ graalvm11-ce clojure ]; buildPhase = with lib; '' runHook preBuild diff --git a/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch b/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch deleted file mode 100644 index 402189627c2..00000000000 --- a/pkgs/development/tools/misc/clojure-lsp/disable-check-toolchain.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/graalvm/native-unix-compile.sh b/graalvm/native-unix-compile.sh -index ec0e49f..e19a120 100755 ---- a/graalvm/native-unix-compile.sh -+++ b/graalvm/native-unix-compile.sh -@@ -17,6 +17,7 @@ CLOJURE_LSP_XMX=${CLOJURE_LSP_XMX:-"-J-Xmx4g"} - - args=("-jar" "$CLOJURE_LSP_JAR" - "-H:+ReportExceptionStackTraces" -+ "-H:-CheckToolchain" - "--verbose" - "--no-fallback" - "--native-image-info" From 9e1ff110b5dbccaff96dcf5d459976da2f80e23c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:22:27 +0200 Subject: [PATCH 067/188] uchess: move makeWrapper to nativeBuildInputs --- pkgs/games/uchess/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/uchess/default.nix b/pkgs/games/uchess/default.nix index bc2524466cc..cafd7cf5769 100644 --- a/pkgs/games/uchess/default.nix +++ b/pkgs/games/uchess/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { # package does not contain any tests as of v0.2.1 doCheck = false; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/uchess --suffix PATH : ${stockfish}/bin ''; From 99e9cc0d403d2fb528a3dc871e6c9659721074bc Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:26:42 +0200 Subject: [PATCH 068/188] gawk-with-extensions: move makeWrapper to nativeBuildInputs --- pkgs/tools/text/gawk/gawk-with-extensions.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gawk/gawk-with-extensions.nix b/pkgs/tools/text/gawk/gawk-with-extensions.nix index 751e5181bb5..1b82d798d33 100644 --- a/pkgs/tools/text/gawk/gawk-with-extensions.nix +++ b/pkgs/tools/text/gawk/gawk-with-extensions.nix @@ -1,7 +1,8 @@ { runCommand, gawk, extensions, makeWrapper }: runCommand "gawk-with-extensions" { - buildInputs = [ makeWrapper gawk ] ++ extensions; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gawk ] ++ extensions; } '' mkdir -p $out/bin for i in ${gawk}/bin/*; do From 2a3b8e76e5668e74ebdad625ed90b93ee349cfa5 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 12 Jul 2021 20:28:02 +0100 Subject: [PATCH 069/188] uutils-coreutils: 0.0.6 -> 0.0.7 --- pkgs/tools/misc/uutils-coreutils/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 209a38cdcc1..8abfb077596 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,25 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-dnswE/DU2jCfxWW10Ctjw8woktwWZqyd3E9IuKkle1M="; + sha256 = "sha256-XI6061nCVyL8Q1s+QH75IesneJNhbhxGnILZxQCa5LU="; }; - postPatch = '' - # can be removed after https://github.com/uutils/coreutils/pull/1815 is included - substituteInPlace GNUmakefile \ - --replace uutils coreutils - ''; - cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-92BHPSVIPZLn399AcaJJjRq2WkxzDm8knKN3FIdAxAA="; + hash = "sha256-bfwWyeuslLjh4OCt+H8CM8hCrRFqlibOS8gS64lysa0="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; From a2c69a6ed9524e6743cd53f7439996fa784bf1a4 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:28:12 +0200 Subject: [PATCH 070/188] freeplane: move makeWrapper to nativeBuildInputs --- pkgs/applications/misc/freeplane/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix index 0568198f41d..f9c04fedfdd 100644 --- a/pkgs/applications/misc/freeplane/default.nix +++ b/pkgs/applications/misc/freeplane/default.nix @@ -86,8 +86,7 @@ let in stdenv.mkDerivation rec { inherit pname version src; - buildInputs = [ makeWrapper ]; - nativeBuildInputs = [ jdk11 gradle_5 ]; + nativeBuildInputs = [ makeWrapper jdk11 gradle_5 ]; buildPhase = '' mkdir -p -- ./freeplane/build/emoji/{txt,resources/images} From b479f3abcda140e23fb41d41b615d414358c3c74 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:29:05 +0200 Subject: [PATCH 071/188] fcitx: move makeWrapper to nativeBuildInputs --- pkgs/tools/inputmethods/fcitx/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix index 28a08e39b22..6e7e71c5713 100644 --- a/pkgs/tools/inputmethods/fcitx/wrapper.nix +++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix @@ -5,7 +5,7 @@ symlinkJoin { paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/fcitx \ From 25be3c82d404f373742540780ef1cf1cd0102010 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:29:50 +0200 Subject: [PATCH 072/188] brasero: move makeWrapper to nativeBuildInputs --- pkgs/tools/cd-dvd/brasero/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/brasero/wrapper.nix b/pkgs/tools/cd-dvd/brasero/wrapper.nix index 8112b0971f3..5371e8d526b 100644 --- a/pkgs/tools/cd-dvd/brasero/wrapper.nix +++ b/pkgs/tools/cd-dvd/brasero/wrapper.nix @@ -6,7 +6,7 @@ in symlinkJoin { name = "brasero-${brasero-original.version}"; paths = [ brasero-original ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/brasero \ From 08ca856305fb6033b149b32fd3a85bdb1897a8ac Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:30:41 +0200 Subject: [PATCH 073/188] 0ad: move makeWrapper to nativeBuildInputs --- pkgs/games/0ad/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/0ad/wrapper.nix b/pkgs/games/0ad/wrapper.nix index ca7c8e16e3c..ede151307d5 100644 --- a/pkgs/games/0ad/wrapper.nix +++ b/pkgs/games/0ad/wrapper.nix @@ -6,7 +6,7 @@ buildEnv { name = "zeroad-${zeroad-unwrapped.version}"; inherit (zeroad-unwrapped) meta; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; paths = [ zeroad-unwrapped zeroad-data ]; From 8c70974350e21a0c505805f9bfb04fa7c1d3af34 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:53:43 +0200 Subject: [PATCH 074/188] variety: move makeWrapper to nativeBuildInputs --- pkgs/applications/misc/variety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 5e7765a16fd..9b40c4c44f1 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -26,9 +26,9 @@ buildPythonApplication rec { sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; }; - nativeBuildInputs = [ intltool wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper intltool wrapGAppsHook ]; - buildInputs = [ makeWrapper distutils_extra ]; + buildInputs = [ distutils_extra ]; doCheck = false; From facdb727a051e3ea45dfee9af4c5bc3555762417 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:55:53 +0200 Subject: [PATCH 075/188] flare: move makeWrapper to nativeBuildInputs --- pkgs/games/flare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/flare/default.nix b/pkgs/games/flare/default.nix index 3ecade9b97e..b0d5f634135 100644 --- a/pkgs/games/flare/default.nix +++ b/pkgs/games/flare/default.nix @@ -8,7 +8,7 @@ buildEnv { (callPackage ./game.nix {}) ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' mkdir -p $out/bin makeWrapper $out/games/flare $out/bin/flare --run "cd $out/share/games/flare" From ab559bd8231f620ff268e22d0938b88d828f6963 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:56:44 +0200 Subject: [PATCH 076/188] iortcw: move makeWrapper to nativeBuildInputs --- pkgs/games/iortcw/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/iortcw/default.nix b/pkgs/games/iortcw/default.nix index 3aa459777ea..8af3dfe31f6 100644 --- a/pkgs/games/iortcw/default.nix +++ b/pkgs/games/iortcw/default.nix @@ -12,7 +12,7 @@ in buildEnv { pathsToLink = [ "/opt" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; # so we can launch sp from mp game and vice versa postBuild = '' From dd9e24f0da6f06528f797fa28c0bb242889d32db Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 21:58:48 +0200 Subject: [PATCH 077/188] texlive: move makeWrapper to nativeBuildInputs --- pkgs/tools/typesetting/tex/texlive/combine.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index f553908d9cc..de9182c0b03 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -50,7 +50,8 @@ in (buildEnv { "/tex/generic/config" # make it a real directory for scheme-infraonly ]; - buildInputs = [ makeWrapper ] ++ pkgList.extraInputs; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ] ++ pkgList.extraInputs; # This is set primarily to help find-tarballs.nix to do its job passthru.packages = pkgList.all; From 94ebbb266ca8fed0adb409504fd9449c397f0035 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 12 Jul 2021 22:06:14 +0200 Subject: [PATCH 078/188] firefox: move makeWrapper to nativeBuildInputs --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 2d2073b80b0..8868cbd003c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -170,7 +170,7 @@ buildStdenv.mkDerivation ({ xorg.pixman yasm libGLU libGL xorg.xorgproto xorg.libXdamage - xorg.libXext makeWrapper + xorg.libXext libevent libstartup_notification /* cairo */ libpng jemalloc glib nasm icu67 libvpx_1_8 @@ -224,6 +224,7 @@ buildStdenv.mkDerivation ({ cargo gnused llvmPackages.llvm # llvm-objdump + makeWrapper nodejs perl pkg-config From 784f843a670cf5407da3f0d7929ca5440228dbf5 Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Mon, 12 Jul 2021 22:34:10 +0200 Subject: [PATCH 079/188] zola: fix build with rust 1.45 (#129852) The lexical_core 0.7.4 dependency doesn't build with rust 1.53. The zola "next" branch updated it to 0.7.6 which builds fine so this will be fixed in the next zola release. In the meantime, use the older version of rust. --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fbc443bae9..4cd7637e636 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28328,6 +28328,9 @@ in zola = callPackage ../applications/misc/zola { inherit (darwin.apple_sdk.frameworks) CoreServices; + # Version 0.13.0 has the lexical_core 0.7.4 dependency that doesn't build + # with rust 1.53. This should be fixed in the next version. + rustPlatform = rustPackages_1_45.rustPlatform; }; zombietrackergps = libsForQt5.callPackage ../applications/gis/zombietrackergps { }; From e3e3baf498c8ad25fc20eb8b636821afd2ff5f16 Mon Sep 17 00:00:00 2001 From: D Anzorge Date: Mon, 12 Jul 2021 23:10:48 +0200 Subject: [PATCH 080/188] git-cola: avoid double wrapping --- .../version-management/git-and-tools/git-cola/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index ba51824fe84..f0ff57b2cb0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -20,10 +20,8 @@ in buildPythonApplication rec { doCheck = false; - postFixup = '' - wrapQtApp $out/bin/git-cola - wrapQtApp $out/bin/git-dag - + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; meta = with lib; { From 9d1ef5706ad5fc0e4231f98f3c23eb31a476c614 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Sun, 11 Jul 2021 11:43:13 +0100 Subject: [PATCH 081/188] portaudio: 190600-20161030 -> 190700_20210406 Build the latest port audio. Also fix the build on apple silicon. --- .../libraries/portaudio/default.nix | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index efa68146e8d..7f5818ae1bb 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -1,32 +1,32 @@ -{ lib, stdenv, fetchurl, alsa-lib, pkg-config, libjack2 -, AudioUnit, AudioToolbox, CoreAudio, CoreServices, Carbon }: +{ lib +, stdenv +, fetchurl +, alsa-lib +, pkg-config +, AudioUnit +, AudioToolbox +, CoreAudio +, CoreServices +, Carbon }: -stdenv.mkDerivation { - name = "portaudio-190600-20161030"; +stdenv.mkDerivation rec { + pname = "portaudio"; + version = "190700_20210406"; src = fetchurl { - url = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"; - sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; + url = "http://files.portaudio.com/archives/pa_stable_v${version}.tgz"; + sha256 = "1vrdrd42jsnffh6rq8ap2c6fr4g9fcld89z649fs06bwqx1bzvs7"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjack2 ] - ++ lib.optional (!stdenv.isDarwin) alsa-lib; + buildInputs = lib.optional (!stdenv.isDarwin) alsa-lib; configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=nullability-inferred-on-nested-type -Wno-error=nullability-completeness-on-arrays"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays"; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; - patchPhase = lib.optionalString stdenv.isDarwin '' - sed -i '50 i\ - #include \ - #include \ - #include ' \ - include/pa_mac_core.h - ''; - # not sure why, but all the headers seem to be installed by the make install installPhase = '' make install From 0e6e4d427616be99574b9537a0fc553ec4cb8b8e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Jul 2021 23:40:50 +0200 Subject: [PATCH 082/188] borgbackup: 1.1.16 -> 1.1.17 https://github.com/borgbackup/borg/blob/1.1.17/docs/changes.rst#version-1117-2021-07-12 --- pkgs/tools/backup/borgbackup/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index d0e48454a36..89e1f3e7e47 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -1,23 +1,14 @@ -{ lib, stdenv, python3, fetchpatch, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: +{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.1.16"; + version = "1.1.17"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw"; + sha256 = "0x0ncy0b0bmf586hbdgrif3gjmkdw760vfnfxndr493v07y29fbs"; }; - patches = [ - # fix compatibility with sphinx 4 - (fetchpatch { - url = "https://github.com/borgbackup/borg/commit/6a1f31bf2914d167e2f5051f1d531d5d4a19f54b.patch"; - includes = [ "docs/conf.py" ]; - sha256 = "0aa4kyb3j4apgwqcy1hzg6lxvpf60m2mijcj60vh101b42410hiz"; - }) - ]; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm # For building documentation: @@ -27,6 +18,7 @@ python3.pkgs.buildPythonApplication rec { libb2 lz4 zstd openssl ] ++ lib.optionals stdenv.isLinux [ acl ]; propagatedBuildInputs = with python3.pkgs; [ + packaging cython llfuse ]; From 26f52bf6b5d32ebdfc799a6cefc0c1d37700b67a Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sat, 10 Jul 2021 12:01:15 +0200 Subject: [PATCH 083/188] claws-mail: 3.17.8 -> 4.0.0 With Claws Mail's latest double release of 3.18.0 and 4.0.0, the package will refer to the more "modern" GTK+ 3 release, major version four. The GTK+ 2 release, major version 3, is now available in the `claws-mail-gtk2` package. In other words, this commit bumps the GTK+ 2 version from 3.17.8 to 3.18.0, the previously unstable GTK+ 3 version 3.99.0 to 4.0.0 and changes the default to GTK+ 3. --- .../from_md/release-notes/rl-2111.section.xml | 8 +++++ .../manual/release-notes/rl-2111.section.md | 2 ++ .../mailreaders/claws-mail/default.nix | 29 +++++++++++++------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 5 ++-- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index b14ca9e3e72..407e073a6dc 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -517,6 +517,14 @@ rxvt-unicode explicitly. + + + The claws-mail package now references the + new GTK+ 3 release branch, major version 4. To use the GTK+ 2 + releases, one can install the + claws-mail-gtk2 package. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 8648f89dbd3..da0462a1597 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -126,3 +126,5 @@ In addition to numerous new and upgraded packages, this release has the followin However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs. - Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly. + +- The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index e28680c245f..5090b1fd027 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, fetchgit, wrapGAppsHook, autoreconfHook, bison, flex +{ stdenv, lib, fetchgit, fetchpatch, wrapGAppsHook, autoreconfHook, bison, flex , curl, gtk2, gtk3, pkg-config, python2, python3, shared-mime-info , glib-networking, gsettings-desktop-schemas -# Use the experimental gtk3 branch. -, useGtk3 ? false +# Selector between the GTK+ 3 and GTK+ 2 releases. +, useGtk3 # Package compatibility: old parameters whose name were not directly derived , enablePgp ? true @@ -57,16 +57,15 @@ with lib; let - version = if useGtk3 then "3.99.0" else "3.17.8"; + # Last release and hash for both the GTK+ 3 and GTK+ 2 version. + version = if useGtk3 then "4.0.0" else "3.18.0"; - # The official release uses gtk2 and contains the version tag. gtk2src = { - sha256 = "0l4f8q11iyj8pi120lrapgq51k5j64xf0jlczkzbm99rym752ch5"; + sha256 = "1vsiy3xsppw4d8ylsz70wsyrvmgy88lp2hj7vrc353ckny80r9lh"; }; - # The corresponding commit in the gtk3 branch. gtk3src = { - sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k"; + sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn"; }; python = if useGtk3 then python3 else python2; @@ -125,7 +124,19 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - patches = [ ./mime.patch ]; + patches = [ + ./mime.patch + + # Fixes a bug with the automatic authentication method, resulting in errors + # with certain mail providers. + # + # This MUST be removed for the next release. + (fetchpatch { + name = "fix-automatic-auth.patch"; + url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=9c2585c58b49815a0eab8d683f0a94f75cbbe64e"; + sha256 = "0v8v5q2p4h93lp7yq3gnlvarsrcssv96aks1wqy3187vsr4kdw7a"; + }) + ]; preConfigure = '' # autotools check tries to dlopen libpython as a requirement for the python plugin diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0df082ff35c..2bc734dc48f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -129,6 +129,7 @@ mapAliases ({ clang12Stdenv = lowPrio llvmPackages_12.stdenv; clangAnalyzer = clang-analyzer; # added 2015-02-20 + claws-mail-gtk3 = claws-mail; # added 2021-07-10 clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 cmakeWithQt4Gui = throw "cmakeWithQt4Gui has been removed in favor of cmakeWithGui (Qt 5)"; # added 2021-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6b95e8f4a..dddd0b4150f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23280,10 +23280,11 @@ in cipher = callPackage ../applications/misc/cipher { }; - claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { + claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; + useGtk3 = false; }; - claws-mail-gtk3 = callPackage ../applications/networking/mailreaders/claws-mail { + claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; useGtk3 = true; }; From 40168fe49ff242eaf9c1ac43512337af57f21b66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 00:32:16 +0200 Subject: [PATCH 084/188] python3Packages.aiohttp-wsgi: 0.8.2 -> 0.9.1 --- pkgs/development/python-modules/aiohttp-wsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/pkgs/development/python-modules/aiohttp-wsgi/default.nix index 25264a66527..18364bdce69 100644 --- a/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiohttp-wsgi"; - version = "0.8.2"; + version = "0.9.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "etianen"; repo = pname; rev = version; - sha256 = "0wirn3xqxxgkpy5spicd7p1bkdnsrch61x2kcpdwpixmx961pq7x"; + sha256 = "sha256-lQ0mAUqsOmozUIMd6nwRATaq8C5SUFGoyQu1v0RBnas="; }; propagatedBuildInputs = [ From 5e5930ef164094445545db7e960b8a6d0d575f3a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 12 Jul 2021 23:10:06 +0000 Subject: [PATCH 085/188] krapslog: 0.2.0 -> 0.3.0 --- pkgs/tools/misc/krapslog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/krapslog/default.nix b/pkgs/tools/misc/krapslog/default.nix index c6f1cf8f816..a499c3eb46b 100644 --- a/pkgs/tools/misc/krapslog/default.nix +++ b/pkgs/tools/misc/krapslog/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "krapslog"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "acj"; repo = "krapslog-rs"; rev = version; - sha256 = "sha256-Ab5bY5r0tYx3JxYRRq7i9O7WFvdi6cRMSuru/pK50y8="; + sha256 = "sha256-IXbOmeWLhGOijO1xLItw1wzbHxl0Zyd0dHvfcaPWE8U="; }; - cargoSha256 = "sha256-k7jsWMFU/8XogREic4GB+qYocFtiTvSzvBAcORUFe0o="; + cargoSha256 = "sha256-2XCtjMV8ko6jnvXYtJhLlNvB1uc0QLO/aYsQX40deBk="; buildInputs = lib.optional stdenv.isDarwin libiconv; From ed22cfb195798dd11a44df5aa13b9b753b7a8a1a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 13 Jul 2021 01:16:27 +0200 Subject: [PATCH 086/188] midori|vimb: fix tarball job this is needed after c6e51d03695efa90a8d09b41fe6441953e21d52a --- pkgs/applications/networking/browsers/midori/default.nix | 4 ++++ pkgs/applications/networking/browsers/vimb/default.nix | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 3362948e98a..187914740f2 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { libarchive ]; + passthru = { + inherit gtk3; + }; + meta = with lib; { description = "Lightweight WebKitGTK web browser"; homepage = "https://www.midori-browser.org/"; diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 816b986f883..240d9a972fb 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook pkg-config ]; buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; + passthru = { + inherit gtk3; + }; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = { From 0230167a1798627bf37d66b127c3568b9e646559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 12 Jul 2021 18:25:09 -0400 Subject: [PATCH 087/188] ifstat: build on darwin --- pkgs/tools/networking/ifstat-legacy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 8383f82fd93..014cce5ea4f 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01zmv6vk5kh5xmd563xws8a1qnxjb6b6kv59yzz9r3rrghxhd6c5"; }; - buildInputs = [ net-snmp ]; + buildInputs = lib.optional stdenv.isLinux net-snmp; nativeBuildInputs = [ autoreconfHook ]; From 7deb6b2aef27133c71381bb2683cd758824da55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 12 Jul 2021 18:20:11 -0400 Subject: [PATCH 088/188] bmon: build on darwin --- pkgs/tools/misc/bmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index ca5f99f3b62..758a42d1538 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ ncurses libconfuse libnl ]; + buildInputs = [ ncurses libconfuse ] ++ lib.optional stdenv.isLinux libnl; preConfigure = '' # Must be an absolute path @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor pSub ]; }; } From 7cbefdda67d4c8c4c32d348712caef967c6fca33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Mon, 12 Jul 2021 18:00:18 -0400 Subject: [PATCH 089/188] gcal: depend on gettext on Darwin Without gettext the gcal binary crashes on macOS: $ ./src/gcal Illegal instruction: 4 --- pkgs/applications/misc/gcal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 28de8e0ecea..da190218d09 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ncurses, fetchpatch }: +{ lib, stdenv, fetchurl, ncurses, gettext, fetchpatch }: stdenv.mkDerivation rec { pname = "gcal"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin gettext; meta = { description = "Program for calculating and printing calendars"; From 3848948f778baea87e52ff8757d54905dd0ccd79 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 13 Jul 2021 01:38:38 +0200 Subject: [PATCH 090/188] borgbackup: enable tests, clean up --- pkgs/tools/backup/borgbackup/default.nix | 70 ++++++++++++++++++++---- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 89e1f3e7e47..ad78dcacd78 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, python3, acl, libb2, lz4, zstd, openssl, openssh, nixosTests }: +{ lib +, stdenv +, acl +, e2fsprogs +, libb2 +, lz4 +, openssh +, openssl +, python3 +, zstd +, nixosTests +}: python3.pkgs.buildPythonApplication rec { pname = "borgbackup"; @@ -9,17 +20,33 @@ python3.pkgs.buildPythonApplication rec { sha256 = "0x0ncy0b0bmf586hbdgrif3gjmkdw760vfnfxndr493v07y29fbs"; }; + postPatch = '' + # sandbox does not support setuid/setgid/sticky bits + substituteInPlace src/borg/testsuite/archiver.py \ + --replace "0o4755" "0o0755" + ''; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm # For building documentation: - sphinx guzzle_sphinx_theme + sphinx + guzzle_sphinx_theme ]; + buildInputs = [ - libb2 lz4 zstd openssl - ] ++ lib.optionals stdenv.isLinux [ acl ]; + libb2 + lz4 + zstd + openssl + ] ++ lib.optionals stdenv.isLinux [ + acl + ]; + propagatedBuildInputs = with python3.pkgs; [ + cython + llfuse packaging - cython llfuse + pyfuse3 ]; preConfigure = '' @@ -53,15 +80,36 @@ python3.pkgs.buildPythonApplication rec { ''; checkInputs = with python3.pkgs; [ - pytest + e2fsprogs + pytest-benchmark + pytest-xdist + pytestCheckHook ]; - checkPhase = '' - HOME=$(mktemp -d) py.test --pyargs borg.testsuite - ''; + pytestFlagsArray = [ + "--numprocesses" "auto" + "--benchmark-skip" + "--pyargs" "borg.testsuite" + ]; - # 64 failures, needs pytest-benchmark - doCheck = false; + disabledTests = [ + # fuse: device not found, try 'modprobe fuse' first + "test_fuse" + "test_fuse_allow_damaged_files" + "test_fuse_mount_hardlinks" + "test_fuse_mount_options" + "test_fuse_versions_view" + "test_readonly_mount" + # Error: Permission denied while trying to write to /var/{,tmp} + "test_get_cache_dir" + "test_get_keys_dir" + "test_get_security_dir" + "test_get_config_dir" + ]; + + preCheck = '' + export HOME=$TEMP + ''; passthru.tests = { inherit (nixosTests) borgbackup; From 2123e68bd8b57690b0a31e039e0a3073d64a5b01 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Jul 2021 12:39:03 +0000 Subject: [PATCH 091/188] gnome.gnome-maps: 40.2 -> 40.3 --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 0a07428b1b2..779f1855371 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-g+gVAFTQxLWmPJoJvyx9+YmuaQ7Kwb5r97ExKqpjm9Q="; + sha256 = "sha256-p58Fz+u1UMUanGKwgDk2PXDdo90RP+cTR6lCW9cYaIk="; }; doCheck = true; From e12040d36ad1231446ad36729c9935474219853c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Jul 2021 11:18:55 +0000 Subject: [PATCH 092/188] gnome.gnome-devel-docs: 40.0 -> 40.3 --- pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix index 501aaa91c97..ca9b8f7fb81 100644 --- a/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-devel-docs"; - version = "40.0"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0zqp01ks8m3s6jn5xqd05rw4fwbvxy5qvcfg9g50b2ar2j7v1ar8"; + sha256 = "v+jyHcqx70sRVlThchK8sDtqEAgzQIA/SW8ia0oILPY="; }; passthru = { From 78624ce1dedbccfa918878369cd200f2f1a98312 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Jul 2021 11:28:39 +0000 Subject: [PATCH 093/188] gnome.gnome-boxes: 40.2 -> 40.3 --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 8d0e86b1a93..529596cd6e1 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "hzN1mi2GpWNnWWpTSQRjO4HKqlxFpWNtsulZDHFK6Nk="; + sha256 = "//COj0Wkvm0zsKGpY6yzc5ujld6yFZDUOLsepvv3QFg="; }; doCheck = true; From 7ab6e0a3f17f58aaa2dcf19932bf6c37dd6aeadb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Jul 2021 10:38:24 +0000 Subject: [PATCH 094/188] gnome-user-docs: 40.1 -> 40.3 --- pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index e76fee1a6eb..ded70a91c95 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "40.1"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "09ld9r29nz64s04fmp3b2wwldmfnwxp4w36dkh7mbz5pdd3z7fwk"; + sha256 = "PeBXr6KsDebKcH9KdsKTLcvFVsHQ0cwCBWXcGHYpLM0="; }; nativeBuildInputs = [ From 2a895b9df0a67c2a3a6f3ca05aa258a51d716c4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Jul 2021 10:00:36 +0000 Subject: [PATCH 095/188] gnome.gnome-software: 40.2 -> 40.3 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 226b251ec46..c8e637124ae 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "y9HdKguvw/U93kIAPEpKA3RsuNZNxdJ+uNvmc27nJ5Y="; + sha256 = "y39TbLCfWCyQdVyQl08+g9/5U56it8CWibtOCsP/yF8="; }; patches = [ From 2edba5491f18e1f56b0434ae33999e7baeff0fac Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Jul 2021 09:01:28 +0000 Subject: [PATCH 096/188] gnome.gnome-disk-utility: 40.1 -> 40.2 --- pkgs/desktops/gnome/core/gnome-disk-utility/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index c11a1df883a..ead50f1c9d1 100644 --- a/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KkuZrBHKIzlLKMVYS56WKE6MWk2mXPBiB95U9Csf8UE="; + sha256 = "sha256-ztES6qh9j/ohOv1NC62TnPp662cbeySIWaHchNb1Iec="; }; nativeBuildInputs = [ From 24a688436aec135040410d4ae03ffa991a564d46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Jul 2021 21:34:08 +0200 Subject: [PATCH 097/188] nuclei: 2.3.8 -> 2.4.0 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index e4c6039c456..3f674bef7bc 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MrAJHYfTcziHTKJYRB6FW23XcHqdr9AGF+Cumw7hbcQ="; + sha256 = "sha256-nmojx3xX5MZFfd1od2Aq3+dWmHCFgR7+q5C2FIUzq7A="; }; - vendorSha256 = "sha256-ZzpmHoMkrDAZcMXtD6smEaFEmT/EnRcKd7XYz/IK72Y="; + vendorSha256 = "sha256-Ok2VUwtqhlp6NwLbQX9KAaGiZtzmfWG0LcqtBBDk22A="; modRoot = "./v2"; subPackages = [ From fd333014ff258257eb14154e4ee2d227f167ddcd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jul 2021 14:08:05 +0200 Subject: [PATCH 098/188] fwup: 1.8.3 -> 1.8.4 --- pkgs/tools/misc/fwup/default.nix | 9 +++---- .../misc/fwup/fix-testrunner-darwin.patch | 25 ------------------- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 pkgs/tools/misc/fwup/fix-testrunner-darwin.patch diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index de2b809eea5..69b76cf648d 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -21,17 +21,15 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "sha256-ayfcnIZ7MuBsCy1giwmY2D2C6AukwS+fevmXqGa4c1w="; + sha256 = "sha256-NaSA3mFWf3C03SAGssMqLT0vr5KMfxD5y/iragGNKjw="; }; - patches = [ ./fix-testrunner-darwin.patch ]; - nativeBuildInputs = [ autoreconfHook pkg-config @@ -44,8 +42,7 @@ stdenv.mkDerivation rec { libsodium xz zlib - ] - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ DiskArbitration ]; diff --git a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch b/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch deleted file mode 100644 index b04b436ff5b..00000000000 --- a/pkgs/tools/misc/fwup/fix-testrunner-darwin.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tests/common-orig.sh b/tests/common.sh -index 1f2673f..79dcf74 100755 ---- a/tests/common-orig.sh -+++ b/tests/common.sh -@@ -21,20 +21,6 @@ else - fi - - case "$HOST_OS" in -- Darwin) -- # BSD stat -- STAT_FILESIZE_FLAGS="-f %z" -- -- # Not -d? -- BASE64_DECODE=-D -- -- READLINK=/usr/local/bin/greadlink -- [ -e $READLINK ] || ( echo "Please run 'brew install coreutils' to install greadlink"; exit 1 ) -- [ -e /usr/local/bin/mdir ] || ( echo "Please run 'brew install mtools' to install mdir"; exit 1 ) -- -- FSCK_FAT=fsck_msdos -- TIMEOUT=gtimeout -- ;; - FreeBSD|NetBSD|OpenBSD|DragonFly) - # BSD stat - STAT_FILESIZE_FLAGS="-f %z" From 1454412796de471d1826154344c18178a44288bb Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 13 Jul 2021 02:37:45 +0800 Subject: [PATCH 099/188] rust-analyzer: 2021-07-05 -> 2021-07-12 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a6381576ead..7daeaac14b1 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-07-05"; - cargoSha256 = "sha256-HmvvDHi33JAYXON98mbb+MfmJizOL4cdTbc3QDtPkZo="; + version = "2021-07-12"; + cargoSha256 = "sha256-wlo3GlB9OhyVXys5pHAqWPKHWZHzNjcQ0hiaYnp2SUc="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-7pH38U+HMNPuO1BFP5kPTJoxGWTewRUoLrc9NXDdK2M="; + sha256 = "sha256-nd8valnltycywxBObSVFbt4fySEYQknFsFf5ZnEbgOk="; }; buildAndTestSubdir = "crates/rust-analyzer"; From 1eb893a8602651af8279341b659e643957b3ab59 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 12 Jul 2021 16:27:16 +0200 Subject: [PATCH 100/188] vndr: 2018-06-23 -> 2020-07-28 --- pkgs/development/tools/vndr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 82f0018ce69..d4e665adc41 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { pname = "vndr-unstable"; - version = "2018-06-23"; - rev = "81cb8916aad3c8d06193f008dba3e16f82851f52"; + version = "2020-07-28"; + rev = "f12b881cb8f081a5058408a58f429b9014833fc6"; goPackagePath = "github.com/LK4D4/vndr"; excludedPackages = "test"; @@ -12,13 +12,13 @@ buildGoPackage rec { inherit rev; owner = "LK4D4"; repo = "vndr"; - sha256 = "0c0k0cic35d1141az72gbf8r0vm9zaq4xi8v1sqpxhlzf28m297l"; + sha256 = "04za4x8p8qzwjlp4i0j0gsb4xx0x9f4yp3ab0b97r50pah1ac2g3"; }; meta = { description = "Stupid golang vendoring tool, inspired by docker vendor script"; homepage = "https://github.com/LK4D4/vndr"; - maintainers = with lib.maintainers; [ vdemeester ]; + maintainers = with lib.maintainers; [ vdemeester rvolosatovs ]; license = lib.licenses.asl20; }; } From 9e7c177aa8710db885878bd6cfe68584263d4f98 Mon Sep 17 00:00:00 2001 From: Yannick Markus Date: Mon, 12 Jul 2021 12:49:58 +0200 Subject: [PATCH 101/188] mullvad-vpn: 2021.3 -> 2021.4 --- pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 33030e0c7ee..2fa486b83a9 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -42,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2021.3"; + version = "2021.4"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-f7ZCDZ/RN+Z0Szmnx8mbzhKZiRPjqXTsgClfWViFYzo="; + sha256 = "sha256-JnHG4qD6nH2l7RCYHmb7Uszn0mrMsFtMHQ3cKpXcq00="; }; nativeBuildInputs = [ From 2151e87d56c577470817d0b9a2ac1c6648b95344 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 12 Jul 2021 21:16:00 +0200 Subject: [PATCH 102/188] chia: 1.2.0 -> 1.2.1 --- pkgs/applications/blockchains/chia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 4b0b8e75748..2ff82804318 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; - sha256 = "sha256-P5oWOQgyj+/Ia21R4PB6ID/iUPKBnW9/X5EF6RZjzS8="; + sha256 = "sha256-ZNSNROWl6RR4GZnoRGAXrdw48wH9OOgrsoKz0RNIIcs="; }; patches = [ From 2f5679a476aeccbf23951950466d2e9cee6d44b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 Jul 2021 21:40:14 +0200 Subject: [PATCH 103/188] python3Packages.garminconnect-ha: 0.1.6 -> 0.1.13 --- .../development/python-modules/garminconnect-ha/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garminconnect-ha/default.nix b/pkgs/development/python-modules/garminconnect-ha/default.nix index e3d4cd5b48e..c88af9b230e 100644 --- a/pkgs/development/python-modules/garminconnect-ha/default.nix +++ b/pkgs/development/python-modules/garminconnect-ha/default.nix @@ -1,21 +1,23 @@ { lib , buildPythonPackage +, cloudscraper , fetchFromGitHub , requests }: buildPythonPackage rec { pname = "garminconnect-ha"; - version = "0.1.6"; + version = "0.1.13"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect-ha"; rev = version; - sha256 = "0ngas6zikhpja1cdkq64m9pjm4b0z3qaj9g3x88mggy60jsxm1d7"; + sha256 = "sha256-1O1EcG5FvpwUvI8rwcdlQLzEEStyFAwvmkaL97u6hZ4="; }; propagatedBuildInputs = [ + cloudscraper requests ]; From cfc749e5b46f5a46b10ba839c085fcf23daf97db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 12 Jul 2021 14:37:40 +0000 Subject: [PATCH 104/188] digikam: 7.2.0 -> 7.3.0 --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index db23a181c5a..141f966253d 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -55,11 +55,11 @@ mkDerivation rec { pname = "digikam"; - version = "7.2.0"; + version = "7.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-zYfs4UOu+gLmkqSvXDw8wQe5pNYYBNefp33S40R5ihc="; + sha256 = "sha256-la6pO+HP05u1IzO4Kz5Xv2gIDH0TGddU0WeiD22+RVE="; }; nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; From 4112eb273eba0a011cfb6d26c46b97523605fe93 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 13 Jul 2021 08:47:28 +0200 Subject: [PATCH 105/188] cosign: 0.5.0 -> 0.6.0 https://github.com/sigstore/cosign/releases/tag/v0.6.0 --- pkgs/tools/security/cosign/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index 31088e26271..550f965b07d 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "0g60qwdxk6pmkzj0zz9iyc8b0bzh751fj2yyz0vilkgcjq47xjk8"; + sha256 = "1h0lhbcrynaiwpgpkcn10yrn90j03g00w9hr2lvsj3cwmdbz0rcz"; }; buildInputs = @@ -17,13 +17,11 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "0agmnl5d00hm854sj1iipng36pf7hcc26iwcmpcr1rsmc7v522z4"; + vendorSha256 = "0f3al6ds0kqyv2fapgdg9i38rfx6h169pmj6az0sfnkh2psq73ia"; subPackages = [ "cmd/cosign" ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}") - ''; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}"]; meta = with lib; { homepage = "https://github.com/sigstore/cosign"; From 6f0f39400d3a5fb80615659a5a9092b1805c9f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Jul 2021 06:01:19 +0200 Subject: [PATCH 106/188] drone: 2.0.0 -> 2.0.3 --- .../tools/continuous-integration/drone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index c6d1e47389a..46ee41d37df 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -3,9 +3,9 @@ buildGoModule rec { pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}"; - version = "2.0.0"; + version = "2.0.3"; - vendorSha256 = "sha256-cnbZSnHU+ORm7/dV+U9NfM18Zrzi24vf7qITPJsusU8="; + vendorSha256 = "sha256-3qTH/p0l6Ke1F9SUcvK2diqZooOMnlXYO1PHLdJJ8PM="; doCheck = false; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "drone"; repo = "drone"; rev = "v${version}"; - sha256 = "sha256-BxwCJf3uY34rqegZJ6H/zb63orELhq41trOgzGXQe80="; + sha256 = "sha256-MKV5kor+Wm9cuIFFcjSNyCgVKtY+/B9sgBOXMMRvMPI="; }; preBuild = '' From c45c6acbfe0ebbcdbed1c5385d19f54dbb6b3572 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 13 Jul 2021 16:15:48 +0800 Subject: [PATCH 107/188] maintainers: add nickcao --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef102e3a7a3..defe8bf6a92 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7530,6 +7530,12 @@ githubId = 1665818; name = "Philipp Eder"; }; + nickcao = { + name = "Nick Cao"; + email = "nickcao@nichi.co"; + github = "NickCao"; + githubId = 15247171; + }; nickhu = { email = "me@nickhu.co.uk"; github = "nickhu"; From cf06420c478b51fb70974e2862adea58c753d4dc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 13 Jul 2021 16:17:37 +0800 Subject: [PATCH 108/188] k0sctl: init at 0.9.0 --- .../networking/cluster/k0sctl/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/cluster/k0sctl/default.nix diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix new file mode 100644 index 00000000000..59530f05457 --- /dev/null +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "k0sctl"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "k0sproject"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-aW7x2XfeFU0z3lwPTsDHudHjdwTtfASgrbKGddVb6Rs="; + }; + + vendorSha256 = "sha256-bsXXWyeZXZLV6igEvyvPpS92FruGiLDx/5CCTKPe0EU="; + + meta = with lib; { + description = "A bootstrapping and management tool for k0s clusters."; + homepage = "https://k0sproject.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254651a4f5b..aa02b791929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13728,6 +13728,8 @@ in augustus = callPackage ../games/augustus { }; + k0sctl = callPackage ../applications/networking/cluster/k0sctl { }; + k2tf = callPackage ../development/tools/misc/k2tf { }; kafkacat = callPackage ../development/tools/kafkacat { }; From 8ef45e7a25206f430e3a7048e7cca9c18dc9cd6a Mon Sep 17 00:00:00 2001 From: Niklas <44636701+MayNiklas@users.noreply.github.com> Date: Tue, 13 Jul 2021 10:31:42 +0200 Subject: [PATCH 109/188] plex: 1.23.3.4707-ebb5fe9f3 -> 1.23.4.4805-186bae04e --- pkgs/servers/plex/raw.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 929abe23cce..b6618eb429d 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.3.4707-ebb5fe9f3"; + version = "1.23.4.4805-186bae04e"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0b3xsyrpz1098lyqfapnjp7k55d07qg7h9avc7f3zmpkiclxf2ry"; + sha256 = "161baz4klwb8wyvc3mnbvvwjcmdfp38rn270jwvmwzp6b70jclyx"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "1as83prhlfi4g172k3mgm6p8k58zm4bahjf8bp8pyxcmgiii76m0"; + sha256 = "0vj7k81fl8chaxqz287arvn9vva4cd4wcnybc5yvls3589h9x1zq"; }; outputs = [ "out" "basedb" ]; From 9e18ae4302981e4a3f37ce7c1e677a72b2305561 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 13 Jul 2021 09:28:19 +0000 Subject: [PATCH 110/188] git-vendor: 1.2.1 -> 1.2.2 --- .../version-management/git-and-tools/git-vendor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix index c7884c2b52e..ec4db1631b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -2,8 +2,8 @@ }: let - version = "1.2.1"; - sha256 = "sha256-sm5SmckaXVjF3odqzYrbC46E1nPzQ9cuNJnNSAa7RWY="; + version = "1.2.2"; + sha256 = "sha256-PhxYiTMXg8qRqwbrZaw9UH7pdvXTEnrd09TiYPepzmk="; in stdenv.mkDerivation { pname = "git-vendor"; From 98ba3939094f938eaef42a8e9181bc9b27af20d1 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 12 Jul 2021 20:41:56 +0100 Subject: [PATCH 111/188] gmnitohtml: init at 0.1.1 --- pkgs/applications/misc/gmnitohtml/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/misc/gmnitohtml/default.nix diff --git a/pkgs/applications/misc/gmnitohtml/default.nix b/pkgs/applications/misc/gmnitohtml/default.nix new file mode 100644 index 00000000000..a4b6f9403c6 --- /dev/null +++ b/pkgs/applications/misc/gmnitohtml/default.nix @@ -0,0 +1,46 @@ +{ lib, buildGoModule, fetchFromSourcehut, scdoc, installShellFiles }: + +buildGoModule rec { + pname = "gmnitohtml"; + version = "0.1.1"; + + src = fetchFromSourcehut { + owner = "~adnano"; + repo = pname; + rev = version; + hash = "sha256-XcHJbqmfSkW6lt2xRlrf9AJfwLOZqdgsL1v0aK2bQwo="; + }; + vendorSha256 = "sha256-Cx8x8AISRVTA4Ufd73vOVky97LX23NkizHDingr/zVk="; + + ldflags = [ "-s" "-w" ]; + + # Build and install the man pages + nativeBuildInputs = [ scdoc installShellFiles ]; + + postBuild = '' + make gmnitohtml.1 + ''; + + postInstall = '' + installManPage gmnitohtml.1 + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/gmnitohtml --help + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://git.sr.ht/~adnano/gmnitohtml"; + changelog = "https://git.sr.ht/~adnano/gmnitohtml/log"; + description = "Gemini text to HTML converter"; + longDescription = '' + he gmnitohtml utility reads Gemini text from the standard input and writes + HTML to the standard output. + ''; + license = licenses.mit; + maintainers = with maintainers; [ jk sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fbc443bae9..6766bbec592 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1566,6 +1566,8 @@ in gmnisrv = callPackage ../servers/gemini/gmnisrv { }; + gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; + goimapnotify = callPackage ../tools/networking/goimapnotify { }; gojsontoyaml = callPackage ../development/tools/gojsontoyaml { }; From df3aa47c5af15512500aee0cd2872bf7bad72ac9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 13 Jul 2021 10:42:35 +0000 Subject: [PATCH 112/188] icingaweb2: 2.8.2 -> 2.8.3 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index e7d9b1a2847..6e8cdd5dca4 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "icingaweb2"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - sha256 = "1zrni1hzblaangiqm7iqbvg2h9rdc2l3pzzymz52r7mri4qnr4s8"; + sha256 = "sha256-wk6rTEYRS0q0HpQRbFAmfeYVrF/xLP/HchEXNqqNpYg="; }; nativeBuildInputs = [ makeWrapper ]; From 428d2a2f5179fb39644d846b541880cd506c8e8b Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 31 May 2021 02:09:18 +0200 Subject: [PATCH 113/188] kicad-unstable: 2021-05-16 -> 2021-07-12 --- .../science/electronics/kicad/versions.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index c30c074a5de..ae403d3f733 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,23 +27,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2021-05-16"; + version = "2021-07-12"; src = { - rev = "c33b2cfa8d16072b9d1bce558e443c4afa889d06"; - sha256 = "1fvbxjpf880ikjqjhzj8wlxj0845gzrj1yv35rk7akbg4vl9ph72"; + rev = "76a6177eb7fc2efe8b5fd522355e70c44a33b150"; + sha256 = "1a94z29if73cnxjx75vkgasm339dasbrjwbg2zk1c35pfygnwrj5"; }; }; libVersion = { - version = "2021-05-16"; + version = "2021-07-12"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; - symbols.rev = "32de73ea01347a005790119eb4102c550815685c"; - symbols.sha256 = "0gj10v06rkxlxngc40d1sfmlcagy5p7jfxid0lch4w0wxfjmks7z"; + symbols.rev = "a6f64c12c9cdea4cda25cdd2c92708e7eb461d46"; + symbols.sha256 = "0j6ng3ysqlxcggjyq3bsgqzg6j50if74q2dpyrdh5pckfqvvmv20"; templates.rev = "073d1941c428242a563dcb5301ff5c7479fe9c71"; templates.sha256 = "14p06m2zvlzzz2w74y83f2zml7mgv5dhy2nyfkpblanxawrzxv1x"; - footprints.rev = "8fa36dfa3423d8777472e3475c1c2b0b2069624f"; - footprints.sha256 = "138xfkr0prxw2djkwc1m4mlp9km99v12sivbqhm1jkq5yxngdbin"; + footprints.rev = "1bacc7562198e2a2985df7f2fbcd7620b4fd0d46"; + footprints.sha256 = "1h17q0xpl4k4klg3mafzsbl88wzrg73xjsh8llyni2jzs531545a"; packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; }; From 0e6d18690605292fed9f4f1a2cf057788fba60ce Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 5 Jun 2021 13:28:53 +0200 Subject: [PATCH 114/188] kicad-unstable: needs python needed since upstream merge request 796 got merged on 2021-06-01 --- pkgs/applications/science/electronics/kicad/base.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 9848eb58399..596083c2709 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -62,6 +62,7 @@ assert lib.assertMsg (!(stable && (sanitizeAddress || sanitizeThreads))) "Only kicad-unstable(-small) supports address/thread sanitation"; assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads)) "'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one."; + let inherit (lib) optional optionals; in @@ -81,14 +82,16 @@ stdenv.mkDerivation rec { makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; - cmakeFlags = optionals (withScripting) [ + cmakeFlags = optionals (stable && withScripting) [ "-DKICAD_SCRIPTING=ON" "-DKICAD_SCRIPTING_MODULES=ON" "-DKICAD_SCRIPTING_PYTHON3=ON" "-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON" ] - ++ optional (!withScripting) + ++ optionals (!withScripting) [ "-DKICAD_SCRIPTING=OFF" + "-DKICAD_SCRIPTING_WXPYTHON=OFF" + ] ++ optional (withNgspice) "-DKICAD_SPICE=ON" ++ optional (!withOCE) "-DKICAD_USE_OCE=OFF" ++ optional (!withOCC) "-DKICAD_USE_OCC=OFF" @@ -152,7 +155,10 @@ stdenv.mkDerivation rec { openssl boost ] - ++ optionals (withScripting) [ swig python wxPython ] + # unstable requires swig and python + # wxPython still optional + ++ optionals (withScripting || (!stable)) [ swig python ] + ++ optional (withScripting) wxPython ++ optional (withNgspice) libngspice ++ optional (withOCE) opencascade ++ optional (withOCC) opencascade-occt From 3e5c6c24d62f42fa2f622f5e93b855197d77db91 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 13 Jul 2021 11:07:27 +0000 Subject: [PATCH 115/188] jrsonnet: 0.4.1 -> 0.4.2 --- pkgs/development/compilers/jrsonnet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix index a8b4a76b7de..512e0aa0247 100644 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "jrsonnet"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "CertainLach"; repo = "jrsonnet"; - sha256 = "sha256-vDZpb5Z8XOVc6EJ1Nul07kC8ppqcGzKPb4DEarqq2yg="; + sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A="; }; postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet ''; - cargoSha256 = "sha256-SR3m2meW8mTaxiYgeY/m7HFPrHGVtium/VRU6vWKxys="; + cargoSha256 = "sha256-eFfAU9Q3nYAJK+kKP1Y6ONjOIfkuYTlelrFrEW9IJ8c="; meta = { description = "Purely-functional configuration language that helps you define JSON data"; From 852af2e84f8226920bb1fe6b7346c528ac84028b Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Jul 2021 12:34:38 +0100 Subject: [PATCH 116/188] buf: 0.43.2 -> 0.44.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index c1060744f44..2e714ebf17c 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "buf"; - version = "0.43.2"; + version = "0.44.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Go0wLcJrxMgB67WlAI7TwX2UU2sQ/yfmC0h2igOkjc4="; + sha256 = "sha256-ZcZvsFw/l/7N8Yb4HG6w96ce9c4g4iiG/TcDoj8RYmA="; leaveDotGit = true; # Required by TestWorkspaceGit }; - vendorSha256 = "sha256-HT0dsGniBoQW2Y7MhahDeFvE0nCASoPdzHETju0JuRY="; + vendorSha256 = "sha256-g0wrHPeHFOL6KB0SUgBy2WK54Kttiks4cuYg8jf3N9g="; patches = [ ./skip_test_requiring_network.patch From 70002f24a5d6d5f2992508548b36d6ae947f369b Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Jul 2021 12:03:37 +0100 Subject: [PATCH 117/188] bat: 0.18.1 -> 0.18.2 --- pkgs/tools/misc/bat/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 8bc82547eeb..81b910117f1 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , nixosTests , rustPlatform , fetchFromGitHub @@ -12,16 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kyl+clL/4uxVaDH/9zPDGQTir4/JVgtHo9kNQ31gXTo="; + sha256 = "sha256-Y8CmVOIDPQ9kpggOlKnxLV0oOyNRow0r/nvxNpCtYNU="; }; - - cargoSha256 = "sha256-j9HbOXiwN4CWv9wMBrNxY3jehh+KRkXlwmDqChNy1Dk="; + cargoSha256 = "sha256-MdfBldImyW8QV0P3zPrYT2Vi9zChvXePI2T8tRsrlcQ="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage $releaseDir/build/bat-*/out/assets/manual/bat.1 - installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{fish,zsh} + installShellCompletion $releaseDir/build/bat-*/out/assets/completions/bat.{bash,fish,zsh} ''; # Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as From a07a62d26dea13eebb93a15df9532ca57cc6e336 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 13 Jul 2021 13:59:55 +0200 Subject: [PATCH 118/188] mutt: 2.1.0 -> 2.1.1 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 1428fa6a428..0c2ffdc7fff 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0dqd6gg1wwhxjgdfl8j0kf93mw43kvd6wrwrzkscq2wjrsy5p0w0"; + sha256 = "0jjjvqkqmpj55v111p1a1i2ry7mpd1bpphn1bhvlr18rgw7xdrja"; }; patches = optional smimeSupport (fetchpatch { From f082c435dd187f92b8423413dff9d0b11c7195f7 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 8 Jul 2021 15:59:09 +0200 Subject: [PATCH 119/188] apostrophe: fix HTML export by referencing fira fonts from store MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pandoc can embed fonts and stylesheets on export which apostrophe uses — however it has hardcoded paths for the fonts which only work in the flatpak version, so we need to substitute them. --- pkgs/applications/editors/apostrophe/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 851c3ea1c2f..df0be4ccfbe 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome, gspell, texlive -, shared-mime-info, libhandy +, shared-mime-info, libhandy, fira }: let @@ -31,6 +31,12 @@ in stdenv.mkDerivation rec { glib-networking libhandy ]; postPatch = '' + substituteInPlace data/media/css/web/base.css \ + --replace 'url("/app/share/fonts/FiraSans-Regular.ttf") format("ttf")' \ + 'url("${fira}/share/fonts/opentype/FiraSans-Regular.otf") format("otf")' \ + --replace 'url("/app/share/fonts/FiraMono-Regular.ttf") format("ttf")' \ + 'url("${fira}/share/fonts/opentype/FiraMono-Regular.otf") format("otf")' + patchShebangs --build build-aux/meson_post_install.py ''; From 2d3a92e9440b2a58a4369cd77dfc86c08ed52561 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 13 Jul 2021 14:11:10 +0200 Subject: [PATCH 120/188] lowdown: 0.8.4 -> 0.8.5 https://github.com/kristapsdz/lowdown/blob/070002aa67f577a803b0f7a31d4314049f4d75d1/versions.xml#L1098-L1111 --- pkgs/tools/typesetting/lowdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index e45eda3326a..640bf49fc16 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.8.4"; + version = "0.8.5"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "1rbsngfw36lyc8s6qxl8hgb1pzj0gdzlb7yqkfblb8fpgs2z0ggyhnfszrqfir8s569i7a9yk9bdx2ggwqhjj56hmi2i4inlnb3rmni"; + sha512 = "0gvrjxvizpxm5xvw8v2jygmx244wdl9n75qxz4chqbzkwshk4gwscz38p7sq9qlsbq8jmnv4l095a9dl9b836kym38hh1bvzmdiflar"; }; nativeBuildInputs = [ which ] From 64f7cb574a6f7d5908bc18250fdd2b51771ab6b1 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Tue, 13 Jul 2021 09:44:08 -0400 Subject: [PATCH 121/188] flann: refactor (#129491) Co-authored-by: Sandro --- pkgs/development/libraries/flann/default.nix | 59 +++++++++++++++++--- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 91339380424..283c815b199 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -1,24 +1,65 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }: +{ lib +, cmake +, fetchFromGitHub +, fetchpatch +, lz4 +, pkg-config +, python3 +, stdenv +, unzip +, enablePython ? false +}: -stdenv.mkDerivation { - name = "flann-1.9.1"; +stdenv.mkDerivation rec { + pname = "flann"; + version = "1.9.1"; src = fetchFromGitHub { - owner = "mariusmuja"; + owner = "flann-lib"; repo = "flann"; - rev = "1.9.1"; + rev = version; sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc"; }; patches = [ - # Upstream issue: https://github.com/mariusmuja/flann/issues/369 + # Patch HDF5_INCLUDE_DIR -> HDF_INCLUDE_DIRS. (fetchpatch { - url = "https://raw.githubusercontent.com/buildroot/buildroot/45a39b3e2ba42b72d19bfcef30db1b8da9ead51a/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch"; - sha256 = "1gmj06cmnqvwxx649mxaivd35727wj6w7710zbcmmgmsnyfh2js4"; + url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-Updated-fix-cmake-hdf5.patch"; + sha256 = "yM1ONU4mu6lctttM5YcSTg8F344TNUJXwjxXLqzr5Pk="; + }) + # Patch no-source library workaround that breaks on CMake > 3.11. + (fetchpatch { + url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-src-cpp-fix-cmake-3.11-build.patch"; + sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4="; + }) + # Avoid the bundled version of LZ4 and instead use the system one. + (fetchpatch { + url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0003-Use-system-version-of-liblz4.patch"; + sha256 = "xi+GyFn9PEjLgbJeAIEmsbp7ut9G9KIBkVulyT3nfsg="; + }) + # Fix LZ4 string separator issue, see: https://github.com/flann-lib/flann/pull/480 + (fetchpatch { + url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; + sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; }) ]; - nativeBuildInputs = [ unzip cmake python ]; + cmakeFlags = [ + "-DBUILD_EXAMPLES:BOOL=OFF" + "-DBUILD_TESTS:BOOL=OFF" + "-DBUILD_MATLAB_BINDINGS:BOOL=OFF" + "-DBUILD_PYTHON_BINDINGS:BOOL=${if enablePython then "ON" else "OFF"}" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + unzip + ]; + + propagatedBuildInputs = [ lz4 ]; + + buildInputs = lib.optionals enablePython [ python3 ]; meta = { homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; From 885cae9dfb90a7c961b7fc35848e89490edd471e Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 13 Jul 2021 07:16:40 -0700 Subject: [PATCH 122/188] remmina: 1.4.13 -> 1.4.20 --- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index e2f1cf2c8a2..f61a00f89ad 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.13"; + version = "1.4.20"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-R+RfczAnt5R0YmXt5SmH8gOuWOH0LZ/70pOMDAXJgsE="; + sha256 = "sha256-m3DUaoOD8COxMwCVBTipzCAz3mqIdunEbVPjyjAl9So="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; From 8b055178de78f9812b5625cf603ba0342194d40c Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 7 Jul 2021 13:44:34 -0600 Subject: [PATCH 123/188] matrix-synapse: 1.37.1 -> 1.38.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 7940b560b5a..c7894529e2b 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.37.1"; + version = "1.38.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KxDHJrKm/QUZtOzI6MEpIUb4hTtxtIPLFuD1as3j4EA="; + sha256 = "sha256-k9/enFktixO4zvgBW3zw0COBakDP1PHVWAlbMi+FiWQ="; }; patches = [ From 9caefab5aa1002cb9bca9074863c33eaf91728f4 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 13 Jul 2021 15:46:24 +0100 Subject: [PATCH 124/188] deno: 1.11.5 -> 1.12.0 --- pkgs/development/web/deno/default.nix | 6 +++--- pkgs/development/web/deno/librusty_v8.nix | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 46ac84cd125..f6cd67d70bc 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.11.5"; + version = "1.12.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DrmdIWaWkOQeghhsnowkdgPA+z4+L2MTs7DNyeqDi5w="; + sha256 = "sha256-heri1vb0KykEqef8uBfEazPzTgz8jjYSUB0dpPiDJ7g="; }; - cargoSha256 = "sha256-E0qcy+/o8q9dv3KJjNkI+VNa5MBWzwla2Dz8niwvPCw="; + cargoSha256 = "sha256-v/yafzfAy1SBjeFwaMEWVTGJH3Fv1CYYU70TA7AUUsk="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 6ae0de15c77..a85d2bf76f2 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.22.3"; + version = "0.25.3"; shas = { - x86_64-linux = "sha256-RS1fUuTm6zhln67ank6Sit9nhGyKij1UsJ77ezffCh8="; - aarch64-linux = "sha256-E7SSFYODO8diPmEvpJyzAcltrh7YUXhWlqsRytFRmtA="; - x86_64-darwin = "sha256-29XTC7RoUDNJq46WkLCQT1vCuv4dzBrp8no6vVCsQ2g="; - aarch64-darwin = "sha256-UZHhKUjWQGklH26z2Kc2J7VwlV83LWl5n3YZt5ryKrY="; + x86_64-linux = "sha256-Z3lEJT3QVhP8PoDiM6Fw0sm5rXWvasBqASBO5tZA5zM="; + aarch64-linux = "sha256-pbcd1zV7IIEqCIp8vsRiO0KBGrOv52SvMZ4gthxuN/I="; + x86_64-darwin = "sha256-BwYdgd1kK8EQFfDc9RgtNvwvx7agt9hYNVmBGwHoqz0="; + aarch64-darwin = "sha256-/RHeNuR7VjhfwdjZXWMMX3UnweAjJblSCUq9eIwGvWc="; }; } From 22812f4becb0306680b596c865e58fb26aea10ed Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 13 Jul 2021 17:06:06 +0200 Subject: [PATCH 125/188] buf: add patch comment To satisfy https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md --- pkgs/development/tools/buf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index c1060744f44..ac918697f15 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -19,6 +19,7 @@ buildGoModule rec { vendorSha256 = "sha256-HT0dsGniBoQW2Y7MhahDeFvE0nCASoPdzHETju0JuRY="; patches = [ + # Skip a test that requires networking to be available to work. ./skip_test_requiring_network.patch ]; From 25eb6344d03d644084d9d3cb3c571f5664accf93 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 13 Jul 2021 17:55:25 +0200 Subject: [PATCH 126/188] go_1_15: 1.15.13 -> 1.15.14 --- pkgs/development/compilers/go/1.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index 0a9b0ba9b27..8dee4cae896 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.13"; + version = "1.15.14"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-mQaeciNHnM5FU/hPh0uTRfb0BF8nz1CJSJtUbaYZokQ="; + sha256 = "sha256-YKSlxI1j0KE+yohJAJtiRin/QpyLxdGmqMPE2p805wo="; }; # perl is used for testing go vet From 4695639fdef6095c3b4358d55f5947235159d7e8 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 13 Jul 2021 17:55:35 +0200 Subject: [PATCH 127/188] go_1_16: 1.16.5 -> 1.16.6 --- pkgs/development/compilers/go/1.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index 26cfb898ecf..f85d2bba907 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.16.5"; + version = "1.16.6"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-e/p+WQjHzJ512l3fMGbXy88/2fpRlFhRMl7rwX9QuoA="; + sha256 = "sha256-o6XUvEAbUdsGXk+TtSM0ek00OuDAsIplw0I7BaE4A30="; }; # perl is used for testing go vet From 4a30039b2754b840591f4ea4f3a8f8b5578993f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 13 Jul 2021 10:46:06 -0500 Subject: [PATCH 128/188] =?UTF-8?q?pijul:=201.0.0-alpha.50=20=E2=86=92=201?= =?UTF-8?q?.0.0-alpha.52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/version-management/pijul/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index d7aa8c8f068..4c4cedd5a12 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.50"; + version = "1.0.0-alpha.52"; src = fetchCrate { inherit version pname; - sha256 = "1hinnpbk83470sdif11v1wy1269jm7cpl0ycj2m89cxwk5g54cxg"; + sha256 = "0m759zfh40kxswsv40z1l332lc8lfqppyv8188y4i6biqmgbx8f1"; }; - cargoSha256 = "0bc116nyykq8ddy7lnhxibx6hphn344d0fs7fbl2paax9ahbh2g0"; + cargoSha256 = "0f31hw2zjvhkhsb0ykvw4c3d0qy8zirgsaz7yr89hy01rs23bh8z"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; @@ -36,6 +36,6 @@ rustPlatform.buildRustPackage rec { description = "A distributed version control system"; homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; - maintainers = with maintainers; [ gal_bolle dywedir ]; + maintainers = with maintainers; [ gal_bolle dywedir fabianhjr ]; }; } From 95172d9ebefc6b4bce3fd4a54e098027dad44ea6 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Thu, 8 Jul 2021 09:04:20 -0600 Subject: [PATCH 129/188] idutils: fix by using latest gnulib --- pkgs/tools/misc/idutils/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index ac64fe9e8bc..e43ab2ae879 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,27 +1,29 @@ -{ fetchurl, lib, stdenv, emacs }: +{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync, gawk}: stdenv.mkDerivation rec { - name = "idutils-4.6"; + pname = "idutils"; + version = "4.6"; src = fetchurl { - url = "mirror://gnu/idutils/${name}.tar.xz"; + url = "mirror://gnu/idutils/idutils-${version}.tar.xz"; sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"; }; - preConfigure = - '' - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in idutils is updated. - sed -i '/gets is a security hole/d' lib/stdio.in.h + preConfigure = '' + # replace embedded gnulib tests with those from gnulib package + bash -O extglob -c "cd gnulib-tests; rm -r !(Makefile.am)" + substituteInPlace ./configure.ac --replace "AC_PREREQ(2.61)" "AC_PREREQ(2.64)" + ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; buildInputs = lib.optional stdenv.isLinux emacs; + nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync gawk ]; doCheck = !stdenv.isDarwin; patches = [ ./nix-mapping.patch ]; - meta = { + meta = with lib; { description = "Text searching utility"; longDescription = '' @@ -46,10 +48,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/idutils/"; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ gfrascadorio ]; platforms = lib.platforms.all; - broken = true; }; } From 1d8caaff1ccb7b94a2adb8629aa84eff5a422343 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Thu, 8 Jul 2021 09:06:08 -0600 Subject: [PATCH 130/188] xprintidle-ng: latest gnulib requires autoconf 2.64 --- pkgs/tools/X11/xprintidle-ng/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 758450d3654..61e48de7f5e 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace configure.ac \ - --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])" + --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.64])" ''; nativeBuildInputs = [ From 8f68b7c15d17682e950e507906d776c3a82086e2 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Thu, 8 Jul 2021 09:11:17 -0600 Subject: [PATCH 131/188] lbzip2: latest gnulib requires autoconf 2.64 --- pkgs/tools/compression/lbzip2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index 4072dd43aef..ad36ebb81de 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake ]; preConfigure = '' + substituteInPlace configure.ac --replace 'AC_PREREQ([2.63])' 'AC_PREREQ(2.64)' ./build-aux/autogen.sh ''; From 7128fc621d900ee0bd24137a6cf6f948c283e785 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Thu, 8 Jul 2021 09:12:13 -0600 Subject: [PATCH 132/188] grub: latest gnulib requires autoconf 2.64 --- pkgs/tools/misc/grub/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 6d747bf8c6e..2371bdb0e05 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { ++ map fetchurl (import ./grub1.patches.nix) ; + preConfigure = '' + substituteInPlace ./configure.ac --replace 'AC_PREREQ(2.61)' 'AC_PREREQ(2.64)' + ''; + # autoreconfHook required for the splashimage patch. nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ texinfo ]; From 66ef9b55f0bb04c2e1e9811005519cb241a86125 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Sat, 10 Jul 2021 20:11:03 -0600 Subject: [PATCH 133/188] grub2: needs older version of gnulib --- pkgs/top-level/all-packages.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280283e0761..bc9dc339ac8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5546,7 +5546,17 @@ in grub2 = grub2_full; - grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2_full = callPackage ../tools/misc/grub/2.0x.nix { + # update breaks grub2 + gnulib = pkgs.gnulib.overrideAttrs (oldAttrs: rec { + version = "20200223"; + src = fetchgit { + url = "https://git.savannah.gnu.org/r/gnulib.git"; + rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; + sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; + }; + }); + }; grub2_efi = grub2.override { efiSupport = true; From 030b3e5a129d822a8f1eb4c4c0f7edc597f53374 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Tue, 13 Jul 2021 07:12:15 -0600 Subject: [PATCH 134/188] gnulib: update to latest version from savanah --- pkgs/development/tools/gnulib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 7441d4018a8..708cdb511a8 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "gnulib"; - version = "20200223"; + version = "20210702"; src = fetchgit { url = "https://git.savannah.gnu.org/r/gnulib.git"; - rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; - sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; + rev = "901694b904cd861adc2529b2e05a3fb33f9b534f"; + sha256 = "1f5znlv2wjziglw9vlygdgm4jfbsz34h2dz6w4h90bl4hm0ycb1w"; }; postPatch = '' From 21f41d8b3387cd0f22479590e860deea0f895d9c Mon Sep 17 00:00:00 2001 From: Tachibana Kiyomi Date: Sat, 17 Apr 2021 23:40:49 +0900 Subject: [PATCH 135/188] nixos/ddclient: add support for IPv6 --- nixos/modules/services/networking/ddclient.nix | 11 ++++++++++- pkgs/tools/networking/ddclient/default.nix | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 053efe71270..7820eedd932 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -18,6 +18,7 @@ let ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"} ssl=${boolToStr cfg.ssl} wildcard=YES + ipv6=${boolToStr cfg.ipv6} quiet=${boolToStr cfg.quiet} verbose=${boolToStr cfg.verbose} ${cfg.extraConfig} @@ -116,7 +117,15 @@ with lib; default = true; type = bool; description = '' - Whether to use to use SSL/TLS to connect to dynamic DNS provider. + Whether to use SSL/TLS to connect to dynamic DNS provider. + ''; + }; + + ipv6 = mkOption { + default = false; + type = bool; + description = '' + Whether to use IPv6. ''; }; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index f62eba66f99..4e05aa76e53 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -12,7 +12,7 @@ perlPackages.buildPerlPackage rec { # perl packages by default get devdoc which isn't present outputs = [ "out" ]; - buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP ]; + buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP IOSocketInet6 ]; # Use iproute2 instead of ifconfig preConfigure = '' From f4a523bc9c1706adcc0cdf70fd7b00fde8834b4f Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 13 Jul 2021 14:38:47 +0700 Subject: [PATCH 136/188] vimPlugins.onedark-vim: set branch to main --- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 60538973fb4..a5679f04818 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -255,7 +255,7 @@ jonsmithers/vim-html-template-literals joonty/vim-xdebug josa42/coc-lua josa42/vim-lightline-coc -joshdick/onedark.vim +joshdick/onedark.vim@main jpalardy/vim-slime@main jparise/vim-graphql jparise/vim-phabricator From 8fd35a326d8b61d334963d0cf5b43edfe35f5e66 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 13 Jul 2021 14:15:36 +0700 Subject: [PATCH 137/188] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 168 ++++++++++++++-------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b1be9a32faa..e9476ebffd6 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-10"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "9a9fd24b17db32e452609e68e6a9729461625720"; - sha256 = "1q9cpnl110shnxvgrmq4zjw5ikwd4bli39wxcqmcd45hq2fcwsdf"; + rev = "d098124e59ba38b0fcd97b41eec4a6de81bc09ab"; + sha256 = "1q524z5xaxshgwwfwbzgad7d6ni9f1ldk2f67chnywd0v8c6qr7f"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-11"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "4bd6e799c8b6762abdb86d298e60824ed2f10afa"; - sha256 = "131sb4dfq5h99n1qqsxm1vb7j2iijgpb9lcixsns2xafb31341kp"; + rev = "fca28c101eba19beffb9ce3018f1523f192adbfc"; + sha256 = "1fzlhjnr8yvzcy8r1sj54app0gfvjcawsg10kj213z4k69z9v7ri"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -966,12 +966,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-07-09"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "c27b4c93fd117dcfec24894d30aeca0acdfb61c9"; - sha256 = "1q7l3iy90sy02bgrl3bkxk9591h05hha5icyhj48g8rh57s5rxhx"; + rev = "0cd4c51246206c9c1e893dd4418e35d17ed67d52"; + sha256 = "1wqmm96waqm11vkin5xzklvmr9z9j3iajvk1bmk9zxdffng6b2hv"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1014,24 +1014,24 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-07-10"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "11960af1b5705edbabdb8083439123035007ce4e"; - sha256 = "1qvnrfrkckq0gbccw98njyf824mqhx9yzia3y1871938xb0dz58y"; + rev = "29ece0ca76408c191e3c5ed997b239efb4b38f58"; + sha256 = "02s43lyqb17066wjjcl29vyky76svzaddclh1q6jh2awhixpsqx2"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-07-04"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "d95fde4d1e042a99f39ddb8c67875fb10d1ed1e8"; - sha256 = "1wg1z85f816k60201hxrrdi4if9ci86cbg776k15pqdmcpzi0ibz"; + rev = "df506505ab2de577b35271a2b222042000a30381"; + sha256 = "0hqfbbcq4bnc48bknd7lfm41djq6977s18j14kyanp9gm7851sis"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1256,12 +1256,12 @@ final: prev: deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-07-10"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "c214dfa9f662027b434ad30cb90a0881d381c14a"; - sha256 = "1cg4lvb1py6q838rvd2z3kvcr3xa9cziz0wgsjlg7392ivkss8hd"; + rev = "1b39ec8dde1e263570418cb65e0b6f63dce20ba0"; + sha256 = "0mybjvr4kmkcf0sqr7hwlwfg9s9bzvqqw3sn46aqclqqhliimj2v"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1376,11 +1376,11 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-07-11"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "178a7e6389201f89199f1ef60970d46a1eb02537"; + rev = "0aad4037902271c8c85d00d02e77f79ec2141267"; sha256 = "0knxkcf8ndj6ggcj8jsfgcmm98pmshl1n05qrixkhgh4ilrisqr4"; }; meta.homepage = "https://github.com/sainnhe/edge/"; @@ -2424,12 +2424,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-07-08"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "622d867706697c92016f79ea731be750a36693fa"; - sha256 = "1gs452xkcgr4h0iq6nradirl6arxwv1b61gxqldfmnlpz6lqyd34"; + rev = "d3f6a7f629931880df3c86ef5d123db1eed9c26a"; + sha256 = "0z9zsl56ikrk7y9njflj9la2wr5iaxbqp73xay69flgkycsnbpy7"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -2580,12 +2580,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-07-06"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "1cbd25bd666f2bfbad480a5b9b308e64dbefdf71"; - sha256 = "0xyiii94ciyki82ck2h88daazs1c17h944vv6caafijs1jqly7xi"; + rev = "a3c62fc1d2bb9fffa14b42b97c100f148e96f15b"; + sha256 = "0mp4p5d2m51f716938pzm8xifh8nxlmspdxpwbzqgnkf1b1rcvz0"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2712,12 +2712,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-11"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "32f5204b7e7687f71dcd3c0bda27127715a3b40f"; - sha256 = "1b952m6lc2dkyxc7x8r9g11b15107aac02x68g1rc0i36vfxf1yj"; + rev = "d7638d0a72686ca3e0e2ff019aae8cb9073d7980"; + sha256 = "0fsd4azmmjjqqm6sb492bp02fvddalklmbyn1a07xql35fj5cq89"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3132,12 +3132,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-07-11"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "467d64d8f4e3018a8742aa152ed5e2c83c3bbef0"; - sha256 = "197yf4ngylv0d8j6s64kds581vb2i14yhx3690iq3f24kqw9c9mk"; + rev = "90b1901774c11b86f3d36f7d17803125bfbe82b8"; + sha256 = "1fi4dajrhrsfj64bxz9vpd2ipsjnsx51sqc34qg0iw47qraw8yij"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3180,12 +3180,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-07-11"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "0834af5fc3e8652fafebc4758eca96dce3e3ee54"; - sha256 = "1z1ijniy7x7hyka4yb6plzsbqyz0dggh4vn6nd4cmv72i44svmnw"; + rev = "4b084b7bdbdec913ba2432c54eb0b5d72183c4ac"; + sha256 = "1fngbp7gvfqk0jidll36mvh0ixsrlsr0bh8g2fxy2x9v26zdpw61"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3408,12 +3408,12 @@ final: prev: numb-nvim = buildVimPluginFrom2Nix { pname = "numb-nvim"; - version = "2021-07-08"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "0ef6d11bd94bc2ef6f311d8f05bd2a4d6471dff6"; - sha256 = "1li62nffx0jq1w97mra4hgfzphvna9m1qgi1fqc4r0vp54dxv3y9"; + rev = "c8b128230adb22727256fd24a221f4c5a1b41e93"; + sha256 = "0dg5cym0rcjy198rhkd61mhq1mg7lw5z4vprik8aimgnlqdzgqad"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -3528,12 +3528,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-10"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "8024ea3b44db0e90b1048dfbf14cfb97439dd9c0"; - sha256 = "1fmnp1imyr1rkfzcyy0jk5lvap2yx011b5q9zr8jrjdk25n03n8x"; + rev = "a3e530ea915634afb43b21e621d45515f7bdff77"; + sha256 = "1dx95vnwz65d07irb3c6dy7nkalmfla501dwcyhyk3zygws50zaw"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3636,12 +3636,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-07-02"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "846187eef85e39997c7b9f101e5169c5b57ec4a8"; - sha256 = "183szh75a3ix715i1hjr7pbcxw6l75l476snjda17ia68fg6zj6r"; + rev = "391e55bb5f90bc23e47c3b57eed6c6fcc95b0e7f"; + sha256 = "1djjdllr1klzy9yggkwmv7cv8gcpyb96mw1c9qfq9vdi5fmhcsyn"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3660,12 +3660,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-11"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "cfab466847e0874f03cf5b1bfbd89286827c537c"; - sha256 = "176blqdih86xa8sw65klfs63pqqbyl9mkckcwqgcfy6gfy3y671f"; + rev = "bc7796a5fd8a9c0373413105f0fbd5ea44583538"; + sha256 = "0qz8pqbj9ijd1qp16fqr4q7fpdjb6j0574q8bsp3lg3x8355skzy"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3732,12 +3732,12 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-09"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "1f1bf3b3efd9b3d4bc1a47bcdee980ff554fbce4"; - sha256 = "0kbxxzh0qpr9cwnk61iyf9hl45kshm21mv8zybi53pi2hygr99k0"; + rev = "96af0fa98252ab3543ff1464c6452930f242c615"; + sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; @@ -3816,12 +3816,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-07-10"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "c5bd199dba35f9794f3ada35417b4f4afe9c62e6"; - sha256 = "0xb8bqdxdpsxylcv7yfkscq9f8ribcdn4vkvp75j0mljbb2bqcmz"; + rev = "802a9d576d836531447f29423fe15abce19d82f7"; + sha256 = "19ww2r4jzmwp4pb2c78aj7jp8a93s25nmlxgzfgb7hpixg8q16p0"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3924,12 +3924,12 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark-vim"; - version = "2021-07-11"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "7d1f6d147625488ff625efd5e520b9ec6fc38ed4"; - sha256 = "1v72z09mmya711xm200699w4n94rny6mi6rca5l6p8amk78y54f5"; + rev = "ee4b22cbae8a3a434fad832bd89a6981c7c061af"; + sha256 = "1fz3ly97w0n8viarlqil2q38s6hwd0lzyyi2jvpqsg9bj07dg4k3"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; @@ -3972,12 +3972,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-07-10"; + version = "2021-07-13"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "c1aa0c773f764950d5e11efb8cba62d6e1b462fc"; - sha256 = "1j79v0gvp2i6vz8hg7ajyafd69pcwb4xpp9wyvqa122nnmqz1w84"; + rev = "3a48ecad19a111b629cc5c5afa62d0513e440dc6"; + sha256 = "1ngm3c5piivxzsx05p1bzyac9rlsy050qzlwq1zvc15zz70gfkk0"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4080,12 +4080,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-07-02"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "ca51b6842cd8021f58dc45c89b3e8d7994e0bf8f"; - sha256 = "071gdhrrbrhdmagai3q8c4yzc9kn794aa7kkacnknkm5kzswb8hg"; + rev = "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974"; + sha256 = "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4646,11 +4646,11 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-07-11"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "cff29d864a6e2ec831a5ce6259a0316a036b5563"; + rev = "ef631befe2bea01c23f4f0d9685025ac15d51ace"; sha256 = "1hk1f1mbk37gcqhrwvn352q83qsf5nrgyrgghvkj8m91jgf4m31y"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; @@ -4899,12 +4899,12 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2021-01-14"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "fa891e62903501f7eeb2f00f6574ec9684e1c4ee"; - sha256 = "0cra1l31fcngp3iyn61rlngz4qx7zwk68h07bgp9w5gjx59a7npz"; + rev = "4c22054dffdd84811664cb6957b001a8617333ae"; + sha256 = "16r27kzpk4xww82x18m6m0hwbplsdw96vcmkyy9r6ndxq0hcblqi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; @@ -5073,8 +5073,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "49b86b4610199d879f539d9193fbee45792ba712"; - sha256 = "0zpkblhnxlr1b4kzmwsv8aq52rcn3hxk60cnpa3j337zlkx8kbvp"; + rev = "5692edd004fed1dbd55c90775c34a051298724e7"; + sha256 = "0mzgbnm9ic173spnm9w9da7yl79fqg6p7s1sv0w3d3m7qqvz0bpz"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6702,12 +6702,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-07-11"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4cdeff8c33ec2fe0686324bf1846ce158c452754"; - sha256 = "10cznifza7ygsw9c8dsrc4rks43661hfrhzi21nsrj4x6vf4n1my"; + rev = "1c2663f516c32f8453f542be10192a49ee844a93"; + sha256 = "01gh4p2d41khx5cb7hcpjp9gs5fkgil838rnik1gawiw7w83hnaa"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6774,12 +6774,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2021-06-08"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "0f98634b92da9a35580b618c11a6d2adc42d9f90"; - sha256 = "0l1f98zfmxq8xi2ii31ih0mbq5yilpc0l61qbprs1g5h5p4azjy8"; + rev = "7d9b7125ff2533f6c520573f54e91db2f13a44b0"; + sha256 = "1ckz2b7y6y483d0ignkv8mm0xf9jbs8k3srp50m7sj24nsdadb1v"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -8781,12 +8781,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-07-08"; + version = "2021-07-11"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "ea2ed4bdcd4facaa83d1a44ccdb3d614ad62fec0"; - sha256 = "1zbbr4fbqn36b63mi9wfjl125b8ml9361vin6hpv4zjhhf8xn06w"; + rev = "e82e635e1e188b1d00fa9ed3de21794c07ea1445"; + sha256 = "1623rkqni2xbz6jl8cs848db0gydnpsp0nxss6rg2cp9l813k68f"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -9382,12 +9382,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2021-05-08"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "cd88d9bc34ca1df6bd06a9e427350d45a6c2931c"; - sha256 = "0gf0xla3jm8cp4j5mldn79kfbd3zlwil3wdgdvsx8w3kybi6dap1"; + rev = "df53e9c5fce91a84e1d6e8722956a01595d16c40"; + sha256 = "0zndnmdmxlr6114d29sc1q8fc0s2zlsrj1v28gp0sgnim1rmavfp"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -9599,12 +9599,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-07-11"; + version = "2021-07-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "77c45e8345f3915b27a27e2f07b158cc997215d5"; - sha256 = "13p6pzsl56l39x7jx0r16nscji9qb6gpfxmjsj7sa18g09lmlxk1"; + rev = "a064c48ade2a4df3d010e02b2d528fc2534a62eb"; + sha256 = "03za8pwaqi2bhkq9zgial6fpipkbij530f54alaqc8mrd6nydz90"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From 242c2dd8e581c5f732e81e98923122f763584700 Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Tue, 13 Jul 2021 14:16:15 +0700 Subject: [PATCH 138/188] vimPlugins.tokyonight-nvim: init at 2021-07-09 --- 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 e9476ebffd6..704b064aa0a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5188,6 +5188,18 @@ final: prev: meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; + tokyonight-nvim = buildVimPluginFrom2Nix { + pname = "tokyonight-nvim"; + version = "2021-07-09"; + src = fetchFromGitHub { + owner = "folke"; + repo = "tokyonight.nvim"; + rev = "e3ad6032a7e2c54dd7500335b43c7d353a19ede9"; + sha256 = "1slb67kirb0jfgjsw09dhimmxagsk2aii6w461y1w8nj3fkl6p28"; + }; + meta.homepage = "https://github.com/folke/tokyonight.nvim/"; + }; + traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; version = "2021-06-16"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a5679f04818..8dc6f9aa993 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -150,6 +150,7 @@ flazz/vim-colorschemes floobits/floobits-neovim folke/lsp-colors.nvim@main folke/todo-comments.nvim@main +folke/tokyonight.nvim@main folke/trouble.nvim@main folke/which-key.nvim@main freitass/todo.txt-vim From 322654b8809546b2a357f29ae4e98cb8836df93e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 13 Jul 2021 18:02:44 +0000 Subject: [PATCH 139/188] factorio-experimental: 1.1.35 -> 1.1.36 --- pkgs/games/factorio/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index b230d94cfa5..98c58191f16 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.35.tar.xz", + "name": "factorio_alpha_x64-1.1.36.tar.xz", "needsAuth": true, - "sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk", + "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/alpha/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/alpha/linux64", + "version": "1.1.36" }, "stable": { "name": "factorio_alpha_x64-1.1.35.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.35.tar.xz", + "name": "factorio_headless_x64-1.1.36.tar.xz", "needsAuth": false, - "sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94", + "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/headless/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/headless/linux64", + "version": "1.1.36" }, "stable": { "name": "factorio_headless_x64-1.1.35.tar.xz", From 54ec249bbe869ea46304e8a34709bce12bb69909 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 9 Jul 2021 08:33:17 +0200 Subject: [PATCH 140/188] rofi-vpn: init at 0.2.0 --- .../networking/rofi-vpn/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/networking/rofi-vpn/default.nix diff --git a/pkgs/applications/networking/rofi-vpn/default.nix b/pkgs/applications/networking/rofi-vpn/default.nix new file mode 100644 index 00000000000..8ff83db294f --- /dev/null +++ b/pkgs/applications/networking/rofi-vpn/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitLab +, makeWrapper +, networkmanager +, rofi-unwrapped +}: + +stdenv.mkDerivation rec { + pname = "rofi-vpn"; + version = "0.2.0"; + + src = fetchFromGitLab { + owner = "DamienCassou"; + repo = pname; + rev = "v${version}"; + sha256 = "04jcfb2jy8yyrk4mg68krwh3zb5qcyj1aq1bwk96fhybrq9k2hhp"; + }; + + installPhase = '' + runHook preInstall + + install -D --target-directory=$out/bin/ ./rofi-vpn + + wrapProgram $out/bin/rofi-vpn \ + --prefix PATH ":" ${lib.makeBinPath [ rofi-unwrapped networkmanager ]} + + runHook postInstall + ''; + + nativeBuildInputs = [ makeWrapper ]; + + meta = with lib; { + description = "Rofi-based interface to enable VPN connections with NetworkManager"; + homepage = "https://gitlab.com/DamienCassou/rofi-vpn"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ DamienCassou ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280283e0761..3c391fce141 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25667,6 +25667,8 @@ in rofi-power-menu = callPackage ../applications/misc/rofi-power-menu { }; + rofi-vpn = callPackage ../applications/networking/rofi-vpn { }; + ympd = callPackage ../applications/audio/ympd { }; # a somewhat more maintained fork of ympd From 55a60de2ac030418c75104a9a77d31e788978d2d Mon Sep 17 00:00:00 2001 From: Valentin Heidelberger Date: Tue, 13 Jul 2021 21:05:55 +0200 Subject: [PATCH 141/188] remove va1entin as maintainer --- maintainers/maintainer-list.nix | 6 ------ pkgs/development/python-modules/geographiclib/default.nix | 1 - pkgs/development/python-modules/pynacl/default.nix | 1 - 3 files changed, 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ef102e3a7a3..2c13016eef3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10964,12 +10964,6 @@ github = "deviant"; githubId = 68829907; }; - va1entin = { - email = "github@valentinsblog.com"; - github = "va1entin"; - githubId = 31535155; - name = "Valentin Heidelberger"; - }; vaibhavsagar = { email = "vaibhavsagar@gmail.com"; github = "vaibhavsagar"; diff --git a/pkgs/development/python-modules/geographiclib/default.nix b/pkgs/development/python-modules/geographiclib/default.nix index 5ebaac9cea5..0526a584a41 100644 --- a/pkgs/development/python-modules/geographiclib/default.nix +++ b/pkgs/development/python-modules/geographiclib/default.nix @@ -23,6 +23,5 @@ buildPythonPackage rec { homepage = "https://geographiclib.sourceforge.io"; description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution"; license = licenses.mit; - maintainers = with maintainers; [ va1entin ]; }; } diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index ebd6aeb0fee..f8696dd54ac 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -37,7 +37,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "nacl" ]; meta = with lib; { - maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; homepage = "https://github.com/pyca/pynacl/"; license = licenses.asl20; From 2913fceb38aca4ee8537a086f47d711f4a0b4d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 13 Jul 2021 21:15:57 +0200 Subject: [PATCH 142/188] polybar: use config.pulseaudio to activate pulseaudio --- pkgs/applications/misc/polybar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 099813483a4..4fe2480810b 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,4 +1,5 @@ -{ cairo +{ config +, cairo , cmake , fetchFromGitHub , libXdmcp @@ -33,7 +34,7 @@ , alsaSupport ? true , githubSupport ? false , mpdSupport ? false -, pulseSupport ? false +, pulseSupport ? config.pulseaudio or false , iwSupport ? false , nlSupport ? true , i3Support ? false From 05447d62f955347b3d91817e920259aa8ce4c703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 13 Jul 2021 21:16:20 +0200 Subject: [PATCH 143/188] polybar: format --- pkgs/applications/misc/polybar/default.nix | 144 ++++++++++----------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 4fe2480810b..b3b71d87608 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -30,87 +30,87 @@ , i3-gaps , jsoncpp -# override the variables ending in 'Support' to enable or disable modules -, alsaSupport ? true + # override the variables ending in 'Support' to enable or disable modules +, alsaSupport ? true , githubSupport ? false -, mpdSupport ? false -, pulseSupport ? config.pulseaudio or false -, iwSupport ? false -, nlSupport ? true -, i3Support ? false +, mpdSupport ? false +, pulseSupport ? config.pulseaudio or false +, iwSupport ? false +, nlSupport ? true +, i3Support ? false , i3GapsSupport ? false }: stdenv.mkDerivation rec { - pname = "polybar"; - version = "3.5.6"; + pname = "polybar"; + version = "3.5.6"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "sha256-Uvj9V2M/uQxyziTx1hecrcaQZECijlpVmWcUeT+PqrI="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-Uvj9V2M/uQxyziTx1hecrcaQZECijlpVmWcUeT+PqrI="; + fetchSubmodules = true; + }; - nativeBuildInputs = [ - cmake - pkg-config - python3Packages.sphinx - removeReferencesTo - ] - ++ lib.optional (i3Support || i3GapsSupport) makeWrapper; + nativeBuildInputs = [ + cmake + pkg-config + python3Packages.sphinx + removeReferencesTo + ] ++ lib.optional (i3Support || i3GapsSupport) makeWrapper; - buildInputs = [ - cairo - libXdmcp - libpthreadstubs - libxcb - pcre - python3 - xcbproto - xcbutil - xcbutilcursor - xcbutilimage - xcbutilrenderutil - xcbutilwm - xcbutilxrm - ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional githubSupport curl - ++ lib.optional mpdSupport libmpdclient - ++ lib.optional pulseSupport libpulseaudio - ++ lib.optional iwSupport wirelesstools - ++ lib.optional nlSupport libnl - ++ lib.optional (i3Support || i3GapsSupport) jsoncpp - ++ lib.optional i3Support i3 - ++ lib.optional i3GapsSupport i3-gaps; + buildInputs = [ + cairo + libXdmcp + libpthreadstubs + libxcb + pcre + python3 + xcbproto + xcbutil + xcbutilcursor + xcbutilimage + xcbutilrenderutil + xcbutilwm + xcbutilxrm + ] ++ lib.optional alsaSupport alsa-lib + ++ lib.optional githubSupport curl + ++ lib.optional mpdSupport libmpdclient + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional iwSupport wirelesstools + ++ lib.optional nlSupport libnl + ++ lib.optional (i3Support || i3GapsSupport) jsoncpp + ++ lib.optional i3Support i3 + ++ lib.optional i3GapsSupport i3-gaps; - postInstall = if i3Support - then ''wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3}/bin" - '' - else if i3GapsSupport - then ''wrapProgram $out/bin/polybar \ - --prefix PATH : "${i3-gaps}/bin" - '' - else ''''; + postInstall = + if i3Support then '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3}/bin" + '' + else if i3GapsSupport + then '' + wrapProgram $out/bin/polybar \ + --prefix PATH : "${i3-gaps}/bin" + '' + else ""; - postFixup = '' - remove-references-to -t ${stdenv.cc} $out/bin/polybar + postFixup = '' + remove-references-to -t ${stdenv.cc} $out/bin/polybar + ''; + + meta = with lib; { + homepage = "https://polybar.github.io/"; + changelog = "https://github.com/polybar/polybar/releases/tag/${version}"; + description = "A fast and easy-to-use tool for creating status bars"; + longDescription = '' + Polybar aims to help users build beautiful and highly customizable + status bars for their desktop environment, without the need of + having a black belt in shell scripting. ''; - - meta = with lib; { - homepage = "https://polybar.github.io/"; - changelog = "https://github.com/polybar/polybar/releases/tag/${version}"; - description = "A fast and easy-to-use tool for creating status bars"; - longDescription = '' - Polybar aims to help users build beautiful and highly customizable - status bars for their desktop environment, without the need of - having a black belt in shell scripting. - ''; - license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ]; - platforms = platforms.linux; - }; + license = licenses.mit; + maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ]; + platforms = platforms.linux; + }; } From 264cfed1b4b4bc2312b7f4e8b6d319de66d53142 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 13 Jul 2021 22:04:23 +0200 Subject: [PATCH 144/188] texlive: remove empty list --- pkgs/tools/typesetting/tex/texlive/combine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index 2e9ccc70ff2..c503a1fd82a 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -51,7 +51,7 @@ in (buildEnv { ]; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ] ++ pkgList.extraInputs; + buildInputs = pkgList.extraInputs; # This is set primarily to help find-tarballs.nix to do its job passthru.packages = pkgList.all; From decadbb63ac66843d52504276e28366c3b192223 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 13 Jul 2021 00:02:38 +0300 Subject: [PATCH 145/188] termius: switch to a official source --- pkgs/applications/networking/termius/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index f6820ea0d04..fec77560393 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -12,12 +12,13 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "7.15.1"; + version = "7.16.0"; src = fetchurl { - # Termius switched to using non-versioned downloads https://s3.amazonaws.com/termius.desktop.autoupdate/linux/Termius.deb - url = "https://web.archive.org/web/20210710174019/https://s3.amazonaws.com/termius.desktop.autoupdate/linux/Termius.deb"; - sha256 = "16zc7ywz3hl1awkc4wk0rd94nsy55l98j2yzfdxcjiixky4gk8wn"; + # find the latest version by + # curl https://deb.termius.com/dists/squeeze/main/binary-amd64/Packages + url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; + sha256 = "013nli61bk4x4hkhr6gcpzm1y8ycmqk3vr7q0w2dn2bfdwjg559v"; }; desktopItem = makeDesktopItem { From b3f974ee08fbf887bfedd41e9ecedaa027fc76dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 13 Jul 2021 22:38:27 +0200 Subject: [PATCH 146/188] delta: 0.8.2 -> 0.8.3 --- .../version-management/git-and-tools/delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 72a27cf0601..46d19f2814d 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-ztRwUf73ioygkgmE9t/EKJPerJJscJYG4YNeNdzXH1g="; + sha256 = "sha256-lwdsl3dzqrIL1JoBFmldwsCvNCWUcTlgeoEoCvmlTCQ="; }; - cargoSha256 = "sha256-cCMHMGHfI0JyIL8+q2fyzamBGGHZx3mc2FpwTUa4S9Y="; + cargoSha256 = "sha256-7TvxkSJ3iWJnjD3Xe7WDXBNWIyl8U9XTCn9muUG1AmI="; nativeBuildInputs = [ installShellFiles ]; From 4b4c8650a8dcd9aa44cee91a0e6dae2a08897401 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 13 Jul 2021 10:47:56 +0200 Subject: [PATCH 147/188] xorgserver: override build OS name --- pkgs/servers/x11/xorg/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 7e8eee77a08..f2f15b3c530 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -659,6 +659,7 @@ self: super: "--with-xkb-output=$out/share/X11/xkb/compiled" "--with-log-dir=/var/log" "--enable-glamor" + "--with-os-name=Nix" # r13y, embeds the build machine's kernel version otherwise ] ++ lib.optionals stdenv.hostPlatform.isMusl [ "--disable-tls" ]; From c9c530fb3a9aa3f547b610942c2be7a5d510cfcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 13 Jul 2021 23:21:51 +0200 Subject: [PATCH 148/188] hexyl: 0.8.0 -> 0.9.0 --- pkgs/tools/misc/hexyl/default.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/hexyl/default.nix b/pkgs/tools/misc/hexyl/default.nix index 3f11490fcc4..dcab5f249fe 100644 --- a/pkgs/tools/misc/hexyl/default.nix +++ b/pkgs/tools/misc/hexyl/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { - pname = "hexyl"; - version = "0.8.0"; + pname = "hexyl"; + version = "0.9.0"; src = fetchFromGitHub { - owner = "sharkdp"; - repo = pname; - rev = "v${version}"; - sha256 = "0aj2sysl0spf5zlcd5kfzlw97w7dzf9x93pv0d1v9blnbd1rz7lm"; + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hLDx5OzCE5iA492V3+dhaav2l8/rOVWyskrU4Gz1hf4="; }; - cargoSha256 = "08hn0csw12xaag95gb5rj4q7k2zyy9j9bf4iw3b0r3ndh66qqra2"; + cargoSha256 = "sha256-CGaCMrShagK4dAdwJtaeUMJlYOlG/cH+6E1QDYGrqL0="; meta = with lib; { changelog = "https://github.com/sharkdp/hexyl/releases/tag/v${version}"; @@ -22,9 +22,8 @@ rustPlatform.buildRustPackage rec { printable ASCII characters, ASCII whitespace characters, other ASCII characters and non-ASCII). ''; - homepage = "https://github.com/sharkdp/hexyl"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ dywedir ]; - platforms = platforms.linux ++ platforms.darwin; + homepage = "https://github.com/sharkdp/hexyl"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dywedir SuperSandro2000 ]; }; } From 2da9ae847c1f8aea2708ad9eef78a220acd7ae95 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 13 Jul 2021 23:29:51 +0200 Subject: [PATCH 149/188] pythonPackages.push_receiver: init at 0.1.1 --- .../python-modules/push-receiver/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/push-receiver/default.nix diff --git a/pkgs/development/python-modules/push-receiver/default.nix b/pkgs/development/python-modules/push-receiver/default.nix new file mode 100644 index 00000000000..fe0582f0962 --- /dev/null +++ b/pkgs/development/python-modules/push-receiver/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, lib +, appdirs +, http-ece +, oscrypto +, protobuf +}: + +buildPythonPackage rec { + pname = "push-receiver"; + version = "0.1.1"; + + src = fetchPypi { + inherit version; + pname = "push_receiver"; + sha256 = "sha256-Tknmra39QfA+OgrRxzKDLbkPucW8zgdHqz5FGQnzYOw="; + }; + + propagatedBuildInputs = [ + appdirs # required for running the bundled example + http-ece # required for listening for new message + oscrypto + protobuf + ]; + + pythonImportsCheck = [ "push_receiver" ]; + + meta = with lib; { + homepage = "https://github.com/Francesco149/push_receiver"; + description = "Subscribe to GCM/FCM and receive notifications"; + license = licenses.unlicense; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78db6b3db5c..0cc68b2d3ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5645,6 +5645,8 @@ in { purl = callPackage ../development/python-modules/purl { }; + push-receiver = callPackage ../development/python-modules/push-receiver { }; + pushbullet = callPackage ../development/python-modules/pushbullet { }; pushover-complete = callPackage ../development/python-modules/pushover-complete { }; From b541e7616691b5236a9ce73739c57434827451b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:45:52 +0200 Subject: [PATCH 150/188] python3Packages.pyupgrade: 2.20.0 -> 2.21.0 --- pkgs/development/python-modules/pyupgrade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix index 229ac69259d..07f21881c50 100644 --- a/pkgs/development/python-modules/pyupgrade/default.nix +++ b/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.20.0"; + version = "2.21.0"; disabled = isPy27; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wq15JU6sbXPZSk/vAX6fTuc3vxZeRy9dSCNGGv2utY4="; + sha256 = "sha256-W0zaziTkXReEuLhcd6jEHH/dS1YSZNiWDro+tTH7Ftg="; }; checkInputs = [ pytestCheckHook ]; From 9cecae1bc5200f2acce1cbf29873123728a3409f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Tue, 13 Jul 2021 19:34:07 -0300 Subject: [PATCH 151/188] temporal: init 1.10.5 (#130099) Co-authored-by: Sandro --- .../networking/cluster/temporal/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/networking/cluster/temporal/default.nix diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix new file mode 100644 index 00000000000..26967b7ed85 --- /dev/null +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -0,0 +1,43 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "temporal"; + version = "1.10.5"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "temporal"; + rev = "v${version}"; + sha256 = "sha256-+rU/Tn3k/VmAgZl169tVZsRf5SL4bI9r3p1svVfKN2E="; + }; + + vendorSha256 = "sha256-jbQPhGfZPPxjYTSJ9wMLzQIOhAwxJZypRzqwL421RfM="; + + # Errors: + # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite + # gocql: unable to dial control conn 127.0.0.1:9042: dial tcp 127.0.0.1:9042: connect: connection refused + doCheck = false; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 "$GOPATH/bin/cli" -T $out/bin/tctl + install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra + install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server + install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/tctl --version | grep ${version} > /dev/null + ''; + + meta = with lib; { + description = "A microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability"; + downloadPage = "https://github.com/temporalio/temporal"; + homepage = "https://temporal.io"; + license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ea5ca31ee5..3888d415ca6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27232,6 +27232,8 @@ in tempo = callPackage ../servers/tracing/tempo {}; + temporal = callPackage ../applications/networking/cluster/temporal { }; + tendermint = callPackage ../tools/networking/tendermint { }; termdown = python3Packages.callPackage ../applications/misc/termdown { }; From 3d260a2d0edffce5095a5f813e9227c4864e9715 Mon Sep 17 00:00:00 2001 From: LeSuisse Date: Wed, 14 Jul 2021 00:35:09 +0200 Subject: [PATCH 152/188] libsForQt5.kimageformats: fix CVE-2021-36083 (#130115) Co-authored-by: Sandro --- .../libraries/kde-frameworks/kimageformats.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 4ad3ba74100..00a9ef015f2 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -15,10 +15,19 @@ mkDerivation { url = "https://invent.kde.org/frameworks/kimageformats/-/commit/bf3f94da766d66a0470ab744dbe1ced4697b572d.diff"; sha256 = "18d67l5kj9sv88jdpi061k9rl3adzkx9l51ng7saylrkfddwc3ig"; }) + (fetchpatch { # included in kimageformats >= 5.82 + name = "CVE-2021-36083.patch"; + url = "https://invent.kde.org/frameworks/kimageformats/-/commit/297ed9a2fe339bfe36916b9fce628c3242e5be0f.diff"; + sha256 = "16axaljgaar0j5796x1mjps93y92393x8zywh3nzw7rm9w2qxzml"; + }) ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive openexr libavif qtbase ]; outputs = [ "out" ]; # plugins only CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR"; + + meta = with lib; { + broken = versionOlder qtbase.version "5.14"; + }; } From 30ce6d8a0cc5354cc56987227a2d981991af3870 Mon Sep 17 00:00:00 2001 From: Matt Votava Date: Mon, 12 Jul 2021 20:20:36 -0700 Subject: [PATCH 153/188] kfctl: init at 1.2.0 Update pkgs/applications/networking/cluster/kfctl/default.nix Co-authored-by: Sandro --- .../networking/cluster/kfctl/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kfctl/default.nix diff --git a/pkgs/applications/networking/cluster/kfctl/default.nix b/pkgs/applications/networking/cluster/kfctl/default.nix new file mode 100644 index 00000000000..52a049ab1bb --- /dev/null +++ b/pkgs/applications/networking/cluster/kfctl/default.nix @@ -0,0 +1,32 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kfctl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "kubeflow"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FY7o4QULobLY1djfcc2l6awE/v2stN7cc2lffMkjoPc="; + }; + + vendorSha256 = "sha256-+6sxXp0LKegZjEFv1CIQ6xYh+hXLn+o9LggRYamCzpI="; + + subPackages = [ "cmd/kfctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd eksctl \ + --bash <($out/bin/kfctl completion bash) \ + --zsh <($out/bin/kfctl completion zsh) + ''; + + meta = with lib; { + description = "A CLI for deploying and managing Kubeflow"; + homepage = "https://github.com/kubeflow/kfctl"; + license = licenses.asl20; + maintainers = with maintainers; [ mvnetbiz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 254651a4f5b..1cfba0c097c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6221,6 +6221,8 @@ in keystore-explorer = callPackage ../applications/misc/keystore-explorer { }; + kfctl = callPackage ../applications/networking/cluster/kfctl { }; + kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { enableUnfree = false; From 0fcc0e972cf40a0704fa7803a9794798acd399fc Mon Sep 17 00:00:00 2001 From: legendofmiracles <30902201+legendofmiracles@users.noreply.github.com> Date: Wed, 14 Jul 2021 01:47:16 +0200 Subject: [PATCH 154/188] zola: 0.13.0 -> unstable-2021-07-10 (#129956) --- pkgs/applications/misc/zola/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 3f704e8dd85..e41bc6bd20d 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -1,31 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pkg-config, openssl, oniguruma, CoreServices, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.13.0"; + version = "unstable-2021-07-10"; src = fetchFromGitHub { owner = "getzola"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-yTvFQWmNxoB+CNZLHGmzJq7mKuOUxUqV4g8PWlOlRbM="; + # unstable because the latest release fails to build + rev = "8c3ce7d7fbc0d585d4cbf27598ac7dfe5acd96f1"; + sha256 = "sha256-Tw3u96ZPb0yUXvtJ+rna6nnb0a+KfTEiR/PPEadFxDA="; }; - cargoSha256 = "sha256:19vijhcs1i02jhz68acil7psv3pcn0jzi1i4y2l05i4m3ayxivjf"; + cargoSha256 = "sha256-mOO39LK7lQ5IxwMgfJpNwX/H5MZ3qKqfeDmnY8zXOx4="; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles]; buildInputs = [ openssl oniguruma ] ++ lib.optional stdenv.isDarwin CoreServices; RUSTONIG_SYSTEM_LIBONIG = true; postInstall = '' - install -D -m 444 completions/zola.bash \ - -t $out/share/bash-completion/completions - install -D -m 444 completions/_zola \ - -t $out/share/zsh/site-functions - install -D -m 444 completions/zola.fish \ - -t $out/share/fish/vendor_completions.d + installShellCompletion --cmd zola \ + --fish completions/zola.fish \ + --zsh completions/_zola \ + --bash completions/zola.bash ''; meta = with lib; { @@ -33,5 +32,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.getzola.org/"; license = licenses.mit; maintainers = with maintainers; [ dywedir _0x4A6F ]; + # set because of unstable-* version + mainProgram = "zola"; }; } From 4b04945c6386bc95db705c12d83a310985236d61 Mon Sep 17 00:00:00 2001 From: Danil <86075850+dan4ik605743@users.noreply.github.com> Date: Wed, 14 Jul 2021 08:07:55 +0700 Subject: [PATCH 155/188] yandex-browser: init at 21.5.3.753-1 (#128940) --- .../browsers/yandex-browser/default.nix | 135 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 137 insertions(+) create mode 100644 pkgs/applications/networking/browsers/yandex-browser/default.nix diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix new file mode 100644 index 00000000000..5c62dbb7e20 --- /dev/null +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -0,0 +1,135 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, wrapGAppsHook +, flac +, gnome2 +, harfbuzzFull +, nss +, snappy +, xdg-utils +, xorg +, alsa-lib +, atk +, cairo +, cups +, curl +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, libX11 +, libxcb +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libdrm +, libnotify +, libopus +, libpulseaudio +, libuuid +, libxshmfence +, mesa +, nspr +, pango +, systemd +, at-spi2-atk +, at-spi2-core +}: + +stdenv.mkDerivation rec { + pname = "yandex-browser"; + version = "21.5.3.753-1"; + + src = fetchurl { + url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; + sha256 = "sha256-sI2p/fCaruUJ3qPMyy+12Bh5I1SH8m7sYX5yDex2rwg="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + flac + harfbuzzFull + nss + snappy + xdg-utils + xorg.libxkbfile + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig.lib + freetype + gdk-pixbuf + glib + gnome2.GConf + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libdrm + libnotify + libopus + libuuid + libxcb + libxshmfence + mesa + nspr + nss + pango + stdenv.cc.cc.lib + ]; + + unpackPhase = '' + mkdir -p $TMP/ya $out/bin + cp $src $TMP/ya.deb + ar vx ya.deb + tar --no-overwrite-dir -xvf data.tar.xz -C $TMP/ya/ + ''; + + installPhase = '' + cp -R $TMP/ya/opt $out/ + ln -sf $out/opt/yandex/browser-beta/yandex_browser $out/bin/yandex-browser + ''; + + runtimeDependencies = [ + libpulseaudio.out + (lib.getLib systemd) + ]; + + meta = with lib; { + description = "Yandex Web Browser"; + homepage = "https://browser.yandex.ru/"; + license = licenses.unfree; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07c33cab6d5..1780cd64b6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31941,6 +31941,8 @@ in yamdi = callPackage ../tools/video/yamdi { }; + yandex-browser = callPackage ../applications/networking/browsers/yandex-browser { }; + yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; yara = callPackage ../tools/security/yara { }; From dfe4ec8f17292603329e85876996c1851cf7324c Mon Sep 17 00:00:00 2001 From: Danil <86075850+dan4ik605743@users.noreply.github.com> Date: Wed, 14 Jul 2021 08:08:24 +0700 Subject: [PATCH 156/188] vk-cli: init at 0.7.6 (#128906) Co-authored-by: Sandro --- .../instant-messengers/vk-cli/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/vk-cli/default.nix diff --git a/pkgs/applications/networking/instant-messengers/vk-cli/default.nix b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix new file mode 100644 index 00000000000..e1b3cc4f775 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/vk-cli/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchurl +, curl +, zulip +, p7zip +, glibc +, ncurses +, openssl +}: + +stdenv.mkDerivation rec { + pname = "vk-cli"; + version = "0.7.6"; + + src = fetchurl { + url = "https://github.com/vk-cli/vk/releases/download/${version}/vk-${version}-64-bin.7z"; + sha256 = "sha256-Y40oLjddunrd7ZF1JbCcgjSCn8jFTubq69jhAVxInXw="; + }; + + nativeBuildInputs = [ + p7zip + ]; + + buildInputs = [ + curl + ncurses + openssl + ]; + + unpackPhase = '' + mkdir -p $TMP/ + 7z x $src -o$TMP/ + ''; + + installPhase = '' + mkdir -p $out/bin/ + mv $TMP/vk-${version}-64-bin vk-cli + install -D vk-cli --target-directory=$out/bin/ + ''; + + postFixup = '' + patchelf $out/bin/vk-cli \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${lib.makeLibraryPath [ curl zulip glibc ]}" + ''; + + meta = with lib; { + description = "A console (ncurses) client for vk.com written in D"; + homepage = "https://github.com/vk-cli/vk"; + license = licenses.asl20; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1780cd64b6e..a89f3b06828 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9607,6 +9607,8 @@ in vdmfec = callPackage ../applications/backup/vdmfec {}; + vk-cli = callPackage ../applications/networking/instant-messengers/vk-cli { }; + vk-messenger = callPackage ../applications/networking/instant-messengers/vk-messenger {}; volatility = callPackage ../tools/security/volatility { }; From b312fdc6266801f8bc5d1d6504794a15ccfbf54c Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Tue, 13 Jul 2021 21:17:46 -0400 Subject: [PATCH 157/188] orocos-kdl: 1.5.0 propagation fix --- pkgs/development/libraries/orocos-kdl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/development/libraries/orocos-kdl/default.nix index 032b67e683d..4eb18c347c0 100644 --- a/pkgs/development/libraries/orocos-kdl/default.nix +++ b/pkgs/development/libraries/orocos-kdl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/orocos_kdl"; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen ]; + propagatedBuildInputs = [ eigen ]; meta = with lib; { description = "Kinematics and Dynamics Library"; From 0f236088eefcfa7c9a968c8d2c02db50c42ed89f Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 11 Jun 2021 03:15:30 +0000 Subject: [PATCH 158/188] libproxy: Make JavaScript optional --- pkgs/development/libraries/libproxy/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index afe5b8dde13..c5d6bc4612f 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -5,6 +5,7 @@ , zlib , dbus , networkmanager +, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_68 , spidermonkey_68 , pcre , gsettings-desktop-schemas @@ -16,7 +17,9 @@ , JavaScriptCore }: -stdenv.mkDerivation rec { +let + jsRuntime = if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_68; +in stdenv.mkDerivation rec { pname = "libproxy"; version = "0.4.17"; @@ -39,22 +42,21 @@ stdenv.mkDerivation rec { pcre python3 zlib + ] ++ lib.optionals enableJavaScript [ + jsRuntime ] ++ (if stdenv.hostPlatform.isDarwin then [ SystemConfiguration CoreFoundation - JavaScriptCore ] else [ glib - spidermonkey_68 dbus networkmanager ]); cmakeFlags = [ - "-DWITH_MOZJS=ON" "-DWITH_PYTHON2=OFF" "-DPYTHON3_SITEPKG_DIR=${placeholder "py3"}/${python3.sitePackages}" - ]; + ] ++ lib.optional (enableJavaScript && !stdenv.hostPlatform.isDarwin) "-DWITH_MOZJS=ON"; postFixup = lib.optionalString stdenv.isLinux '' # config_gnome3 uses the helper to find GNOME proxy settings From 48db86f42c112dc40687173aeda561c2b9bb4e7d Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 16:56:01 +0200 Subject: [PATCH 159/188] gnomeExtensions: Remove remove-dropdown-arrows --- pkgs/desktops/gnome/extensions/default.nix | 1 + .../gnome/extensions/manuallyPackaged.nix | 1 - .../remove-dropdown-arrows/default.nix | 34 ------------------- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 0e1167561eb..a4255411934 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -68,6 +68,7 @@ in rec { nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; + remove-dropdown-arrows = throw "gnomeExtensions.remove-dropdown-arrows removed since 2021-05-25: The extensions has not seen an update sine GNOME 3.34. Furthermore, the functionality it provides is obsolete as of GNOME 40."; } ); } diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 207ba6979c9..4e30130774a 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -26,7 +26,6 @@ noannoyance = callPackage ./noannoyance { }; paperwm = callPackage ./paperwm { }; pidgin-im-integration = callPackage ./pidgin-im-integration { }; - remove-dropdown-arrows = callPackage ./remove-dropdown-arrows { }; sound-output-device-chooser = callPackage ./sound-output-device-chooser { }; system-monitor = callPackage ./system-monitor { }; taskwhisperer = callPackage ./taskwhisperer { }; diff --git a/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix deleted file mode 100644 index e310f5dcf10..00000000000 --- a/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-remove-dropdown-arrows"; - version = "13"; - - src = fetchFromGitHub { - owner = "mpdeimos"; - repo = "gnome-shell-remove-dropdown-arrows"; - rev = "version/${version}"; - sha256 = "09b2hnfbqym20pb1sfc8xiz7gs2kbs6b1s7xl8swc8dydhsbambk"; - }; - - # This package has a Makefile, but it's used for publishing and linting, not - # for building. Disable the build phase so installing doesn't attempt to - # publish the extension. - dontBuild = true; - - uuid = "remove-dropdown-arrows@mpdeimos.com"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp extension.js $out/share/gnome-shell/extensions/${uuid} - cp metadata.json $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "Remove dropdown arrows from GNOME Shell Menus"; - license = licenses.gpl3; - maintainers = with maintainers; [ jonafato ]; - homepage = "https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows"; - }; -} From 6aae2894ef8ae75cc6b07d29853ae8bb1ba96eef Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 21:55:35 +0200 Subject: [PATCH 160/188] gnomeExtensions: rename uuid field to extensionUuid --- pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix | 2 +- pkgs/desktops/gnome/extensions/appindicator/default.nix | 2 +- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 2 +- pkgs/desktops/gnome/extensions/caffeine/default.nix | 4 ++-- pkgs/desktops/gnome/extensions/clock-override/default.nix | 6 +++--- pkgs/desktops/gnome/extensions/dash-to-dock/default.nix | 2 +- pkgs/desktops/gnome/extensions/dash-to-panel/default.nix | 2 +- .../gnome/extensions/drop-down-terminal/default.nix | 4 ++-- .../gnome/extensions/dynamic-panel-transparency/default.nix | 1 + pkgs/desktops/gnome/extensions/emoji-selector/default.nix | 6 +++--- pkgs/desktops/gnome/extensions/freon/default.nix | 6 +++--- pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix | 2 +- pkgs/desktops/gnome/extensions/gsconnect/default.nix | 2 +- pkgs/desktops/gnome/extensions/icon-hider/default.nix | 4 ++-- pkgs/desktops/gnome/extensions/impatience/default.nix | 4 ++-- .../gnome/extensions/night-theme-switcher/default.nix | 4 ++-- pkgs/desktops/gnome/extensions/no-title-bar/default.nix | 2 +- pkgs/desktops/gnome/extensions/paperwm/default.nix | 6 +++--- .../gnome/extensions/pidgin-im-integration/default.nix | 2 +- .../extensions/sound-output-device-chooser/default.nix | 2 +- pkgs/desktops/gnome/extensions/system-monitor/default.nix | 6 +++--- pkgs/desktops/gnome/extensions/taskwhisperer/default.nix | 2 +- pkgs/desktops/gnome/extensions/tilingnome/default.nix | 6 +++--- pkgs/desktops/gnome/extensions/topicons-plus/default.nix | 2 +- pkgs/desktops/gnome/extensions/unite/default.nix | 6 +++--- .../gnome/extensions/window-corner-preview/default.nix | 4 ++-- 26 files changed, 46 insertions(+), 45 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index 57d78bf756a..f08fc7ec0df 100644 --- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - uuid = "EasyScreenCast@iacopodeenosee.gmail.com"; + passthru.extensionUuid = "EasyScreenCast@iacopodeenosee.gmail.com"; meta = with lib; { description = "Simplifies the use of the video recording function integrated in gnome shell"; diff --git a/pkgs/desktops/gnome/extensions/appindicator/default.nix b/pkgs/desktops/gnome/extensions/appindicator/default.nix index 65576d292a8..d4fd6cb0845 100644 --- a/pkgs/desktops/gnome/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome/extensions/appindicator/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # installing doesn't build an unnecessary release. dontBuild = true; - uuid = "appindicatorsupport@rgcjonas.gmail.com"; + passthru.extensionUuid = "appindicatorsupport@rgcjonas.gmail.com"; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions/${uuid} diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index c3ed99b788b..a8fba029217 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - uuid = "arcmenu@arcmenu.com"; + passthru.extensionUuid = "arcmenu@arcmenu.com"; meta = with lib; { description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; diff --git a/pkgs/desktops/gnome/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix index 8b2d538f4fe..7cb98b569b7 100644 --- a/pkgs/desktops/gnome/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs"; }; - uuid = "caffeine@patapon.info"; + passthru.extensionUuid = "caffeine@patapon.info"; nativeBuildInputs = [ glib gettext @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "caffeine@patapon.info" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 3e02d33857a..9576bbf53e5 100644 --- a/pkgs/desktops/gnome/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { stripRoot = false; }; - uuid = "clock-override@gnomeshell.kryogenix.org"; + passthru.extensionUuid = "clock-override@gnomeshell.kryogenix.org"; nativeBuildInputs = [ gettext glib ]; @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} $out/share/gnome-shell/extensions/${uuid} + mkdir -p "$out/share/gnome-shell/extensions/clock-override@gnomeshell.kryogenix.org" + cp -r {convenience.js,extension.js,format.js,locale,metadata.json,prefs.js,schemas} "$out/share/gnome-shell/extensions/clock-override@gnomeshell.kryogenix.org" runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 97815a844d7..cacce95008d 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - uuid = "dash-to-dock@micxgx.gmail.com"; + passthru.extensionUuid = "dash-to-dock@micxgx.gmail.com"; meta = with lib; { description = "A dock for the Gnome Shell"; diff --git a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix index 440b8d76b17..4acd8565e5e 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - uuid = "dash-to-panel@jderose9.github.com"; + passthru.extensionUuid = "dash-to-panel@jderose9.github.com"; meta = with lib; { description = "An icon taskbar for Gnome Shell"; diff --git a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index a994e427fb0..414a67ccabd 100644 --- a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i"; }; - uuid = "drop-down-terminal@gs-extensions.zzrough.org"; + passthru.extensionUuid = "drop-down-terminal@gs-extensions.zzrough.org"; patches = [ (substituteAll { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions/ + cp -r "drop-down-terminal@gs-extensions.zzrough.org" $out/share/gnome-shell/extensions/ runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix index aee636d4534..ae33885fca3 100644 --- a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix +++ b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; uuid = "dynamic-panel-transparency@rockon999.github.io"; + passthru.extensionUuid = uuid; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix index 70f09463d12..a3706fbbe24 100644 --- a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix +++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix @@ -11,20 +11,20 @@ stdenv.mkDerivation rec { sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb"; }; - uuid = "emoji-selector@maestroschan.fr"; + passthru.extensionUuid = "emoji-selector@maestroschan.fr"; nativeBuildInputs = [ glib ]; buildPhase = '' runHook preBuild - glib-compile-schemas ./${uuid}/schemas + glib-compile-schemas "./emoji-selector@maestroschan.fr/schemas" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "emoji-selector@maestroschan.fr" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix index 9a884ac78ac..5877fe6dc6c 100644 --- a/pkgs/desktops/gnome/extensions/freon/default.nix +++ b/pkgs/desktops/gnome/extensions/freon/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-freon"; version = "44"; - uuid = "freon@UshakovVasilii_Github.yahoo.com"; + passthru.extensionUuid = "freon@UshakovVasilii_Github.yahoo.com"; src = fetchFromGitHub { owner = "UshakovVasilii"; @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas ${uuid}/schemas + glib-compile-schemas --strict --targetdir="freon@UshakovVasilii_Github.yahoo.com/schemas" "freon@UshakovVasilii_Github.yahoo.com/schemas" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "freon@UshakovVasilii_Github.yahoo.com" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix index 9ba9ddaf09b..552e0a2dcaf 100755 --- a/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix +++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "127n3jc5d6cl0yrpjf8acdj76br97knks1wx4f6jcswkx9x47w0a"; }; - uuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; + passthru.extensionUuid = "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com"; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 8906ebcddec..4eb92bf923f 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { done ''; - uuid = "gsconnect@andyholmes.github.io"; + passthru.extensionUuid = "gsconnect@andyholmes.github.io"; passthru = { tests = { diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix index 820d96988c9..446c7b0e26c 100644 --- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks"; }; - uuid = "icon-hider@kalnitsky.org"; + passthru.extensionUuid = "icon-hider@kalnitsky.org"; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "icon-hider@kalnitsky.org" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index 95477222163..676bf8f053b 100644 --- a/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r impatience $out/share/gnome-shell/extensions/${uuid} + cp -r impatience "$out/share/gnome-shell/extensions/impatience@gfxmonk.net" runHook postInstall ''; - uuid = "impatience@gfxmonk.net"; + passthru.extensionUuid = "impatience@gfxmonk.net"; meta = with lib; { description = "Speed up builtin gnome-shell animations"; diff --git a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix index fd0d2dbb578..52eef56a743 100644 --- a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ glib gnome.gnome-shell ]; - uuid = "nightthemeswitcher@romainvigier.fr"; + passthru.extensionUuid = "nightthemeswitcher@romainvigier.fr"; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions/ - unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid} + unzip "build/nightthemeswitcher@romainvigier.fr.shell-extension.zip" -d "$out/share/gnome-shell/extensions/nightthemeswitcher@romainvigier.fr" runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index ad588be18ce..518e3f78f64 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - uuid = "no-title-bar@jonaspoehler.de"; + passthru.extensionUuid = "no-title-bar@jonaspoehler.de"; meta = with lib; { description = "Integrates maximized windows with the top panel"; diff --git a/pkgs/desktops/gnome/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix index 201628b4b42..627c4b3f2c3 100644 --- a/pkgs/desktops/gnome/extensions/paperwm/default.nix +++ b/pkgs/desktops/gnome/extensions/paperwm/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1jq15qrq3khqpjsjbcc17amdr1k53jkvambdacdf56xbqkycvlgs"; }; - uuid = "paperwm@hedning:matrix.org"; + passthru.extensionUuid = "paperwm@hedning:matrix.org"; dontBuild = true; installPhase = '' runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} + mkdir -p "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org" + cp -r . "$out/share/gnome-shell/extensions/paperwm@hedning:matrix.org" runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index 93ffcda830a..7f3ee00960c 100644 --- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - uuid = "pidgin@muffinmad"; + passthru.extensionUuid = "pidgin@muffinmad"; meta = with lib; { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index f01a2cd545e..e166f8ca083 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { dontBuild = true; - uuid = "sound-output-device-chooser@kgshank.net"; + passthru.extensionUuid = "sound-output-device-chooser@kgshank.net"; makeFlags = [ "INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions" diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index d141ab9dcaa..31df563387b 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -28,18 +28,18 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - glib-compile-schemas --targetdir=${uuid}/schemas ${uuid}/schemas + glib-compile-schemas --targetdir="system-monitor@paradoxxx.zero.gmail.com/schemas" "system-monitor@paradoxxx.zero.gmail.com/schemas" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "system-monitor@paradoxxx.zero.gmail.com" $out/share/gnome-shell/extensions runHook postInstall ''; - uuid = "system-monitor@paradoxxx.zero.gmail.com"; + passthru.extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; meta = with lib; { description = "Display system informations in gnome shell status bar"; diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index 68d07e2d142..66df4cf6f25 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { taskwarrior ]; - uuid = "taskwhisperer-extension@infinicode.de"; + passthru.extensionUuid = "taskwhisperer-extension@infinicode.de"; makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix index c1ca77d9d73..78a5a60dba3 100644 --- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid}/ + mkdir -p "$out/share/gnome-shell/extensions/tilingnome@rliang.github.com" + cp -r * "$out/share/gnome-shell/extensions/tilingnome@rliang.github.com/" runHook postInstall ''; - uuid = "tilingnome@rliang.github.com"; + passthru.extensionUuid = "tilingnome@rliang.github.com"; meta = with lib; { description = "Tiling window management for GNOME Shell"; diff --git a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix index 084548e1a10..eedfeb098c0 100644 --- a/pkgs/desktops/gnome/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL_PATH=$(out)/share/gnome-shell/extensions" ]; - uuid = "TopIcons@phocean.net"; + passthru.extensionUuid = "TopIcons@phocean.net"; meta = with lib; { description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 228cb706150..8796305f046 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8="; }; - uuid = "unite@hardpixel.eu"; + passthru.extensionUuid = "unite@hardpixel.eu"; nativeBuildInputs = [ glib ]; @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas + glib-compile-schemas --strict --targetdir="unite@hardpixel.eu/schemas/" "unite@hardpixel.eu/schemas" runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "unite@hardpixel.eu" $out/share/gnome-shell/extensions runHook postInstall ''; diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index 0e71345bb8a..d42a4d9541b 100644 --- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { dontBuild = true; - uuid = "window-corner-preview@fabiomereu.it"; + passthru.extensionUuid = "window-corner-preview@fabiomereu.it"; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions + cp -r "window-corner-preview@fabiomereu.it" $out/share/gnome-shell/extensions runHook postInstall ''; From f96ee10c8882780f85756d7c8cdf5c83c4156037 Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Tue, 13 Jul 2021 21:26:58 -0400 Subject: [PATCH 161/188] open-vm-tools: 11.2.5 -> 11.3.0 (#129978) Co-authored-by: Sandro --- nixos/modules/virtualisation/vmware-guest.nix | 2 + .../virtualization/open-vm-tools/default.nix | 51 ++++++++----------- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index 962a9059ea4..9465a8d6800 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -56,5 +56,7 @@ in ${open-vm-tools}/bin/vmware-user-suid-wrapper ''; }; + + services.udev.packages = [ open-vm-tools ]; }; } diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 74845ac190a..74d87a1b740 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fetchpatch, - fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, - libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which, - withX ? true }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook +, bash, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto +, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst +, pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which +, libdrm, udev +, withX ? true +}: stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.2.5"; + version = "11.3.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "sha256-Jv+NSKw/+l+b4lfVGgCZFlcTScO/WAO/d7DtI0FAEV4="; + sha256 = "1yfffxc7drr1hyg28jcvly7jn1bm4ca76lmma5ykbmba2qqszx49"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -20,32 +22,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] + buildInputs = [ fuse glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - # Fix building with glib 2.68. Remove after next release. - # We drop AUTHORS due to conflicts when applying. - # https://github.com/vmware/open-vm-tools/pull/505 - (fetchpatch { - url = "https://github.com/vmware/open-vm-tools/commit/82931a1bcb39d5132910c7fb2ddc086c51d06662.patch"; - stripLen = 1; - excludes = [ "AUTHORS" ]; - sha256 = "0yz5hnngr5vd4416hvmh8734a9vxa18d2xd37kl7if0p9vik6zlg"; - }) - ]; - postPatch = '' - # Build bugfix for 10.1.0, stolen from Arch PKGBUILD - mkdir -p common-agent/etc/config - sed -i 's|.*common-agent/etc/config/Makefile.*|\\|' configure.ac - sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am - sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. sed 1i'#include ' -i lib/wiper/wiperPosix.c @@ -54,24 +39,28 @@ stdenv.mkDerivation rec { sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c ''; - configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ] - ++ lib.optional (!withX) "--without-x"; + configureFlags = [ + "--without-kernel-modules" + "--without-xmlsecurity" + "--with-udev-rules-dir=${placeholder "out"}/lib/udev/rules.d" + ] ++ lib.optional (!withX) "--without-x"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = builtins.toString [ - # igrone glib-2.62 deprecations - # Drop in next stable release. - "-DGLIB_DISABLE_DEPRECATION_WARNINGS" - # fix build with gcc9 "-Wno-error=address-of-packed-member" "-Wno-error=format-overflow" ]; + preConfigure = '' + mkdir -p ${placeholder "out"}/lib/udev/rules.d + ''; + postInstall = '' wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ --prefix PATH ':' "${lib.makeBinPath [ iproute2 dbus systemd which ]}" + substituteInPlace "$out/lib/udev/rules.d/99-vmware-scsi-udev.rules" --replace "/bin/sh" "${bash}/bin/sh" ''; meta = with lib; { From bffbf4617a1bee1ea3889eeb8947b9890d6af8a8 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 17:34:26 +0200 Subject: [PATCH 162/188] gnomeExtensions: integrate manually packaged extensions better with the others Their keys are now not used directly. Instead, we go the standard route of mapping to the UUID in order to apply the rename procedure. This makes sure the manual override always does the correct thing, and also gives us more consistency overall. --- .../gnome/extensions/arcmenu/default.nix | 5 +- .../gnome/extensions/caffeine/default.nix | 5 +- .../extensions/clock-override/default.nix | 5 +- .../gnome/extensions/dash-to-dock/default.nix | 5 +- .../extensions/dash-to-panel/default.nix | 5 +- pkgs/desktops/gnome/extensions/default.nix | 6 +- .../extensions/drop-down-terminal/default.nix | 5 +- .../extensions/emoji-selector/default.nix | 5 +- .../gnome/extensions/extensionRenames.nix | 22 ++++++ .../gnome/extensions/freon/default.nix | 5 +- .../gnome/extensions/gsconnect/default.nix | 5 +- .../gnome/extensions/icon-hider/default.nix | 5 +- .../gnome/extensions/impatience/default.nix | 5 +- .../gnome/extensions/manuallyPackaged.nix | 72 +++++++++---------- .../night-theme-switcher/default.nix | 5 +- .../gnome/extensions/no-title-bar/default.nix | 4 +- .../pidgin-im-integration/default.nix | 5 +- .../sound-output-device-chooser/default.nix | 5 +- .../extensions/system-monitor/default.nix | 5 +- .../extensions/taskwhisperer/default.nix | 5 +- .../gnome/extensions/tilingnome/default.nix | 5 +- .../gnome/extensions/unite/default.nix | 5 +- .../window-corner-preview/default.nix | 6 +- 23 files changed, 142 insertions(+), 58 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index a8fba029217..f9c49111f52 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - passthru.extensionUuid = "arcmenu@arcmenu.com"; + passthru = { + extensionUuid = "arcmenu@arcmenu.com"; + extensionPortalSlug = "arcmenu"; + }; meta = with lib; { description = "Application menu for GNOME Shell, designed to provide a more traditional user experience and workflow"; diff --git a/pkgs/desktops/gnome/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix index 7cb98b569b7..7ac5f916736 100644 --- a/pkgs/desktops/gnome/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0dyagnjmk91h96xr98mc177c473bqpxcv86qf6g3kyh3arwa9shs"; }; - passthru.extensionUuid = "caffeine@patapon.info"; + passthru = { + extensionPortalSlug = "caffeine"; + extensionUuid = "caffeine@patapon.info"; + }; nativeBuildInputs = [ glib gettext diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix index 9576bbf53e5..1f749574c40 100644 --- a/pkgs/desktops/gnome/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { stripRoot = false; }; - passthru.extensionUuid = "clock-override@gnomeshell.kryogenix.org"; + passthru = { + extensionUuid = "clock-override@gnomeshell.kryogenix.org"; + extensionPortalSlug = "clock-override"; + }; nativeBuildInputs = [ gettext glib ]; diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index cacce95008d..ebf15cada97 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; - passthru.extensionUuid = "dash-to-dock@micxgx.gmail.com"; + passthru = { + extensionUuid = "dash-to-dock@micxgx.gmail.com"; + extensionPortalSlug = "dash-to-dock"; + }; meta = with lib; { description = "A dock for the Gnome Shell"; diff --git a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix index 4acd8565e5e..6e8beb70a23 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - passthru.extensionUuid = "dash-to-panel@jderose9.github.com"; + passthru = { + extensionUuid = "dash-to-panel@jderose9.github.com"; + extensionPortalSlug = "dash-to-panel"; + }; meta = with lib; { description = "An icon taskbar for Gnome Shell"; diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index a4255411934..f98e2fb4e67 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -1,5 +1,6 @@ { lib , callPackage +, callPackages , config }: let @@ -60,8 +61,9 @@ in rec { gnome40Extensions = mapUuidNames (produceExtensionsList "40"); gnomeExtensions = lib.recurseIntoAttrs ( - (mapReadableNames (produceExtensionsList "40")) - // (callPackage ./manuallyPackaged.nix {}) + (mapReadableNames + (lib.attrValues (gnome40Extensions // (callPackages ./manuallyPackaged.nix {}))) + ) // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 diff --git a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index 414a67ccabd..ebcf918df10 100644 --- a/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i"; }; - passthru.extensionUuid = "drop-down-terminal@gs-extensions.zzrough.org"; + passthru = { + extensionUuid = "drop-down-terminal@gs-extensions.zzrough.org"; + extensionPortalSlug = "drop-down-terminal"; + }; patches = [ (substituteAll { diff --git a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix index a3706fbbe24..6f249bcb635 100644 --- a/pkgs/desktops/gnome/extensions/emoji-selector/default.nix +++ b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "0x60pg5nl5d73av494dg29hyfml7fbf2d03wm053vx1q8a3pxbyb"; }; - passthru.extensionUuid = "emoji-selector@maestroschan.fr"; + passthru = { + extensionUuid = "emoji-selector@maestroschan.fr"; + extensionPortalSlug = "emoji-selector"; + }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/extensions/extensionRenames.nix b/pkgs/desktops/gnome/extensions/extensionRenames.nix index 912e47a104e..9df97998891 100644 --- a/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -14,6 +14,8 @@ "lockkeys@fawtytoo" = "lock-keys-2"; + + # ############################################################################ # These are conflicts for 3.38 extensions. They will very probably come back # once more of them support 40. @@ -26,4 +28,24 @@ # That extension is broken because of https://github.com/NixOS/nixpkgs/issues/118612 #"flypie@schneegans.github.com" = null; + + + + # ############################################################################ + # Overrides for extensions that were manually packaged in the past but are gradually + # being replaced by automatic packaging where possible. + # + # The manually packaged ones: + "EasyScreenCast@iacopodeenosee.gmail.com" = "easyScreenCast"; # extensionPortalSlug is "easyscreencast" + "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = "fuzzy-app-search"; # extensionPortalSlug is "gnome-fuzzy-app-search" + "TopIcons@phocean.net" = "topicons-plus"; # extensionPortalSlug is "topicons" + "paperwm@hedning:matrix.org" = "paperwm"; # is not on extensions.gnome.org + "no-title-bar@jonaspoehler.de" = "no-title-bar"; # extensionPortalSlug is "no-title-bar-forked" + # These extensions are automatically packaged at the moment. We preserve the old attribute name + # for backwards compatibility. + "appindicatorsupport@rgcjonas.gmail.com" = "appindicator"; # extensionPortalSlug is "appindicator-support" + "unredirect@vaina.lt" = "disable-unredirect"; # extensionPortalSlug is "disable-unredirect-fullscreen-windows" + "drawOnYourScreen@abakkk.framagit.org" = "draw-on-your-screen"; # extensionPortalSlug is "draw-on-you-screen" + "timepp@zagortenay333" = "timepp"; # extensionPortalSlug is "time" + "windowIsReady_Remover@nunofarruca@gmail.com" = "window-is-ready-remover"; # extensionPortalSlug is "window-is-ready-notification-remover" } diff --git a/pkgs/desktops/gnome/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix index 5877fe6dc6c..39224e6245b 100644 --- a/pkgs/desktops/gnome/extensions/freon/default.nix +++ b/pkgs/desktops/gnome/extensions/freon/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-freon"; version = "44"; - passthru.extensionUuid = "freon@UshakovVasilii_Github.yahoo.com"; + passthru = { + extensionUuid = "freon@UshakovVasilii_Github.yahoo.com"; + extensionPortalSlug = "freon"; + }; src = fetchFromGitHub { owner = "UshakovVasilii"; diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 4eb92bf923f..6afaacc00b8 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -98,7 +98,10 @@ stdenv.mkDerivation rec { done ''; - passthru.extensionUuid = "gsconnect@andyholmes.github.io"; + passthru = { + extensionUuid = "gsconnect@andyholmes.github.io"; + extensionPortalSlug = "gsconnect"; + }; passthru = { tests = { diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix index 446c7b0e26c..b5b2ae8ec74 100644 --- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks"; }; - passthru.extensionUuid = "icon-hider@kalnitsky.org"; + passthru = { + extensionUuid = "icon-hider@kalnitsky.org"; + extensionPortalSlug = "icon-hider"; + }; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index 676bf8f053b..867534ba61d 100644 --- a/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -28,7 +28,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.extensionUuid = "impatience@gfxmonk.net"; + passthru = { + extensionUuid = "impatience@gfxmonk.net"; + extensionPortalSlug = "impatience"; + }; meta = with lib; { description = "Speed up builtin gnome-shell animations"; diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 4e30130774a..24048517a1d 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -1,39 +1,39 @@ { callPackage }: { - appindicator = callPackage ./appindicator { }; - arcmenu = callPackage ./arcmenu { }; - caffeine = callPackage ./caffeine { }; - clipboard-indicator = callPackage ./clipboard-indicator { }; - clock-override = callPackage ./clock-override { }; - dash-to-dock = callPackage ./dash-to-dock { }; - dash-to-panel = callPackage ./dash-to-panel { }; - disable-unredirect = callPackage ./disable-unredirect { }; - draw-on-your-screen = callPackage ./draw-on-your-screen { }; - drop-down-terminal = callPackage ./drop-down-terminal { }; - dynamic-panel-transparency = callPackage ./dynamic-panel-transparency { }; - easyScreenCast = callPackage ./EasyScreenCast { }; - emoji-selector = callPackage ./emoji-selector { }; - freon = callPackage ./freon { }; - fuzzy-app-search = callPackage ./fuzzy-app-search { }; - gsconnect = callPackage ./gsconnect { }; - hot-edge = callPackage ./hot-edge { }; - icon-hider = callPackage ./icon-hider { }; - impatience = callPackage ./impatience { }; - material-shell = callPackage ./material-shell { }; - mpris-indicator-button = callPackage ./mpris-indicator-button { }; - night-theme-switcher = callPackage ./night-theme-switcher { }; - no-title-bar = callPackage ./no-title-bar { }; - noannoyance = callPackage ./noannoyance { }; - paperwm = callPackage ./paperwm { }; - pidgin-im-integration = callPackage ./pidgin-im-integration { }; - sound-output-device-chooser = callPackage ./sound-output-device-chooser { }; - system-monitor = callPackage ./system-monitor { }; - taskwhisperer = callPackage ./taskwhisperer { }; - tilingnome = callPackage ./tilingnome { }; - timepp = callPackage ./timepp { }; - topicons-plus = callPackage ./topicons-plus { }; - unite = callPackage ./unite { }; - window-corner-preview = callPackage ./window-corner-preview { }; - window-is-ready-remover = callPackage ./window-is-ready-remover { }; - workspace-matrix = callPackage ./workspace-matrix { }; + "appindicatorsupport@rgcjonas.gmail.com" = callPackage ./appindicator { }; + "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; + "caffeine@patapon.info" = callPackage ./caffeine { }; + "clipboard-indicator@tudmotu.com" = callPackage ./clipboard-indicator { }; + "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; + "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; + "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; + "unredirect@vaina.lt" = callPackage ./disable-unredirect { }; + "drawOnYourScreen@abakkk.framagit.org" = callPackage ./draw-on-your-screen { }; + "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; + "dynamic-panel-transparency@rockon999.github.io" = callPackage ./dynamic-panel-transparency { }; + "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; + "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; + "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; + "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = callPackage ./fuzzy-app-search { }; + "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; + "hotedge@jonathan.jdoda.ca" = callPackage ./hot-edge { }; + "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; + "impatience@gfxmonk.net" = callPackage ./impatience { }; + "material-shell@papyelgringo" = callPackage ./material-shell { }; + "mprisindicatorbutton@JasonLG1979.github.io" = callPackage ./mpris-indicator-button { }; + "nightthemeswitcher@romainvigier.fr" = callPackage ./night-theme-switcher { }; + "noannoyance@daase.net" = callPackage ./noannoyance { }; + "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; + "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; + "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; + "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; + "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; + "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; + "tilingnome@rliang.github.com" = callPackage ./tilingnome { }; + "timepp@zagortenay333" = callPackage ./timepp { }; + "TopIcons@phocean.net" = callPackage ./topicons-plus { }; + "unite@hardpixel.eu" = callPackage ./unite { }; + "window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { }; + "windowIsReady_Remover@nunofarruca@gmail.com" = callPackage ./window-is-ready-remover { }; + "wsmatrix@martin.zurowietz.de" = callPackage ./workspace-matrix { }; } diff --git a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix index 52eef56a743..0065fed4cff 100644 --- a/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; buildInputs = [ glib gnome.gnome-shell ]; - passthru.extensionUuid = "nightthemeswitcher@romainvigier.fr"; + passthru = { + extensionUuid = "nightthemeswitcher@romainvigier.fr"; + extensionPortalSlug = "night-theme-switcher"; + }; installPhase = '' runHook preInstall diff --git a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix index 518e3f78f64..e46b49c8f6e 100644 --- a/pkgs/desktops/gnome/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; - passthru.extensionUuid = "no-title-bar@jonaspoehler.de"; + passthru = { + extensionUuid = "no-title-bar@jonaspoehler.de"; + }; meta = with lib; { description = "Integrates maximized windows with the top panel"; diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index 7f3ee00960c..92e0bfe94d7 100644 --- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.extensionUuid = "pidgin@muffinmad"; + passthru = { + extensionUuid = "pidgin@muffinmad"; + extensionPortalSlug = "pidgin-im-integration"; + }; meta = with lib; { homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index e166f8ca083..e439e5b5a50 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { dontBuild = true; - passthru.extensionUuid = "sound-output-device-chooser@kgshank.net"; + passthru = { + extensionUuid = "sound-output-device-chooser@kgshank.net"; + extensionPortalSlug = "sound-output-device-chooser"; + }; makeFlags = [ "INSTALL_DIR=${placeholder "out"}/share/gnome-shell/extensions" diff --git a/pkgs/desktops/gnome/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix index 31df563387b..2179f63c1eb 100644 --- a/pkgs/desktops/gnome/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -39,7 +39,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; + passthru = { + extensionUuid = "system-monitor@paradoxxx.zero.gmail.com"; + extensionPortalSlug = "system-monitor"; + }; meta = with lib; { description = "Display system informations in gnome shell status bar"; diff --git a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix index 66df4cf6f25..19936f6be61 100644 --- a/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { taskwarrior ]; - passthru.extensionUuid = "taskwhisperer-extension@infinicode.de"; + passthru = { + extensionUuid = "taskwhisperer-extension@infinicode.de"; + extensionPortalSlug = "taskwhisperer"; + }; makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix index 78a5a60dba3..42c6467dba8 100644 --- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -26,7 +26,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.extensionUuid = "tilingnome@rliang.github.com"; + passthru = { + extensionUuid = "tilingnome@rliang.github.com"; + extensionPortalSlug = "tilingnome"; + }; meta = with lib; { description = "Tiling window management for GNOME Shell"; diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix index 8796305f046..776139b3686 100644 --- a/pkgs/desktops/gnome/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-Ys2kWPj/FugW/LkvLAZdbj7Ufg/KShC+EX6QrjKNVH8="; }; - passthru.extensionUuid = "unite@hardpixel.eu"; + passthru = { + extensionUuid = "unite@hardpixel.eu"; + extensionPortalSlug = "unite"; + }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index d42a4d9541b..ef0e22b7abe 100644 --- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { dontBuild = true; - passthru.extensionUuid = "window-corner-preview@fabiomereu.it"; + passthru = { + extensionUuid = "window-corner-preview@fabiomereu.it"; + extensionPortalSlug = "window-corner-preview"; + }; + installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions From 5128ec5f06f89b3e3b51fceea35ace83146e86a6 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:11:12 +0200 Subject: [PATCH 163/188] gnomeExtensions.workspace-matrix: Remove manual packaging --- .../gnome/extensions/manuallyPackaged.nix | 1 - .../extensions/workspace-matrix/default.nix | 36 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/workspace-matrix/default.nix diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 24048517a1d..57f5d3612f7 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -35,5 +35,4 @@ "unite@hardpixel.eu" = callPackage ./unite { }; "window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { }; "windowIsReady_Remover@nunofarruca@gmail.com" = callPackage ./window-is-ready-remover { }; - "wsmatrix@martin.zurowietz.de" = callPackage ./workspace-matrix { }; } diff --git a/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix deleted file mode 100644 index eb1d6e7e319..00000000000 --- a/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, findutils, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-workspace-matrix"; - version = "4.0.2"; - - src = fetchFromGitHub { - owner = "mzur"; - repo = "gnome-shell-wsmatrix"; - rev = "v${version}"; - sha256 = "0dbn6b3fdd7yblk0mhsmaiqs3mwgcf3khkx1dsnlqn5hcs0a3myd"; - }; - - uuid = "wsmatrix@martin.zurowietz.de"; - - nativeBuildInputs = [ - findutils - glib - ]; - - buildFlags = "schemas"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "Arrange workspaces in a two dimensional grid with workspace thumbnails"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chkno ]; - homepage = "https://github.com/mzur/gnome-shell-wsmatrix"; - }; -} From ba3562ed09214cedf3e7855cbd4bf6b1a9673380 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:12:23 +0200 Subject: [PATCH 164/188] gnomeExtensions.window-is-ready-remover: Remove manual packaging --- .../gnome/extensions/manuallyPackaged.nix | 1 - .../window-is-ready-remover/default.nix | 28 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 57f5d3612f7..98841b73dde 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -34,5 +34,4 @@ "TopIcons@phocean.net" = callPackage ./topicons-plus { }; "unite@hardpixel.eu" = callPackage ./unite { }; "window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { }; - "windowIsReady_Remover@nunofarruca@gmail.com" = callPackage ./window-is-ready-remover { }; } diff --git a/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix deleted file mode 100644 index 3f0e9e71b57..00000000000 --- a/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-window-is-ready-remover"; - version = "1.02"; - - src = fetchFromGitHub { - owner = "nunofarruca"; - repo = "WindowIsReady_Remover"; - rev = "v${version}"; - sha256 = "1xaf95gn0if44avvkjxyf8fl29y28idn9shnrks0m9k67jcwv8ns"; - }; - - uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/ - cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "GNOME Shell extension removing window is ready notification"; - homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; - license = licenses.asl20; - }; -} From c5aa58a0156a7474b93197f5c4565a7311dd6c05 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:16:54 +0200 Subject: [PATCH 165/188] gnomeExtensions.timepp: Remove manual packaging --- .../gnome/extensions/manuallyPackaged.nix | 1 - .../gnome/extensions/timepp/default.nix | 28 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/timepp/default.nix diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 98841b73dde..487048be821 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -30,7 +30,6 @@ "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; "taskwhisperer-extension@infinicode.de" = callPackage ./taskwhisperer { }; "tilingnome@rliang.github.com" = callPackage ./tilingnome { }; - "timepp@zagortenay333" = callPackage ./timepp { }; "TopIcons@phocean.net" = callPackage ./topicons-plus { }; "unite@hardpixel.eu" = callPackage ./unite { }; "window-corner-preview@fabiomereu.it" = callPackage ./window-corner-preview { }; diff --git a/pkgs/desktops/gnome/extensions/timepp/default.nix b/pkgs/desktops/gnome/extensions/timepp/default.nix deleted file mode 100644 index cb4234a2513..00000000000 --- a/pkgs/desktops/gnome/extensions/timepp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-timepp"; - version = "unstable-2020-03-15"; - - src = fetchFromGitHub { - owner = "zagortenay333"; - repo = "timepp__gnome"; - rev = "34ae477a51267cc1e85992a80cf85a1a7b7005c1"; - sha256 = "1v0xbrp0x5dwizscxh7h984pax4n92bj8iyw3qvjk27ynpxq8ag1"; - }; - - uuid = "timepp@zagortenay333"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; - homepage = "https://github.com/zagortenay333/timepp__gnome"; - license = licenses.gpl3; - maintainers = with maintainers; [ svsdep ]; - }; -} From 33cf6530fef7481a6d77c82ac7193cbe38f32c17 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:20:29 +0200 Subject: [PATCH 166/188] gnomeExtensions.noannoyance: Remove manual packaging --- .../gnome/extensions/manuallyPackaged.nix | 1 - .../gnome/extensions/noannoyance/default.nix | 31 ------------------- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/noannoyance/default.nix diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 487048be821..70b2e3d8da9 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -22,7 +22,6 @@ "material-shell@papyelgringo" = callPackage ./material-shell { }; "mprisindicatorbutton@JasonLG1979.github.io" = callPackage ./mpris-indicator-button { }; "nightthemeswitcher@romainvigier.fr" = callPackage ./night-theme-switcher { }; - "noannoyance@daase.net" = callPackage ./noannoyance { }; "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; diff --git a/pkgs/desktops/gnome/extensions/noannoyance/default.nix b/pkgs/desktops/gnome/extensions/noannoyance/default.nix deleted file mode 100644 index 1a53e6abd55..00000000000 --- a/pkgs/desktops/gnome/extensions/noannoyance/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-noannoyance"; - version = "unstable-2021-01-17"; - - src = fetchFromGitHub { - owner = "BjoernDaase"; - repo = "noannoyance"; - rev = "f6e76916336aee2f7c4141796f3c40c870d2b347"; - sha256 = "1iy3nif8rjjcwf83fg9ds93fi7vmhliynmlwqnx036s3msmxvgs3"; - }; - - uuid = "noannoyance@daase.net"; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp metadata.json extension.js $out/share/gnome-shell/extensions/${uuid} - ''; - - meta = with lib; { - description = "Removes the 'Window is ready' notification and puts the window into focus"; - homepage = "https://github.com/BjoernDaase/noannoyance"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ tu-maurice ]; - }; -} From ee5b47ecc29ead14fdc359699b94ca41fcf449b9 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:22:35 +0200 Subject: [PATCH 167/188] gnomeExtensions.mpris-indicator-button: Remove manual packaging --- .../gnome/extensions/manuallyPackaged.nix | 1 - .../mpris-indicator-button/default.nix | 42 ------------------- 2 files changed, 43 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 70b2e3d8da9..832e25461f5 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -20,7 +20,6 @@ "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; "material-shell@papyelgringo" = callPackage ./material-shell { }; - "mprisindicatorbutton@JasonLG1979.github.io" = callPackage ./mpris-indicator-button { }; "nightthemeswitcher@romainvigier.fr" = callPackage ./night-theme-switcher { }; "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; diff --git a/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix deleted file mode 100644 index 8d9faaa89ad..00000000000 --- a/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, nix-update-script -, gnome -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-mpris-indicator-button-unstable"; - version = "2020-03-21"; - - src = fetchFromGitHub { - owner = "JasonLG1979"; - repo = "gnome-shell-extension-mpris-indicator-button"; - rev = "de54160e7d905b8c48c0fe30a437f7c51efc1aa3"; - sha256 = "0n5qlx51fxjq1nn10zhdwfy905j20sv7pwh2jc6fns757ac4pwwk"; - }; - - uuid = "mprisindicatorbutton@JasonLG1979.github.io"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - passthru = { - updateScript = nix-update-script { - attrPath = "gnomeExtensions.${pname}"; - }; - }; - - - meta = with lib; { - description = "A simple MPRIS indicator button for GNOME Shell"; - license = licenses.gpl3; - maintainers = with maintainers; [ ]; - platforms = gnome.gnome-shell.meta.platforms; - homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button"; - broken = versionOlder gnome.gnome-shell.version "3.34"; - }; -} From 9dcb9aecc1eeb1315c128efd7fc681b2c5a34838 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:23:51 +0200 Subject: [PATCH 168/188] gnomeExtensions.material-shell: Remove manual packaging --- .../gnome/extensions/manuallyPackaged.nix | 1 - .../extensions/material-shell/default.nix | 35 ------------------- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/material-shell/default.nix diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 832e25461f5..3af27180bd1 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -19,7 +19,6 @@ "hotedge@jonathan.jdoda.ca" = callPackage ./hot-edge { }; "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; - "material-shell@papyelgringo" = callPackage ./material-shell { }; "nightthemeswitcher@romainvigier.fr" = callPackage ./night-theme-switcher { }; "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; diff --git a/pkgs/desktops/gnome/extensions/material-shell/default.nix b/pkgs/desktops/gnome/extensions/material-shell/default.nix deleted file mode 100644 index 9b683c1af6b..00000000000 --- a/pkgs/desktops/gnome/extensions/material-shell/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-material-shell"; - version = "12"; - - src = fetchFromGitHub { - owner = "material-shell"; - repo = "material-shell"; - rev = version; - sha256 = "0ikrh70drwr0pqjcdz7l1ky8xllpnk7myprjd4s61nqkx9j2iz44"; - }; - - # This package has a Makefile, but it's used for building a zip for - # publication to extensions.gnome.org. Disable the build phase so - # installing doesn't build an unnecessary release. - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid}/ - runHook postInstall - ''; - - uuid = "material-shell@papyelgringo"; - - meta = with lib; { - description = "A modern desktop interface for Linux"; - license = licenses.mit; - maintainers = with maintainers; [ benley ]; - homepage = "https://github.com/material-shell/material-shell"; - platforms = gnome.gnome-shell.meta.platforms; - }; -} From 8dd60244932f43bf9237cf07efba804de837b3a7 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:25:26 +0200 Subject: [PATCH 169/188] gnomeExtensions.hot-edge: Remove manual packaging --- .../gnome/extensions/hot-edge/default.nix | 33 ------------------- .../gnome/extensions/manuallyPackaged.nix | 1 - 2 files changed, 34 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/hot-edge/default.nix diff --git a/pkgs/desktops/gnome/extensions/hot-edge/default.nix b/pkgs/desktops/gnome/extensions/hot-edge/default.nix deleted file mode 100644 index aaa5870996a..00000000000 --- a/pkgs/desktops/gnome/extensions/hot-edge/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-hot-edge"; - version = "jdoda"; - - src = fetchFromGitHub { - owner = "jdoda"; - repo = "hotedge"; - rev = "bb7f651becea5287241caf7cda246a68ab07dac8"; - sha256 = "oeTs0kRan6b5relxzhK1IKbV0Yv2d5YdvvUPJ3fM9ik="; - }; - - dontBuild = true; - - uuid = "hotedge@jonathan.jdoda.ca"; - - installPhase = '' - runHook preInstall - install -Dt $out/share/gnome-shell/extensions/${uuid} extension.js metadata.json stylesheet.css - runHook postInstall - ''; - - meta = with lib; { - description = "Replace the top-left hot corner with a bottom hot edge"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jtojnar ]; - homepage = "https://github.com/jdoda/hotedge"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 3af27180bd1..e9be2015000 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -16,7 +16,6 @@ "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com" = callPackage ./fuzzy-app-search { }; "gsconnect@andyholmes.github.io" = callPackage ./gsconnect { }; - "hotedge@jonathan.jdoda.ca" = callPackage ./hot-edge { }; "icon-hider@kalnitsky.org" = callPackage ./icon-hider { }; "impatience@gfxmonk.net" = callPackage ./impatience { }; "nightthemeswitcher@romainvigier.fr" = callPackage ./night-theme-switcher { }; From a4d668bc075ec227f7c4192b2556c9452f227f06 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:26:28 +0200 Subject: [PATCH 170/188] gnomeExtensions: Remove gtile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was never actually referenced anywhere, so technically it was never packaged … --- .../gnome/extensions/gtile/default.nix | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/gtile/default.nix diff --git a/pkgs/desktops/gnome/extensions/gtile/default.nix b/pkgs/desktops/gnome/extensions/gtile/default.nix deleted file mode 100644 index 3430dff1355..00000000000 --- a/pkgs/desktops/gnome/extensions/gtile/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-gtile"; - version = "44"; - - src = fetchFromGitHub { - owner = "gTile"; - repo = "gTile"; - rev = "V${version}"; - sha256 = "0i00psc1ky70zljd14jzr627y7nd8xwnwrh4xpajl1f6djabh12s"; - }; - - uuid = "gTile@vibou"; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r * $out/share/gnome-shell/extensions/${uuid} - - runHook postInstall - ''; - - meta = with lib; { - description = "A window tiling extension for Gnome. This is the new official home of the vibou.gTile extension."; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ mdsp ]; - platforms = platforms.linux; - homepage = "https://github.com/gTile/gTile"; - }; -} From 2e0ffbe7541cb08da321dbb9e3e088a819b49e05 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:28:47 +0200 Subject: [PATCH 171/188] gnomeExtensions.draw-on-your-screen: Remove manual packaging --- .../draw-on-your-screen/default.nix | 29 ------------------- .../gnome/extensions/manuallyPackaged.nix | 1 - 2 files changed, 30 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix diff --git a/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix deleted file mode 100644 index 90e8bffeec9..00000000000 --- a/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchgit, gettext, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-draw-on-your-screen"; - version = "10"; - - src = fetchgit { - url = "https://framagit.org/abakkk/DrawOnYourScreen/"; - rev = "v${version}"; - sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p"; - }; - - uuid = "drawOnYourScreen@abakkk.framagit.org"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r . $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "A drawing extension for GNOME Shell"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ericdallo ahuzik ]; - platforms = gnome.gnome-shell.meta.platforms; - homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index e9be2015000..7dcc32139e1 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -8,7 +8,6 @@ "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; "unredirect@vaina.lt" = callPackage ./disable-unredirect { }; - "drawOnYourScreen@abakkk.framagit.org" = callPackage ./draw-on-your-screen { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "dynamic-panel-transparency@rockon999.github.io" = callPackage ./dynamic-panel-transparency { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; From 1149365fd0c1a60ae543f85edebef1af76e2c89e Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 18:29:43 +0200 Subject: [PATCH 172/188] gnomeExtensions.disable-unredirect: Remove manual packaging --- .../extensions/disable-unredirect/default.nix | 31 ------------------- .../gnome/extensions/manuallyPackaged.nix | 1 - 2 files changed, 32 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/disable-unredirect/default.nix diff --git a/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix deleted file mode 100644 index 166ab61565f..00000000000 --- a/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-disable-unredirect"; - version = "unstable-2021-04-13"; - - src = fetchFromGitHub { - owner = "kazysmaster"; - repo = "gnome-shell-extension-disable-unredirect"; - rev = "2a4c0e6a7a7a5f1aad9907ee2cf43d0725e10c19"; - sha256 = "06hbyy20xz0bvzg0vs5w4092nyfpg372c86cdm1akcjm72m5sim9"; - }; - - uuid = "unredirect@vaina.lt"; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/gnome-shell/extensions - cp -R ${uuid} $out/share/gnome-shell/extensions/${uuid} - - runHook postInstall - ''; - - meta = with lib; { - description = "Disables unredirect fullscreen windows in gnome-shell to avoid tearing"; - license = licenses.gpl3Only; - homepage = "https://github.com/kazysmaster/gnome-shell-extension-disable-unredirect"; - maintainers = with maintainers; [ eduardosm ]; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 7dcc32139e1..97a50eb3c07 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -7,7 +7,6 @@ "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; - "unredirect@vaina.lt" = callPackage ./disable-unredirect { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "dynamic-panel-transparency@rockon999.github.io" = callPackage ./dynamic-panel-transparency { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; From 1d1a4981112bab5085752a3b96ce8e2e793d8b55 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 29 May 2021 19:05:51 +0200 Subject: [PATCH 173/188] gnomeExtensions.clipboard-indicator: Remove manual packaging --- .../clipboard-indicator/default.nix | 32 ------------------- .../gnome/extensions/manuallyPackaged.nix | 1 - 2 files changed, 33 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix diff --git a/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix deleted file mode 100644 index efdcab6a463..00000000000 --- a/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gettext, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-clipboard-indicator"; - version = "38"; - - src = fetchFromGitHub { - owner = "Tudmotu"; - repo = "gnome-shell-extension-clipboard-indicator"; - rev = "v${version}"; - sha256 = "FNrh3b6la2BuWCsriYP5gG0/KNbkFPuq/YTXTj0aJAI="; - }; - - uuid = "clipboard-indicator@tudmotu.com"; - - nativeBuildInputs = [ - gettext - glib - ]; - - makeFlags = [ - "INSTALLPATH=${placeholder "out"}/share/gnome-shell/extensions/${uuid}/" - ]; - - meta = with lib; { - description = "Adds a clipboard indicator to the top panel and saves clipboard history"; - license = licenses.mit; - maintainers = with maintainers; [ jonafato ]; - platforms = platforms.linux; - homepage = "https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 97a50eb3c07..4d88e5bf940 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -3,7 +3,6 @@ "appindicatorsupport@rgcjonas.gmail.com" = callPackage ./appindicator { }; "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; "caffeine@patapon.info" = callPackage ./caffeine { }; - "clipboard-indicator@tudmotu.com" = callPackage ./clipboard-indicator { }; "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; From e7d7df799f50c968df48e8b29a4417fa2ca5f3a9 Mon Sep 17 00:00:00 2001 From: piegames Date: Mon, 7 Jun 2021 19:47:51 +0200 Subject: [PATCH 174/188] gnomeExtensions.dynamic-panel-transparency: Remove manual packaging --- .../dynamic-panel-transparency/default.nix | 39 ------------------- .../gnome/extensions/manuallyPackaged.nix | 1 - 2 files changed, 40 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix diff --git a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix deleted file mode 100644 index ae33885fca3..00000000000 --- a/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome, glib }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-dynamic-panel-transparency"; - version = "unstable-2021-03-04"; - - src = fetchFromGitHub { - owner = "ewlsh"; - repo = "dynamic-panel-transparency"; - rev = "f9e720e98e40c7a2d87928d09a7313c9ef2e832c"; - sha256 = "0njykxjiwlcmk0q8bsgqaznsryaw43fspfs6rzsjjz5p0xaq04nw"; - }; - - uuid = "dynamic-panel-transparency@rockon999.github.io"; - passthru.extensionUuid = uuid; - - nativeBuildInputs = [ glib ]; - - buildPhase = '' - runHook preBuild - glib-compile-schemas --strict --targetdir=${uuid}/schemas/ ${uuid}/schemas - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp -r ${uuid} $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "This extension fades your top panel to nothingness when there are no maximized windows present"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ rhoriguchi ]; - homepage = "https://github.com/ewlsh/dynamic-panel-transparency"; - broken = versionOlder gnome.gnome-shell.version "3.36"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 4d88e5bf940..073c1d32e2f 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -7,7 +7,6 @@ "dash-to-dock@micxgx.gmail.com" = callPackage ./dash-to-dock { }; "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; - "dynamic-panel-transparency@rockon999.github.io" = callPackage ./dynamic-panel-transparency { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; "emoji-selector@maestroschan.fr" = callPackage ./emoji-selector { }; "freon@UshakovVasilii_Github.yahoo.com" = callPackage ./freon { }; From 3c85c0c97577d987f07eeffa7fb7abd992393d6a Mon Sep 17 00:00:00 2001 From: piegames Date: Mon, 7 Jun 2021 21:48:49 +0200 Subject: [PATCH 175/188] gnomeExtensions.appindicator: Remove manual packaging --- .../gnome/extensions/appindicator/default.nix | 36 ------------------- .../gnome/extensions/manuallyPackaged.nix | 1 - 2 files changed, 37 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/appindicator/default.nix diff --git a/pkgs/desktops/gnome/extensions/appindicator/default.nix b/pkgs/desktops/gnome/extensions/appindicator/default.nix deleted file mode 100644 index d4fd6cb0845..00000000000 --- a/pkgs/desktops/gnome/extensions/appindicator/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, gnome }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-appindicator"; - version = "37"; - - src = fetchFromGitHub { - owner = "Ubuntu"; - repo = "gnome-shell-extension-appindicator"; - rev = "v${version}"; - sha256 = "1yss91n94laakzhym409iyjs5gwhln2pkq0zrdrsxc3z70zlslxl"; - }; - - # This package has a Makefile, but it's used for building a zip for - # publication to extensions.gnome.org. Disable the build phase so - # installing doesn't build an unnecessary release. - dontBuild = true; - - passthru.extensionUuid = "appindicatorsupport@rgcjonas.gmail.com"; - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions/${uuid} - cp *.js $out/share/gnome-shell/extensions/${uuid} - cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid} - cp metadata.json $out/share/gnome-shell/extensions/${uuid} - runHook postInstall - ''; - - meta = with lib; { - description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato ]; - platforms = gnome.gnome-shell.meta.platforms; - homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator"; - }; -} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 073c1d32e2f..53395c5c861 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -1,6 +1,5 @@ { callPackage }: { - "appindicatorsupport@rgcjonas.gmail.com" = callPackage ./appindicator { }; "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; "caffeine@patapon.info" = callPackage ./caffeine { }; "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; From 388a4ef42345775a85d823597dadf25d4f0a5209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 14 Jul 2021 02:41:39 +0200 Subject: [PATCH 176/188] treewide: convert all links git.archlinux.org to github.com/archlinux/svntogit-* --- pkgs/applications/editors/vim/default.nix | 2 +- pkgs/applications/graphics/hugin/default.nix | 2 +- pkgs/applications/office/abiword/default.nix | 2 +- pkgs/applications/science/astronomy/xplanet/default.nix | 4 ++-- pkgs/applications/window-managers/openbox/default.nix | 2 +- pkgs/development/libraries/gcc/libstdc++/5.nix | 4 ++-- pkgs/development/libraries/mp4v2/default.nix | 2 +- pkgs/development/libraries/qt-5/5.12/default.nix | 2 +- pkgs/development/libraries/science/math/lcalc/default.nix | 2 +- pkgs/os-specific/linux/g15daemon/default.nix | 2 +- pkgs/os-specific/linux/syslinux/default.nix | 4 ++-- pkgs/servers/x11/xorg/overrides.nix | 2 +- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/misc/xvfb-run/default.nix | 3 +-- pkgs/tools/networking/vde2/default.nix | 2 +- pkgs/tools/networking/zssh/default.nix | 2 +- 16 files changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 48e1369c8c3..2cda81c2588 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -2,7 +2,7 @@ # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/68f6d131750aa778807119e03eed70286a17b1cb/trunk/archlinux.vim"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; } # apple frameworks diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index f7f1e17be22..a83070e5e6b 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ # Fixes build with exiv2 0.27.1 (fetchpatch { - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/hugin-exiv2-0.27.1.patch?h=packages/hugin"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0467d8ba362b9c196e4c1dc4be7de0c1b336335b/hugin/trunk/hugin-exiv2-0.27.1.patch"; sha256 = "1yxvlpvrhyrfd2w6kwx1w3mncsvlzdhp0w7xchy8q6kc2kd5nf7r"; }) ]; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index e32502749dc..0554713feb8 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # default and this patch can be removed. # https://github.com/NixOS/nixpkgs/issues/38506 (fetchurl { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/enchant-2.1.patch?h=packages/abiword"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/d3ff951d3c7249927e7113b3de1653031db24596/abiword/trunk/enchant-2.1.patch"; sha256 = "444dc2aadea3c80310a509b690097541573f6d2652c573d04da66a0f385fcfb2"; }) ]; diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index 82331a9496d..8c0cb2be32b 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "giflib6.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/giflib6.patch?h=packages/xplanet&id=ce6f25eb369dc011161613894f01fd0a6ae85a09"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/ce6f25eb369dc011161613894f01fd0a6ae85a09/trunk/giflib6.patch"; sha256 = "173l0xkqq0v2bpaff7hhwc7y2aw5cclqw8988k1nalhyfbrjb8bl"; }) (fetchpatch { name = "xplanet-c++11.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/xplanet-c++11.patch?h=packages/xplanet&id=ce6f25eb369dc011161613894f01fd0a6ae85a09"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/ce6f25eb369dc011161613894f01fd0a6ae85a09/trunk/xplanet-c++11.patch"; sha256 = "0vldai78ixw49bxch774pps6pq4sp0p33qvkvxywcz7p8kzpg8q2"; }) ]; diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index 5e3392b2002..093b6d1884c 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Use fetchurl to avoid "fetchpatch: ignores file renames" #32084 # This patch adds python3 support (fetchurl { - url = "https://git.archlinux.org/svntogit/community.git/plain/openbox/trunk/py3.patch?id=90cb57ef53d952bb6ab4c33a184f815bbe1791c0"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/90cb57ef53d952bb6ab4c33a184f815bbe1791c0/openbox/trunk/py3.patch"; sha256 = "1ks99awlkhd5ph9kz94s1r6m1bfvh42g4rmxd14dyg5b421p1ljc"; }) ]; diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index b123f799cca..f963ae31e5c 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { ./no-sys-dirs.patch (fetchpatch { name = "siginfo.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/siginfo.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/e36ee8ed9bb5942db14cf6249a2ead14974a2bfa/trunk/siginfo.patch"; sha256 = "15zldbm33yba293dgrgsbv3j332hkc3iqpyc8fa7zl42mh9qk22j"; extraPrefix = ""; }) (fetchpatch { name = "gcc-3.4.3-no_multilib_amd64.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/gcc-3.4.3-no_multilib_amd64.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/e36ee8ed9bb5942db14cf6249a2ead14974a2bfa/trunk/gcc-3.4.3-no_multilib_amd64.patch"; sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm"; extraPrefix = ""; }) diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index 7a6bbb55202..fe0049c1f38 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { (fetchurl { # 2020-06-19: NOTE: # Fix build with C++11 # Close when https://github.com/TechSmith/mp4v2/pull/36 merged/closed. - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libmp4v2-c++11.patch?id=203f5a72bc97ffe089b424c47b07dd9eaea35713"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/203f5a72bc97ffe089b424c47b07dd9eaea35713/trunk/libmp4v2-c++11.patch"; sha256 = "0sbn0il7lmk77yrjyb4f0a3z3h8gsmdkscvz5n9hmrrrhrwf672w"; }) ] ++ lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index fcb6297f519..77b8c3f525a 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -85,7 +85,7 @@ let # https://bugreports.qt.io/browse/QTBUG-77037 (fetchpatch { name = "fix-build-with-pulseaudio-13.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/fc77d6b3d5ec74e421b58f199efceb2593cbf951/trunk/qtbug-77037-workaround.patch"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 95034c3637a..3f0cf45062f 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { (fetchpatch { name = "c++11.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/3607b97df5a8c231191115b0cb5c62426b339e71/trunk/lcalc-c++11.patch"; sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; }) ] ++ lib.optional stdenv.isDarwin diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix index c670fc86d13..118a17c4c8f 100644 --- a/pkgs/os-specific/linux/g15daemon/default.nix +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { patches = let patch = fname: sha256: fetchurl rec { - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/${pname}-${version}-${fname}.patch?h=packages/${pname}"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/c0b0b6d4d6d7b79eca68123b20e0c9fb82e1c6e1/g15daemon/trunk/${pname}-${version}-${fname}.patch"; name = "${fname}.patch"; inherit sha256; }; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 0f69cb13fcd..4ca7f50b7d1 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -23,12 +23,12 @@ stdenv.mkDerivation { sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni"; }) (fetchurl { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/821c3da473d1399d930d5b4a086e46a4179eaa45/trunk/0005-gnu-efi-version-compatibility.patch"; name = "0005-gnu-efi-version-compatibility.patch"; sha256 = "1mz2idg8cwn0mvd3jixxynhkn7rhmi5fp8cc8zznh5f0ysfra446"; }) (fetchurl { - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0025-reproducible-build.patch?id=821c3da473d1399d930d5b4a086e46a4179eaa45"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/821c3da473d1399d930d5b4a086e46a4179eaa45/trunk/0025-reproducible-build.patch"; name = "0025-reproducible-build.patch"; sha256 = "0qk6wc6z3648828y3961pn4pi7xhd20a6fqn6z1mnj22bbvzcxls"; }) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f2f15b3c530..a52e1a7b0a5 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -782,7 +782,7 @@ self: super: # don't unset DBUS_SESSION_BUS_ADDRESS in startx (fetchpatch { name = "dont-unset-DBUS_SESSION_BUS_ADDRESS.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/fs46369.patch?h=packages/xorg-xinit&id=40f3ac0a31336d871c76065270d3f10e922d06f3"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/40f3ac0a31336d871c76065270d3f10e922d06f3/trunk/fs46369.patch"; sha256 = "18kb88i3s9nbq2jxl7l2hyj6p56c993hivk8mzxg811iqbbawkp7"; }) ]; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index ac6481cc625..3d7608ac094 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = "https://git.archlinux.org/svntogit/community.git/plain/cuneiform/trunk/build-fix.patch?id=a2ec92f05de006b56d16ac6a6c370d54a554861a"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/a2ec92f05de006b56d16ac6a6c370d54a554861a/cuneiform/trunk/build-fix.patch"; sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj"; }) ]; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 2e506376851..06e886e4d04 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -3,8 +3,7 @@ let xvfb-run = fetchurl { name = "xvfb-run"; - # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/9cb733cefa92af3fca608fb051d5251160c9bbff/trunk/xvfb-run"; sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index bc3be912265..58fae3f9f15 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # Fix build with openssl 1.1.0 (fetchpatch { name = "vde_cryptcab-compile-against-openssl-1.1.0.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch?h=packages/vde2&id=15b11be49997fa94b603e366064690b7cc6bce61"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b11be49997fa94b603e366064690b7cc6bce61/trunk/vde_cryptcab-compile-against-openssl-1.1.0.patch"; sha256 = "07z1yabwigq35mkwzqa934n7vjnjlqz5xfzq8cfj87lgyjjp00qi"; }) ] ++ lib.optional stdenv.hostPlatform.isMusl [ diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 07b7a8441b8..d512b03dbea 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { # Cargo-culted from Arch, returns “out of pty's” without it (fetchurl { name = "fix_use_ptmx_on_arch.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0a7c92543f9309856d02e31196f06d7c3eaa8b67/trunk/fix_use_ptmx_on_arch.patch"; sha256 = "12daw9wpy58ql882zww945wk9cg2adwp8qsr5rvazx0xq0qawgbr"; }) ]; From 4d581620e2c76f3393a8a96d8509e054e64a6a1f Mon Sep 17 00:00:00 2001 From: upkeep-bot Date: Wed, 14 Jul 2021 00:26:19 +0000 Subject: [PATCH 177/188] vscodium: 1.58.0 -> 1.58.1 --- pkgs/applications/editors/vscode/vscodium.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 62ce4aed9ea..c9da010505e 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "12pghdkkaz4rc174b7hxkq801hjb3l0cimpm7rzbwxxpi3dkdmbl"; - x86_64-darwin = "00gs6r3qgf313fml02953dw96in4rcjddsrxrzk17i3ik1rb1ipn"; - aarch64-linux = "0pbm474630j4l4rsh3v7i535xawb2xgiyg995f55mhgza9cs7lvl"; - armv7l-linux = "1cgda38drpb35q036vqsidbvhwbmqchvyxj6qzvl2ibn5s5bdwpm"; + x86_64-linux = "16hzhmsh9nv2brpzx8wnz08sanf0v6f3ln5hqgzxck0pafbzqyl5"; + x86_64-darwin = "1a44fm5fx0zqlfr344mvc0m9hbd0vxd6s489pmh8x7m7q3sadi7j"; + aarch64-linux = "082gjmnlvk12vkcxbpsd4xfgs38qbxkfawq9kyl3p7i8y6anrd4i"; + armv7l-linux = "0zs66qmlq65166s34qjr6gppxvl5hyz1mjwxc97mki2c6y61fp28"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.58.0"; + version = "1.58.1"; pname = "vscodium"; executableName = "codium"; From b7a7969c1a009abe37528752d814af2018eafca8 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Wed, 14 Jul 2021 09:42:01 +0800 Subject: [PATCH 178/188] layan-gtk-theme: init at 2021-06-30 (#130064) Co-authored-by: Sandro --- pkgs/data/themes/layan-gtk-theme/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/data/themes/layan-gtk-theme/default.nix diff --git a/pkgs/data/themes/layan-gtk-theme/default.nix b/pkgs/data/themes/layan-gtk-theme/default.nix new file mode 100644 index 00000000000..7892fbe9f31 --- /dev/null +++ b/pkgs/data/themes/layan-gtk-theme/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, lib +, gtk-engine-murrine +}: + +stdenv.mkDerivation rec { + pname = "layan-gtk-theme"; + version = "2021-06-30"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "sha256-FI8+AJlcPHGOzxN6HUKLtPGLe8JTfTQ9Az9NsvVUK7g="; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + unset name && ./install.sh -d $out/share/themes + runHook postInstall + ''; + + meta = with lib; { + description = "A flat Material Design theme for GTK 3, GTK 2 and Gnome-Shell."; + homepage = "https://github.com/vinceliuice/Layan-gtk-theme"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = [ maintainers.vanilla ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e86a7e9f83c..f1d0b1cfdcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22310,6 +22310,8 @@ in kreative-square-fonts = callPackage ../data/fonts/kreative-square-fonts { }; + layan-gtk-theme = callPackage ../data/themes/layan-gtk-theme { }; + lato = callPackage ../data/fonts/lato {}; league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; From e14c24593420bb9057e7f38b40d17137eaeff9dd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 11 Jul 2021 01:33:17 +0200 Subject: [PATCH 179/188] flake/lib.nixosSystem: add `_file`-keys for error-location When inlining a module with a problematic declaration, you usually get get a not-so helpful error like this: $ cat flake.nix { description = "A very basic flake"; inputs.nixpkgs.url = path:../.; outputs = { self, nixpkgs }: { nixosConfigurations.foo = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ({ lib, ... }: { services.wrong = 2; }) { services.nginx.enable = true; } ]; }; }; } $ nixos-rebuild build --flake .#foo -L error: The option `services.wrong' does not exist. Definition values: - In `': 2 While it's certainly possible to guess where this comes from, this is IMHO fairly confusing for beginners (and kinda reminds me of the infamous "infinite recursion at undefined position"-error). The module-system determines the position of a declaration using the `_file`-key: this is either `toString path` if `path` is e.g. a value from `imports = [ ./foo.nix ]` or the file used as `NIXOS_CONFIG` in ``. However such a mechanism doesn't exist (yet) for inlined flake modules, so I tried to implement this in a fairly basic way: * For non-path declarations, the position of `modules` inside the `flake.nix` which declares these modules is determined by doing `unsafeGetAttrPos` on the `modules`-argument of `lib.nixosSystem`. So the `flake.nix` from above would now raise the following error-message: $ nixos-rebuild build --flake .#foo -L error: The option `services.wrong' does not exist. Definition values: - In `/nix/store/4vi3nhqjyma73ygs4f93q38qjkhkaxw8-source/flake.nix': 2 Co-authored-by: Cole Helbling Co-authored-by: Silvan Mosberger Co-authored-by: Robert Hensing --- flake.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 5237cae86f1..92c0d97c4a2 100644 --- a/flake.nix +++ b/flake.nix @@ -47,8 +47,20 @@ }) ]; })).config; + + moduleDeclarationFile = + (builtins.unsafeGetAttrPos "modules" args).file; + + # Add the invoking file as error message location for modules + # that don't have their own locations; presumably inline modules. + addModuleDeclarationFile = + m: { + _file = moduleDeclarationFile; + imports = [ m ]; + }; + in - modules ++ [ + map addModuleDeclarationFile modules ++ [ { system.nixos.versionSuffix = ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; From a14985cd2844187bd3441d1179abe5f478caedd8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 25 May 2021 21:10:54 +0300 Subject: [PATCH 180/188] ipxe: allow building on aarch64 --- pkgs/tools/misc/ipxe/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 641e86c22c4..289f87dc784 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, perl, cdrkit, syslinux, xz, openssl, gnu-efi, mtools +{ stdenv, lib, fetchFromGitHub, perl, cdrkit, xz, openssl, gnu-efi, mtools +, syslinux ? null , embedScript ? null , additionalTargets ? {} }: @@ -8,12 +9,20 @@ let "bin-x86_64-efi/ipxe.efi" = null; "bin-x86_64-efi/ipxe.efirom" = null; "bin-x86_64-efi/ipxe.usb" = "ipxe-efi.usb"; - } // { + } // lib.optionalAttrs (stdenv.isi686 || stdenv.isx86_64) { "bin/ipxe.dsk" = null; "bin/ipxe.usb" = null; "bin/ipxe.iso" = null; "bin/ipxe.lkrn" = null; "bin/undionly.kpxe" = null; + } // lib.optionalAttrs stdenv.isAarch32 { + "bin-arm32-efi/ipxe.efi" = null; + "bin-arm32-efi/ipxe.efirom" = null; + "bin-arm32-efi/ipxe.usb" = "ipxe-efi.usb"; + } // lib.optionalAttrs stdenv.isAarch64 { + "bin-arm64-efi/ipxe.efi" = null; + "bin-arm64-efi/ipxe.efirom" = null; + "bin-arm64-efi/ipxe.usb" = "ipxe-efi.usb"; }; in @@ -21,7 +30,7 @@ stdenv.mkDerivation rec { pname = "ipxe"; version = "1.21.1"; - nativeBuildInputs = [ perl cdrkit syslinux xz openssl gnu-efi mtools ]; + nativeBuildInputs = [ perl cdrkit xz openssl gnu-efi mtools ] ++ lib.optional (stdenv.isi686 || stdenv.isx86_64) syslinux; src = fetchFromGitHub { owner = "ipxe"; @@ -37,6 +46,7 @@ stdenv.mkDerivation rec { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + ] ++ lib.optionals (stdenv.isi686 || stdenv.isx86_64) [ "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" "LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; @@ -80,6 +90,6 @@ stdenv.mkDerivation rec { homepage = "https://ipxe.org/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } From 2668c7588635db4abf51d68ba25bd00dcc78b8df Mon Sep 17 00:00:00 2001 From: misuzu Date: Wed, 14 Jul 2021 12:46:41 +0300 Subject: [PATCH 181/188] ipxe: fix installPhase and license --- pkgs/tools/misc/ipxe/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 289f87dc784..4be0b3d417e 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { buildFlags = lib.attrNames targets; installPhase = '' + runHook preInstall + mkdir -p $out ${lib.concatStringsSep "\n" (lib.mapAttrsToList (from: to: if to == null @@ -81,6 +83,8 @@ stdenv.mkDerivation rec { # Some PXE constellations especially with dnsmasq are looking for the file with .0 ending # let's provide it as a symlink to be compatible in this case. ln -s undionly.kpxe $out/undionly.kpxe.0 + + runHook postInstall ''; enableParallelBuilding = true; @@ -88,7 +92,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Network boot firmware"; homepage = "https://ipxe.org/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; From 702a1c23a46bfe7f1463f4c51a9121cb7bf8d441 Mon Sep 17 00:00:00 2001 From: misuzu Date: Tue, 25 May 2021 21:12:46 +0300 Subject: [PATCH 182/188] nixos/test-driver: allow overriding qemu binary in create_startcommand --- nixos/lib/test-driver/test-driver.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 7f4dd5963c9..15eaba88476 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -292,7 +292,12 @@ class Machine: net_frontend += "," + args["netFrontendArgs"] start_command = ( - "qemu-kvm -m 384 " + net_backend + " " + net_frontend + " $QEMU_OPTS " + args.get("qemuBinary", "qemu-kvm") + + " -m 384 " + + net_backend + + " " + + net_frontend + + " $QEMU_OPTS " ) if "hda" in args: From 930daac3457de208e032f684c461c9354457055b Mon Sep 17 00:00:00 2001 From: misuzu Date: Tue, 25 May 2021 21:13:29 +0300 Subject: [PATCH 183/188] nixos/boot: test on aarch64 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/boot.nix | 42 +++++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2e4913dca47..76e5077f42d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -43,7 +43,7 @@ in bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; - boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 + boot = handleTestOn ["x86_64-linux" "aarch64-linux"] ./boot.nix {}; boot-stage1 = handleTest ./boot-stage1.nix {}; borgbackup = handleTest ./borgbackup.nix {}; botamusique = handleTest ./botamusique.nix {}; diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index c5040f3b31f..bdae6341ec9 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -4,6 +4,7 @@ }: with import ../lib/testing-python.nix { inherit system pkgs; }; +with import ../lib/qemu-flags.nix { inherit pkgs; }; with pkgs.lib; let @@ -21,7 +22,10 @@ let makeBootTest = name: extraConfig: let - machineConfig = pythonDict ({ qemuFlags = "-m 768"; } // extraConfig); + machineConfig = pythonDict ({ + qemuBinary = qemuBinary pkgs.qemu_test; + qemuFlags = "-m 768"; + } // extraConfig); in makeTest { inherit iso; @@ -61,6 +65,7 @@ let ]; }; machineConfig = pythonDict ({ + qemuBinary = qemuBinary pkgs.qemu_test; qemuFlags = "-boot order=n -m 2000"; netBackendArgs = "tftp=${ipxeBootDir},bootfile=netboot.ipxe"; } // extraConfig); @@ -75,8 +80,27 @@ let machine.shutdown() ''; }; + uefiBinary = { + x86_64-linux = "${pkgs.OVMF.fd}/FV/OVMF.fd"; + aarch64-linux = "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd"; + }.${pkgs.stdenv.hostPlatform.system}; in { + uefiCdrom = makeBootTest "uefi-cdrom" { + cdrom = "${iso}/iso/${iso.isoName}"; + bios = uefiBinary; + }; + uefiUsb = makeBootTest "uefi-usb" { + usb = "${iso}/iso/${iso.isoName}"; + bios = uefiBinary; + }; + + uefiNetboot = makeNetbootTest "uefi" { + bios = uefiBinary; + # Custom ROM is needed for EFI PXE boot. I failed to understand exactly why, because QEMU should still use iPXE for EFI. + netFrontendArgs = "romfile=${pkgs.ipxe}/ipxe.efirom"; + }; +} // optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-linux") { biosCdrom = makeBootTest "bios-cdrom" { cdrom = "${iso}/iso/${iso.isoName}"; }; @@ -85,21 +109,5 @@ in { usb = "${iso}/iso/${iso.isoName}"; }; - uefiCdrom = makeBootTest "uefi-cdrom" { - cdrom = "${iso}/iso/${iso.isoName}"; - bios = "${pkgs.OVMF.fd}/FV/OVMF.fd"; - }; - - uefiUsb = makeBootTest "uefi-usb" { - usb = "${iso}/iso/${iso.isoName}"; - bios = "${pkgs.OVMF.fd}/FV/OVMF.fd"; - }; - biosNetboot = makeNetbootTest "bios" {}; - - uefiNetboot = makeNetbootTest "uefi" { - bios = "${pkgs.OVMF.fd}/FV/OVMF.fd"; - # Custom ROM is needed for EFI PXE boot. I failed to understand exactly why, because QEMU should still use iPXE for EFI. - netFrontendArgs = "romfile=${pkgs.ipxe}/ipxe.efirom"; - }; } From 86bb12901154e2b012aa9b1dc68e5e3608b22ba6 Mon Sep 17 00:00:00 2001 From: Lucas Ransan Date: Wed, 14 Jul 2021 12:45:21 +0200 Subject: [PATCH 184/188] glfw: add version with wayland support (#129367) --- pkgs/development/libraries/glfw/3.x.nix | 24 +++++++++++++++--- pkgs/development/libraries/glfw/wayland.patch | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/glfw/wayland.patch diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 37c15225869..f9089384a8a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub, cmake , libGL, libXrandr, libXinerama, libXcursor, libX11, libXi, libXext , Cocoa, Kernel, fixDarwinDylibNames +, waylandSupport ? false, extra-cmake-modules, wayland +, wayland-protocols, libxkbcommon }: stdenv.mkDerivation rec { @@ -14,20 +16,34 @@ stdenv.mkDerivation rec { sha256 = "sha256-BP4wxjgm0x0E68tNz5eudkVUyBnXkQlP7LY3ppZunhw="; }; + patches = lib.optional waylandSupport ./wayland.patch; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames + ++ lib.optional waylandSupport extra-cmake-modules; - buildInputs = [ libX11 libXrandr libXinerama libXcursor libXi libXext ] - ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; + buildInputs = + if waylandSupport + then [ wayland wayland-protocols libxkbcommon ] + else [ libX11 libXrandr libXinerama libXcursor libXi libXext ] + ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - ] ++ lib.optional (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.isDarwin) [ "-DCMAKE_C_FLAGS=-D_GLFW_GLX_LIBRARY='\"${lib.getLib libGL}/lib/libGL.so.1\"'" + ] ++ lib.optionals waylandSupport [ + "-DGLFW_USE_WAYLAND=ON" + "-DCMAKE_C_FLAGS=-D_GLFW_EGL_LIBRARY='\"${lib.getLib libGL}/lib/libEGL.so.1\"'" ]; + postPatch = lib.optionalString waylandSupport '' + substituteInPlace src/wl_init.c \ + --replace "libxkbcommon.so.0" "${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0" + ''; + meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; homepage = "https://www.glfw.org/"; diff --git a/pkgs/development/libraries/glfw/wayland.patch b/pkgs/development/libraries/glfw/wayland.patch new file mode 100644 index 00000000000..c0c338f845b --- /dev/null +++ b/pkgs/development/libraries/glfw/wayland.patch @@ -0,0 +1,25 @@ +From 46fb81c69e8acdb70907409f98dd01e387408414 Mon Sep 17 00:00:00 2001 +From: Stone Tickle +Date: Fri, 5 Jun 2020 12:51:25 +0900 +Subject: [PATCH] set O_NONBLOCK on repeat timerfd + +--- + src/wl_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wl_init.c b/src/wl_init.c +index 49e7cc52..43569bef 100644 +--- a/src/wl_init.c ++++ b/src/wl_init.c +@@ -1166,7 +1166,7 @@ int _glfwPlatformInit(void) + + _glfw.wl.timerfd = -1; + if (_glfw.wl.seatVersion >= 4) +- _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC); ++ _glfw.wl.timerfd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC | TFD_NONBLOCK); + + if (_glfw.wl.pointer && _glfw.wl.shm) + { +-- +2.31.1 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 912f223de63..d5b934a84f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15310,6 +15310,9 @@ in }); glfw = glfw3; + glfw-wayland = glfw.override { + waylandSupport = true; + }; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; From 96a3799050f46967f4b1f0141a5965c79137c4a2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 14 Jul 2021 13:51:12 +0200 Subject: [PATCH 185/188] chromiumDev: 93.0.4557.4 -> 93.0.4573.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 33f31b15d03..a8afe2ea8af 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,15 +31,15 @@ } }, "dev": { - "version": "93.0.4557.4", - "sha256": "06397k5mkrrdrmd7icyvd1ifnmhincgw5nskgc3m436qzzifsab9", - "sha256bin64": "1q2c2dhx1yya6vhr82asf7h2zrv6kjzjv1a0zlfxkp3i6lnivgrd", + "version": "93.0.4573.0", + "sha256": "0knks0padlcqhwnjpg32d875nycznlbd228sx8qwnylg1ilrzqck", + "sha256bin64": "1kxbsdcc0gh2pllz3szmnjswxqbw9sr457pq8aafpgk9rdchikg1", "deps": { "gn": { - "version": "2021-06-25", + "version": "2021-07-08", "url": "https://gn.googlesource.com/gn", - "rev": "4d207c94eab41f09c9a8505eb47f3d2919e47943", - "sha256": "1jfgksa7rifh3ynnmd7m8xxggwxckz0jnwjaq9m5xapksb89hbn1" + "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", + "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" } } }, From 090638e14ea9c759728d23d5bf2fba97cd3a51f8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Jul 2021 14:39:44 +0200 Subject: [PATCH 186/188] borgbackup: only include pyfuse3 when not on darwin It includes the fuse package which does not eval on darwin. --- pkgs/tools/backup/borgbackup/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index ad78dcacd78..ce7887ff0fb 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -46,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { cython llfuse packaging + ] ++ lib.optionals (!stdenv.isDarwin) [ pyfuse3 ]; From 91932cbdfa2d2eb40ef3ad5aa019ef8944042aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Wed, 14 Jul 2021 15:16:07 +0200 Subject: [PATCH 187/188] sublime3/4: deprecate phases (#130169) --- pkgs/applications/editors/sublime/3/common.nix | 2 +- pkgs/applications/editors/sublime/4/common.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index e353f4f5652..b4bfc6c9ea7 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation (rec { inherit pname; version = buildVersion; - phases = [ "installPhase" ]; + dontUnpack = true; ${primaryBinary} = binaryPackage; diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index 97299bef3ac..13eabde14e6 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -100,7 +100,7 @@ in stdenv.mkDerivation (rec { inherit pname; version = buildVersion; - phases = [ "installPhase" ]; + dontUnpack = true; ${primaryBinary} = binaryPackage; From d44ce53e070fc80bd5a2e1a1067fc6a0b008da8c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 14 Jul 2021 15:00:33 +0200 Subject: [PATCH 188/188] svtplay-dl: 4.0 -> 4.1 Also add basic install check. --- pkgs/tools/misc/svtplay-dl/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 0e91b9c0e56..5514fd4e30f 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "01q03v6a2rkw49z5nbm5mghm0qmmm12pq3amsiiiv5j6m9p0fdsy"; + sha256 = "0b0q4k5aacw2nna5higr6sk5lsdn62lw2l9lccfy5s3m530banni"; }; pythonPaths = [ cryptography pyyaml requests ]; @@ -43,6 +43,13 @@ in stdenv.mkDerivation rec { sh scripts/run-tests.sh -2 ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/svtplay-dl --help > /dev/null + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://github.com/spaam/svtplay-dl"; description = "Command-line tool to download videos from svtplay.se and other sites";