From 2a38d239754bd801f182046413fd636fbc2a9ee9 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Mon, 29 Nov 2021 02:23:41 +0100 Subject: [PATCH 001/187] maintainers: add Cogitri --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fb9ad4fe3af4..00c7446b7d58 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2255,6 +2255,13 @@ githubId = 5561189; name = "Cody Opel"; }; + Cogitri = { + email = "oss@cogitri.dev"; + github = "Cogitri"; + githubId = 8766773; + matrix = "@cogitri:cogitri.dev"; + name = "Rasmus Thomsen"; + }; cohei = { email = "a.d.xvii.kal.mai@gmail.com"; github = "cohei"; From 83e5da923814a54eda6a27a6854f7d9cda7f76a4 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Tue, 28 Dec 2021 12:25:50 +0100 Subject: [PATCH 002/187] bada-bib: init at 0.3.0 --- .../science/misc/bada-bib/default.nix | 78 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/applications/science/misc/bada-bib/default.nix diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix new file mode 100644 index 000000000000..e57a01fb17e8 --- /dev/null +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -0,0 +1,78 @@ +{ lib +, meson +, ninja +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gdk-pixbuf +, gettext +, glib +, gnome +, gobject-introspection +, gtk3 +, libxml2 +, pkg-config +, python3Packages +, wrapGAppsHook }: + +python3Packages.buildPythonApplication rec { + pname = "bada-bib"; + version = "0.3.0"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 + + src = fetchFromGitHub { + owner = "RogerCrocker"; + repo = "BadaBib"; + rev = "v${version}"; + sha256 = "0rclkkf5kd9ab049lizliiqawx5c5y2qmq40lkxnx09sa0283vg8"; + }; + + nativeBuildInputs = [ + gettext + gobject-introspection + libxml2 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gdk-pixbuf + glib + gtk3 + ]; + + checkInputs = [ + appstream-glib + desktop-file-utils + ]; + + pythonPath = with python3Packages; [ + bibtexparser + pygobject3 + watchgod + ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + dontWrapGApps = true; # Needs python wrapper + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/libexec" "$out $pythonPath" + ''; + + meta = with lib; { + homepage = "https://github.com/RogerCrocker/BadaBib"; + description = "A simple BibTeX Viewer and Editor"; + maintainers = [ maintainers.Cogitri ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b157891b92cc..9909fd73d761 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -204,6 +204,8 @@ with pkgs; bacnet-stack = callPackage ../tools/networking/bacnet-stack {}; + bada-bib = callPackage ../applications/science/misc/bada-bib {}; + bakelite = callPackage ../tools/backup/bakelite { }; beyond-identity = callPackage ../tools/security/beyond-identity {}; From 297f73f5b4f2b11d54b7fa2af459f55376c440af Mon Sep 17 00:00:00 2001 From: pacien Date: Wed, 19 Jan 2022 14:29:13 +0100 Subject: [PATCH 003/187] tortoisehg: 5.9 -> 6.0 --- pkgs/applications/version-management/tortoisehg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 3e1b6e4cd8cb..f581380b9281 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -4,11 +4,11 @@ python3Packages.buildPythonApplication rec { pname = "tortoisehg"; - version = "5.9"; + version = "6.0"; src = fetchurl { url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "1y8nb2b9j9qx11k1wrb9hydc94dgbsqx4yf2bv8y878hqmk1z57a"; + sha256 = "sha256-25uQ2llF/+wqdGpun/nzlvAf286OIRmlZUISZ0szH6Y="; }; # Extension point for when thg's mercurial is lagging behind mainline. From ad859da39076cfeb23d7dd303c10fe61f61268d3 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sat, 22 Jan 2022 21:53:54 +0100 Subject: [PATCH 004/187] asciidoctor-with-extensions: add multipage --- .../typesetting/asciidoctor-with-extensions/Gemfile | 1 + .../asciidoctor-with-extensions/Gemfile.lock | 3 +++ .../asciidoctor-with-extensions/default.nix | 3 ++- .../asciidoctor-with-extensions/gemset.nix | 11 +++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile index 9e65ac43afa1..cfeefff2f0a3 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile @@ -5,6 +5,7 @@ gem 'asciidoctor-diagram' gem 'asciidoctor-epub3' gem 'asciidoctor-html5s' gem 'asciidoctor-mathematical' +gem 'asciidoctor-multipage' gem 'asciidoctor-pdf' gem 'asciidoctor-revealjs' gem 'asciidoctor-rouge' diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock index 98418e183d45..a68c76ece59c 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock @@ -30,6 +30,8 @@ GEM asciidoctor (~> 2.0) asciimath (~> 2.0) mathematical (~> 1.6.0) + asciidoctor-multipage (0.0.15) + asciidoctor (>= 2.0.11, < 2.1) asciidoctor-pdf (1.6.1) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) @@ -128,6 +130,7 @@ DEPENDENCIES asciidoctor-epub3 asciidoctor-html5s asciidoctor-mathematical + asciidoctor-multipage asciidoctor-pdf asciidoctor-revealjs asciidoctor-rouge diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix index 6bb0eac62f12..c4aa7fa4a271 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix @@ -10,8 +10,9 @@ bundlerApp { exes = [ "asciidoctor" - "asciidoctor-pdf" "asciidoctor-epub3" + "asciidoctor-multipage" + "asciidoctor-pdf" "asciidoctor-revealjs" ]; diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix index e88f9701d0d3..b07c0eff90a4 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix @@ -115,6 +115,17 @@ }; version = "0.3.5"; }; + asciidoctor-multipage = { + dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1372213kxw1b9k120dmyackafzsk80h1y2n0r1hmfrri26kczgfb"; + type = "gem"; + }; + version = "0.0.15"; + }; asciidoctor-pdf = { dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"]; groups = ["default"]; From 9d8634565af71a15e4412687d4dda82d98ef74e6 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sat, 22 Jan 2022 21:54:42 +0100 Subject: [PATCH 005/187] asciidoctor-with-extensions: 2.0.16 -> 2.0.17 --- .../asciidoctor-with-extensions/Gemfile.lock | 20 +++++------ .../asciidoctor-with-extensions/gemset.nix | 36 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock index a68c76ece59c..5b0e79aa2bd5 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock @@ -5,7 +5,7 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.16) + asciidoctor (2.0.17) asciidoctor-bibtex (0.8.0) asciidoctor (~> 2.0) bibtex-ruby (~> 5.1) @@ -32,7 +32,7 @@ GEM mathematical (~> 1.6.0) asciidoctor-multipage (0.0.15) asciidoctor (>= 2.0.11, < 2.1) - asciidoctor-pdf (1.6.1) + asciidoctor-pdf (1.6.2) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) prawn (~> 2.4.0) @@ -64,7 +64,7 @@ GEM rexml csl-styles (1.0.1.11) csl (~> 1.0) - css_parser (1.10.0) + css_parser (1.11.0) addressable gepub (1.0.15) nokogiri (>= 1.8.2, < 2.0) @@ -77,14 +77,14 @@ GEM ruby-enum (~> 0.4) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) - mini_portile2 (2.6.1) + mime-types-data (3.2022.0105) + mini_portile2 (2.7.1) namae (1.1.1) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.1) + mini_portile2 (~> 2.7.0) racc (~> 1.4) pdf-core (0.9.0) - pdf-reader (2.6.0) + pdf-reader (2.8.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -106,10 +106,10 @@ GEM pdf-reader (~> 2.0) prawn (~> 2.2) public_suffix (4.0.6) - pygments.rb (2.2.0) + pygments.rb (2.3.0) racc (1.6.0) rexml (3.2.5) - rouge (3.26.1) + rouge (3.27.0) ruby-enum (0.9.0) i18n ruby-rc4 (0.1.5) diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix index b07c0eff90a4..498653c12f2e 100644 --- a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2"; + sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd"; type = "gem"; }; - version = "2.0.16"; + version = "2.0.17"; }; asciidoctor-bibtex = { dependencies = ["asciidoctor" "bibtex-ruby" "citeproc-ruby" "csl-styles" "latex-decode"]; @@ -132,10 +132,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk"; + sha256 = "1inl7cykm542jb7a6kraxkgfqn4y3185wrabh5pd5m68rdv56f04"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; asciidoctor-revealjs = { dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; gepub = { dependencies = ["nokogiri" "rubyzip"]; @@ -324,20 +324,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.1115"; + version = "3.2022.0105"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq"; + sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.1"; }; namae = { groups = ["default"]; @@ -355,10 +355,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b"; + sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11"; type = "gem"; }; - version = "1.12.5"; + version = "1.13.1"; }; pdf-core = { groups = ["default"]; @@ -376,10 +376,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz"; + sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; polyglot = { groups = ["default"]; @@ -461,10 +461,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb"; + sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; racc = { groups = ["default"]; @@ -491,10 +491,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; + sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; type = "gem"; }; - version = "3.26.1"; + version = "3.27.0"; }; ruby-enum = { dependencies = ["i18n"]; From 30d52c1d9bb49f4be63c5e6937866f61559ed4d3 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Sat, 22 Jan 2022 21:54:59 +0100 Subject: [PATCH 006/187] asciidoctor: 2.0.16 -> 2.0.17 --- .../typesetting/asciidoctor/Gemfile.lock | 12 +++++----- pkgs/tools/typesetting/asciidoctor/gemset.nix | 24 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 5c607d269b22..7652239b998d 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -5,8 +5,8 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.16) - asciidoctor-pdf (1.6.1) + asciidoctor (2.0.17) + asciidoctor-pdf (1.6.2) asciidoctor (~> 2.0) concurrent-ruby (~> 1.1) prawn (~> 2.4.0) @@ -18,11 +18,11 @@ GEM treetop (~> 1.6.0) coderay (1.1.3) concurrent-ruby (1.1.9) - css_parser (1.10.0) + css_parser (1.11.0) addressable hashery (2.1.2) pdf-core (0.9.0) - pdf-reader (2.6.0) + pdf-reader (2.8.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -44,9 +44,9 @@ GEM pdf-reader (~> 2.0) prawn (~> 2.2) public_suffix (4.0.6) - pygments.rb (2.2.0) + pygments.rb (2.3.0) rexml (3.2.5) - rouge (3.26.1) + rouge (3.27.0) ruby-rc4 (0.1.5) safe_yaml (1.0.5) treetop (1.6.11) diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index b57d1e5ac4ad..d87c6c1fa995 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10h4pmmkbcrpy7bn76wxzkb0hriabh1k3ii1g8lm0mdji5drlhq2"; + sha256 = "0g8gn3g6qy4bzjv1b14sj283kqynjgwq62bgq569jr4dkqwmwnzd"; type = "gem"; }; - version = "2.0.16"; + version = "2.0.17"; }; asciidoctor-pdf = { dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"]; @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17d3fa6ix6r5ikydqz41r620mm98s076wdg4w6ydsr655r7mvnpk"; + sha256 = "1inl7cykm542jb7a6kraxkgfqn4y3185wrabh5pd5m68rdv56f04"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; coderay = { groups = ["default"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q8gj3wkc2mbzsqw5zcsr3kyzrrb2pda03pi769rjbvqr94g3bm5"; + sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; hashery = { groups = ["default"]; @@ -108,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgv9pp9cqd1cf8bwk7pb5lkm81gn7znnan0a7s42wd0qavs4nnz"; + sha256 = "18vsmybpvyi0favlabjipznpc8hgprsm7jpw3s7xr01c3lpjli7y"; type = "gem"; }; - version = "2.6.0"; + version = "2.8.0"; }; polyglot = { groups = ["default"]; @@ -193,10 +193,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb"; + sha256 = "047mjyzz8v4kkgi1ap6fsjf7kcp6dwirpnigif00ss0hxsxchhac"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; rexml = { groups = ["default"]; @@ -213,10 +213,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "197k0vskf72wxx0gzwld2jzg27bb7982xlvnzy9adlvkzp7nh8vf"; + sha256 = "0530ri0p60km0bg0ib6swkhfnas427cva7vcdmnwl8df52a10y1k"; type = "gem"; }; - version = "3.26.1"; + version = "3.27.0"; }; ruby-rc4 = { groups = ["default"]; From aa6ed9ec7d41a268199caaf3ace9938d89265573 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sun, 23 Jan 2022 16:55:10 +0100 Subject: [PATCH 007/187] sub-batch: 0.4.1 -> 1.0.0 --- pkgs/applications/video/sub-batch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/sub-batch/default.nix b/pkgs/applications/video/sub-batch/default.nix index fd5b2888d63d..1603bdcbb940 100644 --- a/pkgs/applications/video/sub-batch/default.nix +++ b/pkgs/applications/video/sub-batch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sub-batch"; - version = "0.4.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "kl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WUW+lOGbZ82NJxmW+Ogxslf3COOp62aZ/08Yn26l4T0="; + sha256 = "sha256-N+3KyBlLG90C3D5ivgj6qedtKsUBoBHr89gmxyAIfVI="; }; - cargoSha256 = "sha256-m9nBubmuuOcJyegmYGJizY/2b7oamBHKFNIaxOtikcA="; + cargoSha256 = "sha256-rjhSosiLIgcSw6OHpFmGNHXGUdf2QsiIXFVgtO9qNY0="; nativeBuildInputs = [ makeWrapper ]; From 78cbcb3346c80256aad3a73ee332733f9137af39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jan 2022 14:07:12 +0000 Subject: [PATCH 008/187] inherd-quake: 0.4.0 -> 0.5.0 --- pkgs/applications/misc/inherd-quake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/inherd-quake/default.nix b/pkgs/applications/misc/inherd-quake/default.nix index e8bfa00406e2..0fd6e72a57ec 100644 --- a/pkgs/applications/misc/inherd-quake/default.nix +++ b/pkgs/applications/misc/inherd-quake/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "inherd-quake"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "phodal"; repo = "quake"; rev = "v${version}"; - sha256 = "UujcsvjbXda1DdV4hevUP4PbdbOKHQ3O/FBDlhAjfq0="; + sha256 = "sha256-OkgrkjO6IS6P2ZyFFbOprROPzDfQcHYCwaTKFsjjVo8="; }; - cargoSha256 = "HkdF7hLgThOWExociNgxvTxF4qL3F5CPK/j/ZKLg/m4="; + cargoSha256 = "sha256-EMRaChFwjMYZKSX5OvXYLSiwWo1m1H/tHVqc8RXX52A="; nativeBuildInputs = [ pkg-config ]; From 8ee52a13250ec0254c85d437b20ab0dd22e34c6d Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 24 Jan 2022 01:17:29 +0900 Subject: [PATCH 009/187] noto-fonts-cjk: use sparse checkouts for smaller downloads Fixes #156180. --- pkgs/data/fonts/noto-fonts/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index a0d3b34c85cd..a8c6717bd657 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -70,6 +70,7 @@ let owner = "googlefonts"; repo = "noto-cjk"; inherit rev sha256; + sparseCheckout = "${typeface}/OTC"; }; installPhase = '' @@ -113,14 +114,14 @@ in typeface = "Sans"; version = "2.004"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU="; }; noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; version = "2.000"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik="; + sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY="; }; noto-fonts-emoji = let From f8832996d883756c4ae0a1487173e46438d53a04 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 22 Jan 2022 10:06:13 +0800 Subject: [PATCH 010/187] nixos: add sample test for noto fonts --- nixos/tests/all-tests.nix | 1 + nixos/tests/noto-fonts.nix | 44 ++++++++++++++++++++++++++ pkgs/data/fonts/noto-fonts/default.nix | 3 ++ 3 files changed, 48 insertions(+) create mode 100644 nixos/tests/noto-fonts.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 62bc8acef606..2ba2a02384b2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -354,6 +354,7 @@ in nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; }; node-red = handleTest ./node-red.nix {}; nomad = handleTest ./nomad.nix {}; + noto-fonts = handleTest ./noto-fonts.nix {}; novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; nzbget = handleTest ./nzbget.nix {}; diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix new file mode 100644 index 000000000000..829d7797d012 --- /dev/null +++ b/nixos/tests/noto-fonts.nix @@ -0,0 +1,44 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "noto-fonts"; + meta = { + maintainers = with lib.maintainers; [ nickcao ]; + }; + + machine = { + imports = [ ./common/x11.nix ]; + environment.systemPackages = [ pkgs.gnome.gedit ]; + fonts = { + enableDefaultFonts = false; + fonts = with pkgs;[ + noto-fonts + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + ]; + fontconfig.defaultFonts = { + serif = [ "Noto Serif" "Noto Serif CJK SC" ]; + sansSerif = [ "Noto Sans" "Noto Sans CJK SC" ]; + monospace = [ "Noto Sans Mono" "Noto Sans Mono CJK SC" ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + }; + + testScript = + # extracted from http://www.clagnut.com/blog/2380/ + let testText = builtins.toFile "test.txt" '' + the quick brown fox jumps over the lazy dog + 視野無限廣，窗外有藍天 + Eĥoŝanĝo ĉiuĵaŭde. + いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす + 다람쥐 헌 쳇바퀴에 타고파 + 中国智造，慧及全球 + ''; in + '' + machine.wait_for_x() + machine.succeed("gedit ${testText} >&2 &") + machine.wait_for_window(".* - gedit") + machine.sleep(10) + machine.screenshot("screen") + ''; +}) diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index a8c6717bd657..9c9996db39e0 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , fetchurl , cairo +, nixosTests , python3 , pkg-config , pngquant @@ -77,6 +78,8 @@ let install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc ''; + passthru.tests.noto-fonts = nixosTests.noto-fonts; + meta = with lib; { description = "Beautiful and free fonts for CJK languages"; homepage = "https://www.google.com/get/noto/help/cjk/"; From 1c0552204145981bb2f6a6edf8e377391588a86d Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Wed, 26 Jan 2022 14:37:14 -0600 Subject: [PATCH 011/187] wiki-tui: 0.4.4 -> 0.4.5 --- pkgs/misc/wiki-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/wiki-tui/default.nix b/pkgs/misc/wiki-tui/default.nix index 3885da4cbeba..4ff3262d27a5 100644 --- a/pkgs/misc/wiki-tui/default.nix +++ b/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IkPv6oPdwfuIQrqQGqZAJ0b9OPRiA3GWDQuPXM/+fY4="; + sha256 = "sha256-IMNHsmL1L+zfGxfdTxJ4HBGiQOzWmYVE0P3ZInbMVl0="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-/56KsEg6deeROERWLd9lX+7v6n5Dx1VCzdr/GtPFuGo="; + cargoSha256 = "sha256-Q8Xl6L41cDeDN370owAAL9xZhdyUuDKrPlZxG3eg87c="; meta = with lib; { description = "A simple and easy to use Wikipedia Text User Interface"; From 65b18a28c00c286c4417e0bfbecea6db96d35074 Mon Sep 17 00:00:00 2001 From: Jamie Quigley Date: Wed, 26 Jan 2022 20:45:06 +0000 Subject: [PATCH 012/187] thc-hydra: fix build on darwin stdenv-darwin's `ld` doesn;t support --allow-multiple-definition, so it has to be patched out to build --- .../security/thc-hydra/darwin-remove-ldflag.patch | 13 +++++++++++++ pkgs/tools/security/thc-hydra/default.nix | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch diff --git a/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch b/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch new file mode 100644 index 000000000000..b19b9ffe8a62 --- /dev/null +++ b/pkgs/tools/security/thc-hydra/darwin-remove-ldflag.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index 1c915f1..83a8e41 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,7 +4,7 @@ + WARN_CLANG=-Wformat-nonliteral -Wstrncat-size -Wformat-security -Wsign-conversion -Wconversion -Wfloat-conversion -Wshorten-64-to-32 -Wuninitialized -Wmissing-variable-declarations -Wmissing-declarations + WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral -Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 -Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion -Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fno-common -Wcast-align + CFLAGS ?= -g +-OPTS=-I. -O3 $(CFLAGS) -fcommon -Wl,--allow-multiple-definition ++OPTS=-I. -O3 $(CFLAGS) -fcommon + # -Wall -g -pedantic + LIBS=-lm + DESTDIR ?= diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index f60d5374648f..b12daff00387 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-V9rr5fbJWm0pa+Kp8g95XvLPo/uWcDwyU2goImnIq58="; }; + patches = lib.optionals stdenv.isDarwin [ + ./darwin-remove-ldflag.patch + ]; + postPatch = let makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs); in '' @@ -43,6 +47,6 @@ stdenv.mkDerivation rec { homepage = "https://www.thc.org/thc-hydra/"; license = licenses.agpl3; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 26a695399a0e8bc40c502655c3d147f1791e774f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Wed, 10 Feb 2021 00:37:24 +0100 Subject: [PATCH 013/187] nixos/apfs: init Add the final missing pieces for full APFS support. --- .../from_md/release-notes/rl-2205.section.xml | 6 +++ .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/system/boot/stage-1-init.sh | 3 ++ nixos/modules/tasks/filesystems.nix | 2 +- nixos/modules/tasks/filesystems/apfs.nix | 22 ++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/apfs.nix | 54 +++++++++++++++++++ 8 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/tasks/filesystems/apfs.nix create mode 100644 nixos/tests/apfs.nix 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 8d8d70440e84..3f6ab79a19f7 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 @@ -79,6 +79,12 @@ services.filebeat. + + + apfs, + a kernel module for mounting the Apple File System (APFS). + + FRRouting, a diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 61305fe70d65..31e1e36d9e77 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -27,6 +27,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable). +- [apfs](https://github.com/linux-apfs/linux-apfs-rw), a kernel module for mounting the Apple File System (APFS). + - [FRRouting](https://frrouting.org/), a popular suite of Internet routing protocol daemons (BGP, BFD, OSPF, IS-IS, VVRP and others). Available as [services.frr](#opt-services.ffr.babel.enable) - [heisenbridge](https://github.com/hifi/heisenbridge), a bouncer-style Matrix IRC bridge. Available as [services.heisenbridge](options.html#opt-services.heisenbridge.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c2b1e8866863..6b20e86978c0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1162,6 +1162,7 @@ ./tasks/cpu-freq.nix ./tasks/encrypted-devices.nix ./tasks/filesystems.nix + ./tasks/filesystems/apfs.nix ./tasks/filesystems/bcachefs.nix ./tasks/filesystems/btrfs.nix ./tasks/filesystems/cifs.nix diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index f86d4641228c..8fcc1f029723 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -282,6 +282,9 @@ checkFS() { # Don't check resilient COWs as they validate the fs structures at mount time if [ "$fsType" = btrfs -o "$fsType" = zfs -o "$fsType" = bcachefs ]; then return 0; fi + # Skip fsck for apfs as the fsck utility does not support repairing the filesystem (no -a option) + if [ "$fsType" = apfs ]; then return 0; fi + # Skip fsck for nilfs2 - not needed by design and no fsck tool for this filesystem. if [ "$fsType" = nilfs2 ]; then return 0; fi diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 225bcbe58e01..f3da6771197e 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -250,7 +250,7 @@ in environment.etc.fstab.text = let - fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" ]; + fsToSkipCheck = [ "none" "bindfs" "btrfs" "zfs" "tmpfs" "nfs" "vboxsf" "glusterfs" "apfs" ]; skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; diff --git a/nixos/modules/tasks/filesystems/apfs.nix b/nixos/modules/tasks/filesystems/apfs.nix new file mode 100644 index 000000000000..2f2be351df61 --- /dev/null +++ b/nixos/modules/tasks/filesystems/apfs.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inInitrd = any (fs: fs == "apfs") config.boot.initrd.supportedFilesystems; + +in + +{ + config = mkIf (any (fs: fs == "apfs") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.apfsprogs ]; + + boot.extraModulePackages = [ config.boot.kernelPackages.apfs ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "apfs" ]; + + # Don't copy apfsck into the initramfs since it does not support repairing the filesystem + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 62bc8acef606..a58e95b07492 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -35,6 +35,7 @@ in agda = handleTest ./agda.nix {}; airsonic = handleTest ./airsonic.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + apfs = handleTest ./apfs.nix {}; apparmor = handleTest ./apparmor.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; diff --git a/nixos/tests/apfs.nix b/nixos/tests/apfs.nix new file mode 100644 index 000000000000..a82886cbe731 --- /dev/null +++ b/nixos/tests/apfs.nix @@ -0,0 +1,54 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "apfs"; + meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ]; + + machine = { pkgs, ... }: { + virtualisation.emptyDiskImages = [ 1024 ]; + + boot.supportedFilesystems = [ "apfs" ]; + }; + + testScript = '' + machine.wait_for_unit("basic.target") + machine.succeed("mkdir /tmp/mnt") + + with subtest("mkapfs refuses to work with a label that is too long"): + machine.fail( "mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F' /dev/vdb") + + with subtest("mkapfs works with the maximum label length"): + machine.succeed("mkapfs -L '000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7' /dev/vdb") + + with subtest("Enable case sensitivity and normalization sensitivity"): + machine.succeed( + "mkapfs -s -z /dev/vdb", + # Triggers a bug, see https://github.com/linux-apfs/linux-apfs-rw/issues/15 + # "mount -o cknodes,readwrite /dev/vdb /tmp/mnt", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'Hello World 1' > /tmp/mnt/test.txt", + "[ ! -f /tmp/mnt/TeSt.TxT ] || false", # Test case sensitivity + "echo 'Hello World 1' | diff - /tmp/mnt/test.txt", + "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", + "[ ! -f /tmp/mnt/\u00e1.txt ] || false", # Test Unicode normalization sensitivity + "umount /tmp/mnt", + "apfsck /dev/vdb", + ) + with subtest("Disable case sensitivity and normalization sensitivity"): + machine.succeed( + "mkapfs /dev/vdb", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'bla bla bla' > /tmp/mnt/Test.txt", + "echo -n 'Hello World' > /tmp/mnt/test.txt", + "echo ' 1' >> /tmp/mnt/TEST.TXT", + "umount /tmp/mnt", + "apfsck /dev/vdb", + "mount -o readwrite /dev/vdb /tmp/mnt", + "echo 'Hello World 1' | diff - /tmp/mnt/TeSt.TxT", # Test case insensitivity + "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", + "echo 'Hello World 2' | diff - /tmp/mnt/\u00e1.txt", # Test Unicode normalization + "umount /tmp/mnt", + "apfsck /dev/vdb", + ) + ''; +}) From a7182cabf84591d64d44637ecc69b84d53f1f7b4 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Thu, 27 Jan 2022 15:46:04 +0100 Subject: [PATCH 014/187] openjdk8 with javaFX: fix sha256 on aarch64-darwin --- pkgs/development/compilers/openjdk/darwin/8.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index 1d829450a1ed..009802b29234 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -23,7 +23,7 @@ let zuluVersion = "8.54.0.21"; jdkVersion = "8.0.292"; sha256 = - if enableJavaFX then "1b05b2e40f707a151b063ebba821270fa930ebfc05712bc1f5a8a112395731a6" + if enableJavaFX then "8e901075cde2c31f531a34e8321ea4201970936abf54240a232e9389952afe84" else "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c"; }; }."${stdenv.hostPlatform.system}"; From ee48edb62066916f86bde43528adafc3e19a2820 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 27 Jan 2022 17:59:58 +0100 Subject: [PATCH 015/187] arduino: 1.8.16 -> 1.8.19 --- .../embedded/arduino/arduino-core/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 6b2c6203a392..44c20e12004b 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -79,13 +79,13 @@ let in stdenv.mkDerivation rec { pname = (if withTeensyduino then "teensyduino" else "arduino") + lib.optionalString (!withGui) "-core"; - version = "1.8.16"; + version = "1.8.19"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = version; - sha256 = "sha256-6d+y0Lgr+h0qYpCsa/ihvSMNuAdRMNQRuxZFpkWLDvg="; + sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ="; }; teensyduino_version = "155"; @@ -102,10 +102,10 @@ stdenv.mkDerivation rec { arduino_dist_src = fetchurl { url = "https://downloads.arduino.cc/arduino-${version}-${teensy_architecture}.tar.xz"; sha256 = { - linux64 = "sha256-VK+Skl2xjqPWYEEKt1CCLwBZRxoyRfYQ3/60Byen9po="; - linux32 = "sha256-fjqV4avddmWAdFqMuUNUcDguxv3SI45m5QHFiWP8EKE="; - linuxarm = "sha256-Br8vUN7njI7VCH+ZvUh44l8LcgW+61+Q0x2AiXxIhTM="; - linuxaarch64 = "sha256-bOizBUUuyINg0/EqEatBq9lECT97JXxKbesCGyCA3YQ="; + linux64 = "sha256-62i93B0cASC+L8oTUKA+40Uxzzf1GEeyEhC25wVFvJs="; + linux32 = "sha256-wSxtx3BqXMQCeWQDK8PHkWLlQqQM1Csao8bIk98FrFg="; + linuxarm = "sha256-lJ/R1ePq7YtDk3bvloFcn8jswrJH+L63tvH5QpTqfXs="; + linuxaarch64 = "sha256-gm8cDjLKNfpcaeO7fw6Kyv1TnWV/ZmH4u++nun9X6jo="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; From 7f6a7ee25ed9db33a45f0f015b191a4d48cea7ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Jan 2022 08:47:47 +0000 Subject: [PATCH 016/187] qcad: 3.27.1.3 -> 3.27.1.6 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 10dc4edc489b..2e75977d68a2 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "qcad"; - version = "3.27.1.3"; + version = "3.27.1.6"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-DHDfDwGrYMRd5gxFaPL06B/wssQho9420MxUg8fI2r0="; + sha256 = "sha256-ouvWE1fa4DfPLqFYuMsUPWDx/NUaoCc7TfR6Ed0uuF4="; }; patches = [ From ecb6f035e636fa6aef0e99773994738c64b5d841 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 17:33:06 +0100 Subject: [PATCH 017/187] yarn2nix: Add support for nativeBuildInputs in pkgConfig --- .../tools/yarn2nix-moretea/yarn2nix/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index b0bf715e66e8..087658fe5513 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -76,9 +76,14 @@ in rec { workspaceDependencies ? [], # List of yarn packages }: let - extraBuildInputs = (lib.flatten (builtins.map (key: - pkgConfig.${key}.buildInputs or [] - ) (builtins.attrNames pkgConfig))); + extraNativeBuildInputs = + lib.concatMap + (key: pkgConfig.${key}.nativeBuildInputs or []) + (builtins.attrNames pkgConfig); + extraBuildInputs = + lib.concatMap + (key: pkgConfig.${key}.buildInputs or []) + (builtins.attrNames pkgConfig); postInstall = (builtins.map (key: if (pkgConfig.${key} ? postInstall) then @@ -106,7 +111,8 @@ in rec { inherit preBuild postBuild name; dontUnpack = true; dontInstall = true; - buildInputs = [ yarn nodejs git ] ++ extraBuildInputs; + nativeBuildInputs = [ yarn nodejs git ] ++ extraNativeBuildInputs; + buildInputs = extraBuildInputs; configurePhase = lib.optionalString (offlineCache ? outputHash) '' if ! cmp -s ${yarnLock} ${offlineCache}/yarn.lock; then From d7d237e00e059b119098208377a42240f345c4f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 17:41:34 +0100 Subject: [PATCH 018/187] =?UTF-8?q?sharedown:=203.0.1=20=E2=86=92=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds support for storing secrets in keychain. https://github.com/kylon/Sharedown/releases/tag/3.1.0 --- pkgs/tools/misc/sharedown/default.nix | 36 +- pkgs/tools/misc/sharedown/yarn.lock | 385 ++++++--- pkgs/tools/misc/sharedown/yarndeps.nix | 1006 ++++++++++++++---------- 3 files changed, 931 insertions(+), 496 deletions(-) diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 2fb9553a7fea..048e8eb6008a 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -3,6 +3,10 @@ , fetchFromGitHub , ffmpeg , yt-dlp +, libsecret +, python3 +, pkg-config +, nodejs , electron , makeWrapper , makeDesktopItem @@ -13,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-0moxrRxydH/g3J5cQmaFSDhTZh9OnUi8ncPVw7q1JC0="; + sha256 = "sha256-wQEP3fdp+Mhgoz873cgF65WouWtbEdCdXfLiVSmrjyA="; }; nativeBuildInputs = [ @@ -55,6 +59,34 @@ stdenvNoCC.mkDerivation rec { "--production" ]; + pkgConfig = { + keytar = { + nativeBuildInputs = [ + python3 + pkg-config + ]; + buildInputs = [ + libsecret + ]; + postInstall = '' + yarn --offline run build + # Remove unnecessary store path references. + rm build/config.gypi + ''; + }; + }; + + preBuild = '' + # Set up headers for node-gyp, which is needed to build keytar. + mkdir -p "$HOME/.cache/node-gyp/${nodejs.version}" + + # Set up version which node-gyp checks in against the version in . + echo 9 > "$HOME/.cache/node-gyp/${nodejs.version}/installVersion" + + # Link node headers so that node-gyp does not try to download them. + ln -sfv "${nodejs}/include" "$HOME/.cache/node-gyp/${nodejs.version}" + ''; + packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; yarnNix = ./yarndeps.nix; diff --git a/pkgs/tools/misc/sharedown/yarn.lock b/pkgs/tools/misc/sharedown/yarn.lock index 5b5638db5055..58cfe65b3dd2 100644 --- a/pkgs/tools/misc/sharedown/yarn.lock +++ b/pkgs/tools/misc/sharedown/yarn.lock @@ -109,14 +109,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "16.11.10" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz#2e3ad0a680d96367103d3e670d41c2fed3da61ae" - integrity sha512-3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA== + version "17.0.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz#616f16e9d3a2a3d618136b1be244315d95bd7cab" + integrity sha512-S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog== "@types/node@^14.6.2": - version "14.17.34" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz#fe4b38b3f07617c0fa31ae923fca9249641038f0" - integrity sha512-USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg== + version "14.18.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz#0e5944eefe2b287391279a19b407aa98bd14436d" + integrity sha512-j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q== "@types/plist@^3.0.1": version "3.0.2" @@ -137,9 +137,9 @@ integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== "@types/yargs@^17.0.1": - version "17.0.7" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz#44a484c634761da4391477515a98772b82b5060f" - integrity sha512-OvLKmpKdea1aWtqHv9bxVVcMoT6syAeK+198dfETIFkAevYRGwqh4H+KFxfjUETZuUuE5sQCAFwdOdoHUdo8eg== + version "17.0.8" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz#d23a3476fd3da8a0ea44b5494ca7fa677b9dad4c" + integrity sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw== dependencies: "@types/yargs-parser" "*" @@ -179,10 +179,10 @@ ansi-align@^3.0.0: dependencies: string-width "^4.1.0" -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" + integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= ansi-regex@^5.0.1: version "5.0.1" @@ -239,11 +239,24 @@ app-builder-lib@22.14.5: semver "^7.3.5" temp-file "^3.4.0" +aproba@^1.0.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" + integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + arch@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== +are-we-there-yet@~1.1.2: + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" @@ -266,6 +279,11 @@ assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" @@ -440,9 +458,9 @@ cacheable-request@^6.0.0: responselike "^1.0.2" camelcase@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" - integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== chalk@^2.4.2: version "2.4.2" @@ -491,13 +509,13 @@ cli-boxes@^2.2.1: resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== -cli-truncate@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086" - integrity sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA== +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - slice-ansi "^1.0.0" - string-width "^2.0.0" + slice-ansi "^3.0.0" + string-width "^4.2.0" clipboardy@2.3.0: version "2.3.0" @@ -524,6 +542,11 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -612,6 +635,11 @@ configstore@^5.0.1: write-file-atomic "^3.0.0" xdg-basedir "^4.0.0" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -659,7 +687,14 @@ crypto-random-string@^2.0.0: resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== -debug@4, debug@4.3.2, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.3" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" + integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== + dependencies: + ms "2.1.2" + +debug@4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -680,6 +715,13 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" +decompress-response@^4.2.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986" + integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw== + dependencies: + mimic-response "^2.0.0" + deep-extend@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" @@ -702,15 +744,25 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.1.0" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.901419: - version "0.0.901419" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz#79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd" - integrity sha512-4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ== +devtools-protocol@0.0.937139: + version "0.0.937139" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz#bdee3751fdfdb81cb701fd3afa94b1065dafafcf" + integrity sha512-daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ== dir-compare@^2.4.0: version "2.4.0" @@ -737,17 +789,16 @@ dmg-builder@22.14.5: dmg-license "^1.0.9" dmg-license@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f" - integrity sha512-Rq6qMDaDou2+aPN2SYy0x7LDznoJ/XaG6oDcH5wXUp+WRWQMUYE6eM+F+nex+/LSXOp1uw4HLFoed0YbfU8R/Q== + version "1.0.10" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc" + integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A== dependencies: "@types/plist" "^3.0.1" "@types/verror" "^1.10.3" ajv "^6.10.0" - cli-truncate "^1.1.0" crc "^3.8.0" - iconv-corefoundation "^1.1.6" - plist "^3.0.1" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" smart-buffer "^4.0.2" verror "^1.10.0" @@ -780,7 +831,7 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@^22.13.1: +electron-builder@^22.14.5: version "22.14.5" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496" integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg== @@ -823,10 +874,10 @@ electron-publish@22.14.5: lazy-val "^1.0.5" mime "^2.5.2" -electron@^15.3.1: - version "15.3.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz#4f0cbad781d14e0194f5dfef1709e09a70c8074a" - integrity sha512-sEpOX10gjAyvq33HDxJrq2HhYZT3qndZjUrHkzG16QTLjykP7lMvGnJ/bt6wn+T75f4wwv59FUbQx2hW3Xz5TQ== +electron@^16.0.6: + version "16.0.7" + resolved "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz#87eaccd05ab61563d3c17dfbad2949bba7ead162" + integrity sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" @@ -892,6 +943,11 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +expand-template@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" + integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== + extract-zip@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" @@ -951,9 +1007,9 @@ find-up@^4.0.0: path-exists "^4.0.0" follow-redirects@^1.14.4: - version "1.14.5" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" - integrity sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA== + version "1.14.7" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685" + integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ== font-awesome@^4.7.0: version "4.7.0" @@ -1007,6 +1063,20 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -1026,6 +1096,11 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" +github-from-package@0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" + integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= + glob@^7.1.3, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -1092,9 +1167,9 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== + version "4.2.9" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96" + integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ== "graceful-readlink@>= 1.0.0": version "1.0.1" @@ -1111,15 +1186,20 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== hosted-git-info@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961" - integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg== + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -1136,12 +1216,12 @@ https-proxy-agent@5.0.0: agent-base "6" debug "4" -iconv-corefoundation@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a" - integrity sha512-1NBe55C75bKGZaY9UHxvXG3G0gEp0ziht7quhuFrW3SPgZDw9HI6qvYXRSV5M/Eupyu8ljuJ6Cba+ec15PZ4Xw== +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== dependencies: - cli-truncate "^1.1.0" + cli-truncate "^2.1.0" node-addon-api "^1.6.3" iconv-lite@^0.6.2: @@ -1213,10 +1293,12 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -1350,6 +1432,14 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" +keytar@^7.7.0: + version "7.7.0" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2" + integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A== + dependencies: + node-addon-api "^3.0.0" + prebuild-install "^6.0.0" + keyv@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" @@ -1443,6 +1533,11 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== +mimic-response@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43" + integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA== + minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1450,12 +1545,12 @@ minimatch@3.0.4, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp-classic@^0.5.2: +mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== @@ -1477,16 +1572,33 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +napi-build-utils@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" + integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abi@^2.21.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== + dependencies: + semver "^5.4.1" + node-addon-api@^1.6.3: version "1.7.2" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== +node-addon-api@^3.0.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== + node-fetch@2.6.5: version "2.6.5" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" @@ -1514,6 +1626,26 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + +object-assign@^4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + object-keys@^1.0.12: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -1602,7 +1734,7 @@ pkg-dir@4.2.0: dependencies: find-up "^4.0.0" -plist@^3.0.1: +plist@^3.0.1, plist@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe" integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg== @@ -1610,6 +1742,25 @@ plist@^3.0.1: base64-js "^1.5.1" xmlbuilder "^9.0.7" +prebuild-install@^6.0.0: + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== + dependencies: + detect-libc "^1.0.3" + expand-template "^2.0.3" + github-from-package "0.0.0" + minimist "^1.2.3" + mkdirp-classic "^0.5.3" + napi-build-utils "^1.0.1" + node-abi "^2.21.0" + npmlog "^4.0.1" + pump "^3.0.0" + rc "^1.2.7" + simple-get "^3.0.3" + tar-fs "^2.0.0" + tunnel-agent "^0.6.0" + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -1655,13 +1806,13 @@ pupa@^2.1.1: dependencies: escape-goat "^2.0.0" -puppeteer@11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz#0808719c38e15315ecc1b1c28911f1c9054d201f" - integrity sha512-6rPFqN1ABjn4shgOICGDBITTRV09EjXVqhDERBDKwCLz0UyBxeeBH6Ay0vQUJ84VACmlxwzOIzVEJXThcF3aNg== +puppeteer@13.0.1: + version "13.0.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz#9cd9bb8ec090bade183ca186bf342396bdffa135" + integrity sha512-wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A== dependencies: debug "4.3.2" - devtools-protocol "0.0.901419" + devtools-protocol "0.0.937139" extract-zip "2.0.1" https-proxy-agent "5.0.0" node-fetch "2.6.5" @@ -1673,7 +1824,7 @@ puppeteer@11.0.0: unbzip2-stream "1.4.3" ws "8.2.3" -rc@^1.2.8: +rc@^1.2.7, rc@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -1694,7 +1845,7 @@ read-config-file@6.2.0: json5 "^2.2.0" lazy-val "^1.0.4" -readable-stream@^2.2.2: +readable-stream@^2.0.6, readable-stream@^2.2.2: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -1761,16 +1912,16 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" +safe-buffer@^5.0.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -1800,7 +1951,7 @@ semver-diff@^3.1.1: dependencies: semver "^6.3.0" -semver@^5.5.0: +semver@^5.4.1, semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -1824,6 +1975,11 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" +set-blocking@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -1853,12 +2009,28 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== -slice-ansi@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d" - integrity sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg== +simple-concat@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f" + integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q== + +simple-get@^3.0.3: + version "3.1.0" + resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3" + integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA== dependencies: - is-fullwidth-code-point "^2.0.0" + decompress-response "^4.2.0" + once "^1.3.1" + simple-concat "^1.0.0" + +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" smart-buffer@^4.0.2: version "4.2.0" @@ -1888,15 +2060,16 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -1919,12 +2092,12 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= +strip-ansi@^3.0.0, strip-ansi@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: - ansi-regex "^3.0.0" + ansi-regex "^2.0.0" strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" @@ -1964,7 +2137,7 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -tar-fs@2.1.1: +tar-fs@2.1.1, tar-fs@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== @@ -2029,6 +2202,13 @@ truncate-utf8-bytes@^1.0.0: dependencies: utf8-byte-length "^1.0.1" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + tunnel@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" @@ -2161,6 +2341,13 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + version "1.1.5" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + widest-line@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" @@ -2222,23 +2409,23 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== +yargs-parser@^21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" + integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== yargs@^17.0.1: - version "17.2.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea" - integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q== + version "17.3.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9" + integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA== dependencies: cliui "^7.0.2" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" - string-width "^4.2.0" + string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^20.2.2" + yargs-parser "^21.0.0" yauzl@^2.10.0: version "2.10.0" diff --git a/pkgs/tools/misc/sharedown/yarndeps.nix b/pkgs/tools/misc/sharedown/yarndeps.nix index 046a6c71bad2..153a9282427d 100644 --- a/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/pkgs/tools/misc/sharedown/yarndeps.nix @@ -6,7 +6,7 @@ path = fetchurl { name = "7zip_bin___7zip_bin_5.1.1.tgz"; url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; - sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; + sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; }; } { @@ -14,7 +14,7 @@ path = fetchurl { name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; - sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; + sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; }; } { @@ -22,7 +22,7 @@ path = fetchurl { name = "_electron_get___get_1.13.1.tgz"; url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz"; - sha1 = "42a0aa62fd1189638bd966e23effaebb16108368"; + sha512 = "U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA=="; }; } { @@ -30,7 +30,7 @@ path = fetchurl { name = "_electron_universal___universal_1.0.5.tgz"; url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.0.5.tgz"; - sha1 = "b812340e4ef21da2b3ee77b2b4d35c9b86defe37"; + sha512 = "zX9O6+jr2NMyAdSkwEUlyltiI4/EBLu2Ls/VD3pUQdi3cAYeYfdQnT2AJJ38HE4QxLccbU13LSpccw1IWlkyag=="; }; } { @@ -38,7 +38,7 @@ path = fetchurl { name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; - sha1 = "504af200af6b98e198bce768bc1730c6936ae01d"; + sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; }; } { @@ -46,7 +46,7 @@ path = fetchurl { name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; - sha1 = "e8a32c30a95d20c2b1bb635cc580981a06389858"; + sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; }; } { @@ -54,7 +54,7 @@ path = fetchurl { name = "_sindresorhus_is___is_0.14.0.tgz"; url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; - sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; } { @@ -62,7 +62,7 @@ path = fetchurl { name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; - sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; } { @@ -70,7 +70,7 @@ path = fetchurl { name = "_tedconf_fessonia___fessonia_2.2.1.tgz"; url = "https://registry.yarnpkg.com/@tedconf/fessonia/-/fessonia-2.2.1.tgz"; - sha1 = "24499e69c3aeda4926670675b9fdfeb9ab15f19d"; + sha512 = "eX+O8P/xIkuCDeDI3IOIoyzuTJLVqbGnoBhLiBoFU7MwntF02ygQcByMinhUtXv2zm0pOSy6zeKoQTKAVBK60A=="; }; } { @@ -78,7 +78,7 @@ path = fetchurl { name = "_types_debug___debug_4.1.7.tgz"; url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; - sha1 = "7cc0ea761509124709b8b2d1090d8f6c17aadb82"; + sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; }; } { @@ -86,7 +86,7 @@ path = fetchurl { name = "_types_fs_extra___fs_extra_9.0.13.tgz"; url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha1 = "7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"; + sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; } { @@ -94,7 +94,7 @@ path = fetchurl { name = "_types_glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; - sha1 = "bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; } { @@ -102,7 +102,7 @@ path = fetchurl { name = "_types_minimatch___minimatch_3.0.5.tgz"; url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; - sha1 = "1001cc5e6a3704b83c236027e77f2f58ea010f40"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; } { @@ -110,23 +110,23 @@ path = fetchurl { name = "_types_ms___ms_0.7.31.tgz"; url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; - sha1 = "31b7ca6407128a3d2bbc27fe2d21b345397f6197"; + sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; }; } { - name = "_types_node___node_16.11.10.tgz"; + name = "_types_node___node_17.0.10.tgz"; path = fetchurl { - name = "_types_node___node_16.11.10.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.10.tgz"; - sha1 = "2e3ad0a680d96367103d3e670d41c2fed3da61ae"; + name = "_types_node___node_17.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-17.0.10.tgz"; + sha512 = "S/3xB4KzyFxYGCppyDt68yzBU9ysL88lSdIah4D6cptdcltc4NCPCAMc0+PCpg/lLIyC7IPvj2Z52OJWeIUkog=="; }; } { - name = "_types_node___node_14.17.34.tgz"; + name = "_types_node___node_14.18.9.tgz"; path = fetchurl { - name = "_types_node___node_14.17.34.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.34.tgz"; - sha1 = "fe4b38b3f07617c0fa31ae923fca9249641038f0"; + name = "_types_node___node_14.18.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz"; + sha512 = "j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q=="; }; } { @@ -134,7 +134,7 @@ path = fetchurl { name = "_types_plist___plist_3.0.2.tgz"; url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; - sha1 = "61b3727bba0f5c462fe333542534a0c3e19ccb01"; + sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; }; } { @@ -142,7 +142,7 @@ path = fetchurl { name = "_types_verror___verror_1.10.5.tgz"; url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; - sha1 = "2a1413aded46e67a1fe2386800e291123ed75eb1"; + sha512 = "9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw=="; }; } { @@ -150,15 +150,15 @@ path = fetchurl { name = "_types_yargs_parser___yargs_parser_20.2.1.tgz"; url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha1 = "3b9ce2489919d9e4fea439b76916abc34b2df129"; + sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; } { - name = "_types_yargs___yargs_17.0.7.tgz"; + name = "_types_yargs___yargs_17.0.8.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.7.tgz"; - sha1 = "44a484c634761da4391477515a98772b82b5060f"; + name = "_types_yargs___yargs_17.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz"; + sha512 = "wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw=="; }; } { @@ -166,7 +166,7 @@ path = fetchurl { name = "_types_yauzl___yauzl_2.9.2.tgz"; url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz"; - sha1 = "c48e5d56aff1444409e39fa164b0b4d4552a7b7a"; + sha512 = "8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA=="; }; } { @@ -174,7 +174,7 @@ path = fetchurl { name = "agent_base___agent_base_6.0.2.tgz"; url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; } { @@ -182,7 +182,7 @@ path = fetchurl { name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; }; } { @@ -190,7 +190,7 @@ path = fetchurl { name = "ajv___ajv_6.12.6.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } { @@ -198,15 +198,15 @@ path = fetchurl { name = "ansi_align___ansi_align_3.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha1 = "0cdf12e111ace773a86e9a1fad1225c43cb19a59"; + sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; }; } { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; + name = "ansi_regex___ansi_regex_2.1.1.tgz"; path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; }; } { @@ -214,7 +214,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_5.0.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha1 = "082cb2c89c9fe8659a311a53bd6a4dc5301db304"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; } { @@ -222,7 +222,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_3.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; } { @@ -230,7 +230,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_4.3.0.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; } { @@ -238,7 +238,7 @@ path = fetchurl { name = "app_builder_bin___app_builder_bin_3.7.1.tgz"; url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz"; - sha1 = "cb0825c5e12efc85b196ac3ed9c89f076c61040e"; + sha512 = "ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw=="; }; } { @@ -246,7 +246,15 @@ path = fetchurl { name = "app_builder_lib___app_builder_lib_22.14.5.tgz"; url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz"; - sha1 = "a61a50b132b858e98fdc70b6b88994ae99b4f96d"; + sha512 = "k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg=="; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; } { @@ -254,7 +262,15 @@ path = fetchurl { name = "arch___arch_2.2.0.tgz"; url = "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz"; - sha1 = "1bc47818f305764f23ab3306b0bfc086c5a29d11"; + sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; } { @@ -262,7 +278,7 @@ path = fetchurl { name = "argparse___argparse_2.0.1.tgz"; url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; } { @@ -270,7 +286,7 @@ path = fetchurl { name = "asar___asar_3.1.0.tgz"; url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; - sha1 = "70b0509449fe3daccc63beb4d3c7d2e24d3c6473"; + sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; }; } { @@ -278,7 +294,15 @@ path = fetchurl { name = "assert_plus___assert_plus_1.0.0.tgz"; url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } { @@ -286,7 +310,7 @@ path = fetchurl { name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; - sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; }; } { @@ -294,7 +318,7 @@ path = fetchurl { name = "async___async_0.9.2.tgz"; url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; }; } { @@ -302,7 +326,7 @@ path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; }; } { @@ -310,7 +334,7 @@ path = fetchurl { name = "at_least_node___at_least_node_1.0.0.tgz"; url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; }; } { @@ -318,7 +342,7 @@ path = fetchurl { name = "axios___axios_0.24.0.tgz"; url = "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz"; - sha1 = "804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"; + sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; }; } { @@ -326,7 +350,7 @@ path = fetchurl { name = "balanced_match___balanced_match_1.0.2.tgz"; url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; } { @@ -334,7 +358,7 @@ path = fetchurl { name = "base64_js___base64_js_1.5.1.tgz"; url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; } { @@ -342,7 +366,7 @@ path = fetchurl { name = "bl___bl_4.1.0.tgz"; url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha1 = "451535264182bec2fbbc83a62ab98cf11d9f7b3a"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; } { @@ -350,7 +374,7 @@ path = fetchurl { name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; - sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; }; } { @@ -358,7 +382,7 @@ path = fetchurl { name = "bluebird___bluebird_3.7.2.tgz"; url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; } { @@ -366,7 +390,7 @@ path = fetchurl { name = "boolean___boolean_3.1.4.tgz"; url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz"; - sha1 = "f51a2fb5838a99e06f9b6ec1edb674de67026435"; + sha512 = "3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="; }; } { @@ -374,7 +398,7 @@ path = fetchurl { name = "bootstrap___bootstrap_5.1.3.tgz"; url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz"; - sha1 = "ba081b0c130f810fa70900acbc1c6d3c28fa8f34"; + sha512 = "fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q=="; }; } { @@ -382,7 +406,7 @@ path = fetchurl { name = "boxen___boxen_5.1.2.tgz"; url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha1 = "788cb686fc83c1f486dfa8a40c68fc2b831d2b50"; + sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; }; } { @@ -390,7 +414,7 @@ path = fetchurl { name = "brace_expansion___brace_expansion_1.1.11.tgz"; url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } { @@ -398,7 +422,7 @@ path = fetchurl { name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha1 = "bd7dc26ae2972d0eda253be061dba992349c19f0"; + sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; }; } { @@ -406,7 +430,7 @@ path = fetchurl { name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha1 = "890dd90d923a873e08e10e5fd51a57e5b7cce0ec"; + sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; }; } { @@ -414,7 +438,7 @@ path = fetchurl { name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + sha1 = "DTM+PwDqxQqhRUq9MO+MKl2ackI="; }; } { @@ -422,7 +446,7 @@ path = fetchurl { name = "buffer_equal___buffer_equal_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + sha1 = "WWFrSYME1Var1GaWayLu2j7KX74="; }; } { @@ -430,7 +454,7 @@ path = fetchurl { name = "buffer_fill___buffer_fill_1.0.0.tgz"; url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha1 = "f8f78b76789888ef39f205cd637f68e702122b2c"; + sha1 = "+PeLdniYiO858gXNY39o5wISKyw="; }; } { @@ -438,7 +462,7 @@ path = fetchurl { name = "buffer_from___buffer_from_1.1.2.tgz"; url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; } { @@ -446,7 +470,7 @@ path = fetchurl { name = "buffer___buffer_5.7.1.tgz"; url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; } { @@ -454,7 +478,7 @@ path = fetchurl { name = "builder_util_runtime___builder_util_runtime_8.9.1.tgz"; url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz"; - sha1 = "25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"; + sha512 = "c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg=="; }; } { @@ -462,7 +486,7 @@ path = fetchurl { name = "builder_util___builder_util_22.14.5.tgz"; url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz"; - sha1 = "42a18608d2a566c0846e91266464776c8bfb0cc9"; + sha512 = "zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA=="; }; } { @@ -470,15 +494,15 @@ path = fetchurl { name = "cacheable_request___cacheable_request_6.1.0.tgz"; url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; - sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; } { - name = "camelcase___camelcase_6.2.1.tgz"; + name = "camelcase___camelcase_6.3.0.tgz"; path = fetchurl { - name = "camelcase___camelcase_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz"; - sha1 = "250fd350cfd555d0d2160b1d51510eaf8326e86e"; + name = "camelcase___camelcase_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; } { @@ -486,7 +510,7 @@ path = fetchurl { name = "chalk___chalk_2.4.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; } { @@ -494,7 +518,7 @@ path = fetchurl { name = "chalk___chalk_4.1.2.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; } { @@ -502,7 +526,7 @@ path = fetchurl { name = "charenc___charenc_0.0.2.tgz"; url = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz"; - sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + sha1 = "wKHS86cJLgN3S/qD8UwPxXkKhmc="; }; } { @@ -510,7 +534,7 @@ path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; - sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; } { @@ -518,7 +542,7 @@ path = fetchurl { name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + sha1 = "BKEGZywYsIWrd02YPfo+oTjyIgU="; }; } { @@ -526,7 +550,7 @@ path = fetchurl { name = "ci_info___ci_info_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; } { @@ -534,7 +558,7 @@ path = fetchurl { name = "ci_info___ci_info_3.3.0.tgz"; url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz"; - sha1 = "b4ed1fb6818dea4803a55c623041f9165d2066b2"; + sha512 = "riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw=="; }; } { @@ -542,15 +566,15 @@ path = fetchurl { name = "cli_boxes___cli_boxes_2.2.1.tgz"; url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; + sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; } { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; path = fetchurl { - name = "cli_truncate___cli_truncate_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz"; - sha1 = "2b2dfd83c53cfd3572b87fc4d430a808afb04086"; + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; } { @@ -558,7 +582,7 @@ path = fetchurl { name = "clipboardy___clipboardy_2.3.0.tgz"; url = "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz"; - sha1 = "3c2903650c68e46a91b388985bc2774287dba290"; + sha512 = "mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ=="; }; } { @@ -566,7 +590,7 @@ path = fetchurl { name = "cliui___cliui_7.0.4.tgz"; url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; } { @@ -574,7 +598,15 @@ path = fetchurl { name = "clone_response___clone_response_1.0.2.tgz"; url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + sha1 = "0dyXOSAxTfZ/vrlCI7TuNQI56Ws="; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; }; } { @@ -582,7 +614,7 @@ path = fetchurl { name = "color_convert___color_convert_1.9.3.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; }; } { @@ -590,7 +622,7 @@ path = fetchurl { name = "color_convert___color_convert_2.0.1.tgz"; url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; }; } { @@ -598,7 +630,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; }; } { @@ -606,7 +638,7 @@ path = fetchurl { name = "color_name___color_name_1.1.4.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } { @@ -614,7 +646,7 @@ path = fetchurl { name = "colors___colors_1.0.3.tgz"; url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + sha1 = "BDP0TYCWgP3rYO0mDxsMJi6CpAs="; }; } { @@ -622,7 +654,7 @@ path = fetchurl { name = "combined_stream___combined_stream_1.0.8.tgz"; url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; } { @@ -630,7 +662,7 @@ path = fetchurl { name = "commander___commander_2.9.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + sha1 = "nJkJQXbhIkDLItbFFGCYQA/g99Q="; }; } { @@ -638,7 +670,7 @@ path = fetchurl { name = "commander___commander_5.1.0.tgz"; url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; - sha1 = "46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; } { @@ -646,7 +678,7 @@ path = fetchurl { name = "compare_version___compare_version_0.1.2.tgz"; url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; - sha1 = "0162ec2d9351f5ddd59a9202cba935366a725080"; + sha1 = "AWLsLZNR9d3VmpICy6k1NmpyUIA="; }; } { @@ -654,7 +686,7 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; }; } { @@ -662,7 +694,7 @@ path = fetchurl { name = "concat_stream___concat_stream_1.6.2.tgz"; url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } { @@ -670,7 +702,7 @@ path = fetchurl { name = "config_chain___config_chain_1.1.13.tgz"; url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } { @@ -678,7 +710,15 @@ path = fetchurl { name = "configstore___configstore_5.0.1.tgz"; url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; }; } { @@ -686,7 +726,7 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.2.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; }; } { @@ -694,7 +734,7 @@ path = fetchurl { name = "core_util_is___core_util_is_1.0.3.tgz"; url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; }; } { @@ -702,7 +742,7 @@ path = fetchurl { name = "crc___crc_3.8.0.tgz"; url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha1 = "ad60269c2c856f8c299e2c4cc0de4556914056c6"; + sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; }; } { @@ -710,7 +750,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; } { @@ -718,7 +758,7 @@ path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } { @@ -726,7 +766,7 @@ path = fetchurl { name = "crypt___crypt_0.0.2.tgz"; url = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + sha1 = "iNf/fsDfuG9xPch7u0LQRNPmxBs="; }; } { @@ -734,7 +774,15 @@ path = fetchurl { name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; + }; + } + { + name = "debug___debug_4.3.3.tgz"; + path = fetchurl { + name = "debug___debug_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; } { @@ -742,7 +790,7 @@ path = fetchurl { name = "debug___debug_4.3.2.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; } { @@ -750,7 +798,7 @@ path = fetchurl { name = "debug___debug_2.6.9.tgz"; url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; } { @@ -758,7 +806,15 @@ path = fetchurl { name = "decompress_response___decompress_response_3.3.0.tgz"; url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + sha1 = "gKTdMjdIOEv6JICDYirt7Jgq3/M="; + }; + } + { + name = "decompress_response___decompress_response_4.2.1.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz"; + sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; } { @@ -766,7 +822,7 @@ path = fetchurl { name = "deep_extend___deep_extend_0.6.0.tgz"; url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; } { @@ -774,7 +830,7 @@ path = fetchurl { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; - sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + sha512 = "0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ=="; }; } { @@ -782,7 +838,7 @@ path = fetchurl { name = "define_properties___define_properties_1.1.3.tgz"; url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; - sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; }; } { @@ -790,7 +846,23 @@ path = fetchurl { name = "delayed_stream___delayed_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; }; } { @@ -798,15 +870,15 @@ path = fetchurl { name = "detect_node___detect_node_2.1.0.tgz"; url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; - sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; } { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.901419.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.901419.tgz"; - sha1 = "79b5459c48fe7e1c5563c02bd72f8fec3e0cebcd"; + name = "devtools_protocol___devtools_protocol_0.0.937139.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.937139.tgz"; + sha512 = "daj+rzR3QSxsPRy5vjjthn58axO8c11j58uY0lG5vvlJk/EiOdCWOptGdkXDjtuRHr78emKq0udHCXM4trhoDQ=="; }; } { @@ -814,7 +886,7 @@ path = fetchurl { name = "dir_compare___dir_compare_2.4.0.tgz"; url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha1 = "785c41dc5f645b34343a4eafc50b79bac7f11631"; + sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; }; } { @@ -822,15 +894,15 @@ path = fetchurl { name = "dmg_builder___dmg_builder_22.14.5.tgz"; url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz"; - sha1 = "137c0b55e639badcc0b119eb060e6fa4ed61d948"; + sha512 = "1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w=="; }; } { - name = "dmg_license___dmg_license_1.0.9.tgz"; + name = "dmg_license___dmg_license_1.0.10.tgz"; path = fetchurl { - name = "dmg_license___dmg_license_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz"; - sha1 = "a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"; + name = "dmg_license___dmg_license_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz"; + sha512 = "SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A=="; }; } { @@ -838,7 +910,7 @@ path = fetchurl { name = "dot_prop___dot_prop_5.3.0.tgz"; url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; } { @@ -846,7 +918,7 @@ path = fetchurl { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; }; } { @@ -854,7 +926,7 @@ path = fetchurl { name = "dotenv___dotenv_9.0.2.tgz"; url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha1 = "dacc20160935a37dea6364aa1bef819fb9b6ab05"; + sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; }; } { @@ -862,7 +934,7 @@ path = fetchurl { name = "duplexer3___duplexer3_0.1.4.tgz"; url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + sha1 = "7gHdHKwO08vH/b6jfcCo8c4ALOI="; }; } { @@ -870,7 +942,7 @@ path = fetchurl { name = "ejs___ejs_3.1.6.tgz"; url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; - sha1 = "5bfd0a0689743bb5268b3550cceeebbc1702822a"; + sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; } { @@ -878,7 +950,7 @@ path = fetchurl { name = "electron_builder___electron_builder_22.14.5.tgz"; url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz"; - sha1 = "3a25547bd4fe3728d4704da80956a794c5c31496"; + sha512 = "N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg=="; }; } { @@ -886,7 +958,7 @@ path = fetchurl { name = "electron_osx_sign___electron_osx_sign_0.5.0.tgz"; url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz"; - sha1 = "fc258c5e896859904bbe3d01da06902c04b51c3a"; + sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; } { @@ -894,15 +966,15 @@ path = fetchurl { name = "electron_publish___electron_publish_22.14.5.tgz"; url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz"; - sha1 = "34bcdce671f0e651330db20040d6919c77c94bd6"; + sha512 = "h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg=="; }; } { - name = "electron___electron_15.3.2.tgz"; + name = "electron___electron_16.0.7.tgz"; path = fetchurl { - name = "electron___electron_15.3.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-15.3.2.tgz"; - sha1 = "4f0cbad781d14e0194f5dfef1709e09a70c8074a"; + name = "electron___electron_16.0.7.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-16.0.7.tgz"; + sha512 = "/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w=="; }; } { @@ -910,7 +982,7 @@ path = fetchurl { name = "emoji_regex___emoji_regex_8.0.0.tgz"; url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; } { @@ -918,7 +990,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; }; } { @@ -926,7 +998,7 @@ path = fetchurl { name = "end_of_stream___end_of_stream_1.4.4.tgz"; url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; } { @@ -934,7 +1006,7 @@ path = fetchurl { name = "env_paths___env_paths_2.2.1.tgz"; url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; - sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; } { @@ -942,7 +1014,7 @@ path = fetchurl { name = "es6_error___es6_error_4.1.1.tgz"; url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; - sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; }; } { @@ -950,7 +1022,7 @@ path = fetchurl { name = "escalade___escalade_3.1.1.tgz"; url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } { @@ -958,7 +1030,7 @@ path = fetchurl { name = "escape_goat___escape_goat_2.1.1.tgz"; url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; }; } { @@ -966,7 +1038,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; }; } { @@ -974,7 +1046,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; } { @@ -982,7 +1054,15 @@ path = fetchurl { name = "execa___execa_1.0.0.tgz"; url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; - sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; + }; + } + { + name = "expand_template___expand_template_2.0.3.tgz"; + path = fetchurl { + name = "expand_template___expand_template_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz"; + sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; } { @@ -990,7 +1070,7 @@ path = fetchurl { name = "extract_zip___extract_zip_2.0.1.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha1 = "663dca56fe46df890d5f131ef4a06d22bb8ba13a"; + sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; }; } { @@ -998,7 +1078,7 @@ path = fetchurl { name = "extract_zip___extract_zip_1.7.0.tgz"; url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; - sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; }; } { @@ -1006,7 +1086,7 @@ path = fetchurl { name = "extsprintf___extsprintf_1.4.1.tgz"; url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; - sha1 = "8d172c064867f235c0c84a596806d279bf4bcc07"; + sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; }; } { @@ -1014,7 +1094,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; } { @@ -1022,7 +1102,7 @@ path = fetchurl { name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; } { @@ -1030,7 +1110,7 @@ path = fetchurl { name = "fd_slicer___fd_slicer_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; }; } { @@ -1038,7 +1118,7 @@ path = fetchurl { name = "filelist___filelist_1.0.2.tgz"; url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha1 = "80202f21462d4d1c2e214119b1807c1bc0380e5b"; + sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; }; } { @@ -1046,15 +1126,15 @@ path = fetchurl { name = "find_up___find_up_4.1.0.tgz"; url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; }; } { - name = "follow_redirects___follow_redirects_1.14.5.tgz"; + name = "follow_redirects___follow_redirects_1.14.7.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.5.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.5.tgz"; - sha1 = "f09a5848981d3c772b5392309778523f8d85c381"; + name = "follow_redirects___follow_redirects_1.14.7.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; }; } { @@ -1062,7 +1142,7 @@ path = fetchurl { name = "font_awesome___font_awesome_4.7.0.tgz"; url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; - sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; + sha1 = "j6jPBBGhoxr9B7BtKQK7n8gVoTM="; }; } { @@ -1070,7 +1150,7 @@ path = fetchurl { name = "form_data___form_data_4.0.0.tgz"; url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; - sha1 = "93919daeaf361ee529584b9b31664dc12c9fa452"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; } { @@ -1078,7 +1158,7 @@ path = fetchurl { name = "fs_constants___fs_constants_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; - sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; } { @@ -1086,7 +1166,7 @@ path = fetchurl { name = "fs_extra___fs_extra_10.0.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz"; - sha1 = "9ff61b655dde53fb34a82df84bb214ce802e17c1"; + sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; } { @@ -1094,7 +1174,7 @@ path = fetchurl { name = "fs_extra___fs_extra_8.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; }; } { @@ -1102,7 +1182,7 @@ path = fetchurl { name = "fs_extra___fs_extra_9.1.0.tgz"; url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha1 = "5954460c764a8da2094ba3554bf839e6b9a7c86d"; + sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; } { @@ -1110,7 +1190,15 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; }; } { @@ -1118,7 +1206,7 @@ path = fetchurl { name = "get_caller_file___get_caller_file_2.0.5.tgz"; url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; } { @@ -1126,7 +1214,7 @@ path = fetchurl { name = "get_stream___get_stream_4.1.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; - sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; } { @@ -1134,7 +1222,15 @@ path = fetchurl { name = "get_stream___get_stream_5.2.0.tgz"; url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; + }; + } + { + name = "github_from_package___github_from_package_0.0.0.tgz"; + path = fetchurl { + name = "github_from_package___github_from_package_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"; + sha1 = "l/tdlr/eiXMxPyDoKI75oWf6ZM4="; }; } { @@ -1142,7 +1238,7 @@ path = fetchurl { name = "glob___glob_7.2.0.tgz"; url = "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz"; - sha1 = "d15535af7732e02e948f4c41628bd910293f6023"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } { @@ -1150,7 +1246,7 @@ path = fetchurl { name = "global_agent___global_agent_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; - sha1 = "ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6"; + sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } { @@ -1158,7 +1254,7 @@ path = fetchurl { name = "global_dirs___global_dirs_3.0.0.tgz"; url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha1 = "70a76fe84ea315ab37b1f5576cbde7d48ef72686"; + sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; }; } { @@ -1166,7 +1262,7 @@ path = fetchurl { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; - sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f"; + sha512 = "4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg=="; }; } { @@ -1174,7 +1270,7 @@ path = fetchurl { name = "globalthis___globalthis_1.0.2.tgz"; url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz"; - sha1 = "2a235d34f4d8036219f7e34929b5de9e18166b8b"; + sha512 = "ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ=="; }; } { @@ -1182,15 +1278,15 @@ path = fetchurl { name = "got___got_9.6.0.tgz"; url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; - sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; } { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + name = "graceful_fs___graceful_fs_4.2.9.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; } { @@ -1198,7 +1294,7 @@ path = fetchurl { name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + sha1 = "TK+tdrxi8C+gObL5Tpo906ORpyU="; }; } { @@ -1206,7 +1302,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; }; } { @@ -1214,7 +1310,15 @@ path = fetchurl { name = "has_flag___has_flag_4.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; }; } { @@ -1222,15 +1326,15 @@ path = fetchurl { name = "has_yarn___has_yarn_2.1.0.tgz"; url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; + sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; } { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; - sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; }; } { @@ -1238,7 +1342,7 @@ path = fetchurl { name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; }; } { @@ -1246,15 +1350,15 @@ path = fetchurl { name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; }; } { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz"; - sha1 = "27c135470237f6f8d13462fa1f5eaf250523c29a"; + name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; + sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; }; } { @@ -1262,7 +1366,7 @@ path = fetchurl { name = "iconv_lite___iconv_lite_0.6.3.tgz"; url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; } { @@ -1270,7 +1374,7 @@ path = fetchurl { name = "ieee754___ieee754_1.2.1.tgz"; url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } { @@ -1278,7 +1382,7 @@ path = fetchurl { name = "import_lazy___import_lazy_2.1.0.tgz"; url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + sha1 = "BWmOPUXIjo1+nZLLBYTnfwlvPkM="; }; } { @@ -1286,7 +1390,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; }; } { @@ -1294,7 +1398,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; }; } { @@ -1302,7 +1406,7 @@ path = fetchurl { name = "inherits___inherits_2.0.4.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } { @@ -1310,7 +1414,7 @@ path = fetchurl { name = "ini___ini_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha1 = "e5fd556ecdd5726be978fa1001862eacb0a94bc5"; + sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; } { @@ -1318,7 +1422,7 @@ path = fetchurl { name = "ini___ini_1.3.8.tgz"; url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha1 = "a29da425b48806f34767a4efce397269af28432c"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } { @@ -1326,7 +1430,7 @@ path = fetchurl { name = "is_buffer___is_buffer_1.1.6.tgz"; url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; } { @@ -1334,7 +1438,7 @@ path = fetchurl { name = "is_ci___is_ci_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; } { @@ -1342,7 +1446,7 @@ path = fetchurl { name = "is_ci___is_ci_3.0.1.tgz"; url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; - sha1 = "db6ecbed1bd659c43dac0f45661e7674103d1867"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; }; } { @@ -1350,15 +1454,15 @@ path = fetchurl { name = "is_docker___is_docker_2.2.1.tgz"; url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; - sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; } { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; }; } { @@ -1366,7 +1470,7 @@ path = fetchurl { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } { @@ -1374,7 +1478,7 @@ path = fetchurl { name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha1 = "9a0fd407949c30f86eb6959ef1b7994ed0b7b520"; + sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; }; } { @@ -1382,7 +1486,7 @@ path = fetchurl { name = "is_npm___is_npm_5.0.0.tgz"; url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha1 = "43e8d65cc56e1b67f8d47262cf667099193f45a8"; + sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; }; } { @@ -1390,7 +1494,7 @@ path = fetchurl { name = "is_obj___is_obj_2.0.0.tgz"; url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; } { @@ -1398,7 +1502,7 @@ path = fetchurl { name = "is_path_inside___is_path_inside_3.0.3.tgz"; url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; } { @@ -1406,7 +1510,7 @@ path = fetchurl { name = "is_stream___is_stream_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; }; } { @@ -1414,7 +1518,7 @@ path = fetchurl { name = "is_typedarray___is_typedarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; }; } { @@ -1422,7 +1526,7 @@ path = fetchurl { name = "is_wsl___is_wsl_2.2.0.tgz"; url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; - sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } { @@ -1430,7 +1534,7 @@ path = fetchurl { name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha1 = "d502d3382590ea3004893746754c89139973e232"; + sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; }; } { @@ -1438,7 +1542,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; }; } { @@ -1446,7 +1550,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha1 = "5d6def3edebf6e8ca8cae9c30183a804b5f8be80"; + sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; }; } { @@ -1454,7 +1558,7 @@ path = fetchurl { name = "isbinaryfile___isbinaryfile_4.0.8.tgz"; url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz"; - sha1 = "5d34b94865bd4946633ecc78a026fc76c5b11fcf"; + sha512 = "53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w=="; }; } { @@ -1462,7 +1566,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; }; } { @@ -1470,7 +1574,7 @@ path = fetchurl { name = "iso8601_duration___iso8601_duration_1.3.0.tgz"; url = "https://registry.yarnpkg.com/iso8601-duration/-/iso8601-duration-1.3.0.tgz"; - sha1 = "29d7b69e0574e4acdee50c5e5e09adab4137ba5a"; + sha512 = "K4CiUBzo3YeWk76FuET/dQPH03WE04R94feo5TSKQCXpoXQt9E4yx2CnY737QZnSAI3PI4WlKo/zfqizGx52QQ=="; }; } { @@ -1478,7 +1582,7 @@ path = fetchurl { name = "jake___jake_10.8.2.tgz"; url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; - sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; }; } { @@ -1486,7 +1590,7 @@ path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha1 = "c1fb65f8f5017901cdd2c951864ba18458a10602"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; } { @@ -1494,7 +1598,7 @@ path = fetchurl { name = "json_buffer___json_buffer_3.0.0.tgz"; url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + sha1 = "Wx85evx11ne96Lz8Dkfh+aPZqJg="; }; } { @@ -1502,7 +1606,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; } { @@ -1510,7 +1614,7 @@ path = fetchurl { name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; }; } { @@ -1518,7 +1622,7 @@ path = fetchurl { name = "json5___json5_2.2.0.tgz"; url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; - sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; } { @@ -1526,7 +1630,7 @@ path = fetchurl { name = "jsonfile___jsonfile_4.0.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; }; } { @@ -1534,7 +1638,15 @@ path = fetchurl { name = "jsonfile___jsonfile_6.1.0.tgz"; url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; + }; + } + { + name = "keytar___keytar_7.7.0.tgz"; + path = fetchurl { + name = "keytar___keytar_7.7.0.tgz"; + url = "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz"; + sha512 = "YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A=="; }; } { @@ -1542,7 +1654,7 @@ path = fetchurl { name = "keyv___keyv_3.1.0.tgz"; url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; - sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } { @@ -1550,7 +1662,7 @@ path = fetchurl { name = "latest_version___latest_version_5.1.0.tgz"; url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; } { @@ -1558,7 +1670,7 @@ path = fetchurl { name = "lazy_val___lazy_val_1.0.5.tgz"; url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; - sha1 = "6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d"; + sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; }; } { @@ -1566,7 +1678,7 @@ path = fetchurl { name = "locate_path___locate_path_5.0.0.tgz"; url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; }; } { @@ -1574,7 +1686,7 @@ path = fetchurl { name = "lodash___lodash_4.17.21.tgz"; url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; } { @@ -1582,7 +1694,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; }; } { @@ -1590,7 +1702,7 @@ path = fetchurl { name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; } { @@ -1598,7 +1710,7 @@ path = fetchurl { name = "lru_cache___lru_cache_6.0.0.tgz"; url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } { @@ -1606,7 +1718,7 @@ path = fetchurl { name = "make_dir___make_dir_3.1.0.tgz"; url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; } { @@ -1614,7 +1726,7 @@ path = fetchurl { name = "matcher___matcher_3.0.0.tgz"; url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; - sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca"; + sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; }; } { @@ -1622,7 +1734,7 @@ path = fetchurl { name = "md5___md5_2.3.0.tgz"; url = "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz"; - sha1 = "c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"; + sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; }; } { @@ -1630,7 +1742,7 @@ path = fetchurl { name = "mime_db___mime_db_1.51.0.tgz"; url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz"; - sha1 = "d9ff62451859b18342d960850dc3cfb77e63fb0c"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; } { @@ -1638,7 +1750,7 @@ path = fetchurl { name = "mime_types___mime_types_2.1.34.tgz"; url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz"; - sha1 = "5a712f9ec1503511a945803640fafe09d3793c24"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; } { @@ -1646,7 +1758,7 @@ path = fetchurl { name = "mime___mime_2.6.0.tgz"; url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; - sha1 = "a2a682a95cd4d0cb1d6257e28f83da7e35800367"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; } { @@ -1654,7 +1766,15 @@ path = fetchurl { name = "mimic_response___mimic_response_1.0.1.tgz"; url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; + }; + } + { + name = "mimic_response___mimic_response_2.1.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz"; + sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; } { @@ -1662,7 +1782,7 @@ path = fetchurl { name = "minimatch___minimatch_3.0.4.tgz"; url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } { @@ -1670,7 +1790,7 @@ path = fetchurl { name = "minimist___minimist_1.2.5.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; } { @@ -1678,7 +1798,7 @@ path = fetchurl { name = "mkdirp_classic___mkdirp_classic_0.5.3.tgz"; url = "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; - sha1 = "fa10c9115cc6d8865be221ba47ee9bed78601113"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; } { @@ -1686,7 +1806,7 @@ path = fetchurl { name = "mkdirp___mkdirp_0.5.5.tgz"; url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; } { @@ -1694,7 +1814,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; }; } { @@ -1702,7 +1822,15 @@ path = fetchurl { name = "ms___ms_2.1.2.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + } + { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + path = fetchurl { + name = "napi_build_utils___napi_build_utils_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz"; + sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="; }; } { @@ -1710,7 +1838,15 @@ path = fetchurl { name = "nice_try___nice_try_1.0.5.tgz"; url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; + }; + } + { + name = "node_abi___node_abi_2.30.1.tgz"; + path = fetchurl { + name = "node_abi___node_abi_2.30.1.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz"; + sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; } { @@ -1718,7 +1854,15 @@ path = fetchurl { name = "node_addon_api___node_addon_api_1.7.2.tgz"; url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; + sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; + }; + } + { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + path = fetchurl { + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; } { @@ -1726,7 +1870,7 @@ path = fetchurl { name = "node_fetch___node_fetch_2.6.5.tgz"; url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; - sha1 = "42735537d7f080a7e5f78b6c549b7146be1742fd"; + sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; }; } { @@ -1734,7 +1878,7 @@ path = fetchurl { name = "normalize_url___normalize_url_4.5.1.tgz"; url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz"; - sha1 = "0dd90cf1288ee1d1313b87081c9a5932ee48518a"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; }; } { @@ -1742,7 +1886,7 @@ path = fetchurl { name = "npm_conf___npm_conf_1.1.3.tgz"; url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; - sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9"; + sha512 = "Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw=="; }; } { @@ -1750,7 +1894,31 @@ path = fetchurl { name = "npm_run_path___npm_run_path_2.0.2.tgz"; url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + sha1 = "NakjLfo11wZ7TLLd8jV7GHFTbF8="; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; }; } { @@ -1758,7 +1926,7 @@ path = fetchurl { name = "object_keys___object_keys_1.1.1.tgz"; url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; } { @@ -1766,7 +1934,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; }; } { @@ -1774,7 +1942,7 @@ path = fetchurl { name = "p_cancelable___p_cancelable_1.1.0.tgz"; url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; - sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; } { @@ -1782,7 +1950,7 @@ path = fetchurl { name = "p_finally___p_finally_1.0.0.tgz"; url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + sha1 = "P7z7FbiZpEEjs0ttzBi3JDNqLK4="; }; } { @@ -1790,7 +1958,7 @@ path = fetchurl { name = "p_limit___p_limit_2.3.0.tgz"; url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; } { @@ -1798,7 +1966,7 @@ path = fetchurl { name = "p_locate___p_locate_4.1.0.tgz"; url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; } { @@ -1806,7 +1974,7 @@ path = fetchurl { name = "p_try___p_try_2.2.0.tgz"; url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; } { @@ -1814,7 +1982,7 @@ path = fetchurl { name = "package_json___package_json_6.5.0.tgz"; url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; }; } { @@ -1822,7 +1990,7 @@ path = fetchurl { name = "path_exists___path_exists_4.0.0.tgz"; url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; } { @@ -1830,7 +1998,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; }; } { @@ -1838,7 +2006,7 @@ path = fetchurl { name = "path_key___path_key_2.0.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + sha1 = "QRyttXTFoUDTpLGRDUDYDMn0C0A="; }; } { @@ -1846,7 +2014,7 @@ path = fetchurl { name = "path_key___path_key_3.1.1.tgz"; url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; } { @@ -1854,7 +2022,7 @@ path = fetchurl { name = "pend___pend_1.2.0.tgz"; url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + sha1 = "elfrVQpng/kRUzH89GY9XI4AelA="; }; } { @@ -1862,7 +2030,7 @@ path = fetchurl { name = "pify___pify_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha1 = "5aSs0sEB/fPZpNB/DbxNtJ3SgXY="; }; } { @@ -1870,7 +2038,7 @@ path = fetchurl { name = "pkg_dir___pkg_dir_4.2.0.tgz"; url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; - sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; } { @@ -1878,7 +2046,15 @@ path = fetchurl { name = "plist___plist_3.0.4.tgz"; url = "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz"; - sha1 = "a62df837e3aed2bb3b735899d510c4f186019cbe"; + sha512 = "ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg=="; + }; + } + { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + path = fetchurl { + name = "prebuild_install___prebuild_install_6.1.4.tgz"; + url = "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz"; + sha512 = "Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ=="; }; } { @@ -1886,7 +2062,7 @@ path = fetchurl { name = "prepend_http___prepend_http_2.0.0.tgz"; url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + sha1 = "6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="; }; } { @@ -1894,7 +2070,7 @@ path = fetchurl { name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; } { @@ -1902,7 +2078,7 @@ path = fetchurl { name = "progress___progress_2.0.3.tgz"; url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; } { @@ -1910,7 +2086,7 @@ path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + sha1 = "IS1b/hMYMGpCD2QCuOJv85ZHqEk="; }; } { @@ -1918,7 +2094,7 @@ path = fetchurl { name = "proxy_from_env___proxy_from_env_1.1.0.tgz"; url = "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; - sha1 = "e102f16ca355424865755d2c9e8ea4f24d58c3e2"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; }; } { @@ -1926,7 +2102,7 @@ path = fetchurl { name = "pump___pump_3.0.0.tgz"; url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; } { @@ -1934,7 +2110,7 @@ path = fetchurl { name = "punycode___punycode_2.1.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; } { @@ -1942,15 +2118,15 @@ path = fetchurl { name = "pupa___pupa_2.1.1.tgz"; url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; } { - name = "puppeteer___puppeteer_11.0.0.tgz"; + name = "puppeteer___puppeteer_13.0.1.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-11.0.0.tgz"; - sha1 = "0808719c38e15315ecc1b1c28911f1c9054d201f"; + name = "puppeteer___puppeteer_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.0.1.tgz"; + sha512 = "wqGIx59LzYqWhYcJQphMT+ux0sgatEUbjKG0lbjJxNVqVIT3ZC5m4Bvmq2gHE3qhb63EwS+rNkql08bm4BvO0A=="; }; } { @@ -1958,7 +2134,7 @@ path = fetchurl { name = "rc___rc_1.2.8.tgz"; url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; } { @@ -1966,7 +2142,7 @@ path = fetchurl { name = "read_config_file___read_config_file_6.2.0.tgz"; url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; - sha1 = "71536072330bcd62ba814f91458b12add9fc7ade"; + sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; }; } { @@ -1974,7 +2150,7 @@ path = fetchurl { name = "readable_stream___readable_stream_2.3.7.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; } { @@ -1982,7 +2158,7 @@ path = fetchurl { name = "readable_stream___readable_stream_3.6.0.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } { @@ -1990,7 +2166,7 @@ path = fetchurl { name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; - sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; } { @@ -1998,7 +2174,7 @@ path = fetchurl { name = "registry_url___registry_url_5.1.0.tgz"; url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; } { @@ -2006,7 +2182,7 @@ path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; }; } { @@ -2014,7 +2190,7 @@ path = fetchurl { name = "responselike___responselike_1.0.2.tgz"; url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + sha1 = "kYcg7ztjHFZCvgaPFa3lpG9Loec="; }; } { @@ -2022,7 +2198,7 @@ path = fetchurl { name = "rimraf___rimraf_3.0.2.tgz"; url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; } { @@ -2030,15 +2206,7 @@ path = fetchurl { name = "roarr___roarr_2.15.4.tgz"; url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; - sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"; - }; - } - { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; }; } { @@ -2046,7 +2214,15 @@ path = fetchurl { name = "safe_buffer___safe_buffer_5.2.1.tgz"; url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; } { @@ -2054,7 +2230,7 @@ path = fetchurl { name = "safer_buffer___safer_buffer_2.1.2.tgz"; url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; } { @@ -2062,7 +2238,7 @@ path = fetchurl { name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; } { @@ -2070,7 +2246,7 @@ path = fetchurl { name = "sax___sax_1.2.4.tgz"; url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; } { @@ -2078,7 +2254,7 @@ path = fetchurl { name = "semver_compare___semver_compare_1.0.0.tgz"; url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + sha1 = "De4hahyUGrN+nvsXiPavxf9VN/w="; }; } { @@ -2086,7 +2262,7 @@ path = fetchurl { name = "semver_diff___semver_diff_3.1.1.tgz"; url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; + sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; }; } { @@ -2094,7 +2270,7 @@ path = fetchurl { name = "semver___semver_5.7.1.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; } { @@ -2102,7 +2278,7 @@ path = fetchurl { name = "semver___semver_6.3.0.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; } { @@ -2110,7 +2286,7 @@ path = fetchurl { name = "semver___semver_7.3.5.tgz"; url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } { @@ -2118,7 +2294,15 @@ path = fetchurl { name = "serialize_error___serialize_error_7.0.1.tgz"; url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; - sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18"; + sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; }; } { @@ -2126,7 +2310,7 @@ path = fetchurl { name = "shebang_command___shebang_command_1.2.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + sha1 = "RKrGW2lbAzmJaMOfNj/uXer98eo="; }; } { @@ -2134,7 +2318,7 @@ path = fetchurl { name = "shebang_command___shebang_command_2.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; }; } { @@ -2142,7 +2326,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_1.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + sha1 = "2kL0l0DAtC2yypcoVxyxkMmO/qM="; }; } { @@ -2150,7 +2334,7 @@ path = fetchurl { name = "shebang_regex___shebang_regex_3.0.0.tgz"; url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; } { @@ -2158,15 +2342,31 @@ path = fetchurl { name = "signal_exit___signal_exit_3.0.6.tgz"; url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz"; - sha1 = "24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"; + sha512 = "sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ=="; }; } { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; + name = "simple_concat___simple_concat_1.0.1.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz"; - sha1 = "044f1a49d8842ff307aad6b505ed178bd950134d"; + name = "simple_concat___simple_concat_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz"; + sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; + }; + } + { + name = "simple_get___simple_get_3.1.0.tgz"; + path = fetchurl { + name = "simple_get___simple_get_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz"; + sha512 = "bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA=="; + }; + } + { + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; }; } { @@ -2174,7 +2374,7 @@ path = fetchurl { name = "smart_buffer___smart_buffer_4.2.0.tgz"; url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; + sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; }; } { @@ -2182,7 +2382,7 @@ path = fetchurl { name = "source_map_support___source_map_support_0.5.21.tgz"; url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; - sha1 = "04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; } { @@ -2190,7 +2390,7 @@ path = fetchurl { name = "source_map___source_map_0.6.1.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } { @@ -2198,7 +2398,7 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.1.2.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; } { @@ -2206,15 +2406,15 @@ path = fetchurl { name = "stat_mode___stat_mode_1.0.0.tgz"; url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; - sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; }; } { - name = "string_width___string_width_2.1.1.tgz"; + name = "string_width___string_width_1.0.2.tgz"; path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; }; } { @@ -2222,7 +2422,7 @@ path = fetchurl { name = "string_width___string_width_4.2.3.tgz"; url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha1 = "269c7117d27b05ad2e536830a8ec895ef9c6d010"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } { @@ -2230,7 +2430,7 @@ path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; } { @@ -2238,15 +2438,15 @@ path = fetchurl { name = "string_decoder___string_decoder_1.1.1.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; } { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; + name = "strip_ansi___strip_ansi_3.0.1.tgz"; path = fetchurl { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; }; } { @@ -2254,7 +2454,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_6.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha1 = "9e26c63d30f53443e9489495b2105d37b67a85d9"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } { @@ -2262,7 +2462,7 @@ path = fetchurl { name = "strip_eof___strip_eof_1.0.0.tgz"; url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + sha1 = "u0P/VZim6wXYm1n80SnJgzE2Br8="; }; } { @@ -2270,7 +2470,7 @@ path = fetchurl { name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha1 = "PFMZQukIwml8DsNEhYwobHygpgo="; }; } { @@ -2278,7 +2478,7 @@ path = fetchurl { name = "sumchecker___sumchecker_3.0.1.tgz"; url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; - sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42"; + sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; }; } { @@ -2286,7 +2486,7 @@ path = fetchurl { name = "supports_color___supports_color_5.5.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; } { @@ -2294,7 +2494,7 @@ path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; } { @@ -2302,7 +2502,7 @@ path = fetchurl { name = "tar_fs___tar_fs_2.1.1.tgz"; url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz"; - sha1 = "489a15ab85f1f0befabb370b7de4f9eb5cbe8784"; + sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; } { @@ -2310,7 +2510,7 @@ path = fetchurl { name = "tar_stream___tar_stream_2.2.0.tgz"; url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz"; - sha1 = "acad84c284136b060dc3faa64474aa9aebd77287"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; }; } { @@ -2318,7 +2518,7 @@ path = fetchurl { name = "temp_file___temp_file_3.4.0.tgz"; url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; - sha1 = "766ea28911c683996c248ef1a20eea04d51652c7"; + sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; }; } { @@ -2326,7 +2526,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; }; } { @@ -2334,7 +2534,7 @@ path = fetchurl { name = "tmp_promise___tmp_promise_3.0.3.tgz"; url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; - sha1 = "60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"; + sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; }; } { @@ -2342,7 +2542,7 @@ path = fetchurl { name = "tmp___tmp_0.2.1.tgz"; url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; - sha1 = "8457fc3037dcf4719c251367a1af6500ee1ccf14"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; } { @@ -2350,7 +2550,7 @@ path = fetchurl { name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; - sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + sha512 = "Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="; }; } { @@ -2358,7 +2558,7 @@ path = fetchurl { name = "tr46___tr46_0.0.3.tgz"; url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + sha1 = "gYT9NH2snNwYWZLzpmIuFLnZq2o="; }; } { @@ -2366,7 +2566,15 @@ path = fetchurl { name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + sha1 = "QFkjkJWS1W94pYGENLC3hInKXys="; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; }; } { @@ -2374,7 +2582,7 @@ path = fetchurl { name = "tunnel___tunnel_0.0.6.tgz"; url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; + sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; }; } { @@ -2382,7 +2590,7 @@ path = fetchurl { name = "type_fest___type_fest_0.13.1.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; - sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; } { @@ -2390,7 +2598,7 @@ path = fetchurl { name = "type_fest___type_fest_0.20.2.tgz"; url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; }; } { @@ -2398,7 +2606,7 @@ path = fetchurl { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; } { @@ -2406,7 +2614,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; }; } { @@ -2414,7 +2622,7 @@ path = fetchurl { name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; - sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; + sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } { @@ -2422,7 +2630,7 @@ path = fetchurl { name = "unique_string___unique_string_2.0.0.tgz"; url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; } { @@ -2430,7 +2638,7 @@ path = fetchurl { name = "universalify___universalify_0.1.2.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; } { @@ -2438,7 +2646,7 @@ path = fetchurl { name = "universalify___universalify_2.0.0.tgz"; url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } { @@ -2446,7 +2654,7 @@ path = fetchurl { name = "update_notifier___update_notifier_5.1.0.tgz"; url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha1 = "4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"; + sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; } { @@ -2454,7 +2662,7 @@ path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; } { @@ -2462,7 +2670,7 @@ path = fetchurl { name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + sha1 = "FrXK/Afb42dsGxmZF3gj1lA6yww="; }; } { @@ -2470,7 +2678,7 @@ path = fetchurl { name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + sha1 = "9F8VDExm7uloGGUFq5P8u4rWv2E="; }; } { @@ -2478,7 +2686,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; }; } { @@ -2486,7 +2694,7 @@ path = fetchurl { name = "verror___verror_1.10.1.tgz"; url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; - sha1 = "4bf09eeccf4563b109ed4b3d458380c972b0cdeb"; + sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; }; } { @@ -2494,7 +2702,7 @@ path = fetchurl { name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + sha1 = "JFNCdeKnvGvnvIZhHMFq4KVlSHE="; }; } { @@ -2502,7 +2710,7 @@ path = fetchurl { name = "whatwg_url___whatwg_url_5.0.0.tgz"; url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + sha1 = "lmRU6HZUYuN2RNNib2dCzotwll0="; }; } { @@ -2510,7 +2718,7 @@ path = fetchurl { name = "which___which_1.3.1.tgz"; url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; } { @@ -2518,7 +2726,15 @@ path = fetchurl { name = "which___which_2.0.2.tgz"; url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; + }; + } + { + name = "wide_align___wide_align_1.1.5.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; } { @@ -2526,7 +2742,7 @@ path = fetchurl { name = "widest_line___widest_line_3.1.0.tgz"; url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; } { @@ -2534,7 +2750,7 @@ path = fetchurl { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; } { @@ -2542,7 +2758,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; }; } { @@ -2550,7 +2766,7 @@ path = fetchurl { name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; } { @@ -2558,7 +2774,7 @@ path = fetchurl { name = "ws___ws_8.2.3.tgz"; url = "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz"; - sha1 = "63a56456db1b04367d0b721a0b80cae6d8becbba"; + sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; } { @@ -2566,7 +2782,7 @@ path = fetchurl { name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; + sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; }; } { @@ -2574,7 +2790,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha1 = "9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5"; + sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; }; } { @@ -2582,7 +2798,7 @@ path = fetchurl { name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + sha1 = "Ey7mPS7FVlxVfiD0wi35rKaGsQ0="; }; } { @@ -2590,7 +2806,7 @@ path = fetchurl { name = "y18n___y18n_5.0.8.tgz"; url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha1 = "7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; } { @@ -2598,23 +2814,23 @@ path = fetchurl { name = "yallist___yallist_4.0.0.tgz"; url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; } { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; + name = "yargs_parser___yargs_parser_21.0.0.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + name = "yargs_parser___yargs_parser_21.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA=="; }; } { - name = "yargs___yargs_17.2.1.tgz"; + name = "yargs___yargs_17.3.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.2.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz"; - sha1 = "e2c95b9796a0e1f7f3bf4427863b42e0418191ea"; + name = "yargs___yargs_17.3.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz"; + sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; }; } { @@ -2622,7 +2838,7 @@ path = fetchurl { name = "yauzl___yauzl_2.10.0.tgz"; url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + sha1 = "x+sXyT4RLLEIb6bY5R+wZnt5pfk="; }; } ]; From ac9010920b7e1d2a72c6856f01f857c9ece9b94a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 28 Jan 2022 18:14:03 +0100 Subject: [PATCH 019/187] sharedown: make updateScript terminate when version has not changed Otherwise r-ryantm will try to bump lockfile. --- pkgs/tools/misc/sharedown/update.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/sharedown/update.sh b/pkgs/tools/misc/sharedown/update.sh index 584cb8511a7c..d08a258a6a83 100755 --- a/pkgs/tools/misc/sharedown/update.sh +++ b/pkgs/tools/misc/sharedown/update.sh @@ -1,9 +1,19 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update yarn yarn2nix-moretea.yarn2nix +#!nix-shell -i bash -p common-updater-scripts curl jq yarn yarn2nix-moretea.yarn2nix set -euo pipefail -nix-update sharedown +owner=kylon +repo=Sharedown +latestVersion=$(curl "https://api.github.com/repos/$owner/$repo/releases/latest" | jq -r '.tag_name') +currentVersion=$(nix-instantiate --eval --expr 'with import ./. {}; sharedown.version' | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" && "${BUMP_LOCK-}" != "1" ]]; then + # Skip update when already on the latest version. + exit 0 +fi + +update-source-version sharedown "$latestVersion" dirname="$(realpath "$(dirname "$0")")" sourceDir="$(nix-build -A sharedown.src --no-out-link)" From 24bed7aa03ea6b8fb32d3664d8b76facb45c0fbf Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 29 Jan 2022 10:13:40 +0100 Subject: [PATCH 020/187] navidrome: 0.47.0 -> 0.47.5 Fixes CVE-2022-23857 https://github.com/navidrome/navidrome/releases/tag/v0.47.5 --- pkgs/servers/misc/navidrome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 2bec7f6912e7..17e648e59ab1 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,17 +4,17 @@ with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.47.0"; + version = "0.47.5"; src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux" then { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-MoBv2dTCotLnGaZOUWLScYd1+gKSjPXTSkHAR6UircA="; + sha256 = "sha256-AkSjtln53HDdIcQgnA8Wj010RXnOlOsFm2wfVgbvwtc="; } else { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_arm64.tar.gz"; - sha256 = "sha256-FIjrw+BBJXOjh1AoVdfPZIdcDyk5yS/zKD1O+u31YlE="; + sha256 = "sha256-+VBRiV2zKa6PwamWj/jmE4iuoohAD6oeGnlFi4/01HM="; }); nativeBuildInputs = [ makeWrapper ]; From a9bbc8be84d2459aeb9d8fe8bc310fc34c091f3e Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 15 Jan 2022 23:16:29 +0100 Subject: [PATCH 021/187] fslint: drop Requires python2 and libglade (both EOL). Upstream recommends using [czkawka](https://qarmin.github.io/czkawka/) instead. --- pkgs/applications/misc/fslint/default.nix | 41 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/applications/misc/fslint/default.nix diff --git a/pkgs/applications/misc/fslint/default.nix b/pkgs/applications/misc/fslint/default.nix deleted file mode 100644 index 1f2ec2805490..000000000000 --- a/pkgs/applications/misc/fslint/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2, makeWrapper }: - -let pythonEnv = python2.withPackages(ps: [ ps.pyGtkGlade]); -in stdenv.mkDerivation rec { - pname = "fslint"; - version = "2.46"; - - src = fetchFromGitHub { - owner = "pixelb"; - repo = "fslint"; - rev = version; - sha256 = "048pc1rsslbsrfchl2wmdd4hpa2gycglib7kdx8vqs947zcm0sfv"; - }; - - buildInputs = [ - pythonEnv makeWrapper - ]; - - prePatch = '' - substituteInPlace fslint-gui --replace "liblocation=os.path.dirname(os.path.abspath(sys.argv[0]))" "liblocation='$out'" - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - cp * -R $out/ - cp fslint-gui $out/bin/fslint - - wrapProgram "$out/bin/fslint" \ - --prefix PYTHONPATH : "${pythonEnv.interpreter}" - runHook postInstall - ''; - - meta = with lib; { - description = "A utility to find and clean various forms of lint on a filesystem"; - homepage = "https://www.pixelbeat.org/fslint/"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.dasj19 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 42b4b8f59b49..a9730df3c360 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -304,6 +304,7 @@ mapAliases ({ foomatic_filters = foomatic-filters; # 2016-08 fscryptctl-experimental = throw "The package fscryptctl-experimental has been removed. Please switch to fscryptctl."; # 2021-11-07 fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; + fslint = throw "fslint has been removed: end of life. Upstream recommends using czkawka (https://qarmin.github.io/czkawka/) instead"; # 2022-01-15 fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80896900dd13..3e4deae23b9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30412,8 +30412,6 @@ with pkgs; tts = callPackage ../tools/audio/tts { }; - fslint = callPackage ../applications/misc/fslint { }; - ### GAMES _1oom = callPackage ../games/1oom { }; From 724822a79dc6fee025f246bda73b61239e89034c Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 15 Jan 2022 23:19:32 +0100 Subject: [PATCH 022/187] python2Packages.{pygtk,pyGtkGlade}: remove libglade support --- pkgs/development/python2-modules/pygtk/default.nix | 6 +++--- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python2-packages.nix | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python2-modules/pygtk/default.nix b/pkgs/development/python2-modules/pygtk/default.nix index 938b55630c06..465d711ec6ff 100644 --- a/pkgs/development/python2-modules/pygtk/default.nix +++ b/pkgs/development/python2-modules/pygtk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, python, pkg-config, gtk2, pygobject2, pycairo, pango -, buildPythonPackage, libglade ? null, isPy3k }: +, buildPythonPackage, isPy3k }: buildPythonPackage rec { pname = "pygtk"; @@ -27,7 +27,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango - ] ++ lib.optional (libglade != null) libglade; + ]; propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { installPhase = "installPhase"; - checkPhase = lib.optionalString (libglade == null) + checkPhase = '' sed -i -e "s/glade = importModule('gtk.glade', buildDir)//" \ tests/common.py diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e8416f911097..a221e083fa31 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -72,6 +72,7 @@ mapAliases ({ prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 + pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pysmart-smartx = pysmart; # added 2021-10-22 diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 4a15b64da09f..22f72a33d2c9 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -108,10 +108,6 @@ with self; with super; { pygtk = callPackage ../development/python2-modules/pygtk { }; - pyGtkGlade = self.pygtk.override { - inherit (pkgs.gnome2) libglade; - }; - pyjwt = callPackage ../development/python2-modules/pyjwt { }; pyroma = callPackage ../development/python2-modules/pyroma { }; From fb163439eb96f4052a60cb426d522897ba25b669 Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 15 Jan 2022 23:43:02 +0100 Subject: [PATCH 023/187] yarssr: drop --- pkgs/applications/misc/yarssr/default.nix | 81 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 pkgs/applications/misc/yarssr/default.nix diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix deleted file mode 100644 index d031f63a097a..000000000000 --- a/pkgs/applications/misc/yarssr/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ fetchFromGitHub, stdenv, lib, gettext, gtk2, makeWrapper, perlPackages, gnome2 }: - -let - perlDeps = with perlPackages; [ - Glib - Gtk2 - Gnome2 - Pango - Cairo - Gnome2Canvas - Gnome2VFS - Gtk2GladeXML - Gtk2TrayIcon - XMLLibXML - XMLSAXBase - XMLParser - XMLRSS - HTMLParser - DateTime - DateTimeFormatMail - DateTimeFormatW3CDTF - DateTimeLocale - DateTimeTimeZone - ParamsValidate - ModuleImplementation - ModuleRuntime - TryTiny - ClassSingleton - URI - AnyEvent - AnyEventHTTP - commonsense - FileSlurp - JSON - Guard - LocaleGettext - ]; - libs = [ - stdenv.cc.cc.lib - gtk2 - ]; -in -stdenv.mkDerivation { - version = "unstable-2017-12-01"; - pname = "yarssr"; - - src = fetchFromGitHub { - owner = "JGRennison"; - repo = "yarssr"; - rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d"; - sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45"; - }; - - nativeBuildInputs = [ perlPackages.perl gettext makeWrapper ]; - buildInputs = perlDeps ++ [ gnome2.libglade ]; - propagatedBuildInputs = libs ++ perlDeps; - - installPhase = '' - DESTDIR=$out make install - mv $out/usr/* $out/ - rm -R $out/usr - sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr - sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr - sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm - chmod a+x $out/bin/yarssr - ''; - - postFixup = '' - wrapProgram $out/bin/yarssr \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \ - --set PERL5LIB "${perlPackages.makePerlPath perlDeps}" - ''; - - meta = with lib; { - homepage = "https://github.com/tsyrogit/zxcvbn-c"; - description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes"; - license = licenses.gpl1; - platforms = platforms.linux; - maintainers = with maintainers; [ xurei ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a9730df3c360..d01c937e2f3c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1130,6 +1130,7 @@ mapAliases ({ xv = xxv; # added 2020-02-22 xvfb_run = xvfb-run; # added 2021-05-07 yacc = bison; # moved from top-level 2021-03-14 + yarssr = throw "yarssr has been removed as part of the python2 deprecation"; # added 2022-01-15 youtubeDL = youtube-dl; # added 2014-10-26 ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead"; yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e4deae23b9a..56f625f63ce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30000,8 +30000,6 @@ with pkgs; yarp = callPackage ../applications/science/robotics/yarp {}; - yarssr = callPackage ../applications/misc/yarssr { }; - yate = callPackage ../applications/misc/yate { }; ydiff = with python3.pkgs; toPythonApplication ydiff; From a7e58353313f40ee2ac4288eb2aaf29d72c92feb Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 15 Jan 2022 23:26:09 +0100 Subject: [PATCH 024/187] perlPackages.Gtk2GladeXML: drop --- pkgs/top-level/perl-packages.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 870246740093..7707b992ca13 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9676,21 +9676,6 @@ let propagatedBuildInputs = [ Pango ]; }; - Gtk2GladeXML = buildPerlPackage { - pname = "Gtk2-GladeXML"; - version = "1.007"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz"; - sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; - }; - propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 ]; - meta = { - description = "Create user interfaces directly from Glade XML files"; - license = lib.licenses.lgpl2Plus; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.Gtk2GladeXML.x86_64-darwin - }; - }; - Gtk2TrayIcon = buildPerlPackage { pname = "Gtk2-TrayIcon"; version = "0.06"; @@ -25447,4 +25432,5 @@ let SubExporterUtil = self.SubExporter; version = self.Version; + Gtk2GladeXML = throw "Gtk2GladeXML has been removed"; # 2022-01-15 }; in self From f6d2ceae6d89d5927499cc4d8bc559440fee0d6e Mon Sep 17 00:00:00 2001 From: piegames Date: Sat, 15 Jan 2022 23:45:39 +0100 Subject: [PATCH 025/187] pbis: remove comment referencing libglade --- pkgs/tools/security/pbis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix index 7561b1fae98f..acd1fc5607bc 100644 --- a/pkgs/tools/security/pbis/default.nix +++ b/pkgs/tools/security/pbis/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # curl must be placed after openssl_1_0_2, because it pulls openssl 1.1 dependency. buildInputs = [ pam popt libiconv libuuid openssl_1_0_2 cyrus_sasl - curl sqlite popt tdb libxml2 /*libglade2 for gtk*/ + curl sqlite popt tdb libxml2 ]; postPatch = '' From 5ffbf9ed8114485a3fd99efcce55ec9518522e26 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 01:54:22 +0100 Subject: [PATCH 026/187] tilp2: drop While tilp2's libglade dependency is optional, it still has a hard dependency on it via gfm --- .../from_md/release-notes/rl-2205.section.xml | 5 ++ .../manual/release-notes/rl-2205.section.md | 2 + nixos/modules/module-list.nix | 1 - nixos/modules/programs/tilp2.nix | 28 --------- nixos/modules/rename.nix | 1 + .../science/math/tilp2/default.nix | 57 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 8 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 nixos/modules/programs/tilp2.nix delete mode 100644 pkgs/applications/science/math/tilp2/default.nix 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 e99f786b33ce..55d56fa14652 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 @@ -382,6 +382,11 @@ unmaintained + + + tilp2 was removed together with its module + + The options diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index a8b717c6f846..ef7a25d6b02d 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -126,6 +126,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `pkgs.docbookrx` was removed since it's unmaintained +- `tilp2` was removed together with its module + - 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`. - 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`. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c2b1e8866863..103cb0753093 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -203,7 +203,6 @@ ./programs/sway.nix ./programs/system-config-printer.nix ./programs/thefuck.nix - ./programs/tilp2.nix ./programs/tmux.nix ./programs/traceroute.nix ./programs/tsm-client.nix diff --git a/nixos/modules/programs/tilp2.nix b/nixos/modules/programs/tilp2.nix deleted file mode 100644 index da9e32e3e6c6..000000000000 --- a/nixos/modules/programs/tilp2.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - cfg = config.programs.tilp2; - -in { - options.programs.tilp2 = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable tilp2 and udev rules for supported calculators. - ''; - }; - }; - - config = mkIf cfg.enable { - services.udev.packages = [ - pkgs.libticables2 - ]; - - environment.systemPackages = [ - pkgs.tilp2 - ]; - }; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 81843dc0f90a..31538c422192 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -32,6 +32,7 @@ with lib; '') (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) (mkRemovedOptionModule [ "security" "hideProcessInformation" ] '' diff --git a/pkgs/applications/science/math/tilp2/default.nix b/pkgs/applications/science/math/tilp2/default.nix deleted file mode 100644 index ebcca69f0940..000000000000 --- a/pkgs/applications/science/math/tilp2/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, autoreconfHook -, pkg-config -, intltool -, glib -, gnome2 -, gtk2 -, gfm -, libticables2 -, libticalcs2 -, libticonv -, libtifiles2 -}: - -stdenv.mkDerivation rec { - pname = "tilp2"; - version = "1.18"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0isf73bjwk06baz2gm3vpdh600gqck9ca4aqxzb089dmxriv6fkv"; - }; - - patches = fetchpatch { - name = "remove-broken-kde-support.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=tilp"; - sha256 = "1fn6vh7r45spkwpmkvffkbn7zrcsdrs5mjmspd5rwi3jc12cy3ny"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - intltool - ]; - - buildInputs = [ - glib - gtk2 - gnome2.libglade - gfm - libticables2 - libticalcs2 - libticonv - libtifiles2 - ]; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "Transfer data between Texas Instruments graphing calculators and a computer"; - homepage = "http://lpg.ticalc.org/prj_tilp/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d01c937e2f3c..44f9d3b9316d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -804,6 +804,7 @@ mapAliases ({ pg_similarity = postgresqlPackages.pg_similarity; pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; + tilp2 = throw "tilp2 has been removed"; # added 2022-01-15 timescaledb = postgresqlPackages.timescaledb; tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56f625f63ce0..9b83697a002a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10235,8 +10235,6 @@ with pkgs; tilem = callPackage ../misc/emulators/tilem { }; - tilp2 = callPackage ../applications/science/math/tilp2 { }; - timemachine = callPackage ../applications/audio/timemachine { }; timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { }; From 0f5180e7cabcb44aedf763e4268ab83fbe4f969d Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 02:27:56 +0100 Subject: [PATCH 027/187] xfce: drop libglade --- pkgs/desktops/xfce/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 4b057bea7946..2340a57c22d8 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -214,7 +214,7 @@ lib.makeScope pkgs.newScope (self: with self; { gtk = pkgs.gtk2; libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; xinitrc = xfce4-session.xinitrc; - inherit (pkgs.gnome2) libglade; + libglade = throw "libglade has been removed"; inherit (pkgs.gnome) gtksourceview; xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { From 768672d5966f483a76041ca7135e01cebd452c67 Mon Sep 17 00:00:00 2001 From: piegames Date: Tue, 25 Jan 2022 21:47:49 +0100 Subject: [PATCH 028/187] monodevelop: drop It was marked as broken for some time now anyways --- .../editors/monodevelop/default.nix | 81 ------------------- ...10fb3f6dce121df538e36f21d8c2eeb0a6e3.patch | 57 ------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 pkgs/applications/editors/monodevelop/default.nix delete mode 100644 pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix deleted file mode 100644 index 12b66370d506..000000000000 --- a/pkgs/applications/editors/monodevelop/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ lib, stdenv, fetchurl -, autoconf, automake, pkg-config, shared-mime-info, intltool -, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip -, dotnetPackages -}: - -stdenv.mkDerivation rec { - version = "5.9.4.5"; - revision = "8010a90f6e246b32364e3fb46ef2c9d1be9c9a2b"; - pname = "monodevelop"; - - src = fetchurl { - url = "https://download.mono-project.com/sources/monodevelop/${pname}-${version}.tar.bz2"; - sha256 = "0bim4bfv3zwijafl9g0cx3159zq43dlcv74mnyrda41j4p52w5ji"; - }; - - nunit2510 = fetchurl { - url = "https://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip"; - sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc"; - }; - - postPatch = '' - # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19 - - # cecil needs NUnit 2.5.10 - this is also missing from the tar - unzip -j ${nunit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\* - - # the tar doesn't include the nuget binary, so grab it from github and copy it - # into the right place - cp -vfR "$(dirname $(pkg-config NuGet.Core --variable=Libraries))"/* external/nuget-binary/ - ''; - - # Revert this commit which broke the ability to use pkg-config to locate dlls - patchFlags = [ "-p2" ]; - patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ - autoconf automake shared-mime-info intltool - mono gtk-sharp-2_0 gnome-sharp - dotnetPackages.NUnit - dotnetPackages.NUnitRunners - dotnetPackages.Nuget - ]; - - preConfigure = "patchShebangs ./configure"; - - preBuild = '' - cat > ./buildinfo < export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX - > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH - > - EOF - done - - # Without this, you get a missing DLL error any time you install an addin.. - ln -sv `pkg-config nunit.core --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.core.interfaces --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.framework --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ln -sv `pkg-config nunit.util --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit - ''; - - dontStrip = true; - - meta = with lib; { - platforms = platforms.linux; - maintainers = with maintainers; [ obadz ]; - broken = true; # 2018-09-21, build has failed since 2018-03-08 - }; -} diff --git a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch deleted file mode 100644 index 969aad33ec0b..000000000000 --- a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -index 02d3a01..c6daaad 100644 ---- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -+++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj -@@ -452,34 +452,6 @@ - - PreserveNewest - -- -- System.Web.Mvc.dll -- PreserveNewest -- -- -- System.Web.Razor.dll -- PreserveNewest -- -- -- System.Web.Helpers.dll -- PreserveNewest -- -- -- System.Web.WebPages.Deployment.dll -- PreserveNewest -- -- -- System.Web.WebPages.dll -- PreserveNewest -- -- -- System.Web.WebPages.Razor.dll -- PreserveNewest -- -- -- Microsoft.Web.Infrastructure.dll -- PreserveNewest -- - - - -diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -index eab7c32..4a75311 100644 ---- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -+++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml -@@ -1,13 +1,6 @@ - - - -- -- -- -- -- -- -- - - - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 44f9d3b9316d..6cba1cd0508c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -614,6 +614,7 @@ mapAliases ({ minergate-cli = throw "minergatecli has been removed from nixpkgs, because the package is unmaintained and the site has a bad reputation"; # added 2021-08-13 minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # added 2021-10-14 monero = monero-cli; # added 2021-11-28 + monodevelop = throw "monodevelop has been removed from nixpgks"; # added 2022-01-15 mopidy-gmusic = throw "mopidy-gmusic has been removed because Google Play Music was discontinued"; # added 2021-03-07 mopidy-local-images = throw "mopidy-local-images has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 mopidy-local-sqlite = throw "mopidy-local-sqlite has been removed as it's unmaintained. Its functionality has been merged into the mopidy-local extension."; # added 2020-10-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b83697a002a..d16d274d0c1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27297,8 +27297,6 @@ with pkgs; monkeysphere = callPackage ../tools/security/monkeysphere { }; - monodevelop = callPackage ../applications/editors/monodevelop {}; - monotone = callPackage ../applications/version-management/monotone { lua = lua5; boost = boost170; From 6aa85212245b8a3db21b36cd915da566991e26fb Mon Sep 17 00:00:00 2001 From: piegames Date: Tue, 25 Jan 2022 21:53:15 +0100 Subject: [PATCH 029/187] pdfmod: drop --- pkgs/applications/misc/pdfmod/default.nix | 49 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 pkgs/applications/misc/pdfmod/default.nix diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix deleted file mode 100644 index da9340f30759..000000000000 --- a/pkgs/applications/misc/pdfmod/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, pkg-config, gnome-doc-utils, intltool, lib -, mono, gtk-sharp-2_0, gnome-sharp, hyena -, which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "pdfmod"; - version = "0.9.1"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "eb7c987514a053106ddf03f26544766c751c801d87762909b36415d46bc425c9"; - }; - - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/City-busz/Arch-Linux-Repository" - + "/master/gnome/pdfmod/pdfmod/pdfmod-mono-2.10.patch"; - sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81"; - }) ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp - hyena which makeWrapper wrapGAppsHook - ]; - - preConfigure = '' - substituteInPlace lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \ - --replace libpoppler-glib.so.4 libpoppler-glib.so - ''; - - postInstall = '' - makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \ - --add-flags "$out/lib/pdfmod/PdfMod.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ - --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome2.GConf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} - ''; - - dontStrip = true; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Attic/PdfMod"; - description = "A simple application for modifying PDF documents"; - platforms = platforms.all; - maintainers = with maintainers; [ obadz ]; - license = licenses.gpl2Plus; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6cba1cd0508c..4a1146056d22 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -717,6 +717,7 @@ mapAliases ({ parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # added 2022-01-10 parquet-cpp = arrow-cpp; # added 2018-09-08 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 + pdfmod = throw "pdfmod has been removed"; # added 2022-01-15 pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # added 2021-07-22 pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project."; # added 2022-01-01 pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d16d274d0c1b..7121095f81d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8695,8 +8695,6 @@ with pkgs; pdfminer = with python3Packages; toPythonApplication pdfminer; - pdfmod = callPackage ../applications/misc/pdfmod { }; - pdf-quench = callPackage ../applications/misc/pdf-quench { }; jbig2enc = callPackage ../tools/graphics/jbig2enc { }; From dcc2473370e8b4799688118a1b98964955204357 Mon Sep 17 00:00:00 2001 From: piegames Date: Tue, 25 Jan 2022 21:56:11 +0100 Subject: [PATCH 030/187] gnome-sharp: drop --- .../libraries/gnome-sharp/default.nix | 45 ------------------- .../libraries/gnome-sharp/fix-mono-path.patch | 13 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/development/libraries/gnome-sharp/default.nix delete mode 100644 pkgs/development/libraries/gnome-sharp/fix-mono-path.patch diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix deleted file mode 100644 index 4aa510f36068..000000000000 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, gtk2 -, mono -, gtk-sharp-2_0 -, gnome2 -, autoconf -, automake -, libtool -, which -}: - -stdenv.mkDerivation rec { - pname = "gnome-sharp"; - version = "2.24.4"; - - src = fetchFromGitHub { - owner = "mono"; - repo = "gnome-sharp"; - rev = version; - sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z"; - }; - - nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; - buildInputs = [ gtk2 mono gtk-sharp-2_0 ] - ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); - - patches = [ ./fix-mono-path.patch ]; - - preConfigure = '' - ./bootstrap-${lib.versions.majorMinor version} - ''; - - dontStrip = true; - - meta = with lib; { - homepage = "https://www.mono-project.com/docs/gui/gtksharp/"; - description = "A .NET language binding for assorted GNOME libraries"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch deleted file mode 100644 index 706f119c8baa..000000000000 --- a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am -index a0ee802..8260694 100644 ---- a/sample/gconf/Makefile.am -+++ b/sample/gconf/Makefile.am -@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES) - $(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES) - - Settings.cs: $(SCHEMA) -- MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs -+ MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs - - CLEANFILES = sample.exe Settings.cs - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4a1146056d22..da55491c6c60 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -334,6 +334,7 @@ mapAliases ({ gnome-mpv = celluloid; # added 2019-08-22 gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 + gnome-sharp = throw "gnome-sharp has been removed from nixpkgs"; # added 2022-01-15 gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7121095f81d3..d846dba31461 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17015,8 +17015,6 @@ with pkgs; gdk-pixbuf-xlib = callPackage ../development/libraries/gdk-pixbuf/xlib.nix { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; - gnome-menus = callPackage ../development/libraries/gnome-menus { }; elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { }; From 48e2f6885f797d42a8630982713623c10413963e Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 00:43:13 +0100 Subject: [PATCH 031/187] gtk-sharp*: remove old optional Gnome2 dependencies They were marked as optional with `dependency ? null`, however they were references unconditionally in the `buildInputs`. I don't know how all of this ever worked, but it's removed anyways now. --- pkgs/development/libraries/gtk-sharp/2.0.nix | 12 ++---------- pkgs/development/libraries/gtk-sharp/3.0.nix | 12 ++---------- pkgs/top-level/all-packages.nix | 12 ++---------- 3 files changed, 6 insertions(+), 30 deletions(-) diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index f35f5e0552c4..b083ca02cf2c 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -6,14 +6,6 @@ , glib , pango , gtk2 -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null , libxml2 , monoDLLFixer , autoconf @@ -54,8 +46,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake libtool which ]; buildInputs = [ - mono glib pango gtk2 GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + mono glib pango gtk2 + libxml2 ]; preConfigure = '' diff --git a/pkgs/development/libraries/gtk-sharp/3.0.nix b/pkgs/development/libraries/gtk-sharp/3.0.nix index 6b996244a9f3..8b594a00a7e5 100644 --- a/pkgs/development/libraries/gtk-sharp/3.0.nix +++ b/pkgs/development/libraries/gtk-sharp/3.0.nix @@ -6,14 +6,6 @@ , glib , pango , gtk3 -, GConf ? null -, libglade ? null -, libgtkhtml ? null -, gtkhtml ? null -, libgnomecanvas ? null -, libgnomeui ? null -, libgnomeprint ? null -, libgnomeprintui ? null , libxml2 , monoDLLFixer }: @@ -30,8 +22,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - mono glib pango gtk3 GConf libglade libgnomecanvas - libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 + mono glib pango gtk3 + libxml2 ]; patches = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d846dba31461..3f469c274819 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17057,17 +17057,9 @@ with pkgs; gtk-engine-murrine = callPackage ../development/libraries/gtk-engine-murrine { }; - gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { }; - gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { - inherit (gnome2) libglade libgtkhtml gtkhtml - libgnomecanvas libgnomeui libgnomeprint - libgnomeprintui GConf; - }; + gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { }; gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; From 34af921dc9bc69897570362cdd70c9c5f01e3ee1 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 12:42:22 +0100 Subject: [PATCH 032/187] timekeeper: drop --- .../office/timekeeper/default.nix | 44 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 pkgs/applications/office/timekeeper/default.nix diff --git a/pkgs/applications/office/timekeeper/default.nix b/pkgs/applications/office/timekeeper/default.nix deleted file mode 100644 index ba9390251fc5..000000000000 --- a/pkgs/applications/office/timekeeper/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, fetchFromGitHub -, poco -, pkg-config -, gnome2 -, gtkmm2 -, lib -}: - -stdenv.mkDerivation rec { - pname = "timekeeper"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "bburdette"; - repo = "TimeKeeper"; - rev = "v${version}"; - fetchSubmodules = true; - sha256 = "03rvzkygnn7igcindbb5bcmfy0l83n0awkzprsnhlb6ndxax3k9w"; - }; - - nativeBuildInputs = [ - poco - pkg-config - ]; - - buildInputs = [ - gtkmm2 - gnome2.libglademm - gnome2.libglade - ]; - - installPhase = '' - install -Dm755 TimeKeeper/TimeKeeper $out/bin/timekeeper - ''; - - meta = with lib; { - description = "Log hours worked and make reports"; - homepage = "https://github.com/bburdette/TimeKeeper"; - maintainers = with maintainers; [ bburdette ]; - platforms = [ "x86_64-linux" ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index da55491c6c60..4af5fcab81e5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -808,6 +808,7 @@ mapAliases ({ pgtap = postgresqlPackages.pgtap; plv8 = postgresqlPackages.plv8; tilp2 = throw "tilp2 has been removed"; # added 2022-01-15 + timekeeper = throw "timekeeper has been removed"; # added 2022-01-16 timescaledb = postgresqlPackages.timescaledb; tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns"; tsearch_extras = postgresqlPackages.tsearch_extras; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f469c274819..23cea2c42040 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10241,8 +10241,6 @@ with pkgs; timetagger = callPackage ../servers/timetagger { }; - timekeeper = callPackage ../applications/office/timekeeper { }; - timezonemap = callPackage ../development/libraries/timezonemap { }; tzupdate = callPackage ../applications/misc/tzupdate { }; From 5f192c0e73a25fa92d6749bb07519cd803b33916 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 02:44:25 +0100 Subject: [PATCH 033/187] libglademm: drop --- .../gnome-2/bindings/libglademm/default.nix | 17 ----------------- pkgs/desktops/gnome-2/default.nix | 5 +---- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/bindings/libglademm/default.nix diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix deleted file mode 100644 index b997a9ddd1a3..000000000000 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkg-config, intltool, gtkmm2, libglade }: - -stdenv.mkDerivation rec { - name = "libglademm-2.6.7"; - - src = fetchurl { - url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; - sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; - }; - - outputs = [ "out" "devdoc" ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ intltool ]; - - propagatedBuildInputs = [ gtkmm2 libglade ]; -} diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 90d6fd0b7aa5..a8ff7b58ed30 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -62,10 +62,6 @@ lib.makeScope pkgs.newScope (self: with self; { autoreconfHook = pkgs.autoreconfHook269; }; -#### BINDINGS - - libglademm = callPackage ./bindings/libglademm { }; - } // lib.optionalAttrs (config.allowAliases or true) { inherit (pkgs) # GTK Libs @@ -89,4 +85,5 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_icon_theme = self.gnome-icon-theme; gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; + libglademm = throw "libglademm has been removed"; # 2022-01-15 }) From 4850d0ebb89b7a295c7fd1afa49c41be03040945 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 12:51:42 +0100 Subject: [PATCH 034/187] guile-gnome: drop --- .../guile-modules/guile-gnome/default.nix | 70 ------------------- pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 6 -- 3 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 pkgs/development/guile-modules/guile-gnome/default.nix diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix deleted file mode 100644 index ead08ce0231b..000000000000 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchurl -, gconf -, glib -, gnome_vfs -, gtk2 -, guile -, guile-cairo -, guile-lib -, gwrap -, libglade -, libgnome -, libgnomecanvas -, libgnomeui -, pango -, pkg-config -, texinfo -}: - -stdenv.mkDerivation rec { - pname = "guile-gnome-platform"; - version = "2.16.4"; - - src = fetchurl { - url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM="; - }; - - nativeBuildInputs = [ - pkg-config - texinfo - ]; - buildInputs = [ - gconf - glib - gnome_vfs - gtk2 - guile - guile-cairo - gwrap - libglade - libgnome - libgnomecanvas - libgnomeui - pango - ] ++ lib.optional doCheck guile-lib; - - # The test suite tries to open an X display, which fails. - doCheck = false; - - makeFlags = [ - "GUILE_AUTO_COMPILE=0" - ]; - - meta = with lib; { - homepage = "https://www.gnu.org/software/guile-gnome/"; - description = "GNOME bindings for GNU Guile"; - longDescription = '' - GNU guile-gnome brings the power of Scheme to your graphical application. - guile-gnome modules support the entire Gnome library stack: from Pango to - GnomeCanvas, GTK to GStreamer, Glade to GtkSourceView, you will find in - guile-gnome a comprehensive environment for developing modern - applications. - ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4af5fcab81e5..8a5ebb1f9745 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -382,7 +382,8 @@ mapAliases ({ gtk_doc = gtk-doc; # added 2018-02-25 gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # added 2022-01-01 guileCairo = guile-cairo; # added 2017-09-24 - guileGnome = guile-gnome; # added 2017-09-24 + guileGnome = throw "guile-gnome has been removed"; # 2022-01-16 + guile-gnome = throw "guile-gnome has been removed"; # 2022-01-16 gnome3 = gnome; # added 2021-05-07 guileLint = guile-lint; # added 2017-09-27 guile_lib = guile-lib; # added 2017-09-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23cea2c42040..c5641edc30d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13969,12 +13969,6 @@ with pkgs; guile-git = callPackage ../development/guile-modules/guile-git { }; - guile-gnome = callPackage ../development/guile-modules/guile-gnome { - gconf = gnome2.GConf; - guile = guile_2_0; - inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; - }; - guile-json = callPackage ../development/guile-modules/guile-json { }; guile-lib = callPackage ../development/guile-modules/guile-lib { }; From 82c39d692990a6c1073c2a73580d4da0e549eac8 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 12:56:56 +0100 Subject: [PATCH 035/187] obconf: drop --- pkgs/tools/X11/obconf/default.nix | 30 ------------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/tools/X11/obconf/default.nix diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix deleted file mode 100644 index 5cbcec63c59d..000000000000 --- a/pkgs/tools/X11/obconf/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, libglade, openbox, - imlib2, libstartup_notification, makeWrapper, libSM }: - -stdenv.mkDerivation rec { - pname = "obconf"; - version = "2.0.4"; - - src = fetchurl { - url = "http://openbox.org/dist/obconf/obconf-${version}.tar.gz"; - sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gtk2 libglade libSM openbox imlib2 libstartup_notification - makeWrapper - ]; - - postInstall = '' - wrapProgram $out/bin/obconf --prefix XDG_DATA_DIRS : ${openbox}/share/ - ''; - - meta = { - description = "GUI configuration tool for openbox"; - homepage = "http://openbox.org/wiki/ObConf"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.lhvwb ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8a5ebb1f9745..4eba8ceb97f0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -687,6 +687,7 @@ mapAliases ({ nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream"; oauth2_proxy = oauth2-proxy; # added 2021-04-18 opencascade_oce = opencascade; # added 2018-04-25 + obconf = throw "obconf has been removed"; # added 2022-01-16 oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24 ofp = throw "ofp is not compatible with odp-dpdk"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5641edc30d9..714283d3680f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27797,10 +27797,6 @@ with pkgs; nvpy = callPackage ../applications/editors/nvpy { }; - obconf = callPackage ../tools/X11/obconf { - inherit (gnome2) libglade; - }; - oberon-risc-emu = callPackage ../misc/emulators/oberon-risc-emu { }; obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {}; From 405b157aaa06c9a3b9fecb74ecb36638b4668bb8 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 14:18:32 +0100 Subject: [PATCH 036/187] nixos/modules/programs/spacefm: remove gksu dependency --- .../doc/manual/from_md/release-notes/rl-2205.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2205.section.md | 2 ++ nixos/modules/programs/spacefm.nix | 2 -- 3 files changed, 10 insertions(+), 2 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 55d56fa14652..19f0a783520e 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 @@ -737,6 +737,14 @@ 0042 configuration. + + + The default value for + programs.spacefm.settings.graphical_su got + unset. It previously pointed to gksu which + has been removed. + + A new module was added for the diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index ef7a25d6b02d..5461df4c3ab8 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -247,6 +247,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.mbpfan` module was converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration. +- The default value for `programs.spacefm.settings.graphical_su` got unset. It previously pointed to `gksu` which has been removed. + - A new module was added for the [Starship](https://starship.rs/) shell prompt, providing the options `programs.starship.enable` and `programs.starship.settings`. diff --git a/nixos/modules/programs/spacefm.nix b/nixos/modules/programs/spacefm.nix index 822fca3ecec7..f71abcaa3325 100644 --- a/nixos/modules/programs/spacefm.nix +++ b/nixos/modules/programs/spacefm.nix @@ -27,13 +27,11 @@ in default = { tmp_dir = "/tmp"; terminal_su = "${pkgs.sudo}/bin/sudo"; - graphical_su = "${pkgs.gksu}/bin/gksu"; }; defaultText = literalExpression '' { tmp_dir = "/tmp"; terminal_su = "''${pkgs.sudo}/bin/sudo"; - graphical_su = "''${pkgs.gksu}/bin/gksu"; } ''; description = '' From b16e5d212e1963f8a036a8c2b8b1081153521993 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 14:20:25 +0100 Subject: [PATCH 037/187] gksu: drop --- pkgs/applications/misc/gksu/default.nix | 53 ------------------- .../misc/gksu/gksu-2.0.2-glib-2.31.patch | 29 ---------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 pkgs/applications/misc/gksu/default.nix delete mode 100644 pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix deleted file mode 100644 index c1a4ea2b6789..000000000000 --- a/pkgs/applications/misc/gksu/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu, - intltool, libstartup_notification, gtk-doc, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - version = "2.0.2"; - pname = "gksu"; - - src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; - sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1"; - }; - - nativeBuildInputs = [ - pkg-config intltool gtk-doc wrapGAppsHook - ]; - - buildInputs = [ - gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring - ]; - - propagatedBuildInputs = [ - libgksu - ]; - - hardeningDisable = [ "format" ]; - - patches = [ - # https://savannah.nongnu.org/bugs/index.php?36127 - ./gksu-2.0.2-glib-2.31.patch - ]; - - postPatch = '' - sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop - ''; - - configureFlags = [ "--disable-nautilus-extension" ]; - - meta = { - description = "A graphical frontend for libgksu"; - longDescription = '' - GKSu is a library that provides a GTK frontend to su and sudo. - It supports login shells and preserving environment when acting as - a su frontend. It is useful to menu items or other graphical - programs that need to ask a user's password to run another program - as another user. - ''; - homepage = "https://www.nongnu.org/gksu/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch b/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch deleted file mode 100644 index fd711a321acf..000000000000 --- a/pkgs/applications/misc/gksu/gksu-2.0.2-glib-2.31.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sat, 7 Apr 2012 17:57:36 -0400 -Subject: [PATCH] Fix glib includes for building with >=glib-2.31 - -glib-2.31 and newer no longer allow most glib subheaders to be included -directly. - -https://savannah.nongnu.org/bugs/index.php?36127 ---- - nautilus-gksu/libnautilus-gksu.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c -index 8e44d29..4acf3f8 100644 ---- a/nautilus-gksu/libnautilus-gksu.c -+++ b/nautilus-gksu/libnautilus-gksu.c -@@ -5,7 +5,7 @@ - #include - #include - --#include -+#include - #include - #include - #include --- -1.7.8.5 - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4eba8ceb97f0..7f80bae17626 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -328,6 +328,7 @@ mapAliases ({ }; gitin = throw "gitin has been remove because it was unmaintained and depended on an insecure version of libgit2"; # added 2021-12-07 gitinspector = throw "gitinspector has been removed because it doesn't work with python3."; # added 2022-01-12 + gksu = throw "gksu has been removed"; # added 2022-01-16 glib_networking = glib-networking; # added 2018-02-25 gmailieer = lieer; # added 2020-04-19 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # added 2021-03-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 714283d3680f..dd0b1462db48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25435,8 +25435,6 @@ with pkgs; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; - gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { }; gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { From dfbe10822b1287ab573363e6e96b2cf71c83032f Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 14:16:26 +0100 Subject: [PATCH 038/187] libgksu: drop --- .../development/libraries/libgksu/default.nix | 86 ----- .../libgksu/libgksu-2.0.0-fbsd.patch | 60 --- .../libgksu-2.0.12-automake-1.11.2.patch | 25 -- .../libgksu-2.0.12-fix-make-3.82.patch | 19 - .../libgksu/libgksu-2.0.12-notests.patch | 26 -- .../libgksu-2.0.12-revert-forkpty.patch | 359 ------------------ .../libgksu/libgksu-2.0.7-libs.patch | 76 ---- .../libgksu/libgksu-2.0.7-polinguas.patch | 40 -- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 10 files changed, 1 insertion(+), 693 deletions(-) delete mode 100644 pkgs/development/libraries/libgksu/default.nix delete mode 100644 pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch delete mode 100644 pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch delete mode 100644 pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch delete mode 100644 pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch delete mode 100644 pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch delete mode 100644 pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch delete mode 100644 pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix deleted file mode 100644 index b00e7b324518..000000000000 --- a/pkgs/development/libraries/libgksu/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome, - libstartup_notification, libgtop, perlPackages, - autoreconfHook, intltool, docbook_xsl, xauth -}: - -stdenv.mkDerivation rec { - version = "2.0.12"; - pname = "libgksu"; - - src = fetchurl { - url = "http://people.debian.org/~kov/gksu/${pname}-${version}.tar.gz"; - sha256 = "1brz9j3nf7l2gd3a5grbp0s3nksmlrp6rxmgp5s6gjvxcb1wzy92"; - }; - - nativeBuildInputs = [ - pkg-config autoreconfHook intltool docbook_xsl wrapGAppsHook - ]; - - buildInputs = [ - gtk2 gnome2.GConf libstartup_notification - gnome.libgnome-keyring libgtop gnome2.libglade - ] ++ (with perlPackages; [ perl XMLParser ]); - - enableParallelBuilding = true; - - hardeningDisable = [ "format" ]; - - patches = [ - # Patches from the gentoo ebuild - - # Fix compilation on bsdc - ./libgksu-2.0.0-fbsd.patch - - # Fix wrong usage of LDFLAGS, gentoo bug #226837 - ./libgksu-2.0.7-libs.patch - - # Use po/LINGUAS - ./libgksu-2.0.7-polinguas.patch - - # Don't forkpty; gentoo bug #298289 - ./libgksu-2.0.12-revert-forkpty.patch - - # Make this gmake-3.82 compliant, gentoo bug #333961 - ./libgksu-2.0.12-fix-make-3.82.patch - - # Do not build test programs that are never executed; also fixes gentoo bug #367397 (underlinking issues). - ./libgksu-2.0.12-notests.patch - - # Fix automake-1.11.2 compatibility, gentoo bug #397411 - ./libgksu-2.0.12-automake-1.11.2.patch - ]; - - postPatch = '' - # gentoo bug #467026 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac - - # Fix some binary paths - sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c - sed -i -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|g' libgksu/libgksu.c - sed -i -e 's|/bin/su\([^d]\)|/run/wrappers/bin/su\1|g' libgksu/libgksu.c - - touch NEWS README - ''; - - preConfigure = '' - intltoolize --force --copy --automake - ''; - - configureFlags = [ - "--disable-gtk-doc" - ]; - - meta = { - description = "A library for integration of su into applications"; - longDescription = '' - This library comes from the gksu program. It provides a simple API - to use su and sudo in programs that need to execute tasks as other - user. It provides X authentication facilities for running - programs in an X session. - ''; - homepage = "https://www.nongnu.org/gksu/"; - license = lib.licenses.lgpl2; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch deleted file mode 100644 index 5c007be5b4b4..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.0-fbsd.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c ---- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 -+++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 -@@ -23,7 +23,12 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#include -+#else - #include -+#endif - #include - #include - #include -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am ---- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - - EXTRA_DIST = libgksu.ver -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in ---- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 -@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- - gksu_run_helper_SOURCES = gksu-run-helper.c - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - EXTRA_DIST = libgksu.ver - all: all-am - -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am ---- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in ---- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 -@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - all: all-am - - .SUFFIXES: diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch deleted file mode 100644 index 0f22166fb8b7..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-automake-1.11.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -Due to the following change, pkglib_PROGRAMS is invalid: - http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf - -https://savannah.nongnu.org/bugs/index.php?35241 -https://bugs.gentoo.org/show_bug.cgi?id=397411 - ---- - libgksu/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am -index 49362f9..3cb1090 100644 ---- a/libgksu/Makefile.am -+++ b/libgksu/Makefile.am -@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} - pkgconfigdir = ${libdir}/pkgconfig - pkgconfig_DATA = libgksu2.pc - --pkglibdir = ${libdir}/${PACKAGE} --pkglib_PROGRAMS = gksu-run-helper -+gksulibdir = ${libdir}/${PACKAGE} -+gksulib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch deleted file mode 100644 index dd52b8247fa4..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-fix-make-3.82.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libgksu/Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500 -+++ libgksu/Makefile.am 2010-08-22 16:11:55.289599110 -0500 -@@ -17,11 +17,11 @@ - - if GCONF_SCHEMAS_INSTALL - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -- for p in $(schemas_DATA) ; do \ -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -- done \ -- fi -+ if test -z "$(DESTDIR)" ; then \ -+ for p in $(schemas_DATA) ; do \ -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -+ done \ -+ fi - else - install-data-local: - endif diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch deleted file mode 100644 index 3787ef6bfc13..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-notests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libgksu-2.0.12/libgksu/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksu/Makefile.am -+++ libgksu-2.0.12/libgksu/Makefile.am -@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` - gksu_run_helper_SOURCES = gksu-run-helper.c - --noinst_PROGRAMS = test-gksu -+EXTRA_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la - test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -Index: libgksu-2.0.12/libgksuui/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksuui/Makefile.am -+++ libgksu-2.0.12/libgksuui/Makefile.am -@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - --noinst_PROGRAMS = test-gksuui -+EXTRA_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la - test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch deleted file mode 100644 index 2c3a8cc786bb..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.12-revert-forkpty.patch +++ /dev/null @@ -1,359 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c ---- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400 -+++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500 -@@ -1,7 +1,6 @@ - /* - * Gksu -- a library providing access to su functionality - * Copyright (C) 2004-2009 Gustavo Noronha Silva -- * Portions Copyright (C) 2009 VMware, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -56,9 +55,6 @@ - static void - gksu_context_launch_complete (GksuContext *context); - --static void --read_line (int fd, gchar *buffer, int n); -- - GType - gksu_error_get_type (void) - { -@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context, - for (i = 0 ; cmd[i] != NULL ; i++) - g_free (cmd[i]); - g_free(cmd); -- -- _exit(1); - } - else if (pid == -1) - { -@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context, - /* drop the \n echoed on password entry if su did request - a password */ - if (password_needed) -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); - } -@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context, - { - int retval = 0; - -- /* Red Hat's su shows the full path to su in its error messages. */ -- if (!strncmp (buf, "su:", 3) || -- !strncmp (buf, "/bin/su:", 7)) -+ if (!strncmp (buf, "su", 2)) - { - gchar **strings; - -@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context, - } - - strings = g_strsplit (buf, ":", 2); -- -- /* Red Hat and Fedora use 'incorrect password'. */ -- if (strings[1] && -- (g_str_has_prefix(strings[1], " Authentication failure") || -- g_str_has_prefix(strings[1], " incorrect password"))) -+ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23)) - { - if (used_gnome_keyring) - g_set_error (error, gksu_quark, -@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context, - { - char **cmd; - char buffer[256] = {0}; -- char *child_stderr = NULL; -- /* This command is used to gain a token */ -- char *const verifycmd[] = -- { -- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL -- }; - int argcount = 8; - int i, j; - -@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context, - - pid_t pid; - int status; -- FILE *fdfile = NULL; -- int fdpty = -1; -+ FILE *infile, *outfile; -+ int parent_pipe[2]; /* For talking to the parent */ -+ int child_pipe[2]; /* For talking to the child */ - - context->sudo_mode = TRUE; - -@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context, - cmd[argcount] = g_strdup("-S"); - argcount++; - -- /* Make sudo noninteractive (we should already have a token) */ -- cmd[argcount] = g_strdup("-n"); -- argcount++; -- - /* Make sudo use next arg as prompt */ - cmd[argcount] = g_strdup("-p"); - argcount++; -@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]); - } - -- pid = forkpty(&fdpty, NULL, NULL, NULL); -- if (pid == 0) -+ if ((pipe(parent_pipe)) == -1) - { -- // Child -- setsid(); // make us session leader -- -- execv(verifycmd[0], verifycmd); -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -- _("Failed to exec new process: %s"), -+ if ((pipe(child_pipe)) == -1) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), - strerror(errno)); - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -- else if (pid == -1) -+ -+ pid = fork(); -+ if (pid == -1) - { - g_set_error (error, gksu_quark, GKSU_ERROR_FORK, - _("Failed to fork new process: %s"), -@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context, - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -+ else if (pid == 0) -+ { -+ // Child -+ setsid(); // make us session leader -+ close(child_pipe[1]); -+ dup2(child_pipe[0], STDIN_FILENO); -+ dup2(parent_pipe[1], STDERR_FILENO); - -+ execv(cmd[0], cmd); -+ -+ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -+ _("Failed to exec new process: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - else - { - gint counter = 0; - gchar *cmdline = NULL; -- struct termios tio; - - // Parent -- fdfile = fdopen(fdpty, "w+"); -+ close(parent_pipe[1]); - -- /* make sure we notice that ECHO is turned off, if it gets -- turned off */ -- tcgetattr (fdpty, &tio); -- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++) -- { -- usleep (1000); -- tcgetattr (fdpty, &tio); -- } -+ infile = fdopen(parent_pipe[0], "r"); -+ if (!infile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- fcntl (fdpty, F_SETFL, O_NONBLOCK); -+ outfile = fdopen(child_pipe[1], "w"); -+ if (!outfile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } -+ -+ /* -+ we are expecting to receive a GNOME_SUDO_PASS -+ if we don't there are two possibilities: an error -+ or a password is not needed -+ */ -+ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK); - - { /* no matter if we can read, since we're using - O_NONBLOCK; this is just to avoid the prompt -@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context, - struct timeval tv; - - FD_ZERO(&rfds); -- FD_SET(fdpty, &rfds); -+ FD_SET(parent_pipe[0], &rfds); - tv.tv_sec = 1; - tv.tv_usec = 0; - -- select (fdpty + 1, &rfds, NULL, NULL, &tv); -+ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv); - } - - /* Try hard to find the prompt; it may happen that we're -@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context, - if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0) - break; - -- read_line (fdpty, buffer, 256); -+ read_line (parent_pipe[0], buffer, 256); - - if (context->debug) - fprintf (stderr, "buffer: -%s-\n", buffer); -@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context, - - usleep (1000); - -- write (fdpty, password, strlen(password) + 1); -- write (fdpty, "\n", 1); -+ fprintf (outfile, "%s\n", password); -+ fclose (outfile); - - nullify_password (password); - -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ /* turn NONBLOCK off */ -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - /* ignore the first newline that comes right after sudo receives - the password */ -- fgets (buffer, 255, fdfile); -- /* this is the status we are interested in */ -- fgets (buffer, 255, fdfile); -+ fgets (buffer, 255, infile); -+ /* this is the status we are interessted in */ -+ fgets (buffer, 255, infile); - } - else - { -@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n"); - - /* turn NONBLOCK off, also if have no prompt */ -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - - should_display = gconf_client_get_bool (context->gconf_client, - BASE_PATH "display-no-pass-info", NULL); -@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "%s", buffer); - } - -- if (g_str_has_prefix (buffer, "Sorry, try again.")) -+ if (!strcmp (buffer, "Sorry, try again.\n")) - g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS, - _("Wrong password.")); -+ else if (!strncmp (buffer, "Sorry, user ", 12)) -+ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -+ _("The underlying authorization mechanism (sudo) " -+ "does not allow you to run this program. Contact " -+ "the system administrator.")); - else - { - gchar *haystack = buffer; -@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- /* If we have an error, let's just stop sudo right there. */ -- if (error) -- close(fdpty); -- - cmdline = g_strdup("sudo"); - /* wait for the child process to end or become something other - than sudo */ -@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context, - if (context->sn_context) - gksu_context_launch_complete (context); - -+ while (read (parent_pipe[0], buffer, 255) > 0) -+ { -+ fprintf (stderr, "%s", buffer); -+ bzero(buffer, 256); -+ } -+ - /* if the process is still active waitpid() on it */ - if (pid_exited != pid) - waitpid(pid, &status, 0); - sudo_reset_xauth (context, xauth, xauth_env); - -- /* -- * Did token acquisition succeed? If so, spawn sudo in -- * non-interactive mode. It should either succeed or die -- * immediately if you're not allowed to run the command. -- */ -- if (WEXITSTATUS(status) == 0) -- { -- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL, -- NULL, &child_stderr, &status, -- error); -- } -- - if (exit_status) - { - if (WIFEXITED(status)) { -@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context, - - if (WEXITSTATUS(status)) - { -- if (g_str_has_prefix(child_stderr, "Sorry, user ")) -- { -- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -- _("The underlying authorization mechanism (sudo) " -- "does not allow you to run this program. Contact " -- "the system administrator.")); -- } - if(cmdline) - { - /* sudo already exec()ed something else, don't report -@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context, - if (!g_str_has_suffix (cmdline, "sudo")) - { - g_free (cmdline); -- g_free (child_stderr); - return FALSE; - } - g_free (cmdline); -@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- fprintf(stderr, child_stderr); -- g_free(child_stderr); -- - /* if error is set we have found an error condition */ -- return (error == NULL); -+ if (error) -+ return FALSE; -+ -+ return TRUE; - } - - /** diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch deleted file mode 100644 index b9fb77f27147..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.7-libs.patch +++ /dev/null @@ -1,76 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25362 -# https://bugs.gentoo.org/show_bug.cgi?id=226837 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 -+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 -@@ -43,6 +43,9 @@ - PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) - PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) - -+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) -+ - # Checks for library functions. - ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" - -diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am ---- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 -@@ -3,7 +3,7 @@ - AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" - - bin_PROGRAMS = gksu-properties --gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} -+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} - gksu_properties_SOURCES = gksu-properties.c - - gladedir = ${prefix}/share/${PACKAGE} -diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am ---- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 -@@ -8,8 +8,8 @@ - # major -> breaks backward compatibility (changes to existing ABI) - # minor -> keeps compatibility (additions to the API) - # micro -> no change to the API/ABI --libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la --libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 - if USE_VERSION_SCRIPT - libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver - endif -@@ -24,12 +24,11 @@ - - pkglibdir = ${libdir}/${PACKAGE} - pkglib_PROGRAMS = gksu-run-helper --gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` -+gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c --test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} - - EXTRA_DIST = libgksu.ver -diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am ---- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 -@@ -4,12 +4,13 @@ - - noinst_LTLIBRARIES = libgksuui1.0.la - libgksuui1_0_la_SOURCES = gksuui-dialog.c --libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` -+libgksuui1_0_la_LDFLAGS = -Wl,-O1 -+libgksuui1_0_la_LIBADD = ${GTK_LIBS} - - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c --test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} -+ diff --git a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch b/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch deleted file mode 100644 index e423af16b44c..000000000000 --- a/pkgs/development/libraries/libgksu/libgksu-2.0.7-polinguas.patch +++ /dev/null @@ -1,40 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25360 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 -+++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 -@@ -50,7 +50,7 @@ - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - --IT_PROG_INTLTOOL -+IT_PROG_INTLTOOL([0.35.5]) - AM_GLIB_GNU_GETTEXT - - ################################################## -diff -Nura a/po/LINGUAS b/po/LINGUAS ---- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 -@@ -0,0 +1,23 @@ -+# please keep this list sorted alphabetically -+# http://live.gnome.org/GnomeGoals/PoLinguas -+# -+ca -+cs -+da -+de -+es -+eu -+fr -+hu -+it -+ko -+lt -+pl -+pt_BR -+ro -+ru -+sk -+sv -+nb -+nl -+zh_CN diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7f80bae17626..3a9fcc90f9a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -485,6 +485,7 @@ mapAliases ({ liberation_ttf_v1_from_source = liberation_ttf_v1; # added 2018-12-12 liberation_ttf_v2_from_source = liberation_ttf_v2; # added 2018-12-12 liberationsansnarrow = liberation-sans-narrow; # added 2018-12-12 + libgksu = throw "libgksu has been removed"; # added 2022-01-16 libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgpgerror = libgpg-error; # added 2021-09-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd0b1462db48..0398598be652 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17958,8 +17958,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; - libgksu = callPackage ../development/libraries/libgksu { }; - libgnt = callPackage ../development/libraries/libgnt { }; libgpg-error = callPackage ../development/libraries/libgpg-error { }; From 9a2a3d03957cca8f42e0a17ac628acc17bc95821 Mon Sep 17 00:00:00 2001 From: piegames Date: Sun, 16 Jan 2022 01:56:50 +0100 Subject: [PATCH 039/187] gfm: drop It does not appear to have an attribute that references it anymore? (Not sure though, that name's hard to grep for) --- .../applications/science/math/gfm/default.nix | 55 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/applications/science/math/gfm/default.nix diff --git a/pkgs/applications/science/math/gfm/default.nix b/pkgs/applications/science/math/gfm/default.nix deleted file mode 100644 index 1078be99c3a9..000000000000 --- a/pkgs/applications/science/math/gfm/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, pkg-config -, autoreconfHook -, gnome2 -, gtk2 -, glib -, libtifiles2 -, libticables2 -, libticalcs2 -, libticonv -}: - -stdenv.mkDerivation rec { - pname = "gfm"; - version = "1.08"; - src = fetchurl { - url = "mirror://sourceforge/tilp/${pname}-${version}.tar.bz2"; - sha256 = "0zq1a9mm54zr18dz2mqh79w1a126xwqz6dcrpjlbd1pnmg01l0q9"; - }; - - patches = fetchpatch { - name = "remove-broken-kde-support.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/remove-broken-kde-support.patch?h=gfm"; - sha256 = "03yc8s2avicmv04f2ygg3r3q8l7kpsc94mhp6clp584kmjpjqag5"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - gtk2 - gnome2.libglade - glib - libtifiles2 - libticables2 - libticalcs2 - libticonv - ]; - - NIX_CFLAGS_COMPILE = "-I${libticables2}/include/tilp2"; - - meta = with lib; { - changelog = "http://lpg.ticalc.org/prj_tilp/news.html"; - description = "Group File Manager (GFM) allows manipulation of single/group/tigroup files"; - homepage = "http://lpg.ticalc.org/prj_gfm/index.html"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ siraben luc65r ]; - platforms = with platforms; linux ++ darwin; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3a9fcc90f9a3..30f11acc3093 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -315,6 +315,7 @@ mapAliases ({ gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 gettextWithExpat = gettext; # 2016-02-19 getmail = throw "getmail has been removed from nixpkgs, migrate to getmail6."; # added 2022-01-12 + gfm = throw "gfm has been removed"; # 2021-01-15 giflib_4_1 = throw "giflib_4_1 has been removed; use giflib instead"; # 2020-02-12 git-bz = throw "giz-bz has been removed from nixpkgs as it is stuck on python2."; # added 2022-01-01 gitAndTools = self // { # added 2021-01-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0398598be652..e45b5239ee30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16859,8 +16859,6 @@ with pkgs; gflags = callPackage ../development/libraries/gflags { }; - gfm = callPackage ../applications/science/math/gfm { }; - gperftools = callPackage ../development/libraries/gperftools { }; grab-site = callPackage ../tools/backup/grab-site { }; From 023eed8d6fa886fec58635960e854927f706acba Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 29 Jan 2022 15:46:14 -0300 Subject: [PATCH 040/187] uasm: init at 2.53 --- pkgs/development/compilers/uasm/default.nix | 50 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/compilers/uasm/default.nix diff --git a/pkgs/development/compilers/uasm/default.nix b/pkgs/development/compilers/uasm/default.nix new file mode 100644 index 000000000000..f440208e947b --- /dev/null +++ b/pkgs/development/compilers/uasm/default.nix @@ -0,0 +1,50 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch }: + +stdenv.mkDerivation rec { + pname = "uasm"; + version = "2.53"; + + src = fetchFromGitHub { + owner = "Terraspace"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Aohwrcb/KTKUFFpfmqVDPNjJh1dMYSNnBJ2eFaP20pM="; + }; + + # https://github.com/Terraspace/UASM/pull/154 + patches = [ + # fix `invalid operands to binary - (have 'char *' and 'uint_8 *' {aka 'unsigned char *'})` + (fetchpatch { + name = "fix_pointers_compare.patch"; + url = "https://github.com/clouds56/UASM/commit/9cd3a400990e230571e06d4c758bd3bd35f90ab6.patch"; + sha256 = "sha256-8mY36dn+g2QNJ1JbWt/y4p0Ha9RSABnOE3vlWANuhsA="; + }) + # fix `dbgcv.c:*:*: fatal error: direct.h: No such file or directory` + (fetchpatch { + name = "fix_build_dbgcv_c_on_unix.patch"; + url = "https://github.com/clouds56/UASM/commit/806d54cf778246c96dcbe61a4649bf0aebcb0eba.patch"; + sha256 = "sha256-uc1LaizdYEh1Ry55Cq+6wrCa1OeBPFo74H5iBpmteAE="; + }) + ]; + + enableParallelBuilding = true; + + makefile = "gccLinux64.mak"; + + installPhase = '' + runHook preInstall + + install -Dt "$out/bin" -m0755 GccUnixR/uasm + install -Dt "$out/share/doc/${pname}" -m0644 {Readme,History}.txt Doc/* + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.terraspace.co.uk/uasm.html"; + description = "A free MASM-compatible assembler based on JWasm"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ thiagokokada ]; + license = licenses.watcom; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80896900dd13..14f07a84fe0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13283,6 +13283,8 @@ with pkgs; bupc = callPackage ../development/compilers/bupc { }; + uasm = callPackage ../development/compilers/uasm { }; + urn = callPackage ../development/compilers/urn { }; urweb = callPackage ../development/compilers/urweb { From 843cd6a0cbf801b90384da89f63aca23695a5042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 30 Jan 2022 06:06:04 +0000 Subject: [PATCH 041/187] abcm2ps: 8.14.12 -> 8.14.13 --- pkgs/tools/audio/abcm2ps/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index b94d514e8ece..0a62020b3ba0 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -1,25 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, which, docutils, freetype, pango }: +{ lib +, stdenv +, fetchFromGitHub +, docutils +, pkg-config +, freetype +, pango +}: stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.12"; + version = "8.14.13"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk="; + hash = "sha256-31cEBtVn7GlNIsPkRiW0DyKA/giLeJ86EUZr8zjYy3s="; }; configureFlags = [ "--INSTALL=install" ]; - buildFlags = [ - "CC=${stdenv.cc}/bin/cc" - ]; - - nativeBuildInputs = [ which pkg-config docutils ]; + nativeBuildInputs = [ docutils pkg-config ]; buildInputs = [ freetype pango ]; From 6896348d0fad85cfa3975d729b0279537981edfb Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 30 Jan 2022 10:56:31 +0100 Subject: [PATCH 042/187] librecad: apply patch for CVE-2021-45342 https://github.com/LibreCAD/LibreCAD/issues/1464 --- pkgs/applications/misc/librecad/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 05d5f93162c0..54ed6c10f42a 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,6 +1,7 @@ { lib , boost , fetchFromGitHub +, fetchpatch , installShellFiles , mkDerivation , muparser @@ -23,6 +24,14 @@ mkDerivation rec { sha256 = "sha256-RNg7ioMriH4A7V65+4mh8NhsUHs/8IbTt38nVkYilCE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/LibreCAD/LibreCAD/pull/1465/commits/4edcbe72679f95cb60979c77a348c1522a20b0f4.patch"; + sha256 = "sha256-P0G2O5sL7Ip860ByxFQ87TfV/lq06wCQnzPxADGqFPs="; + name = "CVE-2021-45342.patch"; + }) + ]; + postPatch = '' substituteInPlace scripts/postprocess-unix.sh \ --replace /bin/sh ${runtimeShell} From 0483814c3259ad3b10748619dae60a08c02d167b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 30 Jan 2022 11:54:29 +0100 Subject: [PATCH 043/187] intel-gmmlib: 22.0.1 -> 22.0.2 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 644975ca66c1..8581ab729a63 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.0.1"; + version = "22.0.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "1s46vwcs26hdlsa8h51gq4fyi9i8k5hrcx5ffbv9g7v3x706nplf"; + sha256 = "001kkm1l4s9i7ikaqpf78l5h0a5dy1m9w5r5g0yrlqpi54h6ph28"; }; nativeBuildInputs = [ cmake ]; From 700c8b6703022f74b4807c4e9c061cb06e37b905 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 30 Jan 2022 12:35:26 +0100 Subject: [PATCH 044/187] mbedtls: 2.26.0 -> 2.28.0 Changes: https://github.com/ARMmbed/mbedtls/releases/tag/v2.27.0 https://github.com/ARMmbed/mbedtls/releases/tag/v2.28.0 Security advisories: https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-07-1 https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-07-2 https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2021-12 --- pkgs/development/libraries/mbedtls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 9210f18ed962..8bba8f0efe0e 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { # versions. See # * https://github.com/NixOS/nixpkgs/pull/119838#issuecomment-822100428 # * https://github.com/NixOS/nixpkgs/commit/0ee02a9d42b5fe1825b0f7cee7a9986bb4ba975d - version = "2.26.0"; # nixpkgs-update: no auto update + version = "2.28.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "ARMmbed"; repo = "mbedtls"; rev = "${pname}-${version}"; - sha256 = "0scwpmrgvg6q7rvqkc352d2fqlsx0aylcbyibcp1f1rsn8iiif2m"; + sha256 = "sha256-VDoIUBaK2e0E5nkwU1u3Wvxc+s6OzBSdIeHsJKJuZ2g="; }; nativeBuildInputs = [ cmake ninja perl python3 ]; From e2b2afc9b42641146d0174884bb76d24dcd7c133 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sun, 30 Jan 2022 17:51:31 +0100 Subject: [PATCH 045/187] rofi: 1.7.2 -> 1.7.3 --- pkgs/applications/misc/rofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index bce4b297cda6..1d7c183ea7af 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "davatorium"; repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "vre8kFou01P7S6KBBtfzvfFP554mhV+d6rjvY+GfWXk="; + sha256 = "sha256-bUedRRmrfdmzNW+2PzJvLbCTIWta2rbQ3CTLRSdJqbs="; }; preConfigure = '' From 174e7bdf07b3e85e681add8042aba255777cd968 Mon Sep 17 00:00:00 2001 From: Benoit de Chezelles Date: Sun, 30 Jan 2022 17:55:50 +0100 Subject: [PATCH 046/187] rofi-wayland: 1.7.2+wayland1 -> 1.7.3+wayland1 --- pkgs/applications/misc/rofi/wayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix index c2c2da37b4e7..ac0d1c216a4b 100644 --- a/pkgs/applications/misc/rofi/wayland.nix +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -8,14 +8,14 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { pname = "rofi-wayland-unwrapped"; - version = "1.7.2+wayland1"; + version = "1.7.3+wayland1"; src = fetchFromGitHub { owner = "lbonn"; repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-INFYHOVjBNj8ks4UjKnxLW8mL7h1c8ySFPS/rUxOWwo="; + sha256 = "sha256-qvIxWxiQj42VgScSsrF1Yf6ifgEbZes0flNbbwc3O8I="; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ]; From 233931b7a3507da66e94bf8d3a6f83eb56b0bd0b Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 31 Jan 2022 02:51:01 +0900 Subject: [PATCH 047/187] nixos/tests/noto-fonts: add midchildan as maintainer --- nixos/tests/noto-fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix index 829d7797d012..049dc766bd3b 100644 --- a/nixos/tests/noto-fonts.nix +++ b/nixos/tests/noto-fonts.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "noto-fonts"; meta = { - maintainers = with lib.maintainers; [ nickcao ]; + maintainers = with lib.maintainers; [ nickcao midchildan ]; }; machine = { From ce45d1e43ccae19f540e560b7bb2bdc35ecc2774 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Jan 2022 02:47:26 +0000 Subject: [PATCH 048/187] xdg-launch: 1.11 -> 1.12 --- pkgs/applications/misc/xdg-launch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/applications/misc/xdg-launch/default.nix index 973acbbf65a5..bf5b0484c867 100644 --- a/pkgs/applications/misc/xdg-launch/default.nix +++ b/pkgs/applications/misc/xdg-launch/default.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation rec { pname = "xdg-launch"; - version = "1.11"; + version = "1.12"; postPatch = '' # fix gettext configuration @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-qrBxyJ3dUNdnE1nANLKKL0cXw/Hc4qxDoY1anIRN+VA="; + sha256 = "sha256-S/0Wn1T5MSOPN6QXkzfmygHL6XTAnnMJr5Z3fBzsHEw="; }; preConfigure = "./autogen.sh"; From 1921319c4e1d397f463377a8c962da954eef61c8 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 31 Jan 2022 10:09:25 -0500 Subject: [PATCH 049/187] kopia: 0.10.2 -> 0.10.3 --- pkgs/tools/backup/kopia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 288989f51ee4..e452f47bf5d5 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGo117Module rec { pname = "kopia"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SYKTkjN+O7s/LFeVJr2HFuvIuEHeqf0KrMQMYftL4U0="; + sha256 = "sha256-FdLQI+MbGaO0Kj6icUmcvPzo3rC7mbHYC1xoGv/FzPk="; }; - vendorSha256 = "sha256-9JR0ndlxtb0jun7KSWuac2uLqwVKrwUqiV6yScBoqzs="; + vendorSha256 = "sha256-7QgD4kMiULE2G+/FIqe19kZGvJDEXBY27bEfxabD+ic="; doCheck = false; From 7319edcda5bbd9de6b83b79b6484f4a848b9277b Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sat, 29 Jan 2022 15:54:41 -0300 Subject: [PATCH 050/187] 7zz: compile optimized assembly code for x86_64 Use uasm to compile the optimized code instead of generic C code for faster operations. Before: ``` 7zz x 10.83s user 0.40s system 98% cpu 11.439 total ``` After: ``` 7zz x 6.87s user 0.40s system 98% cpu 7.395 total ``` --- pkgs/tools/archivers/7zz/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index f5344a63f494..c93a750e48f0 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -1,5 +1,14 @@ -{ stdenv, lib, fetchurl, p7zip }: +{ stdenv, lib, fetchurl, p7zip, uasm, useUasm ? stdenv.isx86_64 }: +let + inherit (stdenv.hostPlatform) system; + platformSuffix = + if useUasm then + { + x86_64-linux = "_x64"; + }.${system} or (throw "`useUasm` is not supported for system ${system}") + else ""; +in stdenv.mkDerivation rec { pname = "7zz"; version = "21.07"; @@ -11,19 +20,18 @@ stdenv.mkDerivation rec { sourceRoot = "CPP/7zip/Bundles/Alone2"; - # we need https://github.com/nidud/asmc/tree/master/source/asmc/linux in order - # to build with the optimized assembler but that doesn't support building with - # GCC: https://github.com/nidud/asmc/issues/8 - makefile = "../../cmpl_gcc.mak"; # "../../cmpl_gcc_x64.mak"; + makeFlags = lib.optionals useUasm [ "MY_ASM=uasm" ]; - nativeBuildInputs = [ p7zip ]; + makefile = "../../cmpl_gcc${platformSuffix}.mak"; + + nativeBuildInputs = [ p7zip ] ++ lib.optionals useUasm [ uasm ]; enableParallelBuilding = true; installPhase = '' runHook preInstall - install -Dm555 -t $out/bin b/g/7zz + install -Dm555 -t $out/bin b/g${platformSuffix}/7zz install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt runHook postInstall @@ -37,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line archiver utility"; - homepage = "https://7zip.org"; + homepage = "https://7-zip.org"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ anna328p peterhoeg ]; platforms = platforms.linux; From c22d9ac9226c16a05858ae2985c1e00af1854837 Mon Sep 17 00:00:00 2001 From: toastal Date: Mon, 31 Jan 2022 22:41:34 +0700 Subject: [PATCH 051/187] maintainers: add matrix for toastal --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 61786ae676ef..ce55ccc92410 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12163,6 +12163,7 @@ }; toastal = { email = "toastal+nix@posteo.net"; + matrix = "@toastal:matrix.org"; github = "toastal"; githubId = 561087; name = "toastal"; From 7d6252bce013f1cb87106ac4cd7c1978405710eb Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 31 Jan 2022 16:00:23 +0000 Subject: [PATCH 052/187] tektoncd-cli: 0.20.0 -> 0.21.0 --- .../networking/cluster/tektoncd-cli/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 0db134bdb215..d29888aee068 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg="; + sha256 = "sha256-VGdYnynEm0ShG96W0uKiWBbUy/EitX3od5Nnho6T0pg="; }; vendorSha256 = null; @@ -22,10 +22,14 @@ buildGoModule rec { excludedPackages = "\\(third_party\\|cmd/docs\\)"; preCheck = '' - # Some tests try to write to the home dir + # some tests try to write to the home dir export HOME="$TMPDIR" - # Change the golden files to match our desired version - sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden + + # the tests expect the clientVersion ldflag not to be set + unset ldflags + + # remove tests with networking + rm pkg/cmd/version/version_test.go ''; postInstall = '' From 16e9b1777f6908de080b7c5f43cd9d06d9080429 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Mon, 31 Jan 2022 17:09:10 +0100 Subject: [PATCH 053/187] slack: fix linux_url in update.sh --- pkgs/applications/networking/instant-messengers/slack/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh index 0bb0d784167c..463064887148 100755 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -22,7 +22,7 @@ if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_versi exit 0 fi -linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb" +linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb" mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" linux_sha256=$(nix-prefetch-url ${linux_url}) mac_sha256=$(nix-prefetch-url ${mac_url}) From 20926eb66033838a08e4301ce61db43327f399ad Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 31 Jan 2022 19:16:47 +0100 Subject: [PATCH 054/187] google-chrome: reland: add /run/opengl-driver/share/vulkan/icd.d/ to path This change is part of 007af34263d but got accidentally reverted in b2eb5f62a7f. It is required for Vulkan support. --- pkgs/applications/networking/browsers/google-chrome/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index b0fc87a18014..f1da103157b9 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation { makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ --add-flags ${escapeShellArg commandLineArgs} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" From bb2f4471be0a85630d8bbe8185686623e3992fad Mon Sep 17 00:00:00 2001 From: Gordias Date: Mon, 31 Jan 2022 13:36:05 -0500 Subject: [PATCH 055/187] change package platforms to linux package does not build on `darwin`, see https://github.com/NixOS/nixpkgs/pull/156351#pullrequestreview-860432781 --- pkgs/applications/version-management/got/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 50e826174792..7464dcfb73a8 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gameoftrees.org"; license = licenses.isc; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ abbe ]; }; } From b8ed9b8f5c7f76fedf68231785b51c18e7c371a4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 31 Jan 2022 14:51:39 -0500 Subject: [PATCH 056/187] php.extensions.sqlsrv: 5.9.0 -> 5.10.0 --- pkgs/development/php-packages/sqlsrv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 37ff1cb187ee..b70b6c3f3d9e 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "sqlsrv"; - version = "5.9.0"; - sha256 = "1css440b4qrbblmcswd5wdr2v1rjxlj2iicbmvjq9fg81028w40a"; + version = "5.10.0"; + sha256 = "sha256-drPwg6Go8QNYHCG6OkbWyiV76uZyjNFYpkpGq1miJrQ="; buildInputs = [ unixODBC From bf0de7623b75fd6c1bb05d97b67ac67f6a6cd9c3 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 31 Jan 2022 14:51:58 -0500 Subject: [PATCH 057/187] php.extensions.pdo_sqlsrv: 5.9.0 -> 5.10.0 --- pkgs/development/php-packages/pdo_sqlsrv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index ab7e6e71fea5..8f47a211e78d 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pdo_sqlsrv"; - version = "5.9.0"; - sha256 = "0n4cnkldvyp1lrpj18ky2ii2dcaa51dsmh8cspixm7w76dxl3khg"; + version = "5.10.0"; + sha256 = "sha256-BEa7i/8egvz9mT69dl0dxWcVo+dURT9Dzo6f6EdlESo="; internalDeps = [ php.extensions.pdo ]; From 41075e290047e2f5469cbf05f20f0a98ce97fa3b Mon Sep 17 00:00:00 2001 From: sheepforce Date: Mon, 31 Jan 2022 22:33:52 +0100 Subject: [PATCH 058/187] pixinsight: init at 1.8.8-12 pixinsight: review cleanup pixinsight: review cleanup pixinsight: switch back to working wrapper --- .../graphics/pixinsight/default.nix | 132 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 134 insertions(+) create mode 100644 pkgs/applications/graphics/pixinsight/default.nix diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix new file mode 100644 index 000000000000..7133c914b66a --- /dev/null +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -0,0 +1,132 @@ +{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot +, mime-types, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig +, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim +# Qt 5 subpackages +, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt +}: + +stdenv.mkDerivation rec { + pname = "pixinsight"; + version = "1.8.8-12"; + + src = requireFile rec { + name = "PI-linux-x64-${version}-20211229-c.tar.xz"; + url = "https://pixinsight.com/"; + sha256 = "7095b83a276f8000c9fe50caadab4bf22a248a880e77b63e0463ad8d5469f617"; + message = '' + PixInsight is available from ${url} and requires a commercial (or trial) license. + After a license has been obtained, PixInsight can be downloaded from the software distribution + (choose Linux 64bit). + The PixInsight tarball must be added to the nix-store, i.e. via + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + }; + sourceRoot = "."; + + nativeBuildInputs = [ + unixtools.script + fakeroot + wrapQtAppsHook + autoPatchelfHook + mime-types + libudev0-shim + ]; + + buildInputs = [ + stdenv.cc.cc.lib + stdenv.cc + libGL + libpulseaudio + alsa-lib + nss + gd + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + nspr + expat + fontconfig + dbus + glib + zlib + openssl + libdrm + wayland + cups + avahi-compat + # Qt stuff + qt3d + mlt + qtbase + qtgamepad + qtserialport + qtserialbus + qtvirtualkeyboard + qtmultimedia + qtwebkit + ] ++ (with xorg; [ + libX11 + libXdamage + xrandr + libXtst + libXcomposite + libXext + libXfixes + libXrandr + ]); + + postPatch = '' + patchelf ./installer \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.cc.cc.lib}/lib + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin $out/opt/PixInsight $out/share/{applications,mime/packages,icons/hicolor} + + fakeroot script -ec "./installer \ + --yes \ + --install-dir=$out/opt/PixInsight \ + --install-desktop-dir=$out/share/applications \ + --install-mime-dir=$out/share/mime \ + --install-icons-dir=$out/share/icons/hicolor \ + --no-bin-launcher \ + --no-remove" + + rm -rf $out/opt/PixInsight-old-0 + ln -s $out/opt/PixInsight/bin/PixInsight $out/bin/. + ''; + + # Some very exotic Qt libraries are not available in nixpkgs + autoPatchelfIgnoreMissingDeps = true; + + # This mimics what is happening in PixInsight.sh and adds on top the libudev0-shim, which + # without PixInsight crashes at startup. + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${libudev0-shim}/lib" + "--set LC_ALL en_US.utf8" + "--set AVAHI_COMPAT_NOWARN 1" + "--set QT_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins" + "--set QT_QPA_PLATFORM_PLUGIN_PATH $out/opt/PixInsight/bin/lib/qt-plugins/platforms" + "--set QT_AUTO_SCREEN_SCALE_FACTOR 0" + "--set QT_ENABLE_HIGHDPI_SCALING 0" + "--set QT_SCALE_FACTOR 1" + "--set QT_LOGGING_RULES '*=false'" + "--set QTWEBENGINEPROCESS_PATH $out/opt/PixInsight/bin/libexec/QtWebEngineProcess" + ]; + dontWrapQtApps = true; + postFixup = '' + wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString qtWrapperArgs} + ''; + + meta = with lib; { + description = "Scientific image processing program for astrophotography"; + homepage = "https://pixinsight.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.sheepforce ]; + mainProgram = "PixInsight"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4d73f9c8b93..b2bde6f36711 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26400,6 +26400,8 @@ with pkgs; pixeluvo = callPackage ../applications/graphics/pixeluvo { }; + pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { }; + pmbootstrap = python3Packages.callPackage ../tools/misc/pmbootstrap { }; shepherd = nodePackages."@nerdwallet/shepherd"; From 611555aeea9e262d61a1269ab0cc767932fe7ce8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 31 Jan 2022 18:51:36 -0300 Subject: [PATCH 059/187] dwl: 0.2.1 -> 0.2.2 Now with new wlroots! --- .../window-managers/dwl/default.nix | 26 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 04944a1e9092..bfc360e81bbd 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,19 +1,18 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, pkg-config , libinput , libxcb , libxkbcommon , pixman +, pkg-config , wayland , wayland-protocols , wlroots -, enable-xwayland ? true, xwayland, libX11 -, patches ? [ ] -, conf ? null , writeText -, fetchpatch +, enable-xwayland ? true, xwayland, libX11 +, conf ? null +, patches ? [ ] }: let @@ -22,16 +21,17 @@ in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lfUAymLA4+E9kULZIueA+9gyVZYgaVS0oTX0LJjsSEs="; + hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libinput libxcb @@ -60,6 +60,11 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + NIX_CFLAGS_COMPILE = [ + # https://github.com/djpohly/dwl/issues/186 + "-Wno-error=unused-result" + ]; + dontConfigure = true; installPhase = '' @@ -85,8 +90,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Only; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; linux; + inherit (wayland.meta) platforms; }; } # TODO: custom patches from upstream website -# TODO: investigate the modifications in the upstream unstable version diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4d73f9c8b93..59b0923a52d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25229,9 +25229,7 @@ with pkgs; buildGoModule = buildGo117Module; }; - dwl = callPackage ../applications/window-managers/dwl { - wlroots = wlroots_0_14; - }; + dwl = callPackage ../applications/window-managers/dwl { }; dwm = callPackage ../applications/window-managers/dwm { # dwm is configured entirely through source modification. Allow users to From 3022a283d0e081d583cf9ec99b49ed857115951c Mon Sep 17 00:00:00 2001 From: Matt Layher Date: Mon, 31 Jan 2022 17:06:26 -0500 Subject: [PATCH 060/187] corerad: 0.3.4 -> 1.0.0 Signed-off-by: Matt Layher --- pkgs/tools/networking/corerad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 92ac3c8dc09f..03962f1e9e24 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "corerad"; - version = "0.3.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mdlayher"; repo = "corerad"; rev = "v${version}"; - sha256 = "0sf2r4q57hwdakv0b4skn76b0xy7bwj2j9rpj6frs5fkk6gsi6sm"; + sha256 = "sha256-23f+WJcTf+x9GW+hGUU3/j4Qi9MfcsfQuS7aEU4uGU4="; }; - vendorSha256 = "0mbzbgd53mdmq2jpg845mmphb894l6di0ds53n6r3sv777k00sgh"; + vendorSha256 = "sha256-SSa+yBZjZ+5vRfzfCtNhF+kRyJ/VMgd9uWqKPwIi8+Y="; doCheck = false; From f4cc8ee5dd91607ef292a15126c06bfd0177a1b9 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Mon, 31 Jan 2022 22:09:37 +0000 Subject: [PATCH 061/187] nix: fix build on darwin machines --- pkgs/tools/package-management/nix/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index ba95e0ddbf43..71a4313d344b 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -165,7 +165,8 @@ stdenv.mkDerivation { makeFlags = [ "profiledir=$(out)/etc/profile.d" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0"; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "PRECOMPILE_HEADERS=0" + ++ lib.optional (stdenv.hostPlatform.isDarwin) "PRECOMPILE_HEADERS=1"; installFlags = [ "sysconfdir=$(out)/etc" ]; From fd6d59f2edf79c9cff79d91b4c4cb62822f28bc0 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 25 Jan 2022 14:02:58 +0100 Subject: [PATCH 062/187] nixos/i2pd: get rid of unnecessary shell script I think calling i2pd directly in `ExecStart` is much nicer than having an extra shell script for no reason. It's also easier to see what's going on when looking at the generated systemd unit file. --- nixos/modules/services/networking/i2pd.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index e1a31a0c2ee0..34fda57b23d2 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -222,14 +222,12 @@ let in concatStringsSep "\n" inTunOpts))]; in pkgs.writeText "i2pd-tunnels.conf" opts; - i2pdSh = pkgs.writeScriptBin "i2pd" '' - #!/bin/sh - exec ${cfg.package}/bin/i2pd \ - ${if cfg.address == null then "" else "--host="+cfg.address} \ - --service \ - --conf=${i2pdConf} \ - --tunconf=${tunnelConf} - ''; + i2pdFlags = concatStringsSep " " ( + optional (cfg.address != null) ("--host=" + cfg.address) ++ [ + "--service" + ("--conf=" + i2pdConf) + ("--tunconf=" + tunnelConf) + ]); in @@ -686,7 +684,7 @@ in User = "i2pd"; WorkingDirectory = homeDir; Restart = "on-abort"; - ExecStart = "${i2pdSh}/bin/i2pd"; + ExecStart = "${cfg.package}/bin/i2pd ${i2pdFlags}"; }; }; }; From 65ea1a8bf13e85520d703dd68db831f819a08b3e Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 31 Jan 2022 23:24:09 +0000 Subject: [PATCH 063/187] electron_14: 14.2.4 -> 14.2.5 https://github.com/electron/electron/releases/tag/v14.2.5 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index e5fdce7cf285..ed5f0dbf59fb 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -90,14 +90,14 @@ rec { headers = "0s253jdmfyfgb5mwslqd50g623fwj3dgsgsq4cn3pl5qfpmcm26x"; }; - electron_14 = mkElectron "14.2.4" { - armv7l-linux = "d644d2df745a9809794929762db1faa56b77f519ccc0d430dd2238235739ace3"; - aarch64-linux = "1f198a61a5f67954f568e49879e390c94ef9cb05545664e24bac513e05dea0d9"; - x86_64-linux = "faf6c0501811e3dec056f536e53f0ec087345b852e7de47ae86ea175cc070a2f"; - i686-linux = "1f9baa2f3aa1cd935cc29f67aa273c8b1b65da144af3894bd855ce02a6730fc1"; - x86_64-darwin = "4a3c146da911162c7081e280f2c311c41f132e1d3274bc3676ed71cc9392dc5d"; - aarch64-darwin = "279cc3c04c7db9f3361b09f442750f4d18c8b2c7f633bca17aa9fb3656bfb74c"; - headers = "1zkf1j82psbj9mw8zb9ghl9y6bkw77cxqzkp3q1bbn6wvj41lvyh"; + electron_14 = mkElectron "14.2.5" { + armv7l-linux = "d6f7e2fe6088f57ecd455035e0815c20dd1d84b4cbf669e5fa355b96f36eaf2e"; + aarch64-linux = "c8a1a7c5c04462bbe6e148587a72b002ab4bb90aecb9686546b22580c0f9fa52"; + x86_64-linux = "5820ea6c9cfe02096a75df43cab7cdfe5947d6d90207e98c563bd50c400f8110"; + i686-linux = "8099fc3b137e80c5e65493dea2cf3dfb923e86693f3b082429f6fd949560f540"; + x86_64-darwin = "258eb29426a5f275c49284be6818f856ffc29d04fa9cef6fafcdcd207092281d"; + aarch64-darwin = "38a19828c1d7ff5fb49c5db5a706482f4afbae9fecaedaf9ebea0a5765bf952d"; + headers = "172h9ba1s531y3s751inwsia6kr39412yivqkpdc58jmn47nmgb8"; }; electron_15 = mkElectron "15.3.5" { From 97184d6ca37233f6b43fd1785f6cdb868beb583f Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 31 Jan 2022 23:24:33 +0000 Subject: [PATCH 064/187] electron_15: 15.3.5 -> 15.3.6 https://github.com/electron/electron/releases/tag/v15.3.6 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index ed5f0dbf59fb..15c0a2cafbdb 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -100,14 +100,14 @@ rec { headers = "172h9ba1s531y3s751inwsia6kr39412yivqkpdc58jmn47nmgb8"; }; - electron_15 = mkElectron "15.3.5" { - armv7l-linux = "c5540cd94711a31fe0098da982d4a25ed1b606e0d4213c9f7863826b2c8e7eaf"; - aarch64-linux = "6550387135605b64b8549b1034eae672a8f94419032dacbaff7b92934cc0508d"; - x86_64-linux = "3b61eaa48f3c5f1983a24152e6b12f39c3a29abb52d17c13891c16a25e3c209a"; - i686-linux = "30d6de074bebe985bb07f20788a8378c7fa1ded564e3c1e8183b0113ba76b282"; - x86_64-darwin = "fe2c138bb11b3db07d02c1cbf7838765036ac2552582f9ce2265ffe6609ea2e1"; - aarch64-darwin = "7c887b8ae24ad7ca9585a001f29108919bc39d27c3818012aeefb8072e23178d"; - headers = "0fkvwlnxjy8dwfnxhgk6i4qayhmg7dbqmd9nfi94a7kdbwp714r5"; + electron_15 = mkElectron "15.3.6" { + armv7l-linux = "4c105be3dc38ea8899f9fe58c05dfbf20e0d43e9b35ca815c43329d17b714d36"; + aarch64-linux = "3d06de32f02e38039c3c9deb418e3b9dbcda30f387f27e54fb1f1be068b80989"; + x86_64-linux = "5a9a3e37e92ad67d2a4ebb5ac85cb817d682fe2ca0b37b924d7f40085d246cc9"; + i686-linux = "32ff47793c8123fa6220ff9e7c524e3b89c0411e94bdb4d9391038cc58449b5f"; + x86_64-darwin = "faff636a6deedc3b7a3c900aef187baaeec2b83ccc405c56e3ea18d68894b82c"; + aarch64-darwin = "ae7350a7daa6eb2d21fa001c38217bc46a3894f843962c5cca192b837cc9d81c"; + headers = "1mbffk26kdn1id809sdg1kdhrf285zm9ls40b5zaflcljvqg3i2x"; }; electron_16 = mkElectron "16.0.7" { From 2fd87d4313234b41c79f890422d24eb65aac4bfe Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 31 Jan 2022 23:25:14 +0000 Subject: [PATCH 065/187] electron_16: 16.0.7 -> 16.0.8 https://github.com/electron/electron/releases/tag/v16.0.8 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 15c0a2cafbdb..149b1aa5ab19 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -110,13 +110,13 @@ rec { headers = "1mbffk26kdn1id809sdg1kdhrf285zm9ls40b5zaflcljvqg3i2x"; }; - electron_16 = mkElectron "16.0.7" { - armv7l-linux = "8a8567c745ab1c2b1de19305da0a0036ba100b27e1fc4eb014aca325aff3193e"; - aarch64-linux = "6d27cc9acc3f580118cdd685d629d39c2a1fc094376b719fa0100a7446f8fede"; - x86_64-linux = "544cd6d48262f24c8a82d2e8079b20889ec5e83959404fdda9ad00c86e9efa70"; - i686-linux = "8b79ce5fbc704eb03c34d4b96765314074a687ae3165cab21f84f77fee36d755"; - x86_64-darwin = "e5c825d4cfc1dabd066986fa1cae3ee880f222b053c760b700b24899fb02d4db"; - aarch64-darwin = "9fa9dc44e5d71de7a999b3db07a583e0a04252747486c16955232eba498b259d"; - headers = "0r4gd2v9rzrg1msxw62rq1s93ifrjj4yb4gfcma5mbj88m3v5p63"; + electron_16 = mkElectron "16.0.8" { + armv7l-linux = "be3a598d5f7c677c11831b78a8a82d95132ea760bb643e526426b91fdf27aff7"; + aarch64-linux = "465cd93d69ea2e3273339d48bef58e7359b692da5535bff5882e803c22535ec5"; + x86_64-linux = "25767a94d4b0927616ed5008889cd65bb073c7005209671b34045f91d698c857"; + i686-linux = "1cedf35f501ea1512fe9ae5cae47a72e093b6eb7297f76b726551e4a33a593a5"; + x86_64-darwin = "a3c5e5368165304fc9392e3a5b59480965cf0f91f7d889257e6a622f48051cbf"; + aarch64-darwin = "dc8414d7b9a967bda530c83a81720519931aebf541cfaed142ee2042c16e683a"; + headers = "042gz036dzwbvvxvgbgkdb5nq7p8a7vcan6c35l7imgv1hd4g5v4"; }; } From 830a0d9a9d629dae5e0dd571c920274793ab1425 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Feb 2022 01:19:35 +0100 Subject: [PATCH 066/187] gitea: 1.15.10 -> 1.16.0 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.16.0 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 1337c18692a0..e8ec855ff1a7 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.10"; + version = "1.16.0"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "1rrxkpahgzxgs4mckdsrss19mdjdicjgskw689hvhc063slb9vlx"; + sha256 = "sha256-gvhfdA5JBFY81f0UmVodJMWBYeFSDaDdoV723MSYeB4="; }; unpackPhase = '' From ff7ad14c4466a188c3e1273774c3cc2ba1b996fc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 31 Jan 2022 16:42:34 -0800 Subject: [PATCH 067/187] nixVersions.stable: point to nix_2_6 --- pkgs/tools/package-management/nix/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f389da8b4b0b..ffbe598b9291 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -62,8 +62,7 @@ in lib.makeExtensible (self: { sha256 = "sha256-xEPeMcNJVOeZtoN+d+aRwolpW8mFSEQx76HTRdlhPhg="; }; - # FIXME: nix_2_6 is broken on aarch64-darwin for now. - stable = self.nix_2_5; + stable = self.nix_2_6; unstable = lib.lowPrio (common rec { version = "2.7"; From 7264a780f07b951b3e048905f21dc58eaea7f3d8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 31 Jan 2022 21:37:28 -0300 Subject: [PATCH 068/187] dosbox: use desktopItems machinery --- pkgs/misc/emulators/dosbox/default.nix | 68 ++++++++++++++++++-------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index ba4f88dbcad0..383e943ff246 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,16 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, SDL, SDL_net, SDL_sound, libGLU, libGL, libpng, graphicsmagick }: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_net +, SDL_sound +, copyDesktopItems +, graphicsmagick +, libGL +, libGLU +, libpng +, makeDesktopItem +}: stdenv.mkDerivation rec { pname = "dosbox"; @@ -6,31 +18,40 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/dosbox/dosbox-${version}.tar.gz"; - sha256 = "02i648i50dwicv1vaql15rccv4g8h5blf5g6inv67lrfxpbkvlf0"; + hash = "sha256-wNE91+0u02O2jeYVR1eB6JHNWC6BYrXDZpE3UCIiJgo="; }; + nativeBuildInputs = [ + copyDesktopItems + graphicsmagick + ]; + + buildInputs = [ + SDL + SDL_net + SDL_sound + libGL + libGLU + libpng + ]; + hardeningDisable = [ "format" ]; - buildInputs = [ SDL SDL_net SDL_sound libGLU libGL libpng ]; - - nativeBuildInputs = [ graphicsmagick ]; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; - desktopItem = makeDesktopItem { - name = "dosbox"; - exec = "dosbox"; - icon = "dosbox"; - comment = "x86 emulator with internal DOS"; - desktopName = "DOSBox"; - genericName = "DOS emulator"; - categories = "Emulator;"; - }; + desktopItems = [ + (makeDesktopItem { + name = "dosbox"; + exec = "dosbox"; + icon = "dosbox"; + comment = "x86 dos emulator"; + desktopName = "DOSBox"; + genericName = "DOS emulator"; + categories = "Emulator;Game;"; + }) + ]; postInstall = '' - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - mkdir -p $out/share/icons/hicolor/256x256/apps gm convert src/dosbox.ico $out/share/icons/hicolor/256x256/apps/dosbox.png ''; @@ -40,8 +61,15 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.dosbox.com/"; description = "A DOS emulator"; - platforms = platforms.unix; + longDescription = '' + DOSBox is an emulator that recreates a MS-DOS compatible environment + (complete with Sound, Input, Graphics and even basic networking). This + environment is complete enough to run many classic MS-DOS games completely + unmodified. In order to utilize all of DOSBox's features you need to first + understand some basic concepts about the MS-DOS environment. + ''; + license = licenses.gpl2Plus; maintainers = with maintainers; [ matthewbauer ]; - license = licenses.gpl2; + platforms = platforms.unix; }; } From 4319059b4237c175218007f9cbf79afeea5b94be Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 31 Jan 2022 17:05:19 -0800 Subject: [PATCH 069/187] roon-server: 1.8-880 -> 1.8-898 --- pkgs/servers/roon-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index e62f0a9dfd95..4a6195397766 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-880"; + version = "1.8-898"; src = let @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-Td3iRYGmTg8Vx9c4e4ugIIbAqhDFPax9vR2BsCIQCZA="; + sha256 = "sha256-khp2E5BYb7bGEW6xfCKEqYDqAdElOFLbAkaHjILfyqo="; }; dontConfigure = true; From ec3c2071785f854fd043080dd9d94e0f251ccc13 Mon Sep 17 00:00:00 2001 From: Nicolas Berbiche Date: Tue, 14 Dec 2021 01:26:23 -0500 Subject: [PATCH 070/187] SwayNotificationCenter: init at 0.3 --- .../misc/swaynotificationcenter/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/misc/swaynotificationcenter/default.nix diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix new file mode 100644 index 000000000000..a93436362adf --- /dev/null +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, vala +, gtk3 +, glib +, gtk-layer-shell +, dbus +, dbus-glib +, json-glib +, librsvg +, libhandy +, gobject-introspection +, gdk-pixbuf +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "SwayNotificationCenter"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "ErikReider"; + repo = "SwayNotificationCenter"; + rev = "v${version}"; + hash = "sha256-gXo/V2FHkHZBRmaimqJCzi0BqS4tP9IniIlubBmK5u0="; + }; + + nativeBuildInputs = [ gobject-introspection meson ninja pkg-config vala wrapGAppsHook ]; + + buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 json-glib libhandy librsvg ]; + + meta = with lib; { + description = "Simple notification daemon with a GUI built for Sway"; + homepage = "https://github.com/ErikReider/SwayNotificationCenter"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.berbiche ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0940dc15be86..5fc3883368a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26005,6 +26005,8 @@ with pkgs; swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + swaynotificationcenter = callPackage ../applications/misc/swaynotificationcenter { }; + tiramisu = callPackage ../applications/misc/tiramisu { }; rootbar = callPackage ../applications/misc/rootbar {}; From b0c97c01211f63dd632ccae87ac0171b7e7d9cd4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 31 Jan 2022 22:34:45 -0300 Subject: [PATCH 071/187] munt: 2.5.0 -> 2.5.3 --- pkgs/applications/audio/munt/default.nix | 40 +++++++++++++----------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 93a9ce258544..6a308ba74c43 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -1,50 +1,52 @@ { lib -, mkDerivation , stdenv +, mkDerivation , fetchFromGitHub -, makeDesktopItem +, alsa-lib , cmake +, glib , pkg-config , qtbase -, glib -, alsa-lib , withJack ? stdenv.hostPlatform.isUnix, jack }: -let - mainProgram = "mt32emu-qt"; -in mkDerivation rec { pname = "munt"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "munt_${lib.replaceChars [ "." ] [ "_" ] version}"; - sha256 = "1lknq2a72gv1ddhzr7f967wpa12lh805jj4gjacdnamgrc1h22yn"; + rev = "libmt32emu_${lib.replaceChars [ "." ] [ "_" ] version}"; + hash = "sha256-n5VV5Swh1tOVQGT3urEKl64A/w7cY95/0y5wC5ZuLm4="; }; dontFixCmake = true; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = [ qtbase glib ] - ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib - ++ lib.optional withJack jack; + buildInputs = [ + glib + qtbase + ] + ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib + ++ lib.optional withJack jack; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir $out/Applications - mv $out/bin/${mainProgram}.app $out/Applications/ - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin}/${mainProgram} + mv $out/bin/${meta.mainProgram}.app $out/Applications/ + ln -s $out/{Applications/${meta.mainProgram}.app/Contents/MacOS,bin}/${meta.mainProgram} ''; meta = with lib; { - inherit mainProgram; - description = "Multi-platform software synthesiser emulating Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; homepage = "http://munt.sourceforge.net/"; + description = "An emulator of Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; license = with licenses; [ lgpl21 gpl3 ]; - platforms = platforms.all; maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + mainProgram = "mt32emu-qt"; }; } From 1ae972c0195d09532d7401d122c9554637624df8 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 31 Jan 2022 17:43:47 -0800 Subject: [PATCH 072/187] roon-bridge: 1.8-814 -> 1.8-880 --- pkgs/servers/roon-bridge/default.nix | 67 ++++++++++++++++------------ 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 14161b5d5a3f..9b896cd2a116 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -2,71 +2,80 @@ , alsa-utils , autoPatchelfHook , fetchurl +, ffmpeg , lib , makeWrapper +, openssl , stdenv , zlib }: -let - inherit (stdenv.targetPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; -in stdenv.mkDerivation rec { pname = "roon-bridge"; - version = "1.8-814"; + version = "1.8-880"; src = let urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version; + inherit (stdenv.targetPlatform) system; + noSuchSystem = throw "Unsupposed system: ${system}"; in { x86_64-linux = fetchurl { url = "http://download.roonlabs.com/builds/RoonBridge_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-dersaP/8qkl9k81FrgMieB0P4nKmDwjLW5poqKhEn7A="; + sha256 = "sha256-YTLy3D1CQR1hlsGw2MmZtxHT82T0PCYZxD4adt2m1+o="; }; aarch64-linux = fetchurl { url = "http://download.roonlabs.com/builds/RoonBridge_linuxarmv8_${urlVersion}.tar.bz2"; - sha256 = "sha256-zZj7PkLUYYHo3dngqErv1RqynSXi6/D5VPZWfrppX5U="; + sha256 = "sha256-aCQtYMUIzwhmYJW4a8cFzIRuxyMVIkeaJH4w1Lasp3M="; }; - }.${system} or throwSystem; + }.${system} or noSuchSystem; + + dontConfigure = true; + dontBuild = true; buildInputs = [ alsa-lib - alsa-utils zlib + stdenv.cc.cc.lib ]; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' - runHook preInstall - mkdir -p $out - mv * $out - runHook postInstall - ''; - - postFixup = + installPhase = let - linkFix = bin: '' - sed -i '/ulimit/d' ${bin} - sed -i '/ln -sf/d' ${bin} - ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin} - ''; - wrapFix = bin: '' - wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} + fixBin = binPath: '' + ( + sed -i '/ulimit/d' ${binPath} + sed -i 's@^SCRIPT=.*@SCRIPT="$(basename "${binPath}")"@' ${binPath} + wrapProgram ${binPath} \ + --argv0 "$(basename ${binPath})" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ alsa-lib ffmpeg openssl ]}" \ + --prefix PATH : "${lib.makeBinPath [ alsa-utils ffmpeg ]}" + ) ''; in '' - ${linkFix "$out/Bridge/RAATServer"} - ${linkFix "$out/Bridge/RoonBridge"} - ${linkFix "$out/Bridge/RoonBridgeHelper"} + runHook preInstall + mkdir -p $out + mv * $out - ${wrapFix "$out/check.sh"} - ${wrapFix "$out/start.sh"} + rm $out/check.sh + rm $out/start.sh + rm $out/VERSION + + ${fixBin "${placeholder "out"}/Bridge/RAATServer"} + ${fixBin "${placeholder "out"}/Bridge/RoonBridge"} + ${fixBin "${placeholder "out"}/Bridge/RoonBridgeHelper"} + + mkdir -p $out/bin + makeWrapper "$out/Bridge/RoonBridge" "$out/bin/RoonBridge" --run "cd $out" + + runHook postInstall ''; meta = with lib; { description = "The music player for music lovers"; + changelog = "https://community.roonlabs.com/c/roon/software-release-notes/18"; homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ lovesegfault ]; From fc823a014a75ea0c9f9996f1f3f9fd3f932eee59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 31 Jan 2022 22:14:32 +0000 Subject: [PATCH 073/187] python3Packages.upb-lib: 0.5 -> 0.5.1 --- pkgs/development/python-modules/upb-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 61811a290c5f..52b422c0e1d3 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5"; + version = "0.5.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0KTbIDP4lqZ7KNSuPXNbiwkxsqqCxlkiIl8/nnPqohI="; + hash = "sha256-iXwJPe6YYG2TWiQ/dXbeIiadzGMgFzZa6Now692r+t0="; }; propagatedBuildInputs = [ From bf2fc5bccb4ea72b53e61e8902c7c894771adca7 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 31 Jan 2022 14:56:47 -0800 Subject: [PATCH 074/187] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ca6d81fa23bb..950e6981a246 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2327,12 +2327,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-01-29"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "2fa3716bc4690da96d885becdf9988603f0756f0"; - sha256 = "12mdyrzw1aqjdcsqq6jfgd0sldi0hvdz24d64jxymyfz8z3xksam"; + rev = "e91fda815a5f7d20d7e4c89cd1f07f3497fe200d"; + sha256 = "14pwdxflkx0hcg8hhb6pr6jddy87n94hr0dwwk6zv4lxzckrjbbl"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3975,8 +3975,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "1e4cd7d7d0bd641173a3ef38a5427257acecbb63"; - sha256 = "06p86l8l7akl8j4c20pg7sw12g944nwwdh0k9hwg99dkcisrnjyp"; + rev = "f041cab34aa2ad6ac1f60d786a81de746b953221"; + sha256 = "0rqvx8vh9fqrkl5qxa9cw7xgyhmpdh46nn9rflxl6m4diqmp6q89"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -4643,12 +4643,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-01-24"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "e83f80295737e8f470329d768f6ae325bcd0bb23"; - sha256 = "12b78p8lw94ixwgcl71chwssi6li7q46aj0ahdna9v77hk2mlvc8"; + rev = "f632b0bc141ba6698a43425af43a2362eef9feba"; + sha256 = "1142mdjymf94wl1nm9dy66w7db584i1593g9dq3fpma0l7rh0ww0"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -4727,12 +4727,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-01-30"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "477b00f89bf863905c601210188eecf9677fa081"; - sha256 = "11hh1yjl2pm8hkx8pb45fvhaqncbsl57wypx95fbg07yh2mzca0g"; + rev = "83ebb5971eaecc0b2c70fb4ed540e87cbf50af6a"; + sha256 = "09kpaf3870011k1p6985jhy20j3gjgig0557mzsphfsn6gpbqrbw"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4815,8 +4815,8 @@ final: prev: src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "05c963602b66f087cb15f39035d8b31d8225bb55"; - sha256 = "1g9abw015mfpaazms48b12q1ksiszf0hj1hyc146hjqyp2bybf3w"; + rev = "6799824f6b9b9185622e79cda7eebb03c6f6ac15"; + sha256 = "1m2d37z98pphjx5yld578rsm75dwfjswaz9da13jy296mwz2h46q"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -8527,12 +8527,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2021-09-18"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "9a9fe186a73fce636398ee7f851466ef60c9fde5"; - sha256 = "0npqcpciq1pwm1ac6ldlyvrg7mhjg4ybrpmmld9b4nysiws97cnq"; + rev = "5ce866172da4b90f77b8371423dc031fe2f4ece7"; + sha256 = "07rl7il0aqirmrg720c3k96v0rfwj4njmx2pnql3wd8nbl2w5czb"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -10991,12 +10991,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2022-01-30"; + version = "2022-01-31"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "616bbca2e5d0a97edadb441df56bc21598e59a1a"; - sha256 = "1a3ms0b6kvv70l7fd4wxc7lgnqj97c5ad9a1mk2bqcd3xh3yq6ki"; + rev = "0aa467db97a075c576e97424865a57a457fd4851"; + sha256 = "0ds8a0qn4dx332rpfwjmk09iaqjjd7wiqp91j1c84ysjnc2c1pfk"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -11428,8 +11428,8 @@ final: prev: src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "54bcb0407f8ff24a1cface0e91759940b81ae04e"; - sha256 = "1n2k6jq01znx5501fdwdzbxxlzhyng5zv9j5k2hiijqkv9rm1487"; + rev = "a23fb3c17548d2d8f037e12f2c30edd599e3b8e7"; + sha256 = "1hfxx58jwh3kcfqzhlc32h2krzc73rhdx5m1pvkl9ffsnn4k6602"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; From 764e39c6c4702e8cf85b1740803ab48ce1aa3885 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 31 Jan 2022 15:04:29 -0800 Subject: [PATCH 075/187] vimPlugins.galaxyline-nvim: Switch to actively developed fork --- pkgs/misc/vim-plugins/generated.nix | 10 +++++----- pkgs/misc/vim-plugins/vim-plugin-names | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 950e6981a246..09fe8819a5d5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2195,14 +2195,14 @@ final: prev: galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline.nvim"; - version = "2021-04-25"; + version = "2022-01-21"; src = fetchFromGitHub { - owner = "glepnir"; + owner = "NTBBloodbath"; repo = "galaxyline.nvim"; - rev = "d544cb9d0b56f6ef271db3b4c3cf19ef665940d5"; - sha256 = "1390lqsqdcj1q89zn6y5qrm1id7p8fnpy07vlz6mm4cki47211mb"; + rev = "4d4f5fc8e20a10824117e5beea7ec6e445466a8f"; + sha256 = "0xgk64d7dyihrjir8mxchwzi65nimm9w23r24m99w6p0f9qr56gk"; }; - meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; + meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; }; gen_tags-vim = buildVimPluginFrom2Nix { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 3ea491e5fbe6..ff58244643e2 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -202,7 +202,6 @@ gioele/vim-autoswap github/copilot.vim gleam-lang/gleam.vim glepnir/dashboard-nvim -glepnir/galaxyline.nvim glepnir/oceanic-material glepnir/zephyr-nvim glts/vim-textobj-comment @@ -557,6 +556,7 @@ noc7c9/vim-iced-coffee-script norcalli/nvim-colorizer.lua norcalli/nvim-terminal.lua norcalli/snippets.nvim +NTBBloodbath/galaxyline.nvim ntpeters/vim-better-whitespace numirias/semshi numtostr/comment.nvim From cf97c30cfea937ff23937093026aaf4a4f1737cc Mon Sep 17 00:00:00 2001 From: Berk Ozkutuk Date: Tue, 1 Feb 2022 01:54:26 +0300 Subject: [PATCH 076/187] vimPlugins.vim-windowswap: init at 2018-05-16 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 09fe8819a5d5..b677df312973 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -11169,6 +11169,18 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; + vim-windowswap = buildVimPluginFrom2Nix { + pname = "vim-windowswap"; + version = "2018-05-16"; + src = fetchFromGitHub { + owner = "wesQ3"; + repo = "vim-windowswap"; + rev = "15db3f697aa1fa696d99fcdc920c90cd2cec855e"; + sha256 = "1zzgwxv0a4i1qlig1c3n6n9ns2fqkkv6jqc2qxcipn6v6v88sl2b"; + }; + meta.homepage = "https://github.com/wesQ3/vim-windowswap/"; + }; + vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; version = "2021-12-28"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index ff58244643e2..32d030f1255b 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -944,6 +944,7 @@ wbthomason/packer.nvim weilbith/nvim-code-action-menu wellle/targets.vim wellle/tmux-complete.vim +wesQ3/vim-windowswap wfxr/minimap.vim whonore/Coqtail will133/vim-dirdiff From 5776cd7640c41e0ef8b0fed36945d9734de786ff Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Mon, 31 Jan 2022 20:14:54 -0300 Subject: [PATCH 077/187] vscode-extensions.svsool.markdown-memo: 0.3.9 -> 0.3.18 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index bbfbc697246e..e7705d48bf30 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1694,8 +1694,8 @@ let mktplcRef = { name = "markdown-memo"; publisher = "svsool"; - version = "0.3.9"; - sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM="; + version = "0.3.18"; + sha256 = "sha256-ypYqVH1ViJE7+mAJnxmpvUSmiImOo7rE7m+ijTEpmwg="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; From 71e65d9b271fb32d928aef270e988ecaaa72f396 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:04:32 +1000 Subject: [PATCH 078/187] llama: update vendorSha256 --- pkgs/applications/misc/llama/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/llama/default.nix b/pkgs/applications/misc/llama/default.nix index 60598afcc4e1..f1822c674116 100644 --- a/pkgs/applications/misc/llama/default.nix +++ b/pkgs/applications/misc/llama/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6Xuwl4IpzbVfJ2MhHeImPFWxL/Y6rhnBExlh64PeGdk="; }; - vendorSha256 = "sha256-J/2R3XhGNmejc3jstJ0NWmJm/a1Re6UK6AuQb5gzh4E="; + vendorSha256 = "sha256-zbfQtTDbVWFVGQyjqlkv3mTvEPkKImzXAIXcmkh4wqk="; meta = with lib; { description = "Terminal file manager"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 515eafc016c3..e7c727fb433d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18346,7 +18346,9 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; - llama = callPackage ../applications/misc/llama { }; + llama = callPackage ../applications/misc/llama { + buildGoModule = buildGo117Module; + }; malcontent = callPackage ../development/libraries/malcontent { }; From 31dae91dceee13ac81762d0b71aba003f60eba15 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:05:01 +1000 Subject: [PATCH 079/187] lmp: update vendorSha256 --- pkgs/tools/security/lmp/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/lmp/default.nix b/pkgs/tools/security/lmp/default.nix index 6fd544df20a4..2f7f0283f904 100644 --- a/pkgs/tools/security/lmp/default.nix +++ b/pkgs/tools/security/lmp/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-VL/Hp7YaXNcV9JPb3kgRHcdhJJ5p3KHUf3hHbT3gKVk="; }; - vendorSha256 = "sha256-K3jD+r/JFQH5QeLHatCzTdgiABbmKOd/jR3Di10w6mo="; + vendorSha256 = "sha256-3NTaJ/Y3Tc6UGLfYTKjZxAAI43GJyZQ5wQVYbnXHSYc="; meta = with lib; { description = "Scanning and validation toolkit for the Log4J vulnerability"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7c727fb433d..add3c4854faf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7583,7 +7583,9 @@ with pkgs; liquidctl = with python3Packages; toPythonApplication liquidctl; - lmp = callPackage ../tools/security/lmp { }; + lmp = callPackage ../tools/security/lmp { + buildGoModule = buildGo117Module; + }; localtime = callPackage ../tools/system/localtime { }; From 88c3dd43d8a9f92df0e71de7345f5b721c340f32 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:06:33 +1000 Subject: [PATCH 080/187] nfpm: update vendorSha256 --- pkgs/tools/package-management/nfpm/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 392a7f2e9b90..8ef9fea016a9 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xwziGGdFBmPpLRlBBficioULISt8WjGBocbrQUXa8CY="; }; - vendorSha256 = "sha256-RaAb8QDFp/7TolsNZqcXurozr3vvK0SRyyy2h8MPhnk="; + vendorSha256 = "sha256-5gH19R+SZpGWXntQ/Te96t1YGIIIQuy2ZRQSiczvM3Y="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index add3c4854faf..52e0ab212b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7305,7 +7305,9 @@ with pkgs; nyxt = callPackage ../applications/networking/browsers/nyxt { }; - nfpm = callPackage ../tools/package-management/nfpm { }; + nfpm = callPackage ../tools/package-management/nfpm { + buildGoModule = buildGo117Module; + }; nginx-config-formatter = callPackage ../tools/misc/nginx-config-formatter { }; From 19d03943fc61bd08c073b9309ee708e82d28b418 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:07:14 +1000 Subject: [PATCH 081/187] nuclei: update vendorSha256 --- pkgs/tools/security/nuclei/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 396b8e03792c..27805bdd762f 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-r6nOVTg/vZr2somTCoEJQHtbMMZ1RCkdDzGQeTISreU="; }; - vendorSha256 = "sha256-/TFg+ztubfZfyUbRabVr943oF9R0Xg8mIDxUl/MFbJE="; + vendorSha256 = "sha256-zLZ7+eJPKJ8nX47SdbzCLwg3nmv2lFcd2te8oh0UU4s="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 52e0ab212b5a..8fbf19b2ac21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23969,7 +23969,9 @@ with pkgs; nuclear = callPackage ../applications/audio/nuclear { }; - nuclei = callPackage ../tools/security/nuclei { }; + nuclei = callPackage ../tools/security/nuclei { + buildGoModule = buildGo117Module; + }; nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; From 2390f7b4fa0ed192c0094ba0b7297e35ce8b6a2e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:08:03 +1000 Subject: [PATCH 082/187] nwg-menu: update vendorSha256 --- pkgs/applications/misc/nwg-menu/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/applications/misc/nwg-menu/default.nix index 61e7f5ad54f0..98609665c4fe 100644 --- a/pkgs/applications/misc/nwg-menu/default.nix +++ b/pkgs/applications/misc/nwg-menu/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk"; + vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fbf19b2ac21..3f98cbb279b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27676,7 +27676,9 @@ with pkgs; nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; - nwg-menu = callPackage ../applications/misc/nwg-menu { }; + nwg-menu = callPackage ../applications/misc/nwg-menu { + buildGoModule = buildGo117Module; + }; nwg-panel = callPackage ../applications/misc/nwg-panel { }; From b24ccd7a9d1cce3e308ada0333b1a08f9a1404a8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:09:08 +1000 Subject: [PATCH 083/187] oauth2-proxy: update vendorSha256 --- pkgs/servers/oauth2-proxy/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index 7002749a0df5..7f9ce7d5b568 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - vendorSha256 = "sha256-bmF38dj+ovVlSbTtv2TSXGLe/W1R4NUbeDrpgGlfPf4="; + vendorSha256 = "sha256-+5/j2lZJpyo67uRRSn4Fd8S2K0gfAGMe69OoEEdWijc="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f98cbb279b3..128001258237 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21490,7 +21490,9 @@ with pkgs; nsq = callPackage ../servers/nsq { }; - oauth2-proxy = callPackage ../servers/oauth2-proxy { }; + oauth2-proxy = callPackage ../servers/oauth2-proxy { + buildGoModule = buildGo117Module; + }; openbgpd = callPackage ../servers/openbgpd { }; From c68666822ce26e0b60345238f3c906daa240e555 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:10:36 +1000 Subject: [PATCH 084/187] otpauth: update vendorSha256 --- pkgs/tools/security/otpauth/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/tools/security/otpauth/default.nix index b8974bc720de..1fb184d040f8 100644 --- a/pkgs/tools/security/otpauth/default.nix +++ b/pkgs/tools/security/otpauth/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-LGDeNkCxVLDVpwi5VFFL0DFsf8CexI7Nc5l+l2ASHaw="; }; - vendorSha256 = "sha256-fwO3cmlnmuD682vGB8X06yGHZqBadeltRrsEUjQWazc="; + vendorSha256 = "sha256-TU5crhmQAhSfURdfPe/xaa3RgGyc+UFn2E+jJ0flNsg="; doCheck = true; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 128001258237..68f66981498f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8738,7 +8738,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; - otpauth = callPackage ../tools/security/otpauth { }; + otpauth = callPackage ../tools/security/otpauth { + buildGoModule = buildGo117Module; + }; pcsclite = callPackage ../tools/security/pcsclite { inherit (darwin.apple_sdk.frameworks) IOKit; From d8dc7f88cc005a52537042487eef99789403069f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:11:31 +1000 Subject: [PATCH 085/187] pdfcpu: update vendorSha256 --- pkgs/applications/graphics/pdfcpu/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index f2ffa143aebb..4952ecf84f23 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CFKo8YEAXAniX+jL2A0naJUOn3KAWwcrPsabdiZevhI="; }; - vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM="; + vendorSha256 = "sha256-3y42rbhurGhCI9PuSayxmLem0tv/nTjBwYxF3Dk6/yM="; # No tests doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68f66981498f..0a794b4e254c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28146,7 +28146,9 @@ with pkgs; pdfchain = callPackage ../tools/typesetting/pdfchain { }; - pdfcpu = callPackage ../applications/graphics/pdfcpu { }; + pdfcpu = callPackage ../applications/graphics/pdfcpu { + buildGoModule = buildGo117Module; + }; pdftk = callPackage ../tools/typesetting/pdftk { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; From 67fe8f94d229e47fe64945f42377418ec4b545b4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:38:56 +1000 Subject: [PATCH 086/187] pet: update vendorSha256 --- pkgs/development/tools/pet/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index 653bc8aca729..d759efb2b5b7 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-gVTpzmXekQxGMucDKskGi+e+34nJwwsXwvQTjRO6Gdg="; }; - vendorSha256 = "sha256-vciiBzmqUAt5ZWn9go4B1uaz0HsBk5Z9Rbw7/MAimY4="; + vendorSha256 = "sha256-dUvp7FEW09V0xMuhewPGw3TuAic/sD7xyXEYviZ2Ivs="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a794b4e254c..ed099f05e642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -533,7 +533,9 @@ with pkgs; perseus-cli = callPackage ../development/tools/perseus-cli { }; - pet = callPackage ../development/tools/pet { }; + pet = callPackage ../development/tools/pet { + buildGoModule = buildGo117Module; + }; pkger = callPackage ../development/libraries/pkger { }; From af296b4bb35c845ce372b04015657ffa6aa35269 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:40:26 +1000 Subject: [PATCH 087/187] photon-rss: update vendorSha256 --- pkgs/applications/networking/feedreaders/photon/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/photon/default.nix b/pkgs/applications/networking/feedreaders/photon/default.nix index 8e4c85cebeae..0a02c1db1818 100644 --- a/pkgs/applications/networking/feedreaders/photon/default.nix +++ b/pkgs/applications/networking/feedreaders/photon/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { proxyVendor = true; - vendorSha256 = "sha256-MLNgaxxvPGRzBEWRuKTDskl0J2IVushW11E5prpYsE4="; + vendorSha256 = "sha256-1vlgnY4kZJfoAtbv+r8onxL03Ak32zKLJgtrBYZX09g="; meta = with lib; { description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed099f05e642..a5de894954a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8826,7 +8826,9 @@ with pkgs; phodav = callPackage ../tools/networking/phodav { }; - photon-rss = callPackage ../applications/networking/feedreaders/photon { }; + photon-rss = callPackage ../applications/networking/feedreaders/photon { + buildGoModule = buildGo117Module; + }; pim6sd = callPackage ../servers/pim6sd { }; From 6b46d26db7a2151133686b4198e1bea04e4da273 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:42:32 +1000 Subject: [PATCH 088/187] proto-contrib: update vendorSha256 --- pkgs/development/tools/proto-contrib/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index 74f47f3f996e..f60bfb4b724d 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; }; - vendorSha256 = "1ivvq5ch9grdrwqq29flv9821kyb16k0cj6wgj5v0dyn63w420aw"; + vendorSha256 = "093blawprs2yf478zp9p1zc7mmimgpiwrw6nh8nqml89y5b5zldc"; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5de894954a2..1abf88ca25c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -353,7 +353,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - proto-contrib = callPackage ../development/tools/proto-contrib {}; + proto-contrib = callPackage ../development/tools/proto-contrib { + buildGoModule = buildGo117Module; + }; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; From a3876ad3814b3c88b89faf9477db48136775564b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:45:05 +1000 Subject: [PATCH 089/187] protoc-gen-twirp_php: update vendorSha256 --- pkgs/development/tools/protoc-gen-twirp_php/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index a978c2866504..df5afac2dbb2 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-TaHfyYoWsA/g5xZFxIMNwE1w6Dd9Cq5bp1gpQudYLs0="; }; - vendorSha256 = "sha256-z3Yp+Yy03g2DAvWUZXaOxQWONjnYUl69eTpYIDPhsqc="; + vendorSha256 = "sha256-qQFlBviRISEnPBt0q5391RqUrPTI/QDxg3MNfwWE8MI="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1abf88ca25c0..14fd4113acfc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -369,7 +369,9 @@ with pkgs; protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; - protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; + protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { + buildGoModule = buildGo117Module; + }; protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { }; From ded4f972818853560b865354d53c89dc97965fcf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:45:33 +1000 Subject: [PATCH 090/187] protoc-gen-twirp_typescript: update vendorSha256 --- .../development/tools/protoc-gen-twirp_typescript/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix index 2aabe3bcce6e..ead72184b7cd 100644 --- a/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; + vendorSha256 = "sha256-xZlP4rg1FMx6ddkKYlSdF6NrtY8xBZ3aEZSATgSf13M="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14fd4113acfc..d23d3fe04d8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -375,7 +375,9 @@ with pkgs; protoc-gen-twirp_swagger = callPackage ../development/tools/protoc-gen-twirp_swagger { }; - protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { }; + protoc-gen-twirp_typescript = callPackage ../development/tools/protoc-gen-twirp_typescript { + buildGoModule = buildGo117Module; + }; proton-caller = callPackage ../misc/emulators/proton-caller { }; From aa7fa47159182e6b5aa5de5c01eb7f8c7223c99c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:46:28 +1000 Subject: [PATCH 091/187] protolock: update vendorSha256 --- pkgs/development/libraries/protolock/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protolock/default.nix b/pkgs/development/libraries/protolock/default.nix index 7d423ac03470..e364b9077940 100644 --- a/pkgs/development/libraries/protolock/default.nix +++ b/pkgs/development/libraries/protolock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-cKrG8f8cabuGDN1gmBYleXcBqeJksdREiEy63UK/6J0="; }; - vendorSha256 = "sha256-3kRGLZgYcbUQb6S+NrleMNNX0dXrE9Yer3vvqxiP4So="; + vendorSha256 = "sha256-2XbBiiiPvZCnlKUzGDLFnxA34N/LmHoPbvRKZckmhx4="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d23d3fe04d8c..eea6dfabdcc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19579,7 +19579,9 @@ with pkgs; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; - protolock = callPackage ../development/libraries/protolock { }; + protolock = callPackage ../development/libraries/protolock { + buildGoModule = buildGo117Module; + }; protozero = callPackage ../development/libraries/protozero { }; From d53e83dd7d9f6145c19796132afd1884b089e4b3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:47:26 +1000 Subject: [PATCH 092/187] ratt: update vendorSha256 --- pkgs/applications/misc/ratt/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/applications/misc/ratt/default.nix index a7583dabd733..8b49232051d1 100644 --- a/pkgs/applications/misc/ratt/default.nix +++ b/pkgs/applications/misc/ratt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = "sha256-NW5B9oO/LJqPigvOcMeL4hQLKmAL01I2Ff41y169BTQ="; + vendorSha256 = "sha256-4TEdnJ7lCuBka6rtoKowf5X3VqCgfwvGHeJ5B5Q5C20="; # tests try to access the internet to scrape websites doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eea6dfabdcc5..95fc41b50852 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9251,7 +9251,9 @@ with pkgs; ratools = callPackage ../tools/networking/ratools { }; - ratt = callPackage ../applications/misc/ratt { }; + ratt = callPackage ../applications/misc/ratt { + buildGoModule = buildGo117Module; + }; rc = callPackage ../shells/rc { }; From 97b4196fbc59b0b6cfe33e61f6a03945b970abb2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:48:55 +1000 Subject: [PATCH 093/187] scaleway-cli: update vendorSha256 --- pkgs/tools/admin/scaleway-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 2576208e8d22..436c62906261 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "yYzcziEKPSiMvw9LWd60MkHmYFAvN7Qza6Z117NOOv0="; }; - vendorSha256 = "0V9sHi/E095txnfF8YFW5O7o0e1H3sdn3tw5LqB92tI="; + vendorSha256 = "7cGVeja1YE96PEV1IRklyh6MeMDFAP+2TpYvvFkBYnQ="; # some tests require network access to scaleway's API, failing when sandboxed doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95fc41b50852..be4fd24000b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30539,7 +30539,9 @@ with pkgs; scaleft = callPackage ../applications/networking/scaleft { }; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { + buildGoModule = buildGo117Module; + }; beancount = with python3.pkgs; toPythonApplication beancount; From 84a3a82b3968dbbb0369e26a8c4f127002c1f3b8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 06:49:55 +1000 Subject: [PATCH 094/187] scorecard: update vendorSha256 --- pkgs/tools/security/scorecard/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/scorecard/default.nix b/pkgs/tools/security/scorecard/default.nix index 8fd4276427b1..a865e441f1ea 100644 --- a/pkgs/tools/security/scorecard/default.nix +++ b/pkgs/tools/security/scorecard/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-SXBdtwYEslR871wLwCCHD7hsM/riHswyKrIilrsLqns="; + vendorSha256 = "sha256-NSV7mDn1efQAO4jm6bJm12ExDFTN76TkmD4r61V6D2Q="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be4fd24000b8..a9d53fee9f1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9583,7 +9583,9 @@ with pkgs; scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; - scorecard = callPackage ../tools/security/scorecard { }; + scorecard = callPackage ../tools/security/scorecard { + buildGoModule = buildGo117Module; + }; scream = callPackage ../applications/audio/scream { }; From 6d0f0a79c332105aab017c89424cb973a345a176 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:08:50 +1000 Subject: [PATCH 095/187] symfony-cli: update vendorSha256 --- pkgs/development/tools/symfony-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index b2da64427cb5..35de1de6ae32 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -3,7 +3,7 @@ buildGoModule rec { pname = "symfony-cli"; version = "5.2.2"; - vendorSha256 = "sha256-/ct1DNSCB1KzajyHWe6guF5iYm5AAEbPunn7xYLw25I="; + vendorSha256 = "sha256-i4p9kEe0eT2L4U/DjkWlLVqgGT5ZJaoGyFAoYyxmoyI="; src = fetchFromGitHub { owner = "symfony-cli"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9d53fee9f1e..d95f4ed4996e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15654,7 +15654,9 @@ with pkgs; swiftformat = callPackage ../development/tools/swiftformat { }; - symfony-cli = callPackage ../development/tools/symfony-cli { }; + symfony-cli = callPackage ../development/tools/symfony-cli { + buildGoModule = buildGo117Module; + }; swiftshader = callPackage ../development/libraries/swiftshader { }; From 741460dd3a95150ba68fcdc58bf48c92f8339098 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:09:46 +1000 Subject: [PATCH 096/187] tanka: update vendorSha256 --- pkgs/applications/networking/cluster/tanka/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 8bdbf63a9ff5..6b0f1ea2e2d5 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM="; }; - vendorSha256 = "sha256-pqwdxFFcATfxGmz6quIH8OL4U2DZKmuVyOLEct2nBlE="; + vendorSha256 = "sha256-1zdXc+Osqy17APcG5ou/UL/3Hcalmb1OZ2kZnWLSVIg="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d95f4ed4996e..d74585c3ba88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29132,7 +29132,9 @@ with pkgs; tamgamp.lv2 = callPackage ../applications/audio/tamgamp.lv2 { }; - tanka = callPackage ../applications/networking/cluster/tanka { }; + tanka = callPackage ../applications/networking/cluster/tanka { + buildGoModule = buildGo117Module; + }; teams = callPackage ../applications/networking/instant-messengers/teams { }; From 6a18c01836a4b9a1012a8d1b1141d974d020dc1a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:10:54 +1000 Subject: [PATCH 097/187] terracognita: update vendorSha256 --- pkgs/development/tools/misc/terracognita/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index a6f195c12ac8..b3fd7a54ec0b 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QaJoHnuzSQXxEuGpui9lyKAjT2wdz4XmMAh5cAOKvBg="; }; - vendorSha256 = "sha256-7LRq1lG3DT1WQ0+78EEeQqCCrx6n6qTCUcYUuKSfvVE="; + vendorSha256 = "sha256-HcUH3cnaeyB2XnfcRLulsRcHaCwdLkiIb518Ucl2tv8="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d74585c3ba88..8f13cdbd16cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15701,7 +15701,9 @@ with pkgs; tytools = libsForQt5.callPackage ../development/embedded/tytools { }; - terracognita = callPackage ../development/tools/misc/terracognita { }; + terracognita = callPackage ../development/tools/misc/terracognita { + buildGoModule = buildGo117Module; + }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; From 6dd425b0af9779bf6c95ee2d9162e741799bb78e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:11:54 +1000 Subject: [PATCH 098/187] tflint: update vendorSha256 --- pkgs/development/tools/analysis/tflint/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 951e95b1477c..869d7e464a52 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ltxFduUr+poi4tEjViQXCbe+j3fUdvBG8CTaM7VdpK0="; }; - vendorSha256 = "sha256-iZdWCSkdKG0SXcUtZ0DgDGk25vESlv2dSbcK1gUVTV8="; + vendorSha256 = "sha256-xEmDOP2DbTZ8bpK4OCabIpOwORB8EOJZkHCxL5wBeEU="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f13cdbd16cf..57baf0a73c5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15735,7 +15735,9 @@ with pkgs; time-ghc-modules = callPackage ../development/tools/time-ghc-modules { }; - tflint = callPackage ../development/tools/analysis/tflint { }; + tflint = callPackage ../development/tools/analysis/tflint { + buildGoModule = buildGo117Module; + }; tfsec = callPackage ../development/tools/analysis/tfsec { }; From 7d374e858a5dcf57583a8bde1e902363a95922b1 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:12:27 +1000 Subject: [PATCH 099/187] ticker: update vendorSha256 --- pkgs/applications/misc/ticker/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index 62a4151010aa..e345c344f902 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-KICxcfZLBwCo12p5R9wt7Tk440wkUIE7G6lGfWIdxR8="; }; - vendorSha256 = "sha256-aPL3npryiCv+SiSyEUNhdPCDmM/hJDMspCbSNy+SuoA="; + vendorSha256 = "sha256-1FnewgsKlOnBAdm7vyBngrFsDHNCzpZA3IDccxALeJ8="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57baf0a73c5d..54b2e0dedbb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29262,7 +29262,9 @@ with pkgs; ticpp = callPackage ../development/libraries/ticpp { }; - ticker = callPackage ../applications/misc/ticker { }; + ticker = callPackage ../applications/misc/ticker { + buildGoModule = buildGo117Module; + }; tickrs = callPackage ../applications/misc/tickrs { inherit (darwin.apple_sdk.frameworks) Security; From ac6dbb2d7ceca976d9046b0346f6933d543fd43e Mon Sep 17 00:00:00 2001 From: gbtb Date: Sun, 23 Jan 2022 11:37:38 +1000 Subject: [PATCH 100/187] tortoisehg: added smoke test for thg --- .../version-management/tortoisehg/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index f581380b9281..3da14f8796e6 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - doCheck = false; # tests fail with "thg: cannot connect to X server" + doCheck = true; postInstall = '' mkdir -p $out/share/doc/tortoisehg cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt @@ -29,8 +29,17 @@ python3Packages.buildPythonApplication rec { ''; checkPhase = '' - echo "test: thg version" - $out/bin/thg version + export QT_QPA_PLATFORM=offscreen + echo "test: thg smoke test" + $out/bin/thg -h > help.txt & + sleep 1s + if grep "list of commands" help.txt; then + echo "thg help output was captured. Seems like package in a working state." + exit 0 + else + echo "thg help output was not captured. Seems like package is broken." + exit 1 + fi ''; passthru.mercurial = tortoiseMercurial; From 38f2d719cc9db947334dbe801144e0772de53f20 Mon Sep 17 00:00:00 2001 From: gbtb Date: Sun, 23 Jan 2022 11:38:20 +1000 Subject: [PATCH 101/187] tortoisehg: format default.nix with nixpkgs-fmt --- .../version-management/tortoisehg/default.nix | 91 ++++++++++--------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 3da14f8796e6..66f3b9a0aaf3 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,54 +1,59 @@ -{ lib, fetchurl, python3Packages -, mercurial, qt5 +{ lib +, fetchurl +, python3Packages +, mercurial +, qt5 }: python3Packages.buildPythonApplication rec { - pname = "tortoisehg"; - version = "6.0"; + pname = "tortoisehg"; + version = "6.0"; - src = fetchurl { - url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "sha256-25uQ2llF/+wqdGpun/nzlvAf286OIRmlZUISZ0szH6Y="; - }; + src = fetchurl { + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; + sha256 = "sha256-25uQ2llF/+wqdGpun/nzlvAf286OIRmlZUISZ0szH6Y="; + }; - # Extension point for when thg's mercurial is lagging behind mainline. - tortoiseMercurial = mercurial; + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; - propagatedBuildInputs = with python3Packages; [ - tortoiseMercurial qscintilla-qt5 iniparse - ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ + tortoiseMercurial + qscintilla-qt5 + iniparse + ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - doCheck = true; - postInstall = '' - mkdir -p $out/share/doc/tortoisehg - cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt - # convenient alias - ln -s $out/bin/thg $out/bin/tortoisehg - wrapQtApp $out/bin/thg - ''; + doCheck = true; + postInstall = '' + mkdir -p $out/share/doc/tortoisehg + cp COPYING.txt $out/share/doc/tortoisehg/Copying.txt + # convenient alias + ln -s $out/bin/thg $out/bin/tortoisehg + wrapQtApp $out/bin/thg + ''; - checkPhase = '' - export QT_QPA_PLATFORM=offscreen - echo "test: thg smoke test" - $out/bin/thg -h > help.txt & - sleep 1s - if grep "list of commands" help.txt; then - echo "thg help output was captured. Seems like package in a working state." - exit 0 - else - echo "thg help output was not captured. Seems like package is broken." - exit 1 - fi - ''; + checkPhase = '' + export QT_QPA_PLATFORM=offscreen + echo "test: thg smoke test" + $out/bin/thg -h > help.txt & + sleep 1s + if grep "list of commands" help.txt; then + echo "thg help output was captured. Seems like package in a working state." + exit 0 + else + echo "thg help output was not captured. Seems like package is broken." + exit 1 + fi + ''; - passthru.mercurial = tortoiseMercurial; + passthru.mercurial = tortoiseMercurial; - meta = { - description = "Qt based graphical tool for working with Mercurial"; - homepage = "https://tortoisehg.bitbucket.io/"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ danbst ]; - }; + meta = { + description = "Qt based graphical tool for working with Mercurial"; + homepage = "https://tortoisehg.bitbucket.io/"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ danbst ]; + }; } From 019ca1cb3b827aa29655b70105da7a82d8067ee8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 30 Jan 2022 08:49:43 +1000 Subject: [PATCH 102/187] go_1_15: remove --- pkgs/development/compilers/go/1.15.nix | 284 ------------------ .../compilers/go/go_no_vendor_checks.patch | 23 -- .../go/skip-external-network-tests-1.15.patch | 13 - .../compilers/go/ssl-cert-file-1.15.patch | 76 ----- pkgs/top-level/all-packages.nix | 13 - 5 files changed, 409 deletions(-) delete mode 100644 pkgs/development/compilers/go/1.15.nix delete mode 100644 pkgs/development/compilers/go/go_no_vendor_checks.patch delete mode 100644 pkgs/development/compilers/go/skip-external-network-tests-1.15.patch delete mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.15.patch diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix deleted file mode 100644 index 5cba6be88999..000000000000 --- a/pkgs/development/compilers/go/1.15.nix +++ /dev/null @@ -1,284 +0,0 @@ -{ lib -, stdenv -, fetchurl -, tzdata -, iana-etc -, runCommand -, perl -, which -, pkg-config -, patch -, procps -, pcre -, cacert -, Security -, Foundation -, mailcap -, runtimeShell -, buildPackages -, pkgsBuildTarget -, fetchpatch -, callPackage -}: - -let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; - - goBootstrap = runCommand "go-bootstrap" { } '' - mkdir $out - cp -rf ${go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - "powerpc64le" = "ppc64le"; - "mips" = "mips"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - - # We need a target compiler which is still runnable at build time, - # to handle the cross-building case where build != host == target - targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.15.15"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-BmKuOBMzAoDV8al6LuI7vb46Wnz6YAGySphzoZoNx+w="; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkg-config patch procps ]; - buildInputs = [ cacert pcre ] - ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Fails on aarch64 - sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go - # Skip this test since ssl patches mess it up. - sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # Disable another PIE test which breaks. - sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go - # Disable the BuildModePie test - sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + lib.optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.15.patch - ./remove-test-pie-1.15.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests-1.15.patch - ./skip-nohup-tests.patch - ./skip-cgo-tests-1.15.patch - ./go_no_vendor_checks.patch - - # support TZ environment variable starting with colon - (fetchpatch { - name = "tz-support-colon.patch"; - url = "https://github.com/golang/go/commit/58fe2cd4022c77946ce4b598cf3e30ccc8367143.patch"; - sha256 = "0vphwiqrm0qykfj3rfayr65qzk22fksg7qkamvaz0lmf6fqvbd2f"; - }) - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32-1.14.patch - else ./skip-test-extra-files-on-386-1.14.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = - if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${targetCC}/bin/${targetCC.targetPrefix}c++" - else - null; - - GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) '' - # Independent from host/target, CC should produce code for the building system. - # We only set it when cross-compiling. - export CC=${buildPackages.stdenv.cc}/bin/cc - ''} - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - disallowedReferences = [ goBootstrap ]; - - meta = with lib; { - homepage = "https://go.dev/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; - badPlatforms = [ "aarch64-darwin" ]; - }; -} diff --git a/pkgs/development/compilers/go/go_no_vendor_checks.patch b/pkgs/development/compilers/go/go_no_vendor_checks.patch deleted file mode 100644 index 45ff4360f0dd..000000000000 --- a/pkgs/development/compilers/go/go_no_vendor_checks.patch +++ /dev/null @@ -1,23 +0,0 @@ -Starting from go1.14, go verifes that vendor/modules.txt matches the requirements -and replacements listed in the main module go.mod file, and it is a hard failure if -vendor/modules.txt is missing. - -Relax module consistency checks and switch back to pre go1.14 behaviour if -vendor/modules.txt is missing regardless of go version requirement in go.mod. - -This has been ported from FreeBSD: https://reviews.freebsd.org/D24122 -See https://github.com/golang/go/issues/37948 for discussion. - -diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go -index 71f68efbcc..3c566d04dd 100644 ---- a/src/cmd/go/internal/modload/vendor.go -+++ b/src/cmd/go/internal/modload/vendor.go -@@ -133,7 +133,7 @@ func checkVendorConsistency() { - readVendorList() - - pre114 := false -- if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 { -+ if modFile.Go == nil || semver.Compare("v"+modFile.Go.Version, "v1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { - // Go versions before 1.14 did not include enough information in - // vendor/modules.txt to check for consistency. - // If we know that we're on an earlier version, relax the consistency check. diff --git a/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch b/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch deleted file mode 100644 index 0ea1050cd8e3..000000000000 --- a/pkgs/development/compilers/go/skip-external-network-tests-1.15.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/net/dial_test.go b/src/net/dial_test.go -index 01582489de..5b5faa5424 100644 ---- a/src/net/dial_test.go -+++ b/src/net/dial_test.go -@@ -990,6 +990,8 @@ func TestDialerControl(t *testing.T) { - // except that it won't skip testing on non-mobile builders. - func mustHaveExternalNetwork(t *testing.T) { - t.Helper() -+ t.Skipf("Nix sandbox does not have networking") -+ - mobile := runtime.GOOS == "android" || runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" - if testenv.Builder() == "" || mobile { - testenv.MustHaveExternalNetwork(t) diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch b/pkgs/development/compilers/go/ssl-cert-file-1.15.patch deleted file mode 100644 index 1884c681ca30..000000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.15.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/src/crypto/x509/root_darwin_amd64.go b/src/crypto/x509/root_darwin_amd64.go -index ce88de025e..258ecc45d1 100644 ---- a/src/crypto/x509/root_darwin_amd64.go -+++ b/src/crypto/x509/root_darwin_amd64.go -@@ -10,6 +10,7 @@ import ( - "bytes" - macOS "crypto/x509/internal/macos" - "fmt" -+ "io/ioutil" - "os" - "strings" - ) -@@ -25,6 +26,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - var loadSystemRootsWithCgo func() (*CertPool, error) - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - var trustedRoots []*Certificate - untrustedRoots := make(map[string]bool) - -diff --git a/src/crypto/x509/root_darwin_ios.go b/src/crypto/x509/root_darwin_ios.go -index 5ecc4911b3..14b4205c00 100644 ---- a/src/crypto/x509/root_darwin_ios.go -+++ b/src/crypto/x509/root_darwin_ios.go -@@ -6,6 +6,11 @@ - - package x509 - -+import ( -+ "io/ioutil" -+ "os" -+) -+ - func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { - return nil, nil - } -@@ -14,6 +19,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - var loadSystemRootsWithCgo func() (*CertPool, error) - - func loadSystemRoots() (*CertPool, error) { -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots := NewCertPool() -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - p := NewCertPool() - p.AppendCertsFromPEM([]byte(systemRootsPEM)) - return p, nil -diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go -index b48e618a65..195c1ff25a 100644 ---- a/src/crypto/x509/root_unix.go -+++ b/src/crypto/x509/root_unix.go -@@ -42,6 +42,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate - - func loadSystemRoots() (*CertPool, error) { - roots := NewCertPool() -+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" { -+ data, err := ioutil.ReadFile(file) -+ if err == nil { -+ roots.AppendCertsFromPEM(data) -+ return roots, nil -+ } -+ } - - files := certFiles - if f := os.Getenv(certFileEnv); f != "" { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54b2e0dedbb0..f873f0293d6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12482,13 +12482,6 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_1_15 = callPackage ../development/compilers/go/1.15.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - go_1_16 = callPackage ../development/compilers/go/1.16.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { @@ -20827,9 +20820,6 @@ with pkgs; ### DEVELOPMENT / GO MODULES - buildGo115Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_15; - }; buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; @@ -20844,9 +20834,6 @@ with pkgs; buildGoPackage = buildGo116Package; - buildGo115Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_15; - }; buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; From f46347fa66580249bd9709be554fb50f404985d9 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 31 Jan 2022 18:53:43 -0800 Subject: [PATCH 103/187] nix-fallback-paths: update to 2.6.0 --- nixos/modules/installer/tools/nix-fallback-paths.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 065cea470fbb..31aeaad80d60 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/hapw7q1fkjxvprnkcgw9ppczavg4daj2-nix-2.4"; - i686-linux = "/nix/store/8qlvh8pp5j8wgrzj3is2jlbhgrwgsiy9-nix-2.4"; - aarch64-linux = "/nix/store/h48lkygcqj4hdibbdnpl67q7ks6vkrd6-nix-2.4"; - x86_64-darwin = "/nix/store/c3mvzszvyzakvcp9spnjvsb8m2bpjk7m-nix-2.4"; - aarch64-darwin = "/nix/store/hbfqs62r0hga2yr4zi5kc7fzhf71bq9n-nix-2.4"; + x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0"; + i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0"; + aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0"; + x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0"; + aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0"; } From afb96b6809f18caa81887a31c550842acdbdbf62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 04:28:53 +0000 Subject: [PATCH 104/187] python39Packages.mautrix: 0.14.7 -> 0.14.8 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 31edebe64308..c2278b5d79f1 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.14.7"; + version = "0.14.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-P4yibI2KQQtIK8G28rkutaaMejiygZY1l/EjTl9Mju8="; + sha256 = "sha256-0GB6LDsZlWmNS3O01nHWu20JCgSptyih7iBjbEFoZaE="; }; propagatedBuildInputs = [ From 18bef1e58b95f9a904476260d21b3554cca798d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 02:42:21 +0000 Subject: [PATCH 105/187] python310Packages.pycryptodome-test-vectors: 1.0.6 -> 1.0.7 --- .../python-modules/pycryptodome-test-vectors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix index 0a3ab7ff3a1c..6e7f71cee306 100644 --- a/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix +++ b/pkgs/development/python-modules/pycryptodome-test-vectors/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "pycryptodome-test-vectors"; - version = "1.0.6"; + version = "1.0.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-oNfIVm7wyhgU9pgDhdP6BVJehuEw4d238GDaYMuAYLQ="; + hash = "sha256-GfzFM3S4yk0V2zTaQ+rkljyHdvC0ETUNSccZImqoLIU="; extension = "zip"; }; From 034c7f9df4dcc101e3736ee9ac0dbf8d1a559d73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 04:33:01 +0000 Subject: [PATCH 106/187] python310Packages.plugwise: 0.16.0 -> 0.16.1 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 92ab93256c57..b65f8b5f84c5 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.16.0"; + version = "0.16.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "1zgrq70ihkix39kf08h8xbjxa49800j9l6rn9nbgzwd25d7nlal0"; + sha256 = "sha256-95b2PliBlCNHzl9oTu0Mv6e30WE8lXwlAjzwqX2dNZI="; }; postPatch = '' From 2952ce2edd183f41d85f1859af31dfaf9456ae9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 02:31:11 +0000 Subject: [PATCH 107/187] python310Packages.subarulink: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 6a0cbfb97b9b..fdaf191db4d4 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - sha256 = "0mn3am1np653a3mq8rjly482a9x2rp6ss9zx997b6adk5vm3zasc"; + sha256 = "sha256-Q7dl/HSZTUXPs/0fE/Ui5/8r2LdJzyXwPnjQhXYdSxs="; }; propagatedBuildInputs = [ From d1eea58f96e504c7a4f109640949df9e63e1ca38 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Mon, 31 Jan 2022 23:28:50 -0300 Subject: [PATCH 108/187] vscode-extensions.ocamllabs.ocaml-platform: 1.5.1 -> 1.8.4 --- pkgs/misc/vscode-extensions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index e7705d48bf30..f37183e30229 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1448,13 +1448,13 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform"; homepage = "https://github.com/ocamllabs/vscode-ocaml-platform"; license = licenses.isc; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ratsclub ]; }; mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "1.5.1"; - sha256 = "0jkxpcrbr8xmwfl8jphmarjz2jk54hvmc24ww89d4bgx1awayqfh"; + version = "1.8.4"; + sha256 = "sha256-T1eYAuYMv4B7rdECxYzNfIpydjzCDjeo7gmb1uhr6VM="; }; }; From b0f2ff64227c221de6af64849ea464c1bd88a518 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 00:46:39 +0000 Subject: [PATCH 109/187] python310Packages.mongomock: 3.23.0 -> 4.0.0 --- pkgs/development/python-modules/mongomock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongomock/default.nix b/pkgs/development/python-modules/mongomock/default.nix index 0f2f305c97c3..85e574f0b6d5 100644 --- a/pkgs/development/python-modules/mongomock/default.nix +++ b/pkgs/development/python-modules/mongomock/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "mongomock"; - version = "3.23.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1pdh4pj5n6dsaqy98q40wig5y6imfs1p043cgkaaw8f2hxy5x56r"; + sha256 = "sha256-sYMsN0jUdETBiGc3PlzqdUwub2RKDPv9Zn8Xj2i97Pw="; }; nativeBuildInputs = [ From 91d26f50dcb31d4525bfb1524cf0b1f1f7183775 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 27 Jan 2022 11:29:06 +0800 Subject: [PATCH 110/187] phinger-cursors: init at 1.1 --- pkgs/data/icons/phinger-cursors/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/data/icons/phinger-cursors/default.nix diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix new file mode 100644 index 000000000000..4252136cf46b --- /dev/null +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { + pname = "phinger-cursors"; + version = "1.1"; + + src = fetchurl { + url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2"; + sha256 = "sha256-II+1x+rcjGRRVB8GYkVwkKVHNHcNaBKRb6C613901oc="; + }; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r ./ $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "The most over-engineered cursor theme"; + homepage = "https://github.com/phisch/phinger-cursors"; + platforms = platforms.unix; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63961133bbe3..df98ea202eab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23943,6 +23943,8 @@ with pkgs; publicsuffix-list = callPackage ../data/misc/publicsuffix-list { }; + phinger-cursors = callPackage ../data/icons/phinger-cursors { }; + qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; qogir-theme = callPackage ../data/themes/qogir { }; From 2ed32eed61dc2ac0e1de680ad745a4187fbee056 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:42:50 +1000 Subject: [PATCH 111/187] goreleaser: update vendorSha256 --- pkgs/tools/misc/goreleaser/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 446f401dae6e..5c1ef4b9f42e 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QFb702/v+fSzPWJ+hIGAXqVYfLpecA4sOFM+r8QvdYE="; }; - vendorSha256 = "sha256-LZ2fVFvctLw/X2IX8p5/2D3qvoOYmGWhvef6HoeAGeE="; + vendorSha256 = "sha256-EPm+QNGCY3miuhdMETl98c9SQhcqvHbYeLUQQeI/IsM="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f873f0293d6f..7ec38e1efa44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6097,7 +6097,9 @@ with pkgs; gopro = callPackage ../tools/video/gopro { }; - goreleaser = callPackage ../tools/misc/goreleaser { }; + goreleaser = callPackage ../tools/misc/goreleaser { + buildGoModule = buildGo117Module; + }; goreplay = callPackage ../tools/networking/goreplay { }; From 3a78e8e08d87a1b6863ba1173547ac982f4df180 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:43:48 +1000 Subject: [PATCH 112/187] gotify-cli: update vendorSha256 --- pkgs/tools/misc/gotify-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 7f5eef3b442b..e52744223dea 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-X41m7bCilDgnTMJy3ISz8g7dAtaz/lphwaCPZDGMDXk="; }; - vendorSha256 = "sha256-EKscJM8r1dbKRQPSZFwFqJYACkQynIS347460PuxQiU="; + vendorSha256 = "sha256-DvpdmURhOxDVFJiRtTGVw6u6y+s5XteT1owmdBJcKHA="; postInstall = '' mv $out/bin/cli $out/bin/gotify diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ec38e1efa44..2a4ce0af3288 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3225,7 +3225,9 @@ with pkgs; gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { }; + gotify-cli = callPackage ../tools/misc/gotify-cli { + buildGoModule = buildGo117Module; + }; gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; From ff85b40f484e1d5614880c64e40b3eb344f9ab74 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:44:34 +1000 Subject: [PATCH 113/187] helmsman: update vendorSha256 --- pkgs/applications/networking/cluster/helmsman/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 4f9de00dcf25..b209a5c5bcaa 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-KZrv447Yz4WxtkmQkGLsnZC0ok0rWCM2Fs+m8LVTGfM="; }; - vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU="; + vendorSha256 = "sha256-F+b4EXAxa4+O6yepx+9eRrdq294ZcQ+sODFUCKYpSuo="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a4ce0af3288..43c8f7cbfc4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33166,7 +33166,9 @@ with pkgs; helmfile = callPackage ../applications/networking/cluster/helmfile { }; - helmsman = callPackage ../applications/networking/cluster/helmsman { }; + helmsman = callPackage ../applications/networking/cluster/helmsman { + buildGoModule = buildGo117Module; + }; velero = callPackage ../applications/networking/cluster/velero { }; From aa3cbc6feba8dea0e3de9c6255257aee4e1d2909 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:45:08 +1000 Subject: [PATCH 114/187] hugo: update vendorSha256 --- pkgs/applications/misc/hugo/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 264b4ba53dd8..5bb7dcae614a 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-rzAt6jGj1MJ5AvkEKjAH91mKnUcLOPgHgiDkzkdibks="; }; - vendorSha256 = "sha256-ftA7ktZ6dEownEwJC4tK5/V3fl8toACiFiq9xTa7NE4="; + vendorSha256 = "sha256-ar5ctfKjqUuEM0mSygoQQFMgj0RURlvQu10dsCtGu3o="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43c8f7cbfc4d..a148d5aebbf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26370,7 +26370,9 @@ with pkgs; haunt = callPackage ../applications/misc/haunt { }; - hugo = callPackage ../applications/misc/hugo { }; + hugo = callPackage ../applications/misc/hugo { + buildGoModule = buildGo117Module; + }; go-org = callPackage ../applications/misc/go-org { }; From 69e1447c33c32aa8c58acd3eae39989adc9b36d3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:46:34 +1000 Subject: [PATCH 115/187] kcli: update vendorSha256 --- pkgs/development/tools/kcli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 9cd1c976162f..8f0aecba34d7 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0whijr2r2j5bvfy8jgmpxsa0zvwk5kfjlpnkw4za5k35q7bjffls"; }; - vendorSha256 = "0whqrms5mc7v14p2h1jfvkawm30xaylivijlsghrsaq468qcgg15"; + vendorSha256 = "0zj2hls8m0l9xsfv680wiwq1g2qjdjslv2yx3yd4rzxdsv2wz09a"; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a148d5aebbf3..b9f3b591697c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34603,7 +34603,9 @@ with pkgs; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli {}; + kcli = callPackage ../development/tools/kcli { + buildGoModule = buildGo117Module; + }; pxlib = callPackage ../development/libraries/pxlib {}; From cc94d1d1b3b117065382f0b06880522cdd836191 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:47:14 +1000 Subject: [PATCH 116/187] kube-capacity: update vendorSha256 --- .../applications/networking/cluster/kube-capacity/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index 596a71251b2d..0a2386d37cee 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-jop1dn+D0A6BkR1UCMrU9qcbZ1AHVth430cTd+kUYJw="; }; - vendorSha256 = "sha256-1D+nQ6WrHwJwcszCvoZ08SHX0anksdI69Jra5b9jPCY="; + vendorSha256 = "sha256-PkCUwe3S1bq37ME2WyTUnwEcbnFcNI0eaI9yW/HZ1uw="; meta = with lib; { description = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9f3b591697c..39c6dafc2288 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26952,7 +26952,9 @@ with pkgs; popeye = callPackage ../applications/networking/cluster/popeye { }; - kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { }; + kube-capacity = callPackage ../applications/networking/cluster/kube-capacity { + buildGoModule = buildGo117Module; + }; fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; From 8aa6024e7b6f2a37369198d0a61595e783ec993e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:47:58 +1000 Subject: [PATCH 117/187] kubescape: update vendorSha256 --- pkgs/tools/security/kubescape/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index ef18a0f2d735..a75c669f89f1 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { installShellFiles ]; - vendorSha256 = "sha256-1TupDdiG8hnbAM+JJRTJWCYQBGN/o+C3H2e0w9muYog="; + vendorSha256 = "sha256-gB1/WkGC3sgMqmA4F9/dGU0R0hIDwwTVBNNsY6Yj8KU="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39c6dafc2288..d830c386f011 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15145,7 +15145,9 @@ with pkgs; kubeprompt = callPackage ../development/tools/kubeprompt { }; - kubescape = callPackage ../tools/security/kubescape { }; + kubescape = callPackage ../tools/security/kubescape { + buildGoModule = buildGo117Module; + }; kubesec = callPackage ../tools/security/kubesec { }; From 665e71b72040288ede8d977e12a676aaf6fe94d5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:48:31 +1000 Subject: [PATCH 118/187] kubesec: update vendorSha256 --- pkgs/tools/security/kubesec/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix index d15fab720f96..001e851912a7 100644 --- a/pkgs/tools/security/kubesec/default.nix +++ b/pkgs/tools/security/kubesec/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-z1v+xm0ZWs8F5KtltBSDx9W+xNqRsfvAgQUKgrZa+28="; }; - vendorSha256 = "sha256-/2u92KvfzbJxJjh1cy9+4AuM5Qw1tK9Hu0xjRs0nhBE="; + vendorSha256 = "sha256-t2GZaLa/Pc/TCjqTNGuLnOFSepExmE2xA8pc9HkUtcs="; # Tests wants to download the kubernetes schema for use with kubeval doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d830c386f011..195682ce68ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15149,7 +15149,9 @@ with pkgs; buildGoModule = buildGo117Module; }; - kubesec = callPackage ../tools/security/kubesec { }; + kubesec = callPackage ../tools/security/kubesec { + buildGoModule = buildGo117Module; + }; kubespy = callPackage ../applications/networking/cluster/kubespy { }; From 33132bd705255d74e6a0a5b8b4bd3f25e52cb2c7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 04:49:33 +1000 Subject: [PATCH 119/187] limesctl: update vendorSha256 --- pkgs/applications/misc/limesctl/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index d7f0624ad3f3..eadd6c8db55a 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-E6LwNiCykBqjkifUSi6oBWqCEhkRO+03HSKn4p45kh0="; }; - vendorSha256 = "sha256-9MlymY5gM9/K2+7/yTa3WaSIfDJ4gRf33vSCwdIpNqw="; + vendorSha256 = "sha256-SzgiWqPuDZuSH8I9im8r+06E085PWyHwLjwxcaoJgQo="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 195682ce68ad..8ff251c87307 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26095,7 +26095,9 @@ with pkgs; withPortAudio = stdenv.isDarwin; }; - limesctl = callPackage ../applications/misc/limesctl { }; + limesctl = callPackage ../applications/misc/limesctl { + buildGoModule = buildGo117Module; + }; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; From c83cf3473b815fd8869e9433e568bc5bea6e3a00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 02:31:12 +0000 Subject: [PATCH 120/187] python39Packages.objax: 1.4.0 -> 1.6.0 --- pkgs/development/python-modules/objax/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index 5926848b5afb..da0a70aafb4c 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "objax"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "google"; repo = "objax"; rev = "v${version}"; - sha256 = "09gm61ghn5mi92q5mhx22mcv6aa6z78jsrnfar1hd3nwwyn9dq42"; + sha256 = "sha256-/6tZxVDe/3C53Re14odU9VA3mKvSj9X3/xt6bHFLHwQ="; }; # Avoid propagating the dependency on `jaxlib`, see From af268a8f2c9f5fb70e5910a3ee198beb69d9497a Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 1 Feb 2022 07:50:07 +0100 Subject: [PATCH 121/187] btrbk: remove asciidoc dependency asciidoc is not needed and pulls in inkscape which is currently not available in the binary cache, so it triggers a noticeable build process. --- pkgs/tools/backup/btrbk/default.nix | 3 +-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 69f745ecc1bd..969ea26e362b 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -7,7 +7,6 @@ , perl , perlPackages , util-linux -, asciidoc , asciidoctor , mbuffer , makeWrapper @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "1lx7vnf386nsik8mxrrfyx1h7mkqk5zs26sy0s0lynfxcm4lkxb2"; }; - nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; + nativeBuildInputs = [ asciidoctor makeWrapper ]; buildInputs = with perlPackages; [ perl DateCalc ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff251c87307..d65851e2d1ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2374,9 +2374,7 @@ with pkgs; btlejack = python3Packages.callPackage ../applications/radio/btlejack { }; - btrbk = callPackage ../tools/backup/btrbk { - asciidoc = asciidoc-full; - }; + btrbk = callPackage ../tools/backup/btrbk { }; buildpack = callPackage ../development/tools/buildpack { buildGoModule = buildGo117Module; From e68a2fffa1acd7833974bff541abb9257a74fbc8 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 1 Feb 2022 07:07:51 +0000 Subject: [PATCH 122/187] nixos/murmur: remove extra space, fix build after #152372 --- nixos/modules/services/networking/murmur.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index bbbe1e181bba..992678c43ebe 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -294,7 +294,7 @@ in systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target "]; + after = [ "network-online.target" ]; preStart = '' ${pkgs.envsubst}/bin/envsubst \ -o /run/murmur/murmurd.ini \ From e21fc555d66cfb5cf87434591af55cd2c0155f64 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 1 Feb 2022 07:08:44 +0000 Subject: [PATCH 123/187] nixos/vaultwarden: fix alias after #152372 --- nixos/modules/services/security/vaultwarden/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 71088fc4dcd8..fd459f70ccde 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -131,7 +131,7 @@ in { users.groups.vaultwarden = { }; systemd.services.vaultwarden = { - aliases = [ "bitwarden_rs" ]; + aliases = [ "bitwarden_rs.service" ]; after = [ "network.target" ]; path = with pkgs; [ openssl ]; serviceConfig = { From fb8b5c82bd518eb314f3a1702cb4be6eeec12014 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:07:52 +1000 Subject: [PATCH 124/187] seaweedfs: update vendorSha256 --- pkgs/applications/networking/seaweedfs/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 2254b4f34156..19409bde09d2 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-MsPvda+VaqO3tXH26nVukNWcJ1n+/n5Qk7BMr/DAVUk="; }; - vendorSha256 = "sha256-TYVBfjwaoEBKJmIHdwvj/5g4jYmnmJPE1mCL/yET1GQ="; + vendorSha256 = "sha256-gK4uHLNcperpG2OVdk7XKCUWCC87cyDBf8qigj/z3jA="; subPackages = [ "weed" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff251c87307..c648d54e1dce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9637,7 +9637,9 @@ with pkgs; skim = callPackage ../tools/misc/skim { }; - seaweedfs = callPackage ../applications/networking/seaweedfs { }; + seaweedfs = callPackage ../applications/networking/seaweedfs { + buildGoModule = buildGo117Module; + }; sec = callPackage ../tools/admin/sec { }; From be0b9a0b1d3d59f074276869f4d2838028114f8b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:08:40 +1000 Subject: [PATCH 125/187] shadowfox: update vendorSha256 --- pkgs/tools/networking/shadowfox/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index a75936a15204..4b270998a6b1 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; + vendorSha256 = "17m0ssfw9n3g2lkv63qajz3adrk5yp0c9hx66x7dl79snwqd49yg"; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c648d54e1dce..1a761a4c5587 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28756,7 +28756,9 @@ with pkgs; sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { }; + shadowfox = callPackage ../tools/networking/shadowfox { + buildGoModule = buildGo117Module; + }; shfmt = callPackage ../tools/text/shfmt { }; From b14d7dbf1d115dd23633ee64f416dcc6dc917506 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:09:13 +1000 Subject: [PATCH 126/187] skate: update vendorSha256 --- pkgs/applications/misc/skate/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index f7d3173b0f2a..1c5dcc7be546 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-rUOFx0ebZs3xmsSz9oFvjINaHp9gIe7E/5UoJJ47aZc="; }; - vendorSha256 = "sha256-3+KXirGwZvPhqCeglPqHJ9wEt6naJiRE3TAX7/jxJpk="; + vendorSha256 = "sha256-2jyhDSPO/Xg3xBCA93SMSlm7D+ze0MGbNtRpL82IAsk="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a761a4c5587..b1f236db3db2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26439,7 +26439,9 @@ with pkgs; shepherd = nodePackages."@nerdwallet/shepherd"; - skate = callPackage ../applications/misc/skate { }; + skate = callPackage ../applications/misc/skate { + buildGoModule = buildGo117Module; + }; slack = callPackage ../applications/networking/instant-messengers/slack { }; From 503c69b9cdf48029f051263e18b9f73445f407be Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:09:48 +1000 Subject: [PATCH 127/187] slides: update vendorSha256 --- pkgs/applications/misc/slides/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index a7c0f6f7047f..336271b6cb1e 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "06vb5xnss6ibgbsny6cadphfkzw8z3np5qgn3hp2wpf3hxgcnnvs"; + vendorSha256 = "11gxr22a24icryvglx9pjmqn5bjy8adfhh1nmjnd21nvy0nh4im7"; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1f236db3db2..b989573ff0f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9793,7 +9793,9 @@ with pkgs; # Not updated upstream since 2018, doesn't support qt newer than 5.12 sleepyhead = libsForQt512.callPackage ../applications/misc/sleepyhead {}; - slides = callPackage ../applications/misc/slides { }; + slides = callPackage ../applications/misc/slides { + buildGoModule = buildGo117Module; + }; slirp4netns = callPackage ../tools/networking/slirp4netns { }; From a92cc53bf2fcb1e60ed8b3bfa384507c9201a758 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:11:03 +1000 Subject: [PATCH 128/187] spire: update vendorSha256 --- pkgs/tools/security/spire/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index a6b3cc2259a6..412cba21f936 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "01ph9jzh18bnidrsbnnxm3gxh0cgfllnjvf7a5haqz51lm6a9pny"; }; - vendorSha256 = "17d845lwlbk19lsc937c22b1l0ikimhlagknm2i7mn8s8xrs57q8"; + vendorSha256 = "1fd1k5by4wcjmzfgi3gnrwnb38b0wa3w67kzjlx8s0nwapyfgx0b"; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b989573ff0f9..818feb0fac88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9862,7 +9862,9 @@ with pkgs; spicy = callPackage ../development/tools/spicy { }; - spire = callPackage ../tools/security/spire { }; + spire = callPackage ../tools/security/spire { + buildGoModule = buildGo117Module; + }; # to match naming of other package repositories spire-agent = spire.agent; spire-server = spire.server; From ab7ae50ce715d113d5212e02323106afba7a839b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:12:45 +1000 Subject: [PATCH 129/187] steampipe: update vendorSha256 --- pkgs/tools/misc/steampipe/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index 46e02ce9e462..554822ba8de3 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xLw3y9DYkei0MoErsMpSDhEK73lK9b13st+DqHvvhys="; }; - vendorSha256 = "sha256-MTSkWrutDKmsaTI9/L8wh3tWwra/F3+bP0RyVi4DMqE="; + vendorSha256 = "sha256-hqjjwYBVnuw7Bt2901tPIkfvYLy955IdeMbeSWTjtL0="; proxyVendor = true; # tests are failing for no obvious reasons diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 818feb0fac88..23df95433019 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3722,7 +3722,9 @@ with pkgs; statserial = callPackage ../tools/misc/statserial { }; - steampipe = callPackage ../tools/misc/steampipe { }; + steampipe = callPackage ../tools/misc/steampipe { + buildGoModule = buildGo117Module; + }; step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; From 0de459083cd932fb1982b87ed972ebd722cc61dd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:13:15 +1000 Subject: [PATCH 130/187] stern: update vendorSha256 --- pkgs/applications/networking/cluster/stern/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 959c40637fbe..3040b0f7b1bb 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-JredVk2hjnhoaJ9bT7D5k35skBNjcEBLa6GgO8dB2+U="; }; - vendorSha256 = "sha256-ybsDB54kkbONi3b9URtNUusHIdUfzymOpYlNHJz4i2A="; + vendorSha256 = "sha256-GMAYu/BCmDrCUfc0x9TVw6HXJu+eE8eigZoPqPodM3Q="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23df95433019..328dbef221be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33898,7 +33898,9 @@ with pkgs; steamcontroller = callPackage ../misc/drivers/steamcontroller { }; - stern = callPackage ../applications/networking/cluster/stern { }; + stern = callPackage ../applications/networking/cluster/stern { + buildGoModule = buildGo117Module; + }; streamripper = callPackage ../applications/audio/streamripper { }; From 296d999e7a3e3c398f9c19a4986e1cffd83052bd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:14:01 +1000 Subject: [PATCH 131/187] stripe-cli: update vendorSha256 --- pkgs/tools/admin/stripe-cli/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 04f66eaba95a..bbfeaf4867a2 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-F1+goZURc0f1dWV/PGxSVtqHkuePACq4+UzfMTEVJ0M="; }; - vendorSha256 = "sha256-Duu6lP87KKLC1eGIebycBSIPw7FN6BBxPexize9+jPE="; + vendorSha256 = "sha256-AsEem/KuA+jxioG96Ofn0te93fyZ9sebPkLPA+LAUkk="; subPackages = [ "cmd/stripe" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 328dbef221be..4d548fe4c8c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3734,7 +3734,9 @@ with pkgs; string-machine = callPackage ../applications/audio/string-machine { }; - stripe-cli = callPackage ../tools/admin/stripe-cli { }; + stripe-cli = callPackage ../tools/admin/stripe-cli { + buildGoModule = buildGo117Module; + }; bash-supergenpass = callPackage ../tools/security/bash-supergenpass { }; From 2df69394db1f5058732c1e875feaf4d0ba92be04 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 08:14:46 +1000 Subject: [PATCH 132/187] subfinder: update vendorSha256 --- pkgs/tools/networking/subfinder/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 7960324cbd71..d38200a53da4 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4="; }; - vendorSha256 = "sha256-jIU5UZdmBUqyjva+g7zoijPqHF2p3vzImEFQCP/CFwE="; + vendorSha256 = "sha256-lgbTfIsfYFSToCaDppMGaxfE1Bmk52eShQ+40g2VNw0="; modRoot = "./v2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d548fe4c8c7..db2a06bfa416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10099,7 +10099,9 @@ with pkgs; subsonic = callPackage ../servers/misc/subsonic { }; - subfinder = callPackage ../tools/networking/subfinder { }; + subfinder = callPackage ../tools/networking/subfinder { + buildGoModule = buildGo117Module; + }; subzerod = with python3Packages; toPythonApplication subzerod; From c4484815ccb23241223924e01e8d899677684f3d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 10:43:23 +1000 Subject: [PATCH 133/187] godu: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db2a06bfa416..c7b335edb72d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3219,7 +3219,9 @@ with pkgs; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; - godu = callPackage ../tools/misc/godu { }; + godu = callPackage ../tools/misc/godu { + buildGoModule = buildGo116Module; + }; goss = callPackage ../tools/misc/goss { }; From f3af30f2d5fdf0f9a4e32dd920c5b3e9d9eb873a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 10:43:31 +1000 Subject: [PATCH 134/187] gron: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7b335edb72d..5193de4f6e75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6192,7 +6192,9 @@ with pkgs; inherit (xorg) libXdmcp; }; - gron = callPackage ../development/tools/gron { }; + gron = callPackage ../development/tools/gron { + buildGoModule = buildGo116Module; + }; groonga = callPackage ../servers/search/groonga { }; From b6b61477b9db2407a3534127af524ed75283954a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 10:43:46 +1000 Subject: [PATCH 135/187] obfs4: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5193de4f6e75..f95966248c8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8373,7 +8373,9 @@ with pkgs; obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { }; + obfs4 = callPackage ../tools/networking/obfs4 { + buildGoModule = buildGo116Module; + }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; From 0fe62b99840c0bfa5c92f5814769ccf21d2e623e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 10:44:00 +1000 Subject: [PATCH 136/187] k2tf: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f95966248c8b..63d2111a1386 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15115,7 +15115,9 @@ with pkgs; buildGoModule = buildGo117Module; }; - k2tf = callPackage ../development/tools/misc/k2tf { }; + k2tf = callPackage ../development/tools/misc/k2tf { + buildGoModule = buildGo116Module; + }; kafka-delta-ingest = callPackage ../development/tools/kafka-delta-ingest { }; From 97adab03fb934c62a5e5e258f4f80d3abefc9853 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 10:44:22 +1000 Subject: [PATCH 137/187] mycorrhiza: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63d2111a1386..f58f1b72b035 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21459,7 +21459,9 @@ with pkgs; mullvad-vpn = callPackage ../applications/networking/mullvad-vpn { }; - mycorrhiza = callPackage ../servers/mycorrhiza { }; + mycorrhiza = callPackage ../servers/mycorrhiza { + buildGoModule = buildGo116Module; + }; myserver = callPackage ../servers/http/myserver { }; From af9f85dde9a48d50383f4534d43348ed2c8ec97a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 10:44:32 +1000 Subject: [PATCH 138/187] sampler: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f58f1b72b035..ec4139099403 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22016,7 +22016,9 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { }; + sampler = callPackage ../applications/misc/sampler { + buildGoModule = buildGo116Module; + }; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; }; From 8cd425836efeea5f3bc1dfb80d002ebc6ba69f93 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 11:24:38 +1000 Subject: [PATCH 139/187] spruce: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec4139099403..865fb28bffef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15641,7 +15641,9 @@ with pkgs; spooles = callPackage ../development/libraries/science/math/spooles {}; - spruce = callPackage ../development/tools/misc/spruce { }; + spruce = callPackage ../development/tools/misc/spruce { + buildGoModule = buildGo116Module; + }; sqlcheck = callPackage ../development/tools/database/sqlcheck { }; From 555291e05d0577ee6535261ce89fed1d742d6d9c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 14:32:56 +1000 Subject: [PATCH 140/187] vouch-proxy: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 865fb28bffef..b18e002676f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22138,7 +22138,9 @@ with pkgs; urserver = callPackage ../servers/urserver { }; - vouch-proxy = callPackage ../servers/vouch-proxy { }; + vouch-proxy = callPackage ../servers/vouch-proxy { + buildGoModule = buildGo116Module; + }; victoriametrics = callPackage ../servers/nosql/victoriametrics { }; From ae5c3e1831edf60916a9168b59ece37a922f7d6a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 14:33:23 +1000 Subject: [PATCH 141/187] textql: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b18e002676f5..1d1ff2086c89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10947,7 +10947,9 @@ with pkgs; testdisk-qt = testdisk.override { enableQt = true; }; - textql = callPackage ../development/tools/textql { }; + textql = callPackage ../development/tools/textql { + buildGoPackage = buildGo116Package; + }; html2text = callPackage ../tools/text/html2text { }; From 74e5bf97b46c16e7c8f9c298e13336f36dffa625 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 14:33:40 +1000 Subject: [PATCH 142/187] yajsv: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d1ff2086c89..e60253f27a57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11355,7 +11355,9 @@ with pkgs; yafaray-core = callPackage ../tools/graphics/yafaray-core { }; - yajsv = callPackage ../tools/misc/yajsv { }; + yajsv = callPackage ../tools/misc/yajsv { + buildGoModule = buildGo116Module; + }; yallback = callPackage ../development/tools/analysis/yallback { }; From b50023443b330bad3ddf84af02874682d0bf25d8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 14:43:21 +1000 Subject: [PATCH 143/187] goofys: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e60253f27a57..deb15375a0fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6064,7 +6064,9 @@ with pkgs; go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; - goofys = callPackage ../tools/filesystems/goofys { }; + goofys = callPackage ../tools/filesystems/goofys { + buildGoModule = buildGo116Module; + }; go-sct = callPackage ../tools/X11/go-sct { }; From d76465661f5df81684b2390226100450a5ad4035 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 15:45:07 +1000 Subject: [PATCH 144/187] aws-lambda-rie: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index deb15375a0fa..b60433aab611 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1433,7 +1433,9 @@ with pkgs; awslogs = callPackage ../tools/admin/awslogs { }; - aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { }; + aws-lambda-rie = callPackage ../tools/admin/aws-lambda-runtime-interface-emulator { + buildGoModule = buildGo116Module; + }; aws-env = callPackage ../tools/admin/aws-env { }; From b10dc967b65eecbd03a4b17a52ddcea44b0000b8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 15:46:10 +1000 Subject: [PATCH 145/187] utahfs: pin to go_1_16 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b60433aab611..07b4550f32e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5053,7 +5053,9 @@ with pkgs; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; - utahfs = callPackage ../applications/networking/utahfs { }; + utahfs = callPackage ../applications/networking/utahfs { + buildGoPackage = buildGo116Package; + }; wakeonlan = callPackage ../tools/networking/wakeonlan { }; From 91e5176566cfe33ffe4f4f0535da7fd1acd17c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Sun, 30 Jan 2022 12:42:28 +0100 Subject: [PATCH 146/187] otpauth: 0.4.0 -> 0.4.2 --- pkgs/tools/security/otpauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/otpauth/default.nix b/pkgs/tools/security/otpauth/default.nix index 1fb184d040f8..e4c42a83f045 100644 --- a/pkgs/tools/security/otpauth/default.nix +++ b/pkgs/tools/security/otpauth/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "otpauth"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "sha256-LGDeNkCxVLDVpwi5VFFL0DFsf8CexI7Nc5l+l2ASHaw="; + sha256 = "sha256-qSu0kGRi1es9OciN1s9Eh1Z3JkxbcKO8W5cAC7c7n0k="; }; vendorSha256 = "sha256-TU5crhmQAhSfURdfPe/xaa3RgGyc+UFn2E+jJ0flNsg="; From 5bd0ee00b80f6869e09368b3c49f0b06678e2657 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:03:47 +0800 Subject: [PATCH 147/187] convco: 0.3.3 -> 0.3.8 --- pkgs/development/tools/convco/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index 44445f86752a..f137cbd078bc 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -1,21 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, openssl, perl, pkg-config, libiconv, Security }: +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, cmake +, libiconv +, openssl +, pkg-config +, Security +}: rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.3"; + version = "0.3.8"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eWe7oTWl7QfIqq3GfMILi5S8zUi03ER1Mzfr8hqUvgw="; + sha256 = "sha256-sNVl+bbCj3vPYz4wKOaAHeaPCCubG4XvXZ+AZijhFJE="; }; - cargoSha256 = "sha256-RuClZ+ChP7d40e9nr1Lg8R0F7rbFbBse79V9Y1AQn3o="; + cargoSha256 = "sha256-FHiX9XpNjBFfs9fwi3Wzq7bAwRi7e/sqtji5WWPA5Qo="; - nativeBuildInputs = [ openssl perl pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; meta = with lib; { description = "A Conventional commit cli"; From 3543d229c573bdc18def59eb1b0751481b2c3e33 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Tue, 1 Feb 2022 08:29:58 +0000 Subject: [PATCH 148/187] headscale: Add kradalby as maintainer --- pkgs/servers/headscale/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/headscale/default.nix b/pkgs/servers/headscale/default.nix index 8057b56e9f39..68fba06affcc 100644 --- a/pkgs/servers/headscale/default.nix +++ b/pkgs/servers/headscale/default.nix @@ -44,6 +44,6 @@ buildGoModule rec { Headscale implements this coordination server. ''; license = licenses.bsd3; - maintainers = with maintainers; [ nkje jk ]; + maintainers = with maintainers; [ nkje jk kradalby ]; }; } From a8b2649149b38cc7d58bee319f6869ac5edec7d3 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:57:50 +0800 Subject: [PATCH 149/187] just: 0.10.5 -> 0.10.7 --- pkgs/development/tools/just/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 79c726c27964..410660cb459d 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,15 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.10.5"; + version = "0.10.7"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-PbWV8It/ubDbZooJdt/KWihnp221Pexs0U6zMa8KSMw="; + sha256 = "sha256-53dyy/jpmQCjOoZ9Wvec0iQMWKVVrt1WQDCGhXH53Mg="; }; - cargoSha256 = "sha256-VRfk6566SNmvCxtD9EdDxDdBvQuEfjPVggXzt4VoYRg="; + + cargoSha256 = "sha256-cDwuhOJ5/SFCQKJqmN6rPYahW/ctjE0hFr6SpgVzyis="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 45b5eaf288027b34128ca895f7f48c6bca752054 Mon Sep 17 00:00:00 2001 From: Max Hille Date: Tue, 1 Feb 2022 10:33:13 +0100 Subject: [PATCH 150/187] android-studio-stable: 2020.3.1.26 -> 2021.1.1.20 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ec4f9b59e919..268f3174b44d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit buildFHSUserEnv; }; stableVersion = { - version = "2020.3.1.26"; # "Android Studio Arctic Fox (2020.3.1)" - sha256Hash = "NE2FgjXtXTCVrCWRakqPhzAGn3blpf0OugJSKviPVBs="; + version = "2021.1.1.20"; # "Android Studio Bumblebee (2021.1.1)" + sha256Hash = "LwG5IDJBFpdlspDoTNpbi1togri2fvEOEDbkkiYvrJE="; }; betaVersion = { version = "2021.1.1.18"; # "Android Studio Bumblebee (2021.1.1) Beta 5" From eb294649b98df2e4afbe1c8607049408913671f6 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 13:12:17 +1000 Subject: [PATCH 151/187] nerdctl: 0.16.0 -> 0.16.1 https://github.com/containerd/nerdctl/releases/tag/v0.16.1 --- pkgs/applications/networking/cluster/nerdctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index df7d2bea6343..bcbc8439c2f2 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA="; + sha256 = "sha256-s116SwgOj5xzfoz/iw17xubEKzPUx912QHk1+C6YhE8="; }; - vendorSha256 = "sha256-Gk3KBHLux7d7olS16liPYO7yYL2wryWLX5bKgCLEhB8="; + vendorSha256 = "sha256-VvK4pHmV1WkIzQDHiFVzjurigP3F4xYl0DJCnImSx3s="; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 550b235c9c79f3303501f330eb602dc5ca8dcb9a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 19:33:29 +1000 Subject: [PATCH 152/187] air: update vendorSha256 --- pkgs/development/tools/air/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 66f6bdb37a24..52decaeb5ae8 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-8VuCZoAV54TG8MiF6n5O8ZStGujfJ/7w95BYhe5/7dE="; }; - vendorSha256 = "sha256-gUZPX1ymyzf0IuCpK8Nsq2UKPV5f9SAReJ6YxgpxpqE="; + vendorSha256 = "sha256-u/v6RnzBU+zQEy3jjVITjUQiU7AT3wZoeeRFF+KqOvI="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07b4550f32e8..48bb05f7b604 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22910,7 +22910,9 @@ with pkgs; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; - air = callPackage ../development/tools/air { }; + air = callPackage ../development/tools/air { + buildGoModule = buildGo117Module; + }; delve = callPackage ../development/tools/delve { }; From 3e3bf124161fd9c9d5825b7c359a9c61614cd792 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 19:33:30 +1000 Subject: [PATCH 153/187] dbmate: update vendorSha256 --- pkgs/development/tools/database/dbmate/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index d66950829f9c..ae25f2656641 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-j7u8TidiuaA5SbXoD+p23wwTsePi6/hzNdVS5IJMEh0="; }; - vendorSha256 = "sha256-GEJ8n0VN9Qt73dRj7Qjx1DAomSy+hQEH74Dx2h/hv9M="; + vendorSha256 = "sha256-t8ga2KrahzdDBu33vv1ETB6hVoNpdxjPfiYuvLR2m5g="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48bb05f7b604..b553430a6a5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11917,7 +11917,9 @@ with pkgs; dasm = callPackage ../development/compilers/dasm { }; - dbmate = callPackage ../development/tools/database/dbmate { }; + dbmate = callPackage ../development/tools/database/dbmate { + buildGoModule = buildGo117Module; + }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; From fabcd012ee2e0540a7b9498eb61d5e6094b98541 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Mon, 31 Jan 2022 20:21:43 +0100 Subject: [PATCH 154/187] cosign: 1.5.0 -> 1.5.1 https://github.com/sigstore/cosign/releases/tag/v1.5.1 --- pkgs/tools/security/cosign/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index fbbd26dea684..54beab643a80 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mxDLF9DQKySDR1c7jD/D0/xI+/R8a/ZlukliT/R4wCg="; + sha256 = "sha256-hQFkbHOmtk0SqFSPw1+5nCvjq9cKsGzFPtK4jXDrubQ="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-xqwwvVGXWFFKKBtH4a/+akFSlZ2hCOC1v1sO0d2p9fs="; + vendorSha256 = "sha256-d3aOX4iMlhlxgYbqCHCIFKXunVha0Fw4ZBmy4OA6EhI="; excludedPackages = "\\(sample\\|webhook\\|help\\)"; @@ -26,6 +26,9 @@ buildGoModule rec { postPatch = '' rm pkg/cosign/tuf/client_test.go # Require network access + rm internal/pkg/cosign/fulcio/signer_test.go # Require network access + rm internal/pkg/cosign/rekor/signer_test.go # Require network access + rm pkg/cosign/kubernetes/webhook/validator_test.go # Require network access ''; postInstall = '' From 919e13c2380c7207b602710eb5a55c870034a39e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Feb 2022 11:39:25 +0100 Subject: [PATCH 155/187] teensyduino: 1.55 - > 1.56 --- .../embedded/arduino/arduino-core/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-core/default.nix b/pkgs/development/embedded/arduino/arduino-core/default.nix index 44c20e12004b..71f3c884868b 100644 --- a/pkgs/development/embedded/arduino/arduino-core/default.nix +++ b/pkgs/development/embedded/arduino/arduino-core/default.nix @@ -88,14 +88,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-I+PvfGc5F8H/NJOGRa18z7dKyKcO8I8Cg7Tj5yxkYAQ="; }; - teensyduino_version = "155"; + teensyduino_version = "156"; teensyduino_src = fetchurl { url = "https://www.pjrc.com/teensy/td_${teensyduino_version}/TeensyduinoInstall.${teensy_architecture}"; sha256 = { - linux64 = "sha256-DypCbCm4RKYgnFJRwoHyPht6dFG48YvWM4RzEDdJE6U="; - linux32 = "sha256-MJ4xsTAZPO8BhO/VWSjBAjBVLrKM+3PNi1fiF8dsuVQ="; - linuxarm = "sha256-x5JdYflLThohos9RTAWt4XrzvksB7VWfXTKqgXZ1d6Q="; - linuxaarch64 = "sha256-N18nvavEMhvt2jOrdI+tsXtbWIdsj1n4aMVeaaBlcT4="; + linux64 = "sha256-4DbhmmYrx+rCBpDrYFaC0A88Qv9UEeNlQAkFi3zAstk="; + linux32 = "sha256-DlRPOtDxmMPv2Qzhib7vNZdKNZCxmm9YmVNnwUKXK/E="; + linuxarm = "sha256-d+DbpER/4lFPcPDFeMG5f3WaUGn8pFchdIDo7Hm0XWs="; + linuxaarch64 = "sha256-8keQzhWq7QlAGIbfHEe3lfxpJleMMvBORuPaNrLmM6Y="; }.${teensy_architecture} or (throw "No arduino binaries for ${teensy_architecture}"); }; # Used because teensyduino requires jars be a specific size From 93a89cfa3f87f0a78d4970d04079277a29624744 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 20:43:41 +1000 Subject: [PATCH 156/187] fuse-overlayfs: 1.8.1 -> 1.8.2 https://github.com/containers/fuse-overlayfs/releases/tag/v1.8.2 --- pkgs/tools/filesystems/fuse-overlayfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 7a7f442878ca..0e6f5ad88346 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0vmcn3AOASjN61QzxxGYpPMWlukanh8+vbZQcFpU/vs="; + sha256 = "sha256-FqlSMTCKtcG2HOA6KaPYArK/rxHG9eJSQmNOWIzJzCs="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 66b95509afd039fa55d41afea9fe9de3acd0ec85 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 22:00:33 +1000 Subject: [PATCH 157/187] gh: 2.4.0 -> 2.5.0 https://github.com/cli/cli/releases/tag/v2.5.0 --- .../version-management/git-and-tools/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 59aba526c3fd..21781c423b2b 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RFKS6fHh+rX5S31MvAQpJUNgaI6loiUw0FNkdsMFqlQ="; + sha256 = "sha256-zQHFLXcsIFMqMCJp7+3Abc0WbSWKJyfAAE+TTJGRRmY="; }; - vendorSha256 = "sha256-6owFzn+NAhlHjTJEur1H5oZY87ZoptvAnF2w6kafix8="; + vendorSha256 = "sha256-yMc3Czo7gTb2ZSWjj0yyId+qyro4mU1C+FOgEjZEhBY="; nativeBuildInputs = [ installShellFiles ]; From 4cc06b46aeaaa8c0c77c86e7dea388e03f169b81 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Feb 2022 13:08:24 +0100 Subject: [PATCH 158/187] mqttui: 0.13.0 -> 0.14.0 --- pkgs/tools/networking/mqttui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index 7945cd168d42..52c481e3c7e1 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "EdJoPaTo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-taGpVLO9K5VmthWadstQcujcLHTb3fhEWDxKGd3Pj+E="; + sha256 = "sha256-ScB0zJXyk8bPEDCxdymMqNmlhe/skNHr6IRmJpme+qQ="; }; - cargoSha256 = "sha256-aAMDl8GZ+XqA4uBiDm2eHQsNFiqCrMBO66X0ruEjpJg="; + cargoSha256 = "sha256-736UYTCs4d1DcpHWl5AejEaW+SYzlgElozC3t/RU41g="; buildInputs = lib.optional stdenv.isDarwin Security; From 6c568480bef775f413205a514a9e37b048aa379b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 12:12:03 +0000 Subject: [PATCH 159/187] wtf: 0.40.0 -> 0.41.0 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index a012e9ba6981..e29d58039a04 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0hd5gnydxfncsmm7c58lvhkpnyxknvicc8f58xfh74azf363wcvm"; + sha256 = "sha256-Y8Vdh6sMMX8pS4zIuOfcejfsOB5z5mXEpRskJXQgU1Y="; }; - vendorSha256 = "166dpxli2qyls4b9s0nv9vbwiwkp7jh32lkm35qz6s5w9zp6yjfb"; + vendorSha256 = "sha256-UE7BYal8ycU7mM1TLJMhoNxQKZjtsO9rJ+YXmLiOSk0="; doCheck = false; From 78735f7c27ace13d8f5c848d7149f3b4e980a3b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 1 Feb 2022 13:18:51 +0100 Subject: [PATCH 160/187] duf: 0.7.0 -> 0.8.0 --- pkgs/tools/misc/duf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 8d01cd2531aa..9df8b37f7032 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duf"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "muesli"; repo = "duf"; rev = "v${version}"; - sha256 = "sha256-Usdu7f3XPTIT39H23vfP0XBlvNPgPA+3BMyOzFOyLHQ="; + sha256 = "sha256-FZ4NplvCc1c+wPy1NSs2qwfWVtCPNHs6JquubGnwiEY="; }; - vendorSha256 = "sha256-6PV/v+rk63FIR2M0Q7EzqjVvWIwHtK6TQpEYxkXLQ50="; + vendorSha256 = "sha256-VLGsfazTD7hSNXPxuGJJwyqvUlqk5wuz8NqFHs/jyZc="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From c86e65ddee099b7c4e02bfd9cb785f0962cb1711 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 1 Feb 2022 13:33:11 +0100 Subject: [PATCH 161/187] python39Packages.shtab: fix tests (#156458) --- pkgs/development/python-modules/shtab/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index efac8148a72a..78e160058b23 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , setuptools-scm +, bashInteractive }: buildPythonPackage rec { @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + bashInteractive pytest-timeout pytestCheckHook ]; @@ -37,11 +39,6 @@ buildPythonPackage rec { --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" ''; - disabledTests = [ - # bash tests are failing - "bash" - ]; - pythonImportsCheck = [ "shtab" ]; From e6ba932348b878fed511048c503cdc1d133ddae7 Mon Sep 17 00:00:00 2001 From: Sam Hofius Date: Fri, 28 Jan 2022 01:49:48 -0700 Subject: [PATCH 162/187] keybase, kbfs: 5.8.1 -> 5.9.1 --- pkgs/tools/security/keybase/default.nix | 16 +++++++++------- pkgs/tools/security/keybase/kbfs.nix | 13 ++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 058ed8d1487a..bf39c397de3a 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,15 +1,15 @@ -{ stdenv, substituteAll, lib, buildGoPackage, fetchFromGitHub +{ stdenv, substituteAll, lib, buildGoModule, fetchFromGitHub , AVFoundation, AudioToolbox, ImageIO, CoreMedia , Foundation, CoreGraphics, MediaToolbox -, gnupg +, gnupg, ... }: -buildGoPackage rec { +buildGoModule rec { pname = "keybase"; - version = "5.8.1"; + version = "5.9.1"; - goPackagePath = "github.com/keybase/client"; - subPackages = [ "go/kbnm" "go/keybase" ]; + modRoot = "go"; + subPackages = [ "kbnm" "keybase" ]; dontRenameImports = true; @@ -17,8 +17,9 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "sha256-SeBZtrRsWTv5yBBsp18daKCNAr70OalH3shlKf+aiEU="; + sha256 = "sha256-WAI/rl6awVLbXqdqYAq8fyABAO2qet+GYucuiwClylI="; }; + vendorSha256 = "sha256-ZZTM1s/kFHkCjnaDYuP7xCrkW2an3I6kvcMXMy63ySE="; patches = [ (substituteAll { @@ -30,6 +31,7 @@ buildGoPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ AVFoundation AudioToolbox ImageIO CoreMedia Foundation CoreGraphics MediaToolbox ]; tags = [ "production" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://www.keybase.io/"; diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index dc49f9d9e77d..6ee68ac6ca8c 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -1,16 +1,15 @@ -{ lib, buildGoPackage, fetchFromGitHub, keybase }: +{ lib, buildGoModule, fetchFromGitHub, keybase }: -buildGoPackage { +buildGoModule { pname = "kbfs"; - inherit (keybase) src version; + inherit (keybase) src version vendorSha256; - goPackagePath = "github.com/keybase/client"; - subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/redirector" "go/kbfs/kbfsgit/git-remote-keybase" ]; - - dontRenameImports = true; + modRoot = "go"; + subPackages = [ "kbfs/kbfsfuse" "kbfs/redirector" "kbfs/kbfsgit/git-remote-keybase" ]; tags = [ "production" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://keybase.io/docs/kbfs"; From 443dae66f531d9844045e999606a6eee64c52a0c Mon Sep 17 00:00:00 2001 From: Sam Hofius Date: Fri, 28 Jan 2022 01:50:46 -0700 Subject: [PATCH 163/187] keybase-gui: 5.8.1 -> 5.9.0 --- pkgs/tools/security/keybase/gui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 8912961e3520..073d5ccd4841 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20210930160723.fefa22edc1"; + versionSuffix = "20220120174718.95a3939b3a"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.8.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.9.0"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "cqbGvnJ6wx5boVe78Ju8CimH1H08DfkM5nmwbV0uKG0="; + sha256 = "sha256-Wdl5pZFIz+mDkkE0EDpLGH/eGWYoBbLV05LYJgkwpI4="; }; nativeBuildInputs = [ From 0806849d3f3f209a246de45bc669a80d11afc935 Mon Sep 17 00:00:00 2001 From: Sam Hofius Date: Fri, 28 Jan 2022 01:51:06 -0700 Subject: [PATCH 164/187] Add shofius to keybase maintainers --- pkgs/tools/security/keybase/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 2 +- pkgs/tools/security/keybase/kbfs.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index bf39c397de3a..41853ba47343 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne ]; + maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne shofius ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 073d5ccd4841..d5f04099f756 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne ]; + maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne shofius ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 6ee68ac6ca8c..52fedf3feef4 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -15,7 +15,7 @@ buildGoModule { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; platforms = platforms.unix; - maintainers = with maintainers; [ avaq rvolosatovs bennofs np ]; + maintainers = with maintainers; [ avaq rvolosatovs bennofs np shofius ]; license = licenses.bsd3; }; } From 6b3d3c736b2df1045e319389cd9a4499182a7a68 Mon Sep 17 00:00:00 2001 From: Sam Hofius Date: Mon, 31 Jan 2022 12:22:12 -0700 Subject: [PATCH 165/187] Remove '...' from args per suggestion --- pkgs/tools/security/keybase/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 41853ba47343..d8773080b9d6 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -1,7 +1,6 @@ { stdenv, substituteAll, lib, buildGoModule, fetchFromGitHub , AVFoundation, AudioToolbox, ImageIO, CoreMedia -, Foundation, CoreGraphics, MediaToolbox -, gnupg, ... +, Foundation, CoreGraphics, MediaToolbox, gnupg }: buildGoModule rec { From 5150255146bd1abbad901a3b2881ab90a2130d1a Mon Sep 17 00:00:00 2001 From: Paul Grandperrin Date: Tue, 1 Feb 2022 13:55:03 +0100 Subject: [PATCH 166/187] (vscode|vscodium)-fhs: fix missing desktop icon --- pkgs/applications/editors/vscode/generic.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 72c753745168..45a86a73d029 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -161,12 +161,9 @@ let krb5 ]) ++ additionalPkgs pkgs; - # restore desktop item icons + # symlink shared assets, including icons and desktop entries extraInstallCommands = '' - mkdir -p "$out/share/applications" - for item in ${unwrapped}/share/applications/*.desktop; do - ln -s "$item" "$out/share/applications/" - done + ln -s "${unwrapped}/share" "$out/" ''; runScript = "${unwrapped}/bin/${executableName}"; From 1c06243454d8cd862a9579dd964bdaeee8cc3dc0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 13:13:04 +0000 Subject: [PATCH 167/187] vnote: 3.12.0 -> 3.12.888 --- pkgs/applications/office/vnote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/vnote/default.nix b/pkgs/applications/office/vnote/default.nix index 435474fbdce8..f548cf01fcd5 100644 --- a/pkgs/applications/office/vnote/default.nix +++ b/pkgs/applications/office/vnote/default.nix @@ -8,14 +8,14 @@ mkDerivation rec { pname = "vnote"; - version = "3.12.0"; + version = "3.12.888"; src = fetchFromGitHub { owner = "vnotex"; repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-hlB/G7qFYbkdIk9f2N+q1Do3V1ON8UUQZ6AUmBfK8x0="; + sha256 = "sha256-l9oFixyEM0aAfvrC5rrQMzv7n8rUHECRzhuIQJ/szjc="; }; nativeBuildInputs = [ From f5362fe4f4b3820d5298d05638da1f4c6759ae54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 15:00:06 +0000 Subject: [PATCH 168/187] trivy: 0.22.0 -> 0.23.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 957ad7f51efc..47320eff7798 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DH4vr6WiGwzT9zTMs/UqVoCHhpOSoT5t8P9plTPt8ZQ="; + sha256 = "sha256-6eOoFZ2ms1upnbO4brKYKBSPw/9cnQT1Cz/0A4dwoxc="; }; - vendorSha256 = "sha256-1m3izHfxMUvUiz21NRjqdNS95sXf8Rwlu5TuQ411190="; + vendorSha256 = "sha256-ZHVcLmjz7cfL5CjUwCEoWr5fgWZmNsCzHL83Mr+p7kA="; excludedPackages = "misc"; From 92e3901b4c0b12543d863ca4bffd7754aed8a5b5 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 1 Feb 2022 09:04:38 -0600 Subject: [PATCH 169/187] cozette: 1.8.3 -> 1.13.0 (#157590) https://github.com/slavfox/Cozette/blob/v.1.13.0/CHANGELOG.md (including skipped releases) --- pkgs/data/fonts/cozette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 3550facfc114..1b0b03383664 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.8.3"; + version = "1.13.0"; in fetchzip rec { name = "Cozette-${version}"; url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx"; + sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; postFetch = '' mkdir -p $out/share/fonts From ac7b6283ed64c6ce15649f66c53fa581e2a7fc77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 15:08:08 +0000 Subject: [PATCH 170/187] trealla: 1.12.0 -> 1.20.31 --- pkgs/development/interpreters/trealla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix index 6c6268011a73..d6dc01348a1d 100644 --- a/pkgs/development/interpreters/trealla/default.nix +++ b/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "1.12.0"; + version = "1.20.31"; src = fetchFromGitHub { owner = "infradig"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-5gMf62WSGf46Bg8CaI9weSMRjrdGiuxtaDV9FrS2xO8="; + sha256 = "sha256-Yol+bbxC5cCtCIZxP5Sa8R3ev1LAopc/oQa6Zd1nS8A="; }; postPatch = '' From 02a96ad660543f7f9c900e12aae036118a23d00e Mon Sep 17 00:00:00 2001 From: rembo10 Date: Tue, 1 Feb 2022 20:51:02 +0530 Subject: [PATCH 171/187] sickgear: 0.25.24 -> 0.25.26 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index df2e9fe03ab0..bed8da0488b4 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.24"; + version = "0.25.26"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-x6v7CKJkN6gt9askpp/W0CVCKvRaHLBXbagtC+rVNVc="; + sha256 = "153zd0yq39vmh00ydw42yw8dx18cy3as36xml228hq244cxypkwp"; }; dontBuild = true; From 0bcbf67220c9a6e9fd5becf50209b38cb1ceb772 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 3 Jan 2022 21:02:39 -0800 Subject: [PATCH 172/187] sawjap: make build src name independent (cherry picked from commit a78ad036e27a34fa99c4a6600572c3c50ad0d01f) --- pkgs/development/tools/java/sawjap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/java/sawjap/default.nix b/pkgs/development/tools/java/sawjap/default.nix index 13532c48d401..b4c682bbd220 100644 --- a/pkgs/development/tools/java/sawjap/default.nix +++ b/pkgs/development/tools/java/sawjap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit (sawja) src version; - sourceRoot = "source/test"; + prePatch = "cd test"; buildInputs = [ ocaml findlib sawja ]; From 4c13b318017e0e3c244d1e0e1f552d8239b1fda7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 1 Feb 2022 09:18:12 -0800 Subject: [PATCH 173/187] linux/kernel/common-config.nix: mark FORTIFY_SOURCE as optional You cannot use it on clang-built kernels due to some LLVM bugs, namely: * https://bugs.llvm.org/show_bug.cgi?id=50322 * https://bugs.llvm.org/show_bug.cgi?id=41459 so Kconfig forces it off, causing generate-config.pl to explode since it is not marked optional. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 830ddf49810a..34e1b10b32a8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -452,7 +452,7 @@ let }; security = { - FORTIFY_SOURCE = whenAtLeast "4.13" yes; + FORTIFY_SOURCE = whenAtLeast "4.13" (option yes); # https://googleprojectzero.blogspot.com/2019/11/bad-binder-android-in-wild-exploit.html DEBUG_LIST = yes; From 2058ddfe41df8386a58c63831aa0bf9c68a82be7 Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Tue, 1 Feb 2022 12:26:28 -0500 Subject: [PATCH 174/187] clojure-lsp: 2022.01.22 -> 2022.02.01 --- .../tools/misc/clojure-lsp/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 7bf32a13ce68..4841c48d0ee2 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,28 +2,20 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.01.22-01.31.09"; + version = "2022.02.01-16.53.14"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-xQSOJRKKjX3AfQsYe4UNhFlLgWPkoY8NOPXCO1oc3BI="; + sha256 = "sha256-VyDnDlK40Sj/0cethclnRlKc5tOentAEUzjDOqbItpo="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "sha256-le0+ZmGyhM/UfGUV05FHyx5PlARxL/T2aC8UhiPYjxw"; + sha256 = "sha256-gIG8sjf55aRo4xI/RFrxhzLSD6RHzn/YGG9+gWrXcgE="; }; - # https://github.com/clojure-lsp/clojure-lsp/blob/2022.01.22-01.31.09/cli/graalvm/native-unix-compile.sh#L18-L27 - # Needs to be inject on `nativeImageBuildArgs` inside shell environment, - # otherwise we can't expand to the value set in `mktemp -d` call - preBuild = '' - export DTLV_LIB_EXTRACT_DIR="$(mktemp -d)" - nativeImageBuildArgs+=("-H:CLibraryPath=$DTLV_LIB_EXTRACT_DIR") - ''; - extraNativeImageBuildArgs = [ "--no-fallback" "--native-image-info" @@ -68,8 +60,5 @@ buildGraalvmNativeImage rec { homepage = "https://github.com/clojure-lsp/clojure-lsp"; license = licenses.mit; maintainers = with maintainers; [ ericdallo babariviere ]; - # Depends on datalevin that is x86_64 only - # https://github.com/juji-io/datalevin/blob/bb7d9328f4739cddea5d272b5cd6d6dcb5345da6/native/src/java/datalevin/ni/Lib.java#L86-L102 - broken = !stdenv.isx86_64; }; } From 7510d8e842a461f946be1515b0e030c88776150a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 14:36:31 +0000 Subject: [PATCH 175/187] gigalixir: 1.2.4 -> 1.2.5 --- pkgs/development/python-modules/gigalixir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gigalixir/default.nix b/pkgs/development/python-modules/gigalixir/default.nix index aa5512d99131..99a878700d7f 100644 --- a/pkgs/development/python-modules/gigalixir/default.nix +++ b/pkgs/development/python-modules/gigalixir/default.nix @@ -16,11 +16,11 @@ buildPythonApplication rec { pname = "gigalixir"; - version = "1.2.4"; + version = "1.2.5"; src = fetchPypi { inherit pname version; - sha256 = "894b7e5bef30abc2c003e6df47f7758de5649b6f593e33926fcd398cc88d9ce2"; + sha256 = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; }; postPatch = '' From 1705882eb6d2c716e6ce500f32e92b0055d3a5c2 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 26 Jan 2022 22:22:16 +0100 Subject: [PATCH 176/187] tree-sitter-org-nvim: renaming of tree-sitter-org-nvim There are likely to be several "org" grammars so suffixing them seems better in the long term see https://github.com/NixOS/nixpkgs/pull/145940 I haven't provided an alias since this grammar was introduced a few days ago only. --- pkgs/development/tools/parsing/tree-sitter/default.nix | 3 ++- .../development/tools/parsing/tree-sitter/grammars/default.nix | 2 +- .../{tree-sitter-org.json => tree-sitter-org-nvim.json} | 0 pkgs/development/tools/parsing/tree-sitter/update.nix | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/tools/parsing/tree-sitter/grammars/{tree-sitter-org.json => tree-sitter-org-nvim.json} (100%) diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index e81e5e48bdf6..dfed3c91bc5e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -58,7 +58,7 @@ let let change = name: grammar: callPackage ./grammar.nix { } { - language = name; + language = if grammar ? language then grammar.language else name; inherit version; source = fetchGrammar grammar; location = if grammar ? location then grammar.location else null; @@ -67,6 +67,7 @@ let grammars = grammars' // { tree-sitter-ocaml = grammars'.tree-sitter-ocaml // { location = "ocaml"; }; } // { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } // + { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "org"; }; } // { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; }; in diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index a001573b4827..eb2275d2724c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -54,7 +54,7 @@ tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; - tree-sitter-org = lib.importJSON ./tree-sitter-org.json; + tree-sitter-org-nvim = lib.importJSON ./tree-sitter-org-nvim.json; tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json; tree-sitter-php = lib.importJSON ./tree-sitter-php.json; tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json similarity index 100% rename from pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.json rename to pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index eae6dd081355..166154f7481a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -304,7 +304,7 @@ let orga = "victorhqc"; repo = "tree-sitter-prisma"; }; - "tree-sitter-org" = { + "tree-sitter-org-nvim" = { orga = "milisims"; repo = "tree-sitter-org"; }; From 1bbb08976fc68c57a30b9f67dfc9902bdd4f9cde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jan 2022 14:40:15 +0000 Subject: [PATCH 177/187] samba: 4.15.2 -> 4.15.3 (cherry picked from commit 886235de96e2bdd5d29bd1b7bff9f7358c7ff329) --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2001ae005271..f70c33156c3a 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.2"; + version = "4.15.3"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-YoHXxqjEn3mQqfJJpmeEs1GA/iSVV+8RR82KbRZqIRM="; + sha256 = "sha256-UZOZQEORVQNFhGdo6k3Q/n/LBOIMK4kbXusC5VVBN9s="; }; outputs = [ "out" "dev" "man" ]; From d4aac5cd60c14f9ed1dd97c2138cbcd56fe24dd8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 1 Feb 2022 16:19:51 +0100 Subject: [PATCH 178/187] samba: 4.15.3 -> 4.15.5 https://www.openwall.com/lists/oss-security/2022/02/01/1 Fixes: CVE-2021-44141, CVE-2021-44142, CEV-2022-0336 (cherry picked from commit da86fe2cd69c3b12b86040f349fe87a63e4f541c) --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index f70c33156c3a..d32a545069de 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.15.3"; + version = "4.15.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-UZOZQEORVQNFhGdo6k3Q/n/LBOIMK4kbXusC5VVBN9s="; + sha256 = "sha256-aRFeM4MZN7pRUb4CR5QxR3Za7OZYunQ/RHQWcq1o0X8="; }; outputs = [ "out" "dev" "man" ]; From 7bea56b4253a3232a44249b3dd7d2a82795ef7fc Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Sat, 13 Nov 2021 04:47:23 +0000 Subject: [PATCH 179/187] stdenv/check-meta: add note for Flake usage Flake users that use a command like `nix build nixpkgs#hello` on a broken/insecure package will not be able to use an environment variable to override that behavior, unless they pass `--impure` to the command. Co-authored-by: pkharvey --- pkgs/stdenv/generic/check-meta.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 7a70accb723f..44caa6838e8d 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -119,13 +119,20 @@ let } ''; + # flakeNote will be printed in the remediation messages below. + flakeNote = " + Note: For `nix shell`, `nix build`, `nix develop` or any other Nix 2.4+ + (Flake) command, `--impure` must be passed in order to read this + environment variable. + "; + remediate_allowlist = allow_attr: rebuild_amendment: attrs: '' a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable for a single invocation of the nix tools. $ export ${remediation_env_var allow_attr}=1 - + ${flakeNote} b) For `nixos-rebuild` you can set { nixpkgs.config.allow${allow_attr} = true; } in configuration.nix to override this. @@ -148,7 +155,7 @@ let variable for a single invocation of the nix tools: $ export NIXPKGS_ALLOW_INSECURE=1 - + ${flakeNote} b) for `nixos-rebuild` you can add ‘${getName attrs}’ to `nixpkgs.config.permittedInsecurePackages` in the configuration.nix, like so: From f1e012775f644bc09839efb8ff907fc05e2cf9d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 1 Feb 2022 20:57:05 +0100 Subject: [PATCH 180/187] chisel: 1.7.6 -> 1.7.7 (#157492) --- pkgs/tools/networking/chisel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index 9df5625c2355..d7dac44b2802 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "chisel"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hUurgwbSUcNZiSi+eVTG/Ija/yxPeWuvEE5pUiG7Dls="; + sha256 = "sha256-3EaVUGcwkJWX0FxIaHddUehJIdbxAPfBm8esXKCUuhM="; }; - vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; + vendorSha256 = "sha256-Oko9nduKW76NIUCVyF0lPzEH+TFT1el9VGIbm5lQXtM="; ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; From d45c0619184fe4dcacb9b84af22f0e1e2fced76b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Feb 2022 21:08:01 +0100 Subject: [PATCH 181/187] i3status-rust: 0.21.2 -> 0.21.4 ChangeLog: https://github.com/greshake/i3status-rust/blob/v0.21.4/NEWS.md#i3status-rust-0214 --- pkgs/applications/window-managers/i3/status-rust.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 4168a7f3411d..803d5154bce5 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -8,24 +8,25 @@ , notmuch , openssl , ethtool +, lm_sensors }: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.21.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m0Yq6uxo4FAmwvUK/b3zTb79AT9h/fgdm4Q9sf1DYe0="; + sha256 = "sha256-D/+SDKkrYfdzFw+cNBJrCshpDuFSLbr70jvFMbX3B0w="; }; - cargoSha256 = "sha256-J+829GzZ4lKrn3MSip/weaI8pExBt3uex86bKZOofg4="; + cargoSha256 = "sha256-tNwf2ShnzoSrb1R/g0hOGwQMulWYXyVCILU3Jb+Sfpg="; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ dbus libpulseaudio notmuch openssl ]; + buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ]; buildFeatures = [ "notmuch" From 36c2b066a3136ee4d681af116efd0d37064abce1 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 1 Feb 2022 08:25:23 +0100 Subject: [PATCH 182/187] goreleaser: 1.3.1 -> 1.4.1 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 5c1ef4b9f42e..3f480a0ec5e4 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QFb702/v+fSzPWJ+hIGAXqVYfLpecA4sOFM+r8QvdYE="; + sha256 = "sha256-pEZ7H7WOPpzCGMLPgyfVJudamSWynoB5qnZSbVXj5uk="; }; - vendorSha256 = "sha256-EPm+QNGCY3miuhdMETl98c9SQhcqvHbYeLUQQeI/IsM="; + vendorSha256 = "sha256-7c5bd5pEulcr1mpdEUr2tDZNwjRkjqXOLiu+2x5/uFs="; ldflags = [ "-s" From d49e8eca342939c6334a4454ac12ec706e675883 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Jan 2022 20:45:30 +0100 Subject: [PATCH 183/187] kubescape: 2.0.143 -> 2.0.144 --- pkgs/tools/security/kubescape/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index a75c669f89f1..9adf63ea160f 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.143"; + version = "2.0.144"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - hash = "sha256-ylmH3vQTWT9I57J+Q771PG/r6t8t3P6zNC+sGIx3C1A="; + hash = "sha256-X/r39lvNSLZ4SG/x5Woj7c0fEOp8USyeTWYihaY0faU="; }; nativeBuildInputs = [ From 34bc1f1477f441fca470e128b84395a0f71117ec Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 1 Feb 2022 15:37:51 +0800 Subject: [PATCH 184/187] eksctl: 0.76.0 -> 0.82.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index ffb7b76cd48a..5e038b70d543 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.76.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-KhAS8JUM6dobcSJ/QaRhxv2jNpn6AFqiDRCdxeKHwZE="; + sha256 = "sha256-nem090YUHi80P2akWRVuswJxhQ5mIP9fHWVAY4k2LFE="; }; - vendorSha256 = "sha256-bUbStgIJeqzBkoSffJ8ZvqVtOMJ/mqxIIB/Fq9GhoXc="; + vendorSha256 = "sha256-+G3utnWjAilHx9u9P0DtaDf09UT/VqTe7yO/k5o/zMc="; doCheck = false; From 27f8ac106dbf987c567708dbf7efb0641bc8a808 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 1 Feb 2022 14:49:29 -0800 Subject: [PATCH 185/187] ugrep: 3.6.0 -> 3.7.1 * ugrep: 3.6.0 -> 3.7.0 (#157094) * ugrep: 3.7.0 -> 3.7.1 Co-authored-by: Renaud --- 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 5757db1e8719..8fc299fa6c00 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.6.0"; + version = "3.7.1"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hEP7Oe1CNLEvSfUIXoXwRJUG4kIkb2f1549cZRXK+NY="; + hash = "sha256-5ZlZ/nCUOiyOWagF1Vla945d7zKbMsHp56ZE4HwdEP4="; }; buildInputs = [ From 261f3dba3a936cc2cbc61587274d68a9e43b9a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Jan 2022 17:06:20 +0000 Subject: [PATCH 186/187] libsForQt5.mapbox-gl-qml: 1.7.6 -> 1.7.7.1 --- pkgs/development/libraries/mapbox-gl-qml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mapbox-gl-qml/default.nix b/pkgs/development/libraries/mapbox-gl-qml/default.nix index 87e765766227..49a7f26220dd 100644 --- a/pkgs/development/libraries/mapbox-gl-qml/default.nix +++ b/pkgs/development/libraries/mapbox-gl-qml/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "mapbox-gl-qml"; - version = "1.7.6"; + version = "1.7.7.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "mapbox-gl-qml"; rev = version; - sha256 = "sha256-E6Pkr8khzDbhmJxzK943+H6cDREgwAqMnJQ3hQWU7fw="; + hash = "sha256-lmL9nawMY8rNNBV4zNF4N1gn9XZzIZ9Cw2ZRs9bjBaI="; }; nativeBuildInputs = [ cmake pkg-config ]; From c7d68f57c842d56046d31688dee4e0956bc90438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 Jan 2022 17:07:32 +0000 Subject: [PATCH 187/187] pure-maps: 2.6.5 -> 2.9.2 --- pkgs/applications/misc/pure-maps/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index 3f964824e6dd..0914d2599c22 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -1,23 +1,23 @@ { lib, mkDerivation, fetchFromGitHub -, qmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors +, cmake, qttools, kirigami2, qtquickcontrols2, qtlocation, qtsensors , nemo-qml-plugin-dbus, mapbox-gl-qml, s2geometry , python3, pyotherside }: mkDerivation rec { pname = "pure-maps"; - version = "2.6.5"; + version = "2.9.2"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - sha256 = "17gfb7rdaadmcdba4mhish0jrz9lmiban6fpzwhyvn8z1rc43zx9"; + hash = "sha256-pMPjY6OXR6THiSQZ4mw9Kz+tAXJaOwzJEcpPOyZ+YKI="; fetchSubmodules = true; }; nativeBuildInputs = [ - qmake python3 qttools python3.pkgs.wrapPython + cmake python3 qttools python3.pkgs.wrapPython ]; buildInputs = [ @@ -25,12 +25,7 @@ mkDerivation rec { nemo-qml-plugin-dbus pyotherside mapbox-gl-qml s2geometry ]; - postPatch = '' - substituteInPlace pure-maps.pro \ - --replace '$$[QT_HOST_BINS]/lconvert' 'lconvert' - ''; - - qmakeFlags = [ "FLAVOR=kirigami" ]; + cmakeFlags = [ "-DFLAVOR=kirigami" ]; pythonPath = with python3.pkgs; [ gpxpy ];