From 6f17ba558f6605c7f65c3cc6cea7e3975f3f78c7 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Mon, 21 Feb 2022 15:11:10 +0000 Subject: [PATCH 01/84] nodePackages.thelounge-{plugin-closepms, theme-flat-blue, theme-flat-dark}: add override These thelounge plugins require node-pre-gyp to build --- pkgs/development/node-packages/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index a0f76135fd37..cb1f418e9be7 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -409,6 +409,18 @@ let ''; }; + thelounge-plugin-closepms = super.thelounge-plugin-closepms.override { + nativeBuildInputs = [ self.node-pre-gyp ]; + }; + + thelounge-theme-flat-blue = super.thelounge-theme-flat-blue.override { + nativeBuildInputs = [ self.node-pre-gyp ]; + }; + + thelounge-theme-flat-dark = super.thelounge-theme-flat-dark.override { + nativeBuildInputs = [ self.node-pre-gyp ]; + }; + tsun = super.tsun.overrideAttrs (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; postInstall = '' From 192646e4417c1ececb7039d01e9e531c036fc8c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Fri, 4 Mar 2022 13:48:44 +0100 Subject: [PATCH 02/84] tree-sitter-hcl: init --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../parsing/tree-sitter/grammars/tree-sitter-hcl.json | 11 +++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index eb2275d2724c..b7ae694c9181 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -34,6 +34,7 @@ tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json; tree-sitter-graphql = lib.importJSON ./tree-sitter-graphql.json; tree-sitter-haskell = lib.importJSON ./tree-sitter-haskell.json; + tree-sitter-hcl = lib.importJSON ./tree-sitter-hcl.json; tree-sitter-heex = lib.importJSON ./tree-sitter-heex.json; tree-sitter-hjson = lib.importJSON ./tree-sitter-hjson.json; tree-sitter-html = lib.importJSON ./tree-sitter-html.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json new file mode 100644 index 000000000000..24d731be7a2d --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/MichaHoffmann/tree-sitter-hcl", + "rev": "3cb7fc28247efbcb2973b97e71c78838ad98a583", + "date": "2021-09-20T21:50:41+02:00", + "path": "/nix/store/rgd0p162smlfn90ggyq3y6y4q9sgybwh-tree-sitter-hcl", + "sha256": "0hg7w3hsvxjwz1rb1izknn46msm4mkjx2cnq603lzn7i9mb1pbyr", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 246574895e3c..96b5e47316c7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -308,6 +308,10 @@ let orga = "milisims"; repo = "tree-sitter-org"; }; + "tree-sitter-hcl" = { + orga = "MichaHoffmann"; + repo = "tree-sitter-hcl"; + }; }; allGrammars = From 6bda8f8d5c8ae28db2057b190e16cb494b76b033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Sun, 13 Mar 2022 11:40:58 +0300 Subject: [PATCH 03/84] polymc: 1.0.6 -> 1.1.0 --- pkgs/games/polymc/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index 0d63a8ad5f91..0ec60d617f02 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -11,18 +11,20 @@ , libpulseaudio , qtbase , libGL +, glfw +, openal , msaClientID ? "" }: mkDerivation rec { pname = "polymc"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-KgLWbZxtxTpuFdMOJNyADYw9rMWoLgczrbSrH4qv6NI="; + sha256 = "sha256-p5vbpNZI/JiQJclEo/Pu/46qVul+3DAzaoow8jabHrI="; fetchSubmodules = true; }; @@ -36,7 +38,7 @@ mkDerivation rec { --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' ''; - cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++ + cmakeFlags = [ "-DLauncher_PORTABLE=0" ] ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; dontWrapQtApps = true; @@ -50,6 +52,8 @@ mkDerivation rec { libXxf86vm libpulseaudio libGL + glfw + openal ]; in '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 @@ -68,6 +72,7 @@ mkDerivation rec { their associated options with a simple interface. ''; platforms = platforms.linux; + changelog = "https://github.com/PolyMC/PolyMC/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; From ddf78f131265b2921bc01f1870e179abf042843b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Mar 2022 03:49:26 +0000 Subject: [PATCH 04/84] dar: 2.7.3 -> 2.7.4 --- pkgs/tools/backup/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 8b2428ebcc70..870c25462cf6 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -9,12 +9,12 @@ with lib; stdenv.mkDerivation rec { - version = "2.7.3"; + version = "2.7.4"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "sha256-w7005RdZKjP7XrO/h43yM0Lsho4MOKWLynJimD2oHwY="; + sha256 = "sha256-esti2QXoq+5bic639eG96vZOSJboMVHmD+oRNAI6ic4="; }; outputs = [ "out" "dev" ]; From 6475ad4ea8b47849b0d54cc89856ccf45964ed07 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 16 Mar 2022 13:12:20 +0300 Subject: [PATCH 05/84] libthreadar: 1.3.5 -> 1.4.0 --- .../development/libraries/libthreadar/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 5a88d4ba2056..8e94275babfd 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchurl }: - -with lib; +{ lib, stdenv, fetchurl, gcc-unwrapped }: stdenv.mkDerivation rec { - version = "1.3.5"; + version = "1.4.0"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "sha256-T5W83Ry3e1hHrnpmSLkfJDYHrVP6YDpXTqmf0WGCjB8="; + sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E="; }; outputs = [ "out" "dev" ]; + buildInputs = [ gcc-unwrapped ]; + + CXXFLAGS = [ "-std=c++14" ]; + configureFlags = [ "--disable-build-html" ]; @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { rm -r "$out"/share ''; - meta = { + meta = with lib; { homepage = "http://libthreadar.sourceforge.net/"; description = "A C++ library that provides several classes to manipulate threads"; longDescription = '' @@ -32,6 +34,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ izorkin ]; license = licenses.lgpl3; platforms = platforms.unix; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/libthreadar.x86_64-darwin }; } From 6db78a1751cc0d629c51a315b6fafc9d15ea543d Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Thu, 17 Mar 2022 22:55:37 +0100 Subject: [PATCH 06/84] crcpp: 1.1.0.0 -> 1.2.0.0 --- pkgs/development/libraries/crcpp/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/crcpp/default.nix b/pkgs/development/libraries/crcpp/default.nix index 3b9f4f942acf..69b1864702c9 100644 --- a/pkgs/development/libraries/crcpp/default.nix +++ b/pkgs/development/libraries/crcpp/default.nix @@ -1,27 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, cmake }: stdenv.mkDerivation rec { pname = "crcpp"; - version = "1.1.0.0"; + version = "1.2.0.0"; src = fetchFromGitHub { owner = "d-bahr"; repo = "CRCpp"; rev = "release-${version}"; - sha256 = "sha256-jBvh4dHSFChxNPVgkGVHy3TXSExsfwdVUfsA8XB1cn8="; + sha256 = "sha256-OY8MF8fwr6k+ZSA/p1U+9GnTFoMSnUZxKVez+mda2tA="; }; - dontBuild = true; + nativeBuildInputs = [ cmake ]; - installPhase = '' - mkdir -p $out/include - cp inc/CRC.h $out/include - ''; + doCheck = true; meta = with lib; { homepage = "https://github.com/d-bahr/CRCpp"; + changelog = "https://github.com/d-bahr/CRCpp/releases/tag/release-${version}"; description = "Easy to use and fast C++ CRC library"; platforms = platforms.all; maintainers = [ maintainers.ivar ]; From 69544f204da8d897f3ca8505eefc9a965143117f Mon Sep 17 00:00:00 2001 From: Michael Shen Date: Sat, 19 Mar 2022 19:29:23 -0400 Subject: [PATCH 07/84] protoc-gen-go-grpc: 1.1.0 -> 1.2.0 Refactor to use buildGoModule --- .../tools/protoc-gen-go-grpc/default.nix | 15 +- .../tools/protoc-gen-go-grpc/deps.nix | 333 ------------------ 2 files changed, 6 insertions(+), 342 deletions(-) delete mode 100644 pkgs/development/tools/protoc-gen-go-grpc/deps.nix diff --git a/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/pkgs/development/tools/protoc-gen-go-grpc/default.nix index 6fd939d00237..b880921e1e0c 100644 --- a/pkgs/development/tools/protoc-gen-go-grpc/default.nix +++ b/pkgs/development/tools/protoc-gen-go-grpc/default.nix @@ -1,24 +1,21 @@ -{ buildGoPackage +{ buildGoModule , fetchFromGitHub , lib }: -buildGoPackage rec { +buildGoModule rec { pname = "protoc-gen-go-grpc"; - version = "1.1.0"; - - goPackagePath = "google.golang.org/grpc"; + version = "1.2.0"; + modRoot = "cmd/protoc-gen-go-grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-go"; rev = "cmd/protoc-gen-go-grpc/v${version}"; - sha256 = "14rjb8j6fm07rnns3dpwgkzf3y6rmia6i9n7ns6cldc5mbf7nwi3"; + sha256 = "sha256-pIHMykwwyu052rqwSV5Js0+JCKCNLrFVN6XQ3xjlEOI="; }; - subPackages = [ "cmd/protoc-gen-go-grpc" ]; - - goDeps = ./deps.nix; + vendorSha256 = "sha256-yxOfgTA5IIczehpWMM1kreMqJYKgRT5HEGbJ3SeQ/Lg="; meta = with lib; { description = "The Go language implementation of gRPC. HTTP/2 based RPC"; diff --git a/pkgs/development/tools/protoc-gen-go-grpc/deps.nix b/pkgs/development/tools/protoc-gen-go-grpc/deps.nix deleted file mode 100644 index d559989244d9..000000000000 --- a/pkgs/development/tools/protoc-gen-go-grpc/deps.nix +++ /dev/null @@ -1,333 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.26.0"; - sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/cncf/udpa/go"; - fetch = { - type = "git"; - url = "https://github.com/cncf/udpa"; - rev = "5459f2c99403"; - sha256 = "0i3al193dsp91j7iywqrm6fr56y2sz51ci4vf19mb3j4n2x44gsi"; - moduleDir = "go"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.0"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "668b12f5399d"; - sha256 = "0vmhc8ii081x1k2qw4kji7wjyg6l25zp1y6qxi27wq8m341i4rzb"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.1.1"; - sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.4.2"; - sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.5.0"; - sha256 = "04pzp583p6b32y34c6jygfxarff9qjs39rarvfh6467z24sdd9k4"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "v1.1.2"; - sha256 = "1rbpfa0v0ly9sdnixcxhf79swki54ikgm1zkwwkj64p1ws66syqd"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - moduleDir = ""; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "509febef88a4"; - sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "d0100b6bd8b3"; - sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d8887717615a"; - sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438be"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "2c0ae7006135"; - sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; - moduleDir = ""; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - moduleDir = ""; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.4.0"; - sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; - moduleDir = ""; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "cb27e3aa2013"; - sha256 = "0ml73ghqcwbz7ipfk8fnxb5indcml49b5p7vp1fsyny0abyyrmxf"; - moduleDir = ""; - }; - } - { - goPackagePath = "google.golang.org/protobuf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/protobuf"; - rev = "v1.25.0"; - sha256 = "0apfl42x166dh96zfq5kvv4b4ax9xljik6bq1mnvn2240ir3mc23"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - moduleDir = ""; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - moduleDir = ""; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "ea95bdfd59fc"; - sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; - moduleDir = ""; - }; - } -] From 8ec528feefa7793ac4363ab200a7ddd6fc9c3bc6 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 20 Mar 2022 13:39:40 -0500 Subject: [PATCH 08/84] collapseos-cvm: init at 20220316 --- .../emulators/collapseos-cvm/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/applications/emulators/collapseos-cvm/default.nix diff --git a/pkgs/applications/emulators/collapseos-cvm/default.nix b/pkgs/applications/emulators/collapseos-cvm/default.nix new file mode 100644 index 000000000000..798d58467af6 --- /dev/null +++ b/pkgs/applications/emulators/collapseos-cvm/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "collapseos-cvm"; + version = "20220316"; + src = fetchurl { + url = "http://collapseos.org/files/collapseos-${version}.tar.gz"; + hash = "sha256-8bt6wj93T82K9fqtuC/mctkMCzfvW0taxv6QAKeJb5g="; + }; + buildInputs = [ ncurses ]; + sourceRoot = "cvm"; + postPatch = '' + substituteInPlace common.mk \ + --replace "-lcurses" "-lncurses" + ''; + installPhase = '' + runHook preInstall; + find . -type f -executable -exec install -Dt $out/bin {} \; + runHook postInstall; + ''; + meta = { + description = "Virtual machine for Collapse OS (Forth operating system)"; + changelog = "http://collapseos.org/files/CHANGES.txt"; + downloadPage = "http://collapseos.org/files/"; + homepage = "http://collapseos.org/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ehmry ]; + mainProgram = "cos-serial"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca05863803df..e21b7f5acd39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33155,6 +33155,8 @@ with pkgs; clpeak = callPackage ../tools/misc/clpeak { }; + collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { }; + cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; From c5e9132fbb2089e7b1d4fb5acde6ec272c8019c3 Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Mon, 21 Mar 2022 08:01:52 +0100 Subject: [PATCH 09/84] whitesur-icon-theme: 20211108 -> 20220318 --- pkgs/data/icons/whitesur-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/whitesur-icon-theme/default.nix b/pkgs/data/icons/whitesur-icon-theme/default.nix index 27465b828a61..c20a3dfe1950 100644 --- a/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "Whitesur-icon-theme"; - version = "2021-11-08"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "LZ0GLJFUUvzsPhU2sBkfy5mPpQHuPzYhbumwFKnogoA="; + sha256 = "iHLxZqcDLUo62J67MwZ72CSvsHHiI9/Jk31KwkgIPr4="; }; nativeBuildInputs = [ gtk3 ]; From fbc9c00e4f5e3fe07b90c95346c8c236d34ca5ed Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 13 Mar 2022 14:17:42 +0000 Subject: [PATCH 10/84] clash: 1.6.0 -> 1.10.0 --- pkgs/tools/networking/clash/default.nix | 22 +++++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 221a6c280b26..844335df223c 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,24 +1,36 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, testVersion, clash }: buildGoModule rec { pname = "clash"; - version = "1.6.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XG/nci8Sj0vfa/SFPpJwl1Zmt/23LfKxocejplZtS0E="; + sha256 = "sha256-cAJjW+NzG48HcDRx12LLdj8VYyIroL+GWqrUrpHOOIk="; }; - vendorSha256 = "sha256-WR1CpjEMHRkpd0/iqrOm0oVXvyQO+r6GyeP0L0zx8aA="; + vendorSha256 = "sha256-hE2MgjaVme+4vG7+rmJXfjycd3N2R6cA5iSUUTFcQXE="; - doCheck = false; + postPatch = '' + # Do not build testing suit + rm -rf ./test + ''; + + CGO_ENABLED = 0; ldflags = [ + "-s" + "-w" "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; + passthru.tests.version = testVersion { + package = clash; + command = "clash -v"; + }; + meta = with lib; { description = "A rule-based tunnel in Go"; homepage = "https://github.com/Dreamacro/clash"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26ffdb577550..eb736a328681 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2613,7 +2613,9 @@ with pkgs; clac = callPackage ../tools/misc/clac {}; - clash = callPackage ../tools/networking/clash { }; + clash = callPackage ../tools/networking/clash { + buildGoModule = buildGo118Module; + }; clasp = callPackage ../tools/misc/clasp { }; From 55d462eea9a0073ab384a085c84ad24300801188 Mon Sep 17 00:00:00 2001 From: Maciek Starzyk Date: Sun, 13 Mar 2022 21:35:50 +0100 Subject: [PATCH 11/84] miller: 5.10.3 -> 6.2.0 --- .../from_md/release-notes/rl-2205.section.xml | 10 ++++++++ .../manual/release-notes/rl-2205.section.md | 2 ++ pkgs/tools/text/miller/default.nix | 25 ++++++++++++------- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index d3a944533ab7..4702866c4d4e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -749,6 +749,16 @@ true. + + + The miller package has been upgraded from + 5.10.3 to + 6.2.0. + See + What’s + new in Miller 6. + + MultiMC has been replaced with the fork PolyMC due to upstream diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index fe30cbc3cf5d..47b450f51030 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -290,6 +290,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The options `networking.interfaces..ipv4.routes` and `networking.interfaces..ipv6.routes` are no longer ignored when using networkd instead of the default scripted network backend by setting `networking.useNetworkd` to `true`. +- The `miller` package has been upgraded from 5.10.3 to [6.2.0](https://github.com/johnkerl/miller/releases/tag/v6.2.0). See [What's new in Miller 6](https://miller.readthedocs.io/en/latest/new-in-miller-6). + - MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`. - `systemd-nspawn@.service` settings have been reverted to the default systemd behaviour. User namespaces are now activated by default. If you want to keep running nspawn containers without user namespaces you need to set `systemd.nspawn..execConfig.PrivateUsers = false` diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index f64f195db951..932b670c7494 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -1,22 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, flex, libtool }: +{ lib, fetchFromGitHub, buildGoModule }: -stdenv.mkDerivation rec { +buildGoModule rec { pname = "miller"; - - version = "5.10.3"; + version = "6.2.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; - rev = "v${version}"; - sha256 = "sha256-Mag7bIfZNdp+sM54yKp8HdH3kWjwWRfyPBGthej2jd8="; + # NOTE: The tag v6.2.0 has still old version number, as reported by + # `mlr --version`. This is the current head of the 6.2.0 branch, with + # the correct version number. + # + # For future releases please check if we can use + # `rev = "v${version}"` again. + rev = "a6dc231eefc209eb66b50b0773542c2e63501bba"; + sha256 = "sha256-hMWcf43o1wiVjHsgH+ZDBny5vlZQkKyoJN5np4gUy4w="; }; - nativeBuildInputs = [ autoreconfHook flex libtool ]; + vendorSha256 = "sha256-2tl/twzkvWB1lnvi3fIptM77zi0lmAn7Pzoe0/lW6o4="; + + subPackages = [ "cmd/mlr" ]; meta = with lib; { - description = "Like awk, sed, cut, join, and sort for name-indexed data such as CSV, TSV, and tabular JSON"; - homepage = "http://johnkerl.org/miller/"; + description = "Like awk, sed, cut, join, and sort for data formats such as CSV, TSV, JSON, JSON Lines, and positionally-indexed"; + homepage = "https://github.com/johnkerl/miller"; license = licenses.bsd2; maintainers = with maintainers; [ mstarzyk ]; platforms = platforms.all; From 214be243c9c4d2ac1ff1dafeb2a58745186c28ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Mon, 21 Mar 2022 18:18:11 +0000 Subject: [PATCH 12/84] polkadot: 0.9.17 -> 0.9.18 --- .../blockchains/polkadot/default.nix | 40 ++++++++----------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index e008832d4f07..ced8b1f857cc 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -8,15 +8,21 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-m47Y4IXGc43XLs5d6ehlD0A53BWC5kO3K2BS/xbYgl8="; + sha256 = "sha256-pjHSiVspBV15jKUFv+Uf2l3tah40l55Pv8vwDuwgwjc="; - # see the comment below on fakeGit for how this is used + # the build process of polkadot requires a .git folder in order to determine + # the git commit hash that is being built and add it to the version string. + # since having a .git folder introduces reproducibility issues to the nix + # build, we check the git commit hash after fetching the source and save it + # into a .git_commit file, and then delete the .git folder. we can then use + # this file to populate an environment variable with the commit hash, which + # is picked up by polkadot's build process. leaveDotGit = true; postFetch = '' ( cd $out; git rev-parse --short HEAD > .git_commit ) @@ -24,28 +30,14 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-JBacioy2woAfKQuK6tXU9as4DNc+3uY3F3GWksCf6WU="; + cargoSha256 = "sha256-Gc5WbayQUlsl7Fk8NyLPh2Zg2yrLl3WJqKorNZMLi94="; - nativeBuildInputs = - let - # the build process of polkadot requires a .git folder in order to determine - # the git commit hash that is being built and add it to the version string. - # since having a .git folder introduces reproducibility issues to the nix - # build, we check the git commit hash after fetching the source and save it - # into a .git_commit file, and then delete the .git folder. then we create a - # fake git command that will just return the contents of this file, which will - # be used when the polkadot build calls `git rev-parse` to fetch the commit - # hash. - fakeGit = writeShellScriptBin "git" '' - if [[ $@ = "rev-parse --short HEAD" ]]; then - cat /build/source/.git_commit - else - >&2 echo "Unknown command: $@" - exit 1 - fi - ''; - in - [ clang fakeGit ]; + nativeBuildInputs = [ clang ]; + + preBuild = '' + export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(cat .git_commit) + rm .git_commit + ''; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; PROTOC = "${protobuf}/bin/protoc"; From 3512f5b7075c11a3ac24b03b58b45b334a7d2f1b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Mar 2022 17:16:49 +0000 Subject: [PATCH 13/84] mailman-web: fix django version check removal Recent versions had increased the amount of indentation, which stopped this applying. The next version will also change the case, so I've adjusted in advance for that too. --- pkgs/servers/mail/mailman/web.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index c517cb3e4e30..adad9d219433 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # Django is depended on transitively by hyperkitty and postorius, # and mailman_web has overly restrictive version bounds on it, so # let's remove it. - sed -i '/^ Django/d' setup.cfg + sed -i '/^[[:space:]]*django/Id' setup.cfg # Upstream seems to mostly target installing on top of existing # distributions, and uses a path appropriate for that, but we are From 90e831473c469efbc7414db16f7baffdbb538bfc Mon Sep 17 00:00:00 2001 From: fleimgruber Date: Mon, 21 Mar 2022 22:44:37 +0100 Subject: [PATCH 14/84] alda: 2.0.6 -> 2.2.0 Motivated by https://github.com/alda-lang/alda/issues/411 --- pkgs/development/interpreters/alda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index ec46a5e3923d..355551d5ad0d 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "2.0.6"; + version = "2.2.0"; src_alda = fetchurl { url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda"; - sha256 = "1078hywl3gim5wfgxb0xwbk1dn80ls3i7y33n76qsdd4b0x0sn7i"; + sha256 = "0z3n81fmv3fxwgr641r6jjn1dmi5d3rw8d6r8jdfjhgpxanyi9a7"; }; src_player = fetchurl { url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player"; - sha256 = "1g7k2qnh4vcw63604z7zbvhbpn7l1v3m9mx4j4vywfq6qar1r6ck"; + sha256 = "11kji846hbn1f2w1s7rc1ing203jkamy89j1jmysajvirdpp8nha"; }; dontUnpack = true; From 6fc40c85c4709c70eb57c23701977f1bf94992a1 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Tue, 22 Mar 2022 01:56:49 +0100 Subject: [PATCH 15/84] goldberg-emu: init at 0.2.5 --- .../emulators/goldberg-emu/default.nix | 52 +++++++++++++++++++ .../dont-install-unsupported.patch | 34 ++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 88 insertions(+) create mode 100644 pkgs/applications/emulators/goldberg-emu/default.nix create mode 100644 pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix new file mode 100644 index 000000000000..4a8d3e3b85ec --- /dev/null +++ b/pkgs/applications/emulators/goldberg-emu/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, protobuf + }: + +stdenv.mkDerivation rec { + pname = "goldberg-emu"; + version = "0.2.5"; + + src = fetchFromGitLab { + owner = "mr_goldberg"; + repo = "goldberg_emulator"; + rev = version; + sha256 = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog="; + }; + + # It attempts to install windows-only libraries which we never build + patches = [ ./dont-install-unsupported.patch ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ protobuf ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/share/goldberg" + ]; + + preFixup = '' + mkdir -p $out/{bin,lib} + chmod +x $out/share/goldberg/tools/find_interfaces.sh + + ln -s $out/share/goldberg/libsteam_api.so $out/lib + ln -s $out/share/goldberg/lobby_connect/lobby_connect $out/bin + ln -s $out/share/goldberg/tools/generate_interfaces_file $out/bin + ln -s $out/share/goldberg/tools/find_interfaces.sh $out/bin/find_interfaces + ''; + + meta = with lib; { + homepage = "https://gitlab.com/Mr_Goldberg/goldberg_emulator"; + changelog = "https://gitlab.com/Mr_Goldberg/goldberg_emulator/-/releases"; + description = "Program that emulates steam online features"; + longDescription = '' + Steam emulator that emulates steam online features. Lets you play games that + use the steam multiplayer apis on a LAN without steam or an internet connection. + ''; + mainProgram = "lobby_connect"; + license = licenses.lgpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch b/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch new file mode 100644 index 000000000000..7dba7e25b970 --- /dev/null +++ b/pkgs/applications/emulators/goldberg-emu/dont-install-unsupported.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index abaace2..5e3465c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -182,10 +182,10 @@ if(WIN32) + RUNTIME DESTINATION ./ + ) + else() +- install(TARGETS +- ${LIB_STEAMCLIENT} +- LIBRARY DESTINATION ./ +- ) ++ # install(TARGETS ++ #${LIB_STEAMCLIENT} ++ #LIBRARY DESTINATION ./ ++ #) + endif() + + if(NOT WIN32) +@@ -220,10 +220,10 @@ if(WIN32) + RUNTIME DESTINATION ./ + ) + else() +- install(TARGETS +- ${LIB_STEAMNETWORKINGSOCKETS} +- LIBRARY DESTINATION ./ +- ) ++ # install(TARGETS ++ # ${LIB_STEAMNETWORKINGSOCKETS} ++ # LIBRARY DESTINATION ./ ++ # ) + endif() + + if(NOT WIN32) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b544f1e0e6b7..016a855f7c9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25835,6 +25835,8 @@ with pkgs; tuigreet = callPackage ../os-specific/linux/tuigreet { }; }; + goldberg-emu = callPackage ../applications/emulators/goldberg-emu { }; + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; From 2d4de47b3eb617fd5c9f55eda419cae7d0d23ffb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 02:15:37 +0000 Subject: [PATCH 16/84] calamares: 3.2.53 -> 3.2.54 --- pkgs/tools/misc/calamares/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index ad4158c10d50..08c7ab17e52d 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.53"; + version = "3.2.54"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-LWkgQsvP7XmupBDSAnbwewWRT+ZaALyDFw3w7iz66X0="; + sha256 = "sha256-TfdLbDsjjPC/8BoEVm4mXePxQ8KX+9jgwKqUR1lcyOk="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 3901b14926e1119b2dc46ca3349ca8783a1d0977 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Mon, 21 Mar 2022 16:49:44 -0500 Subject: [PATCH 17/84] munin: switch to python3 --- pkgs/servers/monitoring/munin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index d284c94e20af..258247c34f47 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perlPackages -, python2, ruby, jre, nettools, bc +, python3, ruby, jre, nettools, bc }: stdenv.mkDerivation rec { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { perlPackages.ListMoreUtils perlPackages.LWP perlPackages.DBDPg - python2 + python3 ruby jre # tests @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { "DESTDIR=$(out)" "PERLLIB=$(out)/${perlPackages.perl.libPrefix}" "PERL=${perlPackages.perl.outPath}/bin/perl" - "PYTHON=${python2.outPath}/bin/python" + "PYTHON=${python3.interpreter}" "RUBY=${ruby.outPath}/bin/ruby" "JAVARUN=${jre.outPath}/bin/java" "PLUGINUSER=munin" From ce32401ea16e47c8b95b32a2cd45e791a39544ec Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 22 Mar 2022 10:35:42 +0700 Subject: [PATCH 18/84] tonelib-gfx: 4.7.0 -> 4.7.5 --- pkgs/applications/audio/tonelib-gfx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index 108f39925b4f..a0b3cf2879e6 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "tonelib-gfx"; - version = "4.7.0"; + version = "4.7.5"; src = fetchurl { - url = "https://www.tonelib.net/download/0930/ToneLib-GFX-amd64.deb"; - hash = "sha256-BcbX0dz94B4mj6QeQsnuZmwXAaXH+yJjnrUPgEYVqkU="; + url = "https://www.tonelib.net/download/220214/ToneLib-GFX-amd64.deb"; + hash = "sha256-GUSyarqG1V5O6ayAedeGqmOA+UABQDpAZ+dsorh7das="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; From ca835c58ed2f595a0e1c2161d39b1093d18400ef Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 22 Mar 2022 10:41:09 +0700 Subject: [PATCH 19/84] tonelib-jam: 4.7.0 -> 4.7.5 --- pkgs/applications/audio/tonelib-jam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 1c0d51ed88be..17b3b1197f45 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "tonelib-jam"; - version = "4.7.0"; + version = "4.7.5"; src = fetchurl { - url = "https://www.tonelib.net/download/0930/ToneLib-Jam-amd64.deb"; - sha256 = "sha256-xyBDp3DQVC+nK2WGnvrfUfD+9GvwtbldXgExTMmCGw0="; + url = "https://www.tonelib.net/download/220214/ToneLib-Jam-amd64.deb"; + sha256 = "sha256-alkdoEhN58o9IGZ8sB39ctTpouMSmvgn6tbrKFneKPI="; }; nativeBuildInputs = [ From 0077def6bfec8e0ad22614dc5a1750ca68406f64 Mon Sep 17 00:00:00 2001 From: barinov274 Date: Tue, 15 Mar 2022 00:09:07 +1000 Subject: [PATCH 20/84] maintainers: add BarinovMaxim --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b708d1a294fa..1820ace8b8d5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1295,6 +1295,12 @@ githubId = 127523; name = "Herman Fries"; }; + BarinovMaxim = { + name = "Barinov Maxim"; + email = "barinov274@gmail.com"; + github = "barinov274"; + githubId = 54442153; + }; barrucadu = { email = "mike@barrucadu.co.uk"; github = "barrucadu"; From f8f8bc585299fb6670709c4bde671d09d51edc34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 04:18:54 +0000 Subject: [PATCH 21/84] docker-slim: 1.37.4 -> 1.37.5 --- pkgs/applications/virtualization/docker-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 3bc0f225de6e..a7261dac6d1f 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.37.4"; + version = "1.37.5"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "sha256-iz1V+wcrJf0grOe81kwbXPBqnvXpHnh7IMDdugaUOH0="; + sha256 = "sha256-MBs0ybBXsanNFt6R7+ZYvtCh7iHE3FtWXE9uy9tbrE4="; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; From 0e89355d0226f299e72cc2253f288bc84d4dd5b7 Mon Sep 17 00:00:00 2001 From: dan4ik <6057430gu@gmail.com> Date: Tue, 22 Mar 2022 11:39:55 +0700 Subject: [PATCH 22/84] yandex-browser: 22.1.3.856-1 -> 22.1.3.907-1 --- .../networking/browsers/yandex-browser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 7df9b6b1e7a4..dab9794277f6 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation rec { pname = "yandex-browser"; - version = "22.1.3.856-1"; + version = "22.1.3.907-1"; src = fetchurl { url = "http://repo.yandex.ru/yandex-browser/deb/pool/main/y/${pname}-beta/${pname}-beta_${version}_amd64.deb"; - sha256 = "sha256-+xxyV8dBnfu2hQ/ykkp7wFSaojhlPLVvMmZdh/hyaoE="; + sha256 = "sha256-7dbFqNzZP2CyseK0xD9zcvecIuueZfMy5KgN8gRRLEk="; }; nativeBuildInputs = [ From c5a6e4a0fcf5437bc8150c6aae5bf216a9dc622d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Mon, 21 Mar 2022 23:44:41 -0500 Subject: [PATCH 23/84] bundler: 2.3.6 -> 2.3.9 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index ecf98d75ce7d..584a13623ba3 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.3.6"; - source.sha256 = "1531z805j3gls2x0pqp2bp1vv1rf5k7ynjl4qk72h8lpm1skqk9r"; + version = "2.3.9"; + source.sha256 = "sha256-VZiKuSDP3sSoBXUPcPmwHR/GbZs47NIF+ZlXtHSZWzg="; dontPatchShebangs = true; postFixup = '' From 038daf71080d535c7e06505c373abec02d74f8b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 06:49:48 +0000 Subject: [PATCH 24/84] gore: 0.5.3 -> 0.5.4 --- pkgs/development/tools/gore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gore/default.nix b/pkgs/development/tools/gore/default.nix index 0131908d0aac..58ff4125c0d0 100644 --- a/pkgs/development/tools/gore/default.nix +++ b/pkgs/development/tools/gore/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gore"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uLU4uZaQA9u6BUQZ0Rb4Yqg/oJOZ529gIiOwmmyg05A="; + sha256 = "sha256-ipHvflsVBSjqohV/PliS0s0Nhie4nIP/HgupNH/Yui4="; }; - vendorSha256 = "sha256-/yggEibpQK9Uk116RkE5XbbJe6j4WsIC3GtKPU/P2hU="; + vendorSha256 = "sha256-HrdNWsUVz5G5tG/ZFz2z1Vt4kM12I088/6OIkRFyDl8="; doCheck = false; From 67a5c0315730d318ac2a7930810d1240591dc8b0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 22 Mar 2022 08:11:44 +0100 Subject: [PATCH 25/84] Revert "palemoon: 29.4.4 -> 30.0.0" This reverts commit ab6bd24835713a5b672e10c9f7621c5dd4854a48. The v30 milestone has been recalled temporarily: https://forum.palemoon.org/viewtopic.php?f=1&t=28044 --- .../networking/browsers/palemoon/default.nix | 30 +++++++++++-------- .../networking/browsers/palemoon/mozconfig | 4 ++- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 49dcfe0f9c48..e33ff3f3ca6e 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -6,7 +6,7 @@ , dbus , dbus-glib , desktop-file-utils -, fetchFromGitea +, fetchzip , ffmpeg , fontconfig , freetype @@ -44,15 +44,12 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "30.0.0"; + version = "29.4.4"; - src = fetchFromGitea { - domain = "repo.palemoon.org"; - owner = "MoonchildProductions"; - repo = "Pale-Moon"; - rev = "${version}_Release"; - fetchSubmodules = true; - sha256 = "02qdw8b7hphphc66m3m14r4pmcfiq2c5z4jcscm2nymy18ycb10f"; + src = fetchzip { + name = "${pname}-${version}"; + url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; + sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc="; }; nativeBuildInputs = [ @@ -140,15 +137,24 @@ stdenv.mkDerivation rec { ./mach install - # Install official branding stuff (desktop file & icons) + # Fix missing icon due to wrong WMClass + # https://forum.palemoon.org/viewtopic.php?f=3&t=26746&p=214221#p214221 + substituteInPlace ./palemoon/branding/official/palemoon.desktop \ + --replace 'StartupWMClass="pale moon"' 'StartupWMClass=Pale moon' desktop-file-install --dir=$out/share/applications \ - ./other-licenses/branding/palemoon/official/palemoon.desktop + ./palemoon/branding/official/palemoon.desktop + + # Install official branding icons for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n - install -Dm644 ./other-licenses/branding/palemoon/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png + install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png done + # Remove unneeded SDK data from installation + # https://forum.palemoon.org/viewtopic.php?f=37&t=26796&p=214676#p214729 + rm -rf $out/{include,share/idl,lib/palemoon-devel-${version}} + runHook postInstall ''; diff --git a/pkgs/applications/networking/browsers/palemoon/mozconfig b/pkgs/applications/networking/browsers/palemoon/mozconfig index c7674d342c25..0eab96e58469 100644 --- a/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -12,7 +12,7 @@ _BUILD_64=@build64@ _GTK_VERSION=@gtkversion@ # Standard build options for Pale Moon -ac_add_options --enable-application=browser +ac_add_options --enable-application=palemoon ac_add_options --enable-optimize="-O2 -w" ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION ac_add_options --enable-jemalloc @@ -20,6 +20,8 @@ ac_add_options --enable-strip ac_add_options --enable-devtools ac_add_options --enable-av1 +ac_add_options --disable-eme +ac_add_options --disable-webrtc ac_add_options --disable-gamepad ac_add_options --disable-tests ac_add_options --disable-debug From 4bbef818cc1672649caeb2de2985694a7c8edcd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:23:45 +0100 Subject: [PATCH 26/84] python3Packages.pyroute2-core: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pyroute2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index 758c848c7ecc..7a13dc79aa99 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-gkvr1FgFWI1eurjbuUYhYj0D4eZTIBsDMRXSWrKiCP4="; + hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo="; }; # pyroute2 sub-modules have no tests From 2a58e67076c7e0baa536b2853e5432a351667a30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:23:58 +0100 Subject: [PATCH 27/84] python3Packages.pyroute2-ethtool: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pyroute2-ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 4838b6690424..dae025618b7a 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-+/B+YQOluzyGYmnwAZonsjgZeiZPYl8LhJ9OjnvV/64="; + hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E="; }; propagatedBuildInputs = [ From b3131e3c7ce92e1ae9c4a12c91c499e89a28e85e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:24:11 +0100 Subject: [PATCH 28/84] python3Packages.pyroute2-ipdb: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pyroute2-ipdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 4704d95279ff..22991fe20268 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-sjlJ1eBoMQaJzEF/4Qk9ZwZB0s/yvR5wUUDP3UWBA50="; + hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk="; }; propagatedBuildInputs = [ From 52342467719176f5b1c11a88d27e224dd125184d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:24:24 +0100 Subject: [PATCH 29/84] python3Packages.pyroute2-ndb: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pyroute2-ndb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 86bbde3e52ab..47c309cbc321 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-90DAbXCkoIFUbWZotKYkCSGsQvb7LrEpf6xGCviP40w="; + hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE="; }; propagatedBuildInputs = [ From b67d3a0b2cf68f2410e44056d54950e6ad9edd6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:24:38 +0100 Subject: [PATCH 30/84] python3Packages.pyroute2-nftables: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pyroute2-nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 4a3d58c896c2..3c76692016d9 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.8"; + version = "0.6.9"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-SNebxs0mCFEI4bejuLMeU3wrO8KZZT1frnfQw8Gko6E="; + sha256 = "sha256-8BLz8IIobmrGb64PhXz1XWfl3KJTOhOL+j1C4/jlXuI="; }; propagatedBuildInputs = [ From f913df13113bbea204a112389a2420b4224f9985 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:24:52 +0100 Subject: [PATCH 31/84] python3Packages.pyroute2-nslink: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pyroute2-nslink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 0f47e7228d34..387a9b403df5 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-bTGzXouEdVUFaT5mxGfonFu3aOMxZKRTDMaHFciofec="; + hash = "sha256-WZjRexKn1FWXj+5KZxqZXB0aZmnd0ECKWt3hvVDdz4w="; }; propagatedBuildInputs = [ From 7456345105782a8dbbe6344b7de1fbe00569bf32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:25:06 +0100 Subject: [PATCH 32/84] python3Packages.pyroute2-protocols: 0.6.8 -> 0.6.9 --- .../development/python-modules/pyroute2-protocols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 84c9813b5eaa..99c146d41e4d 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-l07CEwZzDxym+QAnKFFEpX690RStOA+rAwMXiEd7FOs="; + hash = "sha256-7vP4rbid2cVGKlYUM5qsmYXQhUfvIWoaDXYnxSUnSJY="; }; propagatedBuildInputs = [ From 6ec5aaf241dba4954b64789a98b102a50e059e10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:25:21 +0100 Subject: [PATCH 33/84] python3Packages.pyroute2: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index a2ae4d3c3857..9b15711ef0f2 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WhqjvCwKrUUBLKvjpva7pc94UIZvTf7j705Bt2DHyKQ="; + hash = "sha256-PRxNGnH7VpyrV49V9xNO8C1I6LMYK05+ZrKndWKO2vs="; }; propagatedBuildInputs = [ From 8588c4ac1cb2fe0dafd5aebe01f5b1dd7b5d5c2a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Mar 2022 14:25:35 +0100 Subject: [PATCH 34/84] python3Packages.pyroute2-ipset: 0.6.8 -> 0.6.9 --- pkgs/development/python-modules/pyroute2-ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 1889b5ead881..7bf625c08864 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.8"; + version = "0.6.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-j2vEQyfuuMH0QRtXw6acX9AMureQwgeS+Ap7m2uP9OY="; + hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M="; }; propagatedBuildInputs = [ From cefc1fc120c8d93fa952fb7224f6afbf99ff9ca9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 07:58:41 +0000 Subject: [PATCH 35/84] imgproxy: 3.3.2 -> 3.3.3 --- pkgs/servers/imgproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index b6dd99edfddc..d35c53de9afe 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-LJsiZeKgetFTqX58I82jDr8fIgYJCDVhb44yg8uc/8w="; + sha256 = "sha256-VS2EZUMUvzuSP/Rs0pY0qo5VcB9VU3+IzZG6AdTrhmk="; rev = "v${version}"; }; - vendorSha256 = "sha256-088VEntNx3ZX2p6EiAZ6nSeWmM32XLAOmqXu2sd9QG4="; + vendorSha256 = "sha256-Rp0vTtpdKpYg/7UjX73Qwxu6dOqDr24nqp41fKN1IYw="; doCheck = false; From a1a6472993e44c44c437f6b5004e53289bc8399c Mon Sep 17 00:00:00 2001 From: "\"Fabian Bull\"" <"fabian@fbull.de"> Date: Tue, 22 Mar 2022 10:00:24 +0100 Subject: [PATCH 36/84] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 782 +++++++++--------- 1 file changed, 391 insertions(+), 391 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b15195bd0155..62e85688e204 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -41,12 +41,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-03-04"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "d864b463bca824ebbdf2b17a0ac046955c007b2b"; - sha256 = "173r0vj0g893c4mkd4if16xqsckx55jfsgwz7fg6rrnbazjs75h0"; + rev = "7566440e339af515f47b28f9e82fe63d58883082"; + sha256 = "06ybma15xba2fbb9068lzc04p3sqj1mzgf77v4xvdcym4rc8nccf"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-03-05"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "560e6340ce10ce90fac587096fb147eea43e624d"; - sha256 = "08gcy6anp648kpk1sir6nwk0dxy55a6gj9w1whp28lchjc5yrd8y"; + rev = "5c7019f394588bdc29d7573f5063198c2803dfe4"; + sha256 = "1cb80msbhmh03ibxf95scgrpl3awj1i2mc3caj38nqpymn8kfyqy"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2022-02-15"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "a955096c566843302a0a509680b92ab276488add"; - sha256 = "1ka9p2d2fvr1p8gr39fq44msjqkshg3r6pjzzsnx8r821ql0055i"; + rev = "bd79727af8a21037222a08ec9bcaf1c85488aaa4"; + sha256 = "0l4hvhmf9cgw921956rh97x6aqhjzs2jxsdnk2m38a9fr738hknk"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -269,12 +269,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-02-21"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "da8a37dc635ef25c39442351fb3c838d151eda71"; - sha256 = "0pn32l9pzvxl5fd8l3pxjsrzx0gv794xjh2flv0gf2f9lk4hvcbx"; + rev = "ba1606202588a1d4cc68360d6ef9549f0fc464a1"; + sha256 = "029pwryrsc1hzxsc6jvin7vxx21rj2270kw2hqj0dj74qn8b8dg5"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -365,12 +365,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2022-02-05"; + version = "2022-03-14"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "b227dd1380bbe226b117f9b758e146aa7c2e7d82"; - sha256 = "1jzfjnry03cv8nxf30h4x5pad5s55k4grzy1jp26sb3xjlpriz3p"; + rev = "d2efbf0093235525e81f537f8f4e63f23acedf06"; + sha256 = "1xx23v9jgpzdhyp1diyq0vc36vlxzljx36qnax2cms36kfnc398l"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -449,24 +449,24 @@ final: prev: bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2022-02-08"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "4b1d3adca7e968ebc619cf2f6f3e197ef78c8342"; - sha256 = "0imyzav898hzx4d669rxx7qyac6b8csp04am2j85rr31rywylpn0"; + rev = "a81eb31192e3033eccedb61c842e274252038a04"; + sha256 = "06b0mfmys2ah1hkyfipv0chv138mmdlixc2l0377zhq8409i3k3c"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-03-09"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "d5904e8a3434acb151a4948b1b3d4760a2a12bb1"; - sha256 = "1rr048xsf4q5rpi1b2fkgqh23khrmjpd6420p240m3b3rj027brw"; + rev = "e1202c6569353d03ef0cb3da11b839dba26854dd"; + sha256 = "1nd5pvbg0yw8jl4rn56dzhabmiwkvlzb8iv595rrkqdb2msdl4qx"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -485,12 +485,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2021-09-18"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "eebee3aa5da63188b70c4fd75509dcfce77e2030"; - sha256 = "0n8i5jg3hvx6mj6grxcvdsanbyvg67gjiq18aq6kpdb1rcip0270"; + rev = "896360bfd9d5347b2726dd247df2d2cbdb8cf1d6"; + sha256 = "06xvggyq0saf9mj330vnlh0q4176w46w09335iwhc3fp999vl07p"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -509,12 +509,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-03-10"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "24aba3962926330266e8a722c62d7c7fcfb1961e"; - sha256 = "1h3jnfjwn16a2by95vh9l7jc79ab5jc6w6ksh56r5maxf9v49x94"; + rev = "f079dda3dc23450d69b4bad11bfbd9af2c77f6f3"; + sha256 = "1w0n96fbrkm3vdl64v1yzkly8wpcn5g9qflmpb8r1ww9hhig7a38"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -533,12 +533,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2022-03-10"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "f5fc1c613783a488e01be692c2ca3b1e9d46e8e4"; - sha256 = "0avdzzppjw59jlkjicl749kbs602dlfjmc4z7770c8ga2hzslzzd"; + rev = "6096305ca7a63e05b9c9355f42fc00a9a467e3a3"; + sha256 = "05z9qw51x5gh3vw1nlgkip90igw33cq8h684c5gnf10rqyc1c9sv"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2022-03-10"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "b21e4e725dfe7aaec02d88923f45193928fe5a55"; - sha256 = "1c5gdd3j1sg0bk92iaanw855d05ximdm7y0s2z1ph4lawfn3bk37"; + rev = "d32e5be4eb144789743aef0fa412176b91410bcc"; + sha256 = "13gxf8jc7fd7fxy2zlqi7jc98p0lijs00bsknxnf9cglp1xi81i6"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -737,12 +737,12 @@ final: prev: cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-document-symbol"; - version = "2021-10-28"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-document-symbol"; - rev = "29d12e55cf49ee07b829114ad39b161cad2544ab"; - sha256 = "0w4m34467j3cg4dj69r12115p5k1i2lbjzmwx5hmd5x6xzb5qycb"; + rev = "c3f0086ed9882e52e0ae38dd5afa915f69054941"; + sha256 = "1jprb86z081kpxyb2dhw3n1pq15dzcc9wlwmpb6k43mqd7k8q11l"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; }; @@ -761,12 +761,12 @@ final: prev: cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; - version = "2022-02-21"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "quangnguyen30192"; repo = "cmp-nvim-ultisnips"; - rev = "3cac37c0dfea9d42cf69d9638bb63f267c5a1033"; - sha256 = "1h4jjhczgx9kp4a0d9jf5qa0jkhb15zzdfhkpfgxfz2szh8frj0k"; + rev = "f90ebb220306e39766ad0ec1f094e4e12bb2fdd4"; + sha256 = "1pfa3fpjna1969a9ij40b4rmss413mzr5m27i2lhq21xw2f0fi6a"; }; meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; @@ -965,24 +965,24 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-03-10"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "c13c51019ca922279b291f82ddeecefb26fecdac"; - sha256 = "0g2sm6f8h5si901l2nzbphin7qh66517636xv9f5821jaixwyx6m"; + rev = "8e27595afad82e56a659257896de85072447703c"; + sha256 = "1jcw2n1j8bjs1x3y0jxh8gajkir2xnncmk6zx8360fm28y6lc90s"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2021-01-11"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "cf62681a4962ce1873e4b2a5e0bf401dcd42890f"; - sha256 = "15j08qa7sklm0pilfn3ljgq75hrv8y9h8xzj8ibrafp29640gkfl"; + rev = "7d2604c8ef8bf2154e191746692477da39aed399"; + sha256 = "0na5nlzi9rz1gx1p98wksy6axmxkq4mmhxq3dzg0pv0m0137vi1g"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1038,12 +1038,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-03-07"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "026ec9530b6691db8c68a3ae4fc44c56aa281f52"; - sha256 = "14qfx8722mzb62a60l3m7ddy2g241gp06f7k5ncdfy49353qv7v8"; + rev = "8a2b2f3b302e3a35184b1107dfb3781aa76e442a"; + sha256 = "1sh0ilkddf8kfhp6fnq5br4yqaqk2g0nm3bz5xdwrf5jmphr4mi0"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1230,24 +1230,24 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-03-10"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "3172e9802f8cd0d6fa64c7cfa377410369786040"; - sha256 = "0zj6j1ih6knj5bhs3d7g1yr8i2pnhf6pgdh7gbj7l28j62idx9dy"; + rev = "d8767f5dd617ae5a97a68c50342e85f482e85492"; + sha256 = "0wfd3ya71d3059p7hskf69rn1c2x9ysfvfgk6k05ah4m7finsh6p"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-02-28"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "074b3f1758d4e743e2d0bed0fc24ef6386387036"; - sha256 = "1qbxrl36zawvbf4x2h9za4s300b8s7yvzfp7klcy30nd9a9xfwpr"; + rev = "f88e1b425d96b331a5375d6e35c741abdedc858d"; + sha256 = "1r4fbz8xzk331blizh8i4fkls3cyli9pzms6xnqksjgik2mbsh37"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1350,12 +1350,12 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2022-02-09"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "d5b092036bc651912474f64277913be8502f8f09"; - sha256 = "12nmcam301h69181hznsh19p9sl42srp98dfa56ghy4iyrcg2d34"; + rev = "8150fdd845a8c26326ceb9418d054370863e826c"; + sha256 = "0y9x39jjw8bk3vnwcvpr6s3nxmdhs30z982fxm6g5i7ksa7wj2v4"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -1470,12 +1470,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-02-17"; + version = "2022-03-16"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "bf9b2bafc76e290f11eabd654ac830034a4b553b"; - sha256 = "1hya333j0j7mhk1cnyjpy3rzmzbq7pddnyrjrl3bi4xhq8044g3h"; + rev = "4ecffa4502a65f90397c2194ae308dac49194a65"; + sha256 = "1h23nmqpf5782r3fj945ck0dn0sa6vb0m03sbb4fzd707k6xwnl9"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1592,12 +1592,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-10-07"; + version = "2022-03-12"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "f3d1f14fa8a8cf882be39605fb037ee982c3f37c"; - sha256 = "0qngyypp8md9rq06xvmwy5qwpa5al6kscj9ivad9mg3wzw6rmya6"; + rev = "c466c955e85d995984a8135e16da71463712e5e5"; + sha256 = "0s14m5k1vw5pfgi9wc9jhvwfwv57hdcrji24vspid8yjzgfjf5yd"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1796,24 +1796,24 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2022-01-18"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "210e0961b9bd765b5b46a84d0631271ee8e6af64"; - sha256 = "0f4kf6853wynhdc30hmc9avk1k6inw8jxp9w0sgkgp6958s3ksfh"; + rev = "d552ad035c041a75e9d284adf2099f5bdea5d293"; + sha256 = "0024igmd05zc84ya08zms7m0nmdrah1ahvmdpfm056nmkw77phhn"; }; meta.homepage = "https://github.com/dracula/vim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-03-02"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "b36b69c6a5d6b30b16782be22674d6d037dc87e3"; - sha256 = "1inb7x7lcf5vrxhbcxcmdldvbldq8asn21wvp3awf9wk8zn6572i"; + rev = "96552c9199dc4e169d1c54a21300365ffa483da9"; + sha256 = "0xh8wnmk3y71mqfcbai0sf7s94kh4f5ward05c8rkwx9rhlasajv"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -1832,12 +1832,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-03-10"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "ba27cebaa7cc51f60f5f8dbeae0ab94c6ccca8e5"; - sha256 = "1fd32qwvqsdb2ndpsnxlaw5940f31p3vlk9j79pxykizl4zi4w39"; + rev = "36c08622c4420129fa576ceafa4ed3388d3beb56"; + sha256 = "0hai4ns9chvqb8x7vgcl0i0lxqvqwxwhpa489zsqsp1lb436bwqc"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1930,12 +1930,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-03-10"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "e6628a1ff5028086b42e90061c78c8d3bd15a7c8"; - sha256 = "0sb0vhnlfm0830w5kpy3jd1ihxpx1ban0mg0lvgg1fqxn8a0kzkx"; + rev = "764e36cf49a5845217ef09281adf708ab5abd9e3"; + sha256 = "03byh70krkcgcj6yis7x73bzs8b21qic5qhi01az057rp7mx462l"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -1990,12 +1990,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-02-13"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "7ddd3f02757b04f1035d0ae8bbe9d8461d536a2d"; - sha256 = "0dfv4a131x5c6njwiz34kfr0sgky8mmd3ifd7gpk5z5q5cwgbhg0"; + rev = "1bd5158943eea629de30db02449aa06633e1fcee"; + sha256 = "1z6hlarj2xj00hia6ns58qwibpaf48h6w8aawsc46ihjib1zs38q"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2014,12 +2014,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-03-03"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "6a0763f917e05c3a22cfa85cbb65e6a9234da122"; - sha256 = "1yl9l3hily2548v5h848f9vg15fblnrb8imlhnv9v31w0233h9xp"; + rev = "540355537e529f00ff770f1647929957b0aa8088"; + sha256 = "1p5sjz24khgmfwmkq6brl8l1z3w7zfb4pgz3xriqij5w0h5nkdin"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2038,12 +2038,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-02-19"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "cbe0db4f2adfddfd830310e5846f8735d4e068fa"; - sha256 = "0fg3rmp3nnb3hh8cs4mha96xjfzkgbs308a5lbmsbkqz9gi2l6yq"; + rev = "d47f2bbf7d984f69dc53bf2d37f9292e3e99ae8a"; + sha256 = "0nw05yzy1a9yq8jvjgzq1y2wbq1x8rski6brmz3pn4rdmpkzqvsd"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2123,12 +2123,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2022-03-01"; + version = "2022-03-14"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "2e82574f2cb6686849fb8e7a0231537734161fd4"; - sha256 = "08c9asrkmr57v83n3a6r28a0rxwna9xp227p8jr3rj3fn9ykahxw"; + rev = "76ffbc613a058902a9166c09f3cae48073bc9276"; + sha256 = "1c56xzwkhrhq0mmk518zhz6dg1q6l9cibiavfj71l5arhbh8d5vk"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -2171,12 +2171,12 @@ final: prev: FTerm-nvim = buildVimPluginFrom2Nix { pname = "FTerm.nvim"; - version = "2022-01-04"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "numToStr"; repo = "FTerm.nvim"; - rev = "eabb65f23ba48ec9e8abb9a2514f99b77b3bc6f2"; - sha256 = "0bk1lh9i584ysj5yvmb7945nkighrc8blw28y6npqaf6mvma31n6"; + rev = "233633a5f6fe8398187a4eba93eba0828ef3d5f3"; + sha256 = "0sxnii921xia4mrf67qz7ichi9xqr9zf193hb9dx199l7hl6k1p8"; }; meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; @@ -2291,12 +2291,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2022-03-05"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "b6a426bc8224865c70244365f5c7599765d8df95"; - sha256 = "1l1485fnsf9y529snqh68kwksc5xcxg7fh7ikscisqdia2j75vg9"; + rev = "957dbf2cc405af362bb544823517de4ddc57e7b2"; + sha256 = "144q5gq3lnr4pgl92iqj13g3v5zd5795dh6bw91b8s78fz7bf9jn"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -2387,12 +2387,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-03-09"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "5c487a804e462c284c159c800a803b8e0294d0a4"; - sha256 = "13i2c5r021h9jbsiap31f42y67z0pqjwfgmx6z64r35n3gmz5azz"; + rev = "3791dfa1ee356a3250e0b74f63bad90e27455f60"; + sha256 = "1497v5hr89ccixnnc91y6w3cmr9jpbp75g3rrakffijm6zdl8pvk"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2423,12 +2423,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-01-26"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "c6685381d31df262b776775b9f4252f6c7fa98d0"; - sha256 = "08f6qi6ncicw7zj9vyf08pays9sbxvzwm920i3mbkld6nmb87j39"; + rev = "64052ad16286281861de9281dc0695c80cc9ccc4"; + sha256 = "0ykd5ps6i7256w6yxvpjp6yia85ds9ln8icd29lzddf1qpza4rnr"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2531,12 +2531,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-03-10"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "256cd9d2bb414942eb2300d41ead84ed0f52edfd"; - sha256 = "1v7d4pfp1m9027x3spqikjhgv03fsjpmmgl6hzf2nzlxqiavh07v"; + rev = "b8b63c81637c845e8a7c2dff4c206b714f7b93e4"; + sha256 = "0ds72yyca1sgrr5b7i683i0lpfz6n75vrij94vc8z07ivn33qy2r"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2639,12 +2639,12 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2022-02-17"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "de698e1f8db5d1d3a65ba9dd1880096ae2d5ff7f"; - sha256 = "099dj5zvijhpvvd6r0zvsyl0v841cqh4vz678k1f7jcrpk6g9537"; + rev = "7bd3ffb073dde94c8d86c1b49c47ef9d2f2bc605"; + sha256 = "0hld4cr09bd0y4k9yz1lls5dqdak605zf5rnv75zi5scbgwly19c"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; @@ -2663,12 +2663,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-02-07"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "75f73d3959a0df7ef3642fd5138acdb1ce50fdc8"; - sha256 = "08yvjh70saffnjjxdhis9sfcbkpmbgm8jl3ax0qal41crwrv7ibb"; + rev = "4f1acb666667b2b914efc407ba44b4d305529331"; + sha256 = "1i2gib6kdbj6sqfhz72n5gq72g2viw28z64dc1cmm4wwafcxzc4c"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2904,12 +2904,12 @@ final: prev: jellybeans-nvim = buildVimPluginFrom2Nix { pname = "jellybeans-nvim"; - version = "2021-04-07"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "metalelf0"; repo = "jellybeans-nvim"; - rev = "cef41133874073b35bf7e8061d97a5214623770d"; - sha256 = "1hd21h48mwsixbx4iw8r86pmml2z79wpc0p0wb8d50jjxlyphgv4"; + rev = "f77b75443adf6461ded30de0243f49771f933d06"; + sha256 = "187xvsfg9ac04006bzcwdi03l5cnzg3rg7ak1s9n8wb66s25vrpx"; }; meta.homepage = "https://github.com/metalelf0/jellybeans-nvim/"; }; @@ -2976,12 +2976,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-03-02"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "63cb5cc1a80def7da4bb375adee1587866250a17"; - sha256 = "08iwz314c0k63mwv3yka8n79lb2627nbx9n81l9crz1f3nplaasd"; + rev = "f5881a688b951cb35a7f36628b23ee4393d96daf"; + sha256 = "1h4m0mcgvpdxh6pzkg2k5am9g31w8xpq84rcpqchvql7yhyjv4g7"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3084,24 +3084,24 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-03-07"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "58ef474453717efa9b700a22fc004756bf2ea5b9"; - sha256 = "1gwk1p7djny7wgy2bb1m5g230z2rr6jy2bjjfwrnbddhvhvi32q8"; + rev = "60e14a5bbd52a22578d6335c606d0539067b9327"; + sha256 = "05bx5wm8r5rs4y51pkgb2m6bxzddacn7f3bdsgnmbvxz0rxyq8dp"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-03-08"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "d3fef426356b6d33248c3e919cbd9b90d3742a70"; - sha256 = "0wr06w8bbsalfs188gg055wc0p4f6x7l8bqci96bjdn9f1pa1xpj"; + rev = "21bf810e3bce3e06d148b4848febcb69bec34b49"; + sha256 = "0m64qqilanz1qgssgyy2h8zlkyngn2nbnwwx15mwls9v0sllc0ns"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3144,12 +3144,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-02-10"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "abfae597b52c621da63882c6d58f252a37815ac0"; - sha256 = "1xn4xv7br7k92q6nsrrys0qrj1bm10asycyrqcqzzs7wvd1qirlv"; + rev = "fbc05de53ca98b7f36a82f566db1df49864e58ef"; + sha256 = "1gyxa9larwz8brfs47ivxcrx03fa52pvc6kw31c7nl03j5p91f8m"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -3240,12 +3240,12 @@ final: prev: lightline-vim = buildVimPluginFrom2Nix { pname = "lightline.vim"; - version = "2021-11-21"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "a29b8331e1bb36b09bafa30c3aa77e89cdd832b2"; - sha256 = "0n3wrfcw6k95cmwg8jpxh0y9jy6y2bjgvszjgal9yha7y8gv6a9v"; + rev = "11931e2de42cb1a14887a002a874f0b2daf12bc2"; + sha256 = "1iyns1bm3wjr6z2hmc0p9j61vhprhax4f9qdqaf3w7vvgkhx1xj6"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; @@ -3288,12 +3288,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2022-03-09"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "8447cf6de2bee95a23c6e43d7cfc291a713e401e"; - sha256 = "0zr9bk6glf97g6w7wsk9s5zi6g3gbpk104b5aq0wl2dmcccxy09m"; + rev = "4a4f0724a520bd4e1a59ce55b7ecb51e44aa9b19"; + sha256 = "17plc8wqa9npvy757qhmm7lk4rcjvm8f340djfi49b9cddpp739s"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -3312,12 +3312,12 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-03-02"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "86fa6872ba2195f4dc569073c46192041f153654"; - sha256 = "0faqi0rwjdd09bv9h3j8jpyv8hmak91aymysi9rc99zwd84nvy59"; + rev = "3f3c25e584558949b1eda38ded76eade28fa5fd6"; + sha256 = "1k1i4c8rydnhk36pcwa9dhvlbawda0dbwh6ppgypm1xnda10hv3h"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; @@ -3336,12 +3336,12 @@ final: prev: litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-02-17"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "58ee5063ca1cd333a2d0a4a9509de80c7582ee01"; - sha256 = "07qbfkjyf0j0mngn6bn4x4vypnl3sf0jaiwhw8iw7zqy4a1338rg"; + rev = "ab90e26d68157d3f016f9a5d5c1d3a46a174618c"; + sha256 = "07cfcmly1xdy4vmng8l2q2cpc99nvpdyihnl8x5xs2i7n1zakmdh"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; @@ -3443,12 +3443,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2022-03-03"; + version = "2022-03-14"; src = fetchFromGitHub { owner = "tami5"; repo = "lspsaga.nvim"; - rev = "f3cdb7b3a99c548b56fe39078a69d0c594422e18"; - sha256 = "11l7iyykbd1hh673srpafggg3hlnf6a8jissmsx303gpnsml4bhv"; + rev = "5309d75bd90ce5b1708331df3af1e971fa83a2b9"; + sha256 = "0xvlpjv69wf18nw5hbmmgbhs8ws4gfq5ny2vrncqaxcikr3gdmms"; }; meta.homepage = "https://github.com/tami5/lspsaga.nvim/"; }; @@ -3479,24 +3479,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-03-07"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "88a44ade818f9ee7ba730aa4096250e22b243808"; - sha256 = "0wjqpy7gvkzim27dnanzydphb44kdm345zm9yrngysrdpmbpkd0p"; + rev = "181b14348f513e6f9eb3bdd2252e13630094fdd3"; + sha256 = "12795wh3md90p3q1zmhar4v4vf1mmhixmd4dycqmk5bcalv8j8ma"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-03-08"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "35c7e1c1a1beec3dda228c7f3c2fba5c543c77a2"; - sha256 = "10a6p7cwa0r3zpf3az4a7i5hi4lza0d7maxywnk0wb4x039bpq9x"; + rev = "680d42a49e2e798cbbc0ea5dc96f298b3039dfff"; + sha256 = "04fhmp3idalm97qpmj7jn6cs7myr2jz0jy3yzw3rqxmf33b17m7w"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3515,12 +3515,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-02-04"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "218923092bea0ba1f7cb5552b68994f28064b154"; - sha256 = "1dmnmvavljy4dh6f7fvpwf6a2zl2rj9aq00jz57l1w0a63fddpcd"; + rev = "69848496f34a27e7c534fca5f3626c08f4fdc754"; + sha256 = "1qm6yv474ija8mbmr33rd2wmalrj8gdzl1ji6q68wr7jrwjs3ds7"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3623,12 +3623,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-03-10"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "68f2bda2ce9ea9ecd51a133d9909c9ec07d44666"; - sha256 = "0klsy5pq3fvj2v6199aikpa6br4q6l30ig5nqnh6jm8c48bw6nqg"; + rev = "758e28b67216a54fdb154a4606acb73eac950a30"; + sha256 = "1nrvkz6q3a0cmf3aw09fk46scawh02xvk5hawbcyszh2sig4km11"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -3659,24 +3659,24 @@ final: prev: mkdir-nvim = buildVimPluginFrom2Nix { pname = "mkdir.nvim"; - version = "2022-02-26"; + version = "2022-03-12"; src = fetchFromGitHub { owner = "jghauser"; repo = "mkdir.nvim"; - rev = "ed2da69babf365395be5dde420d7ee6482564938"; - sha256 = "05zavlylgadhwrv3andvr0briqblj0kr5m148s7bwczqi15y0ljy"; + rev = "01261650382bef195dab8ac39344234b57914f09"; + sha256 = "1irpi2aqi2pr0ydxsw2d4m2lkhzkqcs6gvz15snvnsckvk03j3v7"; }; meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2022-03-01"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "1f33d22f61db59faa24aaa69f2452668c37eef32"; - sha256 = "0ybi76l3f2r19d2f2ca5jjbn2gcvwdh9mxbh3xly8jin7f8anp36"; + rev = "62b921fe7c61180560d6d31baae67c6ed5da2d1e"; + sha256 = "0xnh92vvdrqcj2kwssq1d3jg53lzsz1kpl3vn9dinkrxp4l0pdz1"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3707,12 +3707,12 @@ final: prev: mru = buildVimPluginFrom2Nix { pname = "mru"; - version = "2022-03-10"; + version = "2022-03-12"; src = fetchFromGitHub { owner = "yegappan"; repo = "mru"; - rev = "148f71bd47bdb2af8c639694863910b6e551aaa4"; - sha256 = "1cijxc0srzbl2bycx7ccmwhgzz89frvyyim808rcy7bk7i56ccda"; + rev = "2698dc2622450645618e6457a81d325954ba725f"; + sha256 = "06w4rmdn48h21wl9mn5v9mfkaaypd1fxhdjiv7ng5zj7jgi1qnsd"; }; meta.homepage = "https://github.com/yegappan/mru/"; }; @@ -3731,12 +3731,12 @@ final: prev: ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2021-10-08"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "d2d8cc430232f385d8468f44da8635febb9a92ad"; - sha256 = "1zkl8g7kf95rbyk9zs1xwr0n76l1f9vvwc2432rsmgj2bdly8vby"; + rev = "24d77cd5206438a6670ff1cf8d1628532910e14e"; + sha256 = "1avxqqajkd1rhz61c066n4qxv5955yl6w5mgm15z3disgi68kvb2"; }; meta.homepage = "https://github.com/ncm2/ncm2/"; }; @@ -4007,12 +4007,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-03-05"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "f30879799f7c19d0047c6f3d3a86b818eaf0f201"; - sha256 = "1bfm5zfc97kna9hkb8asknbx1b7pznv88n3128a7d11ysasziz98"; + rev = "9987421e0724ce704d0035f50a7080c677a85d71"; + sha256 = "14sbbih38494ybhs5khsd07rq0136gdacjchfz8bx3sq05l0blmf"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4031,12 +4031,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2021-09-17"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "8df876172fd9b8f6c023fcd5b84728a675cbdf91"; - sha256 = "0dqr9b2h0f2rxiw4lvws2gamwxdmnqb2qsk2ish47v7lnc772l2l"; + rev = "0556893d7fbc1948ac1a82cd0f41023d76a234b2"; + sha256 = "0dw6miyxbbi71na8qb7nqk20vni1q46lmg51r0h354xcnxn4hyms"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -4067,12 +4067,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-03-09"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "ed9fb80e846042a46521494a980df83bc4e075fd"; - sha256 = "1f85yr0kvncxhqp9l4diwk9l3g2sg8ca3xbvp95qh957jfp03n9k"; + rev = "9aeaf79c5ad01930705a0534a35adbdba9eb5f13"; + sha256 = "0v1lqfdkzafsh7v6i0cyhc9mgy6gwyqvlya3722qdrrrramp1yfy"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4259,12 +4259,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-03-03"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "2208bcb7fe17a76d8b88f296fe632860bf62d948"; - sha256 = "0pq5r5kdq858k5cxd9ix3xqwvikllq63b86ba42jpkq1z39bdk2v"; + rev = "ba29285dca9740609f05b9674e3de7708e2ecfc9"; + sha256 = "1959x47sjbb1bl63yfgj30g6s751k4pwchcg2j9y9gm067qnz3r7"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4331,12 +4331,12 @@ final: prev: nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-03-07"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "419542972605b808607d9339cbda0a216b6e8be6"; - sha256 = "10w85n2i7hl0whnv3pb3zva6iws61ca2a8xcrlwh1si2vjywby6i"; + rev = "612f7db0b904d11eeddd41474e71e4bf67acc453"; + sha256 = "000s48f80gpwsqfgxcsafifd10ii99w8kw237i9afa2msrk9w1fs"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -4379,24 +4379,24 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-03-10"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "2d98a1dac0a6ffc915e78738f87ad80c9c6a8d18"; - sha256 = "0wnxbfyr9q4rqbivff0lnyv1b6h9i0dkrg67qxnkqmh3zx34pq9z"; + rev = "71bb21da7faa6676629ebac5e8818b701da46f80"; + sha256 = "0ids4nlg6lhdabkp9pr9jnkghkpwkk1qxvim39a2i0gvqxx4qkz4"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; numb-nvim = buildVimPluginFrom2Nix { pname = "numb.nvim"; - version = "2021-07-12"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "c8b128230adb22727256fd24a221f4c5a1b41e93"; - sha256 = "0dg5cym0rcjy198rhkd61mhq1mg7lw5z4vprik8aimgnlqdzgqad"; + rev = "453c50ab921fa066fb073d2fd0f826cb036eaf7b"; + sha256 = "0pkssmd29r2d5f0s770ppj0z4rv0qj5szd43jh16wxknwwjmqi9n"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; @@ -4427,36 +4427,36 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2022-03-06"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "d2cde7c5802b34d6391a8a3555a3b7b56482f2aa"; - sha256 = "1cbijlqblxf5chc35lq8jl8pzfkx0a72bbf6bzz90nvrcn4xc6m3"; + rev = "6617498bea01c9c628406d7e23030da57f2f8718"; + sha256 = "0ah6jmi8d1z0r38l9mgs46nfn4kfkqxr2vxhkcgllgp6aamhq85k"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2022-02-20"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "6c6962d51dda76cf9bc1467aa8b09036396985d0"; - sha256 = "07ynvj0m88l8vbzvk8izqbwxs4wr99f99wh7x95jpi4wd6rfdvc3"; + rev = "9893a06a11b448e05c0bd1f44970acbb7712e8ba"; + sha256 = "0hhlyw9nacyc4pyx2537y145lm9p3s4m4ckh8cwbambp5ypnn8kl"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-03-06"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "dcb8a8762d9c93ddf7dc8f06009299c0bf11a14c"; - sha256 = "146bwcfywazl2ygs5r0yd56prdmrr1lbhlqcbrvs7l4pkh58w4fw"; + rev = "7d3630f1616c2e5cf9f1c8efc1cf186b9249ce7b"; + sha256 = "0y9kp05qgs7mmivs52ab26jhiqj1izz4jhj1n4x26zmaqbpw4viw"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4487,24 +4487,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-03-02"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "1001683bee3a52a7b7e07ba9d391472961739c7b"; - sha256 = "1z2dy0mgzrpkxirkhximc5ibhgqf2hqa7d8xxmw6icpn3mxwb7xq"; + rev = "272cbdca3e327bf43e8df85c6f4f00921656c4e4"; + sha256 = "1z3nsrkla35sl6d66bjnk0qvqn1a5m8vn670qyb8y9nqs344fy8d"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2022-03-02"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "3f7fc82977e843e14bb3b16bad4cbd5d363d8694"; - sha256 = "1x9cpy79fxq5nwpbfwi2xcw5xhk6nw16rribdns2n2qy4my4ajpa"; + rev = "a864a79c8e024d4f5d95915210188c9c3430b160"; + sha256 = "14m95sp0a6ss71s9ljg1b2m2sz4fyh0rxv9l4mj6brjywsx6agvw"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4523,12 +4523,12 @@ final: prev: nvim-comment = buildVimPluginFrom2Nix { pname = "nvim-comment"; - version = "2022-01-04"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "terrortylor"; repo = "nvim-comment"; - rev = "f670649da497de12aa3d5afc0a693d5d50b17d85"; - sha256 = "0j3pay000yf79lz5plcnfp068fychnf7xa08cg7h5s0nx5cp5bgh"; + rev = "861921706a39144ea528a6200a059a549b02d8f0"; + sha256 = "0r1yb20r8p53y5dli81sm5ycgs76vpwdwcggcwadgiv2rq78ax90"; }; meta.homepage = "https://github.com/terrortylor/nvim-comment/"; }; @@ -4571,24 +4571,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-03-09"; + version = "2022-03-16"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "bc7ac4864188079a6122032a75ea914c95461c1f"; - sha256 = "05wv0cq7w0adkq78fz47vwm65ws6ckysm9bxg3yaxlkiarc59vw0"; + rev = "3d0575a777610b364fea745b85ad497d56b8009a"; + sha256 = "041ypcwa2k737hp9dh3zs1hyx2n2zh9apjnya11zj5xhng76h0ih"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-03-05"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "b4a596f149f87a6e93ae11c46a2121ff7c265170"; - sha256 = "12ljh9mnfvpw538lq8ggmxvsq7f1phjvp4xsnflrl7vkhdy32zsr"; + rev = "45805d69273f1ca0753a096abd419e89af8e5f8a"; + sha256 = "03jjhsdl0w5w0s7d9a64fmvwdpm1pkvjvd5gh1hgsavbpf0w71mb"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -4655,12 +4655,12 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2022-03-09"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "08134573e3d5fef75c52c39f3e7097dbbdf6255c"; - sha256 = "1rs1y3ywrrcz03ad847903wrl4rmg1kzhvm9dkq33pz5m0myf75j"; + rev = "00dce9bff1d0dd74782734b0d2ca6d50499af9fc"; + sha256 = "0mgl88n7ngq6d6wgqcn5s6s4087pk102mvz8jqsj363zx6q7b80b"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; @@ -4679,12 +4679,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2022-03-09"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "6c6dcf5c461355392487d8c0e5b00223de933948"; - sha256 = "1rqk7n0cbrv25dzlz28xajw6fsqw9lrflicd9x830yq809mvfql0"; + rev = "22f7df73283c6f947a56fef0355f5a3ee2971152"; + sha256 = "1qjy4n0ly5vmkpfyjanqb76jvh6qa5ldqvhgfgxk91b9l35ca95l"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4763,24 +4763,24 @@ final: prev: nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-03-10"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "c68bf8e382eb737d98ec77b2f87ce5c07ea09b46"; - sha256 = "10jj3qdxcsyfv260zp5sd2ys93r7y4584865iv1bvgxa98g7y8ps"; + rev = "1d2c585cb69a91cf53f17a90d2544ed10eb03193"; + sha256 = "07vf3xzcld2h3j6hnrrib60p2gnjkcb96h33sm8kfdvaj1578pbd"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-03-09"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "096398a07c2dc08d785266f9f55ddcb462ba0749"; - sha256 = "05gb0nd9iv06hr6zfa8yc2n4nd3p98mvcsdbyxm504bpfy3z8c81"; + rev = "48e59a45b6fddcaadea6e14de0fe92cc4605261f"; + sha256 = "14x031raf0sh2s6syjmq3vqbwwj0pz1sky1f9s10cfh03sz5z54z"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4799,12 +4799,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-03-09"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "32a37ce2f2cdafd0f1c5a44bcf748dae6867c982"; - sha256 = "1n3x2i0jd7lrxa66v7fw0rffy3mv5rajqv9qh1r38x45mig8vi40"; + rev = "3312490ef74ea149121a82fde578a13b1921cef9"; + sha256 = "0xi13qji716kdbbq579pj7rxbjfkwjrsdp3qvfb937spwzbak2jc"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -4835,12 +4835,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-03-02"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "f81b48d298c0ff7479b66568d9cc1a4794c196d0"; - sha256 = "024zzjvdkj1bklhic3yh69jibvnjw0416wvm3lnfw7gjxshglrsy"; + rev = "da1030208347ad8937fdad1d4f8092b578e3ea2f"; + sha256 = "0myrcm6170ncff7ymdlaiahh9230yff794f4dc2lzwv5igkxxiha"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4859,12 +4859,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2022-02-27"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "0090dfbf449d7ad49f6bdaedf51b949e84affc72"; - sha256 = "194pgvs9d11aihddc2c55r8vrz05154lr751w72vii3zvnik9xhd"; + rev = "f1cdec5869de70359c8dff06e9057b99a56a0e48"; + sha256 = "028wvmdbj2fllkw6nr2sasxpamqpl3gmrzdn8lw2bjfzy5xf88x1"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4907,24 +4907,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-03-09"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "2457e141ae5c2e9c5d94a9550b37b421d25cfff1"; - sha256 = "0cw0bgp6q2sa8v88dsvncxmwmglxywbdhiws2klcm6ij9kdk1gy9"; + rev = "e87ee0e3c30368fa97085125ffe13ee37c0daf70"; + sha256 = "0bn74v8ydr71acs204r6580fs636gh00wfk8z6wlbhp4krrwdi1n"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-03-10"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "f448a78057290cca9c70c4065819da96103f3dee"; - sha256 = "0yq2lkjch42s02wr93c4xv7sqksiklwspx5pg8d4cia7ghaadj8q"; + rev = "3e2ac54e1638da214dab58f9edf01ad93f57261d"; + sha256 = "04yjpb3b91j09xwmyxq0bp6zcn2lh3rb86dsp9h1s80wz1hbik7l"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4943,12 +4943,12 @@ final: prev: nvim-treesitter-pyfold = buildVimPluginFrom2Nix { pname = "nvim-treesitter-pyfold"; - version = "2021-05-22"; + version = "2022-03-14"; src = fetchFromGitHub { owner = "eddiebergman"; repo = "nvim-treesitter-pyfold"; - rev = "01185457e9c0a118d5807998de624179bc605a2a"; - sha256 = "13dhix449mvbfsmg8j1554nv6i7gdr8d6143gdy3ihp8sx66bg6k"; + rev = "46e0c3ebed0934fffcc2a23b52393059b76bff3f"; + sha256 = "1fwmwkpnr0cy663cy5yx5spm5hrv8xhsgvk891dqbm1pydxbpa1z"; }; meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; @@ -4991,24 +4991,24 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2021-12-13"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "097df33c9ef5bbd3828105e4bee99965b758dc3f"; - sha256 = "1q6n98kfhi4ra2rgijv32z0m63r6waih8j8zdy0g4ffk4ycqxsf0"; + rev = "7810f1fe706092290dd338f40e5e857bac4a03cf"; + sha256 = "0hl3fivd0yn9g1di2545inz92szsqxq0svwhr8ymyg5sgx465rfc"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-03-03"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "0594067ae677a192a94e383c25a93ac1c3a844d1"; - sha256 = "1pafxnzcwrxbbkqpf9psdglqksl97m8vb6180fwcrgdicbnyp793"; + rev = "af1a18d2577ba0be5b59bc4b32aebd2569ff085e"; + sha256 = "1z100akjipzp3zyr7d54vbwwf53dj4f8y8qzf7fv32la142a7idq"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5063,12 +5063,12 @@ final: prev: nvimdev-nvim = buildVimPluginFrom2Nix { pname = "nvimdev.nvim"; - version = "2022-03-05"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "6562c96cfc9c71b139807a975ada6aa8528511dc"; - sha256 = "1x4qjkq67wlhzwbhcjabqc0z8hz4racfdg7pssbig3cmj27y57ik"; + rev = "cb0fcc1cdbe3864554a7b1ecbe706eb4de4ec680"; + sha256 = "063fyzawn6i67cv3221s282ln5gpms3qw97blrd80l18syykj2b9"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; @@ -5123,12 +5123,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-01-11"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "e5f6772b61b4aea429db1d8cc61b8a91f467611b"; - sha256 = "0nlr29ymv5hqiqblmlyac17w26s2y58jlaxmva4ms62x0wq4mxx0"; + rev = "77752edb0f8378a21f92b8a4dcad984177f24c7f"; + sha256 = "0vh2aa9c9626vxxmpcfkhpfmibvzk7gv31rn65lb140mdnkrqvh8"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -5147,12 +5147,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-03-07"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "f0562da89fecbce7ef335875c70baedfdd34c7d8"; - sha256 = "1f21m3ddmqpcxv2sv80k1zn9kvnx6m8h88mxv9nk8q422r4vrh21"; + rev = "37dcc6e9ff9b58e352a4aa6d109a4b053f41ef11"; + sha256 = "025p78jzc3n8c663gmzixd7ajg7fi58r84aan8fhfsrh8paygf7v"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5195,12 +5195,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-03-08"; + version = "2022-03-10"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "2adb21effcedd6f2c501797a9973d49ca4862544"; - sha256 = "1z5rph5l7m50fh0lv6w56c723ajnr0fz3f4l59acci2p5158hbz0"; + rev = "e1f3054987ce054525258d9a3cc5837bf6e75212"; + sha256 = "0hwsajd7lhc04da7yzx770f3bgn2jsibcg1pjhxyib1prr17mpy0"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5243,12 +5243,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2021-10-14"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "d0d32dc5e92564b63ec905a9423984b5d503c24a"; - sha256 = "1h9ql0ryqblnmiksskh4phah1br1gbfc3zyylc8gczppgnxvgq5p"; + rev = "546570250026ac65c5e2a8a9533fa3a33928352d"; + sha256 = "1naajhn9ii20dx215ksz9fw30xlyvmk0zwsp2flvnwm6jc7wzxji"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -5339,12 +5339,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-03-04"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "14dfb4071022b22e08384ee125a5607464b6d397"; - sha256 = "06c3r97kki2g3jha45nrm6i8dljrqak38iy1248ml8ri3ldpj44z"; + rev = "0d660152000a40d52158c155625865da2aa7aa1b"; + sha256 = "0r8amnlaqxg9jpqk6v4rzlfrc8q161jy1bpy35jrk7gva76kp9hm"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -5641,12 +5641,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2022-03-10"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "7b0c1354bfdc90e9c9085d206b2611ad5d77142a"; - sha256 = "1z03xfqsrr7h7wy9lrsy1bxigyia4i102li5ndki3d2yi7pi9l61"; + rev = "8d1e1488f78306facb98f1eeb518b8ed7843c9b5"; + sha256 = "1lx3hl3lvz92isa07cczmivnc9ffpwim6yayl6l8msrc0ycqsaa2"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5725,12 +5725,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-01-10"; + version = "2022-03-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "86da77b6861a21aef04d644b7ad41751d9b66240"; - sha256 = "06qarvvkxiz126446dd486zwi9yr7qxlgy4vwi38y2gyn793rv0q"; + rev = "26dc0949680b77216ab4de7ae909b324944a493c"; + sha256 = "1ci10s7kcpvg1g9k33ydn4zp8bnm69271mbhys5k9lc50qky2cp2"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5785,12 +5785,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2022-03-06"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "9aa2d2da7f485336c5d97aa47c0acb0544ace768"; - sha256 = "1ffwvx17pl36wxfdi0v8rgh20mb2ww9b5ghrj81n3125ffvl03sk"; + rev = "ad22bd03cefac7d6a483f092a36499e9cce6dad5"; + sha256 = "1d2zkr5r6c7zy4x516ckp57dri3hplmdrzgdq02k0xsvmwispjl0"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5833,12 +5833,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-03-08"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "4926d66c99fd35cf41bf497fa4f8912acb5d6e8d"; - sha256 = "0h6ncs2ac8i2rnal62blbgivykhlhspsd2nda8lwd68ri8pxn4w1"; + rev = "0a3f765335acde2bdf33504a62fe944a5d6d907e"; + sha256 = "1dzbwfic9li5bsc33k6y14avniqbp6hhgkpznwriy8d0pww6p11v"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -6050,12 +6050,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-03-10"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "d92364f07a5b0a8279bfd3c97263bbae4b3ad958"; - sha256 = "090d6s64j6w16l4ww0nm87686k3j4nwh1dl3ydd42mqqi3k95lkf"; + rev = "774ccdb95a04539530be34fa17a34c0f64139aca"; + sha256 = "1myz05j6i7h0yyffbip6a2gpfb61y35w48aa1wlh8i3m9bhy7g4a"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6122,12 +6122,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-02-26"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "e1d68de4c28ec1d71e092c1b4d7cc70e5bec6aa4"; - sha256 = "1zjj510vmvjqb248g0jssh689zsmx3xcwrclkgk3s3y84ylxmh1n"; + rev = "3af5db3e15916d28d0fed9eab478da07b4bc4937"; + sha256 = "1zjcd2pmbn42ss74qbmvz3kar6yn3bz1f1bc4v0r7y2ajrp2m4wy"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -6182,12 +6182,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-01-08"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "452d1359fb14731a316be49fb446a05d2c7d2f71"; - sha256 = "0idp98hm8qbamfdav97c94b1fj6an9vha5rpkc4727n47fj5hvlq"; + rev = "c32b18751a81715e3c13cff22fea9fb5ce31ef35"; + sha256 = "12kp185ndag507b7l4qvhr369zyikwgh0wyi9lrjyr2ar5impjqc"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -6231,12 +6231,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2021-12-22"; + version = "2022-03-11"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "16d1d235f0b05beb423d8b5e4a32044441e7e8ff"; - sha256 = "00vaxyrji34xr0lhlanrd1sbbnrnvx93k6mwff0hmxq05m4r665x"; + rev = "786c818d7258b783afc192ac287b4365c5596dcf"; + sha256 = "07fd72p0qch0gfg92vcw3mlh7f8f1dii681qzpngnlk73ghq4ffw"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -6364,12 +6364,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-11-11"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "2c4b33f6e6679fb5f3824d9cd38d4813c71a19a3"; - sha256 = "18lb4rs9zrgn35b2x6b7pycd3h64virkadlidcy3xhzhsynlvwgr"; + rev = "b7f4f71539038d33f173bfa72631737da049575a"; + sha256 = "0f9nbq4p51624xkdb6a1xvfbvr0ylcr2bxv7gdssyahjr2g45bvy"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -6461,12 +6461,12 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2022-02-06"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "a0343f009025c0457edc92ab83b5a8ee5626d114"; - sha256 = "14lqfkp6ldrdr67r2s5zjg9kml3llirsjbcvsczs0wmwmdl8r7bp"; + rev = "69659cfc9d081caf31c8d548dd4c19593839317b"; + sha256 = "1wdrn0zvqhz7pd0rgl5z3zri3sy4hb947nmw9imvwi62mpdhsh7d"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -6726,12 +6726,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-03-10"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "a7517b4b2df8a066927f0a9d1f226c89bb69f06f"; - sha256 = "1vsmhra3aj1q9r7g12iszgw2mlamcv4prz6s1sx0bvmj7ahfzwkq"; + rev = "1a72a92b641e1dab42036c07e2571b43c55bfaa1"; + sha256 = "1iywxpdy03z1wna8ms1nh1xak1ajya3q8mnlzpfr1vdxp64idy22"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6810,12 +6810,12 @@ final: prev: thumbnail-vim = buildVimPluginFrom2Nix { pname = "thumbnail.vim"; - version = "2021-01-11"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "itchyny"; repo = "thumbnail.vim"; - rev = "bfd408a3210c305aaf51e6ce31ac99497e6ab1ec"; - sha256 = "1kh12d0dg932j9drby27fhg8vbjm8rwih33rm4yjba0316i8wcyv"; + rev = "01e4f648b99aa3799502b35682c2948794ccb238"; + sha256 = "083xd3mwbv89k7vdwm7x3ww6xsjarphr0znfda47dam5r4vk41nz"; }; meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; @@ -6967,12 +6967,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2021-12-31"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "20469be985143d024c460d95326ebeff9971d714"; - sha256 = "00g1w1ry2gzklxvmvgy3dpig8njaziqz64yf7bqr9vqf0nxcvb5p"; + rev = "691d490cc4eadc430d226fa7d77aaa84e2e0a125"; + sha256 = "1d218xxz936q53aknazhnfxhy9ncjyq76dna6y5n87kxn9hzqix1"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -7663,12 +7663,12 @@ final: prev: vim-bracketed-paste = buildVimPluginFrom2Nix { pname = "vim-bracketed-paste"; - version = "2018-05-22"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "ConradIrwin"; repo = "vim-bracketed-paste"; - rev = "c4c639f3cacd1b874ed6f5f196fac772e089c932"; - sha256 = "1hhi7ab36iscv9l7i64qymckccnjs9pzv0ccnap9gj5xigwz6p9h"; + rev = "45411da73cc159e4fc2138d930553d247bbfbcdc"; + sha256 = "1bz40p7zr439ziy7mfks4jcs5rdnw4zinp81fw6wsm5knrx1r5qy"; }; meta.homepage = "https://github.com/ConradIrwin/vim-bracketed-paste/"; }; @@ -7783,12 +7783,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-03-10"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "1b776663b029f00ed20cc87b871726fa0a2f394d"; - sha256 = "1vgm6wh7nsdx7737vl97c8c2x8l1gdkdjbc1zd2a468ij9qhcg00"; + rev = "d2a5259c6ec617688b918a39d9fb4548f6886e5c"; + sha256 = "1qzjzvkw44wylnk0sa4w2kzjb44w18cls4hjaglkbri9k7za8rr9"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7908,7 +7908,7 @@ final: prev: owner = "flazz"; repo = "vim-colorschemes"; rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9"; - sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5"; + sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416"; }; meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; @@ -8107,12 +8107,12 @@ final: prev: vim-DetectSpellLang = buildVimPluginFrom2Nix { pname = "vim-DetectSpellLang"; - version = "2022-03-10"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "konfekt"; repo = "vim-DetectSpellLang"; - rev = "65c3e44b125913d40692a6bd1e5c65b4c42bddf3"; - sha256 = "0mz6hyf9il6l0gk8qn3hfazlkavjrw6w2nbhmqmxk2dnwp8h051c"; + rev = "d5b55e3307e72e45f8d736818c76884016583538"; + sha256 = "0l9bdgqaxfpndpf4v5kxn34zx5pnhf62chp4flzyyhhzlz52dqjw"; }; meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; @@ -8167,12 +8167,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2021-10-08"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "f297b2effb0ec879f33a8539b9701d048d44f295"; - sha256 = "02fag2mar06845dricviqb3jfc05f13na3svhcpddw7gdpimsdmv"; + rev = "d811f46ea3f84c4a8419ad30c74267249b3aadc6"; + sha256 = "02rp0x4v77qzdhicfzysl25lb83146jggdqdqmsfqrlf3x1ivdgs"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -8347,12 +8347,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2021-03-06"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "4289889a2622f9bc7c594a6dd79763781f63dfb5"; - sha256 = "0sixr3rpcgqbaiyk7w6ghcrvllh35cb3gq9isdlwkww3dz4jyyxc"; + rev = "e5ba8b12a87895626ef65d6509ce719bc7e062c3"; + sha256 = "1g0w9mpg45c57khhqxlj58frfkshz99f0kgssawwa8sy4n25w2qj"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -8467,12 +8467,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-12-09"; + version = "2022-03-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "b2fffb38988747e6891bf3bedf3921783e5659df"; - sha256 = "023vj0bsg3vp9s7ldhidlzd40117fbp0xripvzrz364xy22ikn1c"; + rev = "49f213283ffd79e1a397a30ce9e11849eaacf8e1"; + sha256 = "0lk6xxbf111p1d75vagfhf1qydm1mzm4xycmyydfr46acy6a8hbk"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -8743,12 +8743,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-02-16"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "05f97b7fb130cf137b129dd4f9ab09fa5a8839c8"; - sha256 = "1g0v9miazm9z9nbi3s8k5imh75kp4d1mz5q95y2aqm12bi5a7890"; + rev = "dcefd64ba251ffc3d497f8758036735c8f6cc824"; + sha256 = "1j5jrs7kk59ilqsjs0qk5213psv33xnnifsqrjc7h63p28sv3pnw"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8791,12 +8791,12 @@ final: prev: vim-gruvbox8 = buildVimPluginFrom2Nix { pname = "vim-gruvbox8"; - version = "2021-08-04"; + version = "2022-03-20"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-gruvbox8"; - rev = "1e205910e67003ff9efb77e7730f1e49d8aae29c"; - sha256 = "1z7vx4x4flx6853a70vk2bcnv52ra3z275g1i30pjzc5blsbw6hw"; + rev = "f94afba273ec544e1e73e82c78674eed4ccb1c8c"; + sha256 = "1gjnp05a10bad1f12xc5pb1m54jzkq3hh8a83l8aq6377a1z9bky"; }; meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; @@ -8827,12 +8827,12 @@ final: prev: vim-hardtime = buildVimPluginFrom2Nix { pname = "vim-hardtime"; - version = "2021-06-11"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "takac"; repo = "vim-hardtime"; - rev = "00fde0a5e3fe15e329bdeac5331e4b439b6972a8"; - sha256 = "1c66q7bcg0m19zjd3yz5ywhm094cr48yr6rxp8zhlavaswwx8wz7"; + rev = "5603072377d1f1f26a1561eda9e1884bb5f028ef"; + sha256 = "13279v9vd083xg6820gh15qxsyhbr7gjf7lzgy8w52xya852xsks"; }; meta.homepage = "https://github.com/takac/vim-hardtime/"; }; @@ -9044,12 +9044,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-01-13"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "db98338285574265a6ce54370b54d9f939e091bb"; - sha256 = "1inhds5za9v7nja3xv1s7iwcpzd91diixq95bhknp758np6z6yj2"; + rev = "487563de7ed6195fd46da178cb38dc1ff110c1ce"; + sha256 = "1k4pzq1gxqpcrx828ywypff1cjrns34rh8q7yz1j8nhlqvgrda9s"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -9152,12 +9152,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2022-03-01"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "8c59fc67c6a935723be0efacfe7af66866ce8570"; - sha256 = "0vg4nzykdllwwgmnbmbd9i60gd0kml8q58mqpnnc4qmzvm6krgl5"; + rev = "e461476ccc931eed1d439984dd98a26ab56eecee"; + sha256 = "0kpifkb03aw3dq6x6vlai0ivdmwxs32v0ajzcym1f005b1n1rydy"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -9658,12 +9658,12 @@ final: prev: vim-move = buildVimPluginFrom2Nix { pname = "vim-move"; - version = "2021-12-14"; + version = "2022-03-14"; src = fetchFromGitHub { owner = "matze"; repo = "vim-move"; - rev = "d4fbf3b9d794d20a36aef729ecdfa56ce097986e"; - sha256 = "0dkn6ssqhxdp52cg1hk104n3d3fac48yklmnx6sl7i7lx8hpjshc"; + rev = "97fc86064eaa95384b5b00f6253e339fba44da5d"; + sha256 = "0h2f47q5dvl5myk5vif9ya4n308i4h5sb9rrg86v0inpbwzjpyas"; }; meta.homepage = "https://github.com/matze/vim-move/"; }; @@ -10222,12 +10222,12 @@ final: prev: vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2022-02-02"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "a1ff5b95b4e3965c285a1983b930a4bcfd7dd87e"; - sha256 = "1zxwlsnnmq8x56gy37y66hyvir0qzaaf98fkz0d5kyv8nqqirclz"; + rev = "93b2af188fe0937edea414b8e05a362b74f4b31d"; + sha256 = "13x66y0dp70s2wcz5jkcqyp1r44sn3xdn70khzgl3jlv94ij3s1y"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -10378,12 +10378,12 @@ final: prev: vim-ragtag = buildVimPluginFrom2Nix { pname = "vim-ragtag"; - version = "2021-02-22"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-ragtag"; - rev = "b8966c4f6503a8baaec39e17bd0bf38b2aadc9b2"; - sha256 = "0q4blsgnl4l2bkhgjry6xnszhsswdand52gc6gdjffwlzwa9jczy"; + rev = "51b313e8a2e3a44f37b9d625bc0d461e9066b7e9"; + sha256 = "0rd6p1c071dny90n0ph9l61zcbkln24lpjsjyrvlpna0lp1dx81q"; }; meta.homepage = "https://github.com/tpope/vim-ragtag/"; }; @@ -10486,12 +10486,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-12-31"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "3b0c329d823b4736b8f5bae8ab546fb690fc0aa2"; - sha256 = "1r10l7q1wy84insjpzkqg2z4dxv8qja0fgpnwldh6rgh3bz60q0a"; + rev = "f3236767d2e74d736d98efd8da44013d1e95bfc1"; + sha256 = "0mlllnykdmcxf4yx2nkp74rm4wx2qwcly3m711a6pq7w87fgh6jz"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -10510,12 +10510,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-01-30"; + version = "2022-03-12"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "48acdaded60c6b75fce06a0d61183ee99950c0ec"; - sha256 = "0rijq9xwm3n84vpjzyvcpy6r58y6ma2pxj61h86122wda5ymwxwg"; + rev = "7bdd7fc4b4c9f0342e8cbac617b7e5299bd056a1"; + sha256 = "1c10gcfb43f0zq48kmlmhdvmpmgr8likkl7xbjqhkjcsj520qlj5"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -10558,12 +10558,12 @@ final: prev: vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2021-11-05"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "710fe7c2f3c636fae0b5cac041ff8da028a0777f"; - sha256 = "0m3nsy0ks3rljwmaiygb4v3m58a2xnhavawzmms0fh1lsyyzcp1d"; + rev = "74bd5bf46a63b982b100466f9fd47d2d0597fcdd"; + sha256 = "1m9zpxlk1iz1wxylq4nrrlyv111f4my11jf1h5ff25l1acbgxvrw"; }; meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; @@ -10666,12 +10666,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2022-03-08"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "f07ab590e5dc91ded9ef8988b93e686965001dfa"; - sha256 = "0gss50z473cqvpasj9nihvcb2yl43vwb2911v9d6kd5yxvs75hzz"; + rev = "0633b4a1ce6cc32b07d1b473de8d25f5565d579c"; + sha256 = "0bk68zpl4rv414773c9g1vi1qwqcrqp832lmx2hmlraak80dkk0z"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10762,12 +10762,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-03-03"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "4e1d1456fd7d1d5d6cff256578a3e3bbeeb24e62"; - sha256 = "1pwqwbiwgnfxwilazdzgd1yzpkh642wzlpwlvn6jx1n0fywmb60j"; + rev = "3c40345e100624e2a8946457839e80f526acbe3b"; + sha256 = "1xla1q6nhv7r2hyidnsvd47k3gyj6j16bzkmr9y9c1q2szwfjbdp"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -10846,12 +10846,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-02-27"; + version = "2022-03-17"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "63967c60feb2034158bdbcf061c171e3bb4d8b99"; - sha256 = "1vqlmx16n9b53qv6kx2dqaq54k5jw8c15zgdvr69ddljksw80mjk"; + rev = "61f122ebc41e9bcf1793c752a728db59feee77bb"; + sha256 = "1p9b2xgfcfbikadb2250ja0zbz1hcj02knqj5jw5kr3fp170100h"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -11183,12 +11183,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-03-09"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "d601fd8c4635cc127d48d6219881215782bf0b2a"; - sha256 = "1rniy8sl4pr0k2j49yvkbsj4lax6qb6lmyay7svksqyzjy3rndcl"; + rev = "1da5d790a7b5c073453bcddf34da8145df04b32f"; + sha256 = "1x2hlfy3r4qsgshhlz73qdjrjrnzj88z5h9vhnvml4sljf5y9r2d"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -11243,12 +11243,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-03-02"; + version = "2022-03-19"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "5b3d26c0850e3347ebb39b90c3d4e04e883edd36"; - sha256 = "1r63pn6gj2nnjayhxyxm9jhxlsqzrcn847pfmfp3ndh0fradhlzz"; + rev = "2a35653111b023660b519f6dbd95c97996ce8b02"; + sha256 = "1b840fnfqh19p2gzhc1xxisn0gyw756miian4znk0zzj2wlja151"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11315,12 +11315,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-08-31"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "e20908963d9b0114e5da1eacbc516e4b09cf5803"; - sha256 = "02y91annhsrq6m9lnnvrla08g3z4chmpdrfrlzf252s26062mwdv"; + rev = "f8914382614eaba8995fc109917ab4b1c186795f"; + sha256 = "0b221w5kdlkibjw6m9k72lmj939dmnqm9a2wzdp8k4z6ig22nkgr"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -11687,12 +11687,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-03-08"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "9bec3b99f6303bdcbfba669b21e4260df4f8a02b"; - sha256 = "1ynkcklpdlc5kdfcppz8vk1x4qjc2p8dwnxzigzc78hnrrgb76pz"; + rev = "449ffc306a8540d686f095b8b76d5d81f1f14d07"; + sha256 = "1fadbxarddmk85zk7w30208injr8v7bpmscnpcmphd15xym3s19j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -11700,12 +11700,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-03-04"; + version = "2022-03-21"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "dad71b9053e50d7210cdf4e51e0aced1acd296e0"; - sha256 = "0dkkf4sz9cj768q41a1sijiah0fpc290wfm3agvdlmlbpp3l78vx"; + rev = "332ce001ea5950276ce771760fb7125461071021"; + sha256 = "0p833kw9xb75sg9cfw2qp6yr9nfypdyj18sf3kq8qnyqz5hiz4kk"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -11796,36 +11796,36 @@ final: prev: webapi-vim = buildVimPluginFrom2Nix { pname = "webapi-vim"; - version = "2021-06-04"; + version = "2022-03-11"; src = fetchFromGitHub { owner = "mattn"; repo = "webapi-vim"; - rev = "b09cbd3a27157a5baf0468403b392f577adefe45"; - sha256 = "17vlzg5dm5phirwyk8xkqnrkplybd8d5rj9kdx7rgla3h7rqn4wg"; + rev = "e9fdce27dc542f491c034a288bce5d74a79fb92d"; + sha256 = "09shpfr42h96qv4s9z3csjk39ppqmyxi183kpnli4479mc4z4df4"; }; meta.homepage = "https://github.com/mattn/webapi-vim/"; }; which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2022-01-19"; + version = "2022-03-18"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "28d2bd129575b5e9ebddd88506601290bb2bb221"; - sha256 = "13k1q7zkwr5bfc2lj97nk4npy0gk49r1qbac49aib7fyzirkagkg"; + rev = "a3c19ec5754debb7bf38a8404e36a9287b282430"; + sha256 = "00kkl785ifx5sg49q65d4yzdgf08gyriqrils5n4zhz4pksd5z1a"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2022-02-12"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "f49592d297eff4c485ac28927fc7945c165197d6"; - sha256 = "14sxz4vfzrqwa9qxw9pprj34v7z4gmdz0k1xdkyjcx6fzmny7ycn"; + rev = "b59648ad8588bcba377f4eecdea317796ebd1f9d"; + sha256 = "0aic96isjssgmlqkr30m9j3895v27f3hgkgsqbl3zwkvjqa218d6"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -11953,12 +11953,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2022-02-22"; + version = "2022-03-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "aec79589040497cd0cb0701e089d8d80dc6de996"; - sha256 = "16nnq95hvprr5wkbrx4slrfjspcshhx4halij3spldrxy40mbm2m"; + rev = "e32a82c322c680fa3aeef615874cf049669a360b"; + sha256 = "193bdarjk23ny526yyn6w39chsgy3rzpf1iwlwgik4g125jld9y4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -12026,12 +12026,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2022-03-03"; + version = "2022-03-15"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "118d9b74970899cae309823b75ddee3af999a74c"; - sha256 = "1q9gbzyrx5j95jwly0qc41lyaqpsk6wq82w2h8d0q3abfxwisy11"; + rev = "dd5e2c2384d42eaffadd5a8fd749b0499a90a7ac"; + sha256 = "0qbjnmjf057phxkzhsyys9x0620szbgr3awqzgxr3cflyd1zhrf4"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; From 6175651c4294954b0e7eadd34725de779ff10c7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 09:57:14 +0000 Subject: [PATCH 37/84] python310Packages.azure-mgmt-cdn: 11.0.0 -> 12.0.0 --- pkgs/development/python-modules/azure-mgmt-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix index ca662f6b1455..af3a30a117fd 100644 --- a/pkgs/development/python-modules/azure-mgmt-cdn/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cdn/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cdn"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; + sha256 = "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; }; propagatedBuildInputs = [ From c4016b5b8ce20cbf01785fc017f7e37ad925b59c Mon Sep 17 00:00:00 2001 From: Alexander Nortung Date: Tue, 22 Mar 2022 11:15:14 +0100 Subject: [PATCH 38/84] session-desktop-appimage: 1.7.7 -> 1.7.9 --- .../instant-messengers/session-desktop-appimage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index 9126a587dc7a..71748ee77b2f 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -5,10 +5,10 @@ appimageTools.wrapType2 rec { pname = "session-desktop-appimage"; - version = "1.7.7"; + version = "1.7.9"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "iMJk7/Q3Kh2KwLs0m+DAPVv471iPZcsIs4+YCSbmeIo="; + sha256 = "ca7754e59146633b71e66b02a90cff87e4f2574e57ff831ca4a5f983b7e2fbef"; }; meta = with lib; { From fa3fed2a3ebde4d8aa22ff1a7200515449b14513 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 10:18:55 +0000 Subject: [PATCH 39/84] libqb: 2.0.4 -> 2.0.5 --- pkgs/development/libraries/libqb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index fa448fa09695..2fc1c7b7360d 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s6b2/bCVNzr3IBqiSAjiJ/DHCqkRwR1aA+J4uBP5mO4="; + sha256 = "sha256-G49JBEUkO4ySAamvI7xN6ct1SvN4afcOmdrzpDL90FE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 11901d89c45423ec6787a37001203f3905fe06d9 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Fri, 18 Mar 2022 14:18:55 -0500 Subject: [PATCH 40/84] dmtcp: 2021-03-01 -> 2022-02-28 --- pkgs/os-specific/linux/dmtcp/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index 50124a2bf452..6315d361ed68 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, bash, perl, python2 }: - -# There are fixes for python3 compatibility on master +{ lib, stdenv, fetchFromGitHub, bash, perl, python3 }: stdenv.mkDerivation rec { pname = "dmtcp"; - version = "unstable-2021-03-01"; + version = "unstable-2022-02-28"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "f999adbb8e88fe452a0e57ceb43b6eed7b4409f9"; - sha256 = "sha256-codCHQui3fGfUZSNq8GuH4ad/GjD6I/S9rX83o8oFPc="; + rev = "133687764c6742906006a1d247e3b83cd860fa1d"; + hash = "sha256-9Vr8IhoeATCfyt7Lp7kYe/7e87mFX9KMNGTqxJgIztE="; }; dontDisableStatic = true; @@ -30,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace test/autotest.py \ --replace /bin/bash ${bash}/bin/bash \ --replace /usr/bin/perl ${perl}/bin/perl \ - --replace /usr/bin/python ${python2}/bin/python \ + --replace /usr/bin/python ${python3.interpreter} \ --replace "os.environ['USER']" "\"nixbld1\"" \ --replace "os.getenv('USER')" "\"nixbld1\"" ''; From 37102b6bffa5e5efbb021c39f1271cf5c396a6a2 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 22 Mar 2022 06:19:39 -0500 Subject: [PATCH 41/84] bookworm: 1.1.2 -> unstable-2022-01-09 --- pkgs/applications/office/bookworm/default.nix | 81 ++++++++++++------- 1 file changed, 53 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index 100818ad249d..9cdbd14e105c 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,42 +1,67 @@ -{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee -, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook -, appstream, desktop-file-utils }: +{ lib +, stdenv +, fetchFromGitHub +, appstream +, bash +, coreutils +, curl +, desktop-file-utils +, glib +, gnugrep +, gobject-introspection +, gtk3 +, html2text +, libgee +, libxml2 +, meson +, ninja +, pantheon +, pkg-config +, poppler +, poppler_utils +, python3 +, sqlite +, unar +, unzip +, vala +, webkitgtk +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "bookworm"; - version = "1.1.2"; + version = "unstable-2022-01-09"; src = fetchFromGitHub { owner = "babluboy"; repo = pname; - rev = version; - sha256 = "0w0rlyahpgx0l6inkbj106agbnr2czil0vdcy1zzv70apnjz488j"; + rev = "f3df858ce748a6bbc43f03a6e261ff76a6d7d303"; + hash = "sha256-mLyJfblF5WnWBV3rX1ZRupccou4t5mBpo3W7+ECNMVI="; }; nativeBuildInputs = [ bash - gobject-introspection - libxml2 meson ninja pkg-config - python3 vala wrapGAppsHook ]; buildInputs = [ - pantheon.granite - glib - libgee - gtk3 - html2text - poppler - python2 - sqlite - webkitgtk appstream desktop-file-utils + glib + gobject-introspection + gtk3 + html2text + libgee + libxml2 + pantheon.granite + poppler + python3 + sqlite + webkitgtk ]; postPatch = '' @@ -57,13 +82,13 @@ stdenv.mkDerivation rec { patchShebangs $out/share/bookworm/scripts/tasks/*.sh ''; - meta = with lib; { - description = "A simple, focused eBook reader"; - longDescription = '' - Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. - ''; - homepage = "https://babluboy.github.io/bookworm/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; - } + meta = with lib; { + description = "A simple, focused eBook reader"; + longDescription = '' + Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. + ''; + homepage = "https://babluboy.github.io/bookworm/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} From c7b7ad77985e941081dc635d39b5debb0c3155dd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Mar 2022 23:05:27 +0000 Subject: [PATCH 42/84] libudev-zero: 1.0.0 -> 1.0.1 --- .../libraries/libudev-zero/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libudev-zero/default.nix b/pkgs/development/libraries/libudev-zero/default.nix index 9b154f34205e..1c12504aa38c 100644 --- a/pkgs/development/libraries/libudev-zero/default.nix +++ b/pkgs/development/libraries/libudev-zero/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libudev-zero"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "illiliti"; repo = "libudev-zero"; rev = version; - sha256 = "0mln7iwyz7lxz8dx7bx7b47j6yws1dvfq35qsdcwg3wwmd4ngsz6"; + sha256 = "1dg6zqy8w3gxca8clz6hhv4jyvz8jdwvpmn9y289nrms1zx1jcs5"; }; - patches = [ - # Fix static. - # https://github.com/illiliti/libudev-zero/pull/48 - (fetchpatch { - url = "https://github.com/illiliti/libudev-zero/commit/505c61819b371a1802e054fe2601e64f2dc6d79e.patch"; - sha256 = "0y06rgjv73dd7fi3a0dlabcc8ryk3yhbsyrrhnnn3v36y1wz6m0g"; - }) - ]; - makeFlags = [ "PREFIX=$(out)" ]; # Just let the installPhase build stuff, because there's no @@ -31,6 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/illiliti/libudev-zero"; description = "Daemonless replacement for libudev"; + changelog = "https://github.com/illiliti/libudev-zero/releases/tag/${version}"; maintainers = with maintainers; [ qyliss shamilton ]; license = licenses.isc; platforms = platforms.linux; From 5b1c414be6941eebcf9a63b644f091a6bac2d5dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 11:38:07 +0000 Subject: [PATCH 43/84] python39Packages.sentry-sdk: 1.5.6 -> 1.5.8 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index dbb85c911102..51e6c76de5db 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.6"; + version = "1.5.8"; format = "setuptools"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - sha256 = "sha256-PxoxOeFdmmfpXBnGs9D5aKP6vlGKx9nPO3ngYuTa+Rs="; + sha256 = "sha256-28MkwQog+Abk1PSDPWbah650YATiGCBWaTbFO52KgzY="; }; propagatedBuildInputs = [ From 9496786b36c435d3424f9f27215d87c75e14ed6e Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 22 Mar 2022 06:46:32 -0600 Subject: [PATCH 44/84] cfn-nag: init at 0.8.9 --- pkgs/development/tools/cfn-nag/Gemfile | 2 + pkgs/development/tools/cfn-nag/Gemfile.lock | 51 ++++++ pkgs/development/tools/cfn-nag/default.nix | 19 ++ pkgs/development/tools/cfn-nag/gemset.nix | 189 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 263 insertions(+) create mode 100644 pkgs/development/tools/cfn-nag/Gemfile create mode 100644 pkgs/development/tools/cfn-nag/Gemfile.lock create mode 100644 pkgs/development/tools/cfn-nag/default.nix create mode 100644 pkgs/development/tools/cfn-nag/gemset.nix diff --git a/pkgs/development/tools/cfn-nag/Gemfile b/pkgs/development/tools/cfn-nag/Gemfile new file mode 100644 index 000000000000..5ccc66872d41 --- /dev/null +++ b/pkgs/development/tools/cfn-nag/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'cfn-nag' diff --git a/pkgs/development/tools/cfn-nag/Gemfile.lock b/pkgs/development/tools/cfn-nag/Gemfile.lock new file mode 100644 index 000000000000..86bfdad86108 --- /dev/null +++ b/pkgs/development/tools/cfn-nag/Gemfile.lock @@ -0,0 +1,51 @@ +GEM + remote: https://rubygems.org/ + specs: + aws-eventstream (1.2.0) + aws-partitions (1.568.0) + aws-sdk-core (3.130.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.525.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-kms (1.55.0) + aws-sdk-core (~> 3, >= 3.127.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.113.0) + aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.4.0) + aws-eventstream (~> 1, >= 1.0.2) + cfn-model (0.6.6) + kwalify (= 0.7.2) + psych (~> 3) + cfn-nag (0.8.9) + aws-sdk-s3 (~> 1.76) + cfn-model (= 0.6.6) + lightly (~> 0.3.2) + logging (~> 2.2.2) + netaddr (~> 2.0.4) + optimist (~> 3.0.0) + rexml + jmespath (1.6.1) + kwalify (0.7.2) + lightly (0.3.3) + little-plugger (1.1.4) + logging (2.2.2) + little-plugger (~> 1.1) + multi_json (~> 1.10) + multi_json (1.15.0) + netaddr (2.0.5) + optimist (3.0.1) + psych (3.3.2) + rexml (3.2.5) + +PLATFORMS + ruby + +DEPENDENCIES + cfn-nag + +BUNDLED WITH + 2.2.28 diff --git a/pkgs/development/tools/cfn-nag/default.nix b/pkgs/development/tools/cfn-nag/default.nix new file mode 100644 index 000000000000..4e25f052401d --- /dev/null +++ b/pkgs/development/tools/cfn-nag/default.nix @@ -0,0 +1,19 @@ +{ lib, bundlerEnv, bundlerUpdateScript, ruby }: + +bundlerEnv { + pname = "cfn-nag"; + version = "0.8.9"; + + inherit ruby; + gemdir = ./.; + + passthru.updateScript = bundlerUpdateScript "cfn-nag"; + + meta = with lib; { + description = "Linting tool for CloudFormation templates"; + homepage = "https://github.com/stelligent/cfn_nag"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/cfn-nag/gemset.nix b/pkgs/development/tools/cfn-nag/gemset.nix new file mode 100644 index 000000000000..e2e39f7a8137 --- /dev/null +++ b/pkgs/development/tools/cfn-nag/gemset.nix @@ -0,0 +1,189 @@ +{ + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ap27g6hxcczpb5dj7v0wzxrvywfa2kf3zx69xnjz1qvxf3plw54"; + type = "gem"; + }; + version = "1.568.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ymvp06k46gvkpvz5zaqvbvr6wd8vdka5iq25q0wd0fzdx7aivm"; + type = "gem"; + }; + version = "3.130.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi"; + type = "gem"; + }; + version = "1.55.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax"; + type = "gem"; + }; + version = "1.113.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + type = "gem"; + }; + version = "1.4.0"; + }; + cfn-model = { + dependencies = ["kwalify" "psych"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b3ix36yfnfwyxb4w9ss8a7nc6w15m1wbj3q8rarsqjrs3xj6wjs"; + type = "gem"; + }; + version = "0.6.6"; + }; + cfn-nag = { + dependencies = ["aws-sdk-s3" "cfn-model" "lightly" "logging" "netaddr" "optimist" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14qlnflxx5chjvda9n2ka2axcfcjbmn9h00cija8k7kvpy1dgqga"; + type = "gem"; + }; + version = "0.8.9"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; + type = "gem"; + }; + version = "1.6.1"; + }; + kwalify = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ngxg3ysq5vip9dn3d32ajc7ly61kdin86hfycm1hkrcvkkn1vjf"; + type = "gem"; + }; + version = "0.7.2"; + }; + lightly = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sgj2r6j7qxb9vqzkx5isjbphi38rplk4h8838am0cjcpq5h3jb3"; + type = "gem"; + }; + version = "0.3.3"; + }; + little-plugger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + type = "gem"; + }; + version = "2.2.2"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + netaddr = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r7nln9xvrralwwhd5s1q4sghp0k9y7g9z5pinzpqkx715xcpdxm"; + type = "gem"; + }; + version = "2.0.5"; + }; + optimist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + type = "gem"; + }; + version = "3.0.1"; + }; + psych = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10iawnkpa44hcfrapy7yw6zmjn4g1g0y09lw244qiv424f7jasn5"; + type = "gem"; + }; + version = "3.3.2"; + }; + rexml = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d30f5aa539af..686657a0add6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -234,6 +234,8 @@ with pkgs; buf = callPackage ../development/tools/buf { }; + cfn-nag = callPackage ../development/tools/cfn-nag { }; + elfcat = callPackage ../tools/misc/elfcat { }; # Zip file format only allows times after year 1980, which makes e.g. Python wheel building fail with: From 788b69dfe731adca6fece863d151792af0f7fa0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 13:37:11 +0000 Subject: [PATCH 45/84] python310Packages.docplex: 2.22.213 -> 2.23.222 --- pkgs/development/python-modules/docplex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index b7b0231a806e..5f64ee3a6fe7 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.22.213"; + version = "2.23.222"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "8a86bba42b5b65f2e0f88ed350115efeb783b444661e2cfcf3a67d5c59bcb0bd"; + sha256 = "sha256-c5XpfEGTkojgzk+ATHCSzzh04zeEVJEEKBp+lPfS+x4="; }; propagatedBuildInputs = [ From 9ff032c2918ada79edf6598220ae4a9ff43a3462 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Tue, 22 Mar 2022 14:52:22 +0100 Subject: [PATCH 46/84] simgrid: 3.30 -> 3.31 - addition of the optional eigen dependency, used by a new simulation model (bmf) that looks very promising to take interference phenomena into account while remaining coarse-grained. - enabled the new dependency by default as I think this is interesting for most users. --- pkgs/applications/science/misc/simgrid/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 888419fbc86f..4867e6c9ed55 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -4,6 +4,7 @@ , buildJavaBindings ? false, openjdk , buildPythonBindings ? true, python3Packages , modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw +, bmfSupport ? true, eigen , minimalBindings ? false , debug ? false , optimize ? (!debug) @@ -19,14 +20,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.30"; + version = "3.31"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1dg8ywqif20g0fs8dnd6364n080nvwx7f444zcfwqwz6iax61qv1"; + sha256 = "sha256-K6YkkCMxc2lqxHIwyuLiwcp3m49sqbEtOlwZh4L1YJg="; }; propagatedBuildInputs = [ boost ]; @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { ++ optionals buildJavaBindings [ openjdk ] ++ optionals buildPythonBindings [ python3Packages.pybind11 ] ++ optionals buildDocumentation [ fig2dev ghostscript doxygen ] + ++ optionals bmfSupport [ eigen ] ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; outputs = [ "out" ] From 086c5106d1bc351caac49e8a40bb99b16182823c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 22 Mar 2022 15:17:43 +0100 Subject: [PATCH 47/84] u9fs: unstable-2020-11-21 -> unstable-2021-25 * Use new (?) upstream over disappeared 9front hg repo, see also https://www.mail-archive.com/9fans@9fans.net/msg39324.html * Link to Plan 9 Foundation's man page viewer as the Bell Labs has gone offine. --- pkgs/servers/u9fs/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index b99bf43b5822..0f50b1e18dd7 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchhg }: +{ lib, stdenv, fetchFromBitbucket }: stdenv.mkDerivation { pname = "u9fs"; - version = "unstable-2020-11-21"; + version = "unstable-2021-01-25"; - src = fetchhg { - url = "https://code.9front.org/hg/plan9front"; - rev = "6eef4d6a9bce"; - sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6"; + src = fetchFromBitbucket { + owner = "plan9-from-bell-labs"; + repo = "u9fs"; + rev = "d65923fd17e8b158350d3ccd6a4e32b89b15014a"; + sha256 = "0h06l7ciikp3gzrr550z0fyrfp3y2067dfd3rxxw0q95z4l6vhy1"; }; installPhase = '' @@ -17,7 +18,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Serve 9P from Unix"; - homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs"; + homepage = "http://p9f.org/magic/man2html?man=u9fs§=4"; license = licenses.free; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; From 23b9ad346a30b89b4e080b0a062700a305a99851 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Thu, 17 Mar 2022 14:56:50 +0000 Subject: [PATCH 48/84] exploitdb: 2022-03-15 -> 2022-03-22 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 4338576c75e8..9df04ca06274 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-03-15"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-whV7zg7njGGjUpxsXZiNwVfHgrlop2RLZnCsBWQ+HkY="; + sha256 = "sha256-2V6levydKfYtpctgcyBuLES0OujWi8eqlB3x/YoOyHY="; }; From be37c9a4e1466e9e1610c83ab201279a31325f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 18 Feb 2022 15:48:19 -0300 Subject: [PATCH 49/84] graphite-gtk-theme: add update script --- pkgs/data/themes/graphite-gtk-theme/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 0c9bae8ac31e..cee243fbb20a 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, gitUpdater , gnome-themes-extra , gtk-engine-murrine , jdupes @@ -24,7 +25,7 @@ lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVaria lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { inherit pname; version = "unstable-2022-02-04"; @@ -85,6 +86,8 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; + passthru.updateScript = gitUpdater { inherit pname version; }; + meta = with lib; { description = "Flat Gtk+ theme based on Elegant Design"; homepage = "https://github.com/vinceliuice/Graphite-gtk-theme"; From 5af555af48164cf4d0b8326468c7d5a499b00e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 22 Mar 2022 12:55:34 -0300 Subject: [PATCH 50/84] graphite-gtk-theme: unstable-2022-02-04 -> 2022-03-22 --- pkgs/data/themes/graphite-gtk-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index cee243fbb20a..132e2e9c3762 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -22,18 +22,18 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dark" "rimless" "normal" ] tweaks lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { inherit pname; - version = "unstable-2022-02-04"; + version = "2022-03-22"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891"; - sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr"; + sha256 = "maYHA+AICoPiZo62IJ52UFUhOZh+6m2e9z6Kz0zrsSc="; }; nativeBuildInputs = [ From c7172046c7aa28bce8ce3f024d74518669cedfbe Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 22 Mar 2022 18:35:33 +0100 Subject: [PATCH 51/84] nixos-rebuild: add meta & add Profpatsch as maintainer --- pkgs/os-specific/linux/nixos-rebuild/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 58712835d60f..34611d3f4009 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -25,4 +25,12 @@ substituteAll { passthru.tests = { simple-installer-test = nixosTests.installer.simple; }; + + meta = { + description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote."; + homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.Profpatsch ]; + mainProgram = "nixos-rebuild"; + }; } From 1bf88c64d8af2c861b19bc1a413e00eb086a64eb Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 22 Mar 2022 14:09:39 -0400 Subject: [PATCH 52/84] qscintilla: 2.13.1 -> 2.13.2 --- pkgs/development/libraries/qscintilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 88c44ece32cd..4aff530877a0 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "qscintilla-qt5"; - version = "2.13.1"; + version = "2.13.2"; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"; - sha256 = "gA49IHGpa8zNdYE0avDS/ij8MM1oUwy4MCaF0BOv1Uo="; + sha256 = "sha256-tsfl8ntR0l8J/mz4Sumn8Idq8NZdjMtVEQnm57JYhfQ="; }; sourceRoot = "QScintilla_src-${version}/src"; From 94fa436e1b208d5c5dc4c2afa2f4ccbc3a2122ca Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Tue, 22 Mar 2022 15:14:22 -0300 Subject: [PATCH 53/84] Zettlr: 2.2.3 -> 2.2.4 --- pkgs/applications/misc/zettlr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 0d4c21dbfead..b0d1b79509a6 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -10,11 +10,11 @@ # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. let pname = "zettlr"; - version = "2.2.3"; + version = "2.2.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage"; - sha256 = "sha256-BXStGhCEXpQRyLjcS00CM/NI/NVRKpLTlW8Xh51fV8w="; + sha256 = "sha256-lzXciToyUsHl8WV0IvdP6R2pYegL7/G04YPLb6gbCgQ="; }; appimageContents = appimageTools.extractType2 { inherit name src; From dd9d0d51bcb91b4096aca0c396c14f3f382b091a Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 22 Mar 2022 20:01:10 +0100 Subject: [PATCH 54/84] ugrep: 3.7.1 -> 3.7.6 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 8fc299fa6c00..7a921bdd11f5 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.7.1"; + version = "3.7.6"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - hash = "sha256-5ZlZ/nCUOiyOWagF1Vla945d7zKbMsHp56ZE4HwdEP4="; + sha256 = "sha256-fOp+nf/xZKOw8CDI1RSl/DQH52ay/M/aeSMf6MdfKmQ="; }; buildInputs = [ From 40b9dfc73958dc311c1b1d197658bf204868080b Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Thu, 17 Mar 2022 18:30:37 +0000 Subject: [PATCH 55/84] syft: 0.41.6 -> 0.42.2 --- pkgs/tools/admin/syft/default.nix | 21 ++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index cf261187c527..2bd735c33e91 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,27 +2,25 @@ buildGoModule rec { pname = "syft"; - version = "0.41.6"; + version = "0.42.2"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ebs0IVdcll7bTNjoZalD5Ye0GFXJeas1nPseYLzZxOk="; + sha256 = "sha256-ejyUe2FM8pNQO9esWi9QbSiq6PVEjGbRu+AEnbCFqDE="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; postFetch = '' cd "$out" - commit="$(git rev-parse HEAD)" - source_date_epoch="$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad)" - substituteInPlace "$out/internal/version/build.go" \ - --replace 'gitCommit = valueNotProvided' "gitCommit = \"$commit\"" \ - --replace 'buildDate = valueNotProvided' "buildDate = \"$source_date_epoch\"" + git rev-parse HEAD > $out/COMMIT + # 0000-00-00T00:00:00Z + date -u -d "@$(git log -1 --pretty=%ct)" "+%Y-%m-%dT%H:%M:%SZ" > $out/SOURCE_DATE_EPOCH find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-/WGkQfCUDmolGdzNxIZKzZnXWnqO2vvizBLJgO+s4Ak="; + vendorSha256 = "sha256-o5Gq4ZN9H/rXSfIeU2hlExzV5KQZP9DfQsWbOZOB43E="; nativeBuildInputs = [ installShellFiles ]; @@ -32,10 +30,15 @@ buildGoModule rec { "-s" "-w" "-X github.com/anchore/syft/internal/version.version=${version}" - "-X github.com/anchore/syft/internal/version.gitTreeState=clean" "-X github.com/anchore/syft/internal/version.gitDescription=v${version}" + "-X github.com/anchore/syft/internal/version.gitTreeState=clean" ]; + preBuild = '' + ldflags+=" -X github.com/anchore/syft/internal/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X github.com/anchore/syft/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + # tests require a running docker instance doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5eadc4a2c85c..c19a3ee32ac4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10299,7 +10299,9 @@ with pkgs; systrayhelper = callPackage ../tools/misc/systrayhelper {}; - syft = callPackage ../tools/admin/syft { }; + syft = callPackage ../tools/admin/syft { + buildGoModule = buildGo118Module; + }; Sylk = callPackage ../applications/networking/Sylk {}; From d1bb89b5cbe59dd575c49cd3229ef08b88ea1067 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 19:16:13 +0000 Subject: [PATCH 56/84] python310Packages.ibm-cloud-sdk-core: 3.15.0 -> 3.15.1 --- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 6345eebad1bc..b505182b4fb5 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.15.0"; + version = "3.15.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oHQXgiW80zqgpyt5osbBCtoT3XYCGEk4mgKPIsMmBHY="; + sha256 = "sha256-bGTr8Qf7ywlbsl6/FEJEjFB/bqyyMwfmjVVAsrgmkTg="; }; propagatedBuildInputs = [ From 04f60d49c8dbab8437f37db627da2367fed68d23 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 22 Mar 2022 22:16:46 +0200 Subject: [PATCH 57/84] nixVersion.unstable: pre20220311 -> pre20220322 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 8eb8fef82983..4510948b436b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -74,12 +74,12 @@ in lib.makeExtensible (self: { unstable = lib.lowPrio (common rec { version = "2.8"; - suffix = "pre20220311_${lib.substring 0 7 src.rev}"; + suffix = "pre20220322_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "d5322698a2abbc6d141e1d244e17b0d226a2f18b"; - sha256 = "sha256-7rQSktGC8+DmeyGOnzFMy1QwAYnw4JJphv+lEwFCwfU="; + rev = "d5d4d980427aca3849b90bfe1694b6d1d14532fb"; + sha256 = "sha256-fV7nUcRhVmgIvDUraAzHV2TDVHDn1jETfv2zdDMQ59Y="; }; }); }) From 25e7d38000b7dd99ee7782befc25de41a1558c5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 00:53:33 +0000 Subject: [PATCH 58/84] act: 0.2.25 -> 0.2.26 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 43bcaa57309d..10fc62fdeffa 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.25"; + version = "0.2.26"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Eo5uWBLriYa7tLpPMa34+l6BYQe9useL1tN9gqUSt0k="; + sha256 = "sha256-DBiBJf4hEjn/sJXjAvsiARWz66sDBIz0hFEdCgS8D4g="; }; - vendorSha256 = "sha256-1v87WcQoVyTyCStiMAoThidIMRqJwdsYNF987kQp5YM="; + vendorSha256 = "sha256-5RvFdtEZEQBWvkUKIcV/A+tCSy9V9DJj4HujGQgTxq0="; doCheck = false; From 06518a49919e0d86b3e2845402eb3103679600c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 23 Mar 2022 02:10:19 +0100 Subject: [PATCH 59/84] firefox: 98.0.1 -> 98.0.2 https://www.mozilla.org/en-US/firefox/98.0.2/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f5a156943c72..4789d394b73e 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"; - version = "98.0.1"; + version = "98.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1434ff775e6cdc6d9a75fa0e6d07a4680ada86ecfd7b65208c597ed765e847d900b68df355e6bea6461f6d86ee7a8b2ce3117f23826ad144bd87dfe64ee39b42"; + sha512 = "b567b53fcdc08491063d535545f558ea56ec5be02ca540661de116986245b79f509e0103cea5661faf9f4b3d30b67758ebdb4b30401e260ee27cbb300203f36e"; }; meta = { From 16129972c067a3142670dd74d60a707f3a9d1b56 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 23 Mar 2022 02:11:55 +0100 Subject: [PATCH 60/84] firefox-bin: 98.0.1 -> 98.0.2 https://www.mozilla.org/en-US/firefox/98.0.2/releasenotes/ --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index d7b63fe46bb5..080fec91c1ca 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "98.0"; + version = "98.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ach/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ach/firefox-98.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "92fe50154b763faba3d923ba19be737a7e6c48c04652275da2727489c0f3b14f"; + sha256 = "e40a11afbb7a464eb7817457cf360ec2b4e0d77b8d5db5d7856c5b79cdb1425e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/af/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/af/firefox-98.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f086d9cf3142c7adebff590702f497e1f99d74ccb69b7001851e1b0329b9ff7e"; + sha256 = "8d0570e82ec73708933cbe2cacd53d89503cdc7d1e97cc57edaa066960340a1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/an/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/an/firefox-98.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5e7e8fa95293bf2921596ecddd10217f10682e4a576b3f0f8c70021ee785afb2"; + sha256 = "04403b0d68911dde99880c76d1e87f1315d1c463a63711e37e0f40abbfd9c2eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ar/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ar/firefox-98.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "cf7e5bfe6fcc19e0e6ac6b2646118e25b471cffc025d1de85ac62b0569582285"; + sha256 = "57ab64dfa19fead2a828333456921465cd77e37a36d2030f81b7c022062fe215"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ast/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ast/firefox-98.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "54c694772844caf3946520aa624d8a5c8d2d21ab29c64bc1c438011ad830d001"; + sha256 = "3dfb8f3c288e6c910d929da7c0228c52c490e33a1fbc99ce90c231e81cd9896d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/az/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/az/firefox-98.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0e342f5bc920684c2b7ae988a983e27e0bdf130b6f1e210952139edee2ea9827"; + sha256 = "b5fc1a8d7decd2372026f9e4d4d8bb4d5fd839b165168f01e08a9641c0d7f92e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/be/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/be/firefox-98.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "89973f6718cfb63e43713594089618355e5c8323b3912a7a67d4d0fdfbe1cfd5"; + sha256 = "8b1fffc493c20318533879ecf9a006d0215d7c6f2323134fadecdfea68aaaa6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bg/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bg/firefox-98.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b7ea5573feb114ba63e5f0b516f36d134b4015a262c2e7f824dcce5cf31d7058"; + sha256 = "852016bb71423b058a195d1b8631331a6da144a20c0d74b641d6189c93730ad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bn/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bn/firefox-98.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "bc4837219822c224b556c826f83bc913f9454da7aa9b26ff3a44119e5284b63d"; + sha256 = "748e7303d01ca41fed55dc31d0bb57458c69180499bb5915ca4c835f7fdb56c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/br/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/br/firefox-98.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "36d61c43e4aaf323763676ca5ac5be3e4c23af46b4aeb00409ca7391cdf60143"; + sha256 = "efc2e20d5201621c76411ffc3c7df227c9462bb6994f7ad19d735c986c362aa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/bs/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/bs/firefox-98.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "6215685be94ad53ea827a6366673a14c327d2e4fc94fca51918b6cb2a8fb5897"; + sha256 = "adb507af1a64e2c72193942b2c3a839576ca7d493541bdfed06b0f838f3bef43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ca-valencia/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ca-valencia/firefox-98.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "15220b2edf948b6027d391bf0140becb69f529565094f5f10a65b090456cc295"; + sha256 = "1cb7d989fcb1ca726d022a2e20523427d9aa0718d2129cea5102971624edff61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ca/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ca/firefox-98.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1060f9d8a46d078b3a1234116a2b963537213084e74dec8fc6b2598a8e863196"; + sha256 = "0d746e8c8ca233d4f4161134f920a44e1a3593a2277101e20184087f76a443b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cak/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cak/firefox-98.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "03a302fe8bea3dd231b204946cd843850526652ffd2b77b4110c97ddcd6b4f54"; + sha256 = "fac629e27bb9e60fef81fa58268f9367a95af59b299a628ffe692731fd5ae4c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cs/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cs/firefox-98.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6815701642c6a76a3ee5f75433aa91d8e0e23b8a68c3f2204862703a4426fede"; + sha256 = "7f6f30ea9afac44b1d1fde8abe2701f8f83b3014aa1c98fba1e2c4ae6c841140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/cy/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/cy/firefox-98.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "f68a21a0dd833f51a9d8e66e0c5d970b5d704472728e3585512d07fcbd28c470"; + sha256 = "63c2b0bf442365c7db1cf96f192db016c4ddd4233a32190d657779a254871a2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/da/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/da/firefox-98.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "66689f2a8ebdce69f3f83edf2e626017c51dfd823340a946e23550d93cbcfc80"; + sha256 = "f7d18039814a6310ce4a4e37d10d131639868a6f5ae85c4718ca1f9ceb90ae13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/de/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/de/firefox-98.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "183b0453e691f33ea7844a8a0b4fe91cacfca64b07375d85a84dc58aa95fdc5b"; + sha256 = "736f10e89507455708e40c9cdbd093fb1cb802ada7dd5d3e0d612cb0e11db096"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/dsb/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/dsb/firefox-98.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b129086ca18bf18ab583015c2602710e7164a53bb262c8e3ecdc62092d88eed5"; + sha256 = "50ca85b163011ebdda69be8772a76ff4a912653a03d527784b18bbffd7c63a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/el/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/el/firefox-98.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "46f9fc4b9cabb2e9fbee8a6453b7e5cccbed4dc7529717e917e4c3be3bb7fc54"; + sha256 = "4b3a28670c6a7577f65dba7f857e8c68009a8d1e80089707d8d830e02a5f7fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-CA/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-CA/firefox-98.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5f7f255b6d210709f716920989f835f4908bdf02a5a2c1f9c12a393e03da6a8f"; + sha256 = "f3a7c9de172b6ec0673d2600537ab9265cf3cde3e2fa614424e9f4c08986eb7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-GB/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-GB/firefox-98.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a940242819cf79b1bd834520358e0aaea24e682cd5019668f356460a6815e4c9"; + sha256 = "49f044b0b5f841d5e42b9c6275dc7c78e2b2f903aa28f0d6a02a25a41d781d23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/en-US/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/en-US/firefox-98.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1a3d68e5e449faec50a427f709b98078bb57aee8209743a0beac978a4a72a05e"; + sha256 = "07c5f3dad0850a92d5c609278fb1fe682b2562fa55e6733c09a6b4da7373bfcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/eo/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/eo/firefox-98.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "d070191b8184943b55c4a68a3b523712ab04b0781ac835ec1f31de5aa170782a"; + sha256 = "98626ef3b514d1ddf0d9d530ef7b3ac8bb504717eb633f036fe9cb9437d8ea56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-AR/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-AR/firefox-98.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d5a3c016b4090b926710c184729f2a59af3c257ec8ba48dcadb6367f67976192"; + sha256 = "86a57a29b086fbc1d59731f94b792d1116a358e4735d9a8d08c022a2d5c7d0d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-CL/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-CL/firefox-98.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "c22546ecc83739731783c6090172b1a8ca9082415881d62c691a97ed27b0813f"; + sha256 = "834bbbe0388631cae1e87e464c0b4e0151c37341828d71dd99fccc2d56c179c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-ES/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-ES/firefox-98.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "33a424c76e44d1ee73e360da08a5aca42ab30bdcc3ad2524c0c209be37121978"; + sha256 = "590efa38b4a374ccac89128a0e84de77492f1a8702e70b3b13d9a456575963f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/es-MX/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/es-MX/firefox-98.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "5ee32de772d925389210cd210c326f3aec85e9ad45b8041a373cf8456008b7eb"; + sha256 = "f64ac621daa5f891541d836727d91cb56d5eb8db6093aa7f83af19adfc49ffc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/et/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/et/firefox-98.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "3bfdba6becdc20002d267ed8d695b72915f4d59073f0c0c5c5858bd383189017"; + sha256 = "08374c6ae7b8eff3b6ce748c87f18136c86f73abf6238383ba3c4b1555f8a003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/eu/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/eu/firefox-98.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2c0669ed569b7676e10330d034802d9ffd24ca85ef38cff0208a7a02cba53d22"; + sha256 = "3ce288c26201feca071bfd56f66fca69da7a68b3a468405ff6a665cb666cd799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fa/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fa/firefox-98.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "c7c8242892426c9cd1f0f60c3235de6dc7d9e77b3b341630c9d6887e34ff2761"; + sha256 = "3bfac0751b251dbd3ddb253973bb1ad7afe58f7cb824bef59d4f6c7dc5acec78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ff/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ff/firefox-98.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "4a7352a86887d5200106ad725e7a41aab1d353547da2c1891fc399424112ba20"; + sha256 = "2b962a0442a12c7f2dd7d2c716fbac0ad9435debf06d1c1e9f95fcb62fb90d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fi/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fi/firefox-98.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "a696aa3e201f6b776610195e8e0130791015229a66082e3f1240d925210db6db"; + sha256 = "705b21bdfa9826563042d0014a9225870c87b3351b9920cca35e203d1375f9b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fr/firefox-98.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "67022f4ed56749d968780a97e1efc14d272a38a96aaf4bc55584e6fe423d48ac"; + sha256 = "e1d9cbb1c529508bb8262b0498506c30c7932b17a7d86d9b5877f44877cea60e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/fy-NL/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/fy-NL/firefox-98.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1718465d4a46d4e8b0fba79b9e0fdadb241183745ad158fa65a3f8d17212d7eb"; + sha256 = "c1b40fb366281b9df839083af4aaaaa7a264e1ce380f9ffe46a2fe181bddd3f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ga-IE/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ga-IE/firefox-98.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "65ea67422e9816b20be8259b5771f3db7f4c414e52cbc9975612a533ad4d6009"; + sha256 = "466ff81e255bed9c03669c974581ee2cfc796e77456dea25af75adb501855c54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gd/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gd/firefox-98.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5ba3f664ee375bf22255c5d9776c8da83747f52aea566a4436d29b91b34afb7e"; + sha256 = "0e1de18ab0b75b43ee8caff97c2963b7047f1000fa8dfdcc4e3fe87f29794c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gl/firefox-98.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "58edc93a8885ae6c2686a8c8f67b93b19fc99376155770b4e72e821d762be0a0"; + sha256 = "56f259c9f2f13d3f366e921aae1fbd069f00d59131cd3a3b31cb0f3e16f2ad74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gn/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gn/firefox-98.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "c5c08869c3390a95de8e490af4e69783bba03fe8d55a1c2b344339cab9fbc4f7"; + sha256 = "b532c79002184bb13a3f197b5c0faf4a24e0b71f737de31c242f9fd286f05aa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/gu-IN/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/gu-IN/firefox-98.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "35f29f0b0574ccbb02cf08d4714e2827ce364876ad7751ba7f1cc24e9f9861c5"; + sha256 = "12ec5c968d852a7a72221373813fca48a4e524e552d22aca50ae99111a7128fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/he/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/he/firefox-98.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "27c5343c95f53dced72958155d7f8af100e3cdb8aabfebc3189f1a9c2550428c"; + sha256 = "3c1c1222a4ffcac6679849c94da395440d417284a922cae16b5edd1cf4ba678d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hi-IN/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hi-IN/firefox-98.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "f8d7111c208a529c8f461284249d1c77f88e8d644c27f398aabdd414a7309802"; + sha256 = "6ae96b87b251917d2c11684ae58ac3df54496cf047b115145a5f85cfb1575b9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hr/firefox-98.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "721b61beae502b2b7039e29b959c2b4b8cde84260b601aa29bbcf80c73a633f6"; + sha256 = "4a77fb11f0d27a4abfc1426136d93404baaa730ffea2a31fe337f11ad92bcc8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hsb/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hsb/firefox-98.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "4eb192a2d3942e0c80ec2f3ba805a19824ab4c1d85e1ada9050409cf0cfd4ef2"; + sha256 = "725e2f719720c84ba06a28c5f025a16a951642c1102f7fe5faa41baede1b6a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hu/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hu/firefox-98.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "70b9a67a51d3e61242c1ece908a81d0ce4b407bfdd9d3592a7025242cfb0ecce"; + sha256 = "4a128951a5466189b703fbf3055a9e65af64f08a7fcd979448611b91a63bb456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/hy-AM/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/hy-AM/firefox-98.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1135df2ba82e8834a8d38e436df2debab2601884c02a9ed876a64044dec9170e"; + sha256 = "70e44a8105ef260b3e10271f1a9c36a5149a485130d5a1219397aff93500639a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ia/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ia/firefox-98.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "0e8b652231ae2962c61a90466d1e8278c11ca3b4ce70432dd3a3541a7bd55760"; + sha256 = "a121636fb2513557f8e7e0a1b30e3d855202db14f997437cc5a6d7863214d385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/id/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/id/firefox-98.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5c35d191e9010e7a0e97844b38573b6fde93ec57e13c1fcb85f3bbe595257bd1"; + sha256 = "eccb423ef76aab7725cd21efda222ed63c030d494c294998f4e9837ecccbbf06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/is/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/is/firefox-98.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "297aebec277c01bcc5dc0fcccc44946181991192e3f485ec4bc0555131f132ed"; + sha256 = "86aac8ae944846967e472d6fd893c40ac988c25a2c2ee9af40485e216bb67b2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/it/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/it/firefox-98.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7d0c7162f4c3c264d5394814c99881e2a39f9fd406e7a32fb5319bf63c3fe344"; + sha256 = "f0ccf0977b3f3e05ed0d07980eca2179a808e0f62930690fb33f17b68c3bdca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ja/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ja/firefox-98.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "eb260c766f1c82d45393d5c7f3c3c945166f837ba02f061691bcb1b3f9d11b90"; + sha256 = "217159ae769b050bf9ff1b04ed80ad85a384625e2ccbf0d9f98c0786dc2e6c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ka/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ka/firefox-98.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ce8f6ee46fe3c8b836fd694b2642be066a81191a9011e33c0853396dea625880"; + sha256 = "c4aa9e994cad797afc081d2031296cac780e76966a7f231e6a0e3187d9e8aef2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kab/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kab/firefox-98.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "05a282afed3bb3e573c4250368b3ff1edc4c322dfa81d30e8f8f3447199fe9c7"; + sha256 = "cc8333cb75f48ea82b752023162a270f18e33cbec610571624a38919737b00c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kk/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kk/firefox-98.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "558a35d13332976880b0cacb69d45f25d72e34d4ef43e7c92260621dc1287ff3"; + sha256 = "3482645b2581284503f72569caedc750706c439346917c07673ed0a27b0bbf36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/km/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/km/firefox-98.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "a3d3f64dc5e55e9b3168e18a64b2bda9d238e10bbc295d7ce7f4c1d964b6553e"; + sha256 = "b70fcfa2b4b4bed16d4fe8af2d57d8b7a4af346f321ece425895c10f7ac058d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/kn/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/kn/firefox-98.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "b06d52db9c0e2984c8a652278595cbd0530512b9bb8e6d5ec5d3015620225bab"; + sha256 = "63550bf8572312f3c69c90f65de89423fc0ac926736723be3034d5d441ceb1e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ko/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ko/firefox-98.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f1edc7483429824478a9a4d2f4f3a03a9adf23e9ae364ce8c50da8d97fb55052"; + sha256 = "de17cda5324ca6d179b9d576b62cde0ed21718b72896b161631513b654540cf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lij/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lij/firefox-98.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "e441db0a47d1265d1280a60c592b4b2ddd33751c1e9b38bd71afc2f25edfe469"; + sha256 = "67cafe6a9f0c01aadb1fb55afe273fb58e4baeb38be2b472ed90a83c72b07ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lt/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lt/firefox-98.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "989c66160ac78aec5a4d543a519e11cad772cbbeb6b5bd30832b04751217d621"; + sha256 = "135773dc11e691c20f20b0a1d37e2b25d92062c573846127c113896708e649d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/lv/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/lv/firefox-98.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "764a3821b57384676d1236e9553007a78583fd277d27174bf4970750ecbcf9e4"; + sha256 = "44bfaf12e5d34e1b8e281d00c7d9a26c2d0aa0a8ffbd74df9a5026e15ac12b66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/mk/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/mk/firefox-98.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "104b650e57a1d521951086fcd337a21fb3133358dce8842c434089454a389f12"; + sha256 = "94d7db6bc2ba9de25207a058d29d8abc57e967dfaf59c3388438953098da9580"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/mr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/mr/firefox-98.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "396359e41e9fbbc03a548e6f77c1a607af0e3c09044d6b57e2cb01fb80fab94a"; + sha256 = "e2ef6708ed116e40d3cc776c483d3cd42c91988673b91d2d29f4da8ea996f1c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ms/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ms/firefox-98.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e8dcb2af15e9fbedb0e3ebdfabdda5f596fd469b6b20e4b6c5eaedc177e6c7bf"; + sha256 = "e376a479d170ff881d6de21f9c03ffc7a4968fccde7347e9fa261de7bb11e427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/my/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/my/firefox-98.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "89e64cb715720dafacbebc7ddd72a5c6cbd69995113f1b7d1e68805b09591df7"; + sha256 = "a1143bce18aaadd340b69403f064574664f202765ee5a8553ac6d3372ab33134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nb-NO/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nb-NO/firefox-98.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "640c4b9f4e23d08df22d67e915cae12ba07aea80ef392658f693bd5a14a23572"; + sha256 = "eebdd022202cb7140db46995a3925c990e614233f3e15b850e5176b1f2c07907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ne-NP/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ne-NP/firefox-98.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "efe07ad3079a3295744b8739d3718374137ee98d39622c0056f079196175dfed"; + sha256 = "084a278fe0b67a51126518d9aa62cae7cf78d96e3f6cf5b191f136a5c20acf84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nl/firefox-98.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d979a5e416109251b0f27a50e5d2831ae2fbf3da6ed3d3e34b52adf2c19221ba"; + sha256 = "fdae25ccd979bdb5b4bb23f4e9e82e432df98059d82732ee187f37c8cb3547d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/nn-NO/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/nn-NO/firefox-98.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "cdffc971080f506d083b7c4fb1edb769046a6b56ad5c6851fd3a09b48d401bfa"; + sha256 = "7ec4c099c7a282a5b38df9a124ea6f2ee3a1704746aa308431aa8c356a57bec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/oc/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/oc/firefox-98.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "7d4206e9e73132f13f5ac5377eb619c796ab1088f8a91958dd13789b0b309995"; + sha256 = "7f6d8ed3a7511d6af408c47c626a3e141425925df364f26a622a088491d7fe5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pa-IN/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pa-IN/firefox-98.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f46a2e85222e39c03019373cfd539ae5354c608e60783151f15bbdd1a8be3b62"; + sha256 = "9fa3699918286b6f9f8829beac8cd45e59f35f389a09e0cbb34dc393885ec8f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pl/firefox-98.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1853fb827d238af7122e9edb0d7553aab00196f5523addc641f93b3f26b02b0d"; + sha256 = "e2ebf0346fb5b626a048a720782e325eefd04f1fe62de5c57826ebdd3ab1bec5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pt-BR/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pt-BR/firefox-98.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a5f4e7c3f0b187bc86c4b085536a8dddd9c2fff6f746db77ed186b6ccc4efb97"; + sha256 = "dc79e634319ffc7221245e2a081cf6bfc15ddcd4bd8bf110d5dc15732aaab33f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/pt-PT/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/pt-PT/firefox-98.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "88dd8f0332d88ccd38ba119acdaeaad4fa3692b45759762871fba67a110af9b3"; + sha256 = "f94ba01eca76939d1ecbfccfd9647c96244effb080df98b4e04d3edfd80ffa48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/rm/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/rm/firefox-98.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7e901202cb7b29f04c481df5bb330faa92e48d41dfe49ab614f089c4787ac36c"; + sha256 = "6b27aee9330a94e659da34f17213522687859263ed8500daf1d62fc496cff033"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ro/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ro/firefox-98.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "149b39e24f83bd14c9befc52ef92639ad02ac2059a247d8521a8e5f8659b0983"; + sha256 = "b6029f72497173e8aef444cb42437d6035354fe4a2bfe6359c50eefa4d6e1850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ru/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ru/firefox-98.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "5739758546b279d77101391edd7cfe236ddbf69434ea89dea6c5d4f857a016e1"; + sha256 = "73cbafa190a5083cfeba8ad0971d28eaaa228b9a9345ddc72d4f5d6490ebbad1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sco/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sco/firefox-98.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "cbb408a2be5d3c15ba7f9e865c02228f65c9ce59d2c29dd081638515404da03a"; + sha256 = "dd2d86ddcd270d2bb58c7152d15072341460a09b2da1639a76ac70afc9a714e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/si/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/si/firefox-98.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "b96e1604af6e1e828230a1a3652f83bdf28247dbcb9961b233d18a9bcc829da9"; + sha256 = "0cf0281b2d082b3861947e5002f843df050586e96027ec30acba2913ce588daf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sk/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sk/firefox-98.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ebe0774a5872e8e9f3ed3c894d10dd9aebcbce1539e56febcbbb7ee97c3ee358"; + sha256 = "8853372fdbe0834f6322e2e1c03d909b2c21f60496d7e679266dfc35e5835191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sl/firefox-98.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2b3e38e812508438768d4f12e545d96f1b7e160d53edd26481ff70510d89388d"; + sha256 = "ce97423a4ad380fb019b3e4c8d57a44bb15ca0b0afc7778a10fd23cb9382c143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/son/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/son/firefox-98.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "df1bc20d146bdb2d1491cb040c4eaac1a70d4af024a00863539b218b6e1098ef"; + sha256 = "468b642210c8c52ef5a8b91ddf81b9ff9c25768d7b0481f361e7c95861dfa5d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sq/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sq/firefox-98.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9b40353c9c9911522fa495d35f19764b220e2c40488205050719c951911dac11"; + sha256 = "8a079436e4be7ceb82b56f02d50054066906b2f819b787ba964d20c64ba731d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sr/firefox-98.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d2ba0fe06528af4fed9907870bd72290df1c433c02bafad8b7b834a24b9a1427"; + sha256 = "e9f0f1a8d6bf3bcb6df32a27560e952e3373d712cee08fb97e1c41b76052d370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/sv-SE/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/sv-SE/firefox-98.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "44fa731f57d2f0639d1e3595eebeb2491cd3dfff7ff8144eac663e966ffa8f6d"; + sha256 = "eb4b4092f1f667661afbce19e0d3ef75301976689f1ea2ee11104d11fea2ddd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/szl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/szl/firefox-98.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "37523769babf48c7c942d878c8c55bc0bd761a0e4df8a0d562416ccff46f8cb6"; + sha256 = "29c9fcd787fafc93480fabb59573dd500d557847079f032a6f3ca6e9c4422c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ta/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ta/firefox-98.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "3aa9dc19988fb6663ac95b6c3b79d03313cd78cb4e80700708ac92c3939d513f"; + sha256 = "f07b8a79048b55d6fd8f7d19858ea2f1b5f53bde782c65ea7fb3f34d9cd5ac40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/te/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/te/firefox-98.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "bd7a1af00c7aaf49c5ba667e7e85bac5672384b68f5f7cb96e4670f7363ff063"; + sha256 = "14882f8a3c425dd512c37f80fd45bdf9d34c4d7163454e1533c6306713935d36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/th/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/th/firefox-98.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "962c9e428f1ab3d3d143920a503dcf6d5335489e7e691a4447c32ddfad0b55d3"; + sha256 = "c91bb2249cd2b22ae86b1b51fe6c34062a4da7772eab97b1e39915a2c2782488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/tl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/tl/firefox-98.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "6ae919a932170ccc3891f0805949e29cd403f6a2e6efed38b76c7817c9533cef"; + sha256 = "1c6fe06f19821a7a77a26bedf38ed3fea20561df0589c672027b2108e080e6b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/tr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/tr/firefox-98.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "27127d6261975f62185966a8d2a9c4e686c92212b8f4e06a36b47d16434413aa"; + sha256 = "c06881993063dcdf6fbfebe139f9fdafe2ca37667375683ae85497603517b5a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/trs/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/trs/firefox-98.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a005665c64968a82221d6332ed20aa6702f197ec31960fd4a4a78871a947586c"; + sha256 = "fcfd9120933339006f1868b27e0fff1d60f562a3d11e826bbf9996f69d4256ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/uk/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/uk/firefox-98.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "866021efaa23457b203bb2700b8f24649222855d7ac1f71bf05ee98469f8c7ca"; + sha256 = "01cabeeb98988d4478d381b34e7c0e6cde887d2ea83feeb349763ee454760924"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/ur/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/ur/firefox-98.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d34a0c4f6937d8f6375c5d056cb615db37673917dfafec7d1f5201c38359a1c2"; + sha256 = "db7de84fed953da53998ae6ff2456a02de833de22d13d1aa7e16f53d3bcb7fb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/uz/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/uz/firefox-98.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "a5098a02bf4a8c983e81b2863afae1cccc007c69556d69432577928a9eed89d8"; + sha256 = "9fe0fc4851f005160de9562123e48c19216cb013dcdd2b8bd2b745d7838062ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/vi/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/vi/firefox-98.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ec7c91879c348fdccbe73b498757d1ad7bb1461df530829012c33c706c023aa0"; + sha256 = "e335f20bd5a63c2fa17ce15fdebe0c5af5c6787d37bd49ad2da156b450383ae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/xh/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/xh/firefox-98.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "0b8bb8c5eaf45faa1f128c08a8d47d7f1388f37e09f73f3ee9b0e77044aa83a6"; + sha256 = "9cd953e87b70c979a8c03fde8c989f626a23f62a7d59be8796a09c8a8950127f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/zh-CN/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/zh-CN/firefox-98.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4cbe5d68f610f3778be063d132271fca35ad9c7a7914aa32459527b4c1800948"; + sha256 = "2c7d059be4474164fddd349fc3f18d1f380af5f9ba82f8e01b04e2f18bcd09e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-x86_64/zh-TW/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-x86_64/zh-TW/firefox-98.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "80d4bc113d203fdba00f6af11ef1fd7b9184204b1788124e66049ca5ec13b3c1"; + sha256 = "37b5a0275b137b0ef578591ccf5a54518bdbb449915f4ad50c276952a0bcccd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ach/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ach/firefox-98.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "98a4025d0771980dbd3d06511ba15de71d7df7311c7e683039d315bce7dcb590"; + sha256 = "b3b734eb8d62112f7983e86dbd49d2d3be3ed6d2f80fd2d7bc189f12e03ab0b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/af/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/af/firefox-98.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8519234c67e0f8b4e13df38ca98589d0a618f607eb940cf1f686f540a3dad527"; + sha256 = "fcf6a355f70392606ec2ed5853b1d14e8d5923fd92c10774c776c43e6c8a6cdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/an/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/an/firefox-98.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "61bcf050289a12e11c6a2b308f3323f39558aceaaa7b18cd95dd19609065a66f"; + sha256 = "388532ad380bf43c287ca3e7e29a3a6f97fbbc0e02c2ae5207ac07587c3faa2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ar/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ar/firefox-98.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "961d7585e36e387d7a0f01bec3cb8359704a0716124211f2a24f5c046d49d338"; + sha256 = "178a38e6bec65a59679944fdd6882774d23bb15e62f2e697cf369742bc4c8196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ast/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ast/firefox-98.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bb104056866e6518bb0ab94ba179b525105ddba09fc969065dc48d15f70de5cb"; + sha256 = "5fa0aea769c7f7fba13168fb404f03b2cb8f6df5ab733054118df67015ab665f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/az/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/az/firefox-98.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "897fe5ebfd497eadda7858701217d6a0cf0bbf2a74389ffdfc46ddc8a5706480"; + sha256 = "62816d95c32f04090a5e23bc38ebc774355ac77dfdd1a41a2d6e10ce983c53ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/be/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/be/firefox-98.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6e4122643e4bd368c7adeb640554c7a5252562b767093aeb0e9cd63c9a533b25"; + sha256 = "918447a5f57647ed5d846a0a0bbbcbaa55559722de7b8dca2ed2e744eb14ce36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bg/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bg/firefox-98.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "481a3cc57cdd62d1ad23ef9f8f0c15087ff20335ab57bc28729dd74975460370"; + sha256 = "74851892da2c6c0a9a75d822aeef2c0a275fb5bbc32b88abb28e67f9310bb2ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bn/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bn/firefox-98.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "d56c44b8c5103072605b9fd3e5cec63ef613698bad3198543e67958c7ae2c97c"; + sha256 = "2a6f53aa3fec578a76368120bca30240bb631db9767159aedb3b5480c1ab661a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/br/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/br/firefox-98.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2f25b1130142faa0efe08413512353319dd341d31221fd463f198ff8ec776b4e"; + sha256 = "5d1d9478f459bcc3e6b148ff42d6f9f589b8fb395672e3b8ce8f333832b523dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/bs/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/bs/firefox-98.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "a0a33294d9eed0867463b56bd0e02e58836c5eae91718ba918160dc98eb7ac42"; + sha256 = "ed99ea471d6e30c0304bbb27bbdf88b479fee4df7f8cbba481d03de13954131a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ca-valencia/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ca-valencia/firefox-98.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "fed1ba8e292c72cff4c28ce3c5e59f58fd20f25624444084394f7b1cd61446e7"; + sha256 = "5dd1447b3fea23f08551b2ab5a80581c3e0e09f5602709cbdce751d491faa60a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ca/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ca/firefox-98.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f2cff173d6c5f6d12f8b29f07b3ee0d51dc523d508f340a65a99404953e1cb74"; + sha256 = "21f6c622de4016a8e372ae7d249a07800b4393ba02ab59994356869a01cef571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cak/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cak/firefox-98.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c48e7d51d10b4d398a3a737faf204cd695091da360a70f3fb6dcf8b5ddcc265d"; + sha256 = "e9895877763157132e390f31c859b561c7d62adb011e209ab9cc0092ecfccb1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cs/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cs/firefox-98.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1a223fcfa992f1f58e61f9c4903253e51adbf8a73380d09e9b38eda8f713c31d"; + sha256 = "13c94b8b12fcbee4d41c6f7289f0cf2f199ef3d750628cc0ea11a60534ab6954"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/cy/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/cy/firefox-98.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3f26e158ac5870fecd94d2b5a07f7116577fb0cacae5a98f456aa64b66eac64f"; + sha256 = "c21d9e83d14ac46effb9e12a5210d7b56e3d765eef877f8ac4ed5104582d2631"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/da/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/da/firefox-98.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1ad6bd99e003d2c8a2d3dfb15360f52800b8e2b0c6ce586f1857ab491763a27c"; + sha256 = "74a4a14ae8d8f64c56ce4409851f3e8e51bac61e2223c022f40d56d341fdcc65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/de/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/de/firefox-98.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1f433c261278469c96f239c595ccaeaab2d735b461847b2a6f0770cb618e13d6"; + sha256 = "d3449eec8075f3b6d07b2e6d7adecbec60a7e29b12c2016f642a90c5555971ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/dsb/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/dsb/firefox-98.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c0aa0c513549ddcf73243d7b0fec5110d547be0536b79d2763714447cd80460f"; + sha256 = "0dfac7916796d4ec7943963e28d7ca65f78661b6f22c226afb2dd00db47917e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/el/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/el/firefox-98.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "0e341f6e22862bc0d92efce71243e64cde6e9324ac33bb1fbfed59b84fb4fb89"; + sha256 = "c2769489e0947a7eeb0cb1f9d99d51317fd037e2a7bb06134403df1d4560a767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-CA/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-CA/firefox-98.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "5dedc5db801b0f7c7bc42a2373e8558895a1fc757cb1f39f99b355729eff7e4c"; + sha256 = "87bb7162b58f7632ddf733fbdd4f195d75a9a6d467355c2625344171c72f4e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-GB/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-GB/firefox-98.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "05d2a3ed1e9b2d7693062758183187d0a8a4524d6644532029aadb1d2d1b9548"; + sha256 = "89bbf10bb75effa9e8064b6c42d0a4d7fd21ac2cd6e4ed3625d92c6b55ba1ee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/en-US/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/en-US/firefox-98.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "01e9e15b89299cac4ec8931e84f11ed63ff3ee5e70cb73be4cb6f6f5d817cfb3"; + sha256 = "888db6752eb5703af5fe5ab4b1575f2a35dbd204614552fbe3a276042a3509d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/eo/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/eo/firefox-98.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "121a736e78d12f984270cea37b14915fe65a52c3dfd29e155f20a09707d69c58"; + sha256 = "a2004dc59269fb2b37e568767593bcc0a7862a109df18f548eb1a0b829cf4293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-AR/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-AR/firefox-98.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "a051af8c255954d2c025cb9d3a0ad2d1ad6bbfbc1bf69436abe8ec6674277ece"; + sha256 = "9e2c0f6cb231c469660cc7fe63489e69a2616553d17c52f5e7a2a86a171bc6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-CL/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-CL/firefox-98.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "17a2fa85675f5fbf532da3485099315de98397e5286e2fa5a0b1c8b468a9c974"; + sha256 = "dfe6f1229a6f80b6fab3a22fc8a8a6ecf3137b31805339a489ec53e5af63f040"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-ES/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-ES/firefox-98.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "ffa84eba0ac4cd45fa385de6fba23b8bc69efbee1a3bc39b7e1fb95cf6e6581d"; + sha256 = "01020488ee2ad2e2357bbaf83857a2ad0820fb9f97302d1447cf4148b22d2bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/es-MX/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/es-MX/firefox-98.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f73059f6dfa6df82282ce8cf5068fc5fdbc6320d2e73c981ff6571afba8b3959"; + sha256 = "3c7bacc6f703cdff7adb9097bfc39f52a67aa6a9814d7a8f451d4ef50c591714"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/et/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/et/firefox-98.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "250eb95ef69fa4e61fb6fff0c10c7f884684ca428318b1feed366a2b49809993"; + sha256 = "f2bc8e4200c89cf74ae6c984543e97b2523782dae70ecf6135f47943a01f1d83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/eu/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/eu/firefox-98.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "6a709d754542a74104539e8e043f1b07652e007a1c062e067af4123d46c46071"; + sha256 = "62bf0d826adb66d755f38bf25199eaf3850c37bfddca627b597802a20f8d3367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fa/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fa/firefox-98.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "5435ad7aff621091454b61f2261e72ef1ba2fcd2b89d32148f8ffde0635e237e"; + sha256 = "9d4dfff33db462c71eb12067f56f2e20b0a557f9cbf1234b617e1c2ab5832ea8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ff/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ff/firefox-98.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "627f8970b92f5a96d8023406ca14c46471be457147d282e15e71db0163822a66"; + sha256 = "5b3a271207003e25776a55b7ee6adba2f83e844d4b0a738209d21be7db82ac33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fi/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fi/firefox-98.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ef7912a562f3d01e20ee54dd505859ec6da549c8daba04c5003a8b618af722d3"; + sha256 = "50a9408303ac8fc7c22da96f993b0b251407261d35598b4fe06f1c545788ef0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fr/firefox-98.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "da5b3dd660ff8ac8f10f5419d0d848503a74948d76ebe45fbf88470703b24831"; + sha256 = "65db55f518be2abd8da5b52654bdf0efecd94b21ab843b76a6ad9e9ccb516a55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/fy-NL/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/fy-NL/firefox-98.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5d58c3ef8e75c22db07e82131d6773f8af8930d46a3ea9667bae07a59dd6b8bc"; + sha256 = "b3da8b5a077e4955bf2c662840005adaba2dd77af4724e965403da3139b5fb3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ga-IE/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ga-IE/firefox-98.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "05a3402a6be754390c79a66160510696acf866002225a5d242d2f178e3c63dc6"; + sha256 = "f4812b90fa0a0391d2a372e7bf45a3393d59714209046618e7b1ed72f1889e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gd/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gd/firefox-98.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6832439565a3a18ec623c5a6d0c36e429b2ef291bc8c0152da6934a108ca32a3"; + sha256 = "769c42c86d5b3866f9ad38bc833f5f1f1b01c7f5ed6898eba064ce6f31c9f550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gl/firefox-98.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "2e55dcaf24d4fb028ff5dcba94fac38499897bbb7cecca79d6fafc0b83e21a9d"; + sha256 = "b75ed9efccd63053589a3f60fbabb6ce5fc1c027a1a00789ff23b6971b0ebad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gn/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gn/firefox-98.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "c25a77b99c022c3de29cea922e926db9e738771cd146acc6d71545cf8f1acdaf"; + sha256 = "bf60ba48f5d5a18ef9aeaf631d564412788ca102990b69b176ac66c1b8e3535c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/gu-IN/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/gu-IN/firefox-98.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "e41991d388c6fecf9b22416c5f840e8f96d032d3be793101c9133ef7cc545850"; + sha256 = "19f568337cfba71d7e1626099b1c6cee4d69a0332065779e5375da648d70a3f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/he/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/he/firefox-98.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "55125f1e56fa6d8f5af4aba206e3ede2bb80f39414563a541f07eebc568de993"; + sha256 = "7d6a55d76f74d85e2f9da77ee071df31aed1c37f9fb139e448624a105b6ef19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hi-IN/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hi-IN/firefox-98.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4ebdde0d91f94399607c127953e738855a17463cea34a4360b630ce0e6add5c5"; + sha256 = "12451d7cc49ca2629ffedeebd1d77f8ac96d5839ed165ea91f55a249427ebf09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hr/firefox-98.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "11f2449791c1613394764d36e1661cb05a83e2582904eb00ade9f09f58d4147d"; + sha256 = "b2197d6d51847848cd849fef446e8b84725fc2b9539824e65719c4fd1d7f29ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hsb/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hsb/firefox-98.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d7138688ce4edd030bb51d7eb68626a4055ef18dfaf30045d872c03b187b4ed8"; + sha256 = "5000e21630440a446416de3cc38bcfc7c22bb8bc8d1a1a027c14b9548acff74a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hu/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hu/firefox-98.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "693e08538b19f9d1aaab399e8d4b582e557e34ba5d2cae7de6c7e048b175dd3e"; + sha256 = "dee75736596f5f0dc1d6952327274d07f927ff42e7c9a0ed8c8ba8dc78a6b3f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/hy-AM/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/hy-AM/firefox-98.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1e78ed371f092f9e1ec9ec7c43b16da6b5a277056983ea810af568e250c9d588"; + sha256 = "4b7dcb46864b058bdbeb35404de32c88e2822dd0315f105e95f61be857288282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ia/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ia/firefox-98.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a02a62a042cc51d7b6389366114816daf10cead0ce51a716ff58485fd7b856e0"; + sha256 = "e89e07b1d71e1b2ccfd4d412dabea164bae8448f57a5f99a07ab04f9dcaa0bab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/id/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/id/firefox-98.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e548a304acb9075e6110c276482a1759cfb06b6cbd4edf2b7aa633f6762b91d8"; + sha256 = "398ee6ed278cec1ceb489dd06d8f4c2671309a3e0d61f3202fd5280a5b596ca7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/is/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/is/firefox-98.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c43167df2a3739d7d9e7c8013cbe4a9ed5e18a060d06667ebf36102ad7a0587c"; + sha256 = "a3531b8f68ee22452390ff8e1c70d7f6b842e10ab60ca6666f79fd958284d099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/it/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/it/firefox-98.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "4eba45221ef34d71353b3d442e8cc5a565fe79cad1a21b4de27129da92f165fb"; + sha256 = "fe8fd2e7b0e87cb3b12ab6d8d973c422ef763d9d3a78620fe5a9f374455ccecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ja/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ja/firefox-98.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "173c3f7afc252f495e9553c6b7a1afdd5090de2578a477e15307ccbecad937f1"; + sha256 = "5d52ec4afd7de44806b804b5de6e597228d7061c10b0cc8d6fabeca505a0b207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ka/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ka/firefox-98.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "de14be28830076b11610a8824cf20e161cb4e7c0e527d160caf7d214f41ba9a9"; + sha256 = "902abc9df459c6dd2168050764cb2301ffee566f4deb11b2ef7c694cf429cc58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kab/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kab/firefox-98.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "385dfe3ea1c1aafd4e0f3c4176bf2498876b34d7fee5195ba5fa5884203ae338"; + sha256 = "aa96307da2c832df7ea7ea418d3dae6dd9f2aed56432a8ed6e43fabe71aa9828"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kk/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kk/firefox-98.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c9b2f1fe4cdce853ec155a4b99d44279dc64c266706e58274413b0b37cf71317"; + sha256 = "addb689db7bb19f28db963ca61dd0ece3813f5ca21f3437c1320c3f972e19029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/km/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/km/firefox-98.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "adc84f8768a71d7f2ed314dad0347a346b3592d47bb7ef621301deb2b72f7f56"; + sha256 = "7a982cdb847d162c6cedf724adebfab904cfacdbe3d4e48ee9af3e644e74cc14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/kn/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/kn/firefox-98.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c0579f13e76c62e402065069ab7dcbddd7cfbea8e428b5bf2e77d42550d18557"; + sha256 = "d2cb6eb8c004d9c0e0929d8047d93902a2235b5068b86672c693edef1a2b8911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ko/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ko/firefox-98.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bfc610608666e626715000bc4fa48dccd43ce0036ee0111e926f92b75034a0f3"; + sha256 = "63770f2a873b520e5b1c1bece82ea4a987a2ae6535f9c4047e99b68f62c91748"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lij/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lij/firefox-98.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "fb1afb37bd4d47aae8de6ff8b1a2dc34d41903ae4ead5a2671baeeb6ef3b3196"; + sha256 = "ff130a01dc266b5b49f39f9c4355a6576211c0008cd5008290266daff222e18d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lt/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lt/firefox-98.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0197a8c4ddf84ac38aba0533a84b4a57e783d3542b48e221b3317b39e9decddc"; + sha256 = "04105e0614b660d0e156b0aa2307af9d0d11236119b6667718d7f0f1f13ae505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/lv/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/lv/firefox-98.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "a7631d6bfc46a140c226cd1914074084ac1bba0104c7811305d40291e015c2c7"; + sha256 = "50dd34d558800dafc84d714f5cf08a26eb4970c3aa6b8850430aa156d8869549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/mk/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/mk/firefox-98.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "78be93a5ef3ec79c9b7b8ed4134b25fd66db74e4160235e1ff57f87f7ecf7f71"; + sha256 = "8ca0b1cc9ff39757f2cc513d61a77d1d95a607862ea654d6743bf4a8f7bde99c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/mr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/mr/firefox-98.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "3890be73f978299ebbd3c7ef0919a6d5f916729528ee90f7d1ef86b088fb748d"; + sha256 = "b24884486692dfcad578026498a3654d34ae78cd39e977b3708053bd7754d37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ms/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ms/firefox-98.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5bbded06e5eb3c4f628df573ca10aed952d72125ca1f96f74643e28210121e47"; + sha256 = "c43f2f10d928a3cf875e81afb54c09c1ef49ff8457069c054df2f62e0a43979f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/my/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/my/firefox-98.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "2a8ea9468c6fa4a4a303c4b5b1a9306898ed8f2fd60a3e8c9915ae549baefa09"; + sha256 = "296d3860c2224deaa43184fa85dfce21eb9fc9b11d080d7f71cc189c4a790ed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nb-NO/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nb-NO/firefox-98.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c7fb5c534a03afe15bc2c439b679dbf3316aea92d23d154b6902893633fa9b32"; + sha256 = "b0ce5e0157ff9f64434b38cf9338960870bbf6bdb4b75494b82c8ba871868ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ne-NP/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ne-NP/firefox-98.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d2b2731732202c4501e0989fdd95a68cca01aa4b13a02ca035247a1de7a7f299"; + sha256 = "58b7a719e7fb10bf7bfbe23f4ffcf002434652f792a3a1ffbadb13a5e06a04ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nl/firefox-98.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2947d1783e0cc8126c086bb9a1ed139de735ddf2bcb4f104e9efb6d68d844503"; + sha256 = "2951dae0cbb3bec0e47ae44b70e6796ace16c8fbac18d7d04da84a51ded6a650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/nn-NO/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/nn-NO/firefox-98.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "1aad31043951d9b81f707cd9c6259d6c215ae20f55776719c2553148dc3bb589"; + sha256 = "6f44201f301931e3b51144d57a79c484b776c37cb29dda93b57795c0a756c62f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/oc/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/oc/firefox-98.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c237cab50aba2e059224d80ebddda67f13f8737899a29d6246418dcb09c486de"; + sha256 = "899a48b47dd642a64de0ac9226b4655e74bba9f0f6d1eccebc1c1875e1d3ea12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pa-IN/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pa-IN/firefox-98.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "e487db05bc46eae01509b5ac3a9f4aa6e3cd8bd0970366d9501c1a74653f3110"; + sha256 = "392b6e6cb3ca1ef3e17f73ca327bf7fd49d453ee0216f922dfc3bfc7b2ce18da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pl/firefox-98.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a84f34fd417855acfeb89926fdacc8c4fdcb870251d3b43095e04d2392a6637f"; + sha256 = "f4f6124c3520c58ee00b7f4f00a39a904657b21072fe3d822a17b072c8e69473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pt-BR/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pt-BR/firefox-98.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "5a4e35c0efdb79e83d535b62d57c26d5021d20c26d2654b98f6078ebbf4b6094"; + sha256 = "b19e3aee72fb779ab139535295d3279cd06c125349fb5ee71c12737ab2aff733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/pt-PT/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/pt-PT/firefox-98.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f61b70f911e708f4964f4592e9b46c8e70a730f778aaa6e320ee7c0d3647253d"; + sha256 = "0924bc137f6eaaf6686249f59540eadfd9b09aa843a071bd7db5d62f742258af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/rm/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/rm/firefox-98.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3b602a6d897e2311f1521a36ffc4be4c6b84705605aa1bf321b684010c02d59e"; + sha256 = "ea9b082ba495a19162c0945b865eae6f66c689962807873bf27ad59a3e83c85e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ro/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ro/firefox-98.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "94ff92349315c126c3c1294e9d468914b7f81ef8a0597c5fd039fe66bcad271e"; + sha256 = "3bbd902b4ace383d914f51553bce3de83c2ca4f6366e3f2dc42268795c7bf72b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ru/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ru/firefox-98.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "1f24d74427e79b7c78ffcdfbe1a40c5e767ed0854a870babdf1f4956ddaa17bf"; + sha256 = "84296b00a3646cf8d0e7ba3ec6cbc90592b8fe8b2dcc36b8c904d1e15c264575"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sco/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sco/firefox-98.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2b11f6b4b380143ffb07764c6fb6fb139da7aaab0ea5bdad826b1c14eea09a3c"; + sha256 = "8f966e6fa33e9e0242dd422818c9c46c5ffe37ebeb34e01a7eb57258e0aea481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/si/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/si/firefox-98.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "f644c5fcc35bb8e4a2d4ba1d7210cacfa498ca9aaed79174ac4f973021dbac63"; + sha256 = "3ce96976ec5e920b20fdb1ff7fa8d20db2a67c0797ac4307f7e387db91306719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sk/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sk/firefox-98.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "859bfb3a177429a24e585e6ad11fdf9220d5d0a2751ab861aa33e3e553a3fa2e"; + sha256 = "1a4d37ac6777185230343dceb4902b55e0adad62d144347d09f031228583370c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sl/firefox-98.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e5ba078d2f83df37b8211f8423dc549358b9d1c508a9607d1d5e735501ca9845"; + sha256 = "e1875f0077c3c03f34d7fa33e807d0297f831d451a045cd55accc493c3dce366"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/son/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/son/firefox-98.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "07f902640b9742954ac03b737fd402d1024e647d4cfc096ceff2ef5329853235"; + sha256 = "1d13d9d3f9d8cfc03e5e45cd1c62a08b24437ed9feeb27ce42b07a75f0aefc04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sq/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sq/firefox-98.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2dc1cdc47fabf4d212745f326dea7ad202527fa8dee9d90908812a3f7b152840"; + sha256 = "e2ae3fa32c56258069cdb95231a5d3b44218d32f0b10afc4174ac204bda7acf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sr/firefox-98.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d84a3a521ed43b9ce70a6984f6afb35bb02da5b4b9372cfdd47607151dbfdce5"; + sha256 = "96a5178bdbca9f6d1434610aa0d35c32b6eb542d6d3e760ce778a8e4181515f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/sv-SE/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/sv-SE/firefox-98.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "5c313719484370ac42a46cda464ef5096e866a93d821fd88d8cadc3fe483b8be"; + sha256 = "fabe9274a8ac78ba84a394a7a5e7cfa22c41e3b58c8e6b94496fda6490bad644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/szl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/szl/firefox-98.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "6933fcc3ca447d2c530bc4d5a3fac65351359de13ca8415c17034611d343e4d2"; + sha256 = "d77505b5fe04946002e5d1a28081c7e2933ce910a8d67f4e5ed31508808cfd41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ta/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ta/firefox-98.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "a1d11f11350ad8a1aca420774896721a71db6640e78798bd5d0e9563fa215350"; + sha256 = "a34e5b28526f9861bdc7af910e0a3418404f4316ad5792607493a698f480c9a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/te/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/te/firefox-98.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a09332149b4d4daf758cc75a0b50c793207e6dfa7f487f04864f8c41e2f7c2c1"; + sha256 = "c3b8653af6ed8f4cf7e9f3e5a4a0c622a163f7c45dd0d1ddcb3936e1504ea1af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/th/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/th/firefox-98.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "615300bf23c3903079601c5e4d9509bc3a7d5fa1e94a01aff09559f3c2994306"; + sha256 = "a6456037b76bf2adaa6a6d68f8b20f293f8a4fdbbc3e533c8a6a22aedcc3bf4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/tl/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/tl/firefox-98.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "f323e7204e86b91cce656780e65bfb4166bd0e27d1ba84ede5e8b87ab6c4e122"; + sha256 = "51ff115845f3d70a9fb08f08fcd3c1f86a41b3570f81f460c24a5a87605a779d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/tr/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/tr/firefox-98.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "cf36e947181fc7750186b75edb0998df3219097ed94e4617435cff2690f626d9"; + sha256 = "3ccb5735a16622dafe6ae465ba167ea164843c85df436e7cd20cf6e7a4fbb610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/trs/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/trs/firefox-98.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "137270152321a9922decfbfcad4643ce9d3b127498d91ef7a4d60069d249632e"; + sha256 = "7d1a71033460524506082087ce1b3ddc424207ea3ade6e0bbdbb00310e74cfea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/uk/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/uk/firefox-98.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4571eb45952e27756ba8332cd62673c3cd21d58b85662d6eae7a43afc5aa9613"; + sha256 = "6db06ed2f126c5307ef6380dff4dae14cc39ca58d23b827835d3e702acf33c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/ur/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/ur/firefox-98.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "77d60ba1a7bf22d7fb690ec1c22dd35b84b3e59891d07c129335894d3c47e8fa"; + sha256 = "d00bcd6b3c70919999e748046b3291279d313f850c3daedae37259b695cb351d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/uz/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/uz/firefox-98.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a716e77dae132d1741366836c9fb59320477f623cef47713e93ff7ea6c712d49"; + sha256 = "1d77240a5f6d7542a7035fd32fd73e07bee1e1e880800cabd01e357a3da30907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/vi/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/vi/firefox-98.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "90d8f9ae57521d77e4f9db4166aa7124f4b935f3f1531639058cecd7cf96be36"; + sha256 = "9469a1c6613ea83a8e367c0e25e188ea9b9fddcc1497725a3ebb008fb5d5d73e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/xh/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/xh/firefox-98.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ede2ab7f812aeef2f4f07ceac4df1edcdeca35c1b8d1d64053a7250fd781187e"; + sha256 = "af3144bfcb52df706182fa04badf39be51e5774335af21d8ec38dcbebe3bdf13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/zh-CN/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/zh-CN/firefox-98.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "02c61d1b1bb6e966444a800a319eb69fa36ce913614369d0c8f95388e4bdd14d"; + sha256 = "fe6fc7bda0e52d64abcef8cbfc5e8576c64067b8746605e80790bde6dcd9b03d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/98.0/linux-i686/zh-TW/firefox-98.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0.2/linux-i686/zh-TW/firefox-98.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5c347fe33e423b8300fd6f2a0a3026896ac6c74af7bbdfead40f72874e65b0c2"; + sha256 = "18da6dcf61bba9a22b5487f695793d65b952cfc7065ff334b0faf8e7ec82d90f"; } ]; } From 3ec7f8d487042210c6861ea618aef73d932faac5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Mar 2022 15:20:36 +0100 Subject: [PATCH 61/84] firefox: set consistent remoting name With Firefox 98.0 the remoting name now depends on the update channel (mozbz#1752418), which resulted in a weird app_id/wmclass of `firefox-default`, which broke window association in GNOME and likely other desktops. Fixes: #165107 --- pkgs/applications/networking/browsers/firefox/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index cace1829ccc5..019c623e100a 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -224,6 +224,9 @@ buildStdenv.mkDerivation ({ configureScript="$(realpath ./mach) configure" export MOZBUILD_STATE_PATH=$(pwd)/mozbuild + # Set consistent remoting name to ensure wmclass matches with desktop file + export MOZ_APP_REMOTINGNAME="${binaryName}" + '' + (lib.optionalString (lib.versionAtLeast version "95.0") '' # RBox WASM Sandboxing export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc From b7639c40d1f249a4961a663d768a2a55e1a052d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 23 Mar 2022 02:18:28 +0100 Subject: [PATCH 62/84] essentia-extractor: fix eval on darwin --- pkgs/tools/audio/essentia-extractor/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/audio/essentia-extractor/default.nix b/pkgs/tools/audio/essentia-extractor/default.nix index 63ebbb0ffc0b..4fbdd02e4404 100644 --- a/pkgs/tools/audio/essentia-extractor/default.nix +++ b/pkgs/tools/audio/essentia-extractor/default.nix @@ -6,22 +6,20 @@ let }; sha_table = { - "x86_64-linux" = - "d9902aadac4f442992877945da2a6fe8d6ea6b0de314ca8ac0c28dc5f253f7d8"; - "i686-linux" = - "46deb0a053b4910c4e68737a7b6556ff5360260c8f86652f91a0130445f5c949"; + "x86_64-linux" = "d9902aadac4f442992877945da2a6fe8d6ea6b0de314ca8ac0c28dc5f253f7d8"; + "i686-linux" = "46deb0a053b4910c4e68737a7b6556ff5360260c8f86652f91a0130445f5c949"; }; - arch = arch_table.${stdenv.system}; - sha = sha_table.${stdenv.system}; + throwSystem = throw "Unsupported system: ${stdenv.system}"; + arch = arch_table.${stdenv.system} or throwSystem; in stdenv.mkDerivation rec { pname = "essentia-extractor"; version = "2.1_beta2"; src = fetchurl { - url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz"; - sha256 = sha; + url = "https://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz"; + sha256 = sha_table.${stdenv.system} or throwSystem; }; unpackPhase = "unpackFile $src ; export sourceRoot=."; From 6324abc93e79839a2952ead746a3d202de78eda0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 21 Mar 2022 21:57:33 +0100 Subject: [PATCH 63/84] libpng_apng: drop It's been the same as libpng since 8164d28, because `libpng_apng = libpng.override { apngSupport = true; };`, but `apngSupport ? true` --- pkgs/applications/science/math/cemu/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index 35b9200a4774..374b245e2499 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -7,7 +7,7 @@ , qtbase , qmake , git -, libpng_apng +, libpng , pkg-config , wrapQtAppsHook , stdenv @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libarchive libusb-compat-0_1 qtbase - libpng_apng + libpng ]; qmakeFlags = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 818b8118d434..70e3bd958aaf 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -601,6 +601,7 @@ mapAliases ({ liblrdf = throw "'liblrdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2022-02-22 libmsgpack = throw "'libmsgpack' has been renamed to/replaced by 'msgpack'"; # Converted to throw 2022-02-22 libosmpbf = throw "libosmpbf was removed because it is no longer required by osrm-backend"; + libpng_apng = throw "libpng_apng has been removed, because it is equivalent to libpng"; # Added 2021-03-21 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # Added 2020-04-09 libqrencode = throw "'libqrencode' has been renamed to/replaced by 'qrencode'"; # Converted to throw 2022-02-22 librdf = lrdf; # Added 2020-03-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8e159718ce4..d81b6169fdd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18690,7 +18690,6 @@ with pkgs; libplacebo = callPackage ../development/libraries/libplacebo { }; libpng = callPackage ../development/libraries/libpng { }; - libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; libpostal = callPackage ../development/libraries/libpostal { }; @@ -25954,7 +25953,6 @@ with pkgs; firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc; - libpng = libpng_apng; gnused = gnused_422; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox @@ -29440,7 +29438,6 @@ with pkgs; thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc; - libpng = libpng_apng; gnused = gnused_422; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox From f3f02bff9db946eb1ded5c1616ce2b6c225ca071 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Mar 2022 00:46:27 +0000 Subject: [PATCH 64/84] LAStools: 2.0.0 -> 2.0.1 --- pkgs/development/libraries/LAStools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/LAStools/default.nix b/pkgs/development/libraries/LAStools/default.nix index d38fa0609d86..80641446d4d0 100644 --- a/pkgs/development/libraries/LAStools/default.nix +++ b/pkgs/development/libraries/LAStools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "LAStools"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "LAStools"; repo = "LAStools"; rev = "v${version}"; - sha256 = "19y49j5af3z3fsiknq9kg9yjcsr73ywng8dfy837y97q4shc9g00"; + sha256 = "sha256-Mxic/zLk/qkB/rSlvkLZPgtNscrTrzSzrxiqXAMeDVU="; }; patches = [ From e67d3a3e141cddf2b46567cefa9f33cb86d78d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Wed, 23 Mar 2022 03:50:04 +0100 Subject: [PATCH 65/84] prusa-slicer: 2.4.0 -> 2.4.1 (#163933) Co-authored-by: Sandro --- pkgs/applications/misc/prusa-slicer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 6ae7f422f022..dd6184f4ff6f 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.4.0"; + version = "2.4.1"; nativeBuildInputs = [ cmake @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "1mb7v0khrmsgy3inmh4mjn709jlhx422kvbnrhsqziph2wwak9bz"; + sha256 = "sha256-4L/x8cMQee3n20iyWEiXd62NtA6BYM1SHkCn8ZlDNWA="; rev = "version_${version}"; }; From 713648a19b149484625fb88ab97c51b55de1cb93 Mon Sep 17 00:00:00 2001 From: Markus Wamser Date: Wed, 23 Mar 2022 03:51:12 +0100 Subject: [PATCH 66/84] boost: unbreak build for 1.65 and 1.66 (#163216) Co-authored-by: Sandro --- pkgs/development/libraries/boost/generic.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index bad87fba8c64..8084065ce064 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -126,6 +126,13 @@ stdenv.mkDerivation { stripLen = 1; extraPrefix = "libs/context/"; }) + # Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions + ++ optional (versionAtLeast version "1.65" && versionOlder version "1.67") + (fetchpatch { + url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch"; + sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0"; + stripLen = 1; + }) ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch ++ optional (version == "1.77.0") (fetchpatch { From 4f1949bc59173a2b4d29046891d75ebc0982b4a4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 23 Mar 2022 10:59:58 +0800 Subject: [PATCH 67/84] pxz: use upstream's Makefile (#165264) --- pkgs/tools/compression/pxz/default.nix | 42 ++++++++++++------- .../pxz/flush-stdout-help-version.patch | 32 ++++++++++++++ 2 files changed, 59 insertions(+), 15 deletions(-) create mode 100644 pkgs/tools/compression/pxz/flush-stdout-help-version.patch diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index 4ea95a3f78ac..0f509a3bd170 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,31 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, xz }: +{ lib +, stdenv +, fetchFromGitHub +, testVersion +, pxz +, xz +}: stdenv.mkDerivation rec { pname = "pxz"; - version = "4.999.9beta+git"; + version = "4.999.9beta"; src = fetchFromGitHub { owner = "jnovy"; repo = "pxz"; rev = "124382a6d0832b13b7c091f72264f8f3f463070a"; - sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m"; + hash = "sha256-NYhPujm5A0j810IKUZEHru/oLXCW7xZf5FjjKAbatZY="; }; + patches = [ ./flush-stdout-help-version.patch ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace '`date +%Y%m%d`' '19700101' + + substituteInPlace pxz.c \ + --replace 'XZ_BINARY "xz"' 'XZ_BINARY "${lib.getBin xz}/bin/xz"' + ''; + buildInputs = [ xz ]; - buildPhase = '' - gcc -o pxz pxz.c -llzma \ - -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ - -DPXZ_BUILD_DATE=\"nixpkgs\" \ - -DXZ_BINARY=\"${xz.bin}/bin/xz\" \ - -DPXZ_VERSION=\"${version}\" - ''; + makeFlags = [ + "BINDIR=${placeholder "out"}/bin" + "MANDIR=${placeholder "out"}/share/man" + ]; - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - cp pxz $out/bin - cp pxz.1 $out/share/man/man1 - ''; + passthru.tests.version = testVersion { + package = pxz; + }; meta = with lib; { homepage = "https://jnovy.fedorapeople.org/pxz/"; @@ -39,6 +50,7 @@ stdenv.mkDerivation rec { resources to speed up compression time with minimal possible influence on compression ratio ''; + mainProgram = "pxz"; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/compression/pxz/flush-stdout-help-version.patch b/pkgs/tools/compression/pxz/flush-stdout-help-version.patch new file mode 100644 index 000000000000..797cdbeb1f8f --- /dev/null +++ b/pkgs/tools/compression/pxz/flush-stdout-help-version.patch @@ -0,0 +1,32 @@ +From bba741ccd0f0a65cd9bfdd81504ebe5840fd37ad Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 22 Mar 2022 08:01:10 -0500 +Subject: [PATCH] pxz: flush stdout before exec'ing xz, ensure our messages are + printed + +Without this, they're presently dropped on my system when pxz +is piped to something, as in `pxz --help|less` or `pxz --version|cat`. +--- + pxz.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pxz.c b/pxz.c +index 4240b6e..3b53cfa 100644 +--- a/pxz.c ++++ b/pxz.c +@@ -184,10 +184,12 @@ void parse_args( int argc, char **argv, char **envp ) { + " -D, --context-size per-thread compression context size as a multiple\n" + " of dictionary size. Default is 3.\n\n" + "Usage and other options are same as in XZ:\n\n"); ++ fflush(stdout); + run_xz(argv, envp); + break; + case 'V': + printf("Parallel PXZ "PXZ_VERSION" (build "PXZ_BUILD_DATE")\n"); ++ fflush(stdout); + run_xz(argv, envp); + break; + case 'g': +-- +2.35.1 + From 9eeffe65addea33801bac5fcf911c452cc67beed Mon Sep 17 00:00:00 2001 From: Babbaj Date: Tue, 22 Mar 2022 23:04:20 -0400 Subject: [PATCH 68/84] gpu-screen-recorder: init at 1.0.0 --- .../video/gpu-screen-recorder/default.nix | 50 +++++++++++++++++++ .../gpu-screen-recorder/fix-nvfbc-check.patch | 38 ++++++++++++++ .../gpu-screen-recorder-gtk.nix | 46 +++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 4 files changed, 138 insertions(+) create mode 100644 pkgs/applications/video/gpu-screen-recorder/default.nix create mode 100644 pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch create mode 100644 pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix diff --git a/pkgs/applications/video/gpu-screen-recorder/default.nix b/pkgs/applications/video/gpu-screen-recorder/default.nix new file mode 100644 index 000000000000..be02bb5c690e --- /dev/null +++ b/pkgs/applications/video/gpu-screen-recorder/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchgit, makeWrapper, pkg-config, cudatoolkit, glew, libX11 +, libXcomposite, glfw, libpulseaudio, ffmpeg }: + +stdenv.mkDerivation rec { + pname = "gpu-screen-recorder"; + version = "1.0.0"; + + src = fetchgit { + url = "https://repo.dec05eba.com/gpu-screen-recorder"; + rev = "36fd4516db06bcb192e49055319d1778bbed0322"; + sha256 = "sha256-hYEHM4FOYcPmQ5Yxh520PKy8HiD+G0xv9hrn8SmA07w="; + }; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + glew + libX11 + libXcomposite + glfw + libpulseaudio + ffmpeg + ]; + + postPatch = '' + substituteInPlace ./build.sh \ + --replace '/opt/cuda/targets/x86_64-linux/include' '${cudatoolkit}/targets/x86_64-linux/include' \ + --replace '/usr/lib64/libcuda.so' '${cudatoolkit}/targets/x86_64-linux/lib/stubs/libcuda.so' + ''; + + buildPhase = '' + ./build.sh + ''; + + installPhase = '' + install -Dt $out/bin/ gpu-screen-recorder + wrapProgram $out/bin/gpu-screen-recorder --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib + ''; + + meta = with lib; { + description = "A screen recorder that has minimal impact on system performance by recording a window using the GPU only"; + homepage = "https://git.dec05eba.com/gpu-screen-recorder/about/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ babbaj ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch b/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch new file mode 100644 index 000000000000..bd0d7111c80a --- /dev/null +++ b/pkgs/applications/video/gpu-screen-recorder/fix-nvfbc-check.patch @@ -0,0 +1,38 @@ +diff --git a/build.sh b/build.sh +index 05603db..8c38b31 100755 +--- a/build.sh ++++ b/build.sh +@@ -2,5 +2,5 @@ + + dependencies="gtk+-3.0 x11 xrandr libpulse" + includes="$(pkg-config --cflags $dependencies)" +-libs="$(pkg-config --libs $dependencies)" ++libs="$(pkg-config --libs $dependencies) -ldl" + g++ -o gpu-screen-recorder-gtk -O2 src/main.cpp -s $includes $libs +diff --git a/src/main.cpp b/src/main.cpp +index ae2078f..9dcdce1 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + + typedef struct { + Display *display; +@@ -830,7 +831,13 @@ static void audio_input_change_callback(GtkComboBox *widget, gpointer userdata) + } + + static bool is_nv_fbc_installed() { +- return access("/usr/lib/libnvidia-fbc.so.1", F_OK) == 0 || access("/usr/local/lib/libnvidia-fbc.so.1", F_OK) == 0; ++ auto handle = dlopen("libnvidia-fbc.so.1", RTLD_LAZY); ++ if (handle) { ++ dlclose(handle); ++ return true; ++ } else { ++ return false; ++ } + } + + static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *app) { diff --git a/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix new file mode 100644 index 000000000000..6bfb425f0af9 --- /dev/null +++ b/pkgs/applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix @@ -0,0 +1,46 @@ +{ stdenv, lib, fetchgit, pkg-config, makeWrapper, gtk3, libX11, libXrandr +, libpulseaudio, gpu-screen-recorder }: + +stdenv.mkDerivation rec { + pname = "gpu-screen-recorder-gtk"; + version = "0.1.0"; + + src = fetchgit { + url = "https://repo.dec05eba.com/gpu-screen-recorder-gtk"; + rev = "4c317abd0531f8e155fbbbcd32850bbeebbf2ead"; + sha256 = "sha256-5W6qmUMP31ndRDxMHuQ/XnZysPQgaie0vVlMTzfODU4="; + }; + + patches = [ ./fix-nvfbc-check.patch ]; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + gtk3 + libX11 + libXrandr + libpulseaudio + ]; + + buildPhase = '' + ./build.sh + ''; + + installPhase = '' + install -Dt $out/bin/ gpu-screen-recorder-gtk + install -Dt $out/share/applications/ gpu-screen-recorder-gtk.desktop + + wrapProgram $out/bin/gpu-screen-recorder-gtk --prefix PATH : ${lib.makeBinPath [ gpu-screen-recorder ]} + ''; + + meta = with lib; { + description = "GTK frontend for gpu-screen-recorder."; + homepage = "https://git.dec05eba.com/gpu-screen-recorder-gtk/about/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ babbaj ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8e159718ce4..f18e01f1cea6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26380,6 +26380,10 @@ with pkgs; gpsprune = callPackage ../applications/misc/gpsprune { }; + gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { }; + + gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { }; + gpxlab = libsForQt5.callPackage ../applications/misc/gpxlab { }; gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { }; From ecacb5de41c8d8d7aa95b5a3d7bb5ca68b362058 Mon Sep 17 00:00:00 2001 From: Aleksander <42138003+asjur@users.noreply.github.com> Date: Wed, 23 Mar 2022 04:12:46 +0100 Subject: [PATCH 69/84] gitkraken: 8.3.0 -> 8.3.3 (#162753) --- .../applications/version-management/gitkraken/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 2cdc29365356..52ad060c990d 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -11,24 +11,24 @@ with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; opensslSupport = false; }; pname = "gitkraken"; - version = "8.3.0"; + version = "8.3.3"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "sha256-iAXw6+KCyfyabyJvBQ5cLNEMNbsELL9sQaZkzZL7+/w="; + sha256 = "185msrpa33w40prc88n5m0g12wh8r6szj56iikk4ps6kwr6wamy7"; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - sha256 = "sha256-Spgx5JQ/AENYdvkl7+YnBaNk/VI9DdyN17ABfxanfZ4="; + sha256 = "0iam5ni8imajxhcv12zib6m475i6czllmqy512r1wmzw9zbilf43"; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - sha256 = "sha256-PJ4/R1pHbfoSBHhIyiqcGoE13FSWQapxj4Lq+ZdcYCQ="; + sha256 = "12af421r4d8s4l5j54xyd3x8pa72nbilass95v0y3b0wgsi35g0z"; }; }; From edbaf11e94aa603085a5fa61aa760595c5392bca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 23 Feb 2022 15:50:03 +0100 Subject: [PATCH 70/84] tree-sitter: unquote latest version in update script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise if a tag was found it would try to fetch `refs/tag/"v1.2.0"`. ``` fetching list of grammars checking the tree-sitter repo list against the grammars we know writing files to /etc/nixos/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars Fetching latest release ("v1.2.1") of tree-sitter-agda … Initialized empty Git repository in /tmp/git-checkout-tmp-RU9DUpjM/tree-sitter-agda/.git/ fatal: couldn't find remote ref refs/tags/"v1.2.1" From https://github.com/tree-sitter/tree-sitter-agda * branch HEAD -> FETCH_HEAD fatal: Not a valid object name Unrecognized git object type: Unable to checkout refs/tags/"v1.2.1" from https://github.com/tree-sitter/tree-sitter-agda. ``` --- pkgs/development/tools/parsing/tree-sitter/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 96b5e47316c7..961a5e96e0b5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -380,7 +380,7 @@ let if [[ "$(printf "%s" "$res" | ${jq}/bin/jq '.message?')" =~ "rate limit" ]]; then echo "rate limited" >&2 fi - release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name')" + release="$(printf "%s" "$res" | ${jq}/bin/jq -r '.tag_name' | tr -d \")" # github sometimes returns an empty list even tough there are releases if [ "$release" = "null" ]; then echo "uh-oh, latest for ${orga + "/" + repo} is not there, using HEAD" >&2 From 964b4a6bd2f7be1090bffb41237141836ed97078 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 23 Mar 2022 05:22:56 +0100 Subject: [PATCH 71/84] tree-sitter: update grammars --- .../parsing/tree-sitter/grammars/tree-sitter-go.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json index 622f2863290c..49a04edbc37b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-go", - "rev": "0fa917a7022d1cd2e9b779a6a8fc5dc7fad69c75", - "date": "2022-01-06T10:54:10+01:00", - "path": "/nix/store/bw2hilbj37ys9lig2fzz58cvjy7nhn3l-tree-sitter-go", - "sha256": "0kgy4yyd0z8pydldnfwsfw2iwbhn4f43qxfhy94wvpwiwi74kfmg", + "rev": "07d722831382a043b16547b6d9202f3da07f3cb3", + "date": "2022-03-22T15:34:30+01:00", + "path": "/nix/store/9ay5gjwnip3jcmi096sw5fyi1kxqg1pk-tree-sitter-go", + "sha256": "0rc1p5jab08v1r81gzaz5xmxmbspl5i5zxba9immzax8ahzhhaxn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 01ed018d6de1a729b3d2ed2b245850c6c1b3f2a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Mar 2022 00:50:17 +0000 Subject: [PATCH 72/84] python310Packages.arpeggio: 1.10.2 -> 2.0.0, add SuperSandro2000 as maintainer --- .../python-modules/arpeggio/default.nix | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/arpeggio/default.nix b/pkgs/development/python-modules/arpeggio/default.nix index 5ad433413ce7..d3d320785293 100644 --- a/pkgs/development/python-modules/arpeggio/default.nix +++ b/pkgs/development/python-modules/arpeggio/default.nix @@ -1,34 +1,32 @@ { lib , buildPythonPackage , fetchPypi -, glibcLocales -, pytest-runner , pytestCheckHook }: buildPythonPackage rec { - pname = "Arpeggio"; - version = "1.10.2"; + pname = "arpeggio"; + version = "2.0.0"; src = fetchPypi { - inherit pname version; - sha256 = "bfe349f252f82f82d84cb886f1d5081d1a31451e6045275e9f90b65d0daa06f1"; + pname = "Arpeggio"; + inherit version; + sha256 = "sha256-1rA4OQGbuKaHhfkpLuajaxlU64S5JbhKa4peHibT7T0="; }; - # Shall not be needed for next release - LC_ALL = "en_US.UTF-8"; - buildInputs = [ glibcLocales ]; - - nativeBuildInputs = [ pytest-runner ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" + ''; checkInputs = [ pytestCheckHook ]; - disabledTests = [ "test_examples" "test_issue_22" ]; + pythonImportsCheck = [ "arpeggio" ]; - dontUseSetuptoolsCheck = true; - - meta = { - description = "Packrat parser interpreter"; - license = lib.licenses.mit; + meta = with lib; { + description = "Recursive descent parser with memoization based on PEG grammars (aka Packrat parser)"; + homepage = "https://github.com/textX/Arpeggio"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From fab200cb0afee7933f1937d01772232c26838732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 23 Mar 2022 05:23:45 +0100 Subject: [PATCH 73/84] python39Packages.parver: drop version constraint on arpeggio, add SuperSandro200 as maintainer --- .../python-modules/parver/default.nix | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix index 268e90020100..878b2746758c 100644 --- a/pkgs/development/python-modules/parver/default.nix +++ b/pkgs/development/python-modules/parver/default.nix @@ -3,7 +3,7 @@ , fetchPypi , six , attrs -, pytest +, pytestCheckHook , hypothesis , pretend , arpeggio @@ -18,11 +18,27 @@ buildPythonPackage rec { sha256 = "c902e0653bcce927cc156a7fd9b3a51924cbce3bf3d0bfd49fc282bfd0c5dfd3"; }; - propagatedBuildInputs = [ six attrs arpeggio ]; - checkInputs = [ pytest hypothesis pretend ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "arpeggio ~= 1.7" "arpeggio" + ''; - meta = { - description = "parver allows parsing and manipulation of PEP 440 version numbers."; - license = lib.licenses.mit; + propagatedBuildInputs = [ + six + attrs + arpeggio + ]; + + checkInputs = [ + pytestCheckHook + hypothesis + pretend + ]; + + meta = with lib; { + description = "Allows parsing and manipulation of PEP 440 version numbers"; + homepage = "https://github.com/RazerM/parver"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 9994b33f0e82661ab1d2a837ad2da42d3e121e4c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 22 Mar 2022 23:49:23 -0500 Subject: [PATCH 74/84] biblatex-check: 2019-11-09 -> 1.0.1 (#157597) --- pkgs/tools/typesetting/biblatex-check/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/tools/typesetting/biblatex-check/default.nix index 63bf7cf1d71a..c929d5901502 100644 --- a/pkgs/tools/typesetting/biblatex-check/default.nix +++ b/pkgs/tools/typesetting/biblatex-check/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, python3 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "biblatex-check"; - version = "2019-11-09"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Pezmc"; repo = "BibLatex-Check"; - rev = "2db50bf94d1480f37edf1b3619e73baf4ef85938"; - sha256 = "1bq0yqckhssazwkivipdjmn1jpsf301i4ppyl88qhc5igx39wg25"; + rev = "v${version}"; + sha256 = "sha256-Pe6Ume7vH8WJG2EqOw31g3VYilfFsDBmNHtHcUXxqf0="; }; buildInputs = [ python3 ]; From 607723da2450a30d3cd98c6dcb9e3d6a572734de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 23 Mar 2022 05:49:40 +0100 Subject: [PATCH 75/84] python39Packages.brotli: update comments, add SuperSandro2000 as maintainer --- pkgs/development/python-modules/brotli/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index d4cff163a0b1..ad247be16185 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -1,22 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytestCheckHook }: +, pytestCheckHook +}: buildPythonPackage rec { pname = "brotli"; version = "1.0.9"; - # PyPI doesn't contain tests so let's use GitHub src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; sha256 = "sha256-tFnXSXv8t3l3HX6GwWLhEtgpqz0c7Yom5U3k47pWM7o="; - # for some reason, the test data isn't captured in releases, force a git checkout + # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data forceFetchGit = true; }; + # only returns information how to really build dontConfigure = true; checkInputs = [ @@ -31,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From e9c91a137a4aa8b35a3cdb01a3fc10e8885d1470 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Wed, 23 Mar 2022 12:50:12 +0800 Subject: [PATCH 76/84] gotktrix: init at 0.1.1 (#162571) Co-authored-by: Sandro --- .../instant-messengers/gotktrix/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/gotktrix/default.nix diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix new file mode 100644 index 000000000000..0500302ddedb --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, gtk4 +, glib +, gobject-introspection +, pkg-config +, go +}: + +buildGoModule rec { + pname = "gotktrix"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "diamondburned"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9feKg/rnkWdJRolHBQ5WT6Rl3xTFe82M8HyxJK3VuN4="; + }; + + vendorSha256 = "sha256-eO/2MvWOVCeeCsiU2mSwgSEVlSbCXOp8qHyoG0lmk+Q="; + + buildInputs = [ + gtk4 + glib + gobject-introspection + ]; + + nativeBuildInputs = [ pkg-config ]; + + # Checking requires a working display + doCheck = false; + + meta = with lib; { + description = "Matrix client written in Go using GTK4"; + homepage = "https://github.com/diamondburned/gotktrix"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ chuangzhu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad051141479d..06f808ca51f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1927,6 +1927,8 @@ with pkgs; gopacked = callPackage ../applications/misc/gopacked { }; + gotktrix = callPackage ../applications/networking/instant-messengers/gotktrix { }; + gucci = callPackage ../tools/text/gucci { }; guglielmo = libsForQt5.callPackage ../applications/radio/guglielmo { }; From f40327ce40985c5b765b4b5277471330263f84ed Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 23 Mar 2022 04:51:47 +0000 Subject: [PATCH 77/84] hut: init at unstable-2022-03-02 (#162663) Co-authored-by: Sandro --- .../git-and-tools/hut/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/hut/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/hut/default.nix b/pkgs/applications/version-management/git-and-tools/hut/default.nix new file mode 100644 index 000000000000..ad0c02aa2e0d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/hut/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildGoModule +, fetchFromSourcehut +, scdoc +, unstableGitUpdater +}: + +buildGoModule { + pname = "hut"; + version = "unstable-2022-03-02"; + + src = fetchFromSourcehut { + owner = "~emersion"; + repo = "hut"; + rev = "55ad2fbd9ceeeb9e7dc203c15476fa785f1209e0"; + sha256 = "sha256-j2IVwCm7iq3JKccPL8noRBhqw+V+4qfcpAwV65xhZk0="; + }; + + vendorSha256 = "sha256-zdQvk0M1a+Y90pnhqIpKxLJnlVJqMoSycewTep2Oux4="; + + nativeBuildInputs = [ + scdoc + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postBuild = '' + make $makeFlags completions doc/hut.1 + ''; + + preInstall = '' + make $makeFlags install + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = with lib; { + homepage = "https://sr.ht/~emersion/hut/"; + description = "A CLI tool for Sourcehut / sr.ht"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06f808ca51f5..66858049ee2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6662,6 +6662,8 @@ with pkgs; humanfriendly = with python3Packages; toPythonApplication humanfriendly; + hut = callPackage ../applications/version-management/git-and-tools/hut { }; + hwinfo = callPackage ../tools/system/hwinfo { }; hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { From 8e9b5c9f88bb5fb68d44ad94e8f03a6bd42d7263 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 22 Mar 2022 21:52:43 -0700 Subject: [PATCH 78/84] katago: 1.10.0 -> 1.11.0 (#165090) Co-authored-by: OmnipotentEntity Co-authored-by: Sandro --- pkgs/games/katago/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index abfeca69e82d..3265f3d63382 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -29,14 +29,14 @@ assert !enableGPU -> ( # of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv stdenv.mkDerivation rec { pname = "katago"; - version = "1.10.0"; - githash = "ff49d04ad6bcfa056c63492439a41e2f3bce0847"; + version = "1.11.0"; + githash = "d8d0cd76cf73df08af3d7061a639488ae9494419"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-ZLJNNjZ5RdOktWDp88d/ItpokANl2EJ0Gbt9oMGm1Og="; + sha256 = "sha256-TZKkkYe2PPzgPhItBZBSJDwU3anhsujuCGIYru55OtU="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; From e0bd12836bb36d211798b9221e0d7ef976fa447f Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 22 Mar 2022 23:53:51 -0500 Subject: [PATCH 79/84] udis86: 1.7.2 -> unstable-2014-12-25, patch for python3 builds (#165177) Co-authored-by: Sandro --- pkgs/development/tools/udis86/default.nix | 24 ++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/udis86/default.nix b/pkgs/development/tools/udis86/default.nix index dd4ad058c8da..aec41c7c97a6 100644 --- a/pkgs/development/tools/udis86/default.nix +++ b/pkgs/development/tools/udis86/default.nix @@ -1,17 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, python2 }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, python3 +}: stdenv.mkDerivation rec { pname = "udis86"; - version = "1.7.2"; + version = "unstable-2014-12-25"; src = fetchFromGitHub { owner = "vmt"; repo = "udis86"; - rev = "v${version}"; - sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1"; + rev = "56ff6c87c11de0ffa725b14339004820556e343d"; + hash = "sha256-bmm1rgzZeStQJXEmcT8vnplsnmgN3LJlYs7COmqsDU8="; }; - nativeBuildInputs = [ autoreconfHook python2 ]; + patches = [ + (fetchpatch { + name = "support-python3-for-building"; + url = "https://github.com/vmt/udis86/commit/3c05ce60372cb2eba39d6eb87ac05af8a664e1b1.patch"; + hash = "sha256-uF4Cwt7UMkyd0RX6cCMQt9xvkkUNQvTDH/Z/6nHtVT8="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook python3 ]; configureFlags = [ "--enable-shared" From d0d06a70d589bbf6e90f8f48bad94640c5efef5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 23 Mar 2022 06:03:04 +0100 Subject: [PATCH 80/84] python39Packages.click: add SuperSandro2000 as maintainer --- pkgs/development/python-modules/click/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 3e2e8b6e24f1..c78f82841110 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -37,5 +37,6 @@ buildPythonPackage rec { composable way, with as little code as necessary. ''; license = licenses.bsd3; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 247c94fc6a90f0c5bc1a0cf1725bcb6c061c8f32 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 23 Mar 2022 04:49:40 +0000 Subject: [PATCH 81/84] terraform-providers: update 2022-03-23 --- .../terraform-providers/providers.json | 86 +++++++++---------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 16c6ee93fe47..01e08c002539 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -148,10 +148,10 @@ "owner": "DrFaust92", "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", "repo": "terraform-provider-bitbucket", - "rev": "v2.12.0", - "sha256": "sha256-FIJ2nnTHV+Rb4Dbtqcdc06qaBBg3hG8NBwv1LxgnoQI=", - "vendorSha256": "sha256-GEnLgGk9yohWXftNfp9Y21BQKE1B6QwN08d7k0ofKTc=", - "version": "2.12.0" + "rev": "v2.13.1", + "sha256": "sha256-P/6scAuRMRrACHmEdWjn+W37ptVmVgtj+iTXQDrG+WM=", + "vendorSha256": "sha256-o1CZ4VuGCPALqSIz8KSm1zCwd3r9bR13CRvP7XpVBAM=", + "version": "2.13.1" }, "brightbox": { "owner": "brightbox", @@ -194,10 +194,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.10.1", - "sha256": "sha256-2Ulavo82Y8dEOXtgpbgCwuCTOhAEoOFbgL4bK5HXQlY=", - "vendorSha256": "sha256-CgK1/Ddau3glxmzb7Y6o1RZbMV8dwA84F6n2OzuyZrU=", - "version": "3.10.1" + "rev": "v3.11.0", + "sha256": "sha256-z7IjLXO/AHWENKYaCospJDcOwOubNcRHKDQzmRkhimw=", + "vendorSha256": "sha256-Lx/faIdx4k399sm9p8BVqpiKZtNjZoThBhWWWgEuPyg=", + "version": "3.11.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -293,10 +293,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/dns", "repo": "terraform-provider-dns", - "rev": "v3.2.1", - "sha256": "1zynfwm7hl7pnldjr2nxj0a06j209r62g8zpkasj6zdjscy62rc8", - "vendorSha256": "0hpf48z7i5h1hh52wpyc48axpvfx9h3209iw36v8c764xzf87w0g", - "version": "3.2.1" + "rev": "v3.2.3", + "sha256": "sha256-aH9sDqlXSq2dJi0kzGreJZ5V8A0WU0UqTpxWPKn23rM=", + "vendorSha256": "sha256-AefmrO8Zb7ICH+qGxYW9ele6kNtrAusOf+KE/iZxKLY=", + "version": "3.2.3" }, "dnsimple": { "owner": "dnsimple", @@ -411,20 +411,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.14.0", - "sha256": "sha256-VWbyxZ5ag9jRF5yaiEdVkRpmnsSb5IiE5FtE2e3j0b8=", - "vendorSha256": "sha256-NrP3+pBePNex/ZmVM349p5vI8uVcs21Sti2C3NfxZkQ=", - "version": "4.14.0" + "rev": "v4.15.0", + "sha256": "sha256-BHtbBfCihy1zh/A9JB03CDh5KpzMWeR/mbuRErJkVUE=", + "vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=", + "version": "4.15.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.14.0", - "sha256": "sha256-VEQff8SnyPLu9I6dbGRac5rF/hRAihlxFhX6KLaov/Y=", - "vendorSha256": "sha256-NrP3+pBePNex/ZmVM349p5vI8uVcs21Sti2C3NfxZkQ=", - "version": "4.14.0" + "rev": "v4.15.0", + "sha256": "sha256-FTT6PS0OS4HPfkM2u4PZwOA/v5VzDwHLdO2s+qgRkW8=", + "vendorSha256": "sha256-7xTABs0O2eBBwjP1JNaFhsodl/ItPC+iv7NnwwlACvU=", + "version": "4.15.0" }, "grafana": { "owner": "grafana", @@ -583,10 +583,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.8.0", - "sha256": "15mjx531jzrsfd4kxnklcr8q7gbq64z772y9m5lhq73anr9yqfa3", + "rev": "v2.9.0", + "sha256": "sha256-w16pm2+8M59grW5HUBBtkKaCnvf5p4GQMEHtQa4DLXs=", "vendorSha256": null, - "version": "2.8.0" + "version": "2.9.0" }, "launchdarkly": { "owner": "launchdarkly", @@ -683,10 +683,10 @@ "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.4.0", - "sha256": "0da7dhgs1c4r65fwwbkbz67lphrsl6ia5v8yx5viwfrsgdh0319z", - "vendorSha256": "1yshi8sz99ii9v77hlgkrcxrazjc8f6s79dszxdrnjwhahnz0hac", - "version": "1.4.0" + "rev": "v1.5.0", + "sha256": "sha256-wHxslrcjv0SuQhbEv95lkGba61HMimE1JLX4lWgSi3s=", + "vendorSha256": "sha256-j5DWJodrnGm9a3VsOjk0ZeVBh77C00SMMXrK7SNKKrY=", + "version": "1.5.0" }, "mongodbatlas": { "owner": "mongodb", @@ -719,10 +719,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.41.0-beta.2", - "sha256": "sha256-tAEEJuU2ceTwXRtgGUFiFw1jgdJHSPG/WfaMDRm+gGQ=", + "rev": "v2.41.1", + "sha256": "sha256-fd4S78viG38Y8xCNnX4l4/dQ/x8JA6Ej/kd556jvBOU=", "vendorSha256": "sha256-Dvm8vmlfV7LH73Y2jNTO106V/fOA7K78jFclbFKZVXA=", - "version": "2.41.0-beta.2" + "version": "2.41.1" }, "nomad": { "owner": "hashicorp", @@ -765,10 +765,10 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.3.0", - "sha256": "1q38f6a8d607sdhrr6xcqmdsvm625v7y36xma137bqv09g3xga0s", - "vendorSha256": "0qkd9pnidf4rhbk7p4jkpcdq36g8lp8pwpsf3hydy6xh072iy4id", - "version": "1.3.0" + "rev": "v1.4.0", + "sha256": "sha256-zOGZxDxGMeubZQ3u+7Qoj+gy29Et7yeFNFWpXbLllEY=", + "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", + "version": "1.4.0" }, "oci": { "owner": "oracle", @@ -1072,10 +1072,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.65.2", - "sha256": "sha256-JrgLHagLc+yhTMa6gVJpVxy3NGCO2BED/87z0JEhesE=", + "rev": "v1.66.0", + "sha256": "sha256-wbG2O6i0Ai86P+uk9rTsut+DEZcRFJCh93CfIEOfP2A=", "vendorSha256": null, - "version": "1.65.2" + "version": "1.66.0" }, "tfe": { "owner": "hashicorp", @@ -1090,10 +1090,10 @@ "owner": "a10networks", "provider-source-address": "registry.terraform.io/a10networks/thunder", "repo": "terraform-provider-thunder", - "rev": "v0.5.21-beta", - "sha256": "1z52ifdi0nj3miwjz96zkmszh13l3vcbijgacfa28j2shasjyfwd", + "rev": "v1.0.0", + "sha256": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", "vendorSha256": null, - "version": "0.5.21-beta" + "version": "1.0.0" }, "time": { "owner": "hashicorp", @@ -1164,10 +1164,10 @@ "owner": "Venafi", "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", - "rev": "v0.15.0", - "sha256": "sha256-7pfEQ7tHA+RiyotlvEymedCsDtR+8EDob1kKw55U5V0=", + "rev": "v0.15.2", + "sha256": "sha256-jnBunvqdLuU+GTRoXr/62FSnUoD5nfLVCN/wo4NdM3A=", "vendorSha256": "sha256-lj8cuv9jR+3P7OiO/eW8poHcX+LsQo+kOyspiqdMXRY=", - "version": "0.15.0" + "version": "0.15.2" }, "vercel": { "owner": "ondrejsika", From 3bf28598c18a52ef0e184e70f0e6def2b8f1a67a Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Wed, 23 Mar 2022 06:29:45 +0100 Subject: [PATCH 82/84] autoadb: init at unstable-2020-06-01 (#165244) Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/misc/autoadb/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/misc/autoadb/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0fda3529e1ad..ef76a3043bef 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11261,6 +11261,12 @@ githubId = 293035; name = "Shawn Dellysse"; }; + shawn8901 = { + email = "shawn8901@googlemail.com"; + github = "shawn8901"; + githubId = 12239057; + name = "Shawn8901"; + }; shazow = { email = "andrey.petrov@shazow.net"; github = "shazow"; diff --git a/pkgs/misc/autoadb/default.nix b/pkgs/misc/autoadb/default.nix new file mode 100644 index 000000000000..25043e9d45d6 --- /dev/null +++ b/pkgs/misc/autoadb/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "autoadb"; + version = "unstable-2020-06-01"; + + src = fetchFromGitHub { + owner = "rom1v"; + repo = pname; + rev = "7f8402983603a9854bf618a384f679a17cd85e2d"; + sha256 = "sha256-9Sv38dCtvbqvxSnRpq+HsIwF/rfLUVZbi0J+mltLres="; + }; + + cargoSha256 = "1gzg1lhq8gp790mrc8fw8dg146k8lg20pnk45m2ssnmdka0826f7"; + + meta = with lib; { + description = "Execute a command whenever a device is adb-connected"; + homepage = "https://github.com/rom1v/autoadb"; + license = licenses.asl20; + maintainers = with maintainers; [ shawn8901 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66858049ee2a..1e68a7e4a04b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14397,6 +14397,8 @@ with pkgs; augeas = callPackage ../tools/system/augeas { }; + autoadb = callPackage ../misc/autoadb { }; + inherit (callPackage ../tools/admin/ansible { }) ansible ansible_2_8 From 61f798890ec12e5fe0adb8959070cab7c34f3fd4 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Wed, 23 Mar 2022 06:30:06 +0100 Subject: [PATCH 83/84] souffle: 2.0.2 -> 2.2 (#164103) Co-authored-by: Sandro --- .../development/compilers/souffle/default.nix | 35 +++++-------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index dada4dfe9e81..df8ad5d360e2 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, perl, ncurses, zlib, sqlite, libffi -, autoreconfHook, mcpp, bison, flex, doxygen, graphviz +{ lib, stdenv, fetchFromGitHub +, bash-completion, perl, ncurses, zlib, sqlite, libffi +, mcpp, cmake, bison, flex, doxygen, graphviz , makeWrapper }: @@ -10,42 +10,23 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.0.2"; + version = "2.2"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "1fa6yssgndrln8qbbw2j7j199glxp63irfrz1c2y424rq82mm2r5"; + sha256 = "sha256-whvC+DL9XbQLc4wf2kFxUKXSyJnGkYq0/0uLCLbliJU="; }; - patches = [ - # Pull pending unstream inclusion fix for ncurses-6.3: - # https://github.com/souffle-lang/souffle/pull/2134 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/souffle-lang/souffle/commit/9e4bdf86d051ef2e1b1a1be64aff7e498fd5dd20.patch"; - sha256 = "0jw1b6qfdf49dx2qlzn1b2yzrgpnkil4w9y3as1m28w8ws7iphpa"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook bison flex mcpp doxygen graphviz makeWrapper perl ]; - buildInputs = [ ncurses zlib sqlite libffi ]; - + nativeBuildInputs = [ bison cmake flex mcpp doxygen graphviz makeWrapper perl ]; + buildInputs = [ bash-completion ncurses zlib sqlite libffi ]; # these propagated inputs are needed for the compiled Souffle mode to work, # since generated compiler code uses them. TODO: maybe write a g++ wrapper # that adds these so we can keep the propagated inputs clean? propagatedBuildInputs = [ ncurses zlib sqlite libffi ]; - # see 565a8e73e80a1bedbb6cc037209c39d631fc393f and parent commits upstream for - # Wno-error fixes - postPatch = '' - substituteInPlace ./src/Makefile.am \ - --replace '-Werror' '-Werror -Wno-error=deprecated -Wno-error=other' - - substituteInPlace configure.ac \ - --replace "m4_esyscmd([git describe --tags --always | tr -d '\n'])" "${version}" - ''; + cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; postInstall = '' wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e68a7e4a04b..be22edcb2d9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13518,9 +13518,7 @@ with pkgs; boost = boost172; }; - souffle = callPackage ../development/compilers/souffle { - autoreconfHook = buildPackages.autoreconfHook269; - }; + souffle = callPackage ../development/compilers/souffle { }; spasm-ng = callPackage ../development/compilers/spasm-ng { }; From 80e7ea13fcaf5cfd59de5be5f586a7e1db71cbe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 23 Mar 2022 05:51:15 +0100 Subject: [PATCH 84/84] python39Packages.certifi: disable on python older 3.5, add SuperSandro2000 as maintainer --- pkgs/development/python-modules/certifi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 68a0ca42986e..bc361806d87a 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , pytestCheckHook }: @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "certifi"; version = "2021.10.08"; - disabled = isPy27; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/certifi/python-certifi"; description = "Python package for providing Mozilla's CA Bundle"; license = licenses.isc; - maintainers = with maintainers; [ koral ]; + maintainers = with maintainers; [ koral SuperSandro2000 ]; }; }