git.iko.soy/typeable/nixpkgs

on master help sign in

from

swap

to76b29a4463 ahead, 0 behind

compare

doc/stdenv/meta.chapter.md+34

@@ -175,6 +175,40 @@ The NixOS tests are available as `nixosTests` in parameters of derivations. For

175175

176176NixOS tests run in a VM, so they are slower than regular package tests. For more information see [NixOS module tests](https://nixos.org/manual/nixos/stable/#sec-nixos-tests).

177177

178+Alternatively, you can specify other derivations as tests. You can make use of

179+the optional parameter to inject the correct package without

180+relying on non-local definitions, even in the presence of `overrideAttrs`.

181+Here that's `finalAttrs.finalPackage`, but you could choose a different name if

182+`finalAttrs` already exists in your scope.

183+

184+`(mypkg.overrideAttrs f).passthru.tests` will be as expected, as long as the

185+definition of `tests` does not rely on the original `mypkg` or overrides it in

186+all places.

187+

188+```nix

189+# my-package/default.nix

190+{ stdenv, callPackage }:

191+stdenv.mkDerivation (finalAttrs: {

192+ # ...

193+ passthru.tests.example = callPackage ./example.nix { my-package = finalAttrs.finalPackage; };

194+})

195+```

196+

197+```nix

198+# my-package/example.nix

199+{ runCommand, lib, my-package, ... }:

200+runCommand "my-package-test" {

201+ nativeBuildInputs = [ my-package ];

202+ src = lib.sources.sourcesByRegex ./. [ ".*.in" ".*.expected" ];

203+} ''

204+ my-package --help

205+ my-package <example.in >example.actual

206+ diff -U3 --color=auto example.expected example.actual

207+ mkdir $out

208+''

209+```

210+

211+

178212### `timeout` {#var-meta-timeout}

179213

180214A timeout (in seconds) for building the derivation. If the derivation takes longer than this time to build, it can fail due to breaking the timeout. However, all computers do not have the same computing power, hence some builders may decide to apply a multiplicative factor to this value. When filling this value in, try to keep it approximately consistent with other values already present in `nixpkgs`.

doc/stdenv/stdenv.chapter.md+54

@@ -317,6 +317,60 @@ The script will be usually run from the root of the Nixpkgs repository but you s

317317

318318For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`.

319319

320+### Recursive attributes in `mkDerivation`

321+

322+If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, including the overrides when reinvoked via `overrideAttrs`. For example:

323+

324+```nix

325+mkDerivation (finalAttrs: {

326+ pname = "hello";

327+ withFeature = true;

328+ configureFlags =

329+ lib.optionals finalAttrs.withFeature ["--with-feature"];

330+})

331+```

332+

333+Note that this does not use the `rec` keyword to reuse `withFeature` in `configureFlags`.

334+The `rec` keyword works at the syntax level and is unaware of overriding.

335+

336+Instead, the definition references `finalAttrs`, allowing users to change `withFeature`

337+consistently with `overrideAttrs`.

338+

339+`finalAttrs` also contains the attribute `finalPackage`, which includes the output paths, etc.

340+

341+Let's look at a more elaborate example to understand the differences between

342+various bindings:

343+

344+```nix

345+# `pkg` is the _original_ definition (for illustration purposes)

346+let pkg =

347+ mkDerivation (finalAttrs: {

348+ # ...

349+

350+ # An example attribute

351+ packages = [];

352+

353+ # `passthru.tests` is a commonly defined attribute.

354+ passthru.tests.simple = f finalAttrs.finalPackage;

355+

356+ # An example of an attribute containing a function

357+ passthru.appendPackages = packages':

358+ finalAttrs.finalPackage.overrideAttrs (newSelf: super: {

359+ packages = super.packages ++ packages';

360+ });

361+

362+ # For illustration purposes; referenced as

363+ # `(pkg.overrideAttrs(x)).finalAttrs` etc in the text below.

364+ passthru.finalAttrs = finalAttrs;

365+ passthru.original = pkg;

366+ });

367+in pkg

368+```

369+

370+Unlike the `pkg` binding in the above example, the `finalAttrs` parameter always references the final attributes. For instance `(pkg.overrideAttrs(x)).finalAttrs.finalPackage` is identical to `pkg.overrideAttrs(x)`, whereas `(pkg.overrideAttrs(x)).original` is the same as the original `pkg`.

371+

372+See also the section about [`passthru.tests`](#var-meta-tests).

373+

320374## Phases {#sec-stdenv-phases}

321375

322376`stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder.

doc/using/overrides.chapter.md+6−2

@@ -39,14 +39,18 @@ The function `overrideAttrs` allows overriding the attribute set passed to a `st

3939Example usage:

4040

4141```nix

42−helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {

42+helloWithDebug = pkgs.hello.overrideAttrs (finalAttrs: previousAttrs: {

4343 separateDebugInfo = true;

4444});

4545```

4646

4747In the above example, the `separateDebugInfo` attribute is overridden to be true, thus building debug info for `helloWithDebug`, while all other attributes will be retained from the original `hello` package.

4848

49−The argument `oldAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.

49+The argument `previousAttrs` is conventionally used to refer to the attr set originally passed to `stdenv.mkDerivation`.

50+

51+The argument `finalAttrs` refers to the final attributes passed to `mkDerivation`, plus the `finalPackage` attribute which is equal to the result of `mkDerivation` or subsequent `overrideAttrs` calls.

52+

53+If only a one-argument function is written, the argument has the meaning of `previousAttrs`.

5054

5155::: {.note}

5256Note that `separateDebugInfo` is processed only by the `stdenv.mkDerivation` function, not the generated, raw Nix derivation. Thus, using `overrideDerivation` will not work in this case, as it overrides only the attributes of the final derivation. It is for this reason that `overrideAttrs` should be preferred in (almost) all cases to `overrideDerivation`, i.e. to allow using `stdenv.mkDerivation` to process input arguments, as well as the fact that it is easier to use (you can use the same attribute names you see in your Nix code, instead of the ones generated (e.g. `buildInputs` vs `nativeBuildInputs`), and it involves less typing).

lib/systems/platforms.nix+2−2

@@ -3,7 +3,7 @@

33# targetPlatform, etc) containing at least the minimal set of attrs

44# required (see types.parsedPlatform in lib/systems/parse.nix). This

55# file takes an already-valid platform and further elaborates it with

6−# optional fields such as linux-kernel, gcc, etc.

6+# optional fields; currently these are: linux-kernel, gcc, and rustc.

77

88{ lib }:

99rec {

@@ -568,5 +568,5 @@ rec {

568568

569569 else if platform.parsed.cpu == lib.systems.parse.cpuTypes.powerpc64le then powernv

570570

571− else pc;

571+ else { };

572572}

maintainers/maintainer-list.nix+18

@@ -1409,6 +1409,12 @@

14091409 githubId = 164148;

14101410 name = "Ben Darwin";

14111411 };

1412+ bdd = {

1413+ email = "bdd@mindcast.org";

1414+ github = "bdd";

1415+ githubId = 11135;

1416+ name = "Berk D. Demir";

1417+ };

14121418 bdesham = {

14131419 email = "benjamin@esham.io";

14141420 github = "bdesham";

@@ -13288,6 +13294,12 @@

1328813294 githubId = 1771332;

1328913295 name = "László Vaskó";

1329013296 };

13297+ vlinkz = {

13298+ email = "vmfuentes64@gmail.com";

13299+ github = "vlinkz";

13300+ githubId = 20145996;

13301+ name = "Victor Fuentes";

13302+ };

1329113303 vlstill = {

1329213304 email = "xstill@fi.muni.cz";

1329313305 github = "vlstill";

@@ -14199,6 +14211,12 @@

1419914211 github = "deifactor";

1420014212 githubId = 30192992;

1420114213 };

14214+ deinferno = {

14215+ name = "deinferno";

14216+ email = "14363193+deinferno@users.noreply.github.com";

14217+ github = "deinferno";

14218+ githubId = 14363193;

14219+ };

1420214220 fzakaria = {

1420314221 name = "Farid Zakaria";

1420414222 email = "farid.m.zakaria@gmail.com";

maintainers/scripts/pluginupdate.py+12−6

@@ -311,6 +311,16 @@ def load_plugins_from_csv(config: FetchConfig, input_file: Path,) -> List[Plugin

311311

312312 return plugins

313313

314+def run_nix_expr(expr):

315+ with CleanEnvironment():

316+ cmd = ["nix", "eval", "--extra-experimental-features",

317+ "nix-command", "--impure", "--json", "--expr", expr]

318+ log.debug("Running command %s", cmd)

319+ out = subprocess.check_output(cmd)

320+ data = json.loads(out)

321+ return data

322+

323+

314324class Editor:

315325 """The configuration of the update script."""

316326

@@ -333,13 +343,9 @@ class Editor:

333343 self.deprecated = deprecated or root.joinpath("deprecated.json")

334344 self.cache_file = cache_file or f"{name}-plugin-cache.json"

335345

336− def get_current_plugins(editor) -> List[Plugin]:

346+ def get_current_plugins(self) -> List[Plugin]:

337347 """To fill the cache"""

338− with CleanEnvironment():

339− cmd = ["nix", "eval", "--extra-experimental-features", "nix-command", "--impure", "--json", "--expr", editor.get_plugins]

340− log.debug("Running command %s", cmd)

341− out = subprocess.check_output(cmd)

342− data = json.loads(out)

348+ data = run_nix_expr(self.get_plugins)

343349 plugins = []

344350 for name, attr in data.items():

345351 print("get_current_plugins: name %s" % name)

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+40

@@ -43,6 +43,33 @@

4343 Shell.

4444 </para>

4545 </listitem>

46+ <listitem>

47+ <para>

48+ <literal>stdenv.mkDerivation</literal> now supports a

49+ self-referencing <literal>finalAttrs:</literal> parameter

50+ containing the final <literal>mkDerivation</literal> arguments

51+ including overrides. <literal>drv.overrideAttrs</literal> now

52+ supports two parameters

53+ <literal>finalAttrs: previousAttrs:</literal>. This allows

54+ packaging configuration to be overridden in a consistent

55+ manner by providing an alternative to

56+ <literal>rec {}</literal> syntax.

57+ </para>

58+ <para>

59+ Additionally, <literal>passthru</literal> can now reference

60+ <literal>finalAttrs.finalPackage</literal> containing the

61+ final package, including attributes such as the output paths

62+ and <literal>overrideAttrs</literal>.

63+ </para>

64+ <para>

65+ New language integrations can be simplified by overriding a

66+ <quote>prototype</quote> package containing the

67+ language-specific logic. This removes the need for a extra

68+ layer of overriding for the <quote>generic builder</quote>

69+ arguments, thus removing a usability problem and source of

70+ error.

71+ </para>

72+ </listitem>

4673 <listitem>

4774 <para>

4875 PHP 8.1 is now available

@@ -124,6 +151,14 @@

124151 default.

125152 </para>

126153 </listitem>

154+ <listitem>

155+ <para>

156+ The GNOME and Plasma installation CDs now use

157+ <literal>pkgs.calamares</literal> and

158+ <literal>pkgs.calamares-nixos-extensions</literal> to allow

159+ users to easily install and set up NixOS with a GUI.

160+ </para>

161+ </listitem>

127162 </itemizedlist>

128163 </section>

129164 <section xml:id="sec-release-22.05-new-services">

@@ -842,6 +877,11 @@

842877 to the new location if the <literal>stateVersion</literal> is

843878 updated.

844879 </para>

880+ <para>

881+ As of Synapse 1.58.0, the old groups/communities feature has

882+ been disabled by default. It will be completely removed with

883+ Synapse 1.61.0.

884+ </para>

845885 </listitem>

846886 <listitem>

847887 <para>

nixos/doc/manual/release-notes/rl-2205.section.md+19

@@ -17,6 +17,21 @@ In addition to numerous new and upgraded packages, this release has the followin

1717

1818- GNOME has been upgraded to 42. Please take a look at their [Release Notes](https://release.gnome.org/42/) for details. Notably, it replaces gedit with GNOME Text Editor, GNOME Terminal with GNOME Console (formerly King’s Cross), and GNOME Screenshot with a tool built into the Shell.

1919

20+- `stdenv.mkDerivation` now supports a self-referencing `finalAttrs:` parameter

21+ containing the final `mkDerivation` arguments including overrides.

22+ `drv.overrideAttrs` now supports two parameters `finalAttrs: previousAttrs:`.

23+ This allows packaging configuration to be overridden in a consistent manner by

24+ providing an alternative to `rec {}` syntax.

25+

26+ Additionally, `passthru` can now reference `finalAttrs.finalPackage` containing

27+ the final package, including attributes such as the output paths and

28+ `overrideAttrs`.

29+

30+ New language integrations can be simplified by overriding a "prototype"

31+ package containing the language-specific logic. This removes the need for a

32+ extra layer of overriding for the "generic builder" arguments, thus removing a

33+ usability problem and source of error.

34+

2035- PHP 8.1 is now available

2136

2237- Mattermost has been updated to extended support release 6.3, as the previously packaged extended support release 5.37 is [reaching its end of life](https://docs.mattermost.com/upgrade/extended-support-release.html).

@@ -38,6 +53,8 @@ In addition to numerous new and upgraded packages, this release has the followin

3853

3954- The default GHC version has been updated from 8.10.7 to 9.0.2. `pkgs.haskellPackages` and `pkgs.ghc` will now use this version by default.

4055

56+- The GNOME and Plasma installation CDs now use `pkgs.calamares` and `pkgs.calamares-nixos-extensions` to allow users to easily install and set up NixOS with a GUI.

57+

4158## New Services {#sec-release-22.05-new-services}

4259

4360- [aesmd](https://github.com/intel/linux-sgx#install-the-intelr-sgx-psw), the Intel SGX Architectural Enclave Service Manager. Available as [services.aesmd](#opt-services.aesmd.enable).

@@ -345,6 +362,8 @@ In addition to numerous new and upgraded packages, this release has the followin

345362 `media_store_path` was changed from `${dataDir}/media` to `${dataDir}/media_store` if `system.stateVersion` is at least `22.05`. Files will need to be manually moved to the new

346363 location if the `stateVersion` is updated.

347364

365+ As of Synapse 1.58.0, the old groups/communities feature has been disabled by default. It will be completely removed with Synapse 1.61.0.

366+

348367- The Keycloak package (`pkgs.keycloak`) has been switched from the

349368 Wildfly version, which will soon be deprecated, to the Quarkus based

350369 version. The Keycloak service (`services.keycloak`) has been updated

nixos/maintainers/scripts/lxd/lxd-image.nix+1−1

@@ -27,7 +27,7 @@ with lib;

2727 networking.useDHCP = false;

2828 networking.interfaces.eth0.useDHCP = true;

2929

30− # As this is intended as a stadalone image, undo some of the minimal profile stuff

30+ # As this is intended as a standalone image, undo some of the minimal profile stuff

3131 documentation.enable = true;

3232 documentation.nixos.enable = true;

3333 environment.noXlibs = false;

nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix+14−8

@@ -35,22 +35,28 @@ with lib;

3535 # Enable sound in graphical iso's.

3636 hardware.pulseaudio.enable = true;

3737

38− environment.systemPackages = [

38+ # Spice guest additions

39+ services.spice-vdagentd.enable = true;

40+

41+ # Enable plymouth

42+ boot.plymouth.enable = true;

43+

44+ environment.defaultPackages = with pkgs; [

3945 # Include gparted for partitioning disks.

40− pkgs.gparted

46+ gparted

4147

4248 # Include some editors.

43− pkgs.vim

44− pkgs.bvi # binary editor

45− pkgs.joe

49+ vim

50+ nano

4651

4752 # Include some version control tools.

48− pkgs.git

53+ git

54+ rsync

4955

5056 # Firefox for reading the manual.

51− pkgs.firefox

57+ firefox

5258

53− pkgs.glxinfo

59+ glxinfo

5460 ];

5561

5662}

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nixnew file+59

@@ -0,0 +1,59 @@

1+# This module defines a NixOS installation CD that contains GNOME.

2+

3+{ pkgs, ... }:

4+

5+{

6+ imports = [ ./installation-cd-graphical-calamares.nix ];

7+

8+ isoImage.edition = "gnome";

9+

10+ services.xserver.desktopManager.gnome = {

11+ # Add Firefox and other tools useful for installation to the launcher

12+ favoriteAppsOverride = ''

13+ [org.gnome.shell]

14+ favorite-apps=[ 'firefox.desktop', 'nixos-manual.desktop', 'org.gnome.Console.desktop', 'org.gnome.Nautilus.desktop', 'gparted.desktop', 'io.calamares.calamares.desktop' ]

15+ '';

16+

17+ # Override GNOME defaults to disable GNOME tour and disable suspend

18+ extraGSettingsOverrides = ''

19+ [org.gnome.shell]

20+ welcome-dialog-last-shown-version='9999999999'

21+

22+ [org.gnome.settings-daemon.plugins.power]

23+ sleep-inactive-ac-type='nothing'

24+ sleep-inactive-battery-type='nothing'

25+ '';

26+

27+ extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ];

28+

29+ enable = true;

30+ };

31+

32+ # Theme calamares with GNOME theme

33+ qt5 = {

34+ enable = true;

35+ platformTheme = "gnome";

36+ };

37+

38+ # Fix scaling for calamares on wayland

39+ environment.variables = {

40+ QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";

41+ };

42+

43+ services.xserver.displayManager = {

44+ gdm = {

45+ enable = true;

46+ # autoSuspend makes the machine automatically suspend after inactivity.

47+ # It's possible someone could/try to ssh'd into the machine and obviously

48+ # have issues because it's inactive.

49+ # See:

50+ # * https://github.com/NixOS/nixpkgs/pull/63790

51+ # * https://gitlab.gnome.org/GNOME/gnome-control-center/issues/22

52+ autoSuspend = false;

53+ };

54+ autoLogin = {

55+ enable = true;

56+ user = "nixos";

57+ };

58+ };

59+}

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nixnew file+49

@@ -0,0 +1,49 @@

1+# This module defines a NixOS installation CD that contains X11 and

2+# Plasma 5.

3+

4+{ pkgs, ... }:

5+

6+{

7+ imports = [ ./installation-cd-graphical-calamares.nix ];

8+

9+ isoImage.edition = "plasma5";

10+

11+ services.xserver = {

12+ desktopManager.plasma5 = {

13+ enable = true;

14+ };

15+

16+ # Automatically login as nixos.

17+ displayManager = {

18+ sddm.enable = true;

19+ autoLogin = {

20+ enable = true;

21+ user = "nixos";

22+ };

23+ };

24+ };

25+

26+ environment.systemPackages = with pkgs; [

27+ # Graphical text editor

28+ kate

29+ ];

30+

31+ system.activationScripts.installerDesktop = let

32+

33+ # Comes from documentation.nix when xserver and nixos.enable are true.

34+ manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop";

35+

36+ homeDir = "/home/nixos/";

37+ desktopDir = homeDir + "Desktop/";

38+

39+ in ''

40+ mkdir -p ${desktopDir}

41+ chown nixos ${homeDir} ${desktopDir}

42+

43+ ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"}

44+ ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"}

45+ ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop ${desktopDir + "org.kde.konsole.desktop"}

46+ ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${desktopDir + "io.calamares.calamares.desktop"}

47+ '';

48+

49+}

nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nixnew file+20

@@ -0,0 +1,20 @@

1+# This module adds the calamares installer to the basic graphical NixOS

2+# installation CD.

3+

4+{ pkgs, ... }:

5+let

6+ calamares-nixos-autostart = pkgs.makeAutostartItem { name = "io.calamares.calamares"; package = pkgs.calamares-nixos; };

7+in

8+{

9+ imports = [ ./installation-cd-graphical-base.nix ];

10+

11+ environment.systemPackages = with pkgs; [

12+ # Calamares for graphical installation

13+ libsForQt5.kpmcore

14+ calamares-nixos

15+ calamares-nixos-autostart

16+ calamares-nixos-extensions

17+ # Needed for calamares QML module packagechooserq

18+ libsForQt5.full

19+ ];

20+}

nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix+1−3

@@ -1,8 +1,6 @@

11# This module defines a NixOS installation CD that contains GNOME.

22

3−{ lib, ... }:

4−

5−with lib;

3+{ ... }:

64

75{

86 imports = [ ./installation-cd-graphical-base.nix ];

nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix+1−3

@@ -1,9 +1,7 @@

11# This module defines a NixOS installation CD that contains X11 and

22# Plasma 5.

33

4−{ config, lib, pkgs, ... }:

5−

6−with lib;

4+{ pkgs, ... }:

75

86{

97 imports = [ ./installation-cd-graphical-base.nix ];

nixos/modules/module-list.nix+1

@@ -1256,6 +1256,7 @@

12561256 ./virtualisation/virtualbox-guest.nix

12571257 ./virtualisation/virtualbox-host.nix

12581258 ./virtualisation/vmware-guest.nix

1259+ ./virtualisation/vmware-host.nix

12591260 ./virtualisation/waydroid.nix

12601261 ./virtualisation/xen-dom0.nix

12611262 ./virtualisation/xe-guest-utilities.nix

nixos/modules/programs/thefuck.nix+7−6

@@ -6,9 +6,12 @@ let

66 prg = config.programs;

77 cfg = prg.thefuck;

88

9− initScript = ''

9+ bashAndZshInitScript = ''

1010 eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})

1111 '';

12+ fishInitScript = ''

13+ ${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias} | source

14+ '';

1215in

1316 {

1417 options = {

@@ -30,10 +33,8 @@ in

3033 config = mkIf cfg.enable {

3134 environment.systemPackages = with pkgs; [ thefuck ];

3235

33− programs.bash.interactiveShellInit = initScript;

34− programs.zsh.interactiveShellInit = mkIf prg.zsh.enable initScript;

35− programs.fish.interactiveShellInit = mkIf prg.fish.enable ''

36− ${pkgs.thefuck}/bin/thefuck --alias | source

37− '';

36+ programs.bash.interactiveShellInit = bashAndZshInitScript;

37+ programs.zsh.interactiveShellInit = mkIf prg.zsh.enable bashAndZshInitScript;

38+ programs.fish.interactiveShellInit = mkIf prg.fish.enable fishInitScript;

3839 };

3940 }

nixos/modules/security/pam.nix+3−3

@@ -492,7 +492,7 @@ let

492492 auth ${ussh.control} ${pkgs.pam_ussh}/lib/security/pam_ussh.so ${optionalString (ussh.caFile != null) "ca_file=${ussh.caFile}"} ${optionalString (ussh.authorizedPrincipals != null) "authorized_principals=${ussh.authorizedPrincipals}"} ${optionalString (ussh.authorizedPrincipalsFile != null) "authorized_principals_file=${ussh.authorizedPrincipalsFile}"} ${optionalString (ussh.group != null) "group=${ussh.group}"}

493493 '') +

494494 (let oath = config.security.pam.oath; in optionalString cfg.oathAuth ''

495− auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}

495+ auth requisite ${pkgs.oath-toolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}

496496 '') +

497497 (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth ''

498498 auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}

@@ -1131,7 +1131,7 @@ in

11311131 ++ optional config.services.sssd.enable pkgs.sssd

11321132 ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]

11331133 ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]

1134− ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]

1134+ ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ]

11351135 ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ]

11361136 ++ optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];

11371137

@@ -1221,7 +1221,7 @@ in

12211221 mr ${pkgs.pam_ussh}/lib/security/pam_ussh.so,

12221222 '' +

12231223 optionalString (isEnabled (cfg: cfg.oathAuth)) ''

1224− "mr ${pkgs.oathToolkit}/lib/security/pam_oath.so,

1224+ "mr ${pkgs.oath-toolkit}/lib/security/pam_oath.so,

12251225 '' +

12261226 optionalString (isEnabled (cfg: cfg.yubicoAuth)) ''

12271227 mr ${pkgs.yubico-pam}/lib/security/pam_yubico.so,

nixos/modules/services/hardware/udev.nix+32−7

@@ -8,6 +8,24 @@ let

88

99 cfg = config.services.udev;

1010

11+ initrdUdevRules = pkgs.runCommand "initrd-udev-rules" {} ''

12+ mkdir -p $out/etc/udev/rules.d

13+ for f in 60-cdrom_id 60-persistent-storage 75-net-description 80-drivers 80-net-setup-link; do

14+ ln -s ${config.boot.initrd.systemd.package}/lib/udev/rules.d/$f.rules $out/etc/udev/rules.d

15+ done

16+ '';

17+

18+

19+ # networkd link files are used early by udev to set up interfaces early.

20+ # This must be done in stage 1 to avoid race conditions between udev and

21+ # network daemons.

22+ # TODO move this into the initrd-network module when it exists

23+ initrdLinkUnits = pkgs.runCommand "initrd-link-units" {} ''

24+ mkdir -p $out

25+ ln -s ${udev}/lib/systemd/network/*.link $out/

26+ ${lib.concatMapStringsSep "\n" (file: "ln -s ${file} $out/") (lib.mapAttrsToList (n: v: "${v.unit}/${n}") (lib.filterAttrs (n: _: hasSuffix ".link" n) config.systemd.network.units))}

27+ '';

28+

1129 extraUdevRules = pkgs.writeTextFile {

1230 name = "extra-udev-rules";

1331 text = cfg.extraRules;

@@ -350,7 +368,10 @@ in

350368 ];

351369 boot.initrd.systemd.storePaths = [

352370 "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"

353− "${config.boot.initrd.systemd.package}/lib/udev"

371+ "${config.boot.initrd.systemd.package}/lib/udev/ata_id"

372+ "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"

373+ "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"

374+ "${config.boot.initrd.systemd.package}/lib/udev/rules.d"

354375 ] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages;

355376

356377 # Generate the udev rules for the initrd

@@ -364,13 +385,17 @@ in

364385 systemd = config.boot.initrd.systemd.package;

365386 binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ];

366387 };

388+ "/etc/systemd/network".source = initrdLinkUnits;

367389 };

368− # Insert custom rules

369− boot.initrd.services.udev.packages = mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {

370− name = "initrd-udev-rules";

371− destination = "/etc/udev/rules.d/99-local.rules";

372− text = config.boot.initrd.services.udev.rules;

373− });

390+ # Insert initrd rules

391+ boot.initrd.services.udev.packages = [

392+ initrdUdevRules

393+ (mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {

394+ name = "initrd-udev-rules";

395+ destination = "/etc/udev/rules.d/99-local.rules";

396+ text = config.boot.initrd.services.udev.rules;

397+ }))

398+ ];

374399

375400 environment.etc =

376401 {

nixos/modules/services/networking/ssh/sshd.nix+1

@@ -441,6 +441,7 @@ in

441441

442442 ${flip concatMapStrings cfg.hostKeys (k: ''

443443 if ! [ -s "${k.path}" ]; then

444+ rm -f "${k.path}"

444445 ssh-keygen \

445446 -t "${k.type}" \

446447 ${if k ? bits then "-b ${toString k.bits}" else ""} \

nixos/modules/services/web-apps/keycloak.nix+2−1

@@ -540,7 +540,8 @@ in

540540 db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type;

541541 db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;

542542 db-password._secret = cfg.database.passwordFile;

543− db-url-host = "${cfg.database.host}:${toString cfg.database.port}";

543+ db-url-host = cfg.database.host;

544+ db-url-port = toString cfg.database.port;

544545 db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name;

545546 db-url-properties = prefixUnlessEmpty "?" dbProps;

546547 db-url = null;

nixos/modules/virtualisation/vmware-host.nixnew file+166

@@ -0,0 +1,166 @@

1+{ config, pkgs, lib, ... }:

2+

3+let

4+ cfg = config.virtualisation.vmware.host;

5+ wrapperDir = "/run/vmware/bin"; # Perfectly fits as /usr/local/bin

6+ parentWrapperDir = dirOf wrapperDir;

7+ vmwareWrappers = # Needed as hardcoded paths workaround

8+ let mkVmwareSymlink =

9+ program:

10+ ''

11+ ln -s "${config.security.wrapperDir}/${program}" $wrapperDir/${program}

12+ '';

13+ in

14+ [

15+ (mkVmwareSymlink "pkexec")

16+ (mkVmwareSymlink "mount")

17+ (mkVmwareSymlink "umount")

18+ ];

19+in

20+{

21+ options = with lib; {

22+ virtualisation.vmware.host = {

23+ enable = mkEnableOption "VMware" // {

24+ description = ''

25+ This enables VMware host virtualisation for running VMs.

26+

27+ <important><para>

28+ <literal>vmware-vmx</literal> will cause kcompactd0 due to

29+ <literal>Transparent Hugepages</literal> feature in kernel.

30+ Apply <literal>[ "transparent_hugepage=never" ]</literal> in

31+ option <option>boot.kernelParams</option> to disable them.

32+ </para></important>

33+

34+ <note><para>

35+ If that didn't work disable <literal>TRANSPARENT_HUGEPAGE</literal>,

36+ <literal>COMPACTION</literal> configs and recompile kernel.

37+ </para></note>

38+ '';

39+ };

40+ package = mkOption {

41+ type = types.package;

42+ default = pkgs.vmware-workstation;

43+ defaultText = literalExpression "pkgs.vmware-workstation";

44+ description = "VMware host virtualisation package to use";

45+ };

46+ extraPackages = mkOption {

47+ type = with types; listOf package;

48+ default = with pkgs; [ ];

49+ description = "Extra packages to be used with VMware host.";

50+ example = "with pkgs; [ ntfs3g ]";

51+ };

52+ extraConfig = mkOption {

53+ type = types.lines;

54+ default = "";

55+ description = "Add extra config to /etc/vmware/config";

56+ example = ''

57+ # Allow unsupported device's OpenGL and Vulkan acceleration for guest vGPU

58+ mks.gl.allowUnsupportedDrivers = "TRUE"

59+ mks.vk.allowUnsupportedDevices = "TRUE"

60+ '';

61+ };

62+ };

63+ };

64+

65+ config = lib.mkIf cfg.enable {

66+ boot.extraModulePackages = [ config.boot.kernelPackages.vmware ];

67+ boot.extraModprobeConfig = "alias char-major-10-229 fuse";

68+ boot.kernelModules = [ "vmw_pvscsi" "vmw_vmci" "vmmon" "vmnet" "fuse" ];

69+

70+ environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;

71+ services.printing.drivers = [ cfg.package ];

72+

73+ environment.etc."vmware/config".text = ''

74+ ${builtins.readFile "${cfg.package}/etc/vmware/config"}

75+ ${cfg.extraConfig}

76+ '';

77+

78+ environment.etc."vmware/bootstrap".source = "${cfg.package}/etc/vmware/bootstrap";

79+ environment.etc."vmware/icu".source = "${cfg.package}/etc/vmware/icu";

80+ environment.etc."vmware-installer".source = "${cfg.package}/etc/vmware-installer";

81+

82+ # SUID wrappers

83+

84+ security.wrappers = {

85+ vmware-vmx = {

86+ setuid = true;

87+ owner = "root";

88+ group = "root";

89+ source = "${cfg.package}/lib/vmware/bin/.vmware-vmx-wrapped";

90+ };

91+ };

92+

93+ ###### wrappers activation script

94+

95+ system.activationScripts.vmwareWrappers =

96+ lib.stringAfter [ "specialfs" "users" ]

97+ ''

98+ mkdir -p "${parentWrapperDir}"

99+ chmod 755 "${parentWrapperDir}"

100+ # We want to place the tmpdirs for the wrappers to the parent dir.

101+ wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)

102+ chmod a+rx "$wrapperDir"

103+ ${lib.concatStringsSep "\n" (vmwareWrappers)}

104+ if [ -L ${wrapperDir} ]; then

105+ # Atomically replace the symlink

106+ # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/

107+ old=$(readlink -f ${wrapperDir})

108+ if [ -e "${wrapperDir}-tmp" ]; then

109+ rm --force --recursive "${wrapperDir}-tmp"

110+ fi

111+ ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp"

112+ mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}"

113+ rm --force --recursive "$old"

114+ else

115+ # For initial setup

116+ ln --symbolic "$wrapperDir" "${wrapperDir}"

117+ fi

118+ '';

119+

120+ # Services

121+

122+ systemd.services."vmware-authdlauncher" = {

123+ description = "VMware Authentification Daemon";

124+ serviceConfig = {

125+ Type = "forking";

126+ ExecStart = [ "${cfg.package}/bin/vmware-authdlauncher" ];

127+ };

128+ wantedBy = [ "multi-user.target" ];

129+ };

130+

131+ systemd.services."vmware-networks-configuration" = {

132+ description = "VMware Networks Configuration Generation";

133+ unitConfig.ConditionPathExists = "!/etc/vmware/networking";

134+ serviceConfig = {

135+ UMask = "0077";

136+ ExecStart = [

137+ "${cfg.package}/bin/vmware-networks --postinstall vmware-player,0,1"

138+ ];

139+ Type = "oneshot";

140+ RemainAfterExit = "yes";

141+ };

142+ wantedBy = [ "multi-user.target" ];

143+ };

144+

145+ systemd.services."vmware-networks" = {

146+ description = "VMware Networks";

147+ after = [ "vmware-networks-configuration.service" ];

148+ requires = [ "vmware-networks-configuration.service" ];

149+ serviceConfig = {

150+ Type = "forking";

151+ ExecCondition = [ "${pkgs.kmod}/bin/modprobe vmnet" ];

152+ ExecStart = [ "${cfg.package}/bin/vmware-networks --start" ];

153+ ExecStop = [ "${cfg.package}/bin/vmware-networks --stop" ];

154+ };

155+ wantedBy = [ "multi-user.target" ];

156+ };

157+

158+ systemd.services."vmware-usbarbitrator" = {

159+ description = "VMware USB Arbitrator";

160+ serviceConfig = {

161+ ExecStart = [ "${cfg.package}/bin/vmware-usbarbitrator -f" ];

162+ };

163+ wantedBy = [ "multi-user.target" ];

164+ };

165+ };

166+}

nixos/release.nix+2−2

@@ -150,13 +150,13 @@ in rec {

150150 });

151151

152152 iso_plasma5 = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {

153− module = ./modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix;

153+ module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix;

154154 type = "plasma5";

155155 inherit system;

156156 });

157157

158158 iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso {

159− module = ./modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;

159+ module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix;

160160 type = "gnome";

161161 inherit system;

162162 });

nixos/tests/all-tests.nix−1

@@ -284,7 +284,6 @@ in

284284 loki = handleTest ./loki.nix {};

285285 lvm2 = handleTest ./lvm2 {};

286286 lxd = handleTest ./lxd.nix {};

287− lxd-image = handleTest ./lxd-image.nix {};

288287 lxd-nftables = handleTest ./lxd-nftables.nix {};

289288 lxd-image-server = handleTest ./lxd-image-server.nix {};

290289 #logstash = handleTest ./logstash.nix {};

nixos/tests/common/lxd/config.yamlnew file+24

@@ -0,0 +1,24 @@

1+storage_pools:

2+ - name: default

3+ driver: dir

4+ config:

5+ source: /var/lxd-pool

6+

7+networks:

8+ - name: lxdbr0

9+ type: bridge

10+ config:

11+ ipv4.address: auto

12+ ipv6.address: none

13+

14+profiles:

15+ - name: default

16+ devices:

17+ eth0:

18+ name: eth0

19+ network: lxdbr0

20+ type: nic

21+ root:

22+ path: /

23+ pool: default

24+ type: disk

nixos/tests/lxd-image-server.nix+15−48

@@ -1,54 +1,21 @@

1−import ./make-test-python.nix ({ pkgs, ...} :

1+import ./make-test-python.nix ({ pkgs, lib, ... } :

22

33let

4− # Since we don't have access to the internet during the tests, we have to

5− # pre-fetch lxd containers beforehand.

6− #

7− # I've chosen to import Alpine Linux, because its image is turbo-tiny and,

8− # generally, sufficient for our tests.

9− alpine-meta = pkgs.fetchurl {

10− url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

11− hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

12− };

13−

14− alpine-rootfs = pkgs.fetchurl {

15− url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

16− hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

4+ lxd-image = import ../release.nix {

5+ configuration = {

6+ # Building documentation makes the test unnecessarily take a longer time:

7+ documentation.enable = lib.mkForce false;

8+ };

179 };

1810

19− lxd-config = pkgs.writeText "config.yaml" ''

20− storage_pools:

21− - name: default

22− driver: dir

23− config:

24− source: /var/lxd-pool

25−

26− networks:

27− - name: lxdbr0

28− type: bridge

29− config:

30− ipv4.address: auto

31− ipv6.address: none

32−

33− profiles:

34− - name: default

35− devices:

36− eth0:

37− name: eth0

38− network: lxdbr0

39− type: nic

40− root:

41− path: /

42− pool: default

43− type: disk

44− '';

45−

11+ lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

12+ lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

4613

4714in {

4815 name = "lxd-image-server";

4916

5017 meta = with pkgs.lib.maintainers; {

51− maintainers = [ mkg20001 ];

18+ maintainers = [ mkg20001 patryk27 ];

5219 };

5320

5421 nodes.machine = { lib, ... }: {

@@ -100,20 +67,20 @@ in {

10067 # lxd expects the pool's directory to already exist

10168 machine.succeed("mkdir /var/lxd-pool")

10269

103−

10470 machine.succeed(

105− "cat ${lxd-config} | lxd init --preseed"

71+ "cat ${./common/lxd/config.yaml} | lxd init --preseed"

10672 )

10773

10874 machine.succeed(

109− "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

75+ "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

11076 )

11177

112− loc = "/var/www/simplestreams/images/iats/alpine/amd64/default/v1"

78+ loc = "/var/www/simplestreams/images/iats/nixos/amd64/default/v1"

11379

11480 with subtest("push image to server"):

115− machine.succeed("lxc launch alpine test")

116− machine.succeed("lxc stop test")

81+ machine.succeed("lxc launch nixos test")

82+ machine.sleep(5)

83+ machine.succeed("lxc stop -f test")

11784 machine.succeed("lxc publish --public test --alias=testimg")

11885 machine.succeed("lxc image export testimg")

11986 machine.succeed("ls >&2")

nixos/tests/lxd-image.nixdeleted−89

@@ -1,89 +0,0 @@

1−# This test ensures that the nixOS lxd images builds and functions properly

2−# It has been extracted from `lxd.nix` to seperate failures of just the image and the lxd software

3−

4−import ./make-test-python.nix ({ pkgs, ...} : let

5− release = import ../release.nix {

6− /* configuration = {

7− environment.systemPackages = with pkgs; [ stdenv ]; # inject stdenv so rebuild test works

8− }; */

9− };

10−

11− metadata = release.lxdMeta.${pkgs.system};

12− image = release.lxdImage.${pkgs.system};

13−

14− lxd-config = pkgs.writeText "config.yaml" ''

15− storage_pools:

16− - name: default

17− driver: dir

18− config:

19− source: /var/lxd-pool

20−

21− networks:

22− - name: lxdbr0

23− type: bridge

24− config:

25− ipv4.address: auto

26− ipv6.address: none

27−

28− profiles:

29− - name: default

30− devices:

31− eth0:

32− name: eth0

33− network: lxdbr0

34− type: nic

35− root:

36− path: /

37− pool: default

38− type: disk

39− '';

40−in {

41− name = "lxd-image";

42−

43− meta = with pkgs.lib.maintainers; {

44− maintainers = [ mkg20001 ];

45− };

46−

47− nodes.machine = { lib, ... }: {

48− virtualisation = {

49− # disk full otherwise

50− diskSize = 2048;

51−

52− lxc.lxcfs.enable = true;

53− lxd.enable = true;

54− };

55− };

56−

57− testScript = ''

58− machine.wait_for_unit("sockets.target")

59− machine.wait_for_unit("lxd.service")

60− machine.wait_for_file("/var/lib/lxd/unix.socket")

61−

62− # It takes additional second for lxd to settle

63− machine.sleep(1)

64−

65− # lxd expects the pool's directory to already exist

66− machine.succeed("mkdir /var/lxd-pool")

67−

68− machine.succeed(

69− "cat ${lxd-config} | lxd init --preseed"

70− )

71−

72− # TODO: test custom built container aswell

73−

74− with subtest("importing container works"):

75− machine.succeed("lxc image import ${metadata}/*/*.tar.xz ${image}/*/*.tar.xz --alias nixos")

76−

77− with subtest("launching container works"):

78− machine.succeed("lxc launch nixos machine -c security.nesting=true")

79− # make sure machine boots up properly

80− machine.sleep(5)

81−

82− with subtest("container shell works"):

83− machine.succeed("echo true | lxc exec machine /run/current-system/sw/bin/bash -")

84− machine.succeed("lxc exec machine /run/current-system/sw/bin/true")

85−

86− # with subtest("rebuilding works"):

87− # machine.succeed("lxc exec machine /run/current-system/sw/bin/nixos-rebuild switch")

88− '';

89−})

nixos/tests/lxd.nix+40−94

@@ -1,79 +1,18 @@

1−import ./make-test-python.nix ({ pkgs, ...} :

1+import ./make-test-python.nix ({ pkgs, lib, ... } :

22

33let

4− # Since we don't have access to the internet during the tests, we have to

5− # pre-fetch lxd containers beforehand.

6− #

7− # I've chosen to import Alpine Linux, because its image is turbo-tiny and,

8− # generally, sufficient for our tests.

9− alpine-meta-x86 = pkgs.fetchurl {

10− url = "https://tarballs.nixos.org/alpine/3.12/lxd.tar.xz";

11− hash = "sha256-1tcKaO9lOkvqfmG/7FMbfAEToAuFy2YMewS8ysBKuLA=";

12− };

13− alpine-meta-for = arch: pkgs.stdenv.mkDerivation {

14− name = "alpine-meta-${arch}";

15− version = "3.12";

16− unpackPhase = "true";

17− buildPhase = ''

18− runHook preBuild

19−

20− tar xvf ${alpine-meta-x86}

21− sed -i 's/architecture: .*/architecture: ${arch}/' metadata.yaml

22−

23− runHook postBuild

24− '';

25− installPhase = ''

26− runHook preInstall

27−

28− tar czRf $out *

29−

30− runHook postInstall

31− '';

32− };

4+ lxd-image = import ../release.nix {

5+ configuration = {

6+ # Building documentation makes the test unnecessarily take a longer time:

7+ documentation.enable = lib.mkForce false;

338

34− alpine-meta = {

35− x86_64-linux = alpine-meta-x86;

36− aarch64-linux = alpine-meta-for "aarch64";

37− }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");

38−

39− alpine-rootfs = {

40− x86_64-linux = pkgs.fetchurl {

41− url = "https://tarballs.nixos.org/alpine/3.12/rootfs.tar.xz";

42− hash = "sha256-Tba9sSoaiMtQLY45u7p5DMqXTSDgs/763L/SQp0bkCA=";

43− };

44− aarch64-linux = pkgs.fetchurl {

45− url = "https://dl-cdn.alpinelinux.org/alpine/v3.15/releases/aarch64/alpine-minirootfs-3.15.4-aarch64.tar.gz";

46− hash = "sha256-9kBz8Jwmo8XepJhTMt5zilCaHHpflnUH7y9+0To39Us=";

9+ # Our tests require `grep` & friends:

10+ environment.systemPackages = with pkgs; [ busybox ];

4711 };

48− }.${pkgs.system} or (throw "Unsupported system: ${pkgs.system}");

49−

50− lxd-config = pkgs.writeText "config.yaml" ''

51− storage_pools:

52− - name: default

53− driver: dir

54− config:

55− source: /var/lxd-pool

56−

57− networks:

58− - name: lxdbr0

59− type: bridge

60− config:

61− ipv4.address: auto

62− ipv6.address: none

63−

64− profiles:

65− - name: default

66− devices:

67− eth0:

68− name: eth0

69− network: lxdbr0

70− type: nic

71− root:

72− path: /

73− pool: default

74− type: disk

75− '';

12+ };

7613

14+ lxd-image-metadata = lxd-image.lxdMeta.${pkgs.system};

15+ lxd-image-rootfs = lxd-image.lxdImage.${pkgs.system};

7716

7817in {

7918 name = "lxd";

@@ -84,6 +23,8 @@ in {

8423

8524 nodes.machine = { lib, ... }: {

8625 virtualisation = {

26+ diskSize = 2048;

27+

8728 # Since we're testing `limits.cpu`, we've gotta have a known number of

8829 # cores to lean on

8930 cores = 2;

@@ -108,61 +49,66 @@ in {

10849 machine.succeed("mkdir /var/lxd-pool")

10950

11051 machine.succeed(

111− "cat ${lxd-config} | lxd init --preseed"

52+ "cat ${./common/lxd/config.yaml} | lxd init --preseed"

11253 )

11354

11455 machine.succeed(

115− "lxc image import ${alpine-meta} ${alpine-rootfs} --alias alpine"

56+ "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos"

11657 )

11758

118− with subtest("Containers can be launched and destroyed"):

119− machine.succeed("lxc launch alpine test")

120− machine.succeed("lxc exec test true")

121− machine.succeed("lxc delete -f test")

59+ with subtest("Container can be managed"):

60+ machine.succeed("lxc launch nixos container")

61+ machine.sleep(5)

62+ machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -")

63+ machine.succeed("lxc exec container true")

64+ machine.succeed("lxc delete -f container")

12265

123− with subtest("Containers are being mounted with lxcfs inside"):

124− machine.succeed("lxc launch alpine test")

66+ with subtest("Container is mounted with lxcfs inside"):

67+ machine.succeed("lxc launch nixos container")

68+ machine.sleep(5)

12569

12670 ## ---------- ##

12771 ## limits.cpu ##

12872

129− machine.succeed("lxc config set test limits.cpu 1")

130− machine.succeed("lxc restart test")

73+ machine.succeed("lxc config set container limits.cpu 1")

74+ machine.succeed("lxc restart container")

75+ machine.sleep(5)

13176

132− # Since Alpine doesn't have `nproc` pre-installed, we've gotta resort

133− # to the primal methods

13477 assert (

13578 "1"

136− == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

79+ == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

13780 )

13881

139− machine.succeed("lxc config set test limits.cpu 2")

140− machine.succeed("lxc restart test")

82+ machine.succeed("lxc config set container limits.cpu 2")

83+ machine.succeed("lxc restart container")

84+ machine.sleep(5)

14185

14286 assert (

14387 "2"

144− == machine.succeed("lxc exec test grep -- -c ^processor /proc/cpuinfo").strip()

88+ == machine.succeed("lxc exec container grep -- -c ^processor /proc/cpuinfo").strip()

14589 )

14690

14791 ## ------------- ##

14892 ## limits.memory ##

14993

150− machine.succeed("lxc config set test limits.memory 64MB")

151− machine.succeed("lxc restart test")

94+ machine.succeed("lxc config set container limits.memory 64MB")

95+ machine.succeed("lxc restart container")

96+ machine.sleep(5)

15297

15398 assert (

15499 "MemTotal: 62500 kB"

155− == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

100+ == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

156101 )

157102

158− machine.succeed("lxc config set test limits.memory 128MB")

159− machine.succeed("lxc restart test")

103+ machine.succeed("lxc config set container limits.memory 128MB")

104+ machine.succeed("lxc restart container")

105+ machine.sleep(5)

160106

161107 assert (

162108 "MemTotal: 125000 kB"

163− == machine.succeed("lxc exec test grep -- MemTotal /proc/meminfo").strip()

109+ == machine.succeed("lxc exec container grep -- MemTotal /proc/meminfo").strip()

164110 )

165111

166− machine.succeed("lxc delete -f test")

112+ machine.succeed("lxc delete -f container")

167113 '';

168114})

nixos/tests/matrix-appservice-irc.nix+3

@@ -20,6 +20,9 @@ import ./make-test-python.nix ({ pkgs, ... }:

2020

2121 enable_registration = true;

2222

23+ # don't use this in production, always use some form of verification

24+ enable_registration_without_verification = true;

25+

2326 listeners = [ {

2427 # The default but tls=false

2528 bind_addresses = [

nixos/tests/openssh.nix+12−6

@@ -80,17 +80,21 @@ in {

8080

8181 client.wait_for_unit("network.target")

8282 client.succeed(

83− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2"

83+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2",

84+ timeout=30

8485 )

8586 client.succeed(

86− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024"

87+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024",

88+ timeout=30

8789 )

8890

8991 client.succeed(

90− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2"

92+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2",

93+ timeout=30

9194 )

9295 client.succeed(

93− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024"

96+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024",

97+ timeout=30

9498 )

9599

96100 with subtest("configured-authkey"):

@@ -99,10 +103,12 @@ in {

99103 )

100104 client.succeed("chmod 600 privkey.snakeoil")

101105 client.succeed(

102− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true"

106+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true",

107+ timeout=30

103108 )

104109 client.succeed(

105− "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true"

110+ "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true",

111+ timeout=30

106112 )

107113

108114 with subtest("localhost-only"):

nixos/tests/pam/pam-oath-login.nix+1−1

@@ -7,7 +7,7 @@ let

77 # how many passwords have been made. In this env, we'll always be on

88 # the 0th counter, so the password is static.

99 #

10− # Generated in nix-shell -p oathToolkit

10+ # Generated in nix-shell -p oath-toolkit

1111 # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3

1212 # and picking a the first 4:

1313 oathSnakeOilPassword1 = "143349";

nixos/tests/pgadmin4.nix+37−48

@@ -1,53 +1,27 @@

1−import ./make-test-python.nix ({ pkgs, lib, ... }:

1+import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], ... }:

2+

3+ /*

4+ This test suite replaces the typical pytestCheckHook function in python

5+ packages. Pgadmin4 test suite needs a running and configured postgresql

6+ server. This is why this test exists.

7+

8+ To not repeat all the python dependencies needed, this test is called directly

9+ from the pgadmin4 derivation, which also passes the currently

10+ used propagatedBuildInputs and any python overrides.

11+

12+ Unfortunately, there doesn't seem to be an easy way to otherwise include

13+ the needed packages here.

14+

15+ Due the the needed parameters a direct call to "nixosTests.pgadmin4" fails

16+ and needs to be called as "pgadmin4.tests"

17+

18+ */

219

320 let

421 pgadmin4SrcDir = "/pgadmin";

522 pgadmin4Dir = "/var/lib/pgadmin";

623 pgadmin4LogDir = "/var/log/pgadmin";

724

8− python-with-needed-packages = pkgs.python3.withPackages (ps: with ps; [

9− selenium

10− testtools

11− testscenarios

12− flask

13− flask-babelex

14− flask-babel

15− flask-gravatar

16− flask_login

17− flask_mail

18− flask_migrate

19− flask_sqlalchemy

20− flask_wtf

21− flask-compress

22− passlib

23− pytz

24− simplejson

25− six

26− sqlparse

27− wtforms

28− flask-paranoid

29− psutil

30− psycopg2

31− python-dateutil

32− sqlalchemy

33− itsdangerous

34− flask-security-too

35− bcrypt

36− cryptography

37− sshtunnel

38− ldap3

39− gssapi

40− flask-socketio

41− eventlet

42− httpagentparser

43− user-agents

44− wheel

45− authlib

46− qrcode

47− pillow

48− pyotp

49− boto3

50− ]);

5125 in

5226 {

5327 name = "pgadmin4";

@@ -55,12 +29,27 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:

5529

5630 nodes.machine = { pkgs, ... }: {

5731 imports = [ ./common/x11.nix ];

32+ # needed because pgadmin 6.8 will fail, if those dependencies get updated

33+ nixpkgs.overlays = [

34+ (self: super: {

35+ pythonPackages = pythonEnv;

36+ })

37+ ];

38+

5839 environment.systemPackages = with pkgs; [

5940 pgadmin4

6041 postgresql

61− python-with-needed-packages

6242 chromedriver

6343 chromium

44+ # include the same packages as in pgadmin minus speaklater3

45+ (python3.withPackages

46+ (ps: buildDeps ++

47+ [

48+ # test suite package requirements

49+ pythonPackages.testscenarios

50+ pythonPackages.selenium

51+ ])

52+ )

6453 ];

6554 services.postgresql = {

6655 enable = true;

@@ -121,7 +110,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:

121110 with subtest("run browser test"):

122111 machine.succeed(

123112 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

124− && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg browser --exclude \

113+ && python regression/runtests.py --pkg browser --exclude \

125114 browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login'

126115 )

127116

@@ -131,13 +120,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:

131120 machine.succeed(

132121 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

133122 && export FONTCONFIG_FILE=${pkgs.makeFontsConf { fontDirectories = [];}} \

134− && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg feature_tests'

123+ && python regression/runtests.py --pkg feature_tests'

135124 )

136125

137126 with subtest("run resql test"):

138127 machine.succeed(

139128 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \

140− && ${python-with-needed-packages.interpreter} regression/runtests.py --pkg resql'

129+ && python regression/runtests.py --pkg resql'

141130 )

142131 '';

143132 })

pkgs/applications/audio/greg/default.nix+3−3

@@ -2,15 +2,15 @@

22

33with pythonPackages; buildPythonApplication rec {

44 pname = "greg";

5− version = "0.4.7";

5+ version = "0.4.8";

66

77 disabled = !isPy3k;

88

99 src = fetchFromGitHub {

1010 owner = "manolomartinez";

1111 repo = pname;

12− rev = "v" + version;

13− sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";

12+ rev = "refs/tags/v${version}";

13+ sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";

1414 };

1515

1616 propagatedBuildInputs = [ setuptools feedparser ];

pkgs/applications/editors/android-studio/common.nix+2

@@ -52,6 +52,7 @@

5252, xkeyboard_config

5353, zlib

5454, makeDesktopItem

55+, tiling_wm # if we are using a tiling wm, need to set _JAVA_AWT_WM_NONREPARENTING in wrapper

5556}:

5657

5758let

@@ -80,6 +81,7 @@ let

8081 --set-default JAVA_HOME "$out/jre" \

8182 --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \

8283 --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \

84+ ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \

8385 --set FONTCONFIG_FILE ${fontsConf} \

8486 --prefix PATH : "${lib.makeBinPath [

8587

pkgs/applications/editors/android-studio/default.nix+2−1

@@ -1,4 +1,4 @@

1−{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv }:

1+{ callPackage, makeFontsConf, gnome2, buildFHSUserEnv, tiling_wm ? false }:

22

33let

44 mkStudio = opts: callPackage (import ./common.nix opts) {

@@ -7,6 +7,7 @@ let

77 };

88 inherit (gnome2) GConf gnome_vfs;

99 inherit buildFHSUserEnv;

10+ inherit tiling_wm;

1011 };

1112 stableVersion = {

1213 version = "2021.1.1.23"; # "Android Studio Bumblebee (2021.1.1 Patch 3)"

pkgs/applications/editors/vim/plugins/default.nix+3−1

@@ -3,7 +3,8 @@

33

44let

55

6− inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;

6+ inherit (vimUtils.override {inherit vim;})

7+ buildVimPluginFrom2Nix vimGenDocHook vimCommandCheckHook;

78

89 inherit (lib) extends;

910

@@ -24,6 +25,7 @@ let

2425

2526 plugins = callPackage ./generated.nix {

2627 inherit buildVimPluginFrom2Nix;

28+ inherit (vimUtils) buildNeovimPluginFrom2Nix;

2729 };

2830

2931 # TL;DR

pkgs/applications/editors/vim/plugins/generated.nix+441−440

@@ -1,5 +1,5 @@

11# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!

2−{ lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

2+{ lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

33

44final: prev:

55{

@@ -53,12 +53,12 @@ final: prev:

5353

5454 Coqtail = buildVimPluginFrom2Nix {

5555 pname = "Coqtail";

56− version = "2022-04-15";

56+ version = "2022-04-21";

5757 src = fetchFromGitHub {

5858 owner = "whonore";

5959 repo = "Coqtail";

60− rev = "93fca5d307007c05722050ffa8b4e508ca6f3b81";

61− sha256 = "022wv0lpz50ihvnkc38rmds0dl4g4b71yig9dc8nn8sicyv0312w";

60+ rev = "0b8f2408f96481a373f336b4405af03008e39a4e";

61+ sha256 = "1v36ndpx8jaipav30ailxpadvzk5qxmgphd1p0hck50mdngpynki";

6262 };

6363 meta.homepage = "https://github.com/whonore/Coqtail/";

6464 };

@@ -77,12 +77,12 @@ final: prev:

7777

7878 FTerm-nvim = buildVimPluginFrom2Nix {

7979 pname = "FTerm.nvim";

80− version = "2022-04-17";

80+ version = "2022-04-21";

8181 src = fetchFromGitHub {

8282 owner = "numToStr";

8383 repo = "FTerm.nvim";

84− rev = "c2a4c4bbd00da68d864683cd09a5d3a2b80de11d";

85− sha256 = "01xscq18slsib2liqp7mbd4wil6l61m2ipihg2i6a14s9bcd1b0y";

84+ rev = "11ec9290389d22215df93e1c9c35f782c5ceec4a";

85+ sha256 = "16nli4nwsqn3zrc05m6w2h05ab423w8jjk81lys5kd609521wi0y";

8686 };

8787 meta.homepage = "https://github.com/numToStr/FTerm.nvim/";

8888 };

@@ -149,12 +149,12 @@ final: prev:

149149

150150 LeaderF = buildVimPluginFrom2Nix {

151151 pname = "LeaderF";

152− version = "2022-04-19";

152+ version = "2022-04-26";

153153 src = fetchFromGitHub {

154154 owner = "Yggdroot";

155155 repo = "LeaderF";

156− rev = "ecd38845d65ffbe4b080cc3c2c1c7f0bfe835bb3";

157− sha256 = "0cjx9v0fafm2npknr85wb37934ysdggnmiwr9cwbd5risp9ircwh";

156+ rev = "2817a561495f19a37369c72a1685e3e1e4c3c09d";

157+ sha256 = "1xxsm1b2v5wdy4psjcggm4ssgdq2j8q9ds98j1ky8l7carj0qfwn";

158158 };

159159 meta.homepage = "https://github.com/Yggdroot/LeaderF/";

160160 };

@@ -173,12 +173,12 @@ final: prev:

173173

174174 Navigator-nvim = buildVimPluginFrom2Nix {

175175 pname = "Navigator.nvim";

176− version = "2022-04-11";

176+ version = "2022-04-29";

177177 src = fetchFromGitHub {

178178 owner = "numToStr";

179179 repo = "Navigator.nvim";

180− rev = "52225923679ec866651bb0c2e0691374131ec939";

181− sha256 = "0knzisdbaa3aa20ai8lwi8v4ai49jl741a1slpcrjnm6zhb484nv";

180+ rev = "0c57f67a34eff7fd20785861926b7fe6bd76e2c2";

181+ sha256 = "1f1fh5w2hsf16dcd0zz5x4d5ig089bgr7dial3ir82445g7whwsc";

182182 };

183183 meta.homepage = "https://github.com/numToStr/Navigator.nvim/";

184184 };

@@ -269,12 +269,12 @@ final: prev:

269269

270270 SchemaStore-nvim = buildVimPluginFrom2Nix {

271271 pname = "SchemaStore.nvim";

272− version = "2022-04-19";

272+ version = "2022-05-02";

273273 src = fetchFromGitHub {

274274 owner = "b0o";

275275 repo = "SchemaStore.nvim";

276− rev = "4112585513210a3a55e587344649a4bfb8709bdc";

277− sha256 = "1sjm13vq8608xwfhc9hyfn1n4bwpgivnpw04331giwmf4j3kp422";

276+ rev = "24e03a0e7c100336efdef5035eb6e59ac3f7ed4a";

277+ sha256 = "0hjysfszcaw2i2awkv0sbhnj0x5jcl7s6jmb279m7gcf7giwvghk";

278278 };

279279 meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";

280280 };

@@ -305,12 +305,12 @@ final: prev:

305305

306306 SimpylFold = buildVimPluginFrom2Nix {

307307 pname = "SimpylFold";

308− version = "2021-11-04";

308+ version = "2022-05-02";

309309 src = fetchFromGitHub {

310310 owner = "tmhedberg";

311311 repo = "SimpylFold";

312− rev = "b4a87e509c3d873238a39d1c85d0b97d6819f283";

313− sha256 = "0ff5x7ay67wn9c0mi8sb6110i93zrf97c4whg0bd7pr2nmadpvk0";

312+ rev = "ff4c85197c5555715093c08a8d4f9d493c4d80cd";

313+ sha256 = "1ny3dicin979irwp8gv993005yxgzx1h5snihpa0na2p38mkdp25";

314314 };

315315 meta.homepage = "https://github.com/tmhedberg/SimpylFold/";

316316 };

@@ -329,12 +329,12 @@ final: prev:

329329

330330 SpaceVim = buildVimPluginFrom2Nix {

331331 pname = "SpaceVim";

332− version = "2022-04-19";

332+ version = "2022-05-02";

333333 src = fetchFromGitHub {

334334 owner = "SpaceVim";

335335 repo = "SpaceVim";

336− rev = "a1b65988e72a091334cedfe7ed1d067819f4e1eb";

337− sha256 = "096q33lrgn4i8ic6y66snb312ly3rdxm8a15mykawn1n533d04nq";

336+ rev = "97b010245f42bda351fd050a3c6ccf7806b9b007";

337+ sha256 = "1plfcrigk1s2l8ig0y6vf7awidbdj3p985pzjl19nrv93g49d71f";

338338 };

339339 meta.homepage = "https://github.com/SpaceVim/SpaceVim/";

340340 };

@@ -486,12 +486,12 @@ final: prev:

486486

487487 aerial-nvim = buildVimPluginFrom2Nix {

488488 pname = "aerial.nvim";

489− version = "2022-04-19";

489+ version = "2022-05-02";

490490 src = fetchFromGitHub {

491491 owner = "stevearc";

492492 repo = "aerial.nvim";

493− rev = "6d5246a3f0d2861eaad4121eb467bc5e6537690d";

494− sha256 = "0by8s35hhvk38l79y5nm88cvwy53vx21ps1wg9niway5xrp0khcs";

493+ rev = "8d2ef96e44768250a652826c6586005f40eeac7f";

494+ sha256 = "0lgn1p381bxr69j1bb2hfj1y51x941p9yjqfg8nd84ka1qy4hjyx";

495495 };

496496 meta.homepage = "https://github.com/stevearc/aerial.nvim/";

497497 };

@@ -522,12 +522,12 @@ final: prev:

522522

523523 ale = buildVimPluginFrom2Nix {

524524 pname = "ale";

525− version = "2022-04-06";

525+ version = "2022-05-02";

526526 src = fetchFromGitHub {

527527 owner = "dense-analysis";

528528 repo = "ale";

529− rev = "607f33a1b0f662d9809d54363e8e81a4965862ce";

530− sha256 = "0bqd1h1hid68x51032ysr44i4gg12xkqqfj1zn3hli31xf9zgcnx";

529+ rev = "56399106fcf9d80d476307576bc307e67f0167e2";

530+ sha256 = "0mc125zrbipikxdffvcn39cqphz0y2lavsbsh4x4604af74va0dv";

531531 };

532532 meta.homepage = "https://github.com/dense-analysis/ale/";

533533 };

@@ -546,12 +546,12 @@ final: prev:

546546

547547 aniseed = buildVimPluginFrom2Nix {

548548 pname = "aniseed";

549− version = "2022-04-09";

549+ version = "2022-04-27";

550550 src = fetchFromGitHub {

551551 owner = "Olical";

552552 repo = "aniseed";

553− rev = "c55d4879935f07dbf46e86389246449d7af272b1";

554− sha256 = "0yghy4yh5qw5x2qxwz8wp27gmhh7yp0pcgkdv2p1lcilvdz9321s";

553+ rev = "618c2115d5046cc04c8a4af7727ee4d90fc2061c";

554+ sha256 = "1pz021rk2y0ngprhhhavs7xxnzf5sa9002rgs2wxlf36czqlf75q";

555555 };

556556 meta.homepage = "https://github.com/Olical/aniseed/";

557557 };

@@ -654,12 +654,12 @@ final: prev:

654654

655655 asynctasks-vim = buildVimPluginFrom2Nix {

656656 pname = "asynctasks.vim";

657− version = "2022-04-06";

657+ version = "2022-05-01";

658658 src = fetchFromGitHub {

659659 owner = "skywind3000";

660660 repo = "asynctasks.vim";

661− rev = "f1da08bb6bc1a458a7d0b3325eeabd0c77e08ff5";

662− sha256 = "1whc7irj0p07x3iy2r2rkkx89flsbv42pbjjbvhkj90fsv9wxcpd";

661+ rev = "9cdb34314d5066b40627c83829b9d04943c9c66d";

662+ sha256 = "1cjlnwgqyy95xq9nkzx7mp2iqwwd47yyp6y0mng8hrnhn4ixdfkw";

663663 };

664664 meta.homepage = "https://github.com/skywind3000/asynctasks.vim/";

665665 };

@@ -714,12 +714,12 @@ final: prev:

714714

715715 auto-session = buildVimPluginFrom2Nix {

716716 pname = "auto-session";

717− version = "2022-04-12";

717+ version = "2022-04-21";

718718 src = fetchFromGitHub {

719719 owner = "rmagatti";

720720 repo = "auto-session";

721− rev = "e840b844abcc19ad6e406b193a2a5ce285238458";

722− sha256 = "0yx662qipzdmg28x0h454y95jrp952p51pl9h1dxjnwyswn8xrnm";

721+ rev = "4b1c978c6fb73e1e59f988fe85cfa51347a86e8a";

722+ sha256 = "154s0kfhvmyvcbdmy62v00jlmnfgnkmv4ilwf8hig4qxn1376arw";

723723 };

724724 meta.homepage = "https://github.com/rmagatti/auto-session/";

725725 };

@@ -894,12 +894,12 @@ final: prev:

894894

895895 bufferline-nvim = buildVimPluginFrom2Nix {

896896 pname = "bufferline.nvim";

897− version = "2022-04-20";

897+ version = "2022-05-02";

898898 src = fetchFromGitHub {

899899 owner = "akinsho";

900900 repo = "bufferline.nvim";

901− rev = "f02e19bd29a27944e6bcc1e7a492fe07534b6630";

902− sha256 = "10gwj4kd7kngcrfgm4jja08ss5hza7s1bzs11fjk08y489mhracp";

901+ rev = "2d5266d14b7b5dbc54923469b4599f0349f7cedc";

902+ sha256 = "0i8k8paa23v0l011lvydcv45c4jnr8wfiiwyw16hhndfamcwhgfh";

903903 };

904904 meta.homepage = "https://github.com/akinsho/bufferline.nvim/";

905905 };

@@ -1050,24 +1050,24 @@ final: prev:

10501050

10511051 cmp-calc = buildVimPluginFrom2Nix {

10521052 pname = "cmp-calc";

1053− version = "2022-04-12";

1053+ version = "2022-04-25";

10541054 src = fetchFromGitHub {

10551055 owner = "hrsh7th";

10561056 repo = "cmp-calc";

1057− rev = "3bb9f0da74979ed1f5d77afa26aa8155daa9288f";

1058− sha256 = "1qvpd3xx42rg38zdni85bcvakln5dz4xh79rqxa6z21dd3clp3ch";

1057+ rev = "f7efc20768603bd9f9ae0ed073b1c129f63eb312";

1058+ sha256 = "0q5p5s46bh0h1w9p3yzwxd04hlbxg3s4liq42r697gqvna6sq0yg";

10591059 };

10601060 meta.homepage = "https://github.com/hrsh7th/cmp-calc/";

10611061 };

10621062

10631063 cmp-cmdline = buildVimPluginFrom2Nix {

10641064 pname = "cmp-cmdline";

1065− version = "2022-02-13";

1065+ version = "2022-05-02";

10661066 src = fetchFromGitHub {

10671067 owner = "hrsh7th";

10681068 repo = "cmp-cmdline";

1069− rev = "f4beb74e8e036f9532bedbcac0b93c7a55a0f8b0";

1070− sha256 = "0spc5vhrcz2ld1cxf9n27mhhfdwm0v89xbbyzbi9hshzfssndagh";

1069+ rev = "c36ca4bc1dedb12b4ba6546b96c43896fd6e7252";

1070+ sha256 = "04h6np207781l3wa36l6nqd56lx39s1kycf4jvclgfrr6ddnbv68";

10711071 };

10721072 meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/";

10731073 };

@@ -1110,12 +1110,12 @@ final: prev:

11101110

11111111 cmp-nvim-lsp = buildVimPluginFrom2Nix {

11121112 pname = "cmp-nvim-lsp";

1113− version = "2022-01-15";

1113+ version = "2022-05-01";

11141114 src = fetchFromGitHub {

11151115 owner = "hrsh7th";

11161116 repo = "cmp-nvim-lsp";

1117− rev = "ebdfc204afb87f15ce3d3d3f5df0b8181443b5ba";

1118− sha256 = "0kmaxxdxlp1s5w36khnw0sdrbv1lr3p5n9r90h6h7wv842n4mnca";

1117+ rev = "e6b5feb2e6560b61f31c756fb9231a0d7b10c73d";

1118+ sha256 = "0jzgd9g874w507y40fzggbm40n467g8br5xcmgf2mscdb9kcsgvc";

11191119 };

11201120 meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/";

11211121 };

@@ -1146,12 +1146,12 @@ final: prev:

11461146

11471147 cmp-nvim-ultisnips = buildVimPluginFrom2Nix {

11481148 pname = "cmp-nvim-ultisnips";

1149− version = "2022-04-15";

1149+ version = "2022-04-22";

11501150 src = fetchFromGitHub {

11511151 owner = "quangnguyen30192";

11521152 repo = "cmp-nvim-ultisnips";

1153− rev = "c6ace8ca97ca7db5cca319759efd93fbf6cc0bce";

1154− sha256 = "0jys7fl9r6n7khacypkg643lk2aadsnniyrm7nar0k08swdwhl48";

1153+ rev = "21f02b62deb409ce69928a23406076bd0043ddbc";

1154+ sha256 = "0jil0i9g33i0h3ynng58qaam5k18sdlqdzrbyqgn4gjzchcxpfqv";

11551155 };

11561156 meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/";

11571157 };

@@ -1170,12 +1170,12 @@ final: prev:

11701170

11711171 cmp-pandoc-references = buildVimPluginFrom2Nix {

11721172 pname = "cmp-pandoc-references";

1173− version = "2022-02-16";

1173+ version = "2022-04-20";

11741174 src = fetchFromGitHub {

11751175 owner = "jc-doyle";

11761176 repo = "cmp-pandoc-references";

1177− rev = "13e6c080fb16836f52c7fc498eecaae51adb4d54";

1178− sha256 = "10pyzv4pdis05ap9jrz6wszxjha0m3bdjv6pd7xqm1hqahsyf4qs";

1177+ rev = "2c808dff631a783ddd2c554c4c6033907589baf6";

1178+ sha256 = "0knwxs6bg6r5hw2g668j34xr5yvqmcvcqyjfpnmpf5y5m82vahxw";

11791179 };

11801180 meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/";

11811181 };

@@ -1230,12 +1230,12 @@ final: prev:

12301230

12311231 cmp-treesitter = buildVimPluginFrom2Nix {

12321232 pname = "cmp-treesitter";

1233− version = "2021-12-02";

1233+ version = "2022-04-25";

12341234 src = fetchFromGitHub {

12351235 owner = "ray-x";

12361236 repo = "cmp-treesitter";

1237− rev = "a6b4c95ee922cace635b5a46c7fcc691d2559fbb";

1238− sha256 = "068x8n63iavycf5fsc5jf2p8i3cs697r60k54j7rm076bpbmnisa";

1237+ rev = "c5187c31abd081ecef8b41e5eb476b7340442310";

1238+ sha256 = "1jhzw7myrwqgybvkm53mk8zgfz56pzr7cnsrzcr4fl6wnm59a3b5";

12391239 };

12401240 meta.homepage = "https://github.com/ray-x/cmp-treesitter/";

12411241 };

@@ -1266,12 +1266,12 @@ final: prev:

12661266

12671267 cmp_luasnip = buildVimPluginFrom2Nix {

12681268 pname = "cmp_luasnip";

1269− version = "2022-04-01";

1269+ version = "2022-05-01";

12701270 src = fetchFromGitHub {

12711271 owner = "saadparwaiz1";

12721272 repo = "cmp_luasnip";

1273− rev = "b10829736542e7cc9291e60bab134df1273165c9";

1274− sha256 = "1qygdas99m7py98rqxyza88lmk2as8yi9khjac603x6anxmq766l";

1273+ rev = "a9de941bcbda508d0a45d28ae366bb3f08db2e36";

1274+ sha256 = "0mh7gimav9p6cgv4j43l034dknz8szsnmrz49b2ra04yk9ihk1zj";

12751275 };

12761276 meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/";

12771277 };

@@ -1314,12 +1314,12 @@ final: prev:

13141314

13151315 coc-lua = buildVimPluginFrom2Nix {

13161316 pname = "coc-lua";

1317− version = "2022-04-20";

1317+ version = "2022-04-26";

13181318 src = fetchFromGitHub {

13191319 owner = "josa42";

13201320 repo = "coc-lua";

1321− rev = "0df59c8c81acfb7b0abadd49222a769ddf0730ec";

1322− sha256 = "0ij2q9q96dv3rms6qdjsqvgyl0fk3w1h67fhjq7kcagci78cka9k";

1321+ rev = "3601c8ddde380349764fc0bc016b915703c9ad86";

1322+ sha256 = "1w9b4kicsa0r0fxcgcxq3wn0scyyyzfh3akp3zznli9g1fgbiqnx";

13231323 };

13241324 meta.homepage = "https://github.com/josa42/coc-lua/";

13251325 };

@@ -1374,24 +1374,24 @@ final: prev:

13741374

13751375 coc-nvim = buildVimPluginFrom2Nix {

13761376 pname = "coc.nvim";

1377− version = "2022-04-19";

1377+ version = "2022-05-01";

13781378 src = fetchFromGitHub {

13791379 owner = "neoclide";

13801380 repo = "coc.nvim";

1381− rev = "6f81e3034bf04f2d8d65b82b3ac15d93b737cf0b";

1382− sha256 = "0hx8g0xlh0n6yqpv58s8vb2k0gdh1h13d05l1m3wn3gpvid17xi3";

1381+ rev = "83a5f083d7ed76899729f25063a5ab9c326e5f02";

1382+ sha256 = "1pwi1l4h6hdr45z5lnw3mjbpr3jx6iipnaz5bla64cq7cgf98nw6";

13831383 };

13841384 meta.homepage = "https://github.com/neoclide/coc.nvim/";

13851385 };

13861386

13871387 codi-vim = buildVimPluginFrom2Nix {

13881388 pname = "codi.vim";

1389− version = "2022-04-16";

1389+ version = "2022-04-30";

13901390 src = fetchFromGitHub {

13911391 owner = "metakirby5";

13921392 repo = "codi.vim";

1393− rev = "d9a93193dbb23516eebb19ef5ba01b43287ea35d";

1394− sha256 = "0yk3jfp8r432s0kan0g6ml0yyz731yygv0zzpx75l9lfagdv0xpy";

1393+ rev = "086593fbf5f0891c9fa93cf14453ad14a79d3ed0";

1394+ sha256 = "0m8hgchb927kgcz65fkmk61w6ma5hvqfr221r7f9jbjzj49laaxd";

13951395 };

13961396 meta.homepage = "https://github.com/metakirby5/codi.vim/";

13971397 };

@@ -1435,12 +1435,12 @@ final: prev:

14351435

14361436 comment-nvim = buildVimPluginFrom2Nix {

14371437 pname = "comment.nvim";

1438− version = "2022-04-19";

1438+ version = "2022-04-27";

14391439 src = fetchFromGitHub {

14401440 owner = "numtostr";

14411441 repo = "comment.nvim";

1442− rev = "ef3e6bfa41073a73c298ae90d2796f8ceda71c6a";

1443− sha256 = "1ki607wsam22h01gwq8a4vw3jq1yj2zmfp2laglh5cy5dgarm4vv";

1442+ rev = "cb0de89ba80b7cdb37b92e2a9e43b566f8834c7a";

1443+ sha256 = "17pshx6jq82nfjn2w65i0d3zh53r5b07lc2bh2aqpm5x2c5bhn3h";

14441444 };

14451445 meta.homepage = "https://github.com/numtostr/comment.nvim/";

14461446 };

@@ -1579,12 +1579,12 @@ final: prev:

15791579

15801580 conjure = buildVimPluginFrom2Nix {

15811581 pname = "conjure";

1582− version = "2022-04-09";

1582+ version = "2022-04-29";

15831583 src = fetchFromGitHub {

15841584 owner = "Olical";

15851585 repo = "conjure";

1586− rev = "422cadf51dd44306713f3f7965e40ec606290c49";

1587− sha256 = "04m1p4l2i61g7d3yax1g7c1h38pkkzz1jvirvd1xcyzw08wn7ldh";

1586+ rev = "842c81892648de759e639ad2d395757b98be06d5";

1587+ sha256 = "1g67miifvysa4lbbvpa5bpxyw2fvjkq7anj6bqx65m81d4krlwr8";

15881588 };

15891589 meta.homepage = "https://github.com/Olical/conjure/";

15901590 };

@@ -1627,12 +1627,12 @@ final: prev:

16271627

16281628 coq_nvim = buildVimPluginFrom2Nix {

16291629 pname = "coq_nvim";

1630− version = "2022-04-20";

1630+ version = "2022-05-02";

16311631 src = fetchFromGitHub {

16321632 owner = "ms-jpq";

16331633 repo = "coq_nvim";

1634− rev = "0502a7f14ab73b80353d076842d58730a0239a16";

1635− sha256 = "1s46iafdwxr20qw08si0lwbh81x9ffh2wvd4rxcyvhlxc7h686rp";

1634+ rev = "b443ff20dd28d90231dad463bcdbf342e53d13f3";

1635+ sha256 = "14a3942nphlqfr9s4cwx8fa1n1yj1rqhk65bbp6z7zaw7x8g7jmf";

16361636 };

16371637 meta.homepage = "https://github.com/ms-jpq/coq_nvim/";

16381638 };

@@ -1663,12 +1663,12 @@ final: prev:

16631663

16641664 crates-nvim = buildVimPluginFrom2Nix {

16651665 pname = "crates.nvim";

1666− version = "2022-04-19";

1666+ version = "2022-05-02";

16671667 src = fetchFromGitHub {

16681668 owner = "saecki";

16691669 repo = "crates.nvim";

1670− rev = "fc46bf69f0b2293f25581123b46023226d102cc1";

1671− sha256 = "079hraq9cjxjpqrli4y2nk9xwpvkhxmrbrhxq9by1wb1q1a39da3";

1670+ rev = "ce6da0ec93d8160e2bf1f0850bc3d0eec1a2e383";

1671+ sha256 = "1yl0b3fx71axpn1n6dwpdijdq8zjdb028a1gfzzwa6b62ry1qc0q";

16721672 };

16731673 meta.homepage = "https://github.com/saecki/crates.nvim/";

16741674 };

@@ -1795,12 +1795,12 @@ final: prev:

17951795

17961796 defx-nvim = buildVimPluginFrom2Nix {

17971797 pname = "defx.nvim";

1798− version = "2022-04-14";

1798+ version = "2022-04-21";

17991799 src = fetchFromGitHub {

18001800 owner = "Shougo";

18011801 repo = "defx.nvim";

1802− rev = "b636df644005bb4805cba70b238df73b302640eb";

1803− sha256 = "1aha5vashdiz59iy8l8kbkyvwngw5m7n131k7ar82gxi0zqsj6q8";

1802+ rev = "fd5f9416d6acc908660ccca0799109a9a4f0a2d2";

1803+ sha256 = "0dwznzxpsj2xd0hvybg67h6j5kxbk8qsy60axbqx65da7a54yd3j";

18041804 };

18051805 meta.homepage = "https://github.com/Shougo/defx.nvim/";

18061806 };

@@ -1855,12 +1855,12 @@ final: prev:

18551855

18561856 deol-nvim = buildVimPluginFrom2Nix {

18571857 pname = "deol.nvim";

1858− version = "2022-03-16";

1858+ version = "2022-04-29";

18591859 src = fetchFromGitHub {

18601860 owner = "Shougo";

18611861 repo = "deol.nvim";

1862− rev = "4ecffa4502a65f90397c2194ae308dac49194a65";

1863− sha256 = "1h23nmqpf5782r3fj945ck0dn0sa6vb0m03sbb4fzd707k6xwnl9";

1862+ rev = "0bdb926d328765144dd788c062161c565dc38732";

1863+ sha256 = "0c4dl37npass3n2dx6459dm1bk30fhy5yaphxjg897wz61xn622x";

18641864 };

18651865 meta.homepage = "https://github.com/Shougo/deol.nvim/";

18661866 };

@@ -2169,12 +2169,12 @@ final: prev:

21692169

21702170 dressing-nvim = buildVimPluginFrom2Nix {

21712171 pname = "dressing.nvim";

2172− version = "2022-03-31";

2172+ version = "2022-05-01";

21732173 src = fetchFromGitHub {

21742174 owner = "stevearc";

21752175 repo = "dressing.nvim";

2176− rev = "cad08fac5ed6d5e8384d8c0759268e2f6b89b217";

2177− sha256 = "0lc04cvq6iasg724zhpzp1j3bhwj4gphvqbzfh41ikzsy8d2jrpy";

2176+ rev = "a476efd3f372d6b5b0df431cac36911fb84c515e";

2177+ sha256 = "1n15lzjma6mpaphx6ppmhsgvg51vbrp91qf3nssyvr5n2vpjhhfy";

21782178 };

21792179 meta.homepage = "https://github.com/stevearc/dressing.nvim/";

21802180 };

@@ -2193,12 +2193,12 @@ final: prev:

21932193

21942194 edge = buildVimPluginFrom2Nix {

21952195 pname = "edge";

2196− version = "2022-04-14";

2196+ version = "2022-04-27";

21972197 src = fetchFromGitHub {

21982198 owner = "sainnhe";

21992199 repo = "edge";

2200− rev = "957a0f4d17f253ac23f9c870eb92d7ad2ea4b7e0";

2201− sha256 = "15m6b5svvcfsmiq87vhn77q5z7zg22vpnh9qbcv0y6cd04s69n2d";

2200+ rev = "fb5a763f2591bed8d10562edbd0e64c88cc5e674";

2201+ sha256 = "0p79ck2n94argr7k8glwpmmzf6945mh4gb23p5hd5m8a02ys7ax4";

22022202 };

22032203 meta.homepage = "https://github.com/sainnhe/edge/";

22042204 };

@@ -2279,12 +2279,12 @@ final: prev:

22792279

22802280 everforest = buildVimPluginFrom2Nix {

22812281 pname = "everforest";

2282− version = "2022-04-14";

2282+ version = "2022-04-27";

22832283 src = fetchFromGitHub {

22842284 owner = "sainnhe";

22852285 repo = "everforest";

2286− rev = "64f486a4856bfbfd6604c700c938b34cf551561b";

2287− sha256 = "18yxab99d9cy45ir2dfqr8wi0s56qyrzglgcslp97wnjiq79673d";

2286+ rev = "1e594a20ce382bcc55c0e3fd488e90ca68dffb32";

2287+ sha256 = "1415759zc6fp39h0xzpb2d99m4xsh5ma84j6yv236zb0bavm88ah";

22882288 };

22892289 meta.homepage = "https://github.com/sainnhe/everforest/";

22902290 };

@@ -2460,12 +2460,12 @@ final: prev:

24602460

24612461 formatter-nvim = buildVimPluginFrom2Nix {

24622462 pname = "formatter.nvim";

2463− version = "2022-03-29";

2463+ version = "2022-04-26";

24642464 src = fetchFromGitHub {

24652465 owner = "mhartington";

24662466 repo = "formatter.nvim";

2467− rev = "bec8a57d6e990a503e87eb71ae530cd2c1402e31";

2468− sha256 = "14llli9s5x58m7z4ay5b9d2pypq378h3i4062rasdqi5c5and07n";

2467+ rev = "100af7c04f12b99d29fbca7dc1aa3d17301c54e9";

2468+ sha256 = "082cp251ynznjk3ims389ljdww9786nh8kglydqpqh3sdvc7s0mp";

24692469 };

24702470 meta.homepage = "https://github.com/mhartington/formatter.nvim/";

24712471 };

@@ -2484,12 +2484,12 @@ final: prev:

24842484

24852485 friendly-snippets = buildVimPluginFrom2Nix {

24862486 pname = "friendly-snippets";

2487− version = "2022-04-17";

2487+ version = "2022-04-25";

24882488 src = fetchFromGitHub {

24892489 owner = "rafamadriz";

24902490 repo = "friendly-snippets";

2491− rev = "804c3f55ec4ec46f7257451b3cd731df991b9212";

2492− sha256 = "0sznw2q70zac924yf0z0ic3frmmjmryjh4af46fw2zrbrq4kk9vq";

2491+ rev = "6e0881ad5dfae8bcb160bb6704e1f5fe31be9938";

2492+ sha256 = "1cyrqsc0jf1v6qxrd944x74803cck3nxddp1ac8rhl9yj8kz176w";

24932493 };

24942494 meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";

24952495 };

@@ -2604,12 +2604,12 @@ final: prev:

26042604

26052605 gentoo-syntax = buildVimPluginFrom2Nix {

26062606 pname = "gentoo-syntax";

2607− version = "2022-02-23";

2607+ version = "2022-05-02";

26082608 src = fetchFromGitHub {

26092609 owner = "gentoo";

26102610 repo = "gentoo-syntax";

2611− rev = "cf5f268f8b19262515105739bdcc112cd2a6cdbc";

2612− sha256 = "1pbvr1yirn17fxw8zlzp8j5brj0n2sdm3ampjryirdxknli93685";

2611+ rev = "2b77af2d85b1bdc8d78f65f41d6673c240bbc7a1";

2612+ sha256 = "1spdpyxlh53mwdazzaskwk3y2lb4im2by0l9qq1cz78nwmwm2m4h";

26132613 };

26142614 meta.homepage = "https://github.com/gentoo/gentoo-syntax/";

26152615 };

@@ -2652,24 +2652,24 @@ final: prev:

26522652

26532653 git-blame-nvim = buildVimPluginFrom2Nix {

26542654 pname = "git-blame.nvim";

2655− version = "2022-03-03";

2655+ version = "2022-04-29";

26562656 src = fetchFromGitHub {

26572657 owner = "f-person";

26582658 repo = "git-blame.nvim";

2659− rev = "e60bfbc314476777a5ce200e533699691a5cdfa5";

2660− sha256 = "1nh54hfc0cvz3a9znrp32ialpbqqwlgbyw45m9b489g9kndf3y2k";

2659+ rev = "0a7d27028b69525f2c6b6a3460029ed6cb291541";

2660+ sha256 = "0mbvaasx82wcn37mrn20gb98g7prhav4ps1wyk46mirla350ikjl";

26612661 };

26622662 meta.homepage = "https://github.com/f-person/git-blame.nvim/";

26632663 };

26642664

26652665 git-messenger-vim = buildVimPluginFrom2Nix {

26662666 pname = "git-messenger.vim";

2667− version = "2021-11-13";

2667+ version = "2022-05-02";

26682668 src = fetchFromGitHub {

26692669 owner = "rhysd";

26702670 repo = "git-messenger.vim";

2671− rev = "2e67899355f3f631aad6845925e4c2c13546444d";

2672− sha256 = "0a6c04far9ji7h7k0b195zxn62sj6drn56cacmz86zmzksqgm8wp";

2671+ rev = "6c0b55fb38d0e0633127823aab89b0676d13e509";

2672+ sha256 = "1ghqc5kmwsh1f7sbc5xyssffgh5lxcf35686mg6zm9ly3k2z8azk";

26732673 };

26742674 meta.homepage = "https://github.com/rhysd/git-messenger.vim/";

26752675 };

@@ -2710,14 +2710,14 @@ final: prev:

27102710 meta.homepage = "https://github.com/ruifm/gitlinker.nvim/";

27112711 };

27122712

2713− gitsigns-nvim = buildVimPluginFrom2Nix {

2713+ gitsigns-nvim = buildNeovimPluginFrom2Nix {

27142714 pname = "gitsigns.nvim";

2715− version = "2022-04-19";

2715+ version = "2022-05-02";

27162716 src = fetchFromGitHub {

27172717 owner = "lewis6991";

27182718 repo = "gitsigns.nvim";

2719− rev = "498abfa13dd749be963bc87a5b37da0d3e42a50e";

2720− sha256 = "11d2pnqgngm6546r1nr0cf1dj7qkgvdn0ld2h1jn3fm07l892sgv";

2719+ rev = "ef153188e849bd317c00448755bc4182a2bd495d";

2720+ sha256 = "1pysiqgkp34kmpf4fkyjqih0rrq3mscrh9z27mzfhy2zhky8pikp";

27212721 };

27222722 meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";

27232723 };

@@ -2760,12 +2760,12 @@ final: prev:

27602760

27612761 golden-ratio = buildVimPluginFrom2Nix {

27622762 pname = "golden-ratio";

2763− version = "2020-04-03";

2763+ version = "2022-04-21";

27642764 src = fetchFromGitHub {

27652765 owner = "roman";

27662766 repo = "golden-ratio";

2767− rev = "8313b6d6723c9e77ef1d3760af2cdd244e8db043";

2768− sha256 = "03nm1wr0qsrirg4z4171f4nygnqgb6w06ldr6rbbz4a1f7j8j654";

2767+ rev = "7df80253680e4755b82955425da31d8c1f8e23b6";

2768+ sha256 = "0ds2slbg03b8dcgvi1svyn391mr2zaabb4x80wrmyxkrnfzr1rsq";

27692769 };

27702770 meta.homepage = "https://github.com/roman/golden-ratio/";

27712771 };

@@ -2844,24 +2844,24 @@ final: prev:

28442844

28452845 gruvbox-material = buildVimPluginFrom2Nix {

28462846 pname = "gruvbox-material";

2847− version = "2022-04-14";

2847+ version = "2022-04-27";

28482848 src = fetchFromGitHub {

28492849 owner = "sainnhe";

28502850 repo = "gruvbox-material";

2851− rev = "45d05b6affeec1f858a13c0d8fe511db32c85afd";

2852− sha256 = "18sf80zgdsfb2bd9dgdww9prlhkydk695gj9wd9zah24zfc5mcv7";

2851+ rev = "3d664943daf65bf99390a52c5dbc557f87fac552";

2852+ sha256 = "08zh5rc9p6svmds57gvvkk12nadd56ysx8xrhsjxbn3cdxag86gj";

28532853 };

28542854 meta.homepage = "https://github.com/sainnhe/gruvbox-material/";

28552855 };

28562856

28572857 gruvbox-nvim = buildVimPluginFrom2Nix {

28582858 pname = "gruvbox.nvim";

2859− version = "2022-04-18";

2859+ version = "2022-04-26";

28602860 src = fetchFromGitHub {

28612861 owner = "ellisonleao";

28622862 repo = "gruvbox.nvim";

2863− rev = "028302225e19eb203ebb6876b689cc0ce2631169";

2864− sha256 = "0npsh72z3xb9p1jdhz1g9jpx20c2d52mkkg4ix07bmy40ynkbsxs";

2863+ rev = "cf1b07f07673b5c2f9e3903b5fc4c2f7bc7d1123";

2864+ sha256 = "1pr91d8qsii9z5ff4gw766nf4v9r06ym15hk5y3z293bsd6hfns8";

28652865 };

28662866 meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";

28672867 };

@@ -2976,24 +2976,24 @@ final: prev:

29762976

29772977 hop-nvim = buildVimPluginFrom2Nix {

29782978 pname = "hop.nvim";

2979− version = "2022-03-22";

2979+ version = "2022-04-25";

29802980 src = fetchFromGitHub {

29812981 owner = "phaazon";

29822982 repo = "hop.nvim";

2983− rev = "e2f978b50c2bd9ae2c6a4ebdf2222c0f299c85c3";

2984− sha256 = "1si2ibxidjn0l565vhr77949s16yjv46alq145b19h15amwgq3g2";

2983+ rev = "b93ed4cea9c7df625d04e41cb15370b5c43cb578";

2984+ sha256 = "12mc8fa3k5x9l84qw930bbjqi5hgc4y61s5p3kqx9nma2db2686v";

29852985 };

29862986 meta.homepage = "https://github.com/phaazon/hop.nvim/";

29872987 };

29882988

29892989 hotpot-nvim = buildVimPluginFrom2Nix {

29902990 pname = "hotpot.nvim";

2991− version = "2022-04-10";

2991+ version = "2022-04-24";

29922992 src = fetchFromGitHub {

29932993 owner = "rktjmp";

29942994 repo = "hotpot.nvim";

2995− rev = "8ccf600ccb5dbc28ea329d641a58e2fd6974d38e";

2996− sha256 = "0kppddixgkzn3q8zbkgllqmwbxlr46p5hlnddqdv5lnp6fw4w6xf";

2995+ rev = "f481b30f1d93df6016092623199ddc8bfe1624d0";

2996+ sha256 = "0zqz1m46bpj74l5vckvhaynbdq7vvi8vx1r1lrsjapb0blmfh0fj";

29972997 };

29982998 meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";

29992999 };

@@ -3012,12 +3012,12 @@ final: prev:

30123012

30133013 iceberg-vim = buildVimPluginFrom2Nix {

30143014 pname = "iceberg.vim";

3015− version = "2021-12-28";

3015+ version = "2022-04-26";

30163016 src = fetchFromGitHub {

30173017 owner = "cocopon";

30183018 repo = "iceberg.vim";

3019− rev = "105aceb0ccb45deb05bc3b1e5da956cd3e29869c";

3020− sha256 = "0vywngmgm818nca313viriz9csvm6fbi46ik1m037yzi8znfarxa";

3019+ rev = "5ac9da61e8626d1218498a35e515f36387efe454";

3020+ sha256 = "12vqa244zsg8gxc7rar5sfjcajrhprxpxazjmpmi4db25wvbmpsq";

30213021 };

30223022 meta.homepage = "https://github.com/cocopon/iceberg.vim/";

30233023 };

@@ -3277,12 +3277,12 @@ final: prev:

32773277

32783278 kanagawa-nvim = buildVimPluginFrom2Nix {

32793279 pname = "kanagawa.nvim";

3280− version = "2022-04-14";

3280+ version = "2022-04-21";

32813281 src = fetchFromGitHub {

32823282 owner = "rebelot";

32833283 repo = "kanagawa.nvim";

3284− rev = "acf0f5d61236b416c804d649cd76db8390de9ae6";

3285− sha256 = "03xmcph28q1y8n0ykga5m6biw9flpnx02sy7j2w3f1q2shknnwf3";

3284+ rev = "0ad738e7cc43514d35388c1caca13990d688aa5c";

3285+ sha256 = "06gcdkh92i5znpn5gw1xyc82nf4kr2j1mi8d8pnajqyvvxyb8mca";

32863286 };

32873287 meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";

32883288 };

@@ -3361,12 +3361,12 @@ final: prev:

33613361

33623362 lean-nvim = buildVimPluginFrom2Nix {

33633363 pname = "lean.nvim";

3364− version = "2022-04-19";

3364+ version = "2022-05-02";

33653365 src = fetchFromGitHub {

33663366 owner = "Julian";

33673367 repo = "lean.nvim";

3368− rev = "354630520ed3fe73c69796fb2e566a7c2125cd04";

3369− sha256 = "1gwgbgg0dc0fwcdz6qs6mgvg0ybxgld3wm2wprq89abpacfz29dz";

3368+ rev = "902eb7f75d664bccd251c38d7921570b05b47cdc";

3369+ sha256 = "1dw8r7vl260baclf8ymq9zr9vxq8d8s6hjbnjs4xqliaza0g7pj3";

33703370 };

33713371 meta.homepage = "https://github.com/Julian/lean.nvim/";

33723372 };

@@ -3469,12 +3469,12 @@ final: prev:

34693469

34703470 lightline-bufferline = buildVimPluginFrom2Nix {

34713471 pname = "lightline-bufferline";

3472− version = "2022-03-27";

3472+ version = "2022-04-28";

34733473 src = fetchFromGitHub {

34743474 owner = "mengelbrecht";

34753475 repo = "lightline-bufferline";

3476− rev = "59b2c6b0ab5ad41ce42db89f05c8ea67020099ff";

3477− sha256 = "0laz118k20sm3bn6r81f8pg9n77k5038c0vhgpbj349k3zraygjq";

3476+ rev = "fda87ff20e3b9c6a058cfbb6ca3c1f25877f4cab";

3477+ sha256 = "0apd1fm59plqhnc65zs5ayx2sijlhbcsrci2s674nr4w4w5rhvsj";

34783478 };

34793479 meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/";

34803480 };

@@ -3613,12 +3613,12 @@ final: prev:

36133613

36143614 litee-nvim = buildVimPluginFrom2Nix {

36153615 pname = "litee.nvim";

3616− version = "2022-02-28";

3616+ version = "2022-04-25";

36173617 src = fetchFromGitHub {

36183618 owner = "ldelossa";

36193619 repo = "litee.nvim";

3620− rev = "c9fd775aebf702c81e2077693336584a0027d496";

3621− sha256 = "1zbxn3hzss41zwp0b1cwhh31zj0443xfpxjkchml9sq4f0hklkvd";

3620+ rev = "2d257af35e90b1ee6017481b7fd82878d8f0e5ff";

3621+ sha256 = "05cnx2py9jwkpv34fbqqwjq8gb2rx3rwp97a1klr8khk8sr59b5y";

36223622 };

36233623 meta.homepage = "https://github.com/ldelossa/litee.nvim/";

36243624 };

@@ -3684,12 +3684,12 @@ final: prev:

36843684

36853685 lsp_signature-nvim = buildVimPluginFrom2Nix {

36863686 pname = "lsp_signature.nvim";

3687− version = "2022-04-16";

3687+ version = "2022-05-01";

36883688 src = fetchFromGitHub {

36893689 owner = "ray-x";

36903690 repo = "lsp_signature.nvim";

3691− rev = "a351509512687293fd659ba4ee7e34412c3a8f70";

3692− sha256 = "00xzd8b13krysdw21zm9ms902cxm04xl1wd2l7rb04431s2v9vc0";

3691+ rev = "6d160406f948a810c40304224a1255c8bba5a415";

3692+ sha256 = "0hkj9z1ap6a3a4xbdq47cahx2j21pzwiss3fsarpwr6rjmcl62x3";

36933693 };

36943694 meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";

36953695 };

@@ -3699,11 +3699,11 @@ final: prev:

36993699 version = "2022-04-18";

37003700 src = fetchFromGitHub {

37013701 owner = "onsails";

3702− repo = "lspkind-nvim";

3702+ repo = "lspkind.nvim";

37033703 rev = "57e5b5dfbe991151b07d272a06e365a77cc3d0e7";

37043704 sha256 = "1c13ll09v16prhzgmv8pappck4x3ahhc5sizp6r61kb7k4mkfpfk";

37053705 };

3706− meta.homepage = "https://github.com/onsails/lspkind-nvim/";

3706+ meta.homepage = "https://github.com/onsails/lspkind.nvim/";

37073707 };

37083708

37093709 lspsaga-nvim = buildVimPluginFrom2Nix {

@@ -3744,24 +3744,24 @@ final: prev:

37443744

37453745 lualine-nvim = buildVimPluginFrom2Nix {

37463746 pname = "lualine.nvim";

3747− version = "2022-04-17";

3747+ version = "2022-05-02";

37483748 src = fetchFromGitHub {

37493749 owner = "nvim-lualine";

37503750 repo = "lualine.nvim";

3751− rev = "18a07f790ed7ed1f11d1b130c02782e9dfd8dd7d";

3752− sha256 = "09bfj2g7jn693xwi5f3zk90p4vg6jpijr1y8pl5k4hjbrg8nb68k";

3751+ rev = "45d07fc026400c211337a7ce1cb90e7b7a397e31";

3752+ sha256 = "13np9iqh69w5mrzx8pi5db87cm5sjay5cfs9zb1lk0zxz3n4592d";

37533753 };

37543754 meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/";

37553755 };

37563756

37573757 luasnip = buildVimPluginFrom2Nix {

37583758 pname = "luasnip";

3759− version = "2022-04-15";

3759+ version = "2022-05-01";

37603760 src = fetchFromGitHub {

37613761 owner = "l3mon4d3";

37623762 repo = "luasnip";

3763− rev = "6b67cb12747225a6412d8263bb97d6d2b8d9366a";

3764− sha256 = "08a1kk8z3mcq65dh0hi44188dxkqjfg3yilr8viamyni1kwy7gf3";

3763+ rev = "1dbafec2379bd836bd09c4659d4c6e1a70eb380e";

3764+ sha256 = "1y0jp1saggg59lpicyvjbklg3fb5qmbmh8q7gacx27zgp26hz66r";

37653765 };

37663766 meta.homepage = "https://github.com/l3mon4d3/luasnip/";

37673767 };

@@ -3864,12 +3864,12 @@ final: prev:

38643864

38653865 mini-nvim = buildVimPluginFrom2Nix {

38663866 pname = "mini.nvim";

3867− version = "2022-04-20";

3867+ version = "2022-05-01";

38683868 src = fetchFromGitHub {

38693869 owner = "echasnovski";

38703870 repo = "mini.nvim";

3871− rev = "8134370549e73a5a72d24ffc7ea6a881cf4502ad";

3872− sha256 = "0llkj31jkqnm3igs2f7cw8wxbc9877jk1mc2shnh1ii2dh0kmz68";

3871+ rev = "2bc924df80eaa788abd9af9ab9df446b10aa9b88";

3872+ sha256 = "159n5sxg28lsvapdy59dxfhnjr7nb2wqy05pbcsdk90g4d7v43f7";

38733873 };

38743874 meta.homepage = "https://github.com/echasnovski/mini.nvim/";

38753875 };

@@ -3912,12 +3912,12 @@ final: prev:

39123912

39133913 mkdx = buildVimPluginFrom2Nix {

39143914 pname = "mkdx";

3915− version = "2022-04-08";

3915+ version = "2022-04-29";

39163916 src = fetchFromGitHub {

39173917 owner = "SidOfc";

39183918 repo = "mkdx";

3919− rev = "a4645528e2ddedfb6350c142660c3e0468057f1c";

3920− sha256 = "11vz3wmii9d1dhz4bvfqlax5s6yawd640xflyqvd1i45102p55vd";

3919+ rev = "d8e29b48f959aef96df2cb2ff5875ee02970f2a7";

3920+ sha256 = "0rv2x96l5gcbj969ki6y1c0l468sibjcph5rqzavv6naizmwi8ql";

39213921 };

39223922 meta.homepage = "https://github.com/SidOfc/mkdx/";

39233923 };

@@ -4176,12 +4176,12 @@ final: prev:

41764176

41774177 neco-vim = buildVimPluginFrom2Nix {

41784178 pname = "neco-vim";

4179− version = "2022-02-02";

4179+ version = "2022-04-21";

41804180 src = fetchFromGitHub {

41814181 owner = "Shougo";

41824182 repo = "neco-vim";

4183− rev = "4b537fa01c28f2f7cf249722530561d2e477b49f";

4184− sha256 = "09lkbwijvl34ff2pagra383n517k1b1nw2lpjv2jlik0970sbcbv";

4183+ rev = "3a913173dcbf7bac303cb5ede8b3a732b6a0a692";

4184+ sha256 = "0wbp4f0gjc3vchyh8xyjcqyd3xlc4wf276r9lalmjd034792a77k";

41854185 };

41864186 meta.homepage = "https://github.com/Shougo/neco-vim/";

41874187 };

@@ -4212,12 +4212,12 @@ final: prev:

42124212

42134213 neoformat = buildVimPluginFrom2Nix {

42144214 pname = "neoformat";

4215− version = "2022-04-14";

4215+ version = "2022-05-01";

42164216 src = fetchFromGitHub {

42174217 owner = "sbdchd";

42184218 repo = "neoformat";

4219− rev = "06920fa90ec7db3f81c6f842ebaf008c39e088cf";

4220− sha256 = "1f5j7aisnpvykgj7p64cbvfww05fsv47pi04ckkh0gkc49g5sjmg";

4219+ rev = "409ebbba9f4b568ea87ab4f2de90a645cf5d000a";

4220+ sha256 = "13vfy252wv88rbw61ap1vg1x5br28d7rwbf19r28ajvg2xkvw816";

42214221 };

42224222 meta.homepage = "https://github.com/sbdchd/neoformat/";

42234223 };

@@ -4284,12 +4284,12 @@ final: prev:

42844284

42854285 neorg = buildVimPluginFrom2Nix {

42864286 pname = "neorg";

4287− version = "2022-04-18";

4287+ version = "2022-05-01";

42884288 src = fetchFromGitHub {

42894289 owner = "nvim-neorg";

42904290 repo = "neorg";

4291− rev = "4a3ca2c0cb46a5320c124565fd4d9830435aa29f";

4292− sha256 = "15jwzz2ldxg6ql1lzn626dcfxgndqzgpamakqk0yicbidhmdird0";

4291+ rev = "633dfc9f0c3a00a32ee89d4ab826da2eecfe9bd8";

4292+ sha256 = "13r17drh0xy2dibx2qq4r90zlkjfyp3mzfa6p7w29yr623ixbbs1";

42934293 };

42944294 meta.homepage = "https://github.com/nvim-neorg/neorg/";

42954295 };

@@ -4332,24 +4332,24 @@ final: prev:

43324332

43334333 neoterm = buildVimPluginFrom2Nix {

43344334 pname = "neoterm";

4335− version = "2022-01-20";

4335+ version = "2022-04-26";

43364336 src = fetchFromGitHub {

43374337 owner = "kassio";

43384338 repo = "neoterm";

4339− rev = "533d311a2a9187294ea52acab32d8565d6517059";

4340− sha256 = "04k62g72bf2i7jndngp68ci9i4bldk8q3h6yk8lpyqsqkgn9q4k6";

4339+ rev = "05ea81b6424c1576f304bc88c33d5a1f8867b8e9";

4340+ sha256 = "0v6jwrfmlr3hnczgiygxx99289w9g8jf3nzr0qg2qsc19239glqq";

43414341 };

43424342 meta.homepage = "https://github.com/kassio/neoterm/";

43434343 };

43444344

43454345 neovim-ayu = buildVimPluginFrom2Nix {

43464346 pname = "neovim-ayu";

4347− version = "2022-04-19";

4347+ version = "2022-05-01";

43484348 src = fetchFromGitHub {

43494349 owner = "Shatur";

43504350 repo = "neovim-ayu";

4351− rev = "dde7e6f02fbcb5860b24f616c9a07b5f9e52a361";

4352− sha256 = "0800qwxlj84f8ygvniwwyrcjyfwsx7kmzq8vyz9m50zd7b20al9f";

4351+ rev = "cc64cadfd6e54967a7b01bac1a689239a20804ac";

4352+ sha256 = "1rnlr14n3b6sxs0m64x5s42yq2bj8677bxyz4b479cdiq76gnyk2";

43534353 };

43544354 meta.homepage = "https://github.com/Shatur/neovim-ayu/";

43554355 };

@@ -4464,12 +4464,12 @@ final: prev:

44644464

44654465 nightfox-nvim = buildVimPluginFrom2Nix {

44664466 pname = "nightfox.nvim";

4467− version = "2022-04-20";

4467+ version = "2022-05-02";

44684468 src = fetchFromGitHub {

44694469 owner = "EdenEast";

44704470 repo = "nightfox.nvim";

4471− rev = "5d2581a71510c319d128a8b02a21181abc611202";

4472− sha256 = "118lda4cgxkbf13khyg2i36i7fcrlfz29l0wfjhg90ci3w8qvajs";

4471+ rev = "25b3f3e46c87c51e4d8075d2e11f481628716363";

4472+ sha256 = "1asz3wz9v47smwn6ahzmv8mdjbfazwbwzmcf9niy0jxva6b3qyrx";

44734473 };

44744474 meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";

44754475 };

@@ -4572,12 +4572,12 @@ final: prev:

45724572

45734573 null-ls-nvim = buildVimPluginFrom2Nix {

45744574 pname = "null-ls.nvim";

4575− version = "2022-04-16";

4575+ version = "2022-05-01";

45764576 src = fetchFromGitHub {

45774577 owner = "jose-elias-alvarez";

45784578 repo = "null-ls.nvim";

4579− rev = "a887bd6c1bb992ccf48e673b40e061c3e816204f";

4580− sha256 = "1mifn1b83ypvaplmma1zx080vmm5nv40263lsva3z6byqyq3kfl1";

4579+ rev = "3dbded7cfaf0591157280bc97d11407eeaef3ea9";

4580+ sha256 = "0k74064x0k2l4k07zlfv3kl3qm3f7spj49rr9ahcwn0pni38y71c";

45814581 };

45824582 meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";

45834583 };

@@ -4620,36 +4620,36 @@ final: prev:

46204620

46214621 nvim-autopairs = buildVimPluginFrom2Nix {

46224622 pname = "nvim-autopairs";

4623− version = "2022-04-13";

4623+ version = "2022-04-28";

46244624 src = fetchFromGitHub {

46254625 owner = "windwp";

46264626 repo = "nvim-autopairs";

4627− rev = "38d486a1c47ae2722a78cf569008de0a64f4b153";

4628− sha256 = "0qka37c8ikcqvbjq0n0kxgm8l30jy3aixs5i00a25wcwxj40kzxv";

4627+ rev = "63779ea99ed43ab22660ac6ae5b506a40bf41aeb";

4628+ sha256 = "0lc03xjsamy8fpfwy6ag9r8cx1cp0my461l0wvbgznzr1qkq325y";

46294629 };

46304630 meta.homepage = "https://github.com/windwp/nvim-autopairs/";

46314631 };

46324632

46334633 nvim-base16 = buildVimPluginFrom2Nix {

46344634 pname = "nvim-base16";

4635− version = "2022-03-28";

4635+ version = "2022-04-25";

46364636 src = fetchFromGitHub {

46374637 owner = "RRethy";

46384638 repo = "nvim-base16";

4639− rev = "f3c8eaa6c8c0dcd752aa28042f9435c464349776";

4640− sha256 = "18xlhyyg9yq54p6jnq4dri47zfw62xfnx4ci9j9iiiii1dyzwr2z";

4639+ rev = "70fe3102158b2765d5bba46f398bd4213997936f";

4640+ sha256 = "0p53l747hnjrz7wzcyh08vnx3pfdk5gbqmb9vpf4hq2x3lyx1a57";

46414641 };

46424642 meta.homepage = "https://github.com/RRethy/nvim-base16/";

46434643 };

46444644

46454645 nvim-bqf = buildVimPluginFrom2Nix {

46464646 pname = "nvim-bqf";

4647− version = "2022-04-18";

4647+ version = "2022-04-30";

46484648 src = fetchFromGitHub {

46494649 owner = "kevinhwang91";

46504650 repo = "nvim-bqf";

4651− rev = "3dbd349cf75cb23c7d1575b235ee57ecbe665d9d";

4652− sha256 = "12nlfz0imx6i6w8jc4pw5czyfzr8m2mhlmql10i5hdncqi9ggaar";

4651+ rev = "3d174ca8198bafb3eb341001aafcf74ed4290d70";

4652+ sha256 = "0i5pmk13rkk74bx1a19fz32gsg1f47s8550pqz51ma8h0yyc9cpk";

46534653 };

46544654 meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";

46554655 };

@@ -4680,12 +4680,12 @@ final: prev:

46804680

46814681 nvim-cmp = buildVimPluginFrom2Nix {

46824682 pname = "nvim-cmp";

4683− version = "2022-04-20";

4683+ version = "2022-05-02";

46844684 src = fetchFromGitHub {

46854685 owner = "hrsh7th";

46864686 repo = "nvim-cmp";

4687− rev = "f51dc68e1bb170fc49c2d7e13eb45e5ec83f5ee9";

4688− sha256 = "11f53yic8j3iqd4yb0gy2d54vscqqll4lcqqcj1rp195vdd476ak";

4687+ rev = "bba6fb67fdafc0af7c5454058dfbabc2182741f4";

4688+ sha256 = "1qkhynhaasplvk7argik7jqkl0jymi347xqbg1i7b1h4qp51xjpq";

46894689 };

46904690 meta.homepage = "https://github.com/hrsh7th/nvim-cmp/";

46914691 };

@@ -4776,24 +4776,24 @@ final: prev:

47764776

47774777 nvim-dap-ui = buildVimPluginFrom2Nix {

47784778 pname = "nvim-dap-ui";

4779− version = "2022-04-17";

4779+ version = "2022-04-29";

47804780 src = fetchFromGitHub {

47814781 owner = "rcarriga";

47824782 repo = "nvim-dap-ui";

4783− rev = "f136bb253f6811984369a20924251bcbfe00a5cd";

4784− sha256 = "00nxdgsxa3yc0ifsmbs8d1s428p37x3ax3rlxacs983f5xlgmizq";

4783+ rev = "3eec5258c620e2b7b688676be8fb2e9a8ae436b2";

4784+ sha256 = "1x7y49jzbj3s07pkdi842balj9wx0x1z4khgixxj7p03awcyngsm";

47854785 };

47864786 meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/";

47874787 };

47884788

47894789 nvim-dap-virtual-text = buildVimPluginFrom2Nix {

47904790 pname = "nvim-dap-virtual-text";

4791− version = "2022-04-19";

4791+ version = "2022-04-30";

47924792 src = fetchFromGitHub {

47934793 owner = "theHamsta";

47944794 repo = "nvim-dap-virtual-text";

4795− rev = "1c3560ecfe8a865118efe7092308abe9e8b0ae68";

4796− sha256 = "1piz5qxymc2igqdscc3cvvympxrgmxd1ybsnqy13l7ycmknkp9hd";

4795+ rev = "9b731b9748d243b60e61eecbe2d114c39554486e";

4796+ sha256 = "14a66zdys50ifhfz4vls7b6grg69iwndailxdcamal7xafvy1dw9";

47974797 };

47984798 meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/";

47994799 };

@@ -4836,36 +4836,36 @@ final: prev:

48364836

48374837 nvim-gdb = buildVimPluginFrom2Nix {

48384838 pname = "nvim-gdb";

4839− version = "2021-12-09";

4839+ version = "2022-05-02";

48404840 src = fetchFromGitHub {

48414841 owner = "sakhnik";

48424842 repo = "nvim-gdb";

4843− rev = "c2a0d076383b8a0991681c33efe80bcba6dd3608";

4844− sha256 = "19yc51bhfaw53rc9awdr145i8k2i2gnnl3faw85afsqs9dr4hi7i";

4843+ rev = "d064ee481b2aec86133ebcd514c835a28776f9c5";

4844+ sha256 = "1xxm69jndx8sgkip1f8n7k9nb697d1n7r13iyp1bcgllwir5f1mi";

48454845 };

48464846 meta.homepage = "https://github.com/sakhnik/nvim-gdb/";

48474847 };

48484848

48494849 nvim-gps = buildVimPluginFrom2Nix {

48504850 pname = "nvim-gps";

4851− version = "2022-04-19";

4851+ version = "2022-04-30";

48524852 src = fetchFromGitHub {

48534853 owner = "smiteshp";

48544854 repo = "nvim-gps";

4855− rev = "944ea6e7244a839452ab721515141ea9208c0536";

4856− sha256 = "0i3mjk9n9czpadzpwp2wx1640h5sl51cjgnggrm8rg9qxj5108g7";

4855+ rev = "9552418fcbb9587025f4bd38364259b3888f582b";

4856+ sha256 = "0n2393lb5aad2g7lkgihhg4x9sm35500fb8hds2s23nj0cv0jcj4";

48574857 };

48584858 meta.homepage = "https://github.com/smiteshp/nvim-gps/";

48594859 };

48604860

48614861 nvim-highlite = buildVimPluginFrom2Nix {

48624862 pname = "nvim-highlite";

4863− version = "2022-04-18";

4863+ version = "2022-04-29";

48644864 src = fetchFromGitHub {

48654865 owner = "Iron-E";

48664866 repo = "nvim-highlite";

4867− rev = "e46cb5695b8457403488ad44b5379421c0c5dc17";

4868− sha256 = "0343pk8wylms0lnrpa0a5x2ig97an2ps64fgjpa8n85ng1z49z97";

4867+ rev = "16f6fe2ece750b9cbfacca3675e8e71cd4c19665";

4868+ sha256 = "1i5v8z6gmj09lwi6mb6m6srskavqdwwv4iazajjrjwjv0wfzcdb9";

48694869 };

48704870 meta.homepage = "https://github.com/Iron-E/nvim-highlite/";

48714871 };

@@ -4896,12 +4896,12 @@ final: prev:

48964896

48974897 nvim-jdtls = buildVimPluginFrom2Nix {

48984898 pname = "nvim-jdtls";

4899− version = "2022-04-14";

4899+ version = "2022-04-29";

49004900 src = fetchFromGitHub {

49014901 owner = "mfussenegger";

49024902 repo = "nvim-jdtls";

4903− rev = "ffb08466d51f717775d85e7e334ac83156c0ca98";

4904− sha256 = "1rlnidcn8zww6lvqx1syw2331i2gn67765cip2pz5rh8mbv4l67x";

4903+ rev = "9010412f7de118168d2fe4ba97b578d0d76cc500";

4904+ sha256 = "0jzz9av1k4msa9942p8g1f0cnlh0rdgb026s3xg4ksbdspc72d67";

49054905 };

49064906 meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";

49074907 };

@@ -4920,12 +4920,12 @@ final: prev:

49204920

49214921 nvim-lightbulb = buildVimPluginFrom2Nix {

49224922 pname = "nvim-lightbulb";

4923− version = "2022-02-24";

4923+ version = "2022-05-02";

49244924 src = fetchFromGitHub {

49254925 owner = "kosayoda";

49264926 repo = "nvim-lightbulb";

4927− rev = "29ca81408119ba809d1f922edc941868af97ee86";

4928− sha256 = "04c5wqh42648wzrnwcgwdmwwwqvwk5qn3ncrfjl0827xnpc8049g";

4927+ rev = "407f05c71f757f09f775229d5709a3592f1a6910";

4928+ sha256 = "1j3ksmq91fzmvnmvgkkrs6lp55wry2q7x6ixspm197jd0np8w9k9";

49294929 };

49304930 meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";

49314931 };

@@ -4944,12 +4944,12 @@ final: prev:

49444944

49454945 nvim-lint = buildVimPluginFrom2Nix {

49464946 pname = "nvim-lint";

4947− version = "2022-04-18";

4947+ version = "2022-05-02";

49484948 src = fetchFromGitHub {

49494949 owner = "mfussenegger";

49504950 repo = "nvim-lint";

4951− rev = "e5416bdb27a0e61cd213850646534a18bb2ba61d";

4952− sha256 = "1qrjpx99pb67yccvmb66ahcaa7wk9z6s9zvaxm5fpbm1xasci1mz";

4951+ rev = "2c8f41f62d09b1e1068c3949661eba5bc0cea7ba";

4952+ sha256 = "08syhj3wwrz7ivv492zjs02xcf42b3f1zhh26am8jr430k0l491d";

49534953 };

49544954 meta.homepage = "https://github.com/mfussenegger/nvim-lint/";

49554955 };

@@ -4968,12 +4968,12 @@ final: prev:

49684968

49694969 nvim-lspconfig = buildVimPluginFrom2Nix {

49704970 pname = "nvim-lspconfig";

4971− version = "2022-04-17";

4971+ version = "2022-04-28";

49724972 src = fetchFromGitHub {

49734973 owner = "neovim";

49744974 repo = "nvim-lspconfig";

4975− rev = "ad9903c66bac88f344890acb6532f63f1cd4dac3";

4976− sha256 = "10fg52g53yk0d10rm96kw907wdkgqw762ib6530zrnw7p8fbm2ms";

4975+ rev = "21102d5e3b6ffc6929d60418581ac1a29ee9eddd";

4976+ sha256 = "16hdgxzbb31253178kyy1j77qpskq80dlnfdfxj2bh761zc237rn";

49774977 };

49784978 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

49794979 };

@@ -4992,24 +4992,24 @@ final: prev:

49924992

49934993 nvim-metals = buildVimPluginFrom2Nix {

49944994 pname = "nvim-metals";

4995− version = "2022-04-16";

4995+ version = "2022-04-27";

49964996 src = fetchFromGitHub {

49974997 owner = "scalameta";

49984998 repo = "nvim-metals";

4999− rev = "bc6f2ba6d6b2c5ffd65b41f3df74761a90e538da";

5000− sha256 = "0fk41l2jmlhrylc9xbh4h9a35j106r0lr7rd0i2lp0acqai629qg";

4999+ rev = "6bc7681b489b04feff394f832984d14510e97e47";

5000+ sha256 = "0syq7sp836glngfjv6ykbwa14bwyn1zr929ma2sxs5jvqj5sbzvx";

50015001 };

50025002 meta.homepage = "https://github.com/scalameta/nvim-metals/";

50035003 };

50045004

50055005 nvim-neoclip-lua = buildVimPluginFrom2Nix {

50065006 pname = "nvim-neoclip.lua";

5007− version = "2022-04-06";

5007+ version = "2022-04-29";

50085008 src = fetchFromGitHub {

50095009 owner = "AckslD";

50105010 repo = "nvim-neoclip.lua";

5011− rev = "09fa54a2e9866ba05d08980e27b29099d6d0ed6e";

5012− sha256 = "0l17anql1a5vbh5v8djlssfh3a09y6zxrs6vpabkfsj9lp8sls46";

5011+ rev = "f3ff1645de5d2fd46ac8ffe86e440b7f3ae1fd11";

5012+ sha256 = "0ayi9sfdj1rcz9zlib65vbpaf9jyyfkiqsadiq6ldgwj9wx6vvi4";

50135013 };

50145014 meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/";

50155015 };

@@ -5028,12 +5028,12 @@ final: prev:

50285028

50295029 nvim-notify = buildVimPluginFrom2Nix {

50305030 pname = "nvim-notify";

5031− version = "2022-04-17";

5031+ version = "2022-05-01";

50325032 src = fetchFromGitHub {

50335033 owner = "rcarriga";

50345034 repo = "nvim-notify";

5035− rev = "2c8f744de34c72a5a1fabcc66da11aa017ffab88";

5036− sha256 = "1yc98fv30fvkjb7d8acjqvl8kai1hz0mslp04n1d2069q0n6k08n";

5035+ rev = "ebe78bea13b60640816658ae798a199bd5118eb1";

5036+ sha256 = "0mzbqfc5kw4qa9hifjkzf3i1adz38g1lg9m6395y3bc6zry73dxp";

50375037 };

50385038 meta.homepage = "https://github.com/rcarriga/nvim-notify/";

50395039 };

@@ -5100,24 +5100,24 @@ final: prev:

51005100

51015101 nvim-tree-lua = buildVimPluginFrom2Nix {

51025102 pname = "nvim-tree.lua";

5103− version = "2022-04-18";

5103+ version = "2022-05-01";

51045104 src = fetchFromGitHub {

51055105 owner = "kyazdani42";

51065106 repo = "nvim-tree.lua";

5107− rev = "0f0f858348aacc94f98ba32880760c5a5440b825";

5108− sha256 = "1ciir7h9s0g9i62b49swa8c8cgjqg4lz6zapkj5a8gqxqa10qh23";

5107+ rev = "483f1550d1c53f7dcf261d40af5f993ffcb8b9c3";

5108+ sha256 = "1syhjcf9pawc70apbrhrddsxyabqqs60f0s7yc759v6qb64nqshr";

51095109 };

51105110 meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";

51115111 };

51125112

51135113 nvim-treesitter = buildVimPluginFrom2Nix {

51145114 pname = "nvim-treesitter";

5115− version = "2022-04-19";

5115+ version = "2022-05-01";

51165116 src = fetchFromGitHub {

51175117 owner = "nvim-treesitter";

51185118 repo = "nvim-treesitter";

5119− rev = "62fa8f77c43ed3a4ac2bbdfa4327f6b4a835bbea";

5120− sha256 = "0cq0zbs9a52wx84ivpna4qw67dlz7i9nw6mln8948qadnzk1960r";

5119+ rev = "4067351ffd6e5cfd5527873f6db9845e04527b8b";

5120+ sha256 = "0232nmbp82wjpv3npb4302pmsdfcfs67cgl7775d552zqfr2va9r";

51215121 };

51225122 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

51235123 };

@@ -5160,24 +5160,24 @@ final: prev:

51605160

51615161 nvim-treesitter-textobjects = buildVimPluginFrom2Nix {

51625162 pname = "nvim-treesitter-textobjects";

5163− version = "2022-04-15";

5163+ version = "2022-04-21";

51645164 src = fetchFromGitHub {

51655165 owner = "nvim-treesitter";

51665166 repo = "nvim-treesitter-textobjects";

5167− rev = "29c5e9effe53f19f250e3a88d1427b35031bc90d";

5168− sha256 = "09bpgd0fqpcwifs2wna1lqyrfn4rmp2gfan4635lwjp4sixj52vc";

5167+ rev = "094e8ad3cc839e825f8dcc91352837653e365a8f";

5168+ sha256 = "1i7d8yxqffv6rp6n66wqyb0bsrq916qlp88rn8bb92ykyxmjn8bz";

51695169 };

51705170 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";

51715171 };

51725172

51735173 nvim-ts-autotag = buildVimPluginFrom2Nix {

51745174 pname = "nvim-ts-autotag";

5175− version = "2022-03-04";

5175+ version = "2022-04-22";

51765176 src = fetchFromGitHub {

51775177 owner = "windwp";

51785178 repo = "nvim-ts-autotag";

5179− rev = "57035b5814f343bc6110676c9ae2eacfcd5340c2";

5180− sha256 = "06fj3bpfakbzbb4saqa2dss0wz6z98farljv3xmih162qbybr2c1";

5179+ rev = "044a05c4c51051326900a53ba98fddacd15fea22";

5180+ sha256 = "0c94vnhl216p36x19cplhypr1b3z0f7l5jdr19hl79qvdfp9djk2";

51815181 };

51825182 meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";

51835183 };

@@ -5196,24 +5196,24 @@ final: prev:

51965196

51975197 nvim-ts-rainbow = buildVimPluginFrom2Nix {

51985198 pname = "nvim-ts-rainbow";

5199− version = "2022-04-17";

5199+ version = "2022-04-24";

52005200 src = fetchFromGitHub {

52015201 owner = "p00f";

52025202 repo = "nvim-ts-rainbow";

5203− rev = "04284dc97eac0d0ecfea68e10be824d1a6585de0";

5204− sha256 = "1i8i58m1r1322wvs8jl0nzs6lgqw78ibkp5hah07kgi2ynzr3dj3";

5203+ rev = "a7767e2a1761078abb97f6516e45c56147e0952e";

5204+ sha256 = "0ms95gxvydzf078y8mp2xqinm9bbk750nqc3ayyi26ipqba6f13x";

52055205 };

52065206 meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/";

52075207 };

52085208

52095209 nvim-web-devicons = buildVimPluginFrom2Nix {

52105210 pname = "nvim-web-devicons";

5211− version = "2022-03-22";

5211+ version = "2022-05-01";

52125212 src = fetchFromGitHub {

52135213 owner = "kyazdani42";

52145214 repo = "nvim-web-devicons";

5215− rev = "09e62319974d7d7ec7e53b974724f7942470ef78";

5216− sha256 = "0f64alh5mf6zjnbxqsx21m3dcldqshx7a7z46qg0pfbnn9fx7swq";

5215+ rev = "bdd43421437f2ef037e0dafeaaaa62b31d35ef2f";

5216+ sha256 = "0sknns28ww7xwjyqylk4mxvs4sy8lsk52w5q81ldnwfcyiwl70c5";

52175217 };

52185218 meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/";

52195219 };

@@ -5256,12 +5256,12 @@ final: prev:

52565256

52575257 nvimdev-nvim = buildVimPluginFrom2Nix {

52585258 pname = "nvimdev.nvim";

5259− version = "2022-04-11";

5259+ version = "2022-04-24";

52605260 src = fetchFromGitHub {

52615261 owner = "neovim";

52625262 repo = "nvimdev.nvim";

5263− rev = "79f06ba252a5a8a525475f6072bd99494da9a1d7";

5264− sha256 = "0wm6hm97rrpw45jyihydxyy98vxgypcvwnx6406609s8n8w0sbyz";

5263+ rev = "2bfb1156112267e1ab98c6779fb15cf858bf11b9";

5264+ sha256 = "1bdx2lmyh9zvqlqah2knkhdnh5n1fcnav4iw0v9ls4845q2qh4i4";

52655265 };

52665266 meta.homepage = "https://github.com/neovim/nvimdev.nvim/";

52675267 };

@@ -5292,12 +5292,12 @@ final: prev:

52925292

52935293 octo-nvim = buildVimPluginFrom2Nix {

52945294 pname = "octo.nvim";

5295− version = "2022-04-14";

5295+ version = "2022-04-26";

52965296 src = fetchFromGitHub {

52975297 owner = "pwntester";

52985298 repo = "octo.nvim";

5299− rev = "0beb4de71062435ad934caba5728f7f01ae8b969";

5300− sha256 = "01k7jl34x8wikq6ff456650wgf5f5z9z6a3ypr10a3pl8p7wfyzr";

5299+ rev = "622ab9feaa735dc0999e567183ce357f3dff080f";

5300+ sha256 = "00prf7wb1p7daqly08h8l4ak5cmwbr76c5i40a8vfpn660wgj2zg";

53015301 };

53025302 meta.homepage = "https://github.com/pwntester/octo.nvim/";

53035303 };

@@ -5316,12 +5316,12 @@ final: prev:

53165316

53175317 onedark-nvim = buildVimPluginFrom2Nix {

53185318 pname = "onedark.nvim";

5319− version = "2022-03-23";

5319+ version = "2022-04-25";

53205320 src = fetchFromGitHub {

53215321 owner = "navarasu";

53225322 repo = "onedark.nvim";

5323− rev = "e520a0c81a5a1997ecffd846ccd9c6e63b7859c6";

5324− sha256 = "1xvh5mmjc4w4rkp8h1qwxfqz3kcrqvhxnl66x19j098d1h7aqsb6";

5323+ rev = "08cde8acf181b3278dafb9c8284726104a11cc0f";

5324+ sha256 = "01dxnf4pcycp70pzxyv5xd9y9289z14c110w926kwhy1skgwz7f4";

53255325 };

53265326 meta.homepage = "https://github.com/navarasu/onedark.nvim/";

53275327 };

@@ -5340,12 +5340,12 @@ final: prev:

53405340

53415341 onedarkpro-nvim = buildVimPluginFrom2Nix {

53425342 pname = "onedarkpro.nvim";

5343− version = "2022-04-12";

5343+ version = "2022-04-26";

53445344 src = fetchFromGitHub {

53455345 owner = "olimorris";

53465346 repo = "onedarkpro.nvim";

5347− rev = "653b5d729cb2c14c564cf5ab2145e2e24354a2ba";

5348− sha256 = "1xw49fliqalz18nj0pa81xsx1d9zwphdzcai503m1bn2m2nclp6h";

5347+ rev = "bca9cfd1dc2e4311659d9ab85e6e7f3c8309a4d7";

5348+ sha256 = "10xl1hmrkzklsxlbgkazp62h97ff7pz3dczsgx7mk8bzs8cq5433";

53495349 };

53505350 meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";

53515351 };

@@ -5388,12 +5388,12 @@ final: prev:

53885388

53895389 orgmode = buildVimPluginFrom2Nix {

53905390 pname = "orgmode";

5391− version = "2022-04-20";

5391+ version = "2022-05-02";

53925392 src = fetchFromGitHub {

53935393 owner = "nvim-orgmode";

53945394 repo = "orgmode";

5395− rev = "8cd85f7afabef643db6b5d3dc01942870e71533d";

5396− sha256 = "16rkvz8x6rvapyq7grch77j0wd5pnhjwv932v72ai6gy940d56l2";

5395+ rev = "1a52ca239c726d62104fad012472c28a00cdcc22";

5396+ sha256 = "17360m754y0fsxh95pl0zfl8jhhgw4hvk4991kxksrir0v3xsayz";

53975397 };

53985398 meta.homepage = "https://github.com/nvim-orgmode/orgmode/";

53995399 };

@@ -5436,12 +5436,12 @@ final: prev:

54365436

54375437 papercolor-theme = buildVimPluginFrom2Nix {

54385438 pname = "papercolor-theme";

5439− version = "2022-03-24";

5439+ version = "2022-04-30";

54405440 src = fetchFromGitHub {

54415441 owner = "NLKNguyen";

54425442 repo = "papercolor-theme";

5443− rev = "afde171829b1416125bf07a81fc28e4490aa91b2";

5444− sha256 = "1iz8aqmwbnfha2agcxy7cd2v0znz8vzpz7iyvd15hxx7zbqlwz1d";

5443+ rev = "beb86c7630e19314f5990acef81f9823bbb5bf3c";

5444+ sha256 = "14jf8fm1bjcmbw3mbr1a5731bac4i4mb8fv9ahdxd8i9349nyj3c";

54455445 };

54465446 meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/";

54475447 };

@@ -5520,17 +5520,17 @@ final: prev:

55205520

55215521 playground = buildVimPluginFrom2Nix {

55225522 pname = "playground";

5523− version = "2022-04-08";

5523+ version = "2022-05-01";

55245524 src = fetchFromGitHub {

55255525 owner = "nvim-treesitter";

55265526 repo = "playground";

5527− rev = "13e2d2d63ce7bc5d875e8bdf89cb070bc8cc7a00";

5528− sha256 = "1klkg3n3rymb6b9im7hq9yq26mqf2v79snsqbx72am649c6qc0ns";

5527+ rev = "71b00a3c665298e5155ad64a9020135808d4e3e8";

5528+ sha256 = "0cn6q7885ffn0yxv6frjsa8yx6mnil8lmdvml8inj3lvakyprzc8";

55295529 };

55305530 meta.homepage = "https://github.com/nvim-treesitter/playground/";

55315531 };

55325532

5533− plenary-nvim = buildVimPluginFrom2Nix {

5533+ plenary-nvim = buildNeovimPluginFrom2Nix {

55345534 pname = "plenary.nvim";

55355535 version = "2022-04-17";

55365536 src = fetchFromGitHub {

@@ -5617,12 +5617,12 @@ final: prev:

56175617

56185618 project-nvim = buildVimPluginFrom2Nix {

56195619 pname = "project.nvim";

5620− version = "2022-01-19";

5620+ version = "2022-04-25";

56215621 src = fetchFromGitHub {

56225622 owner = "ahmedkhalf";

56235623 repo = "project.nvim";

5624− rev = "cef52b8da07648b750d7f1e8fb93f12cb9482988";

5625− sha256 = "1qwpp0a8llx437jms3ghx8wrc5rwnrkh52xp24ysymqr4lc1xfq6";

5624+ rev = "612443b27f5feda45ea478bd6ddc8f95d4ec7b77";

5625+ sha256 = "1iq16ikd057bg72l39yq3d645wylbdv5i5siqlhfbgdrwiqxqv3w";

56265626 };

56275627 meta.homepage = "https://github.com/ahmedkhalf/project.nvim/";

56285628 };

@@ -5810,12 +5810,12 @@ final: prev:

58105810

58115811 refactoring-nvim = buildVimPluginFrom2Nix {

58125812 pname = "refactoring.nvim";

5813− version = "2022-04-11";

5813+ version = "2022-04-27";

58145814 src = fetchFromGitHub {

58155815 owner = "theprimeagen";

58165816 repo = "refactoring.nvim";

5817− rev = "94eaa199ad892f26d2c8594dbbc5656314cf5bdb";

5818− sha256 = "1smq4snh40ljhyc32qvj3w51xpl7ci0navm1l8xr03z8hpssz39w";

5817+ rev = "fef309f654906d931f2c714a77f5182fe70ada7d";

5818+ sha256 = "15y5v702xa2ax35p4sdv5ylkpz06pnrfi0jfp2isbl6z79p6dqv3";

58195819 };

58205820 meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";

58215821 };

@@ -5846,12 +5846,12 @@ final: prev:

58465846

58475847 rest-nvim = buildVimPluginFrom2Nix {

58485848 pname = "rest.nvim";

5849− version = "2022-01-26";

5849+ version = "2022-05-01";

58505850 src = fetchFromGitHub {

58515851 owner = "NTBBloodbath";

58525852 repo = "rest.nvim";

5853− rev = "2826f6960fbd9adb1da9ff0d008aa2819d2d06b3";

5854− sha256 = "0lb3rcc41rb9yhylmkpsj141yfk1kki1xkd4q2i9y0ld0mlwjjv8";

5853+ rev = "e5f68db73276c4d4d255f75a77bbe6eff7a476ef";

5854+ sha256 = "1gkml0101kai4cff2dlk8bv8rhsbiyr55hysvyv46gnxhisd8fy0";

58555855 };

58565856 meta.homepage = "https://github.com/NTBBloodbath/rest.nvim/";

58575857 };

@@ -5930,12 +5930,12 @@ final: prev:

59305930

59315931 rust-tools-nvim = buildVimPluginFrom2Nix {

59325932 pname = "rust-tools.nvim";

5933− version = "2022-03-26";

5933+ version = "2022-05-01";

59345934 src = fetchFromGitHub {

59355935 owner = "simrat39";

59365936 repo = "rust-tools.nvim";

5937− rev = "9f89fe6d9762ef89973bbb698c750dd21b94ec44";

5938− sha256 = "0r1k71rjlcly5pyi1vdzr22xdssikzsm5q4g2xzjp9v497fycg1h";

5937+ rev = "fe900a3d6028df4e7b7c89e8b0bf05b86af462ac";

5938+ sha256 = "0mkbq5rk86jz5ckj1bg7z0s5x3j8kcldfc57gdk8r48bjkirds42";

59395939 };

59405940 meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";

59415941 };

@@ -6147,12 +6147,12 @@ final: prev:

61476147

61486148 sonokai = buildVimPluginFrom2Nix {

61496149 pname = "sonokai";

6150− version = "2022-04-14";

6150+ version = "2022-04-27";

61516151 src = fetchFromGitHub {

61526152 owner = "sainnhe";

61536153 repo = "sonokai";

6154− rev = "4f29ac457ac759286bce3bb1a34f9517c91306c9";

6155− sha256 = "1yzyk78nb0xj5f2fnfvhrpgahg3mgx82bpw7nimvf0rd29dbpfqj";

6154+ rev = "9ad83caa675cb5160760bf85dcb951946c994572";

6155+ sha256 = "02sp13fbz12xbw7jh5l1isim7q66l54xdl82y4x245xh7h6mkvnh";

61566156 };

61576157 meta.homepage = "https://github.com/sainnhe/sonokai/";

61586158 };

@@ -6243,12 +6243,12 @@ final: prev:

62436243

62446244 splitjoin-vim = buildVimPluginFrom2Nix {

62456245 pname = "splitjoin.vim";

6246− version = "2022-04-03";

6246+ version = "2022-05-02";

62476247 src = fetchFromGitHub {

62486248 owner = "AndrewRadev";

62496249 repo = "splitjoin.vim";

6250− rev = "dbcd3069fb2b4ecfdd964c1e93aa59fcf7f850b6";

6251− sha256 = "1rgc9cbfpjnk8pf7wh9pyyljckbn1i88z5bggyn15q3lfhskvidc";

6250+ rev = "64f68a641084d18903769ec138b8fab45477bd92";

6251+ sha256 = "0if7z8yf75d5wamvlk76hxqvax7lrjmiiwdj4bf00j2pla5jydi8";

62526252 fetchSubmodules = true;

62536253 };

62546254 meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";

@@ -6401,12 +6401,12 @@ final: prev:

64016401

64026402 symbols-outline-nvim = buildVimPluginFrom2Nix {

64036403 pname = "symbols-outline.nvim";

6404− version = "2022-03-05";

6404+ version = "2022-05-01";

64056405 src = fetchFromGitHub {

64066406 owner = "simrat39";

64076407 repo = "symbols-outline.nvim";

6408− rev = "1361738c47892c3cee0d0b7a3b3bc7a8b48139c2";

6409− sha256 = "00a1x5dlns2n1wpf8hnh8brf6bwhbifsg4dlzjq51v4kj35hzjmd";

6408+ rev = "15ae99c27360ab42e931be127d130611375307d5";

6409+ sha256 = "170lxb2hw814wjxkpl0g4sic7wg3krp7pfkf3wp5j4dwk8czm2wi";

64106410 };

64116411 meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/";

64126412 };

@@ -6510,12 +6510,12 @@ final: prev:

65106510

65116511 tagbar = buildVimPluginFrom2Nix {

65126512 pname = "tagbar";

6513− version = "2022-04-07";

6513+ version = "2022-05-02";

65146514 src = fetchFromGitHub {

65156515 owner = "preservim";

65166516 repo = "tagbar";

6517− rev = "ccee72f1d1ed71a001e57592bd585ae77c5f83b2";

6518− sha256 = "1k6vsrvdsb1hkjfff3pbqf57zglwsh2csc6aj6lan790n9p63a3m";

6517+ rev = "a577ee4d650476243d91698f2d1228819c5fa0a5";

6518+ sha256 = "0d26c4qg7d25nzjvzds9p4z544h3zy0iwa51301pxh8s5kqr4s85";

65196519 };

65206520 meta.homepage = "https://github.com/preservim/tagbar/";

65216521 };

@@ -6558,12 +6558,12 @@ final: prev:

65586558

65596559 tcomment_vim = buildVimPluginFrom2Nix {

65606560 pname = "tcomment_vim";

6561− version = "2022-01-24";

6561+ version = "2022-04-24";

65626562 src = fetchFromGitHub {

65636563 owner = "tomtom";

65646564 repo = "tcomment_vim";

6565− rev = "3729ae43318faca94b0a1e878f9c6717b171d55e";

6566− sha256 = "07dhmfqrk6806648a0n9y98ngzk59b55j9nnsvvka0hl27q1mkl9";

6565+ rev = "7fb091aad8d824bef1d7bc9365921c65e26d82ad";

6566+ sha256 = "1lcaa5184gaifscdqzqv7fs35lmcwhlv0s5n8606xbm4qy1sr7mn";

65676567 };

65686568 meta.homepage = "https://github.com/tomtom/tcomment_vim/";

65696569 };

@@ -6642,12 +6642,12 @@ final: prev:

66426642

66436643 telescope-fzf-native-nvim = buildVimPluginFrom2Nix {

66446644 pname = "telescope-fzf-native.nvim";

6645− version = "2022-02-19";

6645+ version = "2022-04-30";

66466646 src = fetchFromGitHub {

66476647 owner = "nvim-telescope";

66486648 repo = "telescope-fzf-native.nvim";

6649− rev = "8ec164b541327202e5e74f99bcc5fe5845720e18";

6650− sha256 = "0n2f5zdpxasswdkmci56n0avwcrwsdyp8csq3mzhzf7696vppli1";

6649+ rev = "281b07a5cba2dc255e2a35d3fa6e49af0c8cb37f";

6650+ sha256 = "0hlrjc69k7gaxx8y6q7l80jpdp1v9kpvlzcv5ncmpfkl80vh2ld8";

66516651 };

66526652 meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";

66536653 };

@@ -6679,12 +6679,12 @@ final: prev:

66796679

66806680 telescope-github-nvim = buildVimPluginFrom2Nix {

66816681 pname = "telescope-github.nvim";

6682− version = "2022-04-06";

6682+ version = "2022-04-22";

66836683 src = fetchFromGitHub {

66846684 owner = "nvim-telescope";

66856685 repo = "telescope-github.nvim";

6686− rev = "c66aee748d572961af0e6ad5130b994343f922a7";

6687− sha256 = "11crv79xbhxzp9y35rf9fg4mgbwsrj709aw22n98575f0r2vqfgz";

6686+ rev = "ee95c509901c3357679e9f2f9eaac3561c811736";

6687+ sha256 = "1943bhi2y3kyxhdrbqysxpwmd9f2rj9pbl4r449kyj1rbh6mzqk2";

66886688 };

66896689 meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/";

66906690 };

@@ -6703,12 +6703,12 @@ final: prev:

67036703

67046704 telescope-project-nvim = buildVimPluginFrom2Nix {

67056705 pname = "telescope-project.nvim";

6706− version = "2022-01-23";

6706+ version = "2022-04-28";

67076707 src = fetchFromGitHub {

67086708 owner = "nvim-telescope";

67096709 repo = "telescope-project.nvim";

6710− rev = "d317c3cef6917d650d9a638c627b54d3e1173031";

6711− sha256 = "0kg2jh23cgbwjmvrc1cxvjka4y2j0qpi4r8dzzw0gs2nmdjmmic7";

6710+ rev = "4658d78523a5a005af80243f1d0b4e7e2a118dae";

6711+ sha256 = "0fpq6jfycl5hmz7ch5ris72qjabvhvbaj6wm9gwgl7ids99982p7";

67126712 };

67136713 meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/";

67146714 };

@@ -6727,12 +6727,12 @@ final: prev:

67276727

67286728 telescope-ui-select-nvim = buildVimPluginFrom2Nix {

67296729 pname = "telescope-ui-select.nvim";

6730− version = "2022-03-20";

6730+ version = "2022-04-30";

67316731 src = fetchFromGitHub {

67326732 owner = "nvim-telescope";

67336733 repo = "telescope-ui-select.nvim";

6734− rev = "186a124a01d7f19e6fcf608d4e1cc61d61ebe939";

6735− sha256 = "1lx11d4m0gcbvbb3bvxaciihnlsj1gi30ja1p0i9w7dm748d57zb";

6734+ rev = "62ea5e58c7bbe191297b983a9e7e89420f581369";

6735+ sha256 = "09mbi1x2r2xsbgfmmpb7113jppjmfwym4sr7nfvpc9glgqlkd4zw";

67366736 };

67376737 meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/";

67386738 };

@@ -6787,12 +6787,12 @@ final: prev:

67876787

67886788 telescope-nvim = buildVimPluginFrom2Nix {

67896789 pname = "telescope.nvim";

6790− version = "2022-04-18";

6790+ version = "2022-05-02";

67916791 src = fetchFromGitHub {

67926792 owner = "nvim-telescope";

67936793 repo = "telescope.nvim";

6794− rev = "6e7ed1b9638f09661fcb3a6db68f3ad77c8036be";

6795− sha256 = "11p5byic4qb9cgaffnrwa4s0qdzvxl6313phz5qdll78hwjw2fmy";

6794+ rev = "23e28d066a55a8e33bff33196f7bd65ea3ecbdbe";

6795+ sha256 = "1yhc81k57ar58i0pwcwr28jsbkpcn8qqqjv95qcfi4hh14z75wfn";

67966796 };

67976797 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

67986798 };

@@ -6968,12 +6968,12 @@ final: prev:

69686968

69696969 toggleterm-nvim = buildVimPluginFrom2Nix {

69706970 pname = "toggleterm.nvim";

6971− version = "2022-04-18";

6971+ version = "2022-04-25";

69726972 src = fetchFromGitHub {

69736973 owner = "akinsho";

69746974 repo = "toggleterm.nvim";

6975− rev = "dca8f4d9516270cb41c147ed692f3ee420c5e515";

6976− sha256 = "0ajypqnx9kglqh5h3vwyy9ccmazq8gjgb84hjrabr9hgvcnyj5hq";

6975+ rev = "6c7f5dbdd69bc5611a85194ddca83ac2c8ee84d6";

6976+ sha256 = "1c9hhwb77h6f4g1agkqmp0zccpbbyany2sgack1k9373y4q4c131";

69776977 };

69786978 meta.homepage = "https://github.com/akinsho/toggleterm.nvim/";

69796979 };

@@ -7088,12 +7088,12 @@ final: prev:

70887088

70897089 ultisnips = buildVimPluginFrom2Nix {

70907090 pname = "ultisnips";

7091− version = "2022-04-19";

7091+ version = "2022-04-23";

70927092 src = fetchFromGitHub {

70937093 owner = "SirVer";

70947094 repo = "ultisnips";

7095− rev = "e1ae43e44fb6b53144a5a8703a3d6cf10492a4a0";

7096− sha256 = "1rzhv8dma9ijf6g9z5drbi45bngzh4ccr3h4i0b8x3w4ab97p17q";

7095+ rev = "f5ccf0977c611ffd774ca180774959301baaffad";

7096+ sha256 = "0b4gb031ylm290ciyq72zlrykp4ypn82akjdac886r9zn50r2lpb";

70977097 };

70987098 meta.homepage = "https://github.com/SirVer/ultisnips/";

70997099 };

@@ -7136,12 +7136,12 @@ final: prev:

71367136

71377137 urlview-nvim = buildVimPluginFrom2Nix {

71387138 pname = "urlview.nvim";

7139− version = "2022-04-20";

7139+ version = "2022-04-25";

71407140 src = fetchFromGitHub {

71417141 owner = "axieax";

71427142 repo = "urlview.nvim";

7143− rev = "fcd59fc3a49e75993c3828c49df18bf3da51f45d";

7144− sha256 = "16y3hicljn9y60jzvq7xmhhp7r3y0v5v4f1i16hj65rly96wziq7";

7143+ rev = "3b637651d5f0de185a0ceac783582692e204b053";

7144+ sha256 = "1hpm1mhj9n6fnrkr5vpl1x80xgx7f2ic5vy9ndybbsppk2l8jrp4";

71457145 };

71467146 meta.homepage = "https://github.com/axieax/urlview.nvim/";

71477147 };

@@ -7184,12 +7184,12 @@ final: prev:

71847184

71857185 venn-nvim = buildVimPluginFrom2Nix {

71867186 pname = "venn.nvim";

7187− version = "2021-10-19";

7187+ version = "2022-04-27";

71887188 src = fetchFromGitHub {

71897189 owner = "jbyuki";

71907190 repo = "venn.nvim";

7191− rev = "d5a9c73fe7772c11414fc52acbb1d1bdb1ebc70f";

7192− sha256 = "1mzxvx1vqnm89yzzy6n3s30y9w7s38lbjhnwdf4diy0kdzyq8x06";

7191+ rev = "71856b548e3206e33bad10acea294ca8b44327ee";

7192+ sha256 = "0gjrcj196cwd0j6jjjplycc2gvw77n9jsmq6q4l7by13d2agn7kc";

71937193 };

71947194 meta.homepage = "https://github.com/jbyuki/venn.nvim/";

71957195 };

@@ -7688,12 +7688,12 @@ final: prev:

76887688

76897689 vim-autoformat = buildVimPluginFrom2Nix {

76907690 pname = "vim-autoformat";

7691− version = "2021-11-07";

7691+ version = "2022-04-21";

76927692 src = fetchFromGitHub {

76937693 owner = "vim-autoformat";

76947694 repo = "vim-autoformat";

7695− rev = "bb11f30377985e45e2eecef570856d42dbabb8b0";

7696− sha256 = "1lx5lrb0hjijvwngvgsgchww70c1bgqf5qxj8lhvk11dvxn3k087";

7695+ rev = "544596a21c54ee0888a1f30f3bb31d472432d7d9";

7696+ sha256 = "19ridsf6vgiknagplfdmbsg23wnl48j7n48z8qa3372x1v30c92p";

76977697 };

76987698 meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/";

76997699 };

@@ -7880,12 +7880,12 @@ final: prev:

78807880

78817881 vim-ccls = buildVimPluginFrom2Nix {

78827882 pname = "vim-ccls";

7883− version = "2022-01-29";

7883+ version = "2022-04-23";

78847884 src = fetchFromGitHub {

78857885 owner = "m-pilia";

78867886 repo = "vim-ccls";

7887− rev = "93ac5dbdeaaaed8fdfd6d850f1e57fb28d204886";

7888− sha256 = "15dr487baghlhl559a4zqpm8vnpm77aci4gw9x95v4kds9g4g51k";

7887+ rev = "b8e3afaca0578ce96f8d7eefd2093e7594a19424";

7888+ sha256 = "1zsp5lsdrrrlgbpb68hksb3lm8289h9rjz991clbvam61ssi4w08";

78897889 };

78907890 meta.homepage = "https://github.com/m-pilia/vim-ccls/";

78917891 };

@@ -7916,12 +7916,12 @@ final: prev:

79167916

79177917 vim-clap = buildVimPluginFrom2Nix {

79187918 pname = "vim-clap";

7919− version = "2022-04-08";

7919+ version = "2022-04-27";

79207920 src = fetchFromGitHub {

79217921 owner = "liuchengxu";

79227922 repo = "vim-clap";

7923− rev = "6e99d7924862b0a929983a36dd1d9bb9ae87ec44";

7924− sha256 = "1w7sjryw6inq2v4ryfabphbavmpgz6qa6f7jxyx1irjsd3293z65";

7923+ rev = "7d1fb3baf5b92b707146262713f6fe30d49a2f15";

7924+ sha256 = "0m7cgiysr95c1lssfsi84z1hhqv8bz32wsazk7jmxxn9j83696s5";

79257925 };

79267926 meta.homepage = "https://github.com/liuchengxu/vim-clap/";

79277927 };

@@ -8204,12 +8204,12 @@ final: prev:

82048204

82058205 vim-dadbod-ui = buildVimPluginFrom2Nix {

82068206 pname = "vim-dadbod-ui";

8207− version = "2022-03-06";

8207+ version = "2022-05-02";

82088208 src = fetchFromGitHub {

82098209 owner = "kristijanhusak";

82108210 repo = "vim-dadbod-ui";

8211− rev = "d9db8d8ae99500e4df6b22a73e30a411936dca37";

8212− sha256 = "1gpsnx2s6wk473547h7fjf21cgzkfx2b2d3hwk1q2m7gjpsg0j3q";

8211+ rev = "7bd114b88da4bf8115bd85d70fb531e4b6d72eb7";

8212+ sha256 = "0mb74z2kr85wd17kbhf8qx02iciq31aqg7y12k1isvmxkv4i0hhw";

82138213 };

82148214 meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";

82158215 };

@@ -8276,12 +8276,12 @@ final: prev:

82768276

82778277 vim-dirvish = buildVimPluginFrom2Nix {

82788278 pname = "vim-dirvish";

8279− version = "2022-03-27";

8279+ version = "2022-04-26";

82808280 src = fetchFromGitHub {

82818281 owner = "justinmk";

82828282 repo = "vim-dirvish";

8283− rev = "9dde0c97cc39ca1cf49cbe7ecd350d153a0426c3";

8284− sha256 = "0ba2lsc2jwgplgqsnq69dngiybcs4ad0il19xlk250msxpr5l8xq";

8283+ rev = "7e41cd7628d9844b4e66b45104f3abc326aa1a00";

8284+ sha256 = "16q979l3zjh4ly0rr74y3g3q0csabs8v5k6dxkyymvg3bycrpg4y";

82858285 };

82868286 meta.homepage = "https://github.com/justinmk/vim-dirvish/";

82878287 };

@@ -8492,24 +8492,24 @@ final: prev:

84928492

84938493 vim-erlang-tags = buildVimPluginFrom2Nix {

84948494 pname = "vim-erlang-tags";

8495− version = "2021-02-19";

8495+ version = "2022-04-02";

84968496 src = fetchFromGitHub {

84978497 owner = "vim-erlang";

84988498 repo = "vim-erlang-tags";

8499− rev = "d7eaa8f6986de0f266dac48b7dcfbf41d67ce611";

8500− sha256 = "03wxy29z0rjnf3hilap7c86di7dkjwb8sdlfh74ch8vhan8h6rv0";

8499+ rev = "cf6e9319818a6737dc9b79b7fa53fe4cdfc65139";

8500+ sha256 = "1sk3z35svv2dznmvw9cgjm1731lgq34gai92c5vy6sxdbn6h1sbw";

85018501 };

85028502 meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/";

85038503 };

85048504

85058505 vim-eunuch = buildVimPluginFrom2Nix {

85068506 pname = "vim-eunuch";

8507− version = "2022-04-19";

8507+ version = "2022-05-01";

85088508 src = fetchFromGitHub {

85098509 owner = "tpope";

85108510 repo = "vim-eunuch";

8511− rev = "c1ee64a9775b4adff8d4e052b158f380682bc249";

8512− sha256 = "17m1632a4nwilg0d29gx7gsng8f1w82q049iynm4gy1aqczlwgxh";

8511+ rev = "73b5e3fccfb5295e38546318c0d3139874c25efb";

8512+ sha256 = "1xqx80a1g9r3lxfxb1ahrbfzmm4r6azm8iyc3430nwqx4jg72pp2";

85138513 };

85148514 meta.homepage = "https://github.com/tpope/vim-eunuch/";

85158515 };

@@ -8588,12 +8588,12 @@ final: prev:

85888588

85898589 vim-flagship = buildVimPluginFrom2Nix {

85908590 pname = "vim-flagship";

8591− version = "2021-12-07";

8591+ version = "2022-04-21";

85928592 src = fetchFromGitHub {

85938593 owner = "tpope";

85948594 repo = "vim-flagship";

8595− rev = "7f3aab5e3f1b48df9f9465b8cd55f9d2a1564087";

8596− sha256 = "0vfihdwabl41wdavzppsim6sza8mjynpnb3my85di5xn5mgcmixp";

8595+ rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b";

8596+ sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06";

85978597 };

85988598 meta.homepage = "https://github.com/tpope/vim-flagship/";

85998599 };

@@ -8696,12 +8696,12 @@ final: prev:

86968696

86978697 vim-fugitive = buildVimPluginFrom2Nix {

86988698 pname = "vim-fugitive";

8699− version = "2022-04-14";

8699+ version = "2022-04-26";

87008700 src = fetchFromGitHub {

87018701 owner = "tpope";

87028702 repo = "vim-fugitive";

8703− rev = "4b0f2b604562e9681ae3b80c2665f168ac637cea";

8704− sha256 = "0amph3kjqq0hl74akpp5czjw2gk6mh6l2zz113mrb95nri0bz73q";

8703+ rev = "b7287bd5421da62986d9abf9131509b2c9f918e4";

8704+ sha256 = "1pk1qlr7lcifffsxm8fqy34p9nizv0n5mc0rl7xb7pr5c98a4vzz";

87058705 };

87068706 meta.homepage = "https://github.com/tpope/vim-fugitive/";

87078707 };

@@ -8792,12 +8792,12 @@ final: prev:

87928792

87938793 vim-gitgutter = buildVimPluginFrom2Nix {

87948794 pname = "vim-gitgutter";

8795− version = "2022-04-15";

8795+ version = "2022-04-25";

87968796 src = fetchFromGitHub {

87978797 owner = "airblade";

87988798 repo = "vim-gitgutter";

8799− rev = "d5bae104031bb1633cb5c5178dc7d4ac422b422a";

8800− sha256 = "1k6bn3wm9chaqhkaw382169ia5ycbbnw00hwyaabx7fbzc8zf7zw";

8799+ rev = "988a6dbad9a9777cd94aab18ba7821a41068685b";

8800+ sha256 = "178jzjwqjd15b3gjdyiay5fw9sv6s7jbzj1sgqfwlg2gm3m7g2fi";

88018801 };

88028802 meta.homepage = "https://github.com/airblade/vim-gitgutter/";

88038803 };

@@ -8840,12 +8840,12 @@ final: prev:

88408840

88418841 vim-go = buildVimPluginFrom2Nix {

88428842 pname = "vim-go";

8843− version = "2022-04-15";

8843+ version = "2022-04-23";

88448844 src = fetchFromGitHub {

88458845 owner = "fatih";

88468846 repo = "vim-go";

8847− rev = "687eb72bb6e84012ef2b0b2474175e46243e43b0";

8848− sha256 = "0llf81fh166xvdvy0vj93a964hp2clb3lqdy2sp3fhzldzyv0bab";

8847+ rev = "e9d7ff3eb4a369f0cb2069c8f77ae68796bca308";

8848+ sha256 = "1gplykwbn8iclliv0ssd728bm3rxfvanppa2svn50h2c3zn7dph7";

88498849 };

88508850 meta.homepage = "https://github.com/fatih/vim-go/";

88518851 };

@@ -9538,24 +9538,24 @@ final: prev:

95389538

95399539 vim-lsc = buildVimPluginFrom2Nix {

95409540 pname = "vim-lsc";

9541− version = "2021-04-28";

9541+ version = "2022-04-30";

95429542 src = fetchFromGitHub {

95439543 owner = "natebosch";

95449544 repo = "vim-lsc";

9545− rev = "4b0fc48037c628f14209f30616a19287d9e54823";

9546− sha256 = "1jwfc193wbh2rmyi6mdwgr3lcq82qhlclq4hjwg1hcw94442r5xv";

9545+ rev = "39ec72353c2170db2caf797072800c513647e9c5";

9546+ sha256 = "18ljb8j8rs77643v8gprpqzfac492ljc49mn4g8b1bdkbji4cnqx";

95479547 };

95489548 meta.homepage = "https://github.com/natebosch/vim-lsc/";

95499549 };

95509550

95519551 vim-lsp = buildVimPluginFrom2Nix {

95529552 pname = "vim-lsp";

9553− version = "2022-04-17";

9553+ version = "2022-04-21";

95549554 src = fetchFromGitHub {

95559555 owner = "prabirshrestha";

95569556 repo = "vim-lsp";

9557− rev = "8df4aa40191717b34f5da8d3c8e90dc0f1f62e0b";

9558− sha256 = "0nx63rn86cjprwbvqpzarxxn1id6jndvww9n10ssdf5cfkw697b7";

9557+ rev = "c075e157fcce4511e537b1f7f3385444d9c80e0d";

9558+ sha256 = "0q7mg3qk0ryh46m6p4pliysrndmz3g6g6m5rqpz86lj6z2ivzzhy";

95599559 };

95609560 meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";

95619561 };

@@ -9586,12 +9586,12 @@ final: prev:

95869586

95879587 vim-maktaba = buildVimPluginFrom2Nix {

95889588 pname = "vim-maktaba";

9589− version = "2021-08-09";

9589+ version = "2022-04-22";

95909590 src = fetchFromGitHub {

95919591 owner = "google";

95929592 repo = "vim-maktaba";

9593− rev = "f5127b339a9d776f220cc0393783c55def9d8ce0";

9594− sha256 = "0svkpk46fvas5346af2cw2ga03mlwd3rn8pya41f9whybqxdrysg";

9593+ rev = "fe631a85b0a1e1a709a55ef0947c9c0813f41edb";

9594+ sha256 = "166fgfxh6k4v2ypzjmn6hicr92xgcsi5bi930f74xv5fzm0gw9l8";

95959595 };

95969596 meta.homepage = "https://github.com/google/vim-maktaba/";

95979597 };

@@ -9610,24 +9610,24 @@ final: prev:

96109610

96119611 vim-markbar = buildVimPluginFrom2Nix {

96129612 pname = "vim-markbar";

9613− version = "2020-08-31";

9613+ version = "2022-04-27";

96149614 src = fetchFromGitHub {

96159615 owner = "Yilin-Yang";

96169616 repo = "vim-markbar";

9617− rev = "df13c3abe88c01a716b1099de953dcfa1679e663";

9618− sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9";

9617+ rev = "b9b87339bca7572ffc506165069242b6c06c210b";

9618+ sha256 = "1kgpq8q7rcskwc8y8fcbvpq61qx9ysb846qhlk2s7fqjkwpmgz59";

96199619 };

96209620 meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/";

96219621 };

96229622

96239623 vim-markdown = buildVimPluginFrom2Nix {

96249624 pname = "vim-markdown";

9625− version = "2022-04-13";

9625+ version = "2022-04-26";

96269626 src = fetchFromGitHub {

96279627 owner = "preservim";

96289628 repo = "vim-markdown";

9629− rev = "c031a3e65c50d6aa0bfc81f8be9d248f9644426d";

9630− sha256 = "0l8ginadb4jxnrggd1lvia8kan397x02jf3v6sgkcyxawwpgfl0x";

9629+ rev = "9068655bb74bb615b3876b4d4d6a1d1141e212f3";

9630+ sha256 = "0s4ph2c8a1ha0cd95b2lf2i5irf4bwx34929i2c5p3ihk2701fsf";

96319631 };

96329632 meta.homepage = "https://github.com/preservim/vim-markdown/";

96339633 };

@@ -9659,12 +9659,12 @@ final: prev:

96599659

96609660 vim-matchup = buildVimPluginFrom2Nix {

96619661 pname = "vim-matchup";

9662− version = "2022-04-19";

9662+ version = "2022-04-20";

96639663 src = fetchFromGitHub {

96649664 owner = "andymass";

96659665 repo = "vim-matchup";

9666− rev = "bb04f9fa64b96bd3d6c4c146c6f9c55a69587fac";

9667− sha256 = "1wrgxsdv3q2px0q7w6jf5dnj2abr0vf1pfq5f53zq784h08m07hq";

9666+ rev = "1cb069f2a526682b3ce69610cf7c05511295ad37";

9667+ sha256 = "09xwkzipsqiyglmyxkz0n6jycwp918mfxazqycy54zwng1c207q1";

96689668 };

96699669 meta.homepage = "https://github.com/andymass/vim-matchup/";

96709670 };

@@ -9863,12 +9863,12 @@ final: prev:

98639863

98649864 vim-nix = buildVimPluginFrom2Nix {

98659865 pname = "vim-nix";

9866− version = "2021-05-28";

9866+ version = "2022-04-25";

98679867 src = fetchFromGitHub {

98689868 owner = "LnL7";

98699869 repo = "vim-nix";

9870− rev = "63b47b39c8d481ebca3092822ca8972e08df769b";

9871− sha256 = "08n9cgphv2m96kk5w996lwlqak011x5xm410hajmc91vy5fws361";

9870+ rev = "7d23e97d13c40fcc6d603b291fe9b6e5f92516ee";

9871+ sha256 = "1vaprm79j0nfl37r6lw0zwd048ajd5sc9cvny59qwdl3x0zk38av";

98729872 };

98739873 meta.homepage = "https://github.com/LnL7/vim-nix/";

98749874 };

@@ -10211,12 +10211,12 @@ final: prev:

1021110211

1021210212 vim-plug = buildVimPluginFrom2Nix {

1021310213 pname = "vim-plug";

10214− version = "2022-04-04";

10214+ version = "2022-04-21";

1021510215 src = fetchFromGitHub {

1021610216 owner = "junegunn";

1021710217 repo = "vim-plug";

10218− rev = "93ab5909784e09134e90f15cafa8a5edcc9a00fe";

10219− sha256 = "0cq2ilqqq90bpp8pzylqi759hqb9ni6l1rqkvj6aj7a4b29a59nv";

10218+ rev = "be55ec46b5ab031805487a9c3e895db57f53010b";

10219+ sha256 = "03flkm75xp7g4kzwdmvz2dc2r1aqbkyknxbclvp38xk3qwwd5kvh";

1022010220 };

1022110221 meta.homepage = "https://github.com/junegunn/vim-plug/";

1022210222 };

@@ -10235,12 +10235,12 @@ final: prev:

1023510235

1023610236 vim-polyglot = buildVimPluginFrom2Nix {

1023710237 pname = "vim-polyglot";

10238− version = "2022-04-18";

10238+ version = "2022-04-30";

1023910239 src = fetchFromGitHub {

1024010240 owner = "sheerun";

1024110241 repo = "vim-polyglot";

10242− rev = "db7bb8ba22f5798bf3abe9f786bc6e6d002725f8";

10243− sha256 = "1fjy26ncql66fn7jdmggkndad1ib9csblvyq42sq9qcdci0lb9jx";

10242+ rev = "38282d58387cff48ac203f6912c05e4c8686141b";

10243+ sha256 = "15szf3fjlnws0g5l3d2p3w74d5m9299l5k5gx91p0n9431xjb569";

1024410244 };

1024510245 meta.homepage = "https://github.com/sheerun/vim-polyglot/";

1024610246 };

@@ -10307,12 +10307,12 @@ final: prev:

1030710307

1030810308 vim-projectionist = buildVimPluginFrom2Nix {

1030910309 pname = "vim-projectionist";

10310− version = "2022-04-19";

10310+ version = "2022-04-27";

1031110311 src = fetchFromGitHub {

1031210312 owner = "tpope";

1031310313 repo = "vim-projectionist";

10314− rev = "8fb9440ad4cea6ffea8efc3efa4d8d64e7fb9785";

10315− sha256 = "0nlsi05r2gvmwzzrrcifvx1rq09d16mnfa3gl2qif5dgmrj7qzni";

10314+ rev = "df1e28dba36e69288173fdcdce122d98538ae782";

10315+ sha256 = "1xqf3vrw5vy2pg87b840i87pxvi252rlw4q6fyldlzffxygk6zhq";

1031610316 };

1031710317 meta.homepage = "https://github.com/tpope/vim-projectionist/";

1031810318 };

@@ -10475,12 +10475,12 @@ final: prev:

1047510475

1047610476 vim-rails = buildVimPluginFrom2Nix {

1047710477 pname = "vim-rails";

10478− version = "2022-04-16";

10478+ version = "2022-04-27";

1047910479 src = fetchFromGitHub {

1048010480 owner = "tpope";

1048110481 repo = "vim-rails";

10482− rev = "d38f1bf8575b920042153689492721b80252ae41";

10483− sha256 = "18c3maypsl265f3a03602mnq4lky5w786i9iaphv5x5rlnfwj8wa";

10482+ rev = "2f8adae670e3fe262b793885ae5d808d40c6f2ed";

10483+ sha256 = "1mjjhnrpdcz85r1l3jriqa55ffdkr35c0vf85g3kzg9kqf8g9y0l";

1048410484 };

1048510485 meta.homepage = "https://github.com/tpope/vim-rails/";

1048610486 };

@@ -10547,12 +10547,12 @@ final: prev:

1054710547

1054810548 vim-ruby = buildVimPluginFrom2Nix {

1054910549 pname = "vim-ruby";

10550− version = "2022-03-22";

10550+ version = "2022-04-27";

1055110551 src = fetchFromGitHub {

1055210552 owner = "vim-ruby";

1055310553 repo = "vim-ruby";

10554− rev = "f3236767d2e74d736d98efd8da44013d1e95bfc1";

10555− sha256 = "0mlllnykdmcxf4yx2nkp74rm4wx2qwcly3m711a6pq7w87fgh6jz";

10554+ rev = "811d8060f390837c49e8625e29c69672cdc56ec3";

10555+ sha256 = "0cx2xl1qn57fxhc7rwdfcf359yknr0qw3yh7mbpygrm45jlgwnva";

1055610556 };

1055710557 meta.homepage = "https://github.com/vim-ruby/vim-ruby/";

1055810558 };

@@ -10631,12 +10631,12 @@ final: prev:

1063110631

1063210632 vim-search-pulse = buildVimPluginFrom2Nix {

1063310633 pname = "vim-search-pulse";

10634− version = "2017-01-05";

10634+ version = "2022-04-26";

1063510635 src = fetchFromGitHub {

1063610636 owner = "inside";

1063710637 repo = "vim-search-pulse";

10638− rev = "9f8f473e3813bd76ecb66e8d6182d96bda39b6df";

10639− sha256 = "1xr90a8wvjfkgw1yrh0zcvpvp9ma6z0wqkl8v8pabf20vckgy2q0";

10638+ rev = "3ae2681332c52ed54c443e09d2ef09ae05eaa445";

10639+ sha256 = "0si6mqrassa7jpdhpiya3f507a74k46h07sbfks7hvxkhk51q7yx";

1064010640 };

1064110641 meta.homepage = "https://github.com/inside/vim-search-pulse/";

1064210642 };

@@ -10739,12 +10739,12 @@ final: prev:

1073910739

1074010740 vim-sleuth = buildVimPluginFrom2Nix {

1074110741 pname = "vim-sleuth";

10742− version = "2022-04-14";

10742+ version = "2022-04-28";

1074310743 src = fetchFromGitHub {

1074410744 owner = "tpope";

1074510745 repo = "vim-sleuth";

10746− rev = "e116c2cc2555b09aee9b18eba405b925c8b7eaf9";

10747− sha256 = "02ljdb3p7fp0h3nf6rxv5kgsxqdvgkwrwgb01x4xn100spkv6y6i";

10746+ rev = "1d25e8e5dc4062e38cab1a461934ee5e9d59e5a8";

10747+ sha256 = "1nb90zm9jc2mq5fxbxifrmhkpjs3a5y68amr3f99rxfd0197jxcs";

1074810748 };

1074910749 meta.homepage = "https://github.com/tpope/vim-sleuth/";

1075010750 };

@@ -10835,12 +10835,12 @@ final: prev:

1083510835

1083610836 vim-snippets = buildVimPluginFrom2Nix {

1083710837 pname = "vim-snippets";

10838− version = "2022-04-20";

10838+ version = "2022-04-30";

1083910839 src = fetchFromGitHub {

1084010840 owner = "honza";

1084110841 repo = "vim-snippets";

10842− rev = "0decc32aad4564452c2f8a5cbfe387195f1a8bba";

10843− sha256 = "1ycmls9xpkfzkrws2aby88zmsv1489d659sllrgmbmh04g0pq8vy";

10842+ rev = "45c8e00d0bae9056713097ea655d76d463b66f10";

10843+ sha256 = "0zng2k82kwm0av1dyar6y44cq79v5khy07swwp6kmkz5vjj9y4dd";

1084410844 };

1084510845 meta.homepage = "https://github.com/honza/vim-snippets/";

1084610846 };

@@ -10979,12 +10979,12 @@ final: prev:

1097910979

1098010980 vim-surround = buildVimPluginFrom2Nix {

1098110981 pname = "vim-surround";

10982− version = "2022-04-10";

10982+ version = "2022-04-22";

1098310983 src = fetchFromGitHub {

1098410984 owner = "tpope";

1098510985 repo = "vim-surround";

10986− rev = "81fc0ec460dd8b25a76346e09aecdbca2677f1a7";

10987− sha256 = "0k8fyyjak1l6f1hsb3pbyri1jsgxzbhcbih7p4vc8cdm346yms1i";

10986+ rev = "bf3480dc9ae7bea34c78fbba4c65b4548b5b1fea";

10987+ sha256 = "07wk87xiri44h5k3higiw9wfp516fflhq2xyrgm5hkxs3nnnx6la";

1098810988 };

1098910989 meta.homepage = "https://github.com/tpope/vim-surround/";

1099010990 };

@@ -11340,12 +11340,12 @@ final: prev:

1134011340

1134111341 vim-unimpaired = buildVimPluginFrom2Nix {

1134211342 pname = "vim-unimpaired";

11343− version = "2022-04-10";

11343+ version = "2022-04-29";

1134411344 src = fetchFromGitHub {

1134511345 owner = "tpope";

1134611346 repo = "vim-unimpaired";

11347− rev = "80ab990c7ff7251f43262aae4b60ff6eff2ef3a4";

11348− sha256 = "0qmxzk0vcglyrvx2hpxm6qgr6mcc1xnf6srw77ga9g0aazjr2hxc";

11347+ rev = "98427183e2b35acee15c7628b1cd587b98025719";

11348+ sha256 = "0w5065ywkr7ygpqjmi1r9s3icm6v0x2w1gfa9flwqhx6y02jfrmk";

1134911349 };

1135011350 meta.homepage = "https://github.com/tpope/vim-unimpaired/";

1135111351 };

@@ -11424,12 +11424,12 @@ final: prev:

1142411424

1142511425 vim-vsnip = buildVimPluginFrom2Nix {

1142611426 pname = "vim-vsnip";

11427− version = "2022-02-26";

11427+ version = "2022-04-22";

1142811428 src = fetchFromGitHub {

1142911429 owner = "hrsh7th";

1143011430 repo = "vim-vsnip";

11431− rev = "70a1131d64d75150ece513b983b0f42939bcb03c";

11432− sha256 = "042cnznm1p5x3ky7m81q62n3nlgab9fq734hlfwsbwrcdqa849l2";

11431+ rev = "8f199ef690ed26dcbb8973d9a6760d1332449ac9";

11432+ sha256 = "1d9wr97a02j717sbh55xk7xam6d97l5ggi0ymc67q64hrq8nsaai";

1143311433 };

1143411434 meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";

1143511435 };

@@ -11460,12 +11460,12 @@ final: prev:

1146011460

1146111461 vim-wakatime = buildVimPluginFrom2Nix {

1146211462 pname = "vim-wakatime";

11463− version = "2022-04-13";

11463+ version = "2022-04-29";

1146411464 src = fetchFromGitHub {

1146511465 owner = "wakatime";

1146611466 repo = "vim-wakatime";

11467− rev = "9cf2f1910d5cd7f25657176fe60b1745a310f1b3";

11468− sha256 = "0jxkfiq5553ad7zabxlgwzwwsgwznkn0rahfmr79r1dvvqm9m1a6";

11467+ rev = "b8e6cc7dc28e2e6198d8c9c30e5c8a2414a7b996";

11468+ sha256 = "1hy0y5v3r5w7y8phkgbi1ff7p8yyhyndxr3yyr1wfvssdilz6xqj";

1146911469 };

1147011470 meta.homepage = "https://github.com/wakatime/vim-wakatime/";

1147111471 };

@@ -11520,12 +11520,12 @@ final: prev:

1152011520

1152111521 vim-wordmotion = buildVimPluginFrom2Nix {

1152211522 pname = "vim-wordmotion";

11523− version = "2021-12-28";

11523+ version = "2022-04-23";

1152411524 src = fetchFromGitHub {

1152511525 owner = "chaoren";

1152611526 repo = "vim-wordmotion";

11527− rev = "0d810cc943a858a570a482055188b5e69c4c8724";

11528− sha256 = "0d0sf7dzzawssfn1dq61485vbykwmzc1g4qk91qnl68w9h4xlpgl";

11527+ rev = "1f7eaf5d5733e39fb37f8e0de2f7f15e242dd39c";

11528+ sha256 = "1j68jvswd7gdva90ar3ldqrspg7r5m4wwv593g98l8yn6dkz9mrz";

1152911529 };

1153011530 meta.homepage = "https://github.com/chaoren/vim-wordmotion/";

1153111531 };

@@ -11748,12 +11748,12 @@ final: prev:

1174811748

1174911749 vimspector = buildVimPluginFrom2Nix {

1175011750 pname = "vimspector";

11751− version = "2022-04-13";

11751+ version = "2022-05-01";

1175211752 src = fetchFromGitHub {

1175311753 owner = "puremourning";

1175411754 repo = "vimspector";

11755− rev = "ebeebc121423a5ab9a31c996f9881880b658c644";

11756− sha256 = "0npcra2k49rz9ij4kc6dyb8dpmfi6kivpp89ggmpnd0989vn9i56";

11755+ rev = "960f0444d21ebb20303e1796e4b478df042c3bd3";

11756+ sha256 = "0sx2awi2b22j9wdyi8m1k261qlfj19i2xs93g5lb24lfb53rarmi";

1175711757 fetchSubmodules = true;

1175811758 };

1175911759 meta.homepage = "https://github.com/puremourning/vimspector/";

@@ -11761,12 +11761,12 @@ final: prev:

1176111761

1176211762 vimtex = buildVimPluginFrom2Nix {

1176311763 pname = "vimtex";

11764− version = "2022-04-10";

11764+ version = "2022-05-02";

1176511765 src = fetchFromGitHub {

1176611766 owner = "lervag";

1176711767 repo = "vimtex";

11768− rev = "7bfcfb7b9a734b07e04209350bbe56d7123efb48";

11769− sha256 = "1w09kmrm6rpffzh3xz9zsqm7h9f56a6p1wzclz96wvy8mr6hd6bn";

11768+ rev = "9ffbe63a2055b59b09b18b1cd682e0b2703cc898";

11769+ sha256 = "151ilpd7360rhpi3nyi5dfky814zx9zc4fa82wj6bnkcwy1b4k0c";

1177011770 };

1177111771 meta.homepage = "https://github.com/lervag/vimtex/";

1177211772 };

@@ -11869,12 +11869,12 @@ final: prev:

1186911869

1187011870 wilder-nvim = buildVimPluginFrom2Nix {

1187111871 pname = "wilder.nvim";

11872− version = "2022-04-17";

11872+ version = "2022-04-23";

1187311873 src = fetchFromGitHub {

1187411874 owner = "gelguy";

1187511875 repo = "wilder.nvim";

11876− rev = "a9ea0c69b37850752d5f8431b7be6bf8f1a0254c";

11877− sha256 = "0vd01sjj4q26a653wv9icfyd7g34rnl4whbnl3ic6pvb9cvj72wk";

11876+ rev = "777b163e394ba658ef288292efb533b25610ef9d";

11877+ sha256 = "1y7kii77jia3j9jlisjg2x1yfk8r048aas5zja0ag8nlyqldj8xh";

1187811878 };

1187911879 meta.homepage = "https://github.com/gelguy/wilder.nvim/";

1188011880 };

@@ -12038,12 +12038,12 @@ final: prev:

1203812038

1203912039 zig-vim = buildVimPluginFrom2Nix {

1204012040 pname = "zig.vim";

12041− version = "2022-03-15";

12041+ version = "2022-05-01";

1204212042 src = fetchFromGitHub {

1204312043 owner = "ziglang";

1204412044 repo = "zig.vim";

12045− rev = "dd5e2c2384d42eaffadd5a8fd749b0499a90a7ac";

12046− sha256 = "0qbjnmjf057phxkzhsyys9x0620szbgr3awqzgxr3cflyd1zhrf4";

12045+ rev = "1cb9cd521cab91e39cf162b50b7a095fd12361d3";

12046+ sha256 = "10flq5dm6aa5ay3rb2rn5y9ih8z66iq6lw2rl2489qxi605bxqs7";

1204712047 };

1204812048 meta.homepage = "https://github.com/ziglang/zig.vim/";

1204912049 };

@@ -12086,12 +12086,12 @@ final: prev:

1208612086

1208712087 chad = buildVimPluginFrom2Nix {

1208812088 pname = "chad";

12089− version = "2022-04-20";

12089+ version = "2022-05-02";

1209012090 src = fetchFromGitHub {

1209112091 owner = "ms-jpq";

1209212092 repo = "chadtree";

12093− rev = "d9a84322624d14c1e249e9a8a4573c9d205a9bc9";

12094− sha256 = "16lha28fmi463snf71w0nz6ll0yiiiz7xrh2v7irkgx214q1gh6z";

12093+ rev = "820c1913a77a12d080e3436e60a491327664589b";

12094+ sha256 = "0lc5ldg65h4jqb6qkz22avzv4x2jmciabcsy47a9wkzy2l9hlvza";

1209512095 };

1209612096 meta.homepage = "https://github.com/ms-jpq/chadtree/";

1209712097 };

@@ -12122,12 +12122,12 @@ final: prev:

1212212122

1212312123 gruvbox-community = buildVimPluginFrom2Nix {

1212412124 pname = "gruvbox-community";

12125− version = "2022-03-06";

12125+ version = "2022-04-29";

1212612126 src = fetchFromGitHub {

1212712127 owner = "gruvbox-community";

1212812128 repo = "gruvbox";

12129− rev = "b6f47ae7031f6746a1f1918c17574aa12c474ef0";

12130− sha256 = "0m8rrm5v542a2c30sg7hlgm7r6gs4ah1n6nr5dc101l2064kg97g";

12129+ rev = "34ad436b234c5095d46bb065c5b32780618df83f";

12130+ sha256 = "11zp3w4n2iq97rx7fp7rlvykmx4k7swbbqpjphrx0il0fmghv6q8";

1213112131 };

1213212132 meta.homepage = "https://github.com/gruvbox-community/gruvbox/";

1213312133 };

@@ -12158,12 +12158,12 @@ final: prev:

1215812158

1215912159 rose-pine = buildVimPluginFrom2Nix {

1216012160 pname = "rose-pine";

12161− version = "2022-04-19";

12161+ version = "2022-04-25";

1216212162 src = fetchFromGitHub {

1216312163 owner = "rose-pine";

1216412164 repo = "neovim";

12165− rev = "758568b92e0a17c3618f71d43cce96a3a5436985";

12166− sha256 = "0zxyyjp1527681rrw25f8vzx1d6djqac04zcay02hxi2rcnjpan5";

12165+ rev = "da67a549cf5d67e15618cc3001f1e07724a1597f";

12166+ sha256 = "1dfccfjy67b7269zypkdi7x6fcsdgw2qmd44kyk66qr6f9q4yng2";

1216712167 };

1216812168 meta.homepage = "https://github.com/rose-pine/neovim/";

1216912169 };

@@ -12180,4 +12180,5 @@ final: prev:

1218012180 meta.homepage = "https://github.com/jhradilek/vim-snippets/";

1218112181 };

1218212182

12183+

1218312184}

pkgs/applications/editors/vim/plugins/update.py+47−16

@@ -26,19 +26,24 @@ from typing import List, Tuple

2626from pathlib import Path

2727

2828log = logging.getLogger()

29−log.addHandler(logging.StreamHandler())

29+

30+sh = logging.StreamHandler()

31+formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s')

32+sh.setFormatter(formatter)

33+log.addHandler(sh)

3034

3135# Import plugin update library from maintainers/scripts/pluginupdate.py

3236ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))

3337# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree

3438sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts"))

3539import pluginupdate

40+from pluginupdate import run_nix_expr, PluginDesc

3641

3742GET_PLUGINS = f"""(with import <localpkgs> {{}};

3843let

39− inherit (vimUtils.override {{inherit vim;}}) buildVimPluginFrom2Nix;

44+ inherit (vimUtils.override {{inherit vim;}}) buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;

4045 generated = callPackage {ROOT}/generated.nix {{

41− inherit buildVimPluginFrom2Nix;

46+ inherit buildNeovimPluginFrom2Nix buildVimPluginFrom2Nix;

4247 }};

4348 hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value;

4449 getChecksum = name: value:

@@ -50,43 +55,69 @@ let

5055 checksums = lib.mapAttrs getChecksum generated;

5156in lib.filterAttrs (n: v: v != null) checksums)"""

5257

58+GET_PLUGINS_LUA = """

59+with import <localpkgs> {};

60+lib.attrNames lua51Packages"""

61+

5362HEADER = (

5463 "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!"

5564)

5665

66+def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool:

67+ '''

68+ Whether it's a neovim-only plugin

69+ We can check if it's available in lua packages

70+ '''

71+ global luaPlugins

72+ if plug.normalized_name in luaPlugins:

73+ log.debug("%s is a neovim plugin", plug)

74+ return True

75+ return False

76+

5777

5878class VimEditor(pluginupdate.Editor):

59− def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str):

79+ def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str):

6080 sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower())

6181

6282 with open(outfile, "w+") as f:

6383 f.write(HEADER)

6484 f.write(textwrap.dedent("""

65− { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

85+ { lib, buildVimPluginFrom2Nix, buildNeovimPluginFrom2Nix, fetchFromGitHub, fetchgit }:

6686

6787 final: prev:

68− {"""

88+ {

89+ """

6990 ))

7091 for pdesc, plugin in sorted_plugins:

92+ content = self.plugin2nix(pdesc, plugin)

93+ f.write(content)

94+ f.write("\n}\n")

95+ print(f"updated {outfile}")

96+

97+ def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str:

7198

72− repo = pdesc.repo

73− src_nix = repo.as_nix(plugin)

74− f.write(

75− f"""

76− {plugin.normalized_name} = buildVimPluginFrom2Nix {{

99+ repo = pdesc.repo

100+ isNeovim = isNeovimPlugin(plugin)

101+

102+ content = f" {plugin.normalized_name} = "

103+ src_nix = repo.as_nix(plugin)

104+ content += """{buildFn} {{

77105 pname = "{plugin.name}";

78106 version = "{plugin.version}";

79107 src = {src_nix};

80108 meta.homepage = "{repo.uri}";

81109 }};

82−"""

83− )

84− f.write("\n}\n")

85− print(f"updated {outfile}")

86−

87110

111+""".format(

112+ buildFn="buildNeovimPluginFrom2Nix" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo)

113+ print(content)

114+ return content

88115

89116def main():

117+

118+ global luaPlugins

119+ luaPlugins = run_nix_expr(GET_PLUGINS_LUA)

120+

90121 editor = VimEditor("vim", ROOT, GET_PLUGINS)

91122 parser = editor.create_parser()

92123 args = parser.parse_args()

pkgs/applications/editors/vim/plugins/vim-utils.nix+5

@@ -535,6 +535,11 @@ rec {

535535 inherit lib stdenv rtpPath vim vimGenDocHook vimCommandCheckHook;

536536 }) buildVimPlugin buildVimPluginFrom2Nix;

537537

538+

539+ # TODO placeholder to ease working on automatic plugin detection

540+ # this should be a luarocks "flat" install with appropriate vim hooks

541+ buildNeovimPluginFrom2Nix = buildVimPluginFrom2Nix;

542+

538543 # used to figure out which python dependencies etc. neovim needs

539544 requiredPlugins = {

540545 packages ? {},

pkgs/applications/misc/bottles/default.nix+2−2

@@ -20,13 +20,13 @@ let

2020in

2121python3Packages.buildPythonApplication rec {

2222 pname = "bottles";

23− version = "2022.4.28-trento";

23+ version = "2022.5.2-trento";

2424

2525 src = fetchFromGitHub {

2626 owner = "bottlesdevs";

2727 repo = pname;

2828 rev = version;

29− sha256 = "sha256-PVtjKAwCA9GliUDIoAFMqeVFZYPo2dxCWhW9lSotC6w=";

29+ sha256 = "sha256-9auQm8rmySjPQmhueGMRj4DsQiKhCGtE97byc/h+v84=";

3030 };

3131

3232 postPatch = ''

pkgs/applications/misc/hello/default.nix+8−5

@@ -1,4 +1,5 @@

1−{ lib

1+{ callPackage

2+, lib

23, stdenv

34, fetchurl

45, nixos

@@ -6,12 +7,12 @@

67, hello

78}:

89

9−stdenv.mkDerivation rec {

10+stdenv.mkDerivation (finalAttrs: {

1011 pname = "hello";

1112 version = "2.12";

1213

1314 src = fetchurl {

14− url = "mirror://gnu/hello/${pname}-${version}.tar.gz";

15+ url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz";

1516 sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g";

1617 };

1718

@@ -27,6 +28,8 @@ stdenv.mkDerivation rec {

2728 (nixos { environment.noXlibs = true; }).pkgs.hello;

2829 };

2930

31+ passthru.tests.run = callPackage ./test.nix { hello = finalAttrs.finalPackage; };

32+

3033 meta = with lib; {

3134 description = "A program that produces a familiar, friendly greeting";

3235 longDescription = ''

@@ -34,9 +37,9 @@ stdenv.mkDerivation rec {

3437 It is fully customizable.

3538 '';

3639 homepage = "https://www.gnu.org/software/hello/manual/";

37− changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}";

40+ changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${finalAttrs.version}";

3841 license = licenses.gpl3Plus;

3942 maintainers = [ maintainers.eelco ];

4043 platforms = platforms.all;

4144 };

42−}

45+})

pkgs/applications/misc/hello/test.nixnew file+8

@@ -0,0 +1,8 @@

1+{ runCommand, hello }:

2+

3+runCommand "hello-test-run" {

4+ nativeBuildInputs = [ hello ];

5+} ''

6+ diff -U3 --color=auto <(hello) <(echo 'Hello, world!')

7+ touch $out

8+''

pkgs/applications/misc/kiln/default.nix+3−3

@@ -2,18 +2,18 @@

22

33buildGoModule rec {

44 pname = "kiln";

5− version = "0.2.1";

5+ version = "0.3.0";

66

77 src = fetchFromSourcehut {

88 owner = "~adnano";

99 repo = pname;

1010 rev = version;

11− hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI=";

11+ hash = "sha256-owON9ZNi8BufkeARjC6SwxzM81YJYu+bakhH5quzMrA=";

1212 };

1313

1414 nativeBuildInputs = [ scdoc ];

1515

16− vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk=";

16+ vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE=";

1717

1818 installPhase = ''

1919 runHook preInstall

pkgs/applications/misc/libosmocore/default.nix+21−6

@@ -1,16 +1,25 @@

1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config

2−, pcsclite, talloc, python2, gnutls

1+{ lib, stdenv

2+, autoreconfHook

3+, fetchFromGitHub

4+, gnutls

5+, libmnl

6+, libusb1

7+, lksctp-tools

8+, pcsclite

9+, pkg-config

10+, python3

11+, talloc

312}:

413

514stdenv.mkDerivation rec {

615 pname = "libosmocore";

7− version = "1.2.0";

16+ version = "1.6.0";

817

918 src = fetchFromGitHub {

1019 owner = "osmocom";

1120 repo = "libosmocore";

1221 rev = version;

13− sha256 = "1535y6r4csvslrxcki80ya6zhhc5jw2nvy9bymb55ln77pf853vg";

22+ hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4=";

1423 };

1524

1625 propagatedBuildInputs = [

@@ -18,11 +27,17 @@ stdenv.mkDerivation rec {

1827 ];

1928

2029 nativeBuildInputs = [

21− autoreconfHook pkg-config

30+ autoreconfHook

31+ pkg-config

32+ python3

2233 ];

2334

2435 buildInputs = [

25− pcsclite python2 gnutls

36+ gnutls

37+ libmnl

38+ libusb1

39+ lksctp-tools

40+ pcsclite

2641 ];

2742

2843 enableParallelBuilding = true;

pkgs/applications/misc/opencpn/default.nix+85−16

@@ -1,31 +1,100 @@

1−{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk2, wxGTK30, libpulseaudio, curl,

2− gettext, glib, portaudio }:

1+{ stdenv, lib

2+, alsa-utils

3+, at-spi2-core

4+, cmake

5+, curl

6+, dbus

7+, epoxy

8+, fetchFromGitHub

9+, flac

10+, gtk3

11+, jasper

12+, libGLU

13+, libarchive

14+, libdatrie

15+, libelf

16+, libexif

17+, libogg

18+, libopus

19+, libselinux

20+, libsepol

21+, libsndfile

22+, libthai

23+, libunarr

24+, libusb

25+, libvorbis

26+, libxkbcommon

27+, lsb-release

28+, lz4

29+, pcre

30+, pkg-config

31+, portaudio

32+, sqlite

33+, tinyxml

34+, udev

35+, util-linux

36+, wxGTK31-gtk3

37+, xorg

38+}:

339

440stdenv.mkDerivation rec {

5− pname = "opencpn-unstable";

6− version = "2019-11-21";

41+ pname = "opencpn";

42+ version = "5.6.2";

743

844 src = fetchFromGitHub {

945 owner = "OpenCPN";

1046 repo = "OpenCPN";

11− rev = "e73dc935545b2bbcf193cc61d987a0178c52d7a7";

12− sha256 = "0yiqahkzwcbzgabc5xgxmwlngapkfiaqyva3mwz29xj0c5lg2bdk";

47+ rev = "Release_${version}";

48+ hash = "sha256-sNZYf/2gtjRrrGPuazVnKTgcuIQpKPazhexqlK21T4g=";

1349 };

1450

15− nativeBuildInputs = [ cmake pkg-config ];

16− buildInputs = [ gtk2 wxGTK30 libpulseaudio curl gettext

17− glib portaudio ];

18−

19− cmakeFlags = [

20− "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

21− "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"

51+ nativeBuildInputs = [ cmake lsb-release pkg-config ];

52+ buildInputs = [

53+ alsa-utils

54+ at-spi2-core

55+ curl

56+ dbus

57+ epoxy

58+ flac

59+ gtk3

60+ jasper

61+ libGLU

62+ libarchive

63+ libdatrie

64+ libelf

65+ libexif

66+ libogg

67+ libopus

68+ libselinux

69+ libsepol

70+ libsndfile

71+ libthai

72+ libunarr

73+ libusb

74+ libvorbis

75+ libxkbcommon

76+ lz4

77+ pcre

78+ portaudio

79+ sqlite

80+ tinyxml

81+ udev

82+ util-linux

83+ wxGTK31-gtk3

84+ xorg.libXdmcp

85+ xorg.libXtst

2286 ];

2387

24− meta = {

88+

89+ cmakeFlags = [ "-DOCPN_BUNDLE_DOCS=true" ];

90+

91+ doCheck = true;

92+

93+ meta = with lib; {

2594 description = "A concise ChartPlotter/Navigator";

26− maintainers = [ lib.maintainers.kragniz ];

95+ maintainers = with maintainers; [ kragniz lovesegfault ];

2796 platforms = [ "x86_64-linux" ];

28− license = lib.licenses.gpl2;

97+ license = licenses.gpl2;

2998 homepage = "https://opencpn.org/";

3099 };

31100}

pkgs/applications/misc/skytemple/default.nix+5−2

@@ -2,13 +2,13 @@

22

33python3Packages.buildPythonApplication rec {

44 pname = "skytemple";

5− version = "1.3.2";

5+ version = "1.3.10";

66

77 src = fetchFromGitHub {

88 owner = "SkyTemple";

99 repo = pname;

1010 rev = version;

11− sha256 = "1sx2rib0la3mifvh84ia3jnnq4qw9jxc13vxyidsdkp6x82nbvcg";

11+ sha256 = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";

1212 };

1313

1414 buildInputs = [

@@ -26,7 +26,10 @@ python3Packages.buildPythonApplication rec {

2626 packaging

2727 pycairo

2828 pygal

29+ psutil

30+ gbulb

2931 pypresence

32+ sentry-sdk

3033 setuptools

3134 skytemple-dtef

3235 skytemple-eventserver

pkgs/applications/misc/tut/default.nix+2−2

@@ -2,13 +2,13 @@

22

33buildGoModule rec {

44 pname = "tut";

5− version = "0.0.42";

5+ version = "0.0.46";

66

77 src = fetchFromGitHub {

88 owner = "RasmusLindroth";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-zWhG9lzerzDqqFN8IG5JSv3voLzvtp/gg6jBisbodMc=";

11+ sha256 = "sha256-C9kyA6QuL8sqzCooaPzSP7VOpu7jcSFCUx9oaZLZ7/w=";

1212 };

1313

1414 vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk=";

pkgs/applications/misc/udiskie/default.nix+30−25

@@ -1,42 +1,47 @@

11{ lib

2+, asciidoc

23, fetchFromGitHub

3−, buildPythonApplication

4−, asciidoc-full

5−, docopt

6−, gettext

74, gobject-introspection

85, gtk3

9−, keyutils

6+, installShellFiles

107, libappindicator-gtk3

118, libnotify

129, librsvg

13−, nose

14−, pygobject3

15−, pyyaml

10+, python3

1611, udisks2

1712, wrapGAppsHook

1813}:

1914

20−buildPythonApplication rec {

15+python3.pkgs.buildPythonApplication rec {

2116 pname = "udiskie";

22− version = "2.4.0";

17+ version = "2.4.2";

18+

19+ format = "setuptools";

2320

2421 src = fetchFromGitHub {

2522 owner = "coldfix";

2623 repo = "udiskie";

2724 rev = "v${version}";

28− hash = "sha256-T4kMPMXfehZT7P+TOd1llR2TbHPA/quNL545xxlmJfE=";

25+ hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU=";

2926 };

3027

31− outputs = [ "out" "man" ];

28+ patches = [

29+ ./locale-path.patch

30+ ];

31+

32+ postPatch = ''

33+ substituteInPlace udiskie/locale.py --subst-var out

34+ '';

3235

3336 nativeBuildInputs = [

34− asciidoc-full # Man page

35− gettext

37+ asciidoc # Man page

3638 gobject-introspection

39+ installShellFiles

3740 wrapGAppsHook

3841 ];

3942

43+ dontWrapGApps = true;

44+

4045 buildInputs = [

4146 gobject-introspection

4247 gtk3

@@ -46,8 +51,9 @@ buildPythonApplication rec {

4651 udisks2

4752 ];

4853

49− propagatedBuildInputs = [

54+ propagatedBuildInputs = with python3.pkgs; [

5055 docopt

56+ keyutils

5157 pygobject3

5258 pyyaml

5359 ];

@@ -57,21 +63,20 @@ buildPythonApplication rec {

5763 '';

5864

5965 postInstall = ''

60− mkdir -p $man/share/man/man8

61− cp -v doc/udiskie.8 $man/share/man/man8/

66+ installManPage doc/udiskie.8

6267 '';

6368

64− checkInputs = [

65− keyutils

66− nose

67− ];

68−

69− checkPhase = ''

70− nosetests

69+ preFixup = ''

70+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

7171 '';

7272

73+ checkInputs = with python3.pkgs; [

74+ pytestCheckHook

75+ ];

76+

7377 meta = with lib; {

7478 homepage = "https://github.com/coldfix/udiskie";

79+ changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst";

7580 description = "Removable disk automounter for udisks";

7681 longDescription = ''

7782 udiskie is a udisks2 front-end that allows to manage removeable media such

@@ -88,6 +93,6 @@ buildPythonApplication rec {

8893 - password caching (requires python keyutils 0.3)

8994 '';

9095 license = licenses.mit;

91− maintainers = with maintainers; [ AndersonTorres ];

96+ maintainers = with maintainers; [ AndersonTorres dotlambda ];

9297 };

9398}

pkgs/applications/misc/udiskie/locale-path.patchnew file+17

@@ -0,0 +1,17 @@

1+diff --git a/udiskie/locale.py b/udiskie/locale.py

2+index f12bea9..450e38b 100644

3+--- a/udiskie/locale.py

4++++ b/udiskie/locale.py

5+@@ -10,10 +10,8 @@ from gettext import translation

6+ testdirs = [

7+ # manual override:

8+ os.environ.get('TEXTDOMAINDIR'),

9+- # editable installation:

10+- os.path.join(os.path.dirname(__file__), '../build/locale'),

11+- # user or virtualenv installation:

12+- os.path.join(sys.prefix, 'share/locale'),

13++ # Nix installation:

14++ os.path.join('@out@', 'share/locale'),

15+ ]

16+ testfile = 'en_US/LC_MESSAGES/udiskie.mo'

17+ localedir = next(

pkgs/applications/misc/upwork/default.nix+3−3

@@ -6,11 +6,11 @@

66

77stdenv.mkDerivation rec {

88 pname = "upwork";

9− version = "5.6.10.7";

9+ version = "5.6.10.13";

1010

1111 src = fetchurl {

12− url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_7_f806fd1250954801/${pname}_${version}_amd64.deb";

13− sha256 = "6fe11cd53ffb66a02aa771153c4f58af34fea25847ee5bc13802fec9b0db0280";

12+ url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_10_13_3c485d1dd2af4f61/${pname}_${version}_amd64.deb";

13+ sha256 = "c3e1ecf14c99596f434edf93a2e08f031fbaa167025d1280cf19f68b829d6b79";

1414 };

1515

1616 nativeBuildInputs = [

pkgs/applications/misc/xpdf/default.nix+2−2

@@ -12,11 +12,11 @@ assert enablePrinting -> cups != null;

1212

1313stdenv.mkDerivation rec {

1414 pname = "xpdf";

15− version = "4.03";

15+ version = "4.04";

1616

1717 src = fetchzip {

1818 url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz";

19− sha256 = "09yhvmh1vxjy763nnmawynygp5bh3j4i8ixqja64j11676yl77n6";

19+ hash = "sha256-ujH9KDwFRjPIKwdMg79Mab9BfA2HooY5+2PESUgnGDY=";

2020 };

2121

2222 # Fix "No known features for CXX compiler", see

pkgs/applications/misc/xplr/default.nix+3−3

@@ -2,18 +2,18 @@

22

33rustPlatform.buildRustPackage rec {

44 pname = "xplr";

5− version = "0.17.3";

5+ version = "0.17.6";

66

77 src = fetchFromGitHub {

88 owner = "sayanarijit";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-BbD0Z/WGNaqpPowZqc4kmFLbL9/+JotKm7dWIgS3NjM=";

11+ sha256 = "1lgfa1y5vsm3gqxizdgbn816klcamqmshw817mwan5i5yx9nk6xz";

1212 };

1313

1414 buildInputs = lib.optional stdenv.isDarwin libiconv;

1515

16− cargoSha256 = "sha256-qsicWf15U5b4xMqkXDOrhGNrQmiZkoxBQwV58asQa8k=";

16+ cargoSha256 = "sha256-va+MKnHVdkQNq1SFvvoYnb28tW61W7d97LoCMNzwZHE=";

1717

1818 meta = with lib; {

1919 description = "A hackable, minimal, fast TUI file explorer";

pkgs/applications/networking/browsers/brave/default.nix+8−5

@@ -49,6 +49,9 @@

4949, pulseSupport ? stdenv.isLinux

5050, libpulseaudio

5151

52+# For GPU acceleration support on Wayland (without the lib it doesn't seem to work)

53+, libGL

54+

5255# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder)

5356, libvaSupport ? stdenv.isLinux

5457, libva

@@ -66,7 +69,7 @@ let

6669

6770 deps = [

6871 alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat

69− fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11

72+ fontconfig freetype gdk-pixbuf glib gtk3 libdrm libX11 libGL

7073 libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage

7174 libXext libXfixes libXi libXrandr libXrender libxshmfence

7275 libXtst libuuid mesa nspr nss pango pipewire udev wayland

@@ -128,9 +131,9 @@ stdenv.mkDerivation rec {

128131 ln -sf $BINARYWRAPPER $out/bin/brave

129132

130133 for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do

131− patchelf \

132− --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

133− --set-rpath "${rpath}" $exe

134+ patchelf \

135+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

136+ --set-rpath "${rpath}" $exe

134137 done

135138

136139 # Fix paths

@@ -170,10 +173,10 @@ stdenv.mkDerivation rec {

170173 ${optionalString (disableFeatures != []) ''

171174 --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}"

172175 ''}

173− --add-flags ${escapeShellArg commandLineArgs}

174176 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"

175177 ${optionalString vulkanSupport ''

176178 --prefix XDG_DATA_DIRS : "${addOpenGLRunpath.driverLink}/share"

179+ --add-flags ${escapeShellArg commandLineArgs}

177180 ''}

178181 )

179182 '';

pkgs/applications/networking/browsers/chromium/upstream-info.json+5−5

@@ -45,9 +45,9 @@

4545 }

4646 },

4747 "ungoogled-chromium": {

48− "version": "101.0.4951.41",

49− "sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",

50− "sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",

48+ "version": "101.0.4951.54",

49+ "sha256": "1d808a7mvg0nd0mm20c1ny5kdvb2xvrs8vz4nnk456ix8pywcv62",

50+ "sha256bin64": "1m6s6xf2wvz535w6jskk3pnibvsjpzmbxvd9rlxmqr08y219gp5y",

5151 "deps": {

5252 "gn": {

5353 "version": "2022-03-14",

@@ -56,8 +56,8 @@

5656 "sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"

5757 },

5858 "ungoogled-patches": {

59− "rev": "101.0.4951.41-1",

60− "sha256": "19m31bd04yvba3w5iymkxfjnmilas3cfp383m9fl6pd4wwhy9md0"

59+ "rev": "101.0.4951.54-1",

60+ "sha256": "0zhzy7llqddvym992pwhkgqh2f6ywjqqg0bhahl6c0np95gzhpbs"

6161 }

6262 }

6363 }

pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix+393−393

@@ -1,985 +1,985 @@

11{

2− version = "100.0b6";

2+ version = "101.0b2";

33 sources = [

4− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ach/firefox-100.0b6.tar.bz2";

4+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ach/firefox-101.0b2.tar.bz2";

55 locale = "ach";

66 arch = "linux-x86_64";

7− sha256 = "6b5ac2e733e44616405f31b16bc995f945740477d00988ce5dd4f16c4ec74085";

7+ sha256 = "84d818f3e3533fa8d0f92c00d654023c036238db4a9a9048a0d71c0b60017eb6";

88 }

9− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/af/firefox-100.0b6.tar.bz2";

9+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/af/firefox-101.0b2.tar.bz2";

1010 locale = "af";

1111 arch = "linux-x86_64";

12− sha256 = "5b25ad2870b33002060f493368f79921046f5b19e4adf0c5e1836b7d00347790";

12+ sha256 = "1d60a63bdf28d4e0ad1ffe1459cd949704bed08864d0a1118032acb6f9e9cd82";

1313 }

14− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/an/firefox-100.0b6.tar.bz2";

14+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/an/firefox-101.0b2.tar.bz2";

1515 locale = "an";

1616 arch = "linux-x86_64";

17− sha256 = "9fc4a88d9216ba0b5979e939092314f135da9e33a3d8df7cadcf142f19b0b71f";

17+ sha256 = "b779cd24703b623d06cf69b60c92e244ed6f8c0df5f30ccf8c3d5d9d08841af1";

1818 }

19− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ar/firefox-100.0b6.tar.bz2";

19+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ar/firefox-101.0b2.tar.bz2";

2020 locale = "ar";

2121 arch = "linux-x86_64";

22− sha256 = "23f33752d3df64ee98cdbdc569b8cb4cea2dbbae71810a3a14a82a6361f97b9e";

22+ sha256 = "b8121d4f1a9b04814933df8e15c7e7c01ed24aba78ce1f43d29ec0130aeb7d50";

2323 }

24− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ast/firefox-100.0b6.tar.bz2";

24+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ast/firefox-101.0b2.tar.bz2";

2525 locale = "ast";

2626 arch = "linux-x86_64";

27− sha256 = "a5d357ed9b58fe0a2b7c95e24cb18659c7aee29cb1cda0071b7afdee9c3ac9eb";

27+ sha256 = "cffaf3288650509a3d25988ba32bcb0e7af0bd787b7b5ea297490f236ee91d5e";

2828 }

29− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/az/firefox-100.0b6.tar.bz2";

29+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/az/firefox-101.0b2.tar.bz2";

3030 locale = "az";

3131 arch = "linux-x86_64";

32− sha256 = "1191a7c0a3222d55a605bbb5f25d064414d08b9bfb6dc6ad74dd1de357177701";

32+ sha256 = "c9e62710701996c4d556320583209402dc955296117e8d70a6ead33472e07d0c";

3333 }

34− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/be/firefox-100.0b6.tar.bz2";

34+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/be/firefox-101.0b2.tar.bz2";

3535 locale = "be";

3636 arch = "linux-x86_64";

37− sha256 = "69445ca3cf31d63162ddd0aab1538655a08e325aad57a3d343ac310193a942a3";

37+ sha256 = "4bb469f3523bdff58e83d9de56a80f1d9396df2fae2c048ea91cefa14d89def2";

3838 }

39− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bg/firefox-100.0b6.tar.bz2";

39+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bg/firefox-101.0b2.tar.bz2";

4040 locale = "bg";

4141 arch = "linux-x86_64";

42− sha256 = "f2ff0a6bf22b9ed16b0656d4e0848c509cee2de9a638d556500909e1352ae5b3";

42+ sha256 = "bbe96de47df523971ad2f7e72b4c5ef040b94dcf3d88dcded6a3808098aeb1c2";

4343 }

44− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bn/firefox-100.0b6.tar.bz2";

44+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bn/firefox-101.0b2.tar.bz2";

4545 locale = "bn";

4646 arch = "linux-x86_64";

47− sha256 = "1fbfdb8d6f22567eb1112c63ab6192cb439b9d2cd5e57c10401c76f9f9cd215b";

47+ sha256 = "0973eae62bf490af5bdf71d5e33dffe291809a2c4389fb8c9cdf33670ab497cb";

4848 }

49− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/br/firefox-100.0b6.tar.bz2";

49+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/br/firefox-101.0b2.tar.bz2";

5050 locale = "br";

5151 arch = "linux-x86_64";

52− sha256 = "e05895d70c72aadcb77dc6d84a6a054a8410b29e05d5da6eeac0fdee1b66b130";

52+ sha256 = "f693b340a2d7ac5bf40705b51333bf7bc22e9a62a9dd14952e6835a8d5374267";

5353 }

54− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/bs/firefox-100.0b6.tar.bz2";

54+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/bs/firefox-101.0b2.tar.bz2";

5555 locale = "bs";

5656 arch = "linux-x86_64";

57− sha256 = "ba125689cbd845e9bf8df940bbfd0796326939ba9b45d4bc0c0a8ddf64dd6f61";

57+ sha256 = "de631ff909d671164e52e7194c1f5f5ac6156ef66877f4642c5f067e806281b3";

5858 }

59− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca-valencia/firefox-100.0b6.tar.bz2";

59+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca-valencia/firefox-101.0b2.tar.bz2";

6060 locale = "ca-valencia";

6161 arch = "linux-x86_64";

62− sha256 = "37a5ba26d10cbc2aa8222a2f19133a12710adeb389234ff53a91b43ddd5e901a";

62+ sha256 = "eb73e92b05b37a7aa042b8b865a630a95fdeed41e9881f659a3589c2dcf3fd99";

6363 }

64− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ca/firefox-100.0b6.tar.bz2";

64+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ca/firefox-101.0b2.tar.bz2";

6565 locale = "ca";

6666 arch = "linux-x86_64";

67− sha256 = "5f11f3a11b93f06235981200b690cb9aaf95ed8d459ea8e1d6ac7c6a73d9d9e4";

67+ sha256 = "d227042106358cfc9025f3bdc84e12494550e29ba4a8a622fa6c1b88a6cfe7cc";

6868 }

69− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cak/firefox-100.0b6.tar.bz2";

69+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cak/firefox-101.0b2.tar.bz2";

7070 locale = "cak";

7171 arch = "linux-x86_64";

72− sha256 = "1d4a103b8c2c601b908a635d2b5edaec068c1a2e644e1924022a94e57e1b2f6a";

72+ sha256 = "6831c152ec2fcab6fe7e6792887c7b813c2e226836135acbfc4ca66a9b114014";

7373 }

74− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cs/firefox-100.0b6.tar.bz2";

74+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cs/firefox-101.0b2.tar.bz2";

7575 locale = "cs";

7676 arch = "linux-x86_64";

77− sha256 = "358b2c3c3c5a9945b35f1c71eadaf7d5305d214ecfe37fda811fd37d326dfd35";

77+ sha256 = "c7c52ee04dbc90417e6c6d35cefe315daffddb6b13b7a239254bc15cb22f197c";

7878 }

79− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/cy/firefox-100.0b6.tar.bz2";

79+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/cy/firefox-101.0b2.tar.bz2";

8080 locale = "cy";

8181 arch = "linux-x86_64";

82− sha256 = "bcbab842e30d22f7d646d2494451e0e676c40c16c1e3532b4c6cd6eb501fb7c2";

82+ sha256 = "e6315de3fc02ab229e1e8422f614ceb0ac4ee1aa913492a24f200dd922dfb2ae";

8383 }

84− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/da/firefox-100.0b6.tar.bz2";

84+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/da/firefox-101.0b2.tar.bz2";

8585 locale = "da";

8686 arch = "linux-x86_64";

87− sha256 = "3b462ea57616171ebe43e218d7fbcc8c45d508fa2b91490d5b107842bf936d25";

87+ sha256 = "1dbcc3ad30cae0c8e5cd29dc480373fe80989d8636d42e45698b8f7a76bb7781";

8888 }

89− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/de/firefox-100.0b6.tar.bz2";

89+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/de/firefox-101.0b2.tar.bz2";

9090 locale = "de";

9191 arch = "linux-x86_64";

92− sha256 = "067a586989c84a280366c6021daf270652d443465b63d03e0fb9ff02eeb3f3ee";

92+ sha256 = "43189166f2f1e7a3366922270b62e95027f2d750206bd1878b764a5a7572d360";

9393 }

94− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/dsb/firefox-100.0b6.tar.bz2";

94+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/dsb/firefox-101.0b2.tar.bz2";

9595 locale = "dsb";

9696 arch = "linux-x86_64";

97− sha256 = "42621cd070dc172b08bdce256c91d6faeede97b116b353f1edf2354c0e37ec3a";

97+ sha256 = "2016ca15c4ef78eb8c698646cf6a7ca605f2316cde2df5e1648510c117fa32dc";

9898 }

99− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/el/firefox-100.0b6.tar.bz2";

99+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/el/firefox-101.0b2.tar.bz2";

100100 locale = "el";

101101 arch = "linux-x86_64";

102− sha256 = "f079ccc06590277ccf09d4e34b73d3b363d79651d6e2a07d7e127a42ab552bac";

102+ sha256 = "7aa33608bd1e9ce1bf3a7b1943644873a7e3d91a5bbc72ac03be5fa1bc4ec8aa";

103103 }

104− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-CA/firefox-100.0b6.tar.bz2";

104+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-CA/firefox-101.0b2.tar.bz2";

105105 locale = "en-CA";

106106 arch = "linux-x86_64";

107− sha256 = "e3f239da659c77662a10ba061f806d615f9a57fe89d1207ac04cacc603a9a587";

107+ sha256 = "e31cc0e5dd155c22b1b3a6219b154544b729e700496e8d8f83a895174e6ecb7e";

108108 }

109− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-GB/firefox-100.0b6.tar.bz2";

109+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-GB/firefox-101.0b2.tar.bz2";

110110 locale = "en-GB";

111111 arch = "linux-x86_64";

112− sha256 = "e41640386bbceef99290458576da3272ea400e78641cbae73ece0e07045396ab";

112+ sha256 = "7521c0e6c083d26d1f5a67f695354e64947ec3335d07991e97429e569aa17e23";

113113 }

114− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/en-US/firefox-100.0b6.tar.bz2";

114+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/en-US/firefox-101.0b2.tar.bz2";

115115 locale = "en-US";

116116 arch = "linux-x86_64";

117− sha256 = "7f5888e7c0480f4f1626943f1878945166179ab94d995e23d0b8f5eb9d83ab4e";

117+ sha256 = "e1ad655ed971655a6b56446b5e09fb7f0415c8ff09370ad8fccf7f28dbbd17b0";

118118 }

119− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eo/firefox-100.0b6.tar.bz2";

119+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eo/firefox-101.0b2.tar.bz2";

120120 locale = "eo";

121121 arch = "linux-x86_64";

122− sha256 = "6c07749b176c7c533a824357da81a42ef10fc78f09b58e7a090d3e36fd77a6d5";

122+ sha256 = "9afae49a33f2a0aa02a346fe6e456d09dbe88a0c655a015be5e50a307c472d95";

123123 }

124− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-AR/firefox-100.0b6.tar.bz2";

124+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-AR/firefox-101.0b2.tar.bz2";

125125 locale = "es-AR";

126126 arch = "linux-x86_64";

127− sha256 = "2d23cfea40e6948fd330b2e72f40edab597e5261fb9abcbd539d0b9f513fd946";

127+ sha256 = "f8919da0647b6e6a6587f4856ce20be5f6054f4e5b6d71562fbffbac594853cf";

128128 }

129− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-CL/firefox-100.0b6.tar.bz2";

129+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-CL/firefox-101.0b2.tar.bz2";

130130 locale = "es-CL";

131131 arch = "linux-x86_64";

132− sha256 = "eef75de09e6fa7d21ca4aa799ea4b279dcdeefa79d9b4ef7f3b5266c90c2a8ff";

132+ sha256 = "b31b8a41ac391aefff8c1d85a29ab129983bd39474a15672cb3e74d916e0c9eb";

133133 }

134− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-ES/firefox-100.0b6.tar.bz2";

134+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-ES/firefox-101.0b2.tar.bz2";

135135 locale = "es-ES";

136136 arch = "linux-x86_64";

137− sha256 = "31d985ab2af1ba15fc6b41580fed4a06fa33fb8cf3dfcf96b1a5ea4e361058f5";

137+ sha256 = "f4f6e6100d85050d381beaa4f2dfeb6b5e7170cf2c079257ebbfbd80219904b4";

138138 }

139− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/es-MX/firefox-100.0b6.tar.bz2";

139+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/es-MX/firefox-101.0b2.tar.bz2";

140140 locale = "es-MX";

141141 arch = "linux-x86_64";

142− sha256 = "1fdc9e77eadf9abb55224bf0db1e555eb99f4a7c525f6021fe226ea7de9db026";

142+ sha256 = "c2e3bd2ccbfe64fc5eb1d4f920554ba3d170c0e2e478791d9cc19da955960200";

143143 }

144− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/et/firefox-100.0b6.tar.bz2";

144+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/et/firefox-101.0b2.tar.bz2";

145145 locale = "et";

146146 arch = "linux-x86_64";

147− sha256 = "2df8328fcf9f10b84b2110f31ec32a5dce7054845c37f7e30b023daee4701322";

147+ sha256 = "cc0b56f513294b0742023e37a06a462b107a480c1fcab118bfba6894c2e72375";

148148 }

149− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/eu/firefox-100.0b6.tar.bz2";

149+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/eu/firefox-101.0b2.tar.bz2";

150150 locale = "eu";

151151 arch = "linux-x86_64";

152− sha256 = "30037fbdb33703b894bb0e33b192d23aa1b67ab9b944b1381d27f95e0c44bdf9";

152+ sha256 = "8a18e5428a9dc60cd39ff3a1b0900282178efe54c11b43a8015b86d33368804b";

153153 }

154− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fa/firefox-100.0b6.tar.bz2";

154+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fa/firefox-101.0b2.tar.bz2";

155155 locale = "fa";

156156 arch = "linux-x86_64";

157− sha256 = "37af6700e54f98541fe1f703c13ccad70a72bb7e28200762bf636bd3494b443d";

157+ sha256 = "75fce16479f2e95c9a00f369364c279b362c0248e787ade7f14f6aba934cc624";

158158 }

159− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ff/firefox-100.0b6.tar.bz2";

159+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ff/firefox-101.0b2.tar.bz2";

160160 locale = "ff";

161161 arch = "linux-x86_64";

162− sha256 = "3612950e42cf9532bb5be99f9f73e2f6b480c58570b1092f8eb337aba1257234";

162+ sha256 = "90081b6c7b487292a14e2a488a14e9d560183ff6313a67076f1a07033df54a80";

163163 }

164− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fi/firefox-100.0b6.tar.bz2";

164+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fi/firefox-101.0b2.tar.bz2";

165165 locale = "fi";

166166 arch = "linux-x86_64";

167− sha256 = "a8a2bace3af643c6b82bdfb043f90d4cd6ec10abfed6ada230786ef7eaaf9ee4";

167+ sha256 = "308fbcc9086fc3f899703a58cd95f55b7e10b7ab4fc0c4cac02c01f5dfd2ffc0";

168168 }

169− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fr/firefox-100.0b6.tar.bz2";

169+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fr/firefox-101.0b2.tar.bz2";

170170 locale = "fr";

171171 arch = "linux-x86_64";

172− sha256 = "296f91da1aec6481bdfecf311db4560268082d6f75f0354c6b09ab64494c211c";

172+ sha256 = "91cca9bb622e3546d683a8e3af9984ab63e6aff56a8f0b7a61c84795d452e198";

173173 }

174− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/fy-NL/firefox-100.0b6.tar.bz2";

174+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/fy-NL/firefox-101.0b2.tar.bz2";

175175 locale = "fy-NL";

176176 arch = "linux-x86_64";

177− sha256 = "3bdd5b38483c8a8fdab13767ad8f38d60e9c12359740d8017ec8a7a83338e99d";

177+ sha256 = "37f87b1b0df5efce58dbc6366028b069bfd61007bba8a4835b8c72966ebfb584";

178178 }

179− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ga-IE/firefox-100.0b6.tar.bz2";

179+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ga-IE/firefox-101.0b2.tar.bz2";

180180 locale = "ga-IE";

181181 arch = "linux-x86_64";

182− sha256 = "5f734b553ce52eaa91bc3ee1ac2afea09aefb35e886ba68d56cf3b1e55dfbebc";

182+ sha256 = "d4a347e9ee59e1eae54783c9d4c99f88d6fe5eddd541d54f6efb1d2d0c494657";

183183 }

184− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gd/firefox-100.0b6.tar.bz2";

184+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gd/firefox-101.0b2.tar.bz2";

185185 locale = "gd";

186186 arch = "linux-x86_64";

187− sha256 = "c2b3ef9590646143e48ffebc75d7f9c4a688ae0d3c3a648683a5f7a02aaee74c";

187+ sha256 = "907d68789cfe8e2be69d85cff2b846d91bd9ccf7c3a183891472509db54a5e49";

188188 }

189− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gl/firefox-100.0b6.tar.bz2";

189+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gl/firefox-101.0b2.tar.bz2";

190190 locale = "gl";

191191 arch = "linux-x86_64";

192− sha256 = "513ca5b29b690986d0aef335cb98406d599a18ee44ed2b8fdf7687ff3dc87ba2";

192+ sha256 = "1d1e107df695c76652207006ed060fcdf2133508c7ea0fee4f402816a4eed53e";

193193 }

194− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gn/firefox-100.0b6.tar.bz2";

194+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gn/firefox-101.0b2.tar.bz2";

195195 locale = "gn";

196196 arch = "linux-x86_64";

197− sha256 = "4a5974953f144ffff20a946073aa8891225d80e3dcc405d0230bc601973e8634";

197+ sha256 = "b62af16daf08e4a2574bb6b96b4a61cfc64967328dc19fdc56ea56cc431019de";

198198 }

199− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/gu-IN/firefox-100.0b6.tar.bz2";

199+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/gu-IN/firefox-101.0b2.tar.bz2";

200200 locale = "gu-IN";

201201 arch = "linux-x86_64";

202− sha256 = "a2e780ccad66a9a741551b5f7425be3e91f5a225a50e39ebf5770808fac484d7";

202+ sha256 = "ef2f317ae3aaf608e74dc882b202a195ad4146295f00bff2673cda02338ae499";

203203 }

204− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/he/firefox-100.0b6.tar.bz2";

204+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/he/firefox-101.0b2.tar.bz2";

205205 locale = "he";

206206 arch = "linux-x86_64";

207− sha256 = "093fef7512fc82efe8aaef9108bf84ab7a9730e2fa94b8092206c0804068bcd5";

207+ sha256 = "4f5cd8a8f6dc9c0588d9a41cc9e68b0f643581cfc42b6f17bde51dc60c3ec2a4";

208208 }

209− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hi-IN/firefox-100.0b6.tar.bz2";

209+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hi-IN/firefox-101.0b2.tar.bz2";

210210 locale = "hi-IN";

211211 arch = "linux-x86_64";

212− sha256 = "1b6955622ff8fda11d439dcb4f425a3d84c16c49ee30b1e6eb246555fa07bd09";

212+ sha256 = "16e96c75e96d656d8a5338c6692ee3c4d94af325b51e3e3326a5024549360f6f";

213213 }

214− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hr/firefox-100.0b6.tar.bz2";

214+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hr/firefox-101.0b2.tar.bz2";

215215 locale = "hr";

216216 arch = "linux-x86_64";

217− sha256 = "571c7bc2b25002094425eaa8878aaa4b339027a5932d5a073b23fa7d3cf9c945";

217+ sha256 = "55a692fd61adb3c0cfe05317dac407f5804518d07ad1bdb6aa49a6e7d7635270";

218218 }

219− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hsb/firefox-100.0b6.tar.bz2";

219+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hsb/firefox-101.0b2.tar.bz2";

220220 locale = "hsb";

221221 arch = "linux-x86_64";

222− sha256 = "7443ddc6143f466712de34ebffb4d41633aec8c0d7b253c3008f68b600a59b3c";

222+ sha256 = "d2786cb3a58bfaa5156c9efd5e36743bd30461e922f8d1f8421fc60ba743738f";

223223 }

224− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hu/firefox-100.0b6.tar.bz2";

224+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hu/firefox-101.0b2.tar.bz2";

225225 locale = "hu";

226226 arch = "linux-x86_64";

227− sha256 = "7413002d74a0c2a0dbc19f783e84fb79a71c73fb28034ad4894a7d64d1745b03";

227+ sha256 = "e4100b8208dfb367de6ea92252de3730728651d54027a7d8da989f52afae2f10";

228228 }

229− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/hy-AM/firefox-100.0b6.tar.bz2";

229+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/hy-AM/firefox-101.0b2.tar.bz2";

230230 locale = "hy-AM";

231231 arch = "linux-x86_64";

232− sha256 = "a8169b877a7f2e85bbf363c5f0b6a05b28f2aa948689535b2b608cdb8d4c5af5";

232+ sha256 = "5f247f00eb048e01f8ac6f1e7cf8bd9a4e2d012e2534acc2dde7e9cd659ba48e";

233233 }

234− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ia/firefox-100.0b6.tar.bz2";

234+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ia/firefox-101.0b2.tar.bz2";

235235 locale = "ia";

236236 arch = "linux-x86_64";

237− sha256 = "54245a95072f8b98a6d556ccb79547d56291b9f915f7e5723f49ff97a1bc1098";

237+ sha256 = "68a040005c7e2db14d380e36a28725d59635ad6166c3a918676e870207a790e6";

238238 }

239− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/id/firefox-100.0b6.tar.bz2";

239+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/id/firefox-101.0b2.tar.bz2";

240240 locale = "id";

241241 arch = "linux-x86_64";

242− sha256 = "43fb95f81026dfae3b889d085b2584cbee7f6b1bec6edd0378d3965b056f8c8b";

242+ sha256 = "f9dba308d0e9f6e1cdf70c26a914acd234cf8d35aecd5374d8661f2d025492f3";

243243 }

244− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/is/firefox-100.0b6.tar.bz2";

244+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/is/firefox-101.0b2.tar.bz2";

245245 locale = "is";

246246 arch = "linux-x86_64";

247− sha256 = "79e94ad99e19f325915231ce35fa741ed617c5595d5a2d1233ff0b2f2cf20733";

247+ sha256 = "5d50987e3ffb7a7818479161ad4d019d59b259575cfcbc4ede9a4a6a5cf1b6ab";

248248 }

249− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/it/firefox-100.0b6.tar.bz2";

249+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/it/firefox-101.0b2.tar.bz2";

250250 locale = "it";

251251 arch = "linux-x86_64";

252− sha256 = "0f2147837a3b3d90cddd387125a8579cc576e1613a520fab8265de36ba1039c2";

252+ sha256 = "b786c212f61213e69010d930f2eaf5bb3dd9c798446725f4822fc3bb37adc01c";

253253 }

254− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ja/firefox-100.0b6.tar.bz2";

254+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ja/firefox-101.0b2.tar.bz2";

255255 locale = "ja";

256256 arch = "linux-x86_64";

257− sha256 = "b755262db8331612cc447c6c5c944374338cd7d52fad732803c1b2d3b8744921";

257+ sha256 = "825af27cf52551dfbc83d7b95e47e64ed0ac7f7db3095bf1debfea87b39a4378";

258258 }

259− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ka/firefox-100.0b6.tar.bz2";

259+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ka/firefox-101.0b2.tar.bz2";

260260 locale = "ka";

261261 arch = "linux-x86_64";

262− sha256 = "3dffe30c39f3fee7ef4fdd0f02e619a79f1d67eb3b49efdf35838090e0c03bd9";

262+ sha256 = "e009b3f2944e6a67d85f8937e5e7472c18049b2569bb2c9f234de468e636862c";

263263 }

264− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kab/firefox-100.0b6.tar.bz2";

264+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kab/firefox-101.0b2.tar.bz2";

265265 locale = "kab";

266266 arch = "linux-x86_64";

267− sha256 = "c675eaf355c484362f3b9586a30eac9362452f548d90fa8f70ede88f33f7b30f";

267+ sha256 = "168c16ddfe42858333d1f53ffae9baa16292687a3d65b29fc9f4605411a4a712";

268268 }

269− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kk/firefox-100.0b6.tar.bz2";

269+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kk/firefox-101.0b2.tar.bz2";

270270 locale = "kk";

271271 arch = "linux-x86_64";

272− sha256 = "cefa5aed2f200c3ebb263695c4192fd16b73861edb20085e956332f9f9c009ab";

272+ sha256 = "e12266f2f186570c1aa382067f9cbf1cf78e0b14e14cce4b9c822f29366c2b05";

273273 }

274− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/km/firefox-100.0b6.tar.bz2";

274+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/km/firefox-101.0b2.tar.bz2";

275275 locale = "km";

276276 arch = "linux-x86_64";

277− sha256 = "02f6a77a412311af0ea581fafa12826bec93c333c14ff6d1f9da0dd783c8aa0d";

277+ sha256 = "77f90b4c24f1dd8ef8ab06f299abfa734da6d74ae1b4298d3b425b08c28fce9f";

278278 }

279− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/kn/firefox-100.0b6.tar.bz2";

279+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/kn/firefox-101.0b2.tar.bz2";

280280 locale = "kn";

281281 arch = "linux-x86_64";

282− sha256 = "e6dedf44d9a0f1a8d379b8f07add326581b06223b335935f81f7c9a442bac2b0";

282+ sha256 = "c9015d588d9e1d07499b7f910d9b2236b81a6c3e5002bcc8d18ea970bf2ee8a5";

283283 }

284− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ko/firefox-100.0b6.tar.bz2";

284+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ko/firefox-101.0b2.tar.bz2";

285285 locale = "ko";

286286 arch = "linux-x86_64";

287− sha256 = "022550ce534cdf4ba489bbcd553052c535fb0ee908155b728718619f33f95630";

287+ sha256 = "0c880beec3dad250b3e224c2e7b73b15253bda3bc043110aa874cf555d475094";

288288 }

289− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lij/firefox-100.0b6.tar.bz2";

289+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lij/firefox-101.0b2.tar.bz2";

290290 locale = "lij";

291291 arch = "linux-x86_64";

292− sha256 = "f2e075a6ef35fd8c802cd929f9c81043d9221f947269ca13be695b58edd603b8";

292+ sha256 = "ba25d461f97dc3f359a4d525143c5a19859a2c051db87017469ba848c421aef4";

293293 }

294− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lt/firefox-100.0b6.tar.bz2";

294+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lt/firefox-101.0b2.tar.bz2";

295295 locale = "lt";

296296 arch = "linux-x86_64";

297− sha256 = "4ac54a885a81db97df5940cac5429c59442de591fba560c9608cc0f9ba1df74d";

297+ sha256 = "e73fe6e7477b4c37d33cb31fb872a845f8a67ab659d93752d936a2ce7a1e3d31";

298298 }

299− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/lv/firefox-100.0b6.tar.bz2";

299+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/lv/firefox-101.0b2.tar.bz2";

300300 locale = "lv";

301301 arch = "linux-x86_64";

302− sha256 = "413dee96d7535b5a276a34871db10b37ae9b6ed233df8a81db0d9080b1cc2ae9";

302+ sha256 = "4b4d510eac153ceb3c2953d1141e893aeb913000cf6d557e4564f8983adf5b29";

303303 }

304− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mk/firefox-100.0b6.tar.bz2";

304+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mk/firefox-101.0b2.tar.bz2";

305305 locale = "mk";

306306 arch = "linux-x86_64";

307− sha256 = "9fa2653fb6cbd77e874b1306c9c070097c4728deec0972edf9b7b03aa79a2b9d";

307+ sha256 = "8a56b192d42351d40e2d35164f5809ffa5ceb52e16e5d6e85f4819f250deb67b";

308308 }

309− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/mr/firefox-100.0b6.tar.bz2";

309+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/mr/firefox-101.0b2.tar.bz2";

310310 locale = "mr";

311311 arch = "linux-x86_64";

312− sha256 = "e26dc9319727f9f7c0fb98efae44d89228499b52edda8f02328586bfae4c79a5";

312+ sha256 = "efe2bcf5f97709240a09680c54c61ae25be5e8019003d67bae8cc166bb6de15c";

313313 }

314− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ms/firefox-100.0b6.tar.bz2";

314+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ms/firefox-101.0b2.tar.bz2";

315315 locale = "ms";

316316 arch = "linux-x86_64";

317− sha256 = "0001655c4a42a6c113f428315200b5cd1eee08cc417fd82464db87c322f5e949";

317+ sha256 = "a5a1b3d542478648efdbed1f174f87f885593209dceb1b41d5090948a46f8c8b";

318318 }

319− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/my/firefox-100.0b6.tar.bz2";

319+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/my/firefox-101.0b2.tar.bz2";

320320 locale = "my";

321321 arch = "linux-x86_64";

322− sha256 = "78fcac093123a0b4b6ebffb1e9f10ee5906d526b96d5be1b249a1e60acc4fcb9";

322+ sha256 = "baf5d8a4e2ccfc40fb9383ad84c15d9e47ddb81dca203ac2df5faa2aec6e2031";

323323 }

324− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nb-NO/firefox-100.0b6.tar.bz2";

324+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nb-NO/firefox-101.0b2.tar.bz2";

325325 locale = "nb-NO";

326326 arch = "linux-x86_64";

327− sha256 = "6c218dc369434feb3ff30840cd940c19e10d3e900325246445fdb7113c22c284";

327+ sha256 = "980c1a26381596b76f5519021327f5d3ab104f231e637e9bade9bf34e9f17df2";

328328 }

329− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ne-NP/firefox-100.0b6.tar.bz2";

329+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ne-NP/firefox-101.0b2.tar.bz2";

330330 locale = "ne-NP";

331331 arch = "linux-x86_64";

332− sha256 = "9a1a9a2380ebc3da9035066bb212b14b1b8bb6fb80feb6ed220cad1a3969ca6b";

332+ sha256 = "15bc3ecc249798080feee3214a76fe843f16a68344673c5cbdfc6557d171b77d";

333333 }

334− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nl/firefox-100.0b6.tar.bz2";

334+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nl/firefox-101.0b2.tar.bz2";

335335 locale = "nl";

336336 arch = "linux-x86_64";

337− sha256 = "6ff75975cb1ba028e78aad213837b17fe0b06e5f522996b3b9cd450beab24b51";

337+ sha256 = "cad9d94763528115c4ab4af90a722492eb3752066483bbdacea7d6933d2b4b2d";

338338 }

339− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/nn-NO/firefox-100.0b6.tar.bz2";

339+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/nn-NO/firefox-101.0b2.tar.bz2";

340340 locale = "nn-NO";

341341 arch = "linux-x86_64";

342− sha256 = "911e765ba62cfc8d69d7e4d68f1a5d44a1b311400731a3593e98ad72516c47dd";

342+ sha256 = "27ada324b58968fe5b9e2b6e367dea00097d83d10aa110d4d76db06bd22e9d5b";

343343 }

344− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/oc/firefox-100.0b6.tar.bz2";

344+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/oc/firefox-101.0b2.tar.bz2";

345345 locale = "oc";

346346 arch = "linux-x86_64";

347− sha256 = "23341acf2319454172a718a0123fa15bc9367028984449c7a2cdb50644a618b7";

347+ sha256 = "9c4dfdfd16cfc0bb8502f31359acb01bda905089781edc89e15eeac4e52d0513";

348348 }

349− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pa-IN/firefox-100.0b6.tar.bz2";

349+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pa-IN/firefox-101.0b2.tar.bz2";

350350 locale = "pa-IN";

351351 arch = "linux-x86_64";

352− sha256 = "bae2060e37bd636ffdab3d3f84b73078c4dc78d7ec7eb7bb9504be4dbc3398bb";

352+ sha256 = "b10709e964787898a2c5e15c0856b8b580a3221dd33ea441073437f833770552";

353353 }

354− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pl/firefox-100.0b6.tar.bz2";

354+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pl/firefox-101.0b2.tar.bz2";

355355 locale = "pl";

356356 arch = "linux-x86_64";

357− sha256 = "cc397c80e75d00507fa6e170ec43df337450796c829e44d518523b871e33f585";

357+ sha256 = "dd8b9baf6d1083f08695fbee6fdf3a3a14e3831d6cc797bc1e9e8ec0818ab0f0";

358358 }

359− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-BR/firefox-100.0b6.tar.bz2";

359+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-BR/firefox-101.0b2.tar.bz2";

360360 locale = "pt-BR";

361361 arch = "linux-x86_64";

362− sha256 = "2bcb44821f106ad7478fe7b61c7952c20be135a2efe1185d91123930729f78a4";

362+ sha256 = "14cd1b927d3dcdfdea02026c3b6a6fb0ecd331652d26f8c7fd344233514ee030";

363363 }

364− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/pt-PT/firefox-100.0b6.tar.bz2";

364+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/pt-PT/firefox-101.0b2.tar.bz2";

365365 locale = "pt-PT";

366366 arch = "linux-x86_64";

367− sha256 = "7f4c5713972e5bca35b891bd850fd90fcf60d254ebc15435e5b814a212428b44";

367+ sha256 = "906bf971747d018c847dd949756618c923cfe72b461636fa4ab809e99c0b0428";

368368 }

369− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/rm/firefox-100.0b6.tar.bz2";

369+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/rm/firefox-101.0b2.tar.bz2";

370370 locale = "rm";

371371 arch = "linux-x86_64";

372− sha256 = "67316b932226848b73a95687e6d218983d8056a966771c3bf16344f158578a53";

372+ sha256 = "9a4d70191390d408104f77595fb8c3442b9133c529152a14edd8b81eb2a9b91b";

373373 }

374− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ro/firefox-100.0b6.tar.bz2";

374+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ro/firefox-101.0b2.tar.bz2";

375375 locale = "ro";

376376 arch = "linux-x86_64";

377− sha256 = "7e61a6ce962f1ae0a74ff7a29b6edd7106fe95e4c2df399c22a17f1cf4d0dde9";

377+ sha256 = "778a0242484198f61e747680eacf4391061255cc4969e1c1ea7d23261f92182a";

378378 }

379− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ru/firefox-100.0b6.tar.bz2";

379+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ru/firefox-101.0b2.tar.bz2";

380380 locale = "ru";

381381 arch = "linux-x86_64";

382− sha256 = "bcad404db75ebac101f503fb793572ac010219f41c6716d33cec0552821bb281";

382+ sha256 = "f68bd731b44cb75c82f800a0944ff69f738692fb981dd27a097b60efd96bee1f";

383383 }

384− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sco/firefox-100.0b6.tar.bz2";

384+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sco/firefox-101.0b2.tar.bz2";

385385 locale = "sco";

386386 arch = "linux-x86_64";

387− sha256 = "4b01c6ae78219c122ae455627b24594966be61d335dcca8e8547784e8050051f";

387+ sha256 = "f7f92d0fbc485d099a63b5bb71b349148bd4e475c212e8c4e49f1793f4bf16ad";

388388 }

389− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/si/firefox-100.0b6.tar.bz2";

389+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/si/firefox-101.0b2.tar.bz2";

390390 locale = "si";

391391 arch = "linux-x86_64";

392− sha256 = "5aed65aa84e19c8a270cbf6ad3284c23c83dbff841b4639a15af6cdd9148560f";

392+ sha256 = "0b6e76241d452954a0438f9e3849743034c47089d6352cb22c1957b40a674c75";

393393 }

394− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sk/firefox-100.0b6.tar.bz2";

394+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sk/firefox-101.0b2.tar.bz2";

395395 locale = "sk";

396396 arch = "linux-x86_64";

397− sha256 = "a06083cf85f88232898d99dd0174e7999c3e65bc8f893c144775722975410235";

397+ sha256 = "aaecf4614bc84130ae7ea552704e375abccbbd80bdde0848718287d46b61a0db";

398398 }

399− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sl/firefox-100.0b6.tar.bz2";

399+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sl/firefox-101.0b2.tar.bz2";

400400 locale = "sl";

401401 arch = "linux-x86_64";

402− sha256 = "fce1013364e0f49f9cf56b4d50be3f17ec92d4dfe77a0ba6672404abbfd954e6";

402+ sha256 = "9fcf2320a0b7ce031ee2d607570177ec3eefe56b5a3e05f29022b6f6b1d4df49";

403403 }

404− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/son/firefox-100.0b6.tar.bz2";

404+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/son/firefox-101.0b2.tar.bz2";

405405 locale = "son";

406406 arch = "linux-x86_64";

407− sha256 = "be37a85ae43d646b5b0249303c65d6f0e3c7e15b65986da7e221119d3b8537aa";

407+ sha256 = "70d0fcc6a8ab38fead293a2bf41a4548e027ab34cb1981c0b5cef12301031e5f";

408408 }

409− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sq/firefox-100.0b6.tar.bz2";

409+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sq/firefox-101.0b2.tar.bz2";

410410 locale = "sq";

411411 arch = "linux-x86_64";

412− sha256 = "dbbcd4da798dca36965a408f74deef86001cdefdbeedd93d3d5c8c34cfd5e4e6";

412+ sha256 = "bfd2966ffc4f244c1af4b115a559865a86358125ca7485df838fa3c4d863237f";

413413 }

414− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sr/firefox-100.0b6.tar.bz2";

414+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sr/firefox-101.0b2.tar.bz2";

415415 locale = "sr";

416416 arch = "linux-x86_64";

417− sha256 = "cb8a4d3af1f8e5af4c6121afaab85eb51239d0a98e9caae0e87df435d9d746ad";

417+ sha256 = "6f2044c48819edcbb611d7455d30b212206a6427df74c186e7deff84d46607a2";

418418 }

419− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/sv-SE/firefox-100.0b6.tar.bz2";

419+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/sv-SE/firefox-101.0b2.tar.bz2";

420420 locale = "sv-SE";

421421 arch = "linux-x86_64";

422− sha256 = "941b3175289f26cc8102c5c436a477cb04af6a35e15861d2473d55b3dc36a04b";

422+ sha256 = "9fbd49d8dbb4c89447786380e468e74150ed8a94191fb9d942a3bc5fdd1eed23";

423423 }

424− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/szl/firefox-100.0b6.tar.bz2";

424+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/szl/firefox-101.0b2.tar.bz2";

425425 locale = "szl";

426426 arch = "linux-x86_64";

427− sha256 = "48fb048a32877082ff1511484cc1eb7847198da4af366c136bcc260879e30970";

427+ sha256 = "9248fc2d9ae25129ea1dd440d6f3e8168c33809156c0ac28c89cf7a849ab71b8";

428428 }

429− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ta/firefox-100.0b6.tar.bz2";

429+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ta/firefox-101.0b2.tar.bz2";

430430 locale = "ta";

431431 arch = "linux-x86_64";

432− sha256 = "16ad13edf164a8867a56dcd59e4bb8c09d2cb3cabbab8c2d7e0a4ed0c02db587";

432+ sha256 = "fa62feaac98df16853e98d40796679105efba2f2b133959d57a8c516d7bc679d";

433433 }

434− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/te/firefox-100.0b6.tar.bz2";

434+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/te/firefox-101.0b2.tar.bz2";

435435 locale = "te";

436436 arch = "linux-x86_64";

437− sha256 = "9c4e9fb72917b2e7b6abec7872366d687874af3c4e0d2acd862363120e3ceae0";

437+ sha256 = "6ff13809cd57fc9415a78776cd809a07ca2731ffc3297c1315f70a80507a402c";

438438 }

439− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/th/firefox-100.0b6.tar.bz2";

439+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/th/firefox-101.0b2.tar.bz2";

440440 locale = "th";

441441 arch = "linux-x86_64";

442− sha256 = "2a14cee27f951ec1e9e6e342cafee68a18513ed1b4d210e0490862296b12f0a9";

442+ sha256 = "984722c2760f9162ea166c004295b529d50e87e983c30e223c19217bf2957349";

443443 }

444− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tl/firefox-100.0b6.tar.bz2";

444+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tl/firefox-101.0b2.tar.bz2";

445445 locale = "tl";

446446 arch = "linux-x86_64";

447− sha256 = "dd1bf5dbb47615dc2f3a473ab541686fe53cd7d3ac3e5bedab37ce436db5fe07";

447+ sha256 = "c7c3570c25909af183593a9cc47dda28417163036af62522b1e762609c906408";

448448 }

449− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/tr/firefox-100.0b6.tar.bz2";

449+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/tr/firefox-101.0b2.tar.bz2";

450450 locale = "tr";

451451 arch = "linux-x86_64";

452− sha256 = "eb9b3f14fa9c2c57784f1e37e198b9eb4bdb8cd3f11ebb52b2a51ba47cc10ccf";

452+ sha256 = "c09188f66bc7e84ecf36c316f6858786a76b6431b223141d7ddcfe5801017efa";

453453 }

454− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/trs/firefox-100.0b6.tar.bz2";

454+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/trs/firefox-101.0b2.tar.bz2";

455455 locale = "trs";

456456 arch = "linux-x86_64";

457− sha256 = "d39ad94019221ecb2cc895ca16d71f4d461a52eef741b5728447ab054ffe12aa";

457+ sha256 = "4e0a2711a19e334ea2b0b2b0c9e1f6b2e2dd8946ac5afc017f0b360ce92b1597";

458458 }

459− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uk/firefox-100.0b6.tar.bz2";

459+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uk/firefox-101.0b2.tar.bz2";

460460 locale = "uk";

461461 arch = "linux-x86_64";

462− sha256 = "9fbc6fa34062cb64fc6c5eb09df6e3736865e09124efd465c6b30c1bc8329494";

462+ sha256 = "16c3317d11f94a098e3998e18d6af803e6cacd9cebf3d8aa7be64bb031ed4a1d";

463463 }

464− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/ur/firefox-100.0b6.tar.bz2";

464+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/ur/firefox-101.0b2.tar.bz2";

465465 locale = "ur";

466466 arch = "linux-x86_64";

467− sha256 = "ca1ed7e7746e5a2085328158185715b7b850e8129adf77b1d6f4e90580563563";

467+ sha256 = "59d7c4dd6cb4a62e01863cfdd176d23dea36c7ba9ffcd0e8f4a87803df25772e";

468468 }

469− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/uz/firefox-100.0b6.tar.bz2";

469+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/uz/firefox-101.0b2.tar.bz2";

470470 locale = "uz";

471471 arch = "linux-x86_64";

472− sha256 = "ad05af6f178de687697e7f98b18a64c2cbcc1bad2b167d5bb35e13ac57d03880";

472+ sha256 = "1874d3bc10804a1bb6ac7b934109649751f694d8eb36ac04c4bfb18df6d7ad49";

473473 }

474− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/vi/firefox-100.0b6.tar.bz2";

474+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/vi/firefox-101.0b2.tar.bz2";

475475 locale = "vi";

476476 arch = "linux-x86_64";

477− sha256 = "22b133203f3bb3c901c225e1275215c0c7e3ab5714e640d218532a9db8c636eb";

477+ sha256 = "f4b6bac19de341c1dfec87263e41b4382f8716a9ed1ab61336a29270988bf17e";

478478 }

479− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/xh/firefox-100.0b6.tar.bz2";

479+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/xh/firefox-101.0b2.tar.bz2";

480480 locale = "xh";

481481 arch = "linux-x86_64";

482− sha256 = "570c959de8351eb8ffaae05292be916bd94f34f51a1ffcc84e3176b7f23d230b";

482+ sha256 = "33e01f8d8e6c21afc055f73415c4c4be324cfbc73bfdc42d262ffde0e87301ce";

483483 }

484− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-CN/firefox-100.0b6.tar.bz2";

484+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-CN/firefox-101.0b2.tar.bz2";

485485 locale = "zh-CN";

486486 arch = "linux-x86_64";

487− sha256 = "f0e4fa1b580f778be335285b1154abdfde0b95c6d2c67f7547ab07bcc7fd5172";

487+ sha256 = "a17b7f914930ebcbe92e5e8fa8ec0ca8fa121939d65c68287ab668db460097f0";

488488 }

489− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-x86_64/zh-TW/firefox-100.0b6.tar.bz2";

489+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-x86_64/zh-TW/firefox-101.0b2.tar.bz2";

490490 locale = "zh-TW";

491491 arch = "linux-x86_64";

492− sha256 = "cd49d2954a7014a926cc012c1e439926af1f58c5e11234e2f9d2489c417388f7";

492+ sha256 = "ad987a76a4f4b5b521c7ac6eb1784c84086a7f11d9f9810f95b9219ed9d22c4c";

493493 }

494− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ach/firefox-100.0b6.tar.bz2";

494+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ach/firefox-101.0b2.tar.bz2";

495495 locale = "ach";

496496 arch = "linux-i686";

497− sha256 = "a3b67450658e8c34ce17f5f3b63afc4116cccdd2d786c72958afdb468c0c7eab";

497+ sha256 = "ee933397cb0be5acac1b67853871c5df8ccfca7bf2d8ffbdadd5575218ae317c";

498498 }

499− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/af/firefox-100.0b6.tar.bz2";

499+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/af/firefox-101.0b2.tar.bz2";

500500 locale = "af";

501501 arch = "linux-i686";

502− sha256 = "c7a9ca1c35ed17fe138df0608d02b345c6e358612a03f3408bd46a792f3bed2b";

502+ sha256 = "c6d21ddbd2eda266e11dc5cb132b0549868706e8d6897a12c570044f0eeafa48";

503503 }

504− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/an/firefox-100.0b6.tar.bz2";

504+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/an/firefox-101.0b2.tar.bz2";

505505 locale = "an";

506506 arch = "linux-i686";

507− sha256 = "242731960f5b500d25f9b328731437a4229aa4d668fc849d2111506dc4741b97";

507+ sha256 = "ae66f452b5ff50aa82867184a0111692d8fcdbfe17a5f8fbc88d2345a058cd1d";

508508 }

509− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ar/firefox-100.0b6.tar.bz2";

509+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ar/firefox-101.0b2.tar.bz2";

510510 locale = "ar";

511511 arch = "linux-i686";

512− sha256 = "4adf2045f911f74323a9e65b4fd2cf249a5369ad5143daa36eb0b1999b5adacc";

512+ sha256 = "1feea62c9a13828854257a5edd93a139881179f52d735558920f21a67c58f895";

513513 }

514− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ast/firefox-100.0b6.tar.bz2";

514+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ast/firefox-101.0b2.tar.bz2";

515515 locale = "ast";

516516 arch = "linux-i686";

517− sha256 = "d0827bf52bf91304a0a17c9f5edbc6081be1f1d9eaeba6dc24b63e8b251dbe11";

517+ sha256 = "05f800f114645ef5859d78d57d3c14ae8af37b27cb0fee766e948faac3548124";

518518 }

519− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/az/firefox-100.0b6.tar.bz2";

519+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/az/firefox-101.0b2.tar.bz2";

520520 locale = "az";

521521 arch = "linux-i686";

522− sha256 = "41de2d574563135721d0a975d8d90f4eccac60f3be51d4cca5e957473793629d";

522+ sha256 = "7170b694f972a73c88d32b1ce8f95d0c29cd549afc77dcc19b0ddb09bc138a1e";

523523 }

524− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/be/firefox-100.0b6.tar.bz2";

524+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/be/firefox-101.0b2.tar.bz2";

525525 locale = "be";

526526 arch = "linux-i686";

527− sha256 = "736900d6a404a97e13cfeeef68681ec7980266ba983f62c0779fd6a8b502e22b";

527+ sha256 = "503e5f53a9fc97e25df4d7b67b5c97fbb809a2bd6a72a99776f1d30acd628f81";

528528 }

529− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bg/firefox-100.0b6.tar.bz2";

529+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bg/firefox-101.0b2.tar.bz2";

530530 locale = "bg";

531531 arch = "linux-i686";

532− sha256 = "77351b45bc0bd3749c54ea1efb1ebb2ba1ced97f9885906a9b86523e85eb011d";

532+ sha256 = "121339b4ced135ecaa3cfa01e8a120f82b8f49d7a12886e81777fddfc9a86d8a";

533533 }

534− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bn/firefox-100.0b6.tar.bz2";

534+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bn/firefox-101.0b2.tar.bz2";

535535 locale = "bn";

536536 arch = "linux-i686";

537− sha256 = "5d9b274d20b5137e531660f92a7ac3b481abd756870af815159ac30e7df47e8d";

537+ sha256 = "e94b39bafbcb6d414608b607fda8ac366bc64e498ecc2d6f7ee29f3a807a0cce";

538538 }

539− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/br/firefox-100.0b6.tar.bz2";

539+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/br/firefox-101.0b2.tar.bz2";

540540 locale = "br";

541541 arch = "linux-i686";

542− sha256 = "22239f50b370747d3029e7f4ab8ac47de15cd5aa8b6d421193299fed9f9b556e";

542+ sha256 = "e35d8795752d5389d9cb6dba5657ff03326dc52f53b4523e568cb14a9d7ea812";

543543 }

544− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/bs/firefox-100.0b6.tar.bz2";

544+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/bs/firefox-101.0b2.tar.bz2";

545545 locale = "bs";

546546 arch = "linux-i686";

547− sha256 = "5e2d51cf768f00ab8a30f8d54e2bb88eed75baf20c381e87b7186f5927447137";

547+ sha256 = "11ab8f6430b63a8ac4a84418a17bb5d7b347a7a887498b528fa3b07c5f69dc86";

548548 }

549− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca-valencia/firefox-100.0b6.tar.bz2";

549+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca-valencia/firefox-101.0b2.tar.bz2";

550550 locale = "ca-valencia";

551551 arch = "linux-i686";

552− sha256 = "cdbee7378c4584d51a7142c695401ebe21a05c87961171fae2fc71e76485e92e";

552+ sha256 = "d9d5848da4d1818619e0b9641cffbee9c63358157be344dc6a30ad0e2230faac";

553553 }

554− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ca/firefox-100.0b6.tar.bz2";

554+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ca/firefox-101.0b2.tar.bz2";

555555 locale = "ca";

556556 arch = "linux-i686";

557− sha256 = "1f8f6e0a3917828f7e30deff842c6d5f0c5a2389c87969783d46950c6b072722";

557+ sha256 = "3791d8354df11c7fd77f6e5dae3ee988fe93226ecf57db1d04d31830ee4cfd07";

558558 }

559− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cak/firefox-100.0b6.tar.bz2";

559+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cak/firefox-101.0b2.tar.bz2";

560560 locale = "cak";

561561 arch = "linux-i686";

562− sha256 = "42996e08427b937cb2e2aa4d7ea569b729c9002d293be5288e02ab1588e3cbfc";

562+ sha256 = "2d38dc2c29dca9c6618da8bd15a7be4fba88a866247fe975172556378d703a94";

563563 }

564− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cs/firefox-100.0b6.tar.bz2";

564+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cs/firefox-101.0b2.tar.bz2";

565565 locale = "cs";

566566 arch = "linux-i686";

567− sha256 = "692d99947185928b46142ae910c76d4c1ee2328aa2e67212919aef39741d67db";

567+ sha256 = "987ab6a31f40aeb3ba4b4321ff755f8909f7bc78ed1568e01bc0936861d756dd";

568568 }

569− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/cy/firefox-100.0b6.tar.bz2";

569+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/cy/firefox-101.0b2.tar.bz2";

570570 locale = "cy";

571571 arch = "linux-i686";

572− sha256 = "b2f7ee9c016bc107e63dee850688b048c43f5d1caca1aa81d22cde4ffbe6c964";

572+ sha256 = "df843641be4d316cd6630a30158422c023d48bb0a4dd30622cef4e27b97c99ad";

573573 }

574− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/da/firefox-100.0b6.tar.bz2";

574+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/da/firefox-101.0b2.tar.bz2";

575575 locale = "da";

576576 arch = "linux-i686";

577− sha256 = "095ae3d0657a68903c4d60a21240b9c3fc399284063e5c366ccedcf58361c80b";

577+ sha256 = "ca5e5b23e9b4615f5a982b9217dd42b82c1f72b832b3aade4955f9f46f0e3e9a";

578578 }

579− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/de/firefox-100.0b6.tar.bz2";

579+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/de/firefox-101.0b2.tar.bz2";

580580 locale = "de";

581581 arch = "linux-i686";

582− sha256 = "359364e7ee5ed03556c7b7390cdb4b1e91e027598a74231cfc20fd5d5c601b1d";

582+ sha256 = "e07f89f21b1952310ce310a54428840053ae8f2dcaad5472b38b1761ef32b649";

583583 }

584− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/dsb/firefox-100.0b6.tar.bz2";

584+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/dsb/firefox-101.0b2.tar.bz2";

585585 locale = "dsb";

586586 arch = "linux-i686";

587− sha256 = "24f7caf5bbc8edefa104c6b4a646a1afa254da9bb8a1965193b7e4a97ef848ae";

587+ sha256 = "c6e32545afdec0bfccc5f568892fc77cb226715fde84bdf2651627ab7d69cbe7";

588588 }

589− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/el/firefox-100.0b6.tar.bz2";

589+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/el/firefox-101.0b2.tar.bz2";

590590 locale = "el";

591591 arch = "linux-i686";

592− sha256 = "97bfe8f01d8f6024b85a6f25ee084642dc2e2c50dc189d1b6bccfa7835120bad";

592+ sha256 = "0a3d7ec83f0a64c6dec14f3649bd6335bb3118120d7b3da50fd0c8498fd899c0";

593593 }

594− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-CA/firefox-100.0b6.tar.bz2";

594+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-CA/firefox-101.0b2.tar.bz2";

595595 locale = "en-CA";

596596 arch = "linux-i686";

597− sha256 = "fa534341dcfeeb5778d19d5c38fdd8a56e92e756212d256c2fd40c499435e6cc";

597+ sha256 = "ce43791e216aa63a250c3d542c4f89eb7199b6d2805b0994f8479a6871f38bfc";

598598 }

599− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-GB/firefox-100.0b6.tar.bz2";

599+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-GB/firefox-101.0b2.tar.bz2";

600600 locale = "en-GB";

601601 arch = "linux-i686";

602− sha256 = "a38f383c06a2cce4ddc49fd304b1b5742dcbc2cdd189dd5b6e91b1494231504a";

602+ sha256 = "61a60147594bea4ce7755d002edc914066f31ac4bab1f2933948b0c0f8987f01";

603603 }

604− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/en-US/firefox-100.0b6.tar.bz2";

604+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/en-US/firefox-101.0b2.tar.bz2";

605605 locale = "en-US";

606606 arch = "linux-i686";

607− sha256 = "c5ad47cc4f5829eb3d01c7031833e3f8aa24d07947415947d5e86e492be37c20";

607+ sha256 = "503b87ed02399c0804edcc99bced3ba07da78781c59616f7469bfbcf8a2ca07e";

608608 }

609− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eo/firefox-100.0b6.tar.bz2";

609+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eo/firefox-101.0b2.tar.bz2";

610610 locale = "eo";

611611 arch = "linux-i686";

612− sha256 = "d96ddc5a07581ac62078cac8d702425d6764cbffd93ea1a35ddcbfa5258e01ca";

612+ sha256 = "564b49b4ce197b4237c514a7cbd8cba982b3aa979e5b2ada991b951edee4d9e4";

613613 }

614− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-AR/firefox-100.0b6.tar.bz2";

614+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-AR/firefox-101.0b2.tar.bz2";

615615 locale = "es-AR";

616616 arch = "linux-i686";

617− sha256 = "e5c069a162cd02c3449b6b6c800c491f80270cbd9e29bb418351b40ca318d08e";

617+ sha256 = "5f0b4e2c1078456a41f74b284ae424fa7fee61e99df08b1d1fce565bc65d1e25";

618618 }

619− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-CL/firefox-100.0b6.tar.bz2";

619+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-CL/firefox-101.0b2.tar.bz2";

620620 locale = "es-CL";

621621 arch = "linux-i686";

622− sha256 = "e45ea8d1bfc96f500e1061eed4694f2c7c81fb5b5ea76411cb7bdf7df8e74b1b";

622+ sha256 = "333b857e916d2a98c38f61561ad9a1203e82cb8ba232f164b4c863c5d5921273";

623623 }

624− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-ES/firefox-100.0b6.tar.bz2";

624+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-ES/firefox-101.0b2.tar.bz2";

625625 locale = "es-ES";

626626 arch = "linux-i686";

627− sha256 = "a86e913fce09abd34f69f72f338e5d276360b39584266fcb160aa4cb5ef15e10";

627+ sha256 = "ee9ccde18f190f18abed18fb068cbd10fb81ccd16c0644316d22f838ac68191f";

628628 }

629− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/es-MX/firefox-100.0b6.tar.bz2";

629+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/es-MX/firefox-101.0b2.tar.bz2";

630630 locale = "es-MX";

631631 arch = "linux-i686";

632− sha256 = "d39ac7c519aa5ab3c2b02da50f882480d657672573ac13b76ffa1620a7c31dea";

632+ sha256 = "ee18e46695e277001331493060354387cc2dce231e58ddc4c70b693b8a73ea30";

633633 }

634− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/et/firefox-100.0b6.tar.bz2";

634+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/et/firefox-101.0b2.tar.bz2";

635635 locale = "et";

636636 arch = "linux-i686";

637− sha256 = "2d83aecece8c35f11bd3190da1d91100779c4516292fb683792c09a9df63297b";

637+ sha256 = "1d2a7947d04503f57098d3e1384c5cd5462674dc423cb5ee9f60d6055cf8d82b";

638638 }

639− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/eu/firefox-100.0b6.tar.bz2";

639+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/eu/firefox-101.0b2.tar.bz2";

640640 locale = "eu";

641641 arch = "linux-i686";

642− sha256 = "acb38b6a8d2111511d31cb967da094d68eb4bc5e1fb4af613392cdb931a81b69";

642+ sha256 = "bce92157723f47e97d252be307413b3d2423910e37f2d3064f28065391e4c6be";

643643 }

644− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fa/firefox-100.0b6.tar.bz2";

644+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fa/firefox-101.0b2.tar.bz2";

645645 locale = "fa";

646646 arch = "linux-i686";

647− sha256 = "4c509afe344db0cf9eff8f3bafabdc80b25f78537dfcc931d05a326d97b3793b";

647+ sha256 = "33fce9fcd652f9d79cbb4f06f8c6566df7227698ff191d5f2a8135e537018ce8";

648648 }

649− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ff/firefox-100.0b6.tar.bz2";

649+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ff/firefox-101.0b2.tar.bz2";

650650 locale = "ff";

651651 arch = "linux-i686";

652− sha256 = "23c02e6d2f18351c72917c02f6795b1183482e35c6fa5990ecab8e724959c4ce";

652+ sha256 = "8f7d299182ca59d040316254a5acad58c133af5f5199b2531388705e9ee74582";

653653 }

654− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fi/firefox-100.0b6.tar.bz2";

654+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fi/firefox-101.0b2.tar.bz2";

655655 locale = "fi";

656656 arch = "linux-i686";

657− sha256 = "30f696e3e0b419017fed38ab434a99ffb303eaa4d9d96bd2525ad84cebb20d51";

657+ sha256 = "f8f49abdcd30b1b9df88a38320235f470aa9932c554a274fb802e2b4b52fe8ed";

658658 }

659− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fr/firefox-100.0b6.tar.bz2";

659+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fr/firefox-101.0b2.tar.bz2";

660660 locale = "fr";

661661 arch = "linux-i686";

662− sha256 = "40d631f78caf08e8a04a4dc1286cd749d66130a9b3f887f8a74d1f15ed7247a3";

662+ sha256 = "3be37bda9be1c9a5fc4fe899010680499dec0e71ddb151f19e18e55a6450b771";

663663 }

664− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/fy-NL/firefox-100.0b6.tar.bz2";

664+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/fy-NL/firefox-101.0b2.tar.bz2";

665665 locale = "fy-NL";

666666 arch = "linux-i686";

667− sha256 = "62563d3d7c5755f1163d956f1bf82cb81c48b5349db293e66185c95b8e65caa6";

667+ sha256 = "76598f5d5ab6be41b003e7648458d1f03dac48d82716d1072a47047dd4d0aa28";

668668 }

669− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ga-IE/firefox-100.0b6.tar.bz2";

669+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ga-IE/firefox-101.0b2.tar.bz2";

670670 locale = "ga-IE";

671671 arch = "linux-i686";

672− sha256 = "72914c49d6b5384987942a6c8127891c7eaa088d08bf9192ce448b11342f512e";

672+ sha256 = "d297c383365b1ff0fab543b42621671e96d831f0620751209f04b75b8022e1c1";

673673 }

674− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gd/firefox-100.0b6.tar.bz2";

674+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gd/firefox-101.0b2.tar.bz2";

675675 locale = "gd";

676676 arch = "linux-i686";

677− sha256 = "1a127b1a4a8407476f1ed73ebd982fc5d0262e2fc413748b4228d9bc9d28a59e";

677+ sha256 = "86bd993b81b67f5d907a87f88666cac72413ecd9450d8c482c31738bd22135e2";

678678 }

679− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gl/firefox-100.0b6.tar.bz2";

679+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gl/firefox-101.0b2.tar.bz2";

680680 locale = "gl";

681681 arch = "linux-i686";

682− sha256 = "1a84a2d00d065f69492a73e6917e07de8824b185139e3acb75b0f0dd5f82d604";

682+ sha256 = "e33cffea73148da8b24e59dd7a2e203285af2d08e356e0892dab1a70a40cd4b4";

683683 }

684− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gn/firefox-100.0b6.tar.bz2";

684+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gn/firefox-101.0b2.tar.bz2";

685685 locale = "gn";

686686 arch = "linux-i686";

687− sha256 = "6ddf864b2b2258d0ced011ac2d0ed13455e99d3c093642a477f95ca13a3349cc";

687+ sha256 = "574df608df5b04549b2d89edd99a829afd2eea768a7dd33b12c21b8db4e00612";

688688 }

689− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/gu-IN/firefox-100.0b6.tar.bz2";

689+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/gu-IN/firefox-101.0b2.tar.bz2";

690690 locale = "gu-IN";

691691 arch = "linux-i686";

692− sha256 = "86688035900e5bf2dabfb7e8c7320dc4ccf33b46d8c9e963216a750ba2e2b300";

692+ sha256 = "910a1eae44a979c09edac6d470fd5cf19428028c8ebe5a04b27c8029700ce682";

693693 }

694− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/he/firefox-100.0b6.tar.bz2";

694+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/he/firefox-101.0b2.tar.bz2";

695695 locale = "he";

696696 arch = "linux-i686";

697− sha256 = "d35c7ac5d61d9253ab69da2a77bbaef7037e7cfa2339d4730201fe41776adc90";

697+ sha256 = "17b634d9c38d21b8dcb6e8b8ae3d89c54099a2b17b68f7acfc56f10191163193";

698698 }

699− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hi-IN/firefox-100.0b6.tar.bz2";

699+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hi-IN/firefox-101.0b2.tar.bz2";

700700 locale = "hi-IN";

701701 arch = "linux-i686";

702− sha256 = "48872f0b68ccf4df855e58a4520f5f8347b05de318a0991d83088521b4d178e6";

702+ sha256 = "e9fb302f798ede6c518ec72eb103dd087aae86826a61f6ff260bba146bd66cd0";

703703 }

704− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hr/firefox-100.0b6.tar.bz2";

704+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hr/firefox-101.0b2.tar.bz2";

705705 locale = "hr";

706706 arch = "linux-i686";

707− sha256 = "9c1c1303aadb4071a82b558fd470c96671872cd480e444686ec74f41afd46e2f";

707+ sha256 = "a976d4bb564eba983412a3301f3ccea463887d3e3c115fe702fc009059c92490";

708708 }

709− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hsb/firefox-100.0b6.tar.bz2";

709+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hsb/firefox-101.0b2.tar.bz2";

710710 locale = "hsb";

711711 arch = "linux-i686";

712− sha256 = "828330501590e2ad3021397cb7b37a86c015b93536e4e2383fc5c5a1e8d6a6f1";

712+ sha256 = "4ef0f578d5deb079d5cbec68e61e756b6c44b36a197740dbbcf473d17576d4d8";

713713 }

714− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hu/firefox-100.0b6.tar.bz2";

714+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hu/firefox-101.0b2.tar.bz2";

715715 locale = "hu";

716716 arch = "linux-i686";

717− sha256 = "592c69c6377657bccbf2b81ae54bc8f37fa6d081dc36d0465c20eaf6d673f32f";

717+ sha256 = "0aca5d7dea85d3e0b823f8a209e39b54afe405c9a168d92f04cf8893272d8e45";

718718 }

719− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/hy-AM/firefox-100.0b6.tar.bz2";

719+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/hy-AM/firefox-101.0b2.tar.bz2";

720720 locale = "hy-AM";

721721 arch = "linux-i686";

722− sha256 = "a95989dbd6b7b499840f5cc65a765129ca23392455afd21c0ff865112900b5b6";

722+ sha256 = "a9595bab34e8034662f6ffc9827e22a97909793bc632ce20f5a12bde711fe77d";

723723 }

724− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ia/firefox-100.0b6.tar.bz2";

724+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ia/firefox-101.0b2.tar.bz2";

725725 locale = "ia";

726726 arch = "linux-i686";

727− sha256 = "a9b225d969b0d8c621a2b545cbb42ce7188d78c09c248422d6379d83934201b6";

727+ sha256 = "bf9e13c8c9ea858875d8940fa3ac3b8440f88279bd1e520bf2e8df3cfa1209a0";

728728 }

729− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/id/firefox-100.0b6.tar.bz2";

729+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/id/firefox-101.0b2.tar.bz2";

730730 locale = "id";

731731 arch = "linux-i686";

732− sha256 = "304f4d04d3e73a477598a034d3fd016948c5e1662bc236d640219b4b96159690";

732+ sha256 = "0a6e0a680e37d53960cfd41c7218dacf359a2dfd9046e4957a64d1cb70cbb9c2";

733733 }

734− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/is/firefox-100.0b6.tar.bz2";

734+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/is/firefox-101.0b2.tar.bz2";

735735 locale = "is";

736736 arch = "linux-i686";

737− sha256 = "3cd144b87e3ef57703ce60c57a09ea8c6ab910408a7c891f9b9b653dca51c55c";

737+ sha256 = "1a4029b76fa9239669fabb61daeda9dce78198e92c47b24225d01bf3ab38fd1e";

738738 }

739− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/it/firefox-100.0b6.tar.bz2";

739+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/it/firefox-101.0b2.tar.bz2";

740740 locale = "it";

741741 arch = "linux-i686";

742− sha256 = "b024d3b0fe4ac5691c6cf1e0c18ce2bff91083746bb988799f2eb3ab74e22e80";

742+ sha256 = "45b29a5e11f55e3775b3fb8079549edb7d2d51ab70a1486f9b119dea3cc1c5a8";

743743 }

744− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ja/firefox-100.0b6.tar.bz2";

744+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ja/firefox-101.0b2.tar.bz2";

745745 locale = "ja";

746746 arch = "linux-i686";

747− sha256 = "fe3d9b0c7d0e8f47e9f1bc12429200aeb951b303946365bb32f51c9d807259cf";

747+ sha256 = "2ae2d1acb31d8d2cd8aa926b7650b81406444e4abed8fd6e2e1bd245c443405c";

748748 }

749− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ka/firefox-100.0b6.tar.bz2";

749+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ka/firefox-101.0b2.tar.bz2";

750750 locale = "ka";

751751 arch = "linux-i686";

752− sha256 = "2e4d0f5f2eab6787db359c47a48b35a202b713de0807299a41a751b527a9ccf3";

752+ sha256 = "730c2582c36982e81a3e86ad8d4c7f817bb32a1812eed3d0ca7692ee45b24180";

753753 }

754− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kab/firefox-100.0b6.tar.bz2";

754+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kab/firefox-101.0b2.tar.bz2";

755755 locale = "kab";

756756 arch = "linux-i686";

757− sha256 = "49166beef9b6952940d1ce420afd77777fbe84143b65693f9b75db6768b88e01";

757+ sha256 = "b72a7e0310bc67576d4e3f882999077e7a8f0604dcbad55aa2c854b2cee858bf";

758758 }

759− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kk/firefox-100.0b6.tar.bz2";

759+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kk/firefox-101.0b2.tar.bz2";

760760 locale = "kk";

761761 arch = "linux-i686";

762− sha256 = "24aec891a8189714c9299c695346a3d0a4ea52621f08b890d5db63ba36bc627d";

762+ sha256 = "9fa815efcb23f0cc91f1de66b33b9d6fa8e76aa5c03179e0f3808632be25bf60";

763763 }

764− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/km/firefox-100.0b6.tar.bz2";

764+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/km/firefox-101.0b2.tar.bz2";

765765 locale = "km";

766766 arch = "linux-i686";

767− sha256 = "90f5b7811a2f0bdfefd14261d1e0e7fe85466dc96c666316134c97095606c6ce";

767+ sha256 = "d4c451d65b82ef753b651b6404240b2bba5e6798285d3fa2737709e4eabee9a2";

768768 }

769− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/kn/firefox-100.0b6.tar.bz2";

769+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/kn/firefox-101.0b2.tar.bz2";

770770 locale = "kn";

771771 arch = "linux-i686";

772− sha256 = "e423d1231edbef812e8cbd50f53dba4b48dc9083cbd5d91825392229015c38c8";

772+ sha256 = "a1d0ba8d2b61f5c554a7193e1f2e25f3901b667107b1a926f8ab2d8b28fafe1a";

773773 }

774− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ko/firefox-100.0b6.tar.bz2";

774+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ko/firefox-101.0b2.tar.bz2";

775775 locale = "ko";

776776 arch = "linux-i686";

777− sha256 = "cadd481242635d64b224e080adc1bdcfff9f7ced4715b0ea9655ab333ac7d039";

777+ sha256 = "c52a38a7c830aecea014596aa035dca5f6b2e8cc28e3455657fd58ccc8dc0a4f";

778778 }

779− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lij/firefox-100.0b6.tar.bz2";

779+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lij/firefox-101.0b2.tar.bz2";

780780 locale = "lij";

781781 arch = "linux-i686";

782− sha256 = "4798691d44767027a39c1124053b2351523e615a06b32bd2bf4f9da7b858159a";

782+ sha256 = "472d0a005d350dc9c358b62b6c428139e5ca784cd6364d73209683c5cdf73a72";

783783 }

784− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lt/firefox-100.0b6.tar.bz2";

784+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lt/firefox-101.0b2.tar.bz2";

785785 locale = "lt";

786786 arch = "linux-i686";

787− sha256 = "ac49b6d34eb8caac4a6900246adb3562eb2228a50fcdc543f79903ea267b339e";

787+ sha256 = "e07ebe646f72849afdb0d8e5c41a7654eab3034bf476216cf58a3b7f8e0c3648";

788788 }

789− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/lv/firefox-100.0b6.tar.bz2";

789+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/lv/firefox-101.0b2.tar.bz2";

790790 locale = "lv";

791791 arch = "linux-i686";

792− sha256 = "4f6e6a26a2b8a23855dbdeabd2363ee0155914542e4c48c655d6b52da6289b34";

792+ sha256 = "441ee8be6452b90fe669843410a07b47db7f87ed47795dcbf81d91053ae263d5";

793793 }

794− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mk/firefox-100.0b6.tar.bz2";

794+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mk/firefox-101.0b2.tar.bz2";

795795 locale = "mk";

796796 arch = "linux-i686";

797− sha256 = "522590d926022cbe833ce0050e5d23db47bab2c8de1e1e0ae3e96941b53dfb6c";

797+ sha256 = "a2dbd0436ebf1ee64300668771960d0021c744c2dae8ecc5bf976d7a821a1640";

798798 }

799− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/mr/firefox-100.0b6.tar.bz2";

799+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/mr/firefox-101.0b2.tar.bz2";

800800 locale = "mr";

801801 arch = "linux-i686";

802− sha256 = "4df57dacc8b71070aa077281beffc04bfc632666b2b26caedc1fda4e484e59d9";

802+ sha256 = "1311f1b8754f93669011358d574f970f258ca8b32cb5638a12266dc7e2a47595";

803803 }

804− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ms/firefox-100.0b6.tar.bz2";

804+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ms/firefox-101.0b2.tar.bz2";

805805 locale = "ms";

806806 arch = "linux-i686";

807− sha256 = "005506663901ad539817197972864f67812a9f5e3f1055e7418ab4bb052ecdad";

807+ sha256 = "8e78f3a12c599a29a01c9a84373ee799c3b8a8478e452b0a8ba27f4be9e7ed93";

808808 }

809− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/my/firefox-100.0b6.tar.bz2";

809+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/my/firefox-101.0b2.tar.bz2";

810810 locale = "my";

811811 arch = "linux-i686";

812− sha256 = "aeb8445d5425640ceb8d2b823a7dd3e79fbd355f07420d015af4559d2bf2cebe";

812+ sha256 = "d6be222fb3161f2737f2e54d0e26f208298162be21197b6b5a6e3c05d8948f1c";

813813 }

814− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nb-NO/firefox-100.0b6.tar.bz2";

814+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nb-NO/firefox-101.0b2.tar.bz2";

815815 locale = "nb-NO";

816816 arch = "linux-i686";

817− sha256 = "d41588beac0fc9a3eeab9f2843b8aef53e61a7c15dcdc34eb89e73838d9dab24";

817+ sha256 = "c4a2f49f516a19542759296d61ffd5af32640d0e022aa960d6d7f2ec645bb353";

818818 }

819− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ne-NP/firefox-100.0b6.tar.bz2";

819+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ne-NP/firefox-101.0b2.tar.bz2";

820820 locale = "ne-NP";

821821 arch = "linux-i686";

822− sha256 = "c3c981a5a701118e70b6b03338451d7d50325234be03838e403e57b822b6fb61";

822+ sha256 = "4b9fba6e4cf8e9ef0878bdda30b12f89b857dba2475adccff386bb492f4efc4f";

823823 }

824− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nl/firefox-100.0b6.tar.bz2";

824+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nl/firefox-101.0b2.tar.bz2";

825825 locale = "nl";

826826 arch = "linux-i686";

827− sha256 = "ee902a63548299b6ceb9cfa263991233c32b0bf8534dc5256ce84714eab01f12";

827+ sha256 = "2561300f8fd8e53ac16506734f17aea5d9cb5b7d970e4070084f944de54c287c";

828828 }

829− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/nn-NO/firefox-100.0b6.tar.bz2";

829+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/nn-NO/firefox-101.0b2.tar.bz2";

830830 locale = "nn-NO";

831831 arch = "linux-i686";

832− sha256 = "e3fcf444660a2e8b3abe10d9d3a512985e9791fb7916ffafac564d9849816241";

832+ sha256 = "f2b880d35f85122c92efa10268f3bacb70063720fb93f85f565ff9d75f4d6a58";

833833 }

834− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/oc/firefox-100.0b6.tar.bz2";

834+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/oc/firefox-101.0b2.tar.bz2";

835835 locale = "oc";

836836 arch = "linux-i686";

837− sha256 = "0b80101b082209ead23287d0d7efa136eea099b9895b9a4a8906abafb8a7dbcd";

837+ sha256 = "ea51d91008fef8163059b1b35403c049b236441c5e87df06f7cf5319dd480680";

838838 }

839− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pa-IN/firefox-100.0b6.tar.bz2";

839+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pa-IN/firefox-101.0b2.tar.bz2";

840840 locale = "pa-IN";

841841 arch = "linux-i686";

842− sha256 = "14f8fe19c6cea1d38eba2f4aff8a8787875632e7ef867b44a48bcda59ad0c32f";

842+ sha256 = "c0332f06388fe11e17599fbd0d2bf4074576d693355f05e0c0ac74b78e8a185a";

843843 }

844− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pl/firefox-100.0b6.tar.bz2";

844+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pl/firefox-101.0b2.tar.bz2";

845845 locale = "pl";

846846 arch = "linux-i686";

847− sha256 = "796b575f4ada12cd1aa0fdeae8b5c198eb2e6a327bd0cede066b1beff4961d96";

847+ sha256 = "ce584b3d90775742be1c521c6e79bc57248eab426d6ea4bba00da22a7e9ced29";

848848 }

849− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-BR/firefox-100.0b6.tar.bz2";

849+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-BR/firefox-101.0b2.tar.bz2";

850850 locale = "pt-BR";

851851 arch = "linux-i686";

852− sha256 = "a1a83e3e317bc7465922b40327031fd48610627c0e1554569710a7b40fedd98c";

852+ sha256 = "6ab1beb2ea5aa1390127fc13f8e0de6555f5ccdee64a96fb382dd0d411e5d280";

853853 }

854− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/pt-PT/firefox-100.0b6.tar.bz2";

854+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/pt-PT/firefox-101.0b2.tar.bz2";

855855 locale = "pt-PT";

856856 arch = "linux-i686";

857− sha256 = "0ff375602235a96b6197366ae22f4c05cbb3c9068d48cdb08a035e3af084d3f3";

857+ sha256 = "641396a068e0de827b6feb03edf4f71f343baef24e5409d892c68e4ce48ec51c";

858858 }

859− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/rm/firefox-100.0b6.tar.bz2";

859+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/rm/firefox-101.0b2.tar.bz2";

860860 locale = "rm";

861861 arch = "linux-i686";

862− sha256 = "5599c540c50162d1a79ea16196bb15fda9fed825508b60b4961d91255709593d";

862+ sha256 = "a7cdb00dddcee0ce416c36c160ce9ab5fedc6de4ad3caaa4c8b14f9a6e1ea05c";

863863 }

864− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ro/firefox-100.0b6.tar.bz2";

864+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ro/firefox-101.0b2.tar.bz2";

865865 locale = "ro";

866866 arch = "linux-i686";

867− sha256 = "771be3da68642a15baa1e054bf23e9df272d0b0ab46f1e42c6fdf35e85035b9f";

867+ sha256 = "eb360965ed5379374b31030b0db3a66e6637687c2b1ee6dcc893c0308bf5ee41";

868868 }

869− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ru/firefox-100.0b6.tar.bz2";

869+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ru/firefox-101.0b2.tar.bz2";

870870 locale = "ru";

871871 arch = "linux-i686";

872− sha256 = "bcca4b9aace48ed4da4c881ed47b0bbc3d20fddd07273ecf1c84758633f350b4";

872+ sha256 = "7da4c79b922a9e03c0ba677ae01271f10c0408ed0125d6c020182572bc6989d5";

873873 }

874− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sco/firefox-100.0b6.tar.bz2";

874+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sco/firefox-101.0b2.tar.bz2";

875875 locale = "sco";

876876 arch = "linux-i686";

877− sha256 = "1ca439331c6437dee10d1f2cd72907499894bd98af036dbedc964248217ff510";

877+ sha256 = "af1717f13e40806345ca2042fdcaa5105cbf23845ce63f1e89cbf43e57cf8edd";

878878 }

879− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/si/firefox-100.0b6.tar.bz2";

879+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/si/firefox-101.0b2.tar.bz2";

880880 locale = "si";

881881 arch = "linux-i686";

882− sha256 = "b643cfd20a0bc56b1989dc1c4dc96535d6585a53bb5d13c85ca53bb1027e1732";

882+ sha256 = "673f9978ea53996d6021990373484eede873a13e75bd32caab8d9c8a915e046d";

883883 }

884− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sk/firefox-100.0b6.tar.bz2";

884+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sk/firefox-101.0b2.tar.bz2";

885885 locale = "sk";

886886 arch = "linux-i686";

887− sha256 = "5aa1dc132c3d2a42b6086cf824c8b6ae7a30d8b55341a05acfc3eaaa8dd4cad0";

887+ sha256 = "db60bfe2a7cb89acc6250304c36c4e665de6c27f788dbb133a68989998e87c27";

888888 }

889− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sl/firefox-100.0b6.tar.bz2";

889+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sl/firefox-101.0b2.tar.bz2";

890890 locale = "sl";

891891 arch = "linux-i686";

892− sha256 = "92b2a15a04c4cee559e0a6565509a546ac7a2c4e3fadbba0c6197356e99f71f9";

892+ sha256 = "22faba05601722a2e01e93bee941dc8065f35bf235037b5ec2259bcbd6c3c229";

893893 }

894− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/son/firefox-100.0b6.tar.bz2";

894+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/son/firefox-101.0b2.tar.bz2";

895895 locale = "son";

896896 arch = "linux-i686";

897− sha256 = "8a25e8af341178bbbcc0731788b1116ab64fbb55480836b94ad6e7830b6b5f16";

897+ sha256 = "b6d6278671e2c7204b5ca7c357390c0abb8ac3fde1ec3f504c808455db990fb0";

898898 }

899− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sq/firefox-100.0b6.tar.bz2";

899+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sq/firefox-101.0b2.tar.bz2";

900900 locale = "sq";

901901 arch = "linux-i686";

902− sha256 = "66b7ea3b488b980c425576fdad6009d2c246bdb4686b24b519604a54dba6f756";

902+ sha256 = "5571154a698ee65c6f10cebd318b425b265b36c20b6deac8a6a1fb8699aedee1";

903903 }

904− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sr/firefox-100.0b6.tar.bz2";

904+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sr/firefox-101.0b2.tar.bz2";

905905 locale = "sr";

906906 arch = "linux-i686";

907− sha256 = "1aecc3a24dab4a843a967b8c023bbe01488dc113e451cfd7d39e7c2caac1c153";

907+ sha256 = "130bb0c0fcad5bb8c7f54bf274a6d4dcb69bd4dc622fda9c32361a2859166231";

908908 }

909− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/sv-SE/firefox-100.0b6.tar.bz2";

909+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/sv-SE/firefox-101.0b2.tar.bz2";

910910 locale = "sv-SE";

911911 arch = "linux-i686";

912− sha256 = "d5189ed627ac49286cec9733c8658c271ee99930f2d07754993e776a58eacfa0";

912+ sha256 = "02199add3347abd89f5ec93f759cf12fd353b63fd4a2f91ee6b3f094f5512a49";

913913 }

914− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/szl/firefox-100.0b6.tar.bz2";

914+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/szl/firefox-101.0b2.tar.bz2";

915915 locale = "szl";

916916 arch = "linux-i686";

917− sha256 = "45c48d7381499d5aeca0fe340ecc8af33016821fa8f081f6c52c878a9af3640f";

917+ sha256 = "c1a99c03d63bea1b1130a02d30c051778648c73f18f38b294c53be83f7f978dd";

918918 }

919− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ta/firefox-100.0b6.tar.bz2";

919+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ta/firefox-101.0b2.tar.bz2";

920920 locale = "ta";

921921 arch = "linux-i686";

922− sha256 = "1a8a9fe5eb0e9e8d213d667cc1aa478f9f381d5a444f8d2be518fb04926e4f64";

922+ sha256 = "c01c7a1f56317f2d415bd777e5434366b0b3b2f4ff3a599a25011ef8b90420c4";

923923 }

924− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/te/firefox-100.0b6.tar.bz2";

924+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/te/firefox-101.0b2.tar.bz2";

925925 locale = "te";

926926 arch = "linux-i686";

927− sha256 = "1f3aa559af38662aea444f52974c2843ffede5505e71e83d73e331d2c4b92275";

927+ sha256 = "fcda6af3a7611243dac789fec6bf78a8517389ba3df5ccbb50157969281aa8fd";

928928 }

929− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/th/firefox-100.0b6.tar.bz2";

929+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/th/firefox-101.0b2.tar.bz2";

930930 locale = "th";

931931 arch = "linux-i686";

932− sha256 = "05bbf88a5b9e914d86244555d06d560b328e8e873e380e67d40edb6d3971d383";

932+ sha256 = "2d38c379f9d8aa9e7b7367eeccdf656cc9374858e5bd0cecc19eddd6b1a51cad";

933933 }

934− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tl/firefox-100.0b6.tar.bz2";

934+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tl/firefox-101.0b2.tar.bz2";

935935 locale = "tl";

936936 arch = "linux-i686";

937− sha256 = "8cd7f71325ce2a54403032bc80fe366acfd7a8ce3e3871ae1a8f4e0b5315ddf9";

937+ sha256 = "18e0bc9c89a0e89151b1edfe498760fecdb66b369e49ca4fa7ef3d5fdb0c4151";

938938 }

939− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/tr/firefox-100.0b6.tar.bz2";

939+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/tr/firefox-101.0b2.tar.bz2";

940940 locale = "tr";

941941 arch = "linux-i686";

942− sha256 = "41275c3dcfc9624390a2d3ce9d0aa0e746c4e3122f433924227299d46ff8ab42";

942+ sha256 = "bde092819c9f0771bb463df750fb35eb422862a7e28a308209953461be9c9d9e";

943943 }

944− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/trs/firefox-100.0b6.tar.bz2";

944+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/trs/firefox-101.0b2.tar.bz2";

945945 locale = "trs";

946946 arch = "linux-i686";

947− sha256 = "c04aafe011c8626d749990e0ba293a22c8a623c6eab9bc4bff2782708832a648";

947+ sha256 = "fca0c955097a04619e834f7bbce4d8bd7f65283dc0dc9bcb07cea7b4d31aa526";

948948 }

949− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uk/firefox-100.0b6.tar.bz2";

949+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uk/firefox-101.0b2.tar.bz2";

950950 locale = "uk";

951951 arch = "linux-i686";

952− sha256 = "965f445606d8c81d1745a7028ffd15af7cb9bf2473bfba5e673e3621afeaa6e2";

952+ sha256 = "31c97b928c9a5e7e80ffdcbec67485702de9fb82acc4f0a7cfc7195e8d214d75";

953953 }

954− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/ur/firefox-100.0b6.tar.bz2";

954+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/ur/firefox-101.0b2.tar.bz2";

955955 locale = "ur";

956956 arch = "linux-i686";

957− sha256 = "8955e64902aca993d110401fe36b56c84b53a414b2da569525653ee28801d9ca";

957+ sha256 = "ec9dc26f00786e8dd084d08e7e9c5612e42ada7e5381e889d940915c9360c837";

958958 }

959− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/uz/firefox-100.0b6.tar.bz2";

959+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/uz/firefox-101.0b2.tar.bz2";

960960 locale = "uz";

961961 arch = "linux-i686";

962− sha256 = "e05ef7856c3c4777da187ed7212ebab01900881702d1fa8e221a86c57c6ef4f9";

962+ sha256 = "9d4de951bfd5d1cf65718f0118807596ce48b2a6a4ce8d29c8ff3c963e39907d";

963963 }

964− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/vi/firefox-100.0b6.tar.bz2";

964+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/vi/firefox-101.0b2.tar.bz2";

965965 locale = "vi";

966966 arch = "linux-i686";

967− sha256 = "baca088760ee065eb8ad86d93c6b0325d23f88d18359693ba9c2a3971e9e5061";

967+ sha256 = "12726a8b22fdfe5d3e9637d665d7d4583e8762362032688367d3a8a5b96665a4";

968968 }

969− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/xh/firefox-100.0b6.tar.bz2";

969+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/xh/firefox-101.0b2.tar.bz2";

970970 locale = "xh";

971971 arch = "linux-i686";

972− sha256 = "c679216fca120982454a15087890fda40d21bb269a940d96dbe37428672db65f";

972+ sha256 = "64ee875cda3543a780a6da399ea7750027e85e4abe62d3eef4e4b21f3b0daa77";

973973 }

974− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-CN/firefox-100.0b6.tar.bz2";

974+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-CN/firefox-101.0b2.tar.bz2";

975975 locale = "zh-CN";

976976 arch = "linux-i686";

977− sha256 = "ba77a6dc02a406174a79a99b510c2cf7f8be6f877acc57822ee174cc5a99931d";

977+ sha256 = "694bc6bfb4a8ac1bd95f756278fb68514a69e58c17e1a6576aa2574cdafbacd6";

978978 }

979− { url = "http://archive.mozilla.org/pub/devedition/releases/100.0b6/linux-i686/zh-TW/firefox-100.0b6.tar.bz2";

979+ { url = "http://archive.mozilla.org/pub/devedition/releases/101.0b2/linux-i686/zh-TW/firefox-101.0b2.tar.bz2";

980980 locale = "zh-TW";

981981 arch = "linux-i686";

982− sha256 = "108fbd9c48b974cfd533c514d8459990b5d278ac5381ba5cfb8fad8d885dcfac";

982+ sha256 = "1a7fb5edb2ce72fb7e2b62f2e6e48f56d44522ef7f11af208b8a2a52e945bd98";

983983 }

984984 ];

985985}

pkgs/applications/networking/browsers/firefox/librewolf/src.json+5−5

@@ -1,11 +1,11 @@

11{

2− "packageVersion": "99.0.1-4",

2+ "packageVersion": "100.0-1",

33 "source": {

4− "rev": "99.0.1-4",

5− "sha256": "0s0r9smyfr8yhbgp67569ki3lkc2dyv1dw9735njja2gy0nahgni"

4+ "rev": "100.0-1",

5+ "sha256": "1xczvsd39g821bh5n12vnn7sgi0x5dqj6vfizkavxj0a05jb4fla"

66 },

77 "firefox": {

8− "version": "99.0.1",

9− "sha512": "0006b773ef1057a6e0b959d4f39849ad4a79272b38d565da98062b9aaf0effd2b729349c1f9fa10fccf7d2462d2c536b02c167ae6ad4556d6e519c6d22c25a7f"

8+ "version": "100.0",

9+ "sha512": "29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa"

1010 }

1111}

pkgs/applications/networking/browsers/microsoft-edge/default.nix+6−6

@@ -1,20 +1,20 @@

11{

22 beta = import ./browser.nix {

33 channel = "beta";

4− version = "99.0.1150.16";

4+ version = "101.0.1210.19";

55 revision = "1";

6− sha256 = "sha256:0qsgs889d6qwxz9qf42psmjqfhmrqgp07srq5r38npl5pncr137h";

6+ sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p";

77 };

88 dev = import ./browser.nix {

99 channel = "dev";

10− version = "100.0.1163.1";

10+ version = "102.0.1227.0";

1111 revision = "1";

12− sha256 = "sha256:153faqxyw5f5b6cqnvd71dl7941znkzci8dwbcgaxway0b6882jq";

12+ sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x";

1313 };

1414 stable = import ./browser.nix {

1515 channel = "stable";

16− version = "98.0.1108.56";

16+ version = "100.0.1185.44";

1717 revision = "1";

18− sha256 = "sha256:03jbj2s2fs60fzfgsmyb284q7nckji87qgb86mvl5g0hbl19aza7";

18+ sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89";

1919 };

2020}

pkgs/applications/networking/browsers/vivaldi/default.nix+2−2

@@ -20,11 +20,11 @@ let

2020 vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";

2121in stdenv.mkDerivation rec {

2222 pname = "vivaldi";

23− version = "5.2.2623.39-1";

23+ version = "5.2.2623.41-1";

2424

2525 src = fetchurl {

2626 url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";

27− sha256 = "1dd44b109gdbjqcbf5rhvgyiqb6qi8vpimsh5fb359dmnqfan1hk";

27+ sha256 = "1kyjplymibvs82bqyjmm0vyv08yg4acl2jghh24rm9x53si6qf2d";

2828 };

2929

3030 unpackPhase = ''

pkgs/applications/networking/cloudflared/default.nix+2−2

@@ -2,13 +2,13 @@

22

33buildGoModule rec {

44 pname = "cloudflared";

5− version = "2022.4.1";

5+ version = "2022.5.0";

66

77 src = fetchFromGitHub {

88 owner = "cloudflare";

99 repo = "cloudflared";

1010 rev = version;

11− hash = "sha256-dgvXbWtLP6sXBlqcx/xpw9LIbcE4VlYZQO5rrS34+9I=";

11+ hash = "sha256-vz0fxSzx0vOpZy6/MVfZ467c9qdHUWZIL5wklTnnBBA=";

1212 };

1313

1414 vendorSha256 = null;

pkgs/applications/networking/cluster/fluxcd/default.nix+5−5

@@ -1,9 +1,9 @@

11{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:

22

33let

4− version = "0.29.5";

5− sha256 = "1nqi7yk5d66fcjf6kyjivm3cbaqkj36ajgfvjm995q7cla2xyawm";

6− manifestsSha256 = "09rq7wiv3ixdp0p8isfp26vikyx523arzdyizi6yb90q6dl6hgc0";

4+ version = "0.30.2";

5+ sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";

6+ manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";

77

88 manifests = fetchzip {

99 url =

@@ -23,7 +23,7 @@ in buildGoModule rec {

2323 inherit sha256;

2424 };

2525

26− vendorSha256 = "sha256-dQV/8NF+sMiEoFr2wtR/oGqqn72JwH/JGbMREHIr/Tw=";

26+ vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk=";

2727

2828 postUnpack = ''

2929 cp -r ${manifests} source/cmd/flux/manifests

@@ -65,6 +65,6 @@ in buildGoModule rec {

6565 '';

6666 homepage = "https://fluxcd.io";

6767 license = licenses.asl20;

68− maintainers = with maintainers; [ jlesquembre bryanasdev000 ];

68+ maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ];

6969 };

7070}

pkgs/applications/networking/cluster/fluxcd/update.sh+1−1

@@ -35,7 +35,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then

3535 fi

3636

3737 # `git` flag here is to be used by local maintainers to speed up the bump process

38− if [ "$1" = "git" ]; then

38+ if [ $# -eq 1 ] && [ "$1" = "git" ]; then

3939 git switch -c "package-fluxcd-${LATEST_VERSION}"

4040 git add "$FLUXCD_PATH"/default.nix

4141 git commit -m "fluxcd: ${OLD_VERSION} -> ${LATEST_VERSION}"

pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix+3−3

@@ -1,13 +1,13 @@

11{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }:

22let

3− ver = "1.2.54.0";

3+ ver = "1.2.312.0";

44 source =

55 if stdenv.isDarwin then {

66 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip";

7− sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg=";

7+ sha256 = "50aac34a4dedddf20c20be24989ee5d33b46a72187791715fb9b395b54db8ef9";

88 } else {

99 url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb";

10− sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM=";

10+ sha256 = "2e51ce5bf8f23a1e590fff866bbdadcf82aa03c5054c671d9115482a1b263cc7";

1111 };

1212 archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin";

1313in

pkgs/applications/networking/firewalld/default.nixnew file+104

@@ -0,0 +1,104 @@

1+{ lib

2+, stdenv

3+, fetchFromGitHub

4+, autoreconfHook

5+, bash

6+, docbook_xml_dtd_42

7+, docbook-xsl-nons

8+, glib

9+, gobject-introspection

10+, gtk3

11+, intltool

12+, libnotify

13+, libxml2

14+, libxslt

15+, networkmanagerapplet

16+, pkg-config

17+, python3

18+, wrapGAppsNoGuiHook

19+, withGui ? false

20+}:

21+

22+let

23+ pythonPath = python3.withPackages (ps: with ps; [

24+ dbus-python

25+ nftables

26+ pygobject3

27+ ] ++ lib.optionals withGui [

28+ pyqt5

29+ pyqt5_sip

30+ ]);

31+in

32+stdenv.mkDerivation rec {

33+ pname = "firewalld";

34+ version = "1.1.1";

35+

36+ src = fetchFromGitHub {

37+ owner = "firewalld";

38+ repo = "firewalld";

39+ rev = "v${version}";

40+ sha256 = "sha256-w8TbovIhOhJAUZWbKdBd/+db8Hro/ttlxWZDcrCXX4Q=";

41+ };

42+

43+ patches = [

44+ ./respect-xml-catalog-files-var.patch

45+ ];

46+

47+ postPatch = ''

48+ substituteInPlace src/firewall/config/__init__.py.in \

49+ --replace "/usr/share" "$out/share"

50+

51+ for file in config/firewall-{applet,config}.desktop.in; do

52+ substituteInPlace $file \

53+ --replace "/usr/bin/" "$out/bin/"

54+ done

55+ '' + lib.optionalString withGui ''

56+ substituteInPlace src/firewall-applet.in \

57+ --replace "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-conenction-editor"

58+ '';

59+

60+ nativeBuildInputs = [

61+ autoreconfHook

62+ docbook_xml_dtd_42

63+ docbook-xsl-nons

64+ glib

65+ intltool

66+ libxml2

67+ libxslt

68+ pkg-config

69+ python3

70+ python3.pkgs.wrapPython

71+ ] ++ lib.optionals withGui [

72+ gobject-introspection

73+ wrapGAppsNoGuiHook

74+ ];

75+

76+ buildInputs = [

77+ bash

78+ glib

79+ ] ++ lib.optionals withGui [

80+ gtk3

81+ libnotify

82+ pythonPath

83+ ];

84+

85+ dontWrapGApps = true;

86+

87+ preFixup = lib.optionalString withGui ''

88+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

89+ '';

90+

91+ postFixup = ''

92+ chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite

93+ patchShebangs --host $out/share/firewalld/testsuite/{,integration/}testsuite $out/share/firewalld/*.py

94+ wrapPythonProgramsIn "$out/bin" "$out ${pythonPath}"

95+ wrapPythonProgramsIn "$out/share/firewalld/testsuite/python" "$out ${pythonPath}"

96+ '';

97+

98+ meta = with lib; {

99+ description = "Firewall daemon with D-Bus interface";

100+ homepage = "https://github.com/firewalld/firewalld";

101+ license = licenses.gpl2Plus;

102+ maintainers = with maintainers; [ SuperSandro2000 ];

103+ };

104+}

pkgs/applications/networking/firewalld/respect-xml-catalog-files-var.patchnew file+13

@@ -0,0 +1,13 @@

1+--- a/m4/jh_path_xml_catalog.m4

2++++ b/m4/jh_path_xml_catalog.m4

3+@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],

4+ [

5+ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl

6+ AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])

7+- if $jh_found_xmlcatalog && \

8+- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then

9++ # empty argument forces libxml to use XML_CATALOG_FILES variable

10++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then

11+ AC_MSG_RESULT([found])

12+ ifelse([$3],,,[$3

13+ ])dnl

pkgs/applications/networking/instant-messengers/caprine-bin/default.nix+3−3

@@ -1,7 +1,7 @@

11{ lib, callPackage, stdenvNoCC }:

22let

33 pname = "caprine";

4− version = "2.55.2";

4+ version = "2.55.4";

55 metaCommon = with lib; {

66 description = "An elegant Facebook Messenger desktop app";

77 homepage = "https://sindresorhus.com/caprine";

@@ -10,11 +10,11 @@ let

1010 };

1111 x86_64-appimage = callPackage ./build-from-appimage.nix {

1212 inherit pname version metaCommon;

13− sha256 = "J7eHVXjWSIcTpLMM8FlGKZzVh6XgpQ0d82kxfMbPyZ4=";

13+ sha256 = "221PyDoCkWqDdewCkFycpjMTcVOcl58blCjrC7O7xyk=";

1414 };

1515 x86_64-dmg = callPackage ./build-from-dmg.nix {

1616 inherit pname version metaCommon;

17− sha256 = "du/9N1BFq1s7spPiEDgDbjjcnkA0x1ExhAEpQvmO3aA=";

17+ sha256 = "6SOqlH7Z9DuQVR4i1OltnSb4dJscFUxaXxgNkE5FVUE=";

1818 };

1919in

2020(if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: {

pkgs/applications/networking/instant-messengers/psi-plus/default.nix+2−2

@@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins;

4343

4444mkDerivation rec {

4545 pname = "psi-plus";

46− version = "1.5.1615";

46+ version = "1.5.1618";

4747

4848 src = fetchFromGitHub {

4949 owner = "psi-plus";

5050 repo = "psi-plus-snapshots";

5151 rev = version;

52− sha256 = "sha256-aD+JVGmBWHUav2bH9rXGtgqI+/5lJTMrYLRP7E65JxI=";

52+ sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A=";

5353 };

5454

5555 cmakeFlags = [

pkgs/applications/networking/irc/senpai/default.nix+4−4

@@ -2,16 +2,16 @@

22

33buildGoModule rec {

44 pname = "senpai";

5− version = "unstable-2021-12-14";

5+ version = "unstable-2022-04-29";

66

77 src = fetchFromSourcehut {

88 owner = "~taiite";

99 repo = "senpai";

10− rev = "8091752a67781273944e7a79a803b7a671378313";

11− sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I=";

10+ rev = "859b8fdb7d433a848668c6f1a00406f107fe00e5";

11+ sha256 = "sha256-grVv/bcUEU6Aaf+4MbkocY/75u7q6Q7r26xK0ybULUg=";

1212 };

1313

14− vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A=";

14+ vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo=";

1515

1616 subPackages = [

1717 "cmd/senpai"

pkgs/applications/networking/modem-manager-gui/default.nix+15

@@ -2,6 +2,7 @@

22, pkg-config

33, python3

44, fetchFromGitLab

5+, fetchpatch

56, gtk3

67, glib

78, gdbm

@@ -44,6 +45,20 @@ stdenv.mkDerivation rec {

4445 libayatana-appindicator-gtk3

4546 ];

4647

48+ patches = [

49+ # Fix missing tray icon

50+ (fetchpatch {

51+ url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/fix-tray-icon.patch";

52+ sha256 = "sha256-9LjCEQl8YfraVlO1W7+Yy7egLAPu5YfnvGvCI3uGFh8=";

53+ })

54+ # Fix build with meson 0.61

55+ # appdata/meson.build:3:5: ERROR: Function does not take positional arguments.

56+ (fetchpatch {

57+ url = "https://salsa.debian.org/debian/modem-manager-gui/-/raw/7c3e67a1cf7788d7a4b86be12803870d79aa27f2/debian/patches/meson0.61.patch";

58+ sha256 = "sha256-B+tBPIz5RxOwZWYEWttqSKGw2Wbfk0mnBY0Zy0evvAQ=";

59+ })

60+ ];

61+

4762 postPatch = ''

4863 patchShebangs man/manhelper.py

4964 '';

pkgs/applications/networking/newsreaders/liferea/default.nix+2−2

@@ -23,11 +23,11 @@

2323

2424stdenv.mkDerivation rec {

2525 pname = "liferea";

26− version = "1.12.9";

26+ version = "1.13.8";

2727

2828 src = fetchurl {

2929 url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";

30− sha256 = "06ybr1wjlfir8iqjx6x0v1knd4b2hsy30qmkk4kssy6ky2ahc66q";

30+ sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h";

3131 };

3232

3333 nativeBuildInputs = [

pkgs/applications/networking/p2p/twister/default.nixdeleted−70

@@ -1,70 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkg-config, python2

2−, boost, db, openssl, geoip, libiconv, miniupnpc, srcOnly

3−}:

4−

5−let

6− twisterHTML = srcOnly {

7− name = "twister-html";

8− src = fetchFromGitHub {

9− owner = "miguelfreitas";

10− repo = "twister-html";

11− rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";

12− sha256 = "sha256-Hi/VAEwujWhKAPaYIuvrxRIuPQa9AYwXiHUGbWxckmk=";

13− };

14− };

15−

16− boostPython = boost.override {

17− enablePython = true;

18− python = python2;

19− };

20−

21−in stdenv.mkDerivation rec {

22− pname = "twister";

23− version = "2019-08-19";

24−

25− src = fetchFromGitHub {

26− owner = "miguelfreitas";

27− repo = "twister-core";

28− rev = "31faf3f63e461ea0a9b23081567a4a552cf06873";

29− sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp";

30− };

31−

32− configureFlags = [

33− "--with-libgeoip"

34− "--with-libiconv"

35− "--disable-deprecated-functions"

36− "--enable-tests"

37− "--enable-python-binding"

38− "--with-boost-libdir=${boostPython.out}/lib"

39− ];

40−

41− nativeBuildInputs = [ pkg-config automake autoconf ];

42− buildInputs = [

43− libtool python2

44− boostPython db openssl geoip miniupnpc libiconv

45− ];

46−

47− postPatch = ''

48− sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \

49− src/init.cpp

50− sed -i -e '/GetDataDir.*html/s|path *= *[^;]*|path = "${twisterHTML}"|' \

51− src/util.cpp

52− '';

53−

54− preConfigure = ''

55− sh autotool.sh

56− '';

57−

58− installPhase = ''

59− install -vD twisterd "$out/bin/twisterd"

60− '';

61−

62− enableParallelBuilding = true;

63−

64− meta = {

65− homepage = "http://www.twister.net.co/";

66− description = "Peer-to-peer microblogging";

67− license = lib.licenses.mit;

68− platforms = lib.platforms.linux;

69− };

70−}

pkgs/applications/networking/seafile-client/default.nix+3−1

@@ -9,7 +9,9 @@ mkDerivation rec {

99 src = fetchFromGitHub {

1010 owner = "haiwen";

1111 repo = "seafile-client";

12− rev = "v${version}";

12+ # Tag v8.0.7 used to point to this commit, but was re-tagged later to a state

13+ # that fails to link properly

14+ rev = "8b96abf64e6aa19e3beeff6b322bcd6d28120bdd";

1315 sha256 = "00wfr7dvbyl7pg1xgssgz8a94c7c4n5r9266lhy9qcbz456hdcgj";

1416 };

1517

pkgs/applications/networking/sync/onedrive/default.nix+2−2

@@ -14,13 +14,13 @@

1414

1515stdenv.mkDerivation rec {

1616 pname = "onedrive";

17− version = "2.4.16";

17+ version = "2.4.17";

1818

1919 src = fetchFromGitHub {

2020 owner = "abraunegg";

2121 repo = pname;

2222 rev = "v${version}";

23− sha256 = "sha256-GoufEcCu/Cg2Fu0RcjTi4te/7+gZfQRTj+AtK0YnF5I=";

23+ hash = "sha256-+ADAPxAZNDqLKLz6rAProqSDINDiTZhc2trxJFFMQeA=";

2424 };

2525

2626 nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ];

pkgs/applications/networking/zerobin/default.nix+1−1

@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {

4040 # relax version constraints of some dependencies

4141 substituteInPlace setup.cfg \

4242 --replace "clize==4.1.1" "clize" \

43− --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \

43+ --replace "bleach==3.1.5" "bleach>=3.1.5,<6" \

4444 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \

4545 --replace "Paste==3.4.3" "Paste>=3.4.3,<4"

4646 '';

pkgs/applications/office/libreoffice/soffice-template.desktopnew file+6

@@ -0,0 +1,6 @@

1+[Desktop Entry]

2+Name=LibreOffice @app@...

3+Comment=Enter LibreOffice @app@ filename:

4+Type=Link

5+URL=.source/soffice.@ext@

6+Icon=libreoffice-oasis-@type@

pkgs/applications/office/libreoffice/wrapper.nix+25−12

@@ -1,19 +1,32 @@

1−{ libreoffice, runCommand, dbus, bash }:

2−let

3− jdk = libreoffice.jdk;

4−in

5−(runCommand libreoffice.name {

6− inherit dbus libreoffice jdk bash;

7−} ''

1+{ lib, runCommand

2+, libreoffice, dbus, bash, substituteAll

3+, dolphinTemplates ? true

4+}:

5+runCommand libreoffice.name {

6+ inherit (libreoffice) jdk meta;

7+ inherit dbus libreoffice bash;

8+} (''

89 mkdir -p "$out/bin"

9− ln -s "${libreoffice}/share" "$out/share"

1010 substituteAll "${./wrapper.sh}" "$out/bin/soffice"

1111 chmod a+x "$out/bin/soffice"

1212

1313 for i in $(ls "${libreoffice}/bin/"); do

1414 test "$i" = "soffice" || ln -s soffice "$out/bin/$(basename "$i")"

1515 done

16−'') // {

17− inherit libreoffice dbus;

18− meta = libreoffice.meta;

19−}

16+

17+ mkdir -p "$out/share"

18+ ln -s "${libreoffice}/share"/* $out/share

19+'' + lib.optionalString dolphinTemplates ''

20+ # Add templates to dolphin "Create new" menu - taken from debian

21+

22+ # We need to unpack the core source since the necessary files aren't available in the libreoffice output

23+ unpackFile "${libreoffice.src}"

24+

25+ install -D "${libreoffice.name}"/extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source"

26+

27+ cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop

28+ cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop

29+ cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop

30+ cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop

31+'')

32+

pkgs/applications/office/qownnotes/default.nix+2−2

@@ -5,13 +5,13 @@

55

66mkDerivation rec {

77 pname = "qownnotes";

8− version = "22.4.1";

8+ version = "22.5.0";

99

1010 src = fetchurl {

1111 url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";

1212 # Fetch the checksum of current version with curl:

1313 # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256

14− sha256 = "b9ce77ecd5bb48bd6534068b0582dfaa3b828f800b19ddec80387a84e00766da";

14+ sha256 = "52a81401a4a03c77e28f37f56c3ebdc6696ff43c75cc9330d10ba7e801f48ccd";

1515 };

1616

1717 nativeBuildInputs = [ qmake qttools ];

pkgs/applications/office/tusk/default.nix+3−2

@@ -21,7 +21,8 @@ let

2121 };

2222

2323in appimageTools.wrapType2 rec {

24− name = "${pname}-v${version}";

24+ inherit pname version;

25+

2526 src = fetchurl {

2627 url = "https://github.com/klaussinani/tusk/releases/download/v${version}/${pname}-${version}-x86_64.AppImage";

2728 sha256 = "02q7wsnhlyq8z74avflrm7805ny8fzlmsmz4bmafp4b4pghjh5ky";

@@ -36,7 +37,7 @@ in appimageTools.wrapType2 rec {

3637 multiPkgs = null; # no 32bit needed

3738 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

3839 extraInstallCommands = ''

39− mv $out/bin/{${name},${pname}}

40+ mv $out/bin/{${pname}-${version},${pname}}

4041 mkdir "$out/share"

4142 ln -s "${desktopItem}/share/applications" "$out/share/"

4243 '';

pkgs/applications/science/biology/bwa/default.nix+2

@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {

1717 sed -i '/^CC/d' Makefile

1818 '';

1919

20+ makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar";

21+

2022 # it's unclear which headers are intended to be part of the public interface

2123 # so we may find ourselves having to add more here over time

2224 installPhase = ''

pkgs/applications/science/biology/megahit/default.nix+3

@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {

1414 nativeBuildInputs = [ cmake ];

1515 buildInputs = [ zlib ];

1616

17+ cmakeFlags = lib.optional stdenv.hostPlatform.isStatic [

18+ "-DSTATIC_BUILD=ON"

19+ ];

1720 meta = with lib; {

1821 description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";

1922 license = licenses.gpl3;

pkgs/applications/science/biology/samtools/default.nix+8−1

@@ -22,8 +22,15 @@ stdenv.mkDerivation rec {

2222

2323 buildInputs = [ zlib ncurses htslib ];

2424

25+ preConfigure = lib.optional stdenv.hostPlatform.isStatic ''

26+ export LIBS="-lz -lbz2 -llzma"

27+ '';

28+ makeFlags = lib.optional stdenv.hostPlatform.isStatic "AR=${stdenv.cc.targetPrefix}ar";

29+

2530 configureFlags = [ "--with-htslib=${htslib}" ]

26− ++ lib.optional (ncurses == null) "--without-curses";

31+ ++ lib.optional (ncurses == null) "--without-curses"

32+ ++ lib.optional stdenv.hostPlatform.isStatic ["--without-curses" ]

33+ ;

2734

2835 preCheck = ''

2936 patchShebangs test/

pkgs/applications/science/logic/easycrypt/default.nixnew file+50

@@ -0,0 +1,50 @@

1+{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "easycrypt";

5+ version = "2022.04";

6+

7+ src = fetchFromGitHub {

8+ owner = pname;

9+ repo = pname;

10+ rev = "r${version}";

11+ sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7";

12+ };

13+

14+ nativeBuildInputs = with ocamlPackages; [

15+ dune_3

16+ findlib

17+ menhir

18+ ocaml

19+ ];

20+ buildInputs = with ocamlPackages; [

21+ batteries

22+ dune-build-info

23+ inifiles

24+ yojson

25+ zarith

26+ ];

27+

28+ propagatedBuildInputs = [ why3 ];

29+

30+ strictDeps = true;

31+

32+ postPatch = ''

33+ substituteInPlace dune-project --replace '(name easycrypt)' '(name easycrypt)(version ${version})'

34+ '';

35+

36+ installPhase = ''

37+ runHook preInstall

38+ dune install --prefix $out ${pname}

39+ rm $out/bin/ec-runtest

40+ runHook postInstall

41+ '';

42+

43+ meta = {

44+ license = lib.licenses.mit;

45+ maintainers = [ lib.maintainers.vbgl ];

46+ platforms = lib.platforms.all;

47+ homepage = "https://easycrypt.info/";

48+ description = "Computer-Aided Cryptographic Proofs";

49+ };

50+}

pkgs/applications/science/logic/easycrypt/runtest.nixnew file+24

@@ -0,0 +1,24 @@

1+{ python3Packages, easycrypt }:

2+

3+python3Packages.buildPythonApplication rec {

4+ inherit (easycrypt) src version;

5+

6+ pname = "easycrypt-runtest";

7+

8+ dontConfigure = true;

9+ dontBuild = true;

10+ doCheck = false;

11+

12+ pythonPath = with python3Packages; [ pyyaml ];

13+

14+ installPhase = ''

15+ runHook preInstall

16+ mkdir -p $out/bin

17+ cp scripts/testing/runtest $out/bin/ec-runtest

18+ runHook postInstall

19+ '';

20+

21+ meta = easycrypt.meta // {

22+ description = "Testing program for EasyCrypt formalizations";

23+ };

24+}

pkgs/applications/science/misc/snakemake/default.nix+3−3

@@ -5,14 +5,14 @@

55

66python3.pkgs.buildPythonApplication rec {

77 pname = "snakemake";

8− version = "7.5.0";

8+ version = "7.6.1";

99 format = "setuptools";

1010

1111 src = fetchFromGitHub {

1212 owner = "snakemake";

1313 repo = pname;

14− rev = "v${version}";

15− hash = "sha256-KIKuV6DVHn3dDY/rJG1zNWM79tdDB6GGVH9/kYn6XaE=";

14+ rev = "refs/tags/v${version}";

15+ hash = "sha256-McknAQDzpTE1WdIBr8HsFpGzXuJT2kDNvLzK2gn75GM=";

1616 };

1717

1818 propagatedBuildInputs = with python3.pkgs; [

pkgs/applications/terminal-emulators/foot/default.nix+3−2

@@ -27,7 +27,7 @@

2727}:

2828

2929let

30− version = "1.11.0";

30+ version = "1.12.1";

3131

3232 # build stimuli file for PGO build and the script to generate it

3333 # independently of the foot's build, so we can cache the result

@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {

9999 owner = "dnkl";

100100 repo = pname;

101101 rev = version;

102− sha256 = "1d9bk8lhmw5lc8k0mw80g0vbwgxyh3gw5c7ppy3sir07s9y0y0fn";

102+ sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk";

103103 };

104104

105105 depsBuildBuild = [

@@ -144,6 +144,7 @@ stdenv.mkDerivation rec {

144144 mesonBuildType = "release";

145145

146146 # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options

147+ # TODO(@sternenseemann): install systemd user units

147148 mesonFlags = [

148149 # Use lto

149150 "-Db_lto=true"

pkgs/applications/video/vlc/default.nix+2−2

@@ -82,11 +82,11 @@ let

8282in

8383stdenv.mkDerivation rec {

8484 pname = "${optionalString onlyLibVLC "lib"}vlc";

85− version = "3.0.17";

85+ version = "3.0.17.3";

8686

8787 src = fetchurl {

8888 url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";

89− sha256 = "sha256-SL2b8zeqEHoVJOulfFLcSpHin1qX+97pL2pNupA4PNA=";

89+ sha256 = "sha256-b36Q74lz0x2W3mTbgXFz40UVCClxepQISxu4MhzeIBQ=";

9090 };

9191

9292 # VLC uses a *ton* of libraries for various pieces of functionality, many of

pkgs/applications/virtualization/containerd/default.nix+2−2

@@ -10,13 +10,13 @@

1010

1111buildGoModule rec {

1212 pname = "containerd";

13− version = "1.6.3";

13+ version = "1.6.4";

1414

1515 src = fetchFromGitHub {

1616 owner = "containerd";

1717 repo = "containerd";

1818 rev = "v${version}";

19− sha256 = "sha256-mVnZsvhpKx/5dHMF0Z8BfuUSqwoIhOtPkA/1BSrVVqA=";

19+ sha256 = "sha256-425BcVHCliAHFQqGn6sWH/ahDX3JR6l/sYZWHpgmZW0=";

2020 };

2121

2222 vendorSha256 = null;

pkgs/applications/virtualization/vmware-workstation/default.nixnew file+341

@@ -0,0 +1,341 @@

1+{ stdenv

2+, buildFHSUserEnv

3+, fetchurl

4+, lib

5+, zlib

6+, gdbm

7+, bzip2

8+, libxslt

9+, libxml2

10+, libuuid

11+, readline

12+, xz

13+, cups

14+, glibc

15+, libaio

16+, vulkan-loader

17+, alsa-lib

18+, libpulseaudio

19+, libGL

20+, numactl

21+, libX11

22+, libXi

23+, kmod

24+, python3

25+, autoPatchelfHook

26+, makeWrapper

27+, sqlite

28+, enableInstaller ? false

29+}:

30+

31+let

32+ vmware-unpack-env = buildFHSUserEnv rec {

33+ name = "vmware-unpack-env";

34+ targetPkgs = pkgs: [ zlib ];

35+ };

36+ gdbm3 = gdbm.overrideAttrs (old: rec {

37+ version = "1.8.3";

38+

39+ src = fetchurl {

40+ url = "mirror://gnu/gdbm/gdbm-${version}.tar.gz";

41+ sha256 = "sha256-zDQDOKLii0AFirnrU1SiHVP4ihWC6iG6C7GFw3ooHck=";

42+ };

43+

44+ installPhase = ''

45+ mkdir -p $out/lib

46+ cp .libs/libgdbm*.so* $out/lib/

47+ '';

48+ });

49+in

50+stdenv.mkDerivation rec {

51+ pname = "vmware-workstation";

52+ version = "16.2.3";

53+ build = "19376536";

54+

55+ buildInputs = [

56+ libxslt

57+ libxml2

58+ libuuid

59+ gdbm3

60+ readline

61+ xz

62+ cups

63+ glibc

64+ libaio

65+ vulkan-loader

66+ alsa-lib

67+ libpulseaudio

68+ libGL

69+ numactl

70+ libX11

71+ libXi

72+ kmod

73+ ];

74+

75+ nativeBuildInputs = [ python3 vmware-unpack-env autoPatchelfHook makeWrapper ]

76+ ++ lib.optionals enableInstaller [ sqlite bzip2 ];

77+

78+ src = fetchurl {

79+ url = "https://download3.vmware.com/software/WKST-1623-LX-New/VMware-Workstation-Full-${version}-${build}.x86_64.bundle";

80+ sha256 = "sha256-+JE1KnRfawcaBannIyEr1TNZTF7YXRYYaFMVq0/erbM=";

81+ };

82+

83+ unpackPhase = ''

84+ ${vmware-unpack-env}/bin/vmware-unpack-env -c "sh ${src} --extract unpacked"

85+ '';

86+

87+ installPhase = ''

88+ mkdir -p \

89+ $out/bin \

90+ $out/etc/vmware \

91+ $out/etc/init.d \

92+ $out/lib/vmware \

93+ $out/share/doc

94+

95+ #### Replicate vmware-installer's order but VMX first because of appLoader

96+ ${lib.optionalString enableInstaller ''

97+ ## VMware installer

98+ echo "Installing VMware Installer"

99+ unpacked="unpacked/vmware-installer"

100+ vmware_installer_version=$(cat "unpacked/vmware-installer/manifest.xml" | grep -oPm1 "(?<=<version>)[^<]+")

101+ dest="$out/lib/vmware-installer/$vmware_installer_version"

102+

103+ mkdir -p $dest

104+ cp -r $unpacked/vmis* $dest/

105+ cp -r $unpacked/sopython $dest/

106+ cp -r $unpacked/python $dest/

107+ cp -r $unpacked/cdsHelper $dest/

108+ cp -r $unpacked/vmware* $dest/

109+ cp -r $unpacked/bin $dest/

110+ cp -r $unpacked/lib $dest/

111+

112+ chmod +x $dest/vmis-launcher $dest/sopython/* $dest/python/init.sh $dest/vmware-*

113+ ln -s $dest/vmware-installer $out/bin/vmware-installer

114+

115+ mkdir -p $out/etc/vmware-installer

116+ cp ${./vmware-installer-bootstrap} $out/etc/vmware-installer/bootstrap

117+ sed -i -e "s,@@INSTALLERDIR@@,$dest," $out/etc/vmware-installer/bootstrap

118+ sed -i -e "s,@@IVERSION@@,$vmware_installer_version," $out/etc/vmware-installer/bootstrap

119+ sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware-installer/bootstrap

120+

121+ # create database of vmware guest tools (avoids vmware fetching them later)

122+ mkdir -p $out/etc/vmware-installer/components

123+ database_filename=$out/etc/vmware-installer/database

124+ touch $database_filename

125+ sqlite3 "$database_filename" "CREATE TABLE settings(key VARCHAR PRIMARY KEY, value VARCHAR NOT NULL, component_name VARCHAR NOT NULL);"

126+ sqlite3 "$database_filename" "INSERT INTO settings(key,value,component_name) VALUES('db.schemaVersion','2','vmware-installer');"

127+ sqlite3 "$database_filename" "CREATE TABLE components(id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, version VARCHAR NOT NULL, buildNumber INTEGER NOT NULL, component_core_id INTEGER NOT NULL, longName VARCHAR NOT NULL, description VARCHAR, type INTEGER NOT NULL);"

128+ for folder in unpacked/**/.installer ; do

129+ component="$(basename $(dirname $folder))"

130+ component_version=$(cat unpacked/$component/manifest.xml | grep -oPm1 "(?<=<version>)[^<]+")

131+ component_core_id=$([ "$component" == "vmware-installer" ] && echo "-1" || echo "1")

132+ type=$([ "$component" == "vmware-workstation" ] && echo "0" || echo "1")

133+ sqlite3 "$database_filename" "INSERT INTO components(name,version,buildNumber,component_core_id,longName,description,type) VALUES(\"$component\",\"$component_version\",\"${build}\",$component_core_id,\"$component\",\"$component\",$type);"

134+ mkdir -p $out/etc/vmware-installer/components/$component

135+ cp -r $folder/* $out/etc/vmware-installer/components/$component

136+ done

137+ ''}

138+

139+ ## VMware Bootstrap

140+ echo "Installing VMware Bootstrap"

141+ cp ${./vmware-bootstrap} $out/etc/vmware/bootstrap

142+ sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/bootstrap

143+

144+ ## VMware Config

145+ echo "Installing VMware Config"

146+ cp ${./vmware-config} $out/etc/vmware/config

147+ sed -i -e "s,@@VERSION@@,${version}," $out/etc/vmware/config

148+ sed -i -e "s,@@BUILD@@,${build}," $out/etc/vmware/config

149+ sed -i -e "s,@@PREFIXDIR@@,$out," $out/etc/vmware/config

150+

151+ ## VMware VMX

152+ echo "Installing VMware VMX"

153+ unpacked="unpacked/vmware-vmx"

154+ cp -r $unpacked/bin/* $out/bin/

155+ cp -r $unpacked/etc/modprobe.d $out/etc/

156+ cp -r $unpacked/etc/init.d/* $out/etc/init.d/

157+ cp -r $unpacked/roms $out/lib/vmware/

158+ cp -r $unpacked/sbin/* $out/bin/

159+

160+ cp -r $unpacked/lib/libconf $out/lib/vmware/

161+ cp -r $unpacked/lib/bin $out/lib/vmware/

162+ cp -r $unpacked/lib/lib $out/lib/vmware/

163+ cp -r $unpacked/lib/scripts $out/lib/vmware/

164+ cp -r $unpacked/lib/icu $out/lib/vmware/

165+ cp -r $unpacked/lib/share $out/lib/vmware/

166+ cp -r $unpacked/lib/modules $out/lib/vmware/

167+ cp -r $unpacked/lib/include $out/lib/vmware/

168+

169+ cp -r $unpacked/extra/checkvm $out/bin/

170+ cp -r $unpacked/extra/modules.xml $out/lib/vmware/modules/

171+

172+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vmblock-fuse

173+ ln -s $out/lib/vmware/icu $out/etc/vmware/icu

174+

175+ # Replace vmware-modconfig with simple error dialog

176+ cp ${./vmware-modconfig} $out/bin/vmware-modconfig

177+ sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmware-modconfig

178+

179+ # Patch dynamic libs in

180+ for binary in "mksSandbox" "mksSandbox-debug" "mksSandbox-stats" "vmware-vmx" "vmware-vmx-debug" "vmware-vmx-stats"

181+ do

182+ patchelf \

183+ --add-needed ${libaio}/lib/libaio.so.1 \

184+ --add-needed ${vulkan-loader}/lib/libvulkan.so.1 \

185+ --add-needed ${alsa-lib}/lib/libasound.so \

186+ --add-needed ${libpulseaudio}/lib/libpulse.so.0 \

187+ --add-needed ${libGL}/lib/libEGL.so.1 \

188+ --add-needed ${numactl}/lib/libnuma.so.1 \

189+ --add-needed ${libX11}/lib/libX11.so.6 \

190+ --add-needed ${libXi}/lib/libXi.so.6 \

191+ --add-needed ${libGL}/lib/libGL.so.1 \

192+ $out/lib/vmware/bin/$binary

193+ done

194+

195+ ## VMware USB Arbitrator

196+ echo "Installing VMware USB Arbitrator"

197+ unpacked="unpacked/vmware-usbarbitrator"

198+ cp -r $unpacked/etc/init.d/* $out/etc/init.d/

199+ cp -r $unpacked/bin/* $out/bin/

200+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-usbarbitrator

201+

202+ ## VMware Player Setup

203+ echo "Installing VMware Player Setup"

204+ unpacked="unpacked/vmware-player-setup"

205+ mkdir -p $out/lib/vmware/setup

206+ cp $unpacked/vmware-config $out/lib/vmware/setup/

207+

208+ ## VMware Network Editor

209+ echo "Installing VMware Network Editor"

210+ unpacked="unpacked/vmware-network-editor"

211+ cp -r $unpacked/lib $out/lib/vmware/

212+

213+ ## VMware Tools + Virtual Printer

214+ echo "Installing VMware Tools + Virtual Printer"

215+ mkdir -p $out/lib/vmware/isoimages/

216+ cp unpacked/vmware-tools-linuxPreGlibc25/linuxPreGlibc25.iso \

217+ unpacked/vmware-tools-windows/windows.iso \

218+ unpacked/vmware-tools-winPreVista/winPreVista.iso \

219+ unpacked/vmware-virtual-printer/VirtualPrinter-Linux.iso \

220+ unpacked/vmware-virtual-printer/VirtualPrinter-Windows.iso \

221+ unpacked/vmware-tools-winPre2k/winPre2k.iso \

222+ unpacked/vmware-tools-linux/linux.iso \

223+ unpacked/vmware-tools-netware/netware.iso \

224+ unpacked/vmware-tools-solaris/solaris.iso \

225+ $out/lib/vmware/isoimages/

226+

227+ ## VMware Player Application

228+ echo "Installing VMware Player Application"

229+ unpacked="unpacked/vmware-player-app"

230+ cp -r $unpacked/lib/* $out/lib/vmware/

231+ cp -r $unpacked/etc/* $out/etc/

232+ cp -r $unpacked/share/* $out/share/

233+ cp -r $unpacked/bin/* $out/bin/

234+ cp -r $unpacked/doc/* $out/share/doc/ # Licences

235+

236+ mkdir -p $out/etc/thnuclnt

237+ cp -r $unpacked/extras/.thnumod $out/etc/thnuclnt/

238+

239+ mkdir -p $out/lib/cups/filter

240+ cp -r $unpacked/extras/thnucups $out/lib/cups/filter/

241+

242+ for target in "vmplayer" "vmware-enter-serial" "vmware-setup-helper" "licenseTool" "vmware-mount" "vmware-fuseUI" "vmware-app-control" "vmware-zenity"

243+ do

244+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/$target

245+ done

246+

247+ ln -s $out/lib/vmware/bin/vmware-mount $out/bin/vmware-mount

248+ ln -s $out/lib/vmware/bin/vmware-fuseUI $out/bin/vmware-fuseUI

249+ ln -s $out/lib/vmware/bin/vmrest $out/bin/vmrest

250+

251+ # Patch vmplayer

252+ sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware," $out/bin/vmplayer

253+ sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer

254+ sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop

255+

256+ ## VMware OVF Tool compoment

257+ echo "Installing VMware OVF Tool for Linux"

258+ unpacked="unpacked/vmware-ovftool"

259+ mkdir -p $out/lib/vmware-ovftool/

260+

261+ cp -r $unpacked/* $out/lib/vmware-ovftool/

262+ chmod 755 $out/lib/vmware-ovftool/ovftool*

263+ makeWrapper "$out/lib/vmware-ovftool/ovftool.bin" "$out/bin/ovftool"

264+

265+ ## VMware Network Editor User Interface

266+ echo "Installing VMware Network Editor User Interface"

267+ unpacked="unpacked/vmware-network-editor-ui"

268+ cp -r $unpacked/share/* $out/share/

269+

270+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-netcfg

271+ ln -s $out/lib/vmware/bin/vmware-netcfg $out/bin/vmware-netcfg

272+

273+ # Patch network editor ui

274+

275+ sed -i -e "s,@@BINARY@@,$out/bin/vmware-netcfg," $out/share/applications/vmware-netcfg.desktop

276+

277+ ## VMware VIX Core Library

278+ echo "Installing VMware VIX Core Library"

279+ unpacked="unpacked/vmware-vix-core"

280+ mkdir -p $out/lib/vmware-vix

281+ cp -r $unpacked/lib/* $out/lib/vmware-vix/

282+ cp -r $unpacked/bin/* $out/bin/

283+ cp $unpacked/*.txt $out/lib/vmware-vix/

284+

285+ mkdir -p $out/share/doc/vmware-vix/

286+ cp -r $unpacked/doc/* $out/share/doc/vmware-vix/

287+

288+ mkdir -p $out/include/

289+ cp -r $unpacked/include/* $out/include/

290+

291+ ## VMware VIX Workstation-16.0.0 Library

292+ echo "Installing VMware VIX Workstation-16.0.0 Library"

293+ unpacked="unpacked/vmware-vix-lib-Workstation1600"

294+ cp -r $unpacked/lib/* $out/lib/vmware-vix/

295+

296+ ## VMware VProbes component for Linux

297+ echo "Installing VMware VProbes component for Linux"

298+ unpacked="unpacked/vmware-vprobe"

299+ cp -r $unpacked/bin/* $out/bin/

300+ cp -r $unpacked/lib/* $out/lib/vmware/

301+

302+ ## VMware Workstation

303+ echo "Installing VMware Workstation"

304+ unpacked="unpacked/vmware-workstation"

305+ cp -r $unpacked/bin/* $out/bin/

306+ cp -r $unpacked/lib/* $out/lib/vmware/

307+ cp -r $unpacked/share/* $out/share/

308+ cp -r $unpacked/man $out/share/

309+ cp -r $unpacked/doc $out/share/

310+

311+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware

312+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-tray

313+ ln -s $out/lib/vmware/bin/appLoader $out/lib/vmware/bin/vmware-vprobe

314+

315+ # Patch vmware

316+ sed -i -e "s,ETCDIR=/etc/vmware,ETCDIR=$out/etc/vmware,g" $out/bin/vmware

317+ sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" $out/bin/vmware

318+ sed -i -e "s,@@BINARY@@,$out/bin/vmware," $out/share/applications/vmware-workstation.desktop

319+

320+ chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/*

321+

322+ # Harcoded pkexec hack

323+ for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so"

324+ do

325+ sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib"

326+ done

327+

328+ # SUID hack

329+ wrapProgram $out/lib/vmware/bin/vmware-vmx

330+ rm $out/lib/vmware/bin/vmware-vmx

331+ ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx

332+ '';

333+

334+ meta = with lib; {

335+ description = "Industry standard desktop hypervisor for x86-64 architecture";

336+ homepage = "https://www.vmware.com/products/workstation-pro.html";

337+ license = licenses.unfree;

338+ platforms = [ "x86_64-linux" ];

339+ maintainers = with maintainers; [ deinferno ];

340+ };

341+}

pkgs/applications/virtualization/vmware-workstation/vmware-bootstrapnew file+11

@@ -0,0 +1,11 @@

1+PREFIX="@@PREFIXDIR@@"

2+BINDIR="@@PREFIXDIR@@/bin"

3+SBINDIR="@@PREFIXDIR@@/sbin"

4+LIBDIR="@@PREFIXDIR@@/lib"

5+DATADIR="@@PREFIXDIR@@/share"

6+SYSCONFDIR="@@PREFIXDIR@@/etc"

7+DOCDIR="@@PREFIXDIR@@/share/doc"

8+MANDIR="@@PREFIXDIR@@/share/man"

9+INCLUDEDIR="@@PREFIXDIR@@/include"

10+INITDIR="@@PREFIXDIR@@/etc"

11+INITSCRIPTDIR="@@PREFIXDIR@@/etc/init.d"

pkgs/applications/virtualization/vmware-workstation/vmware-confignew file+21

@@ -0,0 +1,21 @@

1+.encoding = "UTF-8"

2+product.name = "VMware Workstation"

3+product.version = "@@VERSION@@"

4+product.buildNumber = "@@BUILD@@"

5+workstation.product.version = "@@VERSION@@"

6+player.product.version = "@@VERSION@@"

7+vix.config.version = "1"

8+bindir = "@@PREFIXDIR@@/bin"

9+libdir = "@@PREFIXDIR@@/lib/vmware"

10+vix.libdir = "@@PREFIXDIR@@/lib/vmware-vix"

11+initscriptdir = "@@PREFIXDIR@@/lib/systemd/scripts"

12+vmware.fullpath = "@@PREFIXDIR@@/bin/vmware"

13+authd.fullpath = "@@PREFIXDIR@@/bin/vmware-authd"

14+gksu.rootMethod = "su"

15+NETWORKING = "yes"

16+installerDefaults.autoSoftwareUpdateEnabled = "no"

17+installerDefaults.dataCollectionEnabled = "no"

18+installerDefaults.componentDownloadEnabled = "no"

19+installerDefaults.transferVersion = "1"

20+acceptOVFEULA = "yes"

21+acceptEULA = "yes"

pkgs/applications/virtualization/vmware-workstation/vmware-installer-bootstrapnew file+5

@@ -0,0 +1,5 @@

1+VMWARE_INSTALLER="@@INSTALLERDIR@@"

2+VERSION="@@IVERSION@@" # For backwards compability

3+VMISVERSION="@@IVERSION@@"

4+VMISBUILDNUM="@@BUILD@@"

5+VMISPYVERSION="39"

pkgs/applications/virtualization/vmware-workstation/vmware-modconfignew file+8

@@ -0,0 +1,8 @@

1+#!/bin/bash

2+

3+set -e

4+

5+ETCDIR=/etc/vmware

6+. $ETCDIR/bootstrap

7+

8+exec "$LIBDIR"/vmware/bin/vmware-zenity --error --text "Reboot is required to load VMware kernel modules (make sure that 'virtualisation.vmware.host.enable' is enabled)"

pkgs/desktops/pantheon/apps/switchboard/default.nix+2−15

@@ -1,7 +1,6 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4−, fetchpatch

54, nix-update-script

65, pkg-config

76, meson

@@ -18,13 +17,13 @@

1817

1918stdenv.mkDerivation rec {

2019 pname = "switchboard";

21− version = "6.0.0";

20+ version = "6.0.1";

2221

2322 src = fetchFromGitHub {

2423 owner = "elementary";

2524 repo = pname;

2625 rev = version;

27− sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim";

26+ sha256 = "sha256-QMh9m6Xc0BeprZHrOgcmSireWb8Ja7Td0COYMgYw+5M=";

2827 };

2928

3029 nativeBuildInputs = [

@@ -46,18 +45,6 @@ stdenv.mkDerivation rec {

4645

4746 patches = [

4847 ./plugs-path-env.patch

49− # Upstream code not respecting our localedir

50− # https://github.com/elementary/switchboard/pull/214

51− (fetchpatch {

52− url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch";

53− sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc";

54− })

55− # Fix build with meson 0.61

56− # https://github.com/elementary/switchboard/pull/226

57− (fetchpatch {

58− url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch";

59− sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0=";

60− })

6148 ];

6249

6350 postPatch = ''

pkgs/development/compilers/chicken/5/eggs.nix+414

@@ -2,6 +2,38 @@

22rec {

33 inherit (pkgs) eggDerivation fetchegg;

44

5+ address-info = eggDerivation {

6+ name = "address-info-1.0.5";

7+

8+ src = fetchegg {

9+ name = "address-info";

10+ version = "1.0.5";

11+ sha256 = "1nv87ghfv8szmi2l0rybrgrds6fs5w6jxafqslnzw0mw5sfj6jyk";

12+ };

13+

14+ buildInputs = [

15+ srfi-1

16+ ];

17+ };

18+

19+ apropos = eggDerivation {

20+ name = "apropos-3.6.0";

21+

22+ src = fetchegg {

23+ name = "apropos";

24+ version = "3.6.0";

25+ sha256 = "0jq5d4zijbf5dw2vsfn89smp7zjpgp82y5hs10xkysf831x7l551";

26+ };

27+

28+ buildInputs = [

29+ srfi-1

30+ srfi-13

31+ check-errors

32+ string-utils

33+ symbol-utils

34+ ];

35+ };

36+

537 args = eggDerivation {

638 name = "args-1.6.0";

739

@@ -18,6 +50,125 @@ rec {

1850 ];

1951 };

2052

53+ base64 = eggDerivation {

54+ name = "base64-1.0";

55+

56+ src = fetchegg {

57+ name = "base64";

58+ version = "1.0";

59+ sha256 = "01lid9wxf94nr7gmskamxlfngack1hyxig8rl9swwgnbmz9qgysi";

60+ };

61+

62+ buildInputs = [

63+ srfi-13

64+ ];

65+ };

66+

67+ check-errors = eggDerivation {

68+ name = "check-errors-3.2.0";

69+

70+ src = fetchegg {

71+ name = "check-errors";

72+ version = "3.2.0";

73+ sha256 = "0d0hpq1nmwyvbg162bqzgk62f70rin0pxsr5a3pgx6xin5i3ngah";

74+ };

75+

76+ buildInputs = [

77+

78+ ];

79+ };

80+

81+ defstruct = eggDerivation {

82+ name = "defstruct-2.0";

83+

84+ src = fetchegg {

85+ name = "defstruct";

86+ version = "2.0";

87+ sha256 = "0q1v1gdwqlpmwcsa4jnqldfqky9k7kvb83qgkhdyqym52bm5aln8";

88+ };

89+

90+ buildInputs = [

91+ srfi-1

92+ ];

93+ };

94+

95+ feature-test = eggDerivation {

96+ name = "feature-test-0.2.0";

97+

98+ src = fetchegg {

99+ name = "feature-test";

100+ version = "0.2.0";

101+ sha256 = "1dxdisv64d8alg6r45cwxf5gmdpcvql1hvlq808lgwphd7kvfpgr";

102+ };

103+

104+ buildInputs = [

105+

106+ ];

107+ };

108+

109+ foreigners = eggDerivation {

110+ name = "foreigners-1.5";

111+

112+ src = fetchegg {

113+ name = "foreigners";

114+ version = "1.5";

115+ sha256 = "1mm91y61nlawgb7iqdrkz2fi9sc3fic07f5m1ig541b2hbscfiqy";

116+ };

117+

118+ buildInputs = [

119+ matchable

120+ ];

121+ };

122+

123+ intarweb = eggDerivation {

124+ name = "intarweb-2.0.1";

125+

126+ src = fetchegg {

127+ name = "intarweb";

128+ version = "2.0.1";

129+ sha256 = "0md226jikqhj993cw17588ipmnz0v7l34zrvylamyrs6zbvj3scm";

130+ };

131+

132+ buildInputs = [

133+ srfi-1

134+ srfi-13

135+ srfi-14

136+ defstruct

137+ uri-common

138+ base64

139+ ];

140+ };

141+

142+ iset = eggDerivation {

143+ name = "iset-2.2";

144+

145+ src = fetchegg {

146+ name = "iset";

147+ version = "2.2";

148+ sha256 = "0yfkcd07cw6xnnqfbbvjy81x0vc54k40vdjp2m7gwxx64is6m3rz";

149+ };

150+

151+ buildInputs = [

152+

153+ ];

154+ };

155+

156+ json = eggDerivation {

157+ name = "json-1.6";

158+

159+ src = fetchegg {

160+ name = "json";

161+ version = "1.6";

162+ sha256 = "0sb8285dqrm27c8zaqfzc0gixvfmvf0cq2nbza8c4z7j5snxzs2w";

163+ };

164+

165+ buildInputs = [

166+ packrat

167+ srfi-1

168+ srfi-69

169+ ];

170+ };

171+

21172 matchable = eggDerivation {

22173 name = "matchable-1.1";

23174

@@ -48,6 +199,142 @@ rec {

48199 ];

49200 };

50201

202+ memory-mapped-files = eggDerivation {

203+ name = "memory-mapped-files-0.4";

204+

205+ src = fetchegg {

206+ name = "memory-mapped-files";

207+ version = "0.4";

208+ sha256 = "0by3r18bj9fs0bs9w5czx84vssmr58br3x7pz1m3myb4mns3mpsc";

209+ };

210+

211+ buildInputs = [

212+

213+ ];

214+ };

215+

216+ message-digest-primitive = eggDerivation {

217+ name = "message-digest-primitive-4.3.2";

218+

219+ src = fetchegg {

220+ name = "message-digest-primitive";

221+ version = "4.3.2";

222+ sha256 = "1wfmyyp1fv0sz70m0rgzbhkiqgzjc15ppz7fwmpnxg12rvfzdvq0";

223+ };

224+

225+ buildInputs = [

226+ check-errors

227+ ];

228+ };

229+

230+ miscmacros = eggDerivation {

231+ name = "miscmacros-1.0";

232+

233+ src = fetchegg {

234+ name = "miscmacros";

235+ version = "1.0";

236+ sha256 = "0n2ia4ib4f18hcbkm5byph07ncyx61pcpfp2qr5zijf8ykp8nbvr";

237+ };

238+

239+ buildInputs = [

240+

241+ ];

242+ };

243+

244+ packrat = eggDerivation {

245+ name = "packrat-1.5";

246+

247+ src = fetchegg {

248+ name = "packrat";

249+ version = "1.5";

250+ sha256 = "0hfnh57a8yga3byrk8522al5wdj7dyz48lixvvcgnsn3vdy333hq";

251+ };

252+

253+ buildInputs = [

254+ srfi-1

255+ ];

256+ };

257+

258+ regex = eggDerivation {

259+ name = "regex-2.0";

260+

261+ src = fetchegg {

262+ name = "regex";

263+ version = "2.0";

264+ sha256 = "0qgqrrdr95yqggw8xyvb693nhizwqvf1fp9cjx9p3z80c4ih8j4j";

265+ };

266+

267+ buildInputs = [

268+

269+ ];

270+ };

271+

272+ sendfile = eggDerivation {

273+ name = "sendfile-1.8.3";

274+

275+ src = fetchegg {

276+ name = "sendfile";

277+ version = "1.8.3";

278+ sha256 = "0acmydjxlrbq7bdspmrzv9q9l3gh4xxnbpi5g1d5mz1g2mjwgm63";

279+ };

280+

281+ buildInputs = [

282+ memory-mapped-files

283+ ];

284+ };

285+

286+ sha2 = eggDerivation {

287+ name = "sha2-4.0.5";

288+

289+ src = fetchegg {

290+ name = "sha2";

291+ version = "4.0.5";

292+ sha256 = "020yc41gkpg2s48v5n1nnq02dii340yly2y1zsi71bbfbkai2vcs";

293+ };

294+

295+ buildInputs = [

296+ message-digest-primitive

297+ ];

298+ };

299+

300+ socket = eggDerivation {

301+ name = "socket-0.3.3";

302+

303+ src = fetchegg {

304+ name = "socket";

305+ version = "0.3.3";

306+ sha256 = "04wfxrwjizvf1jdpfqp3r7381rp9lscrm3z21ihq2dc2lfzjgrxw";

307+ };

308+

309+ buildInputs = [

310+ srfi-13

311+ srfi-18

312+ foreigners

313+ feature-test

314+ ];

315+ };

316+

317+ spiffy = eggDerivation {

318+ name = "spiffy-6.3";

319+

320+ src = fetchegg {

321+ name = "spiffy";

322+ version = "6.3";

323+ sha256 = "0f22gfdyysgbm3q6cjibn1z1yavks3imxi1mxcyfmms3x91k5k3c";

324+ };

325+

326+ buildInputs = [

327+ intarweb

328+ uri-common

329+ uri-generic

330+ sendfile

331+ srfi-1

332+ srfi-13

333+ srfi-14

334+ srfi-18

335+ ];

336+ };

337+

51338 srfi-1 = eggDerivation {

52339 name = "srfi-1-0.5.1";

53340

@@ -120,6 +407,20 @@ rec {

120407 ];

121408 };

122409

410+ srfi-18 = eggDerivation {

411+ name = "srfi-18-0.1.6";

412+

413+ src = fetchegg {

414+ name = "srfi-18";

415+ version = "0.1.6";

416+ sha256 = "00lykm5lqbrcxl3dab9dqwimpgm36v4ys2957k3vdlg4xdb1abfa";

417+ };

418+

419+ buildInputs = [

420+

421+ ];

422+ };

423+

123424 srfi-37 = eggDerivation {

124425 name = "srfi-37-1.4";

125426

@@ -133,5 +434,118 @@ rec {

133434

134435 ];

135436 };

437+

438+ srfi-69 = eggDerivation {

439+ name = "srfi-69-0.4.1";

440+

441+ src = fetchegg {

442+ name = "srfi-69";

443+ version = "0.4.1";

444+ sha256 = "1l102kppncz27acsr4jyi46q0r7g2lb6gdbkd6p3h1xmvwcnk2hl";

445+ };

446+

447+ buildInputs = [

448+

449+ ];

450+ };

451+

452+ string-utils = eggDerivation {

453+ name = "string-utils-2.4.0";

454+

455+ src = fetchegg {

456+ name = "string-utils";

457+ version = "2.4.0";

458+ sha256 = "09m3s0p199r2nmvc8qnqvbxjbq967gvwqrzp236wsw3hdcil6p8v";

459+ };

460+

461+ buildInputs = [

462+ srfi-1

463+ srfi-13

464+ srfi-69

465+ miscmacros

466+ check-errors

467+ utf8

468+ ];

469+ };

470+

471+ symbol-utils = eggDerivation {

472+ name = "symbol-utils-2.1.0";

473+

474+ src = fetchegg {

475+ name = "symbol-utils";

476+ version = "2.1.0";

477+ sha256 = "17nq8bj18f3bbf3mdfx1m8agy97izn1xcl8ymvgvvd5g384b2xil";

478+ };

479+

480+ buildInputs = [

481+ check-errors

482+ ];

483+ };

484+

485+ tcp6 = eggDerivation {

486+ name = "tcp6-0.2.1";

487+

488+ src = fetchegg {

489+ name = "tcp6";

490+ version = "0.2.1";

491+ sha256 = "14dynnjgac28f46v781hi6kam326q6rh57pf0pvl0chdva4hlf3q";

492+ };

493+

494+ buildInputs = [

495+ socket

496+ srfi-1

497+ ];

498+ };

499+

500+ uri-common = eggDerivation {

501+ name = "uri-common-2.0";

502+

503+ src = fetchegg {

504+ name = "uri-common";

505+ version = "2.0";

506+ sha256 = "07rq7ppkyk3i85vqspc048pnj6gmjhj236z00chslli9xybqkgrd";

507+ };

508+

509+ buildInputs = [

510+ uri-generic

511+ defstruct

512+ matchable

513+ srfi-1

514+ srfi-13

515+ srfi-14

516+ ];

517+ };

518+

519+ uri-generic = eggDerivation {

520+ name = "uri-generic-3.2";

521+

522+ src = fetchegg {

523+ name = "uri-generic";

524+ version = "3.2";

525+ sha256 = "1lpvnk1mnhmrga149km7ygpy7fkq7z2pvw0mvpx2aql03l8gpdsj";

526+ };

527+

528+ buildInputs = [

529+ matchable

530+ srfi-1

531+ srfi-14

532+ ];

533+ };

534+

535+ utf8 = eggDerivation {

536+ name = "utf8-3.6.2";

537+

538+ src = fetchegg {

539+ name = "utf8";

540+ version = "3.6.2";

541+ sha256 = "10wzp3qmwik4gx3hhaqm2n83wza0rllgy57363h5ccv8fga5nnm6";

542+ };

543+

544+ buildInputs = [

545+ srfi-69

546+ iset

547+ regex

548+ ];

549+ };

136550}

137551

pkgs/development/compilers/chicken/5/eggs.scm+5

@@ -1,6 +1,11 @@

11;; Eggs used by egg2nix

22args

33matchable

4+apropos

5+spiffy

6+json

7+tcp6

8+sha2

49

510;; other eggs to include in nixpkgs

611srfi-189

pkgs/development/compilers/hare/config-template.mknew file+27

@@ -0,0 +1,27 @@

1+## Template to generate config.mk via substitute-all

2+

3+# set PREFIX externally

4+BINDIR = $(PREFIX)/bin

5+MANDIR = $(PREFIX)/share/man

6+SRCDIR = $(PREFIX)/src

7+STDLIB = $(SRCDIR)/hare/stdlib

8+

9+HAREPATH = $(SRCDIR)/hare/stdlib:$(SRCDIR)/hare/third-party

10+

11+## Build configuration

12+

13+# Platform to build for

14+PLATFORM = @platform@

15+ARCH = @arch@

16+

17+# External tools and flags

18+HAREC = harec

19+HAREFLAGS = @hareflags@

20+QBE = qbe

21+AS = as

22+LD = ld

23+AR = ar

24+SCDOC = scdoc

25+

26+# Where to store build artifacts

27+# set HARECACHE externally

pkgs/development/compilers/hare/hare.nixnew file+93

@@ -0,0 +1,93 @@

1+{ lib

2+, stdenv

3+, fetchFromSourcehut

4+, binutils-unwrapped

5+, harec

6+, makeWrapper

7+, qbe

8+, scdoc

9+, substituteAll

10+}:

11+

12+stdenv.mkDerivation rec {

13+ pname = "hare";

14+ version = "0.pre+date=2022-04-27";

15+

16+ src = fetchFromSourcehut {

17+ name = pname + "-src";

18+ owner = "~sircmpwn";

19+ repo = pname;

20+ rev = "1bfb2e6dee850c675a8831b41420800d3c62c2a0";

21+ hash = "sha256-1b7U5u3PM3jmnH/OnY9O++GTPyVOdFkJ0fwJBoDZgSU=";

22+ };

23+

24+ nativeBuildInputs = [

25+ binutils-unwrapped

26+ harec

27+ makeWrapper

28+ qbe

29+ scdoc

30+ ];

31+

32+ buildInputs = [

33+ binutils-unwrapped

34+ harec

35+ qbe

36+ ];

37+

38+ strictDeps = true;

39+

40+ configurePhase =

41+ let

42+ # https://harelang.org/platforms/

43+ arch =

44+ if stdenv.isx86_64 then "x86_64"

45+ else if stdenv.isAarch64 then "aarch64"

46+ else if stdenv.isRiscV64 then "riscv64"

47+ else "unsupported";

48+ platform =

49+ if stdenv.isLinux then "linux"

50+ else if stdenv.isFreeBSD then "freebsd"

51+ else "unsupported";

52+ hareflags = "";

53+ config-file = substituteAll {

54+ src = ./config-template.mk;

55+ inherit arch platform hareflags;

56+ };

57+ in

58+ ''

59+ runHook preConfigure

60+

61+ export HARECACHE="$NIX_BUILD_TOP/.harecache"

62+ cat ${config-file} > config.mk

63+

64+ runHook postConfigure

65+ '';

66+

67+ makeFlags = [

68+ "PREFIX=${placeholder "out"}"

69+ ];

70+

71+ doCheck = true;

72+

73+ postInstall =

74+ let

75+ binPath = lib.makeBinPath [

76+ binutils-unwrapped

77+ harec

78+ qbe

79+ ];

80+ in

81+ ''

82+ wrapProgram $out/bin/hare --prefix PATH : ${binPath}

83+ '';

84+

85+ meta = with lib; {

86+ homepage = "http://harelang.org/";

87+ description =

88+ "A systems programming language designed to be simple, stable, and robust";

89+ license = licenses.gpl3Only;

90+ maintainers = with maintainers; [ AndersonTorres ];

91+ inherit (harec.meta) platforms badPlatforms;

92+ };

93+}

pkgs/development/compilers/hare/harec.nixnew file+45

@@ -0,0 +1,45 @@

1+{ lib

2+, stdenv

3+, fetchFromSourcehut

4+, qbe

5+}:

6+

7+stdenv.mkDerivation rec {

8+ pname = "harec";

9+ version = "0.pre+date=2022-04-26";

10+

11+ src = fetchFromSourcehut {

12+ name = pname + "-src";

13+ owner = "~sircmpwn";

14+ repo = pname;

15+ rev = "e5fb5176ba629e98ace5fcb3aa427b2c25d8fdf0";

16+ hash = "sha256-sqt3q6sarzrpyJ/1QYM1WTukrZpflAmAYq6pQwAwe18=";

17+ };

18+

19+ nativeBuildInputs = [

20+ qbe

21+ ];

22+

23+ buildInputs = [

24+ qbe

25+ ];

26+

27+ # TODO: report upstream

28+ hardeningDisable = [ "fortify" ];

29+

30+ strictDeps = true;

31+

32+ doCheck = true;

33+

34+ meta = with lib; {

35+ homepage = "http://harelang.org/";

36+ description = "Bootstrapping Hare compiler written in C for POSIX systems";

37+ license = licenses.gpl3Only;

38+ maintainers = with maintainers; [ AndersonTorres ];

39+ # The upstream developers do not like proprietary operating systems; see

40+ # https://harelang.org/platforms/

41+ platforms = with platforms;

42+ lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64);

43+ badPlatforms = with platforms; darwin;

44+ };

45+}

pkgs/development/compilers/purescript/purescript/default.nix+2−4

@@ -1,4 +1,4 @@

1−{ stdenv, pkgs, fetchurl, zlib, gmp, ncurses5, lib }:

1+{ stdenv, pkgs, fetchurl, zlib, gmp, lib }:

22

33# from justinwoo/easy-purescript-nix

44# https://github.com/justinwoo/easy-purescript-nix/blob/d383972c82620a712ead4033db14110497bc2c9c/purs.nix

@@ -35,9 +35,7 @@ in stdenv.mkDerivation rec {

3535 };

3636

3737

38− buildInputs = [ zlib

39− gmp

40− ncurses5 ];

38+ buildInputs = [ zlib gmp ];

4139 libPath = lib.makeLibraryPath buildInputs;

4240 dontStrip = true;

4341

pkgs/development/haskell-modules/configuration-darwin.nix−7

@@ -251,13 +251,6 @@ self: super: ({

251251 # Otherwise impure gcc is used, which is Apple's weird wrapper

252252 c2hsc = addTestToolDepends [ pkgs.gcc ] super.c2hsc;

253253

254− # streamly depends on Cocoa starting with 0.8.0

255− streamly_0_8_1_1 = overrideCabal (drv: {

256− libraryFrameworkDepends = [

257− darwin.apple_sdk.frameworks.Cocoa

258− ] ++ (drv.libraryFrameworkDepends or []);

259− }) super.streamly_0_8_1_1;

260−

261254 http-client-tls = overrideCabal (drv: {

262255 postPatch = ''

263256 # This comment has been inserted, so the derivation hash changes, forcing

pkgs/development/interpreters/pixie/default.nixdeleted−94

@@ -1,94 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, fetchurl, python2, makeWrapper, pkg-config, gcc,

2− pypy, libffi, libedit, libuv, boost, zlib,

3− variant ? "jit", buildWithPypy ? false }:

4−

5−let

6− commit-count = "1364";

7− common-flags = "--thread --gcrootfinder=shadowstack --continuation";

8− variants = {

9− jit = { flags = "--opt=jit"; target = "target.py"; };

10− jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; };

11− no-jit = { flags = ""; target = "target.py"; };

12− no-jit-preload = { flags = ""; target = "target_preload.py"; };

13− };

14− pixie-src = fetchFromGitHub {

15− owner = "pixie-lang";

16− repo = "pixie";

17− rev = "5eb0ccbe8b0087d3a5f2d0bbbc6998d624d3cd62";

18− sha256 = "sha256-dQ8ncH0IqU42WYxwBgjH6QQfvMIo7RZpv81UAUsPw10=";

19− };

20− pypy-tag = "91db1a9";

21− pypy-src = fetchurl {

22− name = "pypy-src-${pypy-tag}";

23− url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";

24− sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq";

25− };

26− libs = [ libffi libedit libuv boost.dev boost.out zlib ];

27− include-path = lib.concatStringsSep ":"

28− (map (p: "${p}/include") libs);

29− library-path = lib.concatStringsSep ":"

30− (map (p: "${p}/lib") libs);

31− bin-path = lib.concatStringsSep ":"

32− (map (p: "${p}/bin") [ gcc ]);

33− build = {flags, target}: stdenv.mkDerivation rec {

34− pname = "pixie";

35− version = "0-r${commit-count}-${variant}";

36− nativeBuildInputs = [ makeWrapper pkg-config ];

37− buildInputs = libs;

38− PYTHON = if buildWithPypy

39− then "${pypy}/pypy-c/pypy-c"

40− else python2.interpreter;

41− unpackPhase = ''

42− cp -R ${pixie-src} pixie-src

43− mkdir pypy-src

44− (cd pypy-src

45− tar --strip-components=1 -xjf ${pypy-src})

46− chmod -R +w pypy-src pixie-src

47− '';

48− patchPhase = ''

49− (cd pixie-src

50− patch -p1 < ${./load_paths.patch}

51− libraryPaths='["${libuv}" "${libedit}" "${libffi.dev}" "${boost.dev}" "${boost.out}" "${zlib.dev}"]'

52− export libraryPaths

53− substituteAllInPlace ./pixie/ffi-infer.pxi)

54− '';

55− buildPhase = ''(

56− PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH";

57− RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";

58− cd pixie-src

59− $PYTHON $RPYTHON ${common-flags} ${target}

60− find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;

61− )'';

62− LD_LIBRARY_PATH = library-path;

63− C_INCLUDE_PATH = include-path;

64− LIBRARY_PATH = library-path;

65− PATH = bin-path;

66− installPhase = ''

67− mkdir -p $out/share $out/bin

68− cp pixie-src/pixie-vm $out/share/pixie-vm

69− cp -R pixie-src/pixie $out/share/pixie

70− makeWrapper $out/share/pixie-vm $out/bin/pixie \

71− --prefix LD_LIBRARY_PATH : ${LD_LIBRARY_PATH} \

72− --prefix C_INCLUDE_PATH : ${C_INCLUDE_PATH} \

73− --prefix LIBRARY_PATH : ${LIBRARY_PATH} \

74− --prefix PATH : ${PATH}

75− '';

76− doCheck = true;

77− checkPhase = ''

78− RES=$(./pixie-src/pixie-vm -e "(print :ok)")

79− if [ "$RES" != ":ok" ]; then

80− echo "ERROR Unexpected output: '$RES'"

81− return 1

82− else

83− echo "$RES"

84− fi

85− '';

86− meta = {

87− description = "A clojure-like lisp, built with the pypy vm toolkit";

88− homepage = "https://github.com/pixie-lang/pixie";

89− license = lib.licenses.lgpl3;

90− platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"];

91− maintainers = with lib.maintainers; [ bendlas ];

92− };

93− };

94−in build (builtins.getAttr variant variants)

pkgs/development/interpreters/pixie/dust.nixdeleted−46

@@ -1,46 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub

2−, pixie, rlwrap

3−}:

4−

5−stdenv.mkDerivation rec {

6− pname = "dust";

7− version = "0-91";

8−

9− src = fetchFromGitHub {

10− owner = "pixie-lang";

11− repo = "dust";

12− rev = "efe469661e749a71e86858fd006f61464810575a";

13− sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc";

14− };

15−

16− buildInputs = [ pixie ];

17−

18− patches = [ ./make-paths-configurable.patch ];

19−

20− configurePhase = ''

21− pixiePath="${pixie}/bin/pixie" \

22− basePath="$out/share/dust" \

23− rlwrapPath="${rlwrap}/bin/rlwrap" \

24− substituteAll dust.in dust

25− chmod +x dust

26− '';

27−

28− # FIXME: AOT for dust

29− # buildPhase = ''

30− # find . -name "*.pxi" -exec pixie-vm -c {} \;

31− # '';

32−

33− installPhase = ''

34− mkdir -p $out/bin $out/share/dust

35− cp -a src/ run.pxi $out/share/dust

36− mv dust $out/bin/dust

37− '';

38−

39− meta = with lib; {

40− description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";

41− homepage = src.meta.homepage;

42− maintainers = with maintainers; [ ];

43− license = licenses.lgpl3;

44− platforms = platforms.unix;

45− };

46−}

pkgs/development/interpreters/pixie/load_paths.patchdeleted−25

@@ -1,25 +0,0 @@

1−diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi

2−index 9f13ac7..74301c2 100644

3−--- a/pixie/ffi-infer.pxi

4−+++ b/pixie/ffi-infer.pxi

5−@@ -1,15 +1,12 @@

6− (ns pixie.ffi-infer

7− (:require [pixie.io-blocking :as io]))

8−

9−+(defn -add-library-path [p]

10−+ (swap! load-paths conj (str p "/include"))

11−+ (swap! load-paths conj (str p "/lib")))

12−

13−-(defn -add-rel-path [rel]

14−- (swap! load-paths conj (str (first @load-paths) "/" rel)))

15−-

16−-(-add-rel-path "lib")

17−-(-add-rel-path "include")

18−-(-add-rel-path "../lib")

19−-(-add-rel-path "../include")

20−-

21−+(doseq [lp @libraryPaths@]

22−+ (-add-library-path lp))

23−

24− (def *config* nil)

25− (set-dynamic! (var *config*))

pkgs/development/interpreters/pixie/make-paths-configurable.patchdeleted−119

@@ -1,119 +0,0 @@

1−From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001

2−From: Herwig Hochleitner <herwig@bendlas.net>

3−Date: Sun, 28 Feb 2016 16:34:14 +0100

4−Subject: [PATCH] make paths configurable

5−

6−---

7− dust | 52 ----------------------------------------------------

8− dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++

9− 2 files changed, 43 insertions(+), 52 deletions(-)

10− delete mode 100755 dust

11− create mode 100755 dust.in

12−

13−diff --git a/dust b/dust

14−deleted file mode 100755

15−index ffced9b..0000000

16−--- a/dust

17−+++ /dev/null

18−@@ -1,52 +0,0 @@

19−-#!/usr/bin/env bash

20−-

21−-base_path=$0

22−-if [ -L "$base_path" ]; then

23−- base_path=`readlink $base_path`

24−-fi

25−-base_path=`dirname $base_path`

26−-

27−-pixie_path=`which pixie-vm`

28−-if [ -z "$pixie_path" ]; then

29−- echo "Error: 'pixie-vm' must be on your PATH"

30−- exit 1

31−-fi

32−-

33−-function set_load_path() {

34−- load_path=""

35−- if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then

36−- load_path="`cat .load-path`"

37−- fi

38−-}

39−-

40−-if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then

41−- echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."

42−- echo "To start you can run the following command:"

43−- echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"

44−- echo

45−-fi

46−-

47−-set_load_path

48−-run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"

49−-

50−-case $1 in

51−- ""|"repl")

52−- rlwrap_cmd=""

53−- if [ -n "`which rlwrap`" ]; then

54−- rlwrap_cmd="rlwrap -aignored -n"

55−- fi

56−- $rlwrap_cmd $pixie_path $load_path

57−- ;;

58−- "run")

59−- shift

60−- file=$1

61−- shift

62−- $pixie_path $load_path $file $@

63−- ;;

64−- -h|--help)

65−- $run_dust help

66−- ;;

67−- *)

68−- $run_dust $@

69−- ;;

70−-esac

71−diff --git a/dust.in b/dust.in

72−new file mode 100755

73−index 0000000..44a7fbd

74−--- /dev/null

75−+++ b/dust.in

76−@@ -0,0 +1,40 @@

77−+#!/usr/bin/env bash

78−+

79−+base_path=@basePath@

80−+pixie_path=@pixiePath@

81−+rlwrap_cmd=@rlwrapPath@

82−+

83−+function set_load_path() {

84−+ load_path=""

85−+ if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then

86−+ load_path="`cat .load-path`"

87−+ fi

88−+}

89−+

90−+if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then

91−+ echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."

92−+ echo "To start you can run the following command:"

93−+ echo " pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"

94−+ echo

95−+fi

96−+

97−+set_load_path

98−+run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"

99−+

100−+case $1 in

101−+ ""|"repl")

102−+ $rlwrap_cmd -aignored -n $pixie_path $load_path

103−+ ;;

104−+ "run")

105−+ shift

106−+ file=$1

107−+ shift

108−+ $pixie_path $load_path $file $@

109−+ ;;

110−+ -h|--help)

111−+ $run_dust help

112−+ ;;

113−+ *)

114−+ $run_dust $@

115−+ ;;

116−+esac

117−--

118−2.7.1

119−

pkgs/development/interpreters/python/hooks/default.nix+6

@@ -169,4 +169,10 @@ in rec {

169169 name = "wheel-unpack-hook.sh";

170170 deps = [ wheel ];

171171 } ./wheel-unpack-hook.sh) {};

172+

173+ sphinxHook = callPackage ({ sphinx }:

174+ makeSetupHook {

175+ name = "python${python.pythonVersion}-sphinx-hook";

176+ deps = [ sphinx ];

177+ } ./sphinx-hook.sh) {};

172178}

pkgs/development/interpreters/python/hooks/sphinx-hook.shnew file+57

@@ -0,0 +1,57 @@

1+# This hook automatically finds Sphinx documentation, builds it in html format

2+# and installs it.

3+#

4+# This hook knows about several popular locations in which subdirectory

5+# documentation may be, but in very unusual cases $sphinxRoot directory can be

6+# set explicitly.

7+#

8+# Name of the directory relative to ${doc:-$out}/share/doc is normally also

9+# deduced automatically, but can be overridden with $sphinxOutdir variable.

10+#

11+# Sphinx build system can depend on arbitrary amount of python modules, client

12+# code is responsible for ensuring that all dependencies are present.

13+

14+buildSphinxPhase() {

15+ local __sphinxRoot="" o

16+

17+ runHook preBuildSphinx

18+ if [[ -n "${sphinxRoot:-}" ]] ; then # explicit root

19+ if ! [[ -f "${sphinxRoot}/conf.py" ]] ; then

20+ echo 2>&1 "$sphinxRoot/conf.py: no such file"

21+ exit 1

22+ fi

23+ __sphinxRoot=$sphinxRoot

24+ else

25+ for o in doc docs doc/source docs/source ; do

26+ if [[ -f "$o/conf.py" ]] ; then

27+ echo "Sphinx documentation found in $o"

28+ __sphinxRoot=$o

29+ break

30+ fi

31+ done

32+ fi

33+

34+ if [[ -z "${__sphinxRoot}" ]] ; then

35+ echo 2>&1 "Sphinx documentation not found, use 'sphinxRoot' variable"

36+ exit 1

37+ fi

38+ sphinx-build -M html "${__sphinxRoot}" ".sphinx/html" -v

39+

40+ runHook postBuildSphinx

41+}

42+

43+installSphinxPhase() {

44+ local docdir=""

45+ runHook preInstallSphinx

46+

47+ docdir="${doc:-$out}/share/doc/${sphinxOutdir:-$name}"

48+ mkdir -p "$docdir"

49+

50+ cp -r .sphinx/html/html "$docdir/"

51+ rm -fr "${docdir}/html/_sources" "${docdir}/html/.buildinfo"

52+

53+ runHook postInstallSphinx

54+}

55+

56+preBuildPhases+=" buildSphinxPhase"

57+postPhases+=" installSphinxPhase"

pkgs/development/libraries/docopt_cpp/default.nix+10−2

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub, cmake, python2 }:

1+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, python3 }:

22

33stdenv.mkDerivation rec {

44 version = "0.6.3";

@@ -11,7 +11,15 @@ stdenv.mkDerivation rec {

1111 sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";

1212 };

1313

14− nativeBuildInputs = [ cmake python2 ];

14+ patches = [

15+ (fetchpatch {

16+ name = "python3-for-tests";

17+ url = "https://github.com/docopt/docopt.cpp/commit/b3d909dc952ab102a4ad5a1541a41736f35b92ba.patch";

18+ hash = "sha256-JJR09pbn3QhYaZAIAjs+pe28+g1VfgHUKspWorHzr8o=";

19+ })

20+ ];

21+

22+ nativeBuildInputs = [ cmake python3 ];

1523

1624 cmakeFlags = ["-DWITH_TESTS=ON"];

1725

pkgs/development/libraries/doctest/default.nix+5−5

@@ -2,19 +2,19 @@

22

33stdenv.mkDerivation rec {

44 pname = "doctest";

5− version = "2.4.7";

5+ version = "2.4.8";

66

77 src = fetchFromGitHub {

8− owner = "onqtam";

8+ owner = "doctest";

99 repo = "doctest";

10− rev = version;

11− sha256 = "sha256-pXUg+NHSCKOudkmDCU3ePZrvs8DlM/CEZntEd78oTJ0=";

10+ rev = "v${version}";

11+ sha256 = "sha256-/4lyCQZHsa32ozes5MJ0JZpQ99MECRlgFeSzN/Zs/BQ=";

1212 };

1313

1414 nativeBuildInputs = [ cmake ];

1515

1616 meta = with lib; {

17− homepage = "https://github.com/onqtam/doctest";

17+ homepage = "https://github.com/doctest/doctest";

1818 description = "The fastest feature-rich C++11/14/17/20 single-header testing framework";

1919 platforms = platforms.all;

2020 license = licenses.mit;

pkgs/development/libraries/fcft/default.nix+2−2

@@ -20,14 +20,14 @@ in

2020

2121stdenv.mkDerivation rec {

2222 pname = "fcft";

23− version = "3.0.1";

23+ version = "3.1.1";

2424

2525 src = fetchFromGitea {

2626 domain = "codeberg.org";

2727 owner = "dnkl";

2828 repo = "fcft";

2929 rev = version;

30− sha256 = "0jxy92ny8b7s7yvz1mr8zpf7l2zsn506fi9f98pvh9k25jprg0cx";

30+ sha256 = "1b43sqp5hah374ns62pcrmbiriqsdisb60hp1nwqz3ny3rfjvn15";

3131 };

3232

3333 depsBuildBuild = [ pkg-config ];

pkgs/development/libraries/goocanvas/2.x.nix+2−2

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib, gnome }:

1+{ lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python3, gtk3, cairo, glib, gnome }:

22

33stdenv.mkDerivation rec {

44 pname = "goocanvas";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "141fm7mbqib0011zmkv3g8vxcjwa7hypmq71ahdyhnj2sjvy4a67";

1212 };

1313

14− nativeBuildInputs = [ pkg-config gettext gtk-doc python2 ];

14+ nativeBuildInputs = [ pkg-config gettext gtk-doc python3 ];

1515 buildInputs = [ gtk3 cairo glib gobject-introspection ];

1616

1717 configureFlags = [

pkgs/development/libraries/htmlcxx/c++17.patchnew file+24

@@ -0,0 +1,24 @@

1+diff --color -Naur a/html/CharsetConverter.cc b/html/CharsetConverter.cc

2+--- a/html/CharsetConverter.cc 2018-12-29 03:13:56.000000000 +0000

3++++ b/html/CharsetConverter.cc 2021-05-31 23:03:10.705334580 +0100

4+@@ -7,7 +7,7 @@

5+ using namespace std;

6+ using namespace htmlcxx;

7+

8+-CharsetConverter::CharsetConverter(const string &from, const string &to) throw (Exception)

9++CharsetConverter::CharsetConverter(const string &from, const string &to)

10+ {

11+ mIconvDescriptor = iconv_open(to.c_str(), from.c_str());

12+ if (mIconvDescriptor == (iconv_t)(-1))

13+diff --color -Naur a/html/CharsetConverter.h b/html/CharsetConverter.h

14+--- a/html/CharsetConverter.h 2018-12-29 03:13:56.000000000 +0000

15++++ b/html/CharsetConverter.h 2021-05-31 23:03:19.042574598 +0100

16+@@ -17,7 +17,7 @@

17+ : std::runtime_error(arg) {}

18+ };

19+

20+- CharsetConverter(const std::string &from, const std::string &to) throw (Exception);

21++ CharsetConverter(const std::string &from, const std::string &to);

22+ ~CharsetConverter();

23+

24+ std::string convert(const std::string &input);

pkgs/development/libraries/htmlcxx/default.nix+7−4

@@ -2,15 +2,18 @@

22

33stdenv.mkDerivation rec {

44 pname = "htmlcxx";

5− version = "0.86";

5+ version = "0.87";

66

77 src = fetchurl {

8− url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${pname}-${version}.tar.gz";

9− sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";

8+ url = "mirror://sourceforge/htmlcxx/v${version}/${pname}-${version}.tar.gz";

9+ sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg=";

1010 };

1111

1212 buildInputs = [ libiconv ];

13− patches = [ ./ptrdiff.patch ];

13+ patches = [

14+ ./ptrdiff.patch

15+ ./c++17.patch

16+ ];

1417

1518 meta = with lib; {

1619 homepage = "http://htmlcxx.sourceforge.net/";

pkgs/development/libraries/kpmcore/default.nix+10−18

@@ -1,4 +1,4 @@

1−{ stdenv, lib, fetchurl, fetchpatch, extra-cmake-modules

1+{ stdenv, lib, fetchurl, extra-cmake-modules

22, qca-qt5, kauth, kio, polkit-qt, qtbase

33, util-linux

44}:

@@ -6,25 +6,14 @@

66stdenv.mkDerivation rec {

77 pname = "kpmcore";

88 # NOTE: When changing this version, also change the version of `partition-manager`.

9− version = "4.2.0";

9+ version = "22.04.0";

1010

1111 src = fetchurl {

12− url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";

13− hash = "sha256-MvW0CqvFZtzcJlya6DIpzorPbKJai6fxt7nKsKpJn54=";

12+ url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";

13+ hash = "sha256-sO8WUJL6072H1ghMZd7j0xNMwEn4bJF5PXMhfEb2jbs=";

1414 };

1515

16− patches = [

17− # Fix build with `kcoreaddons` >= 5.77.0

18− (fetchpatch {

19− url = "https://github.com/KDE/kpmcore/commit/07e5a3ac2858e6d38cc698e0f740e7a693e9f302.patch";

20− sha256 = "sha256-LYzea888euo2HXM+acWaylSw28iwzOdZBvPBt/gjP1s=";

21− })

22− # Fix crash when `fstab` omits mount options.

23− (fetchpatch {

24− url = "https://github.com/KDE/kpmcore/commit/eea84fb60525803a789e55bb168afb968464c130.patch";

25− sha256 = "sha256-NJ3PvyRC6SKNSOlhJPrDDjepuw7IlAoufPgvml3fap0=";

26− })

27− ];

16+ nativeBuildInputs = [ extra-cmake-modules ];

2817

2918 buildInputs = [

3019 qca-qt5

@@ -35,10 +24,13 @@ stdenv.mkDerivation rec {

3524 util-linux # Needs blkid in configure script (note that this is not provided by util-linux-compat)

3625 ];

3726

38− nativeBuildInputs = [ extra-cmake-modules ];

39−

4027 dontWrapQtApps = true;

4128

29+ preConfigure = ''

30+ substituteInPlace src/util/CMakeLists.txt \

31+ --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions

32+ '';

33+

4234 meta = with lib; {

4335 description = "KDE Partition Manager core library";

4436 homepage = "https://invent.kde.org/system/kpmcore";

pkgs/development/libraries/libdeltachat/default.nix+3−3

@@ -16,13 +16,13 @@

1616

1717stdenv.mkDerivation rec {

1818 pname = "libdeltachat";

19− version = "1.78.0";

19+ version = "1.79.0";

2020

2121 src = fetchFromGitHub {

2222 owner = "deltachat";

2323 repo = "deltachat-core-rust";

2424 rev = version;

25− hash = "sha256-SMobKC34RU7/LfRtgBxa8CHsLlWOQ29zaiw/V4+wWqU=";

25+ hash = "sha256-jwAPbTwMSWDucAvip5KcA7fb4LCWo70SiIspacijMvQ=";

2626 };

2727

2828 patches = [

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

3232 cargoDeps = rustPlatform.fetchCargoTarball {

3333 inherit src;

3434 name = "${pname}-${version}";

35− hash = "sha256-G2lUk1M3B+a3BaNPFWQgsYehUu7dyfuRc+fXSlWjSq4=";

35+ hash = "sha256-Fn4M4CQV7VTE7SubvOszhpGBbmDyqemyUeZ0qDmcGUU=";

3636 };

3737

3838 nativeBuildInputs = [

pkgs/development/libraries/libinjection/default.nix+12−4

@@ -1,5 +1,5 @@

1−{ lib, stdenv, fetchFromGitHub

2−, python2

1+{ lib, stdenv, fetchFromGitHub, fetchpatch

2+, python3

33}:

44

55stdenv.mkDerivation rec {

@@ -13,11 +13,19 @@ stdenv.mkDerivation rec {

1313 sha256 = "0chsgam5dqr9vjfhdcp8cgk7la6nf3lq44zs6z6si98cq743550g";

1414 };

1515

16− nativeBuildInputs = [ python2 ];

16+ nativeBuildInputs = [ python3 ];

1717

1818 strictDeps = true;

1919

20− patchPhase = ''

20+ patches = [

21+ (fetchpatch {

22+ name = "support-python3-for-building";

23+ url = "https://raw.githubusercontent.com/sysown/proxysql/bed58f92917eb651b80fd8ffa627a485eb320805/deps/libinjection/update-build-py3.diff";

24+ hash = "sha256-SPdf57FIDDNpatWe5pjhAiZl5yPMDEv50k0Wj+eWTEM=";

25+ })

26+ ];

27+

28+ postPatch = ''

2129 patchShebangs src

2230 substituteInPlace src/Makefile \

2331 --replace /usr/local $out

pkgs/development/libraries/openssl/default.nix+2−2

@@ -193,8 +193,8 @@ in {

193193 };

194194

195195 openssl_3_0 = common {

196− version = "3.0.2";

197− sha256 = "sha256-mOkczq1NR1auPJzeXgkZGo5YbZ9NUIOOfsCdZBHf22M=";

196+ version = "3.0.3";

197+ sha256 = "sha256-7gB4rc7x3l8APGLIDMllJ3IWCcbzu0K3eV3zH4tVjAs=";

198198 patches = [

199199 ./3.0/nix-ssl-cert-file.patch

200200

pkgs/development/libraries/science/biology/htslib/default.nix+18−2

@@ -14,9 +14,25 @@ stdenv.mkDerivation rec {

1414

1515 buildInputs = [ zlib bzip2 xz curl ];

1616

17− configureFlags = [ "--enable-libcurl" ]; # optional but strongly recommended

17+ configureFlags = if ! stdenv.hostPlatform.isStatic

18+ then [ "--enable-libcurl" ] # optional but strongly recommended

19+ else [ "--disable-libcurl" "--disable-plugins" ];

1820

19− installFlags = [ "prefix=$(out)" ];

21+

22+ # In the case of static builds, we need to replace the build and install phases

23+ buildPhase = lib.optional stdenv.hostPlatform.isStatic ''

24+ make AR=$AR lib-static

25+ make LDFLAGS=-static bgzip htsfile tabix

26+ '';

27+

28+ installPhase = lib.optional stdenv.hostPlatform.isStatic ''

29+ install -d $out/bin

30+ install -d $out/lib

31+ install -d $out/include/htslib

32+ install -D libhts.a $out/lib

33+ install -m644 htslib/*h $out/include/htslib

34+ install -D bgzip htsfile tabix $out/bin

35+ '';

2036

2137 preCheck = ''

2238 patchShebangs test/

pkgs/development/libraries/science/math/caffe2/default.nixdeleted−151

@@ -1,151 +0,0 @@

1−{ stdenv, lib, config, fetchFromGitHub

2−, cmake

3−, glog, gflags, gtest

4−, protobuf, snappy

5−, python, future, six, python-protobuf, numpy, pydot

6−, eigen

7−, doxygen

8−, useCuda ? (config.cudaSupport or false), cudaPackages ? {}

9−, useCudnn ? (config.cudnnSupport or false)

10−, useOpenmp ? false, openmp ? null

11−, useOpencv3 ? true, opencv3 ? null

12−, useLeveldb ? false, leveldb ? null

13−, useLmdb ? true, lmdb ? null

14−, useRocksdb ? false, rocksdb ? null

15−, useZeromq ? false, zeromq ? null

16−, useMpi ? false, mpi ? null

17−# TODO: distributed computations

18−#, useGloo ? false

19−#, useNccl ? false

20−#, useNnpack ? false

21−}:

22−

23−let

24− inherit (cudaPackages) cudatoolkit cudnn;

25−in

26−

27−assert useCuda -> cudatoolkit != null;

28−assert useCudnn -> (useCuda && cudnn != null);

29−assert useOpencv3 -> opencv3 != null;

30−assert useLeveldb -> leveldb != null;

31−assert useLmdb -> lmdb != null;

32−assert useRocksdb -> rocksdb != null;

33−assert useZeromq -> zeromq != null;

34−assert useMpi -> mpi != null;

35−

36−let

37− # Third party modules that caffe2 holds as git submodules.

38− # Download them and create symlinks from caffe2/third_party.

39− installExtraSrc = extra: ''

40− rmdir "third_party/${extra.dst}"

41− ln -s "${extra.src}" "third_party/${extra.dst}"

42− '';

43−

44− cub = {

45− src = fetchFromGitHub {

46− owner = "NVlabs";

47− repo = "cub";

48− rev = "v1.7.4";

49− sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66";

50− };

51− dst = "cub";

52− };

53−

54− pybind11 = {

55− src = fetchFromGitHub {

56− owner = "pybind";

57− repo = "pybind11";

58− rev = "86e2ad4f77442c3350f9a2476650da6bee253c52";

59− sha256 = "05gi58dirvc8fgm0avpydvidzsbh2zrzgfaq671ym09f6dz0bcgz";

60− };

61− dst = "pybind11";

62− };

63−

64− ccVersion = lib.getVersion stdenv.cc;

65−in

66−

67−stdenv.mkDerivation rec {

68− pname = "caffe2";

69− version = "0.8.1";

70− src = fetchFromGitHub {

71− owner = "caffe2";

72− repo = "caffe2";

73− rev = "v${version}";

74− sha256 = "18y7zjc69j6n5642l9caddl641b0djf3pjn4wacdsc1wk1jiyqk8";

75− };

76−

77− nativeBuildInputs = [ cmake doxygen gtest ];

78− outputs = [ "bin" "out" ];

79− propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle

80−

81− buildInputs = [ glog gflags protobuf snappy eigen ]

82− ++ lib.optional useCuda cudatoolkit

83− ++ lib.optional useCudnn cudnn

84− ++ lib.optional useOpenmp openmp

85− ++ lib.optional useOpencv3 opencv3

86− ++ lib.optional useLeveldb leveldb

87− ++ lib.optional useLmdb lmdb

88− ++ lib.optional useRocksdb rocksdb

89− ++ lib.optional useZeromq zeromq

90− ;

91− propagatedBuildInputs = [ numpy future six python-protobuf pydot ];

92−

93− patches = lib.optional (stdenv.cc.isGNU && lib.versionAtLeast ccVersion "7.0.0") [

94− ./fix_compilation_on_gcc7.patch

95− ] ++ lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];

96−

97− cmakeFlags = [ "-DBUILD_TEST=OFF"

98− "-DBUILD_PYTHON=ON"

99− ''-DUSE_CUDA=${if useCuda then "ON"else "OFF"}''

100− ''-DUSE_OPENMP=${if useOpenmp then "ON"else "OFF"}''

101− ''-DUSE_OPENCV=${if useOpencv3 then "ON"else "OFF"}''

102− ''-DUSE_MPI=${if useMpi then "ON"else "OFF"}''

103− ''-DUSE_LEVELDB=${if useLeveldb then "ON"else "OFF"}''

104− ''-DUSE_LMDB=${if useLmdb then "ON"else "OFF"}''

105− ''-DUSE_ROCKSDB=${if useRocksdb then "ON"else "OFF"}''

106− ''-DUSE_ZMQ=${if useZeromq then "ON"else "OFF"}''

107− "-DUSE_GLOO=OFF"

108− "-DUSE_NNPACK=OFF"

109− "-DUSE_NCCL=OFF"

110− "-DUSE_REDIS=OFF"

111− "-DUSE_FFMPEG=OFF"

112− ]

113− ++ lib.optional useCuda [

114− "-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}"

115− "-DCUDA_FAST_MATH=ON"

116− "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc"

117− ];

118−

119− preConfigure = ''

120− ${installExtraSrc cub}

121− ${installExtraSrc pybind11}

122− # XXX hack

123− export NIX_CFLAGS_COMPILE="-I ${eigen}/include/eigen3/ $NIX_CFLAGS_COMPILE"

124− '';

125−

126− postInstall = ''

127− moveToOutput "bin" "$bin"

128− mkdir -p $out/lib/${python.libPrefix}

129− ln -s $out/ $out/${python.sitePackages}

130− '';

131−

132− doCheck = false;

133−

134− meta = {

135− homepage = "https://caffe2.ai/";

136− description = "A new lightweight, modular, and scalable deep learning framework";

137− longDescription = ''

138− Caffe2 aims to provide an easy and straightforward way for you to experiment

139− with deep learning and leverage community contributions of new models and

140− algorithms. You can bring your creations to scale using the power of GPUs in the

141− cloud or to the masses on mobile with Caffe2's cross-platform libraries.

142− '';

143− platforms = with lib.platforms; linux;

144− license = lib.licenses.asl20;

145− maintainers = with lib.maintainers; [ yuriaisaka ];

146− # fails to compile with

147− # error: invalid conversion from 'const char*' to 'char*'

148− # TODO: Remove usage of python2, protobuf overwrite

149− broken = true;

150− };

151−}

pkgs/development/libraries/science/math/caffe2/fix_compilation_on_gcc7.patchdeleted−46

@@ -1,46 +0,0 @@

1−diff --git a/caffe2/operators/recurrent_network_op.cc b/caffe2/operators/recurrent_network_op.cc

2−index dd4fded..5995e8a 100644

3−--- a/caffe2/operators/recurrent_network_op.cc

4−+++ b/caffe2/operators/recurrent_network_op.cc

5−@@ -1,4 +1,4 @@

6−-#include "recurrent_network_op.h"

7−+#include "caffe2/operators/recurrent_network_op.h"

8− #include "caffe2/core/workspace.h"

9−

10− namespace caffe2 {

11−diff --git a/caffe2/operators/recurrent_network_op.h b/caffe2/operators/recurrent_network_op.h

12−index 55328e5..ea898bc 100644

13−--- a/caffe2/operators/recurrent_network_op.h

14−+++ b/caffe2/operators/recurrent_network_op.h

15−@@ -762,8 +762,8 @@ class AccumulateInputGradientOp : public Operator<Context> {

16− USE_OPERATOR_CONTEXT_FUNCTIONS;

17−

18− bool RunOnDevice() override {

19−- const auto t =

20−- OperatorBase::Input<Tensor<CPUContext>>(0).template data<int32_t>()[0];

21−+ const auto& t0 = OperatorBase::Input<Tensor<CPUContext>>(0);

22−+ const auto t = t0.template data<int32_t>()[0];

23− auto& og = Input(1);

24− auto* g = Output(0);

25−

26−diff --git a/caffe2/queue/queue_ops.h b/caffe2/queue/queue_ops.h

27−index f2c0a33..642343f 100644

28−--- a/caffe2/queue/queue_ops.h

29−+++ b/caffe2/queue/queue_ops.h

30−@@ -17,13 +17,10 @@ class CreateBlobsQueueOp final : public Operator<Context> {

31− name(operator_def.output().Get(0)) {}

32−

33− bool RunOnDevice() override {

34−- const auto capacity =

35−- OperatorBase::template GetSingleArgument<int>("capacity", 1);

36−- const auto numBlobs =

37−- OperatorBase::template GetSingleArgument<int>("num_blobs", 1);

38−+ const auto capacity = GetSingleArgument("capacity", 1);

39−+ const auto numBlobs = GetSingleArgument("num_blobs", 1);

40− const auto enforceUniqueName =

41−- OperatorBase::template GetSingleArgument<int>(

42−- "enforce_unique_name", false);

43−+ GetSingleArgument("enforce_unique_name", false);

44− const auto fieldNames =

45− OperatorBase::template GetRepeatedArgument<std::string>("field_names");

46− CAFFE_ENFORCE_EQ(this->OutputSize(), 1);

pkgs/development/libraries/science/math/caffe2/update_clang_cvtsh_bugfix.patchdeleted−55

@@ -1,55 +0,0 @@

1−diff --git a/caffe2/perfkernels/cvtsh_ss_bugfix.h b/caffe2/perfkernels/cvtsh_ss_bugfix.h

2−index bd06681..00172b7 100644

3−--- a/caffe2/perfkernels/cvtsh_ss_bugfix.h

4−+++ b/caffe2/perfkernels/cvtsh_ss_bugfix.h

5−@@ -1,10 +1,36 @@

6−+/**

7−+ * Copyright (c) 2016-present, Facebook, Inc.

8−+ *

9−+ * Licensed under the Apache License, Version 2.0 (the "License");

10−+ * you may not use this file except in compliance with the License.

11−+ * You may obtain a copy of the License at

12−+ *

13−+ * http://www.apache.org/licenses/LICENSE-2.0

14−+ *

15−+ * Unless required by applicable law or agreed to in writing, software

16−+ * distributed under the License is distributed on an "AS IS" BASIS,

17−+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

18−+ * See the License for the specific language governing permissions and

19−+ * limitations under the License.

20−+ */

21−+

22− #pragma once

23−

24−-#if defined(__APPLE__) && (__clang_major__ < 8)

25−+// Apple clang was fixed in 8.1

26−+#if defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1)))

27−+#define __APPLE_NEED_FIX 1

28−+#endif

29−+

30−+// Regular clang was fixed in 3.9

31−+#if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 9)

32−+#define __CLANG_NEED_FIX 1

33−+#endif

34−+

35−+#if __APPLE_NEED_FIX || __CLANG_NEED_FIX

36−

37− #include <emmintrin.h>

38−

39−-// This version of apple clang has a bug that _cvtsh_ss is not defined, see

40−+// This version of clang has a bug that _cvtsh_ss is not defined, see

41− // https://reviews.llvm.org/D16177

42− static __inline float

43− __attribute__((__always_inline__, __nodebug__, __target__("f16c")))

44−@@ -15,7 +41,10 @@ _cvtsh_ss(unsigned short a)

45− return r[0];

46− }

47−

48−-#endif // defined(__APPLE__) && (__clang_major__ < 8)

49−+#endif // __APPLE_NEED_FIX || __CLANG_NEED_FIX

50−+

51−+#undef __APPLE_NEED_FIX

52−+#undef __CLANG_NEED_FIX

53−

54− #ifdef _MSC_VER

55−

pkgs/development/libraries/vulkan-loader/default.nix+2−1

@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {

2121

2222 cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]

2323 ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"

24− ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share";

24+ ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"

25+ ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";

2526

2627 outputs = [ "out" "dev" ];

2728

pkgs/development/libraries/wolfssl/default.nix+2−2

@@ -7,13 +7,13 @@

77

88stdenv.mkDerivation rec {

99 pname = "wolfssl";

10− version = "5.2.0";

10+ version = "5.3.0";

1111

1212 src = fetchFromGitHub {

1313 owner = "wolfSSL";

1414 repo = "wolfssl";

1515 rev = "v${version}-stable";

16− sha256 = "1xdhbhn31q7waw7w158hz9n0vj76zlfn5njq7hncf73ks38drj6k";

16+ sha256 = "sha256-KteArWAgDohlqEYaNfzLPuBn6uy5ABA8vV/LRCVIPGA=";

1717 };

1818

1919 postPatch = ''

pkgs/development/libraries/zimg/default.nix+2−2

@@ -2,13 +2,13 @@

22

33stdenv.mkDerivation rec {

44 pname = "zimg";

5− version = "3.0.4";

5+ version = "3.0.3";

66

77 src = fetchFromGitHub {

88 owner = "sekrit-twc";

99 repo = "zimg";

1010 rev = "release-${version}";

11− sha256 = "1069x49l7kh1mqcq1h3f0m5j0h832jp5x230bh4c613ymgg5kn00";

11+ sha256 = "0pwgf1mybpa3fs13p6jryzm32vfldyql9biwaypqdcimlnlmyk20";

1212 };

1313

1414 nativeBuildInputs = [ autoreconfHook ];

pkgs/development/php-packages/openswoole/default.nixnew file+22

@@ -0,0 +1,22 @@

1+{ lib, stdenv, buildPecl, php, valgrind, pcre2 }:

2+let

3+ pname = "openswoole";

4+ version = "4.11.1";

5+in

6+buildPecl {

7+ inherit pname version;

8+

9+ sha256 = "sha256-Rhoa4ny86dwB3e86/1W30AlDGRUDYjK8RusquKF5Izg=";

10+

11+ buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ];

12+ internalDeps = lib.optionals (lib.versionOlder php.version "7.4") [ php.extensions.hash ];

13+

14+ meta = with lib; {

15+ changelog = "https://pecl.php.net/package/openswoole/${version}";

16+ description = "Coroutine-based concurrency library and high performance programmatic server for PHP";

17+ homepage = "https://www.openswoole.com/";

18+ license = licenses.asl20;

19+ longDescription = "Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines.\nIt offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL.\nYou can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process.";

20+ maintainers = teams.php.members;

21+ };

22+}

pkgs/development/php-packages/pdepend/default.nixnew file+41

@@ -0,0 +1,41 @@

1+{ stdenv, fetchurl, makeWrapper, lib, php }:

2+

3+let

4+ pname = "pdepend";

5+ version = "2.10.3";

6+in

7+stdenv.mkDerivation {

8+ inherit pname version;

9+

10+ src = fetchurl {

11+ url = "https://github.com/pdepend/pdepend/releases/download/${version}/pdepend.phar";

12+ sha256 = "I5+n8+a3rHRgW4OM6FbVcf3T1wu9zBrTSb5sGq7ArH4=";

13+ };

14+

15+ dontUnpack = true;

16+

17+ nativeBuildInputs = [ makeWrapper ];

18+

19+ installPhase = ''

20+ runHook preInstall

21+ mkdir -p $out/bin

22+ install -D $src $out/libexec/pdepend/pdepend.phar

23+ makeWrapper ${php}/bin/php $out/bin/pdepend \

24+ --add-flags "$out/libexec/pdepend/pdepend.phar"

25+ runHook postInstall

26+ '';

27+

28+ meta = with lib; {

29+ description = "An adaptation of JDepend for PHP";

30+ homepage = "https://github.com/pdepend/pdepend";

31+ license = licenses.bsd3;

32+ longDescription = "

33+ PHP Depend is an adaptation of the established Java

34+ development tool JDepend. This tool shows you the quality

35+ of your design in terms of extensibility, reusability and

36+ maintainability.

37+ ";

38+ maintainers = teams.php.members;

39+ platforms = platforms.all;

40+ };

41+}

pkgs/development/python-modules/afsapi/default.nix+3−3

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "afsapi";

14− version = "0.2.3";

14+ version = "0.2.4";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.8";

@@ -19,8 +19,8 @@ buildPythonPackage rec {

1919 src = fetchFromGitHub {

2020 owner = "wlcrs";

2121 repo = "python-afsapi";

22− rev = version;

23− hash = "sha256-6nmj15jCGBRkT7Ip/VGHX5IrAbhu1LUlvXuvFhvXknY=";

22+ rev = "refs/tags/${version}";

23+ hash = "sha256-pNggrg97GIBBTm4rjtpx0NOZIWCGn9boB/Wss/QwF6U=";

2424 };

2525

2626 SETUPTOOLS_SCM_PRETEND_VERSION = version;

pkgs/development/python-modules/aioairzone/default.nix+2−2

@@ -7,7 +7,7 @@

77

88buildPythonPackage rec {

99 pname = "aioairzone";

10− version = "0.3.4";

10+ version = "0.4.2";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.8";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

1616 owner = "Noltari";

1717 repo = pname;

1818 rev = "refs/tags/${version}";

19− hash = "sha256-ENdgaG30Fll5HQOTcghkmqOAiMYEY1aHRIel4Bd25Pk=";

19+ hash = "sha256-SPxSIcsDjsT7dZQs1CoU7DstQTxYN1c0qAB+XQjVXlo=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/aiooncue/default.nix+2−2

@@ -7,7 +7,7 @@

77

88buildPythonPackage rec {

99 pname = "aiooncue";

10− version = "0.3.3";

10+ version = "0.3.4";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.7";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

1616 owner = "bdraco";

1717 repo = pname;

1818 rev = version;

19− hash = "sha256-rzgSvgVfpz2AVwqnat+TO+QhA3KcXV/a1HDNAP1fNPM=";

19+ hash = "sha256-/Db32OomEkrBtq5lfT8zBGgvaUWnWE/sTqwNVNB9XAg=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/aioslimproto/default.nix+11−4

@@ -1,12 +1,13 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4+, pytestCheckHook

45, pythonOlder

56}:

67

78buildPythonPackage rec {

89 pname = "aioslimproto";

9− version = "1.0.1";

10+ version = "2.0.1";

1011 format = "setuptools";

1112

1213 disabled = pythonOlder "3.9";

@@ -15,11 +16,17 @@ buildPythonPackage rec {

1516 owner = "home-assistant-libs";

1617 repo = pname;

1718 rev = version;

18− hash = "sha256-kR2PG2eivBfqu67hXr8/RRvo5EzI75e8NmG15NPGo1E=";

19+ hash = "sha256-xa0LZGq0di4lnJGVMbb1Un0Ebd4vXRlbkxbatJ9GwB0=";

1920 };

2021

21− # Module has no tests

22− doCheck = false;

22+ checkInputs = [

23+ pytestCheckHook

24+ ];

25+

26+ disabledTests = [

27+ # AssertionError: assert ['mixer', 'volume', '50'] == ['volume', '50']

28+ "test_msg_instantiation"

29+ ];

2330

2431 pythonImportsCheck = [

2532 "aioslimproto"

pkgs/development/python-modules/androidtv/default.nix+2−2

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "androidtv";

14− version = "0.0.66";

14+ version = "0.0.67";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.7";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "JeffLIrion";

2121 repo = "python-androidtv";

2222 rev = "v${version}";

23− hash = "sha256-gSbckVjM49nVfzpk9sfynJDx15+zQ/KgaI7oxEkXQpo=";

23+ hash = "sha256-MAlKD2PDQJQaKPiMQDu1CMvn4xnxb8FmeYqzcW4hso0=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/ansible/default.nix+3−2

@@ -20,7 +20,7 @@

2020

2121let

2222 pname = "ansible";

23− version = "5.7.0";

23+ version = "5.7.1";

2424in

2525buildPythonPackage {

2626 inherit pname version;

@@ -30,7 +30,7 @@ buildPythonPackage {

3030

3131 src = fetchPypi {

3232 inherit pname version;

33− sha256 = "sha256-6AwOdN4XdK2ufAIzskf/crj72LXxBwd9tdC38DcNa4Y=";

33+ sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE=";

3434 };

3535

3636 postPatch = ''

@@ -78,6 +78,7 @@ buildPythonPackage {

7878 meta = with lib; {

7979 description = "Radically simple IT automation";

8080 homepage = "https://www.ansible.com";

81+ changelog = "https://github.com/ansible-community/ansible-build-data/blob/${version}/${lib.versions.major version}/CHANGELOG-v${lib.versions.major version}.rst";

8182 license = licenses.gpl3Plus;

8283 maintainers = with maintainers; [ hexa ];

8384 };

pkgs/development/python-modules/async-upnp-client/default.nix+2−2

@@ -14,7 +14,7 @@

1414

1515buildPythonPackage rec {

1616 pname = "async-upnp-client";

17− version = "0.28.0";

17+ version = "0.29.0";

1818 format = "setuptools";

1919

2020 disabled = pythonOlder "3.7";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

2323 owner = "StevenLooman";

2424 repo = "async_upnp_client";

2525 rev = version;

26− sha256 = "sha256-ZyYIZLIlLQV3Yj4a+M5vZVaTe9lEsrWhBe/g9wzM1TY=";

26+ sha256 = "sha256-IzT48ABfk/v8VZJRJEMU/Rsi6mJG4IvtF7HNRv6TLeA=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/aws-lambda-builders/default.nix+3−3

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "aws-lambda-builders";

13− version = "1.14.0";

13+ version = "1.15.0";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.7";

@@ -18,8 +18,8 @@ buildPythonPackage rec {

1818 src = fetchFromGitHub {

1919 owner = "awslabs";

2020 repo = "aws-lambda-builders";

21− rev = "v${version}";

22− sha256 = "sha256-ypzo0cYvP8LV74cQMzHIFDk3LH0bbEB4UxPxRuqe2fc=";

21+ rev = "refs/tags/v${version}";

22+ sha256 = "sha256-kXglpj82e+LzUI6SW86wyfG2lGVnL/PsrTNsseg4VYk=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/python-modules/beautifulsoup4/default.nix+3

@@ -6,12 +6,14 @@

66, pytestCheckHook

77, pythonOlder

88, soupsieve

9+, sphinxHook

910}:

1011

1112buildPythonPackage rec {

1213 pname = "beautifulsoup4";

1314 version = "4.11.1";

1415 format = "setuptools";

16+ outputs = ["out" "doc"];

1517

1618 disabled = pythonOlder "3.6";

1719

@@ -29,6 +31,7 @@ buildPythonPackage rec {

2931 checkInputs = [

3032 pytestCheckHook

3133 ];

34+ nativeBuildInputs = [ sphinxHook ];

3235

3336 pythonImportsCheck = [

3437 "bs4"

pkgs/development/python-modules/bleach/default.nix+2−2

@@ -11,12 +11,12 @@

1111

1212buildPythonPackage rec {

1313 pname = "bleach";

14− version = "4.1.0";

14+ version = "5.0.0";

1515 disabled = pythonOlder "3.6";

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";

19+ hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/breezy/default.nix+20−5

@@ -3,23 +3,36 @@

33, fetchPypi

44, configobj

55, patiencediff

6−, six

6+, fastbencode

77, fastimport

88, dulwich

99, launchpadlib

1010, testtools

11+, pythonOlder

12+, installShellFiles

1113}:

1214

1315buildPythonPackage rec {

1416 pname = "breezy";

15− version = "3.2.1";

17+ version = "3.2.2";

18+

19+ disabled = pythonOlder "3.5";

1620

1721 src = fetchPypi {

1822 inherit pname version;

19− sha256 = "sha256-4LJo6xoooq8EUoDDfQIa4y1/8XX0ybmfM6rX2wsp2Fw=";

23+ sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU=";

2024 };

2125

22− propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];

26+ nativeBuildInputs = [ installShellFiles ];

27+

28+ propagatedBuildInputs = [

29+ configobj

30+ fastbencode

31+ patiencediff

32+ fastimport

33+ dulwich

34+ launchpadlib

35+ ];

2336

2437 checkInputs = [ testtools ];

2538

@@ -29,6 +42,8 @@ buildPythonPackage rec {

2942 # symlink for bazaar compatibility

3043 postInstall = ''

3144 ln -s "$out/bin/brz" "$out/bin/bzr"

45+

46+ installShellCompletion --cmd brz --bash contrib/bash/brz

3247 '';

3348

3449 pythonImportsCheck = [ "breezy" ];

@@ -36,7 +51,7 @@ buildPythonPackage rec {

3651 meta = with lib; {

3752 description = "Friendly distributed version control system";

3853 homepage = "https://www.breezy-vcs.org/";

39− license = licenses.gpl2;

54+ license = licenses.gpl2Only;

4055 maintainers = [ maintainers.marsam ];

4156 };

4257}

pkgs/development/python-modules/dropbox/default.nix+3

@@ -8,6 +8,7 @@

88, mock

99, pytest-mock

1010, pytestCheckHook

11+, sphinxHook

1112}:

1213

1314buildPythonPackage rec {

@@ -16,6 +17,7 @@ buildPythonPackage rec {

1617 format = "setuptools";

1718

1819 disabled = pythonOlder "3.7";

20+ outputs = ["out" "doc"];

1921

2022 src = fetchFromGitHub {

2123 owner = "dropbox";

@@ -46,6 +48,7 @@ buildPythonPackage rec {

4648 pythonImportsCheck = [

4749 "dropbox"

4850 ];

51+ nativeBuildInputs = [ sphinxHook ];

4952

5053 # Set SCOPED_USER_DROPBOX_TOKEN environment variable to a valid value.

5154 disabledTests = [

pkgs/development/python-modules/dungeon-eos/default.nix+2−2

@@ -2,13 +2,13 @@

22

33buildPythonPackage rec {

44 pname = "dungeon-eos";

5− version = "0.0.4";

5+ version = "0.0.5";

66

77 src = fetchFromGitHub {

88 owner = "SkyTemple";

99 repo = pname;

1010 rev = version;

11− sha256 = "0hxygjk9i4qlwsxnxr52cxhqy3i62pc373z1x5sh2pas5ag59bvl";

11+ sha256 = "sha256-Z1fGtslXP8zcZmVeWjRrbcM2ZJsfbrWjpLWZ49uSCRY=";

1212 };

1313

1414 doCheck = false; # there are no tests

pkgs/development/python-modules/envs/default.nix+15−11

@@ -1,29 +1,29 @@

11{ lib

22, buildPythonPackage

3−, fetchPypi

4−, fetchpatch

53, click

4+, fetchPypi

65, jinja2

7−, terminaltables

86, mock

97, nose

8+, poetry-core

9+, pythonOlder

10+, terminaltables

1011}:

1112

1213buildPythonPackage rec {

1314 pname = "envs";

14− version = "1.3";

15+ version = "1.4";

16+ format = "pyproject";

17+

18+ disabled = pythonOlder "3.7";

1519

1620 src = fetchPypi {

1721 inherit pname version;

18− sha256 = "ccf5cd85ddb8ed335e39ed8a22e0d23658f5a6d7da430f225e6f750c6f50ae42";

22+ hash = "sha256-nYQ1xphdHN1oKZ4ExY4r24rmz2ayWWqAeeb5qT8qA5g=";

1923 };

2024

21− patches = [

22− # https://github.com/capless/envs/pull/19

23− (fetchpatch {

24− url = "https://github.com/capless/envs/commit/6947043fa9120a7b17094fd43ee0e1edf808f42b.patch";

25− sha256 = "0zswg8kp2g922mkc7x34ps37qli1d1mjwna2jfrbnsq2fg4mk818";

26− })

25+ nativeBuildInputs = [

26+ poetry-core

2727 ];

2828

2929 propagatedBuildInputs = [

@@ -45,6 +45,10 @@ buildPythonPackage rec {

4545 runHook postCheck

4646 '';

4747

48+ pythonImportsCheck = [

49+ "envs"

50+ ];

51+

4852 meta = with lib; {

4953 description = "Easy access to environment variables from Python";

5054 homepage = "https://github.com/capless/envs";

pkgs/development/python-modules/exceptiongroup/default.nix+2−2

@@ -8,14 +8,14 @@

88

99buildPythonPackage rec {

1010 pname = "exceptiongroup";

11− version = "1.0.0rc2";

11+ version = "1.0.0rc5";

1212 format = "flit";

1313

1414 disabled = pythonOlder "3.7";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− hash = "sha256-TSVLBSMb7R1DB5vc/g8dZsCrR4Pmd3oyk1X5t43jrYM=";

18+ hash = "sha256-ZlQiVQuWU6zUbpzTXZM/KMUVjKTAWMU2Gc+hEpFc1p4=";

1919 };

2020

2121 nativeBuildInputs = [

pkgs/development/python-modules/fastbencode/default.nixnew file+26

@@ -0,0 +1,26 @@

1+{ lib, buildPythonPackage, fetchPypi, python, cython }:

2+

3+buildPythonPackage rec {

4+ pname = "fastbencode";

5+ version = "0.0.7";

6+

7+ src = fetchPypi {

8+ inherit pname version;

9+ sha256 = "sha256-tryavlQtBmN5NSlXb0m6iJFQhVT4XQm11tXtevfgxuQ=";

10+ };

11+

12+ nativeBuildInputs = [ cython ];

13+

14+ pythonImportsCheck = [ "fastbencode" ];

15+

16+ checkPhase = ''

17+ ${python.interpreter} -m unittest fastbencode.tests.test_suite

18+ '';

19+

20+ meta = with lib; {

21+ description = "Fast implementation of bencode";

22+ homepage = "https://github.com/breezy-team/fastbencode";

23+ license = licenses.gpl2Only;

24+ maintainers = [ maintainers.marsam ];

25+ };

26+}

pkgs/development/python-modules/fontmake/default.nixnew file+42

@@ -0,0 +1,42 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, glyphslib

5+, setuptools-scm

6+, ufo2ft

7+, fonttools

8+, fontmath

9+, lxml

10+, setuptools

11+}:

12+

13+buildPythonPackage rec {

14+ pname = "fontmake";

15+ version = "3.3.0";

16+

17+ src = fetchPypi {

18+ inherit pname version;

19+ sha256 = "sha256-lD7MvZdr9CeWdoZtD3+8stVJTeQN5/AQ4miA/I2TFoE=";

20+ extension = "zip";

21+ };

22+

23+ nativeBuildInputs = [ setuptools-scm ];

24+

25+ propagatedBuildInputs = [

26+ glyphslib

27+ ufo2ft

28+ fonttools

29+ fontmath

30+ lxml

31+ setuptools

32+ ];

33+

34+ pythonImportsCheck = [ "fontmake" ];

35+

36+ meta = {

37+ description = "Compiles fonts from various sources (.glyphs, .ufo, designspace) into binaries formats (.otf, .ttf)";

38+ homepage = "https://github.com/googlefonts/fontmake";

39+ license = lib.licenses.asl20;

40+ maintainers = [ lib.maintainers.BarinovMaxim ];

41+ };

42+}

pkgs/development/python-modules/fonttools/default.nix+7−3

@@ -13,11 +13,12 @@

1313, sphinx

1414, pytestCheckHook

1515, glibcLocales

16+, setuptools-scm

1617}:

1718

1819buildPythonPackage rec {

1920 pname = "fonttools";

20− version = "4.30.0";

21+ version = "4.33.3";

2122

2223 disabled = pythonOlder "3.7";

2324

@@ -25,9 +26,11 @@ buildPythonPackage rec {

2526 owner = pname;

2627 repo = pname;

2728 rev = version;

28− sha256 = "1y9f071bdl66rsx42j16j5v53h85xra5qlg860rz3m054s2rmin9";

29+ sha256 = "MUIZGnYwlfTat9655AOYgK5r6AvHj/xXghUvOZR8HIM=";

2930 };

3031

32+ nativeBuildInputs = [ setuptools-scm ];

33+

3134 # all dependencies are optional, but

3235 # we run the checks with them

3336

@@ -51,6 +54,8 @@ buildPythonPackage rec {

5154 unicodedata2

5255 ];

5356

57+ pythonImportsCheck = [ "fontTools" ];

58+

5459 preCheck = ''

5560 # tests want to execute the "fonttools" executable from $PATH

5661 export PATH="$out/bin:$PATH"

@@ -72,7 +77,6 @@ buildPythonPackage rec {

7277 "Tests/ufoLib"

7378 ];

7479

75−

7680 meta = with lib; {

7781 homepage = "https://github.com/fonttools/fonttools";

7882 description = "A library to manipulate font files from Python";

pkgs/development/python-modules/gbulb/default.nixnew file+43

@@ -0,0 +1,43 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, pygobject3

5+, pytestCheckHook

6+, gtk3

7+, gobject-introspection

8+}:

9+

10+buildPythonPackage rec {

11+ pname = "gbulb";

12+ version = "0.6.3";

13+

14+ src = fetchFromGitHub {

15+ owner = "beeware";

16+ repo = "gbulb";

17+ rev = "v${version}";

18+ sha256 = "sha256-QNpZf1zfe6r6MtmYMWSrXPsXm5iX36oMx4GnXiTYPaQ=";

19+ };

20+

21+ propagatedBuildInputs = [

22+ pygobject3

23+ ];

24+

25+ checkInputs = [

26+ pytestCheckHook

27+ gtk3

28+ gobject-introspection

29+ ];

30+

31+ disabledTests = [

32+ "test_glib_events.TestBaseGLibEventLoop" # Somtimes fail due to imprecise timing

33+ ];

34+

35+ pythonImportsCheck = [ "gbulb" ];

36+

37+ meta = with lib; {

38+ description = "GLib implementation of PEP 3156";

39+ homepage = "https://github.com/beeware/gbulb";

40+ license = licenses.asl20;

41+ maintainers = with maintainers; [ marius851000 ];

42+ };

43+}

pkgs/development/python-modules/gcal-sync/default.nixnew file+46

@@ -0,0 +1,46 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+, aiohttp

6+, pydantic

7+, freezegun

8+, pytest-aiohttp

9+, pytest-asyncio

10+, pytestCheckHook

11+}:

12+

13+buildPythonPackage rec {

14+ pname = "gcal-sync";

15+ version = "0.7.1";

16+

17+ disabled = pythonOlder "3.9";

18+

19+ src = fetchFromGitHub {

20+ owner = "allenporter";

21+ repo = "gcal_sync";

22+ rev = version;

23+ hash = "sha256-NOB74P+5i63FEeHJsPXRdRgY6iyIUEn7BogbVKm8P5M=";

24+ };

25+

26+ propagatedBuildInputs = [

27+ aiohttp

28+ pydantic

29+ ];

30+

31+ checkInputs = [

32+ freezegun

33+ pytest-aiohttp

34+ pytest-asyncio

35+ pytestCheckHook

36+ ];

37+

38+ pythonImportsCheck = [ "gcal_sync" ];

39+

40+ meta = {

41+ description = "Python library for syncing Google Calendar to local storage";

42+ homepage = "https://github.com/allenporter/gcal_sync";

43+ license = lib.licenses.asl20;

44+ maintainers = with lib.maintainers; [ dotlambda ];

45+ };

46+}

pkgs/development/python-modules/glyphslib/default.nixnew file+59

@@ -0,0 +1,59 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, fonttools

5+, openstep-plist

6+, ufoLib2

7+, pytestCheckHook

8+, unicodedata2

9+, setuptools-scm

10+, ufonormalizer

11+, xmldiff

12+, defcon

13+, ufo2ft

14+, skia-pathops

15+}:

16+

17+buildPythonPackage rec {

18+ pname = "glyphslib";

19+ version = "6.0.4";

20+

21+ format = "pyproject";

22+

23+ src = fetchPypi {

24+ pname = "glyphsLib";

25+ inherit version;

26+ sha256 = "sha256-PT66n1WEO5FNcwov8GaXT1YNrAi22X4HN7iVNkuehKI=";

27+ };

28+

29+ nativeBuildInputs = [ setuptools-scm ];

30+

31+ checkInputs = [ pytestCheckHook ];

32+

33+ pythonImportsCheck = [ "glyphsLib" ];

34+

35+ propagatedBuildInputs = [

36+ fonttools

37+ openstep-plist

38+ ufoLib2

39+ unicodedata2

40+ ufonormalizer

41+ xmldiff

42+ defcon

43+ ufo2ft

44+ skia-pathops

45+ ];

46+

47+ disabledTestPaths = [

48+ "tests/builder/designspace_gen_test.py" # this test tries to use non-existent font "CoolFoundry Examplary Serif"

49+ "tests/builder/interpolation_test.py" # this test tries to use a font that previous test should made

50+ ];

51+

52+ meta = {

53+ description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib";

54+ homepage = "https://github.com/googlefonts/glyphsLib";

55+ license = lib.licenses.asl20;

56+ maintainers = [ lib.maintainers.BarinovMaxim ];

57+ };

58+}

59+

pkgs/development/python-modules/howdoi/default.nix+16−2

@@ -10,17 +10,21 @@

1010, pyquery

1111, requests

1212, pytestCheckHook

13+, pythonOlder

1314}:

1415

1516buildPythonPackage rec {

1617 pname = "howdoi";

1718 version = "2.0.19";

19+ format = "setuptools";

20+

21+ disabled = pythonOlder "3.7";

1822

1923 src = fetchFromGitHub {

2024 owner = "gleitz";

2125 repo = pname;

2226 rev = "v${version}";

23− sha256 = "0hl7cpxm4llsgw6390bpjgkzrprrpb0vxx2flgly7wiy9zl1rc5q";

27+ hash = "sha256-uLAc6E8+8uPpo070vsG6Od/855N3gTQMf5pSUvtlh0I=";

2428 };

2529

2630 propagatedBuildInputs = [

@@ -46,6 +50,16 @@ buildPythonPackage rec {

4650 # AssertionError: "The...

4751 "test_get_text_with_one_link"

4852 "test_get_text_without_links"

53+ # Those tests are failing in the sandbox

54+ # OSError: [Errno 24] Too many open files

55+ "test_answers"

56+ "test_answers_bing"

57+ "test_colorize"

58+ "test_json_output"

59+ "test_missing_pre_or_code_query"

60+ "test_multiple_answers"

61+ "test_position"

62+ "test_unicode_answer"

4963 ];

5064

5165 pythonImportsCheck = [

@@ -54,7 +68,7 @@ buildPythonPackage rec {

5468

5569 meta = with lib; {

5670 description = "Instant coding answers via the command line";

57− homepage = "https://pypi.python.org/pypi/howdoi";

71+ homepage = "https://github.com/gleitz/howdoi";

5872 license = licenses.mit;

5973 maintainers = with maintainers; [ costrouc ];

6074 };

pkgs/development/python-modules/insteon-frontend-home-assistant/default.nixnew file+26

@@ -0,0 +1,26 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+}:

5+

6+buildPythonPackage rec {

7+ pname = "insteon-frontend-home-assistant";

8+ version = "0.1.0";

9+

10+ src = fetchPypi {

11+ inherit pname version;

12+ sha256 = "70ee413cae8717416f5add1be7647158d8ff4303942dafccac0792ef44336cdf";

13+ };

14+

15+ # upstream has no tests

16+ doCheck = false;

17+

18+ pythonImportsCheck = [ "insteon_frontend" ];

19+

20+ meta = {

21+ description = "The Insteon frontend for Home Assistant";

22+ homepage = "https://github.com/teharris1/insteon-panel";

23+ license = lib.licenses.mit;

24+ maintainers = with lib.maintainers; [ dotlambda ];

25+ };

26+}

pkgs/development/python-modules/lektor/default.nix+2−2

@@ -27,7 +27,7 @@

2727

2828buildPythonPackage rec {

2929 pname = "lektor";

30− version = "3.3.3";

30+ version = "3.3.4";

3131 format = "pyproject";

3232

3333 disabled = pythonOlder "3.7";

@@ -36,7 +36,7 @@ buildPythonPackage rec {

3636 owner = "lektor";

3737 repo = pname;

3838 rev = "refs/tags/v${version}";

39− hash = "sha256-3jPN4VQdIUVjSSGJxPek2RrnXzCwkDxoEBqk4vuL+nc=";

39+ hash = "sha256-9Zd+N6FkvRuW7rptWAr3JLIARXwJDcocxAp/ZCTQ3Hw=";

4040 };

4141

4242 propagatedBuildInputs = [

pkgs/development/python-modules/loo-py/default.nix → pkgs/development/python-modules/loopy/default.nixrenamed+28−24

@@ -1,51 +1,55 @@

11{ lib

22, buildPythonPackage

3−, fetchPypi

4−, pytools

5−, pymbolic

6−, genpy

3+, codepy

74, cgen

8−, islpy

9−, six

105, colorama

6+, fetchFromGitHub

7+, genpy

8+, islpy

119, mako

10+, numpy

11+, pymbolic

1212, pyopencl

13−, pytest

13+, pyrsistent

14+, pythonOlder

15+, pytools

1416}:

1517

1618buildPythonPackage rec {

17− pname = "loo-py";

18− version = "2020.2";

19+ pname = "loopy";

20+ version = "2020.2.1";

21+ format = "setuptools";

22+

23+ disabled = pythonOlder "3.7";

1924

20− src = fetchPypi {

21− pname = "loo.py";

22− inherit version;

23− sha256 = "c0aba31f8b61f6487e84120a154fab862d19c3b374ad4285b987c4f2d746d51f";

25+ src = fetchFromGitHub {

26+ owner = "inducer";

27+ repo = pname;

28+ rev = "v${version}";

29+ hash = "sha256-GL2GY3fbP9yMEQYyuh4CRHpeN9DGnZxbMt6jC+O/C0g=";

2430 };

2531

26− checkInputs = [ pytest ];

2732 propagatedBuildInputs = [

28− pytools

29− pymbolic

30− genpy

33+ codepy

3134 cgen

32− islpy

33− six

3435 colorama

36+ genpy

37+ islpy

3538 mako

39+ numpy

40+ pymbolic

3641 pyopencl

42+ pyrsistent

43+ pytools

3744 ];

3845

3946 # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR

4047 doCheck = false;

41− checkPhase = ''

42− HOME=$(mktemp -d) pytest test

43− '';

4448

4549 meta = with lib; {

4650 description = "A code generator for array-based code on CPUs and GPUs";

47− homepage = "https://mathema.tician.de/software/loopy";

51+ homepage = "https://github.com/inducer/loopy";

4852 license = licenses.mit;

49− maintainers = [ maintainers.costrouc ];

53+ maintainers = with maintainers; [ costrouc ];

5054 };

5155}

pkgs/development/python-modules/luxtronik/default.nix+2−2

@@ -8,7 +8,7 @@

88

99buildPythonPackage rec {

1010 pname = "luxtronik";

11− version = "0.3.12";

11+ version = "0.3.13";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "Bouni";

1818 repo = "python-luxtronik";

1919 rev = version;

20− sha256 = "sha256-qQwMahZ3EzXzI7FyTL71WzDpLqmIgVYxiJ0IGvlw8dY=";

20+ sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY=";

2121 };

2222

2323 # Project has no tests

pkgs/development/python-modules/meater-python/default.nixnew file+37

@@ -0,0 +1,37 @@

1+{ lib

2+, aiohttp

3+, buildPythonPackage

4+, fetchPypi

5+, pythonOlder

6+}:

7+

8+buildPythonPackage rec {

9+ pname = "meater-python";

10+ version = "0.0.8";

11+ format = "setuptools";

12+

13+ disabled = pythonOlder "3.7";

14+

15+ src = fetchPypi {

16+ inherit pname version;

17+ hash = "sha256-86XJmKOc2MCyU9v0UAZsPCUL/kAXywOlQOIHaykNF1o=";

18+ };

19+

20+ propagatedBuildInputs = [

21+ aiohttp

22+ ];

23+

24+ # Module has no tests

25+ doCheck = false;

26+

27+ pythonImportsCheck = [

28+ "meater"

29+ ];

30+

31+ meta = with lib; {

32+ description = "Library for the Apption Labs Meater cooking probe";

33+ homepage = "https://github.com/Sotolotl/meater-python";

34+ license = licenses.asl20;

35+ maintainers = with maintainers; [ fab ];

36+ };

37+}

pkgs/development/python-modules/mypy-boto3-s3/default.nix+2−2

@@ -8,14 +8,14 @@

88

99buildPythonPackage rec {

1010 pname = "mypy-boto3-s3";

11− version = "1.22.0.post1";

11+ version = "1.22.6";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.6";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− hash = "sha256-lOpsygYi1iCZ9DgqOjfJ4HL9PvRmLqMpEWqgeOyFCI4=";

18+ hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4=";

1919 };

2020

2121 propagatedBuildInputs = [

pkgs/development/python-modules/nbclient/default.nix+33−10

@@ -1,27 +1,50 @@

1−{ lib, buildPythonPackage, fetchPypi, pythonOlder,

2− async_generator, traitlets, nbformat, nest-asyncio, jupyter-client,

3− pytest, xmltodict, nbconvert, ipywidgets

4−, doCheck ? true

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, pythonOlder

5+, async_generator

6+, traitlets

7+, nbformat

8+, nest-asyncio

9+, jupyter-client

10+, pytestCheckHook

11+, xmltodict

12+, nbconvert

13+, ipywidgets

514}:

615

7−buildPythonPackage rec {

16+let nbclient = buildPythonPackage rec {

817 pname = "nbclient";

9− version = "0.5.13";

18+ version = "0.6.2";

19+ format = "setuptools";

20+

1021 disabled = pythonOlder "3.7";

1122

1223 src = fetchPypi {

1324 inherit pname version;

14− sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g=";

25+ hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";

1526 };

1627

17− inherit doCheck;

18− checkInputs = [ pytest xmltodict nbconvert ipywidgets ];

1928 propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ];

2029

30+ # circular dependencies if enabled by default

31+ doCheck = false;

32+

33+ checkInputs = [ pytestCheckHook xmltodict nbconvert ipywidgets ];

34+

35+ preCheck = ''

36+ export HOME=$(mktemp -d)

37+ '';

38+

39+ passthru.tests = {

40+ check = nbclient.overridePythonAttrs (_: { doCheck = true; });

41+ };

42+

2143 meta = with lib; {

2244 homepage = "https://github.com/jupyter/nbclient";

2345 description = "A client library for executing notebooks";

2446 license = licenses.bsd3;

2547 maintainers = [ maintainers.erictapen ];

2648 };

27−}

49+};

50+in nbclient

pkgs/development/python-modules/nbconvert/default.nix+8−7

@@ -5,13 +5,11 @@

55, glibcLocales

66, entrypoints

77, bleach

8−, beautifulsoup4

98, mistune

109, nbclient

1110, jinja2

1211, pygments

1312, traitlets

14−, testpath

1513, jupyter_core

1614, jupyterlab-pygments

1715, nbformat

@@ -20,15 +18,18 @@

2018, tornado

2119, jupyter-client

2220, defusedxml

21+, tinycss2

22+, beautifulsoup4

2323}:

2424

2525buildPythonPackage rec {

2626 pname = "nbconvert";

27− version = "6.4.5";

27+ version = "6.5.0";

28+ format = "setuptools";

2829

2930 src = fetchPypi {

3031 inherit pname version;

31− sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4=";

32+ hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";

3233 };

3334

3435 # Add $out/share/jupyter to the list of paths that are used to search for

@@ -44,10 +45,10 @@ buildPythonPackage rec {

4445 checkInputs = [ pytestCheckHook glibcLocales ];

4546

4647 propagatedBuildInputs = [

47− entrypoints bleach mistune jinja2 pygments traitlets testpath

48+ entrypoints bleach mistune jinja2 pygments traitlets

4849 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client

49− defusedxml beautifulsoup4

50− (nbclient.override { doCheck = false; }) # avoid infinite recursion

50+ defusedxml tinycss2 beautifulsoup4

51+ nbclient

5152 jupyterlab-pygments

5253 ];

5354

pkgs/development/python-modules/nvchecker/default.nix+2−2

@@ -20,7 +20,7 @@

2020

2121buildPythonPackage rec {

2222 pname = "nvchecker";

23− version = "2.7";

23+ version = "2.8";

2424 format = "setuptools";

2525

2626 disabled = pythonOlder "3.7";

@@ -29,7 +29,7 @@ buildPythonPackage rec {

2929 owner = "lilydjwg";

3030 repo = pname;

3131 rev = "v${version}";

32− hash = "sha256-OPUqkHLG8PUlD5NP7q/BpKUvmAA8Jk1NvsPPVbImv0A=";

32+ hash = "sha256-ikpjR1fEZBsSOE20jxTyarb9Pqn3Fz+TYOzXp0g4G9c=";

3333 };

3434

3535 nativeBuildInputs = [

pkgs/development/python-modules/openstep-plist/default.nixnew file+31

@@ -0,0 +1,31 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, setuptools-scm

5+, pytestCheckHook

6+, cython

7+, pythonImportsCheckHook

8+}:

9+

10+buildPythonPackage rec {

11+ pname = "openstep-plist";

12+ version = "0.3.0";

13+

14+ src = fetchPypi {

15+ pname = "openstep_plist";

16+ inherit version;

17+ sha256 = "sha256-KO4sGKjod5BwUFQ1MU2S1dG0DyiJ06mdroMbRDsugBk=";

18+ extension = "zip";

19+ };

20+

21+ nativeBuildInputs = [ setuptools-scm cython ];

22+ checkInputs = [ pytestCheckHook ];

23+ pythonImportsCheck = [ "openstep_plist" ];

24+

25+ meta = {

26+ description = "Parser for the 'old style' OpenStep property list format also known as ASCII plist";

27+ homepage = "https://github.com/fonttools/openstep-plist";

28+ license = lib.licenses.mit;

29+ maintainers = [ lib.maintainers.BarinovMaxim ];

30+ };

31+}

pkgs/development/python-modules/peaqevcore/default.nix+2−2

@@ -6,14 +6,14 @@

66

77buildPythonPackage rec {

88 pname = "peaqevcore";

9− version = "0.0.21";

9+ version = "0.0.22";

1010 format = "setuptools";

1111

1212 disabled = pythonOlder "3.7";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− hash = "sha256-NTwLo/RtwSf3a43dAv8EK1NWuCsVjL+8+KozjvaPUm4=";

16+ hash = "sha256-ye8evqkOy08wHYohVOpXB2pfPN/vsK9GnPnL/nbVZU0=";

1717 };

1818

1919 postPatch = ''

pkgs/development/python-modules/py-desmume/default.nix+3−14

@@ -3,29 +3,18 @@

33, alsa-lib, soundtouch, openal

44}:

55

6−let

7− desmume = fetchFromGitHub {

8− owner = "SkyTemple";

9− repo = "desmume";

10− rev = "8e7af8ada883b7e91344985236f7c7c04ee795d7";

11− sha256 = "0svmv2rch9q347gbpbws4agymas8n014gh1ssaf91wx7jwn53842";

12− };

13−in

146buildPythonPackage rec {

157 pname = "py-desmume";

16− version = "0.0.3.post2";

8+ version = "0.0.4.post2";

179

1810 src = fetchFromGitHub {

1911 owner = "SkyTemple";

2012 repo = pname;

2113 rev = version;

22− sha256 = "1chsg70k8kqnlasn88b04ww3yl0lay1bjxvz6lhp6s2cvsxv03x1";

14+ sha256 = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY=";

15+ fetchSubmodules = true;

2316 };

2417

25− postPatch = ''

26− cp -R --no-preserve=mode ${desmume} __build_desmume

27− '';

28−

2918 buildInputs = [ GitPython libpcap SDL2 alsa-lib soundtouch openal ];

3019 nativeBuildInputs = [ meson ninja pkg-config ];

3120 propagatedBuildInputs = [ pillow pygobject3 ];

pkgs/development/python-modules/pychromecast/default.nix+2−2

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "pychromecast";

13− version = "11.0.0";

13+ version = "12.0.0";

1414 format = "setuptools";

1515

1616 disabled = !isPy3k;

@@ -18,7 +18,7 @@ buildPythonPackage rec {

1818 src = fetchPypi {

1919 pname = "PyChromecast";

2020 inherit version;

21− sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY=";

21+ sha256 = "sha256-asvEJix8/3glVhenll/rlTwSZdX0LRPMX4uCSURohJ4=";

2222 };

2323

2424 propagatedBuildInputs = [

pkgs/development/python-modules/pydeconz/default.nix+6−4

@@ -1,6 +1,7 @@

11{ lib

22, aiohttp

33, aioresponses

4+, async-timeout

45, buildPythonPackage

56, fetchFromGitHub

67, pytest-aiohttp

@@ -10,20 +11,21 @@

1011

1112buildPythonPackage rec {

1213 pname = "pydeconz";

13− version = "87";

14+ version = "91";

1415 format = "setuptools";

1516

16− disabled = pythonOlder "3.7";

17+ disabled = pythonOlder "3.9";

1718

1819 src = fetchFromGitHub {

1920 owner = "Kane610";

2021 repo = "deconz";

21− rev = "v${version}";

22− sha256 = "sha256-scNTHbUL8TOhkUJyib4cgL8A4gZ73asmFLi8aGw3sX8=";

22+ rev = "refs/tags/v${version}";

23+ hash = "sha256-JoQapWQZPjP9TD6gnIGE23hzBt22kAWDKreTzq3GBWQ=";

2324 };

2425

2526 propagatedBuildInputs = [

2627 aiohttp

28+ async-timeout

2729 ];

2830

2931 checkInputs = [

pkgs/development/python-modules/pyeapi/default.nix+36−8

@@ -1,10 +1,11 @@

11{ lib

22, buildPythonPackage

3−, pythonAtLeast

43, fetchFromGitHub

4+, fetchpatch

5+, mock

56, netaddr

67, pytestCheckHook

7−, mock

8+, pythonOlder

89}:

910

1011buildPythonPackage rec {

@@ -12,8 +13,7 @@ buildPythonPackage rec {

1213 version = "0.8.4";

1314 format = "pyproject";

1415

15− # https://github.com/arista-eosplus/pyeapi/issues/189

16− disabled = pythonAtLeast "3.10";

16+ disabled = pythonOlder "3.7";

1717

1818 src = fetchFromGitHub {

1919 owner = "arista-eosplus";

@@ -22,21 +22,49 @@ buildPythonPackage rec {

2222 sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b";

2323 };

2424

25− propagatedBuildInputs = [ netaddr ];

25+ propagatedBuildInputs = [

26+ netaddr

27+ ];

2628

2729 checkInputs = [

2830 mock

2931 pytestCheckHook

3032 ];

3133

32− pytestFlagsArray = [ "test/unit" ];

34+ patches = [

35+ # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223

36+ (fetchpatch {

37+ name = "fix-collection-usage.patch";

38+ url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch";

39+ sha256 = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8=";

40+ })

41+ (fetchpatch {

42+ name = "fix-collection-usage-2.patch";

43+ url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch";

44+ sha256 = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo=";

45+ excludes = [

46+ ".github/workflows/ci.yml"

47+ ];

48+ })

49+ (fetchpatch {

50+ name = "fix-collection-usage-3.patch";

51+ url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch";

52+ sha256 = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE=";

53+ })

54+ ];

3355

34− pythonImportsCheck = [ "pyeapi" ];

56+ pytestFlagsArray = [

57+ "test/unit"

58+ ];

59+

60+ pythonImportsCheck = [

61+ "pyeapi"

62+ ];

3563

3664 meta = with lib; {

3765 description = "Client for Arista eAPI";

3866 homepage = "https://github.com/arista-eosplus/pyeapi";

3967 license = licenses.bsd3;

40− maintainers = [ maintainers.astro ];

68+ maintainers = with maintainers; [ astro ];

4169 };

4270}

pkgs/development/python-modules/pyevilgenius/default.nix+2−2

@@ -8,7 +8,7 @@

88

99buildPythonPackage rec {

1010 pname = "pyevilgenius";

11− version = "1.0.0";

11+ version = "2.0.0";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.8";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "home-assistant-libs";

1818 repo = pname;

1919 rev = version;

20− sha256 = "06xnl93sqklg7gx0z50vm79xwww0yyw05c1yynajc9aijfi8cmi3";

20+ sha256 = "sha256-wjC32oq/lW3Z4XB+4SILRKIOuCgBKk1gruOo4uc/4/o=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/pyinfra/default.nix+2−2

@@ -17,14 +17,14 @@

1717

1818buildPythonPackage rec {

1919 pname = "pyinfra";

20− version = "2.0.1";

20+ version = "2.0.2";

2121 format = "setuptools";

2222

2323 disabled = pythonOlder "3.7";

2424

2525 src = fetchPypi {

2626 inherit pname version;

27− sha256 = "sha256-157NtpA85FS27Ln1Xsvq5/qumSsr0WSDOhG0UwMUnRE=";

27+ sha256 = "sha256-AW2pOyLqyugTSM7PE4oR9ZwD1liNpdD636QA3ElafG0=";

2828 };

2929

3030 propagatedBuildInputs = [

pkgs/development/python-modules/pyinsteon/default.nix+3−3

@@ -16,7 +16,7 @@

1616

1717buildPythonPackage rec {

1818 pname = "pyinsteon";

19− version = "1.0.16";

19+ version = "1.1.0";

2020 format = "setuptools";

2121

2222 disabled = pythonOlder "3.6";

@@ -24,8 +24,8 @@ buildPythonPackage rec {

2424 src = fetchFromGitHub {

2525 owner = pname;

2626 repo = pname;

27− rev = version;

28− hash = "sha256-V0niLQAplN/uZ0YeN6g8uax3U/d0LUT4aXxe3ENXIHc=";

27+ rev = "refs/tags/${version}";

28+ hash = "sha256-YoDCvYpbw06MXx371SNarrtQ0t4xlhwm1CBbl524P7c=";

2929 };

3030

3131 propagatedBuildInputs = [

pkgs/development/python-modules/pykulersky/default.nix+2−2

@@ -11,7 +11,7 @@

1111

1212buildPythonPackage rec {

1313 pname = "pykulersky";

14− version = "0.5.3";

14+ version = "0.5.4";

1515 format = "setuptools";

1616

1717 disabled = pythonOlder "3.6";

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "emlove";

2121 repo = pname;

2222 rev = version;

23− sha256 = "sha256-l3obfs5zo5DqArsDml8EZ+/uzab35Jjsuzw6U1XFJ3k=";

23+ sha256 = "sha256-voD4tR+k5TKGjLXFK94GJy4+wUoP2cSFc5BWkCiinOg=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/pymyq/default.nix+3−3

@@ -9,14 +9,14 @@

99

1010buildPythonPackage rec {

1111 pname = "pymyq";

12− version = "3.1.4";

12+ version = "3.1.5";

1313 disabled = pythonOlder "3.8";

1414

1515 src = fetchFromGitHub {

1616 owner = "arraylabs";

1717 repo = pname;

18− rev = "v${version}";

19− sha256 = "sha256-B8CnyM0nQr8HWnD5toMd8A57j/UtnQ2aWys0netOAtA=";

18+ rev = "refs/tags/v${version}";

19+ sha256 = "sha256-/2eWB4rtHPptfc8Tm0CGk0UB+Hq1EmNhWmdrpPiUJcw=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/pynetgear/default.nix+2−2

@@ -7,7 +7,7 @@

77

88buildPythonPackage rec {

99 pname = "pynetgear";

10− version = "0.9.4";

10+ version = "0.10.0";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.7";

@@ -16,7 +16,7 @@ buildPythonPackage rec {

1616 owner = "MatMaul";

1717 repo = pname;

1818 rev = "refs/tags/${version}";

19− sha256 = "sha256-/oxwUukYq/a0WeO/XhkMW3Jj7I1icZZUDwh1mdbGi08=";

19+ sha256 = "sha256-l+hfE1YdSoMWLonSWKX0809M0OCYxpcvPd4gV9mS4DI=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/pynws/default.nix+2−2

@@ -13,14 +13,14 @@

1313

1414buildPythonPackage rec {

1515 pname = "pynws";

16− version = "1.3.2";

16+ version = "1.4.1";

1717 disabled = pythonOlder "3.6";

1818

1919 src = fetchFromGitHub {

2020 owner = "MatthewFlamm";

2121 repo = pname;

2222 rev = "v${version}";

23− sha256 = "0d2x3vlm444aar4wbdg48xzpgwng5m7i2d7h1z0pb6c514747sd1";

23+ sha256 = "sha256-hAUD92wlQZ0BZ++e/KdIOgTzavmUkrH3esDhI3mbl5Y=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/pyrogram/default.nix+2−2

@@ -12,7 +12,7 @@

1212

1313buildPythonPackage rec {

1414 pname = "pyrogram";

15− version = "2.0.14";

15+ version = "2.0.16";

1616

1717 disabled = pythonOlder "3.7";

1818

@@ -20,7 +20,7 @@ buildPythonPackage rec {

2020 owner = "pyrogram";

2121 repo = "pyrogram";

2222 rev = "v${version}";

23− hash = "sha256-uPScRNbN0XjdfokTNgzCdiVNRucDzNPR/60/IHEDUrg=";

23+ hash = "sha256-uRGLk8XTHimKtkVjPPe2ohTPv3UiaxmkRywQY4iPHyg=";

2424 };

2525

2626 propagatedBuildInputs = [

pkgs/development/python-modules/python-sql/default.nix+24−8

@@ -1,18 +1,34 @@

1−{ lib, fetchPypi, buildPythonPackage }:

1+{ lib

2+, fetchPypi

3+, buildPythonPackage

4+, pytestCheckHook

5+, pythonOlder

6+}:

27

38buildPythonPackage rec {

49 pname = "python-sql";

5− version = "1.3.0";

10+ version = "1.4.0";

11+ format = "setuptools";

12+

13+ disabled = pythonOlder "3.7";

614

715 src = fetchPypi {

816 inherit pname version;

9− sha256 = "9d603a6273f2f5966bab7ce77e1f50e88818d5237ac85e566e2dc84ebfabd176";

17+ hash = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY=";

1018 };

1119

12− meta = {

13− homepage = "https://python-sql.tryton.org/";

14− description = "A library to write SQL queries in a pythonic way";

15− maintainers = with lib.maintainers; [ johbo ];

16− license = lib.licenses.bsd3;

20+ checkInputs = [

21+ pytestCheckHook

22+ ];

23+

24+ pythonImportsCheck = [

25+ "sql"

26+ ];

27+

28+ meta = with lib; {

29+ description = "Library to write SQL queries in a pythonic way";

30+ homepage = "https://pypi.org/project/python-sql/";

31+ license = licenses.bsd3;

32+ maintainers = with maintainers; [ johbo ];

1733 };

1834}

pkgs/development/python-modules/pytomorrowio/default.nix+4−2

@@ -3,19 +3,20 @@

33, pythonOlder

44, fetchPypi

55, aiohttp

6+, pytest-aiohttp

67, pytest-asyncio

78, pytestCheckHook

89}:

910

1011buildPythonPackage rec {

1112 pname = "pytomorrowio";

12− version = "0.2.1";

13+ version = "0.3.3";

1314

1415 disabled = pythonOlder "3.7";

1516

1617 src = fetchPypi {

1718 inherit pname version;

18− sha256 = "aabb41436fb5834b687d73b334d95be07a18d5943d27a1fd06271b749558ba0e";

19+ sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62";

1920 };

2021

2122 propagatedBuildInputs = [

@@ -23,6 +24,7 @@ buildPythonPackage rec {

2324 ];

2425

2526 checkInputs = [

27+ pytest-aiohttp

2628 pytest-asyncio

2729 pytestCheckHook

2830 ];

pkgs/development/python-modules/sentry-sdk/default.nix+2−2

@@ -41,7 +41,7 @@

4141

4242buildPythonPackage rec {

4343 pname = "sentry-sdk";

44− version = "1.5.10";

44+ version = "1.5.11";

4545 format = "setuptools";

4646

4747 disabled = pythonOlder "3.7";

@@ -50,7 +50,7 @@ buildPythonPackage rec {

5050 owner = "getsentry";

5151 repo = "sentry-python";

5252 rev = version;

53− hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0=";

53+ hash = "sha256-2WN18hzOn/gomNvQNbm9R8CcxN6G1XxoodBHqsG6es0=";

5454 };

5555

5656 propagatedBuildInputs = [

pkgs/development/python-modules/signedjson/default.nix+31−18

@@ -1,40 +1,53 @@

11{ lib

22, buildPythonPackage

3−, fetchPypi

4−, fetchpatch

53, canonicaljson

6−, unpaddedbase64

7−, pynacl

8−, typing-extensions

9−, setuptools-scm

4+, fetchPypi

105, importlib-metadata

6+, pynacl

7+, pytestCheckHook

118, pythonOlder

9+, setuptools-scm

10+, typing-extensions

11+, unpaddedbase64

1212}:

1313

1414buildPythonPackage rec {

1515 pname = "signedjson";

16− version = "1.1.1";

16+ version = "1.1.4";

17+ format = "setuptools";

18+

19+ disabled = pythonOlder "3.7";

1720

1821 src = fetchPypi {

1922 inherit pname version;

20− sha256 = "0280f8zyycsmd7iy65bs438flm7m8ffs1kcxfbvhi8hbazkqc19m";

23+ hash = "sha256-zZHFavU/Fp7wMsYunEoyktwViGaTMxjQWS40Yts9ZJI=";

2124 };

2225

23− patches = [

24− # Do not require importlib_metadata on python 3.8

25− (fetchpatch {

26− url = "https://github.com/matrix-org/python-signedjson/commit/c40c83f844fee3c1c7b0c5d1508f87052334b4e5.patch";

27− sha256 = "109f135zn9azg5h1ljw3v94kpvnzmlqz1aiknpl5hsqfa3imjca1";

28− })

26+ nativeBuildInputs = [

27+ setuptools-scm

28+ ];

29+

30+ propagatedBuildInputs = [

31+ canonicaljson

32+ unpaddedbase64

33+ pynacl

34+ ] ++ lib.optionals (pythonOlder "3.8") [

35+ importlib-metadata

36+ typing-extensions

37+ ];

38+

39+ checkInputs = [

40+ pytestCheckHook

2941 ];

3042

31− nativeBuildInputs = [ setuptools-scm ];

32− propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]

33− ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];

43+ pythonImportsCheck = [

44+ "signedjson"

45+ ];

3446

3547 meta = with lib; {

36− homepage = "https://pypi.org/project/signedjson/";

3748 description = "Sign JSON with Ed25519 signatures";

49+ homepage = "https://github.com/matrix-org/python-signedjson";

3850 license = licenses.asl20;

51+ maintainers = with maintainers; [ ];

3952 };

4053}

pkgs/development/python-modules/simplisafe-python/default.nix+6−2

@@ -3,6 +3,7 @@

33, aresponses

44, asynctest

55, backoff

6+, beautifulsoup4

67, buildPythonPackage

78, docutils

89, fetchFromGitHub

@@ -19,7 +20,7 @@

1920

2021buildPythonPackage rec {

2122 pname = "simplisafe-python";

22− version = "2022.03.3";

23+ version = "2022.05.0";

2324 format = "pyproject";

2425

2526 disabled = pythonOlder "3.8";

@@ -28,7 +29,7 @@ buildPythonPackage rec {

2829 owner = "bachya";

2930 repo = pname;

3031 rev = version;

31− sha256 = "sha256-19+p39uZO9pSDzH6YkS9ZDVA4zyl9oJ325yTQ5+SQcw=";

32+ sha256 = "sha256-NXEhjj8L7MPAdQwjqe6u+L9vi/mIIA8TxDpM5q4uUrU=";

3233 };

3334

3435 nativeBuildInputs = [

@@ -38,6 +39,7 @@ buildPythonPackage rec {

3839 propagatedBuildInputs = [

3940 aiohttp

4041 backoff

42+ beautifulsoup4

4143 docutils

4244 pytz

4345 voluptuous

@@ -62,6 +64,8 @@ buildPythonPackage rec {

6264 # simplipy/api.py:253: InvalidCredentialsError

6365 "test_request_error_failed_retry"

6466 "test_update_error"

67+ # ClientConnectorError: Cannot connect to host auth.simplisafe.com:443 ssl:default [Temporary failure in name resolution]

68+ "test_client_async_from_refresh_token_unknown_error"

6569 ];

6670

6771 disabledTestPaths = [

pkgs/development/python-modules/skia-pathops/default.nixnew file+43

@@ -0,0 +1,43 @@

1+{ lib

2+, buildPythonPackage

3+, cython

4+, ninja

5+, setuptools-scm

6+, setuptools

7+, fetchPypi

8+, gn

9+, pytestCheckHook

10+}:

11+

12+buildPythonPackage rec {

13+ pname = "skia-pathops";

14+ version = "0.7.2";

15+

16+ src = fetchPypi {

17+ pname = "skia-pathops";

18+ inherit version;

19+ extension = "zip";

20+ sha256 = "sha256-Gdhcmv77oVr5KxPIiJlk935jgvWPQsYEC0AZ6yjLppA=";

21+ };

22+

23+ postPatch = ''

24+ substituteInPlace setup.py \

25+ --replace "build_cmd = [sys.executable, build_skia_py, build_dir]" \

26+ 'build_cmd = [sys.executable, build_skia_py, "--no-fetch-gn", "--no-virtualenv", "--gn-path", "${gn}/bin/gn", build_dir]'

27+ '';

28+

29+ nativeBuildInputs = [ cython ninja setuptools-scm ];

30+

31+ propagatedBuildInputs = [ setuptools ];

32+

33+ checkInputs = [ pytestCheckHook ];

34+

35+ pythonImportsCheck = [ "pathops" ];

36+

37+ meta = {

38+ description = "Python access to operations on paths using the Skia library";

39+ homepage = "https://skia.org/dev/present/pathops";

40+ license = lib.licenses.bsd3;

41+ maintainers = [ lib.maintainers.BarinovMaxim ];

42+ };

43+}

pkgs/development/python-modules/skytemple-files/default.nix+2−2

@@ -4,13 +4,13 @@

44

55buildPythonPackage rec {

66 pname = "skytemple-files";

7− version = "1.3.3";

7+ version = "1.3.9";

88

99 src = fetchFromGitHub {

1010 owner = "SkyTemple";

1111 repo = pname;

1212 rev = version;

13− sha256 = "01j6khn60mdmz32xkpqrzwdqibmpdpi2wvwzxgdnaim9sq0fdqws";

13+ sha256 = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0=";

1414 fetchSubmodules = true;

1515 };

1616

pkgs/development/python-modules/skytemple-rust/default.nix+15−6

@@ -1,25 +1,34 @@

1−{ lib, stdenv, buildPythonPackage, fetchFromGitHub, libiconv, rustPlatform, setuptools-rust }:

1+{ lib

2+, stdenv

3+, buildPythonPackage

4+, fetchFromGitHub

5+, libiconv

6+, Foundation

7+, rustPlatform

8+, setuptools-rust }:

29

310buildPythonPackage rec {

411 pname = "skytemple-rust";

5− version = "unstable-2021-08-11";

12+ version = "1.3.7";

613

714 src = fetchFromGitHub {

815 owner = "SkyTemple";

916 repo = pname;

10− rev = "e306e5edc096cb3fef25585d9ca5a2817543f1cd";

11− sha256 = "0ja231gsy9i1z6jsaywawz93rnyjhldngi5i787nhnf88zrwx9ml";

17+ rev = version;

18+ sha256 = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0=";

1219 };

1320

1421 cargoDeps = rustPlatform.fetchCargoTarball {

1522 inherit src;

1623 name = "${pname}-${version}";

17− sha256 = "0gjvfblyv72m0nqv90m7qvbdnazsh5ind1pxwqz83vm4zjh9a873";

24+ sha256 = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";

1825 };

1926

20− buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

27+ buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];

2128 nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);

2229

30+ GETTEXT_SYSTEM = true;

31+

2332 doCheck = false; # there are no tests

2433 pythonImportsCheck = [ "skytemple_rust" ];

2534

pkgs/development/python-modules/skytemple-ssb-debugger/default.nix+2−2

@@ -5,13 +5,13 @@

55

66buildPythonPackage rec {

77 pname = "skytemple-ssb-debugger";

8− version = "1.3.0";

8+ version = "1.3.8.post2";

99

1010 src = fetchFromGitHub {

1111 owner = "SkyTemple";

1212 repo = pname;

1313 rev = version;

14− sha256 = "12v0071125m8xjcp2hxm9qvs0qw4hdhkx8r3gbl0plm22vl3fk0d";

14+ sha256 = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow=";

1515 };

1616

1717 buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];

pkgs/development/python-modules/slack-sdk/default.nix+3−3

@@ -20,7 +20,7 @@

2020

2121buildPythonPackage rec {

2222 pname = "slack-sdk";

23− version = "3.15.2";

23+ version = "3.16.0";

2424 format = "setuptools";

2525

2626 disabled = pythonOlder "3.6";

@@ -28,8 +28,8 @@ buildPythonPackage rec {

2828 src = fetchFromGitHub {

2929 owner = "slackapi";

3030 repo = "python-slack-sdk";

31− rev = "v${version}";

32− sha256 = "sha256-lhdh4Eo7yIsukXoKI6Ss793fYmAu91O1UElmxV9xAc4=";

31+ rev = "refs/tags/v${version}";

32+ sha256 = "sha256-odu8/xT2TuOLT2jRztPDUHcGMfmHvWrsnDRkp4yGaY0=";

3333 };

3434

3535 propagatedBuildInputs = [

pkgs/development/python-modules/snowflake-connector-python/default.nix+2−2

@@ -24,12 +24,12 @@

2424

2525buildPythonPackage rec {

2626 pname = "snowflake-connector-python";

27− version = "2.7.6";

27+ version = "2.7.7";

2828 disabled = pythonOlder "3.6";

2929

3030 src = fetchPypi {

3131 inherit pname version;

32− sha256 = "sha256-MxYo4MoCdkSSuDteR3A72FcRWuKTRrct4y1/t8nsVIs=";

32+ sha256 = "sha256-OZL/ClHY8yatR0AJVyomBq7AjBwQwm5f9UnmdlL8IFw=";

3333 };

3434

3535 postPatch = ''

pkgs/development/python-modules/sqlalchemy-mixins/default.nix+3−3

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "sqlalchemy-mixins";

13− version = "1.5.1";

13+ version = "1.5.3";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.8";

@@ -18,8 +18,8 @@ buildPythonPackage rec {

1818 src = fetchFromGitHub {

1919 owner = "absent1706";

2020 repo = pname;

21− rev = "v${version}";

22− sha256 = "sha256-HZiv7F0/UatgY3KlILgzywrK5NJE/tDe6B8/smeYwlM=";

21+ rev = "refs/tags/v${version}";

22+ sha256 = "sha256-GmMxya6aJ7MMqQ3KSqO3f/cbwgWvQYhEVXtGi6fhP1M=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/python-modules/sqlmap/default.nix+2−2

@@ -7,11 +7,11 @@

77

88buildPythonPackage rec {

99 pname = "sqlmap";

10− version = "1.6.4";

10+ version = "1.6.5";

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "sha256-6RKJ5a8Yl+SnWgdfrTIwY0m1JyY6W9fhZk6pTZiBVx8=";

14+ sha256 = "sha256-EdiLTzjRigJLsslWSymLNajvUDimBt4d4EBugxVYueg=";

1515 };

1616

1717 postPatch = ''

pkgs/development/python-modules/stripe/default.nix+2−2

@@ -7,14 +7,14 @@

77

88buildPythonPackage rec {

99 pname = "stripe";

10− version = "2.74.0";

10+ version = "2.75.0";

1111 format = "setuptools";

1212

1313 disabled = pythonOlder "3.7";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− hash = "sha256-+o7StcJBv9peiYTWBnIfnDUqodiG3sVQJBbKBOALktA=";

17+ hash = "sha256-iAjXsbeX+vZW8FtaJRIB5lR3EEkDUU/dPpLpdHSxLME=";

1818 };

1919

2020 propagatedBuildInputs = [

pkgs/development/python-modules/superqt/default.nix+3−3

@@ -11,13 +11,13 @@

1111

1212buildPythonPackage rec {

1313 pname = "superqt";

14− version = "0.3.1";

14+ version = "0.3.2";

1515

1616 src = fetchFromGitHub {

1717 owner = "napari";

1818 repo = pname;

19− rev = "v${version}";

20− sha256 = "sha256-DPjJxOgybNvZ3YvYHr48fmx59Puck61Dzm2G4M9qKo4=";

19+ rev = "refs/tags/v${version}";

20+ sha256 = "sha256-P1uKQaYgXVTE7DK5w4Ct4aJyfdQ6jUPfaTOcYkpo9pc=";

2121 };

2222 format = "pyproject";

2323 nativeBuildInputs = [ setuptools-scm ];

pkgs/development/python-modules/textual/default.nix+16−13

@@ -1,38 +1,34 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4−, fetchpatch

54, poetry-core

65, rich

76, typing-extensions

87, pytestCheckHook

8+, pythonOlder

99}:

1010

1111buildPythonPackage rec {

1212 pname = "textual";

13− version = "0.1.15";

13+ version = "0.1.18";

1414 format = "pyproject";

1515

16+ disabled = pythonOlder "3.7";

17+

1618 src = fetchFromGitHub {

1719 owner = "Textualize";

1820 repo = pname;

1921 rev = "v${version}";

20− sha256 = "1jmjais0yq8dwi9yikgrxdw4rwp8aq1981nhfxn0v97jb07i4cj6";

22+ sha256 = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";

2123 };

2224

23− patches = [

24− (fetchpatch {

25− # v0.1.15 git tag has 0.1.14 in pyproject.toml

26− name = "version.patch";

27− url = "https://github.com/Textualize/textual/commit/1b8d7d184e10889002425641222702afba508aea.patch";

28− sha256 = "1nfqp5f8ba3fg0ar3lghrlqypbjbsaywxaz3iiff8fy8j2wgsppp";

29− })

25+ nativeBuildInputs = [

26+ poetry-core

3027 ];

3128

32− nativeBuildInputs = [ poetry-core ];

33−

3429 propagatedBuildInputs = [

3530 rich

31+ ] ++ lib.optionals (pythonOlder "3.9") [

3632 typing-extensions

3733 ];

3834

@@ -40,7 +36,14 @@ buildPythonPackage rec {

4036 pytestCheckHook

4137 ];

4238

43− pythonImportsCheck = [ "textual" ];

39+ postPatch = ''

40+ substituteInPlace pyproject.toml \

41+ --replace 'rich = "^12.3.0"' 'rich = "*"'

42+ '';

43+

44+ pythonImportsCheck = [

45+ "textual"

46+ ];

4447

4548 meta = with lib; {

4649 description = "TUI framework for Python inspired by modern web development";

pkgs/development/python-modules/total-connect-client/default.nix+2−2

@@ -8,7 +8,7 @@

88

99buildPythonPackage rec {

1010 pname = "total-connect-client";

11− version = "2022.2.1";

11+ version = "2022.3";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "craigjmidwinter";

1818 repo = "total-connect-client";

1919 rev = version;

20− hash = "sha256-1/uqOxaJqrT+E+0ikNZX9AfIRRbpBSjh2nINrqGWxbY=";

20+ hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/ufo2ft/default.nix+2−2

@@ -12,13 +12,13 @@

1212

1313buildPythonPackage rec {

1414 pname = "ufo2ft";

15− version = "2.26.0";

15+ version = "2.27.0";

1616

1717 format = "setuptools";

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "sha256-1WQAs1ypWtLObgBzPtqtvHjkKnDWohu3PbI3bF7B0Sg=";

21+ sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE=";

2222 };

2323

2424 patches = [

pkgs/development/python-modules/ufoLib2/default.nix+3

@@ -5,6 +5,7 @@

55, fonttools

66, pytestCheckHook

77, fs

8+, setuptools-scm

89}:

910

1011buildPythonPackage rec {

@@ -25,6 +26,8 @@ buildPythonPackage rec {

2526 fs

2627 ];

2728

29+ nativeBuildInputs = [ setuptools-scm ];

30+

2831 checkInputs = [

2932 pytestCheckHook

3033 ];

pkgs/development/python-modules/voluptuous/default.nix+15−11

@@ -1,27 +1,31 @@

11{ lib

22, buildPythonPackage

3−, fetchPypi

4−, nose

3+, fetchFromGitHub

4+, pytestCheckHook

55}:

66

77buildPythonPackage rec {

88 pname = "voluptuous";

9− version = "0.13.0";

9+ version = "0.13.1";

1010

11− src = fetchPypi {

12− inherit pname version;

13− sha256 = "sha256-yuakUmtDS2QoFrNKAOEYbVpfXgyUirlNKpGOAeWHQGY=";

11+ src = fetchFromGitHub {

12+ owner = "alecthomas";

13+ repo = pname;

14+ rev = version;

15+ hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk=";

1416 };

1517

1618 checkInputs = [

17− nose

19+ pytestCheckHook

1820 ];

1921

20− checkPhase = ''

21− nosetests

22− '';

22+ pythonImportsCheck = [

23+ "voluptuous"

24+ ];

2325

24− pythonImportsCheck = [ "voluptuous" ];

26+ pytestFlagsArray = [

27+ "voluptuous/tests/"

28+ ];

2529

2630 meta = with lib; {

2731 description = "Python data validation library";

pkgs/development/python-modules/wandb/default.nix+20−12

@@ -12,6 +12,7 @@

1212, jsonref

1313, jsonschema

1414, matplotlib

15+, nbconvert

1516, nbformat

1617, pandas

1718, pathtools

@@ -36,7 +37,7 @@

3637

3738buildPythonPackage rec {

3839 pname = "wandb";

39− version = "0.12.15";

40+ version = "0.12.16";

4041 format = "setuptools";

4142

4243 disabled = pythonOlder "3.6";

@@ -45,7 +46,7 @@ buildPythonPackage rec {

4546 owner = pname;

4647 repo = "client";

4748 rev = "v${version}";

48− hash = "sha256-Fq+JwUEZP1QDFKYVyiR8DUU0GQV6fK50FW78qaWh+Mo=";

49+ hash = "sha256-ZY7nTj93piTEeHhW+H+nQ+ws2dDmmY6u3p7uz296PbA=";

4950 };

5051

5152 # setuptools is necessary since pkg_resources is required at runtime.

@@ -66,6 +67,20 @@ buildPythonPackage rec {

6667 shortuuid

6768 ];

6869

70+ # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf

71+ # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.

72+ # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to

73+ # why we don't put it in propagatedBuildInputs. Note that this is difficult to

74+ # test offline due to https://github.com/wandb/client/issues/3519.

75+ postInstall = ''

76+ mkdir -p $out/bin

77+ ln -s ${git}/bin/git $out/bin/git

78+ '';

79+

80+ preCheck = ''

81+ export HOME=$(mktemp -d)

82+ '';

83+

6984 checkInputs = [

7085 azure-core

7186 bokeh

@@ -73,6 +88,9 @@ buildPythonPackage rec {

7388 jsonref

7489 jsonschema

7590 matplotlib

91+ # Oddly enough, nbclient does not provide the `nbclient` module. Rather it's

92+ # available in nbconvert. See https://github.com/NixOS/nixpkgs/issues/171493#issuecomment-1116960488.

93+ nbconvert

7694 nbformat

7795 pandas

7896 pydantic

@@ -83,16 +101,6 @@ buildPythonPackage rec {

83101 tqdm

84102 ];

85103

86− # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf

87− # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128.

88− # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to

89− # why we don't put it in propagatedBuildInputs. Note that this is difficult to

90− # test offline due to https://github.com/wandb/client/issues/3519.

91− postInstall = ''

92− mkdir -p $out/bin

93− ln -s ${git}/bin/git $out/bin/git

94− '';

95−

96104 disabledTestPaths = [

97105 # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.

98106 "tests/test_cli.py"

pkgs/development/python-modules/webssh/default.nix+2−2

@@ -8,12 +8,12 @@

88

99buildPythonPackage rec {

1010 pname = "webssh";

11− version = "1.5.3";

11+ version = "1.6.0";

1212 format = "setuptools";

1313

1414 src = fetchPypi {

1515 inherit pname version;

16− hash = "sha256-Au6PE8jYm8LkEp0B1ymW//ZkrkcV0BauwufQmrHLEU4=";

16+ hash = "sha256-yqjwahh2METXD83geTGt5sUL+vmxbrYxj4KtwTxbD94=";

1717 };

1818

1919 propagatedBuildInputs = [

pkgs/development/python-modules/xknx/default.nix+2−2

@@ -12,7 +12,7 @@

1212

1313buildPythonPackage rec {

1414 pname = "xknx";

15− version = "0.21.1";

15+ version = "0.21.2";

1616 format = "setuptools";

1717

1818 disabled = pythonOlder "3.8";

@@ -21,7 +21,7 @@ buildPythonPackage rec {

2121 owner = "XKNX";

2222 repo = pname;

2323 rev = "refs/tags/${version}";

24− sha256 = "sha256-QNy/jUh/kIj6sabWnmC5L00ikBTrVmOEp6mFBya29WM=";

24+ sha256 = "sha256-GEjrqqmlGA6wG5x89AZXd8FLvrKEzCLmVhhZ7FxDB+w=";

2525 };

2626

2727 propagatedBuildInputs = [

pkgs/development/python-modules/zeroconf/default.nix+2

@@ -39,6 +39,8 @@ buildPythonPackage rec {

3939 "test_launch_and_close_v4_v6"

4040 "test_launch_and_close_v6_only"

4141 "test_integration_with_listener_ipv6"

42+ # Starting with 0.38.5: AssertionError: assert [('add', '_ht..._tcp.local.')]

43+ "test_service_browser_expire_callbacks"

4244 ] ++ lib.optionals stdenv.isDarwin [

4345 "test_lots_of_names"

4446 ];

pkgs/development/python-modules/zigpy/default.nix+4−2

@@ -4,6 +4,7 @@

44, asynctest

55, buildPythonPackage

66, crccheck

7+, cryptography

78, fetchFromGitHub

89, pycryptodome

910, pytest-aiohttp

@@ -15,7 +16,7 @@

1516

1617buildPythonPackage rec {

1718 pname = "zigpy";

18− version = "0.44.2";

19+ version = "0.45.1";

1920 format = "setuptools";

2021

2122 disabled = pythonOlder "3.7";

@@ -24,13 +25,14 @@ buildPythonPackage rec {

2425 owner = "zigpy";

2526 repo = "zigpy";

2627 rev = version;

27− sha256 = "sha256-E6SeuVu5UdWL5Tx39UQymNhABltR+qVHANYWuCh+h6I=";

28+ sha256 = "sha256-85Bi8qjbUKLXFW7VGOxzelMa1gY9giGeQRmOeoZ1idE=";

2829 };

2930

3031 propagatedBuildInputs = [

3132 aiohttp

3233 aiosqlite

3334 crccheck

35+ cryptography

3436 pycryptodome

3537 voluptuous

3638 ];

pkgs/development/python-modules/zwave-js-server-python/default.nix+2−2

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "zwave-js-server-python";

13− version = "0.35.3";

13+ version = "0.36.1";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.8";

@@ -19,7 +19,7 @@ buildPythonPackage rec {

1919 owner = "home-assistant-libs";

2020 repo = pname;

2121 rev = version;

22− sha256 = "sha256-vM5GEqq32VdC5UjGVlnrN8/LRcCHHkJFzEbaA2Snte8=";

22+ sha256 = "sha256-XVFOx0f5lBh5i7q8XEb4qd0Lu09jEEYKyJUJBqXwirc=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/quickemu/default.nix+2−2

@@ -11,7 +11,7 @@

1111, cdrtools

1212, usbutils

1313, util-linux

14−, spicy

14+, spice-gtk

1515, swtpm

1616, wget

1717, xdg-user-dirs

@@ -32,7 +32,7 @@ let

3232 cdrtools

3333 usbutils

3434 util-linux

35− spicy

35+ spice-gtk

3636 swtpm

3737 wget

3838 xdg-user-dirs

pkgs/development/tools/analysis/checkov/default.nix+3−2

@@ -32,13 +32,13 @@ with py.pkgs;

3232

3333buildPythonApplication rec {

3434 pname = "checkov";

35− version = "2.0.1102";

35+ version = "2.0.1110";

3636

3737 src = fetchFromGitHub {

3838 owner = "bridgecrewio";

3939 repo = pname;

4040 rev = version;

41− hash = "sha256-OPYlgj8jdgCQJddy9UUXMjHJtQcoMrZbghgPUdyUV5Y=";

41+ hash = "sha256-HtXJGi20SbbOofL8TAZDZ9L3aFVx33Xz+QS/f7NxYFI=";

4242 };

4343

4444 nativeBuildInputs = with py.pkgs; [

@@ -89,6 +89,7 @@ buildPythonApplication rec {

8989 pytest-mock

9090 pytest-xdist

9191 pytestCheckHook

92+ responses

9293 ];

9394

9495 postPatch = ''

pkgs/development/tools/analysis/codeql/default.nix+2−2

@@ -2,7 +2,7 @@

22

33stdenv.mkDerivation rec {

44 pname = "codeql";

5− version = "2.8.2";

5+ version = "2.8.5";

66

77 dontConfigure = true;

88 dontBuild = true;

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

1010

1111 src = fetchzip {

1212 url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";

13− sha256 = "sha256-F0tr4oQPgusLVCP5jSCYxl/xHbZLrVXd2FFYSJY3PPs=";

13+ sha256 = "sha256-HZJBqm196RgWR/14mfrLYQlU+4W3t0b4TXme04XkfKw=";

1414 };

1515

1616 nativeBuildInputs = [

pkgs/development/tools/build-managers/bloop/default.nix+16−46

@@ -1,6 +1,5 @@

11{ stdenv

22, fetchurl

3−, coursier

43, autoPatchelfHook

54, installShellFiles

65, makeWrapper

@@ -11,58 +10,34 @@

1110

1211stdenv.mkDerivation rec {

1312 pname = "bloop";

14− version = "1.4.13";

13+ version = "1.5.0";

1514

16− bloop-coursier-channel = fetchurl {

17− url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json";

18− sha256 = "VbvBAz7mXhgQtbrlB6uCSmZXLcdYaROJRSREbazAReo=";

19− };

15+ platform =

16+ if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"

17+ else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"

18+ else throw "unsupported platform";

2019

2120 bloop-bash = fetchurl {

2221 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bash-completions";

23− sha256 = "2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE=";

22+ sha256 = "sha256-2mt+zUEJvQ/5ixxFLZ3Z0m7uDSj/YE9sg/uNMjamvdE=";

2423 };

2524

2625 bloop-fish = fetchurl {

2726 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/fish-completions";

28− sha256 = "eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";

27+ sha256 = "sha256-eFESR6iPHRDViGv+Fk3sCvPgVAhk2L1gCG4LnfXO/v4=";

2928 };

3029

3130 bloop-zsh = fetchurl {

3231 url = "https://github.com/scalacenter/bloop/releases/download/v${version}/zsh-completions";

33− sha256 = "WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";

32+ sha256 = "sha256-WNMsPwBfd5EjeRbRtc06lCEVI2FVoLfrqL82OR0G7/c=";

3433 };

3534

36− bloop-coursier = stdenv.mkDerivation rec {

37− name = "${pname}-coursier-${version}";

38−

39− platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"

40− else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"

41− else throw "unsupported platform";

42−

43− dontUnpack = true;

44− installPhase = ''

45− runHook preInstall

46−

47− export COURSIER_CACHE=$(pwd)

48− export COURSIER_JVM_CACHE=$(pwd)

49−

50− mkdir channel

51− ln -s ${bloop-coursier-channel} channel/bloop.json

52− ${coursier}/bin/cs install --install-dir . --install-platform ${platform} --default-channels=false --channel channel --only-prebuilt=true bloop

53−

54− # Only keeping the binary, we'll wrap it ourselves

55− # This guarantees the output of this fixed-output derivation doesn't have references to itself

56− install -D -m 0755 .bloop.aux $out

57−

58− runHook postInstall

59− '';

60−

61− outputHashMode = "recursive";

62− outputHashAlgo = "sha256";

63− outputHash = if stdenv.isLinux && stdenv.isx86_64 then "sha256-AiF/ih15Jd0WuDP/0vU0vdaSo3FGjWXos+hNVBayFz4="

64− else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-LD23YpcNhWfioGDMqb1plqLy87ZHzT0zvIyc4O4WP5g="

65− else throw "unsupported platform";

35+ bloop-binary = fetchurl rec {

36+ url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";

37+ sha256 =

38+ if stdenv.isLinux && stdenv.isx86_64 then "sha256-jif9z05W17vjFgb146qWC3o44HmbnX05gWPlbXttYsE="

39+ else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-YOnXgKXsGrTu9P4I0NZW6ollZVQUXnbW8WtZTJmy+w0="

40+ else throw "unsupported platform";

6641 };

6742

6843 dontUnpack = true;

@@ -74,14 +49,9 @@ stdenv.mkDerivation rec {

7449 installPhase = ''

7550 runHook preInstall

7651

77− export COURSIER_CACHE=$(pwd)

78− export COURSIER_JVM_CACHE=$(pwd)

79−

80− install -D -m 0755 ${bloop-coursier} $out/.bloop-wrapped

52+ install -D -m 0755 ${bloop-binary} $out/.bloop-wrapped

8153

82− makeWrapper $out/.bloop-wrapped $out/bin/bloop \

83− --set CS_NATIVE_LAUNCHER true \

84− --set IS_CS_INSTALLED_LAUNCHER true

54+ makeWrapper $out/.bloop-wrapped $out/bin/bloop

8555

8656 #Install completions

8757 installShellCompletion --name bloop --bash ${bloop-bash}

pkgs/development/tools/build-managers/scala-cli/default.nix+3−3

@@ -1,15 +1,15 @@

11{ stdenv, coreutils, lib, installShellFiles, zlib, autoPatchelfHook, fetchurl }:

22

33let

4− version = "0.1.4";

4+ version = "0.1.5";

55 assets = {

66 x86_64-darwin = {

77 asset = "scala-cli-x86_64-apple-darwin.gz";

8− sha256 = "19bsfkp398rx3f9lnjzhp8pcs77n075v17rpm4hsmrpsz1hih5xy";

8+ sha256 = "1sczbvvhh1ff8mdb6zj4q3fnrz1qsqmr58jlb1s3fy1wv2p5ywxl";

99 };

1010 x86_64-linux = {

1111 asset = "scala-cli-x86_64-pc-linux.gz";

12− sha256 = "0rggf6v32rw3s82a1apz2b8nyiv8rd0lvw1bajl2s7jhlq8l7lc9";

12+ sha256 = "1ahvjgcghh1pmgfsajg0b8bf5aaqxdx0f6b6qgljs0xfqm7zs05v";

1313 };

1414 };

1515in

pkgs/development/tools/database/liquibase/default.nix+1−1

@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {

6666 ${lib.concatStringsSep "\n" (map (p: addJars "${p}/share/java") extraJars)}

6767

6868 ${lib.getBin jre}/bin/java -cp "\$CP" \$JAVA_OPTS \

69− liquibase.integration.commandline.Main \''${1+"\$@"}

69+ liquibase.integration.commandline.LiquibaseCommandLine \''${1+"\$@"}

7070 EOF

7171 chmod +x $out/bin/liquibase

7272 '';

pkgs/development/tools/dive/default.nix−2

@@ -13,8 +13,6 @@ buildGoModule rec {

1313

1414 vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM=";

1515

16− doCheck = false;

17−

1816 nativeBuildInputs = [ pkg-config ];

1917

2018 buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ];

pkgs/development/tools/gosec/default.nix−2

@@ -20,8 +20,6 @@ buildGoModule rec {

2020 "cmd/gosec"

2121 ];

2222

23− doCheck = false;

24−

2523 ldflags = [

2624 "-s"

2725 "-w"

pkgs/development/tools/just/default.nix+3−3

@@ -10,16 +10,16 @@

1010

1111rustPlatform.buildRustPackage rec {

1212 pname = "just";

13− version = "1.1.2";

13+ version = "1.1.3";

1414

1515 src = fetchFromGitHub {

1616 owner = "casey";

1717 repo = pname;

1818 rev = version;

19− sha256 = "sha256-vUtJ9QVMmDGfkYTBoK8mVaJTEfNBQD5sTEp7kC0LNZw=";

19+ sha256 = "sha256-2tKO0NyWFtRQgGrOKB3bROpDaIbQzTT4s2hGnBdZ6Fg=";

2020 };

2121

22− cargoSha256 = "sha256-rJjLXktWnT6kRx1/18AFr6KciaFF8PaTpz27wz+vGug=";

22+ cargoSha256 = "sha256-O5ntehb9ifWpBxBoOcFyyc8Ns6+SzHVOifUOD2QyhMY=";

2323

2424 nativeBuildInputs = [ installShellFiles ];

2525 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];

pkgs/development/tools/kdash/default.nixnew file+34

@@ -0,0 +1,34 @@

1+{ lib, stdenv

2+, fetchFromGitHub

3+, rustPlatform

4+, pkg-config

5+, perl

6+, python3

7+, openssl

8+, xorg

9+}:

10+

11+rustPlatform.buildRustPackage rec {

12+ pname = "kdash";

13+ version = "0.3.1";

14+

15+ src = fetchFromGitHub {

16+ owner = "kdash-rs";

17+ repo = pname;

18+ rev = "v${version}";

19+ sha256 = "08ca638kvs98xhbc9g1szw0730cjk9g01qqaja8j413n2h1pr8yq";

20+ };

21+

22+ nativeBuildInputs = [ perl python3 pkg-config ];

23+

24+ buildInputs = [ openssl xorg.xcbutil ];

25+

26+ cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204";

27+

28+ meta = with lib; {

29+ description = "A simple and fast dashboard for Kubernetes";

30+ homepage = "https://github.com/kdash-rs/kdash";

31+ license = with licenses; [ mit ];

32+ maintainers = with maintainers; [ matthiasbeyer ];

33+ };

34+}

pkgs/development/tools/misc/clojure-lsp/default.nix+3−3

@@ -2,18 +2,18 @@

22

33buildGraalvmNativeImage rec {

44 pname = "clojure-lsp";

5− version = "2022.04.18-00.59.32";

5+ version = "2022.05.03-12.35.40";

66

77 src = fetchFromGitHub {

88 owner = pname;

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-14EsJIKYl8TWbDqM9PyVrbs/4EssqXp0EK70RrFz+RE=";

11+ sha256 = "sha256-5jh4umT93P53ufgdKYHNtiDJ1QpoJ8QpfAti0+tmvmc=";

1212 };

1313

1414 jar = fetchurl {

1515 url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar";

16− sha256 = "d78094b015bd9e671eea2eb89ca0bb3ec58d39802ad1bfdf875b50e1cdd4995e";

16+ sha256 = "b4984b5d8411542ec7d4732c950340d16e379ad76c40e57c3d41a8e7adda2faf";

1717 };

1818

1919 extraNativeImageBuildArgs = [

pkgs/development/tools/poetry2nix/poetry2nix/default.nix+10−2

@@ -5,7 +5,7 @@

55}:

66let

77 # Poetry2nix version

8− version = "1.27.1";

8+ version = "1.28.0";

99

1010 inherit (poetryLib) isCompatible readTOML moduleName;

1111

@@ -287,12 +287,20 @@ lib.makeScope pkgs.newScope (self: {

287287 (name: value: projectDir + "/${value.path}")

288288 (lib.filterAttrs (name: dep: dep.develop or false && hasAttr "path" dep) set);

289289

290− editablePackageSources' = (

290+ excludedEditablePackageNames = builtins.filter

291+ (pkg: editablePackageSources."${pkg}" == null)

292+ (builtins.attrNames editablePackageSources);

293+

294+ allEditablePackageSources = (

291295 (getEditableDeps (pyProject.tool.poetry."dependencies" or { }))

292296 // (getEditableDeps (pyProject.tool.poetry."dev-dependencies" or { }))

293297 // editablePackageSources

294298 );

295299

300+ editablePackageSources' = builtins.removeAttrs

301+ allEditablePackageSources

302+ excludedEditablePackageNames;

303+

296304 poetryPython = self.mkPoetryPackages {

297305 inherit pyproject poetrylock overrides python pwd preferWheels pyProject;

298306 editablePackageSources = editablePackageSources';

pkgs/development/tools/poetry2nix/poetry2nix/lib.nix+1−1

@@ -180,7 +180,7 @@ let

180180 hasGitIgnore = builtins.pathExists gitIgnore;

181181 gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ];

182182 in

183− lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

183+ lib.optionals (builtins.pathExists path && builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores;

184184

185185 /*

186186 Provides a source filtering mechanism that:

pkgs/development/tools/poetry2nix/poetry2nix/overrides/build-systems.json+153−5

@@ -29,6 +29,9 @@

2929 "aioflo": [

3030 "poetry-core"

3131 ],

32+ "aiogithubapi": [

33+ "poetry-core"

34+ ],

3235 "aioguardian": [

3336 "poetry-core"

3437 ],

@@ -89,9 +92,21 @@

8992 "amqtt": [

9093 "poetry-core"

9194 ],

95+ "ansible-doctor": [

96+ "poetry-core"

97+ ],

98+ "ansible-later": [

99+ "poetry-core"

100+ ],

101+ "ansible-runner": [

102+ "pbr"

103+ ],

92104 "apache-beam": [

93105 "cython"

94106 ],

107+ "aplpy": [

108+ "cython"

109+ ],

95110 "argon2_cffi": [

96111 "flitBuildHook"

97112 ],

@@ -114,15 +129,24 @@

114129 "atomman": [

115130 "cython"

116131 ],

132+ "atpublic": [

133+ "pdm-pep517"

134+ ],

117135 "autarco": [

118136 "poetry-core"

119137 ],

120138 "authcaptureproxy": [

121139 "poetry-core"

122140 ],

141+ "av": [

142+ "cython"

143+ ],

123144 "awesomeversion": [

124145 "poetry-core"

125146 ],

147+ "aws-adfs": [

148+ "poetry-core"

149+ ],

126150 "aws-error-utils": [

127151 "poetry"

128152 ],

@@ -147,6 +171,9 @@

147171 "boltztrap2": [

148172 "cython"

149173 ],

174+ "bsblan": [

175+ "poetry-core"

176+ ],

150177 "build": [

151178 "flit-core"

152179 ],

@@ -183,6 +210,9 @@

183210 "clikit": [

184211 "poetry-core"

185212 ],

213+ "cloudflare-dyndns": [

214+ "poetry"

215+ ],

186216 "collections-extended": [

187217 "poetry-core"

188218 ],

@@ -210,7 +240,8 @@

210240 "poetry-core"

211241 ],

212242 "cssselect2": [

213− "flit"

243+ "flit",

244+ "flit-core"

214245 ],

215246 "cwcwidth": [

216247 "cython"

@@ -224,9 +255,15 @@

224255 "cypari2": [

225256 "cython"

226257 ],

258+ "cypherpunkpay": [

259+ "poetry-core"

260+ ],

227261 "cysignals": [

228262 "cython"

229263 ],

264+ "datadog": [

265+ "hatchling"

266+ ],

230267 "datrie": [

231268 "cython"

232269 ],

@@ -260,6 +297,9 @@

260297 "doc8": [

261298 "pbr"

262299 ],

300+ "docstring-parser": [

301+ "poetry-core"

302+ ],

263303 "dtlssocket": [

264304 "cython"

265305 ],

@@ -301,7 +341,8 @@

301341 "poetry-core"

302342 ],

303343 "entrypoints": [

304− "flit"

344+ "flit",

345+ "flit-core"

305346 ],

306347 "enturclient": [

307348 "poetry-core"

@@ -309,6 +350,13 @@

309350 "enumatch": [

310351 "poetry"

311352 ],

353+ "exceptiongroup": [

354+ "flit-core",

355+ "flitBuildHook"

356+ ],

357+ "falcon": [

358+ "cython"

359+ ],

312360 "fastapi": [

313361 "flitBuildHook"

314362 ],

@@ -378,6 +426,9 @@

378426 "generic": [

379427 "poetry-core"

380428 ],

429+ "gensim": [

430+ "cython"

431+ ],

381432 "glances-api": [

382433 "poetry-core"

383434 ],

@@ -492,9 +543,15 @@

492543 "ipwhl": [

493544 "flitBuildHook"

494545 ],

546+ "iso8601": [

547+ "poetry-core"

548+ ],

495549 "isort": [

496550 "poetry-core"

497551 ],

552+ "jarowinkler": [

553+ "cython"

554+ ],

498555 "jedi-language-server": [

499556 "poetry"

500557 ],

@@ -519,6 +576,12 @@

519576 "jupyterlab": [

520577 "jupyter-packaging"

521578 ],

579+ "jupyterlab-code-formatter": [

580+ "jupyter-packaging"

581+ ],

582+ "jupyterlab-pygments": [

583+ "jupyter-packaging"

584+ ],

522585 "keystoneauth1": [

523586 "pbr"

524587 ],

@@ -537,6 +600,9 @@

537600 "ldappool": [

538601 "pbr"

539602 ],

603+ "levenshtein": [

604+ "cython"

605+ ],

540606 "libgpuarray": [

541607 "cython"

542608 ],

@@ -564,6 +630,9 @@

564630 "lockfile": [

565631 "pbr"

566632 ],

633+ "lsassy": [

634+ "poetry-core"

635+ ],

567636 "luftdaten": [

568637 "poetry-core"

569638 ],

@@ -585,6 +654,9 @@

585654 "marisa-trie": [

586655 "cython"

587656 ],

657+ "markdown-it-py": [

658+ "flit-core"

659+ ],

588660 "mask-rcnn": [

589661 "cython"

590662 ],

@@ -607,6 +679,9 @@

607679 "memory-allocator": [

608680 "cython"

609681 ],

682+ "meteofrance-api": [

683+ "poetry"

684+ ],

610685 "metprint": [

611686 "poetry-core"

612687 ],

@@ -618,6 +693,7 @@

618693 "poetry"

619694 ],

620695 "mkdocs-jupyter": [

696+ "ipython_genutils",

621697 "poetry-core"

622698 ],

623699 "mkdocs-literate-nav": [

@@ -674,6 +750,9 @@

674750 "netdata": [

675751 "poetry-core"

676752 ],

753+ "netutils": [

754+ "poetry-core"

755+ ],

677756 "newversion": [

678757 "poetry-core"

679758 ],

@@ -689,6 +768,9 @@

689768 "nkdfu": [

690769 "flitBuildHook"

691770 ],

771+ "notebook-shim": [

772+ "jupyter-packaging"

773+ ],

692774 "notus-scanner": [

693775 "poetry-core"

694776 ],

@@ -728,6 +810,9 @@

728810 "openvino": [

729811 "cython"

730812 ],

813+ "ordered-set": [

814+ "flit-core"

815+ ],

731816 "ormar": [

732817 "poetry-core"

733818 ],

@@ -807,6 +892,9 @@

807892 "poetry": [

808893 "poetry-core"

809894 ],

895+ "poetry-dynamic-versioning": [

896+ "poetry-core"

897+ ],

810898 "poetry2conda": [

811899 "poetry"

812900 ],

@@ -930,6 +1018,9 @@

9301018 "pymaven-patch": [

9311019 "pbr"

9321020 ],

1021+ "pymdown-extensions": [

1022+ "hatchling"

1023+ ],

9331024 "pymfy": [

9341025 "poetry-core"

9351026 ],

@@ -954,6 +1045,9 @@

9541045 "pyoverkiz": [

9551046 "poetry-core"

9561047 ],

1048+ "pyparsing": [

1049+ "flit-core"

1050+ ],

9571051 "pypass": [

9581052 "pbr"

9591053 ],

@@ -978,12 +1072,21 @@

9781072 "pyproject-flake8": [

9791073 "flit-core"

9801074 ],

1075+ "pypsrp": [

1076+ "poetry-core"

1077+ ],

9811078 "pyquil": [

9821079 "poetry-core"

9831080 ],

1081+ "pyrad": [

1082+ "poetry-core"

1083+ ],

9841084 "pyregion": [

9851085 "cython"

9861086 ],

1087+ "pyrevolve": [

1088+ "cython"

1089+ ],

9871090 "pyrmvtransport": [

9881091 "flit"

9891092 ],

@@ -999,6 +1102,9 @@

9991102 "pysigma": [

10001103 "poetry-core"

10011104 ],

1105+ "pysigma-backend-insightidr": [

1106+ "poetry-core"

1107+ ],

10021108 "pysigma-backend-splunk": [

10031109 "poetry-core"

10041110 ],

@@ -1008,14 +1114,30 @@

10081114 "pysigma-pipeline-sysmon": [

10091115 "poetry-core"

10101116 ],

1117+ "pysigma-pipeline-windows": [

1118+ "poetry-core"

1119+ ],

1120+ "pyslurm": [

1121+ "cython"

1122+ ],

10111123 "pysmf": [

10121124 "cython"

10131125 ],

10141126 "pysml": [

10151127 "poetry-core"

10161128 ],

1129+ "pysnmp-pyasn1": [

1130+ "poetry-core"

1131+ ],

1132+ "pysnmp-pysmi": [

1133+ "poetry-core"

1134+ ],

1135+ "pysnmplib": [

1136+ "poetry-core"

1137+ ],

10171138 "pysnow": [

1018− "poetry"

1139+ "poetry",

1140+ "poetry-core"

10191141 ],

10201142 "pysptk": [

10211143 "cython"

@@ -1035,6 +1157,9 @@

10351157 "pytest-httpserver": [

10361158 "poetry-core"

10371159 ],

1160+ "pytest-isort": [

1161+ "poetry-core"

1162+ ],

10381163 "pytest-mockservers": [

10391164 "poetry-core"

10401165 ],

@@ -1097,6 +1222,9 @@

10971222 "python-openstackclient": [

10981223 "pbr"

10991224 ],

1225+ "python-pae": [

1226+ "poetry-core"

1227+ ],

11001228 "python-pkcs11": [

11011229 "cython"

11021230 ],

@@ -1215,7 +1343,8 @@

12151343 "poetry-core"

12161344 ],

12171345 "rokuecp": [

1218− "poetry"

1346+ "poetry",

1347+ "poetry-core"

12191348 ],

12201349 "roombapy": [

12211350 "poetry-core"

@@ -1280,6 +1409,9 @@

12801409 "sentinel": [

12811410 "poetry-core"

12821411 ],

1412+ "seventeentrack": [

1413+ "poetry-core"

1414+ ],

12831415 "sfepy": [

12841416 "cython"

12851417 ],

@@ -1301,9 +1433,15 @@

13011433 "slowapi": [

13021434 "poetry-core"

13031435 ],

1436+ "socksio": [

1437+ "flit-core"

1438+ ],

13041439 "solo-python": [

13051440 "flitBuildHook"

13061441 ],

1442+ "soupsieve": [

1443+ "hatchling"

1444+ ],

13071445 "spacy-pkuseg": [

13081446 "cython"

13091447 ],

@@ -1425,7 +1563,8 @@

14251563 "cython"

14261564 ],

14271565 "testpath": [

1428− "flit"

1566+ "flit",

1567+ "flit-core"

14291568 ],

14301569 "testrepository": [

14311570 "pbr"

@@ -1505,6 +1644,9 @@

15051644 "typing-extensions": [

15061645 "flit-core"

15071646 ],

1647+ "uharfbuzz": [

1648+ "cython"

1649+ ],

15081650 "unpaddedbase64": [

15091651 "poetry-core"

15101652 ],

@@ -1550,8 +1692,14 @@

15501692 "yoda": [

15511693 "cython"

15521694 ],

1695+ "yte": [

1696+ "poetry-core"

1697+ ],

15531698 "zeversolarlocal": [

15541699 "flit-core",

15551700 "flitBuildHook"

1701+ ],

1702+ "zwave-me-ws": [

1703+ "poetry-core"

15561704 ]

15571705}

pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix+98−4

@@ -8,13 +8,14 @@ let

88 { self

99 , drv

1010 , attr

11+ , extraAttrs ? [ ]

1112 }:

1213 let

1314 buildSystem = if attr == "cython" then self.python.pythonForBuild.pkgs.cython else self.${attr};

1415 in

1516 (

1617 # Flit only works on Python3

17− if (attr == "flit-core" || attr == "flit") && !self.isPy3k then drv

18+ if (attr == "flit-core" || attr == "flit" || attr == "hatchling") && !self.isPy3k then drv

1819 else

1920 drv.overridePythonAttrs (

2021 old:

@@ -23,7 +24,7 @@ let

2324 { }

2425 else

2526 {

26− nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ];

27+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.${attr} ] ++ map (a: self.${a}) extraAttrs;

2728 }

2829 )

2930 );

@@ -55,6 +56,16 @@ lib.composeManyExtensions [

5556 systems)

5657 buildSystems)

5758

59+ # Build systems with conditionals

60+ (self: super: {

61+

62+ platformdirs =

63+ if lib.versionAtLeast super.platformdirs.version "2.5.2"

64+ then addBuildSystem { inherit self; drv = super.platformdirs; attr = "hatchling"; extraAttrs = [ "hatch-vcs" ]; }

65+ else super.platformdirs;

66+

67+ })

68+

5869 # Build fixes

5970 (self: super:

6071 let

@@ -437,6 +448,17 @@ lib.composeManyExtensions [

437448 }

438449 );

439450

451+ # Setuptools >= 60 broke build_py_2to3

452+ docutils =

453+ if lib.versionOlder super.docutils.version "0.16" && lib.versionAtLeast super.setuptools.version "60" then

454+ (

455+ super.docutils.overridePythonAttrs (

456+ old: {

457+ SETUPTOOLS_USE_DISTUTILS = "stdlib";

458+ }

459+ )

460+ ) else super.docutils;

461+

440462 # Environment markers are not always included (depending on how a dep was defined)

441463 enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;

442464

@@ -844,6 +866,17 @@ lib.composeManyExtensions [

844866 }

845867 );

846868

869+ lsassy =

870+ if super.lsassy.version == "3.1.1" then

871+ super.lsassy.overridePythonAttrs

872+ (old: {

873+ # pyproject.toml contains a constraint `rich = "^10.6.0"` which is not replicated in setup.py

874+ # hence pypi misses it and poetry pins rich to 11.0.0

875+ preConfigure = (old.preConfigure or "") + ''

876+ rm pyproject.toml

877+ '';

878+ }) else super.lsassy;

879+

847880 lxml = super.lxml.overridePythonAttrs (

848881 old: {

849882 nativeBuildInputs = with pkgs.buildPackages; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ];

@@ -1143,6 +1176,26 @@ lib.composeManyExtensions [

11431176 }

11441177 );

11451178

1179+ orjson =

1180+ let

1181+ getCargoHash = version: {

1182+ "3.6.7" = "sha256-sz2k9podPB6QSptkyOu7+BoVTrKhefizRtYU+MICPt4=";

1183+ "3.6.8" = "sha256-vpfceVtYkU09xszNIihY1xbqGWieqDquxwsAmDH8jd4=";

1184+ }.${version} or null;

1185+ in

1186+ super.orjson.overridePythonAttrs (old: {

1187+ cargoDeps = pkgs.rustPlatform.fetchCargoTarball {

1188+ inherit (old) src;

1189+ name = "${old.pname}-${old.version}";

1190+ hash = getCargoHash old.version;

1191+ };

1192+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [

1193+ pkgs.rustPlatform.cargoSetupHook

1194+ pkgs.rustPlatform.maturinBuildHook

1195+ ];

1196+ buildInputs = (old.buildInputs or [ ]) ++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv;

1197+ });

1198+

11461199 osqp = super.osqp.overridePythonAttrs (

11471200 old: {

11481201 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ];

@@ -1150,6 +1203,29 @@ lib.composeManyExtensions [

11501203 }

11511204 );

11521205

1206+

1207+ pandas = super.pandas.overridePythonAttrs (old: {

1208+

1209+ buildInputs = old.buildInputs or [ ] ++ lib.optional stdenv.isDarwin pkgs.libcxx;

1210+

1211+ # Doesn't work with -Werror,-Wunused-command-line-argument

1212+ # https://github.com/NixOS/nixpkgs/issues/39687

1213+ hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";

1214+

1215+ # For OSX, we need to add a dependency on libcxx, which provides

1216+ # `complex.h` and other libraries that pandas depends on to build.

1217+ postPatch = lib.optionalString stdenv.isDarwin ''

1218+ cpp_sdk="${lib.getDev pkgs.libcxx}/include/c++/v1";

1219+ echo "Adding $cpp_sdk to the setup.py common_include variable"

1220+ substituteInPlace setup.py \

1221+ --replace "['pandas/src/klib', 'pandas/src']" \

1222+ "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"

1223+ '';

1224+

1225+

1226+ enableParallelBuilding = true;

1227+ });

1228+

11531229 pantalaimon = super.pantalaimon.overridePythonAttrs (old: {

11541230 nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];

11551231 postInstall = old.postInstall or "" + ''

@@ -1196,8 +1272,12 @@ lib.composeManyExtensions [

11961272

11971273 pillow = super.pillow.overridePythonAttrs (

11981274 old: {

1199− nativeBuildInputs = [ pkg-config self.pytest-runner ] ++ (old.nativeBuildInputs or [ ]);

1200− buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]);

1275+ nativeBuildInputs = (old.nativeBuildInputs or [ ])

1276+ ++ [ pkg-config self.pytest-runner ];

1277+ buildInputs = with pkgs; (old.buildInputs or [ ])

1278+ ++ [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ]

1279+ ++ lib.optionals (lib.versionAtLeast old.version "7.1.0") [ xorg.libxcb ]

1280+ ++ lib.optionals (self.isPyPy) [ tk xorg.libX11 ];

12011281 }

12021282 );

12031283

@@ -1246,6 +1326,14 @@ lib.composeManyExtensions [

12461326 }

12471327 );

12481328

1329+ psycopg2cffi = super.psycopg2cffi.overridePythonAttrs (

1330+ old: {

1331+ buildInputs = (old.buildInputs or [ ])

1332+ ++ lib.optional stdenv.isDarwin pkgs.openssl;

1333+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ];

1334+ }

1335+ );

1336+

12491337 py-solc-x = super.py-solc-x.overridePythonAttrs (

12501338 old: {

12511339 preConfigure = ''

@@ -1860,6 +1948,12 @@ lib.composeManyExtensions [

18601948

18611949 });

18621950

1951+ soundfile = super.soundfile.overridePythonAttrs (old: {

1952+ postPatch = ''

1953+ substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${pkgs.libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'"

1954+ '';

1955+ });

1956+

18631957 systemd-python = super.systemd-python.overridePythonAttrs (old: {

18641958 buildInputs = old.buildInputs ++ [ pkgs.systemd ];

18651959 nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];

pkgs/development/tools/protoc-gen-entgrpc/default.nixnew file+28

@@ -0,0 +1,28 @@

1+{ lib, buildGoModule, fetchFromGitHub }:

2+

3+buildGoModule rec {

4+ pname = "protoc-gen-entgrpc";

5+ version = "0.2.0";

6+

7+ src = fetchFromGitHub {

8+ owner = "ent";

9+ repo = "contrib";

10+ rev = "v${version}";

11+ sha256 = "sha256-cpk8yRDBsupI277NWYFaLCvi3ltQDLgCrcpJ/FUVi9o=";

12+ };

13+

14+ vendorSha256 = "sha256-RwwGFBiasxMmtKMLSyAqvkozqoyzzYuslMq+HnzZUhw=";

15+

16+ subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];

17+

18+ ldflags = [ "-s" "-w" ];

19+

20+ meta = with lib; {

21+ description = "Generator of an implementation of the service interface for ent protobuff";

22+ downloadPage = "https://github.com/ent/contrib/";

23+ license = licenses.asl20;

24+ homepage = "https://entgo.io/";

25+ maintainers = with maintainers; [ superherointj ];

26+ };

27+}

28+

pkgs/development/tools/rust/cargo-sync-readme/default.nix+4−3

@@ -2,20 +2,21 @@

22

33rustPlatform.buildRustPackage rec {

44 pname = "cargo-sync-readme";

5− version = "1.0";

5+ version = "1.1";

66

77 src = fetchFromGitHub {

88 owner = "phaazon";

99 repo = pname;

1010 rev = version;

11− sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc";

11+ sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";

1212 };

1313

14− cargoSha256 = "0vrbgs49ghhl4z4ljhghcs9fnbf7qx1an9kwbrgv9wng8m1dccah";

14+ cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";

1515

1616 meta = with lib; {

1717 description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation";

1818 homepage = "https://github.com/phaazon/cargo-sync-readme";

19+ changelog = "https://github.com/phaazon/cargo-sync-readme/blob/${version}/CHANGELOG.md";

1920 license = licenses.bsd3;

2021 maintainers = with maintainers; [ b4dm4n ];

2122 };

pkgs/development/tools/rust/rust-analyzer/default.nix+3−3

@@ -11,14 +11,14 @@

1111

1212rustPlatform.buildRustPackage rec {

1313 pname = "rust-analyzer-unwrapped";

14− version = "2022-04-11";

15− cargoSha256 = "sha256-pc8S+5g67vN9170ABiHGe1t4Go0F63UiOeLd71USYCI=";

14+ version = "2022-05-02";

15+ cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ=";

1616

1717 src = fetchFromGitHub {

1818 owner = "rust-analyzer";

1919 repo = "rust-analyzer";

2020 rev = version;

21− sha256 = "sha256-miMIrDawSS1zXh6EuX03x5ACM2NTabksssSyutSNpjY=";

21+ sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";

2222 };

2323

2424 patches = [

pkgs/development/tools/vulkan-validation-layers/default.nix+3−3

@@ -3,7 +3,7 @@

33, stdenv

44, fetchFromGitHub

55, cmake

6−, pkgconfig

6+, pkg-config

77, glslang

88, libffi

99, libX11

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {

4545

4646 nativeBuildInputs = [

4747 cmake

48− pkgconfig

48+ pkg-config

4949 ];

5050

5151 buildInputs = [

@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {

6565 "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}"

6666 "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}"

6767 "-DBUILD_LAYER_SUPPORT_FILES=ON"

68− "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"

68+ "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"

6969 # Hide dev warnings that are useless for packaging

7070 "-Wno-dev"

7171 ];

pkgs/development/tools/wails/default.nix+3−3

@@ -15,16 +15,16 @@

1515

1616buildGoModule rec {

1717 pname = "wails";

18− version = "2.0.0-beta.34";

18+ version = "2.0.0-beta.36";

1919

2020 src = fetchFromGitHub {

2121 owner = "wailsapp";

2222 repo = pname;

2323 rev = "v${version}";

24− sha256 = "sha256-dsDruZSmr8qSNpX8L27tLpNxvdSkc2mfNQLRxN9AnCg=";

24+ sha256 = "sha256-uAbVc1UDgSNJwk8R6zXXqZImo6J9TRs3zPNlWelXS/I=";

2525 } + "/v2";

2626

27− vendorSha256 = "sha256-OaSPpCb2VxMGlkUIg3fyEJhjz256amEfXBX+5WMY3a0=";

27+ vendorSha256 = "sha256-rrwlFZQT7sHhUqtU4UzwEqZbjWd/1fudfj/xdTGFUmQ=";

2828

2929 proxyVendor = true;

3030

pkgs/development/web/nodejs/nodejs.nix+2−2

@@ -136,7 +136,7 @@ let

136136

137137 ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) ''

138138 mkdir -p $out/share/bash-completion/completions/

139− $out/bin/npm completion > $out/share/bash-completion/completions/npm || :

139+ HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm

140140 for dir in "$out/lib/node_modules/npm/man/"*; do

141141 mkdir -p $out/share/man/$(basename "$dir")

142142 for page in "$dir"/*; do

@@ -194,7 +194,7 @@ let

194194 maintainers = with maintainers; [ goibhniu gilligan cko marsam ];

195195 platforms = platforms.linux ++ platforms.darwin;

196196 mainProgram = "node";

197− knownVulnerabilities = optional (versionOlder version "12") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";

197+ knownVulnerabilities = optional (versionOlder version "14") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/.";

198198 };

199199

200200 passthru.python = python; # to ensure nodeEnv uses the same version

pkgs/development/web/nodejs/v14.nix+2−2

@@ -7,7 +7,7 @@ let

77in

88 buildNodejs {

99 inherit enableNpm;

10− version = "14.19.1";

11− sha256 = "sha256-4a4J3YYas5rwRIO7XA+lTd2CtrFVQ76aJ+pnBKi6ndk=";

10+ version = "14.19.2";

11+ sha256 = "sha256-70N1qRUv9p8oI9eyCjtTdnoEYWS7rHgkQpyyFtFojPA=";

1212 patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;

1313 }

pkgs/development/web/nodejs/v18.nix+2−2

@@ -7,8 +7,8 @@ let

77in

88buildNodejs {

99 inherit enableNpm;

10− version = "18.0.0";

11− sha256 = "sha256-NE0OZUC1JMaal5/1w+eM2nJU/XLANpmSa+sLhVi4znU=";

10+ version = "18.1.0";

11+ sha256 = "0zhb61ihzslmpl1g3dd6vcxjccc8gwj1v4hfphk7f3cy10hcrc78";

1212 patches = [

1313 ./disable-darwin-v8-system-instrumentation.patch

1414 ];

pkgs/games/7kaa/default.nix+7−10

@@ -15,17 +15,15 @@

1515}:

1616

1717let

18+ pname = "7kaa";

19+ version = "2.15.4p1";

1820

19− name = "7kaa";

20− versionMajor = "2.15";

21− versionMinor = "4p1";

22−

23− music = stdenv.mkDerivation rec {

24− pname = "${name}-music";

25− version = "${versionMajor}";

21+ music = stdenv.mkDerivation {

22+ pname = "7kaa-music";

23+ version = lib.versions.majorMinor version;

2624

2725 src = fetchurl {

28− url = "https://www.7kfans.com/downloads/${name}-music-${versionMajor}.tar.bz2";

26+ url = "https://www.7kfans.com/downloads/7kaa-music-${lib.versions.majorMinor version}.tar.bz2";

2927 sha256 = "sha256-sNdntuJXGaFPXzSpN0SoAi17wkr2YnW+5U38eIaVwcM=";

3028 };

3129

@@ -41,8 +39,7 @@ let

4139in

4240

4341gccStdenv.mkDerivation rec {

44− pname = "${name}";

45− version = "v${versionMajor}.${versionMinor}";

42+ inherit pname version;

4643

4744 src = fetchFromGitHub {

4845 owner = "the3dfxdude";

pkgs/games/mindustry/default.nix+11−9

@@ -128,15 +128,6 @@ stdenv.mkDerivation rec {

128128 rm Arc/backends/backend-sdl/libs/linux64/libsdl-arc*.so

129129 '' + cleanupMindustrySrc;

130130

131− # Propagate glew to prevent it from being cleaned up.

132− # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,

133− # and will assume that it's not actually needed.

134− # This can cause issues.

135− # See https://github.com/NixOS/nixpkgs/issues/109798.

136− propagatedBuildInputs = lib.optionals enableClient [

137− glew.out

138− ];

139−

140131 buildInputs = lib.optionals enableClient [

141132 SDL2

142133 glew

@@ -183,6 +174,17 @@ stdenv.mkDerivation rec {

183174 makeWrapper ${jdk}/bin/java $out/bin/mindustry \

184175 --add-flags "-jar $out/share/mindustry.jar" \

185176 --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib/

177+

178+ # Retain runtime depends to prevent them from being cleaned up.

179+ # Since a jar is a compressed archive, nix can't figure out that the dependency is actually in there,

180+ # and will assume that it's not actually needed.

181+ # This can cause issues.

182+ # See https://github.com/NixOS/nixpkgs/issues/109798.

183+ echo "# Retained runtime dependencies: " >> $out/bin/mindustry

184+ for dep in ${SDL2.out} ${alsa-lib.out} ${glew.out}; do

185+ echo "# $dep" >> $out/bin/mindustry

186+ done

187+

186188 install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png

187189 '' + optionalString enableServer ''

188190 install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar

pkgs/misc/platformsh/default.nix+2−2

@@ -2,14 +2,14 @@

22

33let

44 pname = "platformsh";

5− version = "3.79.0";

5+ version = "3.79.2";

66in

77stdenv.mkDerivation {

88 inherit pname version;

99

1010 src = fetchurl {

1111 url = "https://github.com/platformsh/platformsh-cli/releases/download/v${version}/platform.phar";

12− sha256 = "sha256-gTh1VS/b+D8E67w6Q4u9h0EhpFZiA2gBGe4mo49+9KY=";

12+ sha256 = "sha256-STGMKWgI4C6ccg8DGUhdnEENOB2//gtpU0ljM4cQCXI=";

1313 };

1414

1515 dontUnpack = true;

pkgs/misc/rich-cli/default.nix+18−8

@@ -1,17 +1,20 @@

1−{ lib, python3 }:

1+{ lib

2+, python3

3+}:

24

35python3.pkgs.buildPythonApplication rec {

46 pname = "rich-cli";

5− version = "1.5.1";

7+ version = "1.7.0";

8+ format = "pyproject";

69

710 src = python3.pkgs.fetchPypi {

811 inherit pname version;

9− sha256 = "18qpdaw4drkwq71xikngwaarkjxhfc0nrb1zm36rw31b8dz0ij2k";

12+ sha256 = "sha256-fporylec9H+9G2v8D0O32ek7OQs3YRSma1xOpakClqk=";

1013 };

1114

12− format = "pyproject";

13−

14− nativeBuildInputs = [ python3.pkgs.poetry-core ];

15+ nativeBuildInputs = with python3.pkgs; [

16+ poetry-core

17+ ];

1518

1619 propagatedBuildInputs = with python3.pkgs; [

1720 rich

@@ -21,11 +24,18 @@ python3.pkgs.buildPythonApplication rec {

2124 rich-rst

2225 ];

2326

24− buildInputs = [ python3 ];

27+ postPatch = ''

28+ substituteInPlace pyproject.toml \

29+ --replace 'rich = "^12.3.0"' 'rich = "*"'

30+ '';

31+

32+ pythonImportsCheck = [

33+ "rich_cli"

34+ ];

2535

2636 meta = with lib; {

27− homepage = "https://github.com/Textualize/rich-cli";

2837 description = "Command Line Interface to Rich";

38+ homepage = "https://github.com/Textualize/rich-cli";

2939 license = licenses.mit;

3040 maintainers = with maintainers; [ jyooru ];

3141 };

pkgs/os-specific/linux/evdi/default.nix+2−2

@@ -2,13 +2,13 @@

22

33stdenv.mkDerivation rec {

44 pname = "evdi";

5− version = "1.10.0";

5+ version = "1.10.1";

66

77 src = fetchFromGitHub {

88 owner = "DisplayLink";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-vMcmUWdnO9JmImxz4vO3/UONlsrCGc8VH/o38YwCIzg=";

11+ sha256 = "sha256-XABpC2g4/e6/2HsHzrBUs6OW1lzgGBYlFAatVcA/vD8=";

1212 };

1313

1414 NIX_CFLAGS_COMPILE = "-Wno-error -Wno-error=sign-compare";

pkgs/os-specific/linux/nftables/default.nix+7−9

@@ -8,8 +8,6 @@

88, withXtables ? true , iptables

99}:

1010

11−with lib;

12−

1311stdenv.mkDerivation rec {

1412 version = "1.0.2";

1513 pname = "nftables";

@@ -28,8 +26,8 @@ stdenv.mkDerivation rec {

2826 buildInputs = [

2927 libmnl libnftnl libpcap

3028 gmp jansson libedit

31− ] ++ optional withXtables iptables

32− ++ optional withPython python3;

29+ ] ++ lib.optional withXtables iptables

30+ ++ lib.optional withPython python3;

3331

3432 preConfigure = ''

3533 substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file

@@ -46,12 +44,12 @@ stdenv.mkDerivation rec {

4644 configureFlags = [

4745 "--with-json"

4846 "--with-cli=editline"

49− ] ++ optional (!withDebugSymbols) "--disable-debug"

50− ++ optional (!withPython) "--disable-python"

51− ++ optional withPython "--enable-python"

52− ++ optional withXtables "--with-xtables";

47+ ] ++ lib.optional (!withDebugSymbols) "--disable-debug"

48+ ++ lib.optional (!withPython) "--disable-python"

49+ ++ lib.optional withPython "--enable-python"

50+ ++ lib.optional withXtables "--with-xtables";

5351

54− meta = {

52+ meta = with lib; {

5553 description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";

5654 homepage = "https://netfilter.org/projects/nftables/";

5755 license = licenses.gpl2Only;

pkgs/os-specific/linux/vmware/default.nixnew file+47

@@ -0,0 +1,47 @@

1+{ lib, stdenv, fetchFromGitHub, kernel, kmod, gnugrep, vmware-workstation }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "vmware-modules";

5+ version = "${vmware-workstation.version}-${kernel.version}";

6+

7+ src = fetchFromGitHub {

8+ owner = "mkubecek";

9+ repo = "vmware-host-modules";

10+ rev = "w${vmware-workstation.version}-k5.17";

11+ sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0=";

12+ };

13+

14+ hardeningDisable = [ "pic" ];

15+

16+ nativeBuildInputs = kernel.moduleBuildDependencies;

17+

18+ enableParallelBuilding = true;

19+

20+ postPatch = ''

21+ substituteInPlace Makefile \

22+ --replace '/lib/modules/$(VM_UNAME)/misc' "$out/lib/modules/${kernel.modDirVersion}/misc" \

23+ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \

24+ --replace /sbin/modinfo "${kmod}/bin/modinfo" \

25+ --replace 'test -z "$(DESTDIR)"' "0"

26+

27+ for module in "vmmon-only" "vmnet-only"; do

28+ substituteInPlace "./$module/Makefile" \

29+ --replace '/lib/modules/' "${kernel.dev}/lib/modules/" \

30+ --replace '$(shell uname -r)' "${kernel.modDirVersion}" \

31+ --replace /bin/grep "${gnugrep}/bin/grep"

32+ done

33+ '';

34+

35+ preInstall = ''

36+ mkdir -p "$out/lib/modules/${kernel.modDirVersion}/misc"

37+ '';

38+

39+ meta = with lib; {

40+ description = "Kernel modules needed for VMware hypervisor";

41+ homepage = "https://github.com/mkubecek/vmware-host-modules";

42+ license = licenses.gpl2Only;

43+ platforms = [ "x86_64-linux" ];

44+ broken = kernel.kernelOlder "5.5" && kernel.isHardened;

45+ maintainers = with maintainers; [ deinferno ];

46+ };

47+}

pkgs/servers/home-assistant/component-packages.nix+35−14

@@ -2,7 +2,7 @@

22# Do not edit!

33

44{

5− version = "2022.4.7";

5+ version = "2022.5.0";

66 components = {

77 "abode" = ps: with ps; [

88 abodepy

@@ -157,10 +157,6 @@

157157 ];

158158 "arest" = ps: with ps; [

159159 ];

160− "arlo" = ps: with ps; [

161− ha-ffmpeg

162− pyarlo

163− ];

164160 "arris_tg2492lg" = ps: with ps; [

165161 arris-tg2492lg

166162 ];

@@ -554,8 +550,6 @@

554550 "digital_ocean" = ps: with ps; [

555551 digital-ocean

556552 ];

557− "digitalloggers" = ps: with ps; [

558− ]; # missing inputs: dlipower

559553 "directv" = ps: with ps; [

560554 directv

561555 ];

@@ -993,8 +987,7 @@

993987 ];

994988 "google" = ps: with ps; [

995989 aiohttp-cors

996− google-api-python-client

997− httplib2

990+ gcal-sync

998991 oauth2client

999992 ];

1000993 "google_assistant" = ps: with ps; [

@@ -1248,9 +1241,15 @@

12481241 ];

12491242 "insteon" = ps: with ps; [

12501243 aiohttp-cors

1244+ fnvhash

1245+ home-assistant-frontend

1246+ insteon-frontend-home-assistant

1247+ lru-dict

1248+ pillow

12511249 pyinsteon

12521250 pyserial

12531251 pyudev

1252+ sqlalchemy

12541253 ];

12551254 "integration" = ps: with ps; [

12561255 ];

@@ -1391,8 +1390,10 @@

13911390 life360

13921391 ];

13931392 "lifx" = ps: with ps; [

1393+ aiohttp-cors

13941394 aiolifx

13951395 aiolifx-effects

1396+ ifaddr

13961397 ];

13971398 "lifx_cloud" = ps: with ps; [

13981399 ];

@@ -1514,6 +1515,9 @@

15141515 "mazda" = ps: with ps; [

15151516 pymazda

15161517 ];

1518+ "meater" = ps: with ps; [

1519+ meater-python

1520+ ];

15171521 "media_extractor" = ps: with ps; [

15181522 aiohttp-cors

15191523 youtube-dl-light

@@ -2088,6 +2092,9 @@

20882092 ];

20892093 "qnap" = ps: with ps; [

20902094 ]; # missing inputs: qnapstats

2095+ "qnap_qsw" = ps: with ps; [

2096+ aioqsw

2097+ ];

20912098 "qrcode" = ps: with ps; [

20922099 pillow

20932100 pyzbar

@@ -2309,6 +2316,10 @@

23092316 "sentry" = ps: with ps; [

23102317 sentry-sdk

23112318 ];

2319+ "senz" = ps: with ps; [

2320+ aiohttp-cors

2321+ aiosenz

2322+ ];

23122323 "serial" = ps: with ps; [

23132324 pyserial-asyncio

23142325 ];

@@ -2382,6 +2393,10 @@

23822393 ];

23832394 "slide" = ps: with ps; [

23842395 ]; # missing inputs: goslide-api

2396+ "slimproto" = ps: with ps; [

2397+ aiohttp-cors

2398+ aioslimproto

2399+ ];

23852400 "sma" = ps: with ps; [

23862401 pysma

23872402 ];

@@ -2420,7 +2435,7 @@

24202435 paho-mqtt

24212436 ];

24222437 "snmp" = ps: with ps; [

2423− pysnmp

2438+ pysnmplib

24242439 ];

24252440 "solaredge" = ps: with ps; [

24262441 solaredge

@@ -2747,6 +2762,9 @@

27472762 pytradfri

27482763 ]

27492764 ++ pytradfri.extras-require.async;

2765+ "trafikverket_ferry" = ps: with ps; [

2766+ pytrafikverket

2767+ ];

27502768 "trafikverket_train" = ps: with ps; [

27512769 pytrafikverket

27522770 ];

@@ -2828,11 +2846,10 @@

28282846 ];

28292847 "update" = ps: with ps; [

28302848 ];

2831− "updater" = ps: with ps; [

2832− ];

28332849 "upnp" = ps: with ps; [

28342850 aiohttp-cors

28352851 async-upnp-client

2852+ getmac

28362853 ifaddr

28372854 zeroconf

28382855 ];

@@ -3168,7 +3185,6 @@

31683185 "apprise"

31693186 "aprs"

31703187 "arcam_fmj"

3171− "arlo"

31723188 "aseko_pool_live"

31733189 "asuswrt"

31743190 "atag"

@@ -3436,6 +3452,7 @@

34363452 "manual_mqtt"

34373453 "maxcube"

34383454 "mazda"

3455+ "meater"

34393456 "media_player"

34403457 "media_source"

34413458 "melcloud"

@@ -3540,6 +3557,7 @@

35403557 "pvpc_hourly_pricing"

35413558 "python_script"

35423559 "qld_bushfire"

3560+ "qnap_qsw"

35433561 "rachio"

35443562 "radarr"

35453563 "radio_browser"

@@ -3582,6 +3600,7 @@

35823600 "sensibo"

35833601 "sensor"

35843602 "sentry"

3603+ "senz"

35853604 "seventeentrack"

35863605 "shell_command"

35873606 "shelly"

@@ -3595,6 +3614,7 @@

35953614 "siren"

35963615 "slack"

35973616 "sleepiq"

3617+ "slimproto"

35983618 "sma"

35993619 "smappee"

36003620 "smart_meter_texas"

@@ -3648,6 +3668,7 @@

36483668 "tailscale"

36493669 "tankerkoenig"

36503670 "tasmota"

3671+ "tautulli"

36513672 "tcp"

36523673 "telegram"

36533674 "telegram_bot"

@@ -3671,6 +3692,7 @@

36713692 "trace"

36723693 "tractive"

36733694 "tradfri"

3695+ "trafikverket_ferry"

36743696 "trafikverket_train"

36753697 "trafikverket_weatherstation"

36763698 "transmission"

@@ -3689,7 +3711,6 @@

36893711 "upb"

36903712 "upcloud"

36913713 "update"

3692− "updater"

36933714 "upnp"

36943715 "uptime"

36953716 "uptimerobot"

pkgs/servers/home-assistant/default.nix+15−4

@@ -30,7 +30,6 @@ let

3030 defaultOverrides = [

3131 # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt

3232 (mkOverride "python-slugify" "4.0.1" "sha256-aaUXdm4AwSaOW7/A0BCgqFCN4LGNMK1aH/NX+K5yQnA=")

33− (mkOverride "voluptuous" "0.12.2" "sha256-TbGsUHnbkkmCDUnIkctGYKb4yuNQSRIQq850H6v1ZRM=")

3433

3534 # pytest-aiohttp>0.3.0 breaks home-assistant tests

3635 (self: super: {

@@ -47,9 +46,21 @@ let

4746 aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: {

4847 doCheck = false; # requires aiohttp>=1.0.0

4948 });

49+ gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: {

50+ doCheck = false; # requires aiohttp>=1.0.0

51+ });

5052 hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: {

5153 doCheck = false; # requires aiohttp>=1.0.0

5254 });

55+ pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: {

56+ doCheck = false; # requires pytest-aiohttp>=1.0.0

57+ });

58+ pynws = super.pynws.overridePythonAttrs (oldAttrs: {

59+ doCheck = false; # requires pytest-aiohttp>=1.0.0

60+ });

61+ pytomorrowio = super.pytomorrowio.overridePythonAttrs (oldAttrs: {

62+ doCheck = false; # requires pytest-aiohttp>=1.0.0

63+ });

5364 rtsp-to-webrtc = super.rtsp-to-webrtc.overridePythonAttrs (oldAttrs: {

5465 doCheck = false; # requires pytest-aiohttp>=1.0.0

5566 });

@@ -110,7 +121,7 @@ let

110121 src = fetchFromGitHub {

111122 owner = "ManneW";

112123 repo = "vilfo-api-client-python";

113− rev = "v$version}";

124+ rev = "v${version}";

114125 sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf";

115126 };

116127 });

@@ -168,7 +179,7 @@ let

168179 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);

169180

170181 # Don't forget to run parse-requirements.py after updating

171− hassVersion = "2022.4.7";

182+ hassVersion = "2022.5.0";

172183

173184in python.pkgs.buildPythonApplication rec {

174185 pname = "homeassistant";

@@ -186,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {

186197 owner = "home-assistant";

187198 repo = "core";

188199 rev = version;

189− hash = "sha256-1m3t+AeHyuEyu3gT8P37A+L28mBdNKGmycU6eNOyb4M=";

200+ hash = "sha256-xlotye/8oeCs/ntNV4osGjcl7fo05ke7nFLQeee/USY=";

190201 };

191202

192203 # leave this in, so users don't have to constantly update their downstream patch handling

pkgs/servers/home-assistant/frontend.nix+2−2

@@ -4,7 +4,7 @@ buildPythonPackage rec {

44 # the frontend version corresponding to a specific home-assistant version can be found here

55 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json

66 pname = "home-assistant-frontend";

7− version = "20220405.0";

7+ version = "20220504.0";

88 format = "wheel";

99

1010 src = fetchPypi {

@@ -12,7 +12,7 @@ buildPythonPackage rec {

1212 pname = "home_assistant_frontend";

1313 dist = "py3";

1414 python = "py3";

15− sha256 = "sha256-M024uJJVhVSoGhJTc7d8NKItw0sAOGFuCsZNUe//vBg=";

15+ sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog=";

1616 };

1717

1818 # there is nothing to strip in this package

pkgs/servers/hqplayerd/default.nix+30−27

@@ -1,6 +1,6 @@

1−{ stdenv

2−, alsa-lib

1+{ stdenv, lib

32, addOpenGLRunpath

3+, alsa-lib

44, autoPatchelfHook

55, cairo

66, fetchurl

@@ -8,26 +8,25 @@

88, gcc11

99, gnome

1010, gssdp

11+, gupnp

12+, gupnp-av

1113, lame

12−, lib

1314, libgmpris

15+, libusb-compat-0_1

1416, llvmPackages_10

17+, meson

1518, mpg123

19+, ninja

1620, rpmextract

1721, wavpack

18−

19−, gupnp

20−, gupnp-av

21−, meson

22−, ninja

2322}:

2423stdenv.mkDerivation rec {

2524 pname = "hqplayerd";

26− version = "4.30.3-87";

25+ version = "4.31.0-89";

2726

2827 src = fetchurl {

2928 url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm";

30− hash = "sha256-fEze4aScWDwHDTXU0GatdopQf6FWcywWCGhR/7zXK7A=";

29+ hash = "sha256-L9S3MIbvvBViKSxu0x/GkE/pa61NETtw4vA8xM4rJEg=";

3130 };

3231

3332 unpackPhase = ''

@@ -47,6 +46,7 @@ stdenv.mkDerivation rec {

4746 gupnp-av

4847 lame

4948 libgmpris

49+ libusb-compat-0_1

5050 llvmPackages_10.openmp

5151 mpg123

5252 wavpack

@@ -58,34 +58,37 @@ stdenv.mkDerivation rec {

5858 installPhase = ''

5959 runHook preInstall

6060

61− # main executable

62− mkdir -p $out/bin

63− cp ./usr/bin/hqplayerd $out/bin

61+ # executables

62+ mkdir -p $out

63+ cp -rv ./usr/bin $out/bin

64+

65+ # libs

66+ mkdir -p $out

67+ cp -rv ./opt/hqplayerd/lib $out

6468

65− # main configuration

66− mkdir -p $out/etc/hqplayer

67− cp ./etc/hqplayer/hqplayerd.xml $out/etc/hqplayer/

69+ # configuration

70+ mkdir -p $out/etc

71+ cp -rv ./etc/hqplayer $out/etc/

6872

6973 # udev rules

70− mkdir -p $out/etc/udev/rules.d

71− cp ./etc/udev/rules.d/50-taudio2.rules $out/etc/udev/rules.d/

74+ mkdir -p $out/etc/udev

75+ cp -rv ./etc/udev/rules.d $out/etc/udev/

7276

7377 # kernel module cfgs

74− mkdir -p $out/etc/modules-load.d

75− cp ./etc/modules-load.d/taudio2.conf $out/etc/modules-load.d/

78+ mkdir -p $out/etc

79+ cp -rv ./etc/modules-load.d $out/etc/

7680

7781 # systemd service file

78− mkdir -p $out/lib/systemd/system

79− cp ./usr/lib/systemd/system/hqplayerd.service $out/lib/systemd/system/

82+ mkdir -p $out/lib/systemd

83+ cp -rv ./usr/lib/systemd/system $out/lib/systemd/

8084

8185 # documentation

82− mkdir -p $out/share/doc/hqplayerd

83− cp ./usr/share/doc/hqplayerd/* $out/share/doc/hqplayerd/

86+ mkdir -p $out/share/doc

87+ cp -rv ./usr/share/doc/hqplayerd $out/share/doc/

8488

8589 # misc service support files

86− mkdir -p $out/var/lib/hqplayer

87− cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer

88−

90+ mkdir -p $out/var/lib

91+ cp -rv ./var/lib/hqplayer $out/var/lib/

8992 runHook postInstall

9093 '';

9194

pkgs/servers/irc/inspircd/default.nix+2−2

@@ -142,13 +142,13 @@ in

142142

143143stdenv.mkDerivation rec {

144144 pname = "inspircd";

145− version = "3.12.0";

145+ version = "3.13.0";

146146

147147 src = fetchFromGitHub {

148148 owner = pname;

149149 repo = pname;

150150 rev = "v${version}";

151− sha256 = "sha256-3c7PFIZy/TGf68XdaSC25Amr8Zfb0O+za4ermIzQjnY=";

151+ sha256 = "1d5mnj86x4bk6iygns0cc15w315wrzmqxcq0sc4n75xsg6wwp1zl";

152152 };

153153

154154 outputs = [ "bin" "lib" "man" "doc" "out" ];

pkgs/servers/keycloak/default.nix+4−4

@@ -13,11 +13,11 @@

1313

1414stdenv.mkDerivation rec {

1515 pname = "keycloak";

16− version = "17.0.1";

16+ version = "18.0.0";

1717

1818 src = fetchzip {

1919 url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";

20− sha256 = "sha256-z1LfTUoK+v4oQxdyIQruFhl5O333zirSrkPoTFgVfmI=";

20+ sha256 = "0fxf9m50hpjplj077z2zjp0qibixz5y4lbc8159cnxbd4gzpkaaf";

2121 };

2222

2323 nativeBuildInputs = [ makeWrapper jre ];

@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {

5757 '';

5858

5959 postFixup = ''

60− substituteInPlace $out/bin/kc.sh --replace '-Dkc.home.dir=$DIRNAME/../' '-Dkc.home.dir=$KC_HOME_DIR'

61− substituteInPlace $out/bin/kc.sh --replace '-Djboss.server.config.dir=$DIRNAME/../conf' '-Djboss.server.config.dir=$KC_CONF_DIR'

60+ substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Dkc.home.dir='$DIRNAME'/../"} '-Dkc.home.dir=$KC_HOME_DIR'

61+ substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Djboss.server.config.dir='$DIRNAME'/../conf"} '-Djboss.server.config.dir=$KC_CONF_DIR'

6262

6363 for script in $(find $out/bin -type f -executable); do

6464 wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin

pkgs/servers/mastodon/default.nix+1−1

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

1818

1919 yarnOfflineCache = fetchYarnDeps {

2020 yarnLock = "${src}/yarn.lock";

21− sha256 = "sha256-Swe7AH/j1+N1T20xaQ+U0Ajtoe9BGzsghAjN1QakOp8=";

21+ sha256 = "sha256-FCwyJJwZ3/CVPT8LUid+KJcWCmFQet8Cftl7DVYhZ6I=";

2222 };

2323

2424 mastodon-gems = bundlerEnv {

pkgs/servers/mastodon/gemset.nix+72−72

@@ -5,10 +5,10 @@

55 platforms = [];

66 source = {

77 remotes = ["https://rubygems.org"];

8− sha256 = "1zsb2x1j044rcx9b2ijgnp1ir7vsccxfrar59pvra83j5pjmsyiz";

8+ sha256 = "0znrdixzpbr7spr4iwp19z3r2f2klggh9pmnsiix8qrvccc5lsdl";

99 type = "gem";

1010 };

11− version = "6.1.5";

11+ version = "6.1.5.1";

1212 };

1313 actionmailbox = {

1414 dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"];

@@ -16,10 +16,10 @@

1616 platforms = [];

1717 source = {

1818 remotes = ["https://rubygems.org"];

19− sha256 = "1pzpf5vivh864an88gb7fab1gh137prfjpbf92mx5qnln1wjhlgh";

19+ sha256 = "17mcv2qfjkix1q18nj6kidrhdwxd0rdzssdkdanrpp905z0sx0mw";

2020 type = "gem";

2121 };

22− version = "6.1.5";

22+ version = "6.1.5.1";

2323 };

2424 actionmailer = {

2525 dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"];

@@ -27,10 +27,10 @@

2727 platforms = [];

2828 source = {

2929 remotes = ["https://rubygems.org"];

30− sha256 = "0sm5rp2jxlikhvv7085r7zrazy42dw74k9rlniaka8m6wfas01nf";

30+ sha256 = "1084nk3fzq76gzl6kc9dwb586g3kcj1kmp8w1nsrhpl523ljgl1s";

3131 type = "gem";

3232 };

33− version = "6.1.5";

33+ version = "6.1.5.1";

3434 };

3535 actionpack = {

3636 dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];

@@ -38,10 +38,10 @@

3838 platforms = [];

3939 source = {

4040 remotes = ["https://rubygems.org"];

41− sha256 = "0kk8c6n94lg5gyarsy33wakw04zbmdwgfr7zxv4zzmbnp1yach0w";

41+ sha256 = "1b2vxprwfkza3h6z3pq508hsjh1hz9f8d7739j469mqlxsq5jh1l";

4242 type = "gem";

4343 };

44− version = "6.1.5";

44+ version = "6.1.5.1";

4545 };

4646 actiontext = {

4747 dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"];

@@ -49,10 +49,10 @@

4949 platforms = [];

5050 source = {

5151 remotes = ["https://rubygems.org"];

52− sha256 = "1hkqhliw766vcd4c83af2dd1hcnbsh5zkcx8bdqmjcq7zqfn7xib";

52+ sha256 = "0ld6x9x05b1n40rjp83hsi4byp15zvb3lmvfk2h8jgxfrpb47c6j";

5353 type = "gem";

5454 };

55− version = "6.1.5";

55+ version = "6.1.5.1";

5656 };

5757 actionview = {

5858 dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];

@@ -60,10 +60,10 @@

6060 platforms = [];

6161 source = {

6262 remotes = ["https://rubygems.org"];

63− sha256 = "16w7pl8ir253g1dzlzx4mwrjsx3v7fl7zn941xz53zb4ld286mhi";

63+ sha256 = "0y54nw3x38lj0qh36hlzjw82px328k01fyrk21d6xlpn1w0j98gv";

6464 type = "gem";

6565 };

66− version = "6.1.5";

66+ version = "6.1.5.1";

6767 };

6868 active_model_serializers = {

6969 dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"];

@@ -92,10 +92,10 @@

9292 platforms = [];

9393 source = {

9494 remotes = ["https://rubygems.org"];

95− sha256 = "0arf4vxcahb9f9y5fa1ap7dwnknfjb0d5g9zsh0dnqfga9vp1hws";

95+ sha256 = "1i6s8ppwnf0zcz466i5qi2gd7fdgxkl22db50mxkyfnbwnzbfw49";

9696 type = "gem";

9797 };

98− version = "6.1.5";

98+ version = "6.1.5.1";

9999 };

100100 activemodel = {

101101 dependencies = ["activesupport"];

@@ -103,10 +103,10 @@

103103 platforms = [];

104104 source = {

105105 remotes = ["https://rubygems.org"];

106− sha256 = "16anyz7wqwmphzb6w1sgmvdvj50g3zp70s94s5v8hwxj680f6195";

106+ sha256 = "01bbxwbih29qcmqrrvqymlc6hjf0r38rpwdfgaimisp5vms3xxsn";

107107 type = "gem";

108108 };

109− version = "6.1.5";

109+ version = "6.1.5.1";

110110 };

111111 activerecord = {

112112 dependencies = ["activemodel" "activesupport"];

@@ -114,10 +114,10 @@

114114 platforms = [];

115115 source = {

116116 remotes = ["https://rubygems.org"];

117− sha256 = "0jl6jc9g9jxsljfnnmbkxrgwrz86icw6g745cv6iavryizrmw939";

117+ sha256 = "1yscjy5766g67ip3g7614b0hhrpgz5qk22nj8ghzcjqh3fj2k2n0";

118118 type = "gem";

119119 };

120− version = "6.1.5";

120+ version = "6.1.5.1";

121121 };

122122 activestorage = {

123123 dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];

@@ -125,10 +125,10 @@

125125 platforms = [];

126126 source = {

127127 remotes = ["https://rubygems.org"];

128− sha256 = "0gpxx9wyavp1mhy6fmyj4b20c4x0dcdj94y0ag61fgnyishd19ph";

128+ sha256 = "1m0m7k0p5b7dfpmh9aqfs5fapaymkml3gspirpaq6w9w55ahf6pv";

129129 type = "gem";

130130 };

131− version = "6.1.5";

131+ version = "6.1.5.1";

132132 };

133133 activesupport = {

134134 dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"];

@@ -136,10 +136,10 @@

136136 platforms = [];

137137 source = {

138138 remotes = ["https://rubygems.org"];

139− sha256 = "0jmqndx3a46hpwz33ximqch27018n3mk9z19azgpylm33w7xpkx4";

139+ sha256 = "1ylj0nwk9y5hbgv93wk8kkbg9z9bv1052ic37n9ib34w0bkgrzw4";

140140 type = "gem";

141141 };

142− version = "6.1.5";

142+ version = "6.1.5.1";

143143 };

144144 addressable = {

145145 dependencies = ["public_suffix"];

@@ -250,10 +250,10 @@

250250 platforms = [];

251251 source = {

252252 remotes = ["https://rubygems.org"];

253− sha256 = "0q5c8jjnlz6dlkxwsm6cj9n1z08pylvibsx8r42z50ws0jw2f7jm";

253+ sha256 = "1afpq7sczg91xx5xi4xlgcwrrhmy3k6mrk60ph8avbfiyxgw27pc";

254254 type = "gem";

255255 };

256− version = "1.558.0";

256+ version = "1.582.0";

257257 };

258258 aws-sdk-core = {

259259 dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];

@@ -261,10 +261,10 @@

261261 platforms = [];

262262 source = {

263263 remotes = ["https://rubygems.org"];

264− sha256 = "0cmrz2ddv8235z2dx1hyw85mh3lxaipk9dyy10zk2fvmv1nkfkiq";

264+ sha256 = "0hajbavfngn99hcz6n20162jygvwdflldvnlrza7z32hizawaaan";

265265 type = "gem";

266266 };

267− version = "3.127.0";

267+ version = "3.130.2";

268268 };

269269 aws-sdk-kms = {

270270 dependencies = ["aws-sdk-core" "aws-sigv4"];

@@ -272,10 +272,10 @@

272272 platforms = [];

273273 source = {

274274 remotes = ["https://rubygems.org"];

275− sha256 = "0fmpdll52ng1kfn4r5ndcyppn5553qvvxw87w58m9n70ga3avasi";

275+ sha256 = "14dcfqqdx1dy7qwrdyqdvqjs53kswm4njvg34f61jpl9xi3h2yf3";

276276 type = "gem";

277277 };

278− version = "1.55.0";

278+ version = "1.56.0";

279279 };

280280 aws-sdk-s3 = {

281281 dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];

@@ -283,10 +283,10 @@

283283 platforms = [];

284284 source = {

285285 remotes = ["https://rubygems.org"];

286− sha256 = "0iafjly868kdzmpxkv1ndmqm524ik36ibs15mqh145vw32gz7bax";

286+ sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i";

287287 type = "gem";

288288 };

289− version = "1.113.0";

289+ version = "1.113.2";

290290 };

291291 aws-sigv4 = {

292292 dependencies = ["aws-eventstream"];

@@ -294,10 +294,10 @@

294294 platforms = [];

295295 source = {

296296 remotes = ["https://rubygems.org"];

297− sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa";

297+ sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z";

298298 type = "gem";

299299 };

300− version = "1.4.0";

300+ version = "1.5.0";

301301 };

302302 bcrypt = {

303303 groups = ["default" "pam_authentication"];

@@ -369,20 +369,20 @@

369369 platforms = [];

370370 source = {

371371 remotes = ["https://rubygems.org"];

372− sha256 = "053hx5hz1zdcqwywlnabzf0gkrrchhzh66p1bfzvrryb075lsqm1";

372+ sha256 = "0bjhh8pngmvnrsri2h6a753pgv0xdkbbgi1bmv6c7q137sp37jbg";

373373 type = "gem";

374374 };

375− version = "1.10.3";

375+ version = "1.11.1";

376376 };

377377 brakeman = {

378378 groups = ["development"];

379379 platforms = [];

380380 source = {

381381 remotes = ["https://rubygems.org"];

382− sha256 = "197bvfm4rpczyrpbjzn7zh4q6rxigwnxnnmvvgfg9451k3jjygyy";

382+ sha256 = "1bk1xz5w29cq84svnrlgcrwvy1lpkwqrv6cmkkivs3yrym09av14";

383383 type = "gem";

384384 };

385− version = "5.2.1";

385+ version = "5.2.2";

386386 };

387387 browser = {

388388 groups = ["default"];

@@ -864,10 +864,10 @@

864864 platforms = [];

865865 source = {

866866 remotes = ["https://rubygems.org"];

867− sha256 = "0xsfa02hin2ymfcf0bdvsw6wk8w706rrfdqpy6b4f439zbqmn05m";

867+ sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v";

868868 type = "gem";

869869 };

870− version = "1.2.6";

870+ version = "1.2.7";

871871 };

872872 excon = {

873873 groups = ["default"];

@@ -1102,10 +1102,10 @@

11021102 platforms = [];

11031103 source = {

11041104 remotes = ["https://rubygems.org"];

1105− sha256 = "0l8878iqg85zmpifjfnidpp17swgh103a0br68nqakflnn0zwcka";

1105+ sha256 = "16xki30md6bygc62yi2s1y002vq6dm3bhjcjb9pl5dpr3al3fa1j";

11061106 type = "gem";

11071107 };

1108− version = "1.5.2";

1108+ version = "1.5.3";

11091109 };

11101110 fuubar = {

11111111 dependencies = ["rspec-core" "ruby-progressbar"];

@@ -1312,10 +1312,10 @@

13121312 platforms = [];

13131313 source = {

13141314 remotes = ["https://rubygems.org"];

1315− sha256 = "1f3pgfjk4xmyjhqqq8dpx3vbxbq1d9bwlh3d7957vnkpdwk432n0";

1315+ sha256 = "1hiblss98hmybs82xsaavhz1cwlhhx92jzlx8ypkriylxhhwmigk";

13161316 type = "gem";

13171317 };

1318− version = "1.0.8";

1318+ version = "1.0.9";

13191319 };

13201320 idn-ruby = {

13211321 groups = ["default"];

@@ -1342,10 +1342,10 @@

13421342 platforms = [];

13431343 source = {

13441344 remotes = ["https://rubygems.org"];

1345− sha256 = "1gjrr5pdcl3l3skhp9d0jzs4yhmknpv3ldcz59b339b9lqbqasnr";

1345+ sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";

13461346 type = "gem";

13471347 };

1348− version = "1.6.0";

1348+ version = "1.6.1";

13491349 };

13501350 json = {

13511351 groups = ["default" "test"];

@@ -1545,10 +1545,10 @@

15451545 platforms = [];

15461546 source = {

15471547 remotes = ["https://rubygems.org"];

1548− sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km";

1548+ sha256 = "0fpx5p8n0jq4bdazb2vn19sqkmh398rk9b2pa3gdi43snfn485cr";

15491549 type = "gem";

15501550 };

1551− version = "2.16.0";

1551+ version = "2.17.0";

15521552 };

15531553 mail = {

15541554 dependencies = ["mini_mime"];

@@ -1690,10 +1690,10 @@

16901690 platforms = [];

16911691 source = {

16921692 remotes = ["https://rubygems.org"];

1693− sha256 = "0b98w2j7g89ihnc753hh3if68r5qrmdp9n2j6mvqy2yl73sbv739";

1693+ sha256 = "1i0gbypr1yxwfkaxzrk0i1wz4n6v3mw7z24k65jy3q1h5lda5xbw";

16941694 type = "gem";

16951695 };

1696− version = "1.4.4";

1696+ version = "1.5.1";

16971697 };

16981698 multi_json = {

16991699 groups = ["default"];

@@ -1762,10 +1762,10 @@

17621762 platforms = [];

17631763 source = {

17641764 remotes = ["https://rubygems.org"];

1765− sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";

1765+ sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd";

17661766 type = "gem";

17671767 };

1768− version = "1.13.3";

1768+ version = "1.13.4";

17691769 };

17701770 nsa = {

17711771 dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"];

@@ -1941,10 +1941,10 @@

19411941 platforms = [];

19421942 source = {

19431943 remotes = ["https://rubygems.org"];

1944− sha256 = "00rqwbbxiq7rsmfisfnqbgdswbwdm937f2wmj840j8wahsqmj2r8";

1944+ sha256 = "1v0cszy9lgjqn3ax8pbj5fg01pg83wyl41wzid3g35h4xdxz1d4a";

19451945 type = "gem";

19461946 };

1947− version = "2.8.2";

1947+ version = "2.8.3";

19481948 };

19491949 pkg-config = {

19501950 groups = ["default"];

@@ -2099,10 +2099,10 @@

20992099 platforms = [];

21002100 source = {

21012101 remotes = ["https://rubygems.org"];

2102− sha256 = "1rc6simyql7ax5zzp667x6krl0xxxh3asc1av6gcn8j6cyl86wsx";

2102+ sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq";

21032103 type = "gem";

21042104 };

2105− version = "6.6.0";

2105+ version = "6.6.1";

21062106 };

21072107 rack-cors = {

21082108 dependencies = ["rack"];

@@ -2154,10 +2154,10 @@

21542154 platforms = [];

21552155 source = {

21562156 remotes = ["https://rubygems.org"];

2157− sha256 = "1yr66s65nfw5yclf1x0ziy80gzhp9vqvyy0yzl0npmx25h4aizdv";

2157+ sha256 = "08a9wl2g4q403jc9iziqh37c64yccp6rzxz6avy0l7ydslpxggv8";

21582158 type = "gem";

21592159 };

2160− version = "6.1.5";

2160+ version = "6.1.5.1";

21612161 };

21622162 rails-controller-testing = {

21632163 dependencies = ["actionpack" "actionview" "activesupport"];

@@ -2220,10 +2220,10 @@

22202220 platforms = [];

22212221 source = {

22222222 remotes = ["https://rubygems.org"];

2223− sha256 = "1fdqhv8qhk2dspkrr9f5dj3806g52cb0l1chh2hx8v81y218cl93";

2223+ sha256 = "0lirp0g1n114gwkqbqki2fjqwnbyzhn30z97jhikqldd0r54f4b9";

22242224 type = "gem";

22252225 };

2226− version = "6.1.5";

2226+ version = "6.1.5.1";

22272227 };

22282228 rainbow = {

22292229 groups = ["default" "development" "test"];

@@ -2293,10 +2293,10 @@

22932293 platforms = [];

22942294 source = {

22952295 remotes = ["https://rubygems.org"];

2296− sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";

2296+ sha256 = "0a6nxfq3ln1i109jx172n33s73a90l8g04h8p56bmw9phj467h9k";

22972297 type = "gem";

22982298 };

2299− version = "2.2.1";

2299+ version = "2.3.0";

23002300 };

23012301 request_store = {

23022302 dependencies = ["rack"];

@@ -2399,10 +2399,10 @@

23992399 platforms = [];

24002400 source = {

24012401 remotes = ["https://rubygems.org"];

2402− sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3";

2402+ sha256 = "07vagjxdm5a6s103y8zkcnja6avpl8r196hrpiffmg7sk83dqdsm";

24032403 type = "gem";

24042404 };

2405− version = "3.11.0";

2405+ version = "3.11.1";

24062406 };

24072407 rspec-rails = {

24082408 dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];

@@ -2410,10 +2410,10 @@

24102410 platforms = [];

24112411 source = {

24122412 remotes = ["https://rubygems.org"];

2413− sha256 = "0jj5zs9h2ll8iz699ac4bysih7y4csnf8h5h80bm6ppbf02ly8fa";

2413+ sha256 = "1cqw7bhj4a4rhh1x9i5gjm9r91ckhjyngw0zcr7jw2jnfis10d7l";

24142414 type = "gem";

24152415 };

2416− version = "5.1.1";

2416+ version = "5.1.2";

24172417 };

24182418 rspec-sidekiq = {

24192419 dependencies = ["rspec-core" "sidekiq"];

@@ -2453,10 +2453,10 @@

24532453 platforms = [];

24542454 source = {

24552455 remotes = ["https://rubygems.org"];

2456− sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";

2456+ sha256 = "00d9nzlnbxr3jqkya2b2rcahs9l22qpdk5qf3y7pws8m555l8slk";

24572457 type = "gem";

24582458 };

2459− version = "1.26.1";

2459+ version = "1.27.0";

24602460 };

24612461 rubocop-ast = {

24622462 dependencies = ["parser"];

@@ -2464,10 +2464,10 @@

24642464 platforms = [];

24652465 source = {

24662466 remotes = ["https://rubygems.org"];

2467− sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";

2467+ sha256 = "1k9izkr5rhw3zc309yjp17z7496l74j4li3zrcgpgqfnqwz695qx";

24682468 type = "gem";

24692469 };

2470− version = "1.16.0";

2470+ version = "1.17.0";

24712471 };

24722472 rubocop-rails = {

24732473 dependencies = ["activesupport" "rack" "rubocop"];

@@ -2603,10 +2603,10 @@

26032603 platforms = [];

26042604 source = {

26052605 remotes = ["https://rubygems.org"];

2606− sha256 = "13pc206l9w1wklrgkcafbp332cf8ikl4wfks6ikhk9lvd6hi22sx";

2606+ sha256 = "0ncly0glyvcx8cm976c811iw70y5wyix6iwfsmmgfvi0jmy1h4v3";

26072607 type = "gem";

26082608 };

2609− version = "3.1.1";

2609+ version = "3.2.0";

26102610 };

26112611 sidekiq-unique-jobs = {

26122612 dependencies = ["brpoplpush-redis_script" "concurrent-ruby" "sidekiq" "thor"];

@@ -2614,10 +2614,10 @@

26142614 platforms = [];

26152615 source = {

26162616 remotes = ["https://rubygems.org"];

2617− sha256 = "1b2dcw604mmjh4ncfwsidzbzqaa3fbngqidhvhsjv6ladpzsrb8y";

2617+ sha256 = "0ibrdlpvlra8wxkhapiipwrx8v9y6wpmxlfn5r53swvhmlkrjqgq";

26182618 type = "gem";

26192619 };

2620− version = "7.1.16";

2620+ version = "7.1.21";

26212621 };

26222622 simple-navigation = {

26232623 dependencies = ["activesupport"];

pkgs/servers/mastodon/source.nix+2−2

@@ -2,8 +2,8 @@

22{ fetchgit, applyPatches }: let

33 src = fetchgit {

44 url = "https://github.com/mastodon/mastodon.git";

5− rev = "v3.5.1";

6− sha256 = "0n6ml245jdc2inzw7jwhxbqlfkp5bs61kslyy71ww6a29ndd6hv0";

5+ rev = "v3.5.2";

6+ sha256 = "03sk0rzf7zy0vpq6f5f909hx5gbnan5b5h068grgzv2v7lj11was";

77 };

88in applyPatches {

99 inherit src;

pkgs/servers/mastodon/version.nix+1−1

@@ -1 +1 @@

1−"3.5.1"

1+"3.5.2"

pkgs/servers/matrix-synapse/default.nix+2−2

@@ -11,11 +11,11 @@ in

1111with python3.pkgs;

1212buildPythonApplication rec {

1313 pname = "matrix-synapse";

14− version = "1.57.0";

14+ version = "1.58.0";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "sha256-pZhm3jfpqOcLT+M4eeD8FyHtwj5EOAFESFu+4ZMoz0s=";

18+ sha256 = "sha256-cY3rtmaaAimEQPU4wcMEy/QysPNCdk7yptrkctnLfDA=";

1919 };

2020

2121 buildInputs = [ openssl ];

pkgs/servers/matrix-synapse/matrix-appservice-irc/node-composition.nix+1−1

@@ -1,4 +1,4 @@

1−# This file has been generated by node2nix 1.9.0. Do not edit!

1+# This file has been generated by node2nix 1.11.1. Do not edit!

22

33{pkgs ? import <nixpkgs> {

44 inherit system;

pkgs/servers/matrix-synapse/matrix-appservice-irc/node-packages.nix+7−7

@@ -1,4 +1,4 @@

1−# This file has been generated by node2nix 1.9.0. Do not edit!

1+# This file has been generated by node2nix 1.11.1. Do not edit!

22

33{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:

44

@@ -3128,13 +3128,13 @@ let

31283128 sha512 = "HnEXoEhqpNp9/W9Ep7ZNZAubFlUssFyVpjgKfMOxxg+dYbBk5NWToHmAPQxlRUgrZ/rIMLVyMJROSCIthDbo2A==";

31293129 };

31303130 };

3131− "matrix-org-irc-1.2.0" = {

3131+ "matrix-org-irc-1.2.1" = {

31323132 name = "matrix-org-irc";

31333133 packageName = "matrix-org-irc";

3134− version = "1.2.0";

3134+ version = "1.2.1";

31353135 src = fetchurl {

3136− url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.0.tgz";

3137− sha512 = "RnfeR9FimJJD/iOWw0GiV7NIPRmBJobvFasUgjVmGre9A4qJ9klHIDOlQ5vXIoPPMjzG8XXuAf4WHgMCNBfZkQ==";

3136+ url = "https://registry.npmjs.org/matrix-org-irc/-/matrix-org-irc-1.2.1.tgz";

3137+ sha512 = "x7SoeIOP+Z6R2s8PJqhM89OZNsS2RO4srx7c3JGa/VN6rtJ1AMLEyW4EPCVh09tGiTvmbit9KJysjLvFQPx9KA==";

31383138 };

31393139 };

31403140 "media-typer-0.3.0" = {

@@ -5031,7 +5031,7 @@ let

50315031 args = {

50325032 name = "matrix-appservice-irc";

50335033 packageName = "matrix-appservice-irc";

5034− version = "0.33.1";

5034+ version = "0.34.0";

50355035 src = ./.;

50365036 dependencies = [

50375037 sources."@alloc/quick-lru-5.2.0"

@@ -5475,7 +5475,7 @@ let

54755475 sources."qs-6.10.3"

54765476 ];

54775477 })

5478− sources."matrix-org-irc-1.2.0"

5478+ sources."matrix-org-irc-1.2.1"

54795479 sources."media-typer-0.3.0"

54805480 sources."merge-descriptors-1.0.1"

54815481 sources."merge2-1.4.1"

pkgs/servers/matrix-synapse/matrix-appservice-irc/package.json+2−2

@@ -1,6 +1,6 @@

11{

22 "name": "matrix-appservice-irc",

3− "version": "0.33.1",

3+ "version": "0.34.0",

44 "description": "An IRC Bridge for Matrix",

55 "main": "app.js",

66 "bin": "./bin/matrix-appservice-irc",

@@ -34,7 +34,7 @@

3434 "he": "^1.2.0",

3535 "logform": "^2.4.0",

3636 "matrix-appservice-bridge": "^3.2.0",

37− "matrix-org-irc": "^1.2.0",

37+ "matrix-org-irc": "^1.2.1",

3838 "matrix-bot-sdk": "0.5.19",

3939 "nopt": "^3.0.1",

4040 "p-queue": "^6.6.2",

pkgs/servers/matrix-synapse/matrix-appservice-irc/src.json+4−4

@@ -1,9 +1,9 @@

11{

22 "url": "https://github.com/matrix-org/matrix-appservice-irc",

3− "rev": "00c8e7afb057021126c5e8ea9a46f2f8a55ea0bc",

4− "date": "2022-03-30T14:29:04+01:00",

5− "path": "/nix/store/9cm14kvicwc83irmbb8zsr8rc4893l22-matrix-appservice-irc",

6− "sha256": "1zhcihji9cwrdajx5dfnd4w38xsnqnqmwccngfiwrh8mwra7phfi",

3+ "rev": "8faf9614e80073e3cf07c96dbd295379d80f4161",

4+ "date": "2022-05-04T09:06:31+02:00",

5+ "path": "/nix/store/sy3v3h9xf4zc9cggavfk720c1pv3hiz2-matrix-appservice-irc",

6+ "sha256": "1ihhd1y6jsz98iwrza3fnfinpkpzkn0776wiz6jzdzz71hnb444l",

77 "fetchLFS": false,

88 "fetchSubmodules": false,

99 "deepClone": false,

pkgs/servers/monitoring/prometheus/aws-s3-exporter.nix+7−7

@@ -1,19 +1,19 @@

1−{ lib, buildGoPackage, fetchFromGitHub }:

1+{ lib, buildGoModule, fetchFromGitHub }:

22

3−buildGoPackage rec {

3+buildGoModule rec {

44 pname = "aws-s3-exporter";

5− version = "0.4.1";

6−

7− goPackagePath = "github.com/ribbybibby/s3_exporter";

5+ version = "0.5.0";

86

97 src = fetchFromGitHub {

108 owner = "ribbybibby";

119 repo = "s3_exporter";

1210 rev = "v${version}";

13− sha256 = "01g4k5wrbc2ggxkn4yqd2v0amw8yl5dbcfwi4jm3kqkihrf0rbiq";

11+ sha256 = "sha256-dYkMCCAIlFDFOFUNJd4NvtAeJDTsHeJoH90b5pSGlQE=";

1412 };

1513

16− doCheck = true;

14+ vendorSha256 = null;

15+

16+ ldflags = [ "-s" "-w" ];

1717

1818 meta = with lib; {

1919 description = "Exports Prometheus metrics about S3 buckets and objects";

pkgs/servers/monitoring/prometheus/haproxy-exporter.nix+9−7

@@ -1,18 +1,20 @@

1−{ lib, buildGoPackage, fetchFromGitHub }:

1+{ lib, buildGoModule, fetchFromGitHub }:

22

3−buildGoPackage rec {

3+buildGoModule rec {

44 pname = "haproxy_exporter";

5− version = "0.12.0";

6−

7− goPackagePath = "github.com/prometheus/haproxy_exporter";

5+ version = "0.13.0";

86

97 src = fetchFromGitHub {

10− rev = "v${version}";

118 owner = "prometheus";

129 repo = "haproxy_exporter";

13− sha256 = "09aqm2zqimn6w10p1nhnpjcigm299b31xfrq8ma0d7z4v9p2y9dn";

10+ rev = "v${version}";

11+ sha256 = "sha256-F0yYUIKTIGyhzL0QwmioQYnWBb0GeFOhBwL3IqDKoQA=";

1412 };

1513

14+ vendorSha256 = "sha256-iJ2doxsLqTitsKJg3PUFLzEtLlP5QckSdFZkXX3ALIE=";

15+

16+ ldflags = [ "-s" "-w" ];

17+

1618 meta = with lib; {

1719 description = "HAProxy Exporter for the Prometheus monitoring system";

1820 homepage = "https://github.com/prometheus/haproxy_exporter";

pkgs/servers/monitoring/uchiwa/bower-packages.nixdeleted−25

@@ -1,25 +0,0 @@

1−# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)

2−{ fetchbower, buildEnv }:

3−buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [

4− (fetchbower "uchiwa-web" "1.7.0" "1.7.0" "1qn09j3a1ngqn36rhz7a2dj00szr0r6fjb40lfbmq3drkzppgbm1")

5− (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws")

6− (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")

7− (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn")

8− (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi")

9− (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj")

10− (fetchbower "angular-resource" "1.6.10" "~1.6.3" "1gplq8kd49qakk7ardg5xr5amwvspaz9n71kf8x49xfllda61rm0")

11− (fetchbower "angular-route" "1.6.10" "~1.6.3" "0vwbn7i45yvsn8c469nj141ahrn7iw85j7hy3vvhh2r373j94mai")

12− (fetchbower "angular-sanitize" "1.6.10" "~1.6.3" "066gsdl19s27w00wafg2skf5abdsdrlzhkcagkk1ma39dyqyl4i3")

13− (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh")

14− (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8")

15− (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9")

16− (fetchbower "bootstrap" "3.1.1" "3.1.1" "1a06mx1rw5h4wq89kqpa8g2pbiddm3p21dxq50jyi29sywd01ny4")

17− (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "1k6hhvsd75hdfrz8qcjzmb12c17fdn0h3l3l5k9wgd0rfhhfkyvd")

18− (fetchbower "fontawesome" "4.4.0" "~4.4.0" "09mrbik8i3skjwchn7ns2020bqmb51kbd3mqi59vh444s4az2sc7")

19− (fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3")

20− (fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71")

21− (fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")

22− (fetchbower "ua-parser-js" "0.7.20" "~0.7.12" "18r0islba6cwkvx4s2gna7skhsn2vqjcf1xyap5pcmycjnq93j8s")

23− (fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")

24− (fetchbower "jquery" "3.4.1" ">= 1.9.0" "1vk25pbc55m2c82mqf26rfhxhnliq18isi4vbm4p98a1b9vp8fq7")

25−]; }

pkgs/servers/monitoring/uchiwa/default.nixdeleted−53

@@ -1,53 +0,0 @@

1−{ lib, stdenv, fetchFromGitHub, buildBowerComponents, buildGoPackage, makeWrapper }:

2−

3−let

4− inherit (import ./src.nix) version sha256;

5− owner = "sensu";

6− repo = "uchiwa";

7−

8− src = fetchFromGitHub {

9− inherit owner repo sha256;

10− rev = version;

11− };

12−

13− backend = buildGoPackage {

14− pname = "uchiwa-backend";

15− inherit version;

16− goPackagePath = "github.com/${owner}/${repo}";

17− inherit src;

18− postInstall = ''

19− mkdir -p $out

20− cp go/src/github.com/sensu/uchiwa/public/index.html $out/

21− '';

22− };

23−

24− frontend = buildBowerComponents {

25− name = "uchiwa-frontend-${version}";

26− generated = ./bower-packages.nix;

27− inherit src;

28− };

29−

30−in stdenv.mkDerivation {

31− pname = "uchiwa";

32− inherit version;

33−

34− inherit src;

35−

36− nativeBuildInputs = [ makeWrapper ];

37−

38− buildCommand = ''

39− mkdir -p $out/bin $out/public

40− makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \

41− --add-flags "-p $out/public"

42− ln -s ${backend.out}/index.html $out/public/index.html

43− ln -s ${frontend.out}/bower_components $out/public/bower_components

44− '';

45−

46− meta = with lib; {

47− description = "A Dashboard for the sensu monitoring framework";

48− homepage = "http://sensuapp.org/";

49− license = licenses.mit;

50− maintainers = with maintainers; [ peterhoeg ];

51− platforms = platforms.unix;

52− };

53−}

pkgs/servers/monitoring/uchiwa/src.nixdeleted−4

@@ -1,4 +0,0 @@

1−{

2− version = "1.7.0-1";

3− sha256 = "0fa3zzh6d8v1lfn828s0x65pcknycwyv0d1mndi0gvdfbfg463nf";

4−}

pkgs/servers/monitoring/uchiwa/update.shdeleted−42

@@ -1,42 +0,0 @@

1−#!/usr/bin/env nix-shell

2−#!nix-shell -i bash -p curl.bin git.out nix jq.out nodePackages.bower2nix

3−

4−set -euo pipefail

5−IFS=$'\n\t'

6−

7−# set -x

8−

9−REPO=sensu/uchiwa

10−VERSION=0.0.1

11−SHA="1111111111111111111111111111111111111111111111111111"

12−DIR=$(pwd)

13−

14−write_src() {

15− cat <<_EOF > $DIR/src.nix

16−{

17− version = "${VERSION}";

18− sha256 = "${SHA}";

19−}

20−_EOF

21−}

22−

23−LATEST_VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)

24−echo "Latest version: ${LATEST_VERSION}"

25−

26−VERSION=${1:-${LATEST_VERSION}}

27−echo "Updating to: ${VERSION}"

28−

29−TOP=$(git rev-parse --show-toplevel)

30−

31−cd $(dirname $0)

32−

33−write_src

34−pushd $TOP >/dev/null

35−SHA=$(nix-prefetch-url -A uchiwa.src)

36−popd >/dev/null

37−write_src

38−

39−curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > bower.json

40−rm -f bower-packages.nix

41−bower2nix bower.json $DIR/bower-packages.nix

42−rm -f bower.json

pkgs/servers/roon-server/default.nix+2−2

@@ -16,7 +16,7 @@

1616}:

1717stdenv.mkDerivation rec {

1818 pname = "roon-server";

19− version = "1.8-933";

19+ version = "1.8-935";

2020

2121 src =

2222 let

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

2424 in

2525 fetchurl {

2626 url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2";

27− hash = "sha256-9vAp60hck1Zys0Yv4uibLp7GUAoPvkE9AxNp9DXsQfE=";

27+ hash = "sha256-6I612imOCqxVlNu6zCXWS/Yy8bnot+0723t3Se4DjLg=";

2828 };

2929

3030 dontConfigure = true;

pkgs/servers/unifi/default.nix+2−2

@@ -65,7 +65,7 @@ in rec {

6565 };

6666

6767 unifi7 = generic {

68− version = "7.0.25";

69− sha256 = "sha256-DZi2xy6mS3hfqxX1ikiHKPlJ12eaoZVgyl9jKYt91hg=";

68+ version = "7.1.61";

69+ sha256 = "sha256-7Ac8BjlBLCslSU6IZK0EtheKz4CtH7tcmR8J2rUGYbs=";

7070 };

7171}

pkgs/servers/web-apps/sogo/default.nix+2−2

@@ -1,6 +1,6 @@

11{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir

22, openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests

3−, oathToolkit }:

3+, oath-toolkit }:

44gnustep.stdenv.mkDerivation rec {

55 pname = "SOGo";

66 version = "5.5.0";

@@ -13,7 +13,7 @@ gnustep.stdenv.mkDerivation rec {

1313 };

1414

1515 nativeBuildInputs = [ gnustep.make makeWrapper python3 ];

16− buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oathToolkit ];

16+ buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ];

1717

1818 patches = [

1919 # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches

pkgs/servers/web-apps/wallabag/default.nix+3−1

@@ -4,8 +4,10 @@

44}:

55

66# Point the environment variable $WALLABAG_DATA to a data directory

7−# that contains the folder `app/config` which must be a clone of

7+# that contains the folder `app` which must be a clone of

88# wallabag's configuration files with your customized `parameters.yml`.

9+# In practice you need to copy `${pkgs.wallabag}/app` and the

10+# customizzed `parameters.yml` to $WALLABAG_DATA.

911# These need to be updated every package upgrade.

1012#

1113# After a package upgrade, empty the `var/cache` folder or unexpected

pkgs/stdenv/generic/check-meta.nix+37−12

@@ -7,6 +7,10 @@ let

77 # If we're in hydra, we can dispense with the more verbose error

88 # messages and make problems easier to spot.

99 inHydra = config.inHydra or false;

10+ # Allow the user to opt-into additional warnings, e.g.

11+ # import <nixpkgs> { config = { showDerivationWarnings = [ "maintainerless" ]; }; }

12+ showWarnings = config.showDerivationWarnings;

13+

1014 getName = attrs: attrs.name or ("${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}");

1115

1216 # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426

@@ -46,6 +50,9 @@ let

4650 hasLicense attrs &&

4751 isUnfree (lib.lists.toList attrs.meta.license);

4852

53+ hasNoMaintainers = attrs:

54+ attrs ? meta.maintainers && (lib.length attrs.meta.maintainers) == 0;

55+

4956 isMarkedBroken = attrs: attrs.meta.broken or false;

5057

5158 hasUnsupportedPlatform = attrs:

@@ -91,6 +98,7 @@ let

9198 insecure = remediate_insecure;

9299 broken-outputs = remediateOutputsToInstall;

93100 unknown-meta = x: "";

101+ maintainerless = x: "";

94102 };

95103 remediation_env_var = allow_attr: {

96104 Unfree = "NIXPKGS_ALLOW_UNFREE";

@@ -199,6 +207,14 @@ let

199207 else throw;

200208 in handler msg;

201209

210+ handleEvalWarning = { meta, attrs }: { reason , errormsg ? "" }:

211+ let

212+ remediationMsg = (builtins.getAttr reason remediation) attrs;

213+ msg = if inHydra then "Warning while evaluating ${getName attrs}: «${reason}»: ${errormsg}"

214+ else "Package ${getName attrs} in ${pos_str meta} ${errormsg}, continuing anyway."

215+ + (if remediationMsg != "" then "\n${remediationMsg}" else "");

216+ isEnabled = lib.findFirst (x: x == reason) null showWarnings;

217+ in if isEnabled != null then builtins.trace msg true else true;

202218

203219 metaTypes = with lib.types; rec {

204220 # These keys are documented

@@ -277,28 +293,37 @@ let

277293 insecure = isMarkedInsecure attrs;

278294 }

279295 // (if hasDeniedUnfreeLicense attrs && !(hasAllowlistedLicense attrs) then

280− { valid = false; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; }

296+ { valid = "no"; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; }

281297 else if hasBlocklistedLicense attrs then

282− { valid = false; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; }

298+ { valid = "no"; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; }

283299 else if !allowBroken && attrs.meta.broken or false then

284− { valid = false; reason = "broken"; errormsg = "is marked as broken"; }

300+ { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; }

285301 else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then

286− { valid = false; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; }

302+ { valid = "no"; reason = "unsupported"; errormsg = "is not supported on ‘${hostPlatform.system}’"; }

287303 else if !(hasAllowedInsecure attrs) then

288− { valid = false; reason = "insecure"; errormsg = "is marked as insecure"; }

304+ { valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; }

289305 else if checkOutputsToInstall attrs then

290− { valid = false; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; }

306+ { valid = "no"; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; }

291307 else let res = checkMeta (attrs.meta or {}); in if res != [] then

292− { valid = false; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }

293− else { valid = true; });

308+ { valid = "no"; reason = "unknown-meta"; errormsg = "has an invalid meta attrset:${lib.concatMapStrings (x: "\n\t - " + x) res}"; }

309+ # --- warnings ---

310+ # Please also update the type in /pkgs/top-level/config.nix alongside this.

311+ else if hasNoMaintainers attrs then

312+ { valid = "warn"; reason = "maintainerless"; errormsg = "has no maintainers"; }

313+ # -----

314+ else { valid = "yes"; });

294315

295316 assertValidity = { meta, attrs }: let

296317 validity = checkValidity attrs;

297318 in validity // {

298− # Throw an error if trying to evaluate an non-valid derivation

299− handled = if !validity.valid

300− then handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; }

301− else true;

319+ # Throw an error if trying to evaluate a non-valid derivation

320+ # or, alternatively, just output a warning message.

321+ handled =

322+ {

323+ no = handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; };

324+ warn = handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; };

325+ yes = true;

326+ }.${validity.valid};

302327 };

303328

304329in assertValidity

pkgs/stdenv/generic/make-derivation.nix+69−4

@@ -9,8 +9,72 @@ let

99 # to build it. This is a bit confusing for cross compilation.

1010 inherit (stdenv) hostPlatform;

1111 };

12+

13+ makeOverlayable = mkDerivationSimple:

14+ fnOrAttrs:

15+ if builtins.isFunction fnOrAttrs

16+ then makeDerivationExtensible mkDerivationSimple fnOrAttrs

17+ else makeDerivationExtensibleConst mkDerivationSimple fnOrAttrs;

18+

19+ # Based off lib.makeExtensible, with modifications:

20+ makeDerivationExtensible = mkDerivationSimple: rattrs:

21+ let

22+ # NOTE: The following is a hint that will be printed by the Nix cli when

23+ # encountering an infinite recursion. It must not be formatted into

24+ # separate lines, because Nix would only show the last line of the comment.

25+

26+ # An infinite recursion here can be caused by having the attribute names of expression `e` in `.overrideAttrs(finalAttrs: previousAttrs: e)` depend on `finalAttrs`. Only the attribute values of `e` can depend on `finalAttrs`.

27+ args = rattrs (args // { inherit finalPackage; });

28+ # ^^^^

29+

30+ finalPackage =

31+ mkDerivationSimple

32+ (f0:

33+ let

34+ f = self: super:

35+ # Convert f0 to an overlay. Legacy is:

36+ # overrideAttrs (super: {})

37+ # We want to introduce self. We follow the convention of overlays:

38+ # overrideAttrs (self: super: {})

39+ # Which means the first parameter can be either self or super.

40+ # This is surprising, but far better than the confusion that would

41+ # arise from flipping an overlay's parameters in some cases.

42+ let x = f0 super;

43+ in

44+ if builtins.isFunction x

45+ then

46+ # Can't reuse `x`, because `self` comes first.

47+ # Looks inefficient, but `f0 super` was a cheap thunk.

48+ f0 self super

49+ else x;

50+ in

51+ makeDerivationExtensible mkDerivationSimple

52+ (self: let super = rattrs self; in super // f self super))

53+ args;

54+ in finalPackage;

55+

56+ # makeDerivationExtensibleConst == makeDerivationExtensible (_: attrs),

57+ # but pre-evaluated for a slight improvement in performance.

58+ makeDerivationExtensibleConst = mkDerivationSimple: attrs:

59+ mkDerivationSimple

60+ (f0:

61+ let

62+ f = self: super:

63+ let x = f0 super;

64+ in

65+ if builtins.isFunction x

66+ then

67+ f0 self super

68+ else x;

69+ in

70+ makeDerivationExtensible mkDerivationSimple (self: attrs // f self attrs))

71+ attrs;

72+

1273in

1374

75+makeOverlayable (overrideAttrs:

76+

77+

1478# `mkDerivation` wraps the builtin `derivation` function to

1579# produce derivations that use this stdenv and its shell.

1680#

@@ -70,6 +134,7 @@ in

70134

71135, # TODO(@Ericson2314): Make always true and remove

72136 strictDeps ? if config.strictDepsByDefault then true else stdenv.hostPlatform != stdenv.buildPlatform

137+

73138, meta ? {}

74139, passthru ? {}

75140, pos ? # position used in error messages and for meta.position

@@ -370,7 +435,7 @@ else let

370435 } // {

371436 # Expose the result of the checks for everyone to see.

372437 inherit (validity) unfree broken unsupported insecure;

373− available = validity.valid

438+ available = validity.valid != "no"

374439 && (if config.checkMetaRecursively or false

375440 then lib.all (d: d.meta.available or true) references

376441 else true);

@@ -381,8 +446,6 @@ in

381446lib.extendDerivation

382447 validity.handled

383448 ({

384− overrideAttrs = f: stdenv.mkDerivation (attrs // (f attrs));

385−

386449 # A derivation that always builds successfully and whose runtime

387450 # dependencies are the original derivations build time dependencies

388451 # This allows easy building and distributing of all derivations

@@ -408,10 +471,12 @@ lib.extendDerivation

408471 args = [ "-c" "export > $out" ];

409472 });

410473

411− inherit meta passthru;

474+ inherit meta passthru overrideAttrs;

412475 } //

413476 # Pass through extra attributes that are not inputs, but

414477 # should be made available to Nix expressions using the

415478 # derivation (e.g., in assertions).

416479 passthru)

417480 (derivation derivationArg)

481+

482+)

pkgs/tools/X11/opentabletdriver/default.nix+2−2

@@ -19,13 +19,13 @@

1919

2020buildDotnetModule rec {

2121 pname = "OpenTabletDriver";

22− version = "0.6.0.3";

22+ version = "0.6.0.4";

2323

2424 src = fetchFromGitHub {

2525 owner = "OpenTabletDriver";

2626 repo = "OpenTabletDriver";

2727 rev = "v${version}";

28− sha256 = "sha256-/Tow25ycQEK8HN1IaB12ZXCXEsuKItD+aYLF/IX8Eos=";

28+ sha256 = "sha256-VvxW8Ck+XC4nXSUyDhcbGoeSr5uSAZ66jtZNoADuVR8=";

2929 };

3030

3131 debPkg = fetchurl {

pkgs/tools/X11/opentabletdriver/deps.nix+1−1

@@ -20,6 +20,7 @@

2020 (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; })

2121 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })

2222 (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })

23+ (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })

2324 (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })

2425 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })

2526 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })

@@ -27,7 +28,6 @@

2728 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })

2829 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })

2930 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })

30− (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })

3131 (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; })

3232 (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; })

3333 (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; })

pkgs/tools/admin/aws-google-auth/default.nix+3−3

@@ -20,15 +20,15 @@

2020

2121buildPythonApplication rec {

2222 pname = "aws-google-auth";

23− version = "0.0.37";

23+ version = "0.0.38";

2424

2525 # Pypi doesn't ship the tests, so we fetch directly from GitHub

2626 # https://github.com/cevoaustralia/aws-google-auth/issues/120

2727 src = fetchFromGitHub {

2828 owner = "cevoaustralia";

2929 repo = "aws-google-auth";

30− rev = version;

31− sha256 = "1bh733n4m5rsslpbjvhdigx6768nrvacybkakrm9704d2md9vkqd";

30+ rev = "refs/tags/${version}";

31+ sha256 = "sha256-/Xe4RDA9sBEsBBV1VP91VX0VfO8alK8L70m9WrB7qu4=";

3232 };

3333

3434 propagatedBuildInputs = [

pkgs/tools/admin/lxd/default.nix+1

@@ -48,6 +48,7 @@ buildGo118Package rec {

4848 '';

4949

5050 passthru.tests.lxd = nixosTests.lxd;

51+ passthru.tests.lxd-nftables = nixosTests.lxd-nftables;

5152

5253 nativeBuildInputs = [ installShellFiles pkg-config makeWrapper ];

5354 buildInputs = [ lxc acl libcap dqlite.dev raft-canonical.dev

pkgs/tools/admin/pgadmin/default.nix+87−54

@@ -1,21 +1,21 @@

1−{ stdenv

2−, lib

1+{ lib

32, python3

43, fetchurl

54, zlib

65, mkYarnModules

76, sphinx

87, nixosTests

8+, pkgs

99}:

1010

1111let

1212

1313 pname = "pgadmin";

14− version = "6.7";

14+ version = "6.8";

1515

1616 src = fetchurl {

1717 url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz";

18− sha256 = "1g2yxwgj9fp1fkn8j2jrdhmr2b2s6y8sgv4jq55aaxm4hfkkqh6d";

18+ sha256 = "sha256-kS9GV/j28zkXTJZkRrG2JDgas210rQqXOJrwwxzepbw=";

1919 };

2020

2121 yarnDeps = mkYarnModules {

@@ -25,9 +25,78 @@ let

2525 yarnLock = ./yarn.lock;

2626 yarnNix = ./yarn.nix;

2727 };

28+

29+ # move buildDeps here to easily pass to test suite

30+ buildDeps = with pythonPackages; [

31+ flask

32+ flask-gravatar

33+ flask_login

34+ flask_mail

35+ flask_migrate

36+ flask_sqlalchemy

37+ flask_wtf

38+ flask-compress

39+ passlib

40+ pytz

41+ simplejson

42+ six

43+ sqlparse

44+ wtforms

45+ flask-paranoid

46+ psutil

47+ psycopg2

48+ python-dateutil

49+ sqlalchemy

50+ itsdangerous

51+ flask-security-too

52+ bcrypt

53+ cryptography

54+ sshtunnel

55+ ldap3

56+ flask-babelex

57+ flask-babel

58+ gssapi

59+ flask-socketio

60+ eventlet

61+ httpagentparser

62+ user-agents

63+ wheel

64+ authlib

65+ qrcode

66+ pillow

67+ pyotp

68+ botocore

69+ boto3

70+ ];

71+

72+ # override necessary on pgadmin4 6.8

73+ pythonPackages = python3.pkgs.overrideScope (final: prev: rec {

74+ flask = prev.flask.overridePythonAttrs (oldAttrs: rec {

75+ version = "2.0.3";

76+ src = oldAttrs.src.override {

77+ inherit version;

78+ sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0=";

79+ };

80+ disabledTests = (oldAttrs.disabledTests or [ ]) ++ [

81+ "test_aborting"

82+ ];

83+ });

84+ flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec {

85+ # tests fail due to downgrades here

86+ doCheck = false;

87+ });

88+ werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec {

89+ version = "2.0.3";

90+ src = oldAttrs.src.override {

91+ inherit version;

92+ sha256 = "sha256-uGP4/wV8UiFktgZ8niiwQRYbS+W6TQ2s7qpQoWOCLTw=";

93+ };

94+ });

95+ });

96+

2897in

2998

30−python3.pkgs.buildPythonApplication rec {

99+pythonPackages.buildPythonApplication rec {

31100 inherit pname version src;

32101

33102 # from Dockerfile

@@ -43,19 +112,19 @@ python3.pkgs.buildPythonApplication rec {

43112 postPatch = ''

44113 # patching Makefile, so it doesn't try to build sphinx documentation here

45114 # (will do so later)

46− substituteInPlace Makefile --replace "LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html" "true"

115+ substituteInPlace Makefile --replace 'LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 $(MAKE) -C docs/en_US -f Makefile.sphinx html' "true"

47116 # fix document which refers a non-existing document and fails

48117 substituteInPlace docs/en_US/contributions.rst --replace "code_snippets" ""

49118 patchShebangs .

50119 # relax dependencies

51120 substituteInPlace requirements.txt \

52− --replace "Pillow==8.3.*" "Pillow>=8.3.0" \

53121 --replace "psycopg2==2.9.*" "psycopg2>=2.9" \

54122 --replace "cryptography==3.*" "cryptography>=3.0" \

55123 --replace "requests==2.25.*" "requests>=2.25.0" \

56124 --replace "boto3==1.20.*" "boto3>=1.20" \

57125 --replace "botocore==1.23.*" "botocore>=1.23" \

58− --replace "pytz==2021.*" "pytz"

126+ --replace "pytz==2021.*" "pytz" \

127+ --replace "Werkzeug==2.0.3" "werkzeug>=2.*"

59128 # don't use Server Mode (can be overridden later)

60129 substituteInPlace pkg/pip/setup_pip.py \

61130 --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \

@@ -101,10 +170,10 @@ python3.pkgs.buildPythonApplication rec {

101170 cp -v ../pkg/pip/setup_pip.py setup.py

102171 '';

103172

104− nativeBuildInputs = [ python3 python3.pkgs.cython python3.pkgs.pip ];

173+ nativeBuildInputs = with pythonPackages; [ cython pip ];

105174 buildInputs = [

106175 zlib

107− python3.pkgs.wheel

176+ pythonPackages.wheel

108177 ];

109178

110179 # tests need an own data, log directory

@@ -112,57 +181,21 @@ python3.pkgs.buildPythonApplication rec {

112181 # checks will be run through nixos/tests

113182 doCheck = false;

114183

115− propagatedBuildInputs = with python3.pkgs; [

116− flask

117− flask-gravatar

118− flask_login

119− flask_mail

120− flask_migrate

121− flask_sqlalchemy

122− flask_wtf

123− flask-compress

124− passlib

125− pytz

126− simplejson

127− six

128− speaklater3

129− sqlparse

130− wtforms

131− flask-paranoid

132− psutil

133− psycopg2

134− python-dateutil

135− sqlalchemy

136− itsdangerous

137− flask-security-too

138− bcrypt

139− cryptography

140− sshtunnel

141− ldap3

142− flask-babelex

143− flask-babel

144− gssapi

145− flask-socketio

146− eventlet

147− httpagentparser

148− user-agents

149− wheel

150− authlib

151− qrcode

152− pillow

153− pyotp

154− botocore

155− boto3

156− ];

184+ # speaklater3 is seperate because when passing buildDeps

185+ # to the test, it fails there due to a collision with speaklater

186+ propagatedBuildInputs = buildDeps ++ [ pythonPackages.speaklater3 ];

157187

158− passthru = {

159− tests = { inherit (nixosTests) pgadmin4 pgadmin4-standalone; };

188+ passthru.tests = {

189+ standalone = nixosTests.pgadmin4-standalone;

190+ # regression and function tests of the package itself

191+ package = (import ../../../../nixos/tests/pgadmin4.nix ({ inherit pkgs; buildDeps = buildDeps; pythonEnv = pythonPackages; }));

160192 };

161193

162194 meta = with lib; {

163195 description = "Administration and development platform for PostgreSQL";

164196 homepage = "https://www.pgadmin.org/";

165197 license = licenses.mit;

198+ changelog = "https://www.pgadmin.org/docs/pgadmin4/latest/release_notes_${lib.versions.major version}_${lib.versions.minor version}.html";

166199 maintainers = with maintainers; [ gador ];

167200 };

168201}

pkgs/tools/admin/pgadmin/package.json+7−4

@@ -8,8 +8,8 @@

88 "license": "PostgreSQL",

99 "devDependencies": {

1010 "@babel/core": "^7.10.2",

11− "@babel/eslint-parser": "^7.12.13",

12− "@babel/eslint-plugin": "^7.12.13",

11+ "@babel/eslint-parser": "^7.17.0",

12+ "@babel/eslint-plugin": "^7.17.7",

1313 "@babel/plugin-proposal-object-rest-spread": "^7.10.1",

1414 "@babel/plugin-syntax-jsx": "^7.16.0",

1515 "@babel/preset-env": "^7.10.2",

@@ -82,11 +82,12 @@

8282 "@date-io/core": "^1.3.6",

8383 "@date-io/date-fns": "1.x",

8484 "@emotion/sheet": "^1.0.1",

85− "@fortawesome/fontawesome-free": "^5.14.0",

8685 "@material-ui/core": "4.11.0",

8786 "@material-ui/icons": "^4.11.2",

8887 "@material-ui/lab": "4.0.0-alpha.58",

8988 "@material-ui/pickers": "^3.2.10",

89+ "@mui/icons-material": "^5.4.2",

90+ "@mui/material": "^5.4.3",

9091 "@projectstorm/react-diagrams": "^6.6.1",

9192 "@simonwep/pickr": "^1.5.1",

9293 "@szhsin/react-menu": "^2.2.0",

@@ -145,7 +146,7 @@

145146 "path-fx": "^2.0.0",

146147 "pathfinding": "^0.4.18",

147148 "paths-js": "^0.4.9",

148− "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422",

149+ "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613",

149150 "postcss": "^8.2.15",

150151 "raf": "^3.4.1",

151152 "rc-dock": "^3.2.9",

@@ -154,6 +155,8 @@

154155 "react-checkbox-tree": "^1.7.2",

155156 "react-dom": "^17.0.1",

156157 "react-draggable": "^4.4.4",

158+ "react-rnd": "^10.3.5",

159+ "react-router-dom": "^6.2.2",

157160 "react-select": "^4.2.1",

158161 "react-table": "^7.6.3",

159162 "react-timer-hook": "^3.0.5",

pkgs/tools/admin/pgadmin/yarn.lock+231−22

@@ -91,19 +91,19 @@

9191 json5 "^2.1.2"

9292 semver "^6.3.0"

9393

94−"@babel/eslint-parser@^7.12.13":

95− version "7.13.8"

96− resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz#6f2bde6b0690fcc0598b4869fc7c8e8b55b17687"

97− integrity sha512-XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw==

94+"@babel/eslint-parser@^7.17.0":

95+ version "7.17.0"

96+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6"

97+ integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==

9898 dependencies:

99− eslint-scope "5.1.0"

100− eslint-visitor-keys "^1.3.0"

99+ eslint-scope "^5.1.1"

100+ eslint-visitor-keys "^2.1.0"

101101 semver "^6.3.0"

102102

103−"@babel/eslint-plugin@^7.12.13":

104− version "7.13.0"

105− resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz#e6d99efcd6b8551adf479e382a47218726179b1b"

106− integrity sha512-YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w==

103+"@babel/eslint-plugin@^7.17.7":

104+ version "7.17.7"

105+ resolved "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz#4ee1d5b29b79130f3bb5a933358376bcbee172b8"

106+ integrity sha512-JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==

107107 dependencies:

108108 eslint-rule-composer "^0.3.0"

109109

@@ -1741,6 +1741,13 @@

17411741 dependencies:

17421742 regenerator-runtime "^0.13.4"

17431743

1744+"@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6":

1745+ version "7.17.8"

1746+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"

1747+ integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==

1748+ dependencies:

1749+ regenerator-runtime "^0.13.4"

1750+

17441751"@babel/template@^7.12.13", "@babel/template@^7.14.5":

17451752 version "7.14.5"

17461753 resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"

@@ -1849,6 +1856,17 @@

18491856 "@emotion/weak-memoize" "^0.2.5"

18501857 stylis "^4.0.3"

18511858

1859+"@emotion/cache@^11.7.1":

1860+ version "11.7.1"

1861+ resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539"

1862+ integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==

1863+ dependencies:

1864+ "@emotion/memoize" "^0.7.4"

1865+ "@emotion/sheet" "^1.1.0"

1866+ "@emotion/utils" "^1.0.0"

1867+ "@emotion/weak-memoize" "^0.2.5"

1868+ stylis "4.0.13"

1869+

18521870"@emotion/core@^10.0.14":

18531871 version "10.1.1"

18541872 resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3"

@@ -1882,6 +1900,13 @@

18821900 dependencies:

18831901 "@emotion/memoize" "0.7.4"

18841902

1903+"@emotion/is-prop-valid@^1.1.2":

1904+ version "1.1.2"

1905+ resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95"

1906+ integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==

1907+ dependencies:

1908+ "@emotion/memoize" "^0.7.4"

1909+

18851910"@emotion/memoize@0.7.4":

18861911 version "0.7.4"

18871912 resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"

@@ -1937,6 +1962,11 @@

19371962 resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.1.tgz#245f54abb02dfd82326e28689f34c27aa9b2a698"

19381963 integrity sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==

19391964

1965+"@emotion/sheet@^1.1.0":

1966+ version "1.1.0"

1967+ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2"

1968+ integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==

1969+

19401970"@emotion/styled-base@^10.0.27":

19411971 version "10.0.31"

19421972 resolved "https://registry.yarnpkg.com/@emotion/styled-base/-/styled-base-10.0.31.tgz#940957ee0aa15c6974adc7d494ff19765a2f742a"

@@ -2117,6 +2147,93 @@

21172147 prop-types "^15.7.2"

21182148 react-is "^16.8.0 || ^17.0.0"

21192149

2150+"@mui/base@5.0.0-alpha.74":

2151+ version "5.0.0-alpha.74"

2152+ resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750"

2153+ integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ==

2154+ dependencies:

2155+ "@babel/runtime" "^7.17.2"

2156+ "@emotion/is-prop-valid" "^1.1.2"

2157+ "@mui/types" "^7.1.3"

2158+ "@mui/utils" "^5.5.3"

2159+ "@popperjs/core" "^2.11.4"

2160+ clsx "^1.1.1"

2161+ prop-types "^15.7.2"

2162+ react-is "^17.0.2"

2163+

2164+"@mui/icons-material@^5.4.2":

2165+ version "5.5.1"

2166+ resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb"

2167+ integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA==

2168+ dependencies:

2169+ "@babel/runtime" "^7.17.2"

2170+

2171+"@mui/material@^5.4.3":

2172+ version "5.5.3"

2173+ resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc"

2174+ integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A==

2175+ dependencies:

2176+ "@babel/runtime" "^7.17.2"

2177+ "@mui/base" "5.0.0-alpha.74"

2178+ "@mui/system" "^5.5.3"

2179+ "@mui/types" "^7.1.3"

2180+ "@mui/utils" "^5.5.3"

2181+ "@types/react-transition-group" "^4.4.4"

2182+ clsx "^1.1.1"

2183+ csstype "^3.0.11"

2184+ hoist-non-react-statics "^3.3.2"

2185+ prop-types "^15.7.2"

2186+ react-is "^17.0.2"

2187+ react-transition-group "^4.4.2"

2188+

2189+"@mui/private-theming@^5.5.3":

2190+ version "5.5.3"

2191+ resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab"

2192+ integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A==

2193+ dependencies:

2194+ "@babel/runtime" "^7.17.2"

2195+ "@mui/utils" "^5.5.3"

2196+ prop-types "^15.7.2"

2197+

2198+"@mui/styled-engine@^5.5.2":

2199+ version "5.5.2"

2200+ resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6"

2201+ integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA==

2202+ dependencies:

2203+ "@babel/runtime" "^7.17.2"

2204+ "@emotion/cache" "^11.7.1"

2205+ prop-types "^15.7.2"

2206+

2207+"@mui/system@^5.5.3":

2208+ version "5.5.3"

2209+ resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5"

2210+ integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw==

2211+ dependencies:

2212+ "@babel/runtime" "^7.17.2"

2213+ "@mui/private-theming" "^5.5.3"

2214+ "@mui/styled-engine" "^5.5.2"

2215+ "@mui/types" "^7.1.3"

2216+ "@mui/utils" "^5.5.3"

2217+ clsx "^1.1.1"

2218+ csstype "^3.0.11"

2219+ prop-types "^15.7.2"

2220+

2221+"@mui/types@^7.1.3":

2222+ version "7.1.3"

2223+ resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a"

2224+ integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==

2225+

2226+"@mui/utils@^5.5.3":

2227+ version "5.5.3"

2228+ resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65"

2229+ integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag==

2230+ dependencies:

2231+ "@babel/runtime" "^7.17.2"

2232+ "@types/prop-types" "^15.7.4"

2233+ "@types/react-is" "^16.7.1 || ^17.0.0"

2234+ prop-types "^15.7.2"

2235+ react-is "^17.0.2"

2236+

21202237"@nodelib/fs.scandir@2.1.4":

21212238 version "2.1.4"

21222239 resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"

@@ -2159,6 +2276,11 @@

21592276 resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.15.tgz#6a9d143f7f4f49db2d782f9e1c8839a29b43ae23"

21602277 integrity sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==

21612278

2279+"@popperjs/core@^2.11.4":

2280+ version "2.11.4"

2281+ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503"

2282+ integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==

2283+

21622284"@popperjs/core@^2.8.3":

21632285 version "2.9.0"

21642286 resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.0.tgz#32e63212293dd3efbb521cd35a5020ab66eaa546"

@@ -2436,6 +2558,11 @@

24362558 resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"

24372559 integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==

24382560

2561+"@types/prop-types@^15.7.4":

2562+ version "15.7.4"

2563+ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"

2564+ integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==

2565+

24392566"@types/q@^1.5.1":

24402567 version "1.5.4"

24412568 resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"

@@ -2448,6 +2575,13 @@

24482575 dependencies:

24492576 "@types/react" "^16"

24502577

2578+"@types/react-is@^16.7.1 || ^17.0.0":

2579+ version "17.0.3"

2580+ resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a"

2581+ integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==

2582+ dependencies:

2583+ "@types/react" "*"

2584+

24512585"@types/react-transition-group@^4.2.0":

24522586 version "4.4.1"

24532587 resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1"

@@ -2455,6 +2589,13 @@

24552589 dependencies:

24562590 "@types/react" "*"

24572591

2592+"@types/react-transition-group@^4.4.4":

2593+ version "4.4.4"

2594+ resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"

2595+ integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==

2596+ dependencies:

2597+ "@types/react" "*"

2598+

24582599"@types/react@*", "@types/react@^16":

24592600 version "16.14.10"

24602601 resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477"

@@ -4540,6 +4681,11 @@ csstype@^2.5.2, csstype@^2.5.7:

45404681 resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39"

45414682 integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==

45424683

4684+csstype@^3.0.11:

4685+ version "3.0.11"

4686+ resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"

4687+ integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==

4688+

45434689csstype@^3.0.2:

45444690 version "3.0.8"

45454691 resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"

@@ -5223,14 +5369,6 @@ eslint-rule-composer@^0.3.0:

52235369 resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"

52245370 integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==

52255371

5226−eslint-scope@5.1.0:

5227− version "5.1.0"

5228− resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"

5229− integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==

5230− dependencies:

5231− esrecurse "^4.1.0"

5232− estraverse "^4.1.1"

5233−

52345372eslint-scope@^5.1.1:

52355373 version "5.1.1"

52365374 resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"

@@ -5251,7 +5389,7 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:

52515389 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"

52525390 integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==

52535391

5254−eslint-visitor-keys@^2.0.0:

5392+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:

52555393 version "2.1.0"

52565394 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"

52575395 integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==

@@ -5320,7 +5458,7 @@ esquery@^1.4.0:

53205458 dependencies:

53215459 estraverse "^5.1.0"

53225460

5323−esrecurse@^4.1.0, esrecurse@^4.3.0:

5461+esrecurse@^4.3.0:

53245462 version "4.3.0"

53255463 resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"

53265464 integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==

@@ -5498,6 +5636,11 @@ fast-levenshtein@^2.0.6:

54985636 resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"

54995637 integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=

55005638

5639+fast-memoize@^2.5.1:

5640+ version "2.5.2"

5641+ resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"

5642+ integrity sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==

5643+

55015644fast-safe-stringify@^2.0.7:

55025645 version "2.0.7"

55035646 resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"

@@ -6059,6 +6202,13 @@ hex-color-regex@^1.1.0:

60596202 resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"

60606203 integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==

60616204

6205+history@^5.2.0:

6206+ version "5.3.0"

6207+ resolved "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz#1548abaa245ba47992f063a0783db91ef201c73b"

6208+ integrity sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==

6209+ dependencies:

6210+ "@babel/runtime" "^7.7.6"

6211+

60626212hmac-drbg@^1.0.1:

60636213 version "1.0.1"

60646214 resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"

@@ -8351,9 +8501,9 @@ performance-now@^2.1.0:

83518501 resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"

83528502 integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=

83538503

8354−"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422":

8504+"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613":

83558505 version "1.0.0"

8356− resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#bf7ac7be65898883e3e05c9733426152a1da6422"

8506+ resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#c966febebcdffaa46f1ccf0769fe5308f179d613"

83578507 dependencies:

83588508 "@types/classnames" "^2.2.6"

83598509 "@types/react" "^16.7.18"

@@ -9023,6 +9173,13 @@ rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.5.0

90239173 react-is "^16.12.0"

90249174 shallowequal "^1.1.0"

90259175

9176+re-resizable@6.9.1:

9177+ version "6.9.1"

9178+ resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c"

9179+ integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==

9180+ dependencies:

9181+ fast-memoize "^2.5.1"

9182+

90269183react-aspen@^1.1.0, react-aspen@^1.1.1:

90279184 version "1.1.1"

90289185 resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.1.1.tgz#61a85ef43748158322c4a3b73faaa5e563edd038"

@@ -9063,6 +9220,14 @@ react-dom@^17.0.1:

90639220 object-assign "^4.1.1"

90649221 scheduler "^0.20.2"

90659222

9223+react-draggable@4.4.3:

9224+ version "4.4.3"

9225+ resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"

9226+ integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==

9227+ dependencies:

9228+ classnames "^2.2.5"

9229+ prop-types "^15.6.0"

9230+

90669231react-draggable@^4.4.4:

90679232 version "4.4.4"

90689233 resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.4.tgz#5b26d9996be63d32d285a426f41055de87e59b2f"

@@ -9093,6 +9258,30 @@ react-property@1.0.1:

90939258 resolved "https://registry.yarnpkg.com/react-property/-/react-property-1.0.1.tgz#4ae4211557d0a0ae050a71aa8ad288c074bea4e6"

90949259 integrity sha512-1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==

90959260

9261+react-rnd@^10.3.5:

9262+ version "10.3.5"

9263+ resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz#b66e5e06f1eb6823e72eb4b552081b4b9241b139"

9264+ integrity sha512-LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw==

9265+ dependencies:

9266+ re-resizable "6.9.1"

9267+ react-draggable "4.4.3"

9268+ tslib "2.3.0"

9269+

9270+react-router-dom@^6.2.2:

9271+ version "6.3.0"

9272+ resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz#a0216da813454e521905b5fa55e0e5176123f43d"

9273+ integrity sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==

9274+ dependencies:

9275+ history "^5.2.0"

9276+ react-router "6.3.0"

9277+

9278+react-router@6.3.0:

9279+ version "6.3.0"

9280+ resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"

9281+ integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==

9282+ dependencies:

9283+ history "^5.2.0"

9284+

90969285react-select@^4.2.1:

90979286 version "4.3.1"

90989287 resolved "https://registry.yarnpkg.com/react-select/-/react-select-4.3.1.tgz#389fc07c9bc7cf7d3c377b7a05ea18cd7399cb81"

@@ -9144,6 +9333,16 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-g

91449333 loose-envify "^1.4.0"

91459334 prop-types "^15.6.2"

91469335

9336+react-transition-group@^4.4.2:

9337+ version "4.4.2"

9338+ resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"

9339+ integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==

9340+ dependencies:

9341+ "@babel/runtime" "^7.5.5"

9342+ dom-helpers "^5.0.1"

9343+ loose-envify "^1.4.0"

9344+ prop-types "^15.6.2"

9345+

91479346react-transition-state@^1.1.3:

91489347 version "1.1.3"

91499348 resolved "https://registry.yarnpkg.com/react-transition-state/-/react-transition-state-1.1.3.tgz#6d999dc640ffd3a7442021a14a58e13347f4e95f"

@@ -10161,6 +10360,11 @@ stylehacks@^5.0.1:

1016110360 browserslist "^4.16.0"

1016210361 postcss-selector-parser "^6.0.4"

1016310362

10363+stylis@4.0.13:

10364+ version "4.0.13"

10365+ resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91"

10366+ integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==

10367+

1016410368stylis@^4.0.3, stylis@^4.0.7:

1016510369 version "4.0.10"

1016610370 resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240"

@@ -10511,6 +10715,11 @@ trim-right@^1.0.1:

1051110715 resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"

1051210716 integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=

1051310717

10718+tslib@2.3.0:

10719+ version "2.3.0"

10720+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"

10721+ integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==

10722+

1051410723tslib@^2.2.0:

1051510724 version "2.2.0"

1051610725 resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"

pkgs/tools/admin/pgadmin/yarn.nix+226−18

@@ -74,19 +74,19 @@

7474 };

7575 }

7676 {

77− name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz";

77+ name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz";

7878 path = fetchurl {

79− name = "_babel_eslint_parser___eslint_parser_7.13.8.tgz";

80− url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.13.8.tgz";

81− sha512 = "XewKkiyukrGzMeqToXJQk6hjg2veI9SNQElGzAoAjKxYCLbgcVX4KA2WhoyqMon9N4RMdCZhNTJNOBcp9spsiw==";

79+ name = "_babel_eslint_parser___eslint_parser_7.17.0.tgz";

80+ url = "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz";

81+ sha512 = "PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==";

8282 };

8383 }

8484 {

85− name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz";

85+ name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz";

8686 path = fetchurl {

87− name = "_babel_eslint_plugin___eslint_plugin_7.13.0.tgz";

88− url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.13.0.tgz";

89− sha512 = "YGwCLc/u/uc3bU+q/fvgRQ62+TkxuyVvdmybK6ElzE49vODp+RnRe16eJzMM7EwvcRPQfQvcOSuGmzfcbZE2+w==";

87+ name = "_babel_eslint_plugin___eslint_plugin_7.17.7.tgz";

88+ url = "https://registry.yarnpkg.com/@babel/eslint-plugin/-/eslint-plugin-7.17.7.tgz";

89+ sha512 = "JATUoJJXSgwI0T8juxWYtK1JSgoLpIGUsCHIv+NMXcUDA2vIe6nvAHR9vnuJgs/P1hOFw7vPwibixzfqBBLIVw==";

9090 };

9191 }

9292 {

@@ -1577,6 +1577,14 @@

15771577 sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==";

15781578 };

15791579 }

1580+ {

1581+ name = "_babel_runtime___runtime_7.17.8.tgz";

1582+ path = fetchurl {

1583+ name = "_babel_runtime___runtime_7.17.8.tgz";

1584+ url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz";

1585+ sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==";

1586+ };

1587+ }

15801588 {

15811589 name = "_babel_template___template_7.14.5.tgz";

15821590 path = fetchurl {

@@ -1673,6 +1681,14 @@

16731681 sha512 = "Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==";

16741682 };

16751683 }

1684+ {

1685+ name = "_emotion_cache___cache_11.7.1.tgz";

1686+ path = fetchurl {

1687+ name = "_emotion_cache___cache_11.7.1.tgz";

1688+ url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz";

1689+ sha512 = "r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==";

1690+ };

1691+ }

16761692 {

16771693 name = "_emotion_core___core_10.1.1.tgz";

16781694 path = fetchurl {

@@ -1705,6 +1721,14 @@

17051721 sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==";

17061722 };

17071723 }

1724+ {

1725+ name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz";

1726+ path = fetchurl {

1727+ name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz";

1728+ url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz";

1729+ sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==";

1730+ };

1731+ }

17081732 {

17091733 name = "_emotion_memoize___memoize_0.7.4.tgz";

17101734 path = fetchurl {

@@ -1761,6 +1785,14 @@

17611785 sha512 = "GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g==";

17621786 };

17631787 }

1788+ {

1789+ name = "_emotion_sheet___sheet_1.1.0.tgz";

1790+ path = fetchurl {

1791+ name = "_emotion_sheet___sheet_1.1.0.tgz";

1792+ url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz";

1793+ sha512 = "u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==";

1794+ };

1795+ }

17641796 {

17651797 name = "_emotion_styled_base___styled_base_10.0.31.tgz";

17661798 path = fetchurl {

@@ -1929,6 +1961,70 @@

19291961 sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==";

19301962 };

19311963 }

1964+ {

1965+ name = "_mui_base___base_5.0.0_alpha.74.tgz";

1966+ path = fetchurl {

1967+ name = "_mui_base___base_5.0.0_alpha.74.tgz";

1968+ url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz";

1969+ sha512 = "pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ==";

1970+ };

1971+ }

1972+ {

1973+ name = "_mui_icons_material___icons_material_5.5.1.tgz";

1974+ path = fetchurl {

1975+ name = "_mui_icons_material___icons_material_5.5.1.tgz";

1976+ url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz";

1977+ sha512 = "40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA==";

1978+ };

1979+ }

1980+ {

1981+ name = "_mui_material___material_5.5.3.tgz";

1982+ path = fetchurl {

1983+ name = "_mui_material___material_5.5.3.tgz";

1984+ url = "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz";

1985+ sha512 = "eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A==";

1986+ };

1987+ }

1988+ {

1989+ name = "_mui_private_theming___private_theming_5.5.3.tgz";

1990+ path = fetchurl {

1991+ name = "_mui_private_theming___private_theming_5.5.3.tgz";

1992+ url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz";

1993+ sha512 = "Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A==";

1994+ };

1995+ }

1996+ {

1997+ name = "_mui_styled_engine___styled_engine_5.5.2.tgz";

1998+ path = fetchurl {

1999+ name = "_mui_styled_engine___styled_engine_5.5.2.tgz";

2000+ url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz";

2001+ sha512 = "jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA==";

2002+ };

2003+ }

2004+ {

2005+ name = "_mui_system___system_5.5.3.tgz";

2006+ path = fetchurl {

2007+ name = "_mui_system___system_5.5.3.tgz";

2008+ url = "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz";

2009+ sha512 = "J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw==";

2010+ };

2011+ }

2012+ {

2013+ name = "_mui_types___types_7.1.3.tgz";

2014+ path = fetchurl {

2015+ name = "_mui_types___types_7.1.3.tgz";

2016+ url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz";

2017+ sha512 = "DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==";

2018+ };

2019+ }

2020+ {

2021+ name = "_mui_utils___utils_5.5.3.tgz";

2022+ path = fetchurl {

2023+ name = "_mui_utils___utils_5.5.3.tgz";

2024+ url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz";

2025+ sha512 = "t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag==";

2026+ };

2027+ }

19322028 {

19332029 name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz";

19342030 path = fetchurl {

@@ -1977,6 +2073,14 @@

19772073 sha512 = "15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==";

19782074 };

19792075 }

2076+ {

2077+ name = "_popperjs_core___core_2.11.4.tgz";

2078+ path = fetchurl {

2079+ name = "_popperjs_core___core_2.11.4.tgz";

2080+ url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz";

2081+ sha512 = "q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==";

2082+ };

2083+ }

19802084 {

19812085 name = "_popperjs_core___core_2.9.0.tgz";

19822086 path = fetchurl {

@@ -2313,6 +2417,14 @@

23132417 sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==";

23142418 };

23152419 }

2420+ {

2421+ name = "_types_prop_types___prop_types_15.7.4.tgz";

2422+ path = fetchurl {

2423+ name = "_types_prop_types___prop_types_15.7.4.tgz";

2424+ url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz";

2425+ sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==";

2426+ };

2427+ }

23162428 {

23172429 name = "_types_q___q_1.5.4.tgz";

23182430 path = fetchurl {

@@ -2329,6 +2441,14 @@

23292441 sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A==";

23302442 };

23312443 }

2444+ {

2445+ name = "_types_react_is___react_is_17.0.3.tgz";

2446+ path = fetchurl {

2447+ name = "_types_react_is___react_is_17.0.3.tgz";

2448+ url = "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz";

2449+ sha512 = "aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==";

2450+ };

2451+ }

23322452 {

23332453 name = "_types_react_transition_group___react_transition_group_4.4.1.tgz";

23342454 path = fetchurl {

@@ -2337,6 +2457,14 @@

23372457 sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==";

23382458 };

23392459 }

2460+ {

2461+ name = "_types_react_transition_group___react_transition_group_4.4.4.tgz";

2462+ path = fetchurl {

2463+ name = "_types_react_transition_group___react_transition_group_4.4.4.tgz";

2464+ url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz";

2465+ sha512 = "7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==";

2466+ };

2467+ }

23402468 {

23412469 name = "_types_react___react_16.14.10.tgz";

23422470 path = fetchurl {

@@ -4473,6 +4601,14 @@

44734601 sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q==";

44744602 };

44754603 }

4604+ {

4605+ name = "csstype___csstype_3.0.11.tgz";

4606+ path = fetchurl {

4607+ name = "csstype___csstype_3.0.11.tgz";

4608+ url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz";

4609+ sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==";

4610+ };

4611+ }

44764612 {

44774613 name = "csstype___csstype_3.0.8.tgz";

44784614 path = fetchurl {

@@ -5185,14 +5321,6 @@

51855321 sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==";

51865322 };

51875323 }

5188− {

5189− name = "eslint_scope___eslint_scope_5.1.0.tgz";

5190− path = fetchurl {

5191− name = "eslint_scope___eslint_scope_5.1.0.tgz";

5192− url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz";

5193− sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==";

5194− };

5195− }

51965324 {

51975325 name = "eslint_scope___eslint_scope_5.1.1.tgz";

51985326 path = fetchurl {

@@ -5441,6 +5569,14 @@

54415569 sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc=";

54425570 };

54435571 }

5572+ {

5573+ name = "fast_memoize___fast_memoize_2.5.2.tgz";

5574+ path = fetchurl {

5575+ name = "fast_memoize___fast_memoize_2.5.2.tgz";

5576+ url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz";

5577+ sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw==";

5578+ };

5579+ }

54445580 {

54455581 name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz";

54465582 path = fetchurl {

@@ -6081,6 +6217,14 @@

60816217 sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==";

60826218 };

60836219 }

6220+ {

6221+ name = "history___history_5.3.0.tgz";

6222+ path = fetchurl {

6223+ name = "history___history_5.3.0.tgz";

6224+ url = "https://registry.yarnpkg.com/history/-/history-5.3.0.tgz";

6225+ sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==";

6226+ };

6227+ }

60846228 {

60856229 name = "hmac_drbg___hmac_drbg_1.0.1.tgz";

60866230 path = fetchurl {

@@ -8823,8 +8967,8 @@

88238967 let

88248968 repo = fetchgit {

88258969 url = "https://github.com/EnterpriseDB/pgadmin4-treeview/";

8826− rev = "bf7ac7be65898883e3e05c9733426152a1da6422";

8827− sha256 = "0nsn7s0d1kpgpb554hkz7nsifzdyff06qc78gqmzd8j3sfcbjk63";

8970+ rev = "c966febebcdffaa46f1ccf0769fe5308f179d613";

8971+ sha256 = "0fxjalh7g8fwy3fczbj9pvf8g06chq41gw1jidz106wadjr72081";

88288972 };

88298973 in

88308974 runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } ''

@@ -9553,6 +9697,14 @@

95539697 sha512 = "HWuTIKzBeZQQ7IBqdokE0wMp/xx39/KfUJ0gcquBigoldDCrf3YBcWFHrrQlJG7sI82Wg8mwp1uAKV3zMGfAgg==";

95549698 };

95559699 }

9700+ {

9701+ name = "re_resizable___re_resizable_6.9.1.tgz";

9702+ path = fetchurl {

9703+ name = "re_resizable___re_resizable_6.9.1.tgz";

9704+ url = "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz";

9705+ sha512 = "KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==";

9706+ };

9707+ }

95569708 {

95579709 name = "react_aspen___react_aspen_1.1.1.tgz";

95589710 path = fetchurl {

@@ -9585,6 +9737,14 @@

95859737 sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==";

95869738 };

95879739 }

9740+ {

9741+ name = "react_draggable___react_draggable_4.4.3.tgz";

9742+ path = fetchurl {

9743+ name = "react_draggable___react_draggable_4.4.3.tgz";

9744+ url = "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz";

9745+ sha512 = "jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==";

9746+ };

9747+ }

95889748 {

95899749 name = "react_draggable___react_draggable_4.4.4.tgz";

95909750 path = fetchurl {

@@ -9625,6 +9785,30 @@

96259785 sha512 = "1tKOwxFn3dXVomH6pM9IkLkq2Y8oh+fh/lYW3MJ/B03URswUTqttgckOlbxY2XHF3vPG6uanSc4dVsLW/wk3wQ==";

96269786 };

96279787 }

9788+ {

9789+ name = "react_rnd___react_rnd_10.3.5.tgz";

9790+ path = fetchurl {

9791+ name = "react_rnd___react_rnd_10.3.5.tgz";

9792+ url = "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz";

9793+ sha512 = "LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw==";

9794+ };

9795+ }

9796+ {

9797+ name = "react_router_dom___react_router_dom_6.3.0.tgz";

9798+ path = fetchurl {

9799+ name = "react_router_dom___react_router_dom_6.3.0.tgz";

9800+ url = "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.3.0.tgz";

9801+ sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==";

9802+ };

9803+ }

9804+ {

9805+ name = "react_router___react_router_6.3.0.tgz";

9806+ path = fetchurl {

9807+ name = "react_router___react_router_6.3.0.tgz";

9808+ url = "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz";

9809+ sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==";

9810+ };

9811+ }

96289812 {

96299813 name = "react_select___react_select_4.3.1.tgz";

96309814 path = fetchurl {

@@ -9673,6 +9857,14 @@

96739857 sha512 = "Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==";

96749858 };

96759859 }

9860+ {

9861+ name = "react_transition_group___react_transition_group_4.4.2.tgz";

9862+ path = fetchurl {

9863+ name = "react_transition_group___react_transition_group_4.4.2.tgz";

9864+ url = "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz";

9865+ sha512 = "/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==";

9866+ };

9867+ }

96769868 {

96779869 name = "react_transition_state___react_transition_state_1.1.3.tgz";

96789870 path = fetchurl {

@@ -10865,6 +11057,14 @@

1086511057 sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==";

1086611058 };

1086711059 }

11060+ {

11061+ name = "stylis___stylis_4.0.13.tgz";

11062+ path = fetchurl {

11063+ name = "stylis___stylis_4.0.13.tgz";

11064+ url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz";

11065+ sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==";

11066+ };

11067+ }

1086811068 {

1086911069 name = "stylis___stylis_4.0.10.tgz";

1087011070 path = fetchurl {

@@ -11233,6 +11433,14 @@

1123311433 sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM=";

1123411434 };

1123511435 }

11436+ {

11437+ name = "tslib___tslib_2.3.0.tgz";

11438+ path = fetchurl {

11439+ name = "tslib___tslib_2.3.0.tgz";

11440+ url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz";

11441+ sha512 = "N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==";

11442+ };

11443+ }

1123611444 {

1123711445 name = "tslib___tslib_2.2.0.tgz";

1123811446 path = fetchurl {

pkgs/tools/admin/syft/default.nix+3−3

@@ -2,13 +2,13 @@

22

33buildGoModule rec {

44 pname = "syft";

5− version = "0.44.1";

5+ version = "0.45.1";

66

77 src = fetchFromGitHub {

88 owner = "anchore";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-kDTTOc2sPCKWGeVuXlGhOo2dHjBZ1QEE7jAEVs4a70U=";

11+ sha256 = "sha256-oexsu52x9rAqwTVxTVHzKPuaIfvg5lvvuBmKcnb2Yew=";

1212 # populate values that require us to use git. By doing this in postFetch we

1313 # can delete .git afterwards and maintain better reproducibility of the src.

1414 leaveDotGit = true;

@@ -20,7 +20,7 @@ buildGoModule rec {

2020 find "$out" -name .git -print0 | xargs -0 rm -rf

2121 '';

2222 };

23− vendorSha256 = "sha256-ZWJzMDfCop5IT6mOvCWdtjGjVrZJxyM0z7iK3TiO+PI=";

23+ vendorSha256 = "sha256-d6ZBWX4/lgh610fBLTE1EUqZmpctLfxi2PSRifH+1jg=";

2424

2525 nativeBuildInputs = [ installShellFiles ];

2626

pkgs/tools/admin/winbox/default.nix+1−1

@@ -70,7 +70,7 @@ symlinkJoin {

7070 homepage = "https://mikrotik.com";

7171 downloadPage = "https://mikrotik.com/download";

7272 changelog = "https://wiki.mikrotik.com/wiki/Winbox_changelog";

73− license = licenses.gpl3Plus;

73+ license = licenses.unfree;

7474 maintainers = with maintainers; [ yrd ];

7575 };

7676}

pkgs/tools/cd-dvd/ventoy-bin/default.nix+11−6

@@ -24,7 +24,7 @@ let

2424 }.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}");

2525in stdenv.mkDerivation rec {

2626 pname = "ventoy-bin";

27− version = "1.0.72";

27+ version = "1.0.74";

2828

2929 nativeBuildInputs = [ autoPatchelfHook makeWrapper ]

3030 ++ lib.optional withQt5 qt5.wrapQtAppsHook;

@@ -40,13 +40,13 @@ in stdenv.mkDerivation rec {

4040

4141 src = fetchurl {

4242 url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";

43− sha256 = "sha256-1mfe6ZnqkeBNGNjI7Qx7jG5FLgfn6rVwr0VQvSOG7Ow=";

43+ sha256 = "sha256-raoVbj1+6nSR4knq/FmgVpzXRV71Hrcqd8C6Zsi34Uo=";

4444 };

4545 patches = [

4646 (fetchpatch {

4747 name = "sanitize.patch";

48− url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=19f8922b3d96c5ff55eeefc269ae43369a0748e8";

49− sha256 = "sha256-RDdxPCmrfNMwXNuJwQW48fAiJPbMjdHiBmF03fKqm2o=";

48+ url = "https://aur.archlinux.org/cgit/aur.git/plain/sanitize.patch?h=057f2d1eb496c7a3aaa8229e99a7f709428fa4c5";

49+ sha256 = "sha256-iAtLtM+Q4OsXDK83eCnPNomeNSEqdRLFfK2x7ybPSpk=";

5050 })

5151 ./fix-for-read-only-file-system.patch

5252 ./add-mips64.patch

@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {

8282 aarch64) rm -r {tool/,VentoyGUI.}{x86_64,i386,mips64el};;

8383 mips64el) rm -r {tool/,VentoyGUI.}{x86_64,i386,aarch64};;

8484 esac

85− rm README tool/VentoyWorker.sh.orig

85+ rm README

8686 rm tool/"$ARCH"/Ventoy2Disk.gtk2 || true # For aarch64 and mips64el.

8787

8888 # Copy from "$src" to "$out".

@@ -106,10 +106,15 @@ in stdenv.mkDerivation rec {

106106 makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \

107107 --prefix PATH : "${lib.makeBinPath buildInputs}" \

108108 --chdir "$VENTOY_PATH"

109+ mkdir "$out"/share/{applications,pixmaps}

110+ ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/

111+ cp ${./ventoy-gui.desktop} "$out"/share/applications/

109112 '' + lib.optionalString (!withGtk3) ''

110− rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.gtk3"

113+ rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade}

111114 '' + lib.optionalString (!withQt5) ''

112115 rm "$VENTOY_PATH/tool/$ARCH/Ventoy2Disk.qt5"

116+ '' + lib.optionalString (!withGtk3 && !withQt5) ''

117+ rm "$VENTOY_PATH"/VentoyGUI.*

113118 '';

114119

115120 meta = with lib; {

pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktopnew file+10

@@ -0,0 +1,10 @@

1+[Desktop Entry]

2+Categories=Utility;

3+Comment=Tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files

4+Exec=ventoy-gui

5+Hidden=false

6+Icon=VentoyLogo

7+Name=Ventoy

8+StartupNotify=true

9+Terminal=false

10+Type=Application

pkgs/tools/filesystems/ceph/default.nix+2−2

@@ -9,7 +9,7 @@

99, gtest

1010, cunit, snappy

1111, makeWrapper

12−, leveldb, oathToolkit

12+, leveldb, oath-toolkit

1313, libnl, libcap_ng

1414, rdkafka

1515, nixosTests

@@ -161,7 +161,7 @@ in rec {

161161 buildInputs = cryptoLibsMap.${cryptoStr} ++ [

162162 boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3

163163 malloc zlib openldap lttng-ust babeltrace gperf gtest cunit

164− snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka

164+ snappy lz4 oath-toolkit leveldb libnl libcap_ng rdkafka

165165 cryptsetup sqlite lua icu bzip2

166166 ] ++ lib.optionals stdenv.isLinux [

167167 linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs

pkgs/tools/filesystems/xfsprogs/default.nix+2−2

@@ -4,11 +4,11 @@

44

55stdenv.mkDerivation rec {

66 pname = "xfsprogs";

7− version = "5.15.0";

7+ version = "5.16.0";

88

99 src = fetchurl {

1010 url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";

11− sha256 = "0mjdwxr2hhqkfa8xg0v74v3n27sjvlwm90jqnmx0587b60wbzlhk";

11+ hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58=";

1212 };

1313

1414 outputs = [ "bin" "dev" "out" "doc" ];

pkgs/tools/graphics/vulkan-tools/default.nix+3−3

@@ -2,7 +2,7 @@

22, stdenv

33, fetchFromGitHub

44, cmake

5−, pkgconfig

5+, pkg-config

66, glslang

77, libffi

88, libX11

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {

3333

3434 nativeBuildInputs = [

3535 cmake

36− pkgconfig

36+ pkg-config

3737 ];

3838

3939 buildInputs = [

@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {

5959 "-DBUILD_ICD=OFF"

6060 # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH

6161 "-DCMAKE_INSTALL_RPATH=${libraryPath}"

62− "-DPKG_CONFIG_EXECUTABLE=${pkgconfig}/bin/pkg-config"

62+ "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config"

6363 # Hide dev warnings that are useless for packaging

6464 "-Wno-dev"

6565 ];

pkgs/tools/misc/calamares-nixos-extensions/default.nixnew file+30

@@ -0,0 +1,30 @@

1+{ stdenv, fetchFromGitHub, lib }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "calamares-nixos-extensions";

5+ version = "0.3.8";

6+

7+ src = fetchFromGitHub {

8+ owner = "NixOS";

9+ repo = "calamares-nixos-extensions";

10+ rev = version;

11+ sha256 = "MtqAOwlY5euVNAGRl2pRkbg/OolJPNOSQcR4DS5gFz4=";

12+ };

13+

14+ installPhase = ''

15+ runHook preInstall

16+ mkdir -p $out/{lib,share}/calamares

17+ cp -r modules $out/lib/calamares/

18+ cp -r config/* $out/share/calamares/

19+ cp -r branding $out/share/calamares/

20+ runHook postInstall

21+ '';

22+

23+ meta = with lib; {

24+ description = "Calamares modules for NixOS";

25+ homepage = "https://github.com/NixOS/calamares-nixos-extensions";

26+ license = with licenses; [ gpl3Plus bsd2 cc-by-40 cc-by-sa-40 cc0 ];

27+ maintainers = with maintainers; [ vlinkz ];

28+ platforms = platforms.linux;

29+ };

30+}

pkgs/tools/misc/calamares/default.nix+52−14

@@ -1,24 +1,48 @@

1−{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore

2−, kservice, libatasmart, libxcb, libyamlcpp, parted, polkit-qt, python, qtbase

3−, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata

1+{ lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2

2+, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python

3+, qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata

44, ckbcomp, xkeyboard_config, mkDerivation

5+, nixos-extensions ? false

56}:

67

78mkDerivation rec {

89 pname = "calamares";

9− version = "3.2.55";

10+ version = "3.2.56";

1011

1112 # release including submodule

1213 src = fetchurl {

13− url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz";

14− sha256 = "sha256-1xf02rjy6+83zbU2yxGUGjcIGJfYS8ryqi4CBzrh7kI=";

14+ url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz";

15+ sha256 = "e1402d7693659b85c5e553481a7252d91350c3f33ffea413488d7712d3281e03";

1516 };

1617

18+ patches = lib.optionals nixos-extensions [

19+ # Modifies the users module to only set passwords of user and root

20+ # as the users will have already been created in the configuration.nix file

21+ ./userjob.patch

22+ # Makes calamares search /run/current-system/sw/share/calamares/ for extra configuration files

23+ # as by default it only searches /usr/share/calamares/ and /nix/store/<hash>-calamares-<version>/share/calamares/

24+ # but calamares-nixos-extensions is not in either of these locations

25+ ./nixos-extensions-paths.patch

26+ # Uses pkexec within modules in order to run calamares without root permissions as a whole

27+ # Also fixes storage check in the welcome module

28+ ./nonroot.patch

29+ # Adds unfree qml to packagechooserq

30+ ./unfreeq.patch

31+ # Adds config to change name of packagechooserq

32+ # Upstreamed in PR: https://github.com/calamares/calamares/pull/1932

33+ ./packagechooserq.patch

34+ # Modifies finished module to add some NixOS resources

35+ # Modifies packagechooser module to change the UI

36+ ./uimod.patch

37+ # Remove options for unsupported partition types

38+ ./partitions.patch

39+ ];

40+

1741 nativeBuildInputs = [ cmake extra-cmake-modules ];

1842 buildInputs = [

19− boost kparts.dev kpmcore.out kservice.dev

20− libatasmart libxcb libyamlcpp parted polkit-qt python qtbase

21− qtquickcontrols qtsvg qttools qtwebengine.dev util-linux

43+ boost kparts.dev kpmcore.out kservice.dev kirigami2

44+ libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python

45+ qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux

2246 ];

2347

2448 cmakeFlags = [

@@ -32,15 +56,28 @@ mkDerivation rec {

3256 POLKITQT-1_POLICY_FILES_INSTALL_DIR = "$(out)/share/polkit-1/actions";

3357

3458 postPatch = ''

59+ # Run calamares without root. Other patches make it functional as a normal user

60+ sed -e "s,pkexec calamares,calamares," \

61+ -i calamares.desktop

62+

63+ sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=io.calamares.calamares," \

64+ -i calamares.desktop

65+

66+ # Fix desktop reference with wayland

67+ mv calamares.desktop io.calamares.calamares.desktop

68+

69+ sed -e "s,calamares.desktop,io.calamares.calamares.desktop," \

70+ -i CMakeLists.txt

71+

3572 sed -e "s,/usr/bin/calamares,$out/bin/calamares," \

36− -i calamares.desktop \

3773 -i com.github.calamares.calamares.policy

3874

3975 sed -e 's,/usr/share/zoneinfo,${tzdata}/share/zoneinfo,' \

40− -i src/modules/locale/SetTimezoneJob.cpp

76+ -i src/modules/locale/SetTimezoneJob.cpp \

77+ -i src/libcalamares/locale/TimeZone.cpp

4178

4279 sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \

43− -i src/modules/keyboard/keyboardwidget/keyboardglobal.h

80+ -i src/modules/keyboard/keyboardwidget/keyboardglobal.cpp

4481

4582 sed -e 's,"ckbcomp","${ckbcomp}/bin/ckbcomp",' \

4683 -i src/modules/keyboard/keyboardwidget/keyboardpreview.cpp

@@ -51,8 +88,9 @@ mkDerivation rec {

5188

5289 meta = with lib; {

5390 description = "Distribution-independent installer framework";

54− license = with licenses; [ gpl3Plus bsd2 ];

55− maintainers = with maintainers; [ manveru ];

91+ homepage = "https://calamares.io/";

92+ license = with licenses; [ gpl3Plus bsd2 cc0 ];

93+ maintainers = with maintainers; [ manveru vlinkz ];

5694 platforms = platforms.linux;

5795 };

5896}

pkgs/tools/misc/calamares/nixos-extensions-paths.patchnew file+46

@@ -0,0 +1,46 @@

1+diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp

2+index de709156f..a0b6c5faf 100644

3+--- a/src/calamares/main.cpp

4++++ b/src/calamares/main.cpp

5+@@ -131,6 +132,8 @@ main( int argc, char* argv[] )

6+ // TODO: umount anything in /tmp/calamares-... as an emergency save function

7+ #endif

8+

9++ CalamaresUtils::setNixosDirs();

10++

11+ bool is_debug = handle_args( a );

12+

13+ #ifdef WITH_KF5DBus

14+diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp

15+index f333d6e64..6118fb412 100644

16+--- a/src/libcalamares/utils/Dirs.cpp

17++++ b/src/libcalamares/utils/Dirs.cpp

18+@@ -115,6 +116,14 @@ setXdgDirs()

19+ s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() );

20+ }

21+

22++void

23++setNixosDirs()

24++{

25++ s_extraConfigDirs << "/run/current-system/sw/share/calamares/";

26++ s_extraDataDirs << "/run/current-system/sw/share/calamares/";

27++ s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() );

28++}

29++

30+ QStringList

31+ extraConfigDirs()

32+ {

33+diff --git a/src/libcalamares/utils/Dirs.h b/src/libcalamares/utils/Dirs.h

34+index 445cbe1f1..da869d446 100644

35+--- a/src/libcalamares/utils/Dirs.h

36++++ b/src/libcalamares/utils/Dirs.h

37+@@ -50,6 +50,9 @@ DLLEXPORT bool isAppDataDirOverridden();

38+ /** @brief Setup extra config and data dirs from the XDG variables.

39+ */

40+ DLLEXPORT void setXdgDirs();

41++/** @brief Setup extra config and data dirs fir NixOS.

42++ */

43++DLLEXPORT void setNixosDirs();

44+ /** @brief Are any extra directories configured? */

45+ DLLEXPORT bool haveExtraDirs();

46+ /** @brief XDG_CONFIG_DIRS, each guaranteed to end with / */

pkgs/tools/misc/calamares/nonroot.patchnew file+105

@@ -0,0 +1,105 @@

1+diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp

2+index c7146c2d7..e165d9a8f 100644

3+--- a/src/libcalamares/utils/Runner.cpp

4++++ b/src/libcalamares/utils/Runner.cpp

5+@@ -140,13 +140,13 @@ Calamares::Utils::Runner::run()

6+ }

7+ if ( m_location == RunLocation::RunInTarget )

8+ {

9+- process.setProgram( "chroot" );

10+- process.setArguments( QStringList { workingDirectory.absolutePath() } << m_command );

11++ process.setProgram( "pkexec" );

12++ process.setArguments( QStringList { "chroot" } + QStringList { workingDirectory.absolutePath() } << m_command );

13+ }

14+ else

15+ {

16+- process.setProgram( "env" );

17+- process.setArguments( m_command );

18++ process.setProgram( "pkexec" );

19++ process.setArguments( QStringList { "env" } + m_command );

20+ }

21+

22+ if ( m_output )

23+diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py

24+index a3318d1a0..5fbe202fd 100644

25+--- a/src/modules/mount/main.py

26++++ b/src/modules/mount/main.py

27+@@ -152,7 +152,8 @@ def mount_partition(root_mount_point, partition, partitions):

28+

29+ # Ensure that the created directory has the correct SELinux context on

30+ # SELinux-enabled systems.

31+- os.makedirs(mount_point, exist_ok=True)

32++ subprocess.check_call(["pkexec", "mkdir", "-p", mount_point])

33++

34+ try:

35+ subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point])

36+ except FileNotFoundError as e:

37+@@ -193,13 +194,13 @@ def mount_partition(root_mount_point, partition, partitions):

38+ for s in btrfs_subvolumes:

39+ if not s["subvolume"]:

40+ continue

41+- os.makedirs(root_mount_point + os.path.dirname(s["subvolume"]), exist_ok=True)

42+- subprocess.check_call(["btrfs", "subvolume", "create",

43++ subprocess.check_call(["pkexec", "mkdir", "-p", root_mount_point + os.path.dirname(s["subvolume"])])

44++ subprocess.check_call(["pkexec", "btrfs", "subvolume", "create",

45+ root_mount_point + s["subvolume"]])

46+ if s["mountPoint"] == "/":

47+ # insert the root subvolume into global storage

48+ libcalamares.globalstorage.insert("btrfsRootSubvolume", s["subvolume"])

49+- subprocess.check_call(["umount", "-v", root_mount_point])

50++ subprocess.check_call(["pkexec", "umount", "-v", root_mount_point])

51+

52+ device = partition["device"]

53+

54+diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp

55+index ca7219ca4..6ac682ba4 100644

56+--- a/src/modules/welcome/checker/GeneralRequirements.cpp

57++++ b/src/modules/welcome/checker/GeneralRequirements.cpp

58+@@ -371,10 +371,34 @@ GeneralRequirements::checkEnoughStorage( qint64 requiredSpace )

59+ cWarning() << "GeneralRequirements is configured without libparted.";

60+ return false;

61+ #else

62+- return check_big_enough( requiredSpace );

63++ return big_enough( requiredSpace );

64+ #endif

65+ }

66+

67++bool

68++GeneralRequirements::big_enough( qint64 requiredSpace )

69++{

70++ FILE *fpipe;

71++ char command[128];

72++ snprintf(command, sizeof(command), "lsblk --bytes -no SIZE,TYPE | grep disk | awk '$1 > %llu {print $1}'", requiredSpace);

73++ char c = 0;

74++

75++ if (0 == (fpipe = (FILE*)popen(command, "r")))

76++ {

77++ cWarning() << "Failed to check storage size.";

78++ return false;

79++ }

80++

81++ while (fread(&c, sizeof c, 1, fpipe))

82++ {

83++ pclose(fpipe);

84++ return true;

85++ }

86++

87++ pclose(fpipe);

88++

89++ return false;

90++}

91+

92+ bool

93+ GeneralRequirements::checkEnoughRam( qint64 requiredRam )

94+diff --git a/src/modules/welcome/checker/GeneralRequirements.h b/src/modules/welcome/checker/GeneralRequirements.h

95+index b6646da11..ea27324fa 100644

96+--- a/src/modules/welcome/checker/GeneralRequirements.h

97++++ b/src/modules/welcome/checker/GeneralRequirements.h

98+@@ -36,6 +36,7 @@ private:

99+ bool checkHasPower();

100+ bool checkHasInternet();

101+ bool checkIsRoot();

102++ bool big_enough( qint64 requiredSpace );

103+

104+ qreal m_requiredStorageGiB;

105+ qreal m_requiredRamGiB;

pkgs/tools/misc/calamares/packagechooserq.patchnew file+136

@@ -0,0 +1,136 @@

1+diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp

2+index 491fe5c25..667621597 100644

3+--- a/src/modules/packagechooser/Config.cpp

4++++ b/src/modules/packagechooser/Config.cpp

5+@@ -237,6 +237,12 @@ Config::setPackageChoice( const QString& packageChoice )

6+ emit packageChoiceChanged( m_packageChoice.value_or( QString() ) );

7+ }

8+

9++QString

10++Config::prettyName() const

11++{

12++ return m_stepName ? m_stepName->get() : tr( "Packages" );

13++}

14++

15+ QString

16+ Config::prettyStatus() const

17+ {

18+@@ -343,4 +349,14 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )

19+ cWarning() << "Single-selection QML module must use 'Legacy' method.";

20+ }

21+ }

22++

23++ bool labels_ok = false;

24++ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

25++ if ( labels_ok )

26++ {

27++ if ( labels.contains( "step" ) )

28++ {

29++ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

30++ }

31++ }

32+ }

33+diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h

34+index b04b1c30b..d1b783a8d 100644

35+--- a/src/modules/packagechooser/Config.h

36++++ b/src/modules/packagechooser/Config.h

37+@@ -98,6 +98,7 @@ public:

38+ QString packageChoice() const { return m_packageChoice.value_or( QString() ); }

39+ void setPackageChoice( const QString& packageChoice );

40+

41++ QString prettyName() const;

42+ QString prettyStatus() const;

43+

44+ signals:

45+@@ -120,6 +121,7 @@ private:

46+ * Reading the property will return an empty QString.

47+ */

48+ std::optional< QString > m_packageChoice;

49++ CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar

50+ };

51+

52+

53+diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp

54+index 9057004de..8eacf82ec 100644

55+--- a/src/modules/packagechooser/PackageChooserViewStep.cpp

56++++ b/src/modules/packagechooser/PackageChooserViewStep.cpp

57+@@ -29,7 +29,6 @@ PackageChooserViewStep::PackageChooserViewStep( QObject* parent )

58+ : Calamares::ViewStep( parent )

59+ , m_config( new Config( this ) )

60+ , m_widget( nullptr )

61+- , m_stepName( nullptr )

62+ {

63+ emit nextStatusChanged( false );

64+ }

65+@@ -41,14 +40,12 @@ PackageChooserViewStep::~PackageChooserViewStep()

66+ {

67+ m_widget->deleteLater();

68+ }

69+- delete m_stepName;

70+ }

71+

72+-

73+ QString

74+ PackageChooserViewStep::prettyName() const

75+ {

76+- return m_stepName ? m_stepName->get() : tr( "Packages" );

77++ return m_config->prettyName();

78+ }

79+

80+

81+@@ -139,16 +136,6 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap

82+ m_config->setDefaultId( moduleInstanceKey() );

83+ m_config->setConfigurationMap( configurationMap );

84+

85+- bool labels_ok = false;

86+- auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

87+- if ( labels_ok )

88+- {

89+- if ( labels.contains( "step" ) )

90+- {

91+- m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

92+- }

93+- }

94+-

95+ if ( m_widget )

96+ {

97+ hookupModel();

98+diff --git a/src/modules/packagechooser/PackageChooserViewStep.h b/src/modules/packagechooser/PackageChooserViewStep.h

99+index 7561f2bd7..76b35aed8 100644

100+--- a/src/modules/packagechooser/PackageChooserViewStep.h

101++++ b/src/modules/packagechooser/PackageChooserViewStep.h

102+@@ -50,7 +50,6 @@ private:

103+

104+ Config* m_config;

105+ PackageChooserPage* m_widget;

106+- CalamaresUtils::Locale::TranslatedString* m_stepName; // As it appears in the sidebar

107+ };

108+

109+ CALAMARES_PLUGIN_FACTORY_DECLARATION( PackageChooserViewStepFactory )

110+diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

111+index 543c9771d..7c4d5fda7 100644

112+--- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

113++++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp

114+@@ -29,7 +29,7 @@ PackageChooserQmlViewStep::PackageChooserQmlViewStep( QObject* parent )

115+ QString

116+ PackageChooserQmlViewStep::prettyName() const

117+ {

118+- return tr( "Packages" );

119++ return m_config->prettyName();

120+ }

121+

122+ QString

123+@@ -83,4 +83,13 @@ PackageChooserQmlViewStep::setConfigurationMap( const QVariantMap& configuration

124+ m_config->setDefaultId( moduleInstanceKey() );

125+ m_config->setConfigurationMap( configurationMap );

126+ Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last

127++ /*bool labels_ok = false;

128++ auto labels = CalamaresUtils::getSubMap( configurationMap, "labels", labels_ok );

129++ if ( labels_ok )

130++ {

131++ if ( labels.contains( "step" ) )

132++ {

133++ m_stepName = new CalamaresUtils::Locale::TranslatedString( labels, "step" );

134++ }

135++ }*/

136+ }

pkgs/tools/misc/calamares/partitions.patchnew file+28

@@ -0,0 +1,28 @@

1+diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp

2+index c5b17c69e..353b6f964 100644

3+--- a/src/modules/partition/gui/CreatePartitionDialog.cpp

4++++ b/src/modules/partition/gui/CreatePartitionDialog.cpp

5+@@ -107,7 +107,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device,

6+ {

7+ // We need to ensure zfs is added to the list if the zfs module is enabled

8+ if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )

9+- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )

10++ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended

11++ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix ) )

12+ {

13+ fsNames << userVisibleFS( fs ); // This is put into the combobox

14+ if ( fs->type() == defaultFSType )

15+diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp

16+index 0bc35cabe..3cf8a7fa2 100644

17+--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp

18++++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp

19+@@ -95,7 +95,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,

20+ {

21+ // We need to ensure zfs is added to the list if the zfs module is enabled

22+ if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) )

23+- || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended ) )

24++ || ( fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended

25++ && fs->type() != FileSystem::Luks && fs->type() != FileSystem::Luks2 && fs->type() != FileSystem::Minix) )

26+ {

27+ fsNames << userVisibleFS( fs ); // For the combo box

28+ }

pkgs/tools/misc/calamares/uimod.patchnew file+85

@@ -0,0 +1,85 @@

1+diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp

2+index 6c5f9ad16..24d75e07b 100644

3+--- a/src/modules/finished/FinishedPage.cpp

4++++ b/src/modules/finished/FinishedPage.cpp

5+@@ -71,7 +71,10 @@ FinishedPage::retranslate()

6+ {

7+ ui->mainText->setText( tr( "<h1>All done.</h1><br/>"

8+ "%1 has been set up on your computer.<br/>"

9+- "You may now start using your new system." )

10++ "You may now start using your new system.<br/>"

11++ "You can change every setting later except the bootloader.<br/>"

12++ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"

13++ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>")

14+ .arg( branding->versionedName() ) );

15+ ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"

16+ "<p>When this box is checked, your system will "

17+@@ -84,7 +87,10 @@ FinishedPage::retranslate()

18+ ui->mainText->setText( tr( "<h1>All done.</h1><br/>"

19+ "%1 has been installed on your computer.<br/>"

20+ "You may now restart into your new system, or continue "

21+- "using the %2 Live environment." )

22++ "using the %2 Live environment.<br/>"

23++ "You can change every setting later except the bootloader.<br/>"

24++ "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"

25++ "You can find ways to get in touch with the <a href=\"https://nixos.org/community/\">community on the website!</a>")

26+ .arg( branding->versionedName(), branding->productName() ) );

27+ ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"

28+ "<p>When this box is checked, your system will "

29+diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp

30+index 721329c1b..164b9945e 100644

31+--- a/src/modules/packagechooser/PackageChooserPage.cpp

32++++ b/src/modules/packagechooser/PackageChooserPage.cpp

33+@@ -52,6 +52,7 @@ PackageChooserPage::currentChanged( const QModelIndex& index )

34+ if ( !index.isValid() || !ui->products->selectionModel()->hasSelection() )

35+ {

36+ ui->productName->setText( m_introduction.name.get() );

37++ ui->productName->setStyleSheet("font-weight: bold");

38+ ui->productScreenshot->setPixmap( m_introduction.screenshot );

39+ ui->productDescription->setText( m_introduction.description.get() );

40+ }

41+diff --git a/src/modules/packagechooser/page_package.ui b/src/modules/packagechooser/page_package.ui

42+index d021b08b3..fecfa3060 100644

43+--- a/src/modules/packagechooser/page_package.ui

44++++ b/src/modules/packagechooser/page_package.ui

45+@@ -38,19 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later

46+ </item>

47+ <item>

48+- <layout class="QVBoxLayout" name="verticalLayout" stretch="1,30,1">

49++ <layout class="QVBoxLayout" name="verticalLayout" stretch="30,1,1">

50+- <item>

51+- <widget class="QLabel" name="productName">

52+- <property name="sizePolicy">

53+- <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">

54+- <horstretch>0</horstretch>

55+- <verstretch>0</verstretch>

56+- </sizepolicy>

57+- </property>

58+- <property name="text">

59+- <string>Product Name</string>

60+- </property>

61+- </widget>

62+- </item>

63+ <item>

64+ <widget class="FixedAspectRatioLabel" name="productScreenshot">

65+ <property name="sizePolicy">

66+@@ -67,6 +54,19 @@ SPDX-License-Identifier: GPL-3.0-or-later

67+ </property>

68+ </widget>

69+ </item>

70++ <item>

71++ <widget class="QLabel" name="productName">

72++ <property name="sizePolicy">

73++ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">

74++ <horstretch>0</horstretch>

75++ <verstretch>0</verstretch>

76++ </sizepolicy>

77++ </property>

78++ <property name="text">

79++ <string>Product Name</string>

80++ </property>

81++ </widget>

82++ </item>

83+ <item>

84+ <widget class="QLabel" name="productDescription">

85+ <property name="sizePolicy">

pkgs/tools/misc/calamares/unfreeq.patchnew file+109

@@ -0,0 +1,109 @@

1+diff --git a/src/modules/packagechooserq/packagechooserq.qrc b/src/modules/packagechooserq/packagechooserq.qrc

2+index 1b892dce1..ee80a934b 100644

3+--- a/src/modules/packagechooserq/packagechooserq.qrc

4++++ b/src/modules/packagechooserq/packagechooserq.qrc

5+@@ -4,5 +4,6 @@

6+ <file>images/libreoffice.jpg</file>

7+ <file>images/no-selection.png</file>

8+ <file>images/plasma.png</file>

9++ <file>packagechooserq@unfree.qml</file>

10+ </qresource>

11+ </RCC>

12+diff --git a/src/modules/packagechooserq/packagechooserq@unfree.qml b/src/modules/packagechooserq/packagechooserq@unfree.qml

13+new file mode 100644

14+index 000000000..cb87d864a

15+--- /dev/null

16++++ b/src/modules/packagechooserq/packagechooserq@unfree.qml

17+@@ -0,0 +1,75 @@

18++/* === This file is part of Calamares - <https://calamares.io> ===

19++ *

20++ * SPDX-FileCopyrightText: 2021 Anke Boersma <demm@kaosx.us>

21++ * SPDX-License-Identifier: GPL-3.0-or-later

22++ *

23++ * Calamares is Free Software: see the License-Identifier above.

24++ *

25++ */

26++

27++import io.calamares.core 1.0

28++import io.calamares.ui 1.0

29++

30++import QtQuick 2.15

31++import QtQuick.Controls 2.15

32++import QtQuick.Layouts 1.3

33++

34++Item {

35++

36++ SystemPalette {

37++ id: palette

38++ colorGroup: SystemPalette.Active

39++ }

40++

41++ width: parent.width

42++ height: parent.height

43++

44++ Rectangle {

45++ anchors.fill: parent

46++ color: palette.window

47++

48++ ButtonGroup {

49++ id: switchGroup

50++ }

51++

52++ Column {

53++ id: column

54++ anchors.centerIn: parent

55++ spacing: 5

56++

57++ Rectangle {

58++ width: 700

59++ height: 200

60++ color: palette.base

61++ radius: 10

62++ border.width: 0

63++ Text {

64++ color: palette.text

65++ width: 600

66++ height: 150

67++ anchors.centerIn: parent

68++ text: qsTr("NixOS is fully open source, but it also provides software packages with unfree licenses. By default unfree packages are not allowed, but you can enable it here. If you check this box, software installed might have additional End User License Agreements (EULAs) attached. If not enabled, some hardware might not work fully when no suitable open source drivers are available.<br/>")

69++ font.pointSize: 12

70++ wrapMode: Text.WordWrap

71++ }

72++

73++ CheckBox {

74++ id: element2

75++ anchors.horizontalCenter: parent.horizontalCenter

76++ y: 145

77++ text: qsTr("Allow unfree software")

78++ checked: false

79++

80++ onCheckedChanged: {

81++ if ( checked ) {

82++ config.packageChoice = "unfree"

83++ } else {

84++ config.packageChoice = "free"

85++ }

86++ }

87++ }

88++ }

89++ }

90++ }

91++

92++}

93+diff --git a/src/modules/packagechooserq/unfree.conf b/src/modules/packagechooserq/unfree.conf

94+new file mode 100644

95+index 000000000..da79a8eac

96+--- /dev/null

97++++ b/src/modules/packagechooserq/unfree.conf

98+@@ -0,0 +1,11 @@

99++# SPDX-FileCopyrightText: no

100++# SPDX-License-Identifier: CC0-1.0

101++#

102++---

103++qmlLabel:

104++ label: "Unfree Software"

105++method: legacy

106++mode: required

107++labels:

108++ step: "Unfree Software"

109++packageChoice: free

pkgs/tools/misc/calamares/userjob.patchnew file+31

@@ -0,0 +1,31 @@

1+diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp

2+index eedfd274d..0f3e78848 100644

3+--- a/src/modules/users/Config.cpp

4++++ b/src/modules/users/Config.cpp

5+@@ -972,26 +972,11 @@ Config::createJobs() const

6+

7+ Calamares::Job* j;

8+

9+- if ( !m_sudoersGroup.isEmpty() )

10+- {

11+- j = new SetupSudoJob( m_sudoersGroup, m_sudoStyle );

12+- jobs.append( Calamares::job_ptr( j ) );

13+- }

14+-

15+- j = new SetupGroupsJob( this );

16+- jobs.append( Calamares::job_ptr( j ) );

17+-

18+- j = new CreateUserJob( this );

19+- jobs.append( Calamares::job_ptr( j ) );

20+-

21+ j = new SetPasswordJob( loginName(), userPassword() );

22+ jobs.append( Calamares::job_ptr( j ) );

23+

24+ j = new SetPasswordJob( "root", rootPassword() );

25+ jobs.append( Calamares::job_ptr( j ) );

26+

27+- j = new SetHostNameJob( this );

28+- jobs.append( Calamares::job_ptr( j ) );

29+-

30+ return jobs;

31+ }

pkgs/tools/misc/chezmoi/default.nix+3−3

@@ -2,16 +2,16 @@

22

33buildGoModule rec {

44 pname = "chezmoi";

5− version = "2.15.1";

5+ version = "2.15.2";

66

77 src = fetchFromGitHub {

88 owner = "twpayne";

99 repo = "chezmoi";

1010 rev = "v${version}";

11− sha256 = "sha256-spIdY28ZC/+6bwWWwKW7Iu2E2eKD7MeRuxEAMN2e3H8=";

11+ sha256 = "sha256-zvr1O/HMSoZMtA/+dRO+co8Uy70qV8RPIDK3z8dRD28=";

1212 };

1313

14− vendorSha256 = "sha256-D27a107gjHK4NYkJhZDd0SvhUmmRSl3DX519nglAoPo=";

14+ vendorSha256 = "sha256-UAjXCXypR1/SIJIZOS53LTyioKrXOECK9vh9t61W5gc=";

1515

1616 doCheck = false;

1717

pkgs/tools/misc/cht.sh/default.nix+3−3

@@ -10,15 +10,15 @@

1010

1111stdenv.mkDerivation {

1212 pname = "cht.sh";

13− version = "unstable-2022-04-17";

13+ version = "unstable-2022-04-18";

1414

1515 nativeBuildInputs = [ makeWrapper ];

1616

1717 src = fetchFromGitHub {

1818 owner = "chubin";

1919 repo = "cheat.sh";

20− rev = "7f769d6f3697541e55fd3ea9b71f190296529e48";

21− sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo=";

20+ rev = "571377f2f79422398a701cb1864487124ec3dcc6";

21+ sha256 = "0e9YhYcxU9t0SFeT1TjoRGTM3h1xRC528ae69tvz+a0=";

2222 };

2323

2424 # Fix ".cht.sh-wrapped" in the help message

pkgs/tools/misc/fclones/default.nix+3−3

@@ -8,16 +8,16 @@

88

99rustPlatform.buildRustPackage rec {

1010 pname = "fclones";

11− version = "0.22.0";

11+ version = "0.23.0";

1212

1313 src = fetchFromGitHub {

1414 owner = "pkolaczk";

1515 repo = pname;

1616 rev = "v${version}";

17− sha256 = "sha256-gzNrZJz0nC1N7LUyN5q16Vva1SD0jh7cBVV36927pmY=";

17+ sha256 = "sha256-ICuhBoiCBmoy+jW+OK5OU5oAopyyOxSB6uHpZv2dEKI=";

1818 };

1919

20− cargoSha256 = "sha256-yooY58PZbraDYc+mvmDgKZ3CdvVkbKM/f/DcU0xDiNo=";

20+ cargoSha256 = "sha256-NXkXxRDJcfB2F7hXF5nBFnQ+IFhZTSHg915NyRyuS8c=";

2121

2222 buildInputs = lib.optionals stdenv.isDarwin [

2323 AppKit

pkgs/tools/misc/lookatme/default.nixdeleted−67

@@ -1,67 +0,0 @@

1−{ lib, python3, fetchFromGitHub }:

2−

3−let

4− py = python3.override {

5− packageOverrides = self: super: {

6− self = py;

7− # use click 7

8− click = self.callPackage ../../../development/python2-modules/click/default.nix { };

9− # needs pyyaml 5

10− pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {

11− name = "${oldAttrs.pname}-${version}";

12− version = "5.4.1";

13− src = fetchFromGitHub {

14− owner = "yaml";

15− repo = "pyyaml";

16− rev = version;

17− sha256 = "sha256-VUqnlOF/8zSOqh6JoEYOsfQ0P4g+eYqxyFTywgCS7gM=";

18− };

19− checkPhase = ''

20− runHook preCheck

21− PYTHONPATH="tests/lib3:$PYTHONPATH" ${self.python.interpreter} -m test_all

22− runHook postCheck

23− '';

24− });

25− };

26− };

27−in

28−with py.pkgs;

29−

30−buildPythonApplication rec {

31− pname = "lookatme";

32− version = "2.3.2";

33− format = "setuptools";

34−

35− src = fetchPypi {

36− inherit pname version;

37− sha256 = "sha256-qIZMkgOm5jXmxTFLTqMBhpLBhfCL8xvUxxqpS6NjcVw=";

38− };

39−

40− checkInputs = [

41− pytest-mock

42− pytestCheckHook

43− six

44− ];

45−

46− disabledTests = [

47− # https://github.com/d0c-s4vage/lookatme/issues/126

48− "test_sanity_check_that_errors_are_detected"

49− "test_styles_defaults"

50− ];

51−

52− propagatedBuildInputs = [

53− click

54− pyyaml

55− pygments

56− marshmallow

57− mistune

58− urwid

59− ];

60−

61− meta = with lib; {

62− description = "An interactive, terminal-based markdown presenter";

63− homepage = "https://github.com/d0c-s4vage/lookatme";

64− license = licenses.mit;

65− maintainers = with maintainers; [ ameer ];

66− };

67−}

pkgs/tools/misc/partition-manager/default.nix+5−5

@@ -1,6 +1,6 @@

11{ mkDerivation, fetchurl, lib, makeWrapper

22, extra-cmake-modules, kdoctools, wrapGAppsHook, wrapQtAppsHook

3−, kconfig, kcrash, kinit, kpmcore

3+, kconfig, kcrash, kinit, kpmcore, polkit-qt

44, cryptsetup, lvm2, mdadm, smartmontools, systemdMinimal, util-linux

55, btrfs-progs, dosfstools, e2fsprogs, exfat, f2fs-tools, fatresize, hfsprogs

66, jfsutils, nilfs-utils, ntfs3g, reiser4progs, reiserfsprogs, udftools, xfsprogs, zfs

@@ -41,16 +41,16 @@ let

4141in mkDerivation rec {

4242 pname = "partitionmanager";

4343 # NOTE: When changing this version, also change the version of `kpmcore`.

44− version = "4.2.0";

44+ version = "22.04.0";

4545

4646 src = fetchurl {

47− url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";

48− hash = "sha256-6Qlt1c47Eek6TkWWBzTyBZYJ1jfhtwsC9X5q5h6IhPg=";

47+ url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz";

48+ hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo=";

4949 };

5050

5151 nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook wrapQtAppsHook makeWrapper ];

5252

53− propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];

53+ propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ];

5454

5555 postFixup = ''

5656 wrapProgram $out/bin/partitionmanager \

pkgs/tools/misc/pferd/default.nix+2−2

@@ -5,14 +5,14 @@

55

66python3Packages.buildPythonApplication rec {

77 pname = "pferd";

8− version = "3.3.1";

8+ version = "3.4.0";

99 format = "pyproject";

1010

1111 src = fetchFromGitHub {

1212 owner = "Garmelon";

1313 repo = "PFERD";

1414 rev = "v${version}";

15− sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh";

15+ sha256 = "1nwrkc0z2zghy2nk9hfdrffg1k8anh3mn3hx31ql8xqwhv5ksh9g";

1616 };

1717

1818 propagatedBuildInputs = with python3Packages; [

pkgs/tools/misc/rust-motd/default.nix+5−3

@@ -9,21 +9,23 @@

99

1010rustPlatform.buildRustPackage rec {

1111 pname = "rust-motd";

12− version = "0.1.1";

12+ version = "0.2.1";

1313

1414 src = fetchFromGitHub {

1515 owner = "rust-motd";

1616 repo = pname;

1717 rev = "v${version}";

18− sha256 = "0xhdbhl0riaq9n4g9n333pgw966bsi60zpcy7gpndzfj21bj2x1m";

18+ sha256 = "sha256-iuADR7m+wdmsQ897o4CQHqDv9PmYu/vJgO5C6Dluao4=";

1919 };

2020

21− cargoSha256 = "sha256-l9Sit+niCLOnL1mdK6i8jea8NWsJlFM6p9lMTXyWOKY=";

21+ cargoSha256 = "sha256-kdSMcADoTpMU4w2XSv0pPQZC155rrQACQ4XTVyj7eeA=";

2222

2323 nativeBuildInputs = [ pkg-config ];

2424

2525 buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

2626

27+ OPENSSL_NO_VENDOR = 1;

28+

2729 meta = with lib; {

2830 description = "Beautiful, useful MOTD generation with zero runtime dependencies";

2931 homepage = "https://github.com/rust-motd/rust-motd";

pkgs/tools/networking/pssh/default.nix+7−4

@@ -1,14 +1,14 @@

1−{ lib, fetchFromGitHub, python2Packages, openssh, rsync }:

1+{ lib, fetchFromGitHub, python3Packages, openssh, rsync }:

22

3−python2Packages.buildPythonApplication rec {

3+python3Packages.buildPythonApplication rec {

44 pname = "pssh";

5− version = "2.3.1";

5+ version = "2.3.4";

66

77 src = fetchFromGitHub {

88 owner = "lilydjwg";

99 repo = "pssh";

1010 rev = "v${version}";

11− sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";

11+ hash = "sha256-B1dIa6hNeq4iE8GKVhTp3Gzq7vp+v5Yyzj8uF8X71yg=";

1212 };

1313

1414 postPatch = ''

@@ -20,6 +20,9 @@ python2Packages.buildPythonApplication rec {

2020 done

2121 '';

2222

23+ # Tests do not run with python3: https://github.com/lilydjwg/pssh/issues/126

24+ doCheck = false;

25+

2326 meta = with lib; {

2427 description = "Parallel SSH Tools";

2528 longDescription = ''

pkgs/tools/networking/urlwatch/default.nix+2−2

@@ -5,13 +5,13 @@

55

66python3Packages.buildPythonApplication rec {

77 pname = "urlwatch";

8− version = "2.24";

8+ version = "2.25";

99

1010 src = fetchFromGitHub {

1111 owner = "thp";

1212 repo = "urlwatch";

1313 rev = version;

14− sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU=";

14+ hash = "sha256-+ayHMY0gEAVhOgDDh+RfRrUpV0tSX8mMmfPzyg+YSv4=";

1515 };

1616

1717 propagatedBuildInputs = with python3Packages; [

pkgs/tools/package-management/nix/default.nix+3−3

@@ -89,12 +89,12 @@ in lib.makeExtensible (self: {

8989

9090 unstable = lib.lowPrio (common rec {

9191 version = "2.8";

92− suffix = "pre20220428_${lib.substring 0 7 src.rev}";

92+ suffix = "pre20220503_${lib.substring 0 7 src.rev}";

9393 src = fetchFromGitHub {

9494 owner = "NixOS";

9595 repo = "nix";

96− rev = "4bb111c8d4c5692db2f735c2803f632f8c30b6ab";

97− sha256 = "sha256-AmxyCgpd53JBvvj6jPoGMP3eEisgu58YjaZEmhoTlGw=";

96+ rev = "9489b4b7ef73ab20e8f49213d8711ca56b59107e";

97+ sha256 = "sha256-eTRr2MkP9MMqpmHtsCPMbyLBQLrLPnTh4D8RXT4MKk4=";

9898 };

9999 });

100100})

pkgs/tools/security/cryptomator/default.nix+3−3

@@ -6,13 +6,13 @@

66

77let

88 pname = "cryptomator";

9− version = "1.6.8";

9+ version = "1.6.10";

1010

1111 src = fetchFromGitHub {

1212 owner = "cryptomator";

1313 repo = "cryptomator";

1414 rev = version;

15− sha256 = "sha256-2bvIjfutxfTPBtYiSXpgdEh63Eg74uqSf8CDo/Oma0U=";

15+ sha256 = "sha256-klNkMCgXC0gGqNV7S5EObHYCcgN4SayeNHXF9bq+20s=";

1616 };

1717

1818 # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB)

@@ -37,7 +37,7 @@ let

3737

3838 outputHashAlgo = "sha256";

3939 outputHashMode = "recursive";

40− outputHash = "sha256-quYUJX/JErtWuUQBYXXee/uZGkO0UBr4qxcGticxGUc=";

40+ outputHash = "sha256-biQBP0rV94+Hoqte36Xmzm1XWtWC+1ne5lgpUj0GPak=";

4141

4242 doCheck = false;

4343 };

pkgs/tools/security/fulcio/default.nix+3−3

@@ -2,13 +2,13 @@

22

33buildGoModule rec {

44 pname = "fulcio";

5− version = "0.4.0";

5+ version = "0.4.1";

66

77 src = fetchFromGitHub {

88 owner = "sigstore";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-WxSN1pZ8E5vKMoqR5EkGgKnLuHYb5Wl2vzqPcPEkXWE=";

11+ sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo=";

1212 # populate values that require us to use git. By doing this in postFetch we

1313 # can delete .git afterwards and maintain better reproducibility of the src.

1414 leaveDotGit = true;

@@ -20,7 +20,7 @@ buildGoModule rec {

2020 find "$out" -name .git -print0 | xargs -0 rm -rf

2121 '';

2222 };

23− vendorSha256 = "sha256-v3H+uUERDHZB2ArruCOClCQFEEW8ANeReObww+1VKOI=";

23+ vendorSha256 = "sha256-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck=";

2424

2525 nativeBuildInputs = [ installShellFiles ];

2626

pkgs/tools/security/grype/default.nix+3−3

@@ -6,13 +6,13 @@

66

77buildGoModule rec {

88 pname = "grype";

9− version = "0.36.0";

9+ version = "0.36.1";

1010

1111 src = fetchFromGitHub {

1212 owner = "anchore";

1313 repo = pname;

1414 rev = "v${version}";

15− sha256 = "sha256-8bU7vuTbPoHGCoXiCc4p0rPzCSsYuXM3A2NAgIaHuIw=";

15+ sha256 = "sha256-BJSjJrDXZHB4MY4RZCmuC5Gn9YJiCQwyOFrXiGX1h18=";

1616 # populate values that require us to use git. By doing this in postFetch we

1717 # can delete .git afterwards and maintain better reproducibility of the src.

1818 leaveDotGit = true;

@@ -25,7 +25,7 @@ buildGoModule rec {

2525 '';

2626 };

2727

28− vendorSha256 = "sha256-Dn3lDdwUK+C7pQwN3uq7p4WkyG5tXTPd18rQGpwqcPI=";

28+ vendorSha256 = "sha256-aIFom4hGx7HTobCh9YRyqyf9gUpJIaxAstUUkHjSFnA=";

2929

3030 nativeBuildInputs = [

3131 installShellFiles

pkgs/tools/security/jadx/default.nix+3−3

@@ -2,13 +2,13 @@

22

33let

44 pname = "jadx";

5− version = "1.3.4";

5+ version = "1.3.5";

66

77 src = fetchFromGitHub {

88 owner = "skylot";

99 repo = pname;

1010 rev = "v${version}";

11− hash = "sha256-G2BgGhWk0Prbjni6HPZ/0+bWiC9uI2O13Q1SDCE5mBE=";

11+ hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA=";

1212 };

1313

1414 deps = stdenv.mkDerivation {

@@ -40,7 +40,7 @@ let

4040 '';

4141

4242 outputHashMode = "recursive";

43− outputHash = "sha256-QZClHuj7oCUYX3I8B3A90m4zK7+FP24C19RIzYyPC1w=";

43+ outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM=";

4444 };

4545in stdenv.mkDerivation {

4646 inherit pname version src;

pkgs/tools/security/john/default.nix+17−7

@@ -1,5 +1,5 @@

1−{ lib, stdenv, fetchurl, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2

2−, gcc, python3Packages, perl, perlPackages, makeWrapper

1+{ lib, stdenv, fetchFromGitHub, openssl, nss, nspr, libkrb5, gmp, zlib, libpcap, re2

2+, gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch

33}:

44

55with lib;

@@ -8,11 +8,21 @@ stdenv.mkDerivation rec {

88 pname = "john";

99 version = "1.9.0-jumbo-1";

1010

11− src = fetchurl {

12− url = "http://www.openwall.com/john/k/${pname}-${version}.tar.xz";

13− sha256 = "0fvz3v41hnaiv1ggpxanfykyfjq79cwp9qcqqn63vic357w27lgm";

11+ src = fetchFromGitHub {

12+ owner = "openwall";

13+ repo = pname;

14+ rev = "1.9.0-Jumbo-1";

15+ sha256 = "sha256-O1iPh5QTMjZ78sKvGbvSpaHFbBuVc1z49UKTbMa24Rs=";

1416 };

1517

18+ patches = [

19+ (fetchpatch {

20+ name = "fix-gcc-11-struct-allignment-incompatibility.patch";

21+ url = "https://github.com/openwall/john/commit/154ee1156d62dd207aff0052b04c61796a1fde3b.patch";

22+ sha256 = "sha256-3rfS2tu/TF+KW2MQiR+bh4w/FVECciTooDQNTHNw31A=";

23+ })

24+ ];

25+

1626 postPatch = ''

1727 sed -ri -e '

1828 s!^(#define\s+CFG_[A-Z]+_NAME\s+).*/!\1"'"$out"'/etc/john/!

@@ -69,8 +79,8 @@ stdenv.mkDerivation rec {

6979

7080 meta = {

7181 description = "John the Ripper password cracker";

72− license = licenses.gpl2;

73− homepage = "https://github.com/magnumripper/JohnTheRipper/";

82+ license = licenses.gpl2Plus;

83+ homepage = "https://github.com/openwall/john/";

7484 maintainers = with maintainers; [ offline matthewbauer ];

7585 platforms = platforms.unix;

7686 };

pkgs/tools/security/jwt-cli/default.nix+3−3

@@ -2,16 +2,16 @@

22

33rustPlatform.buildRustPackage rec {

44 pname = "jwt-cli";

5− version = "5.0.2";

5+ version = "5.0.3";

66

77 src = fetchFromGitHub {

88 owner = "mike-engel";

99 repo = pname;

1010 rev = version;

11− sha256 = "0w7fqmh8gihknvdamnq1n519253d4lxrpv378jajca9x906rqy1r";

11+ sha256 = "01aqqjynfcrn3m36hfjwcfh870imcd0hj5gifxzpnjiqjwpvys59";

1212 };

1313

14− cargoSha256 = "0b7m23azy8cb8d5wkawnw6nv8k7lfnfwc06swmbkfvg8vcxfsacs";

14+ cargoSha256 = "1n4gmqmi975cd2zyrf0yi4gbxjjg9f99xa191mgmrdyyij7id3cf";

1515

1616 buildInputs = lib.optional stdenv.isDarwin Security;

1717

pkgs/tools/security/nmap/default.nix+6−18

@@ -1,9 +1,7 @@

11{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3

22, pcre, libssh2

3−, graphicalSupport ? false

43, libX11 ? null

54, gtk2 ? null

6−, python2 ? null

75, makeWrapper ? null

86, withLua ? true

97}:

@@ -11,7 +9,7 @@

119with lib;

1210

1311stdenv.mkDerivation rec {

14− pname = "nmap${optionalString graphicalSupport "-graphical"}";

12+ pname = "nmap";

1513 version = "7.92";

1614

1715 src = fetchurl {

@@ -41,7 +39,9 @@ stdenv.mkDerivation rec {

4139 configureFlags = [

4240 (if withLua then "--with-liblua=${lua5_3}" else "--without-liblua")

4341 "--with-liblinear=included"

44− ] ++ optionals (!graphicalSupport) [ "--without-ndiff" "--without-zenmap" ];

42+ "--without-ndiff"

43+ "--without-zenmap"

44+ ];

4545

4646 makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

4747 "AR=${stdenv.cc.bintools.targetPrefix}ar"

@@ -49,20 +49,8 @@ stdenv.mkDerivation rec {

4949 "CC=${stdenv.cc.targetPrefix}gcc"

5050 ];

5151

52− pythonPath = with python2.pkgs; optionals graphicalSupport [

53− pygtk pysqlite pygobject2 pycairo

54− ];

55−

56− nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ];

57− buildInputs = [ pcre libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [

58− python2 libX11 gtk2

59− ]);

60−

61− postInstall = optionalString graphicalSupport ''

62− buildPythonPath "$out $pythonPath"

63− patchPythonScript $out/bin/ndiff

64− patchPythonScript $out/bin/zenmap

65− '';

52+ nativeBuildInputs = [ pkg-config ];

53+ buildInputs = [ pcre libssh2 libpcap openssl ];

6654

6755 enableParallelBuilding = true;

6856

pkgs/tools/security/oath-toolkit/update.sh+1−1

@@ -5,7 +5,7 @@ set -euo pipefail

55

66nixfile='default.nix'

77release_url='https://download.savannah.nongnu.org/releases/oath-toolkit/'

8−attr='oathToolkit'

8+attr='oath-toolkit'

99command='oathtool --version'

1010

1111color() {

pkgs/tools/security/pass/extensions/otp.nix+3−3

@@ -1,4 +1,4 @@

1−{ lib, stdenv, fetchFromGitHub, oathToolkit }:

1+{ lib, stdenv, fetchFromGitHub, oath-toolkit }:

22

33stdenv.mkDerivation rec {

44 pname = "pass-otp";

@@ -11,12 +11,12 @@ stdenv.mkDerivation rec {

1111 sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";

1212 };

1313

14− buildInputs = [ oathToolkit ];

14+ buildInputs = [ oath-toolkit ];

1515

1616 dontBuild = true;

1717

1818 patchPhase = ''

19− sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash

19+ sed -i -e 's|OATH=\$(which oathtool)|OATH=${oath-toolkit}/bin/oathtool|' otp.bash

2020 '';

2121

2222 installFlags = [ "PREFIX=$(out)"

pkgs/tools/security/plasma-pass/default.nix+2−2

@@ -1,7 +1,7 @@

11{ mkDerivation, lib, fetchFromGitLab, cmake, extra-cmake-modules

22, ki18n

33, kitemmodels

4−, oathToolkit

4+, oath-toolkit

55, qgpgme

66, plasma-framework

77, qt5 }:

@@ -21,7 +21,7 @@ mkDerivation rec {

2121 buildInputs = [

2222 ki18n

2323 kitemmodels

24− oathToolkit

24+ oath-toolkit

2525 qgpgme

2626 plasma-framework

2727 qt5.qtbase

pkgs/tools/security/tor/default.nix+9−5

@@ -30,11 +30,11 @@ let

3030in

3131stdenv.mkDerivation rec {

3232 pname = "tor";

33− version = "0.4.6.10";

33+ version = "0.4.7.7";

3434

3535 src = fetchurl {

3636 url = "https://dist.torproject.org/${pname}-${version}.tar.gz";

37− sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw=";

37+ sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q=";

3838 };

3939

4040 outputs = [ "out" "geoip" ];

@@ -45,9 +45,13 @@ stdenv.mkDerivation rec {

4545

4646 patches = [ ./disable-monotonic-timer-tests.patch ];

4747

48− # cross compiles correctly but needs the following

49− configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)

50− "--disable-tool-name-check";

48+ configureFlags =

49+ # cross compiles correctly but needs the following

50+ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ]

51+ ++

52+ # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599

53+ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ]

54+ ;

5155

5256 NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";

5357

pkgs/tools/system/freeipmi/default.nix+6−1

@@ -1,4 +1,4 @@

1−{ fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:

1+{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:

22

33stdenv.mkDerivation rec {

44 version = "1.6.9";

@@ -9,8 +9,13 @@ stdenv.mkDerivation rec {

99 sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY=";

1010 };

1111

12+ depsBuildBuild = [ buildPackages.stdenv.cc ];

13+

1214 buildInputs = [ libgcrypt readline libgpg-error ];

1315

16+ configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)

17+ [ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ];

18+

1419 doCheck = true;

1520

1621 meta = {

pkgs/tools/system/runitor/default.nixnew file+52

@@ -0,0 +1,52 @@

1+{ lib, buildGoModule, fetchFromGitHub, testers, runitor }:

2+

3+buildGoModule rec {

4+ pname = "runitor";

5+ version = "0.9.2";

6+ vendorSha256 = null;

7+

8+ src = fetchFromGitHub {

9+ owner = "bdd";

10+ repo = "runitor";

11+ rev = "v${version}";

12+ sha256 = "sha256-LuCxn4j0MlnJjSh3d18YNzNrtbqtMPxgkZttqKUGJd4";

13+ };

14+

15+ ldflags = [

16+ "-s" "-w" "-X main.Version=v${version}"

17+ ];

18+

19+ # TODO(cole-h):

20+ # End-to-end tests requiring localhost networking currently under

21+ # OfBorg's Linux builders, while passing under Darwin.

22+ #

23+ # Ref: https://github.com/NixOS/nixpkgs/pull/170566#issuecomment-1114034891

24+ #

25+ # Temporarily disable tests.

26+ doCheck = false;

27+

28+ passthru.tests.version = testers.testVersion {

29+ package = runitor;

30+ command = "runitor -version";

31+ version = "v${version}";

32+ };

33+

34+ # Unit tests require binding to local addresses for listening sockets.

35+ __darwinAllowLocalNetworking = true;

36+

37+ meta = with lib; {

38+ homepage = "https://bdd.fi/x/runitor";

39+ description = "A command runner with healthchecks.io integration";

40+ longDescription = ''

41+ Runitor runs the supplied command, captures its output, and based on its exit

42+ code reports successful or failed execution to https://healthchecks.io or your

43+ private instance.

44+

45+ Healthchecks.io is a web service for monitoring periodic tasks. It's like a

46+ dead man's switch for your cron jobs. You get alerted if they don't run on time

47+ or terminate with a failure.

48+ '';

49+ license = licenses.bsd0;

50+ maintainers = with maintainers; [ bdd ];

51+ };

52+}

pkgs/tools/text/xml/xpf/default.nixdeleted−21

@@ -1,21 +0,0 @@

1−{lib, stdenv, fetchurl, python2, libxml2}:

2−

3−assert libxml2.pythonSupport == true;

4−

5−stdenv.mkDerivation rec {

6− pname = "xpf";

7− version = "0.2";

8−

9− src = fetchurl {

10− url = "http://tarballs.nixos.org/xpf-${version}.tar.gz";

11− sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";

12− };

13−

14− buildInputs = [ python2 libxml2 ];

15−

16− meta = {

17− description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";

18− homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters";

19− platforms = lib.platforms.unix;

20− };

21−}

pkgs/tools/virtualization/lxd-image-server/default.nix+3

@@ -3,6 +3,7 @@

33, rsync

44, python3

55, fetchFromGitHub

6+, nixosTests

67}:

78

89python3.pkgs.buildPythonApplication rec {

@@ -37,6 +38,8 @@ python3.pkgs.buildPythonApplication rec {

3738

3839 doCheck = false;

3940

41+ passthru.tests.lxd-image-server = nixosTests.lxd-image-server;

42+

4043 meta = with lib; {

4144 description = "Creates and manages a simplestreams lxd image server on top of nginx";

4245 homepage = "https://github.com/Avature/lxd-image-server";

pkgs/top-level/aliases.nix+10−1

@@ -92,6 +92,7 @@ mapAliases ({

9292 aucdtect = throw "aucdtect: Upstream no longer provides download urls"; # Added 2020-12-26

9393 avldrums-lv2 = x42-avldrums; # Added 2020-03-29

9494 avxsynth = throw "avxsynth was removed because it was broken"; # Added 2021-05-18

95+ awesome-4-0 = awesome; # Added 2022-05-05

9596 aws-okta = throw "aws-okta is on indefinite hiatus. See https://github.com/segmentio/aws-okta/issues/278"; # Added 2022-04-05;

9697 azureus = throw "azureus is now known as vuze and the version in nixpkgs was really outdated"; # Added 2021-08-02

9798

@@ -146,6 +147,7 @@ mapAliases ({

146147

147148 c14 = throw "c14 is deprecated and archived by upstream"; # Added 2022-04-10

148149 caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02

150+ caffe2 = throw "caffe2 has been removed: subsumed under the PyTorch project"; # Added 2022-04-25

149151 calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13

150152 calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13

151153 callPackage_i686 = pkgsi686Linux.callPackage;

@@ -324,6 +326,7 @@ mapAliases ({

324326 double_conversion = throw "'double_conversion' has been renamed to/replaced by 'double-conversion'"; # Converted to throw 2022-02-22

325327 dragon-drop = throw "'dragon-drop' has been removed in favor of 'xdragon'"; # Added 2022-04-10;

326328 draftsight = throw "draftsight has been removed, no longer available as freeware"; # Added 2020-08-14

329+ dust = throw "dust has been removed: abandoned by upstream"; # Added 2022-04-21

327330 dvb_apps = throw "dvb_apps has been removed"; # Added 2020-11-03

328331 dwarf_fortress = throw "'dwarf_fortress' has been renamed to/replaced by 'dwarf-fortress'"; # Converted to throw 2022-02-22

329332 dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose"; # Added 2021-02-07

@@ -870,7 +873,8 @@ mapAliases ({

870873 nix_2_6 = nixVersions.nix_2_6;

871874 nixopsUnstable = nixops_unstable; # Added 2022-03-03

872875 nmap-unfree = nmap; # Added 2021-04-06

873− nmap_graphical = throw "'nmap_graphical' has been renamed to/replaced by 'nmap-graphical'"; # Converted to throw 2022-02-22

876+ nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26

877+ nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26

874878 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22

875879 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27

876880 noto-fonts-cjk = noto-fonts-cjk-sans; # Added 2021-12-16

@@ -881,6 +885,7 @@ mapAliases ({

881885

882886 ### O ###

883887

888+ oathToolkit = oath-toolkit; # Added 2022-04-04

884889 oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained"; # Added 2020-10-09

885890 OVMF-CSM = throw "OVMF-CSM has been removed in favor of OVMFFull"; # Added 2021-10-16

886891 OVMF-secureBoot = throw "OVMF-secureBoot has been removed in favor of OVMFFull"; # Added 2021-10-16

@@ -1001,6 +1006,7 @@ mapAliases ({

10011006 pifi = throw "pifi has been removed from nixpkgs, as it is no longer developed"; # Added 2022-01-19

10021007 ping = throw "'ping' does not build with recent valac and has been removed. If you are just looking for the 'ping' command use either 'iputils' or 'inetutils'"; # Added 2022-04-18

10031008 piwik = throw "'piwik' has been renamed to/replaced by 'matomo'"; # Converted to throw 2022-02-22

1009+ pixie = throw "pixie has been removed: abandoned by upstream"; # Added 2022-04-21

10041010 pkgconfig = pkg-config; # Added 2018-02-02, moved to aliases.nix 2021-01-18

10051011 pkgconfigUpstream = throw "'pkgconfigUpstream' has been renamed to/replaced by 'pkg-configUpstream'"; # Converted to throw 2022-02-22

10061012 planner = throw "planner has been removed from nixpkgs, as it is no longer developed and still uses python2/PyGTK"; # Added 2021-02-02

@@ -1305,12 +1311,14 @@ mapAliases ({

13051311 tshark = throw "'tshark' has been renamed to/replaced by 'wireshark-cli'"; # Converted to throw 2022-02-22

13061312 tuijam = throw "tuijam has been removed because Google Play Music was discontinued"; # Added 2021-03-07

13071313 turbo-geth = throw "turbo-geth has been renamed to erigon"; # Added 2021-08-08

1314+ twister = throw "twister has been removed: abandoned by upstream and python2-only"; # Added 2022-04-26

13081315 typora = throw "Newer versions of typora use anti-user encryption and refuse to start. As such it has been removed"; # Added 2021-09-11

13091316

13101317 ### U ###

13111318

13121319 uberwriter = apostrophe; # Added 2020-04-23

13131320 ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21

1321+ uchiwa = throw "uchiwa is deprecated and archived by upstream"; # Added 2022-05-02

13141322 ucsFonts = throw "'ucsFonts' has been renamed to/replaced by 'ucs-fonts'"; # Converted to throw 2022-02-22

13151323 ufraw = throw "ufraw is unmaintained and has been removed from nixpkgs. Its successor, nufraw, doesn't seem to be stable enough. Consider using Darktable for now"; # Added 2020-01-11

13161324 ultrastardx-beta = throw "'ultrastardx-beta' has been renamed to/replaced by 'ultrastardx'"; # Converted to throw 2022-02-22

@@ -1390,6 +1398,7 @@ mapAliases ({

13901398 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22

13911399 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";

13921400 xp-pen-g430 = pentablet-driver; # Added 2020-05-03

1401+ xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26

13931402 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22

13941403 xf86_input_mtrack = throw ''

13951404 xf86_input_mtrack has been removed from nixpkgs as it is broken and

pkgs/top-level/all-packages.nix+30−32

@@ -406,6 +406,8 @@ with pkgs;

406406

407407 protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { };

408408

409+ protoc-gen-entgrpc = callPackage ../development/tools/protoc-gen-entgrpc { };

410+

409411 protoc-gen-go = callPackage ../development/tools/protoc-gen-go { };

410412

411413 protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { };

@@ -2376,6 +2378,8 @@ with pkgs;

23762378

23772379 passExtensions = recurseIntoAttrs pass.extensions;

23782380

2381+ pdepend = callPackage ../development/php-packages/pdepend/default.nix { };

2382+

23792383 platformsh = callPackage ../misc/platformsh { };

23802384

23812385 inherd-quake = callPackage ../applications/misc/inherd-quake {

@@ -2867,6 +2871,8 @@ with pkgs;

28672871 python = python3;

28682872 boost = boost.override { enablePython = true; python = python3; };

28692873 };

2874+ calamares-nixos = lowPrio (calamares.override { nixos-extensions = true; });

2875+ calamares-nixos-extensions = callPackage ../tools/misc/calamares-nixos-extensions {};

28702876

28712877 calendar-cli = callPackage ../tools/networking/calendar-cli { };

28722878

@@ -3356,6 +3362,10 @@ with pkgs;

33563362

33573363 earlyoom = callPackage ../os-specific/linux/earlyoom { };

33583364

3365+ easycrypt = callPackage ../applications/science/logic/easycrypt { };

3366+

3367+ easycrypt-runtest = callPackage ../applications/science/logic/easycrypt/runtest.nix { };

3368+

33593369 EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };

33603370

33613371 ecasound = callPackage ../applications/audio/ecasound { };

@@ -6828,6 +6838,9 @@ with pkgs;

68286838 llvmPackages = llvmPackages_9;

68296839 };

68306840

6841+ harec = callPackage ../development/compilers/hare/harec.nix { };

6842+ hare = callPackage ../development/compilers/hare/hare.nix { };

6843+

68316844 ham = pkgs.perlPackages.ham;

68326845

68336846 hardinfo = callPackage ../tools/system/hardinfo { };

@@ -7373,6 +7386,8 @@ with pkgs;

73737386 inherit (darwin.apple_sdk.frameworks) AppKit;

73747387 };

73757388

7389+ kdash = callPackage ../development/tools/kdash { };

7390+

73767391 kdbplus = pkgsi686Linux.callPackage ../applications/misc/kdbplus { };

73777392

73787393 keepalived = callPackage ../tools/networking/keepalived { };

@@ -8722,10 +8737,6 @@ with pkgs;

87228737

87238738 nmap = callPackage ../tools/security/nmap { };

87248739

8725− nmap-graphical = nmap.override {

8726− graphicalSupport = true;

8727− };

8728−

87298740 nmap-formatter = callPackage ../tools/security/nmap-formatter { };

87308741

87318742 nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { };

@@ -8816,7 +8827,7 @@ with pkgs;

88168827

88178828 oapi-codegen = callPackage ../tools/networking/oapi-codegen { };

88188829

8819− oathToolkit = callPackage ../tools/security/oath-toolkit { };

8830+ oath-toolkit = callPackage ../tools/security/oath-toolkit { };

88208831

88218832 oatpp = callPackage ../development/libraries/oatpp { };

88228833

@@ -9488,7 +9499,9 @@ with pkgs;

94889499

94899500 proxify = callPackage ../tools/networking/proxify { };

94909501

9491− proxysql = callPackage ../servers/sql/proxysql { };

9502+ proxysql = callPackage ../servers/sql/proxysql {

9503+ stdenv = if stdenv.targetPlatform.isx86_64 then gcc10Stdenv else stdenv;

9504+ };

94929505

94939506 prs = callPackage ../tools/security/prs { };

94949507

@@ -11790,10 +11803,6 @@ with pkgs;

1179011803 inherit (darwin.apple_sdk.frameworks) AppKit;

1179111804 };

1179211805

11793− xpf = callPackage ../tools/text/xml/xpf {

11794− libxml2 = libxml2Python;

11795− };

11796−

1179711806 xsecurelock = callPackage ../tools/X11/xsecurelock { };

1179811807

1179911808 xsel = callPackage ../tools/misc/xsel { };

@@ -12692,7 +12701,7 @@ with pkgs;

1269212701 gcc_latest = gcc11;

1269312702

1269412703 # Use the same GCC version as the one from stdenv by default

12695− gfortran = wrapCC (gccStdenv.cc.cc.override {

12704+ gfortran = wrapCC (gcc.cc.override {

1269612705 name = "gfortran";

1269712706 langFortran = true;

1269812707 langCC = false;

@@ -14486,9 +14495,6 @@ with pkgs;

1448614495

1448714496 inherit (ocamlPackages) reason;

1448814497

14489− pixie = callPackage ../development/interpreters/pixie { };

14490− dust = callPackage ../development/interpreters/pixie/dust.nix { };

14491−

1449214498 buildRubyGem = callPackage ../development/ruby-modules/gem { };

1449314499 defaultGemConfig = callPackage ../development/ruby-modules/gem-config {

1449414500 inherit (darwin) DarwinTools cctools;

@@ -22535,8 +22541,6 @@ with pkgs;

2253522541

2253622542 check-wmiplus = callPackage ../servers/monitoring/plugins/wmiplus { };

2253722543

22538− uchiwa = callPackage ../servers/monitoring/uchiwa { };

22539−

2254022544 shishi = callPackage ../servers/shishi {

2254122545 pam = if stdenv.isLinux then pam else null;

2254222546 # see also openssl, which has/had this same trick

@@ -25254,11 +25258,10 @@ with pkgs;

2525425258

2525525259 avrdudess = callPackage ../applications/misc/avrdudess { };

2525625260

25257− awesome-4-0 = callPackage ../applications/window-managers/awesome {

25261+ awesome = callPackage ../applications/window-managers/awesome {

2525825262 cairo = cairo.override { xcbSupport = true; };

2525925263 inherit (texFunctions) fontsConf;

2526025264 };

25261− awesome = awesome-4-0;

2526225265

2526325266 awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };

2526425267

@@ -26105,6 +26108,10 @@ with pkgs;

2610526108 inherit (darwin.apple_sdk.frameworks) Security;

2610626109 };

2610726110

26111+ firewalld = callPackage ../applications/networking/firewalld { };

26112+

26113+ firewalld-gui = firewalld.override { withGui = true; };

26114+

2610826115 flacon = libsForQt5.callPackage ../applications/audio/flacon { };

2610926116

2611026117 flexget = callPackage ../applications/networking/flexget { };

@@ -27825,8 +27832,6 @@ with pkgs;

2782527832 inherit (luajitPackages) luafilesystem;

2782627833 };

2782727834

27828− lookatme = callPackage ../tools/misc/lookatme {};

27829−

2783027835 looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };

2783127836

2783227837 ltc-tools = callPackage ../applications/audio/ltc-tools { };

@@ -29348,7 +29353,7 @@ with pkgs;

2934829353

2934929354 udevil = callPackage ../applications/misc/udevil {};

2935029355

29351− udiskie = python3.pkgs.callPackage ../applications/misc/udiskie { };

29356+ udiskie = callPackage ../applications/misc/udiskie { };

2935229357

2935329358 sacc = callPackage ../applications/networking/gopher/sacc { };

2935429359

@@ -30063,10 +30068,6 @@ with pkgs;

3006330068 swt = swt_jdk8;

3006430069 };

3006530070

30066− twister = callPackage ../applications/networking/p2p/twister {

30067− boost = boost16x;

30068− };

30069−

3007030071 twmn = libsForQt5.callPackage ../applications/misc/twmn { };

3007130072

3007230073 testssl = callPackage ../applications/networking/testssl { };

@@ -30332,6 +30333,8 @@ with pkgs;

3033230333

3033330334 vmware-horizon-client = callPackage ../applications/networking/remote/vmware-horizon-client { };

3033430335

30336+ vmware-workstation = callPackage ../applications/virtualization/vmware-workstation { };

30337+

3033530338 vocproc = callPackage ../applications/audio/vocproc { };

3033630339

3033730340 vnstat = callPackage ../applications/networking/vnstat { };

@@ -33415,13 +33418,6 @@ with pkgs;

3341533418

3341633419 caffeWithCuda = caffe.override { cudaSupport = true; };

3341733420

33418− caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec {

33419− inherit (python3Packages) python future six numpy pydot;

33420− protobuf = protobuf3_1;

33421− python-protobuf = python3Packages.protobuf.override { inherit protobuf; };

33422− opencv3 = opencv3WithoutCuda; # Used only for image loading.

33423− });

33424−

3342533421 caffeine-ng = callPackage ../tools/X11/caffeine-ng {};

3342633422

3342733423 cntk = callPackage ../applications/science/math/cntk {

@@ -34461,6 +34457,8 @@ with pkgs;

3446134457

3446234458 runit = callPackage ../tools/system/runit { };

3446334459

34460+ runitor = callPackage ../tools/system/runitor { };

34461+

3446434462 refind = callPackage ../tools/bootloaders/refind { };

3446534463

3446634464 spectrojack = callPackage ../applications/audio/spectrojack { };

pkgs/top-level/config.nix+15

@@ -94,6 +94,21 @@ let

9494 '';

9595 };

9696

97+ showDerivationWarnings = mkOption {

98+ type = types.listOf (types.enum [ "maintainerless" ]);

99+ default = [];

100+ description = ''

101+ Which warnings to display for potentially dangerous

102+ or deprecated values passed into `stdenv.mkDerivation`.

103+

104+ A list of warnings can be found in

105+ <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/check-meta.nix">/pkgs/stdenv/generic/check-meta.nix</link>.

106+

107+ This is not a stable interface; warnings may be added, changed

108+ or removed without prior notice.

109+ '';

110+ };

111+

97112 };

98113

99114in {

pkgs/top-level/linux-kernels.nix+2

@@ -464,6 +464,8 @@ in {

464464

465465 vmm_clock = callPackage ../os-specific/linux/vmm_clock { };

466466

467+ vmware = callPackage ../os-specific/linux/vmware { };

468+

467469 wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null;

468470

469471 x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { };

pkgs/top-level/php-packages.nix+2

@@ -209,6 +209,8 @@ lib.makeScope pkgs.newScope (self: with self; {

209209 sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914";

210210 });

211211

212+ openswoole = callPackage ../development/php-packages/openswoole { };

213+

212214 pdlib = callPackage ../development/php-packages/pdlib { };

213215

214216 pcov = callPackage ../development/php-packages/pcov { };

pkgs/top-level/python-aliases.nix+1

@@ -79,6 +79,7 @@ mapAliases ({

7979 jupyter_client = jupyter-client; # added 2021-10-15

8080 Keras = keras; # added 2021-11-25

8181 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04

82+ loo-py = loopy; # added 2022-05-03

8283 Markups = markups; # added 2022-02-14

8384 MechanicalSoup = mechanicalsoup; # added 2021-06-01

8485 net2grid = gridnet; # add 2022-04-22

pkgs/top-level/python-packages.nix+28−2

@@ -106,6 +106,7 @@ in {

106106 inherit buildSetupcfg;

107107

108108 inherit (callPackage ../development/interpreters/python/hooks { })

109+ sphinxHook

109110 condaInstallHook

110111 condaUnpackHook

111112 eggUnpackHook

@@ -2839,6 +2840,8 @@ in {

28392840

28402841 fastavro = callPackage ../development/python-modules/fastavro { };

28412842

2843+ fastbencode = callPackage ../development/python-modules/fastbencode { };

2844+

28422845 fastcache = callPackage ../development/python-modules/fastcache { };

28432846

28442847 fastcore = callPackage ../development/python-modules/fastcore { };

@@ -3139,6 +3142,14 @@ in {

31393142

31403143 fonttools = callPackage ../development/python-modules/fonttools { };

31413144

3145+ fontmake = callPackage ../development/python-modules/fontmake { };

3146+

3147+ skia-pathops = callPackage ../development/python-modules/skia-pathops { };

3148+

3149+ openstep-plist = callPackage ../development/python-modules/openstep-plist { };

3150+

3151+ glyphslib = callPackage ../development/python-modules/glyphslib { };

3152+

31423153 foobot-async = callPackage ../development/python-modules/foobot-async { };

31433154

31443155 foolscap = callPackage ../development/python-modules/foolscap { };

@@ -3255,6 +3266,10 @@ in {

32553266

32563267 gbinder-python = callPackage ../development/python-modules/gbinder-python { };

32573268

3269+ gbulb = callPackage ../development/python-modules/gbulb { };

3270+

3271+ gcal-sync = callPackage ../development/python-modules/gcal-sync { };

3272+

32583273 gcovr = callPackage ../development/python-modules/gcovr { };

32593274

32603275 gcsfs = callPackage ../development/python-modules/gcsfs { };

@@ -4135,6 +4150,8 @@ in {

41354150

41364151 installer = callPackage ../development/python-modules/installer { };

41374152

4153+ insteon-frontend-home-assistant = callPackage ../development/python-modules/insteon-frontend-home-assistant { };

4154+

41384155 intake = callPackage ../development/python-modules/intake { };

41394156

41404157 intake-parquet = callPackage ../development/python-modules/intake-parquet { };

@@ -4944,7 +4961,7 @@ in {

49444961

49454962 lomond = callPackage ../development/python-modules/lomond { };

49464963

4947− loo-py = callPackage ../development/python-modules/loo-py { };

4964+ loopy = callPackage ../development/python-modules/loopy { };

49484965

49494966 losant-rest = callPackage ../development/python-modules/losant-rest { };

49504967

@@ -5150,6 +5167,8 @@ in {

51505167

51515168 measurement = callPackage ../development/python-modules/measurement { };

51525169

5170+ meater-python = callPackage ../development/python-modules/meater-python { };

5171+

51535172 mecab-python3 = callPackage ../development/python-modules/mecab-python3 { };

51545173

51555174 mechanicalsoup = callPackage ../development/python-modules/mechanicalsoup { };

@@ -5611,6 +5630,11 @@ in {

56115630

56125631 nextcord = callPackage ../development/python-modules/nextcord { };

56135632

5633+ nftables = toPythonModule (pkgs.nftables.override {

5634+ python3 = python;

5635+ withPython = true;

5636+ });

5637+

56145638 nghttp2 = (toPythonModule (pkgs.nghttp2.override {

56155639 inherit (self) python cython setuptools;

56165640 inherit (pkgs) ncurses;

@@ -9466,7 +9490,9 @@ in {

94669490

94679491 skytemple-icons = callPackage ../development/python-modules/skytemple-icons { };

94689492

9469− skytemple-rust = callPackage ../development/python-modules/skytemple-rust { };

9493+ skytemple-rust = callPackage ../development/python-modules/skytemple-rust {

9494+ inherit (pkgs.darwin.apple_sdk.frameworks) Foundation;

9495+ };

94709496

94719497 skytemple-ssb-debugger = callPackage ../development/python-modules/skytemple-ssb-debugger { };

94729498

pkgs/top-level/release-lib.nix+1−1

@@ -103,7 +103,7 @@ rec {

103103 forAllSystems = genAttrs supportedSystems;

104104

105105

106− # Generate attributes for all sytems matching at least one of the given

106+ # Generate attributes for all systems matching at least one of the given

107107 # patterns

108108 forMatchingSystems = metaPatterns: genAttrs (supportedMatches metaPatterns);

109109