From 6c3c539c53d295db6a5ce6b500c944c7ea04cdc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sun, 27 Jun 2021 11:46:09 +0200 Subject: [PATCH 001/136] python3Packages.poppler-qt5: reduce the amount of patching done to `pyproject.toml` --- pkgs/development/python-modules/poppler-qt5/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 4a9fdfa4262..74543566dac 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -42,11 +42,8 @@ buildPythonPackage rec { postPatch = '' cat <> pyproject.toml - sip-include-dirs = ["${pyqt5}/share/sip/PyQt5"] - [tool.sip.bindings.Poppler-Qt5] include-dirs = ["${poppler.dev}/include/poppler"] - tags = ["${sip.platform_tag}"] EOF ''; From d3f5e322612ef58b047b438f7361febcdd4d7848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sun, 27 Jun 2021 16:37:14 +0200 Subject: [PATCH 002/136] python3Packages.poppler-qt5: remove unused arguments --- pkgs/development/python-modules/poppler-qt5/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 74543566dac..857f9716251 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -1,9 +1,7 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , isPy3k , fetchPypi -, pythonPackages , sip , qtbase , qmake From 11c0384bf0563718806e92d83fbd23e588231f10 Mon Sep 17 00:00:00 2001 From: Evgeny Kurnevsky Date: Tue, 6 Jul 2021 10:18:58 +0300 Subject: [PATCH 003/136] nixos/swap: allow luks discards if swap discards are enabled --- nixos/modules/config/swap.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index a37b46b8c46..faf4d2bde74 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -215,7 +215,7 @@ in fi ''} ${optionalString sw.randomEncryption.enable '' - cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName} + cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${optionalString (sw.discardPolicy != null) "--allow-discards"} ${sw.device} ${sw.deviceName} mkswap ${sw.realDevice} ''} ''; From ceef268c4b8cca80bd8c9b73bc2b323be13e0970 Mon Sep 17 00:00:00 2001 From: Valentin Conrad Date: Fri, 9 Jul 2021 10:50:25 +0200 Subject: [PATCH 004/136] nextcloud: remove expires header nextcloud default nginx config did not include the expires config see: https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html --- nixos/modules/services/web-apps/nextcloud.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 545deaa905f..2d3aa1e0f90 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -701,7 +701,6 @@ in { }; extraConfig = '' index index.php index.html /index.php$request_uri; - expires 1m; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; From 2d95c949f13aedcd7052bdc9910f482e23d6feec Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Sun, 11 Jul 2021 16:17:41 +0200 Subject: [PATCH 005/136] yuzu-ea: 1855 -> 1874 --- pkgs/misc/emulators/yuzu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/yuzu/default.nix b/pkgs/misc/emulators/yuzu/default.nix index 3ecf17f0233..0e4fe692ae3 100644 --- a/pkgs/misc/emulators/yuzu/default.nix +++ b/pkgs/misc/emulators/yuzu/default.nix @@ -16,13 +16,13 @@ in { }; early-access = libsForQt5.callPackage ./base.nix rec { pname = "yuzu-ea"; - version = "1855"; + version = "1874"; branchName = branch; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "0civ63zi23cym3kii4v3aiqrsg2zzj0w6sp6sa14ixysagqxsd4a"; + sha256 = "0ryrz7dl1sg30vvd7wrf05pjj8swah86055fn7qm6mr2bfslww0h"; }; }; }.${branch} From e54f4b1b045bc5ab4dbea888a43cfd8a78e52f4f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Thu, 15 Jul 2021 10:18:00 +0000 Subject: [PATCH 006/136] =?UTF-8?q?grafanaPlugins.grafana-polystat-panel:?= =?UTF-8?q?=201.2.5=20=E2=86=92=201.2.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grafana/plugins/grafana-polystat-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 85b4c7069a9..0ef21497597 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "1.2.5"; - zipHash = "sha256-U9vNfK4ofNzwL7MVe43tGY85gI56Jt1eb7TrCkeNrOQ="; + version = "1.2.6"; + zipHash = "sha256-gbMD2o8A2YYZzkpYiXNkv8Oj958RP47fL6DXj1SBYF0="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; From 1f94231db25358a42e008ceda3b0648375ed2214 Mon Sep 17 00:00:00 2001 From: Lilian Deloche Date: Thu, 15 Jul 2021 11:59:03 +0200 Subject: [PATCH 007/136] python3Packages.graphqlclient: init at 0.2.4 --- .../python-modules/graphqlclient/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/graphqlclient/default.nix diff --git a/pkgs/development/python-modules/graphqlclient/default.nix b/pkgs/development/python-modules/graphqlclient/default.nix new file mode 100644 index 00000000000..2f09897d4f5 --- /dev/null +++ b/pkgs/development/python-modules/graphqlclient/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "graphqlclient"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b6r3ng78qsn7c9zksx4rgdkmp5296d40kbmjn8q614cz0ymyc5k"; + }; + + propagatedBuildInputs = [ + six + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "graphqlclient" ]; + + meta = with lib; { + description = "Simple GraphQL client for Python"; + homepage = "https://github.com/prisma-labs/python-graphql-client"; + license = licenses.mit; + maintainers = with maintainers; [ lde ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abf8dc2ee80..18eb3bc0498 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3089,6 +3089,8 @@ in { graphene = callPackage ../development/python-modules/graphene { }; + graphqlclient= callPackage ../development/python-modules/graphqlclient { }; + graphql-core = callPackage ../development/python-modules/graphql-core { }; graphql-relay = callPackage ../development/python-modules/graphql-relay { }; From 76db02360aefa00e8cc85df788b8a25ec23dc45e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 11 May 2021 21:51:15 +0200 Subject: [PATCH 008/136] gnonograms: init at 1.4.5 --- pkgs/games/gnonograms/default.nix | 64 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 66 insertions(+) create mode 100644 pkgs/games/gnonograms/default.nix diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix new file mode 100644 index 00000000000..7a696001a15 --- /dev/null +++ b/pkgs/games/gnonograms/default.nix @@ -0,0 +1,64 @@ +{ lib +, stdenv +, fetchFromGitHub +, vala +, meson +, ninja +, pkg-config +, desktop-file-utils +, appstream +, python3 +, shared-mime-info +, wrapGAppsHook +, gtk3 +, pantheon +, libgee +}: + +stdenv.mkDerivation rec { + pname = "gnonograms"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "jeremypw"; + repo = "gnonograms"; + rev = "v${version}"; + sha256 = "1ly3inp6dvjrixdysz5hdfwlhbs49ks0lf8062z2iq6gaf8ivkb2"; + }; + + postPatch = '' + patchShebangs meson/post_install.py + ''; + + nativeBuildInputs = [ + vala + meson + ninja + pkg-config + desktop-file-utils + appstream + python3 + shared-mime-info + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + pantheon.granite + libgee + ]; + + meta = with lib; { + description = "Nonograms puzzle game"; + longDescription = '' + An implementation of the Japanese logic puzzle "Nonograms" written in + Vala, allowing the user to: + * Draw puzzles + * Generate random puzzles of chosen difficulty + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + homepage = "https://github.com/jeremypw/gnonograms"; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f632b5fda8..bfe18bf0223 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28743,6 +28743,8 @@ in gmad = callPackage ../games/gmad { }; + gnonograms = callPackage ../games/gnonograms { }; + gnubg = callPackage ../games/gnubg { }; gnuchess = callPackage ../games/gnuchess { }; From c2f41af67ec794e7604cbd77e05e6dac304eb8b2 Mon Sep 17 00:00:00 2001 From: Lilian Deloche Date: Fri, 16 Jul 2021 09:46:36 +0200 Subject: [PATCH 009/136] maintainers: add lde --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e1e77aa83ef..2d20642c1ec 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5876,6 +5876,12 @@ githubId = 1104419; name = "Lucas Hoffmann"; }; + lde = { + email = "lilian.deloche@puck.fr"; + github = "lde"; + githubId = 1447020; + name = "Lilian Deloche"; + }; ldelelis = { email = "ldelelis@est.frba.utn.edu.ar"; github = "ldelelis"; From f08f8758791270218e8805eb663fe9b20d0e4e91 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 17 Jul 2021 11:34:29 +0800 Subject: [PATCH 010/136] pantheon.appcenter: 3.5.1 -> 3.6.0 --- .../pantheon/apps/appcenter/default.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index a3e75d231f1..556b67aeafe 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -7,7 +7,6 @@ , elementary-gtk-theme , elementary-icon-theme , fetchFromGitHub -, fetchpatch , flatpak , gettext , glib @@ -15,6 +14,7 @@ , gtk3 , json-glib , libgee +, libhandy , libsoup , libxml2 , meson @@ -25,30 +25,20 @@ , python3 , vala , polkit -, libhandy_0 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.5.1"; + version = "3.6.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI="; + sha256 = "0kwqgilhyrj2nbvw5y34nzch5h9jnrg1a1n333qdsx4ax6yrxh4j"; }; - patches = [ - # Allow build with appstream 0.14.x - # https://github.com/elementary/appcenter/pull/1493 - (fetchpatch { - url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch"; - sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo="; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -78,7 +68,7 @@ stdenv.mkDerivation rec { gtk3 json-glib libgee - libhandy_0 # doesn't support libhandy-1 yet + libhandy libsoup libxml2 packagekit From c1536f5c78ead2fdcb0ec11824d673638fa6a5f4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 17 Jul 2021 19:41:45 +0200 Subject: [PATCH 011/136] nixos/systemd: fix NSS database ordering - The order of NSS (host) modules has been brought in line with upstream recommendations: - The `myhostname` module is placed before the `resolve` (optional) and `dns` entries, but after `file` (to allow overriding via `/etc/hosts` / `networking.extraHosts`, and prevent ISPs with catchall-DNS resolvers from hijacking `.localhost` domains) - The `mymachines` module, which provides hostname resolution for local containers (registered with `systemd-machined`) is placed to the front, to make sure its mappings are preferred over other resolvers. - If systemd-networkd is enabled, the `resolve` module is placed before `files` and `myhostname`, as it provides the same logic internally, with caching. - The `mdns(_minimal)` module has been updated to the new priorities. If you use your own NSS host modules, make sure to update your priorities according to these rules: - NSS modules which should be queried before `resolved` DNS resolution should use mkBefore. - NSS modules which should be queried after `resolved`, `files` and `myhostname`, but before `dns` should use the default priority - NSS modules which should come after `dns` should use mkAfter. --- .../from_md/release-notes/rl-2111.section.xml | 71 +++++++++++++++++++ .../manual/release-notes/rl-2111.section.md | 24 +++++++ nixos/modules/config/nsswitch.nix | 4 +- .../services/networking/avahi-daemon.nix | 4 +- nixos/modules/system/boot/resolved.nix | 3 +- nixos/modules/system/boot/systemd.nix | 5 +- 6 files changed, 103 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index fcaac9e8bec..e923a289442 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -562,6 +562,77 @@ be removed in 22.05. + + + The order of NSS (host) modules has been brought in line with + upstream recommendations: + + + + + The myhostname module is placed before + the resolve (optional) and + dns entries, but after + file (to allow overriding via + /etc/hosts / + networking.extraHosts, and prevent ISPs + with catchall-DNS resolvers from hijacking + .localhost domains) + + + + + The mymachines module, which provides + hostname resolution for local containers (registered with + systemd-machined) is placed to the + front, to make sure its mappings are preferred over other + resolvers. + + + + + If systemd-networkd is enabled, the + resolve module is placed before + files and + myhostname, as it provides the same + logic internally, with caching. + + + + + The mdns(_minimal) module has been + updated to the new priorities. + + + + + If you use your own NSS host modules, make sure to update your + priorities according to these rules: + + + + + NSS modules which should be queried before + resolved DNS resolution should use + mkBefore. + + + + + NSS modules which should be queried after + resolved, files and + myhostname, but before + dns should use the default priority + + + + + NSS modules which should come after dns + should use mkAfter. + + + + diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 030f1d21818..4409ad7b436 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -139,3 +139,27 @@ In addition to numerous new and upgraded packages, this release has the followin - The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. + +- The order of NSS (host) modules has been brought in line with upstream + recommendations: + + - The `myhostname` module is placed before the `resolve` (optional) and `dns` + entries, but after `file` (to allow overriding via `/etc/hosts` / + `networking.extraHosts`, and prevent ISPs with catchall-DNS resolvers from + hijacking `.localhost` domains) + - The `mymachines` module, which provides hostname resolution for local + containers (registered with `systemd-machined`) is placed to the front, to + make sure its mappings are preferred over other resolvers. + - If systemd-networkd is enabled, the `resolve` module is placed before + `files` and `myhostname`, as it provides the same logic internally, with + caching. + - The `mdns(_minimal)` module has been updated to the new priorities. + + If you use your own NSS host modules, make sure to update your priorities + according to these rules: + + - NSS modules which should be queried before `resolved` DNS resolution should + use mkBefore. + - NSS modules which should be queried after `resolved`, `files` and + `myhostname`, but before `dns` should use the default priority + - NSS modules which should come after `dns` should use mkAfter. diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index d19d35a4890..91a36cef10e 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -124,8 +124,8 @@ with lib; group = mkBefore [ "files" ]; shadow = mkBefore [ "files" ]; hosts = mkMerge [ - (mkBefore [ "files" ]) - (mkAfter [ "dns" ]) + (mkOrder 998 [ "files" ]) + (mkOrder 1499 [ "dns" ]) ]; services = mkBefore [ "files" ]; }; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 0b7d5575c11..020a817f259 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -240,8 +240,8 @@ in system.nssModules = optional cfg.nssmdns pkgs.nssmdns; system.nssDatabases.hosts = optionals cfg.nssmdns (mkMerge [ - (mkOrder 900 [ "mdns_minimal [NOTFOUND=return]" ]) # must be before resolve - (mkOrder 1501 [ "mdns" ]) # 1501 to ensure it's after dns + (mkBefore [ "mdns_minimal [NOTFOUND=return]" ]) # before resolve + (mkAfter [ "mdns" ]) # after dns ]); environment.systemPackages = [ pkgs.avahi ]; diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 84bc9b78076..a6fc07da0ab 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -140,7 +140,8 @@ in # add resolve to nss hosts database if enabled and nscd enabled # system.nssModules is configured in nixos/modules/system/boot/systemd.nix - system.nssDatabases.hosts = optional config.services.nscd.enable "resolve [!UNAVAIL=return]"; + # added with order 501 to allow modules to go before with mkBefore + system.nssDatabases.hosts = (mkOrder 501 ["resolve [!UNAVAIL=return]"]); systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index abd8ab29cae..58064e5de86 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -925,9 +925,8 @@ in system.nssModules = [ systemd.out ]; system.nssDatabases = { hosts = (mkMerge [ - [ "mymachines" ] - (mkOrder 1600 [ "myhostname" ] # 1600 to ensure it's always the last - ) + (mkOrder 400 ["mymachines"]) # 400 to ensure it comes before resolve (which is mkBefore'd) + (mkOrder 999 ["myhostname"]) # after files (which is 998), but before regular nss modules ]); passwd = (mkMerge [ (mkAfter [ "systemd" ]) From 937961e4e7c6c47a62937b6e9eb18b312960e57f Mon Sep 17 00:00:00 2001 From: Stephen Sherratt Date: Tue, 13 Jul 2021 22:13:39 +1000 Subject: [PATCH 012/136] maintainers: add stevebob --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9ba85483ccd..18b9d2867bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10074,6 +10074,12 @@ githubId = 1829294; name = "Steve Chávez"; }; + stevebob = { + email = "stephen@sherra.tt"; + github = "stevebob"; + githubId = 417118; + name = "Stephen Sherratt"; + }; steveej = { email = "mail@stefanjunker.de"; github = "steveej"; From 56c6d0afd4ba2279a852ae74fa5ec5d180ed204a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Jul 2021 17:55:46 +0200 Subject: [PATCH 013/136] python3Packages.nexia: 0.9.9 -> 0.9.10 --- pkgs/development/python-modules/nexia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nexia/default.nix b/pkgs/development/python-modules/nexia/default.nix index 5e07d6331ac..b9553765fb4 100644 --- a/pkgs/development/python-modules/nexia/default.nix +++ b/pkgs/development/python-modules/nexia/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nexia"; - version = "0.9.9"; + version = "0.9.10"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = version; - sha256 = "sha256-OamQ6p8o23lVeOB/KyNQI7G8xZaAaVNYacoRfbNKJtk="; + sha256 = "0k97i243ap1sap5smvfmpsjqzkx5adjvi14awv82pcp52ckzkbi9"; }; propagatedBuildInputs = [ From 356f9b302120d29d8cf63c4a4060d52261a80b00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 05:04:24 +0000 Subject: [PATCH 014/136] grafana-agent: 0.16.1 -> 0.17.0 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index c772b76cf03..4c9d0437d79 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "0kqbn6fqlrxjqdkkhbr7qmm2m05a7dlskfdb7y4gr5ggi65m6ik5"; + sha256 = "sha256-rHJGVQWbvgcvwPzt8e2uWs1n4bbaAZz6lQjyvmqmLZw="; }; - vendorSha256 = "0xi69a1zkcmi5q8m7lfwp3xb4cbkwc2dzqm24lfqsq13xj5jq6ph"; + vendorSha256 = "sha256-jA8M8ZdJWmrGRQb0W1duVV+XwxqJVQ/ek0Yhw6JZvX8="; patches = [ # https://github.com/grafana/agent/issues/731 From 9d69d3e488a78b0a31b631fdaff839320c06efdc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 08:58:29 +0000 Subject: [PATCH 015/136] abcm2ps: 8.14.11 -> 8.14.12 --- pkgs/tools/audio/abcm2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 08f8e03885e..da9fb934ce2 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "abcm2ps"; - version = "8.14.11"; + version = "8.14.12"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; rev = "v${version}"; - sha256 = "0lzzr2nkfg27gljcrdxkmli1wp08vap3vgxq1zgkv7f43rbm0qnw"; + sha256 = "sha256-RELWtI+S2cbG7cXCehXymvWRdair28UaDZRVr5xt9Tk="; }; configureFlags = [ From 6ff4bc5883218ec8c4ad97e161238ac8c49ed14c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 20 Jul 2021 09:41:13 +0000 Subject: [PATCH 016/136] armadillo: 10.5.3 -> 10.6.1 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index fcc64989606..b0f0682b523 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.3"; + version = "10.6.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-5sUdjVKm94ucZFn2mGE1CT4O5wWmdDBxEPYXXyzV7jc="; + sha256 = "sha256-HQbDI31lx7xGHqEvT9/YtaabapZbSQCucJYM6SCIF58="; }; nativeBuildInputs = [ cmake ]; From a3c5f0cba8fa9c4d9782ef83757be6e4028f54b7 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 20 Jul 2021 05:17:35 +0300 Subject: [PATCH 017/136] lib/types.nix: add nonEmptyStr --- lib/types.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index f47a1f92de7..68262951a13 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -287,6 +287,13 @@ rec { merge = mergeEqualOption; }; + nonEmptyStr = mkOptionType { + name = "nonEmptyStr"; + description = "non-empty string"; + check = x: str.check x && builtins.match "[ \t\n]*" x == null; + inherit (str) merge; + }; + strMatching = pattern: mkOptionType { name = "strMatching ${escapeNixString pattern}"; description = "string matching the pattern ${pattern}"; From c971de97c4146a052b731fd47babc8be395ffdf0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 24 Jun 2021 20:58:18 +0300 Subject: [PATCH 018/136] nixos/swap: add options option --- nixos/modules/config/swap.nix | 9 +++++++++ nixos/modules/tasks/filesystems.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index a37b46b8c46..9b64d5287a1 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -127,6 +127,15 @@ let ''; }; + options = mkOption { + default = [ "defaults" ]; + example = [ "nofail" ]; + type = types.listOf types.nonEmptyStr; + description = '' + Options used to mount the swap. + ''; + }; + deviceName = mkOption { type = types.str; internal = true; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d274a38a270..2f17608560f 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -255,7 +255,7 @@ in # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; swapOptions = sw: concatStringsSep "," ( - [ "defaults" ] + sw.options ++ optional (sw.priority != null) "pri=${toString sw.priority}" ++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}" ); From 71426dabfe4ddde3669c1659348190b01404e419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 21 Jul 2021 12:52:00 +0200 Subject: [PATCH 019/136] duplicity: use python39 --- pkgs/tools/backup/duplicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index ab6b7d81221..243bcbcb881 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , fetchpatch -, python38 +, python3 , librsync , ncftp , gnupg @@ -13,7 +13,7 @@ , gettext }: let - pythonPackages = python38.pkgs; + pythonPackages = python3.pkgs; inherit (lib.versions) majorMinor splitVersion; majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v)); in From c6ff26b19fa083e111005d06e8a4a15625976e66 Mon Sep 17 00:00:00 2001 From: Jan Solanti Date: Wed, 21 Jul 2021 23:44:21 +0300 Subject: [PATCH 020/136] pipewire: 0.3.31 -> 0.3.32 --- pkgs/development/libraries/pipewire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 5f32216737e..3fed43d2d04 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -48,7 +48,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.31"; + version = "0.3.32"; outputs = [ "out" @@ -66,7 +66,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79"; + sha256 = "0f5hkypiy1qjqj3frzz128668hzbi0fqmj0j21z7rp51y62dapnp"; }; patches = [ From ea8547b18044244a90b1043f970455692893f82e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 11:06:35 +0200 Subject: [PATCH 021/136] python3Packages.pylitterbot: 2021.5.0 -> 2021.7.2 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 9390461a2fe..4e22d52a4c8 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.5.0"; + version = "2021.7.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-EiHdyjGYddtvciiwu2kpIBfUGvIJr38/8oJLFVzoRKE="; + sha256 = "0hnjqj9n2sq1jhiwdrw2aayhyz94cwjxniiak2h1nxh2q0nzigh3"; }; propagatedBuildInputs = [ From 3343c0e4c3ab6fa7732b9c89486c65a776d7f005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 22 Jul 2021 11:01:18 +0200 Subject: [PATCH 022/136] gomobile: 2020-06-22 -> 2021-06-14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This upgrade together with Go 1.16 drops support for iOS ARM32 builds. The need for applying a patch was also removed by this fix: https://go.googlesource.com/mobile/+/7c8f154d100840bc5828285bb390bbae1cb5a98c Signed-off-by: Jakub Sokołowski --- pkgs/development/mobile/gomobile/default.nix | 17 +++++++---------- .../gomobile/resolve-nix-android-sdk.patch | 15 --------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/development/mobile/gomobile/default.nix index 17b4e2fb3f6..ce44b7dd934 100644 --- a/pkgs/development/mobile/gomobile/default.nix +++ b/pkgs/development/mobile/gomobile/default.nix @@ -3,21 +3,20 @@ , xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs , androidPkgs ? androidenv.composeAndroidPackages { includeNDK = true; - ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken. + ndkVersion = "22.1.7171670"; } }: buildGoModule { pname = "gomobile"; - version = "unstable-2020-06-22"; + version = "unstable-2021-06-14"; - vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94"; + vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0"; src = fetchgit { - # WARNING: Next commit removes support for ARM 32 bit builds for iOS - rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5"; + rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c"; name = "gomobile"; url = "https://go.googlesource.com/mobile"; - sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm"; + sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1"; }; subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ]; @@ -25,8 +24,6 @@ buildGoModule { # Fails with: go: cannot find GOROOT directory doCheck = false; - patches = [ ./resolve-nix-android-sdk.patch ]; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; @@ -48,8 +45,8 @@ buildGoModule { wrapProgram $out/bin/gomobile \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \ --prefix PATH : "${androidPkgs.androidsdk}/bin" \ - --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ - --set GOPATH $out + --set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \ + --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" ''; meta = with lib; { diff --git a/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch b/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch deleted file mode 100644 index cc143e3a447..00000000000 --- a/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go -index 3b01adc..76216fa 100644 ---- a/cmd/gomobile/bind_androidapp.go -+++ b/cmd/gomobile/bind_androidapp.go -@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) { - var apiVer int - for _, fi := range fis { - name := fi.Name() -+ // Resolve symlinked directories (this is how the Nix Android SDK package is built) -+ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil { -+ fi = fi2 -+ } - if !fi.IsDir() || !strings.HasPrefix(name, "android-") { - continue - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c5ae15d23e..42dcdb65703 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1743,7 +1743,7 @@ in xcodeenv = callPackage ../development/mobile/xcodeenv { }; gomobile = callPackage ../development/mobile/gomobile { - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; }; ssh-agents = callPackage ../tools/networking/ssh-agents { }; From b61e996c47854d956cf67996104d7d9e31bc0bec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 11:17:24 +0200 Subject: [PATCH 023/136] python3Packages.holidays: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index e09b957425a..48892b8d79e 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.11.1"; + version = "0.11.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-f6/YRvZ/Drfh+cGcOPSnlnvweu1d7S3XqKovk3sOoBs="; + sha256 = "0nqxan6nr3jp63i3sbb9s1v5dlig22bl927a6pl1ahks8cnr7rkn"; }; propagatedBuildInputs = [ From f462e471ae6bfcb1ef624741bc053632e332abe4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Jul 2021 11:30:58 +0200 Subject: [PATCH 024/136] python/werkzeug: skip a few more problematic tests --- .../development/python-modules/werkzeug/1.nix | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/werkzeug/1.nix b/pkgs/development/python-modules/werkzeug/1.nix index 73bebd8366e..d03909d191d 100644 --- a/pkgs/development/python-modules/werkzeug/1.nix +++ b/pkgs/development/python-modules/werkzeug/1.nix @@ -17,7 +17,29 @@ buildPythonPackage rec { propagatedBuildInputs = [ itsdangerous ]; checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + "test_save_to_pathlib_dst" + "test_cookie_maxsize" + "test_cookie_samesite_attribute" + "test_cookie_samesite_invalid" + "test_range_parsing" + "test_content_range_parsing" + "test_http_date_lt_1000" + "test_best_match_works" + "test_date_to_unix" + "test_easteregg" + + # Seems to be a problematic test-case: + # + # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg)) + # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]> + # E + # E Traceback (most recent call last): + # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers + # E return Headers(result) + # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> + "TestMultiPart" + ] ++ lib.optionals stdenv.isDarwin [ "test_get_machine_id" ]; From 79684222629d8ef162696915f44ff09256208583 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Jul 2021 11:31:58 +0200 Subject: [PATCH 025/136] privacyidea: fix build --- pkgs/applications/misc/privacyidea/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 7545253d506..41ddec76464 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -12,6 +12,8 @@ let sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; }; }); + werkzeug = self.callPackage ../../../development/python-modules/werkzeug/1.nix { }; + flask = self.callPackage ../../../development/python-modules/flask/1.nix { }; }; }; in From ad34c7697a2e696d31222b4ae7810700175933f0 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 22 Jul 2021 12:54:18 +0200 Subject: [PATCH 026/136] ipfs: install ipfs-hardened.service as well This will be useful for hardening the IPFS NixOS module in the future. --- pkgs/applications/networking/ipfs/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index e96602a54c5..a20d467b171 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -29,10 +29,13 @@ buildGoModule rec { postInstall = '' install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service + install --mode=444 -D misc/systemd/ipfs-hardened.service $out/etc/systemd/system/ipfs-hardened.service install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket substituteInPlace $out/etc/systemd/system/ipfs.service \ --replace /usr/bin/ipfs $out/bin/ipfs + substituteInPlace $out/etc/systemd/system/ipfs-hardened.service \ + --replace /usr/bin/ipfs $out/bin/ipfs ''; meta = with lib; { From 7a4b26853aa44152027cf9a62b0be96d75158953 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 22 Jul 2021 12:59:11 +0200 Subject: [PATCH 027/136] ipfs: 0.9.0 -> 0.9.1 https://github.com/ipfs/go-ipfs/releases/tag/v0.9.1 --- pkgs/applications/networking/ipfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index a20d467b171..2823b84d473 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs"; - version = "0.9.0"; + version = "0.9.1"; rev = "v${version}"; # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "sha256:1fyffnw1d860w7gwm6ijbgrh68297z5bmvww8yqfshm3xgvcs6bf"; + sha256 = "sha256-RliyIEtNgwzbLVwl6T38VIbhc12CZMBc3LZ6T/llaHc="; }; # tarball contains multiple files/directories From 62030c17dc51c56b042fa6d9cf8a7063b1f2f833 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Jul 2021 14:09:33 +0200 Subject: [PATCH 028/136] privacyidea: fix migration command --- pkgs/applications/misc/privacyidea/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 41ddec76464..302c8ce42eb 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -12,6 +12,13 @@ let sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; }; }); + flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { + version = "2.7.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; + }; + }); werkzeug = self.callPackage ../../../development/python-modules/werkzeug/1.nix { }; flask = self.callPackage ../../../development/python-modules/flask/1.nix { }; }; From 9b86def2fcc53a7b9ba6a4c06f2da3e2f983ef47 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Jul 2021 11:39:21 +0200 Subject: [PATCH 029/136] privacyidea: 3.6 -> 3.6.1 ChangeLog: https://github.com/privacyidea/privacyidea/blob/v3.6.1/Changelog --- pkgs/applications/misc/privacyidea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 302c8ce42eb..98bb6d02ebd 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -26,13 +26,13 @@ let in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.6"; + version = "3.6.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-yywkQ3TdBzRMbJGY0Seaprztgt0JrCAbgqosMQ5fcQM="; + sha256 = "sha256-NRfTEZ/6K6xLP+wcT6o54wqk/EyWTiiC9W1KDgaAEbg="; fetchSubmodules = true; }; From 8840f0210b65de547d280f52d6e1a9ab651368e5 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 22 Jul 2021 14:56:56 +0200 Subject: [PATCH 030/136] rgp: 1.10 -> 1.11 --- pkgs/development/tools/rgp/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index 7b49a83b1cc..7b8ac88de63 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -12,22 +12,22 @@ , libX11 , libxcb , libXi -, ncurses5 +, ncurses , qtbase , qtdeclarative , zlib }: let - buildNum = "2021-03-31-696"; + buildNum = "2021-06-30-819"; in stdenv.mkDerivation rec { pname = "rgp"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - sha256 = "1GUV75KpYbeq7KkE86QqTfGnf/t3VEgviaAsbg/LWJI="; + sha256 = "ru+e/oY844x4nvSVRBrTGDdnzUOBhwkaIrnftBITyE8="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -42,17 +42,12 @@ stdenv.mkDerivation rec { libX11 libxcb libXi - ncurses5 + ncurses qtbase qtdeclarative zlib ]; - runtimeDependencies = [ - "${placeholder "out"}/opt/rgp" - "${placeholder "out"}/opt/rgp/qt" - ]; - dontWrapQtApps = true; installPhase = '' From 3ff36d31e46d786498303b7170f40057af60d073 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 15:46:12 +0200 Subject: [PATCH 031/136] foot: fix PGO builds with clang A regression I unfortunately did not notice despite adding tests for it (which even failed). See: * https://codeberg.org/dnkl/foot/issues/642 * https://codeberg.org/dnkl/foot/pulls/643 --- pkgs/applications/terminal-emulators/foot/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index f069338ae8a..a5740fc45b1 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -2,6 +2,7 @@ , lib , fetchzip , fetchurl +, fetchpatch , runCommandNoCC , fcft , freetype @@ -98,6 +99,15 @@ stdenv.mkDerivation rec { sha256 = "1k0alz991cslls4926c5gq02pdq0vfw9jfpprh2a1vb59xgikv7h"; }; + patches = [ + # Fixes PGO builds with clang + (fetchpatch { + url = "https://codeberg.org/dnkl/foot/commit/2acd4b34c57659d86dca76c58e4363de9b0a1f17.patch"; + sha256 = "13xi9ppaqx2p88cxbh6801ry9ral70ylh40agn6ij7pklybs4d7s"; + includes = [ "pgo/pgo.c" ]; + }) + ]; + depsBuildBuild = [ pkg-config ]; From 31461fd4c5886db081036dd806df74e885f53bc8 Mon Sep 17 00:00:00 2001 From: urlordjames Date: Wed, 21 Jul 2021 23:18:43 -0400 Subject: [PATCH 032/136] pythonPackages.leb128: init at 1.0.4 --- .../python-modules/leb128/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/leb128/default.nix diff --git a/pkgs/development/python-modules/leb128/default.nix b/pkgs/development/python-modules/leb128/default.nix new file mode 100644 index 00000000000..fa71abd735e --- /dev/null +++ b/pkgs/development/python-modules/leb128/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage, fetchFromGitHub, pytestCheckHook, lib }: + +buildPythonPackage rec { + pname = "leb128"; + version = "1.0.4"; + + # fetchPypi doesn't include files required for tests + src = fetchFromGitHub { + owner = "mohanson"; + repo = "leb128"; + rev = "v${version}"; + sha256 = "040l6fxyzqal841kirf783kk1840gcy1gjd374jfr46v96qc8scm"; + }; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "leb128" ]; + + meta = with lib; { + description = "A utility to encode and decode Little Endian Base 128"; + homepage = "https://github.com/mohanson/leb128"; + license = licenses.mit; + maintainers = with maintainers; [ urlordjames ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 172fdc4b668..8365c34992e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3973,6 +3973,8 @@ in { leather = callPackage ../development/python-modules/leather { }; + leb128 = callPackage ../development/python-modules/leb128 { }; + ledger_agent = callPackage ../development/python-modules/ledger_agent { }; ledgerblue = callPackage ../development/python-modules/ledgerblue { }; From 70787fb66375bfa6fa7cbd701e9405d817666f25 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Thu, 22 Jul 2021 08:00:44 -0700 Subject: [PATCH 033/136] libmwaw: enableParallelBuilding --- pkgs/development/libraries/libmwaw/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index 04eca2759a8..ed479ad53e1 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + enableParallelBuilding = true; meta = { inherit (s) version; description = "Import library for some old mac text documents"; From 6a7c2e8c30a8999e68a62416cce8a9a9d28cf670 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 17:18:10 +0200 Subject: [PATCH 034/136] tempora-lgc: remove phases --- pkgs/data/fonts/tempora-lgc/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index 6bcceff16d2..ecafc9572bd 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation { name = "tempora-lgc"; inherit nativeBuildInputs; inherit srcs; - phases = "installPhase"; installPhase = '' mkdir -p "$out/share/fonts/opentype/public" cp ${toString srcs} "$out/share/fonts/opentype/public" From b32235fe67b1434af7e3f9066a2f9206c7b507d2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 17:48:51 +0200 Subject: [PATCH 035/136] pdfread: remove the sources are not there any more. The parent project (http://pdfread.sourceforge.net/) has not been updated since 2007. --- pkgs/tools/graphics/pdfread/default.nix | 51 ------------------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 pkgs/tools/graphics/pdfread/default.nix diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix deleted file mode 100644 index 8350e95188d..00000000000 --- a/pkgs/tools/graphics/pdfread/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{lib, stdenv, fetchurl, unzip, python, makeWrapper, ghostscript, pngnq, pillow, djvulibre -, optipng, unrar}: - -stdenv.mkDerivation { - name = "pdfread-1.8.2"; - - src = fetchurl { - # I got it from http://www.mobileread.com/forums/showthread.php?t=21906 - # But that needs user registration to allow downloading. - # This is an evolution from pdfread 1.7 in http://pdfread.sourceforge.net/ - # Temporary place: - url = "http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip"; - sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ python ]; - - broken = true; # Not found. - - phases = "unpackPhase patchPhase installPhase"; - - unpackPhase = '' - unzip $src - sourceRoot=`pwd`/PDFRead/src - ''; - - patchPhase = '' - sed -i 's,#!/usr.*,#!${python}/bin/python,' pdfread.py - ''; - - installPhase = '' - mkdir -p $out/bin - cp pdfread.py $out/bin - chmod +x $out/bin/pdfread.py - - LIBSUFFIX=lib/${python.libPrefix}/site-packages/ - PYDIR=$out/$LIBSUFFIX - mkdir -p $PYDIR - cp -R *.py pylrs $PYDIR - - wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pillow}/$LIBSUFFIX/PIL:$PYDIR \ - --prefix PATH : ${lib.makeBinPath [ ghostscript pngnq djvulibre unrar optipng ]} - ''; - - meta = with lib; { - description = "PDF/DJVU to ebook format converter"; - homepage = "https://www.mobileread.com/forums/showthread.php?t=21906"; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73d0db70084..1459588b60a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7943,9 +7943,7 @@ in pdfarranger = callPackage ../applications/misc/pdfarranger { }; - pdfread = callPackage ../tools/graphics/pdfread { - inherit (pythonPackages) pillow; - }; + pdfread = throw "pdfread has been remove from nixpkgs, because it is unmaintained for years and the sources are no longer available"; briss = callPackage ../tools/graphics/briss { }; From 8432f6de9c249fb12d909025a936fe415b19282e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 22:19:51 +0200 Subject: [PATCH 036/136] zookeeper: remove phases --- pkgs/servers/zookeeper/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index d5bf7b91014..becd765fd8d 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - phases = ["unpackPhase" "installPhase"]; - installPhase = '' runHook preInstall mkdir -p $out From 060059939ff9566382b63f94c5658ce22cf6ceff Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 22:25:02 +0200 Subject: [PATCH 037/136] sqlite-jdbc: remove phases --- pkgs/servers/sql/sqlite/jdbc/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/sql/sqlite/jdbc/default.nix b/pkgs/servers/sql/sqlite/jdbc/default.nix index 01a9d5fa2e2..36fba217e00 100644 --- a/pkgs/servers/sql/sqlite/jdbc/default.nix +++ b/pkgs/servers/sql/sqlite/jdbc/default.nix @@ -11,8 +11,6 @@ stdenv.mkDerivation rec { sha256 = "1xk5fi2wzq3jspvbdm5hvs78501i14jy3v7x6fjnh5fnpqdacpd4"; }; - phases = [ "installPhase" ]; - installPhase = '' install -m444 -D ${src}/share/java/*${pname}-${version}.jar "$out/share/java/${pname}-${version}.jar" ''; From 06888088abe7f4eb136e3151570a3358578d809a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 22 Jul 2021 22:27:21 +0200 Subject: [PATCH 038/136] serviio: remove phases --- pkgs/servers/serviio/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index f3c8fc2311c..29c223a3470 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0mxpdyhjf4w83q8ssmvpxm95hw4x7lfkh48vvdablccfndh82x2i"; }; - phases = ["unpackPhase" "installPhase"]; - installPhase = '' mkdir -p $out cp -R config legal lib library plugins LICENCE.txt NOTICE.txt README.txt RELEASE_NOTES.txt $out From 6c09918068ab9d9caf1dc676847db56cce79a2ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 22:50:09 +0200 Subject: [PATCH 039/136] python3Packages.archinfo: 9.0.9031 -> 9.0.9166 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 60c3e8905b5..40583a12ada 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9031"; + version = "9.0.9166"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pzBMyw5FwQV1FyhvOxUq39s96p0KKSrkEvJzhJQdS4E="; + sha256 = "0y77lyz019rm9zgxpam6dbb006c7j66hwy985h3fg6nbz74pcml5"; }; checkInputs = [ From 8152a8e62f5bc83b7571ae1fc0e2e0a0f4b6b15a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 22:59:02 +0200 Subject: [PATCH 040/136] python3Packages.ailment: 9.0.9031 -> 9.0.9166 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index a6c99e72c0a..3ddd3d366e8 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9031"; + version = "9.0.9166"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xyNTcGTGH8030CJif6an+kDZIfOUVDMiRhFamVajAzk="; + sha256 = "09qbqn57h92f81xv35f645ai7nkkqf7cidkg3qrwfpxcwc2g9kdz"; }; propagatedBuildInputs = [ pyvex ]; From e22fcee9ba382e750a933674699ef5341c7bd2dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 23:04:39 +0200 Subject: [PATCH 041/136] python3Packages.pyvex: 9.0.9031 -> 9.0.9166 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index d021b6b06d3..a6c2b1d381b 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9031"; + version = "9.0.9166"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bl6bWv4c+tlaWcxrYCiljC9C+wAZZVyk+1O0rlb4kxA="; + sha256 = "0h7jw7blr4bal7pw711cxmwm4jjypchshc8ks04z2lyziy83ywja"; }; postPatch = lib.optionalString stdenv.isDarwin '' From f9f398da9138710abbb28d002e0d17a791dab9de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 23:05:35 +0200 Subject: [PATCH 042/136] python3Packages.claripy: 9.0.9031 -> 9.0.9166 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 2c25d258e57..3dc930473f5 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9031"; + version = "9.0.9166"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UCmt2Vm8OWyKa0fmPlGuvzaFddUWs6quavUgIZasoJg="; + sha256 = "0rwl5q7z16agcykn0an2lyqfn2z5yvmg0xcvxfpvndf6zpnbqhx0"; }; # Use upstream z3 implementation From 1c598916a8b66715330169d8ae30da94c595cd56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 23:08:34 +0200 Subject: [PATCH 043/136] python3Packages.cle: 9.0.9031 -> 9.0.9166 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index d6731260937..0110625eba8 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9031"; + version = "9.0.9166"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+9aW7J8FXuKtU20dpqnoj37McPxzbkjKuYZIO8QeFF0="; + sha256 = "1mvdcwzim52mc7vjrr2cq8xwwi0v0ai3z608mg5nfbbf4zjji76c"; }; propagatedBuildInputs = [ From 2b37017043b9537a0100a1014b27865d05d13cd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 23:11:36 +0200 Subject: [PATCH 044/136] python3Packages.angrop: 9.0.9031 -> 9.0.9166 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index e5ab1954276..1ab86c1820a 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9031"; + version = "9.0.9166"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3q/3iFR0FFOcvgmNVXtgi1Spu5xfXNJFy+QoIh8amOY="; + sha256 = "1myrzp5axg0dj7kxqc2mz3kfqlds3vzvavcncrj5y9xpx8m7l71m"; }; propagatedBuildInputs = [ From a87f48dffcaec2437454dec870db92181d1f621b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Jul 2021 23:11:58 +0200 Subject: [PATCH 045/136] python3Packages.angr: 9.0.9031 -> 9.0.9166 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 285a125a725..acad9cb0f59 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9031"; + version = "9.0.9166"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-qWAz9SHfQU0cdk4yVekJn5OIDPJPbi63CDdlHDq1Opw="; + sha256 = "1h1jb57zp8wy24xy60j76sl4hrzhhwfsvfx26zhbnhqzmwghpd5x"; }; propagatedBuildInputs = [ From 548ff797656e6f2e03002746d9d1e42f2c6bd841 Mon Sep 17 00:00:00 2001 From: oxalica Date: Tue, 20 Jul 2021 22:54:17 +0800 Subject: [PATCH 046/136] tdesktop.tg_owt: rework and clean up - Build shared library to keep binary small. - Prefer system-wide libraries instead of bundled ones. - `abseil-cpp` (absl) is required for downstream build and appears in output cmake file. So it's added to `propagatedBuildInputs`. --- .../telegram/tdesktop/tg_owt.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 46076bca68c..363650dae5a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, cmake, ninja, yasm , libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf -, xorg, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr +, openh264, usrsctp, libevent, libvpx , glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire -, libXi +, xorg, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi }: stdenv.mkDerivation { @@ -24,15 +24,23 @@ stdenv.mkDerivation { buildInputs = [ libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf - xorg.libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr + openh264 usrsctp libevent libvpx + libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi glib abseil-cpp pcre util-linuxMinimal libselinux libsepol pipewire - libXi ]; cmakeFlags = [ - # Building as a shared library isn't officially supported and currently broken: + # Building as a shared library isn't officially supported and may break at any time. "-DBUILD_SHARED_LIBS=OFF" ]; - meta.license = lib.licenses.bsd3; + propagatedBuildInputs = [ + # Required for linking downstream binaries. + abseil-cpp openh264 usrsctp libevent libvpx + ]; + + meta = with lib; { + license = licenses.bsd3; + maintainers = with maintainers; [ oxalica ]; + }; } From 2a12ba467c49bd8885f3726fca061574a4d816cb Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 21 Jul 2021 00:11:21 +0800 Subject: [PATCH 047/136] tdesktop: use bundled libtgvoip --- .../instant-messengers/telegram/tdesktop/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 959d1a96d8e..b14e1e41037 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -3,7 +3,7 @@ , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk, jemalloc -, libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules +, rnnoise, extra-cmake-modules # Transitive dependencies: , pcre, xorg, util-linux, libselinux, libsepol, epoxy , at-spi2-core, libXtst, libthai, libdatrie @@ -58,7 +58,7 @@ in mkDerivation rec { qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk jemalloc - libtgvoip rnnoise abseil-cpp extra-cmake-modules + rnnoise extra-cmake-modules tg_owt # Transitive dependencies: pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy @@ -70,7 +70,6 @@ in mkDerivation rec { # We're allowed to used the API ID of the Snap package: "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default ]; @@ -116,7 +115,7 @@ in mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; - changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v{version}"; - maintainers = with maintainers; [ primeos abbradar ]; + changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; + maintainers = with maintainers; [ primeos abbradar oxalica ]; }; } From f3959d8e8bfec7ff7af49624031362a9312e15f8 Mon Sep 17 00:00:00 2001 From: oxalica Date: Wed, 21 Jul 2021 00:11:42 +0800 Subject: [PATCH 048/136] libtgvoip: remove It's removed because: 1. It's an internal library which is only used by telegram itself, and it's fine to use its bundled source in telegram. 2. It's forced to produce static library, is very fast to build (less than 1min) and is quite small (<2 MiB). 3. Reduce extra maintenance work and have almost no other drawback. --- .../telegram/tdesktop/update.py | 4 -- .../libraries/libtgvoip/default.nix | 48 ------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 54 deletions(-) delete mode 100644 pkgs/development/libraries/libtgvoip/default.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py index 8f39533e298..89e40218623 100755 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py @@ -71,7 +71,3 @@ if __name__ == "__main__": tg_owt_hash = nix_prefetch_git('https://github.com/desktop-app/tg_owt.git', tg_owt_ref) update_file('tg_owt.nix', tg_owt_version, tg_owt_hash, tg_owt_ref) tg_owt_ref = github_api_request('repos/desktop-app/tg_owt/commits/master')['sha'] - libtgvoip_ref = github_api_request(f'repos/telegramdesktop/tdesktop/contents/Telegram/ThirdParty/libtgvoip?ref={tdesktop_tag}')['sha'] - libtgvoip_version = get_commit_date('telegramdesktop/libtgvoip', libtgvoip_ref) - libtgvoip_hash = nix_prefetch_url(f'https://github.com/telegramdesktop/libtgvoip/archive/{libtgvoip_ref}.tar.gz', unpack=True) - update_file('../../../../../development/libraries/libtgvoip/default.nix', libtgvoip_version, libtgvoip_hash, libtgvoip_ref) diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix deleted file mode 100644 index 3c10220fffb..00000000000 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch -, pkg-config, autoreconfHook -, openssl, libopus, alsa-lib, libpulseaudio -}: - -with lib; - -stdenv.mkDerivation rec { - pname = "libtgvoip"; - version = "unstable-2021-07-13"; - - src = fetchFromGitHub { - owner = "telegramdesktop"; - repo = "libtgvoip"; - rev = "f321e7c8cc086bac6ae06fa0934aac7d9833a310"; - sha256 = "1gk5nsqhbnn1cdh83b70qr3d3v2c1bncylvgn77vvj8vnyjlmnfq"; - }; - - # To fix the build without external webrtc: - patches = [ - (fetchpatch { - # Use methods from updated webrtc. - url = "https://github.com/telegramdesktop/libtgvoip/commit/13a5fcb16b04472d808ce122abd695dbf5d206cd.patch"; - sha256 = "0wapqvml3yyv5dlp2q8iih5rfvfnkngll69krhnw5xsdjy22sp7r"; - revert = true; - }) - (fetchpatch { - # Allow working with external webrtc. - url = "https://github.com/telegramdesktop/libtgvoip/commit/6e82b6e45664c1f80b9039256c99bebc76d34672.patch"; - sha256 = "0m87ixja70vnm80a9z4gxk0yl7n64y59smczxb88lxnj6kdgih7x"; - revert = true; - }) - ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ openssl libopus alsa-lib libpulseaudio ]; - enableParallelBuilding = true; - - meta = { - description = "VoIP library for Telegram clients"; - license = licenses.unlicense; - platforms = platforms.linux; - homepage = "https://github.com/telegramdesktop/libtgvoip"; - maintainers = with maintainers; [ ilya-fedin ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44319d78c81..58db8471d40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17132,8 +17132,6 @@ in libtap = callPackage ../development/libraries/libtap { }; - libtgvoip = callPackage ../development/libraries/libtgvoip { }; - libtsm = callPackage ../development/libraries/libtsm { }; libgeotiff = callPackage ../development/libraries/libgeotiff { }; From cb0861b999ecb64d0edfaed158d4a210bd0897c9 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 22 Jul 2021 00:42:34 +0800 Subject: [PATCH 049/136] tdesktop: clean up and fix outdated comments --- .../telegram/tdesktop/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index b14e1e41037..e7f967b4a6a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,11 +1,11 @@ { mkDerivation, lib, fetchFromGitHub, callPackage, fetchpatch -, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo +, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash , ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk, jemalloc , rnnoise, extra-cmake-modules # Transitive dependencies: -, pcre, xorg, util-linux, libselinux, libsepol, epoxy +, pcre, xorg, util-linuxMinimal, libselinux, libsepol, epoxy , at-spi2-core, libXtst, libthai, libdatrie , xdg-utils, libsysprof-capture, libpsl, brotli }: @@ -52,16 +52,20 @@ in mkDerivation rec { dontWrapGApps = true; dontWrapQtApps = true; - nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; + nativeBuildInputs = [ + pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook + extra-cmake-modules + ]; buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk jemalloc - rnnoise extra-cmake-modules + rnnoise tg_owt # Transitive dependencies: - pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy + util-linuxMinimal # Required for libmount thus not nativeBuildInputs. + pcre xorg.libpthreadstubs xorg.libXdmcp libselinux libsepol epoxy at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli ]; @@ -70,18 +74,15 @@ in mkDerivation rec { # We're allowed to used the API ID of the Snap package: "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" - "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default ]; # Note: The following packages could be packaged system-wide, but it's # probably best to use the bundled ones from tdesktop (Arch does this too): # rlottie: - # - CMake flag: "-DTDESKTOP_USE_PACKAGED_TGVOIP=ON" # - Sources (problem: there are no stable releases!): # - desktop-app (tdesktop): https://github.com/desktop-app/rlottie # - upstream: https://github.com/Samsung/rlottie # libtgvoip: - # - CMake flag: "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=ON" # - Sources (problem: the stable releases might be too old!): # - tdesktop: https://github.com/telegramdesktop/libtgvoip # - upstream: https://github.com/grishka/libtgvoip @@ -112,7 +113,7 @@ in mkDerivation rec { Desktop client for the Telegram messenger, based on the Telegram API and the MTProto secure protocol. ''; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; From 6019d8abff9e4cc31001d2b9a55088bdefa245cd Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 23 Jul 2021 05:15:37 +0800 Subject: [PATCH 050/136] tdesktop: patch dlopen paths --- .../instant-messengers/telegram/tdesktop/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index e7f967b4a6a..bdca4bb4fef 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -46,6 +46,13 @@ in mkDerivation rec { postPatch = '' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' + + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ + --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ + --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ + --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' ''; # We want to run wrapProgram manually (with additional parameters) From 27585b98971f8180e12592e694d38a19c072d1bf Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 23 Jul 2021 05:17:14 +0800 Subject: [PATCH 051/136] tdesktop: bundle the default font It's worth to think about setting -DDESKTOP_APP_USE_PACKAGED_FONTS=OFF since it's impossible to install fonts as dependencies of packages with Nix and tdesktop's widgets are developed only with Open Sans in mind (it has a lot of hardcoded values and wide fonts like DejaVu may even go out of widgets' bounds) https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index bdca4bb4fef..31aec0a4678 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -81,6 +81,8 @@ in mkDerivation rec { # We're allowed to used the API ID of the Snap package: "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" + # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 + "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" ]; # Note: The following packages could be packaged system-wide, but it's From 9c5e8eb8da36e44b0f847bee610f941a67fcb38e Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 22 Jul 2021 23:49:33 +0200 Subject: [PATCH 052/136] git-machete: enable automatic updates via nix-update --- .../git-and-tools/git-machete/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 531d5a547e6..5913bb33c30 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -1,6 +1,8 @@ { lib, buildPythonApplication, fetchPypi , installShellFiles, pbr -, flake8, mock, pycodestyle, pylint, tox }: +, flake8, mock, pycodestyle, pylint, tox +, nix-update-script +}: buildPythonApplication rec { pname = "git-machete"; @@ -23,6 +25,12 @@ buildPythonApplication rec { installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh ''; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { homepage = "https://github.com/VirtusLab/git-machete"; description = "Git repository organizer and rebase/merge workflow automation tool"; From 290599fbb133f45c6f67d9832e49c24f471be908 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 23 Jul 2021 00:00:04 +0200 Subject: [PATCH 053/136] git-machete: add a simple version test --- .../git-and-tools/git-machete/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 5913bb33c30..d73ae5c960f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -2,6 +2,7 @@ , installShellFiles, pbr , flake8, mock, pycodestyle, pylint, tox , nix-update-script +, testVersion, git-machete }: buildPythonApplication rec { @@ -29,6 +30,12 @@ buildPythonApplication rec { updateScript = nix-update-script { attrPath = pname; }; + + tests = { + version = testVersion { + package = git-machete; + }; + }; }; meta = with lib; { From ff0a9f815f32044b2a304798da46a60400d918e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 22 Jul 2021 20:12:37 -0300 Subject: [PATCH 054/136] matcha-gtk-theme: 2021-07-08 -> 2021-07-20 --- pkgs/data/themes/matcha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index bb825c8044e..711354026d8 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-07-08"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-iTwPN31JvpFlCBWikOeSTda2wBEtg6ygy8o6ovqHPCw="; + sha256 = "0shdkwpqj3fw5qr99ww4z5dyrpa2pq79s0i02p9j3v6w6aca2gic"; }; buildInputs = [ gdk-pixbuf librsvg ]; From d10ccb2b339257bae7d44af7d024476ec46306e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 01:09:51 +0000 Subject: [PATCH 055/136] bemenu: 0.6.2 -> 0.6.3 --- pkgs/applications/misc/bemenu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 371bb3a3ef9..123d839341d 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-2xmi/Mh5iU50yc2R1x1yzP8Xaz+mUgLnH73tAeLwxI8="; + sha256 = "sha256-U4IMfDvQ0rfEJhE3Uext2c/Cs0mjy1tw+k8uk441Ag8="; }; nativeBuildInputs = [ pkg-config pcre ]; From 5409235160215cdf99032957f7f7c80cb31e80e3 Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 23 Jul 2021 01:01:54 +0000 Subject: [PATCH 056/136] nixos/iio: mention iio-sensor-proxy in option description In https://github.com/NixOS/nixpkgs/pull/131094 I mistakenly created a new NixOS module for iio-sensor-proxy because I did not know about `hardware.sensor.iio`. To help people find `hardware.sensor.iio`, include the string "iio-sensor-proxy" in the description. To search for an iio-sensor-proxy module, I tried in vain: * `find -iname '*iio-sensor-proxy*'` * https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&query=iio-sensor-proxy * This PR will ensure this search query finds `hardware.sensor.iio` --- nixos/modules/hardware/sensor/iio.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix index 4c359c3b172..8b3ba87a7d9 100644 --- a/nixos/modules/hardware/sensor/iio.nix +++ b/nixos/modules/hardware/sensor/iio.nix @@ -9,7 +9,7 @@ with lib; hardware.sensor.iio = { enable = mkOption { description = '' - Enable this option to support IIO sensors. + Enable this option to support IIO sensors with iio-sensor-proxy. IIO sensors are used for orientation and ambient light sensors on some mobile devices. From 56ceaa6c8b0fe45447f9bf85a0d7c373ec29601a Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 22 Jul 2021 15:01:13 +0900 Subject: [PATCH 057/136] prometheus: nixpkgs-fmt --- .../servers/monitoring/prometheus/default.nix | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index b87817af439..6d68b66d299 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, go, buildGoModule, fetchFromGitHub, mkYarnPackage, nixosTests +{ stdenv +, lib +, go +, buildGoModule +, fetchFromGitHub +, mkYarnPackage +, nixosTests , fetchpatch }: @@ -27,7 +33,8 @@ let installPhase = "mv build $out"; distPhase = "true"; }; -in buildGoModule rec { +in +buildGoModule rec { pname = "prometheus"; inherit src version; @@ -41,19 +48,21 @@ in buildGoModule rec { ''; buildFlags = "-tags=builtinassets"; - buildFlagsArray = let - t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; - in [ - '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${lib.getVersion go} - '' - ]; + buildFlagsArray = + let + t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; + in + [ + '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.Revision=unknown + -X ${t}.Branch=unknown + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=unknown + -X ${t}.GoVersion=${lib.getVersion go} + '' + ]; # only run this in the real build, not during the vendor build # this should probably be fixed in buildGoModule From 0eaa40b01d7a88b3787e01093d3f7bb711ad35ab Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 22 Jul 2021 15:01:46 +0900 Subject: [PATCH 058/136] prometheus: disable tests for now --- pkgs/servers/monitoring/prometheus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 6d68b66d299..f4ad8a8e7b9 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -76,7 +76,8 @@ buildGoModule rec { cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; - doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1 + # doCheck = !stdenv.isDarwin; # https://hydra.nixos.org/build/130673870/nixlog/1 + doCheck = false; passthru.tests = { inherit (nixosTests) prometheus; }; From 055926dc489cad20914f0ce5953d6ebdc212174f Mon Sep 17 00:00:00 2001 From: Kreyren Date: Fri, 23 Jul 2021 03:57:56 +0200 Subject: [PATCH 059/136] github/bug_report: Improve readability --- .github/ISSUE_TEMPLATE/bug_report.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 4d3c8888f3a..fa1140a7e33 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,33 +7,38 @@ assignees: '' --- -**Describe the bug** +### Describe the bug A clear and concise description of what the bug is. -**To Reproduce** +### Steps To Reproduce Steps to reproduce the behavior: 1. ... 2. ... 3. ... -**Expected behavior** +### Expected behavior A clear and concise description of what you expected to happen. -**Screenshots** +### Screenshots If applicable, add screenshots to help explain your problem. -**Additional context** +### Additional context Add any other context about the problem here. -**Notify maintainers** +### Notify maintainers -**Metadata** +### Metadata Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result. +```console +[user@system:~]$ nix-shell -p nix-info --run "nix-info -m" +output here +``` + Maintainer information: ```yaml # a list of nixpkgs attributes affected by the problem From 20707217392b6993511d0347de68a09c4f105ac2 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 17 Jul 2021 09:31:42 +0000 Subject: [PATCH 060/136] factorio: 1.1.35 -> 1.1.36 --- pkgs/games/factorio/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 98c58191f16..8a5a4d3899a 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.36" }, "stable": { - "name": "factorio_alpha_x64-1.1.35.tar.xz", + "name": "factorio_alpha_x64-1.1.36.tar.xz", "needsAuth": true, - "sha256": "1svjjpyffdrmll1b3icsrikfi4v2r1z6j7iqq0v36iq0zw7vw3bk", + "sha256": "1x9a2lv6zbqawqlxg8bcbx04hjy0pq40macfa4sqi8w6h14wgww8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/alpha/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/alpha/linux64", + "version": "1.1.36" } }, "demo": { @@ -46,12 +46,12 @@ "version": "1.1.36" }, "stable": { - "name": "factorio_headless_x64-1.1.35.tar.xz", + "name": "factorio_headless_x64-1.1.36.tar.xz", "needsAuth": false, - "sha256": "0xpiw89ad6cfpc576g5jpsyzwjncs3jrx01056p52wj01747fm94", + "sha256": "1s8g030xp5nrlmnn21frrd8n4nd7jjmb5hbpj1vhxjrk6vpijh24", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/headless/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/headless/linux64", + "version": "1.1.36" } } } From c0340896a50e6c200aeebd3b38dcd1824fec960b Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 17 Jul 2021 09:32:43 +0000 Subject: [PATCH 061/136] factorio-demo: 1.1.35 -> 1.1.36 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 8a5a4d3899a..500181ff70e 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -28,12 +28,12 @@ "version": "1.1.35" }, "stable": { - "name": "factorio_demo_x64-1.1.35.tar.xz", + "name": "factorio_demo_x64-1.1.36.tar.xz", "needsAuth": false, - "sha256": "0yqb4gf2avpxr4vwafws9pv74xyd9g84zggfikfc801ldc7sp29f", + "sha256": "15fl4pza7n107rrmmdm26kkc12fnrmpn6rjb4ampgzqzn1fq854s", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.35/demo/linux64", - "version": "1.1.35" + "url": "https://factorio.com/get-download/1.1.36/demo/linux64", + "version": "1.1.36" } }, "headless": { From 6c25dfa39a82f4368bfbfe4fcb9a20bd3b8536b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Fri, 23 Jul 2021 05:41:58 +0200 Subject: [PATCH 062/136] seyren: deprecate phases (#131137) --- pkgs/servers/monitoring/seyren/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 4dd90cacb8b..a94de966e4d 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1fixij04n8hgmaj8kw8i6vclwyd6n94x0n6ify73ynm6dfv8g37x"; }; - phases = ["installPhase"]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; From 9d0bdd7f152c1fd3f722c33efc5015f02286a54b Mon Sep 17 00:00:00 2001 From: Takuma Yoneda Date: Thu, 22 Jul 2021 23:01:40 -0500 Subject: [PATCH 063/136] slack: support aarch64-darwin (#131164) --- .../networking/instant-messengers/slack/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 39cff6de85d..24282f4be33 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -50,8 +50,12 @@ let x86_64-linux-version = "4.17.0"; x86_64-linux-sha256 = "07ccms58pq27ilkyhcf6cgwb7qrddwil5kgy8yv95ljikqzi5rxi"; + aarch64-darwin-version = "4.17.0"; + aarch64-darwin-sha256 = "1a5crmnbz8ng3z2pk5zw17dds9d5fyir4rkvv611fn858kq5fv46"; + version = { x86_64-darwin = x86_64-darwin-version; + aarch64-darwin = aarch64-darwin-version; x86_64-linux = x86_64-linux-version; }.${system} or throwSystem; @@ -64,6 +68,10 @@ let url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; sha256 = x86_64-darwin-sha256; }; + aarch64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; + sha256 = aarch64-darwin-sha256; + }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; sha256 = x86_64-linux-sha256; @@ -75,7 +83,7 @@ let homepage = "https://slack.com"; license = licenses.unfree; maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin"]; }; linux = stdenv.mkDerivation rec { From 34d2b8329146c9068af20c1dbb71bff94f9b2abe Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 22 Jul 2021 21:51:16 -0700 Subject: [PATCH 064/136] nixos/klipper: Allow lists as values for gcode_macro --- nixos/modules/services/misc/klipper.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/klipper.nix b/nixos/modules/services/misc/klipper.nix index 4930648ba8e..909408225e0 100644 --- a/nixos/modules/services/misc/klipper.nix +++ b/nixos/modules/services/misc/klipper.nix @@ -2,7 +2,13 @@ with lib; let cfg = config.services.klipper; - format = pkgs.formats.ini { mkKeyValue = generators.mkKeyValueDefault {} ":"; }; + format = pkgs.formats.ini { + # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996 + listToValue = l: + if builtins.length l == 1 then generators.mkValueStringDefault {} (head l) + else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l; + mkKeyValue = generators.mkKeyValueDefault {} ":"; + }; in { ##### interface From 13cef561850fc6ee01de09f945c0e6047c26ef3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 23 Jul 2021 08:02:40 +0200 Subject: [PATCH 065/136] python3Packages.gym: fix build Tested by running one of their code examples --- pkgs/development/python-modules/gym/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 888dbf45342..1bda1d8ac2d 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { scipy ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "Pillow<=8.2.0" "Pillow" + ''; + # The test needs MuJoCo that is not free library. doCheck = false; From c078dbc3072831eff8c5b5c67809c78ad8477796 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Jul 2021 08:34:35 +0200 Subject: [PATCH 066/136] prometheus-openldap-exporter: 2.1 -> 2.1.4 ChangeLogs: * https://github.com/tomcz/openldap_exporter/releases/tag/v2.1.1 * https://github.com/tomcz/openldap_exporter/releases/tag/v2.1.2 * https://github.com/tomcz/openldap_exporter/releases/tag/v2.1.3 * https://github.com/tomcz/openldap_exporter/releases/tag/v2.1.4 --- pkgs/servers/monitoring/prometheus/openldap-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index 3aabe6e7231..a439c84bca9 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "openldap_exporter"; - version = "2.1"; + version = "2.1.4"; src = fetchFromGitHub { owner = "tomcz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Di1GiyVp/hGCFhqxhlqJSucGZK7f/FDDUFtJRaiAZu4="; + sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4="; }; buildFlagsArray = '' From 7f2e069592a3818a5a7c04732fc324a99f7b86af Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Thu, 22 Jul 2021 23:25:30 -0700 Subject: [PATCH 067/136] dpdk: Support building example programs --- pkgs/os-specific/linux/dpdk/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index a4bad12b716..ca8905e6240 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -4,6 +4,7 @@ , pkg-config, meson, ninja , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap , doxygen, python3 +, withExamples ? [] , shared ? false }: let @@ -51,7 +52,8 @@ in stdenv.mkDerivation rec { ++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni" ++ lib.optional (!shared) "-Ddefault_library=static" ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" - ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}"; + ++ lib.optional mod "-Dkernel_dir=${placeholder "kmod"}/lib/modules/${kernel.modDirVersion}" + ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; # dpdk meson script does not support separate kernel source and installion # dirs (except via destdir), so we temporarily link the former into the latter. @@ -65,6 +67,10 @@ in stdenv.mkDerivation rec { rm -f $kmod/lib/modules/${kernel.modDirVersion}/build ''; + postInstall = lib.optionalString (withExamples != []) '' + find examples -type f -executable -exec install {} $out/bin \; + ''; + outputs = [ "out" ] ++ lib.optional mod "kmod"; meta = with lib; { @@ -72,6 +78,6 @@ in stdenv.mkDerivation rec { homepage = "http://dpdk.org/"; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = platforms.linux; - maintainers = with maintainers; [ magenbluten orivej mic92 ]; + maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ]; }; } From b14e3171773c1791b50dc19fa6d68cc285b11741 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 22 Jul 2021 21:12:34 +0900 Subject: [PATCH 068/136] firefox-bin: 90.0.1 -> 90.0.2 --- .../browsers/firefox-bin/release_sources.nix | 778 +++++++++--------- 1 file changed, 389 insertions(+), 389 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5813868286a..93eef40afae 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,975 +1,975 @@ { - version = "90.0.1"; + version = "90.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ach/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ach/firefox-90.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b985849c5109b6a9992ca0fc4699b769af37c84f1aea5fc6c1b66845f51da83d"; + sha256 = "ee3f5f5e5fef9b41a075569515467ae53706d1b456afc34acc3e73cb53ad7549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/af/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/af/firefox-90.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7ddb078a80b7991576f691a1c3bc76635621aa13d64c465651e16ae4dade7436"; + sha256 = "0c6178c97b21580038495444500cd9cbd8de980ba64ab9345366d2eb43ff7c9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/an/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/an/firefox-90.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "dca47858177ed263332c7cb093e3285b5c8f61782a66cf683ee52896c3fc76a2"; + sha256 = "6dd2b6b3219f1ef39e0d204dc346ff750d045bcfe16cfc55efc15ee3dcd74b85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ar/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ar/firefox-90.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "2249834099e5cc9a5feb0b38bdc277e5e3f65635b1a1179afe1240113f0ee1d9"; + sha256 = "efb5dae74218823b3550d716be8b6aa907c9daa2611588d254c3ffd24923a1e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ast/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ast/firefox-90.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "7ad21576299643e480922a2a7b6077a0edc84d362e33bb8318b33d04133a7c7b"; + sha256 = "ef665e2ace9a41650d873cbc5562b2072c9de013f8a48a5ce72b735c9e76e883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/az/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/az/firefox-90.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "10eabc925d651985229d6bac1c34b12267a31886f5354ba943178f6a2d0ef04a"; + sha256 = "2eac97a8216725732ad9e79451e23af0a4f6688d248fb12f17e0ddfdbcbe8766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/be/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/be/firefox-90.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d1e6d939233b23e5378161c79f338e66c010056d9d3e619b9eb6c26dc4461724"; + sha256 = "5da97b0b3e7be0ee77ffc013a453249fdb1b6c90a6baa93e6e180f64a2e6bed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bg/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bg/firefox-90.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d59e69127462aa3efff558d5cd5035951dbe54161f913dacb4142a8bd3f258fb"; + sha256 = "de04186cb91dac93edb81c6da8cfa21a2bb33abe0677038cc08762b79fd9032e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bn/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bn/firefox-90.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "56ca1d7e84ada3f0124e36186a32dfdf287547bdc8d3b111baf9407fedf0a7ae"; + sha256 = "6e408ad360718bed39902e4634c8bbf89de5bd31d4eb6124b3e0a624f4a817ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/br/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/br/firefox-90.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "33a6ceb6d37b73d03fe5a6e93e19e29346b2861ee69ab2fffd6cca4a2dbaf40f"; + sha256 = "192b8e20b9f42f443dcbbc1dca6103e2ea44925fc1df05f6a6c61861ccc2e09e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/bs/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/bs/firefox-90.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "7c853a13afd74307e7a468b85ed430b20f1622dbecb697b8c80945ccea9f0805"; + sha256 = "9fc5a531065f5fe0466e8e3027dfba654dc30470ae2763765692a49223e80da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca-valencia/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ca-valencia/firefox-90.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "0aa103c471b3f71ef638cbf9e8f83447875ef5cd96bdc8535435188510272c65"; + sha256 = "c1a9d555dad9598379733404141272292cbac858b2b2f7fd7f5cc1962aef3280"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ca/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ca/firefox-90.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4672d9fe667f72de45af1eb6a205792440afa9de86eae1f33426d3b948fbc841"; + sha256 = "942fd1cbe717d344e09e4c56e2b5f2fd54d341f92b85d9ea5c90d272b5fdd385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cak/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cak/firefox-90.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7b12a52926888f52957a75f639f09094dc4cbc18a1c6d14bf433028461c4a71a"; + sha256 = "b4ee321fe684de9919bc7333096dcd590576c8ce405e454cd362bd4e7559d0c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cs/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cs/firefox-90.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "7dfdf0c4c740dab356205c52384faf61e9963a42675031f0292be1c0f4e402c3"; + sha256 = "6249f8805552c035160c1a6a155323190e4cde495409ebdb1be182234eea78b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/cy/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/cy/firefox-90.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ad7f76b997bced6df5c240273fb736fe7dcb0c86ae867a5cbdb5097dd5c382ba"; + sha256 = "a362582fa671c3a9c54afb10d1c88348ad3da31add280e730e4ced4aed21a733"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/da/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/da/firefox-90.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "9f59ff2eec510b75312bcbe29e9706fe0710f300c12e33200937571414254d31"; + sha256 = "7ea8aeb5eeeb17799642498905893e8b043e5abfc4a0d3ce142f95d54737f473"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/de/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/de/firefox-90.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c838f9238939cc8e91fff903a231062c03388c2202e273f7b99701415a8f3f22"; + sha256 = "ebbd750201afbcb189cff2db5f72af590024e7d801a04a00c9b2e656921b0440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/dsb/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/dsb/firefox-90.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5370c32283f8bf7fc3273dbe3cb5c77db829723a39401b00f0e8f70c9f3dba91"; + sha256 = "8885710a72d73ee150763fbe942fb645797f791636d27a3c52425a67169c851f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/el/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/el/firefox-90.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2af4feceeea5c0932935d91c22df516ae2e25d9006ab41ba6274783b74b3a5e5"; + sha256 = "652c6d6cb263b57f3f5801bece2464d5df4bcb326072419c9e269dfcbe92dfb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-CA/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-CA/firefox-90.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e805c2eebe0c9892082b900af2bd1511264ed5fd5d47864ca5a8fc3e6c0a05de"; + sha256 = "87f4cb450da3180eefc47f0ab453c00182904f9a367d4a6fb0baf6e1a1aa0955"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-GB/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-GB/firefox-90.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "2d888fdd72a65137790b10f02056d6194fd9c374cc6ff09cf7217cfbb84e2d7d"; + sha256 = "e0d55687a6c577d04db7c1b90532aa6274882e92275e2cf5af1efbf6f4bd1c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/en-US/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/en-US/firefox-90.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "998607f028043b3780f296eee03027279ef059acab5b50f9754df2bd69ca42b3"; + sha256 = "2d62a8b1b1e39c00ddd8923fc862484fa1501eba243894ae4c5079766e58d1fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eo/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/eo/firefox-90.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3fee8ee742d6ebc03a6fd66404979b7e2fc823757801ac205ca291c249f7b31c"; + sha256 = "4e1198ff0d83718326784348d301ab6782a73435ab1b32d40ccdc9d05238ca8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-AR/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-AR/firefox-90.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "854cf81090ccdb2f8d4ccf0729c7228c2945626a56d1cfee524f927c5bb67c47"; + sha256 = "ae8a2145ae461fd5a13744fbeb93f16330f68497a58b21465cc8c174fb5a4fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-CL/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-CL/firefox-90.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "c0b92a9e2defa74171c880be9ed84f12ab946d4d9af888d7d9ed735114968fb5"; + sha256 = "1c66b290d07ae7d7093a67930a15e648b0c4ca95fe8bbd42ca9349766537a4b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-ES/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-ES/firefox-90.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a2fcc7126f6c5b6edf162357ddf7493df2873ecbe36d74a176c3924b877c4448"; + sha256 = "164575fc3385ea9f3883febbd827aaa9115da185e07f70afdd8b2cd5442fdf46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/es-MX/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/es-MX/firefox-90.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "fd27c822086cfdd3636d1edd0afb62be22546d2dcb86d968ef4e1875acbb66fe"; + sha256 = "6f2284a3de5653d9e6cfb769162530d9630b45a3fb5ae73bbe5d77b78c4e19a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/et/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/et/firefox-90.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "13f34d32f05de7d77d4ffed59a00d539cc819edb3ad9ab52d1a77d9f92a05264"; + sha256 = "9c6a073b4539082ef1714d6068c26f0182d3358903cc1b1a6c15d5cdb6067c18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/eu/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/eu/firefox-90.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b53133754eadfd473a68b0647bbf3ada70ad46cd0820ffc94b96ca0bd259db62"; + sha256 = "025c94ed2fd16956ae30c98ee1173386c5ac8920cf3ca4e61ebc0a9d6b71222f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fa/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fa/firefox-90.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "048ab2377915cf7efd4daab495873f9c1282f74907bedc22093b0cf17cc3b301"; + sha256 = "3456216eaf2e17f6973e79161815d963be70db4c1a6aed65dd2e378e7611f310"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ff/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ff/firefox-90.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "99de5853888020d6435e8a369eb8b983fe4374e754451dabc2785b9ab2d5bb24"; + sha256 = "e9a8e66a209a135206757082dc0dcc3fbe991fc0f1a10bfc76b7706778d5f433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fi/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fi/firefox-90.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "03513b1d725a6f5ffa243fe38e19a66c2850d849c09d7b80c3ba17fcb3012b17"; + sha256 = "6f33d44c0f74b9a29accf07d8205604f4c1c7397f9957fd219b246f31def9c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fr/firefox-90.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "350c5ded72a988773acdb3411f0d9d1ecfdd79501cbc04a9ed8777ada8248ae5"; + sha256 = "0e78948af1d6a18195904a6e2c9a368459d5578e9727afc0159fb2c88eb659df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/fy-NL/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/fy-NL/firefox-90.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "026a5a3e8140110c830c237b1dee5857d07c9eacd1e803d0f5b054afd0d5d06b"; + sha256 = "8513f2bd6c2004d1fe778573aaeb029877af01b0d3bb2390584337c8095365a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ga-IE/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ga-IE/firefox-90.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1b522979314c1c672c30da02ea7d38f94ea811df91d86b8327836937069ed956"; + sha256 = "74978be3cf0672e779f291a4260fb977c155b3769c0654f4b819bbb69849d9ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gd/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gd/firefox-90.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d6830e901c20477dd4121cd3a0f918634bc3107d799eaf4439b9ba036acd88d5"; + sha256 = "9593cba33374fda3381798b94d6cfcd41b08a3540cbf845aeebd14e8fff6b2ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gl/firefox-90.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f25adcd9c7c027a7e531a9072201f174cb69e30c30dffabfff4d0d8e12250f68"; + sha256 = "2072671f052216881cab6323912cf32671dd829c0d2a25a0530026bcf763ff33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gn/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gn/firefox-90.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a0df03aa486320a1fbb554a5be600067d2447af0a63726290f2c7d599c9a9534"; + sha256 = "74a3ba6468110a5bf719fa0ed064ed0ceb2cabc9f9182789d3cf8cc7e166548e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/gu-IN/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/gu-IN/firefox-90.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "daf1ba05f971b8b8f04da9085eefb03ad15fa5bf6d637ad1bcedb94665bb150d"; + sha256 = "e58cafd6d1ebd0d5158683e640e745b993365dac9c3ad118274e5115ca3fa986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/he/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/he/firefox-90.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "cedcbd2e76bf371ed8daefd100631e0381470b3980946e033b39a2b94035a55c"; + sha256 = "f2ec967d4e4b9037a46e840ebbcddff8d30ba5284bcc0e9c993807e477004002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hi-IN/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hi-IN/firefox-90.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "d0d6ba66c59fed2c33d9e21c9015b40743ac7e4305b1055f39b909754af984bd"; + sha256 = "74b7fd465be49622638042bd92ebafb961371e8ba3229c5f51b6e16b3d86c2d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hr/firefox-90.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "11ba8ffdf88bbaec536e4a362dd40f2eb535edb652fb01587ed46ba09fa7f17e"; + sha256 = "8eba7ac66bb1c50537cd684c637ad3bf827cb4d835dea895bef648adbf5ae901"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hsb/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hsb/firefox-90.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "d1e1fbba7748ffc2c0f92e4be4dbe346359bc145fa2dc063ed4660d14ffb0b1f"; + sha256 = "04dc064d385a2cc9558ffb293d03a9200046982911c8ffae04fb940ef6348f0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hu/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hu/firefox-90.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ba8d28151ddd5e02b530b653f5bf5de9dc97669355a8b6370e5067527f22bf34"; + sha256 = "fbb823826e6c27b4fc771128ac7e4cabfe25957726ad6926ce6092d92a0ee805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/hy-AM/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/hy-AM/firefox-90.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "df7d7543013687f02a88f9e6d52d4bfbb46c6ce6646bfbbf86571d7473be2554"; + sha256 = "9267181169545acdf9a1c3d34d2a8486b06e470704bacb4d77f608c4a0d7fe89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ia/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ia/firefox-90.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "1df0469ba5a368bf5ddd323e68ab458d29042b85e471bb7e20dfccefdf086ba9"; + sha256 = "197a1a6e71f14c4ddbfab5be47d60ec8bae32bef4dcaf6638932dba41bdd0c06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/id/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/id/firefox-90.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "fee462d383763763a6034a452150166d507d424e303b114b68bb13b6779605d8"; + sha256 = "4fa565fb93e011f7bca7cf321e342361e4ea3462764bb2b965fd192f4fdc20ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/is/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/is/firefox-90.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "86568d6afaed2043d916343c565689047246ff3dbab5e6d928e5a6722f8d093d"; + sha256 = "c6f026a88f5e3e81a5b6998004f122dc3d225decaed161c83145fde0f97ec0b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/it/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/it/firefox-90.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "36e5dc00b8f9bc3fdc91441c0939eae5d43356ef0268c2bebea1d087f5d414e5"; + sha256 = "41da1b7f11386b99ab836b098250d677b1d9804807932e021050d9d5705bb61a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ja/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ja/firefox-90.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b07f66b82be0f6f716384c37286205be455c83d8c9299456376d171167269903"; + sha256 = "e6c64a6f8d9d7369c4d768e86195d7ae4943a36ce2a17bc52c64d6d506790b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ka/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ka/firefox-90.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5b391f01586ca70900ce279de8f3e22c670de5b210f350bc8bf82c75dd47e0ac"; + sha256 = "15af2a3dde8265ef88578f1682ed5874745bbe8afb40cec31933a03618c74eb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kab/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kab/firefox-90.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a833e4c862c8805d4a1571b210de928f5d4fd6e7973d1de5e7ac1e8e3877b722"; + sha256 = "0030c8ca365659698af414b325681673ff600642c873b5403abd77019a3b3c97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kk/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kk/firefox-90.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "5041bbd4acba0a2710e705798c8196605c62852de8a1c43f3676631dba5369a5"; + sha256 = "e596da9120269aea24f275f15a04f65e4319e7c19508fe292752af19d8ff1af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/km/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/km/firefox-90.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f71888db4e4cc49172d625cca26b5b72c6d85180894f29ee0b934781f0f6efff"; + sha256 = "d42dc8a75e3e474da6017c15b699a4b9cdaaa78d1afb8dade7af14f2503ef8d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/kn/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/kn/firefox-90.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "7d32dee56e657d791eb80e6829ad2ff3624d949531bff1366b685924564d6534"; + sha256 = "4674bda817818609461aa128f9aad337a25718646a65924545b403985eecbc8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ko/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ko/firefox-90.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f9f0781ca8eeb1b21060a3cc2df8f8f5fecd659a230fa4f5f2907db5c37fe6c6"; + sha256 = "f3f95e0d996e4cc1fbd3d1051b34a2f6d436a6672fb417f74ff140dc01943f67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lij/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lij/firefox-90.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "0cff9a886e2d158ff00638200106d6537a254cc5a64e48a8233770e5798c1ca5"; + sha256 = "40e470989b0ab746c04c3fa7023c90b0512ef6b580a77b2de8651483e145b1ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lt/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lt/firefox-90.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "69c8e5a6f5c3d2435ed6dd02bc1c4b9264b1543b7763ade3accf4f30eea7b9e6"; + sha256 = "fcb0b0eaa5144357809197539100013ab027de6334d093061b8971057e85e694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/lv/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/lv/firefox-90.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "55b59adc86e9e91f5a134bb16837c8843449f4dfc85abbb3f292bb34214bbca0"; + sha256 = "2aef3f3de461f1c00909dea7bdc00ed1f56d0e4edcb7b2f08581fd06dc6286b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mk/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/mk/firefox-90.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "d670166e34e513ff4dac69740f547542e4e2c3e24f7ae7d165dbe5a4151f17e4"; + sha256 = "789fbe69ab269da101585eab463eb7eab50c1fbfbc92fb88116f402966ad3e71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/mr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/mr/firefox-90.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "9cd258a90e1a12a113e626bbaa4d557936b29b71491138e73f74ebf6645a9b76"; + sha256 = "fd4d1e60ed873bbbb522c956e14ac21bb490888f84dbe900dfcfd036bfd84289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ms/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ms/firefox-90.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0b68ba835ae0f3561eaa2721de08bab95946c1e1111b05f8b02cb7f95bc23335"; + sha256 = "970f5e7f8962c05653228830f53bb55585e7a14bc526f06e09e4fe18c30cf93b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/my/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/my/firefox-90.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "071df9d8ee0a5d1e3b3ae8f472173b5da378b6b41646a3d1d2222a3dbc73596a"; + sha256 = "188813a56ed195452e3dc77760707ac6bb8daf7e8063ae5b3f8dd18597d70452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nb-NO/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nb-NO/firefox-90.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2623cb59780a1db3cc20267023c93f578ad4c6cfede8b12416f538d62ffa930c"; + sha256 = "0e1e979c3e33c5b272355238491bd971a68e6b17cd619f14d61814214516553b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ne-NP/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ne-NP/firefox-90.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a6c6c514cf476bd93d64c1e315161d765792528a632aa881a75abb85076ac998"; + sha256 = "b45d52daf7a8fccb52642eea1da34ba5447a9511d6d577530379804ce64b3a68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nl/firefox-90.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "60d7de62f35cadc8bab987bf81fe6d8635388b361f3157e5d13809604cc41927"; + sha256 = "36a5808b6e510a8c9eb4d61e8cdd1a29f43bade3c30876b1c0d882af1a9b4dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/nn-NO/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/nn-NO/firefox-90.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "a1b0cebb8de16685011e5cded38add6a3b13738163dbcf6216182b350c293f27"; + sha256 = "958f51581c99d459f2e82c0abd311d487e444388bbcacae193fbc8d44df0a567"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/oc/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/oc/firefox-90.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "f4f491e962ec713e708e9f773de3af9f6251ab6f2f41f516116f83a63824928a"; + sha256 = "895f42c9024a9e15e2bad2a1eda74eb6d1e928d01766235ca706543eca822b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pa-IN/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pa-IN/firefox-90.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "5a41333ed465121d212ddc6c61faf2a5c4eab25daf0ec3206196077f490a18e1"; + sha256 = "fc24be218f92076761afa833a1374cf2573b1ac3e86bafd1bde8ea720a181c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pl/firefox-90.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "de5d8c3e5b8f458c400a98c1b72595ff951a54083ff29e1bf01fc3421443cbd8"; + sha256 = "eeac2270945b16aef7d138733fb08576e877347b0a222eb97a0b8f154074af76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-BR/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pt-BR/firefox-90.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "53fb72801cc33ded2e31142161faaca04ec5f7742413faeada30e1c5ef51025b"; + sha256 = "6c609946024a8659d84e3b356245db80e08df7a0fdf4745b846537bc164bfbf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/pt-PT/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/pt-PT/firefox-90.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2c72ac24a7cbdb79b338ad9a79f649be85caa0377b78fabcf07c42b1ef02a94e"; + sha256 = "604f36949f5b7107f4b84e2da7c0125ab67add31a3adf811cd696458127a0d9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/rm/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/rm/firefox-90.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "bfd252411406e6a8816ef000fc6fcff6357741924754daf05ee39ff331bdf3e5"; + sha256 = "52a29404671e2b3132c2d3b27859b414820755b2d60a1043483e26dc33985336"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ro/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ro/firefox-90.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f4c9a173ab7e9fc964f4c255ef9830559fc835d1f18ac388de5fa16d2df5d521"; + sha256 = "60a8c8e6cd54b4093d922dfd3aaeda483d82ec8c23725e8d1a15ec7c21d662dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ru/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ru/firefox-90.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "07d1c8cd10323f039a040295230f223e9e6b40860830b2e26a0ab9fd2c15d0a7"; + sha256 = "6e18bb8f1828a832715543be37f5bee235135623256a0af70e40cbc0513a0477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/si/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/si/firefox-90.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "6f816e89adaabb79ff1b73eed516e6c5f817d7af0ccaee58262ea47c80a08664"; + sha256 = "f85b0f7c1234a9bad7bf7c242209df03dc17655e9a9b5672df04790433648f24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sk/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sk/firefox-90.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "14fbd3f2057da82c95e2cd194021adc3c7c19b0f64cd56e623ae2341b7414301"; + sha256 = "1bdbd0877f513c4368de9fc494b4d3eaf47ff28c73cd323a99f6f02e105f6ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sl/firefox-90.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "388ef17576722a32d22350ac2848c8e7f0239481f1d0172441770052bf1c53d5"; + sha256 = "7f581f23d215bd6d5c52518b4711601b3558fd7b0d5ee6e7484453340d9bfbef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/son/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/son/firefox-90.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "f7785fc5a91c991c277b36eca1928c350953043e77cdb4b47f25d5f2f611828d"; + sha256 = "47de297dc96c63f1eca6dc37df4dcbb73e5ed1561311c9b60cf2e0eba52e4a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sq/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sq/firefox-90.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cc0f348c99304e0da47bbc4be45bc350c53574ea1e20d781f88862e5add4c60a"; + sha256 = "cca2b590997e16daadc8772cd67deff819cb587e2e8bdbcf943c7d5b99a323e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sr/firefox-90.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6824091ffb721ff42072798cd72c3061921eb69f85a710c141407f83ddddd836"; + sha256 = "d31e8bb274404448473e57021995fd7ae78c2024f146206e415580676656a6ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/sv-SE/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/sv-SE/firefox-90.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3d86180707aa4f2fbe271e9d8fdf10ef5cd52126648a64e684214f159cbc7512"; + sha256 = "6bf03f5aef1391708f25a386f05d7b3959bee8390421cefa3b993cd5b9278c3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/szl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/szl/firefox-90.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "e49776c7820b51648c8e2d19f5e8073515fda5397adae3302383e9f503240e08"; + sha256 = "2198b1cff87868bd9152f24306d99be63c322dca578d12ede90d5d34c3635a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ta/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ta/firefox-90.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d8b32890c9ad376cd9122ae6e80d1dc65c0b8be1e5dd4c7381011b1059dd8bbd"; + sha256 = "5fad9a8a62e6a1a96341842f34011db87ffb30dc7490582c0c4da0d2245e6425"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/te/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/te/firefox-90.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "87974e3cf5214db7f82244b43a584f3cb11d4ba66ac45dfce1d22f417fd63185"; + sha256 = "78010fc0503019b04cb7cc44c500c845e28a90c52db7480264e989fbd5deb389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/th/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/th/firefox-90.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1d65c868936bd174ae9ecac66e1c1bc30e4b1214aaa0a2762dfcda6929eed1ec"; + sha256 = "221016e5e7e4f4fb53eb570edd825b2d38922fba7c0344a0048525ffbbb2ae02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/tl/firefox-90.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "115ecf4d90d13df1352637c9ed6d1701b6a9d0793d3487d582b90d487e27b52f"; + sha256 = "81ff9417cbdb2c36be61baa2752701d5507cf5214ac0afac822d426e029c8141"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/tr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/tr/firefox-90.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d66f4114e577e945abbb1b32206b2cddff65db1f9a2b1cbd1c8a11e528ce656f"; + sha256 = "e3a053ff1b785e52df509a08d66bc5662252c8edf7e476812aca76c2c4ab0b75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/trs/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/trs/firefox-90.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "1dc6d43229d0912d34394889deba3d91796ac4aac437b7ed86065d978871fbec"; + sha256 = "d8c246da9885ec4b5f73284f09a6a80b7fe07f1f49da83975811f478526366f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uk/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/uk/firefox-90.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "1795fbe577dee1bc042a7b50bceb958446e7f6c95133c2d1432f1494ba86b6a0"; + sha256 = "0e1024086ade42468ed2f12396a03b87e2698e2490f69cc62c9f76f462d07ffc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/ur/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/ur/firefox-90.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "1da88a58d6262c4b2866e765efae0ccc23ff224ed59d5f9a30434a16408b17d1"; + sha256 = "14376446a9006673e2bc2fd5d947a08b07af2ff50e70cc9dd4e3bff51052a298"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/uz/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/uz/firefox-90.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "549956dc6ac0eab50becf7562e91a17fdc3f0244197379f03bbdb2b12f2ecaef"; + sha256 = "15fc45a28194b3fe8f3aaf2a47de64693e8ffe9054e9b7e06ae72018a7c0ee5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/vi/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/vi/firefox-90.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "3e9575342f30b81bebc730c855b54120c95e385edf9273e5355f857da81d55ea"; + sha256 = "69d69c341b80ca9b521607b737084297119cff0f66c4606c28bcdb47c67907dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/xh/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/xh/firefox-90.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d2e7dd3cbd70ef34c53bcfc5b3427508ed368cad548afe0509ff7149a6472ff8"; + sha256 = "9714bf46a53920a79844cf25cb7f2be2b33d4c98fc9c862edbb44ecba35c0bee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-CN/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/zh-CN/firefox-90.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a65f4a1002422a07083fb8566e3129f781a8083d9427ba4236812204c953a5f3"; + sha256 = "fd5b352d29c37ef0c750d40b8182da3399a8e52589d325dbd85fdfc2fabb1ed8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-x86_64/zh-TW/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-x86_64/zh-TW/firefox-90.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e5f1c0d36c7a4b3634858d691c5f26481018ac4ce7c5ab7a4c19e04b33810941"; + sha256 = "4b79f6db1aae404d23d1dca8ed8745b1132fefe62c2c2a4e64a49aff0cbcb0ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ach/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ach/firefox-90.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "b5908565dea1f33f82d8e380bb5d648fab9ebcb4af24d602a6c71e176fee5007"; + sha256 = "73f89b3c521f974f865ce35081ca23aa34288a3c2c97793031edc0c03e999f1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/af/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/af/firefox-90.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d40bd877e5ad156a45c0c325794537ef9dd71770a395aeebf8381075df0c74d6"; + sha256 = "02c1c8be1c00405a2c2ac66486e01f761c5c6400b2f685f739cc196c130d391d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/an/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/an/firefox-90.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "c72b84b92239955c750cdc302cfed32c7ed1a1352a88b5f599b4edfaad79fdf6"; + sha256 = "173b9ccad19be6b1b5b48eaa0f5f670ee97cfa28e249d36bd85846c8e52c4c87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ar/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ar/firefox-90.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "25b4175421efe766e7be49591c04b636699bc685aee6459c48b19fe9aaca07db"; + sha256 = "fcea5e8c3fde2d339556d4f1544d7f5f83a4c72adb129d028dd0eb342d3fc85f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ast/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ast/firefox-90.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d7919de20cf70de38f03e508b6ac5728b76ceedb626636cfed74c4698ce4dbc6"; + sha256 = "79c68a84f273543a92796e725530dc8f7097801d1958052576ca5b26b8075c86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/az/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/az/firefox-90.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "addbe7fa0121dc3643afde905bf33b764d36d49a60ccf6c427ab97ac941ce9f3"; + sha256 = "3aaac6897845e3884fbfca0888b1b2bb08709a4a1934aa5bf1d7a84dedf29377"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/be/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/be/firefox-90.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "db52de7ce7236110b28322996303e2a07f69b88eb53393aa4ff75dd841b02aa3"; + sha256 = "2bbcdf98b683420da29b8f3b09a6527a8013deefd9ad987d91947b7ac4764dd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bg/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bg/firefox-90.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2abe8c91ce73f350e31de13807fcdc48c2621a29fe25d17ed25a2fb8052ce831"; + sha256 = "693d8513e86329c3796713d9a42ecb9d844bdd3935ad377321156af233f2919e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bn/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bn/firefox-90.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "2b5f6e1bd73eda0fdf69f6d8181b83206bfbcfcb5edb11be12f2a29e6ffd4a37"; + sha256 = "19a2eee6ad520be48b9499bdd0308b15cc022d9767216382d8de3de24c342a46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/br/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/br/firefox-90.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "53339a26816934aa1f5edac114844c42b7107326f114ba28818700ae8ee199ca"; + sha256 = "d4901f3ec5ffc0340dee345fdf381b8f38ffe36d0fe934ed2b983b5600d2f6b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/bs/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/bs/firefox-90.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d49005f911a027a7628f45103ad2e43438a7ec33142f9a5ec7738a8694d071de"; + sha256 = "5a40c41b8ec915b94139f82ac77480c37a2da4595b0f4066f11d33463dff9703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca-valencia/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ca-valencia/firefox-90.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ccaa99d7eede57e43c57ab2a185a53061476cedb65f37d4659c1e765297c937a"; + sha256 = "831a7712f29ccc118ca8ab9ce3796292f56c0e45596e1f2904ae899661e727a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ca/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ca/firefox-90.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b4df85c3f723a3e8c44d249f12f37bd27eeade4ec802baccf2e82a92e9869002"; + sha256 = "eb604650d0b3539c853c1709835edf05c0c60969f0065c8f6c0ed80d41f2a8ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cak/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cak/firefox-90.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a8e1244c9904e3f5bada11c33f2f542b6dbb5ccb867f7cc6d5a2d1a99e95c48d"; + sha256 = "5fe7fc105f7ae411ffc24df0e2ba8c36cdd2fc1be9077ca261a9c422dae6dfe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cs/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cs/firefox-90.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b2cbe665a6b2482edbe29b50036922708e7bc7aaad65ef6d91b47beb4f53acbe"; + sha256 = "53c39c90aed6e55b324b8ef8375ab5b8b627788d716d71ff94f33a3706b7a3c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/cy/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/cy/firefox-90.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5e151c341812dcf8bdf769ba0a1ae9ec03b3e79d5f55fb18241ab0ef907538fe"; + sha256 = "d12f73551705c7ad3afd9898f92d4a20080040542df5ce5fdca27f150491c83d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/da/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/da/firefox-90.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ebcb60a77185d17114c26d58a61a3a3ef5198709c43133263efbe39c05275dcd"; + sha256 = "c5016abf9337ac7f48e12e656e1aefaa572cbeed9ed4ca27717724b08c48cbb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/de/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/de/firefox-90.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8819ad2efc7d49946eed2adbb10280602d0004722207cb46e06f46f4fb0f80d8"; + sha256 = "65a8b0830a07b3d8936cc2f266ced396481dc140433f8092d774ed9b0600bd53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/dsb/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/dsb/firefox-90.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c91e40aed7b1c1c41ebe0cdf77e46cb284d7cd308c6ae66a70f46fc4dab008a0"; + sha256 = "5044dc086c73ff07ee88f1987d15a432931e7ff48c045a05eea8eb1aee5e5f65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/el/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/el/firefox-90.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f9032320f0fd0622c9e6ad048de12533e92660bf56e255d2f79fc0c2adc3356c"; + sha256 = "0b4633ce3aabbd590c308e2b110db416fb0d719778c0132231e3ba94235d940f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-CA/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-CA/firefox-90.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9224c71771b26085f067acd29993e48aea66a61c7ae193bb6442569b9291677a"; + sha256 = "117590c95bd4f372714ea8ea13eea03c7755c5a4442a5a35e01a7ae2900823e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-GB/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-GB/firefox-90.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "fd27cadfa31f81d7103f867aea3efb6f03f341708c4ed93df5d6d8fba601c1eb"; + sha256 = "449f0e563b3fcae89e324e0c331c1a1d61ef76a54018fa02ca6a6ca6c16f2910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/en-US/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/en-US/firefox-90.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1043cc2125aa682953340fb40b721b3dcffab1ad0c06184fc5a92740638d4a13"; + sha256 = "6713930204c699a6b508a1885785f94672116d8ee1df3eaaab3187011b5540e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eo/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/eo/firefox-90.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "1dd42f52563463c146ddef224f97b6e87f82f01249f7bea290a4cb8331dc9fde"; + sha256 = "3754cf70f5a3ec935435c9b8284c1b405870f51fc3224d6c032845d641b3abef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-AR/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-AR/firefox-90.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "fae114afacd99e045abad6dd5a6d4ad5669b00158431ea8458d48e43aa06d4af"; + sha256 = "41f8b2cda0b52cd8d810545a240604ecec7132df3c5b2394b6407f038aa8886b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-CL/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-CL/firefox-90.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "1a4b839f8b55ef758c56ce18770cc31e871278e58f378fa7e7cbf4502e3b930c"; + sha256 = "8febcdbf610c842c31e57a5e0190eb62e586198710ecfbf4b4075d62a7d5f15a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-ES/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-ES/firefox-90.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "cc21e66b7c7250d57067c8fc133a8b6f4a4f4020474bb7d4510c94ca02c316c6"; + sha256 = "54e311e0fd76d0239618f90ce05fa8ed9dc956a0f35886ec587e316f566932b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/es-MX/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/es-MX/firefox-90.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "cfd89dd866f633359c57af8915586abc7d3bedcf2523bf60f7878d70417c09db"; + sha256 = "f57bbcc4176f51aae50ee8fbe5b82e1aed6dca7db6c5bb61b90237a32e93e70d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/et/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/et/firefox-90.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "6e678eeef5ebe30b6005533e69ebbc4f096e3a1e2fc07be8c8f1cf3d1b5c1b06"; + sha256 = "633581b5f19a8c271e3e3cd524b3ae7757ab9e2339d8546fd1d223b844b020ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/eu/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/eu/firefox-90.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "4fcab02f0a755db4baadd5e04fe9589226b0082768ef58e32680a72a86ef52f2"; + sha256 = "1307bdd3214c6a36cfd860e81a1a948df37843effd21ff53525aeef8abbcd3a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fa/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fa/firefox-90.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "bd7500a850ae6c4ea9702521716336bd2809c8e3fc058ea021ee27a1b6d40aa7"; + sha256 = "38fe66fdcc8105a00f5d8655585e96e65f9a1bb6c7d261cad8f7992480728627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ff/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ff/firefox-90.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "76b4327258aedc72fcae8b56dc5dd0c99952f0a2021252c5d0e36d1366b68016"; + sha256 = "9e7acbee5e5be85c6fd8bbd11773533f73cb5c6395efbe86d19b20e236e16c1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fi/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fi/firefox-90.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4500cd834525149ad46b94a7b86ff776511f3173a48064ed88d6b2e67596dc68"; + sha256 = "eece28ddbc746a4182a69f75366e6c2bf0f8e11da790b6bbad0dcd7fb63de0fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fr/firefox-90.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "85313248992ddcc04bc5b72802929a2c601daae07d5e6d8a11c762159caecf86"; + sha256 = "6bda4541f450ccdeeab51097275e253125078bfd2f7a9454ca8fd44a31a45d6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/fy-NL/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/fy-NL/firefox-90.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ba0d003e88355027ccf1be545555e68e06a19e11b7090844707e0053796f2a1d"; + sha256 = "aaab56b445b8cebf325dccd2f809aaa95d30ed9da1834f54b81722ac718e72c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ga-IE/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ga-IE/firefox-90.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "52f94cb53101e4d2564cb4f4589cb2246a4c78314e38e3d566290adf43f40e74"; + sha256 = "2f29abd19a5974d250da1aefdf06986e1b55524610e9bd493e7f94da8e6152fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gd/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gd/firefox-90.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "0998440173e3b5886ff3a356a79fd05e7ea113cab4582a9400abad44ecbf6c48"; + sha256 = "fa2d7d5d462ebc4b21e4652e9e538bfdc4ff3091428454be67ad52cadc3a50b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gl/firefox-90.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6ab3ef1a97c8382160420f563c814f14610f1a0d4565ef8f86b8c8ddbf34e162"; + sha256 = "9d133d05024307c5ae30f5b737dc25afd3d9038d3d4e198924d836f61b66fd81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gn/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gn/firefox-90.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "f57a5d2ed2b9eb8d35b9bbbb9f76a988409db09c7855d6cb93abf151f8e449c5"; + sha256 = "edb82865a9aff2b459dcf3f26583f27989a5d9aa7eb35aa86c30d672f464e3c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/gu-IN/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/gu-IN/firefox-90.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "eb62873a8c7e2b5b706cd0033b5042a4f4496c265f7e57e1c65f23e3fc896a6a"; + sha256 = "db64823b1b4610dc4107062a51567c349600fe9e4072ca18fdea80391d7a8064"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/he/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/he/firefox-90.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6c22304604f9e93153d55251e31bb250168015a4ac6c3d93cffcdd9c64ece7e9"; + sha256 = "98f7d8e0b662b7a020e8aec6a17a171740f4e162cdd2318eacdb2b18d1e84435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hi-IN/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hi-IN/firefox-90.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "155f425d7d9b867acc7035d1220f60148fb94c25dd51ee7049e9c2e9b096a0fd"; + sha256 = "679340528df16854b4366b968f05103dd183a0983393065630d71a963ed59f60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hr/firefox-90.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "96faca700f49d3f8d9337f0f4f820f8a5a6335b06348b835bd39a26619e4efdc"; + sha256 = "e95335aa07145e2388a2cd6973a12ce826ea9a0c44e7669a8f0c916b9c897f3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hsb/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hsb/firefox-90.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "42ce59b460cf94705f88b80c91705bba81142798803bb1d7a3a0bc34dd96a7e3"; + sha256 = "e6450586d82c4c01a96ba5c7947e92ea7285540dbf57c15398449f33d46c20c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hu/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hu/firefox-90.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "804db507b43af04716bbb4d53525aa9b2958b1d3ff08b93812f1d78531eb01da"; + sha256 = "09f33e1cb7595f1f8e7724e6e311f4c2354093839e5bfe9f598c16689d7c53ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/hy-AM/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/hy-AM/firefox-90.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "488e6bdd3d36490a33d5794f5ede500bad29cd2014cdd50ab5edf74c829fd424"; + sha256 = "fa43f2a212e3b2fb1737057dbaf55eb78cdecf1021b086c5afae67d03abd4dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ia/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ia/firefox-90.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "fd3f22e1247b394b654c12aed384c515a390e91651bcc66f3823205c67951287"; + sha256 = "ad5384348f5795bf1c14445cd58b957cf320b5202f987a55efe4d51e0437e532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/id/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/id/firefox-90.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "2a197f4f2aa069b888ad9bfaa54da1b3bc461309a2f0475c298b7e501f06e6fc"; + sha256 = "9519624ef818e9baafa3918bc3972f0d176eaa8df640f6258b4425d0366316e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/is/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/is/firefox-90.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b215c19156d129ef30c2d5b30d723d3923e57658888736bd31d3c7fd4a30f835"; + sha256 = "0e425528e760ce2c5fcfe48559a4ac7d14a0cc79c1e95610e491ea14f941acb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/it/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/it/firefox-90.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f94a4ddd3278993c80e776849cd52721f40a2808a41f37c74f34ef4b7deea972"; + sha256 = "98a24df84e74a257d2885f78933b23804408c6bfb625b85f5015c0f69b52d338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ja/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ja/firefox-90.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4b22759406f177c98ee2496ff17de565f87a0f566e3759ce030fd757c1555e32"; + sha256 = "82830708da718cb70eaabf990b503b9f62a1232ed3ff5537fa91b140e4bd0678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ka/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ka/firefox-90.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7e602c099b680f1da42030067988f818e954ec4b02ddc6ec5473e02402a06428"; + sha256 = "bcf43fa1a6cf21139b7672144e6f355367d680395f32961b5915fcb6d4cd9dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kab/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kab/firefox-90.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "92d0441b33b179d515c88711bb13684e37c748a938d818723256092930428dea"; + sha256 = "c965383ee64db3f84ae1736db80f772e38b04080fdac9117953d8a59697a2998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kk/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kk/firefox-90.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "50a44e34e2a12ba6357f62bc82d9de9c5250c6e3b5635c81724d0a96f5111436"; + sha256 = "26e0becb0c7feaba174ff1de85585364addfdb2dc7e6f5188d81c2a83eb68383"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/km/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/km/firefox-90.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "de8bddaf5a937bfc5bc21897cf95b3d40068133df4c9edfe7eb9eaf76d23e17f"; + sha256 = "a25e0ddb1ecee69236bef3389641921c906f03272c8bea3a6ee17e61327fd377"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/kn/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/kn/firefox-90.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "86e88fbc62e131f6b6a599575f5c507385251e7d03a114b61e8c1b78c4a8c22f"; + sha256 = "4101658f06850402957e08578cec7fc730b9eee24e0e59d0b083e3814f13c713"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ko/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ko/firefox-90.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "10e0169e337cbef4a33e227ea57ff517ec570997fc471509ff95f098cfb52b12"; + sha256 = "c72b19e5928c7f3cb2bf3c681620865c292e02cf88859b13785527598b1b5610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lij/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lij/firefox-90.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "3e054180575b29c5afb286f6d7e8453bc8d4bfaf1ff5d8ac5fc53757b9dc48f1"; + sha256 = "9741436304db85da8b2ff9aaf7254c6304cd8703fc612a906cabbb1bbfa6b1be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lt/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lt/firefox-90.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "79685f8b0d646dc6fb446a85808e22107760343a63be429551866a22581106da"; + sha256 = "cc6ad73885caa3780a22a70ef3a2a321d948fee71a0b9f9e6512c724be5e80d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/lv/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/lv/firefox-90.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4df1044be63e35775c89005cddba209760b169be29a3e49d3d29bc370b11dacc"; + sha256 = "6043b8a53d92d3ee9d2eced77e664e15585f38acd2c9bc69ab6c6ddee4e11fa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mk/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/mk/firefox-90.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8040fd3637b5e25215e1e50cb74b6f25736f78d610cc862eef08b5a7e4905f2c"; + sha256 = "f722688ebc78a9c0647f8562a7d333d15a6f0a23be2e41881cd3395ce9af492b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/mr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/mr/firefox-90.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "49b9eddd2dff87a631ad143e66019d52574ea16b136956e4da473fcee4b810ef"; + sha256 = "e375938caf127ff1ef5f71bafb7df48d8d0f7ae7dbb5c664c99530e2401b08ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ms/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ms/firefox-90.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "629d480a6cc207b558cc2aff169225ec636c3d5656b0d04d34b60f8235151bc2"; + sha256 = "cf927622a682ba18b69134da056c09217950085f14d3abb828b78cc2318e71d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/my/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/my/firefox-90.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "25b330fa564734cd9ead80a58a770a6453d64483cd448dc8ac93e70a2a06a04b"; + sha256 = "dab06f8c4daf9f2287ccfcbf567e830cf2c1154e4a0db403d4c9bb1a5d509c88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nb-NO/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nb-NO/firefox-90.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4d2a0b7101197a603c136b7476e6887d6d9731bbb62e5176ad9876039cc7e166"; + sha256 = "19eaf7c9fedcb79d134304f16c804dd24a1adcddeb48e4f5cd26459556b905e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ne-NP/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ne-NP/firefox-90.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "74c9685da27d362a2729303ddf451f684be097d3ca74bf3596585a869921a881"; + sha256 = "049f573cc57b4ac37417a8674b6a535643cd563f0806a69f5ce769c67d8bcb79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nl/firefox-90.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a10dc5b62f058d71b3dbd8cb12083fc583528b1642d4f2bccce0f1a422147c7f"; + sha256 = "95d99572d07502ca39dfbce3f4f5e046247e1bcbfc8ca14cd1404744a9665731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/nn-NO/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/nn-NO/firefox-90.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "479c022dbadf9b10b2c37577199c3f4df714501502bc894c63efde9358b59745"; + sha256 = "cc7466ce958d97c7ab13235745199631f4cd2c2713ce2d4017c337d5415b3d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/oc/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/oc/firefox-90.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3b702fcd7972cc48151498783e8d0129766fa7adef311369acdba7902bd08f19"; + sha256 = "c24083b7a4d85d97c8b25b34229115558b94db56d3bc95fb510672be6a693f3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pa-IN/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pa-IN/firefox-90.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "69727d81e5dd911bfa426f3f66385caed061e3b22825eeea270925e6d7997a03"; + sha256 = "ae4eaebf65657401c2177dcb3085cf1b463d75d47e0863bf8017beaa5bc4bdf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pl/firefox-90.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "29d59a753381aed8fd4838cf6da0a43389b1dd408988ffd4e97ec3262c1ec75a"; + sha256 = "1f7f4f477fc42a87038555b3375ec84995fee73a0465f7cdf973cc5498f802ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-BR/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pt-BR/firefox-90.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6ca5bf042fc2a94dd229303cec352ec797e8494ca58b12a337997b8289dff78a"; + sha256 = "ca8ff807c9292c5105114ee2093a0e38b33c8ca57db3d21766c5d3d2456efd26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/pt-PT/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/pt-PT/firefox-90.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "50e682cf9bff2b4202ee4c9e64d5efcca66acbcb74d4074ae5d571875cd0f509"; + sha256 = "f3b17fa92fc078fd4c394bfd5763a1fd5b513696fb20547104286527f833be66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/rm/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/rm/firefox-90.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "983c8fb011f348b6de1665b1347cdbda23fe130ea33c7c58a49cd417d0419cff"; + sha256 = "820bc076e2286052b36349170969a42bc76fa196f75f140985ddd5ddc5b4943a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ro/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ro/firefox-90.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1f2ff5fe5d65f5f143e89e258a247291d10c25ee2270607250817187353bafa7"; + sha256 = "1991ad5ecda302b3c9253239452da490c5fd0ec765c464d95a2a682167402bc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ru/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ru/firefox-90.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3a2f872bcdd7736c1e528d306cb9409826c4958d1e8aea627ef0e2c26b7d8889"; + sha256 = "a7f87bdbb023a8daa498befb586fe08015062defc2998433ccc77d6c03ff9807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/si/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/si/firefox-90.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "cfb67ee121130d9ea92af43e33751c31f778f9ff6f9beca2dc609ef5340f09b9"; + sha256 = "7f659c6d46f7499c317bbbfe0f35d0db104c9baf46d9daa1145e7a6ab7dfd86a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sk/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sk/firefox-90.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c045f5c48e3f3f9b20229e744b85920e47e3858f97262ab4d3a8fd61db80da40"; + sha256 = "40a2ffd2a5270715c40375ccef2ed0287ca97b277c7968636222d288cf282fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sl/firefox-90.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ae3bf5e327c4f4fb7a36b8367539de466acf8f60f40e9deee3bd4928959f0111"; + sha256 = "7614af91d89ec3273836d663becd0e215729fc203f8d384c5f42508fbd6dbf81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/son/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/son/firefox-90.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "a7d7f7d1ffdc9126f04f8f96001bce26d21de0e0c65dd1fd00f6f85f75976ba8"; + sha256 = "3225134a36d53ee5fb0f3ca9651ea214f42e74d02ad0efb72cc7090280de1e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sq/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sq/firefox-90.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2982b315ab29ab375d77b1093c53a4a207f36a2d9a40b34aed3376ce96ce5dbe"; + sha256 = "f6c06b96cce4971b02ebca69af7dbf8e8b596dc45b57c0ceda4b7fec071d747d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sr/firefox-90.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "0a2a702216adf7c98ddb19cebfea886b5d0582523ca64f2d7c8656ec663aaf6e"; + sha256 = "7ee70f3e386587b4a09bffb2005eda9c2335adb559d05b3e9c72f64c49ea7c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/sv-SE/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/sv-SE/firefox-90.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "dded767dd98cc3725044c988354842086768bf9a35eb316111df96368a95900e"; + sha256 = "b735af09cf9a0adee055c4f383852f68f0bf15ac5034287ff56fd4e63d93f851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/szl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/szl/firefox-90.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "4ab8b5112cdfdc051a65b5cd562015bf85e11d5ccc0773111439cd469e175c33"; + sha256 = "9cc37dacd4f13ef6d9af99d24eecf42fc4254b52e42ee4b18c52bf830c9a6b45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ta/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ta/firefox-90.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "0240cb3f5357a213f622f1c708e2116db4a4271f4b36135d6614bacdee88f00c"; + sha256 = "badec8d86c4b824bded63fa9a7d49acab7c79a25b7cdc4715a805d6e825efd04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/te/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/te/firefox-90.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "83b5ed844b16f6b9108432a692bc0895d733de03701ab800bb330d06796176bd"; + sha256 = "68ba99a66bbaddf277fec5f97ca311368e915ff4090121f06daa04847bdc108f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/th/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/th/firefox-90.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "faedac7df604ed9cd321a655d27ebf313c08b085c4eeecc310a94c3afd979b6f"; + sha256 = "d43d2be9347cbe576a9e141110efe1b68d211593bbfaac130f3c2b876718fb9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tl/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/tl/firefox-90.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "5abdce18c7b0e53f5efd00aa0381c6e90f669c51dcb4c021128a0e7a0a86223e"; + sha256 = "8251186670a3e82c6f10d93a3c6ff5563537011aa6c599fd21cefd434342a4b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/tr/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/tr/firefox-90.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "92fd9bb4aef9b723b00cb84ffd253b81d5c86b2bfcefad93e948e443d871bd95"; + sha256 = "3021d700b183c6748d61c0dd104e732e3e373465ee0ac4607f3e31584fb69389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/trs/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/trs/firefox-90.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "291c64e95d8accc64fd83738a9b7060122e713786cbb360acbd26b5ed0dc3793"; + sha256 = "bff8d09f8170abf515b28c8fe8492f4b5125cd54a50518d145b86e70b15fbadd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uk/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/uk/firefox-90.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "163de4dd52684912f794c1f9c35b003f9cd38acf1be3bc68f42b2da9c1e13fce"; + sha256 = "36310b3c0272c1592560bbcf2801e7358d0b3583f832d522e38e09c926594549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/ur/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/ur/firefox-90.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "72ebffebcaf8848c5a9cfbc6c9e33cd1a7bfd62b7689f938065730249506a6eb"; + sha256 = "e48d260743ec015816036088f913cdaa9740751854d56c0ad12013c8fe24d5f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/uz/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/uz/firefox-90.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f9c56e6adfa9a0e7289e2a80f88869ebb1556843c940574cfcba4295aac464c0"; + sha256 = "f4079a9c0a439357e97c4838ef6c4caf8969a21569b2d84b1f0f3f2405981a4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/vi/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/vi/firefox-90.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f15136e2e432ae999df5efda82d44c2c61cd680995436cda094bd2fd705e541b"; + sha256 = "6e2f66c5fe236080ad9c8e72461667d7ba98260d038deaf6d4abbd73afe72719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/xh/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/xh/firefox-90.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "360623cac6e11c9179f9c08f2f7f3eb844c3671b8f26a2680e097e1c84896b06"; + sha256 = "7c75f694933e4998496cf4c1895afdc2940aedf9fd2151c2f2946551cbbcf5da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-CN/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/zh-CN/firefox-90.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "f69c7f0fad2bbefbe477ed7ee5414dab2c9ab14e1009970eca07092357cfc7ba"; + sha256 = "74787fb0d2674a2e34f6cbd556bd13f9ea7d83c640aa7c8cc6fe79b58870dbd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.1/linux-i686/zh-TW/firefox-90.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/90.0.2/linux-i686/zh-TW/firefox-90.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "612abc1a9b8b116753ee1417d774fc2ea2f2f931248c57ea93c32ee1c534f9c0"; + sha256 = "df3493d9cf02a0a3c88bb06b6c755658b7638cc6bfe07df193fa19db870fa991"; } ]; } From 82feb1120172e0615e1f6f4dc517a69e8c6c03f6 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 22 Jul 2021 21:12:52 +0900 Subject: [PATCH 069/136] firefox: 90.0.1 -> 90.0.2 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 091ca7b4485..3aa0eeece9b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "90.0.1"; + ffversion = "90.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "9f87c3f3dad33e42a7a9d2161d7f23ff2e7184b2274f9081511c7982957ae9954784bd844a2348ff4744231415aac195d1f12971392db90be0375b4738acb590"; + sha512 = "4fda0b1e666fb0b1d846708fad2b48a5b53d48e7fc2a5da1f234b5b839c55265b41f6509e6b506d5e8a7455f816dfa5ab538589bc9e83b7e3846f0f72210513e"; }; meta = { From 31bc732d8ef9fc47c61f0237e6057fc0379d89bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 06:53:34 +0000 Subject: [PATCH 070/136] fritzprofiles: 0.6.1 -> 0.7.3 --- pkgs/development/python-modules/fritzprofiles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fritzprofiles/default.nix b/pkgs/development/python-modules/fritzprofiles/default.nix index 17716e5fc95..b998f994980 100644 --- a/pkgs/development/python-modules/fritzprofiles/default.nix +++ b/pkgs/development/python-modules/fritzprofiles/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fritzprofiles"; - version = "0.6.1"; + version = "0.7.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1bd4sa3i1ldkg6lnsvg004csgqklvi5xk71y971qyjvsbdbwgbn3"; + sha256 = "sha256-VoKgLJWF9x8dW8A6CNwLtK+AmehtgZP41nUGQO819es="; }; propagatedBuildInputs = [ From bc11ce2abd2c91c9cde267a29d73b7cbe6f9c774 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 23 Jul 2021 07:03:18 +0000 Subject: [PATCH 071/136] libreoffice-fresh: 7.1.4.2 -> 7.1.5.2 --- .../office/libreoffice/src-fresh/download.nix | 16 ++++++++-------- .../office/libreoffice/src-fresh/primary.nix | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index 98070994fa3..bbabd4e70be 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -161,11 +161,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.8.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; - sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; + name = "expat-2.4.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2"; + sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"; md5 = ""; - md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; + md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -567,11 +567,11 @@ md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { - name = "libxml2-2.9.10.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; - sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; + name = "libxml2-2.9.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz"; + sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"; md5 = ""; - md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; + md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz"; } { name = "libxslt-1.1.34.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 2e1a4b1d78d..dfc680e3439 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "4"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m"; + sha256 = "1kl54ddpvmrcs4r1vd4dfzg5a8im0kijhaqdg37zvgb5fqv31bxf"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0cslzhp5ic1w7hnl6wbyxrxhczdmap1g1hh1nj9sgpw9iqdryqj7"; + sha256 = "0nf5s012l7mkpd1srvijl9q6x8f7svm6i84bj75dwyvipkg40rxq"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "091yhm1qkxgvv130a1yzmmikchvxvp8109mcdrlpybp4gc276l8q"; + sha256 = "1m1hxbhrkaynpcps77rym1d0kwl380jv1p7b6ibfl4by0ii2j16a"; }; } From 53805fa06574d3dade901eee8adf8f031455f8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 23 Jul 2021 09:03:07 +0200 Subject: [PATCH 072/136] odp-dpdk: 1.27.0.0_DPDK_19.11 -> 1.30.1.0_DPDK_19.11 --- pkgs/os-specific/linux/odp-dpdk/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index 5e2284b489c..66b39b2c89e 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -7,15 +7,18 @@ url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; sha256 = "sha256-RnEzlohDZ3uxwna7dKNFiqfAAswh4pXFHjvWVJexEqs="; }; + mesonFlags = old.mesonFlags ++ [ + "-Denable_docs=false" + ]; }); in stdenv.mkDerivation rec { pname = "odp-dpdk"; - version = "1.27.0.0_DPDK_19.11"; + version = "1.30.1.0_DPDK_19.11"; src = fetchurl { url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-/4m2NqnEXyenNUrCq3c2ozJzPWFFs/Qp7MAVm9B2biA="; + sha256 = "sha256-R3PsqQiHlHPzIYYWTVEC7Ikg3KR5I0jWGgftDA9Jj1o="; }; nativeBuildInputs = [ From e661c7b92bbae6aa68e7c96bb04b20cf1fb4ff1b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 08:01:17 +0000 Subject: [PATCH 073/136] go-ethereum: 1.10.5 -> 1.10.6 --- pkgs/applications/blockchains/go-ethereum.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index cdd2a41f013..28a7b22a24f 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256:1226picbgnph71fk2y0n1hyfrh6m8sh54kgn3pmikydnw176k9j1"; + sha256 = "sha256-4lapkoxSKdXlD6rmUxnlSKrfH+DeV6/wV05CqJjuzjA="; }; runVend = true; - vendorSha256 = "sha256:1nf2gamamlgr2sl5ibib5wai1pipj66xhbhnb4s4480j5pbv9a76"; + vendorSha256 = "sha256-5qi01y0SIEI0WRYu2I2RN94QFS8rrlioFvnRqqp6wtk="; doCheck = false; From 11400dcd65ed95292d7ac7cb30912e15ec4cf8e1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Jul 2021 10:03:14 +0200 Subject: [PATCH 074/136] chromium: Check the text rendering This should catch regressions like #131074 in the future. In that case a glibc update caused a regression that caused most of the text to become invisible (just not the "Web Store" we've already been checking for). --- nixos/tests/chromium.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index c4ad73679b7..0c85b2d2199 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -239,7 +239,8 @@ mapAttrs (channel: chromiumPkg: makeTest rec { with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"): - pass + # To check the text rendering (catches regressions like #131074): + machine.wait_for_text("Graphics Feature Status") machine.shutdown() From ec132b7fde1e2aacd85da6ff910bd35d315dd0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 23 Jul 2021 10:19:30 +0200 Subject: [PATCH 075/136] ofp: remove --- pkgs/os-specific/linux/ofp/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/os-specific/linux/ofp/default.nix diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix deleted file mode 100644 index 5defafeba80..00000000000 --- a/pkgs/os-specific/linux/ofp/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, openssl, libpcap, odp-dpdk, dpdk -}: - -stdenv.mkDerivation rec { - pname = "ofp"; - version = "2.0.0"; - - src = fetchFromGitHub { - owner = "OpenFastPath"; - repo = "ofp"; - rev = version; - sha256 = "05902593fycgkwzk5g7wzgk0k40nrrgybplkdka3rqnlj6aydhqf"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ openssl libpcap odp-dpdk dpdk ]; - - dontDisableStatic = true; - - postPatch = '' - substituteInPlace configure.ac --replace m4_esyscmd m4_esyscmd_s - substituteInPlace scripts/git_hash.sh --replace /bin/bash ${stdenv.shell} - echo ${version} > .scmversion - ''; - - configureFlags = [ - "--with-odp=${odp-dpdk}" - "--with-odp-lib=odp-dpdk" - "--disable-shared" - ]; - - meta = with lib; { - description = "High performance TCP/IP stack"; - homepage = "http://www.openfastpath.org"; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.abuibrahim ]; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5412880b5f8..8ece1dde076 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -528,6 +528,7 @@ mapAliases ({ oauth2_proxy = oauth2-proxy; # added 2021-04-18 opencascade_oce = opencascade; # added 2018-04-25 oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10 + ofp = throw "ofp is not compatible with odp-dpdk"; opencl-icd = ocl-icd; # added 2017-01-20 openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21 openexr_ctl = ctl; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a53bfe32d5a..71ed5095c46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21623,8 +21623,6 @@ in odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; - ofp = callPackage ../os-specific/linux/ofp { }; - ofono = callPackage ../tools/networking/ofono { }; openpam = callPackage ../development/libraries/openpam { }; From 08bb122c63acffcc86bd40be6530a4ae17e41937 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 08:23:46 +0000 Subject: [PATCH 076/136] gpg-tui: 0.7.1 -> 0.7.2 --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index ad912aee839..6c4f79195e1 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-J1mdgcNWloQOnGdBjcCoAsv+ClQ77DXYQajM9B3sYHY="; + sha256 = "sha256-2FnSCTq+Im7sbiEkbKZ9f09i/lWme/aCrcCOgcIlXp4="; }; - cargoSha256 = "sha256-I63Pevw0BjkjasszZn2wmT4TNeVk27pJy4mJR6nl9MI="; + cargoSha256 = "sha256-v2aZPVBT5XEaffTZHnAgRWGs6HDvL9b8ihR50I4VnJ4="; nativeBuildInputs = [ gpgme # for gpgme-config From 9c7b3586d2c3b48920c3967629c1c75db649729c Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Sat, 22 May 2021 08:09:34 +0200 Subject: [PATCH 077/136] =?UTF-8?q?ocamlPackages.parany:=208.0=20=E2=86=92?= =?UTF-8?q?=2012.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/parany/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index a4378016b47..6892a7a2e4d 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -2,15 +2,16 @@ buildDunePackage rec { pname = "parany"; - version = "8.0.0"; + version = "12.0.3"; useDune2 = true; + minimumOCamlVersion = "4.03.0"; src = fetchFromGitHub { owner = "UnixJunkie"; - repo = pname; - rev = "v${version}"; - sha256 = "19yz1yqyqx6gawy93jlh3x6vji2p9qsy6nsbj65q5pii8p1fjlsm"; + repo = pname; + rev = "v${version}"; + sha256 = "1j962ak68kvv62bczjqxwlwvdgcvjfcs36qwq12nnm0pwlzkhg33"; }; propagatedBuildInputs = [ ocamlnet cpu ]; From db6c491ee0faabe16550261c28c15706d41145c6 Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Sat, 22 May 2021 09:03:15 +0200 Subject: [PATCH 078/136] =?UTF-8?q?ocamlPackages.mparser:=201.2.3=20?= =?UTF-8?q?=E2=86=92=201.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/mparser/default.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix index 90c24718dd1..5f63a98a130 100644 --- a/pkgs/development/ocaml-modules/mparser/default.nix +++ b/pkgs/development/ocaml-modules/mparser/default.nix @@ -1,25 +1,21 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitHub, buildDunePackage }: -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-mparser-1.2.3"; - src = fetchzip { - url = "https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz"; - sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw"; +buildDunePackage rec { + pname = "mparser"; + version = "1.3"; + useDune2 = true; + + src = fetchFromGitHub { + owner = "murmour"; + repo = "mparser"; + rev = version; + sha256 = "16j19v16r42gcsii6a337zrs5cxnf12ig0vaysxyr7sq5lplqhkx"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - - configurePhase = "ocaml setup.ml -configure"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; - - createFindlibDestdir = true; - meta = { description = "A simple monadic parser combinator OCaml library"; license = lib.licenses.lgpl21Plus; - homepage = "https://github.com/cakeplus/mparser"; + homepage = "https://github.com/murmour/mparser"; maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; }; } From a38751eb697dd65211dfa0f6cb0d5ed81c09c38d Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Sat, 22 May 2021 09:12:09 +0200 Subject: [PATCH 079/136] ocamlPackages.mparser-pcre: init at 1.3 --- pkgs/development/ocaml-modules/mparser/pcre.nix | 12 ++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mparser/pcre.nix diff --git a/pkgs/development/ocaml-modules/mparser/pcre.nix b/pkgs/development/ocaml-modules/mparser/pcre.nix new file mode 100644 index 00000000000..f2bdc41b8e2 --- /dev/null +++ b/pkgs/development/ocaml-modules/mparser/pcre.nix @@ -0,0 +1,12 @@ +{ fetchFromGitHub, buildDunePackage, ocaml_pcre, mparser }: + +buildDunePackage rec { + pname = "mparser-pcre"; + useDune2 = true; + + inherit (mparser) src version; + + buildInputs = [ ocaml_pcre mparser ]; + + meta = mparser.meta // { description = "PCRE-based regular expressions"; }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c17ea27a9e5..d317f091990 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -794,6 +794,8 @@ let mparser = callPackage ../development/ocaml-modules/mparser { }; + mparser-pcre = callPackage ../development/ocaml-modules/mparser/pcre.nix { }; + mtime = callPackage ../development/ocaml-modules/mtime { }; mustache = callPackage ../development/ocaml-modules/mustache { }; From 463a41b8684b3e38a3684f25a3acd58345eb3fc3 Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Sat, 22 May 2021 09:30:29 +0200 Subject: [PATCH 080/136] comby: init at 1.5.1 --- .../ocaml-modules/hack_parallel/default.nix | 26 +++++++ .../ocaml-modules/mparser/pcre.nix | 2 +- pkgs/development/tools/comby/default.nix | 77 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/ocaml-packages.nix | 2 + 5 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/ocaml-modules/hack_parallel/default.nix create mode 100644 pkgs/development/tools/comby/default.nix diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix new file mode 100644 index 00000000000..f9bc6777212 --- /dev/null +++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, buildDunePackage, core, core_kernel, pkg-config, sqlite +}: +buildDunePackage rec { + pname = "hack_parallel"; + version = "1.0.1"; + useDune2 = true; + minimumOcamlVersion = "4.04.1"; + + src = fetchFromGitHub { + owner = "rvantonder"; + repo = "hack_parallel"; + rev = version; + sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ core core_kernel sqlite ]; + + meta = { + description = + "Core parallel and shared memory library used by Hack, Flow, and Pyre"; + license = lib.licenses.mit; + homepage = "https://github.com/rvantonder/hack_parallel"; + }; +} diff --git a/pkgs/development/ocaml-modules/mparser/pcre.nix b/pkgs/development/ocaml-modules/mparser/pcre.nix index f2bdc41b8e2..0f26e140ed8 100644 --- a/pkgs/development/ocaml-modules/mparser/pcre.nix +++ b/pkgs/development/ocaml-modules/mparser/pcre.nix @@ -6,7 +6,7 @@ buildDunePackage rec { inherit (mparser) src version; - buildInputs = [ ocaml_pcre mparser ]; + propagatedBuildInputs = [ ocaml_pcre mparser ]; meta = mparser.meta // { description = "PCRE-based regular expressions"; }; } diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix new file mode 100644 index 00000000000..ca0a2413304 --- /dev/null +++ b/pkgs/development/tools/comby/default.nix @@ -0,0 +1,77 @@ +{ ocamlPackages, fetchFromGitHub, lib, zlib, pkg-config, cacert, gmp, libev +, autoconf, sqlite, stdenv }: +let + mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }: + ocamlPackages.buildDunePackage rec { + inherit pname; + version = "1.5.1"; + useDune2 = true; + minimumOcamlVersion = "4.08.1"; + doCheck = true; + + src = fetchFromGitHub { + owner = "comby-tools"; + repo = "comby"; + rev = version; + sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf"; + }; + + nativeBuildInputs = [ + ocamlPackages.ppx_deriving + ocamlPackages.ppx_deriving_yojson + ocamlPackages.ppx_sexp_conv + ocamlPackages.ppx_sexp_message + ] ++ extraNativeInputs; + + buildInputs = [ + ocamlPackages.core + ocamlPackages.ocaml_pcre + ocamlPackages.mparser + ocamlPackages.mparser-pcre + ocamlPackages.angstrom + ] ++ extraBuildInputs; + + checkInputs = [ cacert ]; + + meta = { + description = "Tool for searching and changing code structure"; + license = lib.licenses.asl20; + homepage = "https://comby.dev"; + }; + }; + + combyKernel = mkCombyPackage { pname = "comby-kernel"; }; +in mkCombyPackage { + pname = "comby"; + + extraBuildInputs = [ + zlib + gmp + libev + sqlite + ocamlPackages.shell # This input must appear before `parany` or any other input that propagates `ocamlnet` + ocamlPackages.lwt + ocamlPackages.patience_diff + ocamlPackages.toml + ocamlPackages.cohttp-lwt-unix + ocamlPackages.opium + ocamlPackages.textutils + ocamlPackages.jst-config + ocamlPackages.parany + ocamlPackages.conduit-lwt-unix + ocamlPackages.lwt_react + ocamlPackages.tls + combyKernel + ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then + [ ocamlPackages.hack_parallel ] + else + [ ]); + + extraNativeInputs = [ + autoconf + pkg-config + ocamlPackages.ppx_jane + ocamlPackages.ppx_expect + ocamlPackages.dune-configurator + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a53bfe32d5a..6663c0a2e22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10754,6 +10754,8 @@ in cmucl_binary = pkgsi686Linux.callPackage ../development/compilers/cmucl/binary.nix { }; + comby = callPackage ../development/tools/comby { }; + compcert = coqPackages.compcert.override { version = "3.9"; }; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d317f091990..e8adc826fdd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -415,6 +415,8 @@ let h2 = callPackage ../development/ocaml-modules/h2 { }; + hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { }; + hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; From 9ba7145f30e3f607d10eeb5f18026f35e93228d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 10:35:48 +0200 Subject: [PATCH 081/136] metasploit: 6.0.53 -> 6.0.54 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 22 ++++++------- pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 34 ++++++++++----------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 8b90f7dd5f9..5fa9ad3b4d6 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.53" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.54" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 53b1170b210..e23841b82a5 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: b7cef30d11f0509b7e27334030dae6b8cb34e7f2 - ref: refs/tags/6.0.53 + revision: 0d6c0cfe63f494a04b46700a4317d52484f3a398 + ref: refs/tags/6.0.54 specs: - metasploit-framework (6.0.53) + metasploit-framework (6.0.54) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,7 +31,7 @@ GIT metasploit-concern (~> 3.0.0) metasploit-credential (~> 4.0.0) metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.47) + metasploit-payloads (= 2.0.48) metasploit_data_models (~> 4.1.0) metasploit_payloads-mettle (= 1.0.10) mqtt @@ -127,22 +127,22 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.478.0) + aws-partitions (1.479.0) aws-sdk-core (3.117.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.249.0) + aws-sdk-ec2 (1.251.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.56.0) + aws-sdk-iam (1.57.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-kms (1.44.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.1) + aws-sdk-s3 (1.96.2) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -232,7 +232,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.47) + metasploit-payloads (2.0.48) metasploit_data_models (4.1.4) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -332,11 +332,11 @@ GEM rex-arch rex-ole (0.1.7) rex-text - rex-powershell (0.1.91) + rex-powershell (0.1.92) rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.5) + rex-random_identifier (0.1.7) rex-text rex-registry (0.1.4) rex-rop_builder (0.1.4) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 5217322fd6b..6bee3ddf81c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.53"; + version = "6.0.54"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-0tg2FSRtwo1LRxA5jNQ1Pxx54TPs3ZwErXim8uj24VI="; + sha256 = "sha256-Aoj0KTp8WiY5a5YxssGjvFlVkVHb6ERVFGhyHS7GZ7o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index ab8a1a21ca9..e1ebae7da23 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vsxqayzh04gxxan5i8vvfxh0n238dc9305bc89xs2mx2x1pw167"; + sha256 = "090s6b7lz9wz6rclklshxbksgvdf4wji7yy2vha6cz8vg6lbz1xh"; type = "gem"; }; - version = "1.478.0"; + version = "1.479.0"; }; aws-sdk-core = { groups = ["default"]; @@ -134,20 +134,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6yl7qbzmjlxp3rzm3a62vinzdg9a8rqspq7xdaa9sxrf4zsamf"; + sha256 = "0vs4k390h8sqv6zcmrgixsc8z1smpglrxvnzl1ci522w9jcn6az7"; type = "gem"; }; - version = "1.249.0"; + version = "1.251.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d30abab908434nmfi5j97vmv63466bmcvhvaknma27qc04s53ph"; + sha256 = "0nmd4g0cdvb38z9mpx13z6mwgbyyn84vj8wn0yf5y4kfzmi47q4y"; type = "gem"; }; - version = "1.56.0"; + version = "1.57.0"; }; aws-sdk-kms = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q28bdmpm2c2fw9wh00zhqxnb8p2nzdfi5l6wwa6bl63fm28816h"; + sha256 = "1qgr1x2ykkbbfh6krv4wb97ihjq6w785gh21qrk77s9xjq4lcfqw"; type = "gem"; }; - version = "1.96.1"; + version = "1.96.2"; }; aws-sigv4 = { groups = ["default"]; @@ -594,12 +594,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "b7cef30d11f0509b7e27334030dae6b8cb34e7f2"; - sha256 = "0lp1yvlg59kqml29rpgc6ghpj71z6pa8qf8h8x5qvhkd4hakdn6j"; + rev = "0d6c0cfe63f494a04b46700a4317d52484f3a398"; + sha256 = "1fk7qqp1swk82ial9s6va68mandwlg0v4ccndcwjcnkw78lz9202"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.53"; + version = "6.0.54"; }; metasploit-model = { groups = ["default"]; @@ -616,10 +616,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jxa9q8jzfy91i4khnzmd36p3g2sq7df34csgwbmv6caarzs7732"; + sha256 = "0jg96v1a7q3ypq33jaflnfvpqm6cz0ihaiilag2y6qvd0ypv297d"; type = "gem"; }; - version = "2.0.47"; + version = "2.0.48"; }; metasploit_data_models = { groups = ["default"]; @@ -1106,20 +1106,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zrc0pr1pla0amw6hagllj82hyq8pyy6wb38xry2cxg7q70ghfq7"; + sha256 = "02gpfw43r0pkzp7jj3n0lwn4lgbgkgadrn4p33x7b0xh1dalzgj1"; type = "gem"; }; - version = "0.1.91"; + version = "0.1.92"; }; rex-random_identifier = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pqd8pfcxqd44ql8dawk59k9s5jnhx7inc8wnpjhkbx0y0sldq8q"; + sha256 = "1zaqndyy04c4fn021ibh05xim3wr7l2i71713amz6pvhgs2939r3"; type = "gem"; }; - version = "0.1.5"; + version = "0.1.7"; }; rex-registry = { groups = ["default"]; From b67598112653ffa740426bd99b8f7f4323c9d77b Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 23 Jul 2021 05:17:01 -0300 Subject: [PATCH 082/136] k3s: 1.21.2+k3s1 -> 1.21.3+k3s1 --- .../networking/cluster/k3s/default.nix | 52 +++++++++---------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index dfeb61915ee..4340543b777 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -44,12 +44,21 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.21.2+k3s1"; # k3s git tag - k3sCommit = "5a67e8dc473f8945e8e181f6f0b0dbbc387f6fca"; # k3s git commit at the above version + k3sVersion = "1.21.3+k3s1"; # k3s git tag + k3sCommit = "1d1f220fbee9cdeb5416b76b707dde8c231121f2"; # k3s git commit at the above version traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION - k3sRootVersion = "0.8.1"; # taken from ./scripts/download at ROOT_VERSION + k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS + + baseMeta = { + description = "A lightweight Kubernetes distribution"; + license = licenses.asl20; + homepage = "https://k3s.io"; + maintainers = with maintainers; [ euank superherointj ]; + platforms = platforms.linux; + }; + # bundled into the k3s binary traefikChart = fetchurl { url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; @@ -67,7 +76,7 @@ let k3sRoot = fetchzip { # Note: marked as apache 2.0 license url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; - sha256 = "sha256-r3Nkzl9ccry7cgD3YWlHvEWOsWnnFGIkyRH9sx12gks="; + sha256 = "sha256-qI84KYJKY/T6pqWZW9lOTq5NzZiu//v1zrMzUCiRTGQ="; stripRoot = false; }; k3sPlugins = buildGoPackage rec { @@ -84,12 +93,8 @@ let sha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4="; }; - meta = { + meta = baseMeta // { description = "CNI plugins, as patched by rancher for k3s"; - license = licenses.asl20; - homepage = "https://k3s.io"; - maintainers = [ maintainers.euank ]; - platforms = platforms.linux; }; }; # Grab this separately from a build because it's used by both stages of the @@ -97,7 +102,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - sha256 = "sha256-ZRkdHQ4RJ6XqE+DKE6wwpxetuKDG3k/4HaHyFxHev1U="; + sha256 = "sha256-K4HVXFp5cpByEO4dUwmpzOuhsGh1k7X6k5aShCorTjg="; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -161,12 +166,8 @@ let popd ''; - meta = { + meta = baseMeta // { description = "The various binaries that get packaged into the final k3s binary"; - license = licenses.asl20; - homepage = "https://k3s.io"; - maintainers = [ maintainers.euank ]; - platforms = platforms.linux; }; }; k3sBin = buildGoPackage rec { @@ -228,12 +229,8 @@ let popd ''; - meta = { + meta = baseMeta // { description = "The k3s go binary which is used by the final wrapped output below"; - license = licenses.asl20; - homepage = "https://k3s.io"; - maintainers = [ maintainers.euank ]; - platforms = platforms.linux; }; }; in @@ -241,7 +238,7 @@ stdenv.mkDerivation rec { pname = "k3s"; version = k3sVersion; - # Important utilities used by the kubelet, see + # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 # Note the list in that issue is stale and some aren't relevant for k3s. k3sRuntimeDeps = [ @@ -279,11 +276,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = { - description = "A lightweight Kubernetes distribution"; - license = licenses.asl20; - homepage = "https://k3s.io"; - maintainers = [ maintainers.euank ]; - platforms = platforms.linux; - }; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/k3s --version | grep v${k3sVersion} > /dev/null + ''; + + meta = baseMeta; } From d4612af2c0d5e3c220bdd37c19272a69cc16cfd0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Jul 2021 10:38:36 +0200 Subject: [PATCH 083/136] chromium: remove bendlas as maintainer Their last Chromium commit is a52d7674cc7 from 2019. Thank you for maintaining Chromium in the past. --- pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 623bc3c33d7..705255942c4 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -84,7 +84,7 @@ mkChromiumDerivation (base: rec { else "https://www.chromium.org/"; maintainers = with maintainers; if ungoogled then [ squalus primeos ] - else [ primeos thefloweringash bendlas ]; + else [ primeos thefloweringash ]; license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; mainProgram = "chromium"; From bee854ef56a9d423b83f08bc81efff3bfbe9a952 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 23 Jul 2021 06:12:14 -0300 Subject: [PATCH 084/136] argocd: 2.0.4 -> 2.0.5 --- pkgs/applications/networking/cluster/argocd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 0dfb5507281..9fdd7de045a 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.0.4"; - commit = "0842d448107eb1397b251e63ec4d4bc1b4efdd6e"; + version = "2.0.5"; + commit = "4c94d886f56bcb2f9d5b3251fdc049c2d1354b88"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-SKSAJtp20f6A+CvrsBEmbcNJAKI5b4Wm4K0cr/lGo64="; + sha256 = "sha256-8YymSR15e+6gGGqr5CH4ERHN8RO3wd9NJkM9K7InlFU="; }; - vendorSha256 = "sha256-RbEqivzTpXVQp4zl0zZWAh6qCr2KZSJ6Bj2pZaClQaQ="; + vendorSha256 = "sha256-9dVkGl0gjjMehG2nt1eNpNT5fD9GbJ1mNMzYS8FTm08="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; From 99e7b04d368101c918f418723231f4a893d9ab42 Mon Sep 17 00:00:00 2001 From: Philipp Mildenberger Date: Fri, 23 Jul 2021 11:33:29 +0200 Subject: [PATCH 085/136] efm-langserver: 0.0.31 -> 0.0.36 --- pkgs/development/tools/efm-langserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index 2984de4c5e1..48d4059277d 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.32"; + version = "0.0.36"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-zjjzdHlWEDDmPaDPuyk1ZoXwEFBogf51KjOmRmhFAdc="; + sha256 = "sha256-X2z49KmJiKh1QtcDBZcqNiMhq5deVamS47w6gyVq7Oo="; }; vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; From 1443590c5b46e98d75fbcce65b70e609fcfe2316 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Fri, 23 Jul 2021 05:36:28 -0400 Subject: [PATCH 086/136] cgoban: init at 3.5.23 (#130285) Co-authored-by: Sandro --- pkgs/games/cgoban/default.nix | 38 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/games/cgoban/default.nix diff --git a/pkgs/games/cgoban/default.nix b/pkgs/games/cgoban/default.nix new file mode 100644 index 00000000000..162de112fb5 --- /dev/null +++ b/pkgs/games/cgoban/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, writers +, adoptopenjdk-jre-bin +, fetchurl +, makeWrapper +}: +stdenv.mkDerivation rec { + pname = "cgoban"; + version = "3.5.23"; + + nativeBuildInputs = [ adoptopenjdk-jre-bin makeWrapper ]; + + src = fetchurl { + url = "https://web.archive.org/web/20210116034119/https://files.gokgs.com/javaBin/cgoban.jar"; + sha256 = "0srw1hqr9prgr9dagfbh2j6p9ivaj40kdpyhs6zjkg7lhnnrrrcv"; + }; + + dontConfigure = true; + dontUnpack = true; + dontBuild = true; + dontPatchELF = true; + + installPhase = '' + runHook preInstall + install -D $src $out/lib/cgoban.jar + makeWrapper ${adoptopenjdk-jre-bin}/bin/java $out/bin/cgoban --add-flags "-jar $out/lib/cgoban.jar" + runHook postInstall + ''; + + meta = with lib; { + description = "Client for the KGS Go Server"; + homepage = "https://www.gokgs.com/"; + license = licenses.free; + maintainers = with maintainers; [ savannidgerinel ]; + platforms = adoptopenjdk-jre-bin.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abc2ad527d0..da55752e98d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28787,6 +28787,8 @@ in cdogs-sdl = callPackage ../games/cdogs-sdl { }; + cgoban = callPackage ../games/cgoban { }; + chessdb = callPackage ../games/chessdb { }; chessx = libsForQt5.callPackage ../games/chessx { }; From 6ff64c297421c3525e8b019cc4f4f9a0fce55a13 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 23 Jul 2021 03:38:36 -0600 Subject: [PATCH 087/136] git-sync: Wrap both binaries (#130515) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jörg Thalheim --- .../git-and-tools/git-sync/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index 15d0fe9bc0f..14696903542 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -28,11 +28,14 @@ stdenv.mkDerivation rec { gnused ]; - fixupPhase = '' - patchShebangs $out/bin + postFixup = '' + wrap_path="${wrapperPath}":$out/bin wrapProgram $out/bin/git-sync \ - --prefix PATH : "${wrapperPath}" + --prefix PATH : $wrap_path + + wrapProgram $out/bin/git-sync-on-inotify \ + --prefix PATH : $wrap_path ''; meta = { From 07b51f58df6042e0baaff5e10b0ca389f2cac1fe Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 23 Jul 2021 11:45:31 +0200 Subject: [PATCH 088/136] grocy: 3.0.1 -> 3.1.0 ChangeLog: https://github.com/grocy/grocy/releases/tag/v3.1.0 --- nixos/tests/grocy.nix | 2 +- .../0001-Define-configs-with-env-vars.patch | 40 +++++++++---------- pkgs/servers/grocy/default.nix | 4 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/nixos/tests/grocy.nix b/nixos/tests/grocy.nix index 220c55b1f63..2be5c24ecb5 100644 --- a/nixos/tests/grocy.nix +++ b/nixos/tests/grocy.nix @@ -40,7 +40,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { assert task_name == "Test Task" - machine.succeed("curl -sSfI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'") + machine.succeed("curl -sSI http://localhost/api/tasks 2>&1 | grep '401 Unauthorized'") machine.shutdown() ''; diff --git a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch index 0d6ae781b75..4e3d36c33c9 100644 --- a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch +++ b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch @@ -1,7 +1,7 @@ -From 7ed6c641cc501246931721700b73f40dce7e8f4b Mon Sep 17 00:00:00 2001 +From 035709eeac697945a26276cc17b996c1a0678ddc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 22 Dec 2020 15:38:56 +0100 -Subject: [PATCH 1/2] Define configs with env vars +Subject: [PATCH] Define configs with env vars --- app.php | 4 ++-- @@ -11,32 +11,32 @@ Subject: [PATCH 1/2] Define configs with env vars 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app.php b/app.php -index 8176ebe..04432ba 100644 +index 17ba6a99..89f48089 100644 --- a/app.php +++ b/app.php -@@ -10,7 +10,7 @@ use Slim\Factory\AppFactory; +@@ -11,7 +11,7 @@ use Slim\Views\Blade; require_once __DIR__ . '/vendor/autoload.php'; // Load config files -require_once GROCY_DATAPATH . '/config.php'; +require_once getenv('GROCY_CONFIG_FILE'); require_once __DIR__ . '/config-dist.php'; // For not in own config defined values we use the default ones + require_once __DIR__ . '/helpers/ConfigurationValidator.php'; - // Definitions for dev/demo/prerelease mode -@@ -37,7 +37,7 @@ $app = AppFactory::create(); +@@ -62,7 +62,7 @@ $app = AppFactory::create(); $container = $app->getContainer(); $container->set('view', function (Container $container) { -- return new Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); -+ return new Slim\Views\Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); +- return new Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache'); ++ return new Blade(__DIR__ . '/views', getenv('GROCY_CACHE_DIR')); }); + $container->set('UrlManager', function (Container $container) { - return new UrlManager(GROCY_BASE_URL); diff --git a/services/DatabaseService.php b/services/DatabaseService.php -index d1080b0..8bc4ee1 100644 +index dfcd5d4b..bc8d1a1d 100644 --- a/services/DatabaseService.php +++ b/services/DatabaseService.php -@@ -105,6 +105,6 @@ class DatabaseService +@@ -107,6 +107,6 @@ class DatabaseService return GROCY_DATAPATH . '/grocy_' . $dbSuffix . '.db'; } @@ -45,23 +45,23 @@ index d1080b0..8bc4ee1 100644 } } diff --git a/services/FilesService.php b/services/FilesService.php -index 8c1483e..8f74b4b 100644 +index 7d070350..fba2e923 100644 --- a/services/FilesService.php +++ b/services/FilesService.php -@@ -70,7 +70,7 @@ class FilesService extends BaseService - { - parent::__construct(); +@@ -103,7 +103,7 @@ class FilesService extends BaseService -- $this->StoragePath = GROCY_DATAPATH . '/storage'; + public function GetFilePath($group, $fileName) + { +- $groupFolderPath = $this->StoragePath . '/' . $group; + $this->StoragePath = getenv('GROCY_STORAGE_DIR'); - if (!file_exists($this->StoragePath)) + if (!file_exists($groupFolderPath)) { diff --git a/services/StockService.php b/services/StockService.php -index 4741b4b..6d4e748 100644 +index f73ac5bd..6b6e693a 100644 --- a/services/StockService.php +++ b/services/StockService.php -@@ -1374,8 +1374,7 @@ class StockService extends BaseService +@@ -1589,8 +1589,7 @@ class StockService extends BaseService throw new \Exception('No barcode lookup plugin defined'); } @@ -72,5 +72,5 @@ index 4741b4b..6d4e748 100644 { require_once $path; -- -2.29.2 +2.31.1 diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index bd9a02f7b91..96c7cbbdf71 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "sha256-Yjxv0LcLNtpYs4ntBano9NUxwdWgF5etA/M6hUVzOa8="; + sha256 = "sha256-ohviTI2np6z+SjV2CDScouI8Lh2Ru4+CE00KlgT40i8="; }; nativeBuildInputs = [ unzip ]; From b354b4fc4bd88d6223705a8927a145a4d0161c3d Mon Sep 17 00:00:00 2001 From: Evgeny Kurnevsky Date: Fri, 23 Jul 2021 12:46:06 +0300 Subject: [PATCH 089/136] maintainers: add kurnevsky --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 002d8c435e2..20d90e7d637 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4557,6 +4557,12 @@ githubId = 278013; name = "Tomasz Kontusz"; }; + kurnevsky = { + email = "kurnevsky@gmail.com"; + github = "kurnevsky"; + githubId = 2943605; + name = "Evgeny Kurnevsky"; + }; kuznero = { email = "roman@kuznero.com"; github = "kuznero"; From 61742fb3d5f39a0f01c953de8204a077e7c1b2cb Mon Sep 17 00:00:00 2001 From: Evgeny Kurnevsky Date: Sun, 18 Jul 2021 12:56:07 +0300 Subject: [PATCH 090/136] deadbeef-statusnotifier-plugin: init at 1.6 --- .../audio/deadbeef/plugins/statusnotifier.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix new file mode 100644 index 00000000000..a1ca052f9c6 --- /dev/null +++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtk3, perl +, libdbusmenu-glib }: + +stdenv.mkDerivation rec { + pname = "deadbeef-statusnotifier-plugin"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "vovochka404"; + repo = "deadbeef-statusnotifier-plugin"; + rev = "v${version}"; + sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ deadbeef gtk3 libdbusmenu-glib ]; + + buildFlags = [ "gtk3" ]; + + postPatch = '' + substituteInPlace tools/glib-mkenums \ + --replace /usr/bin/perl "${perl}/bin/perl" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/deadbeef + cp build/sni_gtk3.so $out/lib/deadbeef + runHook postInstall + ''; + + meta = with lib; { + description = "DeaDBeeF StatusNotifier Plugin"; + homepage = "https://github.com/vovochka404/deadbeef-statusnotifier-plugin"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.kurnevsky ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d73a5c31313..77257cb7224 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19893,6 +19893,7 @@ in infobar = callPackage ../applications/audio/deadbeef/plugins/infobar.nix { }; lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { }; mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { }; + statusnotifier = callPackage ../applications/audio/deadbeef/plugins/statusnotifier.nix { }; }; deadbeef-with-plugins = callPackage ../applications/audio/deadbeef/wrapper.nix { From 8236d8c5819338494f90cdcdf1a48acd3cf168a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 13:17:21 +0200 Subject: [PATCH 091/136] natscli: 0.0.24 -> 0.0.25 --- pkgs/tools/system/natscli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index 1b4a173d504..a7f4337ce81 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.24"; + version = "0.0.25"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = version; - sha256 = "11rpgvcnd2m4g0jnv6g0zdvnhs37jwn1c4hc86xgnk2vipvy0nw2"; + sha256 = "180511x3sciqs0njz80qc1a785m84ks9l338qi3liv7bcd541xcr"; }; - vendorSha256 = "0nrgbwc10pp7adj0w1jjj6677y2dpqq969ij7i0pmvr08ni95sxw"; + vendorSha256 = "1j2a6wmyb9akndiwq79jqy5lz84bz2k01xp505j60ynsflim7shq"; meta = with lib; { description = "NATS Command Line Interface"; From 3e32d8627f5041648a32d9480c4043e9b4a84d39 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Jul 2021 12:54:17 +0200 Subject: [PATCH 092/136] intel-media-driver: 21.2.3 -> 21.3.0 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 7aefaa9d493..b64d4d50538 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.2.3"; + version = "21.3.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c"; + sha256 = "1byliq1c80xfklm3d2d910j1i7s7pfi3i3c6baigag1kzgc0apd0"; }; cmakeFlags = [ From e506c26d14ec32f19dc785ccfb0ab97071f12c66 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Mon, 19 Jul 2021 15:49:12 +0200 Subject: [PATCH 093/136] Fix tezos-rust-libs to work with tezos-sapling --- pkgs/development/libraries/tezos-rust-libs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix index bd406d63245..67826f07a43 100644 --- a/pkgs/development/libraries/tezos-rust-libs/default.nix +++ b/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -19,10 +19,11 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - mkdir $out/lib/tezos-rust-libs cp -r rustc-bls12-381/include $out/include - cp $out/lib/librustc_bls12_381.a $out/lib/tezos-rust-libs - cp $out/lib/librustzcash.a $out/lib/tezos-rust-libs + cp -r librustzcash/include $out + cp -r $out/lib $out/tmp + mkdir $out/lib/tezos-rust-libs + mv $out/tmp/ $out/lib/tezos-rust-libs/ ''; doCheck = true; From 5c96c4d2845fd6224a2a8709d67b21369a4206c8 Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Wed, 7 Jul 2021 11:34:04 +0200 Subject: [PATCH 094/136] ocamlPackages.tezos-*: init at 8.3 Init all tezos packages needed to build LIGO --- pkgs/development/ocaml-modules/tezos/base.nix | 33 ++++++++++++ pkgs/development/ocaml-modules/tezos/clic.nix | 25 +++++++++ .../ocaml-modules/tezos/crypto.nix | 38 +++++++++++++ .../ocaml-modules/tezos/error-monad.nix | 30 +++++++++++ .../ocaml-modules/tezos/event-logging.nix | 22 ++++++++ pkgs/development/ocaml-modules/tezos/lmdb.nix | 51 ++++++++++++++++++ .../ocaml-modules/tezos/lwt-result-stdlib.nix | 32 +++++++++++ .../ocaml-modules/tezos/micheline.nix | 28 ++++++++++ .../ocaml-modules/tezos/p2p-services.nix | 18 +++++++ pkgs/development/ocaml-modules/tezos/p2p.nix | 25 +++++++++ .../protocol-008-PtEdo2Zk-parameters.nix | 19 +++++++ .../tezos/protocol-008-PtEdo2Zk.nix | 23 ++++++++ .../ocaml-modules/tezos/protocol-compiler.nix | 29 ++++++++++ .../tezos/protocol-demo-noops.nix | 18 +++++++ .../tezos/protocol-environment-packer.nix | 15 ++++++ .../tezos/protocol-environment-sigs.nix | 30 +++++++++++ .../tezos/protocol-environment-structs.nix | 20 +++++++ .../tezos/protocol-environment.nix | 33 ++++++++++++ .../ocaml-modules/tezos/requester.nix | 27 ++++++++++ pkgs/development/ocaml-modules/tezos/rpc.nix | 22 ++++++++ .../ocaml-modules/tezos/sapling.nix | 31 +++++++++++ .../ocaml-modules/tezos/shell-services.nix | 22 ++++++++ .../ocaml-modules/tezos/stdlib-unix.nix | 30 +++++++++++ .../ocaml-modules/tezos/stdlib.nix | 53 +++++++++++++++++++ .../ocaml-modules/tezos/test-services.nix | 20 +++++++ .../ocaml-modules/tezos/version.nix | 18 +++++++ .../ocaml-modules/tezos/workers.nix | 18 +++++++ pkgs/top-level/ocaml-packages.nix | 28 ++++++++++ 28 files changed, 758 insertions(+) create mode 100644 pkgs/development/ocaml-modules/tezos/base.nix create mode 100644 pkgs/development/ocaml-modules/tezos/clic.nix create mode 100644 pkgs/development/ocaml-modules/tezos/crypto.nix create mode 100644 pkgs/development/ocaml-modules/tezos/error-monad.nix create mode 100644 pkgs/development/ocaml-modules/tezos/event-logging.nix create mode 100644 pkgs/development/ocaml-modules/tezos/lmdb.nix create mode 100644 pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix create mode 100644 pkgs/development/ocaml-modules/tezos/micheline.nix create mode 100644 pkgs/development/ocaml-modules/tezos/p2p-services.nix create mode 100644 pkgs/development/ocaml-modules/tezos/p2p.nix create mode 100644 pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix create mode 100644 pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix create mode 100644 pkgs/development/ocaml-modules/tezos/protocol-compiler.nix create mode 100644 pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix create mode 100644 pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix create mode 100644 pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix create mode 100644 pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix create mode 100644 pkgs/development/ocaml-modules/tezos/protocol-environment.nix create mode 100644 pkgs/development/ocaml-modules/tezos/requester.nix create mode 100644 pkgs/development/ocaml-modules/tezos/rpc.nix create mode 100644 pkgs/development/ocaml-modules/tezos/sapling.nix create mode 100644 pkgs/development/ocaml-modules/tezos/shell-services.nix create mode 100644 pkgs/development/ocaml-modules/tezos/stdlib-unix.nix create mode 100644 pkgs/development/ocaml-modules/tezos/stdlib.nix create mode 100644 pkgs/development/ocaml-modules/tezos/test-services.nix create mode 100644 pkgs/development/ocaml-modules/tezos/version.nix create mode 100644 pkgs/development/ocaml-modules/tezos/workers.nix diff --git a/pkgs/development/ocaml-modules/tezos/base.nix b/pkgs/development/ocaml-modules/tezos/base.nix new file mode 100644 index 00000000000..2f5d7658131 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/base.nix @@ -0,0 +1,33 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-crypto +, tezos-micheline +, ptime +, ezjsonm +, ipaddr +, qcheck-alcotest +, crowbar +}: + +buildDunePackage { + pname = "tezos-base"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-crypto + tezos-micheline + ptime + ezjsonm + ipaddr + ]; + + checkInputs = [ + qcheck-alcotest + crowbar + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: meta-package and pervasive type definitions for Tezos"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/clic.nix b/pkgs/development/ocaml-modules/tezos/clic.nix new file mode 100644 index 00000000000..d69174e5f29 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/clic.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-stdlib-unix +, alcotest +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-clic"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-stdlib-unix + ]; + + checkInputs = [ + alcotest + alcotest-lwt + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: library of auto-documented command-line-parsing combinators"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/crypto.nix b/pkgs/development/ocaml-modules/tezos/crypto.nix new file mode 100644 index 00000000000..9c5bd45f94f --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/crypto.nix @@ -0,0 +1,38 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-clic +, tezos-rpc +, bls12-381 +, hacl-star +, secp256k1-internal +, uecc +, ringo +, ff +, alcotest +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-crypto"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-clic + tezos-rpc + bls12-381 + hacl-star + secp256k1-internal + uecc + ringo + ]; + + checkInputs = [ + alcotest + alcotest-lwt + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: library with all the cryptographic primitives used by Tezos"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/error-monad.nix b/pkgs/development/ocaml-modules/tezos/error-monad.nix new file mode 100644 index 00000000000..70cdff0c0ac --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/error-monad.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, data-encoding +, lwt +, lwt-canceler +, alcotest +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-error-monad"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-stdlib + data-encoding + lwt + lwt-canceler + ]; + + checkInputs = [ + alcotest + alcotest-lwt + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: error monad"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/event-logging.nix b/pkgs/development/ocaml-modules/tezos/event-logging.nix new file mode 100644 index 00000000000..30d6c12087e --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/event-logging.nix @@ -0,0 +1,22 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-lwt-result-stdlib +, lwt_log +, alcotest +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-event-logging"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-lwt-result-stdlib + lwt_log + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: event logging library"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/lmdb.nix b/pkgs/development/ocaml-modules/tezos/lmdb.nix new file mode 100644 index 00000000000..960b2532c37 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/lmdb.nix @@ -0,0 +1,51 @@ +{ lib +, fetchFromGitLab +, pkg-config +, buildDunePackage +, lmdb +, rresult +, cstruct +, alcotest +}: + +buildDunePackage rec { + pname = "tezos-lmdb"; + version = "7.4"; + src = fetchFromGitLab { + owner = "tezos"; + repo = "tezos"; + rev = "v${version}"; + sha256 = "18q02j74aa8mxv233kvyb62xbhjngzpgppp6kgr4m53d7a78wgsm"; + }; + + useDune2 = true; + + preBuild = '' + rm dune + rm -rf src + rm -rf docs + ls vendors | grep -v ocaml-lmdb |xargs rm -rf + ''; + + buildInputs = [ + pkg-config + ]; + + propagatedBuildInputs = [ + rresult + lmdb + ]; + + checkInputs = [ + cstruct + alcotest + ]; + + doCheck = false; + + meta = { + description = "Legacy Tezos OCaml binding to LMDB (Consider ocaml-lmdb instead)"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix b/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix new file mode 100644 index 00000000000..fe32b7aba74 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix @@ -0,0 +1,32 @@ +{ lib +, buildDunePackage +, ocaml +, tezos-stdlib +, tezos-error-monad +, alcotest +, alcotest-lwt +, crowbar +}: + +if lib.versionAtLeast ocaml.version "4.12" then + throw "tezos-lwt-result-stdlib-${tezos-stdlib.version} is not available for OCaml > 4.10" +else + +buildDunePackage { + pname = "tezos-lwt-result-stdlib"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-error-monad + ]; + + checkInputs = [ + alcotest + alcotest-lwt + crowbar + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: error-aware stdlib replacement"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/micheline.nix b/pkgs/development/ocaml-modules/tezos/micheline.nix new file mode 100644 index 00000000000..a729cdef155 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/micheline.nix @@ -0,0 +1,28 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-error-monad +, uutf +, alcotest +, alcotest-lwt +, ppx_inline_test +}: + +buildDunePackage { + pname = "tezos-micheline"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-error-monad + uutf + ]; + + checkInputs = [ + alcotest + alcotest-lwt + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: internal AST and parser for the Michelson language"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/p2p-services.nix b/pkgs/development/ocaml-modules/tezos/p2p-services.nix new file mode 100644 index 00000000000..b4243f589f0 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/p2p-services.nix @@ -0,0 +1,18 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +}: + +buildDunePackage { + pname = "tezos-p2p-services"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-base + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: descriptions of RPCs exported by `tezos-p2p`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/p2p.nix b/pkgs/development/ocaml-modules/tezos/p2p.nix new file mode 100644 index 00000000000..b75c03debfa --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/p2p.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-p2p-services +, alcotest-lwt +, lwt-watcher +}: + +buildDunePackage { + pname = "tezos-p2p"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-p2p-services + lwt-watcher + ]; + + checkInputs = [ + alcotest-lwt + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: library for a pool of P2P connections"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix b/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix new file mode 100644 index 00000000000..5b043eede93 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix @@ -0,0 +1,19 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-008-PtEdo2Zk +, qcheck-alcotest +}: + +buildDunePackage { + pname = "tezos-protocol-008-PtEdo2Zk-parameters"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-protocol-008-PtEdo2Zk + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: parameters"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix b/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix new file mode 100644 index 00000000000..49a7f0e6380 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-protocol-008-PtEdo2Zk"; + inherit (tezos-stdlib) version src useDune2 doCheck; + + preBuild = '' + rm -rf vendors + substituteInPlace src/proto_008_PtEdo2Zk/lib_protocol/dune.inc --replace "-nostdlib" "" + ''; + + propagatedBuildInputs = [ + tezos-protocol-compiler + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: economic-protocol definition"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix b/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix new file mode 100644 index 00000000000..a43356d9cbe --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix @@ -0,0 +1,29 @@ +{ lib +, buildDunePackage +, ocaml +, tezos-stdlib +, tezos-protocol-environment +, ocp-ocamlres +, pprint +}: + +if lib.versionAtLeast ocaml.version "4.12" then + throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.10" +else + +buildDunePackage { + pname = "tezos-protocol-compiler"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + minimalOCamlVersion = "4.09"; + + propagatedBuildInputs = [ + tezos-protocol-environment + ocp-ocamlres + pprint + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: economic-protocol compiler"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix b/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix new file mode 100644 index 00000000000..51efe694184 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix @@ -0,0 +1,18 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-protocol-demo-noops"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-protocol-compiler + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: demo_noops economic-protocol definition"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix new file mode 100644 index 00000000000..42662105b95 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-packer.nix @@ -0,0 +1,15 @@ +{ lib +, buildDunePackage +, tezos-stdlib +}: + +buildDunePackage { + pname = "tezos-protocol-environment-packer"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + minimalOCamlVersion = "4.03"; + + meta = tezos-stdlib.meta // { + description = "Tezos: sigs/structs packer for economic protocol environment"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix new file mode 100644 index 00000000000..79b84360a9d --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, ocaml +, tezos-stdlib +, tezos-protocol-environment-packer +, zarith +}: + +buildDunePackage { + pname = "tezos-protocol-environment-sigs"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-protocol-environment-packer + ]; + + checkInputs = [ + tezos-stdlib + ]; + + postPatch = '' + cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./src/lib_protocol_environment/sigs/v1/z.mli + sed -i 's/out_channel/Stdlib.out_channel/g' ./src/lib_protocol_environment/sigs/v1/z.mli + sed -i 's/Buffer/Stdlib.Buffer/g' ./src/lib_protocol_environment/sigs/v1/z.mli + ''; + + meta = tezos-stdlib.meta // { + description = "Tezos: restricted typing environment for the economic protocols"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix new file mode 100644 index 00000000000..feddca046f8 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix @@ -0,0 +1,20 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-crypto +, tezos-protocol-environment-packer +}: + +buildDunePackage { + pname = "tezos-protocol-environment-structs"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-crypto + tezos-protocol-environment-packer + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: restricted typing environment for the economic protocols"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment.nix new file mode 100644 index 00000000000..60d9ae29222 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment.nix @@ -0,0 +1,33 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +, tezos-sapling +, tezos-protocol-environment-sigs +, tezos-protocol-environment-structs +, zarith +, alcotest-lwt +, crowbar +}: + +buildDunePackage { + pname = "tezos-protocol-environment"; + inherit (tezos-stdlib) version src useDune2 doCheck preBuild; + + propagatedBuildInputs = [ + tezos-sapling + tezos-base + tezos-protocol-environment-sigs + tezos-protocol-environment-structs + zarith # this might break, since they actually want 1.11 + ]; + + checkInputs = [ + alcotest-lwt + crowbar + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: custom economic-protocols environment implementation for `tezos-client` and testing"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/requester.nix b/pkgs/development/ocaml-modules/tezos/requester.nix new file mode 100644 index 00000000000..d4a2b69eaa8 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/requester.nix @@ -0,0 +1,27 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +, tezos-test-services +, lwt-watcher +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-requester"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-base + lwt-watcher + ]; + + checkInputs = [ + alcotest-lwt + tezos-test-services + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: generic resource fetching service"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/rpc.nix b/pkgs/development/ocaml-modules/tezos/rpc.nix new file mode 100644 index 00000000000..33450bdf167 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/rpc.nix @@ -0,0 +1,22 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-error-monad +, resto +, resto-directory +}: + +buildDunePackage { + pname = "tezos-rpc"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-error-monad + resto + resto-directory + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: library of auto-documented RPCs (service and hierarchy descriptions)"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/sapling.nix b/pkgs/development/ocaml-modules/tezos/sapling.nix new file mode 100644 index 00000000000..40665e38054 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/sapling.nix @@ -0,0 +1,31 @@ +{ lib +, buildDunePackage +, ocaml +, tezos-stdlib +, tezos-crypto +, tezos-rust-libs +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-sapling"; + inherit (tezos-stdlib) version src useDune2 preBuild; + + propagatedBuildInputs = [ + tezos-crypto + tezos-rust-libs + ]; + + checkInputs = [ + alcotest-lwt + ]; + + doCheck = false; + + # This is a hack to work around the hack used in the dune files + OPAM_SWITCH_PREFIX = "${tezos-rust-libs}"; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: economic-protocol definition"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/shell-services.nix b/pkgs/development/ocaml-modules/tezos/shell-services.nix new file mode 100644 index 00000000000..4e2f40497eb --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/shell-services.nix @@ -0,0 +1,22 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-workers +, tezos-p2p-services +, tezos-version +}: + +buildDunePackage { + pname = "tezos-shell-services"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-workers + tezos-p2p-services + tezos-version + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: descriptions of RPCs exported by `tezos-shell`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix b/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix new file mode 100644 index 00000000000..2b3a01469a7 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/stdlib-unix.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-event-logging +, lwt +, ptime +, mtime +, ipaddr +, re +, alcotest +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-stdlib-unix"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-event-logging + lwt + ptime + mtime + ipaddr + re + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: yet-another local-extension of the OCaml standard library (unix-specific fragment)"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/stdlib.nix b/pkgs/development/ocaml-modules/tezos/stdlib.nix new file mode 100644 index 00000000000..d0a734800c4 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/stdlib.nix @@ -0,0 +1,53 @@ +{ lib +, fetchFromGitLab +, buildDunePackage +, hex +, lwt +, zarith +, alcotest +, alcotest-lwt +, crowbar +, bigstring +, lwt_log +}: + +buildDunePackage rec { + pname = "tezos-stdlib"; + version = "8.3"; + src = fetchFromGitLab { + owner = "tezos"; + repo = "tezos"; + rev = "v${version}"; + sha256 = "12cv2cssnw60jbpnh6xjysxgsgcj7d72454k4zs2b8fjx7mkgksk"; + }; + + minimalOCamlVersion = "4.0.8"; + + useDune2 = true; + + preBuild = '' + rm -rf vendors + ''; + + propagatedBuildInputs = [ + hex + lwt + zarith + ]; + + checkInputs = [ + alcotest + alcotest-lwt + crowbar + bigstring + lwt_log + ]; + + doCheck = true; + + meta = { + description = "Tezos: yet-another local-extension of the OCaml standard library"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ulrikstrid ]; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/test-services.nix b/pkgs/development/ocaml-modules/tezos/test-services.nix new file mode 100644 index 00000000000..ba30b922d17 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/test-services.nix @@ -0,0 +1,20 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +, alcotest-lwt +}: + +buildDunePackage { + pname = "tezos-test-services"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-base + alcotest-lwt + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: Alcotest-based test services"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/version.nix b/pkgs/development/ocaml-modules/tezos/version.nix new file mode 100644 index 00000000000..3b4bdd4bf6f --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/version.nix @@ -0,0 +1,18 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +}: + +buildDunePackage { + pname = "tezos-version"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-base + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: version information generated from Git"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/workers.nix b/pkgs/development/ocaml-modules/tezos/workers.nix new file mode 100644 index 00000000000..ca659f8adfb --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/workers.nix @@ -0,0 +1,18 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +}: + +buildDunePackage { + pname = "tezos-workers"; + inherit (tezos-stdlib) version src useDune2 preBuild doCheck; + + propagatedBuildInputs = [ + tezos-base + ]; + + meta = tezos-stdlib.meta // { + description = "Tezos: worker library"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e8adc826fdd..2e8a4fa59d1 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1233,6 +1233,34 @@ let terminal_size = callPackage ../development/ocaml-modules/terminal_size { }; + tezos-base = callPackage ../development/ocaml-modules/tezos/base.nix { }; + tezos-clic = callPackage ../development/ocaml-modules/tezos/clic.nix { }; + tezos-crypto = callPackage ../development/ocaml-modules/tezos/crypto.nix { }; + tezos-error-monad = callPackage ../development/ocaml-modules/tezos/error-monad.nix { }; + tezos-event-logging = callPackage ../development/ocaml-modules/tezos/event-logging.nix { }; + tezos-lmdb = callPackage ../development/ocaml-modules/tezos/lmdb.nix { }; + tezos-lwt-result-stdlib = callPackage ../development/ocaml-modules/tezos/lwt-result-stdlib.nix { }; + tezos-micheline = callPackage ../development/ocaml-modules/tezos/micheline.nix { }; + tezos-p2p-services = callPackage ../development/ocaml-modules/tezos/p2p-services.nix { }; + tezos-p2p = callPackage ../development/ocaml-modules/tezos/p2p.nix { }; + tezos-protocol-008-PtEdo2Zk-parameters = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk-parameters.nix { }; + tezos-protocol-008-PtEdo2Zk = callPackage ../development/ocaml-modules/tezos/protocol-008-PtEdo2Zk.nix { }; + tezos-protocol-compiler = callPackage ../development/ocaml-modules/tezos/protocol-compiler.nix { }; + tezos-protocol-demo-noops = callPackage ../development/ocaml-modules/tezos/protocol-demo-noops.nix { }; + tezos-protocol-environment-packer = callPackage ../development/ocaml-modules/tezos/protocol-environment-packer.nix { }; + tezos-protocol-environment-sigs = callPackage ../development/ocaml-modules/tezos/protocol-environment-sigs.nix { }; + tezos-protocol-environment-structs = callPackage ../development/ocaml-modules/tezos/protocol-environment-structs.nix { }; + tezos-protocol-environment = callPackage ../development/ocaml-modules/tezos/protocol-environment.nix { }; + tezos-requester = callPackage ../development/ocaml-modules/tezos/requester.nix { }; + tezos-rpc = callPackage ../development/ocaml-modules/tezos/rpc.nix { }; + tezos-sapling = callPackage ../development/ocaml-modules/tezos/sapling.nix { }; + tezos-shell-services = callPackage ../development/ocaml-modules/tezos/shell-services.nix { }; + tezos-stdlib-unix = callPackage ../development/ocaml-modules/tezos/stdlib-unix.nix { }; + tezos-stdlib = callPackage ../development/ocaml-modules/tezos/stdlib.nix { }; + tezos-test-services = callPackage ../development/ocaml-modules/tezos/test-services.nix { }; + tezos-version = callPackage ../development/ocaml-modules/tezos/version.nix { }; + tezos-workers = callPackage ../development/ocaml-modules/tezos/workers.nix { }; + toml = callPackage ../development/ocaml-modules/toml { }; topkg = callPackage ../development/ocaml-modules/topkg { }; From 87ea7f7db7b7815045c8cd6a318f34edde3890d1 Mon Sep 17 00:00:00 2001 From: "Felix C. Stegerman" Date: Fri, 23 Jul 2021 13:35:34 +0200 Subject: [PATCH 095/136] fdroidserver: change maintainer + small fixes --- pkgs/development/tools/fdroidserver/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index af851e25211..6b3690de91b 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -16,7 +16,6 @@ python.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace fdroidserver/common.py --replace "FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))" "FDROID_PATH = '$out/bin'" - substituteInPlace setup.py --replace "pyasn1-modules >= 0.2.1, < 0.3" "pyasn1-modules" ''; preConfigure = '' @@ -33,8 +32,6 @@ python.pkgs.buildPythonApplication rec { androguard clint defusedxml - docker - docker-py GitPython libcloud mwclient @@ -59,7 +56,7 @@ python.pkgs.buildPythonApplication rec { homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; license = licenses.agpl3; - maintainers = [ lib.maintainers.pmiddend ]; + maintainers = [ lib.maintainers.obfusk ]; }; } From 757eee4990206766d93a3584e778052ab0589f3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 13:39:43 +0200 Subject: [PATCH 096/136] python3Packages.aionotion: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/aionotion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 078184275eb..459a06d57d4 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aionotion"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "1ydrazg7gcwf53006n1fvxh9zm77by6zi36haq1bmy5skqccyiki"; + sha256 = "1328g2245h9gcrnzrbcxaxw78723d0skznrrj8k77fbijxdc4kwv"; }; nativeBuildInputs = [ poetry-core ]; From 36935f973699f7ed87b5d64497f50661c6261e4d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Jul 2021 07:42:26 -0400 Subject: [PATCH 097/136] agdaPackages.cubical: 0.2 -> 0.3pred5030a9 0.2 does not build with agda 2.6.2 --- pkgs/development/libraries/agda/cubical/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 241caf16d67..74bdf0b2135 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -1,16 +1,14 @@ { lib, mkDerivation, fetchFromGitHub, ghc, glibcLocales }: mkDerivation rec { - - # Version 0.2 is meant to be used with the Agda 2.6.1 compiler. pname = "cubical"; - version = "0.2"; + version = "0.3pred5030a9"; src = fetchFromGitHub { repo = pname; owner = "agda"; - rev = "v${version}"; - sha256 = "07qlp2f189jvzbn3aqvpqk2zxpkmkxhhkjsn62iq436kxqj3z6c2"; + rev = "d5030a9c89070255fc575add4e9f37b97e6a0c0c"; + sha256 = "18achbxap4ikydigmz3m3xjfn3i9dw4rn8yih82vrlc01j02nqpi"; }; LC_ALL = "en_US.UTF-8"; From 70950acff9a2ee926673c14e1a718aa51f159187 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 13:49:56 +0200 Subject: [PATCH 098/136] terrascan: 1.8.0 -> 1.8.1 --- pkgs/tools/security/terrascan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 5fd0578bc87..d3af5e368f5 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "terrascan"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "accurics"; @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-eCkinYJtZNf5Fo+LXu01cHRInA9CfDONvt1OIs3XJSk="; }; - vendorSha256 = "sha256-eez/g0Np/vnSO6uvUA8vtqR3DEaKlBo6lyd9t25LE7s="; + vendorSha256 = "1fqk9dpbfz97jwx1m54a8q67g95n5w7m1bxb7g9gkzk98f1zzv3r"; # Tests want to download a vulnerable Terraform project doCheck = false; From acd52c60a7c87f3531e3fafb67bfd845ba4ca679 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 13:54:22 +0200 Subject: [PATCH 099/136] tfsec: 0.50.7 -> 0.51.2 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 7800f4c1eda..62c05439644 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.50.7"; + version = "0.51.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0rklv9wj8gf95ar345k3ghpg9hxjpbsi693239wdfarzbsjrlcla"; + sha256 = "18qblimn78w17gydy7h9sjl9ri1wkvzi5phsqz1dkk43i3ryjg3s"; }; goPackagePath = "github.com/aquasecurity/tfsec"; From 99adb70c75dd10d5783bc78f57b9999cd0fbed22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Jul 2021 14:02:21 +0200 Subject: [PATCH 100/136] python3Packages.aiorecollect: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/aiorecollect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiorecollect/default.nix b/pkgs/development/python-modules/aiorecollect/default.nix index 0d3fe5bbaed..983ff771690 100644 --- a/pkgs/development/python-modules/aiorecollect/default.nix +++ b/pkgs/development/python-modules/aiorecollect/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "1.0.5"; + version = "1.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0h76l0pahnmls0radknzm8dw79qx9dv0xhxqnn6011j9fwyviyqm"; + sha256 = "0vm19rcy14fdsfddjskxh0nlph10jrj3qh6xqwv73wgcmbdpr91i"; }; nativeBuildInputs = [ From ebabecfd2a62ddb3504bcc02f47bd1cc137b07e8 Mon Sep 17 00:00:00 2001 From: arjix <62168569+arjix@users.noreply.github.com> Date: Fri, 23 Jul 2021 14:06:09 +0200 Subject: [PATCH 101/136] nengo-gui: init at 0.4.8 (#130015) Co-authored-by: Sandro --- .../machine-learning/nengo-gui/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/science/machine-learning/nengo-gui/default.nix diff --git a/pkgs/applications/science/machine-learning/nengo-gui/default.nix b/pkgs/applications/science/machine-learning/nengo-gui/default.nix new file mode 100644 index 00000000000..6380f25177c --- /dev/null +++ b/pkgs/applications/science/machine-learning/nengo-gui/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "nengo-gui"; + version = "0.4.8"; + + src = fetchFromGitHub { + owner = "nengo"; + repo = "nengo-gui"; + rev = "v${version}"; + sha256 = "1awb0h2l6yifb77zah7a4qzxqvkk4ac5fynangalidr10sk9rzk3"; + }; + + propagatedBuildInputs = with python3Packages; [ nengo ]; + + # checks req missing: + # pyimgur + doCheck = false; + + meta = with lib; { + description = "Nengo interactive visualizer"; + homepage = "https://nengo.ai/"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ arjix ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da55752e98d..e5ca2c4d630 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30082,6 +30082,8 @@ in ### SCIENCE/MACHINE LEARNING + nengo-gui = callPackage ../applications/science/machine-learning/nengo-gui { }; + sc2-headless = callPackage ../applications/science/machine-learning/sc2-headless { }; ### SCIENCE/MATH From 67ea2e1044d84e40656896c8b19764dc13c2b24d Mon Sep 17 00:00:00 2001 From: QuantMint Date: Fri, 23 Jul 2021 14:30:51 +0200 Subject: [PATCH 102/136] bottles: 3.1.6 -> 2021.7.14-treviso (#130543) --- pkgs/applications/misc/bottles/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 04003f6a9b5..21e63b8b29b 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "3.1.6"; + version = "2021.7.14-treviso"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "1izks01010akjf83xvi70dr4yzgk6yr84kd0slzz22yq204pdh5m"; + sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix"; }; postPatch = '' @@ -44,6 +44,8 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ + pyyaml + requests pycairo pygobject3 lxml From 1d4fad600b050d709f8c729f09b281933601a2b1 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Fri, 23 Jul 2021 06:23:40 -0700 Subject: [PATCH 103/136] fossil: 2.14 -> 2.15.1 (#120700) Co-authored-by: Sandro --- pkgs/applications/version-management/fossil/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index c15d833dfb2..6b445446d5b 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -18,10 +18,7 @@ stdenv.mkDerivation rec { version = "2.15.1"; src = fetchurl { - urls = - [ - "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" - ]; + url = "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"; name = "${pname}-${version}.tar.gz"; sha256 = "sha256-gNJ5I8ZjsqLHEPiujNVJhi4E+MBChXBidMNK48jKF9E="; }; From 597f635071c6b54a339d22eaf8ea2068ffdf5d9f Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 23 Jul 2021 15:29:03 +0200 Subject: [PATCH 104/136] python39Packages.pyls-isort: add pythonImportsCheck --- pkgs/development/python-modules/pyls-isort/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 35b43969e52..3c0febd9ecf 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -16,6 +16,8 @@ buildPythonPackage rec { # no tests doCheck = false; + pythonImportsCheck = [ "pyls_isort" ]; + propagatedBuildInputs = [ isort python-language-server ]; From 5ffb7c850046c94ec9ae58fb57b6ad9abe269013 Mon Sep 17 00:00:00 2001 From: Stephen Sherratt Date: Tue, 13 Jul 2021 22:08:23 +1000 Subject: [PATCH 105/136] bsnes-hd: init at 10.6-beta --- pkgs/misc/emulators/bsnes-hd/default.nix | 55 +++++++++++++++++++ .../bsnes-hd/macos-copy-app-to-prefix.patch | 18 ++++++ .../macos-replace-sips-with-png2icns.patch | 13 +++++ pkgs/top-level/all-packages.nix | 5 ++ 4 files changed, 91 insertions(+) create mode 100644 pkgs/misc/emulators/bsnes-hd/default.nix create mode 100644 pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch create mode 100644 pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch diff --git a/pkgs/misc/emulators/bsnes-hd/default.nix b/pkgs/misc/emulators/bsnes-hd/default.nix new file mode 100644 index 00000000000..6494185958c --- /dev/null +++ b/pkgs/misc/emulators/bsnes-hd/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, fetchFromGitHub +, pkg-config +, libX11, libXv +, udev +, SDL2 +, gtk2, gtksourceview +, alsa-lib, libao, openal, libpulseaudio +, libicns, Cocoa, OpenAL +}: + +stdenv.mkDerivation { + pname = "bsnes-hd"; + version = "10.6-beta"; + + src = fetchFromGitHub { + owner = "DerKoun"; + repo = "bsnes-hd"; + rev = "beta_10_6"; + sha256 = "0f3cd89fd0lqskzj98cc1pzmdbscq0psdjckp86w94rbchx7iw4h"; + }; + + patches = [ + # Replace invocation of `sips` with an equivalent invocation of `png2icns` + # while assembling the .app directory hierarchy in the macos build. The + # `sips` executable isn't in our environment during the build, but + # `png2icns` is available by way of the dependency on libicns. + ./macos-replace-sips-with-png2icns.patch + + # During `make install` on macos the Makefile wants to move the .app into + # the current user's home directory. This patches the Makefile such that + # the .app ends up in $(prefix)/Applications. The $(prefix) variable will + # be set to $out, so this will result in the .app ending up in the + # Applications directory in the current nix profile. + ./macos-copy-app-to-prefix.patch + ]; + + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals stdenv.isDarwin [ libicns ]; + + buildInputs = [ SDL2 libao ] + ++ lib.optionals stdenv.isLinux [ libX11 libXv udev gtk2 gtksourceview alsa-lib openal libpulseaudio ] + ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]; + + enableParallelBuilding = true; + + makeFlags = [ "-C" "bsnes" "prefix=$(out)" ]; + + meta = with lib; { + description = "A fork of bsnes that adds HD video features"; + homepage = "https://github.com/DerKoun/bsnes-hd"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ stevebob ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch b/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch new file mode 100644 index 00000000000..d38efbc99bc --- /dev/null +++ b/pkgs/misc/emulators/bsnes-hd/macos-copy-app-to-prefix.patch @@ -0,0 +1,18 @@ +diff --git a/bsnes/target-bsnes/GNUmakefile b/bsnes/target-bsnes/GNUmakefile +index 7a3ab9f..ec8a1a4 100644 +--- a/bsnes/target-bsnes/GNUmakefile ++++ b/bsnes/target-bsnes/GNUmakefile +@@ -43,11 +43,8 @@ ifeq ($(platform),windows) + else ifeq ($(shell id -un),root) + $(error "make install should not be run as root") + else ifeq ($(platform),macos) +- mkdir -p ~/Library/Application\ Support/$(name)/ +- mkdir -p ~/Library/Application\ Support/$(name)/Database/ +- mkdir -p ~/Library/Application\ Support/$(name)/Firmware/ +- mkdir -p ~/Library/Application\ Support/$(name)/Shaders/ +- cp -R out/$(name).app /Applications/$(name).app ++ mkdir -p $(prefix)/Applications ++ cp -R out/$(name).app $(prefix)/Applications + else ifneq ($(filter $(platform),linux bsd),) + mkdir -p $(prefix)/bin/ + mkdir -p $(prefix)/share/applications/ diff --git a/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch b/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch new file mode 100644 index 00000000000..85adb33e3ab --- /dev/null +++ b/pkgs/misc/emulators/bsnes-hd/macos-replace-sips-with-png2icns.patch @@ -0,0 +1,13 @@ +diff --git a/bsnes/target-bsnes/GNUmakefile b/bsnes/target-bsnes/GNUmakefile +index 4c67bde..7a3ab9f 100644 +--- a/bsnes/target-bsnes/GNUmakefile ++++ b/bsnes/target-bsnes/GNUmakefile +@@ -33,7 +33,7 @@ ifeq ($(platform),macos) + cp Database/* out/$(name).app/Contents/MacOS/Database/ + cp -r ../shaders/* out/$(name).app/Contents/macOS/Shaders/ + cp $(ui)/resource/$(name).plist out/$(name).app/Contents/Info.plist +- sips -s format icns $(ui)/resource/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns ++ png2icns out/$(name).app/Contents/Resources/$(name).icns $(ui)/resource/$(name).png + endif + + verbose: hiro.verbose ruby.verbose nall.verbose all; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1dd7beb83a..93333c8e3a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32074,6 +32074,11 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; + bsnes-hd = callPackage ../misc/emulators/bsnes-hd { + inherit (gnome2) gtksourceview; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL; + }; + yapesdl = callPackage ../misc/emulators/yapesdl { }; x16-emulator = callPackage ../misc/emulators/commanderx16/emulator.nix { }; From 8d5b6bdc8634e8dfd2579c34ba5ee771be5cadcb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 13:47:44 +0000 Subject: [PATCH 106/136] buildah-unwrapped: 1.21.3 -> 1.21.4 --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 13ae74db977..c92b229f05a 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.3"; + version = "1.21.4"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-f39UXQXUje6j8bRWVaX9ELCwO1vaeNuGnlmPhyyVoV8="; + sha256 = "sha256-eVXNkQJ3/T4KFiGeE8o4kFBOONfHc6v+tNEOsOnEYRA="; }; outputs = [ "out" "man" ]; From 9fd41a9a5be02faf8e8d08b3b052c4e4fad06fdc Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Fri, 23 Jul 2021 08:02:20 -0600 Subject: [PATCH 107/136] tuxguitar: 125945 (#131028) * tuxguitar: Ensure that tuxguitar is launched with java 8 comtabilbe jre and libraries as greate java version is not supported * tuxguitar: Added test to verify application starts without problems * tuxguitar: 1.5.2 -> 1.5.4 --- nixos/tests/all-tests.nix | 1 + nixos/tests/tuxguitar.nix | 24 +++++++++++++++++++ .../editors/music/tuxguitar/default.nix | 12 +++++----- pkgs/top-level/all-packages.nix | 5 +++- 4 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 nixos/tests/tuxguitar.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0e2104a20e2..d6ef7d42431 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -440,6 +440,7 @@ in txredisapi = handleTest ./txredisapi.nix {}; tuptime = handleTest ./tuptime.nix {}; turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {}; + tuxguitar = handleTest ./tuxguitar.nix {}; ucarp = handleTest ./ucarp.nix {}; ucg = handleTest ./ucg.nix {}; udisks2 = handleTest ./udisks2.nix {}; diff --git a/nixos/tests/tuxguitar.nix b/nixos/tests/tuxguitar.nix new file mode 100644 index 00000000000..6586132d3cd --- /dev/null +++ b/nixos/tests/tuxguitar.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "tuxguitar"; + meta = with pkgs.lib.maintainers; { + maintainers = [ asbachb ]; + }; + + machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + + environment.systemPackages = [ pkgs.tuxguitar ]; + }; + + testScript = '' + machine.wait_for_x() + machine.succeed("tuxguitar &") + machine.wait_for_window("TuxGuitar - Untitled.tg") + machine.sleep(1) + machine.screenshot("tuxguitar") + ''; +}) diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index a48b5eae3de..b76e4fa0a7b 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, swt, jdk, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }: +{ lib, stdenv, fetchurl, swt, jre, makeWrapper, alsa-lib, jack2, fluidsynth, libpulseaudio }: let metadata = assert stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux"; if stdenv.hostPlatform.system == "i686-linux" then - { arch = "x86"; sha256 = "27675c358db237df74d20e8676000c25a87b9de0bb0a6d1c325e8d6db807d296"; } + { arch = "x86"; sha256 = "afa4b1116aee18e3ddd93132467809d0bcf03715cf9ad55b895f021a13e1cb8a"; } else - { arch = "x86_64"; sha256 = "298555a249adb3ad72f3aef72a124e30bfa01cd069c7b5d152a738140e7903a2"; }; + { arch = "x86_64"; sha256 = "55ab653c601727a2077080e7ea4d76fe7a897379934ed9a5b544e20d490f53f9"; }; in stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.4"; pname = "tuxguitar"; src = fetchurl { - url = "mirror://sourceforge/tuxguitar/${pname}-${version}-linux-${metadata.arch}.tar.gz"; + url = "mirror://sourceforge/${pname}/${pname}-${version}-linux-${metadata.arch}.tar.gz"; sha256 = metadata.sha256; }; @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { ln -s $out/share $out/bin/share wrapProgram $out/bin/tuxguitar \ - --set JAVA "${jdk}/bin/java" \ + --set JAVA "${jre}/bin/java" \ --prefix LD_LIBRARY_PATH : "$out/lib/:${lib.makeLibraryPath [ swt alsa-lib jack2 fluidsynth libpulseaudio ]}" \ --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 777e328265e..827a156f7f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27530,7 +27530,10 @@ in tut = callPackage ../applications/misc/tut { }; - tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { + jre = jre8; + swt = swt_jdk8; + }; twister = callPackage ../applications/networking/p2p/twister { }; From 1fb514aaab91ab79c11e812b95f653570ab7edf2 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 23 Jul 2021 22:23:17 +0800 Subject: [PATCH 108/136] mdbook-mermaid: 0.8.1 -> 0.8.3 --- pkgs/tools/text/mdbook-mermaid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index b29fbbd6e0d..741bc652e51 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.8.1"; + version = "0.8.3"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UMYWRQeSQwWVJla/+RPlAXPMuFVnxqDtYDxLKmbMw4g="; + sha256 = "sha256-maYFOlWNqKFmyDM2nDF25rzYnUXMlV9Ry9TMoXReUUg="; }; - cargoSha256 = "sha256-nhJS2QZUyGeNRMS9D+P+QPMDHK2PqVK/H2AKaP7EECw="; + cargoSha256 = "sha256-GL5Z4KfRu0zQAzVCWRIhaYtG5FrDdQabsbyFX7SjZvg="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From bd14756a10be5390693b7e07f3f02cc2f034b26e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Jul 2021 11:19:47 -0400 Subject: [PATCH 109/136] emacs.pkgs.elpa-packages: 2021-07-23 --- .../editors/emacs/elisp-packages/elpa-generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 10a4a2cab5e..2bbeaba2a2a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -2885,10 +2885,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.9.2.tar"; - sha256 = "18m5wni1zns8fad2ll9flbfgxfy14gi03apnycajdbqxsqfp65j9"; + url = "https://elpa.gnu.org/packages/pyim-3.9.3.tar"; + sha256 = "0rjaimvbh0fadbqiq4ggyxr0y4pfzld76wb64v7l5874qczn8dfr"; }; packageRequires = [ async emacs xr ]; meta = { From 7375e90e93c21a7aa003269e685155a07e39f956 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Jul 2021 11:19:50 -0400 Subject: [PATCH 110/136] emacs.pkgs.org-packages: 2021-07-23 --- .../editors/emacs/elisp-packages/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 5d043f9de9a..4dbf968ee26 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210712"; + version = "20210719"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210712.tar"; - sha256 = "0xdxzfk7hvsmlyivn61ivci6hy2alxg2ysdm5xad4xxz337jrj7x"; + url = "https://orgmode.org/elpa/org-20210719.tar"; + sha256 = "1aravj0krdi8bnfinfj1d92vq3g06djxcnpipibkrw9ggk0d01d6"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210712"; + version = "20210719"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210712.tar"; - sha256 = "1cdpwsfjmjplyik1r9kl4lvd5lm52zrixlfg2ml1mhh28s680k0q"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210719.tar"; + sha256 = "1knjkf365cnjd8sdhaisjx0n6n0l2zfpql1b2gzw0gj62kbpl476"; }; packageRequires = []; meta = { From 3243fa4ba0e8ecc3aaadb509e046fc587ca77601 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Jul 2021 11:21:16 -0400 Subject: [PATCH 111/136] emacs.pkgs.melpa-packages: 2021-07-23 --- .../elisp-packages/recipes-archive-melpa.json | 1211 +++++++++-------- 1 file changed, 619 insertions(+), 592 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 5581a52fed4..e0cb7878bc8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1148,8 +1148,8 @@ "auto-complete", "rtags" ], - "commit": "65113e2a137baa9f85dc2157b893291470788dc4", - "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" + "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", + "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" }, "stable": { "version": [ @@ -1951,8 +1951,8 @@ "annotation", "eri" ], - "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a", - "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b" + "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a", + "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6" }, "stable": { "version": [ @@ -2183,15 +2183,15 @@ "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20200723, - 1405 + 20210721, + 1343 ], "deps": [ "flycheck", "s" ], - "commit": "fc1fc0312b3e7f868f95b917a66719afb96f0c9a", - "sha256": "1cadc2v8mdlz5di7cwhc9qqhrkwgl3gxyw5v4il895r44rcdifgq" + "commit": "c1c4205d2cdf8bf69b22e62548568ed4a8529807", + "sha256": "023lzr112gjscmyqgfz5ib3a80s3bis72acsaxnk4jw32knjy4yl" }, "stable": { "version": [ @@ -2293,7 +2293,7 @@ 0 ], "commit": "97c20b1fd9ad3f138e1100e3a837d05108c4c564", - "sha256": "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj" + "sha256": "1x4apig2hrvvy6pjciklmz5afpq5l4rmfjahc2wvyzs79abh0icx" } }, { @@ -2327,14 +2327,14 @@ "repo": "cpitclaudel/alectryon", "unstable": { "version": [ - 20210518, - 1550 + 20210722, + 1554 ], "deps": [ "flycheck" ], - "commit": "3fad996473200fa07b0381cd66179089d10fcc6f", - "sha256": "0qj4cjra1kyiw8h2qm024wgy9fy3xjwik7sr1mfkhk1gbndl8m3w" + "commit": "f3688475bba4c451fdfe52ad95fb25c7050ec9f9", + "sha256": "02h6xhnnbx27gq3xm2f2j3py5h94kcg8m8399j7dhski60ncn4b4" }, "stable": { "version": [ @@ -2513,14 +2513,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20210325, - 512 + 20210721, + 651 ], "deps": [ "all-the-icons" ], - "commit": "f304d283cbb815cd28b86c1cbe74b706c0678e25", - "sha256": "1afjcv94p8za3ri9c324j1wdg4klpcaippby3r1avwnjy5l9qpav" + "commit": "a3cc2d96f619a2a6cf1cb6ad881ab6e509ac8fc3", + "sha256": "09l0y99lqi3p7h0ll3hm13zi6kp2pbya8rdpvqrx7jpkg3w5slfk" }, "stable": { "version": [ @@ -2575,15 +2575,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210626, - 1956 + 20210721, + 653 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "78ee2fb4eb43c970e12a91949f7efd26ca1834d5", - "sha256": "04pgr5xjk84kksck7f1y9gpvxxnsy803zq252hg1pzg1pl6bx3ga" + "commit": "b20df3e2c901a107441b6246b9d03fa3dc57f47f", + "sha256": "1hqf3jqpq0viygxnbkq7rsabpyygz2kr6nl6jrarm8wdczs55rpr" }, "stable": { "version": [ @@ -3217,8 +3217,8 @@ 20200914, 644 ], - "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a", - "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b" + "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a", + "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6" }, "stable": { "version": [ @@ -5324,11 +5324,11 @@ "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ - 20210709, - 1230 + 20210720, + 1810 ], - "commit": "32786dc552569c7cc9970628f580b0b7b8e0b03d", - "sha256": "0vs8kwgxvmbr1yy1f8jvxpixy4jfxpdk17mq0gfvlcmnqb560gdr" + "commit": "b2c8d431f89788d1e01d42c55e65612e6fc11b44", + "sha256": "05378j4pyxb9s8wpffmmrcn09inxjipiw1sy8jqgc5cslpd1jl3g" } }, { @@ -5532,8 +5532,8 @@ "avy", "embark" ], - "commit": "acbe1cba548832d295449da348719f69b9685c6f", - "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" + "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf", + "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha" }, "stable": { "version": [ @@ -6187,7 +6187,7 @@ "flycheck" ], "commit": "5bfd5f91b9f91e46158e0419c6bb5c350e7684a1", - "sha256": "0nb6dbk8aclkq7jki52y4lwgbxg61xh1598l08yfv2l1ykhgg0n0" + "sha256": "0mb85g7bydd0nv3hjzvqb3d01cs4hg5846ibcznaqhsqk93pgm2h" } }, { @@ -7044,8 +7044,8 @@ "deps": [ "bibtex-completion" ], - "commit": "f5b73bce4fcc31d55044d17949569b35dc50283b", - "sha256": "06wv37ck15i4m90lwksyc4zq9pwx4ljr90g8yqjmmracpgbm967y" + "commit": "6b9a075aebd85fee8a071ffbbada1158ecd470d4", + "sha256": "0ihpm7pnlx5acj7jmrqr9di92908mz7z3k1kg62k8vxj2q43a00c" }, "stable": { "version": [ @@ -7067,8 +7067,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20210408, - 1649 + 20210718, + 1044 ], "deps": [ "biblio", @@ -7078,8 +7078,8 @@ "parsebib", "s" ], - "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", - "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" + "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590", + "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h" }, "stable": { "version": [ @@ -8701,17 +8701,18 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20210716, - 1006 + 20210722, + 1703 ], "deps": [ "dash", "f", "magit-section", + "map", "pretty-hydra" ], - "commit": "d466eac6c4b2ee25c765e7f31e44beb38dd44e4b", - "sha256": "00gyqpm0g437z71vbfd4kmih23vh6909dvygng133vxzly9k4f24" + "commit": "b951e621bc4a4bb07babf8b32dc318d91ae261c9", + "sha256": "14d2mcx6ppjzkpv63m7iir0j2dn549gkxr30bxx8qvc1v7r7r6wn" }, "stable": { "version": [ @@ -9748,6 +9749,30 @@ "sha256": "0xz62fivll6yv1x94f7f5m07zg7383llyz6wa1n5q1ysix2p20j1" } }, + { + "ename": "capnp-mode", + "commit": "7981e5108f449a52631699439724712cba1d2a40", + "sha256": "04idy13yzb5khzycsh394j8m4cchvnl7j75cw7ms1kdxzx6w2k4b", + "fetcher": "github", + "repo": "capnproto/capnproto", + "unstable": { + "version": [ + 20210707, + 2310 + ], + "commit": "583f07515b3be254ec150ce1dadabb48fdfa5bd3", + "sha256": "1nccl2v2fvpmsmvga1ghb9kb72v90bgdqhxb153086qx69s7vlcn" + }, + "stable": { + "version": [ + 0, + 8, + 0 + ], + "commit": "57a4ca5af5a7f55b768a9d9d6655250bffb1257f", + "sha256": "0z7p9687bdvhddgyb6b3j0c3bngynnyvc8z6yp4hhynvrlvsmy5d" + } + }, { "ename": "capture", "commit": "bdfe43be6c5f77845e82745534a1b1a9eb190466", @@ -10424,8 +10449,8 @@ 20171115, 2108 ], - "commit": "d87317f360d64b5f68809a564d03436d2b07e96a", - "sha256": "1g2q4fg95wpg1d77zrk80923553w2sgsby3ylrrq92y11ks4yiq5" + "commit": "94d292543d4869c3c5b48bb4dd1e5d901ce6227e", + "sha256": "12pxnwgfr0ypf80hpgrqyb789wj41gv8cbzsr1jks7pinvpda65f" }, "stable": { "version": [ @@ -10501,7 +10526,7 @@ "yaml-mode" ], "commit": "f3462930067de8f79c3d2e8da14d1924f609d3ab", - "sha256": "15ndphxz1jy4wbk52f6l3hk67b29844ljmmxd8wmahmi6c8nh3si" + "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" } }, { @@ -11419,14 +11444,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20210713, - 1609 + 20210717, + 1041 ], "deps": [ "cl-lib" ], - "commit": "07d6d82cba864b1e38d3bd46654f2e1928a997c2", - "sha256": "04h60s6ig43sj144s7dlip1saf9kdwvzlfys8qwwx48003rbs0dp" + "commit": "77e16de3b9fbaa0417b56a9acc70a9bca17c4ad0", + "sha256": "1ww04kfz4kkbhrbd78r4dpylhayb5hl72qcjv8wm0mhgfwmbb358" }, "stable": { "version": [ @@ -11497,8 +11522,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20210709, - 602 + 20210719, + 918 ], "deps": [ "dash", @@ -11508,8 +11533,8 @@ "s", "string-inflection" ], - "commit": "dc118772ad4585c0511f4f8f25c81faf69952038", - "sha256": "0v8z6fhrsi9kszqcbrm1ggvin0jff744byaiw06d3id1hc428iq5" + "commit": "b46d3c3c6e5a00237f62084c64a25c4b4efabe1b", + "sha256": "0gyyxaiky82km9c897vvslnin7yll3yzjfz0fd5zg7lz4kmjilqk" }, "stable": { "version": [ @@ -11575,11 +11600,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210716, - 403 + 20210722, + 1158 ], - "commit": "813e8c32a41f84ff099feddb5a4d5a51c5c200b5", - "sha256": "02482ln1458hb6z1x89b7294q4bwwdqi08h6m0mmvgd3vz2nwmqs" + "commit": "45e7f801744f471b43fdd96cfe734a4a3796bab6", + "sha256": "1sdj2nvgnbvsz2cvgzpr0axzm4gcb0sna0ps37mbxb0y356xyzfv" }, "stable": { "version": [ @@ -12530,8 +12555,8 @@ 20210104, 1831 ], - "commit": "4e17e90988e9f23dece4c04f574d456309d7a50c", - "sha256": "1gqbgs8zxn9dcpxmbykz0mrqy6p229b0pdz3hnk0kncqkk004lx1" + "commit": "f7a3031b7defbc805a39a8b23dbefe10764d956b", + "sha256": "13036j6019viskahslw3vq28h5kn1xr6ap61l2hvgzpimriam012" }, "stable": { "version": [ @@ -13499,11 +13524,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210709, - 1110 + 20210721, + 2003 ], - "commit": "d77184094b9a45b204813d824918e1ec2aac8504", - "sha256": "09f59ipp6c2b1xpnmk82ygxcfkfhh36h4g1c07dmxf7m3z1hwlgi" + "commit": "7b731e7d435d8782c5095f6f269704a5e21eccad", + "sha256": "1av9ln4nhkjqd6x6v43yjnzp07kx1qhzcxjni343x4npix6p41xm" }, "stable": { "version": [ @@ -14406,7 +14431,7 @@ "seq" ], "commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d", - "sha256": "17m9x3yy0k63j59vx1sf25jcfb6b9yj0ggp2jiq1mih4b62rp97d" + "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" } }, { @@ -14651,7 +14676,7 @@ "s" ], "commit": "0e6941e1832faafb2176238339667edd482acd95", - "sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2" + "sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid" } }, { @@ -14741,8 +14766,8 @@ "company", "prescient" ], - "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", - "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" + "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9", + "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h" }, "stable": { "version": [ @@ -14930,8 +14955,8 @@ "company", "rtags" ], - "commit": "65113e2a137baa9f85dc2157b893291470788dc4", - "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" + "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", + "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" }, "stable": { "version": [ @@ -14996,8 +15021,8 @@ "company", "solidity-mode" ], - "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", - "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" + "commit": "6f7bd1641e5282ec5163188d8b8c2f6dfddc2e36", + "sha256": "0rkw21pic9nypv7vz06chyn9mjl560a4dayb84gj5w6v8gfznrcw" }, "stable": { "version": [ @@ -15589,24 +15614,6 @@ "sha256": "09vq7hcsw4027whn3xrnfz9hkgkakva619hyz0zfgpvppqah9n1p" } }, - { - "ename": "confluence", - "commit": "30de78c9cf83de30093a5647976eeaf552d4b2cb", - "sha256": "0xa2g168mm31kh5h7smhx35cjsk1js88nzs19yakjljf56b1khlf", - "fetcher": "github", - "repo": "emacsorphanage/confluence", - "unstable": { - "version": [ - 20151021, - 128 - ], - "deps": [ - "xml-rpc" - ], - "commit": "4518d270a07760644c4204985c83d234ece4738b", - "sha256": "1lrq23cxlp2vkyv7g56r06bp7chhw10kii3ymkydf24y4pyn1zpg" - } - }, { "ename": "conkeror-minor-mode", "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8", @@ -15713,11 +15720,11 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210716, - 1219 + 20210722, + 1644 ], - "commit": "5fb6248c8e12630ce1247985c67ea28ae4077e4f", - "sha256": "1cgk144alm3pbig9acm62q3r7479x69ig76q3z6agamdvf91ay29" + "commit": "d42ccdca5bbc4c437819cf4d29c7b8728ed090bc", + "sha256": "134flhq2rx2qjhfc5fspsijpdiv7a3z5mk0j1pwipfwfkid27nqk" }, "stable": { "version": [ @@ -17451,6 +17458,14 @@ ], "commit": "a7f0f4610c976a28c41b9b8299892f88b5d0336c", "sha256": "0j8m7rhkf98zqkg6zydcks6qs4msw6vz51nbqya23hka2wpz7f81" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "a7f0f4610c976a28c41b9b8299892f88b5d0336c", + "sha256": "0j8m7rhkf98zqkg6zydcks6qs4msw6vz51nbqya23hka2wpz7f81" } }, { @@ -18060,8 +18075,8 @@ 20190111, 2150 ], - "commit": "5bf5aa63d6b6742144071a2af896067c21b3752a", - "sha256": "1nnyca4bagdbpmzy64pqy95vxbj3dx7lfbapvs120zbpxj193p7a" + "commit": "e46e9dd7c37d8d7ad432a94fff5daafa7fa444e3", + "sha256": "0lbla1pbqk2gaprkwdyxg5x381nmxx1jcc9snls6crlsf8bbhrm4" }, "stable": { "version": [ @@ -18268,8 +18283,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210711, - 1427 + 20210720, + 448 ], "deps": [ "bui", @@ -18281,8 +18296,8 @@ "posframe", "s" ], - "commit": "685168efc72e61bca2a248155bace7ec633269a5", - "sha256": "1mwy92rj9jj4ziflhzpy774vrp5m7zwzy2x1iyj33mn2rmykwl2w" + "commit": "d472a6c937cf519434e718e873c195f5d1e80f19", + "sha256": "17az0rvcy84iahlfdn246marjn4kgrif4gnv0h1zf4sdznk2aijh" }, "stable": { "version": [ @@ -18338,7 +18353,7 @@ 0 ], "commit": "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976", - "sha256": "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky" + "sha256": "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1" } }, { @@ -18638,11 +18653,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210714, - 305 + 20210718, + 940 ], - "commit": "09932ef488b47c6b645a081fee4a82be437f98d8", - "sha256": "1kfsc5f37i4k4j8rqmi70cd6yvwxhhq2q513gby8qj2bqsgiwkhb" + "commit": "67573ceb3db5bc7a5192311c6cac044cb29f61a7", + "sha256": "1ljcym1gwibldsp656a4h9x4hn36ywavqan7h8gk2grr5716cpx2" }, "stable": { "version": [ @@ -18963,7 +18978,7 @@ "ht" ], "commit": "5123477396a562fae350a89fbed79464cc498bc9", - "sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k" + "sha256": "1bkiwg1wp3l904159gycdr83xkb3i0h2k0da7akzkwc957abvp8w" } }, { @@ -19848,7 +19863,7 @@ 0 ], "commit": "6d0c4203eb192d73d89261b3a9bad52951e394af", - "sha256": "1rdmhsrlqn19a140i3099fp7f9wnlglp760rnrjp5p840wzfm74q" + "sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s" } }, { @@ -20305,11 +20320,11 @@ "repo": "HKey/dired-atool", "unstable": { "version": [ - 20210706, - 1456 + 20210719, + 404 ], - "commit": "c01e0a79c952a29db17c262c9ce8a90632b04b3a", - "sha256": "1r44s3f29p70li6k6646xcby3ypz1ljgd4j1fhdd0x4d7a09zl0v" + "commit": "01416fd5961b901c50686c91cb59b3833adc831b", + "sha256": "0dx829jlxr84mylcr0l7wgbkbhajmb2yg2dcnyd1gi768fgh7jdj" }, "stable": { "version": [ @@ -20569,7 +20584,7 @@ 5 ], "commit": "dbace8d2250f84487d31b39050fcdc260fcde804", - "sha256": "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki" + "sha256": "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd" } }, { @@ -20752,7 +20767,7 @@ "hydra" ], "commit": "79e422be55c72bfe36d2ec8a838f19d1cc8d101a", - "sha256": "14hb3d76y4n8qvfl74v9hzgl6774bqdcmsa0npv3gs144fbx9prk" + "sha256": "01zdha3p7wsf98yayvwgpd4arcs7yhz62yk1nyq9n13hvmqg7dvk" } }, { @@ -22238,16 +22253,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210706, - 604 + 20210721, + 1833 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "06606e0b8b3c19fbe56e25702e2a664deec593c3", - "sha256": "0akyzih955j2ijnrvfnajwpml5xb3v9pg9wbn4z8nkcw33hvxgk9" + "commit": "8cbb0457f3f35b3a1615eef176785aacdf5afe97", + "sha256": "1hxs2vdp0qvjcn32yrxxbqq3vgjb68fx0fqsqhh5x3cgvabcim0j" }, "stable": { "version": [ @@ -22955,8 +22970,8 @@ 20210715, 548 ], - "commit": "48bd29decb847bd9357aceeca9ad1c916f199913", - "sha256": "02fy271d8s77l2g4rykgpnqvy4sq2ri88xz97ink00r1r12cdvk9" + "commit": "07dd21abc029f50c6a3a96f2867d31102366faba", + "sha256": "0pvbvzdljxq7mjfsx4fcm3782wdawx2mgzi4hy7kvw7z80n9zm7k" }, "stable": { "version": [ @@ -24554,8 +24569,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210611, - 2249 + 20210721, + 2323 ], "deps": [ "eldoc", @@ -24564,8 +24579,8 @@ "project", "xref" ], - "commit": "5cc8df63d86a6c43134dd6e4e3ae26cfae14e66a", - "sha256": "0whplm1858d3mv4af6qk0jr5dk9ym1yzp4zsslrrfpyi54vy96yx" + "commit": "194b178ef41ccd3d937983f3829d44a546bb24d6", + "sha256": "12pmqq3l08p1vggbhccpg9bh0n78qrdmk5q30a1d4jrfkifcfbr0" }, "stable": { "version": [ @@ -26441,11 +26456,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20210716, - 1445 + 20210720, + 1520 ], - "commit": "7e0919bd74952fb229862f1280e01817721b7fc2", - "sha256": "13fjp20hf4jv3325ipnjrzqvxa122sfhs44dgsr52g9mkhhc6kbm" + "commit": "3cddc8bdcb0a05ecd308c310bcd020f7288af4de", + "sha256": "12xcra3a5bsihcfqs014bcayw0wmv5f22gdk6dipfx1pjygz1x1k" }, "stable": { "version": [ @@ -27031,7 +27046,7 @@ 0 ], "commit": "f0add6820d250875f7d7c21aa5d813dc73dbcf96", - "sha256": "18bnw6yb41ki1xvkhi07v7fqx3var928majgd6613ra9nirnyqnj" + "sha256": "0zg52b3hl0rp9hjz04546kngssxs0l64dm01bwp9hapy7pichbci" } }, { @@ -27114,11 +27129,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210615, - 1833 + 20210723, + 47 ], - "commit": "acbe1cba548832d295449da348719f69b9685c6f", - "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" + "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf", + "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha" }, "stable": { "version": [ @@ -27137,15 +27152,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210525, - 1515 + 20210717, + 1845 ], "deps": [ "consult", "embark" ], - "commit": "acbe1cba548832d295449da348719f69b9685c6f", - "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" + "commit": "c0a3e5398c3303d9336d3614ff8e2ce543501eaf", + "sha256": "18g86ymca74jkkrpjqxcy289rna968qrk4gpn09k52zf83xaafha" }, "stable": { "version": [ @@ -28333,11 +28348,11 @@ "repo": "alexmurray/erc-matterircd", "unstable": { "version": [ - 20210701, - 32 + 20210720, + 412 ], - "commit": "6e9698310f5df5193bccb334839bca29e4bbfe30", - "sha256": "0cwq1ljgb0ga1b8f8gks9c4y8rqjfawpr4l0fi0p3y674a76z33f" + "commit": "caafa1a62a76c2132d8b0872d57684f877608408", + "sha256": "0cba6wawwjmidpv1mccmrn2cr5xkyyj44aildifvyqay7nhldp3d" } }, { @@ -28367,7 +28382,7 @@ "switch-buffer-functions" ], "commit": "7539654e4a72edcc5bba07a101961e5bf0a9d449", - "sha256": "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6" + "sha256": "0pfnp7gw75hfhsy7jizp622s6yv61h3k2s0l2g33i801ar6abwm5" } }, { @@ -28699,8 +28714,8 @@ 20200914, 644 ], - "commit": "3543ef3df19228012a1ac5be766cc38fd2f65f6a", - "sha256": "0wlqrl8ikqc7q61i2qzmwp6h0mrv9kn5229pbsrb1ris7gxgi13b" + "commit": "286bbef128cb3194f8bd63cd5e497bea621c709a", + "sha256": "1i176damqxg0nqawhgr22ypzysnbk44aii0r81pl6zbwsvdxkqn6" }, "stable": { "version": [ @@ -28723,17 +28738,17 @@ 20210315, 1640 ], - "commit": "81c6d94625a04f6550e77a068489ca6378cabfee", - "sha256": "1kkjyradh316xcqsh9pn4l1nvz1krn8cm3zch0vfp47dkkg54w1y" + "commit": "4adbbaa681d902cc342f20c4e153d0cb6d866238", + "sha256": "01nq7qdmdpasvay3jg9kmg8wamvf37pwqcc37sfc85h81qf2rvc4" }, "stable": { "version": [ 24, 0, - 3 + 4 ], - "commit": "0a887ba078f6faadea128b51a98e928dcb0e79a4", - "sha256": "0hirfg5y53gj5smf2rqxiadj02ad761hgq3yqcz4j1ldnm50hlr9" + "commit": "c07336b844645f80430505194c01ffd59672804f", + "sha256": "0wy4fbflsm5sc1jjs6vf8ad0621q1m3vmfazz6jrg1s9llsxgr9r" } }, { @@ -29815,15 +29830,15 @@ "repo": "tali713/esxml", "unstable": { "version": [ - 20210323, - 1102 + 20210722, + 1345 ], "deps": [ "cl-lib", "kv" ], - "commit": "9f96449f6059cb75491dc812ddeb1b6200ec6740", - "sha256": "1xzxmgsg0j72sf1vjh9gjswz3c29js0kqhm7r3jrqrh3a5agdnml" + "commit": "701ccc285f3748d94c12f85636fecaa88858c178", + "sha256": "1ig5i3h5ldsdmxas4nvxrdbdmawgpa10kwq3mmzczp5qwp5a3vq8" }, "stable": { "version": [ @@ -30180,15 +30195,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210715, - 1839 + 20210721, + 658 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "070abb16620653fb343980fb85a13c4d55e1070b", - "sha256": "0pcr471snnmhycvvgczs1gbil45w6lf1bdmg7w19vh2a0dq4pqi9" + "commit": "5201f5cf5a4870e081d09bc3113a55cb94f3812f", + "sha256": "0i6b358vcsywx66fm5p4476rpy7bnl92zyjisb47kqlkznr3s25r" }, "stable": { "version": [ @@ -30382,15 +30397,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210715, - 1552 + 20210721, + 1454 ], "deps": [ "annalist", "evil" ], - "commit": "3bd5e90accbb3a12d924bb7b4220221493675591", - "sha256": "1nikhz4l01zi884dwyjfsaralc1pd6y70fvd36i4qn477xinsvk4" + "commit": "8d10ad4ea59752595de37a8ddc44e8d3fb14fe89", + "sha256": "18qkc3mbc8sr56823bpdr319dg2k2l29chk7c6zr5ln5jls08q8a" }, "stable": { "version": [ @@ -31083,20 +31098,20 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210624, - 1122 + 20210719, + 1305 ], - "commit": "118bebd02a489ddf5eee3ab6fb55b3ef37ebe6d4", - "sha256": "15phgj1x2k7i6wnhq3lbrjldrc7xr18z4sgsmklwwgr4blx9ql1s" + "commit": "2133167e0699f44fe37830839362e2e6793bce88", + "sha256": "0qrqpwnny7v4l8abf93c7l6dz7wkk1b8i6wv0fdcq6b7jrq1ixh4" }, "stable": { "version": [ 3, 5, - 4 + 5 ], - "commit": "b8ac35fe019df5602c31912f65303a3d8ad0066c", - "sha256": "1vyl8lidhjph7k86n8q09mwqpasaxsmwb8vi5i2gcd6klds9hg0d" + "commit": "8b0d9654ecf8f3f1d88db6be8238aaf76afa8a94", + "sha256": "1qrlg4cxlsd4cf1z8j2662pfb9p6pnqpsyb74flja9cqv6g5ylp8" } }, { @@ -31708,8 +31723,8 @@ "deps": [ "evil" ], - "commit": "070abb16620653fb343980fb85a13c4d55e1070b", - "sha256": "0pcr471snnmhycvvgczs1gbil45w6lf1bdmg7w19vh2a0dq4pqi9" + "commit": "5201f5cf5a4870e081d09bc3113a55cb94f3812f", + "sha256": "0i6b358vcsywx66fm5p4476rpy7bnl92zyjisb47kqlkznr3s25r" }, "stable": { "version": [ @@ -33084,14 +33099,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20200129, - 1933 + 20210720, + 1833 ], "deps": [ "popup" ], - "commit": "158e1e54055cafe5da9122a59519e8b3ed1057cf", - "sha256": "06616lzvv6vdc2i37gy47zw3rb4yjml83vn5py2k30ck8gl4fhs2" + "commit": "1096582f68cda91fe9d9336756b7c044ab0d6096", + "sha256": "0qp1nqcni5a3m9iaqar07sii6mpcnnqxmaf5n2fpz1iaz6bwsxva" } }, { @@ -33478,11 +33493,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210713, - 2129 + 20210720, + 1516 ], - "commit": "0f83112e70c1cd13a8b98e9e75b2291fcdf3d57f", - "sha256": "1n1f9bn8447aq3666q9lj7idzj9nwkmknfzybk3is98m03cjki3z" + "commit": "12bdd8ee09ce2ba7c232df96fb199461d25a89c5", + "sha256": "13fyadml9wa30f4brdwfnby067q6bp2dl1y6x7hz0pzzlbk4sbs5" }, "stable": { "version": [ @@ -33491,7 +33506,7 @@ 0 ], "commit": "ea8564a2cc4f7e10b3fc13faf26a4f098b159f00", - "sha256": "1qnmcysrl2zxiid4v1h1hq1nax3a7sxs2dmag54sfifm149lf7f3" + "sha256": "03z3f60qsn6k9wg1km49ad4xlwp82114r5pzibnxly2n0vmmdsyb" } }, { @@ -33819,11 +33834,11 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210427, - 1205 + 20210720, + 244 ], - "commit": "680ec93808176442a2c78b91b18bb4256d81d340", - "sha256": "1af30i3nsms1s2gwq3wx0xbmjxd95hipai63icw3jpwc3pmw3g2n" + "commit": "cde02e549512742366a91ffb70c86c354117cfde", + "sha256": "1xkpyn5lh6nhsmnq50174lnir9c9xhwb9ihvj0lw721s57xq3aa0" }, "stable": { "version": [ @@ -34158,7 +34173,7 @@ 4 ], "commit": "ba63f0591c3be1644ee7ee972430c74b5d346579", - "sha256": "014vbzxz1jmm83a5mg4zsyxm8nw96n8s2l7h3myhrn880d9xnqgg" + "sha256": "1yjfvb2vn5pmrq5fw4sfx1lfkbnkwlc160izpvkrf9ww9xsas6al" } }, { @@ -35013,7 +35028,7 @@ "flycheck" ], "commit": "b4ffad5cabea7e858c66dc824d545653b1cdcb70", - "sha256": "1la7qhczg9bgs1klinwj21mjywsg1nm3sxd5cyc09bxjzbflzzz6" + "sha256": "0ggq4q2c1xi26m4rlvjm8f51wlj7h351pp6m20k6l25856858vhi" } }, { @@ -35789,8 +35804,8 @@ "deps": [ "flycheck" ], - "commit": "061ce63d217b7cd165c487d81331843dea5bc11c", - "sha256": "088g4vi01xanjm5dyzlw483h8w3dyijjccla37zfa55cg0nksdd3" + "commit": "59b37e09923290da1c8458e507da43f403f555d2", + "sha256": "1l0rq2g9dn90xr75cjz64cyai90m5cayr2b2fdrkkrz70g00pqlr" }, "stable": { "version": [ @@ -36052,7 +36067,7 @@ "flycheck" ], "commit": "54744a78d06373404933fedc3ca836916e83de51", - "sha256": "1zdvan6l2s97s7swnccq21z1ja8vl64l757j3hg50ipq8j5yy9dl" + "sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd" } }, { @@ -36985,8 +37000,8 @@ "flycheck", "rtags" ], - "commit": "65113e2a137baa9f85dc2157b893291470788dc4", - "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" + "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", + "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" }, "stable": { "version": [ @@ -38536,11 +38551,11 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20210124, - 1143 + 20210723, + 505 ], - "commit": "404233604439117301562deadc952fe82cb02120", - "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" + "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", + "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" }, "stable": { "version": [ @@ -38567,8 +38582,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "404233604439117301562deadc952fe82cb02120", - "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" + "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", + "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" }, "stable": { "version": [ @@ -38599,8 +38614,8 @@ "flyspell-correct", "helm" ], - "commit": "404233604439117301562deadc952fe82cb02120", - "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" + "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", + "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" }, "stable": { "version": [ @@ -38631,8 +38646,8 @@ "flyspell-correct", "ivy" ], - "commit": "404233604439117301562deadc952fe82cb02120", - "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" + "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", + "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" }, "stable": { "version": [ @@ -38663,8 +38678,8 @@ "flyspell-correct", "popup" ], - "commit": "404233604439117301562deadc952fe82cb02120", - "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" + "commit": "f9b57ea42938e272d9b7ac90d62c5496694ece00", + "sha256": "02vr4a0489l9kig9yypwx59dbaz44l2qi0akym1r5nsh4gmx9hsh" }, "stable": { "version": [ @@ -39350,14 +39365,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210611, - 1228 + 20210717, + 906 ], "deps": [ "seq" ], - "commit": "ede8a254fe1bfb125b52ea71252b863cf80eee18", - "sha256": "0s2qlnx5lq5ni53r0i4fja6qfxxbg6apq5madgkiyz5d1bay551g" + "commit": "d2e0cb8f328a1219a3830f82fd01e789cac398b2", + "sha256": "04a5mwlxq43mk132j7v4gx9jiss2pah38rgk0dsc6pn00xjf4j9q" }, "stable": { "version": [ @@ -39974,8 +39989,8 @@ "deps": [ "cl-lib" ], - "commit": "5b1c814d84714b0c94c5a7b4aeb3f44d2a4d5998", - "sha256": "1sw7abwli4hjwbyqmkc8vfg4sgil59gkygvk3f4p6gdihnfqynwp" + "commit": "d9b6d549251d4a1a7cec2e83b11bda2ef7ff4ed2", + "sha256": "0246kl945g5v539h1hvwg06jsmj10a4q8rld3g6jix2iy1jmnfw7" }, "stable": { "version": [ @@ -40586,7 +40601,7 @@ 16 ], "commit": "803dfeb9414ed7b99c5d567170f32c97cafa1114", - "sha256": "16jqni4s2yxszhkbb83fkgflygbxzx01cmq2qq40p4ihbvwm0gb0" + "sha256": "0s02443pxi49c8hmkk3g489ngb5bl95inraq3jabb6dh7gyxgkag" } }, { @@ -40873,7 +40888,7 @@ "geiser" ], "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981", - "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07" + "sha256": "1dyzpr9i5pxi2p2hg3ndryh7x4y0r9bra88pd1l904vdfsxdxv5z" } }, { @@ -41367,8 +41382,8 @@ 20210401, 656 ], - "commit": "8ab9c88a2b8cccd3c092e155f84b1b19930d0719", - "sha256": "1jiglrlhrph57p5kkm1qlqihwl6z7h9qh16qmmd5783ynksnbxp3" + "commit": "5517a557a17d8016c9e26b0acb74197550f829b9", + "sha256": "0n0gd4k1c1s8xj7p1yg7irnkaxw9f91jmjp5www5hrwhi3mbmpb8" }, "stable": { "version": [ @@ -41376,7 +41391,7 @@ 2 ], "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", - "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh" + "sha256": "1jiglrlhrph57p5kkm1qlqihwl6z7h9qh16qmmd5783ynksnbxp3" } }, { @@ -41675,8 +41690,8 @@ "transient", "with-editor" ], - "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45", - "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5" + "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8", + "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r" }, "stable": { "version": [ @@ -41726,7 +41741,7 @@ "s" ], "commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40", - "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5" + "sha256": "02hag6jd55mqf0n90p0hvihmqjvd0cdlpm5knsxk3cll7fp0kkkr" } }, { @@ -41949,7 +41964,7 @@ 0 ], "commit": "ea49e2e005af977a08331f8caa8f64d102b3b932", - "sha256": "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv" + "sha256": "05bkpg7xz8644np9imsj5ms821sbsb784ap5fjdnnn69kllz0d33" } }, { @@ -42089,7 +42104,7 @@ "transient" ], "commit": "391eb61050de321101e631fcf373fc70ec6e7700", - "sha256": "1pz4l1xnq6s67w5yq9107vm8dg7rqf8n9dmbn90jys97c722g70n" + "sha256": "05pyjhi26charkjy0mhvigd72rvb4s1s8imycfynf0fmjy7f7n7x" } }, { @@ -42617,7 +42632,7 @@ "yaml-mode" ], "commit": "2651e831aed84ee2512245952fac94901b086549", - "sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59" + "sha256": "0yd6s5vy5afkigm87xyh1nnwljplx1wdn5h02224ica0py48fzhd" } }, { @@ -42648,7 +42663,7 @@ "gitlab-ci-mode" ], "commit": "30ea0eab74b24818f187242b079845785035e967", - "sha256": "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798" + "sha256": "1w1simnlffg56j79gal1qf1nlav9f8fmr2zfswfrmcv6cac6fhj9" } }, { @@ -42710,7 +42725,7 @@ "helm" ], "commit": "5fe0a66642da6f4e7ba9e1e3a96572c7f1876e37", - "sha256": "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga" + "sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w" } }, { @@ -43171,7 +43186,7 @@ "gnus" ], "commit": "210c70f0021ee78e724f1d8e00ca96e1e99928ca", - "sha256": "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw" + "sha256": "0h7w5wrkrd0jw8nmgbkzq8wam7ynvy7flhjg4frphzmimlhysli2" } }, { @@ -44218,8 +44233,8 @@ 20180130, 1736 ], - "commit": "4044bbd5ca4434b8cecd23a4da8ae173c1e0d58e", - "sha256": "0nym4c4j0awxzpj2qkds1fxppc7jzzazwj0j8qx6vr5yfp7iry51" + "commit": "d88a5b7b59948d23977942ee62037e8912ff68ce", + "sha256": "1k29za2g3b10jy3nlkg09h5jn8d25w9yghrmz8cvm8zghxkqi2m7" } }, { @@ -46000,7 +46015,7 @@ 5 ], "commit": "fd37f013c2f2619a88d3ed5311a9d1308cc82614", - "sha256": "196ydb57h4mjagjaiflvb20my561i6mdc6v6694ibdik2yns2inm" + "sha256": "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f" } }, { @@ -46638,8 +46653,8 @@ "helm-core", "popup" ], - "commit": "60db46905443c87f324440202bd0735d57c5c201", - "sha256": "10rkyy63vqqf9s4i8rs409d22iwhxrhz3qikagmfyvvr1n6czcnp" + "commit": "f6cf6078a745ec6ab313dbe98097e3bd5cef0a8c", + "sha256": "1h00ay4jjzkvkv5wh9cnd187c3ix8rixasl3wl6ilbilvx1pwv37" }, "stable": { "version": [ @@ -46932,8 +46947,8 @@ "cl-lib", "helm" ], - "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", - "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" + "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590", + "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h" }, "stable": { "version": [ @@ -47101,8 +47116,8 @@ "bufler", "helm" ], - "commit": "d466eac6c4b2ee25c765e7f31e44beb38dd44e4b", - "sha256": "00gyqpm0g437z71vbfd4kmih23vh6909dvygng133vxzly9k4f24" + "commit": "b951e621bc4a4bb07babf8b32dc318d91ae261c9", + "sha256": "14d2mcx6ppjzkpv63m7iir0j2dn549gkxr30bxx8qvc1v7r7r6wn" }, "stable": { "version": [ @@ -47538,14 +47553,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210714, - 1600 + 20210716, + 1933 ], "deps": [ "async" ], - "commit": "60db46905443c87f324440202bd0735d57c5c201", - "sha256": "10rkyy63vqqf9s4i8rs409d22iwhxrhz3qikagmfyvvr1n6czcnp" + "commit": "f6cf6078a745ec6ab313dbe98097e3bd5cef0a8c", + "sha256": "1h00ay4jjzkvkv5wh9cnd187c3ix8rixasl3wl6ilbilvx1pwv37" }, "stable": { "version": [ @@ -50380,8 +50395,8 @@ "helm", "rtags" ], - "commit": "65113e2a137baa9f85dc2157b893291470788dc4", - "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" + "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", + "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" }, "stable": { "version": [ @@ -53139,11 +53154,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20210525, - 2259 + 20210721, + 2022 ], - "commit": "9b4587417f2583c503f84f3b1e994d7934e57bdd", - "sha256": "1dpanfa8qpy9l2i2pw5w95lqsw06944qbcz8c9fgpj2s3nchhkpi" + "commit": "d140638360a3eb1bf8f17877bd888f898df63ec0", + "sha256": "1lybjbbcjsry20p6jzmkg2h7am7hcgfhjkdmby9pk4whnhk9l4lh" } }, { @@ -55197,11 +55212,11 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20210629, - 40 + 20210722, + 1310 ], - "commit": "ec87ecaab5a10e79034f77d553e7fefbf60b9f97", - "sha256": "1p6r0iwqcaf9bp123ccwafmzlf8hgwvap0cqwgy33cks6bhcbzb9" + "commit": "59b7126540bb848d3a38ccff71e85f3cc0cef39d", + "sha256": "1jdc4daydjzrmk07b8a45adrwjaifnwyn9gfi16yl7bn3wx6zcvq" }, "stable": { "version": [ @@ -56481,8 +56496,8 @@ "cl-lib", "swiper" ], - "commit": "9f6ea920a49457d85096caa0e61f086a42b2908e", - "sha256": "0dqf2anmjlgcz7xn4q2pw8cfmhwdhdg4fm8q41vhrp60ymbc6dik" + "commit": "a0d32ab16748b7b0c43d6421f1b497b7caf8e590", + "sha256": "0a0mn41lvqjx8rdrfgff5fjs757nin30caap7ciapnvr18g9mh5h" }, "stable": { "version": [ @@ -57024,8 +57039,8 @@ "ivy", "prescient" ], - "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", - "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" + "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9", + "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h" }, "stable": { "version": [ @@ -57116,8 +57131,8 @@ "ivy", "rtags" ], - "commit": "65113e2a137baa9f85dc2157b893291470788dc4", - "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" + "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", + "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" }, "stable": { "version": [ @@ -59056,8 +59071,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210715, - 1359 + 20210722, + 426 ], "deps": [ "dash", @@ -59066,8 +59081,8 @@ "spinner", "vterm" ], - "commit": "a71a536fc1f194bc329e2c33eed5eab542c00cab", - "sha256": "0cnhv37m8hcl3lfbiivy3yk338x60q8fglm5nibhfr55ln52jjc4" + "commit": "e4035da5322b9528b9751a0305a0feaa28e181fb", + "sha256": "1rpcsw7ddg7cs5mha7sn4j719rkvk04vwsri1y6d1c80y2fdlr10" }, "stable": { "version": [ @@ -59828,11 +59843,11 @@ "repo": "Boruch-Baum/emacs-key-assist", "unstable": { "version": [ - 20210415, - 227 + 20210722, + 758 ], - "commit": "fae7ce265db3bcfd1c6153eb051afd8789e61a4b", - "sha256": "16gi43wgqqjqljnmjwap8lng1p4davv8prvpip034qw9v6vjmm2p" + "commit": "8e5cd089e0b2fedec57c55eeff74cdb6121441aa", + "sha256": "0lg8v6lsa62zhnlrz47hlda65ra6yfqijgz4jcl5vxcx2hgks8g8" }, "stable": { "version": [ @@ -60460,26 +60475,28 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210219, - 51 + 20210723, + 443 ], "deps": [ + "elquery", "request" ], - "commit": "0c5e1619f079df822686cf42af5859111b6afd44", - "sha256": "179wsr1ffsl4hm4vnb0zzbw338jni5pz8ndgkfq21jppgzk8mlna" + "commit": "c0c597d1e1653112f3e10c67dcc22d85beb2aed8", + "sha256": "1k056qzw3a4i4icyrl1a0dv971jnl5d096hawj5qhgwslplrhdpj" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ - "cl-lib" + "elquery", + "request" ], - "commit": "c662f3dc5d924a4b64b7af4af28f15f27b7cea1e", - "sha256": "0i11sfnqvjqqb625cgfzibs6yszx891y4dy7fd6wzmdpclcyzr8z" + "commit": "e191c312e5c9343fd9601c45a8ccd017479ee475", + "sha256": "1lsbd2qjmpbk474n19s9mq2n1i5sdg6jrnbpja6vdmn3a28c5wj7" } }, { @@ -61247,26 +61264,26 @@ "repo": "PillFall/Emacs-LanguageTool.el", "unstable": { "version": [ - 20210621, - 453 + 20210722, + 702 ], "deps": [ "request" ], - "commit": "feea3f9271ce920490a0d9dcd11e669e3eaad1d0", - "sha256": "0vxq945x1yn86kpw7qbb686vb3pzyk7wma8g0dbval2m4hsbrn26" + "commit": "d3665a97cc87577f434a7476e1194b43f35408a8", + "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "request" ], - "commit": "feea3f9271ce920490a0d9dcd11e669e3eaad1d0", - "sha256": "0vxq945x1yn86kpw7qbb686vb3pzyk7wma8g0dbval2m4hsbrn26" + "commit": "d3665a97cc87577f434a7476e1194b43f35408a8", + "sha256": "0gpnczvdwrcvvd162mi9nf55b0vzbpfmbhan1bqzc84rbjw0bzql" } }, { @@ -62420,17 +62437,17 @@ 20210303, 1751 ], - "commit": "4a785dbbf4f906584716bb14c92230beda5081ed", - "sha256": "0vkqp8ck21hhwfnfvmxfwrb3dnkqk4072n4jr7w6ivvhs555srdd" + "commit": "3603e4473ce9f81c5d73ba623c1938e152d03723", + "sha256": "1s1wsz8w7i1p509dqvv0ykljlqlr56203k4lrc542vjdnj4ih4z4" }, "stable": { "version": [ 0, - 20, + 21, 0 ], - "commit": "89c2f0ad779b8d15581a3607beb55855b0da8737", - "sha256": "0vkqp8ck21hhwfnfvmxfwrb3dnkqk4072n4jr7w6ivvhs555srdd" + "commit": "ec88b4d6b430338a1a44a04dca1642fdef15641f", + "sha256": "02n5yc0nqckfpfxkw8gxigg59769alxvk043c2d9bxgm79zxvhhy" } }, { @@ -63589,6 +63606,40 @@ "sha256": "0bnkc6smvaq37q08q1wbrxw9mlcfbrax304fxw4fx7pc1587av0d" } }, + { + "ename": "logms", + "commit": "bd2169076b021407552523282ba1df0ae1aec311", + "sha256": "1jrqya88ii3l4p9044w8x9nbnfm7gpw9kq0ycsclwyap3n71fm0r", + "fetcher": "github", + "repo": "jcs-elpa/logms", + "unstable": { + "version": [ + 20210721, + 349 + ], + "deps": [ + "f", + "ht", + "s" + ], + "commit": "497eb1fa71340a8d7758dd7c8115de05ab452129", + "sha256": "1c5psadb590wbcqab0bjdfdsfd3rninbahr42pbi8gvdg0ay9qws" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "deps": [ + "f", + "ht", + "s" + ], + "commit": "68bab96a13d64efdf4f5951d931d0862e6861fb5", + "sha256": "137z22qyfz0d58iqb8w3lcz5cr2ddi0h2xdns90r979b68lhsj56" + } + }, { "ename": "lognav-mode", "commit": "a5b0dadc609d13737d56657c17a945f10e840222", @@ -63924,8 +63975,8 @@ "dash", "lsp-mode" ], - "commit": "49a6bab0b1ad88d220305dbe3a0a14d368f62354", - "sha256": "1i3gywik5m9j797c69ng70bs28qdww9662sjl6y232rw19rya93b" + "commit": "7039afe9507467e0b1c1fba485f26a7892463bc5", + "sha256": "1f0k76ic6cv6kdszy38jfi5wbv1i9qqp3gnn63j4p0f0xj0ppsgw" } }, { @@ -64306,8 +64357,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210715, - 1320 + 20210721, + 511 ], "deps": [ "dash", @@ -64317,8 +64368,8 @@ "markdown-mode", "spinner" ], - "commit": "cd47168035c98c6ebf9177705b9b7da53fcc9f5f", - "sha256": "1q1isn2g09pdczqdvbk5hjirym6106ip1z6klg1m2d5b9d8vx0l2" + "commit": "ac3b7e6efd1f8d4bb92aa4d89fc361fce3208c46", + "sha256": "1gx5y9j259q4iqnp7b58958wnpw8l3fdcs88zx38252givf814nx" }, "stable": { "version": [ @@ -64474,8 +64525,8 @@ "ht", "lsp-mode" ], - "commit": "71a79760938d2132923fbff58dc25301892b1654", - "sha256": "0si9qca8lml2hd8zj420dmks4cwzfidq14h3xfczhvrshhsc0mny" + "commit": "9a0637e59d2a08a66c49fe8cda708e995ec156ed", + "sha256": "1jcf4jzsw10z9068xm20r7qdspd9yxhswpm0jjsm9rcypi2vm78r" } }, { @@ -64492,8 +64543,8 @@ "deps": [ "lsp-mode" ], - "commit": "4eb78c43046fceb53a66ccd24c85601bdb87ed17", - "sha256": "10d949gb3v7flnkb5khk11dcmfnlr4h02yfj8g3b0ihr1zr7c958" + "commit": "4f2ea975c3199c0e8e35c0b1e9778cf1ed6bd9c2", + "sha256": "1hmdayrmxw979vigx1z6mlpzb5dwblx5c1f2k3ysms5didznlmcf" }, "stable": { "version": [ @@ -64643,16 +64694,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210708, - 134 + 20210718, + 1626 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "1ee371765612b7aaa6046aabdc2f65bcfcb93b11", - "sha256": "051hc6310zzn9qpvd9k8cj7ibzsk1k19l2485c5wra0fvm2lfa6x" + "commit": "4283414de69312298d51b03e938d95d37d238391", + "sha256": "08wqbwxwapi91mj94mgqy02bjz512sj3nwv77b067xqchz5yv6q5" }, "stable": { "version": [ @@ -65006,15 +65057,15 @@ "repo": "nbfalcon/macrostep-geiser", "unstable": { "version": [ - 20210324, - 2141 + 20210717, + 801 ], "deps": [ "geiser", "macrostep" ], - "commit": "8600fca05fd12a2e0ffe63238ddbfcb37c285dac", - "sha256": "1912hxbb7mbra91vjw1fnzbb4fd9ri59lc1hcrw196c7a4hzgv0y" + "commit": "f6a2d5bb96ade4f23df557649af87ebd0cc45125", + "sha256": "0dykvwcvg8n24z3fkx6rv3l1mhzmca4cxj0gsvvqsg9wp0az1fc7" } }, { @@ -65130,8 +65181,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210716, - 1440 + 20210721, + 1556 ], "deps": [ "dash", @@ -65140,8 +65191,8 @@ "transient", "with-editor" ], - "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45", - "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5" + "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8", + "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r" }, "stable": { "version": [ @@ -65487,8 +65538,8 @@ "libgit", "magit" ], - "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45", - "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5" + "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8", + "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r" }, "stable": { "version": [ @@ -65655,8 +65706,8 @@ "deps": [ "dash" ], - "commit": "bf9cc19a3287f6a3cc5c1836312f0d18b38b6e45", - "sha256": "0zjcvhjp4c01ibb1hshpqkib7fvjkmvh9xf06qfsm5ybdc04xik5" + "commit": "0ea7868e368864da4604eaafa7dd332e70584cc8", + "sha256": "1np7rvp1la2l8gb8rkyjalgrhsk2zc9a9chdadx06769z16fbr2r" }, "stable": { "version": [ @@ -66450,11 +66501,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210716, - 1252 + 20210721, + 2100 ], - "commit": "b5893884abeb6a355233edf54e0f63d04bc32ce2", - "sha256": "0cjabw0ia9rnb3idmv9s6i4izgklxkiax8zn5xw1c6n8ls5iwbqj" + "commit": "a3a8edbf25db4b1e167f1fdff6f60a065d0bf9cb", + "sha256": "0a4ra9fwyj5av4cjyj1y1y1z1kr6dnq39hhf51c072zqw3k3jar9" }, "stable": { "version": [ @@ -66570,11 +66621,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210710, - 1646 + 20210722, + 839 ], - "commit": "359347b2bb15f8d7ef819692ac79759ccfe2c85d", - "sha256": "1naqcg0a5shzcg0rlqs6w5mlr7sn0b8b2hmhs07qawvpxln8j628" + "commit": "f3c4fd9230252503e3a9f2de6f5d469c4ac270ae", + "sha256": "08snhqw9kyg8vdaz7ibga0pf2j5cg1akjiphs88dgvxkph8m65nr" }, "stable": { "version": [ @@ -67074,7 +67125,7 @@ "test-simple" ], "commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d", - "sha256": "17m9x3yy0k63j59vx1sf25jcfb6b9yj0ggp2jiq1mih4b62rp97d" + "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" } }, { @@ -67511,11 +67562,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210707, - 901 + 20210720, + 950 ], - "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658", - "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l" + "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78", + "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x" }, "stable": { "version": [ @@ -67543,8 +67594,8 @@ "auto-complete", "merlin" ], - "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658", - "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l" + "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78", + "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x" }, "stable": { "version": [ @@ -67576,8 +67627,8 @@ "company", "merlin" ], - "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658", - "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l" + "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78", + "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x" }, "stable": { "version": [ @@ -67638,8 +67689,8 @@ "iedit", "merlin" ], - "commit": "7c4c0a7018109b2b1bcbc3f6c1486961b223e658", - "sha256": "13cissjjkhfab7sgmwwmdcl3d5kn3qd2d6w9nmcw0yb8c59r1c0l" + "commit": "3442c5f32498d566b9cfbe0f503eb4304820ca78", + "sha256": "0hh5qb3327n4zmb41aggb7q9468ixsda17bkj73qnc8afhfm4m6x" }, "stable": { "version": [ @@ -68534,7 +68585,7 @@ 1 ], "commit": "beb22e85f6073a930f7338a78bd186e3090abdd7", - "sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74" + "sha256": "1yf21gm4ziplmgx8yn7jqq45mwfiindbrman7fc5b9ifq78x9ryn" } }, { @@ -69029,11 +69080,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210716, - 431 + 20210722, + 1916 ], - "commit": "9521dcec6c012d3776e3d05692720dd24922218b", - "sha256": "1m5ifpql8p0w4qk79n2n8wyrq1s7ys0yc8y0a09w1yyxjk6ay12k" + "commit": "fd61a0c67ceafa3aeb0aeebddb93955148376b7e", + "sha256": "0l9gfq4qapa5snskb747jydprb0xvn80rjc83da1vwh4j8s3gavz" }, "stable": { "version": [ @@ -69042,7 +69093,7 @@ 0 ], "commit": "b6fb7cda01a665f9369f2c6a29f3bf26c8cc8019", - "sha256": "1m5ifpql8p0w4qk79n2n8wyrq1s7ys0yc8y0a09w1yyxjk6ay12k" + "sha256": "1yz5yr3acc601xcms7vr2jbj4bq6dqz8n5ymyfyxldid0n5ykzy4" } }, { @@ -69735,8 +69786,8 @@ 20210306, 1053 ], - "commit": "515b4f47c7f43816fce82cdf555107614e9e7edd", - "sha256": "1q39iy7g4f11nzhlsa1j8shrvhmg3ip2h43rxawhmypfwd95vzk1" + "commit": "d08f2a8d96af3ff80aac0e5641d9d20281084038", + "sha256": "1dbpy2bw131g5d166dmw5m4zq7y6h3krm7k1lv33cnbss10kj2fl" }, "stable": { "version": [ @@ -70334,8 +70385,8 @@ "repo": "mihaiolteanu/mugur", "unstable": { "version": [ - 20210503, - 1516 + 20210719, + 722 ], "deps": [ "anaphora", @@ -70343,8 +70394,8 @@ "dash", "s" ], - "commit": "b84752c391c5fe515960f77c80d08f313df57f33", - "sha256": "0la8lqr3wgizmnwnpys9mwrj1qi0al0gx6kxhlfwf9jr5gbdg9np" + "commit": "63a0377ac1ad48171621c9f0c719b62ec9395d35", + "sha256": "180i7igzqv5l22vk6n96g196mnd50lgwcmjkmzwlwdxn4jsgvjbv" }, "stable": { "version": [ @@ -72360,16 +72411,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20210219, - 1948 + 20210716, + 1030 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "b5a221b63c8b311d50807fdfab4ae6b965844f06", - "sha256": "1lq3rh52x0f059lxk0cczins2vggiwjs5m1drj7dkb8lmlxc41y4" + "commit": "50a6a7a58bc0316a9acc2b972380692f7438d9ed", + "sha256": "0q86wzl4va5xjj7czh6ldypwgb09gv8gp7kqi449bhx984a1yq7n" } }, { @@ -72664,7 +72715,7 @@ 0 ], "commit": "7825f88cb881a84eaa5cd1689772819a18eb2943", - "sha256": "009did3i3i8yi0virq606l02w1mw0gdyiqablqg7m368gx0gfvh5" + "sha256": "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs" } }, { @@ -72758,11 +72809,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210713, - 1255 + 20210719, + 1132 ], - "commit": "d8a5fba4fe1efd7d0d652ead6d55371bc4078a9d", - "sha256": "138wxhawdp8nllpvmrgll4nvn5by3hsp0zy4gywf6nalr0d1wdld" + "commit": "bed62eb8bee4aeca1fabfa5e302b515849f50b31", + "sha256": "00mixvwwhrmmr7wcscyzdhwhbnfiha0b0lcx1f3zk5xyshll2y9n" }, "stable": { "version": [ @@ -73123,20 +73174,19 @@ "repo": "joostkremers/nswbuff", "unstable": { "version": [ - 20210129, - 850 + 20210721, + 741 ], - "commit": "2aa3a96abbc76f007923f3fbb19a5246e29ae500", - "sha256": "0lhl49cs0sdr7p22spxf83sixp1pzjiq11plmxc8i0lqv735b9sn" + "commit": "fa9dcf131697ea7af066e11a1edcc881c397e07f", + "sha256": "0bkx7mwy3zbb0ixawvn4cysxk3jjc7ahssvdprvw19ls9xx3wbsp" }, "stable": { "version": [ 1, - 2, - 1 + 3 ], - "commit": "71e241763ca0a4a1d1b432e172d46bed4f44dbe7", - "sha256": "1sswhr52rp8c4v4fv30sww1gadbdrlk3l35j8xmqfw6hbgzxb5dn" + "commit": "fa9dcf131697ea7af066e11a1edcc881c397e07f", + "sha256": "0bkx7mwy3zbb0ixawvn4cysxk3jjc7ahssvdprvw19ls9xx3wbsp" } }, { @@ -74179,14 +74229,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20200316, - 759 + 20210718, + 2008 ], "deps": [ "restclient" ], - "commit": "0ebfc7c5ebf96d2fe1a476439831363a5a43b9b6", - "sha256": "0sc6rljlzm7g4v4l4ziqrr0ydbsyypbq0h19f9xafvnb2pn40j84" + "commit": "bfbc4d8e8a348c140f9328542daf5d979f0993e2", + "sha256": "0nq5w2gankvb7ix8rv33814j7qvhiawd9r15b9i6syn1i5k5pxhj" } }, { @@ -74579,8 +74629,8 @@ 20210617, 1726 ], - "commit": "ba67af28ddca8718ef8816b2b0dc1e5b2f5e9591", - "sha256": "0dp4pkznz9yvqx9gxwbid1z2b8ajkr8i27zay9ghx69624hz3i4z" + "commit": "121f3913f5dad7468b33d4a5ca19e7a687d2ecfc", + "sha256": "104jaqllwzcikk17iajgnjnnqchgivj210mhrx07qrk5vy5qwv5d" }, "stable": { "version": [ @@ -75520,11 +75570,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210613, - 1723 + 20210721, + 2059 ], - "commit": "2646dad28c0819fbe9ee521d39efb9ae40e03982", - "sha256": "0vxfinsx69fqpcgbsv6g26klim3yasds3ha9v3xkk32y9sb783lr" + "commit": "1e84120a28525ccb47b602fc19b7afbeffbbe502", + "sha256": "13smhq5yh5awfqfn3739yw19dxdkqz5fbbczvv8kxf70skjxb9bk" }, "stable": { "version": [ @@ -76399,7 +76449,7 @@ "seq" ], "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4", - "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy" + "sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3" } }, { @@ -76966,16 +77016,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210622, - 130 + 20210719, + 2242 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "f4599dd5dfd7f97a22ca98502f809a8d14551c09", - "sha256": "0i8rqila62qamv3mxh66g678kbang3sxjbf3x70nmrx7fyy2m2jv" + "commit": "2ea00944a7426012cda95cede99e49470f1383aa", + "sha256": "179h5j0k79hbbxz2n3x6hm1v2ws9qii6n8zx4800avbq1fgsh792" }, "stable": { "version": [ @@ -77373,14 +77423,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210518, - 2355 + 20210716, + 2237 ], "deps": [ "htmlize" ], - "commit": "4c92c627b6cfb234fd257b714a5dbfc72d7af8d2", - "sha256": "0mln6324jb8p77pkbiaflmdj8h9m9wvmabgadhi6kh2jp4dhijql" + "commit": "7cedeeece58879e05d3a3bab8af1385006f234df", + "sha256": "0gw34smbw9v0f3xwjci7zsj8hbnqd54yzbph6az65r5634nqhiv2" } }, { @@ -77829,7 +77879,7 @@ 2 ], "commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77", - "sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii" + "sha256": "0ksj6hssyr44qnvb32qj9lrq825ivvndhck9gzx4h7gbxmvq12a4" } }, { @@ -78090,7 +78140,7 @@ "org" ], "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", - "sha256": "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh" + "sha256": "1lfvhc4gly06rq5i2fgjydg4rsy7vgksa8hpydsvklr0ypvc1hcc" } }, { @@ -78122,7 +78172,7 @@ "org-ref" ], "commit": "abcd622e4edaa5e4480bcd1e7e4953f67c90e036", - "sha256": "08ia6gn0x0yydl28dhghifyxz0mrn0asllqg4s449gaz729cxqkd" + "sha256": "1467vskijg2n8k7fa2jj2hz8xr2s04r8a89521wmz54cza21g5j4" } }, { @@ -78344,36 +78394,36 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210609, - 1221 + 20210721, + 1746 ], "deps": [ "dash", "emacsql", - "emacsql-sqlite3", + "emacsql-sqlite", "f", - "org", - "s" + "magit-section", + "org" ], - "commit": "756f6215b672e267f986a3d6e494f5309825b91a", - "sha256": "16rjqzj872y1240w15gawxcwj5gg1cds162wq1hswzplmx8wp9d1" + "commit": "9c10a3c04c06d1658a63d44927e385e2d97854d6", + "sha256": "0kd7wkd6k37ahsgmcjcs0msp02x6vfkq8gdih210yp2w6vz10hhy" }, "stable": { "version": [ - 1, 2, - 4 + 0, + 0 ], "deps": [ "dash", "emacsql", - "emacsql-sqlite3", + "emacsql-sqlite", "f", - "org", - "s" + "magit-section", + "org" ], - "commit": "9065f6a999b98d4b495e3d8fa1fa4424eddd25a8", - "sha256": "10jrnjq65lpg1x8d7lqc537yai9m6pdnfbzwr87fcyv6f8yii8xn" + "commit": "3a78422a099261317d369be58947f4d4b3df1da3", + "sha256": "0mslrdgd41czay3w7znz4qsv1h0p3zqfsq6bkyxmxfyd2w5z82zf" } }, { @@ -78384,31 +78434,30 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210602, - 2113 + 20210720, + 1306 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "c9865196efe7cfdfcced0d47ea3e5b39bdddd162", - "sha256": "0c9y76r1bagz39m74kb2jcxqsc2q461407bbsib3f512sdf93lyg" + "commit": "13de4262d87debdbc43f8e2bd72b991b7284e705", + "sha256": "0iizd5vzxxl7fsm7k4y7dwisipsqwc3xqn33nk8r4c182mga3d9c" }, "stable": { "version": [ 0, 6, - 0, - -1 + 0 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "03b3a843fdbba428b29faa932661bc74fd66e29b", - "sha256": "17ds31cdq4prlknbjhhcjz17sim26yx8iws1scg4xcffxnb1s39r" + "commit": "eea7469fc32eddc9d74621b7ecc1f36832b7efd3", + "sha256": "04vc2w7x2lyamp0qa1y274smsf9x2qxr1igrpz9f4y5ha5332px5" } }, { @@ -79941,11 +79990,11 @@ "repo": "tgbugs/orgstrap", "unstable": { "version": [ - 20201129, - 604 + 20210722, + 737 ], - "commit": "5bd7ee9d9e23ce37fd004054071026ff51445654", - "sha256": "1qblj2m7bhykm58i63r5ywvpz6hr0vyzx7fa0s6rwlkjzbdn77g6" + "commit": "6f3ab471da576938d8200ce600fbb02dcb947f16", + "sha256": "1f8dspi9xizrxylff2zllwzz9lzrg3wr9cx0d5qzs74bs685vwwy" }, "stable": { "version": [ @@ -80113,10 +80162,11 @@ "stable": { "version": [ 1, - 3 + 3, + 2 ], - "commit": "bcb858f607b0d833e1581e0630446ecc576eefd6", - "sha256": "1b6ms822j075fciijpwywzn675hbqqbaylz5iy3czlwypjg1slhh" + "commit": "c0ba49bb01d037ce8800aa04db06f454ef043cb6", + "sha256": "07ck6slz0z484lywdymh719pfmxhvfsb1cvk2bdbrx4xq89sqwq6" } }, { @@ -83138,11 +83188,11 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20210625, - 2116 + 20210722, + 329 ], - "commit": "e6957896b065e2fda80a8258dfebb86b49742c15", - "sha256": "0fx7v5b3v7y9qxr8n8pm6449rdf4ljc0fb6kp0vpdzfzc4yzgdni" + "commit": "36139ba64f43a3d3f4090ef0118bcebfef7e20c9", + "sha256": "1isab23shk1gfk54z4ppbnnkrm527rzb9cvbqqa47s8gv9k7zbnm" } }, { @@ -84215,20 +84265,20 @@ "repo": "vpxyz/php-quickhelp", "unstable": { "version": [ - 20201108, - 1132 + 20210721, + 1945 ], - "commit": "e36fc61a7061044ab7984421997566b97776f722", - "sha256": "1zkql9zy35apidxrd29w479600nccbrzn350f0xjsq2wzmk64ci2" + "commit": "f22e6d31aad504094b441e2f635869fc97939ddf", + "sha256": "12dwjrflhbih1v75sxh0kp4w67i4xzccyxvy9601f94xnrha9s84" }, "stable": { "version": [ 0, 5, - 1 + 3 ], - "commit": "e36fc61a7061044ab7984421997566b97776f722", - "sha256": "1zkql9zy35apidxrd29w479600nccbrzn350f0xjsq2wzmk64ci2" + "commit": "f22e6d31aad504094b441e2f635869fc97939ddf", + "sha256": "12dwjrflhbih1v75sxh0kp4w67i4xzccyxvy9601f94xnrha9s84" } }, { @@ -86734,11 +86784,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20210425, - 1720 + 20210723, + 143 ], - "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", - "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" + "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9", + "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h" }, "stable": { "version": [ @@ -86959,8 +87009,8 @@ "deps": [ "dash" ], - "commit": "e746822cd7d8a0dcf56902d32fbadb3297690590", - "sha256": "09pskvha06picdlgclvwijng712s3xd5mr3kxxpp6gb02qsiy3yy" + "commit": "9e38442d95a49199e1a2e69aefbfe139ca9036ab", + "sha256": "1x42lfp3ay31lvdmjsvwqblci1bbwxhddq58fq1ip108lwqazl87" }, "stable": { "version": [ @@ -87902,8 +87952,8 @@ 20200619, 1742 ], - "commit": "b90ec9c242b303e90811deebaa2e3e684b63de91", - "sha256": "11n9ybjxfc8x58fwp2f67nc6mg4qkj8m9c7ldjlp77m01k0qrij1" + "commit": "d662ec9c2e4f8ca21cb500b25cfe7430511014b2", + "sha256": "1n8ls2pm36imqg98yz20q9nyyxf4z0250mp4aigjcv3c66j8fp2a" }, "stable": { "version": [ @@ -88203,7 +88253,7 @@ "unidecode" ], "commit": "d781870e2f57e40110e07768289ab81d8554f122", - "sha256": "17d2v7q6sfafk8j1ish053xsmihi4f1hbk53fkkmhwan6sw9c4sc" + "sha256": "154lkpipi5wgcwx4j9w6h3zysciw7hblf03an2irr9xgdhs7xs7q" } }, { @@ -88271,7 +88321,7 @@ 8 ], "commit": "708cae8e67dbae293c7c4be0ca5e49d76fac6714", - "sha256": "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py" + "sha256": "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q" } }, { @@ -88756,16 +88806,16 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20210714, - 1304 + 20210721, + 1917 ], "deps": [ "ivy", "nav-flash", "uci-mode" ], - "commit": "321c14c195cd2f8a31b9bf99dd318a552fbbcd6d", - "sha256": "1sz8riry4c4lf5n0nsd3msw5kch3ifwg5psrf4y866b0wlya7yk2" + "commit": "30cce9c134f685d7f2db81aa879e683864a23b66", + "sha256": "0q4q5wziwy2nhv0yyx7k5jx6bccx9lxr4f97njb06j2nvz2x7k1v" }, "stable": { "version": [ @@ -88790,15 +88840,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210714, - 231 + 20210720, + 47 ], "deps": [ "async", "xr" ], - "commit": "ebd3175c4c5e7845c52dddf71a806826a80df89d", - "sha256": "0p52a4bp4gmgwfpai8cwq3frp0fyhp9ma5a0idxdiamr8xjiwjz0" + "commit": "ace904840c676297138ed62abb4f1d05c837fd4c", + "sha256": "117h1zanyjlb566kzdx014xjzryvf6qvqa37zbyb821ajxjlpkk0" }, "stable": { "version": [ @@ -88881,14 +88931,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20210504, - 1144 + 20210719, + 38 ], "deps": [ "pyim" ], - "commit": "da51e226bca9be2ed6175298489be64e45492759", - "sha256": "0nl1yi3zf4pp7cksprmigm119dcp1d2477k4jdm10z7zfcq2p6r0" + "commit": "4812f93ee00196b8fee9f434aa5cd77fabcf90d1", + "sha256": "1wvzgyf3mq3wy0sdnx5jhscr5x28pgbvw8dmfyn18741xnsn26fb" }, "stable": { "version": [ @@ -88960,17 +89010,17 @@ 20210411, 1931 ], - "commit": "6c29598ce446dc441a8095b83c82390249df3693", - "sha256": "0l5dg9snp4p6x3nlyl0civ50kdl1q6zr0hmx9hcp2c72hm22dqi5" + "commit": "a054796d7008f4531b482490f917bdef1454b8fd", + "sha256": "07zs0dzh500xs26ybyfz2z4wigc74l6wq3z1225gnblphhzl4jv9" }, "stable": { "version": [ 2, 9, - 3 + 5 ], - "commit": "aa688de05e469e33a20478144013946ccb752736", - "sha256": "0r2xp90bwwqnya3gq0q0gh2qdn7i9fcsq8ab890bnd0b44ivx0nk" + "commit": "ec8219e48f031f93377cc7d862a6f3bf80d76dbf", + "sha256": "1fixqimr8mq0mg5qs8wj4hbrzlw9925x72311is4s5r8phyjaabb" } }, { @@ -89254,7 +89304,7 @@ 0 ], "commit": "906b0a107f7bcfe6e32bcfedb977e6f0f99fda59", - "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0" + "sha256": "17clkgs94dgq5nsjlwkr52m5s446ibfss3qc8a8m0zaz6j4f8l1m" } }, { @@ -89353,7 +89403,7 @@ "python" ], "commit": "e606469aafec2e6beda8c589540b88a5a6f6f33f", - "sha256": "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr" + "sha256": "0vyipfsppissa87pdnbksamdby0yl2q8nzawqivv6smn33jp6vsn" } }, { @@ -89426,29 +89476,6 @@ "sha256": "1hbb0m5kjczyri6hbgkk1par53zfnsp7m133xqzfhg2sibrvbz2x" } }, - { - "ename": "ql", - "commit": "475bd8fd66c6d5b5c7e74aa2c4e094d313cc8303", - "sha256": "0wxjblqacs5nx2hyh7r6rlv1yngbhn6phn5rni4dw2dms98zj34z", - "fetcher": "github", - "repo": "ieure/ql-el", - "unstable": { - "version": [ - 20180418, - 2020 - ], - "commit": "d976414ba6aa576ad524b5ee5bfa620efd072258", - "sha256": "138h4ndnzpphsmi4b8yw53mxc3rnqrj1c3jp8njx5pkmiqkp1q00" - }, - "stable": { - "version": [ - 1, - 1 - ], - "commit": "d976414ba6aa576ad524b5ee5bfa620efd072258", - "sha256": "138h4ndnzpphsmi4b8yw53mxc3rnqrj1c3jp8njx5pkmiqkp1q00" - } - }, { "ename": "qml-mode", "commit": "f3abc88ddbb6b8ecafa45e75ceba9a1294ad88d4", @@ -89885,15 +89912,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210715, - 2107 + 20210720, + 2002 ], "deps": [ "faceup", "pos-tip" ], - "commit": "c7aca6f1b4c34a48314bc7812c2d7edc849e3dba", - "sha256": "1pcxicz7kg6s9j9gsdb8pba3j3n5522gclc5qq95ch2q3i5phg91" + "commit": "76ca5838cbc266c306aa54964410730f6fd93d88", + "sha256": "1q4cgsi659bk4p1avl6bpzfhlf314432mqjhj3hlyxhf4d3nza8m" } }, { @@ -90550,11 +90577,11 @@ "repo": "pfchen/read-only-cfg", "unstable": { "version": [ - 20210608, - 1259 + 20210717, + 205 ], - "commit": "a02395b37a68b2e20e365c2e3752f966c71d4c02", - "sha256": "0jihqc16knvws5w2y5djdir4h52mpwk86nbjlap47lh2r18qk6q6" + "commit": "a4e50d4fbf48970e98b2464e13f46e51a4c43c37", + "sha256": "1mbnyp2xknymfs2nrcw572plrwxgjacrysxaf5szr75vn2vh11nl" } }, { @@ -92452,7 +92479,7 @@ 0 ], "commit": "c7c6b726806df7e8cb25a41b213a207850c91cb7", - "sha256": "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5" + "sha256": "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98" } }, { @@ -92646,7 +92673,7 @@ "web-mode" ], "commit": "6cf58cf04fee933113857af07414b3f27c24b505", - "sha256": "0s3hs0w6hz8vx4172mfraiqfjhd1a9h1w61ra6fklc5fjf3y8pn8" + "sha256": "0b3gqs1lsk80shirsc41zajzjbg1sgzksmnfazffx88h612p7ygd" } }, { @@ -92829,7 +92856,7 @@ 4 ], "commit": "71e475ab35555e0a1eca26d73acf1ced911e422e", - "sha256": "0x3mmf4gq4d0cqfqbkrrpwhayvmplacck0zc9nlzcn35y17jzpcz" + "sha256": "0y18i4ly61jyvxymvgjr99arhxfn5y5s659jnqf4gvyp3d671dkf" } }, { @@ -92952,8 +92979,8 @@ 20210313, 1541 ], - "commit": "65113e2a137baa9f85dc2157b893291470788dc4", - "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" + "commit": "3a057f127b931c683288f8731f05ba5e2aab4133", + "sha256": "1brf05grh0xdcjllaiixpjxmcg2j130gcrxkqm5v4ryb1w9fki7g" }, "stable": { "version": [ @@ -93512,8 +93539,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210609, - 1900 + 20210719, + 1514 ], "deps": [ "dash", @@ -93526,8 +93553,8 @@ "spinner", "xterm-color" ], - "commit": "6ca73bb3cce4d1db3c4f91efb83b63227eb712d1", - "sha256": "12arrvvp3idq11a4ham77zxqp2d1026qz89ywgd3i9k1cbj852wi" + "commit": "26c2e09907135d5be9628c710bb0753c256b7242", + "sha256": "1bilqhln8m6qk5r3q8dvhhsql1c38dnf7m55kysja86bf6yb3s59" } }, { @@ -94642,7 +94669,7 @@ "s" ], "commit": "91c56311b48a26aa6ef5a113b0a828e174059b0a", - "sha256": "1iyq8m75gzyx2ww919i4zl63gajsaczgwax214a1jgf8x91j590k" + "sha256": "10ikd6ksz5adpldyx9h8s3qnwc488rqixzwnd0rjjwqigmllj9lb" } }, { @@ -94819,8 +94846,8 @@ 20210707, 1827 ], - "commit": "48ea51aa5b6959ea2a134e36cd21f727047b0677", - "sha256": "0lini8hdih1qakf3hg981diw9gmzxjkd6rnjq3lddyqg6dvj9hhw" + "commit": "97693d0aea2c548197e9d1de3bdedf8e703775a4", + "sha256": "0d03sw0w2yhhmnpdn7xc0sm2n3lk11ffhkbz59kzdkcqqi7ppv04" }, "stable": { "version": [ @@ -94846,8 +94873,8 @@ "prescient", "selectrum" ], - "commit": "4a0f5405798cfcb98ea005078ef2e2d490e922c4", - "sha256": "04rz8mypgslb0la4wgj3na5c8p28s9lghq4nykcb28nhcxwfvz8n" + "commit": "54b19cf7121d9eb679c2ba26b3c26e82c8a90df9", + "sha256": "122j06gav4y6ghkjgwivlfqq1y4rl52sm8wskcq1gm3g7n36ds5h" }, "stable": { "version": [ @@ -95858,11 +95885,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210714, - 111 + 20210721, + 148 ], - "commit": "ccdd3681b9e7d8b6a758f2aa61a0ae8eab21240b", - "sha256": "1ynl1kwnhp5xqvmi8p37lprshk96xi8q78rsjmd9f8pkb8ayqbf3" + "commit": "635a71df74d755113f26a6c6d9ae48ccb485393d", + "sha256": "0llby9858sjfxrh6x5nklkm24lmk6d5xm6mw0y6d02pn6rinx0sx" } }, { @@ -96102,7 +96129,7 @@ "s" ], "commit": "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b", - "sha256": "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki" + "sha256": "1xnby24gpxij1z03wvx89s459jw0f8bwhgi80xvdq8gxhbbz2w7a" } }, { @@ -96716,11 +96743,11 @@ "repo": "dawranliou/sketch-themes", "unstable": { "version": [ - 20210325, - 1700 + 20210719, + 2212 ], - "commit": "407094c03e934043aa6d70369bf3e1bd841d1c91", - "sha256": "1glm8cxd91kq6910rrzgh3xaas67fylvgqxq2ld6gzcgmxzhv8yl" + "commit": "8c4b4ef49fbb059ad00ab9fb76f22c2cdd780e7c", + "sha256": "0lvjdcsx3gvg7lk22l5c8jmdqk9s38figlr5zcbbk7fgjpf4q0p2" }, "stable": { "version": [ @@ -97175,11 +97202,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210629, - 2009 + 20210721, + 1756 ], - "commit": "41f4d650485217aa1f2afa7c159418f103a09231", - "sha256": "0cq1a19d1przjizp7d4vjl8khp09j6jcwavhrpja1saqhwavhv7c" + "commit": "e8f57c09cb4cc857887310e61eed7325500e9998", + "sha256": "1ipbi9h1p943mxzyc81wyrpyah41dhg33kmb3y9cy6avr2pkm1ry" }, "stable": { "version": [ @@ -98448,8 +98475,8 @@ "flycheck", "solidity-mode" ], - "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", - "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" + "commit": "6f7bd1641e5282ec5163188d8b8c2f6dfddc2e36", + "sha256": "0rkw21pic9nypv7vz06chyn9mjl560a4dayb84gj5w6v8gfznrcw" }, "stable": { "version": [ @@ -98473,11 +98500,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20210622, - 931 + 20210717, + 844 ], - "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", - "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" + "commit": "6f7bd1641e5282ec5163188d8b8c2f6dfddc2e36", + "sha256": "0rkw21pic9nypv7vz06chyn9mjl560a4dayb84gj5w6v8gfznrcw" }, "stable": { "version": [ @@ -99812,11 +99839,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210701, - 23 + 20210721, + 125 ], - "commit": "a92d2a4f748f124910d406a9386979688f7f28a5", - "sha256": "1gfqskdng23dpacvmypyc2jsrw15hrrwq84qmlnwyibf0g0pjj1f" + "commit": "de1fdca07229e5d43c18cb3dc300397849eeab78", + "sha256": "0vdlcy211zx3fr8vcl6hm8xj8v3wkjj4y7pjcni9g87iijzf6gx2" }, "stable": { "version": [ @@ -100240,8 +100267,8 @@ 20200606, 1308 ], - "commit": "ba12f620074b5a6e6615e2963bdc79fbba6060eb", - "sha256": "1gjmzm8lx8fas9phkbvy3rz9dyzqgdjs2ddd3l9biqqggwka0pa0" + "commit": "1b2058a91b7ed920952ea99b5140c60b8c7cdd1b", + "sha256": "1nk6mbxl416dpgwmpy52v161n2ag3gi6crrzvczx524879a9zvkf" }, "stable": { "version": [ @@ -100249,7 +100276,7 @@ 1 ], "commit": "68f949852ab7f0e8bb52c6a6fc2ece2a74ded824", - "sha256": "129mms7gd0kxqcg3gb2rp5f61420ldlhb0iwslkm7iv64kbxzww1" + "sha256": "09d69q9m4k4pwhl2k5r7d7lqd4cj0qf22cys94zjkrsyw5gggd36" } }, { @@ -100598,11 +100625,11 @@ "repo": "PythonNut/su.el", "unstable": { "version": [ - 20210626, - 2025 + 20210721, + 1816 ], - "commit": "36db018de8423a6e380a49d4e602d376a0740f6d", - "sha256": "08vma290dxzjxyn4df2i1kjzm24myxvsll9cxky277asbb8ja74z" + "commit": "1ecf7a7bbf9d88708eb2215e940753f8d6bccc92", + "sha256": "1994ypxz5zgrpdd5v61znf41c0dn4favab560wkgfnhhzrc1jgkf" } }, { @@ -101684,8 +101711,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210630, - 1816 + 20210720, + 1708 ], "deps": [ "evil", @@ -101697,8 +101724,8 @@ "seq", "undo-tree" ], - "commit": "740d80599c0a1ff0882e231e46c61ba16c83cd84", - "sha256": "1zfjdrm88c16czmi4i6rm87nafpyrjpjkj79cg44l9cizyv5198q" + "commit": "acd0874024018a3352761ffef3ca88916370b195", + "sha256": "17fi4jzsfp2k1fp772b75ihjsg602qyc1vzc0k6vv0p05kiv8s2x" }, "stable": { "version": [ @@ -101931,15 +101958,15 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20210714, - 1932 + 20210722, + 1112 ], "deps": [ "hide-lines", "ov" ], - "commit": "ff1ab94c0f65e9891656d78d84f71614e0b9a597", - "sha256": "1x0xlbiisq8wngxhznkhxavhrhbc1w5p5w1qgfxib16fr09aqyc5" + "commit": "e18d74d8a12b943a3a64eb8c693981e55aea8e9a", + "sha256": "0snf3pjnhff0r7v4iwqqq3568h0a4ff7b2s3axssxk4rfg8bm3ks" }, "stable": { "version": [ @@ -101975,7 +102002,7 @@ 11 ], "commit": "3ad6d52072f0bd043dced40ba7bd422fd9c00a7b", - "sha256": "0pxkyys2lgn16rhf4mzqlh27vs9aw6g083z2vr2agr7bmbavd2fp" + "sha256": "0n4qr5qqy6hbc1hg4wi1d2ckdl870v5mf9xhv5m9vrlwaphvnnjr" } }, { @@ -103651,18 +103678,18 @@ 20200212, 1903 ], - "commit": "b157feff61c3bdefb138753af7636dae5a7b3c08", - "sha256": "1dnspcmni98xhcz21604238lskdqn6b4kpv2zllvq58si59q32mw" + "commit": "1486e47402a5fa7df9791bd01c7e703671de9de6", + "sha256": "098hf7w27223v0h7090w4s2gcw5ylnj6fdfw3c1ifhblglyrbq1n" }, "stable": { "version": [ 2021, 7, - 12, + 22, 0 ], - "commit": "faeb22efa9ed948e6096e37e65e6d121c83e329a", - "sha256": "1adaqcdzzrrff0186276pdmlqixkv47qfgyxap3by9zdiqwysd50" + "commit": "3a1532f0ee53c6746f50dbad17c248eeced05d21", + "sha256": "1nzx3bw472m3ajmhlwp217jyrxm31j9av4h6fw884icpnn3392s7" } }, { @@ -103718,8 +103745,8 @@ "deps": [ "haskell-mode" ], - "commit": "95c065a410c20cbeefeaabc3084b2b09d09564c2", - "sha256": "02xbzwj1bf0n4lvg1rycmxsbvwi0p0h9a5fqx755kshwx5hngkx3" + "commit": "531db05f9b15feadbc1a0df194a4f9dcd0d10c0a", + "sha256": "16m17q8kc0fxq1nc47ggxjjna04k27hch93q8pqilp00s7695597" }, "stable": { "version": [ @@ -104612,8 +104639,8 @@ 20210713, 1609 ], - "commit": "07d6d82cba864b1e38d3bd46654f2e1928a997c2", - "sha256": "04h60s6ig43sj144s7dlip1saf9kdwvzlfys8qwwx48003rbs0dp" + "commit": "77e16de3b9fbaa0417b56a9acc70a9bca17c4ad0", + "sha256": "1ww04kfz4kkbhrbd78r4dpylhayb5hl72qcjv8wm0mhgfwmbb358" }, "stable": { "version": [ @@ -104716,11 +104743,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210712, - 1626 + 20210721, + 2104 ], - "commit": "e90481000f071e9a26a1cc0f40d347f7d3e2201e", - "sha256": "1sw9248cxr3x2hy2rhyzbwik08nvlkglxgig3rbqshc8spnid5h3" + "commit": "769219b5f5757f1373a28e993f36b6a41c778651", + "sha256": "1s108ps8l563ywn4k5z64y67fgi3j0c7ln2zz9qi9xfih0lnz81b" }, "stable": { "version": [ @@ -106271,7 +106298,7 @@ 0 ], "commit": "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9", - "sha256": "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla" + "sha256": "14ybav1f82m2gsxkciwlc0pm01ihqqaqq6arnjqvgxdnw0z6qniq" } }, { @@ -107081,7 +107108,7 @@ "use-package" ], "commit": "f33c448ed43ecb003b60ff601ee7ef9b08cff947", - "sha256": "1wzn3h8k7aydj3hxxws64b0v4cr3b77cf7z128xh3v6xz2w62m4z" + "sha256": "1k1dwydqfgx2yvbipahwzk8kyj7v5ih6hkra8ladbn67x013f9rq" } }, { @@ -108131,7 +108158,7 @@ "outshine" ], "commit": "5202db4c6a511a90a950a723293d11d55ec05264", - "sha256": "1ygx8g9cxyyhhpcqan1ca4g741s3dd141bcmp6jjqbjfn2gqraz6" + "sha256": "1qfjwsxi3w2gdl258jbk5d3z645gs6zccxx2iah54zbgql17pgj9" } }, { @@ -108688,11 +108715,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210530, - 629 + 20210720, + 1218 ], - "commit": "bcae11818d74aa0de8e592b8349d90e512444758", - "sha256": "1rmdin9z68xkxqjhvhyklbby5mxs3qf4wx9c07945p4ps80w8z5g" + "commit": "aadf603bccb51addfcbd1ee4f684f720d56df56f", + "sha256": "0zskaz2np8x6wz3zrkqw5bhmwzyq8llvqq5sbwjzlgdl2xph876f" }, "stable": { "version": [ @@ -108870,30 +108897,30 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20210503, - 624 + 20210718, + 944 ], "deps": [ "org", "org-roam", "s" ], - "commit": "0f73528e603b1901cbe36eccd536a9113ef0439d", - "sha256": "030aglgmph8p9qi160ws6qv288mkwpyhhj0m946q72y7hmsc5xxp" + "commit": "ebbfc00978603c40222e260f06dbec9d781e3306", + "sha256": "1gx8h50r7mhm4p675an5a6hrm37zdcaw1lw2kpn7apr6kyi3c6q7" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "org", "org-roam", "s" ], - "commit": "c4f39b853c54cbfab48876812012e040b56838ee", - "sha256": "1dgmxbdvyb9vdha2swg4ahai6xvfvlr7d03y3c2c3db2jbr00aw5" + "commit": "16f61797090df570c182c8b3aefd6fe6c9768e93", + "sha256": "04i55w017d2i3sf49rs7jj4yzv51bppz6dlybk09cy5giwafv9cx" } }, { @@ -108966,8 +108993,8 @@ 20210615, 103 ], - "commit": "ccdd3681b9e7d8b6a758f2aa61a0ae8eab21240b", - "sha256": "1ynl1kwnhp5xqvmi8p37lprshk96xi8q78rsjmd9f8pkb8ayqbf3" + "commit": "635a71df74d755113f26a6c6d9ae48ccb485393d", + "sha256": "0llby9858sjfxrh6x5nklkm24lmk6d5xm6mw0y6d02pn6rinx0sx" } }, { @@ -109563,26 +109590,26 @@ "repo": "pzel/weblio", "unstable": { "version": [ - 20210511, - 2105 + 20210718, + 1410 ], "deps": [ "request" ], - "commit": "ba0b745c3c11a93eaac826f74232f9eefbbae7a1", - "sha256": "00agkipgf6hc1bsrq460lydql8f04y42h4lh764k1fwg7x1a8pm2" + "commit": "2b4b0c206440b5c63960214feacfceb0c26231c7", + "sha256": "1iy1finnxqjbdivzyn7crpnha87mq1fmd98pkx2r8sk551nfw35s" }, "stable": { "version": [ 0, 3, - 3 + 4 ], "deps": [ "request" ], - "commit": "ba0b745c3c11a93eaac826f74232f9eefbbae7a1", - "sha256": "00agkipgf6hc1bsrq460lydql8f04y42h4lh764k1fwg7x1a8pm2" + "commit": "2b4b0c206440b5c63960214feacfceb0c26231c7", + "sha256": "1iy1finnxqjbdivzyn7crpnha87mq1fmd98pkx2r8sk551nfw35s" } }, { @@ -109797,11 +109824,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210530, - 1418 + 20210717, + 1858 ], - "commit": "a56c56de048900409d271f91fd08a408fd9bf32e", - "sha256": "0nblkcz52qvfkf4q3yb7drv0rbpkqgzv3clwb6vkvwz13s29b6my" + "commit": "246410e1c03f7d8d8e76102f7c5e3cda83acb36b", + "sha256": "184n7k0i2m9syy7mkjxdzjm36iyfx4azchwz0aania4pqm8dz7jv" } }, { @@ -111097,8 +111124,8 @@ 20210511, 1128 ], - "commit": "f74a58f3cfb2e94cee4c4527b2f7aeb8fa5ab46c", - "sha256": "0m50xxi5nz08byxjdp5k20d075anv88lsdk1z2q66y2jqaqbxian" + "commit": "c310d1ba0e0238e5a22f2a584c966b8b5e7e6616", + "sha256": "0k7p39y0lwqr2021nq34asxc4sya4xv3w2nbxqkzjz0ddnyiw2qr" }, "stable": { "version": [ @@ -111473,11 +111500,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210627, - 505 + 20210721, + 2312 ], - "commit": "62b7162198ca6659e025feb058e5662c55333ad4", - "sha256": "0xk5wa209pgc2sfz0j4dac57apy45si87628bqc21fnf877ga8qv" + "commit": "372f5bab99c06a3dbdec220ff5558046e1766476", + "sha256": "0gxd1sk8k8z9d0rrjpgdnh7by8yvwbh2awj4gm81c11k2ylbjcgl" } }, { @@ -111518,11 +111545,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210715, - 2014 + 20210721, + 1622 ], - "commit": "95c54a896c1e4af797f0af7cf9de85426c8e11eb", - "sha256": "137xv47cij7a0zws8xdw140cwlsnywapyb9y51dqpmn08s1ff2l2" + "commit": "afacaeebc3225de13acf19378d7af832d6150871", + "sha256": "08q495fhvcm8n78smsvcz2svzjqjihmzrvp2allysvyy25ni4d5b" } }, { @@ -111691,11 +111718,11 @@ "repo": "dkogan/xcscope.el", "unstable": { "version": [ - 20201025, - 2002 + 20210719, + 828 ], - "commit": "8e441efab0757778fe3594ff68c378bf90f539f9", - "sha256": "0v3jypw0c9m8lbiyq9dv4b7jpqjb1lr0qx619dy9xa48rdj107rh" + "commit": "d228d7593d762e457340f678d14b663ef66d7cee", + "sha256": "0pr85ywp585imjzswm04647nb4iqqvg8jgmbcs5210qmr9kh0z8d" }, "stable": { "version": [ @@ -111895,19 +111922,19 @@ "repo": "ndw/xmlunicode", "unstable": { "version": [ - 20200823, - 755 + 20210717, + 1246 ], - "commit": "0c2ee59888042d516f79a7b96526cbeae611c9bc", - "sha256": "026srs8nf6d5ksq30s3qy1jx4x65bdnyxz8p8nnsqlf81lbmhwq5" + "commit": "7e4c71c30f0d5214c45d4d4d48b149029ddb6b77", + "sha256": "0gc9fg95ihqz7lkn3vxc0qaslbxbj5jkhm2ddh41c3v9ym79mblp" }, "stable": { "version": [ 1, - 23 + 24 ], - "commit": "0c2ee59888042d516f79a7b96526cbeae611c9bc", - "sha256": "026srs8nf6d5ksq30s3qy1jx4x65bdnyxz8p8nnsqlf81lbmhwq5" + "commit": "7e4c71c30f0d5214c45d4d4d48b149029ddb6b77", + "sha256": "0gc9fg95ihqz7lkn3vxc0qaslbxbj5jkhm2ddh41c3v9ym79mblp" } }, { @@ -113277,7 +113304,7 @@ "pkg-info" ], "commit": "9adc5cf07a9117d25eaab41867ddde914c6d2f5a", - "sha256": "0g2vfscikz8qa0danvcickcjnz99yjm9jgk3sci094gmgwka3j2y" + "sha256": "1vl7nyfdpvh4ilxw1bckfkv59d6mxbb7m3z2fvrxs1gss06ks9va" } }, { @@ -113347,15 +113374,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210713, - 1855 + 20210721, + 2026 ], "deps": [ "ace-window", "deft" ], - "commit": "7dbf608d17786a69019867fd6b2b7d6c6edf849f", - "sha256": "1lq80ck08bydl98ka6j4qd6m5iqd1l8cx0y8pa2wq94vj71l65vl" + "commit": "f4d2e02e7b9d02799036d2dd864d45115f937fbd", + "sha256": "032wpg75jwh0nq9a36727f037vwaic05yqjmcc0lwz23czrkpsd5" }, "stable": { "version": [ @@ -113809,7 +113836,7 @@ "request" ], "commit": "98323098c37a444de49cfef44f1506e9386e8c5f", - "sha256": "1zr67h0w49rsi84mgf6jdili28h8782q6vjl8za0iq1hcx9zqxyf" + "sha256": "18hi6m2ngl9yz599q5bhifafi4vz1adc06bjl0bhb3rs62vbkwk2" } }, { From 4b4a07e868da3586b308a8cb7ee2a68b4dda79de Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 23 Jul 2021 11:57:26 -0400 Subject: [PATCH 112/136] gast: patch 0.5.0 to fix NamedExpr parsing (#131237) Co-authored-by: Sandro --- .../python-modules/gast/default.nix | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 7e8d9f8d4ac..6d18a7ba6d1 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -1,16 +1,36 @@ -{ lib, fetchPypi, buildPythonPackage, astunparse }: +{ lib +, fetchFromGitHub +, fetchpatch +, buildPythonPackage +, astunparse +}: buildPythonPackage rec { pname = "gast"; - version = "0.5.0"; - src = fetchPypi { - inherit pname version; - sha256 = "8109cbe7aa0f7bf7e4348379da05b8137ea1f059f073332c3c1cedd57db8541f"; + version = "0.5.0"; + + # TODO: remove this patch on the next release, this fixes a bug with parsing + # assignment expressions e.g., `x := 1`. + patches = [ + (fetchpatch { + url = "https://github.com/serge-sans-paille/gast/commit/3cc9b4d05a80e4bb42882de00df314aaa1e6e591.patch"; + sha256 = "0ylpn0x0a4y6139vd048blsh77yd08npjcn4b5ydf89xnji5mlm1"; + }) + ]; + + src = fetchFromGitHub { + owner = "serge-sans-paille"; + repo = "gast"; + rev = version; + sha256 = "0qsg36knv0k2ppzbr5m4w6spxxw7a77lw88y8vjx7m176bajnsbw"; }; - checkInputs = [ astunparse ] ; + + checkInputs = [ astunparse ]; + meta = with lib; { description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module."; + homepage = "https://github.com/serge-sans-paille/gast/"; license = licenses.bsd3; - maintainers = with maintainers; [ jyp ]; + maintainers = with maintainers; [ jyp cpcloud ]; }; } From dda4132d11f4ed73220fb4f30ac57db475862db2 Mon Sep 17 00:00:00 2001 From: Enno Richter Date: Fri, 23 Jul 2021 18:00:36 +0200 Subject: [PATCH 113/136] gpu-burn: init at 2021-04-29 (#130159) * gpu-burn: init at 2021-04-29 * Apply suggestions from code review * Update pkgs/applications/misc/gpu-burn/default.nix Co-authored-by: Sandro --- pkgs/applications/misc/gpu-burn/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/misc/gpu-burn/default.nix diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix new file mode 100644 index 00000000000..ad11b734762 --- /dev/null +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }: + +stdenv.mkDerivation rec { + pname = "gpu-burn"; + version = "unstable-2021-04-29"; + + src = fetchFromGitHub { + owner = "wilicc"; + repo = "gpu-burn"; + rev = "1e9a84f4bec3b0835c00daace45d79ed6c488edb"; + sha256 = "sha256-x+kta81Z08PsBgbf+fzRTXhNXUPBd5w8bST/T5nNiQA="; + }; + + postPatch = '' + substituteInPlace gpu_burn-drv.cpp \ + --replace "const char *kernelFile = \"compare.ptx\";" \ + "const char *kernelFile = \"$out/share/compare.ptx\";" + ''; + + buildInputs = [ cudatoolkit ]; + + nativeBuildInputs = [ addOpenGLRunpath ]; + + makeFlags = [ "CUDAPATH=${cudatoolkit}" ]; + + LDFLAGS = "-L${cudatoolkit}/lib/stubs"; + + installPhase = '' + mkdir -p $out/{bin,share} + cp gpu_burn $out/bin/ + cp compare.ptx $out/share/ + ''; + + postFixup = '' + addOpenGLRunpath $out/bin/gpu_burn + ''; + + meta = with lib; { + homepage = "http://wili.cc/blog/gpu-burn.html"; + description = "Multi-GPU CUDA stress test"; + platforms = platforms.linux; + maintainers = with maintainers; [ elohmeier ]; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfb561fcb19..e84e0e2a966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2851,6 +2851,8 @@ in gping = callPackage ../tools/networking/gping { }; + gpu-burn = callPackage ../applications/misc/gpu-burn { }; + greg = callPackage ../applications/audio/greg { pythonPackages = python3Packages; }; From ba803ee57b62e7810013890efa8fd902032e5482 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 22 Jul 2021 15:39:57 +0200 Subject: [PATCH 114/136] fcft: 2.4.3 -> 2.4.4 Fixes rendering of bitmap font with freetype >= 2.11 (so this issue did not affect us). https://codeberg.org/dnkl/fcft/releases/tag/2.4.4 --- pkgs/development/libraries/fcft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index b61505f60e6..1340f5e87a8 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.3"; + version = "2.4.4"; src = fetchzip { url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; - sha256 = "0hxvd6xbvgq1rk8851gswffmvh3fv41lyvz4fhwzln7m12759yw8"; + sha256 = "0ycc2xy9jhxcxwbfk9d4jdxgf2zsc664phbf859kshb822m3jf57"; }; depsBuildBuild = [ pkg-config ]; From 3bb38198e94c9076acac411caae0f1c15ad1e96e Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Fri, 23 Jul 2021 20:39:38 +0200 Subject: [PATCH 115/136] webkitgtk: 2.32.1 -> 2.32.3 Relevant security advisory: https://webkitgtk.org/security/WSA-2021-0004.html CVEs: CVE-2021-1817, CVE-2021-1820, CVE-2021-1825, CVE-2021-1826, CVE-2021-21775, CVE-2021-21779, CVE-2021-21806, CVE-2021-30661, CVE-2021-30663, CVE-2021-30665, CVE-2021-30666, CVE-2021-30682, CVE-2021-30689, CVE-2021-30720, CVE-2021-30734, CVE-2021-30744, CVE-2021-30749, CVE-2021-30758, CVE-2021-30761, CVE-2021-30762, CVE-2021-30795, CVE-2021-30797, CVE-2021-30799 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 40f51d6f48a..563c13b26f2 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -63,7 +63,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.1"; + version = "2.32.3"; outputs = [ "out" "dev" ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "05v9hgpkc6mi2klrd8nqql1n8xzq8rgdz3hvyy369xkhgwqifq8k"; + sha256 = "sha256-wfSW9axlTv5M72L71PL77u8mWgfF50GeXSkAv+6lLLw="; }; patches = lib.optionals stdenv.isLinux [ From 60fb856a8bd3be21de4626f0dd8babb6ebb9015c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Jul 2021 12:58:34 +0200 Subject: [PATCH 116/136] python3Packages.pymazda: 0.1.6 -> 0.2.0 --- pkgs/development/python-modules/pymazda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index f4b9f0b1f01..66ab62d927b 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.1.6"; + version = "0.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fQcycOMNYCO6bP344DTLxNf/YoliEITyxsnIDyTPO5E="; + sha256 = "sha256-tEe70gvEglxqECiPjS3k29zZi70OSGMv6JxhrXqPhnY="; }; propagatedBuildInputs = [ From 5b87242c21636e75601b539ad1a11d44b816925a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 00:14:57 +0200 Subject: [PATCH 117/136] python3Packages.pyhaversion: 21.5.0 -> 21.07.0 --- pkgs/development/python-modules/pyhaversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index efc06ad0c96..1b8ee806752 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "21.5.0"; + version = "21.07.0"; # Only 3.8.0 and beyond are supported disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-/F4UMFUs60o3QazfFYEWgTGHg4z5knzNWolUpk5SIeM="; + sha256 = "sha256-LcuMLYekeK9HR+SR8+R+EvuxxaN3RCh7KV969RngZjw="; }; propagatedBuildInputs = [ From da62a6a57ca2631b0cc499459495d24abf4ca245 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 00:17:57 +0200 Subject: [PATCH 118/136] python3Packages.zwave-js-server-python: 0.27.0 -> 0.27.1 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 778f9c448ed..18cb2a98710 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.27.0"; + version = "0.27.1"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-ClZ9B20NphN5XewqEtHpUMNHuuVxs1RJBcxWi6TzT1Y="; + sha256 = "sha256-Q02S0jEFZe4qOkRok/sY0UPrMpmD13off85UL3+8o/o="; }; propagatedBuildInputs = [ From 29f7b615f640acf4dd05b6c4c7e87b2c2520e3f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 00:20:57 +0200 Subject: [PATCH 119/136] python3Packages.pysonos: 0.0.51 -> 0.0.52 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index 63dbe762535..fb2bb3d5022 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.51"; + version = "0.0.52"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MjsbqrH4SWnnwGe9BVHaValoQEiaaZVhFdn6MDoEyZs="; + sha256 = "sha256-RX+VSy5DkMgpa0kZmTqguD4zHa76LJVeh7SquxEKviA="; }; propagatedBuildInputs = [ From 48ca89acb1ab8fc7654249b424fd683a1c15f873 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 00:22:44 +0200 Subject: [PATCH 120/136] python3Packages.pywemo: 0.6.4 -> 0.6.5 --- .../development/python-modules/pywemo/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pywemo/default.nix b/pkgs/development/python-modules/pywemo/default.nix index ceb190fe753..ad2574bd86c 100644 --- a/pkgs/development/python-modules/pywemo/default.nix +++ b/pkgs/development/python-modules/pywemo/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , ifaddr , lxml , poetry-core @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "pywemo"; - version = "0.6.4"; + version = "0.6.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,19 +21,13 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = version; - sha256 = "1hm1vs6m65vqar0lcjnynz0d9y9ri5s75fzhvp0yfjkcnp06gnfa"; + sha256 = "sha256-8nLzNEle5eR5qc/tC1CX+Kh3WkPuKyy9VDMiAVbOykA="; }; - patches = [ - (fetchpatch { - # https://github.com/pywemo/pywemo/issues/264 - url = "https://github.com/pywemo/pywemo/commit/4fd7af8ccc7cb2412f61d5e04b79f83c9ca4753c.patch"; - sha256 = "1x0rm5dxr0z5llmv446bx3i1wvgcfhx22zn78qblcr0m4yv3mif4"; - }) + nativeBuildInputs = [ + poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ ifaddr requests From 684926519000d0e58d059bdc7e22417f45c361a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 00:25:08 +0200 Subject: [PATCH 121/136] python3Packages.pyinsteon: 1.0.11 -> 1.0.12 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index be746ae2793..4a0e04943b8 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.11"; + version = "1.0.12"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-dT01nKXDjkFSIf2BmrIcC8a9n00hlyd59oPwXn1CBaw="; + sha256 = "sha256-IlRCUogs78kbKY8gp22YzIkNrXhSCLJDDDtFAucrQxE="; }; propagatedBuildInputs = [ From 57c40425afa4d0544f60515ecf485d99414b7b4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 00:28:22 +0200 Subject: [PATCH 122/136] python3Packages.aiohomekit: 0.4.2 -> 0.5.1 --- pkgs/development/python-modules/aiohomekit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 981a541e9ec..f720cdf9b13 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, commentjson , cryptography , fetchFromGitHub , poetry-core @@ -11,14 +12,14 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.4.2"; + version = "0.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Jc2k"; repo = pname; rev = version; - sha256 = "12v9szalh3yzfqgmspk4ch8l38kzmhwzjn9jvsq632n4zhjd7qg4"; + sha256 = "sha256-Fo9KWBcN6Y/fa7vkWugSer5L7+hOWz99+hw6Hz1LAMM="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + commentjson cryptography zeroconf ]; From c4aed585d8fb71c4bb8fb955b1bc3afa3b69983f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:39:32 +0200 Subject: [PATCH 123/136] python3Packages.pysma: 0.6.2 -> 0.6.4 --- pkgs/development/python-modules/pysma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 15d40bce9fa..4f04038d650 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.2"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nKnOWVPRFmylwUeb0yApMHdW8vGvPCLlOGkZGNYC128="; + sha256 = "sha256-hnvbQOilsoHn1qc/pKJ2Eq1VwJi+HbGlAAJwiME1Pgc="; }; propagatedBuildInputs = [ From 4286f58fd731bc9c15c1f161d5eacd9978e44464 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 01:34:41 +0200 Subject: [PATCH 124/136] python3Packages.aioesphomeapi: 4.1.0 -> 5.0.1 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 5def5b1d13f..6d468b5f480 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "4.1.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0210l2d5g76pllr2vh990k9shfv3zrknx5d2dmgqb5y90142cp76"; + sha256 = "sha256-2IxXhAysQiqqEd4Mfjgc5vX0+D60rof2nPJDXy9tRVs="; }; propagatedBuildInputs = [ From ded376fbadd924f7d76040a1fec67ef0febbf79e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 01:35:06 +0200 Subject: [PATCH 125/136] python3Packages.async-upnp-client: 0.19.0 -> 0.19.1 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 369288293e1..13c78783ed0 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.19.0"; + version = "0.19.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "0xj3j54nasl59gs1k84h3fixjsaqn7whg33h6wi99l5yfbwfqv8p"; + sha256 = "sha256-qxEn9UrQuwRaP7sZlu3854gDI7Gqku055DF8KvsU6p4="; }; propagatedBuildInputs = [ From 8c9a795b2ef3010079f0ded1ebbe80b408d7e323 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 01:36:21 +0200 Subject: [PATCH 126/136] python3Packages.pydeconz: 80 -> 82 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index c6029d216d6..fb0852e2bf1 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "80"; + version = "82"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-om1Nhqu2CU+W2k2PGP1+6jLRJihacSQDayOfTzblZKo="; + sha256 = "sha256-DdZ6bf+2rMjgjm5aRxcSRI/hN0zfP7uV8PaM40c9IJo="; }; propagatedBuildInputs = [ From 9cbe5ec1ec91dd018d11603c66a8f9a6342b3160 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 01:37:28 +0200 Subject: [PATCH 127/136] python3Packages.pyfireservicerota: 0.0.40 -> 0.0.43 --- pkgs/development/python-modules/pyfireservicerota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix index 9d917a48016..9f6d85fc564 100644 --- a/pkgs/development/python-modules/pyfireservicerota/default.nix +++ b/pkgs/development/python-modules/pyfireservicerota/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyfireservicerota"; - version = "0.0.40"; + version = "0.0.43"; src = fetchPypi { inherit pname version; - sha256 = "8d8173f6682ef2a61367660a15559c8c7a7e00db3f98092e0fa52e771df356f4"; + sha256 = "sha256-3+QK1BVuWYii0oYT4xXMOYJZmVKrB4EmqE0EkdFlZvE="; }; propagatedBuildInputs = [ From 4172b9822d243e5d7c372e60877f58bc4ec3b732 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 01:38:22 +0200 Subject: [PATCH 128/136] python3Packages.pysonos: 0.0.52 -> 0.0.54 --- pkgs/development/python-modules/pysonos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index fb2bb3d5022..132c904dc3e 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysonos"; - version = "0.0.52"; + version = "0.0.54"; disabled = !isPy3k; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "amelchio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RX+VSy5DkMgpa0kZmTqguD4zHa76LJVeh7SquxEKviA="; + sha256 = "sha256-gBOknYHL5nQWFVhCbLN0Ah+1fovcNY4P2myryZnUadk="; }; propagatedBuildInputs = [ From 9c3a3062921e5d9f9ef41c0d2a708007482bb702 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 01:41:22 +0200 Subject: [PATCH 129/136] python3Packages.backoff: 1.10.0 -> 1.11.1 --- pkgs/development/python-modules/backoff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backoff/default.nix b/pkgs/development/python-modules/backoff/default.nix index fd92351c4d8..c7d1d5373fb 100644 --- a/pkgs/development/python-modules/backoff/default.nix +++ b/pkgs/development/python-modules/backoff/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "backoff"; - version = "1.10.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "litl"; repo = pname; rev = "v${version}"; - sha256 = "1jj0l6pjx747d2yyvnzd3qbm4qr73sq6cc56dhvd8wqfbp5279x0"; + sha256 = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4="; }; format = "pyproject"; From 64b15c284f20ce6b49bb554c397c0d301e30645e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 01:43:16 +0200 Subject: [PATCH 130/136] python3Packages.simplisafe-python: 11.0.1 -> 11.0.2 --- .../python-modules/simplisafe-python/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index 7bcd6340acf..9128018825c 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -1,7 +1,8 @@ { lib , aiohttp -, aresponses +, aioresponses , asynctest +, backoff , buildPythonPackage , fetchFromGitHub , poetry-core @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "11.0.1"; + version = "11.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,19 +23,20 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "04fn65iwzgvxi44kgvgvxjr3nzi2f4hwlqrjxfvc5yda96qp347c"; + sha256 = "sha256-sIv7zoLp+1CfeyhVYWMp93TkNk+h14WawOJOQMhwAp8="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp + backoff pytz voluptuous ]; checkInputs = [ - aresponses + aioresponses asynctest pytest-asyncio pytestCheckHook From 8bedd804ad90886ea83ffd34bece51592897a870 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 01:43:52 +0200 Subject: [PATCH 131/136] python3Packages.zigpy: 0.35.1 -> 0.35.2 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 2778581566f..8d393606fbc 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.35.1"; + version = "0.35.2"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "0y5sv8zzlkjwimknpld3fakl22cfkqv0cnw0immb7k4zb9xmls2v"; + sha256 = "sha256-p0q0wGp3NaBO7gBTsPAt7FEAHW0MDPJCKqLklY21zBQ="; }; propagatedBuildInputs = [ From 41bc3eeccd5a1e68a1c806edffce774cf973fefe Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Jul 2021 10:19:04 +0200 Subject: [PATCH 132/136] home-assistant: 2021.7.0 -> 2021.7.4 --- .../home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 2190bd6b278..cb74e1cecb6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.7.0"; + version = "2021.7.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 36af74cc162..5601a6c0cde 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -58,19 +58,6 @@ let (mkOverride "ring-doorbell" "0.6.2" "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") - # Pinned due to API changes in pyatv>=0.8.0 - (self: super: { - pyatv = super.pyatv.overridePythonAttrs (olAttrs: rec { - version = "0.7.7"; - src = fetchFromGitHub { - owner = "postlund"; - repo = "pyatv"; - rev = "v${version}"; - sha256 = "sha256-dPnh8XZN7ZVR2rYNnj7GSYXW5I2GNQwD/KRDTgs2AtI="; - }; - }); - }) - # Pinned due to API changes in pyflunearyou>=2.0 (self: super: { pyflunearyou = super.pyflunearyou.overridePythonAttrs (oldAttrs: rec { @@ -170,7 +157,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.7.0"; + hassVersion = "2021.7.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -187,7 +174,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1dx1pmi0w265pyajmmvd7k6vb5z7s77a7b161zd0n4zsb989dil6"; + sha256 = "1y6p3hg487ishar1r8vir5cxfbaw4c86s5w3zn9bmbf6jbd51pyk"; }; # leave this in, so users don't have to constantly update their downstream patch handling From 953909341ea62291a4c4a9483214f9a12d58ec99 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 23 Jul 2021 22:32:14 +0200 Subject: [PATCH 133/136] trash-cli: 0.21.6.30 -> 0.21.7.23 Also add an installation check. --- pkgs/tools/misc/trash-cli/default.nix | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index dbc00e13e1a..301f6163d76 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "trash-cli"; - version = "0.21.6.30"; + version = "0.21.7.23"; src = fetchFromGitHub { owner = "andreafrancia"; repo = "trash-cli"; rev = version; - sha256 = "09vwg4jpx7pl7rd5ybq5ldgwky8zzf59msmzvmim9vipnmjgkxv7"; + sha256 = "1kdkzs9mbyac8ndc6r0wa39z8d3fj8zglqp149id4j37aydxb10l"; }; propagatedBuildInputs = [ python3Packages.psutil ]; @@ -18,8 +18,27 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - # Skip `test_user_specified` since its result depends on the mount path. - disabledTests = [ "test_user_specified" ]; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Create a home directory with a test file. + HOME="$(mktemp -d)" + touch "$HOME/deleteme" + + # Verify that trash list is initially empty. + [[ $($out/bin/trash-list) == "" ]] + + # Trash a test file and verify that it shows up in the list. + $out/bin/trash "$HOME/deleteme" + [[ $($out/bin/trash-list) == *" $HOME/deleteme" ]] + + # Empty the trash and verify that it is empty. + $out/bin/trash-empty + [[ $($out/bin/trash-list) == "" ]] + + runHook postInstallCheck + ''; meta = with lib; { homepage = "https://github.com/andreafrancia/trash-cli"; From 184178c221991d4adfffa5b17724dbd374d3a522 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 05:10:18 +0000 Subject: [PATCH 134/136] erlang: 24.0.3 -> 24.0.4 --- pkgs/development/interpreters/erlang/R24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index 7f4b49c5c32..b4e9ebba797 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.3"; - sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI="; + version = "24.0.4"; + sha256 = "OeXXNaVJh5el+V+5ukcNOAgDmkJuGy1lYLpUTd1yxHM="; } From 82147a26802fb2cc5b40e8fe561e97261184612b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 Jul 2021 00:11:04 +0200 Subject: [PATCH 135/136] abcm2ps: correct license --- pkgs/tools/audio/abcm2ps/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index da9fb934ce2..b94d514e8ec 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://moinejf.free.fr/"; - license = licenses.gpl3; + license = licenses.lgpl3Plus; description = "A command line program which converts ABC to music sheet in PostScript or SVG format"; platforms = platforms.unix; maintainers = [ maintainers.dotlambda ]; From 85a9a16aa99e8fdf38e37dbf07a076ab0559e56f Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 23 Jul 2021 10:22:24 +0900 Subject: [PATCH 136/136] vscode-extensions.eugleo.magic-racket: init at 0.5.7 --- pkgs/misc/vscode-extensions/default.nix | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 6507a603b86..8c8ab911cc3 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck }: +{ config, lib, buildEnv, callPackage, vscode-utils, asciidoctor, nodePackages, jdk, llvmPackages_8, nixpkgs-fmt, jq, shellcheck, moreutils, racket-minimal }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -513,6 +513,28 @@ let }; }; + eugleo.magic-racket = buildVscodeMarketplaceExtension { + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; + description = "The best coding experience for Racket in VS Code "; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; + homepage = "https://github.com/Eugleo/magic-raket"; + license = licenses.agpl3Only; + + }; + mktplcRef = { + name = "magic-racket"; + publisher = "evzen-wybitul"; + version = "0.5.7"; + sha256 = "sha256-34/H0WgM73yzuOGU2w6Ipq7KuEBuN1bykcLGuvzY3mU="; + }; + nativeBuildInputs = [ jq moreutils ]; + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json + ''; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog";