git.iko.soy/typeable/nixpkgs

on master help sign in

doc/languages-frameworks/dotnet.section.md+1−1

@@ -84,7 +84,7 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila

8484 <ProjectReference Include="../foo/bar.fsproj" />

8585 <PackageReference Include="bar" Version="*" Condition=" '$(ContinuousIntegrationBuild)'=='true' "/>

8686 ```

87−* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`.

87+* `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. This gets done in the `preFixup` phase.

8888* `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies.

8989* `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`.

9090* `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used.

lib/asserts.nix+10−12

@@ -2,35 +2,33 @@

22

33rec {

44

5− /* Print a trace message if pred is false.

5+ /* Throw if pred is false, else return pred.

66 Intended to be used to augment asserts with helpful error messages.

77

88 Example:

99 assertMsg false "nope"

10− => false

11− stderr> trace: nope

10+ stderr> error: nope

1211

13− assert (assertMsg ("foo" == "bar") "foo is not bar, silly"); ""

14− stderr> trace: foo is not bar, silly

15− stderr> assert failed at …

12+ assert assertMsg ("foo" == "bar") "foo is not bar, silly"; ""

13+ stderr> error: foo is not bar, silly

1614

1715 Type:

1816 assertMsg :: Bool -> String -> Bool

1917 */

2018 # TODO(Profpatsch): add tests that check stderr

2119 assertMsg = pred: msg:

22− if pred

23− then true

24− else builtins.trace msg false;

20+ pred || builtins.throw msg;

2521

2622 /* Specialized `assertMsg` for checking if val is one of the elements

2723 of a list. Useful for checking enums.

2824

2925 Example:

30− let sslLibrary = "libressl"

26+ let sslLibrary = "libressl";

3127 in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]

32− => false

33− stderr> trace: sslLibrary must be one of "openssl", "bearssl", but is: "libressl"

28+ stderr> error: sslLibrary must be one of [

29+ stderr> "openssl"

30+ stderr> "bearssl"

31+ stderr> ], but is: "libressl"

3432

3533 Type:

3634 assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool

maintainers/maintainer-list.nix+35−2

@@ -1950,6 +1950,12 @@

19501950 githubId = 543423;

19511951 name = "Alex Wied";

19521952 };

1953+ cfhammill = {

1954+ email = "cfhammill@gmail.com";

1955+ github = "cfhammill";

1956+ githubId = 7467038;

1957+ name = "Chris Hammill";

1958+ };

19531959 cfouche = {

19541960 email = "chaddai.fouche@gmail.com";

19551961 github = "Chaddai";

@@ -4250,6 +4256,16 @@

42504256 githubId = 1313787;

42514257 name = "Gabriel Gonzalez";

42524258 };

4259+ gador = {

4260+ email = "florian.brandes@posteo.de";

4261+ github = "gador";

4262+ githubId = 1883533;

4263+ name = "Florian Brandes";

4264+ keys = [{

4265+ longkeyid = "rsa4096/0xBBB3E40E53797FD9";

4266+ fingerprint = "0200 3EF8 8D2B CF2D 8F00 FFDC BBB3 E40E 5379 7FD9";

4267+ }];

4268+ };

42534269 gal_bolle = {

42544270 email = "florent.becker@ens-lyon.org";

42554271 github = "FlorentBecker";

@@ -4449,6 +4465,16 @@

44494465 githubId = 1621335;

44504466 name = "Andrew Trachenko";

44514467 };

4468+ gordias = {

4469+ name = "Gordias";

4470+ email = "gordias@disroot.org";

4471+ github = "NotGordias";

4472+ githubId = 94724133;

4473+ keys = [{

4474+ longkeyid = "ed25519/0x5D47284830FAA4FA";

4475+ fingerprint = "C006 B8A0 0618 F3B6 E0E4 2ECD 5D47 2848 30FA A4FA";

4476+ }];

4477+ };

44524478 govanify = {

44534479 name = "Gauvain 'GovanifY' Roussel-Tarbouriech";

44544480 email = "gauvain@govanify.com";

@@ -8498,10 +8524,10 @@

84988524 name = "Xinhao Luo";

84998525 };

85008526 newam = {

8501− email = "alexmgit@protonmail.com";

8527+ email = "alex@thinglab.org";

85028528 github = "newAM";

85038529 githubId = 7845120;

8504− name = "Alex M.";

8530+ name = "Alex Martens";

85058531 };

85068532 nikitavoloboev = {

85078533 email = "nikita.voloboev@gmail.com";

@@ -9814,6 +9840,13 @@

98149840 githubId = 1016742;

98159841 name = "Rafael García";

98169842 };

9843+ raitobezarius = {

9844+ email = "ryan@lahfa.xyz";

9845+ matrix = "@raitobezarius:matrix.org";

9846+ github = "RaitoBezarius";

9847+ githubId = 314564;

9848+ name = "Ryan Lahfa";

9849+ };

98179850 raquelgb = {

98189851 email = "raquel.garcia.bautista@gmail.com";

98199852 github = "raquelgb";

nixos/doc/manual/from_md/release-notes/rl-2205.section.xml+118−4

@@ -32,10 +32,14 @@

3232 </listitem>

3333 <listitem>

3434 <para>

35− Mattermost has been updated to version 6.2. Migrations may

36− take a while, see the

37− <link xlink:href="https://docs.mattermost.com/install/self-managed-changelog.html#release-v6.2-feature-release">upgrade

38− notes</link>.

35+ Mattermost has been updated to extended support release 6.3,

36+ as the previously packaged extended support release 5.37 is

37+ <link xlink:href="https://docs.mattermost.com/upgrade/extended-support-release.html">reaching

38+ its end of life</link>. Migrations may take a while, see the

39+ <link xlink:href="https://docs.mattermost.com/install/self-managed-changelog.html#release-v6-3-extended-support-release">changelog</link>

40+ and

41+ <link xlink:href="https://docs.mattermost.com/upgrade/important-upgrade-notes.html">important

42+ upgrade notes</link>.

3943 </para>

4044 </listitem>

4145 </itemizedlist>

@@ -165,6 +169,14 @@

165169 <link xlink:href="options.html#opt-services.timetagger.enable">services.timetagger</link>.

166170 </para>

167171 </listitem>

172+ <listitem>

173+ <para>

174+ <link xlink:href="https://www.rstudio.com/products/rstudio/#rstudio-server">rstudio-server</link>,

175+ a browser-based version of the RStudio IDE for the R

176+ programming language. Available as

177+ <link xlink:href="options.html#opt-services.rstudio-server.enable">services.rstudio-server</link>.

178+ </para>

179+ </listitem>

168180 </itemizedlist>

169181 </section>

170182 <section xml:id="sec-release-22.05-incompatibilities">

@@ -357,6 +369,57 @@

357369 <literal>~/.local/share/polymc/polymc.cfg</literal>.

358370 </para>

359371 </listitem>

372+ <listitem>

373+ <para>

374+ <literal>pkgs.noto-fonts-cjk</literal> is now deprecated in

375+ favor of <literal>pkgs.noto-fonts-cjk-sans</literal> and

376+ <literal>pkgs.noto-fonts-cjk-serif</literal> because they each

377+ have different release schedules. To maintain compatibility

378+ with prior releases of Nixpkgs,

379+ <literal>pkgs.noto-fonts-cjk</literal> is currently an alias

380+ of <literal>pkgs.noto-fonts-cjk-sans</literal> and doesn’t

381+ include serif fonts.

382+ </para>

383+ </listitem>

384+ <listitem>

385+ <para>

386+ The interface that allows activation scripts to restart units

387+ has been reworked. Restarting and reloading is now done by a

388+ single file

389+ <literal>/run/nixos/activation-restart-list</literal> that

390+ honors <literal>restartIfChanged</literal> and

391+ <literal>reloadIfChanged</literal> of the units.

392+ </para>

393+ </listitem>

394+ <listitem>

395+ <para>

396+ The <literal>services.bookstack.cacheDir</literal> option has

397+ been removed, since the cache directory is now handled by

398+ systemd.

399+ </para>

400+ </listitem>

401+ <listitem>

402+ <para>

403+ The <literal>services.bookstack.extraConfig</literal> option

404+ has been replaced by

405+ <literal>services.bookstack.config</literal> which implements

406+ a

407+ <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">settings-style</link>

408+ configuration.

409+ </para>

410+ </listitem>

411+ <listitem>

412+ <para>

413+ <literal>lib.assertMsg</literal> and

414+ <literal>lib.assertOneOf</literal> no longer return

415+ <literal>false</literal> if the passed condition is

416+ <literal>false</literal>, <literal>throw</literal>ing the

417+ given error message instead (which makes the resulting error

418+ message less cluttered). This will not impact the behaviour of

419+ code using these functions as intended, namely as top-level

420+ wrapper for <literal>assert</literal> conditions.

421+ </para>

422+ </listitem>

360423 </itemizedlist>

361424 </section>

362425 <section xml:id="sec-release-22.05-notable-changes">

@@ -500,6 +563,14 @@

500563 renamed to <literal>linux-firmware</literal>.

501564 </para>

502565 </listitem>

566+ <listitem>

567+ <para>

568+ The <literal>services.mbpfan</literal> module was converted to

569+ a

570+ <link xlink:href="https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md">RFC

571+ 0042</link> configuration.

572+ </para>

573+ </listitem>

503574 <listitem>

504575 <para>

505576 A new module was added for the

@@ -509,6 +580,49 @@

509580 <literal>programs.starship.settings</literal>.

510581 </para>

511582 </listitem>

583+ <listitem>

584+ <para>

585+ <literal>services.mattermost.plugins</literal> has been added

586+ to allow the declarative installation of Mattermost plugins.

587+ Plugins are automatically repackaged using autoPatchelf.

588+ </para>

589+ </listitem>

590+ <listitem>

591+ <para>

592+ The <literal>zrepl</literal> package has been updated from

593+ 0.4.0 to 0.5:

594+ </para>

595+ <itemizedlist spacing="compact">

596+ <listitem>

597+ <para>

598+ The RPC protocol version was bumped; all zrepl daemons in

599+ a setup must be updated and restarted before replication

600+ can resume.

601+ </para>

602+ </listitem>

603+ <listitem>

604+ <para>

605+ A bug involving encrypt-on-receive has been fixed. Read

606+ the

607+ <link xlink:href="https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder">zrepl

608+ documentation</link> and check the output of

609+ <literal>zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS</literal>

610+ on the receiver.

611+ </para>

612+ </listitem>

613+ </itemizedlist>

614+ </listitem>

615+ <listitem>

616+ <para>

617+ Renamed option

618+ <literal>services.openssh.challengeResponseAuthentication</literal>

619+ to

620+ <literal>services.openssh.kbdInteractiveAuthentication</literal>.

621+ Reason is that the old name has been deprecated upstream.

622+ Using the old option name will still work, but produce a

623+ warning.

624+ </para>

625+ </listitem>

512626 </itemizedlist>

513627 </section>

514628</section>

nixos/doc/manual/release-notes/rl-2205.section.md+42−2

@@ -13,8 +13,9 @@ In addition to numerous new and upgraded packages, this release has the followin

1313

1414- PHP 8.1 is now available

1515

16−- Mattermost has been updated to version 6.2. Migrations may take a while,

17− see the [upgrade notes](https://docs.mattermost.com/install/self-managed-changelog.html#release-v6.2-feature-release).

16+- 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).

17+ Migrations may take a while, see the [changelog](https://docs.mattermost.com/install/self-managed-changelog.html#release-v6-3-extended-support-release)

18+ and [important upgrade notes](https://docs.mattermost.com/upgrade/important-upgrade-notes.html).

1819

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

2021

@@ -50,6 +51,10 @@ In addition to numerous new and upgraded packages, this release has the followin

5051

5152- [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable).

5253

54+- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable).

55+

56+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

57+

5358## Backward Incompatibilities {#sec-release-22.05-incompatibilities}

5459

5560- `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.

@@ -111,6 +116,26 @@ In addition to numerous new and upgraded packages, this release has the followin

111116

112117- MultiMC has been replaced with the fork PolyMC due to upstream developers being hostile to 3rd party package maintainers. PolyMC removes all MultiMC branding and is aimed at providing proper 3rd party packages like the one contained in Nixpkgs. This change affects the data folder where game instances and other save and configuration files are stored. Users with existing installations should rename `~/.local/share/multimc` to `~/.local/share/polymc`. The main config file's path has also moved from `~/.local/share/multimc/multimc.cfg` to `~/.local/share/polymc/polymc.cfg`.

113118

119+- `pkgs.noto-fonts-cjk` is now deprecated in favor of `pkgs.noto-fonts-cjk-sans`

120+ and `pkgs.noto-fonts-cjk-serif` because they each have different release

121+ schedules. To maintain compatibility with prior releases of Nixpkgs,

122+ `pkgs.noto-fonts-cjk` is currently an alias of `pkgs.noto-fonts-cjk-sans` and

123+ doesn't include serif fonts.

124+

125+- The interface that allows activation scripts to restart units has been reworked. Restarting and reloading is now done by a single file `/run/nixos/activation-restart-list` that honors `restartIfChanged` and `reloadIfChanged` of the units.

126+

127+- The `services.bookstack.cacheDir` option has been removed, since the

128+ cache directory is now handled by systemd.

129+

130+- The `services.bookstack.extraConfig` option has been replaced by

131+ `services.bookstack.config` which implements a

132+ [settings-style](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)

133+ configuration.

134+

135+- `lib.assertMsg` and `lib.assertOneOf` no longer return `false` if the passed condition is `false`, `throw`ing the given error message instead (which makes the resulting error message less cluttered). This will not impact the behaviour of code using these functions as intended, namely as top-level wrapper for `assert` conditions.

136+

137+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

138+

114139## Other Notable Changes {#sec-release-22.05-notable-changes}

115140

116141- The option [services.redis.servers](#opt-services.redis.servers) was added

@@ -173,5 +198,20 @@ In addition to numerous new and upgraded packages, this release has the followin

173198

174199- The `firmwareLinuxNonfree` package has been renamed to `linux-firmware`.

175200

201+- The `services.mbpfan` module was converted to a [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) configuration.

202+

176203- A new module was added for the [Starship](https://starship.rs/) shell prompt,

177204 providing the options `programs.starship.enable` and `programs.starship.settings`.

205+

206+- `services.mattermost.plugins` has been added to allow the declarative installation of Mattermost plugins.

207+ Plugins are automatically repackaged using autoPatchelf.

208+

209+- The `zrepl` package has been updated from 0.4.0 to 0.5:

210+ * The RPC protocol version was bumped; all zrepl daemons in a setup must be updated and restarted before replication can resume.

211+ * A bug involving encrypt-on-receive has been fixed. Read the [zrepl documentation](https://zrepl.github.io/configuration/sendrecvoptions.html#job-recv-options-placeholder) and check the output of `zfs get -r encryption,zrepl:placeholder PATH_TO_ROOTFS` on the receiver.

212+

213+- Renamed option `services.openssh.challengeResponseAuthentication` to `services.openssh.kbdInteractiveAuthentication`.

214+ Reason is that the old name has been deprecated upstream.

215+ Using the old option name will still work, but produce a warning.

216+

217+<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/config/malloc.nix+9−2

@@ -22,8 +22,15 @@ let

2222 '';

2323 };

2424

25− scudo = {

26− libPath = "${pkgs.llvmPackages_latest.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so";

25+ scudo = let

26+ platformMap = {

27+ aarch64-linux = "aarch64";

28+ x86_64-linux = "x86_64";

29+ };

30+

31+ systemPlatform = platformMap.${pkgs.stdenv.hostPlatform.system} or (throw "scudo not supported on ${pkgs.stdenv.hostPlatform.system}");

32+ in {

33+ libPath = "${pkgs.llvmPackages_latest.compiler-rt}/lib/linux/libclang_rt.scudo-${systemPlatform}.so";

2734 description = ''

2835 A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator,

2936 which aims at providing additional mitigations against heap based

nixos/modules/misc/ids.nix+2

@@ -353,6 +353,7 @@ in

353353 distcc = 321;

354354 webdav = 322;

355355 pipewire = 323;

356+ rstudio-server = 324;

356357

357358 # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

358359

@@ -660,6 +661,7 @@ in

660661 distcc = 321;

661662 webdav = 322;

662663 pipewire = 323;

664+ rstudio-server = 324;

663665

664666 # When adding a gid, make sure it doesn't match an existing

665667 # uid. Users and groups with the same name should have equal

nixos/modules/module-list.nix+2

@@ -394,6 +394,7 @@

394394 ./services/development/hoogle.nix

395395 ./services/development/jupyter/default.nix

396396 ./services/development/jupyterhub/default.nix

397+ ./services/development/rstudio-server/default.nix

397398 ./services/development/lorri.nix

398399 ./services/display-managers/greetd.nix

399400 ./services/editors/emacs.nix

@@ -967,6 +968,7 @@

967968 ./services/security/vault.nix

968969 ./services/security/vaultwarden/default.nix

969970 ./services/security/yubikey-agent.nix

971+ ./services/system/cachix-agent/default.nix

970972 ./services/system/cloud-init.nix

971973 ./services/system/dbus.nix

972974 ./services/system/earlyoom.nix

nixos/modules/programs/chromium.nix+8

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

77

88 defaultProfile = filterAttrs (k: v: v != null) {

99 HomepageLocation = cfg.homepageLocation;

10+ DefaultSearchProviderEnabled = cfg.defaultSearchProviderEnabled;

1011 DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL;

1112 DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL;

1213 ExtensionInstallForcelist = cfg.extensions;

@@ -50,6 +51,13 @@ in

5051 example = "https://nixos.org";

5152 };

5253

54+ defaultSearchProviderEnabled = mkOption {

55+ type = types.nullOr types.bool;

56+ description = "Enable the default search provider.";

57+ default = null;

58+ example = true;

59+ };

60+

5361 defaultSearchProviderSearchURL = mkOption {

5462 type = types.nullOr types.str;

5563 description = "Chromium default search provider url.";

nixos/modules/programs/tsm-client.nix+4−4

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

77 inherit (lib.modules) mkDefault mkIf;

88 inherit (lib.options) literalExpression mkEnableOption mkOption;

99 inherit (lib.strings) concatStringsSep optionalString toLower;

10− inherit (lib.types) addCheck attrsOf lines nullOr package path port str strMatching submodule;

10+ inherit (lib.types) addCheck attrsOf lines nonEmptyStr nullOr package path port str strMatching submodule;

1111

1212 # Checks if given list of strings contains unique

1313 # elements when compared without considering case.

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

3535 '';

3636 };

3737 options.server = mkOption {

38− type = strMatching ".+";

38+ type = nonEmptyStr;

3939 example = "tsmserver.company.com";

4040 description = ''

4141 Host/domain name or IP address of the IBM TSM server.

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

5656 '';

5757 };

5858 options.node = mkOption {

59− type = strMatching ".+";

59+ type = nonEmptyStr;

6060 example = "MY-TSM-NODE";

6161 description = ''

6262 Target node name on the IBM TSM server.

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

144144 };

145145 config.name = mkDefault name;

146146 # Client system-options file directives are explained here:

147− # https://www.ibm.com/support/knowledgecenter/SSEQVQ_8.1.8/client/c_opt_usingopts.html

147+ # https://www.ibm.com/docs/en/spectrum-protect/8.1.13?topic=commands-processing-options

148148 config.extraConfig =

149149 mapAttrs (lib.trivial.const mkDefault) (

150150 {

nixos/modules/services/backup/borgbackup.nix+35−6

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

3030 }

3131 trap 'on_exit' INT TERM QUIT EXIT

3232

33− archiveName="${cfg.archiveBaseName}-$(date ${cfg.dateFormat})"

33+ archiveName="${if cfg.archiveBaseName == null then "" else cfg.archiveBaseName + "-"}$(date ${cfg.dateFormat})"

3434 archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}"

3535 ${cfg.preHook}

3636 '' + optionalString cfg.doInit ''

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

6060 '' + optionalString (cfg.prune.keep != { }) ''

6161 borg prune $extraArgs \

6262 ${mkKeepArgs cfg} \

63− --prefix ${escapeShellArg cfg.prune.prefix} \

63+ ${optionalString (cfg.prune.prefix != null) "--prefix ${escapeShellArg cfg.prune.prefix} \\"}

6464 $extraPruneArgs

6565 ${cfg.postPrune}

6666 '';

@@ -99,7 +99,18 @@ let

9999 BORG_REPO = cfg.repo;

100100 inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs;

101101 } // (mkPassEnv cfg) // cfg.environment;

102− inherit (cfg) startAt;

102+ };

103+

104+ mkBackupTimers = name: cfg:

105+ nameValuePair "borgbackup-job-${name}" {

106+ description = "BorgBackup job ${name} timer";

107+ wantedBy = [ "timers.target" ];

108+ timerConfig = {

109+ Persistent = cfg.persistentTimer;

110+ OnCalendar = cfg.startAt;

111+ };

112+ # if remote-backup wait for network

113+ after = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target";

103114 };

104115

105116 # utility function around makeWrapper

@@ -284,7 +295,7 @@ in {

284295 };

285296

286297 archiveBaseName = mkOption {

287− type = types.strMatching "[^/{}]+";

298+ type = types.nullOr (types.strMatching "[^/{}]+");

288299 default = "${globalConfig.networking.hostName}-${name}";

289300 defaultText = literalExpression ''"''${config.networking.hostName}-<name>"'';

290301 description = ''

@@ -292,6 +303,7 @@ in {

292303 determined by <option>dateFormat</option>, will be appended. The full

293304 name can be modified at runtime (<literal>$archiveName</literal>).

294305 Placeholders like <literal>{hostname}</literal> must not be used.

306+ Use <literal>null</literal> for no base name.

295307 '';

296308 };

297309

@@ -320,6 +332,19 @@ in {

320332 '';

321333 };

322334

335+ persistentTimer = mkOption {

336+ default = false;

337+ type = types.bool;

338+ example = true;

339+ description = literalDocBook ''

340+ Set the <literal>persistentTimer</literal> option for the

341+ <citerefentry><refentrytitle>systemd.timer</refentrytitle>

342+ <manvolnum>5</manvolnum></citerefentry>

343+ which triggers the backup immediately if the last trigger

344+ was missed (e.g. if the system was powered down).

345+ '';

346+ };

347+

323348 user = mkOption {

324349 type = types.str;

325350 description = ''

@@ -471,11 +496,11 @@ in {

471496 };

472497

473498 prune.prefix = mkOption {

474− type = types.str;

499+ type = types.nullOr (types.str);

475500 description = ''

476501 Only consider archive names starting with this prefix for pruning.

477502 By default, only archives created by this job are considered.

478− Use <literal>""</literal> to consider all archives.

503+ Use <literal>""</literal> or <literal>null</literal> to consider all archives.

479504 '';

480505 default = config.archiveBaseName;

481506 defaultText = literalExpression "archiveBaseName";

@@ -694,6 +719,10 @@ in {

694719 # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo

695720 // mapAttrs' mkRepoService repos;

696721

722+ # A job named "foo" is mapped to systemd.timers.borgbackup-job-foo

723+ # only generate the timer if interval (startAt) is set

724+ systemd.timers = mapAttrs' mkBackupTimers (filterAttrs (_: cfg: cfg.startAt != []) jobs);

725+

697726 users = mkMerge (mapAttrsToList mkUsersConfig repos);

698727

699728 environment.systemPackages = with pkgs; [ borgbackup ] ++ (mapAttrsToList mkBorgWrapper jobs);

nixos/modules/services/backup/tsm.nix+33−14

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

55 inherit (lib.attrsets) hasAttr;

66 inherit (lib.modules) mkDefault mkIf;

77 inherit (lib.options) mkEnableOption mkOption;

8− inherit (lib.types) nullOr strMatching;

8+ inherit (lib.types) nonEmptyStr nullOr;

99

1010 options.services.tsmBackup = {

1111 enable = mkEnableOption ''

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

1515 <option>programs.tsmClient.enable</option>

1616 '';

1717 command = mkOption {

18− type = strMatching ".+";

18+ type = nonEmptyStr;

1919 default = "backup";

2020 example = "incr";

2121 description = ''

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

2424 '';

2525 };

2626 servername = mkOption {

27− type = strMatching ".+";

27+ type = nonEmptyStr;

2828 example = "mainTsmServer";

2929 description = ''

3030 Create a systemd system service

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

4141 '';

4242 };

4343 autoTime = mkOption {

44− type = nullOr (strMatching ".+");

44+ type = nullOr nonEmptyStr;

4545 default = null;

4646 example = "12:00";

4747 description = ''

@@ -87,16 +87,35 @@ in

8787 environment.DSM_LOG = "/var/log/tsm-backup/";

8888 # TSM needs a HOME dir to store certificates.

8989 environment.HOME = "/var/lib/tsm-backup";

90− # for exit status description see

91− # https://www.ibm.com/support/knowledgecenter/en/SSEQVQ_8.1.8/client/c_sched_rtncode.html

92− serviceConfig.SuccessExitStatus = "4 8";

93− # The `-se` option must come after the command.

94− # The `-optfile` option suppresses a `dsm.opt`-not-found warning.

95− serviceConfig.ExecStart =

96− "${cfgPrg.wrappedPackage}/bin/dsmc ${cfg.command} -se='${cfg.servername}' -optfile=/dev/null";

97− serviceConfig.LogsDirectory = "tsm-backup";

98− serviceConfig.StateDirectory = "tsm-backup";

99− serviceConfig.StateDirectoryMode = "0750";

90+ serviceConfig = {

91+ # for exit status description see

92+ # https://www.ibm.com/docs/en/spectrum-protect/8.1.13?topic=clients-client-return-codes

93+ SuccessExitStatus = "4 8";

94+ # The `-se` option must come after the command.

95+ # The `-optfile` option suppresses a `dsm.opt`-not-found warning.

96+ ExecStart =

97+ "${cfgPrg.wrappedPackage}/bin/dsmc ${cfg.command} -se='${cfg.servername}' -optfile=/dev/null";

98+ LogsDirectory = "tsm-backup";

99+ StateDirectory = "tsm-backup";

100+ StateDirectoryMode = "0750";

101+ # systemd sandboxing

102+ LockPersonality = true;

103+ NoNewPrivileges = true;

104+ PrivateDevices = true;

105+ #PrivateTmp = true; # would break backup of {/var,}/tmp

106+ #PrivateUsers = true; # would block backup of /home/*

107+ ProtectClock = true;

108+ ProtectControlGroups = true;

109+ ProtectHome = "read-only";

110+ ProtectHostname = true;

111+ ProtectKernelLogs = true;

112+ ProtectKernelModules = true;

113+ ProtectKernelTunables = true;

114+ ProtectProc = "noaccess";

115+ ProtectSystem = "strict";

116+ RestrictNamespaces = true;

117+ RestrictSUIDSGID = true;

118+ };

100119 startAt = mkIf (cfg.autoTime!=null) cfg.autoTime;

101120 };

102121 };

nixos/modules/services/development/rstudio-server/default.nixnew file+107

@@ -0,0 +1,107 @@

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

2+

3+with lib;

4+

5+let

6+

7+ cfg = config.services.rstudio-server;

8+

9+ rserver-conf = builtins.toFile "rserver.conf" ''

10+ server-working-dir=${cfg.serverWorkingDir}

11+ www-address=${cfg.listenAddr}

12+ ${cfg.rserverExtraConfig}

13+ '';

14+

15+ rsession-conf = builtins.toFile "rsession.conf" ''

16+ ${cfg.rsessionExtraConfig}

17+ '';

18+

19+in

20+{

21+ meta.maintainers = with maintainers; [ jbedo cfhammill ];

22+

23+ options.services.rstudio-server = {

24+ enable = mkEnableOption "RStudio server";

25+

26+ serverWorkingDir = mkOption {

27+ type = types.str;

28+ default = "/var/lib/rstudio-server";

29+ description = ''

30+ Default working directory for server (server-working-dir in rserver.conf).

31+ '';

32+ };

33+

34+ listenAddr = mkOption {

35+ type = types.str;

36+ default = "127.0.0.1";

37+ description = ''

38+ Address to listen on (www-address in rserver.conf).

39+ '';

40+ };

41+

42+ package = mkOption {

43+ type = types.package;

44+ default = pkgs.rstudio-server;

45+ defaultText = literalExpression "pkgs.rstudio-server";

46+ example = literalExpression "pkgs.rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; }";

47+ description = ''

48+ Rstudio server package to use. Can be set to rstudioServerWrapper to provide packages.

49+ '';

50+ };

51+

52+ rserverExtraConfig = mkOption {

53+ type = types.str;

54+ default = "";

55+ description = ''

56+ Extra contents for rserver.conf.

57+ '';

58+ };

59+

60+ rsessionExtraConfig = mkOption {

61+ type = types.str;

62+ default = "";

63+ description = ''

64+ Extra contents for resssion.conf.

65+ '';

66+ };

67+

68+ };

69+

70+ config = mkIf cfg.enable

71+ {

72+ systemd.services.rstudio-server = {

73+ description = "Rstudio server";

74+

75+ after = [ "network.target" ];

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

77+ restartTriggers = [ rserver-conf rsession-conf ];

78+

79+ serviceConfig = {

80+ Restart = "on-failure";

81+ Type = "forking";

82+ ExecStart = "${cfg.package}/bin/rserver";

83+ StateDirectory = "rstudio-server";

84+ RuntimeDirectory = "rstudio-server";

85+ };

86+ };

87+

88+ environment.etc = {

89+ "rstudio/rserver.conf".source = rserver-conf;

90+ "rstudio/rsession.conf".source = rsession-conf;

91+ "pam.d/rstudio".source = "/etc/pam.d/login";

92+ };

93+ environment.systemPackages = [ cfg.package ];

94+

95+ users = {

96+ users.rstudio-server = {

97+ uid = config.ids.uids.rstudio-server;

98+ description = "rstudio-server";

99+ group = "rstudio-server";

100+ };

101+ groups.rstudio-server = {

102+ gid = config.ids.gids.rstudio-server;

103+ };

104+ };

105+

106+ };

107+}

nixos/modules/services/misc/ananicy.nix+1−1

@@ -84,7 +84,7 @@ in

8484 } // (if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then {

8585 # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/blob/master/src/config.cpp#L12

8686 loglevel = mkOD "warn"; # default is info but its spammy

87− cgroup_realtime_workaround = mkOD true;

87+ cgroup_realtime_workaround = mkOD config.systemd.enableUnifiedCgroupHierarchy;

8888 } else {

8989 # https://github.com/Nefelim4ag/Ananicy/blob/master/ananicy.d/ananicy.conf

9090 check_disks_schedulers = mkOD true;

nixos/modules/services/misc/bees.nix+3

@@ -21,6 +21,8 @@ let

2121 <para>

2222 This must be in a format usable by findmnt; that could be a key=value

2323 pair, or a bare path to a mount point.

24+ Using bare paths will allow systemd to start the beesd service only

25+ after mounting the associated path.

2426 '';

2527 example = "LABEL=MyBulkDataDrive";

2628 };

@@ -122,6 +124,7 @@ in

122124 StartupIOWeight = 25;

123125 SyslogIdentifier = "beesd"; # would otherwise be "bees-service-wrapper"

124126 };

127+ unitConfig.RequiresMountsFor = lib.mkIf (lib.hasPrefix "/" fs.spec) fs.spec;

125128 wantedBy = [ "multi-user.target" ];

126129 })

127130 cfg.filesystems;

nixos/modules/services/misc/heisenbridge.nix+26−12

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

2323in

2424{

2525 options.services.heisenbridge = {

26− enable = mkEnableOption "A bouncer-style Matrix IRC bridge";

26+ enable = mkEnableOption "the Matrix to IRC bridge";

2727

2828 package = mkOption {

2929 type = types.package;

@@ -172,25 +172,39 @@ in

172172 ++ (map (lib.escapeShellArg) cfg.extraArgs)

173173 );

174174

175− ProtectHome = true;

176− PrivateDevices = true;

177− ProtectKernelTunables = true;

178− ProtectKernelModules = true;

179− ProtectControlGroups = true;

180− StateDirectory = "heisenbridge";

181− StateDirectoryMode = "755";

175+ # Hardening options

182176

183177 User = "heisenbridge";

184178 Group = "heisenbridge";

179+ RuntimeDirectory = "heisenbridge";

180+ RuntimeDirectoryMode = "0700";

181+ StateDirectory = "heisenbridge";

182+ StateDirectoryMode = "0755";

185183

186− CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024 || cfg.identd.port < 1024) "CAP_NET_BIND_SERVICE";

184+ ProtectSystem = "strict";

185+ ProtectHome = true;

186+ PrivateTmp = true;

187+ PrivateDevices = true;

188+ ProtectKernelTunables = true;

189+ ProtectControlGroups = true;

190+ RestrictSUIDSGID = true;

191+ PrivateMounts = true;

192+ ProtectKernelModules = true;

193+ ProtectKernelLogs = true;

194+ ProtectHostname = true;

195+ ProtectClock = true;

196+ ProtectProc = "invisible";

197+ ProcSubset = "pid";

198+ RestrictNamespaces = true;

199+ RemoveIPC = true;

200+ UMask = "0077";

201+

202+ CapabilityBoundingSet = [ "CAP_CHOWN" ] ++ optional (cfg.port < 1024 || (cfg.identd.enable && cfg.identd.port < 1024)) "CAP_NET_BIND_SERVICE";

187203 AmbientCapabilities = CapabilityBoundingSet;

188204 NoNewPrivileges = true;

189−

190205 LockPersonality = true;

191206 RestrictRealtime = true;

192− PrivateMounts = true;

193− SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap";

207+ SystemCallFilter = ["@system-service" "~@priviledged" "@chown"];

194208 SystemCallArchitectures = "native";

195209 RestrictAddressFamilies = "AF_INET AF_INET6";

196210 };

nixos/modules/services/misc/mbpfan.nix+52−60

@@ -5,6 +5,8 @@ with lib;

55let

66 cfg = config.services.mbpfan;

77 verbose = if cfg.verbose then "v" else "";

8+ settingsFormat = pkgs.formats.ini {};

9+ settingsFile = settingsFormat.generate "config.conf" cfg.settings;

810

911in {

1012 options.services.mbpfan = {

@@ -19,54 +21,6 @@ in {

1921 '';

2022 };

2123

22− minFanSpeed = mkOption {

23− type = types.int;

24− default = 2000;

25− description = ''

26− The minimum fan speed.

27− '';

28− };

29−

30− maxFanSpeed = mkOption {

31− type = types.int;

32− default = 6200;

33− description = ''

34− The maximum fan speed.

35− '';

36− };

37−

38− lowTemp = mkOption {

39− type = types.int;

40− default = 63;

41− description = ''

42− The low temperature.

43− '';

44− };

45−

46− highTemp = mkOption {

47− type = types.int;

48− default = 66;

49− description = ''

50− The high temperature.

51− '';

52− };

53−

54− maxTemp = mkOption {

55− type = types.int;

56− default = 86;

57− description = ''

58− The maximum temperature.

59− '';

60− };

61−

62− pollingInterval = mkOption {

63− type = types.int;

64− default = 7;

65− description = ''

66− The polling interval.

67− '';

68− };

69−

7024 verbose = mkOption {

7125 type = types.bool;

7226 default = false;

@@ -74,23 +28,61 @@ in {

7428 If true, sets the log level to verbose.

7529 '';

7630 };

31+

32+ settings = mkOption {

33+ default = {};

34+ description = "The INI configuration for Mbpfan.";

35+ type = types.submodule {

36+ freeformType = settingsFormat.type;

37+

38+ options.general.min_fan1_speed = mkOption {

39+ type = types.int;

40+ default = 2000;

41+ description = "The minimum fan speed.";

42+ };

43+ options.general.max_fan1_speed = mkOption {

44+ type = types.int;

45+ default = 6199;

46+ description = "The maximum fan speed.";

47+ };

48+ options.general.low_temp = mkOption {

49+ type = types.int;

50+ default = 55;

51+ description = "The low temperature.";

52+ };

53+ options.general.high_temp = mkOption {

54+ type = types.int;

55+ default = 58;

56+ description = "The high temperature.";

57+ };

58+ options.general.max_temp = mkOption {

59+ type = types.int;

60+ default = 86;

61+ description = "The maximum temperature.";

62+ };

63+ options.general.polling_interval = mkOption {

64+ type = types.int;

65+ default = 1;

66+ description = "The polling interval.";

67+ };

68+ };

69+ };

7770 };

7871

72+ imports = [

73+ (mkRenamedOptionModule [ "services" "mbpfan" "pollingInterval" ] [ "services" "mbpfan" "settings" "general" "polling_interval" ])

74+ (mkRenamedOptionModule [ "services" "mbpfan" "maxTemp" ] [ "services" "mbpfan" "settings" "general" "max_temp" ])

75+ (mkRenamedOptionModule [ "services" "mbpfan" "lowTemp" ] [ "services" "mbpfan" "settings" "general" "low_temp" ])

76+ (mkRenamedOptionModule [ "services" "mbpfan" "highTemp" ] [ "services" "mbpfan" "settings" "general" "high_temp" ])

77+ (mkRenamedOptionModule [ "services" "mbpfan" "minFanSpeed" ] [ "services" "mbpfan" "settings" "general" "min_fan1_speed" ])

78+ (mkRenamedOptionModule [ "services" "mbpfan" "maxFanSpeed" ] [ "services" "mbpfan" "settings" "general" "max_fan1_speed" ])

79+ ];

80+

7981 config = mkIf cfg.enable {

8082 boot.kernelModules = [ "coretemp" "applesmc" ];

8183

82− environment = {

83− etc."mbpfan.conf".text = ''

84− [general]

85− min_fan_speed = ${toString cfg.minFanSpeed}

86− max_fan_speed = ${toString cfg.maxFanSpeed}

87− low_temp = ${toString cfg.lowTemp}

88− high_temp = ${toString cfg.highTemp}

89− max_temp = ${toString cfg.maxTemp}

90− polling_interval = ${toString cfg.pollingInterval}

91− '';

92− systemPackages = [ cfg.package ];

93− };

84+ environment.etc."mbpfan.conf".source = settingsFile;

85+ environment.systemPackages = [ cfg.package ];

9486

9587 systemd.services.mbpfan = {

9688 description = "A fan manager daemon for MacBook Pro";

nixos/modules/services/networking/adguardhome.nix+17−1

@@ -87,6 +87,22 @@ in {

8787 };

8888

8989 config = mkIf cfg.enable {

90+ assertions = [

91+ {

92+ assertion = cfg.settings != { }

93+ -> (hasAttrByPath [ "dns" "bind_host" ] cfg.settings)

94+ || (hasAttrByPath [ "dns" "bind_hosts" ] cfg.settings);

95+ message =

96+ "AdGuard setting dns.bind_host or dns.bind_hosts needs to be configured for a minimal working configuration";

97+ }

98+ {

99+ assertion = cfg.settings != { }

100+ -> hasAttrByPath [ "dns" "bootstrap_dns" ] cfg.settings;

101+ message =

102+ "AdGuard setting dns.bootstrap_dns needs to be configured for a minimal working configuration";

103+ }

104+ ];

105+

90106 systemd.services.adguardhome = {

91107 description = "AdGuard Home: Network-level blocker";

92108 after = [ "network.target" ];

@@ -96,7 +112,7 @@ in {

96112 StartLimitBurst = 10;

97113 };

98114

99− preStart = ''

115+ preStart = optionalString (cfg.settings != { }) ''

100116 if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \

101117 && [ "${toString cfg.mutableSettings}" = "1" ]; then

102118 # Writing directly to AdGuardHome.yaml results in empty file

nixos/modules/services/networking/ddclient.nix+2−2

@@ -29,9 +29,9 @@ let

2929 configFile = if (cfg.configFile != null) then cfg.configFile else configFile';

3030

3131 preStart = ''

32− install --owner ddclient -m600 ${configFile} /run/${RuntimeDirectory}/ddclient.conf

32+ install ${configFile} /run/${RuntimeDirectory}/ddclient.conf

3333 ${lib.optionalString (cfg.configFile == null) (if (cfg.protocol == "nsupdate") then ''

34− install --owner ddclient -m600 ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key

34+ install ${cfg.passwordFile} /run/${RuntimeDirectory}/ddclient.key

3535 '' else if (cfg.passwordFile != null) then ''

3636 password=$(printf "%q" "$(head -n 1 "${cfg.passwordFile}")")

3737 sed -i "s|^password=$|password=$password|" /run/${RuntimeDirectory}/ddclient.conf

nixos/modules/services/networking/mosquitto.nix+1−1

@@ -556,7 +556,7 @@ in

556556 systemd.services.mosquitto = {

557557 description = "Mosquitto MQTT Broker Daemon";

558558 wantedBy = [ "multi-user.target" ];

559− after = [ "network.target" ];

559+ after = [ "network-online.target" ];

560560 serviceConfig = {

561561 Type = "notify";

562562 NotifyAccess = "main";

nixos/modules/services/networking/nix-serve.nix+10

@@ -26,6 +26,12 @@ in

2626 '';

2727 };

2828

29+ openFirewall = mkOption {

30+ type = types.bool;

31+ default = false;

32+ description = "Open ports in the firewall for nix-serve.";

33+ };

34+

2935 secretKeyFile = mkOption {

3036 type = types.nullOr types.str;

3137 default = null;

@@ -77,5 +83,9 @@ in

7783 "NIX_SECRET_KEY_FILE:${cfg.secretKeyFile}";

7884 };

7985 };

86+

87+ networking.firewall = mkIf cfg.openFirewall {

88+ allowedTCPPorts = [ cfg.port ];

89+ };

8090 };

8191}

nixos/modules/services/networking/ssh/sshd.nix+4−3

@@ -81,6 +81,7 @@ in

8181 imports = [

8282 (mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])

8383 (mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])

84+ (mkRenamedOptionModule [ "services" "openssh" "challengeResponseAuthentication" ] [ "services" "openssh" "kbdInteractiveAuthentication" ])

8485 ];

8586

8687 ###### interface

@@ -218,11 +219,11 @@ in

218219 '';

219220 };

220221

221− challengeResponseAuthentication = mkOption {

222+ kbdInteractiveAuthentication = mkOption {

222223 type = types.bool;

223224 default = true;

224225 description = ''

225− Specifies whether challenge/response authentication is allowed.

226+ Specifies whether keyboard-interactive authentication is allowed.

226227 '';

227228 };

228229

@@ -534,7 +535,7 @@ in

534535 PermitRootLogin ${cfg.permitRootLogin}

535536 GatewayPorts ${cfg.gatewayPorts}

536537 PasswordAuthentication ${if cfg.passwordAuthentication then "yes" else "no"}

537− ChallengeResponseAuthentication ${if cfg.challengeResponseAuthentication then "yes" else "no"}

538+ KbdInteractiveAuthentication ${if cfg.kbdInteractiveAuthentication then "yes" else "no"}

538539

539540 PrintMotd no # handled by pam_motd

540541

nixos/modules/services/networking/syncthing.nix+2−2

@@ -468,7 +468,7 @@ in {

468468 default = false;

469469 example = true;

470470 description = ''

471− Whether to open the default ports in the firewall: TCP 22000 for transfers

471+ Whether to open the default ports in the firewall: TCP/UDP 22000 for transfers

472472 and UDP 21027 for discovery.

473473

474474 If multiple users are running Syncthing on this machine, you will need

@@ -504,7 +504,7 @@ in {

504504

505505 networking.firewall = mkIf cfg.openDefaultPorts {

506506 allowedTCPPorts = [ 22000 ];

507− allowedUDPPorts = [ 21027 ];

507+ allowedUDPPorts = [ 21027 22000 ];

508508 };

509509

510510 systemd.packages = [ pkgs.syncthing ];

nixos/modules/services/system/cachix-agent/default.nixnew file+57

@@ -0,0 +1,57 @@

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

2+

3+with lib;

4+

5+let

6+ cfg = config.services.cachix-agent;

7+in {

8+ meta.maintainers = [ lib.maintainers.domenkozar ];

9+

10+ options.services.cachix-agent = {

11+ enable = mkEnableOption "Cachix Deploy Agent: https://docs.cachix.org/deploy/";

12+

13+ name = mkOption {

14+ type = types.str;

15+ description = "Agent name, usually same as the hostname";

16+ default = config.networking.hostName;

17+ defaultText = "config.networking.hostName";

18+ };

19+

20+ profile = mkOption {

21+ type = types.nullOr types.str;

22+ default = null;

23+ description = "Profile name, defaults to 'system' (NixOS).";

24+ };

25+

26+ package = mkOption {

27+ type = types.package;

28+ default = pkgs.cachix;

29+ defaultText = literalExpression "pkgs.cachix";

30+ description = "Cachix Client package to use.";

31+ };

32+

33+ credentialsFile = mkOption {

34+ type = types.path;

35+ default = "/etc/cachix-agent.token";

36+ description = ''

37+ Required file that needs to contain CACHIX_AGENT_TOKEN=...

38+ '';

39+ };

40+ };

41+

42+ config = mkIf cfg.enable {

43+ systemd.services.cachix-agent = {

44+ description = "Cachix Deploy Agent";

45+ after = ["network-online.target"];

46+ path = [ config.nix.package ];

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

48+ # don't restart while changing

49+ reloadIfChanged = true;

50+ serviceConfig = {

51+ Restart = "on-failure";

52+ EnvironmentFile = cfg.credentialsFile;

53+ ExecStart = "${cfg.package}/bin/cachix deploy agent ${cfg.name} ${if cfg.profile != null then profile else ""}";

54+ };

55+ };

56+ };

57+}

nixos/modules/services/web-apps/bookstack.nix+142−60

@@ -24,8 +24,14 @@ let

2424 $sudo ${pkgs.php}/bin/php artisan $*

2525 '';

2626

27+ tlsEnabled = cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME;

2728

2829in {

30+ imports = [

31+ (mkRemovedOptionModule [ "services" "bookstack" "extraConfig" ] "Use services.bookstack.config instead.")

32+ (mkRemovedOptionModule [ "services" "bookstack" "cacheDir" ] "The cache directory is now handled automatically.")

33+ ];

34+

2935 options.services.bookstack = {

3036

3137 enable = mkEnableOption "BookStack";

@@ -44,28 +50,38 @@ in {

4450

4551 appKeyFile = mkOption {

4652 description = ''

47− A file containing the AppKey.

48− Used for encryption where needed. Can be generated with <code>head -c 32 /dev/urandom| base64</code> and must be prefixed with <literal>base64:</literal>.

53+ A file containing the Laravel APP_KEY - a 32 character long,

54+ base64 encoded key used for encryption where needed. Can be

55+ generated with <code>head -c 32 /dev/urandom | base64</code>.

4956 '';

5057 example = "/run/keys/bookstack-appkey";

5158 type = types.path;

5259 };

5360

61+ hostname = lib.mkOption {

62+ type = lib.types.str;

63+ default = if config.networking.domain != null then

64+ config.networking.fqdn

65+ else

66+ config.networking.hostName;

67+ defaultText = lib.literalExpression "config.networking.fqdn";

68+ example = "bookstack.example.com";

69+ description = ''

70+ The hostname to serve BookStack on.

71+ '';

72+ };

73+

5474 appURL = mkOption {

5575 description = ''

5676 The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value.

5777 If you change this in the future you may need to run a command to update stored URLs in the database. Command example: <code>php artisan bookstack:update-url https://old.example.com https://new.example.com</code>

5878 '';

79+ default = "http${lib.optionalString tlsEnabled "s"}://${cfg.hostname}";

80+ defaultText = ''http''${lib.optionalString tlsEnabled "s"}://''${cfg.hostname}'';

5981 example = "https://example.com";

6082 type = types.str;

6183 };

6284

63− cacheDir = mkOption {

64− description = "BookStack cache directory";

65− default = "/var/cache/bookstack";

66− type = types.path;

67− };

68−

6985 dataDir = mkOption {

7086 description = "BookStack data directory";

7187 default = "/var/lib/bookstack";

@@ -202,16 +218,59 @@ in {

202218 '';

203219 };

204220

205− extraConfig = mkOption {

206− type = types.nullOr types.lines;

207− default = null;

208− example = ''

209− ALLOWED_IFRAME_HOSTS="https://example.com"

210− WKHTMLTOPDF=/home/user/bins/wkhtmltopdf

221+ config = mkOption {

222+ type = with types;

223+ attrsOf

224+ (nullOr

225+ (either

226+ (oneOf [

227+ bool

228+ int

229+ port

230+ path

231+ str

232+ ])

233+ (submodule {

234+ options = {

235+ _secret = mkOption {

236+ type = nullOr str;

237+ description = ''

238+ The path to a file containing the value the

239+ option should be set to in the final

240+ configuration file.

241+ '';

242+ };

243+ };

244+ })));

245+ default = {};

246+ example = literalExpression ''

247+ {

248+ ALLOWED_IFRAME_HOSTS = "https://example.com";

249+ WKHTMLTOPDF = "/home/user/bins/wkhtmltopdf";

250+ AUTH_METHOD = "oidc";

251+ OIDC_NAME = "MyLogin";

252+ OIDC_DISPLAY_NAME_CLAIMS = "name";

253+ OIDC_CLIENT_ID = "bookstack";

254+ OIDC_CLIENT_SECRET = {_secret = "/run/keys/oidc_secret"};

255+ OIDC_ISSUER = "https://keycloak.example.com/auth/realms/My%20Realm";

256+ OIDC_ISSUER_DISCOVER = true;

257+ }

211258 '';

212259 description = ''

213− Lines to be appended verbatim to the BookStack configuration.

214− Refer to <link xlink:href="https://www.bookstackapp.com/docs/"/> for details on supported values.

260+ BookStack configuration options to set in the

261+ <filename>.env</filename> file.

262+

263+ Refer to <link xlink:href="https://www.bookstackapp.com/docs/"/>

264+ for details on supported values.

265+

266+ Settings containing secret data should be set to an attribute

267+ set containing the attribute <literal>_secret</literal> - a

268+ string pointing to a file containing the value the option

269+ should be set to. See the example to get a better picture of

270+ this: in the resulting <filename>.env</filename> file, the

271+ <literal>OIDC_CLIENT_SECRET</literal> key will be set to the

272+ contents of the <filename>/run/keys/oidc_secret</filename>

273+ file.

215274 '';

216275 };

217276

@@ -228,6 +287,30 @@ in {

228287 }

229288 ];

230289

290+ services.bookstack.config = {

291+ APP_KEY._secret = cfg.appKeyFile;

292+ APP_URL = cfg.appURL;

293+ DB_HOST = db.host;

294+ DB_PORT = db.port;

295+ DB_DATABASE = db.name;

296+ DB_USERNAME = db.user;

297+ MAIL_DRIVER = mail.driver;

298+ MAIL_FROM_NAME = mail.fromName;

299+ MAIL_FROM = mail.from;

300+ MAIL_HOST = mail.host;

301+ MAIL_PORT = mail.port;

302+ MAIL_USERNAME = mail.user;

303+ MAIL_ENCRYPTION = mail.encryption;

304+ DB_PASSWORD._secret = db.passwordFile;

305+ MAIL_PASSWORD._secret = mail.passwordFile;

306+ APP_SERVICES_CACHE = "/run/bookstack/cache/services.php";

307+ APP_PACKAGES_CACHE = "/run/bookstack/cache/packages.php";

308+ APP_CONFIG_CACHE = "/run/bookstack/cache/config.php";

309+ APP_ROUTES_CACHE = "/run/bookstack/cache/routes-v7.php";

310+ APP_EVENTS_CACHE = "/run/bookstack/cache/events.php";

311+ SESSION_SECURE_COOKIE = tlsEnabled;

312+ };

313+

231314 environment.systemPackages = [ artisan ];

232315

233316 services.mysql = mkIf db.createLocally {

@@ -258,24 +341,19 @@ in {

258341

259342 services.nginx = {

260343 enable = mkDefault true;

261− virtualHosts.bookstack = mkMerge [ cfg.nginx {

344+ recommendedTlsSettings = true;

345+ recommendedOptimisation = true;

346+ recommendedGzipSettings = true;

347+ virtualHosts.${cfg.hostname} = mkMerge [ cfg.nginx {

262348 root = mkForce "${bookstack}/public";

263− extraConfig = optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;";

264349 locations = {

265350 "/" = {

266351 index = "index.php";

267− extraConfig = ''try_files $uri $uri/ /index.php?$query_string;'';

268− };

269− "~ \.php$" = {

270− extraConfig = ''

271− try_files $uri $uri/ /index.php?$query_string;

272− include ${pkgs.nginx}/conf/fastcgi_params;

273− fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

274− fastcgi_param REDIRECT_STATUS 200;

275− fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket};

276− ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"}

277− '';

352+ tryFiles = "$uri $uri/ /index.php?$query_string";

278353 };

354+ "~ \.php$".extraConfig = ''

355+ fastcgi_pass unix:${config.services.phpfpm.pools."bookstack".socket};

356+ '';

279357 "~ \.(js|css|gif|png|ico|jpg|jpeg)$" = {

280358 extraConfig = "expires 365d;";

281359 };

@@ -290,50 +368,54 @@ in {

290368 wantedBy = [ "multi-user.target" ];

291369 serviceConfig = {

292370 Type = "oneshot";

371+ RemainAfterExit = true;

293372 User = user;

294373 WorkingDirectory = "${bookstack}";

374+ RuntimeDirectory = "bookstack/cache";

375+ RuntimeDirectoryMode = 0700;

295376 };

296− script = ''

377+ path = [ pkgs.replace-secret ];

378+ script =

379+ let

380+ isSecret = v: isAttrs v && v ? _secret && isString v._secret;

381+ bookstackEnvVars = lib.generators.toKeyValue {

382+ mkKeyValue = lib.flip lib.generators.mkKeyValueDefault "=" {

383+ mkValueString = v: with builtins;

384+ if isInt v then toString v

385+ else if isString v then v

386+ else if true == v then "true"

387+ else if false == v then "false"

388+ else if isSecret v then v._secret

389+ else throw "unsupported type ${typeOf v}: ${(lib.generators.toPretty {}) v}";

390+ };

391+ };

392+ secretPaths = lib.mapAttrsToList (_: v: v._secret) (lib.filterAttrs (_: isSecret) cfg.config);

393+ mkSecretReplacement = file: ''

394+ replace-secret ${escapeShellArgs [ file file "${cfg.dataDir}/.env" ]}

395+ '';

396+ secretReplacements = lib.concatMapStrings mkSecretReplacement secretPaths;

397+ filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! elem v [ {} null ])) cfg.config;

398+ bookstackEnv = pkgs.writeText "bookstack.env" (bookstackEnvVars filteredConfig);

399+ in ''

400+ # error handling

401+ set -euo pipefail

402+

297403 # set permissions

298404 umask 077

405+

299406 # create .env file

300− echo "

301− APP_KEY=base64:$(head -n1 ${cfg.appKeyFile})

302− APP_URL=${cfg.appURL}

303− DB_HOST=${db.host}

304− DB_PORT=${toString db.port}

305− DB_DATABASE=${db.name}

306− DB_USERNAME=${db.user}

307− MAIL_DRIVER=${mail.driver}

308− MAIL_FROM_NAME=\"${mail.fromName}\"

309− MAIL_FROM=${mail.from}

310− MAIL_HOST=${mail.host}

311− MAIL_PORT=${toString mail.port}

312− ${optionalString (mail.user != null) "MAIL_USERNAME=${mail.user};"}

313− ${optionalString (mail.encryption != null) "MAIL_ENCRYPTION=${mail.encryption};"}

314− ${optionalString (db.passwordFile != null) "DB_PASSWORD=$(head -n1 ${db.passwordFile})"}

315− ${optionalString (mail.passwordFile != null) "MAIL_PASSWORD=$(head -n1 ${mail.passwordFile})"}

316− APP_SERVICES_CACHE=${cfg.cacheDir}/services.php

317− APP_PACKAGES_CACHE=${cfg.cacheDir}/packages.php

318− APP_CONFIG_CACHE=${cfg.cacheDir}/config.php

319− APP_ROUTES_CACHE=${cfg.cacheDir}/routes-v7.php

320− APP_EVENTS_CACHE=${cfg.cacheDir}/events.php

321− ${optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "SESSION_SECURE_COOKIE=true"}

322− ${toString cfg.extraConfig}

323− " > "${cfg.dataDir}/.env"

407+ install -T -m 0600 -o ${user} ${bookstackEnv} "${cfg.dataDir}/.env"

408+ ${secretReplacements}

409+ if ! grep 'APP_KEY=base64:' "${cfg.dataDir}/.env" >/dev/null; then

410+ sed -i 's/APP_KEY=/APP_KEY=base64:/' "${cfg.dataDir}/.env"

411+ fi

324412

325413 # migrate db

326414 ${pkgs.php}/bin/php artisan migrate --force

327−

328− # clear & create caches (needed in case of update)

329− ${pkgs.php}/bin/php artisan cache:clear

330− ${pkgs.php}/bin/php artisan config:clear

331− ${pkgs.php}/bin/php artisan view:clear

332415 '';

333416 };

334417

335418 systemd.tmpfiles.rules = [

336− "d ${cfg.cacheDir} 0700 ${user} ${group} - -"

337419 "d ${cfg.dataDir} 0710 ${user} ${group} - -"

338420 "d ${cfg.dataDir}/public 0750 ${user} ${group} - -"

339421 "d ${cfg.dataDir}/public/uploads 0750 ${user} ${group} - -"

nixos/modules/services/web-apps/keycloak.nix+476−399

@@ -3,280 +3,311 @@

33let

44 cfg = config.services.keycloak;

55 opt = options.services.keycloak;

6−in

7−{

8− options.services.keycloak = {

9−

10− enable = lib.mkOption {

11− type = lib.types.bool;

12− default = false;

13− example = true;

14− description = ''

15− Whether to enable the Keycloak identity and access management

16− server.

17− '';

18− };

196

20− bindAddress = lib.mkOption {

21− type = lib.types.str;

22− default = "\${jboss.bind.address:0.0.0.0}";

23− example = "127.0.0.1";

24− description = ''

25− On which address Keycloak should accept new connections.

7+ inherit (lib) types mkOption concatStringsSep mapAttrsToList

8+ escapeShellArg recursiveUpdate optionalAttrs boolToString mkOrder

9+ sort filterAttrs concatMapStringsSep concatStrings mkIf

10+ optionalString optionals mkDefault literalExpression hasSuffix

11+ foldl' isAttrs filter attrNames elem literalDocBook

12+ maintainers;

2613

27− A special syntax can be used to allow command line Java system

28− properties to override the value: ''${property.name:value}

29− '';

30− };

31−

32− httpPort = lib.mkOption {

33− type = lib.types.str;

34− default = "\${jboss.http.port:80}";

35− example = "8080";

36− description = ''

37− On which port Keycloak should listen for new HTTP connections.

14+ inherit (builtins) match typeOf;

15+in

16+{

17+ options.services.keycloak =

18+ let

19+ inherit (types) bool str nullOr attrsOf path enum anything

20+ package port;

21+ in

22+ {

23+ enable = mkOption {

24+ type = bool;

25+ default = false;

26+ example = true;

27+ description = ''

28+ Whether to enable the Keycloak identity and access management

29+ server.

30+ '';

31+ };

3832

39− A special syntax can be used to allow command line Java system

40− properties to override the value: ''${property.name:value}

41− '';

42− };

33+ bindAddress = mkOption {

34+ type = str;

35+ default = "\${jboss.bind.address:0.0.0.0}";

36+ example = "127.0.0.1";

37+ description = ''

38+ On which address Keycloak should accept new connections.

4339

44− httpsPort = lib.mkOption {

45− type = lib.types.str;

46− default = "\${jboss.https.port:443}";

47− example = "8443";

48− description = ''

49− On which port Keycloak should listen for new HTTPS connections.

40+ A special syntax can be used to allow command line Java system

41+ properties to override the value: ''${property.name:value}

42+ '';

43+ };

5044

51− A special syntax can be used to allow command line Java system

52− properties to override the value: ''${property.name:value}

53− '';

54− };

45+ httpPort = mkOption {

46+ type = str;

47+ default = "\${jboss.http.port:80}";

48+ example = "8080";

49+ description = ''

50+ On which port Keycloak should listen for new HTTP connections.

5551

56− frontendUrl = lib.mkOption {

57− type = lib.types.str;

58− apply = x: if lib.hasSuffix "/" x then x else x + "/";

59− example = "keycloak.example.com/auth";

60− description = ''

61− The public URL used as base for all frontend requests. Should

62− normally include a trailing <literal>/auth</literal>.

63−

64− See <link xlink:href="https://www.keycloak.org/docs/latest/server_installation/#_hostname">the

65− Hostname section of the Keycloak server installation

66− manual</link> for more information.

67− '';

68− };

52+ A special syntax can be used to allow command line Java system

53+ properties to override the value: ''${property.name:value}

54+ '';

55+ };

6956

70− forceBackendUrlToFrontendUrl = lib.mkOption {

71− type = lib.types.bool;

72− default = false;

73− example = true;

74− description = ''

75− Whether Keycloak should force all requests to go through the

76− frontend URL configured in <xref

77− linkend="opt-services.keycloak.frontendUrl" />. By default,

78− Keycloak allows backend requests to instead use its local

79− hostname or IP address and may also advertise it to clients

80− through its OpenID Connect Discovery endpoint.

81−

82− See <link

83− xlink:href="https://www.keycloak.org/docs/latest/server_installation/#_hostname">the

84− Hostname section of the Keycloak server installation

85− manual</link> for more information.

86− '';

87− };

57+ httpsPort = mkOption {

58+ type = str;

59+ default = "\${jboss.https.port:443}";

60+ example = "8443";

61+ description = ''

62+ On which port Keycloak should listen for new HTTPS connections.

8863

89− sslCertificate = lib.mkOption {

90− type = lib.types.nullOr lib.types.path;

91− default = null;

92− example = "/run/keys/ssl_cert";

93− description = ''

94− The path to a PEM formatted certificate to use for TLS/SSL

95− connections.

64+ A special syntax can be used to allow command line Java system

65+ properties to override the value: ''${property.name:value}

66+ '';

67+ };

9668

97− This should be a string, not a Nix path, since Nix paths are

98− copied into the world-readable Nix store.

99− '';

100− };

69+ frontendUrl = mkOption {

70+ type = str;

71+ apply = x:

72+ if x == "" || hasSuffix "/" x then

73+ x

74+ else

75+ x + "/";

76+ example = "keycloak.example.com/auth";

77+ description = ''

78+ The public URL used as base for all frontend requests. Should

79+ normally include a trailing <literal>/auth</literal>.

10180

102− sslCertificateKey = lib.mkOption {

103− type = lib.types.nullOr lib.types.path;

104− default = null;

105− example = "/run/keys/ssl_key";

106− description = ''

107− The path to a PEM formatted private key to use for TLS/SSL

108− connections.

81+ See <link xlink:href="https://www.keycloak.org/docs/latest/server_installation/#_hostname">the

82+ Hostname section of the Keycloak server installation

83+ manual</link> for more information.

84+ '';

85+ };

10986

110− This should be a string, not a Nix path, since Nix paths are

111− copied into the world-readable Nix store.

112− '';

113− };

87+ forceBackendUrlToFrontendUrl = mkOption {

88+ type = bool;

89+ default = false;

90+ example = true;

91+ description = ''

92+ Whether Keycloak should force all requests to go through the

93+ frontend URL configured in <xref

94+ linkend="opt-services.keycloak.frontendUrl" />. By default,

95+ Keycloak allows backend requests to instead use its local

96+ hostname or IP address and may also advertise it to clients

97+ through its OpenID Connect Discovery endpoint.

98+

99+ See <link

100+ xlink:href="https://www.keycloak.org/docs/latest/server_installation/#_hostname">the

101+ Hostname section of the Keycloak server installation

102+ manual</link> for more information.

103+ '';

104+ };

114105

115− database = {

116− type = lib.mkOption {

117− type = lib.types.enum [ "mysql" "postgresql" ];

118− default = "postgresql";

119− example = "mysql";

106+ sslCertificate = mkOption {

107+ type = nullOr path;

108+ default = null;

109+ example = "/run/keys/ssl_cert";

120110 description = ''

121− The type of database Keycloak should connect to.

111+ The path to a PEM formatted certificate to use for TLS/SSL

112+ connections.

113+

114+ This should be a string, not a Nix path, since Nix paths are

115+ copied into the world-readable Nix store.

122116 '';

123117 };

124118

125− host = lib.mkOption {

126− type = lib.types.str;

127− default = "localhost";

119+ sslCertificateKey = mkOption {

120+ type = nullOr path;

121+ default = null;

122+ example = "/run/keys/ssl_key";

128123 description = ''

129− Hostname of the database to connect to.

124+ The path to a PEM formatted private key to use for TLS/SSL

125+ connections.

126+

127+ This should be a string, not a Nix path, since Nix paths are

128+ copied into the world-readable Nix store.

130129 '';

131130 };

132131

133− port =

134− let

135− dbPorts = {

136− postgresql = 5432;

137− mysql = 3306;

138− };

139− in

140− lib.mkOption {

141− type = lib.types.port;

132+ database = {

133+ type = mkOption {

134+ type = enum [ "mysql" "postgresql" ];

135+ default = "postgresql";

136+ example = "mysql";

137+ description = ''

138+ The type of database Keycloak should connect to.

139+ '';

140+ };

141+

142+ host = mkOption {

143+ type = str;

144+ default = "localhost";

145+ description = ''

146+ Hostname of the database to connect to.

147+ '';

148+ };

149+

150+ port =

151+ let

152+ dbPorts = {

153+ postgresql = 5432;

154+ mysql = 3306;

155+ };

156+ in

157+ mkOption {

158+ type = port;

142159 default = dbPorts.${cfg.database.type};

143− defaultText = lib.literalDocBook "default port of selected database";

160+ defaultText = literalDocBook "default port of selected database";

144161 description = ''

145162 Port of the database to connect to.

146163 '';

147164 };

148165

149− useSSL = lib.mkOption {

150− type = lib.types.bool;

151− default = cfg.database.host != "localhost";

152− defaultText = lib.literalExpression ''config.${opt.database.host} != "localhost"'';

153− description = ''

154− Whether the database connection should be secured by SSL /

155− TLS.

156− '';

157− };

166+ useSSL = mkOption {

167+ type = bool;

168+ default = cfg.database.host != "localhost";

169+ defaultText = literalExpression ''config.${opt.database.host} != "localhost"'';

170+ description = ''

171+ Whether the database connection should be secured by SSL /

172+ TLS.

173+ '';

174+ };

158175

159− caCert = lib.mkOption {

160− type = lib.types.nullOr lib.types.path;

161− default = null;

162− description = ''

163− The SSL / TLS CA certificate that verifies the identity of the

164− database server.

176+ caCert = mkOption {

177+ type = nullOr path;

178+ default = null;

179+ description = ''

180+ The SSL / TLS CA certificate that verifies the identity of the

181+ database server.

165182

166− Required when PostgreSQL is used and SSL is turned on.

183+ Required when PostgreSQL is used and SSL is turned on.

167184

168− For MySQL, if left at <literal>null</literal>, the default

169− Java keystore is used, which should suffice if the server

170− certificate is issued by an official CA.

171− '';

185+ For MySQL, if left at <literal>null</literal>, the default

186+ Java keystore is used, which should suffice if the server

187+ certificate is issued by an official CA.

188+ '';

189+ };

190+

191+ createLocally = mkOption {

192+ type = bool;

193+ default = true;

194+ description = ''

195+ Whether a database should be automatically created on the

196+ local host. Set this to false if you plan on provisioning a

197+ local database yourself. This has no effect if

198+ services.keycloak.database.host is customized.

199+ '';

200+ };

201+

202+ username = mkOption {

203+ type = str;

204+ default = "keycloak";

205+ description = ''

206+ Username to use when connecting to an external or manually

207+ provisioned database; has no effect when a local database is

208+ automatically provisioned.

209+

210+ To use this with a local database, set <xref

211+ linkend="opt-services.keycloak.database.createLocally" /> to

212+ <literal>false</literal> and create the database and user

213+ manually. The database should be called

214+ <literal>keycloak</literal>.

215+ '';

216+ };

217+

218+ passwordFile = mkOption {

219+ type = path;

220+ example = "/run/keys/db_password";

221+ description = ''

222+ File containing the database password.

223+

224+ This should be a string, not a Nix path, since Nix paths are

225+ copied into the world-readable Nix store.

226+ '';

227+ };

172228 };

173229

174− createLocally = lib.mkOption {

175− type = lib.types.bool;

176− default = true;

230+ package = mkOption {

231+ type = package;

232+ default = pkgs.keycloak;

233+ defaultText = literalExpression "pkgs.keycloak";

177234 description = ''

178− Whether a database should be automatically created on the

179− local host. Set this to false if you plan on provisioning a

180− local database yourself. This has no effect if

181− services.keycloak.database.host is customized.

235+ Keycloak package to use.

182236 '';

183237 };

184238

185− username = lib.mkOption {

186− type = lib.types.str;

187− default = "keycloak";

239+ initialAdminPassword = mkOption {

240+ type = str;

241+ default = "changeme";

188242 description = ''

189− Username to use when connecting to an external or manually

190− provisioned database; has no effect when a local database is

191− automatically provisioned.

192−

193− To use this with a local database, set <xref

194− linkend="opt-services.keycloak.database.createLocally" /> to

195− <literal>false</literal> and create the database and user

196− manually. The database should be called

197− <literal>keycloak</literal>.

243+ Initial password set for the <literal>admin</literal>

244+ user. The password is not stored safely and should be changed

245+ immediately in the admin panel.

198246 '';

199247 };

200248

201− passwordFile = lib.mkOption {

202− type = lib.types.path;

203− example = "/run/keys/db_password";

249+ themes = mkOption {

250+ type = attrsOf package;

251+ default = { };

204252 description = ''

205− File containing the database password.

253+ Additional theme packages for Keycloak. Each theme is linked into

254+ subdirectory with a corresponding attribute name.

206255

207− This should be a string, not a Nix path, since Nix paths are

208− copied into the world-readable Nix store.

256+ Theme packages consist of several subdirectories which provide

257+ different theme types: for example, <literal>account</literal>,

258+ <literal>login</literal> etc. After adding a theme to this option you

259+ can select it by its name in Keycloak administration console.

209260 '';

210261 };

211− };

212−

213− package = lib.mkOption {

214− type = lib.types.package;

215− default = pkgs.keycloak;

216− defaultText = lib.literalExpression "pkgs.keycloak";

217− description = ''

218− Keycloak package to use.

219− '';

220− };

221−

222− initialAdminPassword = lib.mkOption {

223− type = lib.types.str;

224− default = "changeme";

225− description = ''

226− Initial password set for the <literal>admin</literal>

227− user. The password is not stored safely and should be changed

228− immediately in the admin panel.

229− '';

230− };

231262

232− extraConfig = lib.mkOption {

233− type = lib.types.attrs;

234− default = { };

235− example = lib.literalExpression ''

236− {

237− "subsystem=keycloak-server" = {

238− "spi=hostname" = {

239− "provider=default" = null;

240− "provider=fixed" = {

241− enabled = true;

242− properties.hostname = "keycloak.example.com";

263+ extraConfig = mkOption {

264+ type = attrsOf anything;

265+ default = { };

266+ example = literalExpression ''

267+ {

268+ "subsystem=keycloak-server" = {

269+ "spi=hostname" = {

270+ "provider=default" = null;

271+ "provider=fixed" = {

272+ enabled = true;

273+ properties.hostname = "keycloak.example.com";

274+ };

275+ default-provider = "fixed";

243276 };

244− default-provider = "fixed";

245277 };

246− };

247− }

248− '';

249− description = ''

250− Additional Keycloak configuration options to set in

251− <literal>standalone.xml</literal>.

252−

253− Options are expressed as a Nix attribute set which matches the

254− structure of the jboss-cli configuration. The configuration is

255− effectively overlayed on top of the default configuration

256− shipped with Keycloak. To remove existing nodes and undefine

257− attributes from the default configuration, set them to

258− <literal>null</literal>.

259−

260− The example configuration does the equivalent of the following

261− script, which removes the hostname provider

262− <literal>default</literal>, adds the deprecated hostname

263− provider <literal>fixed</literal> and defines it the default:

264−

265− <programlisting>

266− /subsystem=keycloak-server/spi=hostname/provider=default:remove()

267− /subsystem=keycloak-server/spi=hostname/provider=fixed:add(enabled = true, properties = { hostname = "keycloak.example.com" })

268− /subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="fixed")

269− </programlisting>

270−

271− You can discover available options by using the <link

272− xlink:href="http://docs.wildfly.org/21/Admin_Guide.html#Command_Line_Interface">jboss-cli.sh</link>

273− program and by referring to the <link

274− xlink:href="https://www.keycloak.org/docs/latest/server_installation/index.html">Keycloak

275− Server Installation and Configuration Guide</link>.

276− '';

277− };

278+ }

279+ '';

280+ description = ''

281+ Additional Keycloak configuration options to set in

282+ <literal>standalone.xml</literal>.

283+

284+ Options are expressed as a Nix attribute set which matches the

285+ structure of the jboss-cli configuration. The configuration is

286+ effectively overlayed on top of the default configuration

287+ shipped with Keycloak. To remove existing nodes and undefine

288+ attributes from the default configuration, set them to

289+ <literal>null</literal>.

290+

291+ The example configuration does the equivalent of the following

292+ script, which removes the hostname provider

293+ <literal>default</literal>, adds the deprecated hostname

294+ provider <literal>fixed</literal> and defines it the default:

295+

296+ <programlisting>

297+ /subsystem=keycloak-server/spi=hostname/provider=default:remove()

298+ /subsystem=keycloak-server/spi=hostname/provider=fixed:add(enabled = true, properties = { hostname = "keycloak.example.com" })

299+ /subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="fixed")

300+ </programlisting>

301+

302+ You can discover available options by using the <link

303+ xlink:href="http://docs.wildfly.org/21/Admin_Guide.html#Command_Line_Interface">jboss-cli.sh</link>

304+ program and by referring to the <link

305+ xlink:href="https://www.keycloak.org/docs/latest/server_installation/index.html">Keycloak

306+ Server Installation and Configuration Guide</link>.

307+ '';

308+ };

278309

279− };

310+ };

280311

281312 config =

282313 let

@@ -285,28 +316,58 @@ in

285316 createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.database.type == "postgresql";

286317 createLocalMySQL = databaseActuallyCreateLocally && cfg.database.type == "mysql";

287318

288− mySqlCaKeystore = pkgs.runCommand "mysql-ca-keystore" {} ''

319+ mySqlCaKeystore = pkgs.runCommand "mysql-ca-keystore" { } ''

289320 ${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.database.caCert} -keystore $out -storepass notsosecretpassword -noprompt

290321 '';

291322

292− keycloakConfig' = builtins.foldl' lib.recursiveUpdate {

293− "interface=public".inet-address = cfg.bindAddress;

294− "socket-binding-group=standard-sockets"."socket-binding=http".port = cfg.httpPort;

295− "subsystem=keycloak-server"."spi=hostname" = {

296− "provider=default" = {

297− enabled = true;

298− properties = {

299− inherit (cfg) frontendUrl forceBackendUrlToFrontendUrl;

323+ # Both theme and theme type directories need to be actual directories in one hierarchy to pass Keycloak checks.

324+ themesBundle = pkgs.runCommand "keycloak-themes" { } ''

325+ linkTheme() {

326+ theme="$1"

327+ name="$2"

328+

329+ mkdir "$out/$name"

330+ for typeDir in "$theme"/*; do

331+ if [ -d "$typeDir" ]; then

332+ type="$(basename "$typeDir")"

333+ mkdir "$out/$name/$type"

334+ for file in "$typeDir"/*; do

335+ ln -sn "$file" "$out/$name/$type/$(basename "$file")"

336+ done

337+ fi

338+ done

339+ }

340+

341+ mkdir -p "$out"

342+ for theme in ${cfg.package}/themes/*; do

343+ if [ -d "$theme" ]; then

344+ linkTheme "$theme" "$(basename "$theme")"

345+ fi

346+ done

347+

348+ ${concatStringsSep "\n" (mapAttrsToList (name: theme: "linkTheme ${theme} ${escapeShellArg name}") cfg.themes)}

349+ '';

350+

351+ keycloakConfig' = foldl' recursiveUpdate

352+ {

353+ "interface=public".inet-address = cfg.bindAddress;

354+ "socket-binding-group=standard-sockets"."socket-binding=http".port = cfg.httpPort;

355+ "subsystem=keycloak-server" = {

356+ "spi=hostname"."provider=default" = {

357+ enabled = true;

358+ properties = {

359+ inherit (cfg) frontendUrl forceBackendUrlToFrontendUrl;

360+ };

300361 };

362+ "theme=defaults".dir = toString themesBundle;

301363 };

302− };

303− "subsystem=datasources"."data-source=KeycloakDS" = {

304− max-pool-size = "20";

305− user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;

306− password = "@db-password@";

307− };

308− } [

309− (lib.optionalAttrs (cfg.database.type == "postgresql") {

364+ "subsystem=datasources"."data-source=KeycloakDS" = {

365+ max-pool-size = "20";

366+ user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;

367+ password = "@db-password@";

368+ };

369+ } [

370+ (optionalAttrs (cfg.database.type == "postgresql") {

310371 "subsystem=datasources" = {

311372 "jdbc-driver=postgresql" = {

312373 driver-module-name = "org.postgresql";

@@ -314,16 +375,16 @@ in

314375 driver-xa-datasource-class-name = "org.postgresql.xa.PGXADataSource";

315376 };

316377 "data-source=KeycloakDS" = {

317− connection-url = "jdbc:postgresql://${cfg.database.host}:${builtins.toString cfg.database.port}/keycloak";

378+ connection-url = "jdbc:postgresql://${cfg.database.host}:${toString cfg.database.port}/keycloak";

318379 driver-name = "postgresql";

319− "connection-properties=ssl".value = lib.boolToString cfg.database.useSSL;

320− } // (lib.optionalAttrs (cfg.database.caCert != null) {

380+ "connection-properties=ssl".value = boolToString cfg.database.useSSL;

381+ } // (optionalAttrs (cfg.database.caCert != null) {

321382 "connection-properties=sslrootcert".value = cfg.database.caCert;

322383 "connection-properties=sslmode".value = "verify-ca";

323384 });

324385 };

325386 })

326− (lib.optionalAttrs (cfg.database.type == "mysql") {

387+ (optionalAttrs (cfg.database.type == "mysql") {

327388 "subsystem=datasources" = {

328389 "jdbc-driver=mysql" = {

329390 driver-module-name = "com.mysql";

@@ -331,28 +392,40 @@ in

331392 driver-class-name = "com.mysql.jdbc.Driver";

332393 };

333394 "data-source=KeycloakDS" = {

334− connection-url = "jdbc:mysql://${cfg.database.host}:${builtins.toString cfg.database.port}/keycloak";

395+ connection-url = "jdbc:mysql://${cfg.database.host}:${toString cfg.database.port}/keycloak";

335396 driver-name = "mysql";

336− "connection-properties=useSSL".value = lib.boolToString cfg.database.useSSL;

337− "connection-properties=requireSSL".value = lib.boolToString cfg.database.useSSL;

338− "connection-properties=verifyServerCertificate".value = lib.boolToString cfg.database.useSSL;

397+ "connection-properties=useSSL".value = boolToString cfg.database.useSSL;

398+ "connection-properties=requireSSL".value = boolToString cfg.database.useSSL;

399+ "connection-properties=verifyServerCertificate".value = boolToString cfg.database.useSSL;

339400 "connection-properties=characterEncoding".value = "UTF-8";

340401 valid-connection-checker-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker";

341402 validate-on-match = true;

342403 exception-sorter-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter";

343− } // (lib.optionalAttrs (cfg.database.caCert != null) {

404+ } // (optionalAttrs (cfg.database.caCert != null) {

344405 "connection-properties=trustCertificateKeyStoreUrl".value = "file:${mySqlCaKeystore}";

345406 "connection-properties=trustCertificateKeyStorePassword".value = "notsosecretpassword";

346407 });

347408 };

348409 })

349− (lib.optionalAttrs (cfg.sslCertificate != null && cfg.sslCertificateKey != null) {

410+ (optionalAttrs (cfg.sslCertificate != null && cfg.sslCertificateKey != null) {

350411 "socket-binding-group=standard-sockets"."socket-binding=https".port = cfg.httpsPort;

351− "core-service=management"."security-realm=UndertowRealm"."server-identity=ssl" = {

352− keystore-path = "/run/keycloak/ssl/certificate_private_key_bundle.p12";

353− keystore-password = "notsosecretpassword";

412+ "subsystem=elytron" = mkOrder 900 {

413+ "key-store=httpsKS" = mkOrder 900 {

414+ path = "/run/keycloak/ssl/certificate_private_key_bundle.p12";

415+ credential-reference.clear-text = "notsosecretpassword";

416+ type = "JKS";

417+ };

418+ "key-manager=httpsKM" = mkOrder 901 {

419+ key-store = "httpsKS";

420+ credential-reference.clear-text = "notsosecretpassword";

421+ };

422+ "server-ssl-context=httpsSSC" = mkOrder 902 {

423+ key-manager = "httpsKM";

424+ };

425+ };

426+ "subsystem=undertow" = mkOrder 901 {

427+ "server=default-server"."https-listener=https".ssl-context = "httpsSSC";

354428 };

355− "subsystem=undertow"."server=default-server"."https-listener=https".security-realm = "UndertowRealm";

356429 })

357430 cfg.extraConfig

358431 ];

@@ -441,41 +514,42 @@ in

441514 # with `expression` to evaluate.

442515 prefixExpression = string:

443516 let

444− match = (builtins.match ''"\$\{.*}"'' string);

517+ matchResult = match ''"\$\{.*}"'' string;

445518 in

446− if match != null then

447− "expression " + string

448− else

449− string;

519+ if matchResult != null then

520+ "expression " + string

521+ else

522+ string;

450523

451524 writeAttribute = attribute: value:

452525 let

453− type = builtins.typeOf value;

526+ type = typeOf value;

454527 in

455− if type == "set" then

456− let

457− names = builtins.attrNames value;

458− in

459− builtins.foldl' (text: name: text + (writeAttribute "${attribute}.${name}" value.${name})) "" names

460− else if value == null then ''

461− if (outcome == success) of ${path}:read-attribute(name="${attribute}")

462− ${path}:undefine-attribute(name="${attribute}")

528+ if type == "set" then

529+ let

530+ names = attrNames value;

531+ in

532+ foldl' (text: name: text + (writeAttribute "${attribute}.${name}" value.${name})) "" names

533+ else if value == null then ''

534+ if (outcome == success) of ${path}:read-attribute(name="${attribute}")

535+ ${path}:undefine-attribute(name="${attribute}")

536+ end-if

537+ ''

538+ else if elem type [ "string" "path" "bool" ] then

539+ let

540+ value' = if type == "bool" then boolToString value else ''"${value}"'';

541+ in

542+ ''

543+ if (result != ${prefixExpression value'}) of ${path}:read-attribute(name="${attribute}")

544+ ${path}:write-attribute(name=${attribute}, value=${value'})

463545 end-if

464546 ''

465− else if builtins.elem type [ "string" "path" "bool" ] then

466− let

467− value' = if type == "bool" then lib.boolToString value else ''"${value}"'';

468− in ''

469− if (result != ${prefixExpression value'}) of ${path}:read-attribute(name="${attribute}")

470− ${path}:write-attribute(name=${attribute}, value=${value'})

471− end-if

472− ''

473− else throw "Unsupported type '${type}' for path '${path}'!";

547+ else throw "Unsupported type '${type}' for path '${path}'!";

474548 in

475− lib.concatStrings

476− (lib.mapAttrsToList

477− (attribute: value: (writeAttribute attribute value))

478− set);

549+ concatStrings

550+ (mapAttrsToList

551+ (attribute: value: (writeAttribute attribute value))

552+ set);

479553

480554

481555 /* Produces an argument list for the JBoss `add()` function,

@@ -498,98 +572,108 @@ in

498572 let

499573 makeArg = attribute: value:

500574 let

501− type = builtins.typeOf value;

575+ type = typeOf value;

502576 in

503− if type == "set" then

504− "${attribute} = { " + (makeArgList value) + " }"

505− else if builtins.elem type [ "string" "path" "bool" ] then

506− "${attribute} = ${if type == "bool" then lib.boolToString value else ''"${value}"''}"

507− else if value == null then

508− ""

509− else

510− throw "Unsupported type '${type}' for attribute '${attribute}'!";

577+ if type == "set" then

578+ "${attribute} = { " + (makeArgList value) + " }"

579+ else if elem type [ "string" "path" "bool" ] then

580+ "${attribute} = ${if type == "bool" then boolToString value else ''"${value}"''}"

581+ else if value == null then

582+ ""

583+ else

584+ throw "Unsupported type '${type}' for attribute '${attribute}'!";

585+

511586 in

512− lib.concatStringsSep ", " (lib.mapAttrsToList makeArg set);

587+ concatStringsSep ", " (mapAttrsToList makeArg set);

513588

514589

515− /* Recurses into the `attrs` attrset, beginning at the path

516− resolved from `state.path ++ node`; if `node` is `null`,

517− starts from `state.path`. Only subattrsets that are JBoss

518− paths, i.e. follows the `key=value` format, are recursed

590+ /* Recurses into the `nodeValue` attrset. Only subattrsets that

591+ are JBoss paths, i.e. follows the `key=value` format, are recursed

519592 into - the rest are considered JBoss attributes / maps.

520593 */

521− recurse = state: node:

594+ recurse = nodePath: nodeValue:

522595 let

523− path = state.path ++ (lib.optional (node != null) node);

596+ nodeContent =

597+ if isAttrs nodeValue && nodeValue._type or "" == "order" then

598+ nodeValue.content

599+ else

600+ nodeValue;

524601 isPath = name:

525602 let

526− value = lib.getAttrFromPath (path ++ [ name ]) attrs;

603+ value = nodeContent.${name};

527604 in

528− if (builtins.match ".*([=]).*" name) == [ "=" ] then

529− if builtins.isAttrs value || value == null then

530− true

531− else

532− throw "Parsing path '${lib.concatStringsSep "." (path ++ [ name ])}' failed: JBoss attributes cannot contain '='!"

605+ if (match ".*([=]).*" name) == [ "=" ] then

606+ if isAttrs value || value == null then

607+ true

533608 else

534− false;

535− jbossPath = "/" + (lib.concatStringsSep "/" path);

536− nodeValue = lib.getAttrFromPath path attrs;

537− children = if !builtins.isAttrs nodeValue then {} else nodeValue;

538− subPaths = builtins.filter isPath (builtins.attrNames children);

539− jbossAttrs = lib.filterAttrs (name: _: !(isPath name)) children;

540− in

541− state // {

542− text = state.text + (

543− if nodeValue != null then ''

609+ throw "Parsing path '${concatStringsSep "." (nodePath ++ [ name ])}' failed: JBoss attributes cannot contain '='!"

610+ else

611+ false;

612+ jbossPath = "/" + concatStringsSep "/" nodePath;

613+ children = if !isAttrs nodeContent then { } else nodeContent;

614+ subPaths = filter isPath (attrNames children);

615+ getPriority = name:

616+ let

617+ value = children.${name};

618+ in

619+ if value._type or "" == "order" then value.priority else 1000;

620+ orderedSubPaths = sort (a: b: getPriority a < getPriority b) subPaths;

621+ jbossAttrs = filterAttrs (name: _: !(isPath name)) children;

622+ text =

623+ if nodeContent != null then

624+ ''

544625 if (outcome != success) of ${jbossPath}:read-resource()

545626 ${jbossPath}:add(${makeArgList jbossAttrs})

546627 end-if

547− '' + (writeAttributes jbossPath jbossAttrs)

548− else ''

628+ '' + writeAttributes jbossPath jbossAttrs

629+ else

630+ ''

549631 if (outcome == success) of ${jbossPath}:read-resource()

550632 ${jbossPath}:remove()

551633 end-if

552− '') + (builtins.foldl' recurse { text = ""; inherit path; } subPaths).text;

553− };

634+ '';

635+ in

636+ text + concatMapStringsSep "\n" (name: recurse (nodePath ++ [ name ]) children.${name}) orderedSubPaths;

554637 in

555− (recurse { text = ""; path = []; } null).text;

556−

638+ recurse [ ] attrs;

557639

558640 jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig');

559641

560− keycloakConfig = pkgs.runCommand "keycloak-config" {

561− nativeBuildInputs = [ cfg.package ];

562− } ''

563− export JBOSS_BASE_DIR="$(pwd -P)";

564− export JBOSS_MODULEPATH="${cfg.package}/modules";

565− export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log";

642+ keycloakConfig = pkgs.runCommand "keycloak-config"

643+ {

644+ nativeBuildInputs = [ cfg.package ];

645+ }

646+ ''

647+ export JBOSS_BASE_DIR="$(pwd -P)";

648+ export JBOSS_MODULEPATH="${cfg.package}/modules";

649+ export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log";

566650

567− cp -r ${cfg.package}/standalone/configuration .

568− chmod -R u+rwX ./configuration

651+ cp -r ${cfg.package}/standalone/configuration .

652+ chmod -R u+rwX ./configuration

569653

570− mkdir -p {deployments,ssl}

654+ mkdir -p {deployments,ssl}

571655

572− standalone.sh&

656+ standalone.sh&

573657

574− attempt=1

575− max_attempts=30

576− while ! jboss-cli.sh --connect ':read-attribute(name=server-state)'; do

577− if [[ "$attempt" == "$max_attempts" ]]; then

578− echo "ERROR: Could not connect to Keycloak after $attempt attempts! Failing.." >&2

579− exit 1

580− fi

581− echo "Keycloak not fully started yet, retrying.. ($attempt/$max_attempts)"

582− sleep 1

583− (( attempt++ ))

584− done

658+ attempt=1

659+ max_attempts=30

660+ while ! jboss-cli.sh --connect ':read-attribute(name=server-state)'; do

661+ if [[ "$attempt" == "$max_attempts" ]]; then

662+ echo "ERROR: Could not connect to Keycloak after $attempt attempts! Failing.." >&2

663+ exit 1

664+ fi

665+ echo "Keycloak not fully started yet, retrying.. ($attempt/$max_attempts)"

666+ sleep 1

667+ (( attempt++ ))

668+ done

585669

586− jboss-cli.sh --connect --file=${jbossCliScript} --echo-command

670+ jboss-cli.sh --connect --file=${jbossCliScript} --echo-command

587671

588− cp configuration/standalone.xml $out

589− '';

672+ cp configuration/standalone.xml $out

673+ '';

590674 in

591− lib.mkIf cfg.enable {

592−

675+ mkIf cfg.enable

676+ {

593677 assertions = [

594678 {

595679 assertion = (cfg.database.useSSL && cfg.database.type == "postgresql") -> (cfg.database.caCert != null);

@@ -599,7 +683,7 @@ in

599683

600684 environment.systemPackages = [ cfg.package ];

601685

602− systemd.services.keycloakPostgreSQLInit = lib.mkIf createLocalPostgreSQL {

686+ systemd.services.keycloakPostgreSQLInit = mkIf createLocalPostgreSQL {

603687 after = [ "postgresql.service" ];

604688 before = [ "keycloak.service" ];

605689 bindsTo = [ "postgresql.service" ];

@@ -623,7 +707,7 @@ in

623707 '';

624708 };

625709

626− systemd.services.keycloakMySQLInit = lib.mkIf createLocalMySQL {

710+ systemd.services.keycloakMySQLInit = mkIf createLocalMySQL {

627711 after = [ "mysql.service" ];

628712 before = [ "keycloak.service" ];

629713 bindsTo = [ "mysql.service" ];

@@ -650,13 +734,16 @@ in

650734 let

651735 databaseServices =

652736 if createLocalPostgreSQL then [

653− "keycloakPostgreSQLInit.service" "postgresql.service"

737+ "keycloakPostgreSQLInit.service"

738+ "postgresql.service"

654739 ]

655740 else if createLocalMySQL then [

656− "keycloakMySQLInit.service" "mysql.service"

741+ "keycloakMySQLInit.service"

742+ "mysql.service"

657743 ]

658744 else [ ];

659− in {

745+ in

746+ {

660747 after = databaseServices;

661748 bindsTo = databaseServices;

662749 wantedBy = [ "multi-user.target" ];

@@ -671,52 +758,16 @@ in

671758 JBOSS_MODULEPATH = "${cfg.package}/modules";

672759 };

673760 serviceConfig = {

674− ExecStartPre = let

675− startPreFullPrivileges = ''

676− set -o errexit -o pipefail -o nounset -o errtrace

677− shopt -s inherit_errexit

678−

679− umask u=rwx,g=,o=

680−

681− install -T -m 0400 -o keycloak -g keycloak '${cfg.database.passwordFile}' /run/keycloak/secrets/db_password

682− '' + lib.optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) ''

683− install -T -m 0400 -o keycloak -g keycloak '${cfg.sslCertificate}' /run/keycloak/secrets/ssl_cert

684− install -T -m 0400 -o keycloak -g keycloak '${cfg.sslCertificateKey}' /run/keycloak/secrets/ssl_key

685− '';

686− startPre = ''

687− set -o errexit -o pipefail -o nounset -o errtrace

688− shopt -s inherit_errexit

689−

690− umask u=rwx,g=,o=

691−

692− install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration

693− install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml

694−

695− replace-secret '@db-password@' '/run/keycloak/secrets/db_password' /run/keycloak/configuration/standalone.xml

696−

697− export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration

698− add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'

699− '' + lib.optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) ''

700− pushd /run/keycloak/ssl/

701− cat /run/keycloak/secrets/ssl_cert <(echo) \

702− /run/keycloak/secrets/ssl_key <(echo) \

703− /etc/ssl/certs/ca-certificates.crt \

704− > allcerts.pem

705− openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert -inkey /run/keycloak/secrets/ssl_key -chain \

706− -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \

707− -CAfile allcerts.pem -passout pass:notsosecretpassword

708− popd

709− '';

710− in [

711− "+${pkgs.writeShellScript "keycloak-start-pre-full-privileges" startPreFullPrivileges}"

712− "${pkgs.writeShellScript "keycloak-start-pre" startPre}"

761+ LoadCredential = [

762+ "db_password:${cfg.database.passwordFile}"

763+ ] ++ optionals (cfg.sslCertificate != null && cfg.sslCertificateKey != null) [

764+ "ssl_cert:${cfg.sslCertificate}"

765+ "ssl_key:${cfg.sslCertificateKey}"

713766 ];

714− ExecStart = "${cfg.package}/bin/standalone.sh";

715767 User = "keycloak";

716768 Group = "keycloak";

717769 DynamicUser = true;

718770 RuntimeDirectory = map (p: "keycloak/" + p) [

719− "secrets"

720771 "configuration"

721772 "deployments"

722773 "data"

@@ -728,13 +779,39 @@ in

728779 LogsDirectory = "keycloak";

729780 AmbientCapabilities = "CAP_NET_BIND_SERVICE";

730781 };

782+ script = ''

783+ set -o errexit -o pipefail -o nounset -o errtrace

784+ shopt -s inherit_errexit

785+

786+ umask u=rwx,g=,o=

787+

788+ install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration

789+ install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml

790+

791+ replace-secret '@db-password@' "$CREDENTIALS_DIRECTORY/db_password" /run/keycloak/configuration/standalone.xml

792+

793+ export JAVA_OPTS=-Djboss.server.config.user.dir=/run/keycloak/configuration

794+ add-user-keycloak.sh -u admin -p '${cfg.initialAdminPassword}'

795+ '' + optionalString (cfg.sslCertificate != null && cfg.sslCertificateKey != null) ''

796+ pushd /run/keycloak/ssl/

797+ cat "$CREDENTIALS_DIRECTORY/ssl_cert" <(echo) \

798+ "$CREDENTIALS_DIRECTORY/ssl_key" <(echo) \

799+ /etc/ssl/certs/ca-certificates.crt \

800+ > allcerts.pem

801+ openssl pkcs12 -export -in "$CREDENTIALS_DIRECTORY/ssl_cert" -inkey "$CREDENTIALS_DIRECTORY/ssl_key" -chain \

802+ -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \

803+ -CAfile allcerts.pem -passout pass:notsosecretpassword

804+ popd

805+ '' + ''

806+ ${cfg.package}/bin/standalone.sh

807+ '';

731808 };

732809

733− services.postgresql.enable = lib.mkDefault createLocalPostgreSQL;

734− services.mysql.enable = lib.mkDefault createLocalMySQL;

735− services.mysql.package = lib.mkIf createLocalMySQL pkgs.mariadb;

810+ services.postgresql.enable = mkDefault createLocalPostgreSQL;

811+ services.mysql.enable = mkDefault createLocalMySQL;

812+ services.mysql.package = mkIf createLocalMySQL pkgs.mariadb;

736813 };

737814

738815 meta.doc = ./keycloak.xml;

739− meta.maintainers = [ lib.maintainers.talyz ];

816+ meta.maintainers = [ maintainers.talyz ];

740817}

nixos/modules/services/web-apps/keycloak.xml+17−1

@@ -85,7 +85,12 @@

8585 The frontend URL is used as base for all frontend requests and

8686 must be configured through <xref linkend="opt-services.keycloak.frontendUrl" />.

8787 It should normally include a trailing <literal>/auth</literal>

88− (the default web context).

88+ (the default web context). If you use a reverse proxy, you need

89+ to set this option to <literal>""</literal>, so that frontend URL

90+ is derived from HTTP headers. <literal>X-Forwarded-*</literal> headers

91+ support also should be enabled, using <link

92+ xlink:href="https://www.keycloak.org/docs/latest/server_installation/index.html#identifying-client-ip-addresses">

93+ respective guidelines</link>.

8994 </para>

9095

9196 <para>

@@ -131,6 +136,17 @@

131136 </warning>

132137 </section>

133138

139+ <section xml:id="module-services-keycloak-themes">

140+ <title>Themes</title>

141+ <para>

142+ You can package custom themes and make them visible to Keycloak via

143+ <xref linkend="opt-services.keycloak.themes" />

144+ option. See the <link xlink:href="https://www.keycloak.org/docs/latest/server_development/#_themes">

145+ Themes section of the Keycloak Server Development Guide</link>

146+ and respective NixOS option description for more information.

147+ </para>

148+ </section>

149+

134150 <section xml:id="module-services-keycloak-extra-config">

135151 <title>Additional configuration</title>

136152 <para>

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

@@ -181,7 +181,7 @@ in

181181 description = ''

182182 Plugins to add to the configuration. Overrides any installed if non-null.

183183 This is a list of paths to .tar.gz files or derivations evaluating to

184− .tar.gz files. All entries will be passed to `mattermost plugin add`.

184+ .tar.gz files.

185185 '';

186186 };

187187

nixos/modules/services/web-apps/prosody-filer.nix+4−6

@@ -21,12 +21,10 @@ in {

2121

2222 type = settingsFormat.type;

2323

24− example = literalExample ''

25− {

26− secret = "mysecret";

27− storeDir = "/srv/http/nginx/prosody-upload";

28− }

29− '';

24+ example = {

25+ secret = "mysecret";

26+ storeDir = "/srv/http/nginx/prosody-upload";

27+ };

3028

3129 defaultText = literalExpression ''

3230 {

nixos/modules/system/activation/switch-to-configuration.pl+54−18

@@ -18,11 +18,13 @@ my $startListFile = "/run/nixos/start-list";

1818my $restartListFile = "/run/nixos/restart-list";

1919my $reloadListFile = "/run/nixos/reload-list";

2020

21−# Parse restart/reload requests by the activation script

21+# Parse restart/reload requests by the activation script.

22+# Activation scripts may write newline-separated units to this

23+# file and switch-to-configuration will handle them. While

24+# `stopIfChanged = true` is ignored, switch-to-configuration will

25+# handle `restartIfChanged = false` and `reloadIfChanged = true`.

2226my $restartByActivationFile = "/run/nixos/activation-restart-list";

23−my $reloadByActivationFile = "/run/nixos/activation-reload-list";

2427my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list";

25−my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list";

2628

2729make_path("/run/nixos", { mode => oct(755) });

2830

@@ -382,7 +384,6 @@ sub filterUnits {

382384}

383385

384386my @unitsToStopFiltered = filterUnits(\%unitsToStop);

385−my @unitsToStartFiltered = filterUnits(\%unitsToStart);

386387

387388

388389# Show dry-run actions.

@@ -395,21 +396,39 @@ if ($action eq "dry-activate") {

395396 print STDERR "would activate the configuration...\n";

396397 system("$out/dry-activate", "$out");

397398

398− $unitsToRestart{$_} = 1 foreach

399− split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "");

399+ # Handle the activation script requesting the restart or reload of a unit.

400+ foreach (split('\n', read_file($dryRestartByActivationFile, err_mode => 'quiet') // "")) {

401+ my $unit = $_;

402+ my $baseUnit = $unit;

403+ my $newUnitFile = "$out/etc/systemd/system/$baseUnit";

404+

405+ # Detect template instances.

406+ if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) {

407+ $baseUnit = "$1\@.$2";

408+ $newUnitFile = "$out/etc/systemd/system/$baseUnit";

409+ }

410+

411+ my $baseName = $baseUnit;

412+ $baseName =~ s/\.[a-z]*$//;

400413

401− $unitsToReload{$_} = 1 foreach

402− split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // "");

414+ # Start units if they were not active previously

415+ if (not defined $activePrev->{$unit}) {

416+ $unitsToStart{$unit} = 1;

417+ next;

418+ }

419+

420+ handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToRestart, \%unitsToRestart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip);

421+ }

422+ unlink($dryRestartByActivationFile);

403423

404424 print STDERR "would restart systemd\n" if $restartSystemd;

405425 print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n"

406426 if scalar(keys %unitsToReload) > 0;

407427 print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"

408428 if scalar(keys %unitsToRestart) > 0;

429+ my @unitsToStartFiltered = filterUnits(\%unitsToStart);

409430 print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n"

410431 if scalar @unitsToStartFiltered;

411− unlink($dryRestartByActivationFile);

412− unlink($dryReloadByActivationFile);

413432 exit 0;

414433}

415434

@@ -433,13 +452,31 @@ print STDERR "activating the configuration...\n";

433452system("$out/activate", "$out") == 0 or $res = 2;

434453

435454# Handle the activation script requesting the restart or reload of a unit.

436−# We can only restart and reload (not stop/start) because the units to be

437−# stopped are already stopped before the activation script is run.

438−$unitsToRestart{$_} = 1 foreach

439− split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "");

455+foreach (split('\n', read_file($restartByActivationFile, err_mode => 'quiet') // "")) {

456+ my $unit = $_;

457+ my $baseUnit = $unit;

458+ my $newUnitFile = "$out/etc/systemd/system/$baseUnit";

440459

441−$unitsToReload{$_} = 1 foreach

442− split('\n', read_file($reloadByActivationFile, err_mode => 'quiet') // "");

460+ # Detect template instances.

461+ if (!-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) {

462+ $baseUnit = "$1\@.$2";

463+ $newUnitFile = "$out/etc/systemd/system/$baseUnit";

464+ }

465+

466+ my $baseName = $baseUnit;

467+ $baseName =~ s/\.[a-z]*$//;

468+

469+ # Start units if they were not active previously

470+ if (not defined $activePrev->{$unit}) {

471+ $unitsToStart{$unit} = 1;

472+ recordUnit($startListFile, $unit);

473+ next;

474+ }

475+

476+ handleModifiedUnit($unit, $baseName, $newUnitFile, $activePrev, \%unitsToRestart, \%unitsToRestart, \%unitsToReload, \%unitsToRestart, \%unitsToSkip);

477+}

478+# We can remove the file now because it has been propagated to the other restart/reload files

479+unlink($restartByActivationFile);

443480

444481# Restart systemd if necessary. Note that this is done using the

445482# current version of systemd, just in case the new one has trouble

@@ -480,7 +517,6 @@ if (scalar(keys %unitsToReload) > 0) {

480517 print STDERR "reloading the following units: ", join(", ", sort(keys %unitsToReload)), "\n";

481518 system("@systemd@/bin/systemctl", "reload", "--", sort(keys %unitsToReload)) == 0 or $res = 4;

482519 unlink($reloadListFile);

483− unlink($reloadByActivationFile);

484520}

485521

486522# Restart changed services (those that have to be restarted rather

@@ -489,7 +525,6 @@ if (scalar(keys %unitsToRestart) > 0) {

489525 print STDERR "restarting the following units: ", join(", ", sort(keys %unitsToRestart)), "\n";

490526 system("@systemd@/bin/systemctl", "restart", "--", sort(keys %unitsToRestart)) == 0 or $res = 4;

491527 unlink($restartListFile);

492− unlink($restartByActivationFile);

493528}

494529

495530# Start all active targets, as well as changed units we stopped above.

@@ -498,6 +533,7 @@ if (scalar(keys %unitsToRestart) > 0) {

498533# that are symlinks to other units. We shouldn't start both at the

499534# same time because we'll get a "Failed to add path to set" error from

500535# systemd.

536+my @unitsToStartFiltered = filterUnits(\%unitsToStart);

501537print STDERR "starting the following units: ", join(", ", @unitsToStartFiltered), "\n"

502538 if scalar @unitsToStartFiltered;

503539system("@systemd@/bin/systemctl", "start", "--", sort(keys %unitsToStart)) == 0 or $res = 4;

nixos/tests/adguardhome.nixnew file+57

@@ -0,0 +1,57 @@

1+import ./make-test-python.nix {

2+ name = "adguardhome";

3+

4+ nodes = {

5+ minimalConf = { ... }: {

6+ services.adguardhome = { enable = true; };

7+ };

8+

9+ declarativeConf = { ... }: {

10+ services.adguardhome = {

11+ enable = true;

12+

13+ mutableSettings = false;

14+ settings = {

15+ dns = {

16+ bind_host = "0.0.0.0";

17+ bootstrap_dns = "127.0.0.1";

18+ };

19+ };

20+ };

21+ };

22+

23+ mixedConf = { ... }: {

24+ services.adguardhome = {

25+ enable = true;

26+

27+ mutableSettings = true;

28+ settings = {

29+ dns = {

30+ bind_host = "0.0.0.0";

31+ bootstrap_dns = "127.0.0.1";

32+ };

33+ };

34+ };

35+ };

36+ };

37+

38+ testScript = ''

39+ with subtest("Minimal config test"):

40+ minimalConf.wait_for_unit("adguardhome.service")

41+ minimalConf.wait_for_open_port(3000)

42+

43+ with subtest("Declarative config test, DNS will be reachable"):

44+ declarativeConf.wait_for_unit("adguardhome.service")

45+ declarativeConf.wait_for_open_port(53)

46+ declarativeConf.wait_for_open_port(3000)

47+

48+ with subtest("Mixed config test, check whether merging works"):

49+ mixedConf.wait_for_unit("adguardhome.service")

50+ mixedConf.wait_for_open_port(53)

51+ mixedConf.wait_for_open_port(3000)

52+ # Test whether merging works properly, even if nothing is changed

53+ mixedConf.systemctl("restart adguardhome.service")

54+ mixedConf.wait_for_unit("adguardhome.service")

55+ mixedConf.wait_for_open_port(3000)

56+ '';

57+}

nixos/tests/all-tests.nix+3

@@ -23,6 +23,7 @@ in

2323{

2424 _3proxy = handleTest ./3proxy.nix {};

2525 acme = handleTest ./acme.nix {};

26+ adguardhome = handleTest ./adguardhome.nix {};

2627 aesmd = handleTest ./aesmd.nix {};

2728 agda = handleTest ./agda.nix {};

2829 airsonic = handleTest ./airsonic.nix {};

@@ -474,6 +475,7 @@ in

474475 taskserver = handleTest ./taskserver.nix {};

475476 telegraf = handleTest ./telegraf.nix {};

476477 teleport = handleTest ./teleport.nix {};

478+ thelounge = handleTest ./thelounge.nix {};

477479 tiddlywiki = handleTest ./tiddlywiki.nix {};

478480 tigervnc = handleTest ./tigervnc.nix {};

479481 timezone = handleTest ./timezone.nix {};

@@ -488,6 +490,7 @@ in

488490 trezord = handleTest ./trezord.nix {};

489491 trickster = handleTest ./trickster.nix {};

490492 trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {};

493+ tsm-client-gui = handleTest ./tsm-client-gui.nix {};

491494 txredisapi = handleTest ./txredisapi.nix {};

492495 tuptime = handleTest ./tuptime.nix {};

493496 turbovnc-headless-server = handleTest ./turbovnc-headless-server.nix {};

nixos/tests/borgbackup.nix+1−1

@@ -106,7 +106,7 @@ in {

106106 services.openssh = {

107107 enable = true;

108108 passwordAuthentication = false;

109− challengeResponseAuthentication = false;

109+ kbdInteractiveAuthentication = false;

110110 };

111111

112112 services.borgbackup.repos.repo1 = {

nixos/tests/btrbk.nix+1−1

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

5353 services.openssh = {

5454 enable = true;

5555 passwordAuthentication = false;

56− challengeResponseAuthentication = false;

56+ kbdInteractiveAuthentication = false;

5757 };

5858 services.btrbk = {

5959 extraPackages = [ pkgs.lz4 ];

nixos/tests/google-oslogin/server.nix+1−1

@@ -17,7 +17,7 @@ in {

1717 };

1818

1919 services.openssh.enable = true;

20− services.openssh.challengeResponseAuthentication = false;

20+ services.openssh.kbdInteractiveAuthentication = false;

2121 services.openssh.passwordAuthentication = false;

2222

2323 security.googleOsLogin.enable = true;

nixos/tests/rstudio-server.nixnew file+30

@@ -0,0 +1,30 @@

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

2+ {

3+ name = "rstudio-server-test";

4+ meta.maintainers = with pkgs.lib.maintainers; [ jbedo cfhammill ];

5+

6+ nodes.machine = { config, lib, pkgs, ... }: {

7+ services.rstudio-server.enable = true;

8+ };

9+

10+ nodes.customPackageMachine = { config, lib, pkgs, ... }: {

11+ services.rstudio-server = {

12+ enable = true;

13+ package = pkgs.rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; };

14+ };

15+ };

16+

17+ users.testuser = {

18+ uid = 1000;

19+ group = "testgroup";

20+ };

21+ groups.testgroup.gid = 1000;

22+

23+ testScript = ''

24+ machine.wait_for_unit("rstudio-server.service")

25+ machine.succeed("curl -f -vvv -s http://127.0.0.1:8787")

26+

27+ customPackageMachine.wait_for_unit("rstudio-server.service")

28+ customPackageMachine.succeed("curl -f -vvv -s http://127.0.0.1:8787")

29+ '';

30+ })

nixos/tests/switch-test.nix+70

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

4545 systemd.services.test.restartIfChanged = false;

4646 };

4747

48+ restart-and-reload-by-activation-script.configuration = {

49+ systemd.services = rec {

50+ simple-service = {

51+ # No wantedBy so we can check if the activation script restart triggers them

52+ serviceConfig = {

53+ Type = "oneshot";

54+ RemainAfterExit = true;

55+ ExecStart = "${pkgs.coreutils}/bin/true";

56+ ExecReload = "${pkgs.coreutils}/bin/true";

57+ };

58+ };

59+

60+ simple-restart-service = simple-service // {

61+ stopIfChanged = false;

62+ };

63+

64+ simple-reload-service = simple-service // {

65+ reloadIfChanged = true;

66+ };

67+

68+ no-restart-service = simple-service // {

69+ restartIfChanged = false;

70+ };

71+ };

72+

73+ system.activationScripts.restart-and-reload-test = {

74+ supportsDryActivation = true;

75+ deps = [];

76+ text = ''

77+ if [ "$NIXOS_ACTION" = dry-activate ]; then

78+ f=/run/nixos/dry-activation-restart-list

79+ else

80+ f=/run/nixos/activation-restart-list

81+ fi

82+ cat <<EOF >> "$f"

83+ simple-service.service

84+ simple-restart-service.service

85+ simple-reload-service.service

86+ no-restart-service.service

87+ EOF

88+ '';

89+ };

90+ };

91+

4892 mount.configuration = {

4993 systemd.mounts = [

5094 {

@@ -261,6 +305,32 @@ import ./make-test-python.nix ({ pkgs, ...} : {

261305 assert_lacks(out, "as well:")

262306 assert_contains(out, "would start the following units: test.service\n")

263307

308+ with subtest("restart and reload by activation script"):

309+ out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script")

310+ assert_contains(out, "stopping the following units: test.service\n")

311+ assert_lacks(out, "NOT restarting the following changed units:")

312+ assert_lacks(out, "reloading the following units:")

313+ assert_lacks(out, "restarting the following units:")

314+ assert_contains(out, "\nstarting the following units: no-restart-service.service, simple-reload-service.service, simple-restart-service.service, simple-service.service\n")

315+ assert_lacks(out, "as well:")

316+ # Switch to the same system where the example services get restarted

317+ # by the activation script

318+ out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script")

319+ assert_lacks(out, "stopping the following units:")

320+ assert_lacks(out, "NOT restarting the following changed units:")

321+ assert_contains(out, "reloading the following units: simple-reload-service.service\n")

322+ assert_contains(out, "restarting the following units: simple-restart-service.service, simple-service.service\n")

323+ assert_lacks(out, "\nstarting the following units:")

324+ assert_lacks(out, "as well:")

325+ # The same, but in dry mode

326+ out = switch_to_specialisation("${machine}", "restart-and-reload-by-activation-script", action="dry-activate")

327+ assert_lacks(out, "would stop the following units:")

328+ assert_lacks(out, "would NOT stop the following changed units:")

329+ assert_contains(out, "would reload the following units: simple-reload-service.service\n")

330+ assert_contains(out, "would restart the following units: simple-restart-service.service, simple-service.service\n")

331+ assert_lacks(out, "\nwould start the following units:")

332+ assert_lacks(out, "as well:")

333+

264334 with subtest("mounts"):

265335 switch_to_specialisation("${machine}", "mount")

266336 out = machine.succeed("mount | grep 'on /testmount'")

nixos/tests/thelounge.nixnew file+29

@@ -0,0 +1,29 @@

1+import ./make-test-python.nix {

2+ nodes = {

3+ private = { config, pkgs, ... }: {

4+ services.thelounge = {

5+ enable = true;

6+ plugins = [ pkgs.theLoungePlugins.themes.solarized ];

7+ };

8+ };

9+

10+ public = { config, pkgs, ... }: {

11+ services.thelounge = {

12+ enable = true;

13+ public = true;

14+ };

15+ };

16+ };

17+

18+ testScript = ''

19+ start_all()

20+

21+ for machine in machines:

22+ machine.wait_for_unit("thelounge.service")

23+ machine.wait_for_open_port(9000)

24+

25+ private.wait_until_succeeds("journalctl -u thelounge.service | grep thelounge-theme-solarized")

26+ private.wait_until_succeeds("journalctl -u thelounge.service | grep 'in private mode'")

27+ public.wait_until_succeeds("journalctl -u thelounge.service | grep 'in public mode'")

28+ '';

29+}

nixos/tests/tsm-client-gui.nixnew file+57

@@ -0,0 +1,57 @@

1+# The tsm-client GUI first tries to connect to a server.

2+# We can't simulate a server, so we just check if

3+# it reports the correct connection failure error.

4+# After that the test persuades the GUI

5+# to show its main application window

6+# and verifies some configuration information.

7+

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

9+ name = "tsm-client";

10+

11+ enableOCR = true;

12+

13+ machine = { pkgs, ... }: {

14+ imports = [ ./common/x11.nix ];

15+ programs.tsmClient = {

16+ enable = true;

17+ package = pkgs.tsm-client-withGui;

18+ defaultServername = "testserver";

19+ servers.testserver = {

20+ # 192.0.0.8 is a "dummy address" according to RFC 7600

21+ server = "192.0.0.8";

22+ node = "SOME-NODE";

23+ passwdDir = "/tmp";

24+ };

25+ };

26+ };

27+

28+ testScript = ''

29+ machine.succeed("which dsmj") # fail early if this is missing

30+ machine.wait_for_x()

31+ machine.execute("DSM_LOG=/tmp dsmj -optfile=/dev/null >&2 &")

32+

33+ # does it report the "TCP/IP connection failure" error code?

34+ machine.wait_for_window("IBM Spectrum Protect")

35+ machine.wait_for_text("ANS2610S")

36+ machine.send_key("esc")

37+

38+ # it asks to continue to restore a local backupset now;

39+ # "yes" (return) leads to the main application window

40+ machine.wait_for_text("backupset")

41+ machine.send_key("ret")

42+

43+ # main window: navigate to "Connection Information"

44+ machine.wait_for_text("Welcome")

45+ machine.send_key("alt-f") # "File" menu

46+ machine.send_key("c") # "Connection Information"

47+

48+ # "Connection Information" dialog box

49+ machine.wait_for_window("Connection Information")

50+ machine.wait_for_text("SOME-NODE")

51+ machine.wait_for_text("${pkgs.tsm-client.passthru.unwrapped.version}")

52+

53+ machine.shutdown()

54+ '';

55+

56+ meta.maintainers = [ lib.maintainers.yarny ];

57+})

pkgs/applications/audio/aumix/default.nix+11

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchurl

4+, fetchpatch

45, gettext

56, ncurses

67, gtkGUI ? false

@@ -17,6 +18,16 @@ stdenv.mkDerivation rec {

1718 sha256 = "0a8fwyxnc5qdxff8sl2sfsbnvgh6pkij4yafiln0fxgg6bal7knj";

1819 };

1920

21+ patches = [

22+ # Pull Gentoo fix for -fno-common toolchains. Upstream does not

23+ # seem to have the contacts

24+ (fetchpatch {

25+ name = "fno-common.patch";

26+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/aumix/files/aumix-2.9.1-fno-common.patch?id=496c9ec7355f06f6d1d19be780a6981503e6df1f";

27+ sha256 = "0qwylhx1hawsmx1pc7ykrjq9phksc73dq9rss6ggq15n3ggnc95y";

28+ })

29+ ];

30+

2031 buildInputs = [ gettext ncurses ]

2132 ++ lib.optionals gtkGUI [ pkg-config gtk2 ];

2233

pkgs/applications/audio/bespokesynth/default.nix+113−85

@@ -1,40 +1,46 @@

1−{ lib, stdenv, fetchFromGitHub, pkg-config, fetchzip

2−, libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor

3−, libGL, python3, ncurses, libusb1

4−, gtk3, webkitgtk, curl, xvfb-run, makeWrapper

5− # "Debug", or "Release"

6−, buildType ? "Release"

1+{ lib

2+, stdenv

3+, fetchFromGitHub

4+, fetchzip

5+, cmake

6+, pkg-config

7+, ninja

8+, makeWrapper

9+, libjack2

10+, alsa-lib

11+, alsa-tools

12+, freetype

13+, libusb1

14+, libX11

15+, libXrandr

16+, libXinerama

17+, libXext

18+, libXcursor

19+, libXScrnSaver

20+, libGL

21+, libxcb

22+, xcbutil

23+, libxkbcommon

24+, xcbutilkeysyms

25+, xcb-util-cursor

26+, gtk3

27+, webkitgtk

28+, python3

29+, curl

30+, pcre

31+, mount

32+, gnome

33+, Cocoa

34+, WebKit

35+, CoreServices

36+, CoreAudioKit

37+ # It is not allowed to distribute binaries with the VST2 SDK plugin without a license

38+ # (the author of Bespoke has such a licence but not Nix). VST3 should work out of the box.

39+ # Read more in https://github.com/NixOS/nixpkgs/issues/145607

40+, enableVST2 ? false

741}:

842

943let

10− projucer = stdenv.mkDerivation rec {

11− pname = "projucer";

12− version = "5.4.7";

13−

14− src = fetchFromGitHub {

15− owner = "juce-framework";

16− repo = "JUCE";

17− rev = version;

18− sha256= "0qpiqfwwpcghk7ij6w4vy9ywr3ryg7ppg77bmd7783kxg6zbhj8h";

19− };

20−

21− nativeBuildInputs = [ pkg-config ];

22− buildInputs = [

23− freetype libX11 libXrandr libXinerama libXext gtk3 webkitgtk

24− libjack2 curl

25− ];

26− preBuild = ''

27− cd extras/Projucer/Builds/LinuxMakefile

28− '';

29− makeFlags = [ "CONFIG=${buildType}" ];

30− enableParallelBuilding = true;

31−

32− installPhase = ''

33− mkdir -p $out/bin

34− cp -a build/Projucer $out/bin/Projucer

35− '';

36− };

37−

3844 # equal to vst-sdk in ../oxefmsynth/default.nix

3945 vst-sdk = stdenv.mkDerivation rec {

4046 name = "vstsdk3610_11_06_2018_build_37";

@@ -50,70 +56,92 @@ let

5056in

5157stdenv.mkDerivation rec {

5258 pname = "bespokesynth";

53− version = "1.0.0";

59+ version = "1.1.0";

5460

5561 src = fetchFromGitHub {

56− owner = "awwbees";

62+ owner = "BespokeSynth";

5763 repo = pname;

5864 rev = "v${version}";

59− sha256 = "04b2m40jszphslkd4850jcb8qwls392lwy3lc6vlj01h4izvapqk";

65+ sha256 = "sha256-PN0Q6/gI1PeMaF/8EZFGJdLR8JVHQZfWunAhOIQxkHw=";

66+ fetchSubmodules = true;

6067 };

6168

62− configurePhase = ''

63− runHook preConfigure

64−

65− export HOME=$(mktemp -d)

66− xvfb-run sh -e <<EOF

67− ${projucer}/bin/Projucer --set-global-search-path linux defaultJuceModulePath ${projucer.src}/modules

68− ${projucer}/bin/Projucer --resave BespokeSynth.jucer

69− EOF

70−

71− runHook postConfigure

72− '';

73− CFLAGS = "-I${vst-sdk}/VST2_SDK";

74−

75− nativeBuildInputs = [ xvfb-run pkg-config python3 makeWrapper ];

76−

77− buildInputs = [

78− libX11 libXrandr libXinerama libXext libXcursor freetype libGL

79− ncurses libusb1

80− alsa-lib libjack2

69+ cmakeBuildType = "Release";

70+

71+ cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ];

72+

73+ nativeBuildInputs = [ python3 makeWrapper cmake pkg-config ninja ];

74+

75+ buildInputs = lib.optionals stdenv.hostPlatform.isLinux [

76+ # List obtained in https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml

77+ libX11

78+ libXrandr

79+ libXinerama

80+ libXext

81+ libXcursor

82+ libXScrnSaver

83+ curl

84+ gtk3

85+ webkitgtk

86+ freetype

87+ libGL

88+ libusb1

89+ alsa-lib

90+ libjack2

91+ gnome.zenity

92+ alsa-tools

93+ libxcb

94+ xcbutil

95+ libxkbcommon

96+ xcbutilkeysyms

97+ xcb-util-cursor

98+ pcre

99+ mount

100+ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

101+ Cocoa

102+ WebKit

103+ CoreServices

104+ CoreAudioKit

81105 ];

82106

83− preBuild = ''

84− cd Builds/LinuxMakefile

85− '';

86− makeFlags = [ "CONFIG=${buildType}" ];

87− enableParallelBuilding = true;

88−

89− installPhase = ''

90− runHook preInstall

91−

92− mkdir -p $out/bin $out/share/bespokesynth $out/share/applications $out/share/icons/hicolor/512x512/apps

93− cp build/BespokeSynth $out/bin/

94− cp -ar ../MacOSX/build/Release/resource $out/share/bespokesynth/

95− wrapProgram $out/bin/BespokeSynth \

96− --run "cd $out/share/bespokesynth"

97−

98− mkdir -p $out/share/applications/ $out/share/icons/hicolor/512x512/apps/

99− cp ../../bespoke_icon.png $out/share/icons/hicolor/512x512/apps/

100− substitute ../../BespokeSynth.desktop $out/share/applications/BespokseSynth.desktop \

101− --replace "/usr/bin/" ""

102−

103− runHook postInstall

104− '';

107+ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [

108+ # Fails to find fp.h on its own

109+ "-isystem ${CoreServices}/Library/Frameworks/CoreServices.framework/Versions/Current/Frameworks/CarbonCore.framework/Versions/Current/Headers/"

110+ ]);

111+

112+ postInstall =

113+ if stdenv.hostPlatform.isDarwin then ''

114+ mkdir -p $out/{Applications,bin}

115+ mv Source/BespokeSynth_artefacts/${cmakeBuildType}/BespokeSynth.app $out/Applications/

116+ # Symlinking confuses the resource finding about the actual location of the binary

117+ # Resources are looked up relative to the executed file's location

118+ makeWrapper $out/{Applications/BespokeSynth.app/Contents/MacOS,bin}/BespokeSynth

119+ '' else ''

120+ # Ensure zenity is available, or it won't be able to open new files.

121+ # Ensure the python used for compilation is the same as the python used at run-time.

122+ # jedi is also required for auto-completion.

123+ # These X11 libs get dlopen'd, they cause visual bugs when unavailable.

124+ wrapProgram $out/bin/BespokeSynth \

125+ --prefix PATH : '${lib.makeBinPath [

126+ gnome.zenity

127+ (python3.withPackages (ps: with ps; [ jedi ]))

128+ ]}' \

129+ --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [

130+ libXrandr

131+ libXinerama

132+ libXcursor

133+ libXScrnSaver

134+ ]}'

135+ '';

105136

106137 meta = with lib; {

107− description = "Software modular synth with controllers support, scripting and VST";

138+ description =

139+ "Software modular synth with controllers support, scripting and VST";

108140 homepage = "https://github.com/awwbees/BespokeSynth";

109141 license = with licenses; [

110142 gpl3Plus

111−

112− # This package is unfree and not distributable due to the license of VST2.

113− # see #145607

114− unfree

115− ];

116− maintainers = with maintainers; [ astro ];

143+ ] ++ lib.optional enableVST2 unfree;

144+ maintainers = with maintainers; [ astro tobiasBora OPNA2608 ];

117145 platforms = platforms.all;

118146 };

119147}

pkgs/applications/audio/rhvoice/default.nix+2−2

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

11{ stdenv, lib, pkg-config, fetchFromGitHub, sconsPackages

2−, python, glibmm, libpulseaudio, libao }:

2+, glibmm, libpulseaudio, libao }:

33

44let

55 version = "unstable-2018-02-10";

@@ -19,7 +19,7 @@ in stdenv.mkDerivation {

1919 ];

2020

2121 buildInputs = [

22− python glibmm libpulseaudio libao

22+ glibmm libpulseaudio libao

2323 ];

2424

2525 # SConstruct patch

pkgs/applications/audio/schismtracker/default.nix+2−2

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

33, fetchFromGitHub

44, autoreconfHook

55, alsa-lib

6−, python

6+, python3

77, SDL

88}:

99

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

2121 configureFlags = [ "--enable-dependency-tracking" ]

2222 ++ lib.optional stdenv.isDarwin "--disable-sdltest";

2323

24− nativeBuildInputs = [ autoreconfHook python ];

24+ nativeBuildInputs = [ autoreconfHook python3 ];

2525

2626 buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib;

2727

pkgs/applications/audio/sorcer/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config, python }:

1+{ lib, stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkg-config }:

22

33stdenv.mkDerivation rec {

44 pname = "sorcer";

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

1212 };

1313

1414 nativeBuildInputs = [ cmake pkg-config ];

15− buildInputs = [ boost cairomm libsndfile lv2 ntk python ];

15+ buildInputs = [ boost cairomm libsndfile lv2 ntk ];

1616

1717 postPatch = ''

1818 # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72

pkgs/applications/audio/split2flac/default.nix+2−2

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

11{ lib, stdenv, fetchFromGitHub, makeWrapper

22, shntool, cuetools

33, flac, faac, mp4v2, wavpack, mac

4−, imagemagick, libiconv, enca, lame, pythonPackages, vorbis-tools

4+, imagemagick, libiconv, enca, lame, mutagen, vorbis-tools

55, aacgain, mp3gain, vorbisgain

66}:

77

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

1212 --prefix PATH : ${lib.makeBinPath [

1313 shntool cuetools

1414 flac faac mp4v2 wavpack mac

15− imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools

15+ imagemagick libiconv enca lame mutagen vorbis-tools

1616 aacgain mp3gain vorbisgain

1717 ]}

1818 '';

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

@@ -21,19 +21,19 @@

2121

2222stdenv.mkDerivation rec {

2323 pname = "spot";

24− version = "0.2.2";

24+ version = "0.3.0";

2525

2626 src = fetchFromGitHub {

2727 owner = "xou816";

2828 repo = "spot";

2929 rev = version;

30− hash = "sha256-g0oVhlfez9i+Vv8lt/aNftCVqdgPMDySBBeLyOv7Zl8=";

30+ hash = "sha256-An9PJsuXZkvJhP67cisWxFd2dpky53EY/xcR6StgWFY=";

3131 };

3232

3333 cargoDeps = rustPlatform.fetchCargoTarball {

3434 inherit src;

3535 name = "${pname}-${version}";

36− hash = "sha256-n10aYzkRqEe1h2WPAfARjH79Npvv+3fdX9jCtxv2a34=";

36+ hash = "sha256-2qMmPIBoZS6WT06VzCmnYWaIfLzWN2HUvk7y9GKuuXg=";

3737 };

3838

3939 nativeBuildInputs = [

pkgs/applications/blockchains/btcpayserver/default.nix+1−1

@@ -26,7 +26,7 @@ buildDotnetModule rec {

2626 makeWrapperArgs+=(--run "cd $out/lib/btcpayserver")

2727 '';

2828

29− postInstall = ''

29+ postFixup = ''

3030 mv $out/bin/{BTCPayServer,btcpayserver}

3131 '';

3232

pkgs/applications/blockchains/chia-plotter/default.nix+2−2

@@ -4,7 +4,7 @@

44, libsodium

55, cmake

66, substituteAll

7−, pythonPackages

7+, python3Packages

88}:

99

1010stdenv.mkDerivation {

@@ -23,7 +23,7 @@ stdenv.mkDerivation {

2323 # prevent CMake from trying to get libraries on the Internet

2424 (substituteAll {

2525 src = ./dont_fetch_dependencies.patch;

26− pybind11_src = pythonPackages.pybind11.src;

26+ pybind11_src = python3Packages.pybind11.src;

2727 relic_src = fetchFromGitHub {

2828 owner = "relic-toolkit";

2929 repo = "relic";

pkgs/applications/blockchains/nbxplorer/default.nix+1−1

@@ -17,7 +17,7 @@ buildDotnetModule rec {

1717 dotnet-sdk = dotnetCorePackages.sdk_3_1;

1818 dotnet-runtime = dotnetCorePackages.aspnetcore_3_1;

1919

20− postInstall = ''

20+ postFixup = ''

2121 mv $out/bin/{NBXplorer,nbxplorer}

2222 '';

2323

pkgs/applications/blockchains/wasabibackend/default.nix+1−1

@@ -36,7 +36,7 @@ buildDotnetModule rec {

3636 )

3737 '';

3838

39− postInstall = ''

39+ postFixup = ''

4040 mv $out/bin/WalletWasabi.Backend $out/bin/WasabiBackend

4141 '';

4242

pkgs/applications/blockchains/zcash/default.nix+3−3

@@ -6,16 +6,16 @@

66

77rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {

88 pname = "zcash";

9− version = "4.5.1";

9+ version = "4.6.0-1";

1010

1111 src = fetchFromGitHub {

1212 owner = "zcash";

1313 repo = "zcash";

1414 rev = "v${version}";

15− sha256 = "0kyk3hv1y13b3vwg9kjcrpvz9v3l8lp0ikj977nykd5ms8b1rifa";

15+ sha256 = "sha256-YJ5ufo+LYbOTr9SyiEzzp1pcSx6+cHSvDLBOIcx9X+4=";

1616 };

1717

18− cargoSha256 = "1mwprsg74xv6qlxf00w7xapnkisb1aid9hkyr8r90zcwdcy8783r";

18+ cargoSha256 = "sha256-m/SBHv3BNYKkSXxHnCdVng3blbHrTc/HxX/nEIa1DnM=";

1919

2020 nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];

2121 buildInputs = [ boost175 libevent libsodium utf8cpp ]

pkgs/applications/editors/cudatext/default.nix+2−2

@@ -38,13 +38,13 @@ let

3838in

3939stdenv.mkDerivation rec {

4040 pname = "cudatext";

41− version = "1.152.1";

41+ version = "1.153.0";

4242

4343 src = fetchFromGitHub {

4444 owner = "Alexey-T";

4545 repo = "CudaText";

4646 rev = version;

47− sha256 = "sha256-rFmgf/wg6/jIObBDN+viKX3KrewVWgxs8uVF1gCY72s=";

47+ sha256 = "sha256-3p5wb3buZtd1gnNoEJOclNO8xEYJBZYc86HfrkFrBWU=";

4848 };

4949

5050 postPatch = ''

pkgs/applications/editors/cudatext/deps.json+8−8

@@ -16,23 +16,23 @@

1616 },

1717 "ATSynEdit": {

1818 "owner": "Alexey-T",

19− "rev": "2021.12.22",

20− "sha256": "sha256-MmRJ3XDq7b9doPFfW7njSOasHej5ut0nYcJMFj+Y/Dc="

19+ "rev": "2022.01.07",

20+ "sha256": "sha256-KxeaTXv0qig3O2hqjJ5HG1KCN0TTQdnd3g9jBsEc0a4="

2121 },

2222 "ATSynEdit_Cmp": {

2323 "owner": "Alexey-T",

24− "rev": "2021.09.14",

25− "sha256": "sha256-6eC75zAtWbM1XEI9OM3iqy/a8Vj1l5WU7HGJBpmoQsA="

24+ "rev": "2021.12.28",

25+ "sha256": "sha256-bXTjPdn0DIVTdoi30Ws5+M+UsC7F99IphMSTpI5ia/Q="

2626 },

2727 "EControl": {

2828 "owner": "Alexey-T",

29− "rev": "2021.12.07",

30− "sha256": "sha256-givCklAHao26psWLI2qK246igxcAQEeIYTGH61FX6Xo="

29+ "rev": "2022.01.07",

30+ "sha256": "sha256-dgkyXrFs2hzuFjt9GW+WNyrLIp/i/AbRsM/MyMbatdA="

3131 },

3232 "ATSynEdit_Ex": {

3333 "owner": "Alexey-T",

34− "rev": "2021.12.07",

35− "sha256": "sha256-/2Fv/vrpbHSiJro11cjbziUaT4gfwa6y5aQBoYgq3OQ="

34+ "rev": "2022.01.07",

35+ "sha256": "sha256-7QDHf0PYGMc611qrk+a8pNJHF1v1DFMWlt5hbaU/oD8="

3636 },

3737 "Python-for-Lazarus": {

3838 "owner": "Alexey-T",

pkgs/applications/editors/netbeans/default.nix+2−2

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

11{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, which, unzip, libicns, imagemagick

2−, jdk, perl, python

2+, jdk, perl

33}:

44

55let

@@ -58,7 +58,7 @@ stdenv.mkDerivation {

5858 '';

5959

6060 nativeBuildInputs = [ makeWrapper unzip ];

61− buildInputs = [ perl python libicns imagemagick ];

61+ buildInputs = [ perl libicns imagemagick ];

6262

6363 meta = {

6464 description = "An integrated development environment for Java, C, C++ and PHP";

pkgs/applications/editors/rstudio/default.nix+162−141

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

11{ lib

2+, stdenv

23, mkDerivation

34, fetchurl

45, fetchpatch

@@ -30,6 +31,9 @@

3031, nodejs

3132, mkYarnModules

3233, qmake

34+, server ? false # build server version

35+, sqlite

36+, pam

3337}:

3438

3539let

@@ -61,149 +65,166 @@ let

6165 panmirrorModules = mkYarnModules {

6266 inherit pname version;

6367 packageJSON = ./package.json;

64− yarnLock = ./yarn.lock;

68+ yarnLock = ./yarn.lock;

6569 yarnNix = ./yarndeps.nix;

6670 };

6771

72+ description = "Set of integrated tools for the R language";

6873in

69−mkDerivation rec {

70− inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH;

71−

72− nativeBuildInputs = [

73− cmake

74− unzip

75− ant

76− jdk

77− makeWrapper

78− pandoc

79− nodejs

80− copyDesktopItems

81− ];

82−

83− buildInputs = [

84− boost

85− zlib

86− openssl

87− R

88− qtbase

89− qtxmlpatterns

90− qtsensors

91− qtwebengine

92− qtwebchannel

93− libuuid

94− libyamlcpp

95− soci

96− postgresql

97− ];

98−

99− cmakeFlags = [

100− "-DRSTUDIO_TARGET=Desktop"

101− "-DCMAKE_BUILD_TYPE=Release"

102− "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"

103− "-DRSTUDIO_USE_SYSTEM_SOCI=ON"

104− "-DRSTUDIO_USE_SYSTEM_BOOST=ON"

105− "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"

106− "-DPANDOC_VERSION=${pandoc.version}"

107− "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"

108− ];

109−

110− # Hack RStudio to only use the input R and provided libclang.

111− patches = [

112− ./r-location.patch

113− ./clang-location.patch

114− # postFetch doesn't work with this | error: unexpected end-of-file

115− # replacing /usr/bin/node is done in postPatch

116− # https://src.fedoraproject.org/rpms/rstudio/tree/rawhide

117− (fetchpatch {

118− name = "system-node.patch";

119− url = "https://src.fedoraproject.org/rpms/rstudio/raw/5bda2e290c9e72305582f2011040938d3e356906/f/0004-use-system-node.patch";

120− sha256 = "sha256-P1Y07RB/ceFNa749nyBUWSE41eiiZgt43zVcmahvfZM=";

121− })

122− ];

123−

124− postPatch = ''

125− substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}

126−

127− substituteInPlace src/cpp/CMakeLists.txt \

128− --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"'

129−

130− substituteInPlace src/gwt/build.xml \

131− --replace '/usr/bin/node' '${nodejs}/bin/node'

132−

133− substituteInPlace src/cpp/core/libclang/LibClang.cpp \

134− --replace '@libclang@' ${llvmPackages.libclang.lib} \

135− --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so

136−

137− substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \

138− --replace "bin/pandoc" "${pandoc}/bin/pandoc"

139− '';

140−

141− hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts));

142− # These dicts contain identically-named dict files, so we only keep the

143− # -large versions in case of clashes

144− largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries;

145− otherDicts = with lib; filter

146− (d: !(hasAttr "dictFileName" d &&

147− elem d.dictFileName (map (d: d.dictFileName) largeDicts)))

148− hunspellDictionaries;

149− dictionaries = largeDicts ++ otherDicts;

150−

151− preConfigure = ''

152− mkdir dependencies/dictionaries

153− for dict in ${builtins.concatStringsSep " " dictionaries}; do

154− for i in "$dict/share/hunspell/"*; do

155− ln -s $i dependencies/dictionaries/

74+(if server then stdenv.mkDerivation else mkDerivation)

75+ (rec {

76+ inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH;

77+

78+ nativeBuildInputs = [

79+ cmake

80+ unzip

81+ ant

82+ jdk

83+ makeWrapper

84+ pandoc

85+ nodejs

86+ ] ++ lib.optional (!server) [

87+ copyDesktopItems

88+ ];

89+

90+ buildInputs = [

91+ boost

92+ zlib

93+ openssl

94+ R

95+ libuuid

96+ libyamlcpp

97+ soci

98+ postgresql

99+ ] ++ (if server then [

100+ sqlite.dev

101+ pam

102+ ] else [

103+ qtbase

104+ qtxmlpatterns

105+ qtsensors

106+ qtwebengine

107+ qtwebchannel

108+ ]);

109+

110+ cmakeFlags = [

111+ "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"

112+ "-DCMAKE_BUILD_TYPE=Release"

113+ "-DRSTUDIO_USE_SYSTEM_SOCI=ON"

114+ "-DRSTUDIO_USE_SYSTEM_BOOST=ON"

115+ "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"

116+ "-DPANDOC_VERSION=${pandoc.version}"

117+ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"

118+ ] ++ lib.optional (!server) [

119+ "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"

120+ ];

121+

122+ # Hack RStudio to only use the input R and provided libclang.

123+ patches = [

124+ ./r-location.patch

125+ ./clang-location.patch

126+ # postFetch doesn't work with this | error: unexpected end-of-file

127+ # replacing /usr/bin/node is done in postPatch

128+ # https://src.fedoraproject.org/rpms/rstudio/tree/rawhide

129+ (fetchpatch {

130+ name = "system-node.patch";

131+ url = "https://src.fedoraproject.org/rpms/rstudio/raw/5bda2e290c9e72305582f2011040938d3e356906/f/0004-use-system-node.patch";

132+ sha256 = "sha256-P1Y07RB/ceFNa749nyBUWSE41eiiZgt43zVcmahvfZM=";

133+ })

134+ ];

135+

136+ postPatch = ''

137+ substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}

138+

139+ substituteInPlace src/cpp/CMakeLists.txt \

140+ --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"'

141+

142+ substituteInPlace src/gwt/build.xml \

143+ --replace '/usr/bin/node' '${nodejs}/bin/node'

144+

145+ substituteInPlace src/cpp/core/libclang/LibClang.cpp \

146+ --replace '@libclang@' ${llvmPackages.libclang.lib} \

147+ --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so

148+

149+ substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \

150+ --replace "bin/pandoc" "${pandoc}/bin/pandoc"

151+ '';

152+

153+ hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts));

154+ # These dicts contain identically-named dict files, so we only keep the

155+ # -large versions in case of clashes

156+ largeDicts = with lib; filter (d: hasInfix "-large-wordlist" d) hunspellDictionaries;

157+ otherDicts = with lib; filter

158+ (d: !(hasAttr "dictFileName" d &&

159+ elem d.dictFileName (map (d: d.dictFileName) largeDicts)))

160+ hunspellDictionaries;

161+ dictionaries = largeDicts ++ otherDicts;

162+

163+ preConfigure = ''

164+ mkdir dependencies/dictionaries

165+ for dict in ${builtins.concatStringsSep " " dictionaries}; do

166+ for i in "$dict/share/hunspell/"*; do

167+ ln -s $i dependencies/dictionaries/

168+ done

156169 done

157− done

158−

159− unzip -q ${mathJaxSrc} -d dependencies/mathjax-27

160−

161− mkdir -p dependencies/pandoc/${pandoc.version}

162− cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc

163−

164− cp -r ${rsconnectSrc} dependencies/rsconnect

165− ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )

166−

167− cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules

168− '';

169−

170− postInstall = ''

171− mkdir -p $out/share/icons/hicolor/48x48/apps $out/bin

172− ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps

173−

174− for f in {diagnostics,rpostback,rstudio}; do

175− ln -s $out/lib/rstudio/bin/$f $out/bin

176− done

177−

178− for f in .gitignore .Rbuildignore LICENSE README; do

179− find . -name $f -delete

180− done

181− rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}

182− rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc}

183− '';

184−

185− qtWrapperArgs = [

186− "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"

187− ];

188−

189− desktopItems = [

190− (makeDesktopItem {

191− name = "${pname}";

192− exec = "rstudio %F";

193− icon = "rstudio";

194− desktopName = "RStudio";

195− genericName = "IDE";

196− comment = meta.description;

197− categories = "Development;";

198− mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";

199− })

200− ];

201−

202− meta = with lib; {

203− description = "Set of integrated tools for the R language";

204− homepage = "https://www.rstudio.com/";

205− license = licenses.agpl3Only;

206− maintainers = with maintainers; [ ciil ];

207− platforms = platforms.linux;

208− };

209−}

170+

171+ unzip -q ${mathJaxSrc} -d dependencies/mathjax-27

172+

173+ mkdir -p dependencies/pandoc/${pandoc.version}

174+ cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc

175+

176+ cp -r ${rsconnectSrc} dependencies/rsconnect

177+ ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )

178+

179+ cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules

180+ '';

181+

182+ postInstall = ''

183+ mkdir -p $out/bin $out/share

184+

185+ ${lib.optionalString (!server) ''

186+ mkdir -p $out/share/icons/hicolor/48x48/apps

187+ ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps

188+ ''}

189+

190+ for f in {${if server

191+ then "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server"

192+ else "diagnostics,rpostback,rstudio"}}; do

193+ ln -s $out/lib/rstudio/bin/$f $out/bin

194+ done

195+

196+ for f in .gitignore .Rbuildignore LICENSE README; do

197+ find . -name $f -delete

198+ done

199+ rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}

200+ rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc}

201+ '';

202+

203+ meta = with lib; {

204+ inherit description;

205+ homepage = "https://www.rstudio.com/";

206+ license = licenses.agpl3Only;

207+ maintainers = with maintainers; [ ciil cfhammill ];

208+ mainProgram = "rstudio" + optionalString server "-server";

209+ platforms = platforms.linux;

210+ };

211+

212+ passthru = { inherit server; };

213+ } // lib.optionalAttrs (!server) {

214+ qtWrapperArgs = [

215+ "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"

216+ ];

217+

218+ desktopItems = [

219+ (makeDesktopItem {

220+ name = pname;

221+ exec = "rstudio %F";

222+ icon = "rstudio";

223+ desktopName = "RStudio";

224+ genericName = "IDE";

225+ comment = description;

226+ categories = "Development;";

227+ mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;";

228+ })

229+ ];

230+ })

pkgs/applications/editors/tiled/default.nix+2−2

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

11{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake

2−, python, qtbase, qttools }:

2+, python2, qtbase, qttools }:

33

44mkDerivation rec {

55 pname = "tiled";

@@ -13,7 +13,7 @@ mkDerivation rec {

1313 };

1414

1515 nativeBuildInputs = [ pkg-config qmake ];

16− buildInputs = [ python qtbase qttools ];

16+ buildInputs = [ python2 qtbase qttools ];

1717

1818 meta = with lib; {

1919 description = "Free, easy to use and flexible tile map editor";

pkgs/applications/editors/wxhexeditor/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python, gettext }:

1+{ lib, stdenv, fetchFromGitHub, fetchpatch, wxGTK, autoconf, automake, libtool, python2, gettext }:

22

33stdenv.mkDerivation rec {

44 pname = "wxHexEditor";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";

1212 };

1313

14− buildInputs = [ wxGTK autoconf automake libtool python gettext ];

14+ buildInputs = [ wxGTK autoconf automake libtool python2 gettext ];

1515

1616 preConfigure = "patchShebangs .";

1717

pkgs/applications/graphics/inkscape/default.nix+8

@@ -81,6 +81,14 @@ stdenv.mkDerivation rec {

8181 stripLen = 1;

8282 extraPrefix = "share/extensions/";

8383 })

84+ # Remove mandatory break from end of paragraphs, added in Pango 1.49

85+ # https://gitlab.com/inkscape/inkscape/-/merge_requests/3630

86+ # TODO: Remove in Inkscape 1.1.2

87+ (fetchpatch {

88+ url = "https://gitlab.com/inkscape/inkscape/-/commit/b3dabef2245d4e4e977ee9d6776be9a134493515.patch";

89+ sha256 = "YhqUlRBKL1vJ/iCM/DvdwbmPIsAHQpcgf4TPpjlnBng=";

90+ })

91+

8492 ];

8593

8694 postPatch = ''

pkgs/applications/graphics/krita/default.nix+2−2

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

11{ callPackage, ... } @ args:

22

33callPackage ./generic.nix (args // {

4− version = "5.0.0";

4+ version = "5.0.2";

55 kde-channel = "stable";

6− sha256 = "sha256-hNWDPbyrP9OkGPTDdnDYKtkZQw8MbQpXuZOQdHHuzFc=";

6+ sha256 = "sha256-5nUfx+tQSXekiAo3brvTmVyH2tFUSGCE6COX5l1JnL8=";

77})

pkgs/applications/graphics/pinta/default.nix+39−42

@@ -2,23 +2,23 @@

22, buildDotnetModule

33, dotnetCorePackages

44, fetchFromGitHub

5+, glibcLocales

56, gtk3

6−, installShellFiles

7−, librsvg

8−, makeDesktopItem

7+, intltool

98, wrapGAppsHook

109}:

1110

1211buildDotnetModule rec {

1312 pname = "Pinta";

14− version = "2.0.1";

13+ version = "2.0.2";

1514

1615 nativeBuildInputs = [

17− installShellFiles

16+ intltool

1817 wrapGAppsHook

1918 ];

2019

2120 runtimeDeps = [ gtk3 ];

21+ buildInputs = runtimeDeps;

2222

2323 dotnet-sdk = dotnetCorePackages.sdk_6_0;

2424 dotnet-runtime = dotnetCorePackages.runtime_6_0;

@@ -26,7 +26,7 @@ buildDotnetModule rec {

2626 # How-to update deps:

2727 # $ nix-build -A pinta.fetch-deps

2828 # $ ./result

29− # $ cp /tmp/Pinta-deps.nix ./pkgs/applications/graphics/pinta/default.nix

29+ # $ cp /tmp/Pinta-deps.nix ./pkgs/applications/graphics/pinta/deps.nix

3030 # TODO: create update script

3131 nugetDeps = ./deps.nix;

3232

@@ -36,52 +36,49 @@ buildDotnetModule rec {

3636 owner = "PintaProject";

3737 repo = "Pinta";

3838 rev = version;

39− sha256 = "sha256-iOKJPB2bI/GjeDxzG7r6ew7SGIzgrJTcRXhEYzOpC9k=";

39+ sha256 = "sha256-Bvzs1beq7I1+10w9pmMePqGCz2TPDp5UK5Wa9hbKERU=";

4040 };

4141

42− # FIXME: this should be propagated by wrapGAppsHook already, however for some

43− # reason it is not working. Maybe a bug in buildDotnetModule?

44− preInstall = ''

45− gappsWrapperArgs+=(

46− --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}"

47− --set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache

48− )

49− '';

50−

51− postInstall = ''

52− # Rename the binary

53− mv $out/bin/Pinta $out/bin/pinta

42+ # https://github.com/NixOS/nixpkgs/issues/38991

43+ # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)

44+ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";

5445

55− # Copy desktop icons

56− for size in 16x16 22x22 24x24 32x32 96x96 scalable; do

57− mkdir -p $out/share/icons/hicolor/$size/apps

58− cp xdg/$size/* $out/share/icons/hicolor/$size/apps/

59− done

46+ # Do the autoreconf/Makefile job manually

47+ # TODO: use upstream build system

48+ postBuild = ''

49+ # Substitute translation placeholders

50+ intltool-merge -x po/ xdg/pinta.appdata.xml.in xdg/pinta.appdata.xml

51+ intltool-merge -d po/ xdg/pinta.desktop.in xdg/pinta.desktop

6052

61− # Copy runtime icons

62− cp -r Pinta.Resources/icons/hicolor/16x16/* $out/share/icons/hicolor/16x16/

53+ # Build translations

54+ dotnet build Pinta \

55+ -p:ContinuousIntegrationBuild=true \

56+ -p:Deterministic=true \

57+ -target:CompileTranslations,PublishTranslations \

58+ -p:BuildTranslations=true \

59+ -p:PublishDir="$NIX_BUILD_TOP/source/publish"

60+ '';

6361

64− # Install manpage

65− installManPage xdg/pinta.1

62+ postFixup = ''

63+ # Rename the binary

64+ mv "$out/bin/Pinta" "$out/bin/pinta"

6665

67− # Fix and copy desktop file

68− # TODO: fix this propely by using the autoreconf+pkg-config build system

69− # from upstream

70− mkdir -p $out/share/applications

71− substitute xdg/pinta.desktop.in $out/share/applications/Pinta.desktop \

72− --replace _Name Name \

73− --replace _Comment Comment \

74− --replace _GenericName GenericName \

75− --replace _X-GNOME-FullName X-GNOME-FullName \

76− --replace _Keywords Keywords

66+ # Install

67+ dotnet build installer/linux/install.proj \

68+ -target:Install \

69+ -p:ContinuousIntegrationBuild=true \

70+ -p:Deterministic=true \

71+ -p:SourceDir="$NIX_BUILD_TOP/source" \

72+ -p:PublishDir="$NIX_BUILD_TOP/source/publish" \

73+ -p:InstallPrefix="$out"

7774 '';

7875

79− meta = {

76+ meta = with lib; {

8077 homepage = "https://www.pinta-project.com/";

8178 description = "Drawing/editing program modeled after Paint.NET";

82− license = lib.licenses.mit;

83− maintainers = with lib.maintainers; [ thiagokokada ];

84− platforms = with lib.platforms; linux;

79+ license = licenses.mit;

80+ maintainers = with maintainers; [ thiagokokada ];

81+ platforms = with platforms; linux;

8582 mainProgram = "pinta";

8683 };

8784}

pkgs/applications/graphics/renderdoc/default.nix+28−7

@@ -1,8 +1,25 @@

1−{ lib, fetchFromGitHub, cmake, pkg-config, mkDerivation

2−, qtbase, qtx11extras, qtsvg, makeWrapper

3−, vulkan-loader, libglvnd, xorg, python3, python3Packages

4−, bison, pcre, automake, autoconf, addOpenGLRunpath

5−, waylandSupport ? false, wayland

1+{ lib

2+, fetchFromGitHub

3+, nix-update-script

4+, cmake

5+, pkg-config

6+, mkDerivation

7+, qtbase

8+, qtx11extras

9+, qtsvg

10+, makeWrapper

11+, vulkan-loader

12+, libglvnd

13+, xorg

14+, python3

15+, python3Packages

16+, bison

17+, pcre

18+, automake

19+, autoconf

20+, addOpenGLRunpath

21+, waylandSupport ? false

22+, wayland

623}:

724let

825 custom_swig = fetchFromGitHub {

@@ -15,13 +32,13 @@ let

1532in

1633mkDerivation rec {

1734 pname = "renderdoc";

18− version = "1.16";

35+ version = "1.17";

1936

2037 src = fetchFromGitHub {

2138 owner = "baldurk";

2239 repo = "renderdoc";

2340 rev = "v${version}";

24− sha256 = "150d1qzjs420clqr48gickiw5ymjx4md6iyjbxmxsdml0pyxpwwn";

41+ sha256 = "sha256-Zr7Av49mK48B4N+Ca2vPIgKuVNP4YLVEs4EQepukSs8=";

2542 };

2643

2744 buildInputs = [

@@ -64,6 +81,10 @@ mkDerivation rec {

6481 addOpenGLRunpath $out/lib/librenderdoc.so

6582 '';

6683

84+ passthru.updateScript = nix-update-script {

85+ attrPath = pname;

86+ };

87+

6788 meta = with lib; {

6889 description = "A single-frame graphics debugger";

6990 homepage = "https://renderdoc.org/";

pkgs/applications/graphics/screencloud/default.nix+3−3

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

1−{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, pythonPackages }:

1+{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }:

22

33with lib;

44stdenv.mkDerivation rec {

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {

1818 };

1919

2020 nativeBuildInputs = [ cmake ];

21− buildInputs = [ qt4 quazip qt-mobility qxt pythonPackages.python pythonPackages.pycrypto ];

21+ buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ];

2222

2323 patchPhase = ''

2424 # Required to make the configure script work. Normally, screencloud's

@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {

5959 postInstall = ''

6060 patchShebangs $prefix/opt/screencloud/screencloud.sh

6161 substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"

62− sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pythonPackages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"

62+ sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"

6363 mkdir $prefix/bin

6464 mkdir $prefix/lib

6565 ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud

pkgs/applications/misc/auto-multiple-choice/default.nix+1−1

@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {

8282 XMLWriter

8383 ]}:"$out/share/perl5 \

8484 --prefix XDG_DATA_DIRS : "$out/share" \

85− --set TEXINPUTS ":.:$out/share/texmf/tex/latex/AMC"

85+ --set TEXINPUTS ":.:$out/tex/latex"

8686 '';

8787

8888 nativeBuildInputs = [

pkgs/applications/misc/cubiomes-viewer/default.nixnew file+70

@@ -0,0 +1,70 @@

1+{ lib

2+, stdenv

3+, fetchFromGitHub

4+, qtbase

5+, qmake

6+, wrapQtAppsHook

7+, copyDesktopItems

8+, makeDesktopItem

9+}:

10+

11+stdenv.mkDerivation rec {

12+ pname = "cubiomes-viewer";

13+ version = "1.12.1";

14+

15+ src = fetchFromGitHub {

16+ owner = "Cubitect";

17+ repo = pname;

18+ rev = version;

19+ sha256 = "sha256-F0c6gMQKu35iBNRw+wpoxSUOhRUbPRKIXSNDDNZsfPE=";

20+ fetchSubmodules = true;

21+ };

22+

23+ buildInputs = [

24+ qtbase

25+ ];

26+

27+ nativeBuildInputs = [

28+ qmake

29+ wrapQtAppsHook

30+ copyDesktopItems

31+ ];

32+

33+ desktopItems = [ (makeDesktopItem {

34+ name = pname;

35+ desktopName = "Cubiomes Viewer";

36+ exec = pname;

37+ icon = pname;

38+ categories = "Game";

39+ comment = meta.description;

40+ }) ];

41+

42+ preBuild = ''

43+ # QMAKE_PRE_LINK is not executed (I dont know why)

44+ make -C ./cubiomes libcubiomes CFLAGS="-DSTRUCT_CONFIG_OVERRIDE=1" all

45+ '';

46+

47+ installPhase = ''

48+ runHook preInstall

49+

50+ mkdir -p $out/bin

51+ cp cubiomes-viewer $out/bin

52+

53+ mkdir -p $out/share/pixmaps

54+ cp icons/map.png $out/share/pixmaps/cubiomes-viewer.png

55+

56+ runHook postInstall

57+ '';

58+

59+ meta = with lib; {

60+ homepage = "https://github.com/Cubitect/cubiomes-viewer";

61+ description = "A graphical Minecraft seed finder and map viewer";

62+ longDescription = ''

63+ Cubiomes Viewer provides a graphical interface for the efficient and flexible seed-finding

64+ utilities provided by cubiomes and a map viewer for the Minecraft biomes and structure generation.

65+ '';

66+ platforms = platforms.all;

67+ license = licenses.gpl3Plus;

68+ maintainers = with maintainers; [ hqurve ];

69+ };

70+}

pkgs/applications/misc/haxor-news/default.nix+2−1

@@ -15,7 +15,8 @@ let

1515 sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx";

1616 };

1717 });

18− click = self.callPackage ../../../development/python-modules/click/7.nix { };

18+ # Use click 7

19+ click = self.callPackage ../../../development/python2-modules/click/default.nix { };

1920 };

2021 };

2122in

pkgs/applications/misc/minder/default.nix+4−2

@@ -15,6 +15,7 @@

1515, gtk3

1616, gtksourceview4

1717, hicolor-icon-theme # for setup-hook

18+, json-glib

1819, libarchive

1920, libgee

2021, libhandy

@@ -24,13 +25,13 @@

2425

2526stdenv.mkDerivation rec {

2627 pname = "minder";

27− version = "1.13.1";

28+ version = "1.14.0";

2829

2930 src = fetchFromGitHub {

3031 owner = "phase1geo";

3132 repo = pname;

3233 rev = version;

33− sha256 = "07mq595c1vxwsnwkr2zdci0r06yhs75ph2db09mc63k5fjvi8rya";

34+ sha256 = "sha256-0x+MMVa9/jOVp9n9JFM1MGndh9H9MzmmHepcez4aT+Q=";

3435 };

3536

3637 nativeBuildInputs = [

@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {

5152 gtk3

5253 gtksourceview4

5354 hicolor-icon-theme

55+ json-glib

5456 libarchive

5557 libgee

5658 libhandy

pkgs/applications/misc/ocropus/default.nix+3−3

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

1−{ lib, fetchFromGitHub, fetchurl, pythonPackages, curl }:

1+{ lib, fetchFromGitHub, fetchurl, python2Packages, curl }:

22

33let

44 getmodel = name: sha256: {

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

1717 ];

1818

1919in

20−pythonPackages.buildPythonApplication rec {

20+python2Packages.buildPythonApplication rec {

2121 pname = "ocropus";

2222 version = "1.3.3";

2323

@@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {

2828 owner = "tmbdev";

2929 };

3030

31− propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow

31+ propagatedBuildInputs = with python2Packages; [ curl numpy scipy pillow

3232 matplotlib beautifulsoup4 pygtk lxml ];

3333

3434 enableParallelBuilding = true;

pkgs/applications/misc/pdfdiff/default.nix+4−4

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

1−{ lib, pythonPackages, fetchurl, xpdf }:

1+{ lib, python2Packages, fetchurl, xpdf }:

22let

3− py = pythonPackages;

3+ py = python2Packages;

44in

55py.buildPythonApplication rec {

66 name = "pdfdiff-${version}";

@@ -11,7 +11,7 @@ py.buildPythonApplication rec {

1111 sha256 = "0zxwjjbklz87wkbhkmsvhc7xmv5php7m2a9vm6ydhmhlxsybf836";

1212 };

1313

14− buildInputs = [ pythonPackages.wrapPython ];

14+ buildInputs = [ python2Packages.wrapPython ];

1515

1616 dontConfigure = true;

1717 dontBuild = true;

@@ -29,7 +29,7 @@ py.buildPythonApplication rec {

2929 cp pdfdiff.py $out/bin/pdfdiff

3030 chmod +x $out/bin/pdfdiff

3131

32− substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${pythonPackages.python.interpreter}"

32+ substituteInPlace $out/bin/pdfdiff --replace "#!/usr/bin/python" "#!${python2Packages.python.interpreter}"

3333 '';

3434

3535 meta = with lib; {

pkgs/applications/misc/phwmon/default.nix+4−4

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

1−{ lib, stdenv, fetchFromGitLab, pythonPackages }:

1+{ lib, stdenv, fetchFromGitLab, python2Packages }:

22

33stdenv.mkDerivation {

44 pname = "phwmon";

@@ -11,11 +11,11 @@ stdenv.mkDerivation {

1111 sha256 = "1hqmsq66y8bqkpvszw84jyk8haxq3cjnz105hlkmp7786vfmkisq";

1212 };

1313

14− nativeBuildInputs = [ pythonPackages.wrapPython ];

14+ nativeBuildInputs = [ python2Packages.wrapPython ];

1515

16− buildInputs = [ pythonPackages.pygtk pythonPackages.psutil ];

16+ buildInputs = [ python2Packages.pygtk python2Packages.psutil ];

1717

18− pythonPath = [ pythonPackages.pygtk pythonPackages.psutil ];

18+ pythonPath = [ python2Packages.pygtk python2Packages.psutil ];

1919

2020 patchPhase = ''

2121 substituteInPlace install.sh --replace "/usr/local" "$out"

pkgs/applications/misc/pomotroid/default.nixnew file+60

@@ -0,0 +1,60 @@

1+{ stdenv, lib, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, electron }:

2+

3+let

4+ version = "0.13.0";

5+ appIcon = fetchurl {

6+ url = "https://raw.githubusercontent.com/Splode/pomotroid/v${version}/static/icon.png";

7+ sha256 = "sha256-BEPoOBErw5ZCeK4rtdxdwZZLimbpglu1Cu++4xzuVUs=";

8+ };

9+

10+in stdenv.mkDerivation rec {

11+ pname = "pomotroid";

12+ inherit version;

13+

14+ src = fetchurl {

15+ url = "https://github.com/Splode/pomotroid/releases/download/v${version}/${pname}-${version}-linux.tar.gz";

16+ sha256 = "sha256-AwpVnvwWQd/cgmZvtr5NprnLyeXz6ym4Fywc808tcSc=";

17+ };

18+

19+ nativeBuildInputs = [

20+ makeWrapper

21+ copyDesktopItems

22+ ];

23+

24+ desktopItems = [

25+ (makeDesktopItem {

26+ name = pname;

27+ exec = "pomotroid";

28+ icon = "pomotroid";

29+ comment = meta.description;

30+ desktopName = "Pomotroid";

31+ genericName = "Pomodoro Application";

32+ })

33+ ];

34+

35+ dontConfigure = true;

36+ dontBuild = true;

37+

38+ installPhase = ''

39+ runHook preInstall

40+

41+ mkdir -p $out/opt/pomotroid $out/share/pomotroid $out/share/pixmaps

42+

43+ cp -r ./ $out/opt/pomotroid

44+ mv $out/opt/pomotroid/{locales,resources} $out/share/pomotroid

45+ cp ${appIcon} $out/share/pixmaps/pomotroid.png

46+

47+ makeWrapper ${electron}/bin/electron $out/bin/pomotroid \

48+ --add-flags $out/share/pomotroid/resources/app.asar

49+

50+ runHook postInstall

51+ '';

52+

53+ meta = with lib; {

54+ description = "Simple and visually-pleasing Pomodoro timer";

55+ homepage = "https://splode.github.io/pomotroid";

56+ license = licenses.mit;

57+ maintainers = with maintainers; [ wolfangaukang ];

58+ platforms = [ "x86_64-linux" ];

59+ };

60+}

pkgs/applications/misc/privacyidea/default.nix+2−2

@@ -20,8 +20,8 @@ let

2020 sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38";

2121 };

2222 });

23− werkzeug = self.callPackage ../../../development/python-modules/werkzeug/1.nix { };

24− flask = self.callPackage ../../../development/python-modules/flask/1.nix { };

23+ werkzeug = self.callPackage ../../../development/python2-modules/werkzeug { };

24+ flask = self.callPackage ../../../development/python2-modules/flask { };

2525 sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: {

2626 meta = meta // { broken = false; };

2727 });

pkgs/applications/misc/rofi/wayland.nixnew file+31

@@ -0,0 +1,31 @@

1+{ stdenv

2+, lib

3+, fetchFromGitHub

4+, rofi-unwrapped

5+, wayland-protocols

6+, wayland

7+}:

8+

9+rofi-unwrapped.overrideAttrs (oldAttrs: rec {

10+ pname = "rofi-wayland-unwrapped";

11+ version = "1.7.2+wayland1";

12+

13+ src = fetchFromGitHub {

14+ owner = "lbonn";

15+ repo = "rofi";

16+ rev = version;

17+ fetchSubmodules = true;

18+ sha256 = "sha256-INFYHOVjBNj8ks4UjKnxLW8mL7h1c8ySFPS/rUxOWwo=";

19+ };

20+

21+ nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-protocols ];

22+ buildInputs = oldAttrs.buildInputs ++ [ wayland ];

23+

24+ meta = with lib; {

25+ description = "Window switcher, run dialog and dmenu replacement for Wayland";

26+ homepage = "https://github.com/lbonn/rofi";

27+ license = licenses.mit;

28+ maintainers = with maintainers; [ bew ];

29+ platforms = with platforms; linux;

30+ };

31+})

pkgs/applications/misc/survex/default.nix+2−2

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

99, proj_7

1010, perl532

1111, unscii

12−, python

12+, python2

1313, libGL

1414, libGLU

1515, xlibsWrapper

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {

2626 pname = "survex";

2727 version = "1.2.44";

2828

29− nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python ];

29+ nativeBuildInputs = [ docbook5 docbook2x autoreconfHook pkg-config perlenv python2 ];

3030

3131 buildInputs = [

3232 libGL libGLU ffmpeg proj_7

pkgs/applications/misc/weather/default.nix+3−3

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

1−{ lib, stdenv, fetchurl, pythonPackages, installShellFiles }:

1+{ lib, stdenv, fetchurl, python2Packages, installShellFiles }:

22

33stdenv.mkDerivation rec {

44 version = "2.4.2";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111

1212 nativeBuildInputs = [

1313 installShellFiles

14− pythonPackages.wrapPython

14+ python2Packages.wrapPython

1515 ];

1616

1717 dontConfigure = true;

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {

2020 # Upstream doesn't provide a setup.py or alike, so we follow:

2121 # http://fungi.yuggoth.org/weather/doc/install.rst#id3

2222 installPhase = ''

23− site_packages=$out/${pythonPackages.python.sitePackages}

23+ site_packages=$out/${python2Packages.python.sitePackages}

2424 install -Dt $out/bin -m 755 weather

2525 install -Dt $site_packages weather.py

2626 install -Dt $out/share/weather-util \

pkgs/applications/networking/browsers/chromium/common.nix+11−1

@@ -161,13 +161,23 @@ let

161161 ./patches/no-build-timestamps.patch

162162 # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags:

163163 ./patches/widevine-79.patch

164− ] ++ lib.optionals (versionRange "98" "99") [

164+ ] ++ lib.optionals (versionRange "97" "98") [

165165 # A critical Ozone/Wayland fix:

166+ # (Note: The patch for surface_augmenter.cc doesn't apply on M97 so we extract that part.)

167+ (fetchpatch {

168+ # [linux/wayland] Fixed terminate caused by binding to wrong version.

169+ url = "https://github.com/chromium/chromium/commit/dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d.patch";

170+ excludes = [ "ui/ozone/platform/wayland/host/surface_augmenter.cc" ];

171+ sha256 = "sha256-lp4kxPNAkafdE9NfD3ittTCpomRpX9Hqhtt9GFf4Ntw=";

172+ })

173+ ./patches/m97-ozone-wayland-fix-surface_augmenter.patch

174+ ] ++ lib.optionals (versionRange "98" "99") [

166175 (githubPatch {

167176 # [linux/wayland] Fixed terminate caused by binding to wrong version.

168177 commit = "dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d";

169178 sha256 = "sha256-FH7lBQTruMzkBT2XQ+kgADmJA0AxJfaV/gvtoqfQ4a4=";

170179 })

180+ ] ++ lib.optionals (versionRange "97" "99") [

171181 (githubPatch {

172182 # [linux/wayland] Fixed terminate caused by binding to wrong version. (fixup)

173183 commit = "a84b79daa8897b822336b8f348ef4daaae07af37";

pkgs/applications/networking/browsers/chromium/patches/m97-ozone-wayland-fix-surface_augmenter.patchnew file+31

@@ -0,0 +1,31 @@

1+diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc

2+index d971d15e71426..6e5408398bcea 100644

3+--- a/ui/ozone/platform/wayland/host/surface_augmenter.cc

4++++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc

5+@@ -13,7 +13,8 @@

6+ namespace ui {

7+

8+ namespace {

9+-constexpr uint32_t kMaxSurfaceAugmenterVersion = 1;

10++constexpr uint32_t kMinVersion = 1;

11++constexpr uint32_t kMaxVersion = 1;

12+ }

13+

14+ // static

15+@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection,

16+ uint32_t version) {

17+ DCHECK_EQ(interface, kInterfaceName);

18+

19+- if (connection->surface_augmenter_)

20++ if (connection->surface_augmenter_ ||

21++ !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) {

22+ return;

23++ }

24+

25+- auto augmenter = wl::Bind<surface_augmenter>(

26+- registry, name, std::min(version, kMaxSurfaceAugmenterVersion));

27++ auto augmenter = wl::Bind<surface_augmenter>(registry, name,

28++ std::min(version, kMaxVersion));

29+ if (!augmenter) {

30+ LOG(ERROR) << "Failed to bind surface_augmenter";

31+ return;

pkgs/applications/networking/browsers/lagrange/default.nix+2−4

@@ -19,13 +19,13 @@

1919

2020stdenv.mkDerivation rec {

2121 pname = "lagrange";

22− version = "1.9.5";

22+ version = "1.10.0";

2323

2424 src = fetchFromGitHub {

2525 owner = "skyjake";

2626 repo = "lagrange";

2727 rev = "v${version}";

28− sha256 = "sha256-jvknhGTvb2Qw2587TmCJxES2DSv+9+BfMk2IOyqqLt8=";

28+ sha256 = "sha256-5K2Fm7CkzVcHM3JC1rgh/vCyXfVTTY47nZFzqgQcoSs";

2929 fetchSubmodules = true;

3030 };

3131

@@ -38,8 +38,6 @@ stdenv.mkDerivation rec {

3838 buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ]

3939 ++ lib.optional stdenv.isDarwin AppKit;

4040

41− hardeningDisable = lib.optional (!stdenv.cc.isClang) "format";

42−

4341 installPhase = lib.optionalString stdenv.isDarwin ''

4442 mkdir -p $out/Applications

4543 mv Lagrange.app $out/Applications

pkgs/applications/networking/cluster/tanka/default.nix+3−3

@@ -2,16 +2,16 @@

22

33buildGoModule rec {

44 pname = "tanka";

5− version = "0.17.3";

5+ version = "0.19.0";

66

77 src = fetchFromGitHub {

88 owner = "grafana";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-Khu6ovtcXkqqt3W4OoJ09INgv80tw/6uDcJS+jt3y0Y=";

11+ sha256 = "sha256-SMPStxqzoeooBoqUJdFK6Zg3dzbNHrB/tv8iwa8GdbM=";

1212 };

1313

14− vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw=";

14+ vendorSha256 = "sha256-pqwdxFFcATfxGmz6quIH8OL4U2DZKmuVyOLEct2nBlE=";

1515

1616 doCheck = false;

1717

pkgs/applications/networking/cluster/terraform-providers/default.nix+75−60

@@ -7,82 +7,97 @@

77, cdrtools # libvirt

88}:

99let

10− list = lib.importJSON ./providers.json;

11−

12− buildWithGoModule = data:

10+ # Our generic constructor to build new providers.

11+ #

12+ # Is designed to combine with the terraform.withPlugins implementation.

13+ mkProvider =

14+ { owner

15+ , repo

16+ , rev

17+ , version

18+ , sha256

19+ , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */

20+ , deleteVendor ? false

21+ , proxyVendor ? false

22+ , provider-source-address

23+ }@attrs:

1324 buildGoModule {

14− pname = data.repo;

15− inherit (data) vendorSha256 version;

25+ pname = repo;

26+ inherit vendorSha256 version deleteVendor proxyVendor;

1627 subPackages = [ "." ];

1728 doCheck = false;

1829 # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml

1930 # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled

2031 CGO_ENABLED = 0;

21− ldflags = [ "-s" "-w" "-X main.version=${data.version}" "-X main.commit=${data.rev}" ];

32+ ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ];

2233 src = fetchFromGitHub {

23− inherit (data) owner repo rev sha256;

34+ inherit owner repo rev sha256;

2435 };

25− deleteVendor = data.deleteVendor or false;

26− proxyVendor = data.proxyVendor or false;

2736

2837 # Terraform allow checking the provider versions, but this breaks

2938 # if the versions are not provided via file paths.

30− postBuild = "mv $NIX_BUILD_TOP/go/bin/${data.repo}{,_v${data.version}}";

31− passthru = data;

39+ postBuild = "mv $NIX_BUILD_TOP/go/bin/${repo}{,_v${version}}";

40+ passthru = attrs;

3241 };

3342

34− # Our generic constructor to build new providers

35− mkProvider = attrs:

36− (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else throw /* added 2022/01 */ "vendorSha256 missing: please use `buildGoModule`")

37− attrs;

43+ list = lib.importJSON ./providers.json;

3844

3945 # These providers are managed with the ./update-all script

4046 automated-providers = lib.mapAttrs (_: attrs: mkProvider attrs) list;

4147

4248 # These are the providers that don't fall in line with the default model

43− special-providers = let archived = throw "the provider has been archived by upstream"; in {

44− # Packages that don't fit the default model

45− gandi = callPackage ./gandi { };

46− # mkisofs needed to create ISOs holding cloud-init data,

47− # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630

48− libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });

49− teleport = callPackage ./teleport { };

50− vpsadmin = callPackage ./vpsadmin { };

51− } // (lib.optionalAttrs (config.allowAliases or false) {

52− arukas = archived; # added 2022/01

53− bitbucket = archived; # added 2022/01

54− chef = archived; # added 2022/01

55− cherryservers = archived; # added 2022/01

56− clc = archived; # added 2022/01

57− cloudstack = throw "removed from nixpkgs"; # added 2022/01

58− cobbler = archived; # added 2022/01

59− cohesity = archived; # added 2022/01

60− dyn = archived; # added 2022/01

61− genymotion = archived; # added 2022/01

62− hedvig = archived; # added 2022/01

63− ignition = archived; # added 2022/01

64− incapsula = archived; # added 2022/01

65− influxdb = archived; # added 2022/01

66− jdcloud = archived; # added 2022/01

67− kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";

68− librato = archived; # added 2022/01

69− logentries = archived; # added 2022/01

70− metalcloud = archived; # added 2022/01

71− mysql = archived; # added 2022/01

72− nixos = archived; # added 2022/01

73− oneandone = archived; # added 2022/01

74− packet = archived; # added 2022/01

75− profitbricks = archived; # added 2022/01

76− pureport = archived; # added 2022/01

77− rancher = archived; # added 2022/01

78− rightscale = archived; # added 2022/01

79− runscope = archived; # added 2022/01

80− segment = throw "removed from nixpkgs"; # added 2022/01

81− softlayer = archived; # added 2022/01

82− telefonicaopencloud = archived; # added 2022/01

83− terraform = archived; # added 2022/01

84− ultradns = archived; # added 2022/01

85− vthunder = throw "provider was renamed to thunder"; # added 2022/01

86− });

49+ special-providers =

50+ {

51+ # Packages that don't fit the default model

52+ gandi = callPackage ./gandi { };

53+ # mkisofs needed to create ISOs holding cloud-init data,

54+ # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630

55+ libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });

56+ teleport = callPackage ./teleport { };

57+ vpsadmin = callPackage ./vpsadmin { };

58+ };

59+

60+ # Put all the providers we not longer support in this list.

61+ removed-providers =

62+ let

63+ archived = date: throw "the provider has been archived by upstream on ${date}";

64+ removed = date: throw "removed from nixpkgs on ${date}";

65+ in

66+ lib.optionalAttrs (config.allowAliases or false) {

67+ arukas = archived "2022/01";

68+ bitbucket = archived "2022/01";

69+ chef = archived "2022/01";

70+ cherryservers = archived "2022/01";

71+ clc = archived "2022/01";

72+ cloudstack = removed "2022/01";

73+ cobbler = archived "2022/01";

74+ cohesity = archived "2022/01";

75+ dyn = archived "2022/01";

76+ genymotion = archived "2022/01";

77+ hedvig = archived "2022/01";

78+ ignition = archived "2022/01";

79+ incapsula = archived "2022/01";

80+ influxdb = archived "2022/01";

81+ jdcloud = archived "2022/01";

82+ kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";

83+ librato = archived "2022/01";

84+ logentries = archived "2022/01";

85+ metalcloud = archived "2022/01";

86+ mysql = archived "2022/01";

87+ nixos = archived "2022/01";

88+ oneandone = archived "2022/01";

89+ packet = archived "2022/01";

90+ profitbricks = archived "2022/01";

91+ pureport = archived "2022/01";

92+ rancher = archived "2022/01";

93+ rightscale = archived "2022/01";

94+ runscope = archived "2022/01";

95+ segment = removed "2022/01";

96+ softlayer = archived "2022/01";

97+ telefonicaopencloud = archived "2022/01";

98+ terraform = archived "2022/01";

99+ ultradns = archived "2022/01";

100+ vthunder = throw "provider was renamed to thunder on 2022/01";

101+ };

87102in

88−automated-providers // special-providers // { inherit mkProvider; }

103+automated-providers // special-providers // removed-providers // { inherit mkProvider; }

pkgs/applications/networking/cluster/terraform-providers/providers.json+72−72

@@ -21,10 +21,10 @@

2121 "owner": "aiven",

2222 "provider-source-address": "registry.terraform.io/aiven/aiven",

2323 "repo": "terraform-provider-aiven",

24− "rev": "v2.4.0",

25− "sha256": "0m43d2iaa9kywzvlgcnsya1ma9k570j9q8cq9l6ldpc8565fqq0i",

26− "vendorSha256": "1lpfnpg4sivy8vilkxamdn1hyn6k61lxsfcq67afxsq8pcy6q44v",

27− "version": "2.4.0"

24+ "rev": "v2.5.0",

25+ "sha256": "1x37bnykn28hmb80qi530zgk6jfqpk97nswrm0hdw8x5vac4v63a",

26+ "vendorSha256": "0ldk06dj72551b6djsq7vil0hzfsp3ixwh3ikqb40shsdq10iplx",

27+ "version": "2.5.0"

2828 },

2929 "akamai": {

3030 "owner": "akamai",

@@ -40,10 +40,10 @@

4040 "owner": "aliyun",

4141 "provider-source-address": "registry.terraform.io/aliyun/alicloud",

4242 "repo": "terraform-provider-alicloud",

43− "rev": "v1.151.0",

44− "sha256": "0pdvbq9kfq7vwkfk75fjy6jaiq5bfkjmvr3z07712b76z29m10bz",

43+ "rev": "v1.152.0",

44+ "sha256": "1childp3dkdi6raya1865inkky2qx1jav95yq9c57gz20zs27x8a",

4545 "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg",

46− "version": "1.151.0"

46+ "version": "1.152.0"

4747 },

4848 "ansible": {

4949 "owner": "nbering",

@@ -94,28 +94,28 @@

9494 "owner": "hashicorp",

9595 "provider-source-address": "registry.terraform.io/hashicorp/aws",

9696 "repo": "terraform-provider-aws",

97− "rev": "v3.71.0",

98− "sha256": "0jr9mk6gvimh8picpcc47pcan323k4rml438743ma53g8jhcvn2a",

99− "vendorSha256": "02ax2717xci8qia3k7q19yknazn67idb64hf5mwahfnx1fjmdc22",

100− "version": "3.71.0"

97+ "rev": "v3.72.0",

98+ "sha256": "0xkwqh7akc7rf047w6by4368n2bpn4lijk9j6j3wsgbaffw0xjlb",

99+ "vendorSha256": "0apvp3vb3qx2l6698x4ai3spz40l6mb3z8gn45ms2vlxcwp2wf7y",

100+ "version": "3.72.0"

101101 },

102102 "azuread": {

103103 "owner": "hashicorp",

104104 "provider-source-address": "registry.terraform.io/hashicorp/azuread",

105105 "repo": "terraform-provider-azuread",

106− "rev": "v2.14.0",

107− "sha256": "0sjpwhywc165gkxd1ybkwi1aww4xivry82wh0mbh4bgs607mn8lg",

106+ "rev": "v2.15.0",

107+ "sha256": "1gjx91svfg25x0hlx6mfam40615x278b9vxsy5p88s3dl6xs3hdv",

108108 "vendorSha256": null,

109− "version": "2.14.0"

109+ "version": "2.15.0"

110110 },

111111 "azurerm": {

112112 "owner": "hashicorp",

113113 "provider-source-address": "registry.terraform.io/hashicorp/azurerm",

114114 "repo": "terraform-provider-azurerm",

115− "rev": "v2.91.0",

116− "sha256": "0db23ch46wi5mjmwibp7n98y0j3cl06mq2pzmvw1scbzvgh0gcqp",

115+ "rev": "v2.92.0",

116+ "sha256": "0p4vxda4n7895xp7aqg4zqddynjn7hnzsc8am83y8hf9hbfaji8q",

117117 "vendorSha256": null,

118− "version": "2.91.0"

118+ "version": "2.92.0"

119119 },

120120 "azurestack": {

121121 "owner": "hashicorp",

@@ -185,10 +185,10 @@

185185 "owner": "cloudflare",

186186 "provider-source-address": "registry.terraform.io/cloudflare/cloudflare",

187187 "repo": "terraform-provider-cloudflare",

188− "rev": "v3.6.0",

189− "sha256": "1adpzk9vjllr18dq8kggxfabm3ax59m55ls98mkqh8lmgq96bh7d",

190− "vendorSha256": "1rdgjb1gfz5fs6s3c15nj92rm8ifb23n25wpxl16mz4aifkjgqam",

191− "version": "3.6.0"

188+ "rev": "v3.7.0",

189+ "sha256": "1d1wljk033b9j5sx01xjv5jmclw79f2f21s8zsix036mmzvaiswb",

190+ "vendorSha256": "1g3fyxrdqa4ds6n9pcw2mvi8nfiz4dna57ssvggfwic4jl89q7zm",

191+ "version": "3.7.0"

192192 },

193193 "cloudfoundry": {

194194 "owner": "cloudfoundry-community",

@@ -266,10 +266,10 @@

266266 "owner": "digitalocean",

267267 "provider-source-address": "registry.terraform.io/digitalocean/digitalocean",

268268 "repo": "terraform-provider-digitalocean",

269− "rev": "v2.16.0",

270− "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw",

269+ "rev": "v2.17.0",

270+ "sha256": "0in6xg4kgqy1izi8zapdi0f6dsni3i27fxh1l4sqp5kwh3vgpn0d",

271271 "vendorSha256": null,

272− "version": "2.16.0"

272+ "version": "2.17.0"

273273 },

274274 "dme": {

275275 "owner": "DNSMadeEasy",

@@ -347,10 +347,10 @@

347347 "owner": "fastly",

348348 "provider-source-address": "registry.terraform.io/fastly/fastly",

349349 "repo": "terraform-provider-fastly",

350− "rev": "v0.39.0",

351− "sha256": "0sjjcz2z7qr1dmm6zzyi382cas4k5vdg0q7yxlpcqxqqrql636k8",

350+ "rev": "v0.40.0",

351+ "sha256": "11gf1xmj0qgn3hfw4hviqnfc23rrfd3qxz82idff4f1i7c5kym1i",

352352 "vendorSha256": null,

353− "version": "0.39.0"

353+ "version": "0.40.0"

354354 },

355355 "flexibleengine": {

356356 "owner": "FlexibleEngineCloud",

@@ -393,29 +393,29 @@

393393 "provider-source-address": "registry.terraform.io/hashicorp/google",

394394 "proxyVendor": true,

395395 "repo": "terraform-provider-google",

396− "rev": "v4.5.0",

397− "sha256": "173aqwrzqdb3y57wiq1dbgb74ksr063qqq1k178n4wrab4s1h3px",

396+ "rev": "v4.6.0",

397+ "sha256": "0vi0crc4i5myzw17knvb3zz0yjpg7v1qvp9rjrb0q6v89nafr30c",

398398 "vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la",

399− "version": "4.5.0"

399+ "version": "4.6.0"

400400 },

401401 "google-beta": {

402402 "owner": "hashicorp",

403403 "provider-source-address": "registry.terraform.io/hashicorp/google-beta",

404404 "proxyVendor": true,

405405 "repo": "terraform-provider-google-beta",

406− "rev": "v4.5.0",

407− "sha256": "17z2jy8b9gk0id8q0318a6k60fhcqps0p36s7d7kkqmr44shgzs4",

406+ "rev": "v4.6.0",

407+ "sha256": "0kbdpyln8yy3128g43y134v5li9k5a6mb2fwa0jl8zffmhfc209k",

408408 "vendorSha256": "17rlq86zl83cav8pinr8am3wkmva4slab2izmxddhiw3na60a4la",

409− "version": "4.5.0"

409+ "version": "4.6.0"

410410 },

411411 "grafana": {

412412 "owner": "grafana",

413413 "provider-source-address": "registry.terraform.io/grafana/grafana",

414414 "repo": "terraform-provider-grafana",

415− "rev": "v1.17.0",

416− "sha256": "10mj1dvz7q3w250hvi3k4rj2x0mn592gw2xcy1j98x5ll6kx4ynd",

417− "vendorSha256": "1bhygkkgd3j971cg6wha57cyh4ggbkaihw6sn6p9jvdi1k1f63lw",

418− "version": "1.17.0"

415+ "rev": "v1.18.0",

416+ "sha256": "1qvhdshaiy1v7557nkh869k1wmz604pv2gchv98vrm3cp7zj83zn",

417+ "vendorSha256": "1rgvil2kw38kbgbgcjy8mbkahj6zm91s187x41vd4x7ypc5kgbkn",

418+ "version": "1.18.0"

419419 },

420420 "gridscale": {

421421 "owner": "gridscale",

@@ -466,10 +466,10 @@

466466 "owner": "huaweicloud",

467467 "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",

468468 "repo": "terraform-provider-huaweicloud",

469− "rev": "v1.32.0",

470− "sha256": "1k5d4a488mrba6cvpcbhd9hqhhb977yi89p32wlfx266mf11w2yw",

469+ "rev": "v1.32.1",

470+ "sha256": "05rm1cmpbmavza1pyqjzrd316v6r68427cjhqy6bngb749nc1als",

471471 "vendorSha256": null,

472− "version": "1.32.0"

472+ "version": "1.32.1"

473473 },

474474 "huaweicloudstack": {

475475 "owner": "huaweicloud",

@@ -493,10 +493,10 @@

493493 "owner": "IBM-Cloud",

494494 "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",

495495 "repo": "terraform-provider-ibm",

496− "rev": "v1.37.1",

497− "sha256": "1m9038ylv44xhgws0jrqdynj7kd97x9jgk1npqblbfv86fccwqxc",

498− "vendorSha256": "1a8zy023j3mcy3bswyrmllkgv61wiyxa1f7bfj8mxx3701rsb4ji",

499− "version": "1.37.1"

496+ "rev": "v1.38.0",

497+ "sha256": "0cbyq74fy3y7ia8lywr8amwcjq53bn3psymyl5cnwqx8y97avx5w",

498+ "vendorSha256": "0cgl87pij4amn77ksbrzl0qlf6a5ga29b64cnasq8lq03lbmqzw4",

499+ "version": "1.38.0"

500500 },

501501 "icinga2": {

502502 "owner": "Icinga",

@@ -674,10 +674,10 @@

674674 "owner": "mongodb",

675675 "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",

676676 "repo": "terraform-provider-mongodbatlas",

677− "rev": "v1.1.1",

678− "sha256": "0ifrpamajmrqa3fmsg4qyag1i7ghrswbhl0ixj8hgw7kzbzslsyd",

679− "vendorSha256": "1xrpgrzk5hr7qc5zm7nq5ljhc4sgzbsaxfszc8dlpc5y49j5q0ip",

680− "version": "1.1.1"

677+ "rev": "v1.2.0",

678+ "sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi",

679+ "vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks",

680+ "version": "1.2.0"

681681 },

682682 "ncloud": {

683683 "owner": "NaverCloudPlatform",

@@ -701,10 +701,10 @@

701701 "owner": "newrelic",

702702 "provider-source-address": "registry.terraform.io/newrelic/newrelic",

703703 "repo": "terraform-provider-newrelic",

704− "rev": "v2.34.1",

705− "sha256": "1j7r6cac1ajp8f6h2492dnz7ihkxbdi8js535dv04kiah79r49d5",

706− "vendorSha256": "0qbrrh5qdbcnzmf69jilcd9qql526w9mf4ix8y8bi94w7m0nwxap",

707− "version": "2.34.1"

704+ "rev": "v2.35.0",

705+ "sha256": "0pwy3vsj332v82n3is6xaw4mgvv968ffr8n41s1r7j39r8bpl77f",

706+ "vendorSha256": "13xqrdv0xnza0yxdgk155x4vq8lai9jrjvnfp153jb5p5hfnzwmp",

707+ "version": "2.35.0"

708708 },

709709 "nomad": {

710710 "owner": "hashicorp",

@@ -757,19 +757,19 @@

757757 "owner": "terraform-providers",

758758 "provider-source-address": "registry.terraform.io/hashicorp/oci",

759759 "repo": "terraform-provider-oci",

760− "rev": "v4.58.0",

761− "sha256": "0cxzy9sj4n7yz7zbqhpkr92h7gqqfx7qxpr0a1jgh9a087j3752c",

760+ "rev": "v4.59.0",

761+ "sha256": "12i4j95g08c887xxplc90hcxwsrpwcn5qjyy5inazr21vqscjx2h",

762762 "vendorSha256": null,

763− "version": "4.58.0"

763+ "version": "4.59.0"

764764 },

765765 "okta": {

766766 "owner": "okta",

767767 "provider-source-address": "registry.terraform.io/okta/okta",

768768 "repo": "terraform-provider-okta",

769− "rev": "v3.20.2",

770− "sha256": "0qlm99m4dljnczsypn4gmw9n4vvxkfazi21hvkbkgy2v3wmhsms9",

771− "vendorSha256": "0fyxm6wff5pz5g3rjnia23npar9qbwcv01pa3rsskxkl8jc3v13j",

772− "version": "3.20.2"

769+ "rev": "v3.20.3",

770+ "sha256": "0m9y0dagav1pw8cz6pv9zkhag59f9bbn8b6zi1h3lcgvmzf303wv",

771+ "vendorSha256": "156nyjga5q5mgwiq6aynp199i0hn5mvckj2h7j3pfzc1yz8ri5cc",

772+ "version": "3.20.3"

773773 },

774774 "oktaasa": {

775775 "owner": "oktadeveloper",

@@ -857,10 +857,10 @@

857857 "owner": "PaloAltoNetworks",

858858 "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos",

859859 "repo": "terraform-provider-panos",

860− "rev": "v1.9.1",

861− "sha256": "05jsap80dcgmncxa8xbx1hnrbpi9bxjz2k9jnfnws1pmbjxl94hf",

860+ "rev": "v1.9.2",

861+ "sha256": "03585rm434lcp6xk58185i78iv5fjd18z7nrdnbhxxy94yhhf335",

862862 "vendorSha256": null,

863− "version": "1.9.1"

863+ "version": "1.9.2"

864864 },

865865 "pass": {

866866 "owner": "camptocamp",

@@ -1001,10 +1001,10 @@

10011001 "owner": "spotinst",

10021002 "provider-source-address": "registry.terraform.io/spotinst/spotinst",

10031003 "repo": "terraform-provider-spotinst",

1004− "rev": "v1.64.2",

1005− "sha256": "0h47ik93lhb9mjg3ai9n76ya918h1mk3fyp70yr26rwc3rihvjm6",

1006− "vendorSha256": "1lv305kamb3xnw3a2q45ndn7a88ifnh8j8ngv7awc41028j539w4",

1007− "version": "1.64.2"

1004+ "rev": "v1.65.0",

1005+ "sha256": "1gk4v6lxa4k8za6c1zxrrrc6qw3ymsk46w97qhfri6y7vrc3vxh0",

1006+ "vendorSha256": "0xhzj8lmrh0mcpbxa7xkzhhgl3jfk6mz5adia0jgflgrx4wjaf38",

1007+ "version": "1.65.0"

10081008 },

10091009 "stackpath": {

10101010 "owner": "stackpath",

@@ -1046,10 +1046,10 @@

10461046 "owner": "tencentcloudstack",

10471047 "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",

10481048 "repo": "terraform-provider-tencentcloud",

1049− "rev": "v1.60.26",

1050− "sha256": "1diwiyfswmgqm1iizj228s2ysrnx4z3lqlq82a7gp0z9p8rzd0vs",

1049+ "rev": "v1.61.1",

1050+ "sha256": "1v6b8ldg6pkphqy5aphdhig1q3iizzfrj611k39lyk1q3q914yf4",

10511051 "vendorSha256": null,

1052− "version": "1.60.26"

1052+ "version": "1.61.1"

10531053 },

10541054 "tfe": {

10551055 "owner": "hashicorp",

@@ -1128,10 +1128,10 @@

11281128 "owner": "vmware",

11291129 "provider-source-address": "registry.terraform.io/vmware/vcd",

11301130 "repo": "terraform-provider-vcd",

1131− "rev": "v3.5.0",

1132− "sha256": "1sdcjizg0gip55042p0599wvjicibyx9kiymxq45af14yhnwqyv5",

1131+ "rev": "v3.5.1",

1132+ "sha256": "1fwkbsgnxn0jl84nji57grasdsbw0ydd7vzcllpv7r1z3jpa545q",

11331133 "vendorSha256": "0bzp6807l4hspk1c1pmgnzk0axk0nir3v0lqmw9xvkij4c5rnz9s",

1134− "version": "3.5.0"

1134+ "version": "3.5.1"

11351135 },

11361136 "venafi": {

11371137 "deleteVendor": true,

pkgs/applications/networking/cluster/terraform/default.nix−14

@@ -160,20 +160,6 @@ rec {

160160 # Constructor for other terraform versions

161161 mkTerraform = attrs: pluggable (generic attrs);

162162

163− terraform_0_12 = mkTerraform {

164− version = "0.12.31";

165− sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg";

166− patches = [

167− ./provider-path.patch

168− (fetchpatch {

169− name = "fix-mac-mojave-crashes.patch";

170− url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch";

171− sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs";

172− })

173− ];

174− passthru = { inherit plugins; };

175− };

176−

177163 terraform_0_13 = mkTerraform {

178164 version = "0.13.7";

179165 sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn";

pkgs/applications/networking/cluster/terranix/default.nix+3−3

@@ -2,20 +2,20 @@

22

33stdenv.mkDerivation rec {

44 pname = "terranix";

5− version = "2.5.0";

5+ version = "2.5.3";

66

77 src = fetchFromGitHub {

88 owner = "mrVanDalo";

99 repo = "terranix";

1010 rev = version;

11− sha256 = "sha256-HDiyJGgyDUoLnpL8N+wDm3cM/vEfYYc/p4N1kKH/kLk=";

11+ sha256 = "sha256-Jhq0pkyF1KWJ6HgeWLoRfIxo7QHvOwwXzsIxZQgQtK4=";

1212 };

1313

1414 nativeBuildInputs = [ makeWrapper ];

1515

1616 installPhase = ''

1717 mkdir -p $out/{bin,core,modules,lib}

18− mv bin core modules lib $out/

18+ mv bin core modules lib share $out/

1919

2020 wrapProgram $out/bin/terranix-doc-json \

2121 --prefix PATH : ${lib.makeBinPath [ jq nix ]}

pkgs/applications/networking/instant-messengers/element/element-desktop.nix+4−1

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

77, fetchYarnDeps

88, electron

99, element-web

10+, sqlcipher

1011, callPackage

1112, Security

1213, AppKit

@@ -78,7 +79,9 @@ mkYarnPackage rec {

7879 ln -s "${desktopItem}/share/applications" "$out/share/applications"

7980

8081 # executable wrapper

82+ # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102

8183 makeWrapper '${electron_exec}' "$out/bin/${executableName}" \

84+ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \

8285 --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}"

8386 '';

8487

@@ -94,7 +97,7 @@ mkYarnPackage rec {

9497 name = "element-desktop";

9598 exec = "${executableName} %u";

9699 icon = "element";

97− desktopName = "Element (Riot)";

100+ desktopName = "Element";

98101 genericName = "Matrix Client";

99102 comment = meta.description;

100103 categories = "Network;InstantMessaging;Chat;";

pkgs/applications/networking/instant-messengers/franz/generic.nix+2−1

@@ -24,6 +24,7 @@

2424, libnotify

2525, xdg-utils

2626, mesa

27+, libappindicator-gtk3

2728}:

2829

2930# Helper function for building a derivation for Franz and forks.

@@ -68,7 +69,7 @@ stdenv.mkDerivation rec {

6869 expat

6970 stdenv.cc.cc

7071 ];

71− runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ];

72+ runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ];

7273

7374 unpackPhase = "dpkg-deb -x $src .";

7475

pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, pidgin, intltool, python } :

1+{ lib, stdenv, fetchurl, pidgin, intltool, python2 } :

22

33stdenv.mkDerivation rec {

44 pname = "purple-plugin-pack";

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

88 sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";

99 };

1010

11− buildInputs = [ pidgin intltool python ];

11+ buildInputs = [ pidgin intltool python2 ];

1212

1313 meta = with lib; {

1414 homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack";

pkgs/applications/networking/instant-messengers/torchat/default.nix+4−4

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

1−{ lib, stdenv, fetchFromGitHub, python, unzip, wxPython, wrapPython, tor }:

1+{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }:

22

33stdenv.mkDerivation rec {

44 pname = "torchat";

@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {

1212 };

1313

1414 nativeBuildInputs = [ unzip ];

15− buildInputs = [ python wxPython wrapPython ];

16− pythonPath = [ wxPython ];

15+ buildInputs = with python2.pkgs; [ python wxPython wrapPython ];

16+ pythonPath = with python2.pkgs; [ wxPython ];

1717

1818 preConfigure = "cd torchat/src; rm portable.txt";

1919

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

2424

2525 mkdir -p $out/lib/torchat

2626 cp -rf * $out/lib/torchat

27− makeWrapper ${python}/bin/python $out/bin/torchat \

27+ makeWrapper ${python2}/bin/python $out/bin/torchat \

2828 --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \

2929 --run "cd $out/lib/torchat" \

3030 --add-flags "-O $out/lib/torchat/torchat.py"

pkgs/applications/networking/ipfs-cluster/default.nix+3−3

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

22

33buildGoModule rec {

44 pname = "ipfs-cluster";

5− version = "0.14.1";

5+ version = "0.14.4";

66

7− vendorSha256 = "sha256-vDNWYgWlM3kJqlHW/6Bj6P+t6M61TvOVRJwDN2p0mi4=";

7+ vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc=";

88

99 src = fetchFromGitHub {

1010 owner = "ipfs";

1111 repo = "ipfs-cluster";

1212 rev = "v${version}";

13− sha256 = "sha256-GELCd12LhA4CBe9DRRBu4r+AwCksaRVIWcSAJScvnbk=";

13+ sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ=";

1414 };

1515

1616 meta = with lib; {

pkgs/applications/networking/ipget/default.nix+3−3

@@ -2,16 +2,16 @@

22

33buildGoModule rec {

44 pname = "ipget";

5− version = "0.7.0";

5+ version = "0.8.0";

66

77 src = fetchFromGitHub {

88 owner = "ipfs";

99 repo = "ipget";

1010 rev = "v${version}";

11− sha256 = "sha256-YD05HIVr99b8VmEJgzY2ClNv31I98d0NbfCk3XcB+xk=";

11+ sha256 = "sha256-qRPke8/CUmGX6v+8qv9JQCUC8T9pjwRRyGmBWvatsJ0=";

1212 };

1313

14− vendorSha256 = "sha256-bymHVWskCt7bf02CveMXl1VhZYhRSEH7xIoESh31iGg=";

14+ vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg=";

1515

1616 postPatch = ''

1717 # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies

pkgs/development/python-modules/alot/default.nix → pkgs/applications/networking/mailreaders/alot/default.nixrenamed+8−4

@@ -1,9 +1,13 @@

1−{ lib, buildPythonPackage, python, fetchFromGitHub, isPy3k, pytestCheckHook

2−, notmuch2, urwid, urwidtrees, twisted, python_magic, configobj, mock, file, gpgme

3−, service-identity, gnupg, sphinx, gawk, procps, future , withManpage ? false

1+{ lib, python3, fetchFromGitHub, file, gnupg, gawk, notmuch, procps, withManpage ? false

42}:

53

6−buildPythonPackage rec {

4+with python3.pkgs;

5+

6+let

7+ notmuch2 = callPackage ./notmuch.nix {

8+ inherit notmuch;

9+ };

10+in buildPythonApplication rec {

711 pname = "alot";

812 version = "0.10";

913 outputs = [ "out" ] ++ lib.optional withManpage "man";

pkgs/development/python-modules/notmuch/2.nix → pkgs/applications/networking/mailreaders/alot/notmuch.nixrenamed

The content is the same.

pkgs/development/python-modules/aiohttp-apispec/unstable.nix → pkgs/applications/networking/p2p/tribler/aiohttp-apispec.nixrenamed+2−2

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

33}:

44

55let

6− apispec3 = callPackage ../apispec/3.nix {};

7− jinja2 = callPackage ../jinja2/2.nix {};

6+ apispec3 = callPackage ./apispec.nix {};

7+ jinja2 = callPackage ../../../../development/python2-modules/jinja2 {};

88in

99buildPythonPackage rec {

1010 pname = "aiohttp-apispec";

pkgs/development/python-modules/apispec/3.nix → pkgs/applications/networking/p2p/tribler/apispec.nixrenamed

The content is the same.

pkgs/applications/networking/p2p/tribler/default.nix+1−2

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

66 libtorrent = (python3.pkgs.toPythonModule (

77 libtorrent-rasterbar-1_2_x.override { python = python3; })).python;

88

9− aiohttp-apispec = python3.pkgs.callPackage

10− ../../../../development/python-modules/aiohttp-apispec/unstable.nix { };

9+ aiohttp-apispec = python3.pkgs.callPackage ./aiohttp-apispec.nix { };

1110in

1211stdenv.mkDerivation rec {

1312 pname = "tribler";

pkgs/applications/networking/p2p/twister/default.nix+4−1

@@ -13,7 +13,10 @@ let

1313 };

1414 };

1515

16− boostPython = boost.override { enablePython = true; };

16+ boostPython = boost.override {

17+ enablePython = true;

18+ python = python2;

19+ };

1720

1821in stdenv.mkDerivation rec {

1922 pname = "twister";

pkgs/applications/networking/ping/default.nix+10−3

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

1−{ lib, stdenv

1+{ lib

2+, stdenv

23, fetchFromGitHub

34, nix-update-script

45, meson

@@ -14,7 +15,6 @@

1415, libsoup

1516, libgee

1617, wrapGAppsHook

17−, vala_0_40

1818}:

1919

2020stdenv.mkDerivation rec {

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {

3131 nativeBuildInputs = [

3232 meson

3333 ninja

34− vala_0_40

34+ vala

3535 pkg-config

3636 python3

3737 wrapGAppsHook

@@ -65,5 +65,12 @@ stdenv.mkDerivation rec {

6565 platforms = platforms.linux;

6666 license = licenses.gpl3;

6767 mainProgram = "com.github.jeremyvaartjes.ping";

68+ # Does not build with vala 0.48 or later

69+ # ../src/Application.vala:696.46-696.57: error: Assignment: Cannot convert from

70+ # `GLib.HashTable<weak string,weak string>' to `GLib.HashTable<string,string>?'

71+ # HashTable<string,string> tempDataList = Soup.Form.decode(testObjs[id].data);

72+ # ^^^^^^^^^^^^

73+ # Upstream has no activity since 28 Dec 2020

74+ broken = true;

6875 };

6976}

pkgs/applications/office/PageEdit/default.nixnew file+25

@@ -0,0 +1,25 @@

1+{ lib, mkDerivation, fetchFromGitHub, cmake, qtsvg, qtwebengine, qttranslations }:

2+

3+mkDerivation rec {

4+ pname = "PageEdit";

5+ version = "1.7.0";

6+

7+ src = fetchFromGitHub {

8+ owner = "Sigil-Ebook";

9+ repo = pname;

10+ rev = version;

11+ hash = "sha256-/t08ZS2iYWIDkco0nhACBQs1X+X77SJ/g+ow7KemfRY=";

12+ };

13+

14+ nativeBuildInputs = [ cmake qttranslations ];

15+ propagatedBuildInputs = [ qtsvg qtwebengine ];

16+ cmakeFlags = "-DINSTALL_BUNDLED_DICTS=0";

17+

18+ meta = with lib; {

19+ description = "ePub XHTML Visual Editor";

20+ homepage = "https://sigil-ebook.com/pageedit/";

21+ license = licenses.gpl3Plus;

22+ maintainers = [ maintainers.pasqui23 ];

23+ platforms = platforms.all;

24+ };

25+}

pkgs/applications/office/notion-app-enhanced/default.nix+2−2

@@ -1,12 +1,12 @@

11{ appimageTools, lib, fetchurl }:

22let

33 pname = "notion-app-enhanced";

4− version = "2.0.16-5";

4+ version = "2.0.18-1";

55 name = "${pname}-v${version}";

66

77 src = fetchurl {

88 url = "https://github.com/notion-enhancer/notion-repackaged/releases/download/v${version}/Notion-Enhanced-${version}.AppImage";

9− sha256 = "1v733b4clc9sjgb72fasmbqiyz26d09f3kmvd1nqshwp5d14dajz";

9+ sha256 = "sha256-SqeMnoMzxxaViJ3NPccj3kyMc1xvXWULM6hQIDZySWY=";

1010 };

1111

1212 appimageContents = appimageTools.extract { inherit name src; };

pkgs/applications/office/qownnotes/default.nix+2−2

@@ -5,13 +5,13 @@

55

66mkDerivation rec {

77 pname = "qownnotes";

8− version = "21.12.8";

8+ version = "22.1.7";

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 = "sha256-iVcGJz4lxyn303ACYBUVm9cOYjVrETpyUapjAieMpqE=";

14+ sha256 = "7ac13816e47e23e8469f47b6d48a29f7e98416de0fa9ef77eb3da63b191829f3";

1515 };

1616

1717 nativeBuildInputs = [ qmake qttools ];

pkgs/applications/office/timeline/default.nix+1−1

@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {

1818 nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems ];

1919

2020 pythonPath = with python3.pkgs; [

21− wxPython_4_0 # not compatible with wxPython_4_1. reported upstream https://github.com/wxWidgets/Phoenix/issues/1956

21+ wxPython_4_1

2222 humblewx

2323 icalendar

2424 markdown

pkgs/applications/office/trilium/default.nix+3−3

@@ -19,16 +19,16 @@ let

1919 maintainers = with maintainers; [ fliegendewurst ];

2020 };

2121

22− version = "0.49.4";

22+ version = "0.49.5";

2323

2424 desktopSource = {

2525 url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";

26− sha256 = "078w7jjkn8af3i0y0s236ky54h08b2wgzcaiakqiqx4gxdpf6jrq";

26+ sha256 = "0bis0xkpcr8rvhm9364v0np5cnvkscv2fgl90f455lcwy7kk9m12";

2727 };

2828

2929 serverSource = {

3030 url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";

31− sha256 = "0hygdxb97373z5cn3s4wr66wc41w7a55kxjyb8alck1fl9l6agn1";

31+ sha256 = "1wv9xz1asjadz1jzgpaxf6lzbj5azgsq0qpawp3y257h488r1z9k";

3232 };

3333

3434in {

pkgs/applications/office/watson/default.nix+2−1

@@ -10,7 +10,8 @@ let

1010 # Workaround the issue by providing click 7 explicitly.

1111 python = python3.override {

1212 packageOverrides = self: super: {

13− click = self.callPackage ../../../development/python-modules/click/7.nix { };

13+ # Use click 7

14+ click = self.callPackage ../../../development/python2-modules/click/default.nix { };

1415 };

1516 };

1617in with python.pkgs; buildPythonApplication rec {

pkgs/applications/radio/gnuradio/3.7.nix → pkgs/applications/radio/gnuradio/3.9.nixrenamed+109−97

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

77, pkg-config

88, volk

99, cppunit

10−, swig

1110, orc

1211, boost

1312, log4cpp

@@ -21,33 +20,39 @@

2120, libjack2

2221, CoreAudio

2322, uhd

24−, comedilib

25−, libusb1

2623, SDL

2724, gsl

25+, soapysdr

26+, libsodium

27+, libsndfile

28+, libunwind

29+, thrift

2830, cppzmq

2931, zeromq

32+# Needed only if qt-gui is disabled, from some reason

33+, icu

3034# GUI related

31−, gtk2

35+, gtk3

3236, pango

37+, gobject-introspection

3338, cairo

34−, qt4

35−, qwt6_qt4

39+, qt5

40+, libsForQt5

3641# Features available to override, the list of them is in featuresInfo. They

37−# are all turned on by default

42+# are all turned on by default.

3843, features ? {}

3944# If one wishes to use a different src or name for a very custom build

4045, overrideSrc ? {}

4146, pname ? "gnuradio"

4247, versionAttr ? {

43− major = "3.7";

44− minor = "14";

48+ major = "3.9";

49+ minor = "5";

4550 patch = "0";

4651}

4752}:

4853

4954let

50− sourceSha256 = "BiUDibXV/5cEYmAAaIxT4WTxF/ni4MJumF5oJ/vuOyc=";

55+ sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY=";

5156 featuresInfo = {

5257 # Needed always

5358 basic = {

@@ -56,27 +61,30 @@ let

5661 pkg-config

5762 orc

5863 ];

59− runtime = [ boost log4cpp mpir ];

60− pythonNative = with python.pkgs; [ Mako six ];

61− };

62− volk = {

63− cmakeEnableFlag = "VOLK";

6464 runtime = [

6565 volk

66+ boost

67+ log4cpp

68+ mpir

69+ ]

70+ # when gr-qtgui is disabled, icu needs to be included, otherwise

71+ # building with boost 1.7x fails

72+ ++ lib.optionals (!(hasFeature "gr-qtgui")) [ icu ];

73+ pythonNative = with python.pkgs; [

74+ Mako

75+ six

6676 ];

6777 };

6878 doxygen = {

6979 native = [ doxygen ];

7080 cmakeEnableFlag = "DOXYGEN";

7181 };

72− sphinx = {

73− pythonNative = with python.pkgs; [ sphinx ];

74− cmakeEnableFlag = "SPHINX";

82+ man-pages = {

83+ cmakeEnableFlag = "MANPAGES";

7584 };

7685 python-support = {

7786 pythonRuntime = [ python.pkgs.six ];

7887 native = [

79− swig

8088 python

8189 ];

8290 cmakeEnableFlag = "PYTHON";

@@ -85,31 +93,44 @@ let

8593 native = [ cppunit ];

8694 cmakeEnableFlag = "TESTING";

8795 };

96+ post-install = {

97+ cmakeEnableFlag = "POSTINSTALL";

98+ };

8899 gnuradio-runtime = {

89100 cmakeEnableFlag = "GNURADIO_RUNTIME";

101+ pythonRuntime = [

102+ python.pkgs.pybind11

103+ ];

90104 };

91105 gr-ctrlport = {

92− cmakeEnableFlag = "GR_CTRLPORT";

93− native = [

94− swig

106+ runtime = [

107+ libunwind

108+ thrift

95109 ];

110+ pythonRuntime = with python.pkgs; [

111+ python.pkgs.thrift

112+ # For gr-perf-monitorx

113+ matplotlib

114+ networkx

115+ ];

116+ cmakeEnableFlag = "GR_CTRLPORT";

96117 };

97118 gnuradio-companion = {

98119 pythonRuntime = with python.pkgs; [

99120 pyyaml

100− cheetah

101− lxml

102− pygtk

121+ Mako

103122 numpy

104− # propagated by pygtk, but since wrapping is done externally, it help

105− # the wrapper if it's here

106− pycairo

107− pygobject2

123+ pygobject3

124+ ];

125+ native = [

126+ python.pkgs.pytest

108127 ];

109128 runtime = [

110− gtk2

129+ gtk3

111130 pango

131+ gobject-introspection

112132 cairo

133+ libsndfile

113134 ];

114135 cmakeEnableFlag = "GRC";

115136 };

@@ -126,6 +147,10 @@ let

126147 gr-filter = {

127148 runtime = [ fftwFloat ];

128149 cmakeEnableFlag = "GR_FILTER";

150+ pythonRuntime = with python.pkgs; [

151+ scipy

152+ pyqtgraph

153+ ];

129154 };

130155 gr-analog = {

131156 cmakeEnableFlag = "GR_ANALOG";

@@ -136,9 +161,6 @@ let

136161 gr-dtv = {

137162 cmakeEnableFlag = "GR_DTV";

138163 };

139− gr-atsc = {

140− cmakeEnableFlag = "GR_ATSC";

141− };

142164 gr-audio = {

143165 runtime = []

144166 ++ lib.optionals stdenv.isLinux [ alsa-lib libjack2 ]

@@ -146,33 +168,46 @@ let

146168 ;

147169 cmakeEnableFlag = "GR_AUDIO";

148170 };

149− gr-comedi = {

150− runtime = [ comedilib ];

151− cmakeEnableFlag = "GR_COMEDI";

152− };

153171 gr-channels = {

154172 cmakeEnableFlag = "GR_CHANNELS";

155173 };

156− gr-noaa = {

157− cmakeEnableFlag = "GR_NOAA";

158− };

159− gr-pager = {

160− cmakeEnableFlag = "GR_PAGER";

161− };

162174 gr-qtgui = {

163− runtime = [ qt4 qwt6_qt4 ];

164− pythonRuntime = [ python.pkgs.pyqt4 ];

175+ runtime = [ qt5.qtbase libsForQt5.qwt ];

176+ pythonRuntime = [ python.pkgs.pyqt5 ];

165177 cmakeEnableFlag = "GR_QTGUI";

166178 };

167179 gr-trellis = {

168180 cmakeEnableFlag = "GR_TRELLIS";

169181 };

170182 gr-uhd = {

171− runtime = [ uhd ];

183+ runtime = [

184+ uhd

185+ ];

172186 cmakeEnableFlag = "GR_UHD";

173187 };

188+ gr-uhd-rfnoc = {

189+ runtime = [

190+ uhd

191+ ];

192+ cmakeEnableFlag = "UHD_RFNOC";

193+ };

174194 gr-utils = {

175195 cmakeEnableFlag = "GR_UTILS";

196+ pythonRuntime = with python.pkgs; [

197+ # For gr_plot

198+ matplotlib

199+ ];

200+ };

201+ gr-modtool = {

202+ pythonRuntime = with python.pkgs; [

203+ setuptools

204+ click

205+ click-plugins

206+ ];

207+ cmakeEnableFlag = "GR_MODTOOL";

208+ };

209+ gr-blocktool = {

210+ cmakeEnableFlag = "GR_BLOCKTOOL";

176211 };

177212 gr-video-sdl = {

178213 runtime = [ SDL ];

@@ -182,27 +217,28 @@ let

182217 runtime = [ codec2 gsm ];

183218 cmakeEnableFlag = "GR_VOCODER";

184219 };

185− gr-fcd = {

186− runtime = [ libusb1 ];

187− cmakeEnableFlag = "GR_FCD";

188− };

189220 gr-wavelet = {

190221 cmakeEnableFlag = "GR_WAVELET";

191− runtime = [ gsl ];

222+ runtime = [ gsl libsodium ];

192223 };

193224 gr-zeromq = {

194225 runtime = [ cppzmq zeromq ];

195226 cmakeEnableFlag = "GR_ZEROMQ";

196227 };

197− gr-wxgui = {

198− pythonRuntime = with python.pkgs; [ numpy wxPython ];

199− cmakeEnableFlag = "GR_WXGUI";

228+ gr-network = {

229+ cmakeEnableFlag = "GR_NETWORK";

230+ };

231+ gr-soapy = {

232+ cmakeEnableFlag = "GR_SOAPY";

233+ runtime = [

234+ soapysdr

235+ ];

200236 };

201237 };

202238 shared = (import ./shared.nix {

203239 inherit

204− lib

205240 stdenv

241+ lib

206242 python

207243 removeReferencesTo

208244 featuresInfo

@@ -212,8 +248,8 @@ let

212248 overrideSrc

213249 fetchFromGitHub

214250 ;

215− qt = qt4;

216− gtk = gtk2;

251+ qt = qt5;

252+ gtk = gtk3;

217253 });

218254 inherit (shared) hasFeature; # function

219255in

@@ -225,57 +261,33 @@ stdenv.mkDerivation rec {

225261 src

226262 nativeBuildInputs

227263 buildInputs

264+ cmakeFlags

228265 disallowedReferences

229− postInstall

266+ stripDebugList

230267 doCheck

231268 dontWrapPythonPrograms

269+ dontWrapQtApps

232270 meta

233271 ;

234−

272+ patches = [

273+ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227

274+ ./modtool-newmod-permissions.patch

275+ ];

235276 passthru = shared.passthru // {

236277 # Deps that are potentially overriden and are used inside GR plugins - the same version must

237278 inherit boost volk;

238279 } // lib.optionalAttrs (hasFeature "gr-uhd") {

239280 inherit uhd;

281+ } // lib.optionalAttrs (hasFeature "gr-qtgui") {

282+ inherit (libsForQt5) qwt;

240283 };

241− cmakeFlags = shared.cmakeFlags

242− # From some reason, if these are not set, libcodec2 and gsm are

243− # not detected properly (slightly different then what's in

244− # ./default.nix).

245− ++ lib.optionals (hasFeature "gr-vocoder") [

246− "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so"

247− "-DLIBCODEC2_INCLUDE_DIR=${codec2}/include"

248− "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so"

249− "-DLIBGSM_INCLUDE_DIR=${gsm}/include/gsm"

250− ]

251− ++ lib.optionals (hasFeature "volk" && volk != null) [

252− "-DENABLE_INTERNAL_VOLK=OFF"

253− ]

254− ;

255− stripDebugList = shared.stripDebugList

256− # gr-fcd feature was dropped in 3.8

257− ++ lib.optionals (hasFeature "gr-fcd") [ "share/gnuradio/examples/fcd" ]

258− ;

259− preConfigure = ""

260− # wxgui and pygtk are not looked up properly, so we force them to be

261− # detected as found, if they are requested by the `features` attrset.

262− + lib.optionalString (hasFeature "gr-wxgui") ''

263− sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt

264− ''

265− + lib.optionalString (hasFeature "gnuradio-companion") ''

266− sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt

284+

285+ postInstall = shared.postInstall

286+ # This is the only python reference worth removing, if needed.

287+ + lib.optionalString (!hasFeature "python-support") ''

288+ ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake

289+ ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so)

290+ ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake

267291 ''

268292 ;

269− patches = [

270− # Don't install python referencing files if python support is disabled.

271− # See: https://github.com/gnuradio/gnuradio/pull/3856

272− (fetchpatch {

273− url = "https://github.com/gnuradio/gnuradio/commit/acef55433d15c231661fa44751f9a2d90a4baa4b.diff";

274− sha256 = "2CEX44Ll8frfLXTIWjdDhKl7aXcjiAWsezVdwrynelE=";

275− })

276− (fetchpatch {

277− url = "https://github.com/gnuradio/gnuradio/commit/a2681edcfaabcb1ecf878ae861161b6a6bf8459d.diff";

278− sha256 = "2Pitgu8accs16B5X5+/q51hr+IY9DMsA15f56gAtBs8=";

279− })

280− ];

281293}

pkgs/applications/radio/gnuradio/default.nix+23−5

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

99, cppunit

1010, orc

1111, boost

12−, log4cpp

12+, spdlog

1313, mpir

1414, doxygen

1515, python

@@ -18,6 +18,8 @@

1818, fftwFloat

1919, alsa-lib

2020, libjack2

21+, libiio

22+, libad9361

2123, CoreAudio

2224, uhd

2325, SDL

@@ -45,14 +47,14 @@

4547, overrideSrc ? {}

4648, pname ? "gnuradio"

4749, versionAttr ? {

48− major = "3.9";

49− minor = "5";

50+ major = "3.10";

51+ minor = "0";

5052 patch = "0";

5153}

5254}:

5355

5456let

55− sourceSha256 = "sha256-TWCXLoS+ImKNd2zkxMks4FXsQMvGKgcW5/MW8S1Y1TY=";

57+ sourceSha256 = "sha256-1K8nlNiirks3MJ+9cH9bkILVFtu5OxhKkNhetGqojn4=";

5658 featuresInfo = {

5759 # Needed always

5860 basic = {

@@ -64,7 +66,7 @@ let

6466 runtime = [

6567 volk

6668 boost

67− log4cpp

69+ spdlog

6870 mpir

6971 ]

7072 # when gr-qtgui is disabled, icu needs to be included, otherwise

@@ -171,6 +173,22 @@ let

171173 gr-channels = {

172174 cmakeEnableFlag = "GR_CHANNELS";

173175 };

176+ gr-pdu = {

177+ cmakeEnableFlag = "GR_PDU";

178+ runtime = [

179+ libiio

180+ libad9361

181+ ];

182+ };

183+ gr-iio = {

184+ cmakeEnableFlag = "GR_IIO";

185+ runtime = [

186+ libiio

187+ ];

188+ };

189+ common-precompiled-headers = {

190+ cmakeEnableFlag = "COMMON_PCH";

191+ };

174192 gr-qtgui = {

175193 runtime = [ qt5.qtbase libsForQt5.qwt ];

176194 pythonRuntime = [ python.pkgs.pyqt5 ];

pkgs/applications/radio/gqrx/default.nix+2−2

@@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport);

2424

2525gnuradio3_8Minimal.pkgs.mkDerivation rec {

2626 pname = "gqrx";

27− version = "2.15.2";

27+ version = "2.15.4";

2828

2929 src = fetchFromGitHub {

3030 owner = "gqrx-sdr";

3131 repo = "gqrx";

3232 rev = "v${version}";

33− sha256 = "sha256-LWuSJbzQKHoCbkyRQ7KqUxFXzA99kuafPibH8Xx7mXs=";

33+ sha256 = "sha256-iQlrnkc1EMR8sUUAHh+7RfS/05unrcDm/kJ/Q4Vst2Q=";

3434 };

3535

3636 nativeBuildInputs = [

pkgs/applications/radio/soapysdr/default.nix+2−1

@@ -2,7 +2,8 @@

22, fetchFromGitHub, cmake

33, libusb-compat-0_1, pkg-config

44, usePython ? false

5−, python, ncurses, swig2

5+, python ? null

6+, ncurses, swig2

67, extraPackages ? []

78} :

89

pkgs/applications/science/biology/minimap2/default.nix+3−2

@@ -2,13 +2,13 @@

22

33stdenv.mkDerivation rec {

44 pname = "minimap2";

5− version = "2.23";

5+ version = "2.24";

66

77 src = fetchFromGitHub {

88 repo = pname;

99 owner = "lh3";

1010 rev = "v${version}";

11− sha256 = "sha256-oNVpSINcXO2eKzOCr/Fl8tSMguRxzmlDNu7hLZeopoQ=";

11+ sha256 = "sha256-sEp7/Y5ifV9LTqrkhlkfykTJYMMuc+VtF7PvmIpBxUw=";

1212 };

1313

1414 buildInputs = [ zlib ];

@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {

2525 homepage = "https://lh3.github.io/minimap2";

2626 license = licenses.mit;

2727 platforms = platforms.all;

28+ badPlatforms = platforms.aarch64;

2829 maintainers = [ maintainers.arcadio ];

2930 };

3031}

pkgs/applications/science/biology/poretools/default.nix+3−3

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

1−{ lib, pythonPackages, fetchFromGitHub }:

1+{ lib, python2Packages, fetchFromGitHub }:

22

3−pythonPackages.buildPythonPackage rec {

3+python2Packages.buildPythonPackage rec {

44 pname = "poretools";

55 version = "unstable-2016-07-10";

66

@@ -11,7 +11,7 @@ pythonPackages.buildPythonPackage rec {

1111 sha256 = "0bglj833wxpp3cq430p1d3xp085ls221js2y90w7ir2x5ay8l7am";

1212 };

1313

14− propagatedBuildInputs = [pythonPackages.h5py pythonPackages.matplotlib pythonPackages.seaborn pythonPackages.pandas];

14+ propagatedBuildInputs = [python2Packages.h5py python2Packages.matplotlib python2Packages.seaborn python2Packages.pandas];

1515

1616 meta = {

1717 description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore";

pkgs/applications/science/biology/tebreak/default.nix+6−6

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

1−{ lib, fetchFromGitHub, last, exonerate, minia, python3Packages, bwa

2−, samtools, findutils, python }:

1+{ lib, fetchFromGitHub, last, exonerate, minia, python3, bwa

2+, samtools, findutils }:

33

4−python3Packages.buildPythonApplication rec {

4+python3.pkgs.buildPythonApplication rec {

55 pname = "tebreak";

66 version = "1.1";

77

@@ -12,8 +12,8 @@ python3Packages.buildPythonApplication rec {

1212 sha256 = "13mgh775d8hkl340923lfwwm4r5ps70girn8d6wgfxzwzxylz8iz";

1313 };

1414

15− nativeBuildInputs = [ findutils python3Packages.cython ];

16− propagatedBuildInputs = with python3Packages; [

15+ nativeBuildInputs = [ findutils python3.pkgs.cython ];

16+ propagatedBuildInputs = with python3.pkgs; [

1717 pysam

1818 scipy

1919 bx-python

@@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec {

3535 checkPhase = ''

3636 $out/bin/tebreak -b test/data/example.ins.bam -r test/data/Homo_sapiens_chr4_50000000-60000000_assembly19.fasta -p 4 --pickle test/example.pickle --detail_out test/example.tebreak.detail.out -i lib/teref.human.fa

3737 pushd test

38− ${python.interpreter} checktest.py

38+ ${python3.interpreter} checktest.py

3939 '';

4040

4141 meta = with lib; {

pkgs/applications/science/electronics/kicad/default.nix+1−1

@@ -22,7 +22,7 @@

2222, sanitizeAddress ? false

2323, sanitizeThreads ? false

2424, with3d ? true

25−, withI18n ? false

25+, withI18n ? true

2626, withPCM ? true # Plugin and Content Manager

2727, srcs ? { }

2828}:

pkgs/applications/science/logic/lean/default.nix+3−3

@@ -2,7 +2,7 @@

22

33stdenv.mkDerivation rec {

44 pname = "lean";

5− version = "3.37.0";

5+ version = "3.38.0";

66

77 src = fetchFromGitHub {

88 owner = "leanprover-community";

@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {

1111 # from. this is then used to check whether an olean file should be

1212 # rebuilt. don't use a tag as rev because this will get replaced into

1313 # src/githash.h.in in preConfigure.

14− rev = "e69ab934262eb6f141344fdaec98ede68a9102b6";

15− sha256 = "19sigzbrdl90jqk7lvl3q8j6n4nnidzwp9zzmzgq3zxxgywa2ghp";

14+ rev = "a8cf8a0c9ea19a633baeb3aa7e8d706b86c2c0f9";

15+ sha256 = "14dam91pnn266fgii5c2j5p9p2i31bghx0s2h3qnnqyvxi4s5isx";

1616 };

1717

1818 nativeBuildInputs = [ cmake ];

pkgs/applications/science/machine-learning/shogun/default.nix+4−4

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

66 # build

77, cmake

88, ctags

9−, pythonPackages

9+, python2Packages

1010, swig

1111 # math

1212, eigen

@@ -36,7 +36,7 @@

3636, withSvmLight ? false

3737}:

3838

39−assert pythonSupport -> pythonPackages != null;

39+assert pythonSupport -> python2Packages != null;

4040assert opencvSupport -> opencv != null;

4141

4242assert (!blas.isILP64) && (!lapack.isILP64);

@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {

101101 ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch;

102102

103103 nativeBuildInputs = [ cmake swig ctags ]

104− ++ (with pythonPackages; [ python jinja2 ply ]);

104+ ++ (with python2Packages; [ python jinja2 ply ]);

105105

106106 buildInputs = [

107107 eigen

@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {

121121 nlopt

122122 lp_solve

123123 colpack

124− ] ++ lib.optionals pythonSupport (with pythonPackages; [ python numpy ])

124+ ] ++ lib.optionals pythonSupport (with python2Packages; [ python numpy ])

125125 ++ lib.optional opencvSupport opencv;

126126

127127 cmakeFlags = let

pkgs/applications/science/misc/sasview/default.nix+12−12

@@ -1,25 +1,25 @@

1−{ lib, fetchFromGitHub, gcc, python }:

1+{ lib, fetchFromGitHub, gcc, python2 }:

22

33let

44 xhtml2pdf = import ./xhtml2pdf.nix {

55 inherit lib;

6− fetchPypi = python.pkgs.fetchPypi;

7− buildPythonPackage = python.pkgs.buildPythonPackage;

8− html5lib = python.pkgs.html5lib;

9− httplib2 = python.pkgs.httplib2;

10− nose = python.pkgs.nose;

11− pillow = python.pkgs.pillow;

12− pypdf2 = python.pkgs.pypdf2;

13− reportlab = python.pkgs.reportlab;

6+ fetchPypi = python2.pkgs.fetchPypi;

7+ buildPythonPackage = python2.pkgs.buildPythonPackage;

8+ html5lib = python2.pkgs.html5lib;

9+ httplib2 = python2.pkgs.httplib2;

10+ nose = python2.pkgs.nose;

11+ pillow = python2.pkgs.pillow;

12+ pypdf2 = python2.pkgs.pypdf2;

13+ reportlab = python2.pkgs.reportlab;

1414 };

1515

1616in

1717

18−python.pkgs.buildPythonApplication rec {

18+python2.pkgs.buildPythonApplication rec {

1919 pname = "sasview";

2020 version = "4.2.0";

2121

22− checkInputs = with python.pkgs; [

22+ checkInputs = with python2.pkgs; [

2323 pytest

2424 unittest-xml-reporting

2525 ];

@@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec {

3535 HOME=$(mktemp -d) py.test

3636 '';

3737

38− propagatedBuildInputs = with python.pkgs; [

38+ propagatedBuildInputs = with python2.pkgs; [

3939 bumps

4040 gcc

4141 h5py

pkgs/applications/science/misc/tulip/default.nix+2−2

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

11{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4

2−, cmake, makeWrapper, libjpeg, python }:

2+, cmake, makeWrapper, libjpeg, python2 }:

33

44let version = "5.2.1"; in

55stdenv.mkDerivation rec {

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky";

1212 };

1313

14− buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python ];

14+ buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ];

1515

1616 nativeBuildInputs = [ cmake makeWrapper ];

1717

pkgs/applications/science/molecular-dynamics/gromacs/default.nix+2−2

@@ -19,11 +19,11 @@ let

1919

2020in stdenv.mkDerivation rec {

2121 pname = "gromacs";

22− version = "2021.4";

22+ version = "2021.5";

2323

2424 src = fetchurl {

2525 url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz";

26− sha256 = "07ds8abxq0k7vfpjvxb8in3fhb6lz0pbdzbmlidyzaw37qz8lw6b";

26+ sha256 = "1dh9l2gcv61h1r6qsg8vr3k1xp8jgd27czzg24kzf4k823k3z9pb";

2727 };

2828

2929 nativeBuildInputs = [ cmake ];

pkgs/applications/system/monitor/default.nix+16−2

@@ -18,17 +18,20 @@

1818, sassc

1919, udisks2

2020, wrapGAppsHook

21+, libX11

22+, libXext

23+, libXNVCtrl

2124}:

2225

2326stdenv.mkDerivation rec {

2427 pname = "monitor";

25− version = "0.11.0";

28+ version = "0.12.0";

2629

2730 src = fetchFromGitHub {

2831 owner = "stsdc";

2932 repo = "monitor";

3033 rev = version;

31− sha256 = "sha256-xWhhjn7zk/juXx50wLG2TpB5aqU+588kWBBquWrVJbM=";

34+ sha256 = "1fv98yz9393ddp0k96bwbgccy6x9dmmg8g1pjd3xs6m4c1bnvfc7";

3235 fetchSubmodules = true;

3336 };

3437

@@ -53,8 +56,19 @@ stdenv.mkDerivation rec {

5356 libwnck

5457 sassc

5558 udisks2

59+ libX11

60+ libXext

61+ libXNVCtrl

5662 ];

5763

64+ # Force link against Xext, otherwise build fails with:

65+ # ld: /nix/store/...-libXNVCtrl-495.46/lib/libXNVCtrl.a(NVCtrl.o): undefined reference to symbol 'XextAddDisplay'

66+ # ld: /nix/store/...-libXext-1.3.4/lib/libXext.so.6: error adding symbols: DSO missing from command line

67+ # https://github.com/stsdc/monitor/issues/292

68+ NIX_LDFLAGS = "-lXext";

69+

70+ mesonFlags = [ "-Dindicator-wingpanel=enabled" ];

71+

5872 postPatch = ''

5973 chmod +x meson/post_install.py

6074 patchShebangs meson/post_install.py

pkgs/applications/terminal-emulators/kitty/default.nix+22−11

@@ -3,8 +3,10 @@

33 libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor,

44 libxkbcommon, libXi, libXext, wayland-protocols, wayland,

55 lcms2,

6+ librsync,

67 installShellFiles,

78 dbus,

9+ darwin,

810 Cocoa,

911 CoreGraphics,

1012 Foundation,

@@ -21,20 +23,21 @@

2123with python3Packages;

2224buildPythonApplication rec {

2325 pname = "kitty";

24− version = "0.23.1";

26+ version = "0.24.1";

2527 format = "other";

2628

2729 src = fetchFromGitHub {

2830 owner = "kovidgoyal";

2931 repo = "kitty";

3032 rev = "v${version}";

31− sha256 = "sha256-2RwDU6EOJWF0u2ikJFg9U2yqSXergDkJH3h2i+QJ7G4=";

33+ sha256 = "sha256-WPkyub7CwNXRksUmqiZeznnSqEPFpyHTeFLQ+D4Fb5c=";

3234 };

3335

3436 buildInputs = [

3537 harfbuzz

3638 ncurses

3739 lcms2

40+ librsync

3841 ] ++ lib.optionals stdenv.isDarwin [

3942 Cocoa

4043 CoreGraphics

@@ -45,6 +48,8 @@ buildPythonApplication rec {

4548 libpng

4649 python3

4750 zlib

51+ ] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [

52+ darwin.apple_sdk.frameworks.UserNotifications

4853 ] ++ lib.optionals stdenv.isLinux [

4954 fontconfig libunistring libcanberra libX11

5055 libXrandr libXinerama libXcursor libxkbcommon libXi libXext

@@ -67,26 +72,31 @@ buildPythonApplication rec {

6772

6873 propagatedBuildInputs = lib.optional stdenv.isLinux libGL;

6974

70− outputs = [ "out" "terminfo" ];

75+ outputs = [ "out" "terminfo" "shell_integration" ];

7176

7277 # Causes build failure due to warning

7378 hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";

7479

7580 dontConfigure = true;

7681

77− buildPhase = ''

82+ buildPhase = let

83+ commonOptions = ''

84+ --update-check-interval=0 \

85+ --shell-integration=enabled\ no-rc

86+ '';

87+ in ''

7888 runHook preBuild

7989 ${if stdenv.isDarwin then ''

8090 ${python.interpreter} setup.py kitty.app \

81− --update-check-interval=0 \

82− --disable-link-time-optimization

91+ --disable-link-time-optimization \

92+ ${commonOptions}

8393 make man

8494 '' else ''

8595 ${python.interpreter} setup.py linux-package \

86− --update-check-interval=0 \

8796 --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \

8897 --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \

89− --canberra-library='${libcanberra}/lib/libcanberra.so'

98+ --canberra-library='${libcanberra}/lib/libcanberra.so' \

99+ ${commonOptions}

90100 ''}

91101 runHook postBuild

92102 '';

@@ -125,10 +135,7 @@ buildPythonApplication rec {

125135 --bash <("$out/bin/kitty" + complete setup bash) \

126136 --fish <("$out/bin/kitty" + complete setup fish) \

127137 --zsh <("$out/bin/kitty" + complete setup zsh)

128− runHook postInstall

129− '';

130138

131− postInstall = ''

132139 terminfo_src=${if stdenv.isDarwin then

133140 ''"$out/Applications/kitty.app/Contents/Resources/terminfo"''

134141 else

@@ -139,6 +146,10 @@ buildPythonApplication rec {

139146

140147 mkdir -p $out/nix-support

141148 echo "$terminfo" >> $out/nix-support/propagated-user-env-packages

149+

150+ cp -r 'shell-integration' "$shell_integration"

151+

152+ runHook postInstall

142153 '';

143154

144155 meta = with lib; {

pkgs/applications/terminal-emulators/mlterm/default.nix+2−2

@@ -10,13 +10,13 @@

1010

1111stdenv.mkDerivation rec {

1212 pname = "mlterm";

13− version = "3.9.1";

13+ version = "3.9.2";

1414

1515 src = fetchFromGitHub {

1616 owner = "arakiken";

1717 repo = pname;

1818 rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1

19− sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj";

19+ sha256 = "sha256-DvGR3rDegInpnLp3H+rXNXktCGhpjsBBPTRMwodeTro=";

2020 };

2121

2222 nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ];

pkgs/applications/version-management/dvc/default.nix+64−35

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

11{ lib

2−, python3Packages

2+, python3

33, fetchFromGitHub

44, enableGoogle ? false

55, enableAWS ? false

@@ -7,59 +7,88 @@

77, enableSSH ? false

88}:

99

10−with python3Packages;

11−buildPythonApplication rec {

10+python3.pkgs.buildPythonApplication rec {

1211 pname = "dvc";

13− version = "0.24.3";

12+ version = "2.9.3";

13+ format = "setuptools";

1414

15− # PyPi only has wheel

1615 src = fetchFromGitHub {

1716 owner = "iterative";

18− repo = "dvc";

17+ repo = pname;

1918 rev = version;

20− sha256 = "1wqq4i23hppilp20fx5a5nj93xwf3wwwr2f8aasvn6jkv2l22vpl";

19+ hash = "sha256-nRlgo7Wjs7RgTUxoMYQh5YEsqiJtdWH2ex79rhXagAQ=";

2120 };

2221

23− propagatedBuildInputs = [

24− ply

25− configparser

26− zc_lockfile

27− future

22+ nativeBuildInputs = with python3.pkgs; [

23+ setuptools-scm

24+ setuptools-scm-git-archive

25+ ];

26+

27+ propagatedBuildInputs = with python3.pkgs; [

28+ appdirs

29+ aiohttp-retry

2830 colorama

2931 configobj

30− networkx

31− pyyaml

32− GitPython

33− setuptools

32+ configobj

33+ dictdiffer

34+ diskcache

35+ distro

36+ dpath

37+ flatten-dict

38+ flufl_lock

39+ funcy

40+ grandalf

3441 nanotime

35− pyasn1

36− schema

37− jsonpath_rw

42+ networkx

43+ pathspec

44+ ply

45+ psutil

46+ pydot

47+ pygtrie

48+ pyparsing

49+ python-benedict

3850 requests

39− grandalf

40− asciimatics

41− distro

42− appdirs

43− ]

44− ++ lib.optional enableGoogle google-cloud-storage

45− ++ lib.optional enableAWS boto3

46− ++ lib.optional enableAzure azure-storage-blob

47− ++ lib.optional enableSSH paramiko;

48−

49− # tests require access to real cloud services

50− # nix build tests have to be isolated and run locally

51− doCheck = false;

51+ rich

52+ ruamel-yaml

53+ scmrepo

54+ shortuuid

55+ shtab

56+ tabulate

57+ toml

58+ tqdm

59+ typing-extensions

60+ voluptuous

61+ zc_lockfile

62+ ] ++ lib.optional enableGoogle [

63+ google-cloud-storage

64+ ] ++ lib.optional enableAWS [

65+ boto3

66+ ] ++ lib.optional enableAzure [

67+ azure-storage-blob

68+ ] ++ lib.optional enableSSH [

69+ paramiko

70+ ] ++ lib.optionals (pythonOlder "3.8") [

71+ importlib-metadata

72+ ] ++ lib.optionals (pythonOlder "3.9") [

73+ importlib-resources

74+ ];

5275

5376 patches = [ ./dvc-daemon.patch ];

5477

5578 postPatch = ''

56− substituteInPlace dvc/daemon.py --subst-var-by dvc "$out/bin/dcv"

79+ substituteInPlace setup.cfg \

80+ --replace "grandalf==0.6" "grandalf>=0.6"

81+ substituteInPlace dvc/daemon.py \

82+ --subst-var-by dvc "$out/bin/dcv"

5783 '';

5884

85+ # Tests require access to real cloud services

86+ doCheck = false;

87+

5988 meta = with lib; {

6089 description = "Version Control System for Machine Learning Projects";

61− license = licenses.asl20;

6290 homepage = "https://dvc.org";

63− maintainers = with maintainers; [ cmcdragonkai ];

91+ license = licenses.asl20;

92+ maintainers = with maintainers; [ cmcdragonkai fab ];

6493 };

6594}

pkgs/applications/version-management/dvc/dvc-daemon.patch+9−12

@@ -1,21 +1,18 @@

11diff --git a/dvc/daemon.py b/dvc/daemon.py

2−index 1d67a37..7ce6fde 100644

2+index 9854a0e1..fefdd613 100644

33--- a/dvc/daemon.py

44+++ b/dvc/daemon.py

5−@@ -67,14 +67,8 @@ def daemon(args):

6− Args:

7− args (list): list of arguments to append to `dvc daemon` command.

8− """

9−- cmd = [sys.executable]

10−- if not is_binary():

11−- cmd += ['-m', 'dvc']

12−- cmd += ['daemon', '-q'] + args

5+@@ -103,11 +103,8 @@ def daemon(args):

6+ logger.debug("skipping launching a new daemon.")

7+ return

8+

9+- cmd = ["daemon", "-q"] + args

1310-

1411- env = fix_env()

1512- file_path = os.path.abspath(inspect.stack()[0][1])

16−- env['PYTHONPATH'] = os.path.dirname(os.path.dirname(file_path))

13+- env["PYTHONPATH"] = os.path.dirname(os.path.dirname(file_path))

1714+ cmd = [ "@dvc@" , "daemon", "-q"] + args

1815+ env = None

16+ env[DVC_DAEMON] = "1"

1917

20− logger.debug("Trying to spawn '{}' with env '{}'".format(cmd, env))

21−

18+ _spawn(cmd, env)

pkgs/applications/version-management/git-and-tools/git-workspace/default.nix+3−3

@@ -7,16 +7,16 @@

77

88rustPlatform.buildRustPackage rec {

99 pname = "git-workspace";

10− version = "0.8.0";

10+ version = "0.9.0";

1111

1212 src = fetchFromGitHub {

1313 owner = "orf";

1414 repo = pname;

1515 rev = "v${version}";

16− sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA=";

16+ sha256 = "sha256-uP1sex4Hx57ZsqVG4b3809FzFB10Un48+vbwaWZ7HSg=";

1717 };

1818

19− cargoSha256 = "sha256-X0jRwDUVzS1s2tG6N2RDaFqwUUAT+mPMEft11VkJy5A=";

19+ cargoSha256 = "sha256-mkrC8uzfNpL0MQUMjcNaJf5c1wSdlBVg8AMgc/zxM6A=";

2020

2121 nativeBuildInputs = [ pkg-config ];

2222 buildInputs = [ openssl ]

pkgs/applications/version-management/gitless/default.nix+2−2

@@ -6,10 +6,10 @@ buildPythonApplication rec {

66 version = "0.8.8";

77

88 src = fetchFromGitHub {

9− owner = "sdg-mit";

9+ owner = "gitless-vcs";

1010 repo = "gitless";

1111 rev = "v${version}";

12− sha256 = "1q6y38f8ap6q1livvfy0pfnjr0l8b68hyhc9r5v87fmdyl7y7y8g";

12+ sha256 = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE=";

1313 };

1414

1515 propagatedBuildInputs = with pythonPackages; [ sh pygit2 clint ];

pkgs/applications/version-management/rapidsvn/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }:

1+{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python2 }:

22

33stdenv.mkDerivation rec {

44 pname = "rapidsvn";

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {

99 sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";

1010 };

1111

12− buildInputs = [ wxGTK subversion apr aprutil python ];

12+ buildInputs = [ wxGTK subversion apr aprutil python2 ];

1313

1414 configureFlags = [ "--with-svn-include=${subversion.dev}/include"

1515 "--with-svn-lib=${subversion.out}/lib" ];

pkgs/applications/version-management/src/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, python, rcs, git, makeWrapper }:

1+{ lib, stdenv, fetchurl, python2, rcs, git, makeWrapper }:

22

33stdenv.mkDerivation rec {

44 pname = "src";

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

1010 };

1111

1212 nativeBuildInputs = [ makeWrapper ];

13− buildInputs = [ python rcs git ];

13+ buildInputs = [ python2 rcs git ];

1414

1515 preConfigure = ''

1616 patchShebangs .

pkgs/applications/version-management/srcml/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2,

1+{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2,

22 curl

33}:

44

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

2323 ];

2424

2525 nativeBuildInputs = [ cmake antlr2 ];

26− buildInputs = [ libxml2 libxslt boost libarchive python curl ];

26+ buildInputs = [ libxml2 libxslt boost libarchive python2 curl ];

2727

2828 meta = {

2929 description = "Infrastructure for exploration, analysis, and manipulation of source code";

pkgs/applications/video/kodi/addons/arrow/default.nixnew file+30

@@ -0,0 +1,30 @@

1+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, typing_extensions }:

2+buildKodiAddon rec {

3+ pname = "arrow";

4+ namespace = "script.module.arrow";

5+ version = "1.0.3.1";

6+

7+ src = fetchzip {

8+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";

9+ sha256 = "0xa16sb2hls59l4gsg1xwb1qbkhcvbykq02l05n5rcm0alg80l3l";

10+ };

11+

12+ propagatedBuildInputs = [

13+ dateutil

14+ typing_extensions

15+ ];

16+

17+ passthru = {

18+ pythonPath = "lib";

19+ updateScript = addonUpdateScript {

20+ attrPath = "kodi.packages.arrow";

21+ };

22+ };

23+

24+ meta = with lib; {

25+ homepage = "https://github.com/razzeee/script.module.arrow";

26+ description = "Better dates & times for Python";

27+ license = licenses.asl20;

28+ maintainers = teams.kodi.members;

29+ };

30+}

pkgs/applications/video/kodi/addons/trakt-module/default.nixnew file+31

@@ -0,0 +1,31 @@

1+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, six, arrow }:

2+buildKodiAddon rec {

3+ pname = "trakt-module";

4+ namespace = "script.module.trakt";

5+ version = "4.4.0+matrix.1";

6+

7+ src = fetchzip {

8+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";

9+ sha256 = "19kjhrykx92sy67cajxjckzdwgq47ipwml0bx9vmdr9d191h14p8";

10+ };

11+

12+ propagatedBuildInputs = [

13+ requests

14+ six

15+ arrow

16+ ];

17+

18+ passthru = {

19+ pythonPath = "lib";

20+ updateScript = addonUpdateScript {

21+ attrPath = "kodi.packages.trakt-module";

22+ };

23+ };

24+

25+ meta = with lib; {

26+ homepage = "https://github.com/Razzeee/script.module.trakt";

27+ description = "Python trakt.py library packed for Kodi";

28+ license = licenses.mit;

29+ maintainers = teams.kodi.members;

30+ };

31+}

pkgs/applications/video/kodi/addons/trakt/default.nixnew file+30

@@ -0,0 +1,30 @@

1+{ lib, buildKodiAddon, fetchzip, addonUpdateScript, trakt-module, dateutil }:

2+buildKodiAddon rec {

3+ pname = "trakt";

4+ namespace = "script.trakt";

5+ version = "3.5.0";

6+

7+ src = fetchzip {

8+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";

9+ sha256 = "07fb0wjcr8ggidswrjs1r1hzi6grykiyi855bgm7pjzzk95kl99v";

10+ };

11+

12+ propagatedBuildInputs = [

13+ dateutil

14+ trakt-module

15+ ];

16+

17+ passthru = {

18+ pythonPath = "lib";

19+ updateScript = addonUpdateScript {

20+ attrPath = "kodi.packages.trakt";

21+ };

22+ };

23+

24+ meta = with lib; {

25+ homepage = "https://kodi.wiki/view/Add-on:Trakt";

26+ description = "Trakt.tv movie and TV show scrobbler for Kodi";

27+ license = licenses.gpl2Only;

28+ maintainers = teams.kodi.members;

29+ };

30+}

pkgs/applications/video/kodi/addons/typing_extensions/default.nixnew file+25

@@ -0,0 +1,25 @@

1+{ lib, buildKodiAddon, fetchzip, addonUpdateScript }:

2+buildKodiAddon rec {

3+ pname = "typing_extensions";

4+ namespace = "script.module.typing_extensions";

5+ version = "3.7.4.3";

6+

7+ src = fetchzip {

8+ url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";

9+ sha256 = "0p28hchj05hmccs6b2836kh4vqdqnl169409f2845d0nw9y4wkqq";

10+ };

11+

12+ passthru = {

13+ pythonPath = "lib";

14+ updateScript = addonUpdateScript {

15+ attrPath = "kodi.packages.typing_extensions";

16+ };

17+ };

18+

19+ meta = with lib; {

20+ homepage = "https://github.com/python/typing/tree/master/typing_extensions";

21+ description = "Python typing extensions";

22+ license = licenses.psfl;

23+ maintainers = teams.kodi.members;

24+ };

25+}

pkgs/applications/virtualization/runc/default.nix+2−2

@@ -16,13 +16,13 @@

1616

1717buildGoModule rec {

1818 pname = "runc";

19− version = "1.0.3";

19+ version = "1.1.0";

2020

2121 src = fetchFromGitHub {

2222 owner = "opencontainers";

2323 repo = "runc";

2424 rev = "v${version}";

25− sha256 = "sha256-Tl/JKbIpao+FCjngPzaVkxse50zo3XQ9Mg/AdkblMcI=";

25+ sha256 = "sha256-svLxxfiRDLWkdRuHXaDyH5Ta6qmptI8z+s41iZKgbWM=";

2626 };

2727

2828 vendorSha256 = null;

pkgs/applications/window-managers/i3/lock-blur.nix+2−1

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

1−{ i3lock-color, lib, fetchFromGitHub }:

1+{ i3lock-color, lib, stdenv, fetchFromGitHub }:

22

33i3lock-color.overrideAttrs (oldAttrs : rec {

44 pname = "i3lock-blur";

@@ -17,5 +17,6 @@ i3lock-color.overrideAttrs (oldAttrs : rec {

1717 license = licenses.bsd3;

1818 maintainers = with maintainers; [ dan4ik605743 ];

1919 platforms = platforms.all;

20+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/i3lock-blur.x86_64-darwin

2021 };

2122})

pkgs/applications/window-managers/i3/lock-color.nix+1

@@ -56,5 +56,6 @@ stdenv.mkDerivation rec {

5656 license = licenses.bsd3;

5757

5858 platforms = platforms.all;

59+ broken = stdenv.isDarwin;

5960 };

6061}

pkgs/applications/window-managers/tabbed/default.nix+3−3

@@ -18,9 +18,9 @@ stdenv.mkDerivation {

1818

1919 buildInputs = [ xorgproto libX11 libXft ];

2020

21− makeFlags = [

22− "PREFIX=$(out)"

23− ];

21+ makeFlags = [ "CC:=$(CC)" ];

22+

23+ installFlags = [ "PREFIX=$(out)" ];

2424

2525 meta = with lib; {

2626 homepage = "https://tools.suckless.org/tabbed";

pkgs/applications/window-managers/wmii-hg/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python, which

1+{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which

22, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }:

33

44stdenv.mkDerivation rec {

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {

3030 '';

3131

3232 nativeBuildInputs = [ pkg-config unzip ];

33− buildInputs = [ libixp_hg txt2tags dash python which

33+ buildInputs = [ libixp_hg txt2tags dash python2 which

3434 libX11 libXrender libXext libXinerama libXrandr libXft ];

3535

3636 # For some reason including mercurial in buildInputs did not help

pkgs/build-support/build-dotnet-module/default.nix+18−16

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

224224 "''${dotnetInstallFlags[@]}" \

225225 "''${dotnetFlags[@]}"

226226 done

227− '' + (lib.optionalString packNupkg ''

227+ '' + lib.optionalString packNupkg ''

228228 for project in ''${projectFile[@]}; do

229229 dotnet pack "$project" \

230230 -p:ContinuousIntegrationBuild=true \

@@ -235,16 +235,24 @@ let

235235 "''${dotnetPackFlags[@]}" \

236236 "''${dotnetFlags[@]}"

237237 done

238− '') + (if executables != null then ''

239− for executable in $executables; do

238+ '' + ''

239+ runHook postInstall

240+ '';

241+

242+ preFixup = ''

243+ _wrapDotnetProgram() {

244+ makeWrapper "$1" "$out/bin/$(basename "$executable")" \

245+ --set DOTNET_ROOT "${dotnet-runtime}" \

246+ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \

247+ "''${gappsWrapperArgs[@]}" \

248+ "''${makeWrapperArgs[@]}"

249+ }

250+ '' + (if executables != null then ''

251+ for executable in ''${executables[@]}; do

240252 execPath="$out/lib/${args.pname}/$executable"

241253

242254 if [[ -f "$execPath" && -x "$execPath" ]]; then

243− makeWrapper "$execPath" "$out/bin/$(basename "$executable")" \

244− --set DOTNET_ROOT "${dotnet-runtime}" \

245− --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \

246− "''${gappsWrapperArgs[@]}" \

247− "''${makeWrapperArgs[@]}"

255+ _wrapDotnetProgram $execPath

248256 else

249257 echo "Specified binary \"$executable\" is either not an executable, or does not exist!"

250258 exit 1

@@ -253,16 +261,10 @@ let

253261 '' else ''

254262 for executable in $out/lib/${args.pname}/*; do

255263 if [[ -f "$executable" && -x "$executable" && "$executable" != *"dll"* ]]; then

256− makeWrapper "$executable" "$out/bin/$(basename "$executable")" \

257− --set DOTNET_ROOT "${dotnet-runtime}" \

258− --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" \

259− "''${gappsWrapperArgs[@]}" \

260− "''${makeWrapperArgs[@]}"

264+ _wrapDotnetProgram $executable

261265 fi

262266 done

263− '') + ''

264− runHook postInstall

265− '';

267+ '');

266268 });

267269in

268270 package

pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix+1−1

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

7171 "pki"

7272 ];

7373 in concatStringsSep "\n "

74− (map (file: "--ro-bind-try /etc/${file} /etc/${file}") files);

74+ (map (file: "--ro-bind-try $(${coreutils}/bin/readlink -f /etc/${file}) /etc/${file}") files);

7575

7676 # Create this on the fly instead of linking from /nix

7777 # The container might have to modify it and re-run ldconfig if there are

pkgs/build-support/skaware/build-skaware-package.nix+9−6

@@ -21,9 +21,9 @@

2121 # : lines

2222, postInstall

2323 # : list Maintainer

24−, maintainers ? []

24+, maintainers ? [ ]

2525 # : passtrhu arguments (e.g. tests)

26−, passthru ? {}

26+, passthru ? { }

2727

2828}:

2929

@@ -54,7 +54,8 @@ let

5454 "CONTRIBUTING"

5555 ];

5656

57−in stdenv.mkDerivation {

57+in

58+stdenv.mkDerivation {

5859 inherit pname version;

5960

6061 src = fetchurl {

@@ -73,8 +74,8 @@ in stdenv.mkDerivation {

7374 # This might not hold for e.g. BSD.

7475 "--with-sysdep-devurandom=yes"

7576 (if stdenv.isDarwin

76− then "--disable-shared"

77− else "--enable-shared")

77+ then "--disable-shared"

78+ else "--enable-shared")

7879 ]

7980 # On darwin, the target triplet from -dumpmachine includes version number,

8081 # but skarnet.org software uses the triplet to test binary compatibility.

@@ -82,10 +83,12 @@ in stdenv.mkDerivation {

8283 # binary built on a different version of darwin.

8384 # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph

8485 ++ (lib.optional stdenv.isDarwin

85− "--build=${stdenv.hostPlatform.system}");

86+ "--build=${stdenv.hostPlatform.system}");

8687

8788 inherit postConfigure;

8889

90+ makeFlags = lib.optional stdenv.cc.isClang [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ];

91+

8992 # TODO(Profpatsch): ensure that there is always a $doc output!

9093 postInstall = ''

9194 echo "Cleaning & moving common files"

pkgs/data/fonts/noto-fonts/default.nix+47−33

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

33, lib

44, fetchFromGitHub

55, fetchurl

6−, fetchzip

76, cairo

87, python3

98, pkg-config

@@ -61,6 +60,42 @@ let

6160 maintainers = with maintainers; [ mathnerd314 emily ];

6261 };

6362 };

63+

64+ mkNotoCJK = { typeface, version, rev, sha256 }:

65+ stdenvNoCC.mkDerivation {

66+ pname = "noto-fonts-cjk-${lib.toLower typeface}";

67+ inherit version;

68+

69+ src = fetchFromGitHub {

70+ owner = "googlefonts";

71+ repo = "noto-cjk";

72+ inherit rev sha256;

73+ };

74+

75+ installPhase = ''

76+ install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/Variable/OTC/*.otf.ttc

77+ '';

78+

79+ meta = with lib; {

80+ description = "Beautiful and free fonts for CJK languages";

81+ homepage = "https://www.google.com/get/noto/help/cjk/";

82+ longDescription = ''

83+ Noto ${typeface} CJK is a ${lib.toLower typeface} typeface designed as

84+ an intermediate style between the modern and traditional. It is

85+ intended to be a multi-purpose digital font for user interface

86+ designs, digital content, reading on laptops, mobile devices, and

87+ electronic books. Noto ${typeface} CJK comprehensively covers

88+ Simplified Chinese, Traditional Chinese, Japanese, and Korean in a

89+ unified font family. It supports regional variants of ideographic

90+ characters for each of the four languages. In addition, it supports

91+ Japanese kana, vertical forms, and variant characters (itaiji); it

92+ supports Korean hangeul — both contemporary and archaic.

93+ '';

94+ license = licenses.ofl;

95+ platforms = platforms.all;

96+ maintainers = with maintainers; [ mathnerd314 emily ];

97+ };

98+ };

6499in

65100

66101{

@@ -74,39 +109,18 @@ in

74109 weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";

75110 };

76111

77− noto-fonts-cjk = let zip = fetchzip {

78− url = let rev = "be6c059ac1587e556e2412b27f5155c8eb3ddbe6"; in

79− "https://raw.githubusercontent.com/googlefonts/noto-cjk/${rev}/NotoSansCJK.ttc.zip";

80− # __MACOSX...

81− stripRoot = false;

82− sha256 = "0ik4z2b15i0pghskgfm3adzb0h35fr4gyzvz3bq49hhkhn9h85vi";

83− }; in stdenvNoCC.mkDerivation {

84− pname = "noto-fonts-cjk";

85− version = "2.001";

86−

87− buildCommand = ''

88− install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${zip}/*.ttc

89− '';

112+ noto-fonts-cjk-sans = mkNotoCJK {

113+ typeface = "Sans";

114+ version = "2.004";

115+ rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";

116+ sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik=";

117+ };

90118

91− meta = with lib; {

92− description = "Beautiful and free fonts for CJK languages";

93− homepage = "https://www.google.com/get/noto/help/cjk/";

94− longDescription =

95− ''

96− Noto Sans CJK is a sans serif typeface designed as an intermediate style

97− between the modern and traditional. It is intended to be a multi-purpose

98− digital font for user interface designs, digital content, reading on laptops,

99− mobile devices, and electronic books. Noto Sans CJK comprehensively covers

100− Simplified Chinese, Traditional Chinese, Japanese, and Korean in a unified font

101− family. It supports regional variants of ideographic characters for each of the

102− four languages. In addition, it supports Japanese kana, vertical forms, and

103− variant characters (itaiji); it supports Korean hangeul — both contemporary and

104− archaic.

105− '';

106− license = licenses.ofl;

107− platforms = platforms.all;

108− maintainers = with maintainers; [ mathnerd314 emily ];

109− };

119+ noto-fonts-cjk-serif = mkNotoCJK {

120+ typeface = "Serif";

121+ version = "2.000";

122+ rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";

123+ sha256 = "sha256-BX4tcDcz+RGka8mtced1k3BopUJQ14t1BtAVqTjyPik=";

110124 };

111125

112126 noto-fonts-emoji = let

pkgs/data/icons/tela-circle-icon-theme/default.nixnew file+65

@@ -0,0 +1,65 @@

1+{ lib

2+, stdenvNoCC

3+, fetchFromGitHub

4+, gtk3

5+, hicolor-icon-theme

6+, jdupes

7+, allColorVariants ? false

8+, circularFolder ? false

9+, colorVariants ? [] # default is standard

10+}:

11+

12+let

13+ pname = "tela-circle-icon-theme";

14+in

15+lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brown" "green" "grey" "orange" "pink" "purple" "red" "yellow" "manjaro" "ubuntu" ] colorVariants

16+

17+stdenvNoCC.mkDerivation rec {

18+ inherit pname;

19+ version = "unstable-2021-12-24";

20+

21+ src = fetchFromGitHub {

22+ owner = "vinceliuice";

23+ repo = pname;

24+ rev = "aa1f1446b6dbc6acfe3ee247e6841369c68e1495";

25+ sha256 = "03f79h6kv5vbf92fhpi1wivzvcrfvvdvkhbmy805x4b4wl7qynki";

26+ };

27+

28+ nativeBuildInputs = [

29+ gtk3

30+ jdupes

31+ ];

32+

33+ propagatedBuildInputs = [

34+ hicolor-icon-theme

35+ ];

36+

37+ dontDropIconThemeCache = true;

38+

39+ # These fixup steps are slow and unnecessary for this package.

40+ # Package may installs almost 400 000 small files.

41+ dontPatchELF = true;

42+ dontRewriteSymlinks = true;

43+

44+ installPhase = ''

45+ runHook preInstall

46+

47+ patchShebangs install.sh

48+

49+ ./install.sh -d $out/share/icons \

50+ ${lib.optionalString circularFolder "-c"} \

51+ ${if allColorVariants then "-a" else builtins.toString colorVariants}

52+

53+ jdupes -L -r $out/share/icons

54+

55+ runHook postInstall

56+ '';

57+

58+ meta = with lib; {

59+ description = "Flat and colorful personality icon theme";

60+ homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme";

61+ license = licenses.gpl3Only;

62+ platforms = platforms.unix;

63+ maintainers = with maintainers; [ romildo ];

64+ };

65+}

pkgs/data/misc/hackage/pin.json+4−4

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

11{

2− "commit": "52e5aa39956d0d5a8158320897630fed86ec2ed3",

3− "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/52e5aa39956d0d5a8158320897630fed86ec2ed3.tar.gz",

4− "sha256": "1yx7v3hscyp1jar0kfsc5pmj8i552j5milqzsair67cl8jf37vwz",

5− "msg": "Update from Hackage at 2022-01-05T00:50:25Z"

2+ "commit": "0b85617478c8c03b4db538b5dc1774f9fa5bf41c",

3+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b85617478c8c03b4db538b5dc1774f9fa5bf41c.tar.gz",

4+ "sha256": "1r2w0cysn4x8hzw0989p9cmqvyqkjs4phy8iisphczw30s02zc27",

5+ "msg": "Update from Hackage at 2022-01-14T12:47:41Z"

66}

pkgs/data/themes/graphite/default.nix+7−14

@@ -15,28 +15,21 @@

1515let

1616 pname = "graphite-gtk-theme";

1717

18− throwIfNotSubList = name: given: valid:

19− let

20− unexpected = lib.subtractLists valid given;

21− in

22− lib.throwIfNot (unexpected == [])

23− "${name}: ${builtins.concatStringsSep ", " (builtins.map builtins.toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (builtins.map builtins.toString valid)}";

24−

2518in

26−throwIfNotSubList "${pname}: theme variants" themeVariants [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ]

27−throwIfNotSubList "${pname}: color variants" colorVariants [ "standard" "light" "dark" ]

28−throwIfNotSubList "${pname}: size variants" sizeVariants [ "standard" "compact" ]

29−throwIfNotSubList "${pname}: tweaks" tweaks [ "nord" "black" "midblack" "rimless" "normal" ]

19+lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants

20+lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants

21+lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants

22+lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks

3023

3124stdenvNoCC.mkDerivation {

3225 inherit pname;

33− version = "unstable-2022-01-04";

26+ version = "unstable-2022-01-07";

3427

3528 src = fetchFromGitHub {

3629 owner = "vinceliuice";

3730 repo = pname;

38− rev = "947cac4966377d8f5b5a4e2966ec2b9a6041d205";

39− sha256 = "11pl8hzk4fwniqdib0ffvjilpspr1n5pg1gw39kal13wxh4sdg28";

31+ rev = "78e5421fee63b4c2a2a3d2e321538367b01a24ec";

32+ sha256 = "1vfvv1gfbr9yr9mz0kb7c7ij6pxcryni1fjs87gn4hpyzns431wk";

4033 };

4134

4235 nativeBuildInputs = [

pkgs/data/themes/lightly-qt/default.nixnew file+42

@@ -0,0 +1,42 @@

1+{ mkDerivation

2+, lib

3+, fetchFromGitHub

4+, cmake

5+, extra-cmake-modules

6+, kdecoration

7+, plasma-workspace

8+, qtbase

9+, qt5

10+}:

11+

12+mkDerivation rec {

13+ pname = "lightly-qt";

14+ version = "0.4.1";

15+

16+ src = fetchFromGitHub {

17+ owner = "Luwx";

18+ repo = "Lightly";

19+ rev = "v${version}";

20+ sha256 = "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk";

21+ };

22+

23+ buildInputs = [

24+ kdecoration

25+ plasma-workspace

26+ qtbase

27+ qt5.qtx11extras

28+ ];

29+

30+ nativeBuildInputs = [

31+ cmake

32+ extra-cmake-modules

33+ ];

34+

35+ meta = with lib; {

36+ description = "A fork of breeze theme style that aims to be visually modern and minimalistic";

37+ homepage = "https://github.com/Luwx/Lightly";

38+ license = licenses.gpl2Plus;

39+ maintainers = [ maintainers.pwoelfel ];

40+ platforms = platforms.all;

41+ };

42+}

pkgs/data/themes/mojave/default.nix+40−8

@@ -10,24 +10,42 @@

1010, optipng

1111, sassc

1212, which

13+, buttonSizeVariants ? [] # default to standard

14+, buttonVariants ? [] # default to all

15+, colorVariants ? [] # default to all

16+, opacityVariants ? [] # default to all

17+, themeVariants ? [] # default to MacOS blue

18+, wallpapers ? false

1319}:

1420

15−stdenv.mkDerivation rec {

21+let

1622 pname = "mojave-gtk-theme";

17− version = "2021-07-20";

23+in

24+lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] buttonSizeVariants

25+lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants

26+lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants

27+lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants

28+lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants

29+

30+stdenv.mkDerivation rec {

31+ inherit pname;

32+ version = "unstable-2021-12-20";

1833

1934 srcs = [

2035 (fetchFromGitHub {

2136 owner = "vinceliuice";

2237 repo = pname;

23− rev = version;

24− sha256 = "08j70kmjhvh06c3ahcracarrfq4vpy0zsp6zkcivbw4nf3bzp2zc";

38+ rev = "c148646ccab382f7a2d5fdc421fc32d843cb4172";

39+ sha256 = "sha256-h4MSSh8cu9M81bM+WJSyl1SQ7CVth1DvjIVOUJXqpxs";

2540 })

41+ ]

42+ ++

43+ lib.optional wallpapers

2644 (fetchurl {

2745 url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz";

2846 sha256 = "18zzkwm1kqzsdaj8swf0xby1n65gxnyslpw4lnxcx1rphip0rwf7";

2947 })

30− ];

48+ ;

3149

3250 sourceRoot = "source";

3351

@@ -76,9 +94,23 @@ stdenv.mkDerivation rec {

7694

7795 installPhase = ''

7896 runHook preInstall

79− name= ./install.sh --theme all --dest $out/share/themes

80− install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/*

81− jdupes -l -r $out/share

97+

98+ name= ./install.sh \

99+ ${lib.optionalString (buttonSizeVariants != []) "--small " + builtins.toString buttonSizeVariants} \

100+ ${lib.optionalString (buttonVariants != []) "--alt " + builtins.toString buttonVariants} \

101+ ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \

102+ ${lib.optionalString (opacityVariants != []) "--opacity " + builtins.toString opacityVariants} \

103+ ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \

104+ --dest $out/share/themes

105+

106+ ${lib.optionalString wallpapers ''

107+ install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/*

108+ ''}

109+

110+ # Replace duplicate files with hardlinks to the first file in each

111+ # set of duplicates, reducing the installed size in about 53%

112+ jdupes -L -r $out/share

113+

82114 runHook postInstall

83115 '';

84116

pkgs/data/themes/nordic/default.nix+29−18

@@ -1,77 +1,84 @@

1−{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }:

1+{ lib

2+, stdenv

3+, fetchFromGitHub

4+, gtk-engine-murrine

5+, jdupes

6+}:

27

38stdenv.mkDerivation rec {

49 pname = "nordic";

5− version = "2.1.0";

10+ version = "unstable-2022-01-08";

611

712 srcs = [

813 (fetchFromGitHub {

914 owner = "EliverLara";

1015 repo = pname;

11− rev = "0112af91943b8819f7a1af9a508cda7fe3d74051";

12− sha256 = "sha256-ccOA5/jXTx20495NpTgVu7DvsjfTEULqL3IyJ+Pd/ug";

16+ rev = "85086324c2a8fa7ca538b85ad0681e03733b2c86";

17+ sha256 = "sha256-p1nr71iJZm+2123WF67NkunBX2dR4ruK2Afqd7XdeGc=";

1318 name = "Nordic";

1419 })

1520

1621 (fetchFromGitHub {

1722 owner = "EliverLara";

1823 repo = pname;

19− rev = "b30d2c844cc6ef5d020308f1c02791de45b607a7";

20− sha256 = "sha256-g5yCCFXzipZLmUat+1r6QWHB7DWQvMKhMexHPV/DJHM";

24+ rev = "46c9e6665963ccb54938d7730e520bd8c52f4307";

25+ sha256 = "sha256-uFnNLshyKOvzaij7tEKb0fw0j3/GGfzznAf/aaKx7XI=";

2126 name = "Nordic-standard-buttons";

2227 })

2328

2429 (fetchFromGitHub {

2530 owner = "EliverLara";

2631 repo = pname;

27− rev = "6d38d6af363528f42619f663e3ecd4c08dfd2411";

28− sha256 = "sha256-jaRiSE6yfTltzZ2vr8w4d+YtSz7REOcL7vOOhQvIMlQ";

32+ rev = "da5c930386427fce65ea185f164709c8a20e362f";

33+ sha256 = "sha256-Ee9ymuMWs2ZgU+8FVLaviGtHMT4Sz5NWLaEGln2Z4V0=";

2934 name = "Nordic-darker";

3035 })

3136

3237 (fetchFromGitHub {

3338 owner = "EliverLara";

3439 repo = pname;

35− rev = "4142817c14c27b371d42796445bedc84dc94672c";

36− sha256 = "sha256-FAb1+EREcwYrfSxAl6LrPaJtkHMt67NV3bG87g1cFT4";

40+ rev = "fd85fb2712ac1192e35c92149b75bfc3c440b1c7";

41+ sha256 = "sha256-6WUQBeNq7EKNkYcCt/fUYloue90gxfp8bDYawkQQ6ss=";

3742 name = "Nordic-darker-standard-buttons";

3843 })

3944

4045 (fetchFromGitHub {

4146 owner = "EliverLara";

4247 repo = pname;

43− rev = "2a91d6f3db70412b0a80ed33546fbe93075627d8";

44− sha256 = "sha256-Su+amS7moc2IDONNvqw3bjL6Q0WLJWzHu6WvfcVDcDY";

48+ rev = "259e30ce13566214c7594b038dd2c240648a07a0";

49+ sha256 = "sha256-F6hC6XbT9yJl6SW9qJNlwmmBcvOrOS5yPCQALZFhgbM=";

4550 name = "Nordic-bluish-accent";

4651 })

4752

4853 (fetchFromGitHub {

4954 owner = "EliverLara";

5055 repo = pname;

51− rev = "3ebd334f97d638fdc888b16d69851e3ee31131f2";

52− sha256 = "sha256-h0IXtWcdDvAEVi/1cLZF4Vacdl6VAY+5uo0LGPNe0bg";

56+ rev = "2a27051d87558dfa595fb94eff34241d3a1b8c30";

57+ sha256 = "sha256-JIld6GVtr1tz02Do2Ft92qtza6iGrPapasd6jmMFG6k=";

5358 name = "Nordic-bluish-accent-standard-buttons";

5459 })

5560

5661 (fetchFromGitHub {

5762 owner = "EliverLara";

5863 repo = "${pname}-polar";

59− rev = "803926882f8178c72b433466a377aaa33c5b372a";

60− sha256 = "sha256-G7Vu03PoFOEU9uxb5JiHR4Tr8qk47fPo7Gg7Vt9Zzns";

64+ rev = "0bea76aed39bb2a2669278b8403c4129aa47be0f";

65+ sha256 = "sha256-OXmz6uHXh1zl93sgv5WEwARkEUCr4PRh0/mJyMLXpnk=";

6166 name = "Nordic-Polar";

6267 })

6368

6469 (fetchFromGitHub {

6570 owner = "EliverLara";

6671 repo = "${pname}-polar";

67− rev = "988cb8a16ece3901b8b0e7a5b86503400491cb1e";

68− sha256 = "sha256-Zx1mrzJm5o4wQwOR8ZU2OEcjD3/6UXwLrBYpMtCkQbg";

72+ rev = "8fe52b6c276a7e548e87a558db6734cf9f003b06";

73+ sha256 = "sha256-/IxlBvMLAK+mGRyaa7bTv/oZS24nSNeE5GsyJIeN6UU=";

6974 name = "Nordic-Polar-standard-buttons";

7075 })

7176 ];

7277

7378 sourceRoot = ".";

7479

80+ nativeBuildInputs = [ jdupes ];

81+

7582 propagatedUserEnvPkgs = [ gtk-engine-murrine ];

7683

7784 installPhase = ''

@@ -101,6 +108,10 @@ stdenv.mkDerivation rec {

101108 mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/

102109 rm -rf $out/share/themes/Nordic/kde

103110

111+ # Replace duplicate files with hardlinks to the first file in each

112+ # set of duplicates, reducing the installed size in about 65%

113+ jdupes -L -r $out/share

114+

104115 runHook postInstall

105116 '';

106117

pkgs/data/themes/sierra/default.nix+51−10

@@ -1,26 +1,67 @@

1−{ lib, stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }:

1+{ lib

2+, stdenv

3+, fetchFromGitHub

4+, gdk-pixbuf

5+, gtk-engine-murrine

6+, jdupes

7+, librsvg

8+, libxml2

9+, buttonVariants ? [] # default to all

10+, colorVariants ? [] # default to all

11+, opacityVariants ? [] # default to all

12+, sizeVariants ? [] # default to all

13+}:

214

3−stdenv.mkDerivation rec {

15+let

416 pname = "sierra-gtk-theme";

5− version = "2019-12-16";

17+in

18+lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants

19+lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants

20+lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants

21+lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants

22+

23+stdenv.mkDerivation {

24+ inherit pname;

25+ version = "unstable-2021-05-24";

626

727 src = fetchFromGitHub {

828 owner = "vinceliuice";

929 repo = pname;

10− rev = version;

11− sha256 = "14hlz8kbrjypyd6wyrwmnj2wm9w3kc8y00ms35ard7x8lmhs56hr";

30+ rev = "05899001c4fc2fec87c4d222cb3997c414e0affd";

31+ sha256 = "174l5mryc34ma1r42pk6572c6i9hmzr9vj1a6w06nqz5qcfm1hds";

1232 };

1333

14− nativeBuildInputs = [ libxml2 ];

34+ nativeBuildInputs = [

35+ jdupes

36+ libxml2

37+ ];

1538

16− buildInputs = [ gdk-pixbuf librsvg ];

39+ buildInputs = [

40+ gdk-pixbuf

41+ librsvg

42+ ];

1743

18− propagatedUserEnvPkgs = [ gtk-engine-murrine ];

44+ propagatedUserEnvPkgs = [

45+ gtk-engine-murrine

46+ ];

1947

2048 installPhase = ''

21− patchShebangs .

49+ runHook preInstall

50+

51+ patchShebangs install.sh

52+

2253 mkdir -p $out/share/themes

23− name= ./install.sh --dest $out/share/themes

54+ name= ./install.sh --dest $out/share/themes \

55+ ${lib.optionalString (buttonVariants != []) "--alt " + builtins.toString buttonVariants} \

56+ ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \

57+ ${lib.optionalString (opacityVariants != []) "--opacity " + builtins.toString opacityVariants} \

58+ ${lib.optionalString (sizeVariants != []) "--flat " + builtins.toString sizeVariants}

59+

60+ # Replace duplicate files with hardlinks to the first file in each

61+ # set of duplicates, reducing the installed size in about 79%

62+ jdupes -L -r $out/share

63+

64+ runHook postInstall

2465 '';

2566

2667 meta = with lib; {

pkgs/desktops/pantheon/apps/elementary-camera/default.nix+10

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -34,6 +35,15 @@ stdenv.mkDerivation rec {

3435 sha256 = "sha256-xIv+mOlZV58XD0Z6Vc2wA1EQUxT5BaQ0zhYc9v+ne1w=";

3536 };

3637

38+ patches = [

39+ # Fix build with meson 0.61

40+ # https://github.com/elementary/camera/pull/216

41+ (fetchpatch {

42+ url = "https://github.com/elementary/camera/commit/ead143b7e3246c5fa9bb37c95d491fb07cea9e04.patch";

43+ sha256 = "sha256-2zGigUi6DpjJx8SEvAE3Q3jrm7MggOvLc72lAPMPvs4=";

44+ })

45+ ];

46+

3747 nativeBuildInputs = [

3848 appstream

3949 desktop-file-utils

pkgs/desktops/pantheon/apps/elementary-code/default.nix+10

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -38,6 +39,15 @@ stdenv.mkDerivation rec {

3839 sha256 = "sha256-AXmMcPj2hf33G5v3TUg+eZwaKOdVlRvoVXglMJFHRjw=";

3940 };

4041

42+ patches = [

43+ # Fix build with meson 0.61

44+ # https://github.com/elementary/code/pull/1165

45+ (fetchpatch {

46+ url = "https://github.com/elementary/code/commit/a2607cce3a6b1bb62d02456456d3cbc3c6530bb0.patch";

47+ sha256 = "sha256-VKR83IOUYsQhBRlU9JUTlMJtXWv/AyG4wDsjMU2vmU8=";

48+ })

49+ ];

50+

4151 passthru = {

4252 updateScript = nix-update-script {

4353 attrPath = "pantheon.${pname}";

pkgs/desktops/pantheon/apps/elementary-files/default.nix+10

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -43,6 +44,15 @@ stdenv.mkDerivation rec {

4344 sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY=";

4445 };

4546

47+ patches = [

48+ # Fix build with meson 0.61

49+ # https://github.com/elementary/files/pull/1973

50+ (fetchpatch {

51+ url = "https://github.com/elementary/files/commit/28428fbda905ece59d3427a3a40e986fdf71a916.patch";

52+ sha256 = "sha256-GZTHAH9scQWrBqdrDI14cj57f61HD8o79zFcPCXjKmc=";

53+ })

54+ ];

55+

4656 nativeBuildInputs = [

4757 desktop-file-utils

4858 gettext

pkgs/desktops/pantheon/apps/elementary-mail/default.nix+10

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -34,6 +35,15 @@ stdenv.mkDerivation rec {

3435 sha256 = "sha256-wOu9jvvwG53vzcNa38nk4eREZWW7Cin8el4qApQ8gI8=";

3536 };

3637

38+ patches = [

39+ # Fix build with meson 0.61

40+ # https://github.com/elementary/mail/pull/751

41+ (fetchpatch {

42+ url = "https://github.com/elementary/mail/commit/bbadc56529276d8e0ff98e9df7d9bb1bf8fc5783.patch";

43+ sha256 = "sha256-lJEnX5/G6e8PdKy1XGlwFIoCeSy6SR5p68tS4noj+44=";

44+ })

45+ ];

46+

3747 nativeBuildInputs = [

3848 appstream

3949 desktop-file-utils

pkgs/desktops/pantheon/apps/elementary-music/default.nix+6

@@ -50,6 +50,12 @@ stdenv.mkDerivation rec {

5050 url = "https://github.com/elementary/music/commit/aea97103d59afd213467403a48788e476e47c4c3.patch";

5151 sha256 = "1ayj8l6lb19hhl9bhsdfbq7jgchfmpjx0qkljnld90czcksn95yx";

5252 })

53+ # Fix build with meson 0.61

54+ # https://github.com/elementary/music/pull/674

55+ (fetchpatch {

56+ url = "https://github.com/elementary/music/commit/fb3d840049c1e2e0bf8fdddea378a2db647dd096.patch";

57+ sha256 = "sha256-tQZv7hZExLqbkGXahZxDfg7bkgwCKYbDholC2zuwlNw=";

58+ })

5359 ];

5460

5561 passthru = {

pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix+10

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -28,6 +29,15 @@ stdenv.mkDerivation rec {

2829 sha256 = "sha256-n+L08C/W5YnHZ5P3F1NGUYE2SH94sc4+kr1x+wXZ+cw=";

2930 };

3031

32+ patches = [

33+ # Fix build with meson 0.61

34+ # https://github.com/elementary/screenshot/pull/241

35+ (fetchpatch {

36+ url = "https://github.com/elementary/screenshot/commit/80a5d942e813dd098e1ef0f6629b81d2ccef05ae.patch";

37+ sha256 = "sha256-jOQuzUJvsjqytplLcW9BeIxzi9+/k2GFa4hHVZ3+wts=";

38+ })

39+ ];

40+

3141 nativeBuildInputs = [

3242 desktop-file-utils

3343 meson

pkgs/desktops/pantheon/apps/elementary-terminal/default.nix+10

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -32,6 +33,15 @@ stdenv.mkDerivation rec {

3233 sha256 = "sha256-4q7YQ4LxuiM/TRae1cc3ncmw7QwE1soC2Sh+GZ+Gpq0=";

3334 };

3435

36+ patches = [

37+ # Fix build with meson 0.61

38+ # https://github.com/elementary/terminal/pull/649

39+ (fetchpatch {

40+ url = "https://github.com/elementary/terminal/commit/15e3ace08cb25e53941249fa1ee680a1e2f871b4.patch";

41+ sha256 = "sha256-XVs+kq5qbX5KlxtkqxwJnatNYNeJiVLBec7sLjQsUxg=";

42+ })

43+ ];

44+

3545 nativeBuildInputs = [

3646 appstream

3747 desktop-file-utils

pkgs/desktops/pantheon/apps/switchboard/default.nix+6

@@ -60,6 +60,12 @@ stdenv.mkDerivation rec {

6060 url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch";

6161 sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc";

6262 })

63+ # Fix build with meson 0.61

64+ # https://github.com/elementary/switchboard/pull/226

65+ (fetchpatch {

66+ url = "https://github.com/elementary/switchboard/commit/ecf2a6c42122946cc84150f6927ef69c1f67c909.patch";

67+ sha256 = "sha256-J62tMeDfOpliBLHMSa3uBGTc0RBNzC6eDjDBDYySL+0=";

68+ })

6369 ];

6470

6571 postPatch = ''

pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix+7

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, linkFarm

67, substituteAll

@@ -90,6 +91,12 @@ stdenv.mkDerivation rec {

9091 src = ./hardcode-fallback-background.patch;

9192 default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";

9293 })

94+ # Fix build with meson 0.61

95+ # https://github.com/elementary/greeter/pull/590

96+ (fetchpatch {

97+ url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch";

98+ sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY=";

99+ })

93100 ];

94101

95102 preFixup = ''

pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix+11−3

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -21,15 +22,22 @@ stdenv.mkDerivation rec {

2122 pname = "elementary-shortcut-overlay";

2223 version = "1.2.1";

2324

24− repoName = "shortcut-overlay";

25−

2625 src = fetchFromGitHub {

2726 owner = "elementary";

28− repo = repoName;

27+ repo = "shortcut-overlay";

2928 rev = version;

3029 sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM=";

3130 };

3231

32+ patches = [

33+ # Fix build with meson 0.61

34+ # https://github.com/elementary/shortcut-overlay/pull/113

35+ (fetchpatch {

36+ url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch";

37+ sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA=";

38+ })

39+ ];

40+

3341 nativeBuildInputs = [

3442 desktop-file-utils

3543 libxml2

pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix+11−3

@@ -1,6 +1,7 @@

11{ lib

22, stdenv

33, fetchFromGitHub

4+, fetchpatch

45, nix-update-script

56, pkg-config

67, meson

@@ -21,15 +22,22 @@ stdenv.mkDerivation rec {

2122 pname = "elementary-capnet-assist";

2223 version = "2.4.0";

2324

24− repoName = "capnet-assist";

25−

2625 src = fetchFromGitHub {

2726 owner = "elementary";

28− repo = repoName;

27+ repo = "capnet-assist";

2928 rev = version;

3029 sha256 = "sha256-UdkS+w61c8z2TCJyG7YsDb0n0b2LOpFyaHzMbdCJsZI=";

3130 };

3231

32+ patches = [

33+ # Fix build with meson 0.61

34+ # https://github.com/elementary/capnet-assist/pull/76

35+ (fetchpatch {

36+ url = "https://github.com/elementary/capnet-assist/commit/0e77bf8023ba1b35e3a5badb72c246cabf6552b9.patch";

37+ sha256 = "sha256-B/KEs/TCxR+i3uQSRtWxTi2+cu0n6QLcfKCbMCvSsvs=";

38+ })

39+ ];

40+

3341 nativeBuildInputs = [

3442 desktop-file-utils

3543 meson

pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix+9−8

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

1−{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala_0_40

1+{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala

22, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce }:

33

44stdenv.mkDerivation rec {

@@ -12,13 +12,7 @@ stdenv.mkDerivation rec {

1212 sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA=";

1313 };

1414

15− # Does not build with vala 0.48 or later

16− # Upstream has no activity for a while

17− # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible

18− # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters.

19− # public virtual signal bool remote_event (string name, GLib.Value value);

20− # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

21− nativeBuildInputs = [ pkg-config vala_0_40 wafHook python3 ];

15+ nativeBuildInputs = [ pkg-config vala wafHook python3 ];

2216 buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ];

2317

2418 postPatch = ''

@@ -39,5 +33,12 @@ stdenv.mkDerivation rec {

3933 license = licenses.mit;

4034 platforms = platforms.linux;

4135 maintainers = with maintainers; [ volth ] ++ teams.xfce.members;

36+ # Does not build with vala 0.48 or later

37+ # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible

38+ # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters.

39+ # public virtual signal bool remote_event (string name, GLib.Value value);

40+ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

41+ # Upstream has no activity since 20 May 2020

42+ broken = true;

4243 };

4344}

pkgs/development/compilers/hip/default.nix+3−3

@@ -16,7 +16,7 @@

1616, makeWrapper

1717, numactl

1818, perl

19−, python

19+, python2

2020, rocclr

2121, rocm-comgr

2222, rocm-device-libs

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

5656 substituteInPlace bin/hip_embed_pch.sh \

5757 --replace '$LLVM_DIR/bin/' ""

5858

59− sed 's,#!/usr/bin/python,#!${python}/bin/python,' -i hip_prof_gen.py

59+ sed 's,#!/usr/bin/python,#!${python2}/bin/python,' -i hip_prof_gen.py

6060

6161 sed -e 's,$ROCM_AGENT_ENUM = "''${ROCM_PATH}/bin/rocm_agent_enumerator";,$ROCM_AGENT_ENUM = "${rocminfo}/bin/rocm_agent_enumerator";,' \

6262 -e 's,^\($DEVICE_LIB_PATH=\).*$,\1"${rocm-device-libs}/amdgcn/bitcode";,' \

@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {

111111 sha256 = "WvOuQu/EN81Kwcoc3ZtGlhb996edQJ3OWFsmPuqeNXE=";

112112 };

113113

114− nativeBuildInputs = [ cmake python makeWrapper perl ];

114+ nativeBuildInputs = [ cmake python2 makeWrapper perl ];

115115 buildInputs = [ libxml2 numactl libglvnd libX11 ];

116116 propagatedBuildInputs = [

117117 clang

pkgs/development/compilers/intel-graphics-compiler/default.nix+1

@@ -77,5 +77,6 @@ stdenv.mkDerivation rec {

7777 license = licenses.mit;

7878 platforms = platforms.all;

7979 maintainers = with maintainers; [ gloaming ];

80+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/intel-graphics-compiler.x86_64-darwin

8081 };

8182}

pkgs/development/compilers/vala/default.nix+5−22

@@ -15,19 +15,7 @@ let

1515 # header file isn't available at all, but that patch (./gvc-compat.patch)

1616 # can be shared between all versions of Vala so far.

1717 graphvizPatch =

18− let

19− fp = { commit, sha256 }: fetchpatch {

20− url = "https://github.com/openembedded/openembedded-core/raw/${commit}/meta/recipes-devtools/vala/vala/disable-graphviz.patch";

21− inherit sha256;

22− };

23−

24− in {

25−

26− # NOTE: the openembedded-core project doesn't have a patch for 0.40.12

27− # We've fixed the single merge conflict in the following patch.

28− # 0.40.12: https://github.com/openembedded/openembedded-core/raw/8553c52f174af4c8c433c543f806f5ed5c1ec48c/meta/recipes-devtools/vala/vala/disable-graphviz.patch

29− "0.40" = ./disable-graphviz-0.40.12.patch;

30−

18+ {

3119 "0.48" = ./disable-graphviz-0.46.1.patch;

3220

3321 "0.52" = ./disable-graphviz-0.46.1.patch;

@@ -98,19 +86,14 @@ let

9886 });

9987

10088in rec {

101− vala_0_40 = generic {

102− version = "0.40.25";

103− sha256 = "1pxpack8rrmywlf47v440hc6rv3vi8q9c6niwqnwikxvb2pwf3w7";

104− };

105−

10689 vala_0_48 = generic {

107− version = "0.48.21";

108− sha256 = "sha256-MFRVrrdo1u2bAYNgtVGC5IsW2xvBY6TluBQg+Y0h2Zg=";

90+ version = "0.48.22";

91+ sha256 = "sha256-27NHjEvjZvCTFkrGHNOu29zz5EQE2eNkFK4VEk525os=";

10992 };

11093

11194 vala_0_52 = generic {

112− version = "0.52.9";

113− sha256 = "sha256-HpMH2B4hHxniUB6P5PtN0Z+5J8SEtV/873FOjFFdAHk=";

95+ version = "0.52.10";

96+ sha256 = "sha256-nCAb+BLZh04hveU/jZwU9lF0ixqBRB/1ySkSJESQEAg=";

11497 };

11598

11699 vala_0_54 = generic {

pkgs/development/compilers/vala/disable-graphviz-0.40.12.patchdeleted−208

@@ -1,208 +0,0 @@

1−diff --git i/configure.ac w/configure.ac

2−index 694ffd200..915062053 100644

3−--- i/configure.ac

4−+++ w/configure.ac

5−@@ -112,34 +112,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)

6− AC_SUBST(GMODULE_CFLAGS)

7− AC_SUBST(GMODULE_LIBS)

8−

9−-PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)

10−-AC_MSG_CHECKING([for CGRAPH])

11−-cgraph_tmp_LIBADD="$LIBADD"

12−-cgraph_tmp_CFLAGS="$CFLAGS"

13−-LIBADD="$LIBADD $LIBGVC_LIBS"

14−-CFLAGS="$CFLAGS $LIBGVC_CFLAGS"

15−-AC_RUN_IFELSE(

16−- [AC_LANG_SOURCE([

17−- #include <gvc.h>

18−-

19−- int main(void) {

20−- #ifdef WITH_CGRAPH

21−- return 0;

22−- #else

23−- return -1;

24−- #endif

25−- }

26−- ])], [

27−- AC_MSG_RESULT([yes])

28−- VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"

29−- have_cgraph=yes

30−- ], [

31−- AC_MSG_RESULT([no])

32−- have_cgraph=no

33−- ]

34−-)

35−-LIBADD="$cgraph_tmp_LIBADD"

36−-CFLAGS="$cgraph_tmp_CFLAGS"

37−+AC_ARG_ENABLE(graphviz, AS_HELP_STRING([--disable-graphviz], [Disable graphviz usage for valadoc]), enable_graphviz=$enableval, enable_graphviz=yes)

38−+if test x$enable_graphviz = xyes; then

39−+ PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)

40−+ AC_MSG_CHECKING([for CGRAPH])

41−+ VALAFLAGS="$VALAFLAGS -D HAVE_GRAPHVIZ"

42−+ cgraph_tmp_LIBADD="$LIBADD"

43−+ cgraph_tmp_CFLAGS="$CFLAGS"

44−+ LIBADD="$LIBADD $LIBGVC_LIBS"

45−+ CFLAGS="$CFLAGS $LIBGVC_CFLAGS"

46−+ AC_RUN_IFELSE(

47−+ [AC_LANG_SOURCE([

48−+ #include <gvc.h>

49−+ int main(void) {

50−+ #ifdef WITH_CGRAPH

51−+ return 0;

52−+ #else

53−+ return -1;

54−+ #endif

55−+ }

56−+ ])], [

57−+ AC_MSG_RESULT([yes])

58−+ VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"

59−+ have_cgraph=yes

60−+ ], [

61−+ AC_MSG_RESULT([no])

62−+ have_cgraph=no

63−+ ]

64−+ )

65−+ LIBADD="$cgraph_tmp_LIBADD"

66−+ CFLAGS="$cgraph_tmp_CFLAGS"

67−+fi

68−+AM_CONDITIONAL(ENABLE_GRAPHVIZ, test x$enable_graphviz = xyes)

69− AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")

70−

71− AC_PATH_PROG([XSLTPROC], [xsltproc], :)

72−diff --git i/libvaladoc/Makefile.am w/libvaladoc/Makefile.am

73−index f3f790e76..3c5dc4c80 100644

74−--- i/libvaladoc/Makefile.am

75−+++ w/libvaladoc/Makefile.am

76−@@ -128,10 +128,6 @@ libvaladoc_la_VALASOURCES = \

77− content/tablerow.vala \

78− content/taglet.vala \

79− content/text.vala \

80−- charts/chart.vala \

81−- charts/chartfactory.vala \

82−- charts/hierarchychart.vala \

83−- charts/simplechartfactory.vala \

84− parser/manyrule.vala \

85− parser/oneofrule.vala \

86− parser/optionalrule.vala \

87−@@ -158,13 +154,24 @@ libvaladoc_la_VALASOURCES = \

88− highlighter/codetoken.vala \

89− highlighter/highlighter.vala \

90− html/basicdoclet.vala \

91−- html/htmlchartfactory.vala \

92− html/linkhelper.vala \

93− html/cssclassresolver.vala \

94− html/htmlmarkupwriter.vala \

95− html/htmlrenderer.vala \

96− $(NULL)

97−

98−+if ENABLE_GRAPHVIZ

99−+libvaladoc_la_VALASOURCES += \

100−+ charts/chart.vala \

101−+ charts/chartfactory.vala \

102−+ charts/hierarchychart.vala \

103−+ charts/simplechartfactory.vala \

104−+ html/htmlchartfactory.vala \

105−+ $(NULL)

106−+

107−+LIBGVC_PKG = --vapidir $(top_srcdir)/vapi --pkg libgvc

108−+endif

109−+

110− libvaladoc@PACKAGE_SUFFIX@_la_SOURCES = \

111− libvaladoc.vala.stamp \

112− $(libvaladoc_la_VALASOURCES:.vala=.c) \

113−@@ -184,11 +191,11 @@ libvaladoc.vala.stamp: $(libvaladoc_la_VALASOURCES)

114− --library valadoc \

115− --vapi valadoc@PACKAGE_SUFFIX@.vapi \

116− --vapidir $(top_srcdir)/vapi --pkg gmodule-2.0 \

117−- --vapidir $(top_srcdir)/vapi --pkg libgvc \

118− --vapidir $(top_srcdir)/gee --pkg gee \

119− --vapidir $(top_srcdir)/vala --pkg vala \

120− --vapidir $(top_srcdir)/ccode --pkg ccode \

121− --vapidir $(top_srcdir)/codegen --pkg codegen \

122−+ $(LIBGVC_PKG) \

123− --pkg config \

124− $(filter %.vala %.c,$^)

125− touch $@

126−@@ -217,6 +224,9 @@ nodist_pkgconfig_DATA = valadoc@PACKAGE_SUFFIX@.pc

127−

128− valadoc@PACKAGE_SUFFIX@.pc: valadoc.pc

129− cp $< $@

130−+if !ENABLE_GRAPHVIZ

131−+ sed -i "s/libgvc //g" $@

132−+endif

133−

134− vapidir = $(datadir)/vala/vapi

135− dist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.vapi

136−@@ -224,6 +234,9 @@ nodist_vapi_DATA = valadoc@PACKAGE_SUFFIX@.deps

137−

138− valadoc@PACKAGE_SUFFIX@.deps: valadoc.deps

139− cp $< $@

140−+if !ENABLE_GRAPHVIZ

141−+ sed -i "s/libgvc//g" $@

142−+endif

143−

144− EXTRA_DIST = \

145− $(libvaladoc_la_VALASOURCES) \

146−diff --git i/libvaladoc/html/basicdoclet.vala w/libvaladoc/html/basicdoclet.vala

147−index 192e488cd..ec0960222 100644

148−--- i/libvaladoc/html/basicdoclet.vala

149−+++ w/libvaladoc/html/basicdoclet.vala

150−@@ -46,7 +46,11 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {

151− protected HtmlRenderer _renderer;

152− protected Html.MarkupWriter writer;

153− protected Html.CssClassResolver cssresolver;

154−+#if HAVE_GRAPHVIZ

155− protected Charts.Factory image_factory;

156−+#else

157−+ protected void* image_factory;

158−+#endif

159− protected ErrorReporter reporter;

160− protected string package_list_link = "../index.html";

161−

162−@@ -120,7 +124,9 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {

163− this.linker = new LinkHelper ();

164−

165− _renderer = new HtmlRenderer (settings, this.linker, this.cssresolver);

166−+#if HAVE_GRAPHVIZ

167− this.image_factory = new SimpleChartFactory (settings, linker);

168−+#endif

169− }

170−

171−

172−@@ -1026,6 +1032,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {

173− }

174−

175− protected void write_image_block (Api.Node element) {

176−+#if HAVE_GRAPHVIZ

177− if (element is Class || element is Interface || element is Struct) {

178− unowned string format = (settings.use_svg_images ? "svg" : "png");

179− var chart = new Charts.Hierarchy (image_factory, element);

180−@@ -1045,6 +1052,7 @@ public abstract class Valadoc.Html.BasicDoclet : Api.Visitor, Doclet {

181− this.get_img_path_html (element, format)});

182− writer.add_usemap (chart);

183− }

184−+#endif

185− }

186−

187− public void write_namespace_content (Namespace node, Api.Node? parent) {

188−diff --git i/libvaladoc/html/htmlmarkupwriter.vala w/libvaladoc/html/htmlmarkupwriter.vala

189−index dcc4dad76..cf9c860b8 100644

190−--- i/libvaladoc/html/htmlmarkupwriter.vala

191−+++ w/libvaladoc/html/htmlmarkupwriter.vala

192−@@ -51,12 +51,16 @@ public class Valadoc.Html.MarkupWriter : Valadoc.MarkupWriter {

193− }

194− }

195−

196−+#if HAVE_GRAPHVIZ

197− public MarkupWriter add_usemap (Charts.Chart chart) {

198− string? buf = (string?) chart.write_buffer ("cmapx");

199− if (buf != null) {

200− raw_text ("\n");

201− raw_text ((!) buf);

202− }

203−+#else

204−+ public MarkupWriter add_usemap (void* chart) {

205−+#endif

206−

207− return this;

208− }

pkgs/development/compilers/zulu/default.nix+4−4

@@ -22,11 +22,11 @@

2222}:

2323

2424let

25− version = "11.50.19";

26− openjdk = "11.0.12";

25+ version = "11.52.13";

26+ openjdk = "11.0.13";

2727

28− sha256_linux = "b8e8a63b79bc312aa90f3558edbea59e71495ef1a9c340e38900dd28a1c579f3";

29− sha256_darwin = "9bc6874932f7f88d0a48220d3200449ddf7dc5c0e82af2df2738bc13d21b0e4e";

28+ sha256_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f";

29+ sha256_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e";

3030

3131 platform = if stdenv.isDarwin then "macosx" else "linux";

3232 hash = if stdenv.isDarwin then sha256_darwin else sha256_linux;

pkgs/development/gnuradio-modules/grnet/default.nix+1

@@ -52,6 +52,7 @@ mkDerivation {

5252 pname = "gr-grnet";

5353 version = version.name;

5454 inherit src;

55+ disabledForGRafter = "3.10";

5556

5657 buildInputs = [

5758 boost

pkgs/development/gnuradio-modules/limesdr/default.nix−2

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

2020 version = {

2121 "3.7" = "2.0.0";

2222 "3.8" = "3.0.1";

23− "3.9" = null;

2423 }.${gnuradio.versionAttr.major};

2524 src = fetchFromGitHub {

2625 owner = "myriadrf";

@@ -29,7 +28,6 @@ let

2928 sha256 = {

3029 "3.7" = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq";

3130 "3.8" = "ffs+8TU0yr6IW1xZJ/abQ1CQWGZM+zYqPRJxy3ZvM9U=";

32− "3.9" = null;

3331 }.${gnuradio.versionAttr.major};

3432 };

3533in mkDerivation {

pkgs/development/gnuradio-modules/osmosdr/default.nix+2−4

@@ -24,16 +24,14 @@

2424let

2525 version = {

2626 "3.7" = "0.1.5";

27− "3.8" = "0.2.2";

28− "3.9" = null;

27+ "3.8" = "0.2.3";

2928 }.${gnuradio.versionAttr.major};

3029 src = fetchgit {

3130 url = "git://git.osmocom.org/gr-osmosdr";

3231 rev = "v${version}";

3332 sha256 = {

3433 "3.7" = "0bf9bnc1c3c4yqqqgmg3nhygj6rcfmyk6pybi27f7461d2cw1drv";

35− "3.8" = "HT6xlN6cJAnvF+s1g2I1uENhBJJizdADlLXeSD0rEqs=";

36− "3.9" = null;

34+ "3.8" = "sha256-ZfI8MshhZOdJ1U5FlnZKXsg2Rsvb6oKg943ZVYd/IWo=";

3735 }.${gnuradio.versionAttr.major};

3836 };

3937in mkDerivation {

pkgs/development/haskell-modules/configuration-common.nix+18−22

@@ -181,7 +181,8 @@ self: super: {

181181 # base bound

182182 digit = doJailbreak super.digit;

183183

184− hnix = generateOptparseApplicativeCompletion "hnix"

184+ # hnix.patch needed until the next release is bumped

185+ hnix = appendPatch ./patches/hnix.patch (generateOptparseApplicativeCompletion "hnix"

185186 (overrideCabal (drv: {

186187 # 2020-06-05: HACK: does not pass own build suite - `dontCheck`

187188 doCheck = false;

@@ -189,7 +190,7 @@ self: super: {

189190 # needs newer version of relude and semialign than stackage has

190191 relude = self.relude_1_0_0_1;

191192 semialign = self.semialign_1_2_0_1;

192− }));

193+ })));

193194

194195 # Fails for non-obvious reasons while attempting to use doctest.

195196 focuslist = dontCheck super.focuslist;

@@ -1185,7 +1186,6 @@ self: super: {

11851186 # The test suite depends on an impure cabal-install installation in

11861187 # $HOME, which we don't have in our build sandbox.

11871188 cabal-install-parsers = dontCheck super.cabal-install-parsers;

1188− cabal-install-parsers_0_4_2 = dontCheck super.cabal-install-parsers_0_4_2;

11891189

11901190 # 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage.

11911191 gitit = doJailbreak super.gitit;

@@ -1522,7 +1522,10 @@ self: super: {

15221522 # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129

15231523 servant-swagger = dontCheck super.servant-swagger;

15241524

1525− hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;

1525+ # substituteInPlace: https://github.com/hercules-ci/hercules-ci-agent/issues/363

1526+ hercules-ci-agent = overrideCabal { preConfigure = ''

1527+ substituteInPlace hercules-ci-agent/Hercules/Agent/Cachix/Init.hs --replace "Cachix.Client.Env" "Cachix.Client.Version"

1528+ ''; } (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent);

15261529

15271530 hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [

15281531 unmarkBroken

@@ -1862,29 +1865,22 @@ self: super: {

18621865 # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions.

18631866 tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland;

18641867

1865− # 2021-05-09 haskell-ci pins ShellCheck 0.7.1

1866− # https://github.com/haskell-CI/haskell-ci/issues/507

1867− # 2021-09-05 haskell-ci needs Cabal 3.4,

1868− # cabal-install-parsers uses Cabal 3.6 since 0.4.3

1869− haskell-ci = super.haskell-ci.override {

1870− ShellCheck = self.ShellCheck_0_7_1;

1871− cabal-install-parsers = self.cabal-install-parsers_0_4_2;

1872− };

1868+ # 2022-01-16 haskell-ci needs Cabal 3.6,

1869+ haskell-ci = super.haskell-ci.overrideScope (self: super: {

1870+ attoparsec = self.attoparsec_0_14_4;

1871+ Cabal = self.Cabal_3_6_2_0;

1872+ });

18731873

1874− # Build haskell-ci from git repository, including some useful fixes,

1875− # e. g. required for generating the workflows for the cabal2nix repository

1876− haskell-ci-unstable = (overrideSrc rec {

1877− version = "0.13.20211116-${builtins.substring 0 7 src.rev}";

1874+ # Build haskell-ci from git repository

1875+ haskell-ci-unstable = overrideSrc rec {

1876+ version = "0.14.1-${builtins.substring 0 7 src.rev}";

18781877 src = pkgs.fetchFromGitHub {

18791878 owner = "haskell-CI";

18801879 repo = "haskell-ci";

1881− rev = "b61df11e7f6010ce09920c231321ab1545a990b5";

1882− sha256 = "0v6mqpavz5v161milq6a3x9gzap0pgksd3h4rwi2s3f9b15sczcy";

1880+ rev = "8311a999b8e8be3aa31f65f314def256aa2d5535";

1881+ sha256 = "169jaqm4xs2almmvqsk567wayxs0g6kn0l5877c03hzr3d9ykrav";

18831882 };

1884− } super.haskell-ci).overrideScope (self: super: {

1885− attoparsec = self.attoparsec_0_14_3;

1886− Cabal = self.Cabal_3_6_2_0;

1887− });

1883+ } self.haskell-ci;

18881884

18891885 Frames-streamly = super.Frames-streamly.override {

18901886 relude = super.relude_1_0_0_1;

pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix−5

@@ -49,11 +49,6 @@ self: super: {

4949 # cabal-install-parsers is written for Cabal 3.6

5050 cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; };

5151

52− # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4

53− cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override {

54− Cabal = self.Cabal_3_4_1_0;

55− };

56−

5752 # Jailbreak to fix the build.

5853 base-noprelude = doJailbreak super.base-noprelude;

5954 system-fileio = doJailbreak super.system-fileio;

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix+9−9

@@ -83,7 +83,7 @@ self: super: {

8383 # Jailbreaks & Version Updates

8484 assoc = doJailbreak super.assoc;

8585 async = doJailbreak super.async;

86− attoparsec = super.attoparsec_0_14_3;

86+ attoparsec = super.attoparsec_0_14_4;

8787 base64-bytestring = doJailbreak super.base64-bytestring;

8888 base-compat = self.base-compat_0_12_1;

8989 base-compat-batteries = self.base-compat-batteries_0_12_1;

@@ -102,23 +102,23 @@ self: super: {

102102 genvalidity-hspec = self.genvalidity-hspec_1_0_0_0;

103103 ghc-byteorder = doJailbreak super.ghc-byteorder;

104104 ghc-exactprint = overrideCabal (drv: {

105− # HACK: ghc-exactprint 1.3.0 is not buildable for GHC < 9.2,

105+ # HACK: ghc-exactprint 1.4.1 is not buildable for GHC < 9.2,

106106 # but hackage2nix evaluates the cabal file with GHC 8.10.*,

107107 # causing the build-depends to be skipped. Since the dependency

108108 # list hasn't changed much since 0.6.4, we can just reuse the

109109 # normal expression.

110− inherit (self.ghc-exactprint_1_3_0) src version;

110+ inherit (self.ghc-exactprint_1_4_1) src version;

111111 revision = null; editedCabalFile = null;

112112 libraryHaskellDepends = [

113113 self.fail

114114 self.ordered-containers

115115 ] ++ drv.libraryHaskellDepends or [];

116116 }) super.ghc-exactprint;

117− ghc-lib = self.ghc-lib_9_2_1_20211101;

118− ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;

117+ ghc-lib = self.ghc-lib_9_2_1_20220109;

118+ ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109;

119119 ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;

120120 hackage-security = doJailbreak super.hackage-security;

121− hashable = super.hashable_1_4_0_1;

121+ hashable = super.hashable_1_4_0_2;

122122 hashable-time = doJailbreak super.hashable-time_0_3;

123123 hedgehog = doJailbreak super.hedgehog;

124124 HTTP = overrideCabal (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }) (doJailbreak super.HTTP);

@@ -131,13 +131,13 @@ self: super: {

131131 ormolu = self.ormolu_0_4_0_0;

132132 OneTuple = super.OneTuple_0_3_1;

133133 parallel = doJailbreak super.parallel;

134− path = doJailbreak super.path_0_9_1;

134+ path = doJailbreak super.path_0_9_2;

135135 polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);

136136 primitive = doJailbreak super.primitive;

137137 quickcheck-instances = super.quickcheck-instances_0_3_27;

138138 regex-posix = doJailbreak super.regex-posix;

139139 resolv = doJailbreak super.resolv;

140− retrie = doDistribute self.retrie_1_2_0_0;

140+ retrie = doDistribute self.retrie_1_2_0_1;

141141 semialign = super.semialign_1_2_0_1;

142142 singleton-bool = doJailbreak super.singleton-bool;

143143 scientific = doJailbreak super.scientific;

@@ -234,7 +234,7 @@ self: super: {

234234 sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc";

235235 };

236236 } (super.hlint_3_3_6.overrideScope (self: super: {

237− ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101;

237+ ghc-lib-parser = self.ghc-lib-parser_9_2_1_20220109;

238238 ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1;

239239 }))

240240 );

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml+6

@@ -455,6 +455,7 @@ broken-packages:

455455 - brick-dropdownmenu

456456 - bricks-internal

457457 - brillig

458+ - broadcast-chan-tests

458459 - broccoli

459460 - brok

460461 - broker-haskell

@@ -571,6 +572,7 @@ broken-packages:

571572 - capnp

572573 - capped-list

573574 - capri

575+ - captcha-core

574576 - caramia

575577 - carbonara

576578 - cardano-coin-selection

@@ -3881,6 +3883,7 @@ broken-packages:

38813883 - pretty-ncols

38823884 - prettyprinter-vty

38833885 - prim-array

3886+ - primecount

38843887 - primes-type

38853888 - prim-instances

38863889 - PrimitiveArray-Pretty

@@ -4452,6 +4455,8 @@ broken-packages:

44524455 - show-prettyprint

44534456 - Shpadoinkle-backend-pardiff

44544457 - Shpadoinkle-backend-snabbdom

4458+ - Shpadoinkle-backend-static

4459+ - Shpadoinkle-html

44554460 - Shpadoinkle-isreal

44564461 - Shpadoinkle-streaming

44574462 - Shpadoinkle-template

@@ -4852,6 +4857,7 @@ broken-packages:

48524857 - tagsoup-selection

48534858 - tai

48544859 - tai64

4860+ - tailwind

48554861 - takahashi

48564862 - Takusen

48574863 - takusen-oracle

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml+3−2

@@ -158,8 +158,6 @@ extra-packages:

158158 - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x

159159 - sbv == 7.13 # required for pkgs.petrinizer

160160 - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses

161− - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version

162− - cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6

163161 - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4

164162 - ghc-lib == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version

165163 - ghc-lib-parser == 9.0.* # 2021-11-05: Need one GHC 9.0.2 compatible version

@@ -623,3 +621,6 @@ dont-distribute-packages:

623621 - webkitgtk3

624622 - webkitgtk3-javascriptcore

625623 - websnap

624+

625+ # glade relies on system libglade which is deprecated

626+ - glade

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml+13−2

@@ -618,6 +618,8 @@ dont-distribute-packages:

618618 - bricks-parsec

619619 - bricks-rendering

620620 - bricks-syntax

621+ - broadcast-chan-conduit

622+ - broadcast-chan-pipes

621623 - bronyradiogermany-streaming

622624 - brotli-conduit

623625 - brotli-streams

@@ -659,6 +661,8 @@ dont-distribute-packages:

659661 - canteven-http

660662 - cao

661663 - cap

664+ - captcha-2captcha

665+ - captcha-capmonster

662666 - car-pool

663667 - carboncopy

664668 - cartel

@@ -827,6 +831,8 @@ dont-distribute-packages:

827831 - copilot-language

828832 - copilot-libraries

829833 - copilot-theorem

834+ - core-webserver-servant

835+ - core-webserver-warp

830836 - coroutine-enumerator

831837 - coroutine-iteratee

832838 - couch-simple

@@ -1186,7 +1192,7 @@ dont-distribute-packages:

11861192 - funnyprint

11871193 - funsat

11881194 - fused-effects-squeal

1189− - futhark_0_21_2

1195+ - futhark_0_21_4

11901196 - fwgl-glfw

11911197 - fwgl-javascript

11921198 - fxpak

@@ -1652,6 +1658,7 @@ dont-distribute-packages:

16521658 - hsfacter

16531659 - hslogstash

16541660 - hspec-expectations-pretty

1661+ - hspec-expectations-pretty-diff_0_7_2_6

16551662 - hspec-pg-transact

16561663 - hspec-setup

16571664 - hspec-shouldbe

@@ -1810,6 +1817,7 @@ dont-distribute-packages:

18101817 - ivy-web

18111818 - iyql

18121819 - j2hs

1820+ - jacinda

18131821 - jail

18141822 - java-bridge-extras

18151823 - java-character

@@ -1890,6 +1898,7 @@ dont-distribute-packages:

18901898 - knead-arithmetic

18911899 - knit-haskell

18921900 - knots

1901+ - koji-tool

18931902 - korfu

18941903 - ks-test

18951904 - kurita

@@ -2161,6 +2170,7 @@ dont-distribute-packages:

21612170 - mprover

21622171 - mps

21632172 - mptcp

2173+ - mptcpanalyzer

21642174 - msgpack-aeson

21652175 - msgpack-idl

21662176 - msgpack-rpc

@@ -2295,7 +2305,7 @@ dont-distribute-packages:

22952305 - pairing

22962306 - panda

22972307 - pandoc-japanese-filters

2298− - pandoc_2_16_2

2308+ - pandoc_2_17

22992309 - papa

23002310 - papa-base

23012311 - papa-base-implement

@@ -2443,6 +2453,7 @@ dont-distribute-packages:

24432453 - proto3-suite

24442454 - protobuf-native

24452455 - protocol-buffers-descriptor-fork

2456+ - psql

24462457 - puffytools

24472458 - pugs-compat

24482459 - pugs-hsregex

pkgs/development/haskell-modules/configuration-nix.nix+6

@@ -818,6 +818,12 @@ self: super: builtins.intersectAttrs super {

818818 platforms = pkgs.lib.platforms.x86;

819819 } super.geomancy;

820820

821+ hlint = overrideCabal (drv: {

822+ postInstall = ''

823+ install -Dm644 data/hlint.1 -t "$out/share/man/man1"

824+ '' + drv.postInstall or "";

825+ }) super.hlint;

826+

821827 hls-brittany-plugin = overrideCabal (drv: {

822828 testToolDepends = [ pkgs.git ];

823829 preCheck = ''

pkgs/development/haskell-modules/hackage-packages.nix+1743−510

@@ -2818,6 +2818,8 @@ self: {

28182818 pname = "Cabal";

28192819 version = "3.6.2.0";

28202820 sha256 = "0hmw2wkypd42qyyfi6rhbsxmymbxg9rrw683yg39627vlw33v44y";

2821+ revision = "1";

2822+ editedCabalFile = "1s79dmxxzyczldakjcwg7jqxhhfw724fwbjh7s656cynxnalq85f";

28212823 setupHaskellDepends = [ mtl parsec ];

28222824 libraryHaskellDepends = [

28232825 array base binary bytestring containers deepseq directory filepath

@@ -10824,8 +10826,8 @@ self: {

1082410826 pname = "HsOpenSSL";

1082510827 version = "0.11.7.2";

1082610828 sha256 = "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5";

10827− revision = "1";

10828− editedCabalFile = "1lccw8x48xxmw1cpd260fdr9mxqr39f4b623i78027l0m93dw38b";

10829+ revision = "2";

10830+ editedCabalFile = "1wqk9mnzxwphiza6lwg526nvr6mzbwv0l22kwbsd2r9vv1gix1rk";

1082910831 setupHaskellDepends = [ base Cabal ];

1083010832 libraryHaskellDepends = [ base bytestring network time ];

1083110833 librarySystemDepends = [ openssl ];

@@ -11221,6 +11223,25 @@ self: {

1122111223 license = lib.licenses.bsd3;

1122211224 }) {};

1122311225

11226+ "IPv6Addr_2_0_4" = callPackage

11227+ ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network

11228+ , network-info, random, test-framework, test-framework-hunit, text

11229+ }:

11230+ mkDerivation {

11231+ pname = "IPv6Addr";

11232+ version = "2.0.4";

11233+ sha256 = "1d20cfnxvahcnr8iq71ymyykfl6cgxzl5i6vmdl7ill2bj07xy08";

11234+ libraryHaskellDepends = [

11235+ aeson attoparsec base iproute network network-info random text

11236+ ];

11237+ testHaskellDepends = [

11238+ base HUnit test-framework test-framework-hunit text

11239+ ];

11240+ description = "Library to deal with IPv6 address text representations";

11241+ license = lib.licenses.bsd3;

11242+ hydraPlatforms = lib.platforms.none;

11243+ }) {};

11244+

1122411245 "IPv6DB" = callPackage

1122511246 ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger

1122611247 , hedis, hspec, http-client, http-types, IPv6Addr, mtl

@@ -18339,34 +18360,6 @@ self: {

1833918360 broken = true;

1834018361 }) {};

1834118362

18342− "ShellCheck_0_7_1" = callPackage

18343− ({ mkDerivation, aeson, array, base, bytestring, containers

18344− , deepseq, Diff, directory, filepath, mtl, parsec, process

18345− , QuickCheck, regex-tdfa

18346− }:

18347− mkDerivation {

18348− pname = "ShellCheck";

18349− version = "0.7.1";

18350− sha256 = "06m4wh891nah3y0br4wh3adpsb16zawkb2ijgf1vcz61fznj6ps1";

18351− isLibrary = true;

18352− isExecutable = true;

18353− libraryHaskellDepends = [

18354− aeson array base bytestring containers deepseq Diff directory

18355− filepath mtl parsec process QuickCheck regex-tdfa

18356− ];

18357− executableHaskellDepends = [

18358− aeson array base bytestring containers deepseq Diff directory

18359− filepath mtl parsec QuickCheck regex-tdfa

18360− ];

18361− testHaskellDepends = [

18362− aeson array base bytestring containers deepseq Diff directory

18363− filepath mtl parsec QuickCheck regex-tdfa

18364− ];

18365− description = "Shell script analysis tool";

18366− license = lib.licenses.gpl3Only;

18367− hydraPlatforms = lib.platforms.none;

18368− }) {};

18369−

1837018363 "ShellCheck" = callPackage

1837118364 ({ mkDerivation, aeson, array, base, bytestring, containers

1837218365 , deepseq, Diff, directory, filepath, mtl, parsec, process

@@ -18588,6 +18581,8 @@ self: {

1858818581 libraryHaskellDepends = [ base compactable Shpadoinkle text ];

1858918582 description = "A backend for rendering Shpadoinkle as Text";

1859018583 license = lib.licenses.bsd3;

18584+ hydraPlatforms = lib.platforms.none;

18585+ broken = true;

1859118586 }) {};

1859218587

1859318588 "Shpadoinkle-console" = callPackage

@@ -18704,6 +18699,8 @@ self: {

1870418699 ];

1870518700 description = "A typed, template generated Html DSL, and helpers";

1870618701 license = lib.licenses.bsd3;

18702+ hydraPlatforms = lib.platforms.none;

18703+ broken = true;

1870718704 }) {};

1870818705

1870918706 "Shpadoinkle-isreal" = callPackage

@@ -33855,15 +33852,15 @@ self: {

3385533852 license = lib.licenses.asl20;

3385633853 }) {};

3385733854

33858− "ascii_1_1_1_0" = callPackage

33855+ "ascii_1_1_1_2" = callPackage

3385933856 ({ mkDerivation, ascii-case, ascii-char, ascii-group

3386033857 , ascii-predicates, ascii-superset, ascii-th, base, bytestring

3386133858 , text

3386233859 }:

3386333860 mkDerivation {

3386433861 pname = "ascii";

33865− version = "1.1.1.0";

33866− sha256 = "11a2hwjz439damkjcx3ybbwjnvhdrhwxw78203vgydym4v1k2hrn";

33862+ version = "1.1.1.2";

33863+ sha256 = "0wyr8s678dz2f45aiaish7xagdpnzn9rdx56zd4cs0aib0w71gl6";

3386733864 libraryHaskellDepends = [

3386833865 ascii-case ascii-char ascii-group ascii-predicates ascii-superset

3386933866 ascii-th base bytestring text

@@ -33901,6 +33898,19 @@ self: {

3390133898 license = lib.licenses.asl20;

3390233899 }) {};

3390333900

33901+ "ascii-case_1_0_0_10" = callPackage

33902+ ({ mkDerivation, ascii-char, base, hashable }:

33903+ mkDerivation {

33904+ pname = "ascii-case";

33905+ version = "1.0.0.10";

33906+ sha256 = "1vncwrngvqlzacs8084s7xvbj02zpq5irciwmv8cxh8pwjk2vhpw";

33907+ libraryHaskellDepends = [ ascii-char base hashable ];

33908+ testHaskellDepends = [ ascii-char base ];

33909+ description = "ASCII letter case";

33910+ license = lib.licenses.asl20;

33911+ hydraPlatforms = lib.platforms.none;

33912+ }) {};

33913+

3390433914 "ascii-char" = callPackage

3390533915 ({ mkDerivation, base, hashable }:

3390633916 mkDerivation {

@@ -33913,6 +33923,19 @@ self: {

3391333923 license = lib.licenses.asl20;

3391433924 }) {};

3391533925

33926+ "ascii-char_1_0_0_14" = callPackage

33927+ ({ mkDerivation, base, hashable }:

33928+ mkDerivation {

33929+ pname = "ascii-char";

33930+ version = "1.0.0.14";

33931+ sha256 = "0mdmcxp5bd89akh6z7kdyhl679pbm58rww0mhzj6y41sj4g7j4m4";

33932+ libraryHaskellDepends = [ base hashable ];

33933+ testHaskellDepends = [ base ];

33934+ description = "A Char type representing an ASCII character";

33935+ license = lib.licenses.asl20;

33936+ hydraPlatforms = lib.platforms.none;

33937+ }) {};

33938+

3391633939 "ascii-cows" = callPackage

3391733940 ({ mkDerivation, base, random-extras, random-fu, text }:

3391833941 mkDerivation {

@@ -33952,6 +33975,19 @@ self: {

3395233975 license = lib.licenses.asl20;

3395333976 }) {};

3395433977

33978+ "ascii-group_1_0_0_10" = callPackage

33979+ ({ mkDerivation, ascii-char, base, hashable }:

33980+ mkDerivation {

33981+ pname = "ascii-group";

33982+ version = "1.0.0.10";

33983+ sha256 = "0swkv40jlcix8qs62zszkbsvw0k833l6rmrx21jzxvfi41pycd5r";

33984+ libraryHaskellDepends = [ ascii-char base hashable ];

33985+ testHaskellDepends = [ ascii-char base ];

33986+ description = "ASCII character groups";

33987+ license = lib.licenses.asl20;

33988+ hydraPlatforms = lib.platforms.none;

33989+ }) {};

33990+

3395533991 "ascii-holidays" = callPackage

3395633992 ({ mkDerivation, base, random, random-shuffle, terminfo, time }:

3395733993 mkDerivation {

@@ -33979,6 +34015,19 @@ self: {

3397934015 license = lib.licenses.asl20;

3398034016 }) {};

3398134017

34018+ "ascii-predicates_1_0_0_8" = callPackage

34019+ ({ mkDerivation, ascii-char, base }:

34020+ mkDerivation {

34021+ pname = "ascii-predicates";

34022+ version = "1.0.0.8";

34023+ sha256 = "1pl1pw6z1yc2r21v70qrm1wfnbzyq8cl0z3xn0268w1qx4qlnpng";

34024+ libraryHaskellDepends = [ ascii-char base ];

34025+ testHaskellDepends = [ ascii-char base ];

34026+ description = "Various categorizations of ASCII characters";

34027+ license = lib.licenses.asl20;

34028+ hydraPlatforms = lib.platforms.none;

34029+ }) {};

34030+

3398234031 "ascii-progress" = callPackage

3398334032 ({ mkDerivation, async, base, concurrent-output, data-default

3398434033 , hspec, QuickCheck, time

@@ -34037,6 +34086,21 @@ self: {

3403734086 license = lib.licenses.asl20;

3403834087 }) {};

3403934088

34089+ "ascii-superset_1_0_1_10" = callPackage

34090+ ({ mkDerivation, ascii-char, base, bytestring, hashable, text }:

34091+ mkDerivation {

34092+ pname = "ascii-superset";

34093+ version = "1.0.1.10";

34094+ sha256 = "1filq9yr5lmwmn6m5ax0hpnyxlk160qbw2ikvjk4rs6078xwjwl9";

34095+ libraryHaskellDepends = [

34096+ ascii-char base bytestring hashable text

34097+ ];

34098+ testHaskellDepends = [ ascii-char base text ];

34099+ description = "Representing ASCII with refined supersets";

34100+ license = lib.licenses.asl20;

34101+ hydraPlatforms = lib.platforms.none;

34102+ }) {};

34103+

3404034104 "ascii-table" = callPackage

3404134105 ({ mkDerivation, aeson, base, containers, dlist, hashable, text

3404234106 , unordered-containers, vector, wl-pprint-extras

@@ -34072,6 +34136,25 @@ self: {

3407234136 license = lib.licenses.asl20;

3407334137 }) {};

3407434138

34139+ "ascii-th_1_0_0_8" = callPackage

34140+ ({ mkDerivation, ascii-char, ascii-superset, base, bytestring

34141+ , template-haskell, text

34142+ }:

34143+ mkDerivation {

34144+ pname = "ascii-th";

34145+ version = "1.0.0.8";

34146+ sha256 = "1685msxir8di3blnaykj036b640z8jsmlzvj1vwr86wf92g9gbdz";

34147+ libraryHaskellDepends = [

34148+ ascii-char ascii-superset base template-haskell

34149+ ];

34150+ testHaskellDepends = [

34151+ ascii-char ascii-superset base bytestring text

34152+ ];

34153+ description = "Template Haskell support for ASCII";

34154+ license = lib.licenses.asl20;

34155+ hydraPlatforms = lib.platforms.none;

34156+ }) {};

34157+

3407534158 "ascii-vector-avc" = callPackage

3407634159 ({ mkDerivation, attoparsec, base, binary, bytestring, deepseq

3407734160 , deepseq-generics, HUnit, split, zlib

@@ -35220,8 +35303,8 @@ self: {

3522035303 ({ mkDerivation, base, stm }:

3522135304 mkDerivation {

3522235305 pname = "atomic-modify";

35223− version = "0.1.0.2";

35224− sha256 = "0j4zhr02bmkpar80vzxxj91qyz97wi7kia79q20a1y3sqbmx2sk5";

35306+ version = "0.1.0.3";

35307+ sha256 = "1kz3sbr4sh2c405plf0d4078j47kmvw0gwsw53vyvsyxwhm9db3z";

3522535308 libraryHaskellDepends = [ base stm ];

3522635309 description = "A typeclass for mutable references that have an atomic modify operation";

3522735310 license = lib.licenses.asl20;

@@ -35603,19 +35686,17 @@ self: {

3560335686 license = lib.licenses.bsd3;

3560435687 }) {};

3560535688

35606− "attoparsec_0_14_3" = callPackage

35689+ "attoparsec_0_14_4" = callPackage

3560735690 ({ mkDerivation, array, base, bytestring, case-insensitive

35608− , containers, criterion, deepseq, directory, filepath, ghc-prim

35609− , http-types, parsec, QuickCheck, quickcheck-unicode, scientific

35610− , tasty, tasty-quickcheck, text, transformers, unordered-containers

35611− , vector

35691+ , containers, deepseq, directory, filepath, ghc-prim, http-types

35692+ , parsec, QuickCheck, quickcheck-unicode, scientific, tasty

35693+ , tasty-bench, tasty-quickcheck, text, transformers

35694+ , unordered-containers, vector

3561235695 }:

3561335696 mkDerivation {

3561435697 pname = "attoparsec";

35615− version = "0.14.3";

35616− sha256 = "1j7sy24d7kf9qb99cr36zchb4gsj3gcy4yflawxqnng31lqdxjal";

35617− revision = "1";

35618− editedCabalFile = "1i3dwcq8970d7i7via7y0384hv7xqlajjlr9dlwlx1f29bx98pdn";

35698+ version = "0.14.4";

35699+ sha256 = "0v4yjz4qi8bwhbyavqxlhsfb1iv07v10gxi64khmsmi4hvjpycrz";

3561935700 libraryHaskellDepends = [

3562035701 array base bytestring containers deepseq ghc-prim scientific text

3562135702 transformers

@@ -35625,10 +35706,11 @@ self: {

3562535706 scientific tasty tasty-quickcheck text transformers vector

3562635707 ];

3562735708 benchmarkHaskellDepends = [

35628− array base bytestring case-insensitive containers criterion deepseq

35629− directory filepath ghc-prim http-types parsec scientific text

35709+ array base bytestring case-insensitive containers deepseq directory

35710+ filepath ghc-prim http-types parsec scientific tasty-bench text

3563035711 transformers unordered-containers vector

3563135712 ];

35713+ doHaddock = false;

3563235714 description = "Fast combinator parsing for bytestrings and text";

3563335715 license = lib.licenses.bsd3;

3563435716 hydraPlatforms = lib.platforms.none;

@@ -36432,6 +36514,21 @@ self: {

3643236514 license = lib.licenses.mit;

3643336515 }) {};

3643436516

36517+ "autoexporter_2_0_0_1" = callPackage

36518+ ({ mkDerivation, base, Cabal, directory, filepath }:

36519+ mkDerivation {

36520+ pname = "autoexporter";

36521+ version = "2.0.0.1";

36522+ sha256 = "1sdpfqd8ypi1d8bkxj695midhgi9ynahknwlc72gh718ah26xc18";

36523+ isLibrary = true;

36524+ isExecutable = true;

36525+ libraryHaskellDepends = [ base Cabal directory filepath ];

36526+ executableHaskellDepends = [ base Cabal directory filepath ];

36527+ description = "Automatically re-export modules";

36528+ license = lib.licenses.mit;

36529+ hydraPlatforms = lib.platforms.none;

36530+ }) {};

36531+

3643536532 "autom" = callPackage

3643636533 ({ mkDerivation, base, bytestring, colour, ghc-prim, gloss

3643736534 , JuicyPixels, random, vector

@@ -38631,6 +38728,23 @@ self: {

3863138728 license = lib.licenses.bsd3;

3863238729 }) {};

3863338730

38731+ "barbies_2_0_3_1" = callPackage

38732+ ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit

38733+ , tasty-quickcheck, transformers

38734+ }:

38735+ mkDerivation {

38736+ pname = "barbies";

38737+ version = "2.0.3.1";

38738+ sha256 = "0gfzb52k3py1qnr2b6gshdg7c9aj1j9y2xsdhz86n01ybv81yg51";

38739+ libraryHaskellDepends = [ base distributive transformers ];

38740+ testHaskellDepends = [

38741+ base distributive QuickCheck tasty tasty-hunit tasty-quickcheck

38742+ ];

38743+ description = "Classes for working with types that can change clothes";

38744+ license = lib.licenses.bsd3;

38745+ hydraPlatforms = lib.platforms.none;

38746+ }) {};

38747+

3863438748 "barbies-layered" = callPackage

3863538749 ({ mkDerivation, barbies, base, doctest, doctest-discover, hspec

3863638750 , hspec-discover, transformers

@@ -39425,6 +39539,8 @@ self: {

3942539539 pname = "basement-cd";

3942639540 version = "0.0.12.1";

3942739541 sha256 = "18w1rzn6p3a25y075rr1lmln74mfiv9dzgf01mipwjqfsirki15b";

39542+ revision = "1";

39543+ editedCabalFile = "12z794dzdyjkc9l55yw5c7y3knplsrkz1ndhn9bi87a8vn7kwvcq";

3942839544 libraryHaskellDepends = [ base ghc-prim ];

3942939545 description = "Foundation scrap box of array & string";

3943039546 license = lib.licenses.bsd3;

@@ -41675,6 +41791,25 @@ self: {

4167541791 license = lib.licenses.mit;

4167641792 }) {};

4167741793

41794+ "binary-parser_0_5_7_1" = callPackage

41795+ ({ mkDerivation, base, bytestring, mtl, QuickCheck

41796+ , quickcheck-instances, rerebase, tasty, tasty-hunit

41797+ , tasty-quickcheck, text, transformers

41798+ }:

41799+ mkDerivation {

41800+ pname = "binary-parser";

41801+ version = "0.5.7.1";

41802+ sha256 = "1k3rc1szwahc5w2lxddnjpd4zkfi2hmcq398sixf2qx44f2kk6vp";

41803+ libraryHaskellDepends = [ base bytestring mtl text transformers ];

41804+ testHaskellDepends = [

41805+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit

41806+ tasty-quickcheck

41807+ ];

41808+ description = "A highly-efficient but limited parser API specialised for bytestrings";

41809+ license = lib.licenses.mit;

41810+ hydraPlatforms = lib.platforms.none;

41811+ }) {};

41812+

4167841813 "binary-parsers" = callPackage

4167941814 ({ mkDerivation, attoparsec, base, binary, bytestring

4168041815 , bytestring-lexing, case-insensitive, criterion, deepseq

@@ -43232,18 +43367,18 @@ self: {

4323243367 "bisc" = callPackage

4323343368 ({ mkDerivation, base, bytestring, configurator, data-default

4323443369 , directory, exceptions, filepath, leveldb-haskell, mtl

43235− , optparse-applicative, selda, selda-sqlite, text

43370+ , optparse-applicative, resourcet, selda, selda-sqlite, text, unix

4323643371 }:

4323743372 mkDerivation {

4323843373 pname = "bisc";

43239− version = "0.4.0.0";

43240− sha256 = "1x0i3yjgfnhw5nsx2fr150anf199z29g630xv58315xz6a526js0";

43374+ version = "0.4.1.0";

43375+ sha256 = "06jb8kikpdc9fz5ndy8qmqv1zmvxjg130wvsh23hhp8a01n4pxca";

4324143376 isLibrary = false;

4324243377 isExecutable = true;

4324343378 executableHaskellDepends = [

4324443379 base bytestring configurator data-default directory exceptions

43245− filepath leveldb-haskell mtl optparse-applicative selda

43246− selda-sqlite text

43380+ filepath leveldb-haskell mtl optparse-applicative resourcet selda

43381+ selda-sqlite text unix

4324743382 ];

4324843383 description = "A small tool that clears cookies (and more)";

4324943384 license = lib.licenses.gpl3Only;

@@ -47114,7 +47249,7 @@ self: {

4711447249 license = lib.licenses.agpl3Only;

4711547250 }) {};

4711647251

47117− "brittany_0_14_0_0" = callPackage

47252+ "brittany_0_14_0_2" = callPackage

4711847253 ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs

4711947254 , containers, czipwith, data-tree-print, deepseq, directory, extra

4712047255 , filepath, ghc, ghc-boot, ghc-boot-th, ghc-exactprint, hspec

@@ -47123,8 +47258,8 @@ self: {

4712347258 }:

4712447259 mkDerivation {

4712547260 pname = "brittany";

47126− version = "0.14.0.0";

47127− sha256 = "10xphm9szdflwqkfbhz9pngiq0sn5jmysa015dhqc3prhz4qha2b";

47261+ version = "0.14.0.2";

47262+ sha256 = "03jnjmp4hy0g22h0jq5md60iz5y94fzhdjx849s89mvb28pdfd1n";

4712847263 isLibrary = true;

4712947264 isExecutable = true;

4713047265 libraryHaskellDepends = [

@@ -47166,16 +47301,29 @@ self: {

4716647301 license = lib.licenses.bsd3;

4716747302 }) {};

4716847303

47304+ "broadcast-chan_0_2_1_2" = callPackage

47305+ ({ mkDerivation, async, base, criterion, deepseq, stm, transformers

47306+ , unliftio-core

47307+ }:

47308+ mkDerivation {

47309+ pname = "broadcast-chan";

47310+ version = "0.2.1.2";

47311+ sha256 = "1zsrafz3q9l8np8wafmrbi8ilwwsgnzkc8jfjkjfgs4kq65yglqw";

47312+ libraryHaskellDepends = [ base transformers unliftio-core ];

47313+ benchmarkHaskellDepends = [ async base criterion deepseq stm ];

47314+ description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";

47315+ license = lib.licenses.bsd3;

47316+ hydraPlatforms = lib.platforms.none;

47317+ }) {};

47318+

4716947319 "broadcast-chan-conduit" = callPackage

4717047320 ({ mkDerivation, base, broadcast-chan, broadcast-chan-tests

4717147321 , conduit, containers, resourcet, transformers, unliftio-core

4717247322 }:

4717347323 mkDerivation {

4717447324 pname = "broadcast-chan-conduit";

47175− version = "0.2.1.1";

47176− sha256 = "0w0f4skprhnm1x4vzchkgjgjljzqizpb678251jgj65jsg1mnyfc";

47177− revision = "1";

47178− editedCabalFile = "0pk09frf24jg2id13l1nx47wwvf2z4qjqv17y7ji036iwp9xk6nw";

47325+ version = "0.2.1.2";

47326+ sha256 = "0mwd82arm50zwz559qzxi70ia9d4h5kjwdvhk09jf966hd0knnmm";

4717947327 libraryHaskellDepends = [

4718047328 base broadcast-chan conduit resourcet transformers unliftio-core

4718147329 ];

@@ -47184,6 +47332,7 @@ self: {

4718447332 ];

4718547333 description = "Conduit-based parallel streaming code for broadcast-chan";

4718647334 license = lib.licenses.bsd3;

47335+ hydraPlatforms = lib.platforms.none;

4718747336 }) {};

4718847337

4718947338 "broadcast-chan-pipes" = callPackage

@@ -47192,16 +47341,15 @@ self: {

4719247341 }:

4719347342 mkDerivation {

4719447343 pname = "broadcast-chan-pipes";

47195− version = "0.2.1";

47196− sha256 = "0yifpd97cihagflmh0xs0wcl541k89hick4h9hh8zrah72g71fqr";

47197− revision = "1";

47198− editedCabalFile = "0zz05sc0ny5czzyw71c1fdzlfawjwhznbr8z683bf83821ra5fcv";

47344+ version = "0.2.1.1";

47345+ sha256 = "06nghcddlcnc97p3464fsgcfvjlsnxv7i7khzws3g3myl8hrd89c";

4719947346 libraryHaskellDepends = [ base broadcast-chan pipes pipes-safe ];

4720047347 testHaskellDepends = [

4720147348 base broadcast-chan-tests containers foldl pipes pipes-safe

4720247349 ];

4720347350 description = "Pipes-based parallel streaming code for broadcast-chan";

4720447351 license = lib.licenses.bsd3;

47352+ hydraPlatforms = lib.platforms.none;

4720547353 }) {};

4720647354

4720747355 "broadcast-chan-tests" = callPackage

@@ -47212,10 +47360,10 @@ self: {

4721247360 }:

4721347361 mkDerivation {

4721447362 pname = "broadcast-chan-tests";

47215− version = "0.2.1.1";

47216− sha256 = "0qx8j9sfky5qvrxrn4is9sja4qh6jh7jahq3zkyyq3a54jkwc8d3";

47217− revision = "4";

47218− editedCabalFile = "04hgr1ik1z9v317x8rw6amxqrmc94g6cghzxghddszqismz44gaq";

47363+ version = "0.2.1.2";

47364+ sha256 = "08qjvhdx2pwgj5kcl5fmg5qdlzbdchxjihmqch4sgv48kcga06nv";

47365+ revision = "1";

47366+ editedCabalFile = "1x2bmnkybh627yf22ackvqh3xfhdxv88ijsl8ryg8qhr6qm51jfj";

4721947367 libraryHaskellDepends = [

4722047368 async base broadcast-chan clock containers optparse-applicative

4722147369 paramtree stm tagged tasty tasty-golden tasty-hunit tasty-travis

@@ -47226,6 +47374,8 @@ self: {

4722647374 ];

4722747375 description = "Helpers for generating tests for broadcast-chan";

4722847376 license = lib.licenses.bsd3;

47377+ hydraPlatforms = lib.platforms.none;

47378+ broken = true;

4722947379 }) {};

4723047380

4723147381 "broccoli" = callPackage

@@ -48194,6 +48344,27 @@ self: {

4819448344 license = lib.licenses.isc;

4819548345 }) {};

4819648346

48347+ "burrito_2_0_1_0" = callPackage

48348+ ({ mkDerivation, base, bytestring, containers, hspec, parsec

48349+ , QuickCheck, template-haskell, text, transformers

48350+ }:

48351+ mkDerivation {

48352+ pname = "burrito";

48353+ version = "2.0.1.0";

48354+ sha256 = "1b8c4sdk60sj20rrrhra4hx0f1y1injih4xcg4q19fgaf04chr91";

48355+ libraryHaskellDepends = [

48356+ base bytestring containers parsec template-haskell text

48357+ transformers

48358+ ];

48359+ testHaskellDepends = [

48360+ base bytestring containers hspec parsec QuickCheck template-haskell

48361+ text transformers

48362+ ];

48363+ description = "Parse and render URI templates";

48364+ license = lib.licenses.mit;

48365+ hydraPlatforms = lib.platforms.none;

48366+ }) {};

48367+

4819748368 "burst-detection" = callPackage

4819848369 ({ mkDerivation, base, criterion, deepseq }:

4819948370 mkDerivation {

@@ -50338,35 +50509,6 @@ self: {

5033850509 broken = true;

5033950510 }) {};

5034050511

50341− "cabal-install-parsers_0_4_2" = callPackage

50342− ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring

50343− , binary, binary-instances, bytestring, Cabal, containers

50344− , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko

50345− , network-uri, parsec, pretty, tar, tasty, tasty-golden

50346− , tasty-hunit, text, time, transformers, tree-diff

50347− }:

50348− mkDerivation {

50349− pname = "cabal-install-parsers";

50350− version = "0.4.2";

50351− sha256 = "08ny95sryii4nzyy8b2zf15vk329y84gbvpy7302hnjxanc6awx5";

50352− libraryHaskellDepends = [

50353− aeson base base16-bytestring binary binary-instances bytestring

50354− Cabal containers cryptohash-sha256 deepseq directory filepath lukko

50355− network-uri parsec pretty tar text time transformers

50356− ];

50357− testHaskellDepends = [

50358− ansi-terminal base base16-bytestring bytestring Cabal containers

50359− directory filepath pretty tar tasty tasty-golden tasty-hunit

50360− tree-diff

50361− ];

50362− benchmarkHaskellDepends = [

50363− base bytestring Cabal containers criterion directory filepath

50364− ];

50365− description = "Utilities to work with cabal-install files";

50366− license = "GPL-2.0-or-later AND BSD-3-Clause";

50367− hydraPlatforms = lib.platforms.none;

50368− }) {};

50369−

5037050512 "cabal-install-parsers" = callPackage

5037150513 ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring

5037250514 , binary, binary-instances, bytestring, Cabal, containers

@@ -50538,6 +50680,8 @@ self: {

5053850680 pname = "cabal-plan";

5053950681 version = "0.7.2.1";

5054050682 sha256 = "0n45bakzf1r1nyvs76fmrj0cf74knqnpyb2i82baxia0falbp48r";

50683+ revision = "1";

50684+ editedCabalFile = "1pb8r65f279m9ps67mkkcbcpbprbj7pd12b9m2s64l8fgn9in422";

5054150685 configureFlags = [ "-fexe" ];

5054250686 isLibrary = true;

5054350687 isExecutable = true;

@@ -51223,35 +51367,39 @@ self: {

5122351367 }) {};

5122451368

5122551369 "cachix" = callPackage

51226− ({ mkDerivation, async, base, base64-bytestring, bytestring

51370+ ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring

5122751371 , cachix-api, concurrent-extra, conduit, conduit-extra, containers

5122851372 , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify

5122951373 , hercules-ci-cnix-store, here, hspec, hspec-discover, http-client

51230− , http-client-tls, http-conduit, http-types, lzma-conduit

51231− , megaparsec, memory, mmorph, netrc, nix, optparse-applicative

51232− , process, protolude, resourcet, retry, safe-exceptions, servant

51233− , servant-auth, servant-auth-client, servant-client

51234− , servant-client-core, servant-conduit, stm, temporary, text, unix

51235− , uri-bytestring, vector, versions

51374+ , http-client-tls, http-conduit, http-types, inline-c-cpp, katip

51375+ , lzma-conduit, megaparsec, memory, mmorph, netrc, nix

51376+ , optparse-applicative, pretty-terminal, process, protolude

51377+ , resourcet, retry, safe-exceptions, servant, servant-auth

51378+ , servant-auth-client, servant-client, servant-client-core

51379+ , servant-conduit, stm, stm-conduit, systemd, temporary, text, time

51380+ , unix, unordered-containers, uri-bytestring, uuid, vector

51381+ , versions, websockets, wuss

5123651382 }:

5123751383 mkDerivation {

5123851384 pname = "cachix";

51239− version = "0.6.1";

51240− sha256 = "0fgm7035ahlgl3vbk0lqf3l07wagsykmw9z0pkzqqcwh1wlv1np7";

51385+ version = "0.7.0";

51386+ sha256 = "10yyzk26hmx4xqv4zc83a5m69bj88fd6v2fs76nfbqc2kcpiis6k";

5124151387 isLibrary = true;

5124251388 isExecutable = true;

5124351389 libraryHaskellDepends = [

51244− async base base64-bytestring bytestring cachix-api concurrent-extra

51245− conduit conduit-extra containers cookie cryptonite dhall directory

51246− ed25519 filepath fsnotify hercules-ci-cnix-store here http-client

51247− http-client-tls http-conduit http-types lzma-conduit megaparsec

51248− memory mmorph netrc optparse-applicative process protolude

51249− resourcet retry safe-exceptions servant servant-auth

51250− servant-auth-client servant-client servant-client-core

51251− servant-conduit stm text unix uri-bytestring vector versions

51390+ aeson async base base64-bytestring bytestring cachix-api

51391+ concurrent-extra conduit conduit-extra containers cookie cryptonite

51392+ dhall directory ed25519 filepath fsnotify hercules-ci-cnix-store

51393+ here http-client http-client-tls http-conduit http-types

51394+ inline-c-cpp katip lzma-conduit megaparsec memory mmorph netrc

51395+ optparse-applicative pretty-terminal process protolude resourcet

51396+ retry safe-exceptions servant servant-auth servant-auth-client

51397+ servant-client servant-client-core servant-conduit stm stm-conduit

51398+ systemd temporary text time unix unordered-containers

51399+ uri-bytestring uuid vector versions websockets wuss

5125251400 ];

5125351401 libraryPkgconfigDepends = [ nix ];

51254− executableHaskellDepends = [ base cachix-api ];

51402+ executableHaskellDepends = [ base cachix-api safe-exceptions ];

5125551403 executableToolDepends = [ hspec-discover ];

5125651404 testHaskellDepends = [

5125751405 base cachix-api directory here hspec protolude servant-auth-client

@@ -51263,24 +51411,24 @@ self: {

5126351411 }) {inherit (pkgs) nix;};

5126451412

5126551413 "cachix-api" = callPackage

51266− ({ mkDerivation, aeson, base, base16-bytestring, bytestring

51414+ ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring

5126751415 , conduit, cookie, cryptonite, deepseq, exceptions, hspec

5126851416 , hspec-discover, http-api-data, http-media, jose, lens, memory

5126951417 , nix-narinfo, protolude, resourcet, servant, servant-auth

5127051418 , servant-auth-swagger, servant-client, servant-swagger

5127151419 , servant-swagger-ui-core, string-conv, swagger2, text, time

51272− , transformers

51420+ , transformers, unordered-containers, uuid, websockets

5127351421 }:

5127451422 mkDerivation {

5127551423 pname = "cachix-api";

51276− version = "0.6.0";

51277− sha256 = "0q6kl5lb05c1m62yqj0d8vimlghhrc3avl3bz5wjp70azs28jcd3";

51424+ version = "0.7.0";

51425+ sha256 = "0l9bvzpf0g3rnr417gvxq0lgbmi3pn3cr9ap2m7sbwvikal8wlxg";

5127851426 libraryHaskellDepends = [

51279− aeson base base16-bytestring bytestring conduit cookie cryptonite

51280− deepseq exceptions http-api-data http-media jose lens memory

51281− nix-narinfo protolude resourcet servant servant-auth

51427+ aeson async base base16-bytestring bytestring conduit cookie

51428+ cryptonite deepseq exceptions http-api-data http-media jose lens

51429+ memory nix-narinfo protolude resourcet servant servant-auth

5128251430 servant-auth-swagger servant-client string-conv swagger2 text time

51283− transformers

51431+ transformers unordered-containers uuid websockets

5128451432 ];

5128551433 testHaskellDepends = [

5128651434 aeson base base16-bytestring bytestring conduit cookie cryptonite

@@ -51329,8 +51477,8 @@ self: {

5132951477 }:

5133051478 mkDerivation {

5133151479 pname = "caerbannog";

51332− version = "0.6.0.5";

51333− sha256 = "048d46g7xnqbkb061hs3ix8rzpp1mwww9iznpgrrkvimafb0r0m0";

51480+ version = "1.0.0.0";

51481+ sha256 = "1sfk4kh7jk762dqfp4c0hq9jqmp1r0x0727vp0cp48wsp9yn4d8f";

5133451482 libraryHaskellDepends = [ base binary bytestring ];

5133551483 testHaskellDepends = [

5133651484 base binary bytestring hspec QuickCheck random

@@ -51928,8 +52076,8 @@ self: {

5192852076 }:

5192952077 mkDerivation {

5193052078 pname = "candid";

51931− version = "0.3";

51932− sha256 = "0zq29zddkkwvlyz9qmxl942ml53m6jawl4m5rkb2510glbkcvr5x";

52079+ version = "0.3.1";

52080+ sha256 = "0swz07qn3829dpr850973baj1ki5pizlh90gy4xrp1d9bsvwy4sq";

5193352081 isLibrary = true;

5193452082 isExecutable = true;

5193552083 libraryHaskellDepends = [

@@ -52343,6 +52491,75 @@ self: {

5234352491 license = lib.licenses.bsd3;

5234452492 }) {};

5234552493

52494+ "captcha-2captcha" = callPackage

52495+ ({ mkDerivation, aeson, base, bytestring, captcha-core

52496+ , data-default, errors, extra, http-client, lens, lens-aeson, mtl

52497+ , o-clock, string-conversions, string-interpolate, tasty

52498+ , tasty-hunit, text, unliftio, wreq

52499+ }:

52500+ mkDerivation {

52501+ pname = "captcha-2captcha";

52502+ version = "0.1.0.0";

52503+ sha256 = "19r7977vkbyd6if9bvh9m2vv2wmhynly6qzsq7ndckn4yw4xc5wx";

52504+ libraryHaskellDepends = [

52505+ aeson base bytestring captcha-core errors extra http-client lens

52506+ lens-aeson mtl o-clock string-conversions string-interpolate text

52507+ unliftio wreq

52508+ ];

52509+ testHaskellDepends = [

52510+ aeson base bytestring captcha-core data-default errors extra

52511+ http-client lens lens-aeson mtl o-clock string-conversions

52512+ string-interpolate tasty tasty-hunit text unliftio wreq

52513+ ];

52514+ description = "A package for integrating a variety of captcha solving services";

52515+ license = lib.licenses.mit;

52516+ hydraPlatforms = lib.platforms.none;

52517+ }) {};

52518+

52519+ "captcha-capmonster" = callPackage

52520+ ({ mkDerivation, aeson, aeson-qq, base, bytestring, captcha-core

52521+ , data-default, errors, extra, http-client, lens, lens-aeson, mtl

52522+ , o-clock, string-conversions, string-interpolate, tasty

52523+ , tasty-hunit, text, unliftio, wreq

52524+ }:

52525+ mkDerivation {

52526+ pname = "captcha-capmonster";

52527+ version = "0.1.0.0";

52528+ sha256 = "0ps7dwbkafi92a408c0fcc15vjp8b2gf400ijbx4vz5vm0s9dzvl";

52529+ libraryHaskellDepends = [

52530+ aeson aeson-qq base bytestring captcha-core errors extra

52531+ http-client lens lens-aeson mtl o-clock string-interpolate text

52532+ unliftio wreq

52533+ ];

52534+ testHaskellDepends = [

52535+ aeson aeson-qq base bytestring captcha-core data-default errors

52536+ extra http-client lens lens-aeson mtl o-clock string-conversions

52537+ string-interpolate tasty tasty-hunit text unliftio wreq

52538+ ];

52539+ description = "A package for integrating a variety of captcha solving services";

52540+ license = lib.licenses.mit;

52541+ hydraPlatforms = lib.platforms.none;

52542+ }) {};

52543+

52544+ "captcha-core" = callPackage

52545+ ({ mkDerivation, aeson, base, bytestring, cookie

52546+ , data-default-extra, lens, mtl, o-clock, string-conversions, text

52547+ , unliftio, wreq

52548+ }:

52549+ mkDerivation {

52550+ pname = "captcha-core";

52551+ version = "0.1.0.0";

52552+ sha256 = "08bvgmxj7rs0gz8rnidrxmw7p9ahw40p07k3gs3vk5h275dnqsk7";

52553+ libraryHaskellDepends = [

52554+ aeson base bytestring cookie data-default-extra lens mtl o-clock

52555+ string-conversions text unliftio wreq

52556+ ];

52557+ description = "A package for integrating a variety of captcha solving services";

52558+ license = lib.licenses.mit;

52559+ hydraPlatforms = lib.platforms.none;

52560+ broken = true;

52561+ }) {};

52562+

5234652563 "car-pool" = callPackage

5234752564 ({ mkDerivation, base, blaze-html, containers, digestive-functors

5234852565 , digestive-functors-blaze, digestive-functors-happstack

@@ -52950,8 +53167,8 @@ self: {

5295053167 }:

5295153168 mkDerivation {

5295253169 pname = "casr-logbook";

52953− version = "0.6.6";

52954− sha256 = "0nq6jkaxw68dn4m9pqa717w0k1kbvqz00ji4sjal3r2imykpwrfa";

53170+ version = "0.6.9";

53171+ sha256 = "0ga60asv7i5jdmvbv25s9h7b23p4f4aasmksh6swbxz5fzky7g7g";

5295553172 libraryHaskellDepends = [

5295653173 base containers digit lens lucid text time

5295753174 ];

@@ -55304,10 +55521,8 @@ self: {

5530455521 }:

5530555522 mkDerivation {

5530655523 pname = "chell";

55307− version = "0.5";

55308− sha256 = "1i845isfbk0yq852am9bqmxfpfkpnlha8nfidffsv4gw2p8gg6fg";

55309− revision = "1";

55310− editedCabalFile = "1q93wrw03ix4cmnkz3lzkixcvvizw6i2ia2zifdfak1dvxnblxk0";

55524+ version = "0.5.0.1";

55525+ sha256 = "10zpnalrz4riyqbk2bwsdml4b23x3mrn0cg4hmssffsa50yq93gs";

5531155526 libraryHaskellDepends = [

5531255527 ansi-terminal base bytestring options patience random

5531355528 template-haskell text transformers

@@ -55320,8 +55535,8 @@ self: {

5532055535 ({ mkDerivation, base, chell, HUnit }:

5532155536 mkDerivation {

5532255537 pname = "chell-hunit";

55323− version = "0.3";

55324− sha256 = "18p9rhs81b43jb95dqg650h3cajsw45w7cgsavkm18h0qhrz41kb";

55538+ version = "0.3.0.1";

55539+ sha256 = "01dv6lv4bj1m0sk7v90w5jnlyvir2v969sw8hrif2h3hy9f3pc9v";

5532555540 libraryHaskellDepends = [ base chell HUnit ];

5532655541 description = "HUnit support for the Chell testing library";

5532755542 license = lib.licenses.mit;

@@ -55331,8 +55546,8 @@ self: {

5533155546 ({ mkDerivation, base, chell, QuickCheck, random }:

5533255547 mkDerivation {

5533355548 pname = "chell-quickcheck";

55334− version = "0.2.5.2";

55335− sha256 = "0n8c57n88r2bx0bh8nabsz07m42rh23ahs3hgyzf8gr76l08zq03";

55549+ version = "0.2.5.3";

55550+ sha256 = "1bm2gva5g9y71z2kbnl4dinplvlbisnjqhlcvgf6a9ir7y4r5c0x";

5533655551 libraryHaskellDepends = [ base chell QuickCheck random ];

5533755552 description = "QuickCheck support for the Chell testing library";

5533855553 license = lib.licenses.mit;

@@ -55926,6 +56141,8 @@ self: {

5592656141 pname = "chs-cabal";

5592756142 version = "0.1.1.1";

5592856143 sha256 = "0fvf26394rpn9g4f3rp13bq8rrhzs9d95k7nbcpayzml2j9rsv3l";

56144+ revision = "1";

56145+ editedCabalFile = "13c4sc83kl6wvx39b1i09mjgsnn4l7ffcynnhsnn9v5y3nzw3j78";

5592956146 libraryHaskellDepends = [ base Cabal chs-deps ];

5593056147 description = "Cabal with c2hs dependencies";

5593156148 license = lib.licenses.bsd3;

@@ -56143,8 +56360,8 @@ self: {

5614356360 }:

5614456361 mkDerivation {

5614556362 pname = "cimple";

56146− version = "0.0.8";

56147− sha256 = "08mm6v0a52l7wq4kaj4zs9wyvnf7g0qmhxvbdbbrcqgxm8a9mc9v";

56363+ version = "0.0.11";

56364+ sha256 = "1n7633c6w4n4996i3k9v60yhpiddd8b7600c7hpam2axm9cqb19i";

5614856365 isLibrary = true;

5614956366 isExecutable = true;

5615056367 libraryHaskellDepends = [

@@ -56555,7 +56772,7 @@ self: {

5655556772 license = lib.licenses.bsd2;

5655656773 }) {};

5655756774

56558− "citeproc_0_6" = callPackage

56775+ "citeproc_0_6_0_1" = callPackage

5655956776 ({ mkDerivation, aeson, attoparsec, base, bytestring

5656056777 , case-insensitive, containers, data-default, Diff, directory

5656156778 , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific

@@ -56564,8 +56781,8 @@ self: {

5656456781 }:

5656556782 mkDerivation {

5656656783 pname = "citeproc";

56567− version = "0.6";

56568− sha256 = "1dx61f8y32b5w84d2fzaxfgdj2gyr0wyqhh6jl2jf2lfn5cbhll3";

56784+ version = "0.6.0.1";

56785+ sha256 = "015ansq3a710s0hzs2157fx12bc4f1hy45l4dbi6j477sy800bqc";

5656956786 isLibrary = true;

5657056787 isExecutable = true;

5657156788 libraryHaskellDepends = [

@@ -57741,8 +57958,19 @@ self: {

5774157958 ({ mkDerivation, base }:

5774257959 mkDerivation {

5774357960 pname = "cli-arguments";

57744− version = "0.3.1.0";

57745− sha256 = "14zgzsps25xr47a2l888xrzg3d09zfdz62g6d3liawhmf1kiwbkp";

57961+ version = "0.6.0.0";

57962+ sha256 = "0vg5xmdg84bv6bab03iv9zj0i1vkp9xlfjbm1rpzjjhpihp8v5sg";

57963+ libraryHaskellDepends = [ base ];

57964+ description = "A library to process command line arguments in some more convenient way";

57965+ license = lib.licenses.mit;

57966+ }) {};

57967+

57968+ "cli-arguments-strict" = callPackage

57969+ ({ mkDerivation, base }:

57970+ mkDerivation {

57971+ pname = "cli-arguments-strict";

57972+ version = "0.1.0.0";

57973+ sha256 = "06m6b5jcc00n4xaqz27f4f3vyb13ic8vnqf3nazhr2dnx0xjfad3";

5774657974 libraryHaskellDepends = [ base ];

5774757975 description = "A library to process command line arguments in some more convenient way";

5774857976 license = lib.licenses.mit;

@@ -60948,6 +61176,28 @@ self: {

6094861176 license = lib.licenses.bsd3;

6094961177 }) {};

6095061178

61179+ "commonmark-extensions_0_2_3" = callPackage

61180+ ({ mkDerivation, base, commonmark, containers, emojis, filepath

61181+ , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text

61182+ , transformers

61183+ }:

61184+ mkDerivation {

61185+ pname = "commonmark-extensions";

61186+ version = "0.2.3";

61187+ sha256 = "02zq9ma58yngabz1rw0alaq9s8lsfmxjn8m3dfjxavvq2pl3748f";

61188+ libraryHaskellDepends = [

61189+ base commonmark containers emojis filepath network-uri parsec text

61190+ transformers

61191+ ];

61192+ testHaskellDepends = [

61193+ base commonmark parsec tasty tasty-hunit text

61194+ ];

61195+ benchmarkHaskellDepends = [ base commonmark tasty-bench text ];

61196+ description = "Pure Haskell commonmark parser";

61197+ license = lib.licenses.bsd3;

61198+ hydraPlatforms = lib.platforms.none;

61199+ }) {};

61200+

6095161201 "commonmark-pandoc" = callPackage

6095261202 ({ mkDerivation, base, commonmark, commonmark-extensions

6095361203 , pandoc-types, text

@@ -61246,12 +61496,27 @@ self: {

6124661496 }) {};

6124761497

6124861498 "compactable" = callPackage

61249− ({ mkDerivation, base, containers, transformers, vector }:

61499+ ({ mkDerivation, aeson, base, base-compat, bifunctors, containers

61500+ , contravariant, data-default-class, deepseq, genvalidity

61501+ , genvalidity-sydtest, hashable, keys, lens, QuickCheck

61502+ , semigroupoids, sydtest, sydtest-discover, these, transformers

61503+ , transformers-compat, unordered-containers, vector

61504+ , vector-instances

61505+ }:

6125061506 mkDerivation {

6125161507 pname = "compactable";

61252− version = "0.1.2.4";

61253− sha256 = "13lynjbwr78jy3j0zx6g2rk8qvyzkgw1smriqm6sslp3nn0v1g4r";

61254− libraryHaskellDepends = [ base containers transformers vector ];

61508+ version = "0.2.0.0";

61509+ sha256 = "0ngcrmb9yihwn5dm6dcfkclgk31m92qa14rk99i2g6hbdmd6w747";

61510+ libraryHaskellDepends = [

61511+ aeson base base-compat bifunctors containers contravariant

61512+ data-default-class deepseq hashable keys lens QuickCheck

61513+ semigroupoids these transformers transformers-compat

61514+ unordered-containers vector vector-instances

61515+ ];

61516+ testHaskellDepends = [

61517+ base containers genvalidity genvalidity-sydtest QuickCheck sydtest

61518+ sydtest-discover these vector

61519+ ];

6125561520 description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";

6125661521 license = lib.licenses.bsd3;

6125761522 }) {};

@@ -65604,8 +65869,8 @@ self: {

6560465869 }:

6560565870 mkDerivation {

6560665871 pname = "copilot";

65607− version = "3.6";

65608− sha256 = "0h43slh084wj7kwn2rdn0s63pqzy930h6z2vk38kn6yqic8d9s9y";

65872+ version = "3.7";

65873+ sha256 = "1s39w0vqk2pdd9b3kxvjzi6r300x4mxz6rbkpdjzccagnk08xzay";

6560965874 isLibrary = true;

6561065875 isExecutable = true;

6561165876 libraryHaskellDepends = [

@@ -65624,8 +65889,8 @@ self: {

6562465889 }:

6562565890 mkDerivation {

6562665891 pname = "copilot-c99";

65627− version = "3.6";

65628− sha256 = "18p7pijx2f7bw61bzfs5994xpkygghf7hvwpklhp72jkshjdjj1m";

65892+ version = "3.7";

65893+ sha256 = "0k30n2w6sw76fdm42vrn28jrz23w3sydkmmh3lmbd42kipp01h7b";

6562965894 libraryHaskellDepends = [

6563065895 base containers copilot-core directory filepath language-c99

6563165896 language-c99-simple language-c99-util mtl pretty

@@ -65658,10 +65923,8 @@ self: {

6565865923 }:

6565965924 mkDerivation {

6566065925 pname = "copilot-core";

65661− version = "3.6";

65662− sha256 = "00v8la4q15qj27wyqcbsv0h7m5k5ln98y4zkdzpng3z5gw4mpkm9";

65663− revision = "2";

65664− editedCabalFile = "0yrrrksyhn7xq0hrp5shlrs0mf725dwzaskd5f13v143k8yx6c7c";

65926+ version = "3.7";

65927+ sha256 = "0mf6mim94ryixdbwwdr39bvc704fwi0pdj3zkdl4csnj3gv4mr40";

6566565928 libraryHaskellDepends = [ base dlist mtl pretty ];

6566665929 testHaskellDepends = [

6566765930 base HUnit pretty QuickCheck test-framework test-framework-hunit

@@ -65679,8 +65942,8 @@ self: {

6567965942 }:

6568065943 mkDerivation {

6568165944 pname = "copilot-language";

65682− version = "3.6";

65683− sha256 = "0b1cl4v5w54nx007mmnsx49hh3zxjm55ninlzkd78balnyah8nlk";

65945+ version = "3.7";

65946+ sha256 = "1p1l7ciyvwgghnshf7apjwarf9w2wsyqflib5xghq9y1dhmz0xg4";

6568465947 libraryHaskellDepends = [

6568565948 array base containers copilot-core copilot-theorem data-reify mtl

6568665949 ];

@@ -65695,8 +65958,8 @@ self: {

6569565958 }:

6569665959 mkDerivation {

6569765960 pname = "copilot-libraries";

65698− version = "3.6";

65699− sha256 = "0s6y1is91nbvlrb9fdp9xhaq9wx3j5pm67gjrlajiik4029a2dxd";

65961+ version = "3.7";

65962+ sha256 = "1lqi3ml5vw0qjki4rmb1kk6q6yapc24zwvmsccnlik5llnrhb7lv";

6570065963 libraryHaskellDepends = [

6570165964 array base containers copilot-language data-reify mtl parsec

6570265965 ];

@@ -65730,8 +65993,8 @@ self: {

6573065993 }:

6573165994 mkDerivation {

6573265995 pname = "copilot-theorem";

65733− version = "3.6";

65734− sha256 = "17l8xq4zd9jfih5p21l6xkahdgrfbmpy8wxc38w88w98qmz5ix59";

65996+ version = "3.7";

65997+ sha256 = "1h587747s52gx03qspnhx5jbkrrxhg618mibbwfcxpk7w7bdayv1";

6573565998 libraryHaskellDepends = [

6573665999 ansi-terminal base bimap bv-sized containers copilot-core

6573766000 data-default directory filepath libBF mtl panic parameterized-utils

@@ -65940,8 +66203,8 @@ self: {

6594066203 }:

6594166204 mkDerivation {

6594266205 pname = "core-telemetry";

65943− version = "0.1.7.3";

65944− sha256 = "05l6s3bw1gp36wx052c5q3mvzzmfdv922851kmr6ax79m5fxdsd9";

66206+ version = "0.1.8.1";

66207+ sha256 = "024npp0cm5f3v1h70iw03hv2lj0r2ylsp7w2pm1iv6zr8j63k1iy";

6594566208 libraryHaskellDepends = [

6594666209 async base bytestring chronologique core-data core-program

6594766210 core-text exceptions http-streams io-streams locators mtl random

@@ -65985,6 +66248,42 @@ self: {

6598566248 license = lib.licenses.bsd3;

6598666249 }) {};

6598766250

66251+ "core-webserver-servant" = callPackage

66252+ ({ mkDerivation, base, core-program, core-telemetry

66253+ , core-webserver-warp, mtl, safe-exceptions, servant

66254+ , servant-server, vault, wai

66255+ }:

66256+ mkDerivation {

66257+ pname = "core-webserver-servant";

66258+ version = "0.1.0.0";

66259+ sha256 = "1d888qpm9g867czdhyv65302badpwg275xran5n3mapfjvk1zbqd";

66260+ libraryHaskellDepends = [

66261+ base core-program core-telemetry core-webserver-warp mtl

66262+ safe-exceptions servant servant-server vault wai

66263+ ];

66264+ description = "Interoperability with Servant";

66265+ license = lib.licenses.mit;

66266+ hydraPlatforms = lib.platforms.none;

66267+ }) {};

66268+

66269+ "core-webserver-warp" = callPackage

66270+ ({ mkDerivation, async, base, bytestring, core-data, core-program

66271+ , core-telemetry, core-text, http-types, http2, mtl

66272+ , safe-exceptions, vault, wai, warp

66273+ }:

66274+ mkDerivation {

66275+ pname = "core-webserver-warp";

66276+ version = "0.1.1.0";

66277+ sha256 = "0yfd2037bq6vljixkhrk2v2mlywj2br16pf5dpz2vahjpk0079yj";

66278+ libraryHaskellDepends = [

66279+ async base bytestring core-data core-program core-telemetry

66280+ core-text http-types http2 mtl safe-exceptions vault wai warp

66281+ ];

66282+ description = "Interoperability with Wai/Warp";

66283+ license = lib.licenses.mit;

66284+ hydraPlatforms = lib.platforms.none;

66285+ }) {};

66286+

6598866287 "corebot-bliki" = callPackage

6598966288 ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers

6599066289 , directory, filepath, filestore, http-types, monads-tf, pandoc

@@ -67413,6 +67712,8 @@ self: {

6741367712 pname = "criterion";

6741467713 version = "1.5.12.0";

6741567714 sha256 = "0wrb48byp906f9wc9ii2mi2b2k008ycbi8ffrrj86plhp5rpvzz5";

67715+ revision = "1";

67716+ editedCabalFile = "154jscaip9y081mvf70vcwqw0acynfb9hwxgqwmzqq9q6d8b1wfw";

6741667717 isLibrary = true;

6741767718 isExecutable = true;

6741867719 enableSeparateDataOutput = true;

@@ -68461,8 +68762,8 @@ self: {

6846168762 pname = "cryptonite-cd";

6846268763 version = "0.29.1";

6846368764 sha256 = "053zfjxwnpaiw0kkky0fdbdqqyarygqnvmlm4vziqqrlkm4nba0c";

68464− revision = "1";

68465− editedCabalFile = "1y97mmslygswj5aydkvlj5vvf5xzkjxxjrblp3h9mx6wr9k63iyi";

68765+ revision = "3";

68766+ editedCabalFile = "1j7ch1h7irlk8lx0zjk41f4j0fmn3x96zf5355m669dwivan3m7s";

6846668767 libraryHaskellDepends = [

6846768768 base basement-cd bytestring deepseq ghc-prim integer-gmp memory-cd

6846868769 ];

@@ -69978,12 +70279,12 @@ self: {

6997870279 license = lib.licenses.mit;

6997970280 }) {};

6998070281

69981− "d10_1_0_0_1" = callPackage

70282+ "d10_1_0_0_2" = callPackage

6998270283 ({ mkDerivation, base, hedgehog, template-haskell }:

6998370284 mkDerivation {

6998470285 pname = "d10";

69985− version = "1.0.0.1";

69986− sha256 = "0jaql1ql1pm0s6xd0mmi0gadx7z0ms62q46rxy4ida8k4v76r7cl";

70286+ version = "1.0.0.2";

70287+ sha256 = "10jc4sa986r194py1gg90mixvb2h4d1m12zwi6y5hffmrc910qva";

6998770288 libraryHaskellDepends = [ base template-haskell ];

6998870289 testHaskellDepends = [ base hedgehog template-haskell ];

6998970290 description = "Digits 0-9";

@@ -74325,6 +74626,29 @@ self: {

7432574626 license = lib.licenses.mit;

7432674627 }) {};

7432774628

74629+ "deferred-folds_0_9_18" = callPackage

74630+ ({ mkDerivation, base, bytestring, containers, foldl, hashable

74631+ , primitive, QuickCheck, quickcheck-instances, rerebase, tasty

74632+ , tasty-hunit, tasty-quickcheck, text, transformers

74633+ , unordered-containers, vector

74634+ }:

74635+ mkDerivation {

74636+ pname = "deferred-folds";

74637+ version = "0.9.18";

74638+ sha256 = "15yd5wqkksainhwwiq8vlf49ih2789wz9njv7050s5mr20b2rqy1";

74639+ libraryHaskellDepends = [

74640+ base bytestring containers foldl hashable primitive text

74641+ transformers unordered-containers vector

74642+ ];

74643+ testHaskellDepends = [

74644+ QuickCheck quickcheck-instances rerebase tasty tasty-hunit

74645+ tasty-quickcheck

74646+ ];

74647+ description = "Abstractions over deferred folds";

74648+ license = lib.licenses.mit;

74649+ hydraPlatforms = lib.platforms.none;

74650+ }) {};

74651+

7432874652 "definitive-base" = callPackage

7432974653 ({ mkDerivation, array, base, bytestring, containers, deepseq

7433074654 , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector

@@ -75465,6 +75789,22 @@ self: {

7546575789 license = lib.licenses.mit;

7546675790 }) {};

7546775791

75792+ "derulo_2_0_0_1" = callPackage

75793+ ({ mkDerivation, base, HUnit }:

75794+ mkDerivation {

75795+ pname = "derulo";

75796+ version = "2.0.0.1";

75797+ sha256 = "15lq7yv69i7azz2vxbx29k9csz62pp3a01qk8sng6yrq734qw8dx";

75798+ isLibrary = true;

75799+ isExecutable = true;

75800+ libraryHaskellDepends = [ base ];

75801+ executableHaskellDepends = [ base ];

75802+ testHaskellDepends = [ base HUnit ];

75803+ description = "Parse and render JSON simply";

75804+ license = lib.licenses.mit;

75805+ hydraPlatforms = lib.platforms.none;

75806+ }) {};

75807+

7546875808 "describe" = callPackage

7546975809 ({ mkDerivation, base, bytestring, cereal, fixed-vector, lens

7547075810 , mmorph, monad-control, mtl, profunctors, QuickCheck

@@ -76956,8 +77296,8 @@ self: {

7695677296 pname = "diagrams-contrib";

7695777297 version = "1.4.4";

7695877298 sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m";

76959− revision = "4";

76960− editedCabalFile = "1hsi63kig21mb71qa4kf27h4g99xxqwlfqzl9jpca451sadlk7mp";

77299+ revision = "5";

77300+ editedCabalFile = "0qfsfrg9igmma9k68qdlkbgnla09w9y1a55kzxk49sfvfzvkilz5";

7696177301 libraryHaskellDepends = [

7696277302 base circle-packing colour containers cubicbezier data-default

7696377303 data-default-class diagrams-core diagrams-lib diagrams-solve

@@ -77110,6 +77450,8 @@ self: {

7711077450 pname = "diagrams-lib";

7711177451 version = "1.4.5.1";

7711277452 sha256 = "1hkxp549i99s45qk8zmhjvz1xyyv3i0ffl8155bifkic6fd8y2gz";

77453+ revision = "1";

77454+ editedCabalFile = "0yqpasggmdkzg2n67a6m20rbhzcgchnfhs66m95lnp5n9vl7v8mn";

7711377455 libraryHaskellDepends = [

7711477456 active adjunctions array base bytestring cereal colour containers

7711577457 data-default-class diagrams-core diagrams-solve directory

@@ -77309,8 +77651,8 @@ self: {

7730977651 pname = "diagrams-svg";

7731077652 version = "1.4.3.1";

7731177653 sha256 = "002lgmq78c6rsvds9bgm6m4w8j6qpg260mc52hf97wj6m050l237";

77312− revision = "1";

77313− editedCabalFile = "0534kgm9r70s5yhfjy4pkqy1f2aflg0acfp2g23xjfzr9kwq9v7m";

77654+ revision = "2";

77655+ editedCabalFile = "056nfj2srbhh68jc5al8hffcfrqlr89173pjf6bhpmnzxhwlv55k";

7731477656 libraryHaskellDepends = [

7731577657 base base64-bytestring bytestring colour containers diagrams-core

7731677658 diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl

@@ -78711,20 +79053,21 @@ self: {

7871179053 "discord-haskell" = callPackage

7871279054 ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring

7871379055 , containers, data-default, emoji, http-client, iso8601-time

78714− , JuicyPixels, MonadRandom, mtl, req, safe-exceptions, text, time

78715− , unliftio, unordered-containers, vector, websockets, wuss

79056+ , JuicyPixels, MonadRandom, mtl, req, safe-exceptions, scientific

79057+ , text, time, unliftio, unordered-containers, vector, websockets

79058+ , wuss

7871679059 }:

7871779060 mkDerivation {

7871879061 pname = "discord-haskell";

78719− version = "1.10.0";

78720− sha256 = "1im1yjlnk8b8fcwyhlza1iggmry5r96sdibq2whcsyxqnpg24fr0";

79062+ version = "1.11.0";

79063+ sha256 = "10vak5aar5fx25ani676pi870mnnvzrn6n1b1akhdyags1hrsghm";

7872179064 isLibrary = true;

7872279065 isExecutable = true;

7872379066 libraryHaskellDepends = [

7872479067 aeson async base base64-bytestring bytestring containers

7872579068 data-default emoji http-client iso8601-time JuicyPixels MonadRandom

78726− mtl req safe-exceptions text time unliftio unordered-containers

78727− vector websockets wuss

79069+ mtl req safe-exceptions scientific text time unliftio

79070+ unordered-containers vector websockets wuss

7872879071 ];

7872979072 executableHaskellDepends = [ base text unliftio ];

7873079073 description = "Write bots for Discord in Haskell";

@@ -84098,8 +84441,8 @@ self: {

8409884441 pname = "ed25519";

8409984442 version = "0.0.5.0";

8410084443 sha256 = "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq";

84101− revision = "3";

84102− editedCabalFile = "1yidh86ymzwmp2b449pwim6vvfcs1qgkkncbixw1zmb7wj6v167v";

84444+ revision = "4";

84445+ editedCabalFile = "1jr8v3kw69fdchnynflq3gz1bwx4jm5jpl7c00bnflrhkdrfbndn";

8410384446 libraryHaskellDepends = [ base bytestring ghc-prim ];

8410484447 testHaskellDepends = [

8410584448 base bytestring directory doctest filepath hlint QuickCheck

@@ -88034,8 +88377,8 @@ self: {

8803488377 pname = "errors";

8803588378 version = "2.3.0";

8803688379 sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7";

88037− revision = "1";

88038− editedCabalFile = "08y607nwnw12vlbmwcppv1ydw726x8p3kwwx4rgaiss906hgnzrp";

88380+ revision = "2";

88381+ editedCabalFile = "1x1bhmkx7zxwdfassc9ypl9d319p6f14rv6d3mjgvac7nxfbq245";

8803988382 libraryHaskellDepends = [

8804088383 base exceptions safe text transformers transformers-compat

8804188384 ];

@@ -88987,6 +89330,8 @@ self: {

8898789330 pname = "evdev";

8898889331 version = "2.1.0";

8898989332 sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3";

89333+ revision = "1";

89334+ editedCabalFile = "0c930gd1a9pwlr4p9r9d9nizr90g06l836rai5b83z5sa0s3p01n";

8899089335 libraryHaskellDepends = [

8899189336 base bytestring containers extra filepath-bytestring monad-loops

8899289337 rawfilepath time unix

@@ -89005,17 +89350,16 @@ self: {

8900589350

8900689351 "evdev-streamly" = callPackage

8900789352 ({ mkDerivation, base, bytestring, containers, evdev, extra

89008− , posix-paths, rawfilepath, streamly, streamly-fsnotify, unix

89353+ , filepath-bytestring, rawfilepath, streamly, streamly-fsnotify

89354+ , unix

8900989355 }:

8901089356 mkDerivation {

8901189357 pname = "evdev-streamly";

89012− version = "0.0.1.0";

89013− sha256 = "1bzmxkg5y7w6v5l6q5vzhr19j5vwbx4p4qxdq72f7f714ihn8nyp";

89014− revision = "1";

89015− editedCabalFile = "02xnb49zwr39ziq2xrwnnddzxr1ppwig441i3074g1w0ng5cf2gj";

89358+ version = "0.0.2.0";

89359+ sha256 = "0vrkg3d1171lsr71k3vrcf9vbl18mdnvpi02sxvzjp2zbv3gs7v6";

8901689360 libraryHaskellDepends = [

89017− base bytestring containers evdev extra posix-paths rawfilepath

89018− streamly streamly-fsnotify unix

89361+ base bytestring containers evdev extra filepath-bytestring

89362+ rawfilepath streamly streamly-fsnotify unix

8901989363 ];

8902089364 description = "Bridge for working with evdev and streamly";

8902189365 license = lib.licenses.bsd3;

@@ -90781,16 +91125,16 @@ self: {

9078191125

9078291126 "exploring-interpreters" = callPackage

9078391127 ({ mkDerivation, aeson, attoparsec, base, bytestring, containers

90784− , fgl, http-types, mtl, network, readline, scientific, text

90785− , transformers

91128+ , exceptions, fgl, haskeline, http-types, mtl, network, scientific

91129+ , text, transformers

9078691130 }:

9078791131 mkDerivation {

9078891132 pname = "exploring-interpreters";

90789− version = "1.0.0.0";

90790− sha256 = "11anvk0m8ihl2pgf3wmlw97hc886wg2rngvw86zwyd5hzg0chi66";

91133+ version = "1.3.0.0";

91134+ sha256 = "12a2z2z5c8kaqn7mks28ppazmkfvxn9lah6argmjqsd5ahwsxazs";

9079191135 libraryHaskellDepends = [

90792− aeson attoparsec base bytestring containers fgl http-types mtl

90793− network readline scientific text transformers

91136+ aeson attoparsec base bytestring containers exceptions fgl

91137+ haskeline http-types mtl network scientific text transformers

9079491138 ];

9079591139 description = "A generic exploring interpreter for exploratory programming";

9079691140 license = lib.licenses.bsd3;

@@ -96348,6 +96692,19 @@ self: {

9634896692 license = lib.licenses.mit;

9634996693 }) {};

9635096694

96695+ "flow_2_0_0_0" = callPackage

96696+ ({ mkDerivation, base, HUnit }:

96697+ mkDerivation {

96698+ pname = "flow";

96699+ version = "2.0.0.0";

96700+ sha256 = "03zhamnwni9y0div9lwdmw5nl63m6ykjppxhyhl95zknc0dml1vj";

96701+ libraryHaskellDepends = [ base ];

96702+ testHaskellDepends = [ base HUnit ];

96703+ description = "Write more understandable Haskell";

96704+ license = lib.licenses.mit;

96705+ hydraPlatforms = lib.platforms.none;

96706+ }) {};

96707+

9635196708 "flow-er" = callPackage

9635296709 ({ mkDerivation, base, doctest, flow, QuickCheck }:

9635396710 mkDerivation {

@@ -97741,19 +98098,13 @@ self: {

9774198098 }) {};

9774298099

9774398100 "formatn" = callPackage

97744− ({ mkDerivation, attoparsec, base, containers, doctest, foldl

97745− , generic-lens, numhask, scientific, tdigest, text, transformers

97746− }:

98101+ ({ mkDerivation, base, containers, text }:

9774798102 mkDerivation {

9774898103 pname = "formatn";

97749− version = "0.0.1";

97750− sha256 = "0rw1xli4df72wxylf211jhm0v2y842rfn8nalrp04yzklvyrri84";

97751− libraryHaskellDepends = [

97752− attoparsec base containers foldl generic-lens numhask scientific

97753− tdigest text transformers

97754− ];

97755− testHaskellDepends = [ base doctest numhask ];

97756− description = "Number text formatting";

98104+ version = "0.1.0";

98105+ sha256 = "1svixdvwzxmf5n6vx3pgx065z2gkabk563pp38bmp5z4mxvf67d9";

98106+ libraryHaskellDepends = [ base containers text ];

98107+ description = "Formatting of doubles";

9775798108 license = lib.licenses.bsd3;

9775898109 hydraPlatforms = lib.platforms.none;

9775998110 broken = true;

@@ -98001,8 +98352,8 @@ self: {

9800198352 }:

9800298353 mkDerivation {

9800398354 pname = "fortran-vars";

98004− version = "0.1.0";

98005− sha256 = "1j1k4paca1g6w38kd7fl1h4vzf6rb8ypdfilhkn2fk5llxkkw226";

98355+ version = "0.3.0";

98356+ sha256 = "0095ifc9psi2mv348qw7538rl1ld2drfq5pcsbdyxrhklm12h5ji";

9800698357 isLibrary = true;

9800798358 isExecutable = true;

9800898359 libraryHaskellDepends = [

@@ -98183,25 +98534,23 @@ self: {

9818398534 license = lib.licenses.bsd3;

9818498535 }) {};

9818598536

98186− "fourmolu_0_4_0_0" = callPackage

98187− ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal

98188− , containers, Diff, directory, dlist, exceptions, filepath

98537+ "fourmolu_0_5_0_0" = callPackage

98538+ ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring

98539+ , Cabal, containers, Diff, directory, dlist, exceptions, filepath

9818998540 , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML

9819098541 , HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb

9819198542 , temporary, text

9819298543 }:

9819398544 mkDerivation {

9819498545 pname = "fourmolu";

98195− version = "0.4.0.0";

98196− sha256 = "1mq0h6nsl7ssfwh6zqhyja7w212vn8msmlm5iwwimca279hzwywb";

98197− revision = "1";

98198− editedCabalFile = "03bwhqj547brmgk191gy3k9xayi6fqqk2f5sbz3ail1bk7b73xnq";

98546+ version = "0.5.0.0";

98547+ sha256 = "0rw2mkhlzcbczhmn93sffmnwsbmn3j0y6np3wn5f72166vjfr02i";

9819998548 isLibrary = true;

9820098549 isExecutable = true;

9820198550 libraryHaskellDepends = [

98202− aeson ansi-terminal base bytestring Cabal containers Diff directory

98203− dlist exceptions filepath ghc-lib-parser HsYAML HsYAML-aeson mtl

98204− syb text

98551+ aeson ansi-terminal array base bytestring Cabal containers Diff

98552+ directory dlist exceptions filepath ghc-lib-parser HsYAML

98553+ HsYAML-aeson mtl syb text

9820598554 ];

9820698555 executableHaskellDepends = [

9820798556 base directory filepath ghc-lib-parser gitrev optparse-applicative

@@ -98515,8 +98864,8 @@ self: {

9851598864 }:

9851698865 mkDerivation {

9851798866 pname = "franz";

98518− version = "0.5.2";

98519− sha256 = "0mah7ghfzgg41iazvwpxzr6gc0afw30hsp6v3vg1vadnsp96nfnl";

98867+ version = "0.5.3";

98868+ sha256 = "034fz3k07l5sf9hd9c56646df9d570dv7lcdwlsf68a7hrd0icqb";

9852098869 isLibrary = true;

9852198870 isExecutable = true;

9852298871 libraryHaskellDepends = [

@@ -98556,33 +98905,35 @@ self: {

9855698905

9855798906 "freckle-app" = callPackage

9855898907 ({ mkDerivation, aeson, ansi-terminal, base, bytestring

98559− , case-insensitive, conduit, data-default, datadog, directory

98560− , doctest, ekg-core, errors, exceptions, fast-logger, filepath

98561− , Glob, hspec, hspec-core, hspec-expectations-lifted

98562− , hspec-junit-formatter, http-client, http-conduit

98563− , http-link-header, http-types, immortal, iproute, lens, lens-aeson

98564− , load-env, monad-control, monad-logger, MonadRandom, mtl, network

98565− , network-uri, persistent, persistent-postgresql, postgresql-simple

98566− , primitive, process, resource-pool, retry, rio, template-haskell

98908+ , case-insensitive, conduit, containers, data-default, datadog

98909+ , directory, doctest, ekg-core, errors, exceptions, fast-logger

98910+ , filepath, Glob, hashable, hspec, hspec-core

98911+ , hspec-expectations-lifted, hspec-junit-formatter, http-client

98912+ , http-conduit, http-link-header, http-types, immortal, iproute

98913+ , lens, lens-aeson, load-env, monad-control, monad-logger

98914+ , MonadRandom, mtl, network, network-uri, persistent

98915+ , persistent-postgresql, postgresql-simple, primitive, process

98916+ , resource-pool, retry, rio, safe, semigroupoids, template-haskell

9856798917 , temporary, text, time, transformers, transformers-base, unliftio

98568− , unliftio-core, unordered-containers, wai, wai-extra, yaml, yesod

98569− , yesod-core

98918+ , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml

98919+ , yesod, yesod-core

9857098920 }:

9857198921 mkDerivation {

9857298922 pname = "freckle-app";

98573− version = "1.0.2.2";

98574− sha256 = "1n7fp40v8zac1b9gmq07c6d5lnbjh64ma0ykh35v87kd3jdrf9rk";

98923+ version = "1.0.2.3";

98924+ sha256 = "05khvp1gr3ngrcfz4ly9zjmxp8pdiyjmmbrc4pv2rrlpgmnj1zfk";

9857598925 libraryHaskellDepends = [

9857698926 aeson ansi-terminal base bytestring case-insensitive conduit

98577− data-default datadog doctest ekg-core errors exceptions fast-logger

98578− filepath Glob hspec hspec-core hspec-expectations-lifted

98579− hspec-junit-formatter http-client http-conduit http-link-header

98580− http-types immortal iproute lens load-env monad-control

98581− monad-logger MonadRandom mtl network network-uri persistent

98582− persistent-postgresql postgresql-simple primitive process

98583− resource-pool retry rio template-haskell text time transformers

98584− transformers-base unliftio unliftio-core unordered-containers wai

98585− wai-extra yaml yesod yesod-core

98927+ containers data-default datadog doctest ekg-core errors exceptions

98928+ fast-logger filepath Glob hashable hspec hspec-core

98929+ hspec-expectations-lifted hspec-junit-formatter http-client

98930+ http-conduit http-link-header http-types immortal iproute lens

98931+ load-env monad-control monad-logger MonadRandom mtl network

98932+ network-uri persistent persistent-postgresql postgresql-simple

98933+ primitive process resource-pool retry rio safe semigroupoids

98934+ template-haskell text time transformers transformers-base unliftio

98935+ unliftio-core unordered-containers vector wai wai-extra yaml yesod

98936+ yesod-core

9858698937 ];

9858798938 testHaskellDepends = [

9858898939 aeson base bytestring directory hspec http-types lens lens-aeson

@@ -99100,6 +99451,32 @@ self: {

9910099451 license = lib.licenses.bsd3;

9910199452 }) {};

9910299453

99454+ "freer-simple_1_2_1_2" = callPackage

99455+ ({ mkDerivation, base, criterion, extensible-effects, free, mtl

99456+ , natural-transformation, QuickCheck, tasty, tasty-hunit

99457+ , tasty-quickcheck, template-haskell, transformers-base

99458+ }:

99459+ mkDerivation {

99460+ pname = "freer-simple";

99461+ version = "1.2.1.2";

99462+ sha256 = "11ypffdkpaxc03hlik6ymilhnk41fy7m92zzwqjma97g614vn0lw";

99463+ isLibrary = true;

99464+ isExecutable = true;

99465+ libraryHaskellDepends = [

99466+ base natural-transformation template-haskell transformers-base

99467+ ];

99468+ executableHaskellDepends = [ base ];

99469+ testHaskellDepends = [

99470+ base QuickCheck tasty tasty-hunit tasty-quickcheck

99471+ ];

99472+ benchmarkHaskellDepends = [

99473+ base criterion extensible-effects free mtl

99474+ ];

99475+ description = "A friendly effect system for Haskell";

99476+ license = lib.licenses.bsd3;

99477+ hydraPlatforms = lib.platforms.none;

99478+ }) {};

99479+

9910399480 "freer-simple-catching" = callPackage

9910499481 ({ mkDerivation, base, freer-simple, hspec }:

9910599482 mkDerivation {

@@ -100417,8 +100794,8 @@ self: {

100417100794 pname = "functor-infix";

100418100795 version = "0.0.5";

100419100796 sha256 = "0rifm1p5zq2711vak2lyxzz2xs03saym3m3695wpf3zy38safbpn";

100420− revision = "1";

100421− editedCabalFile = "0nvk9hff0vd3s7q67pb4my5vfz1y954y0l8vlbbmdx9i20r1m8nf";

100797+ revision = "2";

100798+ editedCabalFile = "0ypnjnxwz4dpdhajqk8y67lrcwjgyc4lh1i3d3zjxmgr3zbym8d2";

100422100799 libraryHaskellDepends = [ base template-haskell ];

100423100800 description = "Infix operators for mapping over compositions of functors. Lots of them.";

100424100801 license = lib.licenses.mit;

@@ -100892,7 +101269,7 @@ self: {

100892101269 license = lib.licenses.isc;

100893101270 }) {};

100894101271

100895− "futhark_0_21_2" = callPackage

101272+ "futhark_0_21_4" = callPackage

100896101273 ({ mkDerivation, aeson, alex, ansi-terminal, array, base

100897101274 , base16-bytestring, binary, blaze-html, bmp, bytestring

100898101275 , bytestring-to-vector, cmark-gfm, containers, cryptohash-md5

@@ -100907,8 +101284,8 @@ self: {

100907101284 }:

100908101285 mkDerivation {

100909101286 pname = "futhark";

100910− version = "0.21.2";

100911− sha256 = "09cvyqkhwnp5h759j0rggp2i6n48hkb7ck8284d8ahkq3lh47isg";

101287+ version = "0.21.4";

101288+ sha256 = "0ij7sc9zq3l8i100kf7acwvrmqnq3f6x78wv5a7r8mfmb8bs51b3";

100912101289 isLibrary = true;

100913101290 isExecutable = true;

100914101291 libraryHaskellDepends = [

@@ -105811,7 +106188,7 @@ self: {

105811106188 hydraPlatforms = lib.platforms.none;

105812106189 }) {};

105813106190

105814− "ghc-lib_9_2_1_20211101" = callPackage

106191+ "ghc-lib_9_2_1_20220109" = callPackage

105815106192 ({ mkDerivation, alex, array, base, binary, bytestring, containers

105816106193 , deepseq, directory, exceptions, filepath, ghc-lib-parser

105817106194 , ghc-prim, happy, hpc, parsec, pretty, process, rts, time

@@ -105819,8 +106196,8 @@ self: {

105819106196 }:

105820106197 mkDerivation {

105821106198 pname = "ghc-lib";

105822− version = "9.2.1.20211101";

105823− sha256 = "10rzvj7m6m664szxjaf3mk1v42lb4imwkrvpqn26x7p3jd7ywph0";

106199+ version = "9.2.1.20220109";

106200+ sha256 = "0858r81w2al9h9q53z4paqkf3fvxraf3ghvb4ga4kilxiq5rp8z6";

105824106201 enableSeparateDataOutput = true;

105825106202 libraryHaskellDepends = [

105826106203 array base binary bytestring containers deepseq directory

@@ -105873,15 +106250,15 @@ self: {

105873106250 hydraPlatforms = lib.platforms.none;

105874106251 }) {};

105875106252

105876− "ghc-lib-parser_9_2_1_20211101" = callPackage

106253+ "ghc-lib-parser_9_2_1_20220109" = callPackage

105877106254 ({ mkDerivation, alex, array, base, binary, bytestring, containers

105878106255 , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec

105879106256 , pretty, process, time, transformers, unix

105880106257 }:

105881106258 mkDerivation {

105882106259 pname = "ghc-lib-parser";

105883− version = "9.2.1.20211101";

105884− sha256 = "0dxhpczlpppdsmn1cnz2minpkvlz27njzv7xcbqgfgl0bvp5wx0n";

106260+ version = "9.2.1.20220109";

106261+ sha256 = "0scm320w19lm40y2i1858h24704s9hvci37pxmlraxa0virjhcx6";

105885106262 enableSeparateDataOutput = true;

105886106263 libraryHaskellDepends = [

105887106264 array base binary bytestring containers deepseq directory

@@ -106430,21 +106807,20 @@ self: {

106430106807 }) {};

106431106808

106432106809 "ghc-tags-core" = callPackage

106433− ({ mkDerivation, attoparsec, base, bytestring, cpphs, criterion

106434− , deepseq, directory, filepath, filepath-bytestring, ghc, lattices

106435− , mtl, pipes, pipes-attoparsec, pipes-bytestring, QuickCheck

106810+ ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq

106811+ , directory, filepath, filepath-bytestring, ghc, lattices, mtl

106812+ , pipes, pipes-attoparsec, pipes-bytestring, QuickCheck

106436106813 , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text

106437106814 , transformers

106438106815 }:

106439106816 mkDerivation {

106440106817 pname = "ghc-tags-core";

106441− version = "0.3.0.0";

106442− sha256 = "035k7akyhhn5jf2231ahplgggymc8h8k2kxia6i22v9cv976zgna";

106818+ version = "0.3.1.0";

106819+ sha256 = "052ylgf0sjwmkf1p1lzsisk9j1dgwpjgw1n81bnfhvlvarhncavq";

106443106820 libraryHaskellDepends = [

106444106821 attoparsec base bytestring directory filepath-bytestring ghc mtl

106445106822 pipes pipes-attoparsec pipes-bytestring text transformers

106446106823 ];

106447− libraryToolDepends = [ cpphs ];

106448106824 testHaskellDepends = [

106449106825 attoparsec base bytestring directory filepath filepath-bytestring

106450106826 lattices mtl pipes QuickCheck quickcheck-instances tasty

@@ -106468,8 +106844,8 @@ self: {

106468106844 }:

106469106845 mkDerivation {

106470106846 pname = "ghc-tags-plugin";

106471− version = "0.3.0.0";

106472− sha256 = "1d39jnz79vlxqqg2bw3cj1djii3bkmayqs4sm2a6bs5xzsplc5w3";

106847+ version = "0.4.0.0";

106848+ sha256 = "078l3m6sl60ilqj25zd9sqjjpss348ylsbz8l7bvhf45n91gx6yn";

106473106849 isLibrary = true;

106474106850 isExecutable = true;

106475106851 libraryHaskellDepends = [

@@ -106486,8 +106862,8 @@ self: {

106486106862 ({ mkDerivation, base, ghc, transformers }:

106487106863 mkDerivation {

106488106864 pname = "ghc-tcplugin-api";

106489− version = "0.7.0.0";

106490− sha256 = "0lnvfahphrkvg4r0r5imxqjj0a5bb5cpcx85svw4g4y9p13i94jh";

106865+ version = "0.7.1.0";

106866+ sha256 = "02qmqmhlcfn53hs7wl92r65r6dcg01fdrwqn4capjlxs1bdsfpbr";

106491106867 libraryHaskellDepends = [ base ghc transformers ];

106492106868 description = "An API for type-checker plugins";

106493106869 license = lib.licenses.bsd3;

@@ -106601,6 +106977,8 @@ self: {

106601106977 pname = "ghc-typelits-natnormalise";

106602106978 version = "0.7.6";

106603106979 sha256 = "09d70iw58m5g6yi8k2b52f1g0pfdqm5fzhs8rd7fgrgmi70np9bx";

106980+ revision = "1";

106981+ editedCabalFile = "1b587pryjkbvgayqwm8cn7ljmcyd4jikrxxkgm6zq1v9qhi7xy22";

106604106982 libraryHaskellDepends = [

106605106983 base containers ghc ghc-tcplugins-extra integer-gmp transformers

106606106984 ];

@@ -110335,6 +110713,30 @@ self: {

110335110713 license = lib.licenses.mit;

110336110714 }) {};

110337110715

110716+ "github-release_2_0_0_0" = callPackage

110717+ ({ mkDerivation, aeson, base, burrito, bytestring, http-client

110718+ , http-client-tls, http-types, mime-types, optparse-generic, text

110719+ , unordered-containers

110720+ }:

110721+ mkDerivation {

110722+ pname = "github-release";

110723+ version = "2.0.0.0";

110724+ sha256 = "03bvbqpaa3xp9rnmg8a95qs9j7chng1xsk53f30520m1cfyyikgq";

110725+ isLibrary = true;

110726+ isExecutable = true;

110727+ libraryHaskellDepends = [

110728+ aeson base burrito bytestring http-client http-client-tls

110729+ http-types mime-types optparse-generic text unordered-containers

110730+ ];

110731+ executableHaskellDepends = [

110732+ aeson base burrito bytestring http-client http-client-tls

110733+ http-types mime-types optparse-generic text unordered-containers

110734+ ];

110735+ description = "Upload files to GitHub releases";

110736+ license = lib.licenses.mit;

110737+ hydraPlatforms = lib.platforms.none;

110738+ }) {};

110739+

110338110740 "github-rest" = callPackage

110339110741 ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client

110340110742 , http-client-tls, http-types, jwt, mtl, scientific, tasty

@@ -119428,8 +119830,8 @@ self: {

119428119830 pname = "hackage-security";

119429119831 version = "0.6.0.1";

119430119832 sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli";

119431− revision = "8";

119432− editedCabalFile = "1xpzcdpfz0agbv75sadsylq6r8pq7zr0pyzbzrz0nz130yixsv5f";

119833+ revision = "9";

119834+ editedCabalFile = "14g1zr05qcvrn5ghhjmk6pz9h2ypa84bgqddxm0sk0qxbzpnxmqi";

119433119835 libraryHaskellDepends = [

119434119836 base base16-bytestring base64-bytestring bytestring Cabal

119435119837 containers cryptohash-sha256 directory ed25519 filepath ghc-prim

@@ -123150,7 +123552,7 @@ self: {

123150123552 license = lib.licenses.bsd3;

123151123553 }) {};

123152123554

123153− "hashable_1_4_0_1" = callPackage

123555+ "hashable_1_4_0_2" = callPackage

123154123556 ({ mkDerivation, base, base-orphans, bytestring, containers

123155123557 , deepseq, ghc-prim, HUnit, integer-gmp, QuickCheck, random

123156123558 , test-framework, test-framework-hunit, test-framework-quickcheck2

@@ -123158,10 +123560,8 @@ self: {

123158123560 }:

123159123561 mkDerivation {

123160123562 pname = "hashable";

123161− version = "1.4.0.1";

123162− sha256 = "04v61w87hvm6lg9a7p5mz177iab3rvb86pzcclcdw0w314dsxpaw";

123163− revision = "1";

123164− editedCabalFile = "1rcvw4fjm3v29phg0q54x8358c4qvg1y8cwy6lqzmg1kvhd9qp63";

123563+ version = "1.4.0.2";

123564+ sha256 = "003nlhi8wzlsikfwi0q6ma3b38wizvazci6dbq3lr4bd6pfnwq43";

123165123565 libraryHaskellDepends = [

123166123566 base base-orphans bytestring containers deepseq ghc-prim

123167123567 integer-gmp text

@@ -123996,8 +124396,8 @@ self: {

123996124396 }:

123997124397 mkDerivation {

123998124398 pname = "haskell-ci";

123999− version = "0.12.1";

124000− sha256 = "0bdb3x2kk5nqm6ly2ycdpx6xw7pspgg67x73cjscqj6pxcx1wjzf";

124399+ version = "0.14";

124400+ sha256 = "1vaxbby4sfrzzr0bzw6dv3kb9f6k3i4w16xfxvm3h2jazrw56122";

124001124401 isLibrary = false;

124002124402 isExecutable = true;

124003124403 libraryHaskellDepends = [

@@ -126793,8 +127193,8 @@ self: {

126793127193 }:

126794127194 mkDerivation {

126795127195 pname = "haskoin-store";

126796− version = "0.64.10";

126797− sha256 = "16dslrdkl4dw7ywjf181mr8vnrjwz9yrc03jr80c704vc0034ymj";

127196+ version = "0.64.16";

127197+ sha256 = "13dbx5szx87zhb5xq007lbpisr94593sf3a144a5052pbghcyj4s";

126798127198 isLibrary = true;

126799127199 isExecutable = true;

126800127200 libraryHaskellDepends = [

@@ -126841,8 +127241,8 @@ self: {

126841127241 }:

126842127242 mkDerivation {

126843127243 pname = "haskoin-store-data";

126844− version = "0.64.10";

126845− sha256 = "01nlxy8s37nizvliq6167aaiqy4nl7an3qnhka0pnzawlvn6hdhk";

127244+ version = "0.64.16";

127245+ sha256 = "01fgnbvwhxz4829ksv01165bvnhqyd3djjqm96819jp5r1ifzjin";

126846127246 libraryHaskellDepends = [

126847127247 aeson base binary bytes bytestring cereal containers data-default

126848127248 deepseq hashable haskoin-core http-client http-types lens mtl

@@ -128116,8 +128516,8 @@ self: {

128116128516 }:

128117128517 mkDerivation {

128118128518 pname = "hasql-th";

128119− version = "0.4.0.10";

128120− sha256 = "1s339xkqdz1hcd8i183lzf565radl95zqq0y7h2r2ayz3rh36485";

128519+ version = "0.4.0.11";

128520+ sha256 = "1dkx0r874qzn2kb8wimr1n75vmx70jx5ddi8088dlw5cxhj2v950";

128121128521 libraryHaskellDepends = [

128122128522 base bytestring containers contravariant foldl hasql

128123128523 postgresql-syntax template-haskell template-haskell-compat-v0208

@@ -133572,18 +133972,18 @@ self: {

133572133972 license = lib.licenses.bsd3;

133573133973 }) {};

133574133974

133575− "hie-bios_0_8_0" = callPackage

133975+ "hie-bios_0_8_1" = callPackage

133576133976 ({ mkDerivation, aeson, base, base16-bytestring, bytestring

133577133977 , conduit, conduit-extra, containers, cryptohash-sha1, deepseq

133578133978 , directory, exceptions, extra, file-embed, filepath, ghc, hslogger

133579− , hspec-expectations, optparse-applicative, process, tasty

133580− , tasty-expected-failure, tasty-hunit, temporary, text, time

133581− , transformers, unix-compat, unordered-containers, vector, yaml

133979+ , optparse-applicative, process, tasty, tasty-expected-failure

133980+ , tasty-hunit, temporary, text, time, transformers, unix-compat

133981+ , unordered-containers, vector, yaml

133582133982 }:

133583133983 mkDerivation {

133584133984 pname = "hie-bios";

133585− version = "0.8.0";

133586− sha256 = "1apy7zdafrw96f7sbhhq62hlk4blcsi4kc4kq59wcm2yvj134rvv";

133985+ version = "0.8.1";

133986+ sha256 = "1rd0aasab8z8ilwyzngvs99wbb861hlmc8bmmnnfgd742xldxs2q";

133587133987 isLibrary = true;

133588133988 isExecutable = true;

133589133989 libraryHaskellDepends = [

@@ -133596,7 +133996,7 @@ self: {

133596133996 base directory filepath ghc optparse-applicative

133597133997 ];

133598133998 testHaskellDepends = [

133599− aeson base directory extra filepath ghc hspec-expectations tasty

133999+ aeson base directory extra filepath ghc tasty

133600134000 tasty-expected-failure tasty-hunit temporary text

133601134001 unordered-containers yaml

133602134002 ];

@@ -137559,8 +137959,8 @@ self: {

137559137959 }:

137560137960 mkDerivation {

137561137961 pname = "hnix";

137562− version = "0.14.0.5";

137563− sha256 = "1h2m9vrgss4mg25dyfwhb93h1c60nrkw122b7hnpiff5lm1jy89f";

137962+ version = "0.14.0.7";

137963+ sha256 = "1irwfq4gx5rzryqp8hh2cwf3c4cz9pmilbc2qhb3h609bfn5rwlq";

137564137964 isLibrary = true;

137565137965 isExecutable = true;

137566137966 enableSeparateDataOutput = true;

@@ -140154,8 +140554,8 @@ self: {

140154140554 }:

140155140555 mkDerivation {

140156140556 pname = "hpqtypes-extras";

140157− version = "1.14.0.0";

140158− sha256 = "143ghr188d9kp0cz421pr87sdvf2nzabp76b3py716xmrz9jckq5";

140557+ version = "1.14.1.0";

140558+ sha256 = "17ixli3w1ixa7hspvcgggyslpxgprl40vjjavi81c44crj7w4m4q";

140159140559 libraryHaskellDepends = [

140160140560 base base16-bytestring bytestring containers cryptohash exceptions

140161140561 extra fields-json hpqtypes lifted-base log-base monad-control mtl

@@ -140674,21 +141074,21 @@ self: {

140674141074 license = lib.licenses.bsd3;

140675141075 }) {inherit (pkgs) ruby;};

140676141076

140677− "hruby_0_4_0_0" = callPackage

141077+ "hruby_0_5_0_0" = callPackage

140678141078 ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal

140679141079 , process, QuickCheck, ruby, scientific, stm, text

140680141080 , unordered-containers, vector

140681141081 }:

140682141082 mkDerivation {

140683141083 pname = "hruby";

140684− version = "0.4.0.0";

140685− sha256 = "0qd3mfc8mr5b0vmvfqnmjrba5abvwb4vn6mjlm0mhlgigmh685f9";

141084+ version = "0.5.0.0";

141085+ sha256 = "10ldq23lgp3jcxpdm9b1dryjf4sprsjlc4qs1lnjb9cmfcafrqj4";

140686141086 setupHaskellDepends = [ base Cabal process ];

140687141087 libraryHaskellDepends = [

140688141088 aeson attoparsec base bytestring scientific stm text

140689141089 unordered-containers vector

140690141090 ];

140691− librarySystemDepends = [ ruby ];

141091+ libraryPkgconfigDepends = [ ruby ];

140692141092 testHaskellDepends = [

140693141093 aeson attoparsec base QuickCheck text vector

140694141094 ];

@@ -141412,8 +141812,8 @@ self: {

141412141812 }:

141413141813 mkDerivation {

141414141814 pname = "hs-opentelemetry-sdk";

141415− version = "0.0.3.0";

141416− sha256 = "0z9fwppsgyrw56r4fcb0ds06rvn2vskmc3l7fhkdb47j71fill58";

141815+ version = "0.0.3.1";

141816+ sha256 = "0z4j2jih8076xic39kil0w0p6vcjbpcmpbfiskx2i7ycm2cg4gs2";

141417141817 libraryHaskellDepends = [

141418141818 async base bytestring hs-opentelemetry-api

141419141819 hs-opentelemetry-exporter-otlp hs-opentelemetry-propagator-w3c

@@ -141733,6 +142133,26 @@ self: {

141733142133 broken = true;

141734142134 }) {};

141735142135

142136+ "hs-tags_0_1_5_3" = callPackage

142137+ ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc

142138+ , ghc-paths, mtl, process, strict

142139+ }:

142140+ mkDerivation {

142141+ pname = "hs-tags";

142142+ version = "0.1.5.3";

142143+ sha256 = "17h1jgi7nr6p93zhsqxx6gx1yjwv0gahz84pw14gnsr79v3q9z1f";

142144+ isLibrary = false;

142145+ isExecutable = true;

142146+ executableHaskellDepends = [

142147+ base Cabal containers directory filepath ghc ghc-paths mtl process

142148+ strict

142149+ ];

142150+ description = "Create tag files (ctags and etags) for Haskell code";

142151+ license = lib.licenses.mit;

142152+ hydraPlatforms = lib.platforms.none;

142153+ broken = true;

142154+ }) {};

142155+

141736142156 "hs-term-emulator" = callPackage

141737142157 ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring

141738142158 , containers, criterion, hspec, hspec-discover, lens, text, vector

@@ -144765,6 +145185,23 @@ self: {

144765145185 license = lib.licenses.mit;

144766145186 }) {};

144767145187

145188+ "hspec-expectations-pretty-diff_0_7_2_6" = callPackage

145189+ ({ mkDerivation, aeson, ansi-terminal, base, Diff, hscolour, hspec

145190+ , HUnit, nicify-lib, text, unicode-show

145191+ }:

145192+ mkDerivation {

145193+ pname = "hspec-expectations-pretty-diff";

145194+ version = "0.7.2.6";

145195+ sha256 = "0wksgvdj50yc3p4bg3wmacf2w75v7p8nlq1g33z5amrwllig6m49";

145196+ libraryHaskellDepends = [

145197+ ansi-terminal base Diff hscolour HUnit nicify-lib text unicode-show

145198+ ];

145199+ testHaskellDepends = [ aeson base hspec HUnit text ];

145200+ description = "Catchy combinators for HUnit";

145201+ license = lib.licenses.mit;

145202+ hydraPlatforms = lib.platforms.none;

145203+ }) {};

145204+

144768145205 "hspec-experimental" = callPackage

144769145206 ({ mkDerivation, base, hspec, hspec-meta, HUnit, QuickCheck }:

144770145207 mkDerivation {

@@ -148923,28 +149360,30 @@ self: {

148923149360 "hup" = callPackage

148924149361 ({ mkDerivation, base, bytestring, cmdargs, directory, filepath

148925149362 , hspec, hspec-core, hspec-wai, http-client, http-client-tls

148926− , http-types, mtl, QuickCheck, shelly, simple, split, tagsoup, tar

148927− , temporary, text, transformers, wai, wai-extra, zlib

149363+ , http-types, lifted-base, mtl, network, QuickCheck, scotty, shelly

149364+ , split, tagsoup, tar, temporary, text, transformers, vector, wai

149365+ , wai-extra, warp, zlib

148928149366 }:

148929149367 mkDerivation {

148930149368 pname = "hup";

148931− version = "0.3.0.2";

148932− sha256 = "05xgbdzy3jg9qpxrxrfb6mjydw80wa65gkjcpqj2ckmk0vd6hmhr";

149369+ version = "0.3.0.3";

149370+ sha256 = "0igs4w546zqpav40c3v99lfi8gix70ssx97b0dnq6fw6c02kacq9";

148933149371 isLibrary = true;

148934149372 isExecutable = true;

148935149373 libraryHaskellDepends = [

148936149374 base bytestring directory filepath http-client http-client-tls

148937− http-types mtl split tar zlib

149375+ http-types mtl split tar text zlib

148938149376 ];

148939149377 executableHaskellDepends = [

148940− base bytestring cmdargs directory mtl shelly tagsoup text

148941− transformers

149378+ base bytestring cmdargs directory lifted-base mtl shelly tagsoup

149379+ text transformers

148942149380 ];

148943149381 testHaskellDepends = [

148944149382 base bytestring filepath hspec hspec-core hspec-wai http-client

148945− http-types QuickCheck simple temporary transformers wai wai-extra

149383+ http-types mtl network QuickCheck scotty temporary text

149384+ transformers vector wai wai-extra warp

148946149385 ];

148947− description = "Upload packages or documentation to a hackage server";

149386+ description = "Upload packages and/or documentation to a hackage server";

148948149387 license = lib.licenses.bsd2;

148949149388 hydraPlatforms = lib.platforms.none;

148950149389 broken = true;

@@ -149894,6 +150333,31 @@ self: {

149894150333 license = lib.licenses.mit;

149895150334 }) {inherit (pkgs) rdkafka;};

149896150335

150336+ "hw-kafka-client_5_0_0" = callPackage

150337+ ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers

150338+ , either, hspec, hspec-discover, monad-loops, rdkafka, text

150339+ , transformers, unix

150340+ }:

150341+ mkDerivation {

150342+ pname = "hw-kafka-client";

150343+ version = "5.0.0";

150344+ sha256 = "1w0c80pn43xg4rrmwwq37yya96fil124sdly9djjnxm1g0brwjz6";

150345+ isLibrary = true;

150346+ isExecutable = true;

150347+ libraryHaskellDepends = [

150348+ base bifunctors bytestring containers text transformers unix

150349+ ];

150350+ librarySystemDepends = [ rdkafka ];

150351+ libraryToolDepends = [ c2hs ];

150352+ testHaskellDepends = [

150353+ base bifunctors bytestring containers either hspec monad-loops text

150354+ ];

150355+ testToolDepends = [ hspec-discover ];

150356+ description = "Kafka bindings for Haskell";

150357+ license = lib.licenses.mit;

150358+ hydraPlatforms = lib.platforms.none;

150359+ }) {inherit (pkgs) rdkafka;};

150360+

149897150361 "hw-kafka-conduit" = callPackage

149898150362 ({ mkDerivation, base, bifunctors, bytestring, conduit

149899150363 , conduit-extra, containers, exceptions, extra, hspec

@@ -153814,12 +154278,16 @@ self: {

153814154278 }) {};

153815154279

153816154280 "include-env" = callPackage

153817− ({ mkDerivation, base, template-haskell }:

154281+ ({ mkDerivation, base, containers, template-haskell

154282+ , th-lift-instances

154283+ }:

153818154284 mkDerivation {

153819154285 pname = "include-env";

153820− version = "0.4.0.0";

153821− sha256 = "0swq7fzij24wmqid0zb7hz6v4q8nm3qvd741wd183lidrkisgpf0";

153822− libraryHaskellDepends = [ base template-haskell ];

154286+ version = "0.5.0.0";

154287+ sha256 = "1jcq2hnak3mwxxpqp81gh8adm97czip0fb7h92k6n8sxrbvf4b1c";

154288+ libraryHaskellDepends = [

154289+ base containers template-haskell th-lift-instances

154290+ ];

153823154291 description = "Include the value of an environment variable at compile time";

153824154292 license = lib.licenses.bsd3;

153825154293 }) {};

@@ -155868,8 +156336,8 @@ self: {

155868156336 }:

155869156337 mkDerivation {

155870156338 pname = "interval-algebra";

155871− version = "1.1.2";

155872− sha256 = "0cnzlsmqg6snvggq7fh2c6hmjaijxqz8ng0lnzfyz8p3lk4p42zi";

156339+ version = "1.2.0";

156340+ sha256 = "1n9db9p3v7da1d3j21lrm46s2py0m1rdfjpvilx43n7yd6630i81";

155873156341 libraryHaskellDepends = [

155874156342 base containers foldl QuickCheck safe time witherable

155875156343 ];

@@ -156615,6 +157083,20 @@ self: {

156615157083 license = lib.licenses.bsd3;

156616157084 }) {};

156617157085

157086+ "ip6addr_1_0_3" = callPackage

157087+ ({ mkDerivation, base, cmdargs, IPv6Addr, text }:

157088+ mkDerivation {

157089+ pname = "ip6addr";

157090+ version = "1.0.3";

157091+ sha256 = "16dbvrsbg7l4z31faxm1pxps0plg89d4ny2mxsgwyq8r351irmwc";

157092+ isLibrary = false;

157093+ isExecutable = true;

157094+ executableHaskellDepends = [ base cmdargs IPv6Addr text ];

157095+ description = "Commandline tool to deal with IPv6 address text representations";

157096+ license = lib.licenses.bsd3;

157097+ hydraPlatforms = lib.platforms.none;

157098+ }) {};

157099+

156618157100 "ipa" = callPackage

156619157101 ({ mkDerivation, attoparsec, base, hspec, template-haskell, text

156620157102 , unicode-transforms

@@ -156869,6 +157351,28 @@ self: {

156869157351 license = lib.licenses.bsd3;

156870157352 }) {};

156871157353

157354+ "ipynb_0_2" = callPackage

157355+ ({ mkDerivation, aeson, base, base64-bytestring, bytestring

157356+ , containers, directory, filepath, microlens, microlens-aeson

157357+ , tasty, tasty-hunit, text, unordered-containers

157358+ }:

157359+ mkDerivation {

157360+ pname = "ipynb";

157361+ version = "0.2";

157362+ sha256 = "1iwia4sxg40m4d290gys72wabqmkqx24ywsaranwzk2wx5s3sx4s";

157363+ libraryHaskellDepends = [

157364+ aeson base base64-bytestring bytestring containers text

157365+ unordered-containers

157366+ ];

157367+ testHaskellDepends = [

157368+ aeson base bytestring directory filepath microlens microlens-aeson

157369+ tasty tasty-hunit text

157370+ ];

157371+ description = "Data structure for working with Jupyter notebooks (ipynb)";

157372+ license = lib.licenses.bsd3;

157373+ hydraPlatforms = lib.platforms.none;

157374+ }) {};

157375+

156872157376 "ipython-kernel" = callPackage

156873157377 ({ mkDerivation, aeson, base, binary, bytestring, containers

156874157378 , cryptonite, directory, filepath, memory, parsec, process

@@ -157280,6 +157784,19 @@ self: {

157280157784 license = lib.licenses.asl20;

157281157785 }) {};

157282157786

157787+ "isbn_1_1_0_3" = callPackage

157788+ ({ mkDerivation, base, hspec, QuickCheck, text }:

157789+ mkDerivation {

157790+ pname = "isbn";

157791+ version = "1.1.0.3";

157792+ sha256 = "16srdvsjsiqzcm0hb3rhwry1vr170fz85g84wk6nyk1glbva4bga";

157793+ libraryHaskellDepends = [ base text ];

157794+ testHaskellDepends = [ base hspec QuickCheck text ];

157795+ description = "ISBN Validation and Manipulation";

157796+ license = lib.licenses.asl20;

157797+ hydraPlatforms = lib.platforms.none;

157798+ }) {};

157799+

157283157800 "isdicom" = callPackage

157284157801 ({ mkDerivation, base, directory, doctest, filepath, QuickCheck

157285157802 , template-haskell

@@ -157495,8 +158012,8 @@ self: {

157495158012 ({ mkDerivation, base, bytestring, text }:

157496158013 mkDerivation {

157497158014 pname = "isocline";

157498− version = "1.0.6";

157499− sha256 = "0yxnylxmim43a4gc8hnz32gv3p1mzfx5v0j0pn2frn3xhjx9mxhn";

158015+ version = "1.0.7";

158016+ sha256 = "0pcvi7rq6v32q6zqcl7fh7ncbjd2qirhb4z380x2d57qal5lk1lv";

157500158017 isLibrary = true;

157501158018 isExecutable = true;

157502158019 libraryHaskellDepends = [ base bytestring text ];

@@ -158392,6 +158909,33 @@ self: {

158392158909 license = lib.licenses.bsd3;

158393158910 }) {};

158394158911

158912+ "jacinda" = callPackage

158913+ ({ mkDerivation, alex, array, base, bytestring, containers, happy

158914+ , microlens, microlens-mtl, mtl, optparse-applicative

158915+ , prettyprinter, recursion, regex-rure, tasty, tasty-hunit, text

158916+ , transformers, vector

158917+ }:

158918+ mkDerivation {

158919+ pname = "jacinda";

158920+ version = "0.2.0.0";

158921+ sha256 = "17kayg0xlfm0a037kg2h0hyrjnzwaxkkjmf08pid8vqaq14x0p1g";

158922+ isLibrary = false;

158923+ isExecutable = true;

158924+ libraryHaskellDepends = [

158925+ array base bytestring containers microlens microlens-mtl mtl

158926+ prettyprinter recursion regex-rure text transformers vector

158927+ ];

158928+ libraryToolDepends = [ alex happy ];

158929+ executableHaskellDepends = [

158930+ base bytestring optparse-applicative

158931+ ];

158932+ testHaskellDepends = [ base bytestring tasty tasty-hunit ];

158933+ doHaddock = false;

158934+ description = "Functional, expression-oriented data processing language";

158935+ license = lib.licenses.agpl3Only;

158936+ hydraPlatforms = lib.platforms.none;

158937+ }) {};

158938+

158395158939 "jack" = callPackage

158396158940 ({ mkDerivation, array, base, bytestring, enumset, event-list

158397158941 , explicit-exception, libjack2, midi, non-negative, semigroups

@@ -160130,6 +160674,26 @@ self: {

160130160674 license = lib.licenses.mit;

160131160675 }) {};

160132160676

160677+ "json-feed_2_0_0_0" = callPackage

160678+ ({ mkDerivation, aeson, base, bytestring, filepath, hspec

160679+ , mime-types, network-uri, tagsoup, text, time

160680+ }:

160681+ mkDerivation {

160682+ pname = "json-feed";

160683+ version = "2.0.0.0";

160684+ sha256 = "1d2xjyi5b6v5sq0g4aayirfjj4l7lskwv28w6601dxwz7yrsp234";

160685+ libraryHaskellDepends = [

160686+ aeson base bytestring mime-types network-uri tagsoup text time

160687+ ];

160688+ testHaskellDepends = [

160689+ aeson base bytestring filepath hspec mime-types network-uri tagsoup

160690+ text time

160691+ ];

160692+ description = "JSON Feed";

160693+ license = lib.licenses.mit;

160694+ hydraPlatforms = lib.platforms.none;

160695+ }) {};

160696+

160133160697 "json-fu" = callPackage

160134160698 ({ mkDerivation, aeson, attoparsec, base, bytestring, containers

160135160699 , hashable, hspec, mtl, syb, text, time, unordered-containers

@@ -160280,7 +160844,7 @@ self: {

160280160844 license = lib.licenses.mit;

160281160845 hydraPlatforms = lib.platforms.none;

160282160846 broken = true;

160283− }) {inherit (pkgs) python;};

160847+ }) {python = null;};

160284160848

160285160849 "json-qq" = callPackage

160286160850 ({ mkDerivation, base, haskell-src-meta, parsec, template-haskell

@@ -160871,6 +161435,28 @@ self: {

160871161435 license = lib.licenses.bsd3;

160872161436 }) {};

160873161437

161438+ "jsonpath_0_2_1_0" = callPackage

161439+ ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring

161440+ , file-embed, hspec, hspec-attoparsec, hspec-discover, text

161441+ , unordered-containers, vector

161442+ }:

161443+ mkDerivation {

161444+ pname = "jsonpath";

161445+ version = "0.2.1.0";

161446+ sha256 = "1d9h6j0xzrpxc56wym9b0sdanpw1v2rcx1sdm49h6iriwwmckb10";

161447+ libraryHaskellDepends = [

161448+ aeson attoparsec base text unordered-containers vector

161449+ ];

161450+ testHaskellDepends = [

161451+ aeson aeson-casing attoparsec base bytestring file-embed hspec

161452+ hspec-attoparsec text unordered-containers vector

161453+ ];

161454+ testToolDepends = [ hspec-discover ];

161455+ description = "Library to parse and execute JSONPath";

161456+ license = lib.licenses.bsd3;

161457+ hydraPlatforms = lib.platforms.none;

161458+ }) {};

161459+

160874161460 "jsonresume" = callPackage

160875161461 ({ mkDerivation, aeson, base, bytestring, old-locale, text, time

160876161462 , unordered-containers

@@ -163889,6 +164475,28 @@ self: {

163889164475 broken = true;

163890164476 }) {};

163891164477

164478+ "koji-tool" = callPackage

164479+ ({ mkDerivation, base, directory, extra, filepath, format-numbers

164480+ , Glob, http-directory, koji, pretty-simple, rpm-nvr, simple-cmd

164481+ , simple-cmd-args, text, time, xdg-userdirs

164482+ }:

164483+ mkDerivation {

164484+ pname = "koji-tool";

164485+ version = "0.6.1";

164486+ sha256 = "1l2w0dcy4fcv865z27661j7jmfy3blf8q321mv18dn44f3wr0xax";

164487+ isLibrary = false;

164488+ isExecutable = true;

164489+ executableHaskellDepends = [

164490+ base directory extra filepath format-numbers Glob http-directory

164491+ koji pretty-simple rpm-nvr simple-cmd simple-cmd-args text time

164492+ xdg-userdirs

164493+ ];

164494+ testHaskellDepends = [ base simple-cmd ];

164495+ description = "Koji CLI tool for querying tasks and installing builds";

164496+ license = lib.licenses.bsd3;

164497+ hydraPlatforms = lib.platforms.none;

164498+ }) {};

164499+

163892164500 "kontra-config" = callPackage

163893164501 ({ mkDerivation, base, bytestring, data-default, exceptions, text

163894164502 , transformers-base, unjson, utf8-string, yaml

@@ -164530,6 +165138,19 @@ self: {

164530165138 license = lib.licenses.mit;

164531165139 }) {};

164532165140

165141+ "lackey_2_0_0_0" = callPackage

165142+ ({ mkDerivation, base, hspec, servant, servant-foreign, text }:

165143+ mkDerivation {

165144+ pname = "lackey";

165145+ version = "2.0.0.0";

165146+ sha256 = "06ad35nmppblqb7400563l5qk3zna6l3kasp5ng0iacgmqzmvcrv";

165147+ libraryHaskellDepends = [ base servant-foreign text ];

165148+ testHaskellDepends = [ base hspec servant servant-foreign text ];

165149+ description = "Generate Ruby clients from Servant APIs";

165150+ license = lib.licenses.mit;

165151+ hydraPlatforms = lib.platforms.none;

165152+ }) {};

165153+

164533165154 "lacroix" = callPackage

164534165155 ({ mkDerivation, base }:

164535165156 mkDerivation {

@@ -167593,8 +168214,8 @@ self: {

167593168214 }:

167594168215 mkDerivation {

167595168216 pname = "lazy-async";

167596− version = "1.0.0.0";

167597− sha256 = "0kk8pzwm04z4jljl38gd0n03nkxw3mxg8rg93ka0rvnibfwm8dda";

168217+ version = "1.0.0.1";

168218+ sha256 = "1nw24hfpw0wd099lxjsi1iqssbb7yw6isilkv4a68agv2q1ranvk";

167598168219 libraryHaskellDepends = [

167599168220 base exceptions lifted-async monad-control rank2classes stm

167600168221 transformers transformers-base

@@ -172703,6 +173324,18 @@ self: {

172703173324 license = lib.licenses.isc;

172704173325 }) {};

172705173326

173327+ "list-singleton_2_0_0_0" = callPackage

173328+ ({ mkDerivation, base }:

173329+ mkDerivation {

173330+ pname = "list-singleton";

173331+ version = "2.0.0.0";

173332+ sha256 = "1mv2567as9vsnrqp23dzb7rlvcmid484rk94nrrfl8za97i1s4c0";

173333+ libraryHaskellDepends = [ base ];

173334+ description = "Easily and clearly create lists with only one element in them";

173335+ license = lib.licenses.mit;

173336+ hydraPlatforms = lib.platforms.none;

173337+ }) {};

173338+

172706173339 "list-t" = callPackage

172707173340 ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph

172708173341 , monad-control, mtl, mtl-prelude, semigroups, transformers

@@ -173982,12 +174615,25 @@ self: {

173982174615 license = lib.licenses.asl20;

173983174616 }) {};

173984174617

174618+ "loc_0_1_3_16" = callPackage

174619+ ({ mkDerivation, base, containers, doctest, hedgehog }:

174620+ mkDerivation {

174621+ pname = "loc";

174622+ version = "0.1.3.16";

174623+ sha256 = "0bizqfczhc5higdzrrhinr5q3s971a3klfl3gpffnq9gyzd16nrq";

174624+ libraryHaskellDepends = [ base containers ];

174625+ testHaskellDepends = [ base containers doctest hedgehog ];

174626+ description = "Types representing line and column positions and ranges in text files";

174627+ license = lib.licenses.asl20;

174628+ hydraPlatforms = lib.platforms.none;

174629+ }) {};

174630+

173985174631 "loc-test" = callPackage

173986174632 ({ mkDerivation, base, containers, hedgehog, loc }:

173987174633 mkDerivation {

173988174634 pname = "loc-test";

173989− version = "0.1.3.8";

173990− sha256 = "0jg6p0lfd5xgrwbmlskj5f1x8l5b0b3dqh460ds2nii8isccgvcq";

174635+ version = "0.1.3.10";

174636+ sha256 = "0mppiz4nv86mfdk43w83jx3wn8c6w7g9k3m3jhgmwlgqpcpdrryd";

173991174637 libraryHaskellDepends = [ base containers hedgehog loc ];

173992174638 description = "Test-related utilities related to the /loc/ package";

173993174639 license = lib.licenses.asl20;

@@ -176226,12 +176872,12 @@ self: {

176226176872 license = lib.licenses.bsd3;

176227176873 }) {};

176228176874

176229− "lucid-alpine_0_1_0_4" = callPackage

176875+ "lucid-alpine_0_1_0_5" = callPackage

176230176876 ({ mkDerivation, base, lucid, text }:

176231176877 mkDerivation {

176232176878 pname = "lucid-alpine";

176233− version = "0.1.0.4";

176234− sha256 = "1pr2fg5r43jvgh694lhqbmwl1dida9ymgw161j16dcj66jx8fjk6";

176879+ version = "0.1.0.5";

176880+ sha256 = "1prcr3rfpg3saybfjmfik9xznj0knvfxy5dwllkq6s5szi2bqyaz";

176235176881 isLibrary = true;

176236176882 isExecutable = true;

176237176883 libraryHaskellDepends = [ base lucid text ];

@@ -176309,12 +176955,12 @@ self: {

176309176955 license = lib.licenses.bsd3;

176310176956 }) {};

176311176957

176312− "lucid-htmx_0_1_0_3" = callPackage

176958+ "lucid-htmx_0_1_0_4" = callPackage

176313176959 ({ mkDerivation, base, lucid, servant, text }:

176314176960 mkDerivation {

176315176961 pname = "lucid-htmx";

176316− version = "0.1.0.3";

176317− sha256 = "1fgb4gika5f3bbba2as4bkg6m8nn2w25k17m45b389rwmhyg6syj";

176962+ version = "0.1.0.4";

176963+ sha256 = "0rq25ixsyvnp3zh3wsfmijlyv4dg94d1k1bhhwq8y624v819yg8r";

176318176964 libraryHaskellDepends = [ base lucid servant text ];

176319176965 testHaskellDepends = [ base lucid servant text ];

176320176966 description = "Use htmx in your lucid templates";

@@ -179836,22 +180482,22 @@ self: {

179836180482 "matrix-client" = callPackage

179837180483 ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base, base64

179838180484 , bytestring, containers, exceptions, hashable, hspec, http-client

179839− , http-client-tls, http-types, retry, SHA, text, time

180485+ , http-client-tls, http-types, profunctors, retry, SHA, text, time

179840180486 , unordered-containers

179841180487 }:

179842180488 mkDerivation {

179843180489 pname = "matrix-client";

179844− version = "0.1.2.0";

179845− sha256 = "18n5il56p3hr6iax2d1m0b7vximc0z4jzj0dav0rhv3yrwy8p5w2";

180490+ version = "0.1.3.0";

180491+ sha256 = "14vsz507l93zdddr3k6rwvqwpwdmsansv5ryq87k58v04fyfmvz6";

179846180492 libraryHaskellDepends = [

179847180493 aeson aeson-casing base base64 bytestring containers exceptions

179848− hashable http-client http-client-tls http-types retry SHA text time

179849− unordered-containers

180494+ hashable http-client http-client-tls http-types profunctors retry

180495+ SHA text time unordered-containers

179850180496 ];

179851180497 testHaskellDepends = [

179852180498 aeson aeson-casing aeson-pretty base base64 bytestring containers

179853180499 exceptions hashable hspec http-client http-client-tls http-types

179854− retry SHA text time unordered-containers

180500+ profunctors retry SHA text time unordered-containers

179855180501 ];

179856180502 description = "A matrix client library";

179857180503 license = lib.licenses.asl20;

@@ -181536,6 +182182,8 @@ self: {

181536182182 pname = "memory-cd";

181537182183 version = "0.16.0.1";

181538182184 sha256 = "05dkgkms159k4mk4l1ngcnxqs2hbnzmh9zv3gks0cx7wba6qyrf1";

182185+ revision = "1";

182186+ editedCabalFile = "1kja8j32h1ff6vkn3smj88k4gzgi0il8kv47cm8hwgn0v0cjjy9f";

181539182187 libraryHaskellDepends = [

181540182188 base basement-cd bytestring deepseq ghc-prim

181541182189 ];

@@ -184106,8 +184754,8 @@ self: {

184106184754 }:

184107184755 mkDerivation {

184108184756 pname = "mit-3qvpPyAi6mH";

184109− version = "6";

184110− sha256 = "1bwnpf7jvbc8z7aipw0fvkgjq1mmwn1xmm6vaaipf3ami10gpfn5";

184757+ version = "7";

184758+ sha256 = "1asr82fnqpb936kfj8fnilas76l5r5ndylvzf1van2z57sxjx9ba";

184111184759 isLibrary = true;

184112184760 isExecutable = true;

184113184761 libraryHaskellDepends = [

@@ -187327,20 +187975,24 @@ self: {

187327187975 }) {};

187328187976

187329187977 "monoid-statistics" = callPackage

187330− ({ mkDerivation, base, math-functions, QuickCheck, tasty

187331− , tasty-quickcheck, vector, vector-th-unbox

187978+ ({ mkDerivation, base, criterion, doctest, exceptions

187979+ , math-functions, mwc-random, QuickCheck, tasty

187980+ , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector

187981+ , vector-th-unbox

187332187982 }:

187333187983 mkDerivation {

187334187984 pname = "monoid-statistics";

187335− version = "1.0.1.0";

187336− sha256 = "1krgyvshvw28ld89hb1qpjx8jiz40a8yq2q3zglrir4vfch5cyx9";

187337− revision = "1";

187338− editedCabalFile = "14p36fz2yssx92imqggv5xrsnqqhhh3xj2ba96v47fm2dglgfsrv";

187985+ version = "1.1.0";

187986+ sha256 = "12q86bh057pn040wdr39wlq066mcffpgsx71jy5h8rj02qi4b78f";

187339187987 libraryHaskellDepends = [

187340− base math-functions vector vector-th-unbox

187988+ base exceptions math-functions vector vector-th-unbox

187341187989 ];

187342187990 testHaskellDepends = [

187343− base math-functions QuickCheck tasty tasty-quickcheck

187991+ base doctest math-functions QuickCheck tasty tasty-expected-failure

187992+ tasty-hunit tasty-quickcheck

187993+ ];

187994+ benchmarkHaskellDepends = [

187995+ base criterion math-functions mwc-random vector

187344187996 ];

187345187997 description = "Monoids for calculation of statistics of sample";

187346187998 license = lib.licenses.bsd3;

@@ -187586,8 +188238,8 @@ self: {

187586188238 pname = "months";

187587188239 version = "0.2";

187588188240 sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija";

187589− revision = "3";

187590− editedCabalFile = "1j57vvb2vs0jd5jsq2dh0q5wpvxibwn43dwkg1l3ysl46k5sv58i";

188241+ revision = "4";

188242+ editedCabalFile = "1prni51r2kca7cff4jshas87bxvfmqkp9r5yhkmapphxc9w8vanb";

187591188243 libraryHaskellDepends = [

187592188244 aeson attoparsec base base-compat deepseq hashable intervals

187593188245 QuickCheck text time-compat

@@ -188909,6 +189561,52 @@ self: {

188909189561 broken = true;

188910189562 }) {};

188911189563

189564+ "mptcpanalyzer" = callPackage

189565+ ({ mkDerivation, aeson, aeson-extra, aeson-pretty, ansi-terminal

189566+ , base, bytestring, Cabal, cereal, Chart, Chart-cairo, containers

189567+ , directory, filepath, foldl, formatting, Frames, ghci-dap

189568+ , hashable, haskeline, haskell-dap, haskell-debug-adapter, hspec

189569+ , HUnit, ip, lens, mptcp, mptcp-pm, mtl, network

189570+ , optparse-applicative, pipes, pipes-parse, pipes-safe, polysemy

189571+ , polysemy-log, polysemy-log-co, polysemy-plugin, process

189572+ , QuickCheck, readable, template-haskell, temporary, text, time

189573+ , transformers, unix, utf8-string, vector, vinyl, wide-word

189574+ }:

189575+ mkDerivation {

189576+ pname = "mptcpanalyzer";

189577+ version = "0.0.2.0";

189578+ sha256 = "0x13kbh693h27adxwna4v4swvcma0k9r7inh156rzd4jqbv1faz3";

189579+ isLibrary = true;

189580+ isExecutable = true;

189581+ libraryHaskellDepends = [

189582+ aeson aeson-extra aeson-pretty ansi-terminal base bytestring Cabal

189583+ cereal Chart Chart-cairo containers directory filepath foldl

189584+ formatting Frames ghci-dap hashable haskeline haskell-dap

189585+ haskell-debug-adapter ip lens mptcp mptcp-pm mtl network

189586+ optparse-applicative pipes pipes-parse pipes-safe polysemy

189587+ polysemy-log polysemy-log-co polysemy-plugin process readable

189588+ template-haskell temporary text time transformers unix utf8-string

189589+ vector vinyl wide-word

189590+ ];

189591+ executableHaskellDepends = [

189592+ aeson aeson-extra aeson-pretty ansi-terminal base bytestring Cabal

189593+ cereal Chart Chart-cairo containers directory filepath foldl

189594+ formatting Frames ghci-dap hashable haskeline haskell-dap

189595+ haskell-debug-adapter ip lens mptcp mptcp-pm mtl network

189596+ optparse-applicative pipes pipes-parse pipes-safe polysemy

189597+ polysemy-log polysemy-log-co polysemy-plugin process readable

189598+ template-haskell temporary text time transformers unix utf8-string

189599+ vector vinyl wide-word

189600+ ];

189601+ testHaskellDepends = [

189602+ base Cabal Frames hspec HUnit ip mptcp polysemy polysemy-log

189603+ polysemy-log-co QuickCheck

189604+ ];

189605+ description = "A Multipath TCP analyzer";

189606+ license = lib.licenses.gpl3Only;

189607+ hydraPlatforms = lib.platforms.none;

189608+ }) {};

189609+

188912189610 "mpvguihs" = callPackage

188913189611 ({ mkDerivation, base, directory, filepath, gtk, mtl, process

188914189612 , template-haskell, unix

@@ -189046,8 +189744,8 @@ self: {

189046189744 }:

189047189745 mkDerivation {

189048189746 pname = "ms-tds";

189049− version = "0.4.0.1";

189050− sha256 = "1yjvbn6a50wvcibvi5na6x1d7864zyspqhljvr0dpcfrz3s2yc31";

189747+ version = "0.4.0.2";

189748+ sha256 = "0lkvl74ckxsdxwvrm45z5gk2ax65yfpd00j86w8iax4askz76vxc";

189051189749 libraryHaskellDepends = [

189052189750 array base binary bytestring crypto-random data-default-class mtl

189053189751 network template-haskell text time tls uuid-types x509-store

@@ -189259,8 +189957,8 @@ self: {

189259189957 }:

189260189958 mkDerivation {

189261189959 pname = "mssql-simple";

189262− version = "0.6.0.2";

189263− sha256 = "1glp86kbimsjh1hlmdivp12qzvcy6c5yyx5ynvrwibwnxj5g968v";

189960+ version = "0.6.0.3";

189961+ sha256 = "0pgc5p018xc7pmn4mrmgwrh9zy3cxk2gkpqnw2lhnw7h0akhq5im";

189264189962 libraryHaskellDepends = [

189265189963 base binary bytestring hostname ms-tds mtl network template-haskell

189266189964 text time tls uuid-types

@@ -189548,8 +190246,8 @@ self: {

189548190246 }:

189549190247 mkDerivation {

189550190248 pname = "mu-graphql";

189551− version = "0.5.0.2";

189552− sha256 = "0kr8gqi34zgg8vj5x0c0mx3xjkhjr4ynparplysga7qzzj58a7f3";

190249+ version = "0.5.0.3";

190250+ sha256 = "1ahi51sslxlmv4yi6518bn3i4ks7hpc8327r6lz0l6d4q192k1nq";

189553190251 isLibrary = true;

189554190252 isExecutable = true;

189555190253 enableSeparateDataOutput = true;

@@ -189574,19 +190272,17 @@ self: {

189574190272 , http2-client, http2-client-grpc, http2-grpc-types, mu-grpc-common

189575190273 , mu-optics, mu-protobuf, mu-rpc, mu-schema, optics-core, sop-core

189576190274 , stm, stm-chans, stm-conduit, template-haskell, text

189577− , th-abstraction, tracing

190275+ , th-abstraction, tracing-control

189578190276 }:

189579190277 mkDerivation {

189580190278 pname = "mu-grpc-client";

189581− version = "0.4.0.1";

189582− sha256 = "030b8ajbplb1w5llzm8vn8jpwa7v4kw0y8zli8xagc50k19wp75v";

189583− revision = "2";

189584− editedCabalFile = "1zs17a684mww8ppgams79xbr019mlr27bxnnhvyhq3k5y1lwz7dh";

190279+ version = "0.4.0.2";

190280+ sha256 = "19y39ixf2d97wfm6x3sl99kwfxsd57mf2s2rqp4s80v3rs8b41iw";

189585190281 libraryHaskellDepends = [

189586190282 async avro base bytestring conduit http2 http2-client

189587190283 http2-client-grpc http2-grpc-types mu-grpc-common mu-optics

189588190284 mu-protobuf mu-rpc mu-schema optics-core sop-core stm stm-chans

189589− stm-conduit template-haskell text th-abstraction tracing

190285+ stm-conduit template-haskell text th-abstraction tracing-control

189590190286 ];

189591190287 description = "gRPC clients from Mu definitions";

189592190288 license = lib.licenses.asl20;

@@ -192633,13 +193329,13 @@ self: {

192633193329 }) {};

192634193330

192635193331 "nat-optics" = callPackage

192636− ({ mkDerivation, base, hedgehog, optics-core, text }:

193332+ ({ mkDerivation, base, optics-core, text }:

192637193333 mkDerivation {

192638193334 pname = "nat-optics";

192639− version = "1.0.0.1";

192640− sha256 = "1ba5lnb70gdaa9hwfcg2r0x76h2mxknn49rwplmbgcyxyh79x4jl";

193335+ version = "1.0.0.2";

193336+ sha256 = "12m6267dirzykj4d0rjqq5h3n2zrnp7ixavryvbgqdvrnk6y2ik4";

192641193337 libraryHaskellDepends = [ base optics-core text ];

192642− testHaskellDepends = [ base hedgehog optics-core text ];

193338+ testHaskellDepends = [ base optics-core text ];

192643193339 description = "Refinement types for natural numbers with an optics interface";

192644193340 license = lib.licenses.mit;

192645193341 hydraPlatforms = lib.platforms.none;

@@ -193443,7 +194139,7 @@ self: {

193443194139 license = lib.licenses.bsd3;

193444194140 }) {};

193445194141

193446− "net-mqtt_0_8_1_0" = callPackage

194142+ "net-mqtt_0_8_2_0" = callPackage

193447194143 ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary

193448194144 , bytestring, checkers, conduit, conduit-extra, connection

193449194145 , containers, deepseq, HUnit, network-conduit-tls, network-uri

@@ -193452,8 +194148,8 @@ self: {

193452194148 }:

193453194149 mkDerivation {

193454194150 pname = "net-mqtt";

193455− version = "0.8.1.0";

193456− sha256 = "1cy17mv8ld3aifh1nr5sggm4x08h58vaa6q1s7nd7nhnkj1icajk";

194151+ version = "0.8.2.0";

194152+ sha256 = "0krh8imyjls1incrsz8pnn3zww0yxygy3hy15r55gbs80x5w7j13";

193457194153 isLibrary = true;

193458194154 isExecutable = true;

193459194155 libraryHaskellDepends = [

@@ -204102,19 +204798,19 @@ self: {

204102204798 maintainers = with lib.maintainers; [ peti ];

204103204799 }) {};

204104204800

204105− "pandoc_2_16_2" = callPackage

204801+ "pandoc_2_17" = callPackage

204106204802 ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base

204107204803 , base64-bytestring, binary, blaze-html, blaze-markup, bytestring

204108204804 , case-insensitive, citeproc, commonmark, commonmark-extensions

204109204805 , commonmark-pandoc, connection, containers, data-default, deepseq

204110204806 , Diff, directory, doclayout, doctemplates, emojis, exceptions

204111− , file-embed, filepath, Glob, haddock-library, hslua

204807+ , file-embed, filepath, Glob, haddock-library, hslua, hslua-aeson

204112204808 , hslua-marshalling, hslua-module-path, hslua-module-system

204113204809 , hslua-module-text, hslua-module-version, http-client

204114204810 , http-client-tls, http-types, ipynb, jira-wiki-markup, JuicyPixels

204115− , lpeg, mtl, network, network-uri, pandoc-types, parsec, pretty

204116− , pretty-show, process, QuickCheck, random, safe, scientific, SHA

204117− , skylighting, skylighting-core, split, syb, tagsoup, tasty

204811+ , lpeg, mtl, network, network-uri, pandoc-lua-marshal, pandoc-types

204812+ , parsec, pretty, pretty-show, process, random, safe, scientific

204813+ , SHA, skylighting, skylighting-core, split, syb, tagsoup, tasty

204118204814 , tasty-bench, tasty-golden, tasty-hunit, tasty-lua

204119204815 , tasty-quickcheck, temporary, texmath, text, text-conversions

204120204816 , time, unicode-collation, unicode-transforms, unix, xml

@@ -204122,10 +204818,8 @@ self: {

204122204818 }:

204123204819 mkDerivation {

204124204820 pname = "pandoc";

204125− version = "2.16.2";

204126− sha256 = "0pnw4v5i20bi9j3gg0i9wlikk2fhj34x5vhh23zhj8v4p72r3wkj";

204127− revision = "1";

204128− editedCabalFile = "013i4hsgfdq38zsxq4c3l80hqxrqccy41h1ihyakamb8m3p3pq8q";

204821+ version = "2.17";

204822+ sha256 = "0wbq4mzvjzyl9nzfagbjljv11khajzv030sr51n5wfxf8rm463y6";

204129204823 configureFlags = [ "-fhttps" "-f-trypandoc" ];

204130204824 isLibrary = true;

204131204825 isExecutable = true;

@@ -204136,20 +204830,20 @@ self: {

204136204830 commonmark commonmark-extensions commonmark-pandoc connection

204137204831 containers data-default deepseq directory doclayout doctemplates

204138204832 emojis exceptions file-embed filepath Glob haddock-library hslua

204139− hslua-marshalling hslua-module-path hslua-module-system

204833+ hslua-aeson hslua-marshalling hslua-module-path hslua-module-system

204140204834 hslua-module-text hslua-module-version http-client http-client-tls

204141204835 http-types ipynb jira-wiki-markup JuicyPixels lpeg mtl network

204142− network-uri pandoc-types parsec pretty pretty-show process random

204143− safe scientific SHA skylighting skylighting-core split syb tagsoup

204144− temporary texmath text text-conversions time unicode-collation

204145− unicode-transforms unix xml xml-conduit yaml zip-archive zlib

204836+ network-uri pandoc-lua-marshal pandoc-types parsec pretty

204837+ pretty-show process random safe scientific SHA skylighting

204838+ skylighting-core split syb tagsoup temporary texmath text

204839+ text-conversions time unicode-collation unicode-transforms unix xml

204840+ xml-conduit yaml zip-archive zlib

204146204841 ];

204147204842 executableHaskellDepends = [ base ];

204148204843 testHaskellDepends = [

204149204844 base bytestring containers Diff directory doctemplates exceptions

204150− filepath Glob hslua mtl pandoc-types process QuickCheck tasty

204151− tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml

204152− zip-archive

204845+ filepath Glob hslua mtl pandoc-types process tasty tasty-golden

204846+ tasty-hunit tasty-lua tasty-quickcheck text time xml zip-archive

204153204847 ];

204154204848 benchmarkHaskellDepends = [

204155204849 base bytestring deepseq mtl tasty-bench text

@@ -204472,8 +205166,8 @@ self: {

204472205166 }:

204473205167 mkDerivation {

204474205168 pname = "pandoc-lua-marshal";

204475− version = "0.1.3";

204476− sha256 = "0x4r0w2gavphc5f6yr4szb31blsvw3hdyackwza8dmzag952nc9k";

205169+ version = "0.1.3.1";

205170+ sha256 = "04q433gpqkydyy2gx6jhyvv7lahx186b1d90clkggach1x0rg8ii";

204477205171 libraryHaskellDepends = [

204478205172 base bytestring containers exceptions hslua hslua-marshalling lua

204479205173 pandoc-types safe text

@@ -204608,8 +205302,8 @@ self: {

204608205302 pname = "pandoc-plot";

204609205303 version = "1.3.0";

204610205304 sha256 = "0d33cbw0ygsdwh718q7q5gw2s6565dbrjwi3rz0qdf78q14wiayi";

204611− revision = "1";

204612− editedCabalFile = "1l4rxi23i8ngfrv6vk94l0j0cfczwxchp2bwh1l894b4dfhkq1ks";

205305+ revision = "2";

205306+ editedCabalFile = "14q1l5m29736f9zybh3sba74mxvs73lbr4hqvmdyzfz369r41rmv";

204613205307 isLibrary = true;

204614205308 isExecutable = true;

204615205309 libraryHaskellDepends = [

@@ -204786,8 +205480,8 @@ self: {

204786205480 ({ mkDerivation }:

204787205481 mkDerivation {

204788205482 pname = "pandora";

204789− version = "0.4.9";

204790− sha256 = "0z02q7bxrrij4vls3gpxg34z47y2ijapjwagw6aw8dpsn75hj798";

205483+ version = "0.5.0";

205484+ sha256 = "144k1cqb4gkwyh3w01cwsax58n9w3h1giggdb8b0dw64pnhsq8zd";

204791205485 description = "A box of patterns and paradigms";

204792205486 license = lib.licenses.mit;

204793205487 }) {};

@@ -206546,14 +207240,15 @@ self: {

206546207240

206547207241 "parsley-core" = callPackage

206548207242 ({ mkDerivation, array, base, bytestring, containers, cpphs

206549− , deepseq, dependent-map, dependent-sum, ghc-prim, hashable, mtl

206550− , pretty-terminal, tasty, tasty-hunit, tasty-quickcheck

206551− , template-haskell, text, th-test-utils, unordered-containers

207243+ , deepseq, dependent-map, dependent-sum, gauge, ghc-prim, hashable

207244+ , mtl, pretty-terminal, QuickCheck, tasty, tasty-hunit

207245+ , tasty-quickcheck, template-haskell, text, th-test-utils

207246+ , unordered-containers

206552207247 }:

206553207248 mkDerivation {

206554207249 pname = "parsley-core";

206555− version = "2.0.0.0";

206556− sha256 = "1v46wpi80fdjpdgr6jcrhljxjrmf1gf7cxmi3y0sdlininr4273i";

207250+ version = "2.1.0.0";

207251+ sha256 = "0vr4qlgkwsh92a8fv4fj48l9625xd80mkkmihwf20zln6svcsbfs";

206557207252 libraryHaskellDepends = [

206558207253 array base bytestring containers dependent-map dependent-sum

206559207254 ghc-prim hashable mtl pretty-terminal template-haskell text

@@ -206564,6 +207259,9 @@ self: {

206564207259 base containers deepseq tasty tasty-hunit tasty-quickcheck

206565207260 template-haskell th-test-utils

206566207261 ];

207262+ benchmarkHaskellDepends = [

207263+ base containers deepseq gauge QuickCheck

207264+ ];

206567207265 description = "A fast parser combinator library backed by Typed Template Haskell";

206568207266 license = lib.licenses.bsd3;

206569207267 hydraPlatforms = lib.platforms.none;

@@ -206729,12 +207427,25 @@ self: {

206729207427 license = lib.licenses.asl20;

206730207428 }) {};

206731207429

207430+ "partial-semigroup_0_5_1_14" = callPackage

207431+ ({ mkDerivation, base, doctest, hedgehog }:

207432+ mkDerivation {

207433+ pname = "partial-semigroup";

207434+ version = "0.5.1.14";

207435+ sha256 = "11xbdv24jy54wniappiqp6j27nm3wjgrbc8zmjkbfwdgb7fzlrws";

207436+ libraryHaskellDepends = [ base ];

207437+ testHaskellDepends = [ base doctest hedgehog ];

207438+ description = "A partial binary associative operator";

207439+ license = lib.licenses.asl20;

207440+ hydraPlatforms = lib.platforms.none;

207441+ }) {};

207442+

206732207443 "partial-semigroup-hedgehog" = callPackage

206733207444 ({ mkDerivation, base, hedgehog, partial-semigroup }:

206734207445 mkDerivation {

206735207446 pname = "partial-semigroup-hedgehog";

206736− version = "0.6.0.8";

206737− sha256 = "0gldqqrfc87x1ff33qgan3pp62siqgal3imkf81b9rynws0saxh7";

207447+ version = "0.6.0.10";

207448+ sha256 = "1i40ndpk6dwq56fd83za46wn1fyzm46hnx06s29h4pz1ilfrk1xx";

206738207449 libraryHaskellDepends = [ base hedgehog partial-semigroup ];

206739207450 description = "Property testing for partial semigroups using Hedgehog";

206740207451 license = lib.licenses.asl20;

@@ -207072,7 +207783,7 @@ self: {

207072207783 license = lib.licenses.bsd3;

207073207784 }) {};

207074207785

207075− "patch_0_0_5_1" = callPackage

207786+ "patch_0_0_5_2" = callPackage

207076207787 ({ mkDerivation, base, constraints-extras, containers

207077207788 , dependent-map, dependent-sum, directory, filemanip, filepath

207078207789 , hedgehog, hlint, HUnit, lens, monoidal-containers, semialign

@@ -207080,8 +207791,8 @@ self: {

207080207791 }:

207081207792 mkDerivation {

207082207793 pname = "patch";

207083− version = "0.0.5.1";

207084− sha256 = "073q0kxjkjyv7cvxmxksln91s0dqki07by9fbg4ls1lh5mwyn3vk";

207794+ version = "0.0.5.2";

207795+ sha256 = "1l1rd5xybp0a9lvk89i64a4vr82vsha8fkcpwd6hwv2klsxbrwf6";

207085207796 libraryHaskellDepends = [

207086207797 base constraints-extras containers dependent-map dependent-sum lens

207087207798 monoidal-containers semialign semigroupoids these transformers

@@ -210982,8 +211693,8 @@ self: {

210982211693 }:

210983211694 mkDerivation {

210984211695 pname = "phonetic-languages-simplified-generalized-properties-array";

210985− version = "0.8.2.0";

210986− sha256 = "0mlzmsal1phg2r7mwdgxbc55ybziqys6avzkv7pw3il1vy7kyzyx";

211696+ version = "0.8.3.0";

211697+ sha256 = "0vsvj3958czr812jwgkqgnq9jnr79pf1bh1pip49xahp2b35j7ml";

210987211698 libraryHaskellDepends = [

210988211699 base phonetic-languages-phonetics-basics

210989211700 phonetic-languages-rhythmicity phonetic-languages-simplified-base

@@ -211099,8 +211810,8 @@ self: {

211099211810 ({ mkDerivation, base, mmsyn2-array, mmsyn5 }:

211100211811 mkDerivation {

211101211812 pname = "phonetic-languages-ukrainian-array";

211102− version = "0.8.0.0";

211103− sha256 = "12hpqlcwccv2c25fxyxq5vdnmzwqykcvmp8rj118hc3yssc2ygj8";

211813+ version = "0.8.2.0";

211814+ sha256 = "14p2fr80qw8svqb5bdhm2lcbwrciad7vx2lswvz1h8g62wd03py7";

211104211815 isLibrary = true;

211105211816 isExecutable = true;

211106211817 libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ];

@@ -211146,8 +211857,8 @@ self: {

211146211857 }:

211147211858 mkDerivation {

211148211859 pname = "photoname";

211149− version = "5.0";

211150− sha256 = "0g17jbnrgl2crgd04sy9s8d1g8da7p8wxq7hgnlg9h4n40yjxbd8";

211860+ version = "5.1";

211861+ sha256 = "0ihw0pjiqwfny8nqbdglg13dch622m2agp2y328n7fqar79xx6dv";

211151211862 isLibrary = true;

211152211863 isExecutable = true;

211153211864 libraryHaskellDepends = [

@@ -212606,6 +213317,8 @@ self: {

212606213317 pname = "pipes-lzma";

212607213318 version = "0.2.0.0";

212608213319 sha256 = "1b1xnjq1bvp14rl0lvzfxkckvwsihmq0j61wbmx1k0vqjy2b350m";

213320+ revision = "1";

213321+ editedCabalFile = "1i501pqamv0sjrp2ngppvy1wy6gr7xk89hzpfmvnj02ja2m49z41";

212609213322 isLibrary = true;

212610213323 isExecutable = true;

212611213324 libraryHaskellDepends = [ base bytestring exceptions lzma pipes ];

@@ -218045,8 +218758,8 @@ self: {

218045218758 }:

218046218759 mkDerivation {

218047218760 pname = "powerdns";

218048− version = "0.2.0";

218049− sha256 = "0ddrgvpvss342zmnyd0svj7424k8gynd7bwb2i0r10zw1l4kai26";

218761+ version = "0.2.1";

218762+ sha256 = "09amgmzyypjilz6armsvyjjxj8frx48aq3nq8vjkp30j2xs7a7a4";

218050218763 libraryHaskellDepends = [

218051218764 aeson base base64-bytestring bytestring case-insensitive containers

218052218765 deepseq servant servant-client servant-client-core text time

@@ -219360,6 +220073,8 @@ self: {

219360220073 pname = "prettyprinter-graphviz";

219361220074 version = "1.1.0.0";

219362220075 sha256 = "1lqf296jr2jfg86apn729payq2rkk95pdidl7n62xx4bniax7fvm";

220076+ revision = "1";

220077+ editedCabalFile = "1q8mp6rzb9l6jm8bc902si99ns2nw3vzimqvzwhxbkxf4ljdzqwq";

219363220078 libraryHaskellDepends = [ base graphviz prettyprinter text ];

219364220079 description = "A prettyprinter backend for graphviz";

219365220080 license = lib.licenses.bsd3;

@@ -219371,6 +220086,8 @@ self: {

219371220086 pname = "prettyprinter-lucid";

219372220087 version = "0.1.0.1";

219373220088 sha256 = "0m8dbxzs22zbahpr6r1frlfqyw581wyg92vswm3gi2qqpj406djh";

220089+ revision = "1";

220090+ editedCabalFile = "02vqw79j1pj9f1z2gl08jny75lfdm29jw2g6kqg23x5sayzh1f89";

219374220091 libraryHaskellDepends = [ base lucid prettyprinter text ];

219375220092 description = "A prettyprinter backend for lucid";

219376220093 license = lib.licenses.bsd3;

@@ -219538,6 +220255,24 @@ self: {

219538220255 license = lib.licenses.gpl3Only;

219539220256 }) {};

219540220257

220258+ "primecount" = callPackage

220259+ ({ mkDerivation, base, primecount, silently, tasty, tasty-bench

220260+ , tasty-hunit

220261+ }:

220262+ mkDerivation {

220263+ pname = "primecount";

220264+ version = "0.1.0.0";

220265+ sha256 = "16ls5fb8z0mpnggs9c1sjksgzpj558gdp9fk3wrv55z41pch53r0";

220266+ libraryHaskellDepends = [ base ];

220267+ librarySystemDepends = [ primecount ];

220268+ testHaskellDepends = [ base silently tasty tasty-hunit ];

220269+ benchmarkHaskellDepends = [ base tasty-bench ];

220270+ description = "Bindings to the primecount library";

220271+ license = lib.licenses.bsd3;

220272+ hydraPlatforms = lib.platforms.none;

220273+ broken = true;

220274+ }) {inherit (pkgs) primecount;};

220275+

219541220276 "primes" = callPackage

219542220277 ({ mkDerivation, base }:

219543220278 mkDerivation {

@@ -219629,8 +220364,8 @@ self: {

219629220364 ({ mkDerivation, base, primitive }:

219630220365 mkDerivation {

219631220366 pname = "primitive-checked";

219632− version = "0.7.0.0";

219633− sha256 = "1h4gsririgjw8p72dz2p91yq8mxr37qca8rshmxmkmmds8yv6w1s";

220367+ version = "0.7.2.0";

220368+ sha256 = "1swb10hd18w2xnxiwnscsv4fxmvrql3aw7fll5qlqi2hczbkd4lf";

219634220369 libraryHaskellDepends = [ base primitive ];

219635220370 description = "primitive functions with bounds-checking";

219636220371 license = lib.licenses.bsd3;

@@ -219699,7 +220434,7 @@ self: {

219699220434 license = lib.licenses.mit;

219700220435 }) {};

219701220436

219702− "primitive-extras_0_10_1_3" = callPackage

220437+ "primitive-extras_0_10_1_4" = callPackage

219703220438 ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus

219704220439 , foldl, list-t, primitive, primitive-unlifted, profunctors

219705220440 , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit

@@ -219707,8 +220442,8 @@ self: {

219707220442 }:

219708220443 mkDerivation {

219709220444 pname = "primitive-extras";

219710− version = "0.10.1.3";

219711− sha256 = "03i65knf4fkhai1668k5vlpa7z8jdvwy9kay4i4qr2l013qx29yf";

220445+ version = "0.10.1.4";

220446+ sha256 = "00x8jwmkijc110idviz6i4q25dfxnjv4gcdkhsyrldrg8g1bn90f";

219712220447 libraryHaskellDepends = [

219713220448 base bytestring cereal deferred-folds focus foldl list-t primitive

219714220449 primitive-unlifted profunctors vector

@@ -221147,6 +221882,24 @@ self: {

221147221882 license = lib.licenses.bsd3;

221148221883 }) {};

221149221884

221885+ "prometheus_2_2_3" = callPackage

221886+ ({ mkDerivation, atomic-primops, base, bytestring, containers

221887+ , http-client, http-client-tls, http-types, network-uri, text

221888+ , transformers, wai, warp

221889+ }:

221890+ mkDerivation {

221891+ pname = "prometheus";

221892+ version = "2.2.3";

221893+ sha256 = "1ggav326fpkrvg39a5rxg2ysg6mb16zzdv4yw0753fyk61v2g4pz";

221894+ libraryHaskellDepends = [

221895+ atomic-primops base bytestring containers http-client

221896+ http-client-tls http-types network-uri text transformers wai warp

221897+ ];

221898+ description = "Prometheus Haskell Client";

221899+ license = lib.licenses.bsd3;

221900+ hydraPlatforms = lib.platforms.none;

221901+ }) {};

221902+

221150221903 "prometheus-client" = callPackage

221151221904 ({ mkDerivation, atomic-primops, base, bytestring, clock

221152221905 , containers, criterion, deepseq, doctest, exceptions, hspec, mtl

@@ -222367,6 +223120,32 @@ self: {

222367223120 license = lib.licenses.mit;

222368223121 }) {};

222369223122

223123+ "psql" = callPackage

223124+ ({ mkDerivation, base, bytestring, cgroup-rts-threads, concurrency

223125+ , containers, cryptonite, exceptions, hspec, massiv, megaparsec

223126+ , mtl, postgresql-libpq, semigroupoids, simpoole, sop-core

223127+ , template-haskell, text, unordered-containers, vector

223128+ }:

223129+ mkDerivation {

223130+ pname = "psql";

223131+ version = "0.0.0";

223132+ sha256 = "15f0404yvs6bixzb0wbcp9nnn07wf0vq0dgaxr1pkch4gy8n79ij";

223133+ revision = "1";

223134+ editedCabalFile = "0pfi16q3kv0kxwamggk3jsvy5mmgc7g6qawzxwmz14n8mg61885w";

223135+ libraryHaskellDepends = [

223136+ base bytestring concurrency containers cryptonite exceptions

223137+ megaparsec mtl postgresql-libpq semigroupoids simpoole

223138+ template-haskell text vector

223139+ ];

223140+ testHaskellDepends = [

223141+ base bytestring cgroup-rts-threads exceptions hspec massiv mtl

223142+ postgresql-libpq semigroupoids sop-core unordered-containers vector

223143+ ];

223144+ description = "PostgreSQL client";

223145+ license = lib.licenses.bsd3;

223146+ hydraPlatforms = lib.platforms.none;

223147+ }) {};

223148+

222370223149 "psql-helpers" = callPackage

222371223150 ({ mkDerivation, base, postgresql-simple }:

222372223151 mkDerivation {

@@ -223742,7 +224521,7 @@ self: {

223742224521 license = lib.licenses.mit;

223743224522 hydraPlatforms = lib.platforms.none;

223744224523 broken = true;

223745− }) {inherit (pkgs) python;};

224524+ }) {python = null;};

223746224525

223747224526 "pyfi" = callPackage

223748224527 ({ mkDerivation, aeson, base, bytestring, containers, pureMD5

@@ -223760,7 +224539,7 @@ self: {

223760224539 license = lib.licenses.mit;

223761224540 hydraPlatforms = lib.platforms.none;

223762224541 broken = true;

223763− }) {inherit (pkgs) python;};

224542+ }) {python = null;};

223764224543

223765224544 "python-pickle" = callPackage

223766224545 ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs

@@ -226432,6 +227211,20 @@ self: {

226432227211 license = lib.licenses.isc;

226433227212 }) {};

226434227213

227214+ "rampart_2_0_0_0" = callPackage

227215+ ({ mkDerivation, base, criterion, hspec }:

227216+ mkDerivation {

227217+ pname = "rampart";

227218+ version = "2.0.0.0";

227219+ sha256 = "1hmn6dm5x2n9mn31lwa3dg77plahqmfj0h6s2h3v5y09d7s2fjhv";

227220+ libraryHaskellDepends = [ base ];

227221+ testHaskellDepends = [ base hspec ];

227222+ benchmarkHaskellDepends = [ base criterion ];

227223+ description = "Determine how intervals relate to each other";

227224+ license = lib.licenses.mit;

227225+ hydraPlatforms = lib.platforms.none;

227226+ }) {};

227227+

226435227228 "ramus" = callPackage

226436227229 ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io

226437227230 }:

@@ -227335,6 +228128,28 @@ self: {

227335228128 license = lib.licenses.mit;

227336228129 }) {};

227337228130

228131+ "ratel_2_0_0_0" = callPackage

228132+ ({ mkDerivation, aeson, base, bytestring, case-insensitive

228133+ , containers, filepath, hspec, http-client, http-client-tls

228134+ , http-types, uuid

228135+ }:

228136+ mkDerivation {

228137+ pname = "ratel";

228138+ version = "2.0.0.0";

228139+ sha256 = "02pkc0mkzxvv07kzwsrxp1hlgb5gypxc7phsv85k9kr6vvkh58jf";

228140+ libraryHaskellDepends = [

228141+ aeson base bytestring case-insensitive containers http-client

228142+ http-client-tls http-types uuid

228143+ ];

228144+ testHaskellDepends = [

228145+ aeson base bytestring case-insensitive containers filepath hspec

228146+ http-client http-client-tls http-types uuid

228147+ ];

228148+ description = "Notify Honeybadger about exceptions";

228149+ license = lib.licenses.mit;

228150+ hydraPlatforms = lib.platforms.none;

228151+ }) {};

228152+

227338228153 "ratel-wai" = callPackage

227339228154 ({ mkDerivation, base, bytestring, case-insensitive, containers

227340228155 , http-client, ratel, wai

@@ -227350,6 +228165,22 @@ self: {

227350228165 license = lib.licenses.mit;

227351228166 }) {};

227352228167

228168+ "ratel-wai_2_0_0_0" = callPackage

228169+ ({ mkDerivation, base, bytestring, case-insensitive, containers

228170+ , http-client, ratel, wai

228171+ }:

228172+ mkDerivation {

228173+ pname = "ratel-wai";

228174+ version = "2.0.0.0";

228175+ sha256 = "1z95ydab4q8r3lmsin3ghzqcnfliw2km7sdldzm6crvgvpj90l73";

228176+ libraryHaskellDepends = [

228177+ base bytestring case-insensitive containers http-client ratel wai

228178+ ];

228179+ description = "Notify Honeybadger about exceptions via a WAI middleware";

228180+ license = lib.licenses.mit;

228181+ hydraPlatforms = lib.platforms.none;

228182+ }) {};

228183+

227353228184 "ratelimiter" = callPackage

227354228185 ({ mkDerivation, base, containers, extra, mtl, time, timespan

227355228186 , vector

@@ -231084,14 +231915,14 @@ self: {

231084231915 }:

231085231916 mkDerivation {

231086231917 pname = "regex-rure";

231087− version = "0.1.0.0";

231088− sha256 = "0fji4j0nhq47s956ahxq7rh1a50q6y65b5m9rdcn3mjahqmirkal";

231918+ version = "0.1.0.2";

231919+ sha256 = "1nqly1c2pg7c44jaajl3kj8hibybm5w8ly4ndyfgmrs60d2kzhyw";

231089231920 libraryHaskellDepends = [ base bytestring ];

231090231921 librarySystemDepends = [ rure ];

231091231922 libraryToolDepends = [ c2hs ];

231092231923 testHaskellDepends = [ base bytestring tasty tasty-hunit ];

231093231924 description = "Bindings to Rust's regex library";

231094− license = lib.licenses.gpl3Only;

231925+ license = lib.licenses.agpl3Only;

231095231926 hydraPlatforms = lib.platforms.none;

231096231927 broken = true;

231097231928 }) {rure = null;};

@@ -231554,8 +232385,8 @@ self: {

231554232385 ({ mkDerivation, base, vector }:

231555232386 mkDerivation {

231556232387 pname = "regression-simple";

231557− version = "0.1";

231558− sha256 = "0f74xwyrnz39cl24kazvk8rd3px2l2ycx6a5jaqlab6wiwi5xclq";

232388+ version = "0.1.1";

232389+ sha256 = "18gq05xrkkxg2zrnkx9z7n91g8lagz6j3cfw7mqik7dyc2m1w675";

231559232390 libraryHaskellDepends = [ base vector ];

231560232391 description = "Simple linear and quadratic regression";

231561232392 license = lib.licenses.bsd3;

@@ -231743,7 +232574,7 @@ self: {

231743232574 maintainers = with lib.maintainers; [ sternenseemann ];

231744232575 }) {};

231745232576

231746− "rel8_1_2_1_0" = callPackage

232577+ "rel8_1_2_2_0" = callPackage

231747232578 ({ mkDerivation, aeson, base, bifunctors, bytestring

231748232579 , case-insensitive, comonad, containers, contravariant, hasql

231749232580 , hasql-transaction, hedgehog, mmorph, opaleye, pretty

@@ -231753,8 +232584,8 @@ self: {

231753232584 }:

231754232585 mkDerivation {

231755232586 pname = "rel8";

231756− version = "1.2.1.0";

231757− sha256 = "0f4rnyr90f989ww4hh8h65fhnj16ir144qsin9abc767fxnb7wis";

232587+ version = "1.2.2.0";

232588+ sha256 = "1jbss5liyz8r747yzva1ciadacd63lida1gzrw9g7075hsawfwjf";

231758232589 libraryHaskellDepends = [

231759232590 aeson base bifunctors bytestring case-insensitive comonad

231760232591 contravariant hasql opaleye pretty product-profunctors profunctors

@@ -233423,8 +234254,8 @@ self: {

233423234254 pname = "resolv";

233424234255 version = "0.1.2.0";

233425234256 sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1";

233426− revision = "3";

233427− editedCabalFile = "0af5dsdyn04i76d012xhhfkkml10bqzl6q2yivkhf8rlvh1fiii5";

234257+ revision = "4";

234258+ editedCabalFile = "1d3dsbvrwynnbdj32fswiwh90h28p31h6fsfpq5zh85rd29yp210";

233428234259 libraryHaskellDepends = [

233429234260 base base16-bytestring binary bytestring containers

233430234261 ];

@@ -236552,13 +237383,15 @@ self: {

236552237383

236553237384 "rounded-hw" = callPackage

236554237385 ({ mkDerivation, array, base, Cabal, deepseq, doctest, fp-ieee

236555− , gauge, hspec, long-double, primitive, QuickCheck, random, tagged

236556− , vector

237386+ , hspec, long-double, primitive, QuickCheck, random, tagged

237387+ , tasty-bench, vector

236557237388 }:

236558237389 mkDerivation {

236559237390 pname = "rounded-hw";

236560− version = "0.2.0";

236561− sha256 = "01393ps7i83ncxlj9yi6jhngr26py6sdafq67mbhigrclyax6ysi";

237391+ version = "0.3.0";

237392+ sha256 = "15y6yz101mnfkc2ff4w6wnqc5r6ykipd7jh0pbg9rjm67jmyr4b5";

237393+ revision = "1";

237394+ editedCabalFile = "139hr8a1qyfkdcpxn9pwmi9c7v4q3g86bjrx654nc0q7v87q4afh";

236562237395 setupHaskellDepends = [ base Cabal ];

236563237396 libraryHaskellDepends = [

236564237397 array base deepseq fp-ieee long-double primitive tagged vector

@@ -236568,7 +237401,7 @@ self: {

236568237401 QuickCheck random vector

236569237402 ];

236570237403 benchmarkHaskellDepends = [

236571− array base deepseq fp-ieee gauge primitive vector

237404+ array base deepseq fp-ieee primitive tasty-bench vector

236572237405 ];

236573237406 description = "Directed rounding for built-in floating types";

236574237407 license = lib.licenses.bsd3;

@@ -238601,6 +239434,19 @@ self: {

238601239434 license = lib.licenses.mit;

238602239435 }) {};

238603239436

239437+ "salve_2_0_0_0" = callPackage

239438+ ({ mkDerivation, base, HUnit }:

239439+ mkDerivation {

239440+ pname = "salve";

239441+ version = "2.0.0.0";

239442+ sha256 = "0ddja5py6wjxvlc9340v0z9qh7b59vfp81hz882nfq0c0d2bdna5";

239443+ libraryHaskellDepends = [ base ];

239444+ testHaskellDepends = [ base HUnit ];

239445+ description = "Semantic version numbers and constraints";

239446+ license = lib.licenses.mit;

239447+ hydraPlatforms = lib.platforms.none;

239448+ }) {};

239449+

238604239450 "salvia" = callPackage

238605239451 ({ mkDerivation, base, bytestring, containers, directory, fclabels

238606239452 , MaybeT-transformers, monads-fd, network, old-locale, process

@@ -240002,6 +240848,29 @@ self: {

240002240848 hydraPlatforms = lib.platforms.none;

240003240849 }) {};

240004240850

240851+ "scheduling" = callPackage

240852+ ({ mkDerivation, aeson, base, bimap, bytestring, containers, gogol

240853+ , gogol-sheets, lens, mime-mail, mtl, optparse-generic, random, sbv

240854+ , servant, text, time

240855+ }:

240856+ mkDerivation {

240857+ pname = "scheduling";

240858+ version = "0.1.0.0";

240859+ sha256 = "14kl43l624b9wl7igj52vxjgw42mdkx1n7f2i6ng638y2wfc0xzl";

240860+ isLibrary = true;

240861+ isExecutable = true;

240862+ libraryHaskellDepends = [

240863+ aeson base bimap bytestring containers gogol gogol-sheets lens

240864+ mime-mail mtl optparse-generic random sbv servant text time

240865+ ];

240866+ executableHaskellDepends = [

240867+ aeson base bimap bytestring containers gogol gogol-sheets lens

240868+ mime-mail mtl optparse-generic random sbv servant text time

240869+ ];

240870+ description = "An interview scheduler using constraint satisfaction and Google Sheets";

240871+ license = lib.licenses.bsd3;

240872+ }) {};

240873+

240005240874 "schedyield" = callPackage

240006240875 ({ mkDerivation, base }:

240007240876 mkDerivation {

@@ -241168,6 +242037,28 @@ self: {

241168242037 license = lib.licenses.bsd3;

241169242038 }) {inherit (pkgs) SDL2;};

241170242039

242040+ "sdl2_2_5_3_1" = callPackage

242041+ ({ mkDerivation, base, bytestring, deepseq, exceptions, linear

242042+ , SDL2, StateVar, text, transformers, vector, weigh

242043+ }:

242044+ mkDerivation {

242045+ pname = "sdl2";

242046+ version = "2.5.3.1";

242047+ sha256 = "1lnscy9vc3h9fhh65iq60kma79q4pkb00r8lqx8i3ax2v53yl626";

242048+ isLibrary = true;

242049+ isExecutable = true;

242050+ enableSeparateDataOutput = true;

242051+ libraryHaskellDepends = [

242052+ base bytestring exceptions linear StateVar text transformers vector

242053+ ];

242054+ librarySystemDepends = [ SDL2 ];

242055+ libraryPkgconfigDepends = [ SDL2 ];

242056+ testHaskellDepends = [ base deepseq linear vector weigh ];

242057+ description = "Both high- and low-level bindings to the SDL library (version 2.0.6+).";

242058+ license = lib.licenses.bsd3;

242059+ hydraPlatforms = lib.platforms.none;

242060+ }) {inherit (pkgs) SDL2;};

242061+

241171242062 "sdl2-cairo" = callPackage

241172242063 ({ mkDerivation, base, cairo, linear, sdl2 }:

241173242064 mkDerivation {

@@ -242536,6 +243427,26 @@ self: {

242536243427 license = lib.licenses.bsd2;

242537243428 }) {};

242538243429

243430+ "semigroupoids_5_3_7" = callPackage

243431+ ({ mkDerivation, base, base-orphans, bifunctors, comonad

243432+ , containers, contravariant, distributive, hashable, tagged

243433+ , template-haskell, transformers, transformers-compat

243434+ , unordered-containers

243435+ }:

243436+ mkDerivation {

243437+ pname = "semigroupoids";

243438+ version = "5.3.7";

243439+ sha256 = "169pjrm7lxjxrqj5q1iyl288bx5nj8n0pf2ri1cclxccqnvcsibd";

243440+ libraryHaskellDepends = [

243441+ base base-orphans bifunctors comonad containers contravariant

243442+ distributive hashable tagged template-haskell transformers

243443+ transformers-compat unordered-containers

243444+ ];

243445+ description = "Semigroupoids: Category sans id";

243446+ license = lib.licenses.bsd2;

243447+ hydraPlatforms = lib.platforms.none;

243448+ }) {};

243449+

242539243450 "semigroupoids-do" = callPackage

242540243451 ({ mkDerivation, base, semigroupoids }:

242541243452 mkDerivation {

@@ -244403,8 +245314,8 @@ self: {

244403245314 ({ mkDerivation, base, bytestring, http-media, servant, text }:

244404245315 mkDerivation {

244405245316 pname = "servant-fiat-content";

244406− version = "1.0.0";

244407− sha256 = "1108npqddwsbplxzf65hq0w3aqnyfrk8lcdffkszwx3g8s8xblg7";

245317+ version = "1.0.1";

245318+ sha256 = "1vkmwllgy9s8kd72yg8ipvqyp1w2fi3mbf98ylwjzjsvm9vbgysx";

244408245319 libraryHaskellDepends = [

244409245320 base bytestring http-media servant text

244410245321 ];

@@ -248398,14 +249309,14 @@ self: {

248398249309 license = lib.licenses.mit;

248399249310 }) {};

248400249311

248401− "shikensu_0_4_0" = callPackage

249312+ "shikensu_0_4_1" = callPackage

248402249313 ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow

248403249314 , Glob, tasty, tasty-hunit, text, unordered-containers

248404249315 }:

248405249316 mkDerivation {

248406249317 pname = "shikensu";

248407− version = "0.4.0";

248408− sha256 = "0ln51nw01k776lv8bxg1pp8cpnchhr4aj12llxvh4zzi4asxj2x6";

249318+ version = "0.4.1";

249319+ sha256 = "0qf0rc0sxhj6x03g9mdxhnk8dk8n0jpi6061ky0cqhvivn4fd9hy";

248409249320 libraryHaskellDepends = [

248410249321 aeson base bytestring directory filepath flow Glob text

248411249322 unordered-containers

@@ -250419,48 +251330,51 @@ self: {

250419251330 }) {};

250420251331

250421251332 "simplexmq" = callPackage

250422− ({ mkDerivation, ansi-terminal, asn1-encoding, asn1-types, async

250423− , attoparsec, base, base64-bytestring, bytestring, composition

250424− , constraints, containers, cryptonite, cryptostore, direct-sqlite

250425− , directory, file-embed, filepath, generic-random, hspec

250426− , hspec-core, http-types, HUnit, ini, iso8601-time, memory, mtl

250427− , network, network-transport, optparse-applicative, QuickCheck

250428− , random, simple-logger, sqlite-simple, stm, template-haskell, text

250429− , time, timeit, transformers, unliftio, unliftio-core, websockets

250430− , x509

251333+ ({ mkDerivation, aeson, ansi-terminal, asn1-encoding, asn1-types

251334+ , async, attoparsec, base, base64-bytestring, bytestring

251335+ , composition, constraints, containers, cryptonite, cryptostore

251336+ , data-default, direct-sqlite, directory, file-embed, filepath

251337+ , generic-random, hspec, hspec-core, http-types, HUnit, ini

251338+ , iso8601-time, memory, mtl, network, network-transport

251339+ , optparse-applicative, process, QuickCheck, random, simple-logger

251340+ , sqlite-simple, stm, template-haskell, text, time, timeit, tls

251341+ , transformers, unliftio, unliftio-core, websockets, x509

251342+ , x509-store, x509-validation

250431251343 }:

250432251344 mkDerivation {

250433251345 pname = "simplexmq";

250434− version = "0.5.0";

250435− sha256 = "0wmhqmrxzgb4zvxmcsv49lzmvgqrqljivzcjfp4s04j87968x79j";

251346+ version = "1.0.0";

251347+ sha256 = "0ldri2kp1hadsx9kbypkkijijak1c6zy2h5apj6kgnh7f9a851pm";

250436251348 isLibrary = true;

250437251349 isExecutable = true;

250438251350 libraryHaskellDepends = [

250439− ansi-terminal asn1-encoding asn1-types async attoparsec base

251351+ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base

250440251352 base64-bytestring bytestring composition constraints containers

250441− cryptonite direct-sqlite directory file-embed filepath

250442− generic-random http-types iso8601-time memory mtl network

250443− network-transport QuickCheck random simple-logger sqlite-simple stm

250444− template-haskell text time transformers unliftio unliftio-core

250445− websockets x509

251353+ cryptonite cryptostore data-default direct-sqlite directory

251354+ file-embed filepath generic-random http-types iso8601-time memory

251355+ mtl network network-transport QuickCheck random simple-logger

251356+ sqlite-simple stm template-haskell text time tls transformers

251357+ unliftio unliftio-core websockets x509 x509-store x509-validation

250446251358 ];

250447251359 executableHaskellDepends = [

250448− ansi-terminal asn1-encoding asn1-types async attoparsec base

251360+ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base

250449251361 base64-bytestring bytestring composition constraints containers

250450− cryptonite cryptostore direct-sqlite directory file-embed filepath

250451− generic-random http-types ini iso8601-time memory mtl network

250452− network-transport optparse-applicative QuickCheck random

250453− simple-logger sqlite-simple stm template-haskell text time

250454− transformers unliftio unliftio-core websockets x509

251362+ cryptonite cryptostore data-default direct-sqlite directory

251363+ file-embed filepath generic-random http-types ini iso8601-time

251364+ memory mtl network network-transport optparse-applicative process

251365+ QuickCheck random simple-logger sqlite-simple stm template-haskell

251366+ text time tls transformers unliftio unliftio-core websockets x509

251367+ x509-store x509-validation

250455251368 ];

250456251369 testHaskellDepends = [

250457− ansi-terminal asn1-encoding asn1-types async attoparsec base

251370+ aeson ansi-terminal asn1-encoding asn1-types async attoparsec base

250458251371 base64-bytestring bytestring composition constraints containers

250459− cryptonite direct-sqlite directory file-embed filepath

250460− generic-random hspec hspec-core http-types HUnit iso8601-time

250461− memory mtl network network-transport QuickCheck random

250462− simple-logger sqlite-simple stm template-haskell text time timeit

250463− transformers unliftio unliftio-core websockets x509

251372+ cryptonite cryptostore data-default direct-sqlite directory

251373+ file-embed filepath generic-random hspec hspec-core http-types

251374+ HUnit iso8601-time memory mtl network network-transport QuickCheck

251375+ random simple-logger sqlite-simple stm template-haskell text time

251376+ timeit tls transformers unliftio unliftio-core websockets x509

251377+ x509-store x509-validation

250464251378 ];

250465251379 description = "SimpleXMQ message broker";

250466251380 license = lib.licenses.agpl3Only;

@@ -250489,8 +251403,8 @@ self: {

250489251403 }:

250490251404 mkDerivation {

250491251405 pname = "simpoole";

250492− version = "0.3.0";

250493− sha256 = "188c6r5vzi7bdyk8qgi5z2zxw7cjacf7fa986y7r1v89q0advr8v";

251406+ version = "0.4.0";

251407+ sha256 = "12gvmgjngbl8inf0w5nfngbpk3l2shsc4gi3hxk9m5l85ngz2y16";

250494251408 libraryHaskellDepends = [

250495251409 base concurrency containers exceptions mtl time

250496251410 ];

@@ -257898,6 +258812,8 @@ self: {

257898258812 pname = "stack";

257899258813 version = "2.7.3";

257900258814 sha256 = "0i2v5i6bg90n6i4clcaww8m8702d3y5z8r03xdizdisjhf0zijj7";

258815+ revision = "1";

258816+ editedCabalFile = "0j99hh3lf886qvf86xwgv9a0ps9vp40z2s3xnl4lr4mgn9f0lrvb";

257901258817 configureFlags = [

257902258818 "-fdisable-git-info" "-fhide-dependency-versions"

257903258819 "-fsupported-build"

@@ -258019,8 +258935,8 @@ self: {

258019258935 }:

258020258936 mkDerivation {

258021258937 pname = "stack-clean-old";

258022− version = "0.4.4";

258023− sha256 = "1z2lvvpzlaxwxxbb30xyr62sm483bqiknxwmzdnfb0ri7qf31kfr";

258938+ version = "0.4.5";

258939+ sha256 = "04qc3z7xgs8p814lnpwyqgwza7i6wz9mkmzzk0ggq6mv32zzz7kb";

258024258940 isLibrary = false;

258025258941 isExecutable = true;

258026258942 executableHaskellDepends = [

@@ -259326,6 +260242,33 @@ self: {

259326260242 license = lib.licenses.bsd2;

259327260243 }) {};

259328260244

260245+ "statistics_0_16_0_1" = callPackage

260246+ ({ mkDerivation, aeson, async, base, binary, data-default-class

260247+ , deepseq, dense-linear-algebra, erf, ieee754, math-functions

260248+ , monad-par, mwc-random, primitive, QuickCheck, random, tasty

260249+ , tasty-expected-failure, tasty-hunit, tasty-quickcheck, vector

260250+ , vector-algorithms, vector-binary-instances, vector-th-unbox

260251+ }:

260252+ mkDerivation {

260253+ pname = "statistics";

260254+ version = "0.16.0.1";

260255+ sha256 = "16ynj3bj8j70w4iq4xsrz7h140cp0jff0fv1iybsjl3lr83hdvk0";

260256+ libraryHaskellDepends = [

260257+ aeson async base binary data-default-class deepseq

260258+ dense-linear-algebra math-functions monad-par mwc-random primitive

260259+ random vector vector-algorithms vector-binary-instances

260260+ vector-th-unbox

260261+ ];

260262+ testHaskellDepends = [

260263+ aeson base binary dense-linear-algebra erf ieee754 math-functions

260264+ primitive QuickCheck tasty tasty-expected-failure tasty-hunit

260265+ tasty-quickcheck vector vector-algorithms

260266+ ];

260267+ description = "A library of statistical types, data, and functions";

260268+ license = lib.licenses.bsd2;

260269+ hydraPlatforms = lib.platforms.none;

260270+ }) {};

260271+

259329260272 "statistics-dirichlet" = callPackage

259330260273 ({ mkDerivation, base, deepseq, hmatrix-special

259331260274 , nonlinear-optimization, vector

@@ -261450,6 +262393,8 @@ self: {

261450262393 pname = "streamly";

261451262394 version = "0.8.1.1";

261452262395 sha256 = "13m415pcyyzipm5nsf9l8lcan3dn2ck666rq014y46zd66l5ahb9";

262396+ revision = "1";

262397+ editedCabalFile = "0y9pq53jd2wf7xb5i51pa6vm728sza405dx37j8rqnqxxbm5sq7y";

261453262398 libraryHaskellDepends = [

261454262399 atomic-primops base containers deepseq directory exceptions

261455262400 filepath fusion-plugin-types ghc-prim heaps lockfree-queue

@@ -261675,8 +262620,8 @@ self: {

261675262620 }:

261676262621 mkDerivation {

261677262622 pname = "streamly-lz4";

261678− version = "0.1.0";

261679− sha256 = "0jp6px6m85rji0wpq0xfp2cv63jidvqmb1x1z33q95xfh6v73yng";

262623+ version = "0.1.1";

262624+ sha256 = "1ac7lby73pylzyg84nr155sfkcjj2p9kaj0v99va3kx4r6j4jr81";

261680262625 libraryHaskellDepends = [

261681262626 base exceptions fusion-plugin-types streamly

261682262627 ];

@@ -261710,19 +262655,19 @@ self: {

261710262655 }) {};

261711262656

261712262657 "streamly-process" = callPackage

261713− ({ mkDerivation, base, directory, exceptions, fusion-plugin, hspec

261714− , process, QuickCheck, streamly, tasty-bench, unix

262658+ ({ mkDerivation, base, directory, exceptions, hspec, process

262659+ , QuickCheck, streamly, tasty-bench, unix

261715262660 }:

261716262661 mkDerivation {

261717262662 pname = "streamly-process";

261718− version = "0.1.0";

261719− sha256 = "066ldbphb230cc21jvsmmqlnjli6cwqpphs7vjb88q62lbl8yf6p";

262663+ version = "0.2.0";

262664+ sha256 = "0ryf0hbqdpzlips3hyrhb310ha3h8fbna4rd8lqzj67dya66rd3r";

261720262665 libraryHaskellDepends = [ base exceptions process streamly unix ];

261721262666 testHaskellDepends = [

261722262667 base directory exceptions hspec process QuickCheck streamly

261723262668 ];

261724262669 benchmarkHaskellDepends = [

261725− base directory fusion-plugin process streamly tasty-bench

262670+ base directory process streamly tasty-bench

261726262671 ];

261727262672 description = "Use OS processes as stream transformation functions";

261728262673 license = lib.licenses.asl20;

@@ -262055,6 +263000,8 @@ self: {

262055263000 pname = "strict-tuple";

262056263001 version = "0.1.4";

262057263002 sha256 = "06fyf58kl3c5xpfdd5h7368ggbfadm5n67h3kqajrsgh3yl84hrq";

263003+ revision = "1";

263004+ editedCabalFile = "127byff30qm6vfnpdb2jfhag6dfv8zz306hkdnlkryx4gf5aab86";

262058263005 libraryHaskellDepends = [ base bifunctors deepseq hashable ];

262059263006 testHaskellDepends = [ base ];

262060263007 description = "Strict tuples";

@@ -262566,6 +263513,18 @@ self: {

262566263513 license = lib.licenses.mit;

262567263514 }) {};

262568263515

263516+ "stripe-concepts_1_0_3_1" = callPackage

263517+ ({ mkDerivation, base, bytestring, text }:

263518+ mkDerivation {

263519+ pname = "stripe-concepts";

263520+ version = "1.0.3.1";

263521+ sha256 = "1mi538f8nm90mygrcv6w90bxf0d0lc4qxkbrq19j35l9r1xlm5bk";

263522+ libraryHaskellDepends = [ base bytestring text ];

263523+ description = "Types for the Stripe API";

263524+ license = lib.licenses.mit;

263525+ hydraPlatforms = lib.platforms.none;

263526+ }) {};

263527+

262569263528 "stripe-core" = callPackage

262570263529 ({ mkDerivation, aeson, base, bytestring, mtl, text, time

262571263530 , transformers, unordered-containers

@@ -262697,18 +263656,20 @@ self: {

262697263656 }) {};

262698263657

262699263658 "stripe-signature" = callPackage

262700− ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite

262701− , memory, stripe-concepts, text

263659+ ({ mkDerivation, base, base16-bytestring, bytestring

263660+ , cryptohash-sha256, stripe-concepts, text

262702263661 }:

262703263662 mkDerivation {

262704263663 pname = "stripe-signature";

262705− version = "1.0.0.10";

262706− sha256 = "04b5z6hnm000fii4qiczm4xpr41v55fgcj07yh35iwh4gwgc7c4h";

263664+ version = "1.0.0.14";

263665+ sha256 = "0r982h1vd06yd1kyhyqf3s982a34amlnfzwykg3cs6pscpqbg7mz";

262707263666 libraryHaskellDepends = [

262708− base base16-bytestring bytestring cryptonite memory stripe-concepts

263667+ base base16-bytestring bytestring cryptohash-sha256 stripe-concepts

262709263668 text

262710263669 ];

262711− testHaskellDepends = [ base bytestring text ];

263670+ testHaskellDepends = [

263671+ base base16-bytestring bytestring stripe-concepts text

263672+ ];

262712263673 description = "Verification of Stripe webhook signatures";

262713263674 license = lib.licenses.mit;

262714263675 hydraPlatforms = lib.platforms.none;

@@ -262758,8 +263719,8 @@ self: {

262758263719 }:

262759263720 mkDerivation {

262760263721 pname = "stripeapi";

262761− version = "2.0.0.1";

262762− sha256 = "1kqmdw0f9cppbvirizmyfcsc26iczwrn6hrhmi9y6fhhxiy4wd1z";

263722+ version = "2.0.1.0";

263723+ sha256 = "16jiqhkl6ww1rk0n3bp26p30x536akyaaww75bwz0rwzxkr8rjsh";

262763263724 libraryHaskellDepends = [

262764263725 aeson base bytestring ghc-prim http-client http-conduit http-types

262765263726 mtl scientific text time transformers unordered-containers vector

@@ -262801,6 +263762,24 @@ self: {

262801263762 license = lib.licenses.mit;

262802263763 }) {};

262803263764

263765+ "strive_6_0_0_1" = callPackage

263766+ ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline

263767+ , http-client, http-client-tls, http-types, template-haskell, text

263768+ , time, transformers

263769+ }:

263770+ mkDerivation {

263771+ pname = "strive";

263772+ version = "6.0.0.1";

263773+ sha256 = "1vhszra49nfqx3lfyc378krxx8gf3cs2s6vb602fzlbjbm54i9mh";

263774+ libraryHaskellDepends = [

263775+ aeson base bytestring data-default gpolyline http-client

263776+ http-client-tls http-types template-haskell text time transformers

263777+ ];

263778+ description = "A client for the Strava V3 API";

263779+ license = lib.licenses.mit;

263780+ hydraPlatforms = lib.platforms.none;

263781+ }) {};

263782+

262804263783 "strong-path" = callPackage

262805263784 ({ mkDerivation, base, exceptions, filepath, hspec, path, tasty

262806263785 , tasty-discover, tasty-hspec, tasty-quickcheck, template-haskell

@@ -263529,8 +264508,8 @@ self: {

263529264508 ({ mkDerivation, base }:

263530264509 mkDerivation {

263531264510 pname = "successors";

263532− version = "0.1.0.2";

263533− sha256 = "0q6sfxxzc0ws1iky79iyx7sf7l3jqdwxz9ngsi11km1bp7rd8ycw";

264511+ version = "0.1.0.3";

264512+ sha256 = "15pydjb9f7ycjclv5qq0ll8iaf8vpb6241ja858vkkfpz4rsciyv";

263534264513 libraryHaskellDepends = [ base ];

263535264514 description = "An applicative functor to manage successors";

263536264515 license = lib.licenses.mit;

@@ -264267,8 +265246,8 @@ self: {

264267265246 pname = "svg-builder";

264268265247 version = "0.1.1";

264269265248 sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g";

264270− revision = "4";

264271− editedCabalFile = "1731ryf1bymy0s4hg109f2g7wn6mm9b52y2r4gw2d59170lxzv8f";

265249+ revision = "5";

265250+ editedCabalFile = "0cnv8rx410mprjvdmzz8j9lmd05wb87zk9bcpjhyymz4qhcbqpl2";

264272265251 libraryHaskellDepends = [

264273265252 base blaze-builder bytestring hashable text unordered-containers

264274265253 ];

@@ -267626,6 +268605,35 @@ self: {

267626268605 license = lib.licenses.mit;

267627268606 }) {};

267628268607

268608+ "tailwind" = callPackage

268609+ ({ mkDerivation, aeson, async, base, bytestring, containers

268610+ , data-default, deriving-aeson, directory, filepath, filepattern

268611+ , lens, monad-logger, mtl, neat-interpolation, optparse-applicative

268612+ , parser-combinators, profunctors, relude, safe-exceptions

268613+ , temporary, text, time, unliftio, which, with-utf8

268614+ }:

268615+ mkDerivation {

268616+ pname = "tailwind";

268617+ version = "0.1.0.0";

268618+ sha256 = "1wvmygaf8dmy9h0wzxb3623rpdmzvhzr879yc4sm94bzd42y8cy6";

268619+ isLibrary = true;

268620+ isExecutable = true;

268621+ libraryHaskellDepends = [

268622+ aeson async base bytestring containers data-default deriving-aeson

268623+ directory filepath filepattern lens monad-logger mtl

268624+ neat-interpolation profunctors relude safe-exceptions temporary

268625+ text time unliftio which with-utf8

268626+ ];

268627+ executableHaskellDepends = [

268628+ base data-default filepath filepattern lens monad-logger

268629+ optparse-applicative parser-combinators relude with-utf8

268630+ ];

268631+ description = "Tailwind wrapped in Haskell";

268632+ license = lib.licenses.mit;

268633+ hydraPlatforms = lib.platforms.none;

268634+ broken = true;

268635+ }) {};

268636+

267629268637 "tak" = callPackage

267630268638 ({ mkDerivation, base, bytestring, hashable, hslogger, HUnit

267631268639 , matrix, network, parsec, random-shuffle, safe

@@ -268432,6 +269440,29 @@ self: {

268432269440 license = lib.licenses.mit;

268433269441 }) {};

268434269442

269443+ "tasty-golden_2_3_5" = callPackage

269444+ ({ mkDerivation, async, base, bytestring, containers, deepseq

269445+ , directory, filepath, mtl, optparse-applicative, tagged, tasty

269446+ , tasty-hunit, temporary, text, typed-process

269447+ }:

269448+ mkDerivation {

269449+ pname = "tasty-golden";

269450+ version = "2.3.5";

269451+ sha256 = "03klnxn9rcv0l7fl4w8q6s59fzl1328j1wzwi1za4gb0l90vadwb";

269452+ isLibrary = true;

269453+ isExecutable = true;

269454+ libraryHaskellDepends = [

269455+ async base bytestring containers deepseq directory filepath mtl

269456+ optparse-applicative tagged tasty temporary text typed-process

269457+ ];

269458+ testHaskellDepends = [

269459+ base directory filepath tasty tasty-hunit temporary typed-process

269460+ ];

269461+ description = "Golden tests support for tasty";

269462+ license = lib.licenses.mit;

269463+ hydraPlatforms = lib.platforms.none;

269464+ }) {};

269465+

268435269466 "tasty-grading-system" = callPackage

268436269467 ({ mkDerivation, aeson, base, containers, directory, filepath

268437269468 , generic-deriving, mtl, stm, tagged, tasty, tasty-hunit, text

@@ -270670,6 +271701,8 @@ self: {

270670271701 pname = "termbox";

270671271702 version = "0.3.0";

270672271703 sha256 = "1vi2ssylwvc6xqnhpnvc9q9c70glbf6s63rmyblc53g4qra2wkah";

271704+ revision = "1";

271705+ editedCabalFile = "1d0sv2ycizpy0fsn0v4n2bbziyr56y2md8qnqmr0bx1rkriz67li";

270673271706 isLibrary = true;

270674271707 isExecutable = true;

270675271708 libraryHaskellDepends = [ base ];

@@ -270683,6 +271716,8 @@ self: {

270683271716 pname = "termbox-banana";

270684271717 version = "0.3.0";

270685271718 sha256 = "07nn1jff33zb80vhzkw48fik5d5w7j7q982ihpsbb6gbqp5azx5s";

271719+ revision = "1";

271720+ editedCabalFile = "0k62lbwigk97shxlx5c34d2k81ndims9nc36rlcv34s0iig0lh7d";

270686271721 isLibrary = true;

270687271722 isExecutable = true;

270688271723 libraryHaskellDepends = [ base reactive-banana termbox ];

@@ -271326,8 +272361,8 @@ self: {

271326272361 }:

271327272362 mkDerivation {

271328272363 pname = "test-lib";

271329− version = "0.3";

271330− sha256 = "15b3gsy03z3hqc0d2b7hjk3l79ykkcdhb5mrz453p8s4bgd8l6av";

272364+ version = "0.4";

272365+ sha256 = "0jp0k27vvdz4lfrdi7874j7gnnn051kvqfn1k3zg1ap4m9jzyb45";

271331272366 isLibrary = true;

271332272367 isExecutable = true;

271333272368 libraryHaskellDepends = [

@@ -271767,6 +272802,29 @@ self: {

271767272802 license = lib.licenses.gpl2Only;

271768272803 }) {};

271769272804

272805+ "texmath_0_12_4" = callPackage

272806+ ({ mkDerivation, base, bytestring, containers, directory, filepath

272807+ , mtl, pandoc-types, parsec, process, split, syb, temporary, text

272808+ , utf8-string, xml

272809+ }:

272810+ mkDerivation {

272811+ pname = "texmath";

272812+ version = "0.12.4";

272813+ sha256 = "1k7hh75jzgysh7b7jkvy4w07dbkvm5fcc5hkkixz6xzrp2fvnws3";

272814+ isLibrary = true;

272815+ isExecutable = true;

272816+ libraryHaskellDepends = [

272817+ base containers mtl pandoc-types parsec split syb text xml

272818+ ];

272819+ testHaskellDepends = [

272820+ base bytestring directory filepath process temporary text

272821+ utf8-string xml

272822+ ];

272823+ description = "Conversion between math formats";

272824+ license = lib.licenses.gpl2Only;

272825+ hydraPlatforms = lib.platforms.none;

272826+ }) {};

272827+

271770272828 "texrunner" = callPackage

271771272829 ({ mkDerivation, attoparsec, base, bytestring, directory, filepath

271772272830 , HUnit, io-streams, lens, mtl, process, semigroups, temporary

@@ -272545,7 +273603,7 @@ self: {

272545273603 license = lib.licenses.bsd3;

272546273604 }) {};

272547273605

272548− "text-show_3_9_5" = callPackage

273606+ "text-show_3_9_6" = callPackage

272549273607 ({ mkDerivation, array, base, base-compat-batteries, base-orphans

272550273608 , bifunctors, bytestring, bytestring-builder, containers, criterion

272551273609 , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim

@@ -272555,8 +273613,8 @@ self: {

272555273613 }:

272556273614 mkDerivation {

272557273615 pname = "text-show";

272558− version = "3.9.5";

272559− sha256 = "03gp01wim236xdznxi5naq42lz9whdb2ms8xj01g39l54i83n22q";

273616+ version = "3.9.6";

273617+ sha256 = "1wcnwfshsscwy96jg709m2vrprcy4hi65n7f65a45q9rr81jiriw";

272560273618 libraryHaskellDepends = [

272561273619 array base base-compat-batteries bifunctors bytestring

272562273620 bytestring-builder containers generic-deriving ghc-boot-th ghc-prim

@@ -275500,8 +276558,8 @@ self: {

275500276558 pname = "timer-wheel";

275501276559 version = "0.3.0";

275502276560 sha256 = "16v663mcsj0h17x4jriq50dps3m3f8wqcsm19kl48vrs7f4mp07s";

275503− revision = "1";

275504− editedCabalFile = "03wprm88wl6smfcq6dfr62l4igi8lfg6wkk65rsmyzxxkjzhc6f1";

276561+ revision = "2";

276562+ editedCabalFile = "0kfckbmcf9c8538i38r40agrc31mgk771hfnm54sgslnam1idiym";

275505276563 libraryHaskellDepends = [ atomic-primops base psqueues vector ];

275506276564 testHaskellDepends = [ base ];

275507276565 description = "A timer wheel";

@@ -275700,8 +276758,8 @@ self: {

275700276758 }:

275701276759 mkDerivation {

275702276760 pname = "timezone-olson-th";

275703− version = "0.1.0.10";

275704− sha256 = "0lks0mgshcsq36aminfbrz524mgn5q02lwln8lli1l54d8bn4x8n";

276761+ version = "0.1.0.11";

276762+ sha256 = "0lpsmjy99l1yqz23dqb31cx08wg19bd4qzfmsqzz7hfmz0dgjqsj";

275705276763 libraryHaskellDepends = [

275706276764 base template-haskell time timezone-olson timezone-series

275707276765 ];

@@ -278311,6 +279369,8 @@ self: {

278311279369 pname = "transformers-compat";

278312279370 version = "0.7.1";

278313279371 sha256 = "102hydcqn7yjskzp586fvsw39dp3fi34fkskc7ykqkf16haqc2xc";

279372+ revision = "1";

279373+ editedCabalFile = "03xi4gxwvim33xkv289g6wz9dpz43zd91s5j2ini7bhcg40gagl7";

278314279374 libraryHaskellDepends = [ base ghc-prim transformers ];

278315279375 description = "A small compatibility shim for the transformers library";

278316279376 license = lib.licenses.bsd3;

@@ -280461,16 +281521,16 @@ self: {

280461281521

280462281522 "twain" = callPackage

280463281523 ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie

280464− , either, http-types, text, time, transformers, wai, wai-extra

280465− , warp

281524+ , either, exceptions, http-types, http2, text, time, transformers

281525+ , vault, wai, wai-extra

280466281526 }:

280467281527 mkDerivation {

280468281528 pname = "twain";

280469− version = "1.0.0.0";

280470− sha256 = "0brxvqddnhxs4q5hm9g8fzkznk3xjagivy0glfiqrx24p4k8s9yb";

281529+ version = "2.0.1.0";

281530+ sha256 = "0wal0qr3bacy7phgbvi2sif5q490jk8mhw675lpl2ch8dmmf769p";

280471281531 libraryHaskellDepends = [

280472− aeson base bytestring case-insensitive cookie either http-types

280473− text time transformers wai wai-extra warp

281532+ aeson base bytestring case-insensitive cookie either exceptions

281533+ http-types http2 text time transformers vault wai wai-extra

280474281534 ];

280475281535 description = "Tiny web application framework for WAI";

280476281536 license = lib.licenses.bsd3;

@@ -281631,6 +282691,8 @@ self: {

281631282691 pname = "type-map";

281632282692 version = "0.1.6.0";

281633282693 sha256 = "0zakl5bdzwng1r0x384w066zhwgwcf24s6jsm6d4zsx7xmngzmr5";

282694+ revision = "1";

282695+ editedCabalFile = "184jzydzkm8qa3wbfzx173yjhydss9fnki0g81dp4yij90lr1qf9";

281634282696 libraryHaskellDepends = [ base containers ghc-prim vector ];

281635282697 testHaskellDepends = [

281636282698 base HUnit test-framework test-framework-hunit

@@ -281639,6 +282701,23 @@ self: {

281639282701 license = lib.licenses.mit;

281640282702 }) {};

281641282703

282704+ "type-map_0_1_7_0" = callPackage

282705+ ({ mkDerivation, base, containers, ghc-prim, HUnit, test-framework

282706+ , test-framework-hunit, vector

282707+ }:

282708+ mkDerivation {

282709+ pname = "type-map";

282710+ version = "0.1.7.0";

282711+ sha256 = "0612y1n2ydnb5sw411a1xnjmp03qhjl3iv9pnwdj59l17bcmqq21";

282712+ libraryHaskellDepends = [ base containers ghc-prim vector ];

282713+ testHaskellDepends = [

282714+ base HUnit test-framework test-framework-hunit

282715+ ];

282716+ description = "Type-indexed maps";

282717+ license = lib.licenses.mit;

282718+ hydraPlatforms = lib.platforms.none;

282719+ }) {};

282720+

281642282721 "type-natural" = callPackage

281643282722 ({ mkDerivation, base, constraints, equational-reasoning, ghc

281644282723 , ghc-typelits-knownnat, ghc-typelits-natnormalise

@@ -283794,6 +284873,8 @@ self: {

283794284873 pname = "unicode-data";

283795284874 version = "0.3.0";

283796284875 sha256 = "0pwjjsk0gjkn73ghj10s603p84xr7h2kfg351c9grzngrcv9giq8";

284876+ revision = "1";

284877+ editedCabalFile = "1invxbc1f635rywnkcpap9s93z08mbdfi3rzi7882lssf1wy0i85";

283797284878 isLibrary = true;

283798284879 isExecutable = true;

283799284880 libraryHaskellDepends = [ base ];

@@ -283932,6 +285013,8 @@ self: {

283932285013 pname = "unicode-transforms";

283933285014 version = "0.4.0";

283934285015 sha256 = "0m234yhjizl28xm8y08bdhrbni666r7q2z71a8s64lynqk4lzq5k";

285016+ revision = "1";

285017+ editedCabalFile = "18k7z25byg9x05rydbcgjfvhz9qdv6yxjvxac58kxw8pfj8xlcap";

283935285018 isLibrary = true;

283936285019 isExecutable = true;

283937285020 libraryHaskellDepends = [

@@ -284539,8 +285622,8 @@ self: {

284539285622 }:

284540285623 mkDerivation {

284541285624 pname = "units";

284542− version = "2.4.1.4";

284543− sha256 = "1r6innb99d6ljbbbrl2q9i4l6j4cb96mmv0k56q9l2xckwlsfz32";

285625+ version = "2.4.1.5";

285626+ sha256 = "09ssrid1an2nv6j9skb787i3hqiz5hgz020q13552w55m0smw4c9";

284544285627 libraryHaskellDepends = [

284545285628 base containers deepseq lens linear mtl multimap singletons syb

284546285629 template-haskell th-desugar units-parser vector-space

@@ -284959,6 +286042,18 @@ self: {

284959286042 license = lib.licenses.bsd3;

284960286043 }) {};

284961286044

286045+ "unix-compat_0_5_4" = callPackage

286046+ ({ mkDerivation, base, unix }:

286047+ mkDerivation {

286048+ pname = "unix-compat";

286049+ version = "0.5.4";

286050+ sha256 = "1cd4lh2c16h7y5hzrcn5l9vir8aq2wcizwksppnagklsdsfmf942";

286051+ libraryHaskellDepends = [ base unix ];

286052+ description = "Portable POSIX-compatibility layer";

286053+ license = lib.licenses.bsd3;

286054+ hydraPlatforms = lib.platforms.none;

286055+ }) {};

286056+

284962286057 "unix-fcntl" = callPackage

284963286058 ({ mkDerivation, base, foreign-var }:

284964286059 mkDerivation {

@@ -289298,8 +290393,8 @@ self: {

289298290393 }:

289299290394 mkDerivation {

289300290395 pname = "verset";

289301− version = "0.0.1.6";

289302− sha256 = "1fk53vd2mh6ngrj4v2322fzdx0k0cj0zc2w1xpwkvyy3584l8af8";

290396+ version = "0.0.1.7";

290397+ sha256 = "12bbadznnp4pksy1yb7lw4zniksnaz7ipmfyji0ak6b0bqfh74s2";

289303290398 libraryHaskellDepends = [

289304290399 base bytestring containers extra mtl safe text time uuid

289305290400 ];

@@ -290054,8 +291149,8 @@ self: {

290054291149 }:

290055291150 mkDerivation {

290056291151 pname = "vivid";

290057− version = "0.5.1.0";

290058− sha256 = "06skwy5k4sgmh7m20m5v3g82kvm6sxq2sxmg039s45pvkbfp1c32";

291152+ version = "0.5.2.0";

291153+ sha256 = "1p4x6q2ks259xzigj31f8bz3562k07dzj77a9bnhl934sl85hz6q";

290059291154 libraryHaskellDepends = [

290060291155 base binary bytestring cereal containers directory filepath

290061291156 hashable MonadRandom mtl network process random random-shuffle

@@ -290963,6 +292058,17 @@ self: {

290963292058 hydraPlatforms = lib.platforms.none;

290964292059 }) {};

290965292060

292061+ "wai-env" = callPackage

292062+ ({ mkDerivation, base, data-default, vault, wai }:

292063+ mkDerivation {

292064+ pname = "wai-env";

292065+ version = "1.0.0.0";

292066+ sha256 = "03hnp38qgi2qqkzpds7ac2arvsjvpbfdkwwfcl5c6f6zjdwzq97y";

292067+ libraryHaskellDepends = [ base data-default vault wai ];

292068+ description = "WAI middleware to parameterize requests with environment";

292069+ license = lib.licenses.bsd3;

292070+ }) {};

292071+

290966292072 "wai-eventsource" = callPackage

290967292073 ({ mkDerivation, wai }:

290968292074 mkDerivation {

@@ -292760,15 +293866,13 @@ self: {

292760293866 "warc" = callPackage

292761293867 ({ mkDerivation, attoparsec, base, bytestring, errors, exceptions

292762293868 , filepath, free, hashable, lens, mmorph, optparse-applicative

292763− , pipes, pipes-attoparsec, pipes-bytestring, pipes-zlib, text, time

293869+ , pipes, pipes-attoparsec, pipes-bytestring, text, time

292764293870 , transformers, unordered-containers

292765293871 }:

292766293872 mkDerivation {

292767293873 pname = "warc";

292768− version = "1.0.4";

292769− sha256 = "1mxfm8kdvm0l1lnzma4n9mriz94ypckxqcz1f34fa3n1j3ckc45b";

292770− revision = "6";

292771− editedCabalFile = "0s563lg70ks3s6plvwi79glq6vkrh7n769fh6l6b4pvj7vp604cj";

293874+ version = "1.0.5";

293875+ sha256 = "1s01x0w37gsh4kkv1jq54i0yf7mxk6m6jr6djwql8dz8nqrny8j7";

292772293876 isLibrary = true;

292773293877 isExecutable = true;

292774293878 libraryHaskellDepends = [

@@ -292778,8 +293882,8 @@ self: {

292778293882 ];

292779293883 executableHaskellDepends = [

292780293884 attoparsec base bytestring errors exceptions filepath free lens

292781− optparse-applicative pipes pipes-attoparsec pipes-bytestring

292782− pipes-zlib text time transformers

293885+ optparse-applicative pipes pipes-attoparsec pipes-bytestring text

293886+ time transformers

292783293887 ];

292784293888 description = "A parser for the Web Archive (WARC) format";

292785293889 license = lib.licenses.bsd3;

@@ -294014,6 +295118,41 @@ self: {

294014295118 broken = true;

294015295119 }) {};

294016295120

295121+ "webgear-core" = callPackage

295122+ ({ mkDerivation, arrows, base, bytestring, case-insensitive

295123+ , filepath, http-api-data, http-media, http-types, jose, mime-types

295124+ , network, safe-exceptions, tagged, template-haskell, text

295125+ , unordered-containers, wai

295126+ }:

295127+ mkDerivation {

295128+ pname = "webgear-core";

295129+ version = "1.0.1";

295130+ sha256 = "06yg14x40j7jg5gy875f2g4fplnh08678qy3naqapd8ysvw52rmb";

295131+ libraryHaskellDepends = [

295132+ arrows base bytestring case-insensitive filepath http-api-data

295133+ http-media http-types jose mime-types network safe-exceptions

295134+ tagged template-haskell text unordered-containers wai

295135+ ];

295136+ description = "Composable, type-safe library to build HTTP APIs";

295137+ license = lib.licenses.mpl20;

295138+ }) {};

295139+

295140+ "webgear-openapi" = callPackage

295141+ ({ mkDerivation, arrows, base, http-media, http-types

295142+ , insert-ordered-containers, lens, openapi3, text, webgear-core

295143+ }:

295144+ mkDerivation {

295145+ pname = "webgear-openapi";

295146+ version = "1.0.1";

295147+ sha256 = "0fxj5bhsqxkjizyl0wcwbs5ai05lksf3cwzz2535lb4rh90ndx3b";

295148+ libraryHaskellDepends = [

295149+ arrows base http-media http-types insert-ordered-containers lens

295150+ openapi3 text webgear-core

295151+ ];

295152+ description = "Composable, type-safe library to build HTTP API servers";

295153+ license = lib.licenses.mpl20;

295154+ }) {};

295155+

294017295156 "webgear-server" = callPackage

294018295157 ({ mkDerivation, aeson, base, base64-bytestring, bytestring

294019295158 , bytestring-conversion, case-insensitive, http-api-data

@@ -294040,6 +295179,32 @@ self: {

294040295179 license = lib.licenses.mpl20;

294041295180 }) {};

294042295181

295182+ "webgear-server_1_0_1" = callPackage

295183+ ({ mkDerivation, aeson, arrows, base, base64-bytestring, bytestring

295184+ , bytestring-conversion, http-api-data, http-media, http-types

295185+ , jose, monad-time, mtl, QuickCheck, quickcheck-instances, tasty

295186+ , tasty-hunit, tasty-quickcheck, text, unordered-containers, wai

295187+ , webgear-core

295188+ }:

295189+ mkDerivation {

295190+ pname = "webgear-server";

295191+ version = "1.0.1";

295192+ sha256 = "0v27iq4jqbxyn66pzi7sz0qapd4a0k1iifvj2ng488jl2j852xa2";

295193+ libraryHaskellDepends = [

295194+ aeson arrows base base64-bytestring bytestring

295195+ bytestring-conversion http-api-data http-media http-types jose

295196+ monad-time mtl text unordered-containers wai webgear-core

295197+ ];

295198+ testHaskellDepends = [

295199+ base base64-bytestring bytestring http-types QuickCheck

295200+ quickcheck-instances tasty tasty-hunit tasty-quickcheck text wai

295201+ webgear-core

295202+ ];

295203+ description = "Composable, type-safe library to build HTTP API servers";

295204+ license = lib.licenses.mpl20;

295205+ hydraPlatforms = lib.platforms.none;

295206+ }) {};

295207+

294043295208 "webidl" = callPackage

294044295209 ({ mkDerivation, base, bytestring, HSFFIG, LEXER, parsec, pretty

294045295210 , utf8-env, utf8-string

@@ -295141,8 +296306,8 @@ self: {

295141296306 pname = "windns";

295142296307 version = "0.1.0.1";

295143296308 sha256 = "016d1cf51jqvhbzlf5kbizv4l4dymradac1420rl47q2k5faczq8";

295144− revision = "3";

295145− editedCabalFile = "10jidn34rmv0amhw3c24pkl64q5xl3c6l9yqwcvqdn0vkbd0bf2v";

296309+ revision = "4";

296310+ editedCabalFile = "17wzjaj16q4bm8kz2mcs02naj6v89lnbwjfgmrf81c9dw873l9px";

295146296311 libraryHaskellDepends = [ base bytestring deepseq ];

295147296312 librarySystemDepends = [ dnsapi ];

295148296313 description = "Domain Name Service (DNS) lookup via the <windns.h>/dnsapi.dll standard library";

@@ -295332,6 +296497,26 @@ self: {

295332296497 maintainers = with lib.maintainers; [ maralorn ];

295333296498 }) {};

295334296499

296500+ "witch_1_0_0_1" = callPackage

296501+ ({ mkDerivation, base, bytestring, containers, HUnit

296502+ , template-haskell, text, time

296503+ }:

296504+ mkDerivation {

296505+ pname = "witch";

296506+ version = "1.0.0.1";

296507+ sha256 = "010agcfcmyjmcz6wl7wrwd6w7y60d4163vlvrp1b2h8w86z87jlm";

296508+ libraryHaskellDepends = [

296509+ base bytestring containers template-haskell text time

296510+ ];

296511+ testHaskellDepends = [

296512+ base bytestring containers HUnit template-haskell text time

296513+ ];

296514+ description = "Convert values from one type into another";

296515+ license = lib.licenses.mit;

296516+ hydraPlatforms = lib.platforms.none;

296517+ maintainers = with lib.maintainers; [ maralorn ];

296518+ }) {};

296519+

295335296520 "with-index" = callPackage

295336296521 ({ mkDerivation, base }:

295337296522 mkDerivation {

@@ -295660,6 +296845,18 @@ self: {

295660296845 license = lib.licenses.bsd3;

295661296846 }) {};

295662296847

296848+ "wl-pprint-text_1_2_0_2" = callPackage

296849+ ({ mkDerivation, base, base-compat, text }:

296850+ mkDerivation {

296851+ pname = "wl-pprint-text";

296852+ version = "1.2.0.2";

296853+ sha256 = "0axivwh7bxmljxpfnccs66knxzrqck07byxmp2j737xbb26pf5cj";

296854+ libraryHaskellDepends = [ base base-compat text ];

296855+ description = "A Wadler/Leijen Pretty Printer for Text values";

296856+ license = lib.licenses.bsd3;

296857+ hydraPlatforms = lib.platforms.none;

296858+ }) {};

296859+

295663296860 "wlc-hs" = callPackage

295664296861 ({ mkDerivation, base, c2hs, containers, data-default, lens, pretty

295665296862 , process, transformers, wlc, xkbcommon

@@ -296031,8 +297228,8 @@ self: {

296031297228 }:

296032297229 mkDerivation {

296033297230 pname = "wordlist";

296034− version = "0.1.0.4";

296035− sha256 = "0v2xnm4iqk8wh3l05vkmfblwk49q54awp2qr1cwszgxfzaz4n9zb";

297231+ version = "0.1.0.5";

297232+ sha256 = "11h52dykc23ks3wn3apnp81jm091igqy8dkgs7apk8yh141vdfak";

296036297233 isLibrary = true;

296037297234 isExecutable = true;

296038297235 libraryHaskellDepends = [ base optparse-applicative text ];

@@ -297117,6 +298314,21 @@ self: {

297117298314 license = lib.licenses.mit;

297118298315 }) {};

297119298316

298317+ "wuss_2_0_0_1" = callPackage

298318+ ({ mkDerivation, base, bytestring, connection, network, websockets

298319+ }:

298320+ mkDerivation {

298321+ pname = "wuss";

298322+ version = "2.0.0.1";

298323+ sha256 = "17s6wilzyzsdc174a3an12pkq20cy7x2pfrn4jmdp30f468r47fb";

298324+ libraryHaskellDepends = [

298325+ base bytestring connection network websockets

298326+ ];

298327+ description = "Secure WebSocket (WSS) clients";

298328+ license = lib.licenses.mit;

298329+ hydraPlatforms = lib.platforms.none;

298330+ }) {};

298331+

297120298332 "wx" = callPackage

297121298333 ({ mkDerivation, base, stm, time, wxcore }:

297122298334 mkDerivation {

@@ -298344,6 +299556,27 @@ self: {

298344299556 license = lib.licenses.bsd3;

298345299557 }) {};

298346299558

299559+ "xml-hamlet_0_5_0_2" = callPackage

299560+ ({ mkDerivation, base, containers, hspec, HUnit, parsec

299561+ , shakespeare, template-haskell, text, xml-conduit

299562+ }:

299563+ mkDerivation {

299564+ pname = "xml-hamlet";

299565+ version = "0.5.0.2";

299566+ sha256 = "109fck1626d74s00ssjffg837584wf7dxpswkil37wqqfy94mw2z";

299567+ libraryHaskellDepends = [

299568+ base containers parsec shakespeare template-haskell text

299569+ xml-conduit

299570+ ];

299571+ testHaskellDepends = [

299572+ base containers hspec HUnit parsec shakespeare template-haskell

299573+ text xml-conduit

299574+ ];

299575+ description = "Hamlet-style quasiquoter for XML content";

299576+ license = lib.licenses.bsd3;

299577+ hydraPlatforms = lib.platforms.none;

299578+ }) {};

299579+

298347299580 "xml-helpers" = callPackage

298348299581 ({ mkDerivation, base, xml }:

298349299582 mkDerivation {

pkgs/development/haskell-modules/patches/hnix.patchnew file+24

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

1+From 06b12ab8a733d4de2a39060ba29c06e4ec1c1187 Mon Sep 17 00:00:00 2001

2+From: Anton Latukha <anton.latukha@gmail.com>

3+Date: Sun, 16 Jan 2022 18:16:50 +0200

4+Subject: [PATCH] fix aeson <2 support

5+

6+---

7+ src/Nix/Json.hs | 2 ++

8+ 1 file changed, 2 insertions(+)

9+

10+diff --git a/src/Nix/Json.hs b/src/Nix/Json.hs

11+index 3fe05269..329899e4 100644

12+--- a/src/Nix/Json.hs

13++++ b/src/Nix/Json.hs

14+@@ -9,6 +9,8 @@ import qualified Data.Text.Lazy.Encoding as TL

15+ #if MIN_VERSION_aeson(2,0,0)

16+ import qualified Data.Aeson.Key as AKM

17+ import qualified Data.Aeson.KeyMap as AKM

18++#else

19++import Nix.Expr.Types

20+ #endif

21+ import qualified Data.Vector as V

22+ import Nix.Atoms

23+--

24+2.34.1

pkgs/development/interpreters/acl2/default.nix+2−2

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

11{ lib, stdenv, callPackage, fetchFromGitHub, runCommandLocal, makeWrapper, substituteAll

22, sbcl, bash, which, perl, hostname

3−, openssl, glucose, minisat, abc-verifier, z3, python

3+, openssl, glucose, minisat, abc-verifier, z3, python2

44, certifyBooks ? true

55} @ args:

66

@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {

4848 which perl hostname makeWrapper

4949 # Some of the books require one or more of these external tools:

5050 openssl.out glucose minisat abc-verifier libipasir

51− z3 (python.withPackages (ps: [ ps.z3 ]))

51+ z3 (python2.withPackages (ps: [ ps.z3 ]))

5252 ];

5353

5454 # NOTE: Parallel building can be memory-intensive depending on the number of

pkgs/development/interpreters/clojurescript/lumo/default.nix+2−2

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

88, unzip

99, nodePackages

1010, xcbuild

11−, python

11+, python2

1212, openssl

1313, pkgs

1414, fetchgit

@@ -154,7 +154,7 @@ stdenv.mkDerivation {

154154 nodejs

155155 clojure

156156 jre

157− python

157+ python2

158158 openssl

159159 gnutar

160160 nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"

pkgs/development/interpreters/lunatic/default.nix+3−3

@@ -2,16 +2,16 @@

22

33rustPlatform.buildRustPackage rec {

44 pname = "lunatic";

5− version = "0.7.0";

5+ version = "0.7.4";

66

77 src = fetchFromGitHub {

88 owner = "lunatic-solutions";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-+4014p+4QJ7nytFHHszAOYQHXLYXqR+Cip+vHxsH9l8=";

11+ sha256 = "sha256-RX8JarGpY6dhPGpvOX1FuUjirEPff0wGqLkGFxOa+bc=";

1212 };

1313

14− cargoSha256 = "sha256-RnaAiumTP4cW2eHUbnwyPdgJQLK65gqDI/NP2SOrO4E=";

14+ cargoSha256 = "sha256-UvrDqxaZSgUJ/a6abigTuiUOfw+C7UolBApt5kVR+yo=";

1515

1616 nativeBuildInputs = [ cmake ];

1717

pkgs/development/interpreters/php/7.4.nix+2−2

@@ -2,8 +2,8 @@

22

33let

44 base = callPackage ./generic.nix (_args // {

5− version = "7.4.26";

6− sha256 = "0k803j5wf4jv72px0zqz2z2hxyk2w3jr6xyczy568dx4z2l8i2yn";

5+ version = "7.4.27";

6+ sha256 = "184aaef313fbf28c9987f6aa07b655cd1b0eae9e7e17061775a3e7d880185563";

77 });

88

99in

pkgs/development/interpreters/php/8.0.nix+2−2

@@ -2,8 +2,8 @@

22

33let

44 base = callPackage ./generic.nix (_args // {

5− version = "8.0.13";

6− sha256 = "0djqh650clz4fy1zifazf0jq383znksydx23f1s48prrlixrshf2";

5+ version = "8.0.14";

6+ sha256 = "0jydl388mpysrrxa7h9sxf3fpp38mmygg9ryq8j7rb8p93giyf5v";

77 });

88

99in

pkgs/development/interpreters/wasmtime/default.nix+2−2

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

1−{ rustPlatform, fetchFromGitHub, lib, python, cmake, llvmPackages, clang, stdenv, darwin }:

1+{ rustPlatform, fetchFromGitHub, lib, python2, cmake, llvmPackages, clang, stdenv, darwin }:

22

33rustPlatform.buildRustPackage rec {

44 pname = "wasmtime";

@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {

1414

1515 cargoSha256 = "1wlig9gls7s1k1swxwhl82vfga30bady8286livxc4y2zp0vb18w";

1616

17− nativeBuildInputs = [ python cmake clang ];

17+ nativeBuildInputs = [ python2 cmake clang ];

1818 buildInputs = [ llvmPackages.libclang ] ++

1919 lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

2020 LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";

pkgs/development/interpreters/yex-lang/default.nixnew file+24

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

1+{ lib, stdenv, rustPlatform, fetchFromGitHub }:

2+

3+rustPlatform.buildRustPackage rec {

4+ pname = "yex-lang";

5+ version = "unstable-2021-12-25";

6+

7+ src = fetchFromGitHub {

8+ owner = "nonamescm";

9+ repo = "yex-lang";

10+ rev = "a97def1431b73b8693700f530ec023f1776eaf83";

11+ hash = "sha256-CEzJtlEVMvMnRyUKdko1UDTluv8Fc88tfOpKGIFMnRw=";

12+ };

13+

14+ cargoSha256 = "sha256-mHMenqcdt9Yjm/6H1Ywf637Sv8ddq6a4Eu2/A/jX9gQ=";

15+

16+ meta = with lib; {

17+ homepage = "https://github.com/nonamesc/yex-lang";

18+ description = "A cool functional scripting language written in rust";

19+ license = licenses.mit;

20+ maintainers = with maintainers; [ AndersonTorres ];

21+ platforms = platforms.unix;

22+ broken = stdenv.isAarch64 && stdenv.isLinux;

23+ };

24+}

pkgs/development/libraries/arrayfire/default.nix+8−5

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

1−{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkg-config

1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config

22, opencl-clhpp, ocl-icd, fftw, fftwFloat

33, blas, lapack, boost, mesa, libGLU, libGL

44, freeimage, python3, clfft, clblas

@@ -8,11 +8,14 @@

88

99stdenv.mkDerivation rec {

1010 pname = "arrayfire";

11− version = "3.6.4";

11+ version = "3.7.3";

1212

13− src = fetchurl {

14− url = "http://arrayfire.com/arrayfire_source/arrayfire-full-${version}.tar.bz2";

15− sha256 = "1fin7a9rliyqic3z83agkpb8zlq663q6gdxsnm156cs8s7f7rc9h";

13+ src = fetchFromGitHub {

14+ owner = pname;

15+ repo = pname;

16+ rev = "v${version}";

17+ sha256 = "0gcbg6b6gs38xhks5pp0vkcqs89zl7rh9982jqlzsd0h724qddw0";

18+ fetchSubmodules = true;

1619 };

1720

1821 cmakeFlags = [

pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix+2−2

@@ -2,10 +2,10 @@

22

33stdenv.mkDerivation rec {

44 pname = "zita-alsa-pcmi";

5− version = "0.3.2";

5+ version = "0.4.0";

66 src = fetchurl {

77 url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2";

8− sha256 = "12d7vdg74yh21w69qi0wg57iz4876j94qbiq09bvscih6xz9y78s";

8+ sha256 = "sha256-vYyfNg37VB+2DkinE7rx4i1BssdMGaD+ny005y9Q8cU=";

99 };

1010

1111 buildInputs = [ alsa-lib ];

pkgs/development/libraries/blitz/default.nix+2−2

@@ -4,7 +4,7 @@

44, pkg-config

55, gfortran

66, texinfo

7−, python

7+, python2

88, boost

99 # Select SIMD alignment width (in bytes) for vectorization.

1010, simdWidth ? 1

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

3232 sha256 = "0nq84vwvvbq7m0my6h835ijfw53bxdp42qjc6kjhk436888qy9rh";

3333 };

3434

35− nativeBuildInputs = [ pkg-config python texinfo ];

35+ nativeBuildInputs = [ pkg-config python2 texinfo ];

3636 buildInputs = [ gfortran texinfo boost ];

3737

3838 configureFlags =

pkgs/development/libraries/freenect/default.nix+5

@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {

1818

1919 nativeBuildInputs = [ cmake pkg-config ];

2020

21+ # see https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=libfreenect&id=0d17db49ba64bcb9e3a4eed61cf55c9a5ceb97f1

22+ patchPhase = lib.concatMapStrings (x: ''

23+ substituteInPlace ${x} --replace "{GLUT_LIBRARY}" "{GLUT_LIBRARIES}"

24+ '') [ "examples/CMakeLists.txt" "wrappers/cpp/CMakeLists.txt" ];

25+

2126 meta = {

2227 description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS";

2328 homepage = "http://openkinect.org";

pkgs/development/libraries/highfive/default.nix+3−3

@@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null;

1212

1313stdenv.mkDerivation rec {

1414 pname = "highfive";

15− version = "2.2";

15+ version = "2.3.1";

1616

1717 src = fetchFromGitHub {

1818 owner = "BlueBrain";

1919 repo = "HighFive";

20− rev = "4c70d818ed18231563fe49ff197d1c41054be592";

21− sha256 = "02xy3c2ix3nw8109aw75ixj651knzc5rjqwqrxximm4hzwx09frk";

20+ rev = "v${version}";

21+ sha256 = "qaIThJGdoLgs82h+W4BKQEu1yy1bB8bZFiuxI7IxInw=";

2222 };

2323

2424 nativeBuildInputs = [ cmake ];

pkgs/development/libraries/libpqxx/default.nix+2−2

@@ -2,13 +2,13 @@

22

33stdenv.mkDerivation rec {

44 pname = "libpqxx";

5− version = "7.6.0";

5+ version = "7.7.0";

66

77 src = fetchFromGitHub {

88 owner = "jtv";

99 repo = pname;

1010 rev = version;

11− sha256 = "sha256-shcGJebjXJ3ORvcdINJFLiuW7ySqe6HyPUQioeUG/wM=";

11+ sha256 = "sha256-O30czHwEDXz5xY4o3MWhmEK06OKTKMQCy0M6qwSEpy8=";

1212 };

1313

1414 nativeBuildInputs = [ gnused python3 ];

pkgs/development/libraries/nsync/default.nixnew file+29

@@ -0,0 +1,29 @@

1+{ stdenv

2+, lib

3+, fetchFromGitHub

4+, cmake

5+}:

6+

7+stdenv.mkDerivation rec {

8+ pname = "nsync";

9+ version = "1.24.0";

10+

11+ src = fetchFromGitHub {

12+ owner = "google";

13+ repo = pname;

14+ rev = version;

15+ sha256 = "sha256-jQJtlBDR6efBe1tFOUOZ6awaMTT33qM/GbvbwiWTZxw=";

16+ };

17+

18+ nativeBuildInputs = [ cmake ];

19+

20+ meta = {

21+ homepage = "https://github.com/google/nsync";

22+ description = "C library that exports various synchronization primitives";

23+ license = lib.licenses.asl20;

24+ maintainers = with lib.maintainers; [ puffnfresh ];

25+ # On macOS we get an error for some reason:

26+ # > mkdir: cannot create directory 'build': File exists

27+ platforms = lib.platforms.linux;

28+ };

29+}

pkgs/development/libraries/ntrack/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }:

1+{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python2 }:

22

33stdenv.mkDerivation rec {

44 pname = "ntrack";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111

1212 buildInputs = [ libnl qt4 ];

1313

14− nativeBuildInputs = [ pkg-config python ];

14+ nativeBuildInputs = [ pkg-config python2 ];

1515

1616 # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic]

1717 NIX_CFLAGS_COMPILE = "-Wno-error";

pkgs/development/libraries/openbabel/2.nix+2−2

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

1−{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config }:

1+{stdenv, lib, fetchFromGitHub, fetchpatch, cmake, zlib, libxml2, eigen, python2, cairo, pcre, pkg-config }:

22

33stdenv.mkDerivation rec {

44 pname = "openbabel";

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

1919 })

2020 ];

2121

22− buildInputs = [ zlib libxml2 eigen python cairo pcre ];

22+ buildInputs = [ zlib libxml2 eigen python2 cairo pcre ];

2323

2424 nativeBuildInputs = [ cmake pkg-config ];

2525

pkgs/development/libraries/opencv/default.nix+3−3

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

11{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unzip

22, zlib

3−, enablePython ? false, pythonPackages

3+, enablePython ? false, python2Packages

44, enableGtk2 ? false, gtk2

55, enableJPEG ? true, libjpeg

66, enablePNG ? true, libpng

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {

4444

4545 buildInputs =

4646 [ zlib ]

47− ++ lib.optional enablePython pythonPackages.python

47+ ++ lib.optional enablePython python2Packages.python

4848 ++ lib.optional enableGtk2 gtk2

4949 ++ lib.optional enableJPEG libjpeg

5050 ++ lib.optional enablePNG libpng

@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {

5656 ++ lib.optionals stdenv.isDarwin [ Cocoa QTKit ]

5757 ;

5858

59− propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy;

59+ propagatedBuildInputs = lib.optional enablePython python2Packages.numpy;

6060

6161 nativeBuildInputs = [ cmake pkg-config unzip ];

6262

pkgs/development/libraries/pcmsolver/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python

1+{ lib, stdenv, fetchFromGitHub, cmake, perl, gfortran, python2

22, boost, eigen, zlib

33} :

44

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {

1717 cmake

1818 gfortran

1919 perl

20− python

20+ python2

2121 ];

2222

2323 buildInputs = [

pkgs/development/libraries/physics/fastjet/default.nix+1−1

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

11{ lib

22, stdenv

33, fetchurl

4−, python

4+, python ? null

55, withPython ? false

66}:

77

pkgs/development/libraries/polkit/default.nix+3−1

@@ -25,6 +25,8 @@

2525, elogind

2626# needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222)

2727, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform)

28+# cross build fails on polkit-1-scan (https://github.com/NixOS/nixpkgs/pull/152704)

29+, withGtkDoc ? (stdenv.buildPlatform == stdenv.hostPlatform)

2830# A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault).

2931# Not yet investigated; it may be due to the "Make netgroup support optional"

3032# patch not updating the tests correctly yet, or doing something wrong,

@@ -119,7 +121,7 @@ stdenv.mkDerivation rec {

119121 "-Dos_type=redhat" # only affects PAM includes

120122 "-Dintrospection=${lib.boolToString withIntrospection}"

121123 "-Dtests=${lib.boolToString doCheck}"

122− "-Dgtk_doc=${lib.boolToString true}"

124+ "-Dgtk_doc=${lib.boolToString withGtkDoc}"

123125 "-Dman=true"

124126 ] ++ lib.optionals stdenv.isLinux [

125127 "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}"

pkgs/development/libraries/ptex/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, zlib, python, cmake, pkg-config }:

1+{ lib, stdenv, fetchFromGitHub, zlib, python2, cmake, pkg-config }:

22

33stdenv.mkDerivation rec

44{

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec

1515 outputs = [ "bin" "dev" "out" "lib" ];

1616

1717 nativeBuildInputs = [ cmake ];

18− buildInputs = [ zlib python pkg-config ];

18+ buildInputs = [ zlib python2 pkg-config ];

1919

2020 # Can be removed in the next release

2121 # https://github.com/wdas/ptex/pull/42

pkgs/development/libraries/rabbitmq-java-client/default.nix+2−2

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

1−{ fetchurl, lib, stdenv, ant, jdk, jre, python, makeWrapper }:

1+{ fetchurl, lib, stdenv, ant, jdk, jre, python2, makeWrapper }:

22

33stdenv.mkDerivation rec {

44 pname = "rabbitmq-java-client";

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {

1010 };

1111

1212 nativeBuildInputs = [ makeWrapper ];

13− buildInputs = [ ant jdk python ];

13+ buildInputs = [ ant jdk python2 ];

1414

1515 buildPhase = "ant dist";

1616

pkgs/development/libraries/science/math/fenics/default.nix+9

@@ -30,6 +30,15 @@

3030let

3131 version = "2019.1.0";

3232

33+ # TODO: test with newer pytest

34+ pytest = pythonPackages.callPackage

35+ ../../../../python2-modules/pytest {

36+ # hypothesis tests require pytest that causes dependency cycle

37+ hypothesis = pythonPackages.hypothesis.override {

38+ doCheck = false;

39+ };

40+ };

41+

3342 dijitso = pythonPackages.buildPythonPackage {

3443 pname = "dijitso";

3544 inherit version;

pkgs/development/libraries/science/math/itpp/default.nix+1

@@ -49,5 +49,6 @@ stdenv.mkDerivation rec {

4949 license = licenses.gpl3;

5050 platforms = platforms.unix;

5151 maintainers = with maintainers; [ andrew-d ];

52+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/itpp.x86_64-darwin

5253 };

5354}

pkgs/development/libraries/seasocks/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, cmake, python, zlib }:

1+{ lib, stdenv, fetchFromGitHub, cmake, python3, zlib }:

22

33stdenv.mkDerivation rec {

44 pname = "seasocks";

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

1212 };

1313

1414 nativeBuildInputs = [ cmake ];

15− buildInputs = [ zlib python ];

15+ buildInputs = [ zlib python3 ];

1616

1717 meta = with lib; {

1818 homepage = "https://github.com/mattgodbolt/seasocks";

pkgs/development/libraries/snack/default.nix+3−3

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

1−# alsa-lib vorbis-tools python can be made optional

1+# alsa-lib vorbis-tools python2 can be made optional

22

3−{ lib, stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:

3+{ lib, stdenv, fetchurl, python2, tcl, tk, vorbis-tools, pkg-config, xlibsWrapper }:

44

55stdenv.mkDerivation rec {

66 pname = "snack";

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

1616 postUnpack = ''sourceRoot="$sourceRoot/unix"'';

1717

1818 nativeBuildInputs = [ pkg-config ];

19− buildInputs = [ python tcl tk vorbis-tools xlibsWrapper ];

19+ buildInputs = [ python2 tcl tk vorbis-tools xlibsWrapper ];

2020

2121 hardeningDisable = [ "format" ];

2222

pkgs/development/libraries/swiften/default.nix+2−2

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

11{ stdenv

22, lib

3−, python

3+, python2

44, libidn

55, lua

66, miniupnpc

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {

4040 ];

4141

4242 buildInputs = [

43− python

43+ python2

4444 libidn

4545 lua

4646 miniupnpc

pkgs/development/libraries/tiledb/default.nix+2−2

@@ -13,7 +13,7 @@

1313, libpqxx

1414, clang-tools

1515, catch2

16−, python

16+, python3

1717, gtest

1818, doxygen

1919, fixDarwinDylibNames

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {

3939 nativeBuildInputs = [

4040 clang-tools

4141 cmake

42− python

42+ python3

4343 doxygen

4444 ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;

4545

pkgs/development/libraries/uriparser/default.nix+2−2

@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {

1414

1515 cmakeFlags = [

1616 "-DURIPARSER_BUILD_DOCS=OFF"

17− ];

17+ ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF";

1818

1919 checkInputs = [ gtest ];

20− doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system;

20+ doCheck = stdenv.buildPlatform == stdenv.hostPlatform;

2121

2222 meta = with lib; {

2323 homepage = "https://uriparser.github.io/";

pkgs/development/libraries/v8/5_x.nixdeleted−199

@@ -1,199 +0,0 @@

1−{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu

2−, patchelf, coreutils, xcbuild

3−, doCheck ? false

4−, static ? false

5−}:

6−

7−assert readline != null;

8−

9−let

10− arch = if stdenv.isx86_64 then "x64"

11− else if stdenv.isi686 then "ia32"

12− else if stdenv.isAarch64 then "arm64"

13− else if stdenv.isAarch32 then "arm"

14− else throw "Unknown architecture for v8";

15− git_url = "https://chromium.googlesource.com";

16− clangFlag = if stdenv.isDarwin then "1" else "0";

17− sharedFlag = if static then "static_library" else "shared_library";

18−

19− deps = {

20− build = fetchgit {

21− url = "${git_url}/chromium/src/build.git";

22− rev = "2c67d4d74b6b3673228fab191918500a582ef3b0";

23− sha256 = "0jc7hci5yh792pw0ahjfxrk5xzllnlrv9llmwlgcgn2x8x6bn34q";

24− };

25− "tools/gyp" = fetchgit {

26− url = "${git_url}/external/gyp.git";

27− rev = "e7079f0e0e14108ab0dba58728ff219637458563";

28− sha256 = "0yd1ds13z0r9d2sb67f9i1gjn1zgzwyfv96qqqp6pn5pcfbialg6";

29− };

30− "third_party/icu" = fetchgit {

31− url = "${git_url}/chromium/deps/icu.git";

32− rev = "b5ecbb29a26532f72ef482569b223d5a51fd50bf";

33− sha256 = "0ld47wdnk8grcba221z67l3pnphv9zwifk4y44f5b946w3iwmpns";

34− };

35− buildtools = fetchgit {

36− url = "${git_url}/chromium/buildtools.git";

37− rev = "60f7f9a8b421ebf9a46041dfa2ff11c0fe59c582";

38− sha256 = "0i10bw7yhslklqwcx5krs3k05sicb73cpwd0mkaz96yxsvmkvjq0";

39− };

40− "base/trace_event/common" = fetchgit {

41− url = "${git_url}/chromium/src/base/trace_event/common.git";

42− rev = "315bf1e2d45be7d53346c31cfcc37424a32c30c8";

43− sha256 = "1pp2ygvp20j6g4868hrmiw0j704kdvsi9d9wx2gbk7w79rc36695";

44− };

45− "platform/inspector_protocol" = fetchgit {

46− url = "${git_url}/chromium/src/third_party/WebKit/Source/platform/inspector_protocol.git";

47− rev = "f49542089820a34a9a6e33264e09b73779407512";

48− sha256 = "1lwpass3p4rpp2kjmxxxpkqyv4lznxhf4i0yy7mmrd7jkpc7kn8k";

49− };

50− "tools/mb" = fetchgit {

51− url = "${git_url}/chromium/src/tools/mb.git";

52− rev = "0c4dc43c454f26936ddf3074ab8e9a41e3dc03a3";

53− sha256 = "0f96qphbmwn1pprv0a6xf68p01s1jzx2sz6pmadqbrs1dgh1xwnk";

54− };

55− "tools/swarming_client" = fetchgit {

56− url = "${git_url}/external/swarming.client.git";

57− rev = "7f63a272f7d9785ce41b6d10bb3106c49a968e57";

58− sha256 = "1pmb8bq4qifjf2dzz8c4jdwhlvwgrl9ycjaalcyh1sbh4lx3yvv2";

59− };

60− "testing/gtest" = fetchgit {

61− url = "${git_url}/external/github.com/google/googletest.git";

62− rev = "6f8a66431cb592dad629028a50b3dd418a408c87";

63− sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw";

64− };

65− "testing/gmock" = fetchgit {

66− url = "${git_url}/external/googlemock.git";

67− rev = "0421b6f358139f02e102c9c332ce19a33faf75be";

68− sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp";

69− };

70− "test/benchmarks/data" = fetchgit {

71− url = "${git_url}/v8/deps/third_party/benchmarks.git";

72− rev = "05d7188267b4560491ff9155c5ee13e207ecd65f";

73− sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl";

74− };

75− "test/mozilla/data" = fetchgit {

76− url = "${git_url}/v8/deps/third_party/mozilla-tests.git";

77− rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be";

78− sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn";

79− };

80− "test/simdjs/data" = fetchgit {

81− url = "${git_url}/external/github.com/tc39/ecmascript_simd.git";

82− rev = "baf493985cb9ea7cdbd0d68704860a8156de9556";

83− sha256 = "178r0k40a58c1187gfzqz2i6as34l8cliy1g1x870wyy0qcvlq2q";

84− };

85− "test/test262/data" = fetchgit {

86− url = "${git_url}/external/github.com/tc39/test262.git";

87− rev = "88bc7fe7586f161201c5f14f55c9c489f82b1b67";

88− sha256 = "0gc7fmaqrgwb6rl02jnrm3synpwzzg0dfqy3zm386r1qcisl93xs";

89− };

90− "test/test262/harness" = fetchgit {

91− url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git";

92− rev = "cbd968f54f7a95c6556d53ba852292a4c49d11d8";

93− sha256 = "094c3600a4wh1m3fvvlivn290kik1pzzvwabq77lk8bh4jkkv7ki";

94− };

95− "tools/clang" = fetchgit {

96− url = "${git_url}/chromium/src/tools/clang.git";

97− rev = "496622ab4aaa5be7e5a9b80617013cb02f45dc87";

98− sha256 = "1gkhk2bzpxwzkirzcqfixxpprbr8mn6rk00krm25daarm3smydmf";

99− };

100− };

101−

102−in

103−

104−stdenv.mkDerivation rec {

105− pname = "v8";

106− version = "5.4.232";

107−

108− inherit doCheck;

109−

110− src = fetchFromGitHub {

111− owner = "v8";

112− repo = "v8";

113− rev = version;

114− sha256 = "1nqxbkz75m8xrjih0sj3f3iqvif4192vxdaxzy8r787rihjwg9nx";

115− };

116−

117− postUnpack = ''

118− ${lib.concatStringsSep "\n" (

119− lib.mapAttrsToList (n: v: ''

120− mkdir -p $sourceRoot/${n}

121− cp -r ${v}/* $sourceRoot/${n}

122− '') deps)}

123− '';

124−

125− # Patch based off of:

126− # https://github.com/cowboyd/libv8/tree/v5.1.281.67.0/patches

127− patches = lib.optional (!doCheck) ./libv8-5.4.232.patch;

128−

129− postPatch = ''

130− sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' gypfiles/gyp_v8

131− sed -i 's,/bin/echo,${coreutils}/bin/echo,' gypfiles/standalone.gypi

132− sed -i '/CR_CLANG_REVISION/ d' gypfiles/standalone.gypi

133− sed -i 's/-Wno-format-pedantic//g' gypfiles/standalone.gypi

134− '';

135−

136− configurePhase = ''

137− PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \

138− PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \

139− gypfiles/gyp_v8 \

140− -f make \

141− --generator-output="out" \

142− -Dflock_index=0 \

143− -Dclang=${clangFlag} \

144− -Dv8_enable_i18n_support=1 \

145− -Duse_system_icu=1 \

146− -Dcomponent=${sharedFlag} \

147− -Dconsole=readline \

148− -Dv8_target_arch=${arch} \

149− -Dv8_use_external_startup_data=0

150− '';

151−

152− nativeBuildInputs = [ which ];

153− buildInputs = [ readline python icu ]

154− ++ lib.optional stdenv.isDarwin xcbuild

155− ++ lib.optional stdenv.isLinux patchelf;

156−

157− NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes"

158− + lib.optionalString stdenv.cc.isClang " -Wno-error=unused-lambda-capture";

159−

160− buildFlags = [

161− "LINK=c++"

162− "-C out"

163− "builddir=$(CURDIR)/Release"

164− "BUILDTYPE=Release"

165− ];

166−

167− enableParallelBuilding = true;

168−

169− dontUpdateAutotoolsGnuConfigScripts = if stdenv.isAarch64 then true else null;

170−

171− # the `libv8_libplatform` target is _only_ built as a static library,

172− # and is expected to be statically linked in when needed.

173− # see the following link for further commentary:

174− # https://github.com/cowboyd/therubyracer/issues/391

175− installPhase = ''

176− install -vD out/Release/d8 "$out/bin/d8"

177− install -vD out/Release/mksnapshot "$out/bin/mksnapshot"

178− ${if static then ""

179− else if stdenv.isDarwin then ''

180− install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib"

181− install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8

182− install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib

183− '' else ''

184− install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so"

185− ''}

186− mkdir -p "$out/include"

187− cp -vr include/*.h "$out/include"

188− cp -vr include/libplatform "$out/include"

189− mkdir -p "$out/lib"

190− cp -v out/Release/*.a "$out/lib"

191− '';

192−

193− meta = with lib; {

194− description = "Google's open source JavaScript engine";

195− maintainers = with maintainers; [ cstrahan proglodyte ];

196− platforms = platforms.linux ++ platforms.darwin;

197− license = licenses.bsd3;

198− };

199−}

pkgs/development/libraries/v8/8_x.nixnew file+169

@@ -0,0 +1,169 @@

1+{ stdenv, lib, fetchgit, fetchFromGitHub

2+, gn, ninja, python3, glib, pkg-config, icu

3+, xcbuild, darwin

4+, fetchpatch

5+}:

6+

7+# Use update.sh to update all checksums.

8+

9+let

10+ version = "8.8.278.14";

11+ v8Src = fetchgit {

12+ url = "https://chromium.googlesource.com/v8/v8";

13+ rev = version;

14+ sha256 = "0w6zldyas9w6p394876ssn3pnr5rjzjy1a5dcsmdkfj51m4rlg8m";

15+ };

16+

17+ git_url = "https://chromium.googlesource.com";

18+

19+ # This data is from the DEPS file in the root of a V8 checkout.

20+ deps = {

21+ "base/trace_event/common" = fetchgit {

22+ url = "${git_url}/chromium/src/base/trace_event/common.git";

23+ rev = "eb94f1c7aa96207f469008f29989a43feb2718f8";

24+ sha256 = "14gym38ncc9cysknv3jrql7jvcpjxf2d1dh4m8jgqb967jyzy5cj";

25+ };

26+ "build" = fetchgit {

27+ url = "${git_url}/chromium/src/build.git";

28+ rev = "2101eff1ac4bfd25f2dfa71ad632a600a38c1ed9";

29+ sha256 = "0i3xcwzi4pkv4xpgjkbmcpj5h6mji80zqskkx0jx3sx0ji63fylz";

30+ };

31+ "third_party/googletest/src" = fetchgit {

32+ url = "${git_url}/external/github.com/google/googletest.git";

33+ rev = "4fe018038f87675c083d0cfb6a6b57c274fb1753";

34+ sha256 = "1ilm9dmnm2v4y6l1wyfsajsbqv56j29ldfbpd0ykg4q90gpxz201";

35+ };

36+ "third_party/icu" = fetchgit {

37+ url = "${git_url}/chromium/deps/icu.git";

38+ rev = "c2a4cae149aae7fd30c4cbe3cf1b30df03b386f1";

39+ sha256 = "0lgzxf7hmfsgqazs74v5li9ifg8r0jx5m3gxh1mnw33vpwp7qqf4";

40+ };

41+ "third_party/zlib" = fetchgit {

42+ url = "${git_url}/chromium/src/third_party/zlib.git";

43+ rev = "e84c9a3fd75fdc39055b7ae27d6ec508e50bd39e";

44+ sha256 = "03z30djnb3srhd0nvlxvx58sjqm2bvxk7j3vp4fk6h7a0sa2bdpi";

45+ };

46+ "third_party/jinja2" = fetchgit {

47+ url = "${git_url}/chromium/src/third_party/jinja2.git";

48+ rev = "a82a4944a7f2496639f34a89c9923be5908b80aa";

49+ sha256 = "02mkjwkrzhrg16zx97z792l0faz7gc8vga8w10r5y94p98jymnyz";

50+ };

51+ "third_party/markupsafe" = fetchgit {

52+ url = "${git_url}/chromium/src/third_party/markupsafe.git";

53+ rev = "0944e71f4b2cb9a871bcbe353f95e889b64a611a";

54+ sha256 = "052ij8i7nkqchbvzv6ykj929hvfxjbzq7az2l01r0l2gfazhvdb9";

55+ };

56+ };

57+

58+ # See `gn_version` in DEPS.

59+ gnSrc = fetchgit {

60+ url = "https://gn.googlesource.com/gn";

61+ rev = "53d92014bf94c3893886470a1c7c1289f8818db0";

62+ sha256 = "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9";

63+ };

64+

65+ myGn = gn.overrideAttrs (oldAttrs: {

66+ version = "for-v8";

67+ src = gnSrc;

68+ });

69+

70+in

71+

72+stdenv.mkDerivation rec {

73+ pname = "v8";

74+ inherit version;

75+

76+ doCheck = true;

77+

78+ patches = [

79+ ./darwin.patch

80+ ];

81+

82+ src = v8Src;

83+

84+ postUnpack = ''

85+ ${lib.concatStringsSep "\n" (

86+ lib.mapAttrsToList (n: v: ''

87+ mkdir -p $sourceRoot/${n}

88+ cp -r ${v}/* $sourceRoot/${n}

89+ '') deps)}

90+ chmod u+w -R .

91+ '';

92+

93+ postPatch = ''

94+ ${lib.optionalString stdenv.isAarch64 ''

95+ substituteInPlace build/toolchain/linux/BUILD.gn \

96+ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'

97+ ''}

98+ ${lib.optionalString stdenv.isDarwin ''

99+ substituteInPlace build/config/compiler/compiler.gni \

100+ --replace 'strip_absolute_paths_from_debug_symbols = true' \

101+ 'strip_absolute_paths_from_debug_symbols = false'

102+ substituteInPlace build/config/compiler/BUILD.gn \

103+ --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \

104+ 'false'

105+ ''}

106+ echo 'checkout_google_benchmark = false' > build/config/gclient_args.gni

107+ '';

108+

109+ gnFlags = [

110+ "use_custom_libcxx=false"

111+ "is_clang=${lib.boolToString stdenv.cc.isClang}"

112+ "use_sysroot=false"

113+ # "use_system_icu=true"

114+ "clang_use_chrome_plugins=false"

115+ "is_component_build=false"

116+ "v8_use_external_startup_data=false"

117+ "v8_monolithic=true"

118+ "is_debug=true"

119+ "is_official_build=false"

120+ "treat_warnings_as_errors=false"

121+ "v8_enable_i18n_support=true"

122+ "use_gold=false"

123+ # ''custom_toolchain="//build/toolchain/linux/unbundle:default"''

124+ ''host_toolchain="//build/toolchain/linux/unbundle:default"''

125+ ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''

126+ ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${stdenv.cc}"'';

127+

128+ NIX_CFLAGS_COMPILE = "-O2";

129+ FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";

130+

131+ nativeBuildInputs = [

132+ myGn

133+ ninja

134+ pkg-config

135+ python3

136+ ] ++ lib.optionals stdenv.isDarwin [

137+ xcbuild

138+ darwin.DarwinTools

139+ python3.pkgs.setuptools

140+ ];

141+ buildInputs = [ glib icu ];

142+

143+ ninjaFlags = [ ":d8" "v8_monolith" ];

144+

145+ enableParallelBuilding = true;

146+

147+ installPhase = ''

148+ install -D d8 $out/bin/d8

149+ install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a

150+ install -D -m644 icudtl.dat $out/share/v8/icudtl.dat

151+ cp -r ../../include $out

152+

153+ mkdir -p $out/lib/pkgconfig

154+ cat > $out/lib/pkgconfig/v8.pc << EOF

155+ Name: v8

156+ Description: V8 JavaScript Engine

157+ Version: ${version}

158+ Libs: -L$out/lib -lv8 -pthread

159+ Cflags: -I$out/include

160+ EOF

161+ '';

162+

163+ meta = with lib; {

164+ description = "Google's open source JavaScript engine";

165+ maintainers = with maintainers; [ cstrahan proglodyte matthewbauer ];

166+ platforms = platforms.unix;

167+ license = licenses.bsd3;

168+ };

169+}

pkgs/development/libraries/v8/default.nix+62−48

@@ -1,75 +1,85 @@

11{ stdenv, lib, fetchgit, fetchFromGitHub

2−, gn, ninja, python, pythonPackages, glib, pkg-config, icu

2+, gn, ninja, python3, glib, pkg-config, icu

33, xcbuild, darwin

44, fetchpatch

55}:

66

7+# Use update.sh to update all checksums.

8+

79let

10+ version = "9.7.106.18";

11+ v8Src = fetchgit {

12+ url = "https://chromium.googlesource.com/v8/v8";

13+ rev = version;

14+ sha256 = "0cb3w733w1xn6zq9dsr43nx6llcg9hrmb2dkxairarj9c0igpzyh";

15+ };

16+

817 git_url = "https://chromium.googlesource.com";

918

10− # This data is from the DEPS file in the root of a V8 checkout

19+ # This data is from the DEPS file in the root of a V8 checkout.

1120 deps = {

1221 "base/trace_event/common" = fetchgit {

1322 url = "${git_url}/chromium/src/base/trace_event/common.git";

14− rev = "dab187b372fc17e51f5b9fad8201813d0aed5129";

15− sha256 = "0dmpj9hj4xv3xb0fl1kb9hm4bhpbs2s5csx3z8cgjd5vwvhdzig4";

23+ rev = "7f36dbc19d31e2aad895c60261ca8f726442bfbb";

24+ sha256 = "01b2fhbxznqbakxv42ivrzg6w8l7i9yrd9nf72d6p5xx9dm993j4";

1625 };

17− build = fetchgit {

26+ "build" = fetchgit {

1827 url = "${git_url}/chromium/src/build.git";

19− rev = "26e9d485d01d6e0eb9dadd21df767a63494c8fea";

20− sha256 = "1jjvsgj0cs97d26i3ba531ic1f9gqan8x7z4aya8yl8jx02l342q";

28+ rev = "cf325916d58a194a935c26a56fcf6b525d1e2bf4";

29+ sha256 = "1ix4h1cpx9bvgln8590xh7lllhsd9w1hd5k9l1gx5yxxrmywd3s4";

2130 };

2231 "third_party/googletest/src" = fetchgit {

2332 url = "${git_url}/external/github.com/google/googletest.git";

24− rev = "e3f0319d89f4cbf32993de595d984183b1a9fc57";

25− sha256 = "18xz71l2xjrqsc0q317whgw4xi1i5db24zcj7v04f5g6r1hyf1a5";

33+ rev = "16f637fbf4ffc3f7a01fa4eceb7906634565242f";

34+ sha256 = "11012k3c3mxzdwcw2iparr9lrckafpyhqzclsj26hmfbgbdi0rrh";

2635 };

2736 "third_party/icu" = fetchgit {

2837 url = "${git_url}/chromium/deps/icu.git";

29− rev = "f2223961702f00a8833874b0560d615a2cc42738";

30− sha256 = "0z5p53kbrjfkjn0i12dpk55cp8976j2zk7a4wk88423s2c5w87zl";

38+ rev = "eedbaf76e49d28465d9119b10c30b82906e606ff";

39+ sha256 = "0mppvx7wf9zlqjsfaa1cf06brh1fjb6nmiib0lhbb9hd55mqjdjj";

40+ };

41+ "third_party/zlib" = fetchgit {

42+ url = "${git_url}/chromium/src/third_party/zlib.git";

43+ rev = "6da1d53b97c89b07e47714d88cab61f1ce003c68";

44+ sha256 = "0v7ylmbwfwv6w6wp29qdf77kjjnfr2xzin08n0v1yvbhs01h5ppy";

3145 };

3246 "third_party/jinja2" = fetchgit {

3347 url = "${git_url}/chromium/src/third_party/jinja2.git";

34− rev = "b41863e42637544c2941b574c7877d3e1f663e25";

35− sha256 = "1qgilclkav67m6cl2xq2kmzkswrkrb2axc2z8mw58fnch4j1jf1r";

48+ rev = "ee69aa00ee8536f61db6a451f3858745cf587de6";

49+ sha256 = "1fsnd5h0gisfp8bdsfd81kk5v4mkqf8z368c7qlm1qcwc4ri4x7a";

3650 };

3751 "third_party/markupsafe" = fetchgit {

3852 url = "${git_url}/chromium/src/third_party/markupsafe.git";

39− rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783";

40− sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz";

41− };

42− "third_party/zlib" = fetchgit {

43− url = "${git_url}/chromium/src/third_party/zlib.git";

44− rev = "156be8c52f80cde343088b4a69a80579101b6e67";

45− sha256 = "0hxbkkzmlv714fjq2jlp5dd2jc339xyh6gkjx1sz3srwv33mlk92";

53+ rev = "1b882ef6372b58bfd55a3285f37ed801be9137cd";

54+ sha256 = "1jnjidbh03lhfaawimkjxbprmsgz4snr0jl06630dyd41zkdw5kr";

4655 };

4756 };

4857

58+ # See `gn_version` in DEPS.

59+ gnSrc = fetchgit {

60+ url = "https://gn.googlesource.com/gn";

61+ rev = "8926696a4186279489cc2b8d768533e61bba73d7";

62+ sha256 = "1084lnyb0a1khbgjvak05fcx6jy973wqvsf77n0alxjys18sg2yk";

63+ };

64+

65+ myGn = gn.overrideAttrs (oldAttrs: {

66+ version = "for-v8";

67+ src = gnSrc;

68+ });

69+

4970in

5071

5172stdenv.mkDerivation rec {

5273 pname = "v8";

53− version = "8.4.255";

74+ inherit version;

5475

5576 doCheck = true;

5677

5778 patches = [

58− # Remove unrecognized clang debug flags

59− (fetchpatch {

60− url = "https://raw.githubusercontent.com/saiarcot895/chromium-ubuntu-build/663dbfc492fd2f8ba28d9af40fb3b1327e6aa56e/debian/patches/revert-Xclang-instcombine-lower-dbg-declare.patch";

61− sha256 = "07qp4bjgbwbdrzqslvl2bgbzr3v97b9isbp0539x3lc8cy3h02g1";

62− })

6379 ./darwin.patch

64− ./gcc_arm.patch # Fix building zlib with gcc on aarch64, from https://gist.github.com/Adenilson/d973b6fd96c7709d33ddf08cf1dcb149

6580 ];

6681

67− src = fetchFromGitHub {

68− owner = "v8";

69− repo = "v8";

70− rev = version;

71− sha256 = "07ymw4kqbz7kv311gpk5bs5q90wj73n2q7jkyfhqk4hvhs1q5bw7";

72− };

82+ src = v8Src;

7383

7484 postUnpack = ''

7585 ${lib.concatStringsSep "\n" (

@@ -80,16 +90,20 @@ stdenv.mkDerivation rec {

8090 chmod u+w -R .

8191 '';

8292

83− postPatch = lib.optionalString stdenv.isAarch64 ''

84− substituteInPlace build/toolchain/linux/BUILD.gn \

85− --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'

86− '' + lib.optionalString stdenv.isDarwin ''

87− substituteInPlace build/config/compiler/compiler.gni \

88− --replace 'strip_absolute_paths_from_debug_symbols = true' \

89− 'strip_absolute_paths_from_debug_symbols = false'

90− substituteInPlace build/config/compiler/BUILD.gn \

91− --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \

92− 'false'

93+ postPatch = ''

94+ ${lib.optionalString stdenv.isAarch64 ''

95+ substituteInPlace build/toolchain/linux/BUILD.gn \

96+ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'

97+ ''}

98+ ${lib.optionalString stdenv.isDarwin ''

99+ substituteInPlace build/config/compiler/compiler.gni \

100+ --replace 'strip_absolute_paths_from_debug_symbols = true' \

101+ 'strip_absolute_paths_from_debug_symbols = false'

102+ substituteInPlace build/config/compiler/BUILD.gn \

103+ --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \

104+ 'false'

105+ ''}

106+ touch build/config/gclient_args.gni

93107 '';

94108

95109 gnFlags = [

@@ -106,7 +120,6 @@ stdenv.mkDerivation rec {

106120 "treat_warnings_as_errors=false"

107121 "v8_enable_i18n_support=true"

108122 "use_gold=false"

109− "init_stack_vars=false"

110123 # ''custom_toolchain="//build/toolchain/linux/unbundle:default"''

111124 ''host_toolchain="//build/toolchain/linux/unbundle:default"''

112125 ''v8_snapshot_toolchain="//build/toolchain/linux/unbundle:default"''

@@ -116,14 +129,14 @@ stdenv.mkDerivation rec {

116129 FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12";

117130

118131 nativeBuildInputs = [

119− gn

132+ myGn

120133 ninja

121134 pkg-config

122− python

135+ python3

123136 ] ++ lib.optionals stdenv.isDarwin [

124137 xcbuild

125138 darwin.DarwinTools

126− pythonPackages.setuptools

139+ python3.pkgs.setuptools

127140 ];

128141 buildInputs = [ glib icu ];

129142

@@ -133,7 +146,8 @@ stdenv.mkDerivation rec {

133146

134147 installPhase = ''

135148 install -D d8 $out/bin/d8

136− install -D obj/libv8_monolith.a $out/lib/libv8.a

149+ install -D -m644 obj/libv8_monolith.a $out/lib/libv8.a

150+ install -D -m644 icudtl.dat $out/share/v8/icudtl.dat

137151 cp -r ../../include $out

138152

139153 mkdir -p $out/lib/pkgconfig

pkgs/development/libraries/v8/gcc_arm.patchdeleted−31

@@ -1,31 +0,0 @@

1−diff --git a/third_party/zlib/contrib/optimizations/insert_string.h b/third_party/zlib/contrib/optimizations/insert_string.h

2−index 1826601..d123305 100644

3−--- a/third_party/zlib/contrib/optimizations/insert_string.h

4−+++ b/third_party/zlib/contrib/optimizations/insert_string.h

5−@@ -26,15 +26,23 @@

6− #define _cpu_crc32_u32 _mm_crc32_u32

7−

8− #elif defined(CRC32_ARMV8_CRC32)

9−- #if defined(__clang__)

10−+ #if defined(__GNUC__) || defined(__clang__)

11− #undef TARGET_CPU_WITH_CRC

12−- #define __crc32cw __builtin_arm_crc32cw

13−+ #if defined(__clang__)

14−+ #define __crc32cw __builtin_arm_crc32cw

15−+ #elif defined(__GNUC__)

16−+ #define __crc32cw __builtin_aarch64_crc32cw

17−+ #endif

18− #endif

19−

20− #define _cpu_crc32_u32 __crc32cw

21−

22− #if defined(__aarch64__)

23−- #define TARGET_CPU_WITH_CRC __attribute__((target("crc")))

24−+ #if defined(__clang__)

25−+ #define TARGET_CPU_WITH_CRC __attribute__((target("crc")))

26−+ #elif defined(__GNUC__)

27−+ #define TARGET_CPU_WITH_CRC __attribute__((target("+crc")))

28−+ #endif

29− #else // !defined(__aarch64__)

30− #define TARGET_CPU_WITH_CRC __attribute__((target("armv8-a,crc")))

31− #endif // defined(__aarch64__)

pkgs/development/libraries/v8/libv8-5.4.232.patchdeleted−97

@@ -1,97 +0,0 @@

1−From c9f42d1314c6026efcfcc01824f4e2fdfd05ebcf Mon Sep 17 00:00:00 2001

2−From: Ben Sklaroff <bsklaroff@gmail.com>

3−Date: Sat, 23 Jul 2016 18:16:55 -0400

4−Subject: [PATCH] libv8-5.4.232

5−

6−---

7− Makefile | 5 +----

8− gypfiles/all.gyp | 32 --------------------------------

9− gypfiles/standalone.gypi | 5 ++++-

10− 3 files changed, 5 insertions(+), 37 deletions(-)

11−

12−diff --git a/Makefile b/Makefile

13−index 5ea5c58..d1b2d73 100644

14−--- a/Makefile

15−+++ b/Makefile

16−@@ -261,11 +261,8 @@ GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \

17− gypfiles/shim_headers.gypi gypfiles/features.gypi \

18− gypfiles/standalone.gypi \

19− gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \

20−- test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \

21−- test/unittests/unittests.gyp src/v8.gyp \

22−- tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \

23− buildtools/third_party/libc++abi/libc++abi.gyp \

24−- buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \

25−+ buildtools/third_party/libc++/libc++.gyp \

26− src/third_party/vtune/v8vtune.gyp src/d8.gyp

27−

28− # If vtunejit=on, the v8vtune.gyp will be appended.

29−diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp

30−index ff1bea4..96820a0 100644

31−--- a/gypfiles/all.gyp

32−+++ b/gypfiles/all.gyp

33−@@ -16,38 +16,6 @@

34− '../tools/parser-shell.gyp:parser-shell',

35− ],

36− }],

37−- # These items don't compile for Android on Mac.

38−- ['host_os!="mac" or OS!="android"', {

39−- 'dependencies': [

40−- '../samples/samples.gyp:*',

41−- '../test/cctest/cctest.gyp:*',

42−- '../test/fuzzer/fuzzer.gyp:*',

43−- '../test/unittests/unittests.gyp:*',

44−- ],

45−- }],

46−- ['test_isolation_mode != "noop"', {

47−- 'dependencies': [

48−- '../test/bot_default.gyp:*',

49−- '../test/benchmarks/benchmarks.gyp:*',

50−- '../test/default.gyp:*',

51−- '../test/ignition.gyp:*',

52−- '../test/intl/intl.gyp:*',

53−- '../test/message/message.gyp:*',

54−- '../test/mjsunit/mjsunit.gyp:*',

55−- '../test/mozilla/mozilla.gyp:*',

56−- '../test/optimize_for_size.gyp:*',

57−- '../test/perf.gyp:*',

58−- '../test/preparser/preparser.gyp:*',

59−- '../test/simdjs/simdjs.gyp:*',

60−- '../test/test262/test262.gyp:*',

61−- '../test/webkit/webkit.gyp:*',

62−- '../tools/check-static-initializers.gyp:*',

63−- '../tools/gcmole/run_gcmole.gyp:*',

64−- '../tools/jsfunfuzz/jsfunfuzz.gyp:*',

65−- '../tools/run-deopt-fuzzer.gyp:*',

66−- '../tools/run-valgrind.gyp:*',

67−- ],

68−- }],

69− ]

70− }

71− ]

72−diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi

73−index 89f06a0..a43976d 100644

74−--- a/gypfiles/standalone.gypi

75−+++ b/gypfiles/standalone.gypi

76−@@ -506,6 +506,9 @@

77− }], # fastbuild!=0

78− ],

79− 'target_conditions': [

80−+ ['_type=="static_library"', {

81−+ 'standalone_static_library': 1,

82−+ }],

83− ['v8_code == 0', {

84− 'defines!': [

85− 'DEBUG',

86−@@ -770,7 +773,7 @@

87− [ 'visibility=="hidden" and v8_enable_backtrace==0', {

88− 'cflags': [ '-fvisibility=hidden' ],

89− }],

90−- [ 'component=="shared_library"', {

91−+ [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64" or v8_target_arch=="arm")', {

92− 'cflags': [ '-fPIC', ],

93− }],

94− [ 'clang==0 and coverage==1', {

95−--

96−2.9.0

97−

pkgs/development/libraries/v8/update.sh+32−17

@@ -1,29 +1,45 @@

11#!/usr/bin/env nix-shell

2−#! nix-shell -i bash -p curl -p nix-prefetch-git

2+#! nix-shell -i bash -p curl -p nix-prefetch-git -p jq

33VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux

4−TARGET_CHANNEL=beta

5−FILE_PATH=6_x.nix

4+TARGET_CHANNEL=stable

65

76set -eo pipefail

87

9−v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }")

8+if [ -n "$1" ]; then

9+ v8_version="$1"

10+ shift

11+else

12+ v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }")

13+fi

14+

15+if [ -n "$1" ]; then

16+ file_path="$1"

17+else

18+ file_path=default.nix

19+fi

1020

1121echo "Using V8 version --> $v8_version"

12−sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${FILE_PATH}

1322

14−sha256=$(nix-prefetch-git --no-deepClone https://github.com/v8/v8.git "refs/tags/${v8_version}" \

15− | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }')

16−sed -e "/repo = \"v8\"/ { n;n; s#\".*\"#\"${sha256}\"# }" -i ${FILE_PATH}

23+prefetched=$(nix-prefetch-git --no-deepClone https://chromium.googlesource.com/v8/v8 "refs/tags/${v8_version}")

24+

25+path=$(echo "$prefetched" | jq -r .path)

26+sha256=$(echo "$prefetched" | jq -r .sha256)

27+sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${file_path}

28+sed -e "/v8Src = fetchgit/ { n; n; n; s/\".*\"/\"${sha256}\"/ }" -i ${file_path}

29+

30+deps="$path/DEPS"

1731

18−deps="$(mktemp)"

32+echo "$deps"

1933

20−curl -s -o "$deps" "https://raw.githubusercontent.com/v8/v8/${v8_version}/DEPS"

21−echo $deps

34+echo "Processing gn"

35+gn_rev=$(sed -ne "s/.*'gn_version': 'git_revision:\([^']*\).*/\1/p" < "$deps")

36+gn_sha256=$(nix-prefetch-git --no-deepClone https://gn.googlesource.com/gn "$gn_rev" 2>/dev/null | jq -r .sha256)

37+sed -e "/gnSrc = fetchgit/ { n; n; s/\".*\"/\"${gn_rev}\"/; n; s/\".*\"/\"${gn_sha256}\"/ }" -i ${file_path}

2238

23−sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read dep; do

39+sed -ne '/" = fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${file_path} | while read dep; do

2440 echo "Processing dependency --> $dep"

2541 escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g')

26− dep_rev=$(sed -ne "/\"v8\/${escaped_dep}\":/ { n; s#.*+ \"##; s#\".*##; p }" "$deps")

42+ dep_rev=$(sed -ne "/'${escaped_dep}':/ { n; s#.*+ '##; s#'.*##; p }" "$deps")

2743

2844 if [ "$dep_rev" = "" ]; then

2945 echo "Failed to resolve dependency $dep, not listed in DEPS file"

@@ -31,8 +47,8 @@ sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read d

3147 exit 2

3248 fi

3349

34− repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${FILE_PATH})

35− sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }')

50+ repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${file_path})

51+ sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | jq -r .sha256)

3652

3753 if [ "$sha256" = "" ]; then

3854 echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev"

@@ -40,8 +56,7 @@ sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read d

4056 exit 2

4157 fi

4258

43− sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${FILE_PATH}

59+ sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${file_path}

4460done

4561

46−rm -f "$deps"

4762echo done.

pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix+2−2

@@ -4,13 +4,13 @@

44

55stdenv.mkDerivation rec {

66 pname = "xdg-desktop-portal-wlr";

7− version = "0.4.0";

7+ version = "0.5.0";

88

99 src = fetchFromGitHub {

1010 owner = "emersion";

1111 repo = pname;

1212 rev = "v${version}";

13− sha256 = "sha256:13fbzh8bjnhk4xs8j9bpc01q3hy27zpbf0gkk1fnh3hm5pnyfyiv";

13+ sha256 = "sha256-weePlNcLmZ3R0IDQ95p0wQvsKTYp+sVlTENJtF8Z78Y=";

1414 };

1515

1616 nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ];

pkgs/development/node-packages/default.nix+3−1

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

1−{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }:

1+{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl, nixosTests }:

22

33let

44 inherit (pkgs) lib;

@@ -442,6 +442,8 @@ let

442442 echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home

443443 patch -d $out/lib/node_modules/thelounge -p1 < ${./thelounge-packages-path.patch}

444444 '';

445+ passthru.tests = { inherit (nixosTests) thelounge; };

446+ meta = super.thelounge.meta // { maintainers = with lib.maintainers; [ winter ]; };

445447 };

446448

447449 yaml-language-server = super.yaml-language-server.override {

pkgs/development/ocaml-modules/llvm/default.nix+2−2

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

1−{ stdenv, lib, python, cmake, libllvm, ocaml, findlib, ctypes }:

1+{ stdenv, lib, python2, cmake, libllvm, ocaml, findlib, ctypes }:

22

33let version = lib.getVersion libllvm; in

44

@@ -9,7 +9,7 @@ stdenv.mkDerivation {

99 inherit (libllvm) src;

1010

1111 nativeBuildInputs = [ cmake ];

12− buildInputs = [ python ocaml findlib ctypes ];

12+ buildInputs = [ python2 ocaml findlib ctypes ];

1313 propagatedBuildInputs = [ libllvm ];

1414

1515 cmakeFlags = [

pkgs/development/ocaml-modules/pycaml/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python, ocaml_make }:

1+{ lib, stdenv, fetchurl, ocaml, findlib, ncurses, python2, ocaml_make }:

22

33# This is the original pycaml version with patches from debian.

44

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

2727 sourceRoot = "pycaml";

2828 patches = [ "../debian/patches/*.patch" ];

2929

30− buildInputs = [ ncurses ocaml findlib python ocaml_make ];

30+ buildInputs = [ ncurses ocaml findlib python2 ocaml_make ];

3131 createFindlibDestdir = true;

3232

3333 # the Makefile is not shipped with an install target, hence we do it ourselves.

pkgs/development/octave-modules/miscellaneous/default.nix−2

@@ -2,7 +2,6 @@

22, lib

33, fetchurl

44# Build-time dependencies

5−, mlterm

65, ncurses # >= 5

76, units

87}:

@@ -17,7 +16,6 @@ buildOctavePackage rec {

1716 };

1817

1918 buildInputs = [

20− mlterm

2119 ncurses

2220 ];

2321

pkgs/development/python-modules/aiogithubapi/default.nix+13−10

@@ -12,7 +12,8 @@

1212

1313buildPythonPackage rec {

1414 pname = "aiogithubapi";

15− version = "21.11.0";

15+ version = "22.1.0";

16+ format = "setuptools";

1617

1718 disabled = pythonOlder "3.8";

1819

@@ -20,16 +21,9 @@ buildPythonPackage rec {

2021 owner = "ludeeus";

2122 repo = pname;

2223 rev = version;

23− sha256 = "sha256-sxWgLd+oQv9qNOpyAYXsBcqGbo/ugNXzGF5nbdcNLFw=";

24+ sha256 = "sha256-rzZtf3xrbNg9VaOAOM6ux1A9S1WqUKBMKxWfHDo7/VM=";

2425 };

2526

26− postPatch = ''

27− # Upstream is releasing with the help of a CI to PyPI, GitHub releases

28− # are not in their focus

29− substituteInPlace setup.py \

30− --replace 'version="main",' 'version="${version}",'

31− '';

32−

3327 propagatedBuildInputs = [

3428 aiohttp

3529 async-timeout

@@ -42,7 +36,16 @@ buildPythonPackage rec {

4236 pytestCheckHook

4337 ];

4438

45− pythonImportsCheck = [ "aiogithubapi" ];

39+ postPatch = ''

40+ # Upstream is releasing with the help of a CI to PyPI, GitHub releases

41+ # are not in their focus

42+ substituteInPlace setup.py \

43+ --replace 'version="main",' 'version="${version}",'

44+ '';

45+

46+ pythonImportsCheck = [

47+ "aiogithubapi"

48+ ];

4649

4750 meta = with lib; {

4851 description = "Python client for the GitHub API";

pkgs/development/python-modules/aiohttp-retry/default.nixnew file+43

@@ -0,0 +1,43 @@

1+{ lib

2+, aiohttp

3+, buildPythonPackage

4+, fetchFromGitHub

5+, pytestCheckHook

6+, pytest-aiohttp

7+, pythonOlder

8+}:

9+

10+buildPythonPackage rec {

11+ pname = "aiohttp-retry";

12+ version = "2.5.6";

13+ format = "setuptools";

14+

15+ disabled = pythonOlder "3.7";

16+

17+ src = fetchFromGitHub {

18+ owner = "inyutin";

19+ repo = "aiohttp_retry";

20+ rev = "v${version}";

21+ hash = "sha256-jyt4YPn3gSgR1YfHYLs+5VCsjAk9Ij+2m5Kzy51CnLk=";

22+ };

23+

24+ propagatedBuildInputs = [

25+ aiohttp

26+ ];

27+

28+ checkInputs = [

29+ pytest-aiohttp

30+ pytestCheckHook

31+ ];

32+

33+ pythonImportsCheck = [

34+ "aiohttp_retry"

35+ ];

36+

37+ meta = with lib; {

38+ description = "Retry client for aiohttp";

39+ homepage = "https://github.com/inyutin/aiohttp_retry";

40+ license = licenses.mit;

41+ maintainers = with maintainers; [ fab ];

42+ };

43+}

pkgs/development/python-modules/bimmer-connected/default.nix+2−2

@@ -13,7 +13,7 @@

1313

1414buildPythonPackage rec {

1515 pname = "bimmer-connected";

16− version = "0.8.7";

16+ version = "0.8.10";

1717 format = "setuptools";

1818

1919 disabled = pythonOlder "3.6";

@@ -22,7 +22,7 @@ buildPythonPackage rec {

2222 owner = "bimmerconnected";

2323 repo = "bimmer_connected";

2424 rev = version;

25− hash = "sha256-nLZdaV341mULXIngkEqiLQeg4G2NDFGNg/AUozgJe74=";

25+ hash = "sha256-xt21mcXcucUhJlqwDLrAHvQLg9++uc/cX5Sy+Sppsbo=";

2626 };

2727

2828 nativeBuildInputs = [

pkgs/development/python-modules/build/default.nix+2

@@ -54,6 +54,8 @@ buildPythonPackage rec {

5454 pytestFlagsArray = [

5555 "-n"

5656 "$NIX_BUILD_CORES"

57+ "-W"

58+ "ignore::DeprecationWarning"

5759 ];

5860

5961 disabledTests = [

pkgs/development/python-modules/cairocffi/default.nix+59−8

@@ -12,16 +12,67 @@

1212, cairo

1313, cffi

1414, numpy

15−, withXcffib ? false, xcffib

15+, withXcffib ? false

16+, xcffib

1617, python

1718, glib

1819, gdk-pixbuf

19−}@args:

20+}:

21+

22+buildPythonPackage rec {

23+ pname = "cairocffi";

24+ version = "1.3.0";

2025

21−import ./generic.nix ({

22− version = "1.2.0";

23− sha256 = "sha256-mpebUAxkyBef7ChvM36P5kTsovLNBYYM4LYtJfIuoUA=";

24− dlopen_patch = ./dlopen-paths.patch;

2526 disabled = pythonOlder "3.5";

26− inherit withXcffib;

27−} // args)

27+

28+ src = fetchPypi {

29+ inherit pname version;

30+ sha256 = "sha256-EIo6fLCeIDvdhQHZuq2R14bSBFYb1x6TZOizSJfEe5E=";

31+ };

32+

33+ LC_ALL = "en_US.UTF-8";

34+

35+ # checkPhase require at least one 'normal' font and one 'monospace',

36+ # otherwise glyph tests fails

37+ FONTCONFIG_FILE = makeFontsConf {

38+ fontDirectories = [ freefont_ttf ];

39+ };

40+

41+ propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;

42+ propagatedNativeBuildInputs = [ cffi ];

43+

44+ # pytestCheckHook does not work

45+ checkInputs = [ numpy pytest glibcLocales ];

46+

47+ postPatch = ''

48+ substituteInPlace setup.cfg \

49+ --replace "pytest-runner" "" \

50+ --replace "pytest-cov" "" \

51+ --replace "pytest-flake8" "" \

52+ --replace "pytest-isort" "" \

53+ --replace "--flake8 --isort" ""

54+ '';

55+

56+ checkPhase = ''

57+ py.test $out/${python.sitePackages}

58+ '';

59+

60+ patches = [

61+ # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0

62+ (substituteAll {

63+ src = ./dlopen-paths.patch;

64+ ext = stdenv.hostPlatform.extensions.sharedLibrary;

65+ cairo = cairo.out;

66+ glib = glib.out;

67+ gdk_pixbuf = gdk-pixbuf.out;

68+ })

69+ ./fix_test_scaled_font.patch

70+ ];

71+

72+ meta = with lib; {

73+ homepage = "https://github.com/SimonSapin/cairocffi";

74+ license = licenses.bsd3;

75+ maintainers = with maintainers; [ SuperSandro2000 ];

76+ description = "cffi-based cairo bindings for Python";

77+ };

78+}

pkgs/development/python-modules/cairocffi/generic.nixdeleted−63

@@ -1,63 +0,0 @@

1−{ version

2−, sha256

3−, dlopen_patch

4−, disabled ? false

5−, ...

6−}@args:

7−

8−with args;

9−

10−buildPythonPackage rec {

11− pname = "cairocffi";

12− inherit version disabled;

13−

14− src = fetchPypi {

15− inherit pname version sha256;

16− };

17−

18− LC_ALL = "en_US.UTF-8";

19−

20− # checkPhase require at least one 'normal' font and one 'monospace',

21− # otherwise glyph tests fails

22− FONTCONFIG_FILE = makeFontsConf {

23− fontDirectories = [ freefont_ttf ];

24− };

25−

26− propagatedBuildInputs = [ cairo cffi ] ++ lib.optional withXcffib xcffib;

27− propagatedNativeBuildInputs = [ cffi ];

28−

29− # pytestCheckHook does not work

30− checkInputs = [ numpy pytest glibcLocales ];

31−

32− postPatch = ''

33− substituteInPlace setup.cfg \

34− --replace "pytest-runner" "" \

35− --replace "pytest-cov" "" \

36− --replace "pytest-flake8" "" \

37− --replace "pytest-isort" "" \

38− --replace "--flake8 --isort" ""

39− '';

40−

41− checkPhase = ''

42− py.test $out/${python.sitePackages}

43− '';

44−

45− patches = [

46− # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0

47− (substituteAll {

48− src = dlopen_patch;

49− ext = stdenv.hostPlatform.extensions.sharedLibrary;

50− cairo = cairo.out;

51− glib = glib.out;

52− gdk_pixbuf = gdk-pixbuf.out;

53− })

54− ./fix_test_scaled_font.patch

55− ];

56−

57− meta = with lib; {

58− homepage = "https://github.com/SimonSapin/cairocffi";

59− license = licenses.bsd3;

60− maintainers = with maintainers; [];

61− description = "cffi-based cairo bindings for Python";

62− };

63−}

pkgs/development/python-modules/commoncode/default.nix+8

@@ -8,6 +8,7 @@

88, intbitset

99, pytest-xdist

1010, pytestCheckHook

11+, pythonAtLeast

1112, pythonOlder

1213, requests

1314, saneyaml

@@ -19,6 +20,7 @@

1920buildPythonPackage rec {

2021 pname = "commoncode";

2122 version = "30.0.0";

23+ format = "setuptools";

2224

2325 disabled = pythonOlder "3.6";

2426

@@ -49,12 +51,18 @@ buildPythonPackage rec {

4951 pytestCheckHook

5052 pytest-xdist

5153 ];

54+

5255 disabledTests = lib.optionals stdenv.isDarwin [

5356 # expected result is tailored towards the quirks of upstream's

5457 # CI environment on darwin

5558 "test_searchable_paths"

5659 ];

5760

61+ disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [

62+ # https://github.com/nexB/commoncode/issues/36

63+ "src/commoncode/fetch.py"

64+ ];

65+

5866 pythonImportsCheck = [

5967 "commoncode"

6068 ];

pkgs/development/python-modules/cot/default.nix+46−15

@@ -1,27 +1,57 @@

1−{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k

2−, colorlog, pyvmomi, requests, verboselogs

3−, psutil, pyopenssl, setuptools

4−, mock, pytest-mock, pytestCheckHook, qemu

1+{ lib

2+, stdenv

3+, buildPythonPackage

4+, fetchPypi

5+, pythonOlder

6+, colorlog

7+, pyvmomi

8+, requests

9+, verboselogs

10+, pyopenssl

11+, setuptools

12+, mock

13+, pytest-mock

14+, pytestCheckHook

15+, qemu

516}:

617

718buildPythonPackage rec {

819 pname = "cot";

920 version = "2.2.1";

10− disabled = !isPy3k;

21+ format = "setuptools";

22+

23+ disabled = pythonOlder "3.7";

1124

1225 src = fetchPypi {

1326 inherit pname version;

14− sha256 = "f4b3553415f90daac656f89d3e82e79b3d751793239bb173a683b4cc0ceb2635";

27+ hash = "sha256-9LNVNBX5DarGVvidPoLnmz11F5Mjm7FzpoO0zAzrJjU=";

1528 };

1629

17− propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ]

18− ++ lib.optional (pythonOlder "3.3") psutil;

30+ propagatedBuildInputs = [

31+ colorlog

32+ pyvmomi

33+ requests

34+ verboselogs

35+ pyopenssl

36+ setuptools

37+ ];

1938

20− checkInputs = [ mock pytestCheckHook pytest-mock qemu ];

39+ checkInputs = [

40+ mock

41+ pytestCheckHook

42+ pytest-mock

43+ qemu

44+ ];

45+

46+ prePatch = ''

47+ # argparse is part of the standardlib

48+ substituteInPlace setup.py \

49+ --replace "'argparse'," ""

50+ '';

2151

22− # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf)

23− # try enabling these tests with ovftool once/if it is added to nixpkgs

2452 disabledTests = [

53+ # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf)

54+ # try enabling these tests with ovftool once/if it is added to nixpkgs

2555 "HelperGenericTest"

2656 "TestCOTAddDisk"

2757 "TestCOTAddFile"

@@ -34,14 +64,15 @@ buildPythonPackage rec {

3464 "TestQCOW2"

3565 "TestRAW"

3666 "TestVMDKConversion"

67+ # CLI test fails with AssertionError

68+ "test_help"

3769 ] ++ lib.optionals stdenv.isDarwin [

3870 "test_serial_fixup_invalid_host"

3971 ];

4072

41− # argparse is part of the standardlib

42− prePatch = ''

43− substituteInPlace setup.py --replace "'argparse'," ""

44− '';

73+ pythonImportsCheck = [

74+ "COT"

75+ ];

4576

4677 meta = with lib; {

4778 description = "Common OVF Tool";

pkgs/development/python-modules/cozy/default.nixdeleted−62

@@ -1,62 +0,0 @@

1−{ buildPythonPackage

2−, isPy3k

3−, fetchFromGitHub

4−, lib

5−, z3

6−, ply

7−, igraph

8−, oset

9−, ordered-set

10−, dictionaries

11−, setuptools

12−}:

13−

14−buildPythonPackage {

15− pname = "cozy";

16− version = "2.0a1";

17− disabled = !isPy3k;

18−

19− propagatedBuildInputs = [

20− setuptools

21− z3

22− ply

23− igraph

24− oset

25− ordered-set

26− dictionaries

27− ];

28−

29− src = fetchFromGitHub {

30− owner = "CozySynthesizer";

31− repo = "cozy";

32− rev = "f553e9b";

33− sha256 = "1jhr5gzihj8dkg0yc5dmi081v2isxharl0ph7v2grqj0bwqzl40j";

34− };

35−

36− # - yoink the Z3 dependency name, because our Z3 package doesn't provide it.

37− # - remove "dictionaries" version bound

38− # - patch igraph package name

39− postPatch = ''

40− sed -i -e '/z3-solver/d' \

41− -e 's/^dictionaries.*$/dictionaries/' \

42− -e 's/python-igraph/igraph/' \

43− requirements.txt

44− '';

45−

46− # Tests are not correctly set up in the source tree.

47− doCheck = false;

48− pythonImportsCheck = [ "cozy" ];

49−

50− # There is some first-time-run codegen that we will force to happen.

51− postInstall = ''

52− $out/bin/cozy --help

53− '';

54−

55−

56− meta = with lib; {

57− description = "The collection synthesizer";

58− homepage = "https://cozy.uwplse.org/";

59− license = licenses.asl20;

60− maintainers = with maintainers; [ MostAwesomeDude ];

61− };

62−}

pkgs/development/python-modules/dataset/default.nixnew file+35

@@ -0,0 +1,35 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, sqlalchemy

5+, alembic

6+, banal

7+}:

8+

9+buildPythonPackage rec {

10+ pname = "dataset";

11+ version = "1.5.2";

12+

13+ src = fetchPypi {

14+ inherit pname version;

15+ sha256 = "sha256-TDZ6fAqFxOdI79o07uMAw/zD8HbHXDKQt0mnoFM1yEc=";

16+ };

17+

18+ propagatedBuildInputs = [

19+ sqlalchemy alembic banal

20+ ];

21+

22+ # checks attempt to import nonexistent module 'test.test' and fail

23+ doCheck = false;

24+

25+ pythonImportsCheck = [

26+ "dataset"

27+ ];

28+

29+ meta = with lib; {

30+ description = "Toolkit for Python-based database access";

31+ homepage = "https://dataset.readthedocs.io";

32+ license = licenses.mit;

33+ maintainers = [ maintainers.xfnw ];

34+ };

35+}

pkgs/development/python-modules/demjson/default.nix+14−5

@@ -1,25 +1,34 @@

1−{ lib, python, buildPythonPackage, fetchPypi, isPy3k }:

1+{ lib

2+, python

3+, buildPythonPackage

4+, fetchPypi

5+, isPy3k

6+}:

27

38buildPythonPackage rec {

49 pname = "demjson";

510 version = "2.2.4";

11+ format = "setuptools";

612

713 src = fetchPypi {

814 inherit pname version;

915 sha256 = "0ygbddpnvp5lby6mr5kz60la3hkvwwzv3wwb3z0w9ngxl0w21pii";

1016 };

1117

12− checkPhase = lib.optionalString isPy3k ''

13− ${python.interpreter} -m lib2to3 -w test/test_demjson.py

14− '' + ''

18+ doCheck = !(isPy3k);

19+

20+ checkPhase = ''

1521 ${python.interpreter} test/test_demjson.py

1622 '';

1723

24+ pythonImportsCheck = [

25+ "demjson"

26+ ];

27+

1828 meta = with lib; {

1929 description = "Encoder/decoder and lint/validator for JSON (JavaScript Object Notation)";

2030 homepage = "https://github.com/dmeranda/demjson";

2131 license = licenses.lgpl3Plus;

2232 maintainers = with maintainers; [ bjornfor ];

23− platforms = platforms.all;

2433 };

2534}

pkgs/development/python-modules/dictdiffer/default.nixnew file+50

@@ -0,0 +1,50 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, pytestCheckHook

5+, pythonOlder

6+, setuptools-scm

7+}:

8+

9+buildPythonPackage rec {

10+ pname = "dictdiffer";

11+ version = "0.9.0";

12+ format = "setuptools";

13+

14+ disabled = pythonOlder "3.7";

15+

16+ src = fetchFromGitHub {

17+ owner = "inveniosoftware";

18+ repo = pname;

19+ rev = "v${version}";

20+ hash = "sha256-lQyPs3lQWtsvNPuvvwJUTDzrFaOX5uwGuRHe3yWUheU=";

21+ };

22+

23+ SETUPTOOLS_SCM_PRETEND_VERSION = version;

24+

25+ nativeBuildInputs = [

26+ setuptools-scm

27+ ];

28+

29+ checkInputs = [

30+ pytestCheckHook

31+ ];

32+

33+ postPatch = ''

34+ substituteInPlace setup.py \

35+ --replace "'pytest-runner>=2.7'," ""

36+ substituteInPlace pytest.ini \

37+ --replace ' --isort --pydocstyle --pycodestyle --doctest-glob="*.rst" --doctest-modules --cov=dictdiffer --cov-report=term-missing' ""

38+ '';

39+

40+ pythonImportsCheck = [

41+ "dictdiffer"

42+ ];

43+

44+ meta = with lib; {

45+ description = "Module to diff and patch dictionaries";

46+ homepage = "https://github.com/inveniosoftware/dictdiffer";

47+ license = licenses.mit;

48+ maintainers = with maintainers; [ fab ];

49+ };

50+}

pkgs/development/python-modules/doit/default.nix+2−2

@@ -12,13 +12,13 @@

1212

1313buildPythonPackage rec {

1414 pname = "doit";

15− version = "0.33.1";

15+ version = "0.34.0";

1616

1717 disabled = !isPy3k;

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "37c3b35c2151647b968b2af24481112b2f813c30f695366db0639d529190a143";

21+ sha256 = "sha256-jvHeEFy8qTnHPoNt/4bIEskijhHthwL2lVt6CGyqwC0=";

2222 };

2323

2424 propagatedBuildInputs = [ cloudpickle ]

pkgs/development/python-modules/drf-jwt/default.nix+2−2

@@ -7,13 +7,13 @@

77

88buildPythonPackage rec {

99 pname = "drf-jwt";

10− version = "1.19.1";

10+ version = "1.19.2";

1111

1212 src = fetchFromGitHub {

1313 owner = "Styria-Digital";

1414 repo = "django-rest-framework-jwt";

1515 rev = version;

16− sha256 = "sha256-++8rFXVsA5WMTt+aC4di3Rpa0BAW285/qM087i9uQ0g=";

16+ hash = "sha256-bbkk78uYTG+JTzY3AyOmEVtVSgout/TETfr5N5fUto4=";

1717 };

1818

1919 propagatedBuildInputs = [

pkgs/development/python-modules/flask-gravatar/default.nixnew file+47

@@ -0,0 +1,47 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, flask

5+, pytestCheckHook

6+, pygments

7+}:

8+

9+buildPythonPackage rec {

10+ pname = "flask-gravatar";

11+ version = "0.5.0";

12+

13+ src = fetchPypi {

14+ pname = "Flask-Gravatar";

15+ inherit version;

16+ sha256 = "YGZfMcLGEokdto/4Aek+06CIHGyOw0arxk0qmSP1YuE=";

17+ };

18+

19+ postPatch = ''

20+ sed -i setup.py \

21+ -e "s|tests_require=tests_require,||g" \

22+ -e "s|extras_require=extras_require,||g" \

23+ -e "s|setup_requires=setup_requires,||g"

24+ # pep8 is deprecated and cov not needed

25+ substituteInPlace pytest.ini \

26+ --replace "--pep8" "" \

27+ --replace "--cov=flask_gravatar --cov-report=term-missing" ""

28+ '';

29+

30+ propagatedBuildInputs = [

31+ flask

32+ ];

33+

34+ checkInputs = [

35+ pytestCheckHook

36+ pygments

37+ ];

38+

39+ pythonImportsCheck = [ "flask_gravatar" ];

40+

41+ meta = with lib; {

42+ homepage = "https://github.com/zzzsochi/Flask-Gravatar";

43+ description = "Small and simple integration of gravatar into flask";

44+ license = licenses.bsd3;

45+ maintainers = with maintainers; [ gador ];

46+ };

47+}

pkgs/development/python-modules/flask-paranoid/default.nixnew file+40

@@ -0,0 +1,40 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, flask

5+, pytestCheckHook

6+}:

7+

8+buildPythonPackage rec {

9+ pname = "flask-paranoid";

10+ version = "0.2";

11+

12+ src = fetchFromGitHub {

13+ owner = "miguelgrinberg";

14+ repo = pname;

15+ rev = "v${version}";

16+ sha256 = "0WWc/ktAOuTk4A75xI1jCj/aef2+1TjLKBA9+PRfJO0=";

17+ };

18+

19+ postPatch = ''

20+ # tests have a typo in one of the assertions

21+ substituteInPlace tests/test_paranoid.py --replace "01-Jan-1970" "01 Jan 1970"

22+ '';

23+

24+ propagatedBuildInputs = [

25+ flask

26+ ];

27+

28+ checkInputs = [

29+ pytestCheckHook

30+ ];

31+

32+ pythonImportsCheck = [ "flask_paranoid" ];

33+

34+ meta = with lib; {

35+ homepage = "https://github.com/miguelgrinberg/flask-paranoid/";

36+ description = "Simple user session protection";

37+ license = licenses.mit;

38+ maintainers = with maintainers; [ gador ];

39+ };

40+}

pkgs/development/python-modules/flask-security-too/default.nixnew file+76

@@ -0,0 +1,76 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, flask

5+, blinker

6+, setuptools

7+, itsdangerous

8+, flask_principal

9+, passlib

10+, email_validator

11+, flask_wtf

12+, flask_login

13+, pytestCheckHook

14+, flask_mail

15+, sqlalchemy

16+, flask_sqlalchemy

17+, flask-mongoengine

18+, peewee

19+, pony

20+, zxcvbn

21+, mongoengine

22+, cryptography

23+, pyqrcode

24+, phonenumbers

25+, bleach

26+, mongomock

27+}:

28+

29+buildPythonPackage rec {

30+ pname = "flask-security-too";

31+ version = "4.1.2";

32+

33+ src = fetchPypi {

34+ pname = "Flask-Security-Too";

35+ inherit version;

36+ sha256 = "16ws5n08vm7wsa2f7lrkxvc7jl3ah1xfylhhyzb4vvqmlk7x9hw8";

37+ };

38+

39+ propagatedBuildInputs = [

40+ flask

41+ flask_login

42+ flask_principal

43+ flask_wtf

44+ email_validator

45+ itsdangerous

46+ passlib

47+ blinker

48+ setuptools

49+ ];

50+

51+ checkInputs = [

52+ pytestCheckHook

53+ flask_mail

54+ sqlalchemy

55+ flask_sqlalchemy

56+ flask-mongoengine

57+ peewee

58+ pony

59+ zxcvbn

60+ mongoengine

61+ cryptography

62+ pyqrcode

63+ phonenumbers

64+ bleach

65+ mongomock

66+ ];

67+

68+ pythonImportsCheck = [ "flask_security" ];

69+

70+ meta = with lib; {

71+ homepage = "https://pypi.org/project/Flask-Security-Too/";

72+ description = "Simple security for Flask apps (fork)";

73+ license = licenses.mit;

74+ maintainers = with maintainers; [ gador ];

75+ };

76+}

pkgs/development/python-modules/flatten-dict/default.nixnew file+46

@@ -0,0 +1,46 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, poetry-core

5+, pytestCheckHook

6+, pythonOlder

7+, six

8+}:

9+

10+buildPythonPackage rec {

11+ pname = "flatten-dict";

12+ version = "0.4.2";

13+ format = "pyproject";

14+

15+ disabled = pythonOlder "3.7";

16+

17+ src = fetchFromGitHub {

18+ owner = "ianlini";

19+ repo = pname;

20+ rev = version;

21+ hash = "sha256-uHenKoD4eLm9sMREVuV0BB/oUgh4NMiuj+IWd0hlxNQ=";

22+ };

23+

24+ nativeBuildInputs = [

25+ poetry-core

26+ ];

27+

28+ propagatedBuildInputs = [

29+ six

30+ ];

31+

32+ checkInputs = [

33+ pytestCheckHook

34+ ];

35+

36+ pythonImportsCheck = [

37+ "flatten_dict"

38+ ];

39+

40+ meta = with lib; {

41+ description = "Module for flattening and unflattening dict-like objects";

42+ homepage = "https://github.com/ianlini/flatten-dict";

43+ license = licenses.mit;

44+ maintainers = with maintainers; [ fab ];

45+ };

46+}

pkgs/development/python-modules/flux-led/default.nix+2−2

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

88

99buildPythonPackage rec {

1010 pname = "flux-led";

11− version = "0.28.3";

11+ version = "0.28.4";

1212 format = "setuptools";

1313

1414 disabled = pythonOlder "3.7";

@@ -17,7 +17,7 @@ buildPythonPackage rec {

1717 owner = "Danielhiversen";

1818 repo = "flux_led";

1919 rev = version;

20− sha256 = "sha256-IkH5cCJbBUekABUcRyJl00tZgx+WqipEVsK8/ks2KDk=";

20+ sha256 = "sha256-mD6pTrUAzApJamqqcLzzQI2JDKy3PAn5TtQz5/aPFXg=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/google-api-core/default.nix+2−2

@@ -16,14 +16,14 @@

1616

1717buildPythonPackage rec {

1818 pname = "google-api-core";

19− version = "2.2.2";

19+ version = "2.4.0";

2020 format = "setuptools";

2121

2222 disabled = pythonOlder "3.6";

2323

2424 src = fetchPypi {

2525 inherit pname version;

26− sha256 = "97349cc18c2bb2415f64f1353a80273a289a61294ce3eb2f7ce682d251bdd997";

26+ sha256 = "sha256-uoeHt8YWMs0DQPCV4cA2vvlCayWU8Qr7KQujEa6Msss=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-bigquery/default.nix+2−2

@@ -18,12 +18,12 @@

1818

1919buildPythonPackage rec {

2020 pname = "google-cloud-bigquery";

21− version = "2.31.0";

21+ version = "2.32.0";

2222 format = "setuptools";

2323

2424 src = fetchPypi {

2525 inherit pname version;

26− sha256 = "ff66d7d1f64795a855784706c3baa52d18fa0cd1cc4f0a150cf74268abb53ac0";

26+ sha256 = "sha256-84Y6xCk/CkWF5ERh2CuR+SOXIe8z/JV11AG02n3BJ70=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-datacatalog/default.nix+2−2

@@ -2,11 +2,11 @@

22

33buildPythonPackage rec {

44 pname = "google-cloud-datacatalog";

5− version = "3.6.1";

5+ version = "3.6.2";

66

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "136fb153740d4154d8c9ef306284f7f899399de45eef2c9027ca3e56249c4e2d";

9+ sha256 = "sha256-9oixM+4HxHn0G3j8Hpg1iB5gM+7xyD5GBbWpEzzjdrE=";

1010 };

1111

1212 propagatedBuildInputs = [ libcst google-api-core grpc-google-iam-v1 proto-plus ];

pkgs/development/python-modules/google-cloud-storage/default.nix+2−2

@@ -13,11 +13,11 @@

1313

1414buildPythonPackage rec {

1515 pname = "google-cloud-storage";

16− version = "1.44.0";

16+ version = "2.0.0";

1717

1818 src = fetchPypi {

1919 inherit pname version;

20− sha256 = "29edbfeedd157d853049302bf5d104055c6f0cb7ef283537da3ce3f730073001";

20+ sha256 = "sha256-pXoVrq0PnfvUOB8b/b6L+JgYpL11urhGyvzvstuEbEc=";

2121 };

2222

2323 propagatedBuildInputs = [

pkgs/development/python-modules/google-cloud-tasks/default.nix+2−2

@@ -12,11 +12,11 @@

1212

1313buildPythonPackage rec {

1414 pname = "google-cloud-tasks";

15− version = "2.7.1";

15+ version = "2.7.2";

1616

1717 src = fetchPypi {

1818 inherit pname version;

19− sha256 = "2fd2222901a7d8ba65f28f9019cb41f5d4c952d012f020bdde105527a3f5ae43";

19+ sha256 = "sha256-h/lmrrT8fu1YLDYF6s856EAB8+k7CMFfIMGZPDxC7Ys=";

2020 };

2121

2222 propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

pkgs/development/python-modules/google-cloud-testutils/default.nix+2−2

@@ -2,11 +2,11 @@

22

33buildPythonPackage rec {

44 pname = "google-cloud-testutils";

5− version = "1.3.0";

5+ version = "1.3.1";

66

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "7a755c1247e32e92bd6df4fa2240dab185b29da9777ab3b946c3b3d9f1abf5d3";

9+ sha256 = "sha256-X85NRgGZt7+OpL4poOyS+UWec4fuABiTxEYyFpkUpqs=";

1010 };

1111

1212 propagatedBuildInputs = [ click google-auth six ];

pkgs/development/python-modules/grandalf/default.nix+19−13

@@ -3,20 +3,22 @@

33, fetchFromGitHub

44, pyparsing

55, future

6−, pytest

7−, pytest-runner

6+, pytestCheckHook

7+, pythonOlder

88}:

99

1010buildPythonPackage rec {

1111 pname = "grandalf";

12− version = "0.6";

12+ version = "0.7";

13+ format = "setuptools";

14+

15+ disabled = pythonOlder "3.7";

1316

14− # fetch from github to acquire tests

1517 src = fetchFromGitHub {

1618 owner = "bdcht";

17− repo = "grandalf";

19+ repo = pname;

1820 rev = "v${version}";

19− sha256 = "1f1l288sqna0bca7dwwvyw7wzg9b2613g6vc0g0vfngm7k75b2jg";

21+ hash = "sha256-j2SvpQvDMfwoj2PAQSxzEIyIzzJ61Eb9wgetKyni6A4=";

2022 };

2123

2224 propagatedBuildInputs = [

@@ -24,18 +26,22 @@ buildPythonPackage rec {

2426 future

2527 ];

2628

27− checkInputs = [ pytest pytest-runner ];

29+ checkInputs = [

30+ pytestCheckHook

31+ ];

2832

29− patches = [ ./no-setup-requires-pytestrunner.patch ];

33+ patches = [

34+ ./no-setup-requires-pytestrunner.patch

35+ ];

3036

31− checkPhase = ''

32− pytest tests

33− '';

37+ pythonImportsCheck = [

38+ "grandalf"

39+ ];

3440

3541 meta = with lib; {

36− description = "A python package made for experimentations with graphs and drawing algorithms";

42+ description = "Module for experimentations with graphs and drawing algorithms";

3743 homepage = "https://github.com/bdcht/grandalf";

38− license = licenses.gpl2;

44+ license = licenses.gpl2Only;

3945 maintainers = with maintainers; [ cmcdragonkai ];

4046 };

4147}

pkgs/development/python-modules/graph-tool/2.x.x.nix → pkgs/development/python-modules/graph-tool/default.nixrenamed

The content is the same.

pkgs/development/python-modules/greeclimate/default.nix+2−2

@@ -10,7 +10,7 @@

1010

1111buildPythonPackage rec {

1212 pname = "greeclimate";

13− version = "1.0.1";

13+ version = "1.0.2";

1414 format = "setuptools";

1515

1616 disabled = pythonOlder "3.6";

@@ -19,7 +19,7 @@ buildPythonPackage rec {

1919 owner = "cmroche";

2020 repo = "greeclimate";

2121 rev = "v${version}";

22− hash = "sha256-O9SaEveZntb7VWL5k1WjTDK9fXhTWFIsVh5v7NKASnQ=";

22+ hash = "sha256-Y8IgqrU8zzV020qwyyb57Tp2j7laQ3JsCOCYBuf8vsQ=";

2323 };

2424

2525 propagatedBuildInputs = [

pkgs/development/python-modules/gvm-tools/default.nix+3

@@ -4,6 +4,7 @@

44, poetry-core

55, pytestCheckHook

66, python-gvm

7+, pythonAtLeast

78, pythonOlder

89}:

910

@@ -36,6 +37,8 @@ buildPythonPackage rec {

3637 disabledTests = [

3738 # Don't test sending

3839 "SendTargetTestCase"

40+ ] ++ lib.optionals (pythonAtLeast "3.10") [

41+ "HelpFormattingParserTestCase"

3942 ];

4043

4144 pythonImportsCheck = [

pkgs/development/python-modules/hangups/default.nix+3−4

@@ -18,7 +18,7 @@

1818

1919buildPythonPackage rec {

2020 pname = "hangups";

21− version = "0.4.15";

21+ version = "0.4.17";

2222

2323 disabled = pythonOlder "3.6";

2424

@@ -26,13 +26,12 @@ buildPythonPackage rec {

2626 owner = "tdryer";

2727 repo = "hangups";

2828 rev = "v${version}";

29− sha256 = "sha256-47OvfFK92AtX6KiYnvro2B17RfQWyzgsgvOfl5T3Kag=";

29+ hash = "sha256-8kNWcRAip9LkmazDUVeDjGWhy/TWzT01c959LA5hb1Q=";

3030 };

3131

3232 postPatch = ''

3333 substituteInPlace setup.py \

34− --replace "protobuf>=3.1.0,<3.17" "protobuf" \

35− --replace "async-timeout>=2,<4" "async-timeout" \

34+ --replace "protobuf>=3.1.0,<3.20" "protobuf" \

3635 --replace "MechanicalSoup>=0.6.0,<0.13" "MechanicalSoup"

3736 '';

3837

pkgs/development/python-modules/hap-python/default.nix+2−2

@@ -16,14 +16,14 @@

1616

1717buildPythonPackage rec {

1818 pname = "hap-python";

19− version = "4.3.0";

19+ version = "4.4.0";

2020 disabled = pythonOlder "3.6";

2121

2222 src = fetchFromGitHub {

2323 owner = "ikalchev";

2424 repo = "HAP-python";

2525 rev = "v${version}";

26− sha256 = "sha256-G4KL6iMeVn/tmvFtFL8vyqHGNfqk6j8iG4tDK9VpCyM=";

26+ sha256 = "sha256-dSiI2W4U4FYwMRBInpxb/wkQLKxPzLHIkLPNgiZEhUA=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/httpagentparser/default.nixnew file+26

@@ -0,0 +1,26 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+}:

5+

6+buildPythonPackage rec {

7+ pname = "httpagentparser";

8+ version = "1.9.1";

9+

10+ src = fetchPypi {

11+ inherit pname version;

12+ sha256 = "73Y9MZk912GCWs7myLNL4yuVzxZ10cc8PNNfnlKDGyY=";

13+ };

14+

15+ # PyPi version does not include test directory

16+ doCheck = false;

17+

18+ pythonImportsCheck = [ "httpagentparser" ];

19+

20+ meta = with lib; {

21+ homepage = "https://github.com/shon/httpagentparser";

22+ description = "Extracts OS Browser etc information from http user agent string";

23+ license = licenses.mit;

24+ maintainers = with maintainers; [ gador ];

25+ };

26+}

pkgs/development/python-modules/hwi/default.nix+12−5

@@ -8,11 +8,15 @@

88, mnemonic

99, pyaes

1010, typing-extensions

11+, pythonOlder

1112}:

1213

1314buildPythonPackage rec {

1415 pname = "hwi";

1516 version = "2.0.2";

17+ format = "setuptools";

18+

19+ disabled = pythonOlder "3.7";

1620

1721 src = fetchFromGitHub {

1822 owner = "bitcoin-core";

@@ -34,18 +38,21 @@ buildPythonPackage rec {

3438 # make compatible with libusb1 2.x

3539 postPatch = ''

3640 substituteInPlace setup.py \

37− --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7'

41+ --replace 'libusb1>=1.7,<2.0' 'libusb1>=1.7' \

42+ --replace "'python_requires': '>=3.6,<3.10'," "'python_requires': '>=3.6,<4',"

3843 '';

3944

4045 # tests require to clone quite a few firmwares

4146 doCheck = false;

4247

43− pythonImportsCheck = [ "hwilib" ];

48+ pythonImportsCheck = [

49+ "hwilib"

50+ ];

4451

45− meta = {

52+ meta = with lib; {

4653 description = "Bitcoin Hardware Wallet Interface";

4754 homepage = "https://github.com/bitcoin-core/hwi";

48− license = with lib.licenses; [ mit ];

49− maintainers = with lib.maintainers; [ prusnak ];

55+ license = with licenses; [ mit ];

56+ maintainers = with maintainers; [ prusnak ];

5057 };

5158}

pkgs/development/python-modules/ics/default.nix+2

@@ -40,6 +40,8 @@ buildPythonPackage rec {

4040 disabledTests = [

4141 # Failure seems to be related to arrow > 1.0

4242 "test_event"

43+ # Broke with TatSu 5.7:

44+ "test_many_lines"

4345 ];

4446

4547 pythonImportsCheck = [ "ics" ];

pkgs/development/python-modules/identify/default.nix+2−2

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

99

1010buildPythonPackage rec {

1111 pname = "identify";

12− version = "2.4.3";

12+ version = "2.4.4";

1313 format = "setuptools";

1414

1515 disabled = pythonOlder "3.7";

@@ -18,7 +18,7 @@ buildPythonPackage rec {

1818 owner = "pre-commit";

1919 repo = pname;

2020 rev = "v${version}";

21− sha256 = "sha256-r7Ta/OumYdm+brM6UgAPTWvxODpex1Mg0Arq94tPdnM=";

21+ sha256 = "sha256-G819m1mMtk5v1paMf9vdK/m/gbq08NNHM1bfW7jb+JA=";

2222 };

2323

2424 checkInputs = [

pkgs/development/python-modules/installer/default.nixnew file+35

@@ -0,0 +1,35 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+, pytestCheckHook

6+, flit-core

7+, mock

8+}:

9+

10+buildPythonPackage rec {

11+ pname = "installer";

12+ version = "0.3.0";

13+ format = "pyproject";

14+

15+ src = fetchFromGitHub {

16+ owner = "pradyunsg";

17+ repo = pname;

18+ rev = version;

19+ sha256 = "sha256-AxAQgDhRFkb0HB7ttDb+pHuHzwnNDX6UOm9rswzIwmI=";

20+ };

21+

22+ nativeBuildInputs = [ flit-core ];

23+

24+ checkInputs = [

25+ pytestCheckHook

26+ mock

27+ ];

28+

29+ meta = with lib; {

30+ homepage = "https://github.com/pradyunsg/installer";

31+ description = "A low-level library for installing a Python package from a wheel distribution.";

32+ license = licenses.mit;

33+ maintainers = with maintainers; [ cpcloud fridh ];

34+ };

35+}

pkgs/development/python-modules/ipython/7.16.nixdeleted−69

@@ -1,69 +0,0 @@

1−{ lib

2−, stdenv

3−, buildPythonPackage

4−, fetchPypi

5−, pythonOlder

6−# Build dependencies

7−, glibcLocales

8−# Test dependencies

9−, nose

10−, pygments

11−# Runtime dependencies

12−, jedi

13−, decorator

14−, pickleshare

15−, traitlets

16−, prompt-toolkit

17−, pexpect

18−, appnope

19−, backcall

20−}:

21−

22−buildPythonPackage rec {

23− pname = "ipython";

24− version = "7.16.1";

25− disabled = pythonOlder "3.6";

26−

27− src = fetchPypi {

28− inherit pname version;

29− sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf";

30− };

31−

32− prePatch = lib.optionalString stdenv.isDarwin ''

33− substituteInPlace setup.py --replace "'gnureadline'" " "

34− '';

35−

36− buildInputs = [ glibcLocales ];

37−

38− checkInputs = [ nose pygments ];

39−

40− propagatedBuildInputs = [

41− jedi

42− decorator

43− pickleshare

44− traitlets

45− prompt-toolkit

46− pygments

47− pexpect

48− backcall

49− ] ++ lib.optionals stdenv.isDarwin [appnope];

50−

51− LC_ALL="en_US.UTF-8";

52−

53− doCheck = false; # Circular dependency with ipykernel

54−

55− checkPhase = ''

56− nosetests

57− '';

58−

59− pythonImportsCheck = [

60− "IPython"

61− ];

62−

63− meta = with lib; {

64− description = "IPython: Productive Interactive Computing";

65− homepage = "http://ipython.org/";

66− license = licenses.bsd3;

67− maintainers = with maintainers; [ bjornfor fridh ];

68− };

69−}

pkgs/development/python-modules/irc/default.nix+2−2

@@ -5,13 +5,13 @@

55

66buildPythonPackage rec {

77 pname = "irc";

8− version = "19.0.1";

8+ version = "20.0.0";

99

1010 disabled = !isPy3k;

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "99fd5d1fa1d054dee4fbb81e0d5193dc1e8200db751d5da9a97850a62162b9ab";

14+ sha256 = "59acb8d69d61a0cbd290e77e6ff10a8c7f2201fb8c7b7d5a195b5883d0c40b0a";

1515 };

1616

1717 doCheck = false;

pkgs/development/python-modules/mailchecker/default.nixnew file+32

@@ -0,0 +1,32 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, pythonOlder

5+}:

6+

7+buildPythonPackage rec {

8+ pname = "mailchecker";

9+ version = "4.1.8";

10+ format = "setuptools";

11+

12+ disabled = pythonOlder "3.7";

13+

14+ src = fetchPypi {

15+ inherit pname version;

16+ hash = "sha256-RLZunjRX7lljKQl+sJ/py8bTR/YZsDewTJao9IBuLbE=";

17+ };

18+

19+ # Module has no tests

20+ doCheck = false;

21+

22+ pythonImportsCheck = [

23+ "MailChecker"

24+ ];

25+

26+ meta = with lib; {

27+ description = "Module for temporary (disposable/throwaway) email detection";

28+ homepage = "https://github.com/FGRibreau/mailchecker";

29+ license = licenses.mit;

30+ maintainers = with maintainers; [ fab ];

31+ };

32+}

pkgs/development/python-modules/matrix-common/default.nixnew file+27

@@ -0,0 +1,27 @@

1+{ stdenv

2+, lib

3+, buildPythonPackage

4+, fetchPypi

5+, attrs

6+}:

7+

8+buildPythonPackage rec {

9+ pname = "matrix_common";

10+ version = "1.0.0";

11+ format = "pyproject";

12+

13+ src = fetchPypi {

14+ inherit pname version;

15+ sha256 = "sha256-ZmiKRoJ8hv1USuJBDzV2U1uIFt2lRxmT+iAOqOShJK4=";

16+ };

17+

18+ propagatedBuildInputs = [ attrs ];

19+ pythonImportsCheck = [ "matrix_common" ];

20+

21+ meta = with lib; {

22+ description = "Common utilities for Synapse, Sydent and Sygnal";

23+ homepage = "https://github.com/matrix-org/matrix-python-common";

24+ license = licenses.asl20;

25+ maintainers = with maintainers; [ sumnerevans ];

26+ };

27+}

pkgs/development/python-modules/meshtastic/default.nix+2−2

@@ -18,7 +18,7 @@

1818

1919buildPythonPackage rec {

2020 pname = "meshtastic";

21− version = "1.2.54";

21+ version = "1.2.57";

2222 format = "setuptools";

2323

2424 disabled = pythonOlder "3.6";

@@ -27,7 +27,7 @@ buildPythonPackage rec {

2727 owner = "meshtastic";

2828 repo = "Meshtastic-python";

2929 rev = version;

30− sha256 = "sha256-YTE0lcsPBvcTdeYRrADQjs5b8inO7+nSw2YW2xalo74=";

30+ sha256 = "sha256-olh8DUYg3s72ll1+p+0QapdKR2+aaSvgSUrZuGFif1s=";

3131 };

3232

3333 propagatedBuildInputs = [

pkgs/development/python-modules/mitogen/default.nix+9−3

@@ -1,23 +1,29 @@

11{ lib

22, buildPythonPackage

33, fetchFromGitHub

4+, pythonOlder

45}:

56

67buildPythonPackage rec {

78 pname = "mitogen";

8− version = "0.3.0";

9+ version = "0.3.2";

10+ format = "setuptools";

11+

12+ disabled = pythonOlder "3.7";

913

1014 src = fetchFromGitHub {

1115 owner = "mitogen-hq";

1216 repo = pname;

1317 rev = "v${version}";

14− sha256 = "sha256-SotxlsJDIeFd4BN9C7afyyybET5ST2yaoWVEyT/lr48=";

18+ sha256 = "sha256-ACd1z9h9RLu6Kho59L2YkXkLtBEywYbO+drUvoZaVlg=";

1519 };

1620

1721 # Tests require network access and Docker support

1822 doCheck = false;

1923

20− pythonImportsCheck = [ "mitogen" ];

24+ pythonImportsCheck = [

25+ "mitogen"

26+ ];

2127

2228 meta = with lib; {

2329 description = "Python Library for writing distributed self-replicating programs";

pkgs/development/python-modules/mlflow/default.nix+14−3

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

1−{ lib, buildPythonPackage, fetchPypi, isPy27

1+{ lib, buildPythonPackage, fetchPypi, isPy27, fetchpatch

22, alembic

33, click

44, cloudpickle

@@ -20,6 +20,8 @@

2020, sqlalchemy

2121, gorilla

2222, gunicorn

23+, prometheus-flask-exporter

24+, importlib-metadata

2325}:

2426

2527buildPythonPackage rec {

@@ -58,6 +60,17 @@ buildPythonPackage rec {

5860 sqlalchemy

5961 gorilla

6062 gunicorn

63+ prometheus-flask-exporter

64+ importlib-metadata

65+ ];

66+

67+ patches = [

68+ # Relex alembic version, https://github.com/mlflow/mlflow/pull/5245

69+ (fetchpatch {

70+ name = "relax-alembic-version.patch";

71+ url = "https://github.com/mlflow/mlflow/commit/945eb4b67f315c0b2c4018b1df006fde910f115f.patch";

72+ sha256 = "sha256-jETVEPzlNe0PvFZVOi1SwgJELfx/KCeq6REL3vl+YT0=";

73+ })

6174 ];

6275

6376 meta = with lib; {

@@ -65,7 +78,5 @@ buildPythonPackage rec {

6578 description = "Open source platform for the machine learning lifecycle";

6679 license = licenses.asl20;

6780 maintainers = with maintainers; [ tbenst ];

68− # missing prometheus-flask-exporter, not packaged in nixpkgs

69− broken = true; # 2020-08-15

7081 };

7182}

pkgs/development/python-modules/mongomock/default.nixnew file+40

@@ -0,0 +1,40 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+, pbr

5+, sentinels

6+, six

7+, pytestCheckHook

8+}:

9+

10+buildPythonPackage rec {

11+ pname = "mongomock";

12+ version = "3.23.0";

13+

14+ src = fetchPypi {

15+ inherit pname version;

16+ sha256 = "1pdh4pj5n6dsaqy98q40wig5y6imfs1p043cgkaaw8f2hxy5x56r";

17+ };

18+

19+ nativeBuildInputs = [

20+ pbr

21+ ];

22+

23+ propagatedBuildInputs = [

24+ sentinels

25+ six

26+ ];

27+

28+ checkInputs = [

29+ pytestCheckHook

30+ ];

31+

32+ pythonImportsCheck = [ "mongomock" ];

33+

34+ meta = with lib; {

35+ homepage = "https://github.com/mongomock/mongomock";

36+ description = "Fake pymongo stub for testing simple MongoDB-dependent code";

37+ license = licenses.bsd3;

38+ maintainers = with maintainers; [ gador ];

39+ };

40+}

pkgs/development/python-modules/nexia/default.nix+9−4

@@ -9,14 +9,16 @@

99

1010buildPythonPackage rec {

1111 pname = "nexia";

12− version = "0.9.12";

12+ version = "0.9.13";

13+ format = "setuptools";

14+

1315 disabled = pythonOlder "3.5";

1416

1517 src = fetchFromGitHub {

1618 owner = "bdraco";

1719 repo = pname;

1820 rev = version;

19− sha256 = "sha256-YZHAWRTYquUm3Ymi/3mSQqxYZuoxsH5Q/LZOPDftEzU=";

21+ sha256 = "sha256-0VG8tSwbVTIIsQYAEwzQfXLTDy4df/nS/rbHjYo7xf0=";

2022 };

2123

2224 propagatedBuildInputs = [

@@ -29,10 +31,13 @@ buildPythonPackage rec {

2931 ];

3032

3133 postPatch = ''

32− substituteInPlace setup.py --replace '"pytest-runner",' ""

34+ substituteInPlace setup.py \

35+ --replace '"pytest-runner",' ""

3336 '';

3437

35− pythonImportsCheck = [ "nexia" ];

38+ pythonImportsCheck = [

39+ "nexia"

40+ ];

3641

3742 meta = with lib; {

3843 description = "Python module for Nexia thermostats";

pkgs/development/python-modules/pdm-pep517/default.nixnew file+38

@@ -0,0 +1,38 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchPypi

5+, git

6+, pytestCheckHook

7+}:

8+

9+buildPythonPackage rec {

10+ pname = "pdm-pep517";

11+ version = "0.9.4";

12+ format = "pyproject";

13+ disabled = pythonOlder "3.7";

14+

15+ src = fetchPypi {

16+ inherit pname version;

17+ sha256 = "sha256-2o2FuuvS5PW7uhxl3EGBP75CZ3dcyjPoug1k0irl51c=";

18+ };

19+

20+ preCheck = ''

21+ HOME=$TMPDIR

22+

23+ git config --global user.name nobody

24+ git config --global user.email nobody@example.com

25+ '';

26+

27+ checkInputs = [

28+ pytestCheckHook

29+ git

30+ ];

31+

32+ meta = with lib; {

33+ homepage = "https://github.com/pdm-project/pdm-pep517";

34+ description = "Yet another PEP 517 backend.";

35+ license = licenses.mit;

36+ maintainers = with maintainers; [ cpcloud ];

37+ };

38+}

pkgs/development/python-modules/pikepdf/default.nix+2−2

@@ -25,7 +25,7 @@

2525

2626buildPythonPackage rec {

2727 pname = "pikepdf";

28− version = "4.3.0";

28+ version = "4.3.1";

2929 disabled = ! isPy3k;

3030

3131 src = fetchFromGitHub {

@@ -38,7 +38,7 @@ buildPythonPackage rec {

3838 extraPostFetch = ''

3939 rm "$out/.git_archival.txt"

4040 '';

41− hash = "sha256-9dSJ6+rZd49rFSQExYnFBGQGZ8MnFM+z/0Iz/nYkW4E=";

41+ hash = "sha256-u/NDDJGCcctWL3ivxtU+8CSlQH+5qkmXUcF4RkQOiPI=";

4242 };

4343

4444 patches = [

pkgs/development/python-modules/pony/default.nix+29−12

@@ -1,25 +1,42 @@

1−{ lib, python, buildPythonPackage, fetchPypi }:

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, pytestCheckHook

5+, pythonOlder

6+}:

27

38buildPythonPackage rec {

49 pname = "pony";

5− version = "0.7.14";

10+ version = "0.7.15rc1";

11+ format = "setuptools";

612

7− src = fetchPypi {

8− inherit pname version;

9− sha256 = "2f01e84e79ea7a14040225cb6c079bb266e7ba147346356c266490b18c77ce82";

13+ disabled = pythonOlder "3.7";

14+

15+ src = fetchFromGitHub {

16+ owner = "ponyorm";

17+ repo = pname;

18+ rev = "v${version}";

19+ hash = "sha256-EoMpVvPCwxJbNPoeF73djcaQ4lY9jRx5nJYR2A2LXoQ=";

1020 };

1121

12− doCheck = true;

22+ checkInputs = [

23+ pytestCheckHook

24+ ];

25+

26+ disabledTests = [

27+ # Tests are outdated

28+ "test_exception_msg"

29+ "test_method"

30+ ];

1331

14− # stripping the tests

15− postInstall = ''

16− rm -rf $out/${python.sitePackages}/pony/orm/tests

17− '';

32+ pythonImportsCheck = [

33+ "pony"

34+ ];

1835

1936 meta = with lib; {

20− description = "Pony is a Python ORM with beautiful query syntax";

37+ description = "Library for advanced object-relational mapping";

2138 homepage = "https://ponyorm.org/";

22− maintainers = with maintainers; [ d-goldin xvapx ];

2339 license = licenses.asl20;

40+ maintainers = with maintainers; [ d-goldin xvapx ];

2441 };

2542}

pkgs/development/python-modules/pyTelegramBotAPI/default.nix+2−2

@@ -2,11 +2,11 @@

22

33buildPythonPackage rec {

44 pname = "pyTelegramBotAPI";

5− version = "4.2.1";

5+ version = "4.3.0";

66

77 src = fetchPypi {

88 inherit pname version;

9− sha256 = "9a407fd58a406a53ae44ae8ff5f2edb4396be67bca3436523f791642d8561de3";

9+ sha256 = "a0405d1c6c60e6603594e9319c28d31b97abe49afe9af21d230f5072a1d38976";

1010 };

1111

1212 propagatedBuildInputs = [ aiohttp requests ];

pkgs/development/python-modules/pyatv/default.nix+2−2

@@ -20,7 +20,7 @@

2020

2121buildPythonPackage rec {

2222 pname = "pyatv";

23− version = "0.9.7";

23+ version = "0.9.8";

2424 format = "setuptools";

2525

2626 disabled = pythonOlder "3.6";

@@ -29,7 +29,7 @@ buildPythonPackage rec {

2929 owner = "postlund";

3030 repo = pname;

3131 rev = "v${version}";

32− sha256 = "1ikv9m1348sjv31gch5w0sj97jlr4yjxbqfyds7alxxcm5hrhai4";

32+ sha256 = "1ns1ys3mwi1s1b8zxcr7xgr1rfnlxwdn2fp680yi09x4d9nmnvqp";

3333 };

3434

3535 propagatedBuildInputs = [

pkgs/development/python-modules/pybotvac/default.nix+2−2

@@ -8,11 +8,11 @@

88

99buildPythonPackage rec {

1010 pname = "pybotvac";

11− version = "0.0.22";

11+ version = "0.0.23";

1212

1313 src = fetchPypi {

1414 inherit pname version;

15− sha256 = "sha256-hl8UmoVUbbHCSpCWdUTxoIlop5di+rUmGUQI9UWq3ik=";

15+ sha256 = "54b4fe565c10000c54d5644d081e2de1f850daefbac39cea74cea649b47bfb12";

1616 };

1717

1818 propagatedBuildInputs = [

pkgs/development/python-modules/pyhiveapi/default.nix+2−2

@@ -13,7 +13,7 @@

1313

1414buildPythonPackage rec {

1515 pname = "pyhiveapi";

16− version = "0.4.3";

16+ version = "0.4.6";

1717

1818 format = "pyproject";

1919

@@ -23,7 +23,7 @@ buildPythonPackage rec {

2323 owner = "Pyhass";

2424 repo = "Pyhiveapi";

2525 rev = "v${version}";

26− sha256 = "sha256-SCMASYBOdq9nko5RSQ5BEbRLjOB4FlgwOKwdDggiOv8=";

26+ hash = "sha256-muUVZYBUloKRnAx7H8ry72eg85GzmnpTG8M/MfKcnGM=";

2727 };

2828

2929 postPatch = ''

pkgs/development/python-modules/pyrogram/default.nix+4−2

@@ -5,26 +5,28 @@

55, pyaes

66, pysocks

77, async-lru

8+, tgcrypto

89, pytestCheckHook

910, pytest-asyncio

1011}:

1112

1213buildPythonPackage rec {

1314 pname = "pyrogram";

14− version = "1.3.1";

15+ version = "1.3.5";

1516

1617 disabled = pythonOlder "3.6";

1718

1819 src = fetchPypi {

1920 pname = "Pyrogram";

2021 inherit version;

21− sha256 = "e883c001ebf2d0f5ce6805063470c92436c493eb15547923e5d437e2c13f66cd";

22+ hash = "sha256-51/to8ZCyK6cYWQCGWcQ07rGDR29awfxcUNnSF5vIKE=";

2223 };

2324

2425 propagatedBuildInputs = [

2526 pyaes

2627 pysocks

2728 async-lru

29+ tgcrypto

2830 ];

2931

3032 checkInputs = [

pkgs/development/python-modules/pytest/5.nixdeleted−95

@@ -1,95 +0,0 @@

1−{ lib, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy

2−, atomicwrites

3−, attrs

4−, hypothesis

5−, more-itertools

6−, packaging

7−, pathlib2

8−, pluggy

9−, py

10−, pygments

11−, setuptools

12−, setuptools-scm

13−, six

14−, toml

15−, wcwidth

16−, writeText

17−}:

18−

19−buildPythonPackage rec {

20− version = "5.4.3";

21− pname = "pytest";

22−

23− disabled = !isPy3k;

24−

25− src = fetchPypi {

26− inherit pname version;

27− sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr";

28− };

29−

30− postPatch = ''

31− substituteInPlace setup.py \

32− --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0"

33− '';

34−

35− checkInputs = [ hypothesis pygments ];

36− nativeBuildInputs = [ setuptools-scm ];

37− propagatedBuildInputs = [

38− atomicwrites

39− attrs

40− more-itertools

41− packaging

42− pluggy

43− py

44− setuptools

45− six

46− toml

47− wcwidth

48− ] ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ];

49−

50− doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460

51−

52− preCheck = ''

53− # don't test bash builtins

54− rm testing/test_argcomplete.py

55− '';

56−

57− # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929

58− checkPhase = ''

59− runHook preCheck

60− $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py

61− runHook postCheck

62− '';

63−

64− # Remove .pytest_cache when using py.test in a Nix build

65− setupHook = writeText "pytest-hook" ''

66− pytestcachePhase() {

67− find $out -name .pytest_cache -type d -exec rm -rf {} +

68− }

69− preDistPhases+=" pytestcachePhase"

70−

71− # pytest generates it's own bytecode files to improve assertion messages.

72− # These files similar to cpython's bytecode files but are never laoded

73− # by python interpreter directly. We remove them for a few reasons:

74− # - files are non-deterministic: https://github.com/NixOS/nixpkgs/issues/139292

75− # (file headers are generatedt by pytest directly and contain timestamps)

76− # - files are not needed after tests are finished

77− pytestRemoveBytecodePhase () {

78− # suffix is defined at:

79− # https://github.com/pytest-dev/pytest/blob/5.4.3/src/_pytest/assertion/rewrite.py#L42-L45

80− find $out -name "*-pytest-*.py[co]" -delete

81− }

82− preDistPhases+=" pytestRemoveBytecodePhase"

83− '';

84−

85− pythonImportsCheck = [

86− "pytest"

87− ];

88−

89− meta = with lib; {

90− homepage = "https://docs.pytest.org";

91− description = "Framework for writing tests";

92− maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];

93− license = licenses.mit;

94− };

95−}

pkgs/development/python-modules/python-benedict/default.nixnew file+75

@@ -0,0 +1,75 @@

1+{ lib

2+, aiohttp

3+, buildPythonPackage

4+, fetchFromGitHub

5+, pytestCheckHook

6+, pythonOlder

7+

8+, mailchecker

9+, phonenumbers

10+, python-dateutil

11+, python-fsutil

12+, python-slugify

13+, pyyaml

14+, ftfy

15+, requests

16+, six

17+, toml

18+, xmltodict

19+}:

20+

21+buildPythonPackage rec {

22+ pname = "python-benedict";

23+ version = "0.24.3";

24+ format = "setuptools";

25+

26+ disabled = pythonOlder "3.7";

27+

28+ src = fetchFromGitHub {

29+ owner = "fabiocaccamo";

30+ repo = pname;

31+ rev = version;

32+ hash = "sha256-06n8MNoGQRSrBK2XeEBBoQ2NIXWf0qXPVBeP9ERMEj0=";

33+ };

34+

35+ propagatedBuildInputs = [

36+ mailchecker

37+ phonenumbers

38+ python-dateutil

39+ python-fsutil

40+ python-slugify

41+ pyyaml

42+ ftfy

43+ requests

44+ six

45+ toml

46+ xmltodict

47+ ];

48+

49+ checkInputs = [

50+ pytestCheckHook

51+ ];

52+

53+ disabledTests = [

54+ # Tests require network access

55+ "test_from_base64_with_valid_url_valid_content"

56+ "test_from_json_with_valid_url_valid_content"

57+ "test_from_pickle_with_valid_url_valid_content"

58+ "test_from_plist_with_valid_url_valid_content"

59+ "test_from_query_string_with_valid_url_valid_content"

60+ "test_from_toml_with_valid_url_valid_content"

61+ "test_from_xml_with_valid_url_valid_content"

62+ "test_from_yaml_with_valid_url_valid_content"

63+ ];

64+

65+ pythonImportsCheck = [

66+ "benedict"

67+ ];

68+

69+ meta = with lib; {

70+ description = "Module with keylist/keypath support";

71+ homepage = "https://github.com/fabiocaccamo/python-benedict";

72+ license = licenses.mit;

73+ maintainers = with maintainers; [ fab ];

74+ };

75+}

pkgs/development/python-modules/python-engineio/default.nix+2−2

@@ -16,7 +16,7 @@

1616

1717buildPythonPackage rec {

1818 pname = "python-engineio";

19− version = "4.3.0";

19+ version = "4.3.1";

2020 format = "setuptools";

2121

2222 disabled = pythonOlder "3.6";

@@ -25,7 +25,7 @@ buildPythonPackage rec {

2525 owner = "miguelgrinberg";

2626 repo = "python-engineio";

2727 rev = "v${version}";

28− sha256 = "sha256-ohNRtceh0bHBlnGSFUckG5KzoLY8Q1jvpFee7T78Vto=";

28+ sha256 = "sha256-8595zivZmff0agFiQd5Qyd/T3BDxYcsb4RjA5AWXVNM=";

2929 };

3030

3131 checkInputs = [

pkgs/development/python-modules/python-fsutil/default.nixnew file+51

@@ -0,0 +1,51 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, pytestCheckHook

5+, pythonOlder

6+, requests

7+}:

8+

9+buildPythonPackage rec {

10+ pname = "python-fsutil";

11+ version = "0.5.0";

12+ format = "setuptools";

13+

14+ disabled = pythonOlder "3.7";

15+

16+ src = fetchFromGitHub {

17+ owner = "fabiocaccamo";

18+ repo = pname;

19+ rev = version;

20+ hash = "sha256-zWthL7iwdVzdihX2YA4G//B18iwe1gRT0GM2KNP01kQ=";

21+ };

22+

23+ propagatedBuildInputs = [

24+ requests

25+ ];

26+

27+ checkInputs = [

28+ pytestCheckHook

29+ ];

30+

31+ pytestFlagsArray = [

32+ "tests/test.py"

33+ ];

34+

35+ disabledTests = [

36+ # Tests require network access

37+ "test_download_file"

38+ "test_read_file_from_url"

39+ ];

40+

41+ pythonImportsCheck = [

42+ "fsutil"

43+ ];

44+

45+ meta = with lib; {

46+ description = "Module with file-system utilities";

47+ homepage = "https://github.com/fabiocaccamo/python-fsutil";

48+ license = licenses.mit;

49+ maintainers = with maintainers; [ fab ];

50+ };

51+}

pkgs/development/python-modules/python-kasa/default.nix+5−18

@@ -2,7 +2,6 @@

22, asyncclick

33, buildPythonPackage

44, fetchFromGitHub

5−, fetchpatch

65, importlib-metadata

76, poetry-core

87, pytest-asyncio

@@ -14,7 +13,7 @@

1413

1514buildPythonPackage rec {

1615 pname = "python-kasa";

17− version = "0.4.0";

16+ version = "0.4.1";

1817 format = "pyproject";

1918

2019 disabled = pythonOlder "3.7";

@@ -23,7 +22,7 @@ buildPythonPackage rec {

2322 owner = pname;

2423 repo = pname;

2524 rev = version;

26− sha256 = "08blmz5kg826l08pf6yrvl8gc8iz3hfb6wsfqih606dal08kdhdi";

25+ sha256 = "sha256-4e9jpUDorZlKCYwWtqrba61zbkJl57oWUhEpFcaS9ak=";

2726 };

2827

2928 nativeBuildInputs = [

@@ -42,26 +41,14 @@ buildPythonPackage rec {

4241 voluptuous

4342 ];

4443

45− patches = [

46− # Switch to poetry-core, https://github.com/python-kasa/python-kasa/pull/226

47− (fetchpatch {

48− name = "switch-to-poetry-core.patch";

49− url = "https://github.com/python-kasa/python-kasa/commit/05c2a4a7dedbd60038e177b4d3f5ac5798544d11.patch";

50− sha256 = "0cla11yqx88wj2s50s3xxxhv4nz4h3wd9pi12v79778hzdlg58rr";

51− })

52− ];

53−

54− postPatch = ''

55− substituteInPlace pyproject.toml \

56− --replace 'asyncclick = "^7"' 'asyncclick = "*"'

57− '';

58−

5944 disabledTestPaths = [

6045 # Skip the examples tests

6146 "kasa/tests/test_readme_examples.py"

6247 ];

6348

64− pythonImportsCheck = [ "kasa" ];

49+ pythonImportsCheck = [

50+ "kasa"

51+ ];

6552

6653 meta = with lib; {

6754 description = "Python API for TP-Link Kasa Smarthome products";

pkgs/development/python-modules/python-miio/default.nix+2−2

@@ -24,13 +24,13 @@

2424

2525buildPythonPackage rec {

2626 pname = "python-miio";

27− version = "0.5.9.1";

27+ version = "0.5.9.2";

2828 disabled = pythonOlder "3.6.5";

2929 format = "pyproject";

3030

3131 src = fetchPypi {

3232 inherit pname version;

33− sha256 = "sha256-fWLN1mGSoB+H6YSwTYpx1fuXfkrHBgdRkhzDLbmMBcg=";

33+ sha256 = "sha256-AFwarRhFknfwTSvSDGoWE+/mv1KUD2XnWK/xCBqrN4o=";

3434 };

3535

3636 postPatch = ''

pkgs/development/python-modules/python-socketio/default.nix+2−2

@@ -14,7 +14,7 @@

1414

1515buildPythonPackage rec {

1616 pname = "python-socketio";

17− version = "5.5.0";

17+ version = "5.5.1";

1818 format = "setuptools";

1919

2020 disabled = pythonOlder "3.6";

@@ -23,7 +23,7 @@ buildPythonPackage rec {

2323 owner = "miguelgrinberg";

2424 repo = "python-socketio";

2525 rev = "v${version}";

26− sha256 = "sha256-K5rs3UEGN1BvWDDfJE9/dPDLsZ4EGSsEf6PXodvc2Bg=";

26+ sha256 = "sha256-mtXGSd7Y+frT22EL3QmiBNatwc6IrJqGBRfsQlD8LLk=";

2727 };

2828

2929 propagatedBuildInputs = [

pkgs/development/python-modules/pythonfinder/default.nixnew file+56

@@ -0,0 +1,56 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchFromGitHub

5+, pytestCheckHook

6+, attrs

7+, cached-property

8+, click

9+, six

10+, packaging

11+, pytest-cov

12+, pytest-timeout

13+}:

14+

15+buildPythonPackage rec {

16+ pname = "pythonfinder";

17+ version = "1.2.9";

18+ format = "pyproject";

19+

20+ src = fetchFromGitHub {

21+ owner = "sarugaku";

22+ repo = pname;

23+ rev = version;

24+ sha256 = "sha256-tPMqVKbYwBRvb8/GyYNxO8lwJLcUUQyRoCoF5tg6rxs=";

25+ };

26+

27+ propagatedBuildInputs = [

28+ attrs

29+ cached-property

30+ click

31+ six

32+ packaging

33+ ];

34+

35+ checkInputs = [

36+ pytestCheckHook

37+ pytest-cov

38+ pytest-timeout

39+ ];

40+

41+ pytestFlagsArray = [ "--no-cov" ];

42+

43+ # these tests invoke git in a subprocess and

44+ # for some reason git can't be found even if included in checkInputs

45+ disabledTests = [

46+ "test_shims_are_kept"

47+ "test_shims_are_removed"

48+ ];

49+

50+ meta = with lib; {

51+ homepage = "https://github.com/sarugaku/pythonfinder";

52+ description = "Cross Platform Search Tool for Finding Pythons";

53+ license = licenses.mit;

54+ maintainers = with maintainers; [ cpcloud ];

55+ };

56+}

pkgs/development/python-modules/pywayland/default.nix+2−2

@@ -10,11 +10,11 @@

1010

1111buildPythonPackage rec {

1212 pname = "pywayland";

13− version = "0.4.7";

13+ version = "0.4.8";

1414

1515 src = fetchPypi {

1616 inherit pname version;

17− sha256 = "0IMNOPTmY22JCHccIVuZxDhVr41cDcKNkx8bp+5h2CU=";

17+ sha256 = "abby4o9LmiRZwNkPhYfFOWgRtxU8e5CURQnutz6cWjQ=";

1818 };

1919

2020 nativeBuildInputs = [ pkg-config ];

pkgs/development/python-modules/rich/default.nix+2−2

@@ -13,7 +13,7 @@

1313

1414buildPythonPackage rec {

1515 pname = "rich";

16− version = "10.16.2";

16+ version = "11.0.0";

1717 format = "pyproject";

1818 disabled = pythonOlder "3.6";

1919

@@ -21,7 +21,7 @@ buildPythonPackage rec {

2121 owner = "willmcgugan";

2222 repo = pname;

2323 rev = "v${version}";

24− sha256 = "sha256-SVenprbWq+ucQPAM1e9sNVYWbGAeo7qdEBy+cvqAMK8=";

24+ sha256 = "0vkwar22rv1j6a3kqj3c016j0vnnha0kwi79fkd90ib1n501m7rn";

2525 };

2626

2727 nativeBuildInputs = [ poetry-core ];

pkgs/development/python-modules/sagemaker/default.nix+2−2

@@ -16,11 +16,11 @@

1616

1717buildPythonPackage rec {

1818 pname = "sagemaker";

19− version = "2.70.0";

19+ version = "2.72.2";

2020

2121 src = fetchPypi {

2222 inherit pname version;

23− sha256 = "1bc0b783befa4d07dd9c43da1d1d0f3a0e66767ce8aa2af0c376cfa47c12689a";

23+ sha256 = "7bc62eb713d6b2e72bf4b5635e2b1d18790f08ebd80cc9f380b5ba3a5000e727";

2424 };

2525

2626 pythonImportsCheck = [

pkgs/development/python-modules/sasmodels/default.nix+2−2

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

11{ lib

22, fetchFromGitHub

33, buildPythonPackage

4−, pytest_5

4+, pytest

55, numpy

66, scipy

77, matplotlib

@@ -24,7 +24,7 @@ buildPythonPackage rec {

2424 buildInputs = [ opencl-headers ];

2525 # Note: the 1.0.5 release should be compatible with pytest6, so this can

2626 # be set back to 'pytest' at that point

27− checkInputs = [ pytest_5 ];

27+ checkInputs = [ pytest ];

2828 propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ];

2929

3030 checkPhase = ''

pkgs/development/python-modules/scmrepo/default.nixnew file+53

@@ -0,0 +1,53 @@

1+{ lib

2+, asyncssh

3+, buildPythonPackage

4+, dulwich

5+, fetchFromGitHub

6+, fsspec

7+, funcy

8+, GitPython

9+, pathspec

10+, pygit2

11+, pygtrie

12+, pythonOlder

13+}:

14+

15+buildPythonPackage rec {

16+ pname = "scmrepo";

17+ version = "0.0.7";

18+ format = "pyproject";

19+

20+ disabled = pythonOlder "3.7";

21+

22+ src = fetchFromGitHub {

23+ owner = "iterative";

24+ repo = pname;

25+ rev = version;

26+ hash = "sha256-tZsogqcfAqpSo9yOz4z0mgY9SVU1epPmcBuyLJsHLfY=";

27+ };

28+

29+ propagatedBuildInputs = [

30+ asyncssh

31+ dulwich

32+ fsspec

33+ funcy

34+ GitPython

35+ pathspec

36+ pygit2

37+ pygtrie

38+ ];

39+

40+ # Requires a running Docker instance

41+ doCheck = false;

42+

43+ pythonImportsCheck = [

44+ "scmrepo"

45+ ];

46+

47+ meta = with lib; {

48+ description = "SCM wrapper and fsspec filesystem";

49+ homepage = "https://github.com/iterative/scmrepo";

50+ license = licenses.asl20;

51+ maintainers = with maintainers; [ fab ];

52+ };

53+}

pkgs/development/python-modules/secretstorage/2.nixdeleted−24

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

1−{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }:

2−

3−buildPythonPackage rec {

4− pname = "secretstorage";

5− version = "2.3.1";

6−

7− src = fetchPypi {

8− pname = "SecretStorage";

9− inherit version;

10− sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis";

11− };

12−

13− propagatedBuildInputs = [ cryptography dbus-python ];

14−

15− # Needs a D-Bus Sesison

16− doCheck = false;

17−

18− meta = with lib; {

19− homepage = "https://github.com/mitya57/secretstorage";

20− description = "Python bindings to FreeDesktop.org Secret Service API";

21− license = licenses.bsd3;

22− maintainers = with maintainers; [ orivej ];

23− };

24−}

pkgs/development/python-modules/sense-energy/default.nix+2−2

@@ -9,14 +9,14 @@

99

1010buildPythonPackage rec {

1111 pname = "sense-energy";

12− version = "0.9.3";

12+ version = "0.9.4";

1313 format = "setuptools";

1414

1515 src = fetchFromGitHub {

1616 owner = "scottbonline";

1717 repo = "sense";

1818 rev = version;

19− sha256 = "sha256-LUM7SP03U3mRxCTjgxPRXh/ZLz15R04zBWOxLKnan98=";

19+ hash = "sha256-X+sGfcEodxWkBmDamJkrZVsjyKkuqzsZ5BJFwOgL63M=";

2020 };

2121

2222 propagatedBuildInputs = [

pkgs/development/python-modules/sentinels/default.nixnew file+36

@@ -0,0 +1,36 @@

1+{ lib

2+, buildPythonPackage

3+, pythonOlder

4+, fetchPypi

5+, setuptools

6+, pytestCheckHook

7+}:

8+

9+buildPythonPackage rec {

10+ pname = "sentinels";

11+ version = "1.0.0";

12+

13+ disabled = pythonOlder "3.5";

14+

15+ src = fetchPypi {

16+ inherit pname version;

17+ sha256 = "1cglkxph47pki4db4kjx5g4ikxp2milqdlcjgqwmx4p1gx6p1q3v";

18+ };

19+

20+ propagatedBuildInputs = [

21+ setuptools

22+ ];

23+

24+ checkInputs = [

25+ pytestCheckHook

26+ ];

27+

28+ pythonImportsCheck = [ "sentinels" ];

29+

30+ meta = with lib; {

31+ homepage = "https://github.com/vmalloc/sentinels/";

32+ description = "Various objects to denote special meanings in python";

33+ license = licenses.bsd3;

34+ maintainers = with maintainers; [ gador ];

35+ };

36+}

pkgs/development/python-modules/sentry-sdk/default.nix+2−2

@@ -40,14 +40,14 @@

4040

4141buildPythonPackage rec {

4242 pname = "sentry-sdk";

43− version = "1.5.1";

43+ version = "1.5.2";

4444 format = "setuptools";

4545

4646 src = fetchFromGitHub {

4747 owner = "getsentry";

4848 repo = "sentry-python";

4949 rev = version;

50− sha256 = "sha256-vQ5zeAscPMQH3L+Ogj50IZZp2pBoYaxHzvcXakaoC4k=";

50+ sha256 = "086kzvrpy1c7kiwjrdyr4i4a8dp4vncsc8dk6hp8c7bwswfffa3d";

5151 };

5252

5353 propagatedBuildInputs = [

pkgs/development/python-modules/shtab/default.nixnew file+55

@@ -0,0 +1,55 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, pytest-timeout

5+, pytestCheckHook

6+, pythonOlder

7+, setuptools-scm

8+}:

9+

10+buildPythonPackage rec {

11+ pname = "shtab";

12+ version = "1.5.3";

13+ format = "setuptools";

14+

15+ disabled = pythonOlder "3.7";

16+

17+ src = fetchFromGitHub {

18+ owner = "iterative";

19+ repo = pname;

20+ rev = "v${version}";

21+ hash = "sha256-Wuc4m3VdOGEcevYXUpbL4gTvyW9t13pj57zPYdqx0UY=";

22+ };

23+

24+ SETUPTOOLS_SCM_PRETEND_VERSION = version;

25+

26+ nativeBuildInputs = [

27+ setuptools-scm

28+ ];

29+

30+ checkInputs = [

31+ pytest-timeout

32+ pytestCheckHook

33+ ];

34+

35+ postPatch = ''

36+ substituteInPlace setup.cfg \

37+ --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" ""

38+ '';

39+

40+ disabledTests = [

41+ # bash tests are failing

42+ "bash"

43+ ];

44+

45+ pythonImportsCheck = [

46+ "shtab"

47+ ];

48+

49+ meta = with lib; {

50+ description = "Module for shell tab completion of Python CLI applications";

51+ homepage = "https://docs.iterative.ai/shtab/";

52+ license = licenses.asl20;

53+ maintainers = with maintainers; [ fab ];

54+ };

55+}

pkgs/development/python-modules/socketio-client/default.nixnew file+39

@@ -0,0 +1,39 @@

1+{ lib

2+, buildPythonPackage

3+, requests

4+, six

5+, websocket-client

6+, fetchFromGitHub

7+}:

8+

9+buildPythonPackage rec {

10+ pname = "socketio-client";

11+ version = "0.7.2";

12+

13+ src = fetchFromGitHub {

14+ owner = "invisibleroads";

15+ repo = "socketio-client";

16+ rev = version;

17+ sha256 = "sha256-71sjiGJDDYElPGUNCH1HaVdvgMt8KeD/kXVDpF615ho=";

18+ };

19+

20+ propagatedBuildInputs = [

21+ six

22+ websocket-client

23+ requests

24+ ];

25+

26+ # Perform networking tests.

27+ doCheck = false;

28+

29+ pythonImportsCheck = [

30+ "socketIO_client"

31+ ];

32+

33+ meta = with lib; {

34+ description = "A socket.io client library for protocol 1.x";

35+ homepage = "https://github.com/invisibleroads/socketIO-client";

36+ license = licenses.mit;

37+ maintainers = with maintainers; [ raitobezarius ];

38+ };

39+}

pkgs/development/python-modules/sopel/default.nix+2−2

@@ -13,12 +13,12 @@

1313

1414buildPythonPackage rec {

1515 pname = "sopel";

16− version = "7.1.6";

16+ version = "7.1.7";

1717 disabled = isPyPy;

1818

1919 src = fetchPypi {

2020 inherit pname version;

21− sha256 = "ebd3b2aa9230835f8a68ea7f5a10324ddf35d70d89a9c92c8cba81c558565efb";

21+ sha256 = "4eb12e9753162e4c19a1bfdd42aea9eb7f5f15e316a6609b925350792fb454fd";

2222 };

2323

2424 propagatedBuildInputs = [

pkgs/development/python-modules/spacy-loggers/default.nixnew file+34

@@ -0,0 +1,34 @@

1+{ lib

2+, callPackage

3+, fetchPypi

4+, buildPythonPackage

5+, wandb

6+, wasabi

7+}:

8+

9+buildPythonPackage rec {

10+ pname = "spacy-loggers";

11+ version = "1.0.1";

12+

13+ src = fetchPypi {

14+ inherit pname version;

15+ sha256 = "sha256-F9DiSbLmxlRsSfxlYaCmhfkajtvySlsrd1nq1EPHRlQ=";

16+ };

17+

18+ propagatedBuildInputs = [

19+ wandb

20+ wasabi

21+ ];

22+

23+ pythonImportsCheck = [ "spacy_loggers" ];

24+

25+ # skipping the checks, becaus it requires a cycle dependency to spacy as well.

26+ doCheck = false;

27+

28+ meta = with lib; {

29+ description = "Logging utilities for spaCy";

30+ homepage = "https://github.com/explosion/spacy-loggers";

31+ license = licenses.mit;

32+ maintainers = with maintainers; [ stunkymonkey ];

33+ };

34+}

pkgs/development/python-modules/spacy/default.nix+6−2

@@ -25,17 +25,19 @@

2525, python

2626, tqdm

2727, typing-extensions

28+, spacy-loggers

29+, langcodes

2830}:

2931

3032buildPythonPackage rec {

3133 pname = "spacy";

32− version = "3.2.0";

34+ version = "3.2.1";

3335

3436 disabled = pythonOlder "3.6";

3537

3638 src = fetchPypi {

3739 inherit pname version;

38− sha256 = "68e54b2a14ce74eeecea9bfb0b9bdadf8a4a8157765dbefa7e50d25a1bf0f2f3";

40+ sha256 = "sha256-9uusURYndAqMorEXuR71UVyPCy+xF6aevgHQEN1PxTw=";

3941 };

4042

4143 propagatedBuildInputs = [

@@ -58,6 +60,8 @@ buildPythonPackage rec {

5860 tqdm

5961 typer

6062 wasabi

63+ spacy-loggers

64+ langcodes

6165 ] ++ lib.optional (pythonOlder "3.8") typing-extensions;

6266

6367 checkInputs = [

pkgs/development/python-modules/speaklater3/default.nixnew file+23

@@ -0,0 +1,23 @@

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+}:

5+

6+buildPythonPackage rec {

7+ pname = "speaklater3";

8+ version = "1.4";

9+

10+ src = fetchPypi {

11+ inherit pname version;

12+ sha256 = "ySYdS2taMEZyMS0esImb4Cj6yRdgGQqA/szTHTo7UEI=";

13+ };

14+

15+ pythonImportsCheck = [ "speaklater" ];

16+

17+ meta = with lib; {

18+ description = "Implements a lazy string for python useful for use with gettext";

19+ homepage = "https://github.com/mitsuhiko/speaklater";

20+ license = licenses.bsd0;

21+ maintainers = with maintainers; [ gador ];

22+ };

23+}

pkgs/development/python-modules/surepy/default.nix+2−1

@@ -33,7 +33,8 @@ buildPythonPackage rec {

3333 postPatch = ''

3434 substituteInPlace pyproject.toml \

3535 --replace 'aiohttp = {extras = ["speedups"], version = "^3.7.4"}' 'aiohttp = {extras = ["speedups"], version = ">=3.7.4"}' \

36− --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"'

36+ --replace 'async-timeout = "^3.0.1"' 'async-timeout = ">=3.0.1"' \

37+ --replace 'rich = "^10.1.0"' 'rich = ">=10.1.0"'

3738 '';

3839

3940 nativeBuildInputs = [

pkgs/development/python-modules/tempest/default.nix+9−2

@@ -1,6 +1,7 @@

11{ lib

22, buildPythonApplication

33, fetchPypi

4+, fetchpatch

45, pbr

56, cliff

67, jsonschema

@@ -20,7 +21,6 @@

2021, prettytable

2122, urllib3

2223, debtcollector

23−, unittest2

2424, hacking

2525, oslotest

2626, bash

@@ -36,6 +36,14 @@ buildPythonApplication rec {

3636 sha256 = "0521d3042360c0fb469b16f99174a9abddbae8a2d2a81268cfc664f1ccfdd0f9";

3737 };

3838

39+ patches = [

40+ # remove need for unittest2

41+ (fetchpatch {

42+ url = "https://github.com/openstack/tempest/commit/cd3745c27b7d8fcdaffc72b965a3d803d9ee12c2.patch";

43+ sha256 = "sha256-UwUmyFZokH66Xqfsj982MBHb0w7x6v4SAtXlqA5dpnk=";

44+ })

45+ ];

46+

3947 propagatedBuildInputs = [

4048 pbr

4149 cliff

@@ -56,7 +64,6 @@ buildPythonApplication rec {

5664 prettytable

5765 urllib3

5866 debtcollector

59− unittest2

6067 ];

6168

6269 checkInputs = [

pkgs/development/python-modules/teslajsonpy/default.nix+2−2

@@ -15,7 +15,7 @@

1515

1616buildPythonPackage rec {

1717 pname = "teslajsonpy";

18− version = "1.4.2";

18+ version = "1.5.0";

1919 format = "pyproject";

2020

2121 disabled = pythonOlder "3.6";

@@ -24,7 +24,7 @@ buildPythonPackage rec {

2424 owner = "zabuldon";

2525 repo = pname;

2626 rev = "v${version}";

27− sha256 = "sha256-oablQoumBiqDk7bz1BUpUWddxExoqOofrZzX7y618Hw=";

27+ sha256 = "sha256-5ZGj3ZS+KGtnlphyUF1xb9e2XuHa4qbOWWtyzZwP1RM=";

2828 };

2929

3030 nativeBuildInputs = [

pkgs/development/python-modules/transformers/default.nix+2−2

@@ -19,13 +19,13 @@

1919

2020buildPythonPackage rec {

2121 pname = "transformers";

22− version = "4.12.5";

22+ version = "4.15.0";

2323

2424 src = fetchFromGitHub {

2525 owner = "huggingface";

2626 repo = pname;

2727 rev = "v${version}";

28− sha256 = "07v72fyhm1s3bzg2kvaff15d7d8na39nlqpf5gyxaqvp3hglc3qy";

28+ sha256 = "05qwrs040sqxk5fi44rjx0s5ba4897iw8l7yk8f1xzv314df05fg";

2929 };

3030

3131 nativeBuildInputs = [ packaging ];

pkgs/development/python-modules/treex/default.nix+6−3

@@ -27,9 +27,12 @@ buildPythonPackage rec {

2727 sha256 = "1hl3wj71c7cp7jzkhyjy7xgs2vc8c89icq0bgfr49y4pwv69n43m";

2828 };

2929

30− patches = [

31− ./relax-deps.patch

32− ];

30+ postPatch = ''

31+ substituteInPlace pyproject.toml \

32+ --replace 'rich = "^10.7.0"' 'rich = ">=10.7.0"' \

33+ --replace 'PyYAML = "^5.4.1"' 'PyYAML = ">=5.4.1"' \

34+ --replace 'optax = "^0.0.9"' 'optax = ">=0.0.9"'

35+ '';

3336

3437 nativeBuildInputs = [

3538 poetry-core

pkgs/development/python-modules/treex/relax-deps.patchdeleted−16

@@ -1,16 +0,0 @@

1−diff --git a/pyproject.toml b/pyproject.toml

2−index f0ff8a0..56787ca 100644

3−--- a/pyproject.toml

4−+++ b/pyproject.toml

5−@@ -16,9 +16,9 @@ secondary = true

6− [tool.poetry.dependencies]

7− python = "^3.7"

8− flax = "^0.3.4"

9−-PyYAML = "^5.4.1"

10−+PyYAML = ">=5.4.1"

11− rich = "^10.7.0"

12−-optax = "^0.0.9"

13−+optax = ">=0.0.9"

14− einops = "^0.3.2"

15− treeo = "^0.0.9"

16− # treeo = { path = "../treeo", develop = true }

pkgs/development/python-modules/twinkly-client/default.nix+11−4

@@ -7,19 +7,26 @@

77

88buildPythonPackage rec {

99 pname = "twinkly-client";

10− version = "0.0.2";

10+ version = "0.0.3";

11+ format = "setuptools";

12+

1113 disabled = pythonOlder "3.6";

1214

1315 src = fetchPypi {

1416 inherit pname version;

15− sha256 = "16jbm4ya4yk2nfswza1kpgks70rmy5lpsv9dv3hdjdnr1j44hr3i";

17+ sha256 = "sha256-F/N6yMOvLHIfXvPyR7z3P/Rlh79OvCbvEiNwClLSLl8=";

1618 };

1719

18− propagatedBuildInputs = [ aiohttp ];

20+ propagatedBuildInputs = [

21+ aiohttp

22+ ];

1923

2024 # Project has no tests

2125 doCheck = false;

22− pythonImportsCheck = [ "twinkly_client" ];

26+

27+ pythonImportsCheck = [

28+ "twinkly_client"

29+ ];

2330

2431 meta = with lib; {

2532 description = "Python module to communicate with Twinkly LED strings";

pkgs/development/python-modules/types-freezegun/default.nixnew file+24

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

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+}:

5+

6+buildPythonPackage rec {

7+ pname = "types-freezegun";

8+ version = "1.1.6";

9+

10+ src = fetchPypi {

11+ inherit pname version;

12+ sha256 = "0kxiv0yjbbvp1zx694ir149b26kjzvb6600fh397v32b8jvs8w2w";

13+ };

14+

15+ # Module doesn't have tests

16+ doCheck = false;

17+

18+ meta = with lib; {

19+ description = "Typing stubs for freezegun";

20+ homepage = "https://github.com/python/typeshed";

21+ license = licenses.asl20;

22+ maintainers = with maintainers; [ jpetrucciani ];

23+ };

24+}

pkgs/development/python-modules/types-tabulate/default.nixnew file+24

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

1+{ lib

2+, buildPythonPackage

3+, fetchPypi

4+}:

5+

6+buildPythonPackage rec {

7+ pname = "types-tabulate";

8+ version = "0.8.5";

9+

10+ src = fetchPypi {

11+ inherit pname version;

12+ sha256 = "sha256-A/KDvzhOoSG3tqWK+zj03vl/MHBPyhOg2mhpNrDzkqw=";

13+ };

14+

15+ # Module doesn't have tests

16+ doCheck = false;

17+

18+ meta = with lib; {

19+ description = "Typing stubs for tabulate";

20+ homepage = "https://github.com/python/typeshed";

21+ license = licenses.asl20;

22+ maintainers = with maintainers; [ jpetrucciani ];

23+ };

24+}

pkgs/development/python-modules/wtforms/default.nix+13−5

@@ -2,21 +2,29 @@

22, buildPythonPackage

33, fetchPypi

44, markupsafe

5+, Babel

6+, pytestCheckHook

7+, email_validator

58}:

69

710buildPythonPackage rec {

8− version = "2.3.3";

11+ version = "3.0.1";

912 pname = "WTForms";

1013

1114 src = fetchPypi {

1215 inherit pname version;

13− sha256 = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c";

16+ sha256 = "1g654ghavds387hqxmhg9s8x222x89wbq1ggzxbsyn6x2axindbb";

1417 };

1518

16− propagatedBuildInputs = [ markupsafe ];

19+ propagatedBuildInputs = [ markupsafe Babel ];

1720

18− # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."

19− doCheck = false;

21+

22+ checkInputs = [

23+ pytestCheckHook

24+ email_validator

25+ ];

26+

27+ pythonImportsCheck = [ "wtforms" ];

2028

2129 meta = with lib; {

2230 description = "A flexible forms validation and rendering library for Python";

pkgs/development/python-modules/yalexs/default.nix+2−2

@@ -16,7 +16,7 @@

1616

1717buildPythonPackage rec {

1818 pname = "yalexs";

19− version = "1.1.17";

19+ version = "1.1.19";

2020 format = "setuptools";

2121

2222 disabled = pythonOlder "3.6";

@@ -25,7 +25,7 @@ buildPythonPackage rec {

2525 owner = "bdraco";

2626 repo = pname;

2727 rev = "v${version}";

28− sha256 = "sha256-kCLL+0ZiraTW7swgdfS9vkLcr/s6lTccFQbC02rdNDY=";

28+ sha256 = "sha256-i6UFsSY2DQ4jB316fy5cZ+2C93TTmvyB4Caxj3syPdo=";

2929 };

3030

3131 propagatedBuildInputs = [

pkgs/development/python-modules/Pygments/2_5.nix → pkgs/development/python2-modules/Pygments/default.nixrenamed

The content is the same.

pkgs/development/python-modules/TurboCheetah/default.nix → pkgs/development/python2-modules/TurboCheetah/default.nixrenamed

The content is the same.

pkgs/development/python-modules/bootstrapped-pip/2.nix → pkgs/development/python2-modules/bootstrapped-pip/default.nixrenamed

The content is the same.

pkgs/development/python-modules/boto3/1_17.nix → pkgs/development/python2-modules/boto3/default.nixrenamed

The content is the same.

pkgs/development/python-modules/botocore/1_20.nix → pkgs/development/python2-modules/botocore/default.nixrenamed

The content is the same.

pkgs/development/python-modules/certifi/python2.nix → pkgs/development/python2-modules/certifi/default.nixrenamed

The content is the same.

pkgs/development/python-modules/chardet/2.nix → pkgs/development/python2-modules/chardet/default.nixrenamed

The content is the same.

pkgs/development/python-modules/cheetah/default.nix → pkgs/development/python2-modules/cheetah/default.nixrenamed

The content is the same.

pkgs/development/python-modules/click/7.nix → pkgs/development/python2-modules/click/default.nixrenamed

The content is the same.

pkgs/development/python-modules/configparser/4.nix → pkgs/development/python2-modules/configparser/default.nixrenamed

The content is the same.

pkgs/development/python-modules/construct/2.10.54.nix → pkgs/development/python2-modules/construct/default.nixrenamed

The content is the same.

pkgs/development/python-modules/contextlib2/0.nix → pkgs/development/python2-modules/contextlib2/default.nixrenamed

The content is the same.

pkgs/development/python-modules/cryptography/vectors-3.3.nix → pkgs/development/python2-modules/cryptography-vectors/default.nixrenamed

The content is the same.

pkgs/development/python-modules/cryptography/3.3.nix → pkgs/development/python2-modules/cryptography/default.nixrenamed

The content is the same.

pkgs/development/python-modules/decorator/4.nix → pkgs/development/python2-modules/decorator/default.nixrenamed

The content is the same.

pkgs/development/python-modules/enum/default.nix → pkgs/development/python2-modules/enum/default.nixrenamed

The content is the same.

pkgs/development/python-modules/filelock/3.2.nix → pkgs/development/python2-modules/filelock/default.nixrenamed

The content is the same.

pkgs/development/python-modules/flask/1.nix → pkgs/development/python2-modules/flask/default.nixrenamed

The content is the same.

pkgs/development/python-modules/freezegun/0.3.nix → pkgs/development/python2-modules/freezegun/default.nixrenamed

The content is the same.

pkgs/development/python-modules/futures/default.nix → pkgs/development/python2-modules/futures/default.nixrenamed

The content is the same.

pkgs/development/python-modules/google-apputils/default.nix → pkgs/development/python2-modules/google-apputils/default.nixrenamed

The content is the same.

pkgs/development/python-modules/httpretty/0.nix → pkgs/development/python2-modules/httpretty/default.nixrenamed

The content is the same.

pkgs/development/python-modules/hypothesis/2.nix → pkgs/development/python2-modules/hypothesis/default.nixrenamed

The content is the same.

pkgs/development/python-modules/idna/2.nix → pkgs/development/python2-modules/idna/default.nixrenamed

The content is the same.

pkgs/development/python-modules/importlib-metadata/2.nix → pkgs/development/python2-modules/importlib-metadata/default.nixrenamed

The content is the same.

pkgs/development/python-modules/ipaddr/default.nix → pkgs/development/python2-modules/ipaddr/default.nixrenamed

The content is the same.

pkgs/development/python-modules/itsdangerous/1.nix → pkgs/development/python2-modules/itsdangerous/default.nixrenamed

The content is the same.

pkgs/development/python-modules/jinja2/2.nix → pkgs/development/python2-modules/jinja2/default.nixrenamed

The content is the same.

pkgs/development/python-modules/libcloud/2.nix → pkgs/development/python2-modules/libcloud/default.nixrenamed

The content is the same.

pkgs/development/python-modules/lpod/default.nix → pkgs/development/python2-modules/lpod/default.nixrenamed

The content is the same.

pkgs/development/python-modules/marisa/default.nix → pkgs/development/python2-modules/marisa/default.nixrenamed

The content is the same.

pkgs/development/python-modules/markdown/3_1.nix → pkgs/development/python2-modules/markdown/default.nixrenamed

The content is the same.

pkgs/development/python-modules/markupsafe/1.nix → pkgs/development/python2-modules/markupsafe/default.nixrenamed

The content is the same.

pkgs/development/python-modules/mock/2.nix → pkgs/development/python2-modules/mock/default.nixrenamed

The content is the same.

pkgs/development/python-modules/more-itertools/2.7.nix → pkgs/development/python2-modules/more-itertools/default.nixrenamed

The content is the same.

pkgs/development/python-modules/mutagen/1.43.nix → pkgs/development/python2-modules/mutagen/default.nixrenamed

The content is the same.

pkgs/development/python-modules/numpy/1.16.nix → pkgs/development/python2-modules/numpy/default.nixrenamed+1−1

@@ -54,7 +54,7 @@ in buildPythonPackage rec {

5454 # We patch cpython/distutils to fix https://bugs.python.org/issue1222585

5555 # Patching of numpy.distutils is needed to prevent it from undoing the

5656 # patch to distutils.

57− ./numpy-distutils-C++_1.16.patch

57+ ./numpy-distutils-C++.patch

5858 ];

5959

6060 preConfigure = ''

pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch → pkgs/development/python2-modules/numpy/numpy-distutils-C++.patchrenamed

The content is the same.

pkgs/development/python-modules/packaging/2.nix → pkgs/development/python2-modules/packaging/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pillow/6.nix → pkgs/development/python2-modules/pillow/default.nixrenamed

The content is the same.

pkgs/development/python2-modules/pillow/generic.nixnew file+77

@@ -0,0 +1,77 @@

1+{ pname

2+, version

3+, disabled

4+, src

5+, meta

6+, ...

7+}@args:

8+

9+with args;

10+

11+buildPythonPackage rec {

12+ inherit pname version src meta;

13+

14+ # Disable imagefont tests, because they don't work well with infinality:

15+ # https://github.com/python-pillow/Pillow/issues/1259

16+ postPatch = ''

17+ rm Tests/test_imagefont.py

18+ '';

19+

20+ # Disable darwin tests which require executables: `iconutil` and `screencapture`

21+ disabledTests = lib.optionals stdenv.isDarwin [

22+ "test_grab"

23+ "test_grabclipboard"

24+ "test_save"

25+

26+ # pillow-simd

27+ "test_roundtrip"

28+ "test_basic"

29+ ] ++ lib.optionals (lib.versions.major version == "6") [

30+ # RuntimeError: Error setting from dictionary

31+ "test_custom_metadata"

32+ ];

33+

34+ propagatedBuildInputs = [ olefile ]

35+ ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ];

36+

37+ checkInputs = [ pytestCheckHook pyroma numpy ];

38+

39+ buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp tcl lcms2 ]

40+ ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ]

41+ ++ lib.optionals (isPyPy) [ tk libX11 ];

42+

43+ # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.

44+ # NOTE: The Pillow install script will, by default, add paths like /usr/lib

45+ # and /usr/include to the search paths. This can break things when building

46+ # on a non-NixOS system that has some libraries installed that are not

47+ # installed in Nix (for example, Arch Linux has jpeg2000 but Nix doesn't

48+ # build Pillow with this support). We patch the `disable_platform_guessing`

49+ # setting here, instead of passing the `--disable-platform-guessing`

50+ # command-line option, since the command-line option doesn't work when we run

51+ # tests.

52+ preConfigure = let

53+ libinclude' = pkg: ''"${pkg.out}/lib", "${pkg.out}/include"'';

54+ libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"'';

55+ in ''

56+ sed -i "setup.py" \

57+ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude freetype}|g ;

58+ s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude libjpeg}|g ;

59+ s|^JPEG2K_ROOT =.*$|JPEG2K_ROOT = ${libinclude openjpeg}|g ;

60+ s|^IMAGEQUANT_ROOT =.*$|IMAGEQUANT_ROOT = ${libinclude' libimagequant}|g ;

61+ s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude zlib}|g ;

62+ s|^LCMS_ROOT =.*$|LCMS_ROOT = ${libinclude lcms2}|g ;

63+ s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude libtiff}|g ;

64+ s|^TCL_ROOT=.*$|TCL_ROOT = ${libinclude' tcl}|g ;

65+ s|self\.disable_platform_guessing = None|self.disable_platform_guessing = True|g ;'

66+ export LDFLAGS="$LDFLAGS -L${libwebp}/lib"

67+ export CFLAGS="$CFLAGS -I${libwebp}/include"

68+ '' + lib.optionalString (lib.versionAtLeast version "7.1.0") ''

69+ export LDFLAGS="$LDFLAGS -L${libxcb}/lib"

70+ export CFLAGS="$CFLAGS -I${libxcb.dev}/include"

71+ '' + lib.optionalString stdenv.isDarwin ''

72+ # Remove impurities

73+ substituteInPlace setup.py \

74+ --replace '"/Library/Frameworks",' "" \

75+ --replace '"/System/Library/Frameworks"' ""

76+ '';

77+}

pkgs/development/python-modules/pip/20.nix → pkgs/development/python2-modules/pip/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pluggy/0.nix → pkgs/development/python2-modules/pluggy/default.nixrenamed

The content is the same.

pkgs/development/python-modules/prettytable/1.nix → pkgs/development/python2-modules/prettytable/default.nixrenamed

The content is the same.

pkgs/development/python2-modules/protobuf/default.nixnew file+59

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

1+{ buildPackages

2+, lib

3+, fetchpatch

4+, python

5+, buildPythonPackage

6+, isPy37

7+, protobuf

8+, google-apputils ? null

9+, six

10+, pyext

11+, isPy27

12+, disabled

13+, doCheck ? true

14+}:

15+

16+buildPythonPackage {

17+ inherit (protobuf) pname src version;

18+ inherit disabled;

19+ doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2

20+

21+ propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ];

22+ propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.

23+ nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ];

24+ buildInputs = [ protobuf ];

25+

26+ patches = lib.optional (isPy37 && (lib.versionOlder protobuf.version "3.6.1.2"))

27+ # Python 3.7 compatibility (not needed for protobuf >= 3.6.1.2)

28+ (fetchpatch {

29+ url = "https://github.com/protocolbuffers/protobuf/commit/0a59054c30e4f0ba10f10acfc1d7f3814c63e1a7.patch";

30+ sha256 = "09hw22y3423v8bbmc9xm07znwdxfbya6rp78d4zqw6fisdvjkqf1";

31+ stripLen = 1;

32+ })

33+ ;

34+

35+ prePatch = ''

36+ while [ ! -d python ]; do

37+ cd *

38+ done

39+ cd python

40+ '';

41+

42+ setupPyGlobalFlags = lib.optional (lib.versionAtLeast protobuf.version "2.6.0")

43+ "--cpp_implementation";

44+

45+ pythonImportsCheck = [

46+ "google.protobuf"

47+ ] ++ lib.optionals (lib.versionAtLeast protobuf.version "2.6.0") [

48+ "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked

49+ ];

50+

51+ meta = with lib; {

52+ description = "Protocol Buffers are Google's data interchange format";

53+ homepage = "https://developers.google.com/protocol-buffers/";

54+ license = licenses.bsd3;

55+ maintainers = with maintainers; [ knedlsepp ];

56+ };

57+

58+ passthru.protobuf = protobuf;

59+}

pkgs/development/python-modules/pycairo/1.18.nix → pkgs/development/python2-modules/pycairo/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pygobject/3.36.nix → pkgs/development/python2-modules/pygobject/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pygtk/default.nix → pkgs/development/python2-modules/pygtk/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pyjwt/1.nix → pkgs/development/python2-modules/pyjwt/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pyroma/2.nix → pkgs/development/python2-modules/pyroma/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pysqlite/default.nix → pkgs/development/python2-modules/pysqlite/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pytest-runner/2.nix → pkgs/development/python2-modules/pytest-runner/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pytest-xdist/1.nix → pkgs/development/python2-modules/pytest-xdist/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pytest/4.nix → pkgs/development/python2-modules/pytest/default.nixrenamed

The content is the same.

pkgs/development/python-modules/pyyaml/5.nix → pkgs/development/python2-modules/pyyaml/default.nixrenamed

The content is the same.

pkgs/development/python-modules/qpid-python/default.nix → pkgs/development/python2-modules/qpid-python/default.nixrenamed

The content is the same.

pkgs/development/python-modules/s3transfer/0_4.nix → pkgs/development/python2-modules/s3transfer/default.nixrenamed

The content is the same.

pkgs/development/python-modules/scandir/default.nix → pkgs/development/python2-modules/scandir/default.nixrenamed

The content is the same.

pkgs/development/python-modules/setuptools-scm/2.nix → pkgs/development/python2-modules/setuptools-scm/default.nixrenamed

The content is the same.

pkgs/development/python-modules/setuptools/44.0.nix → pkgs/development/python2-modules/setuptools/default.nixrenamed

The content is the same.

pkgs/development/python2-modules/setuptools/tag-date.patchnew file+12

@@ -0,0 +1,12 @@

1+diff --git a/setup.cfg b/setup.cfg

2+index f23714b6..8aaeb330 100644

3+--- a/setup.cfg

4++++ b/setup.cfg

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

6+ [egg_info]

7+ tag_build = .post

8+-tag_date = 1

9++tag_date = 0

10+

11+ [aliases]

12+ clean_egg_info = egg_info -Db ''

pkgs/development/python-modules/sphinx/2.nix → pkgs/development/python2-modules/sphinx/default.nixrenamed

The content is the same.

pkgs/development/python-modules/sphinx/python2-lexer.patch → pkgs/development/python2-modules/sphinx/python2-lexer.patchrenamed

The content is the same.

pkgs/development/python-modules/sphinxcontrib-websupport/1_1.nix → pkgs/development/python2-modules/sphinxcontrib-websupport/default.nixrenamed

The content is the same.

pkgs/development/python-modules/typing/default.nix → pkgs/development/python2-modules/typing/default.nixrenamed

The content is the same.

pkgs/development/python-modules/urllib3/2.nix → pkgs/development/python2-modules/urllib3/default.nixrenamed

The content is the same.

pkgs/development/python-modules/vcrpy/3.nix → pkgs/development/python2-modules/vcrpy/default.nixrenamed

The content is the same.

pkgs/development/python-modules/werkzeug/1.nix → pkgs/development/python2-modules/werkzeug/default.nixrenamed

The content is the same.

pkgs/development/python-modules/wsproto/0.14.nix → pkgs/development/python2-modules/wsproto/default.nixrenamed

The content is the same.

pkgs/development/python-modules/wxPython/3.0.nix → pkgs/development/python2-modules/wxPython/default.nixrenamed

The content is the same.

pkgs/development/python-modules/zipp/1.nix → pkgs/development/python2-modules/zipp/default.nixrenamed

The content is the same.

pkgs/development/r-modules/wrapper-rstudio.nix+38−18

@@ -1,16 +1,23 @@

1−{ lib, runCommand, R, rstudio, wrapQtAppsHook, recommendedPackages, packages, qtbase }:

1+{ lib

2+, runCommand

3+, R

4+, rstudio

5+, makeWrapper

6+, wrapQtAppsHook

7+, recommendedPackages

8+, packages

9+, fontconfig

10+}:

211

3−let

4− qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}";

5−in

6−runCommand (rstudio.name + "-wrapper") {

12+runCommand (rstudio.name + "-wrapper")

13+{

714 preferLocalBuild = true;

815 allowSubstitutes = false;

916

10− nativeBuildInputs = [wrapQtAppsHook];

17+ nativeBuildInputs = [ (if rstudio.server then makeWrapper else wrapQtAppsHook) ];

1118 dontWrapQtApps = true;

1219

13− buildInputs = [R rstudio] ++ recommendedPackages ++ packages;

20+ buildInputs = [ R rstudio ] ++ recommendedPackages ++ packages;

1421

1522 # rWrapper points R to a specific set of packages by using a wrapper

1623 # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets

@@ -22,14 +29,27 @@ runCommand (rstudio.name + "-wrapper") {

2229 # uses R_PROFILE_USER to load this code at startup in RStudio.

2330 fixLibsR = "fix_libs.R";

2431}

25−''

26−mkdir $out

27−ln -s ${rstudio}/share $out

28−echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR

29−echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR

30−echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR

31−echo -n "\"))" >> $out/$fixLibsR

32−echo >> $out/$fixLibsR

33−makeQtWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \

34− --set R_PROFILE_USER $out/$fixLibsR

35−''

32+ (

33+ ''

34+ mkdir -p $out/bin

35+ ln -s ${rstudio}/share $out

36+ echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR

37+ echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR

38+ echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR

39+ echo -n "\"))" >> $out/$fixLibsR

40+ echo >> $out/$fixLibsR

41+ '' +

42+ (if

43+ rstudio.server then ''

44+ makeWrapper ${rstudio}/bin/rsession $out/bin/rsession \

45+ --set R_PROFILE_USER $out/$fixLibsR --set FONTCONFIG_FILE ${fontconfig.out}/etc/fonts/fonts.conf

46+

47+ makeWrapper ${rstudio}/bin/rserver $out/bin/rserver \

48+ --add-flags --rsession-path=$out/bin/rsession

49+ ''

50+ else

51+ ''

52+ makeQtWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \

53+ --set R_PROFILE_USER $out/$fixLibsR

54+ '')

55+ )

pkgs/development/tools/ammonite/default.nix+3−3

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

99 common = { scalaVersion, sha256 }:

1010 stdenv.mkDerivation rec {

1111 pname = "ammonite";

12− version = "2.5.0";

12+ version = "2.5.1";

1313

1414 src = fetchurl {

1515 url =

@@ -83,10 +83,10 @@ let

8383in {

8484 ammonite_2_12 = common {

8585 scalaVersion = "2.12";

86− sha256 = "sha256-JTW1xb+eCb0yhzrA1ntmalP88JoUo+KrjOBvs+cuE/A=";

86+ sha256 = "sha256-XV+SPZD7IirLJDqwn/eV8/Wf8m3dSSW0DF3IcBPcixA=";

8787 };

8888 ammonite_2_13 = common {

8989 scalaVersion = "2.13";

90− sha256 = "sha256-l5kGPP8tuYi16t6u8ZeAY54yqAWJZR5UuopSGQ69v9Y=";

90+ sha256 = "sha256-rq8SLtj0rb35vcvPsCzhDGR93EjHoU6KAhEjs2WIA6o=";

9191 };

9292}

pkgs/development/tools/analysis/checkov/default.nix+3−2

@@ -22,13 +22,13 @@ with py.pkgs;

2222

2323buildPythonApplication rec {

2424 pname = "checkov";

25− version = "2.0.712";

25+ version = "2.0.727";

2626

2727 src = fetchFromGitHub {

2828 owner = "bridgecrewio";

2929 repo = pname;

3030 rev = version;

31− hash = "sha256-iUplSd4/OcJtfby2bn7b6GwCbXnBMqUSuLjkkh+7W9Y=";

31+ hash = "sha256-hegbkmM8ZN6zO2iANGRr2QRW3ErdtwYaTo618uELev0=";

3232 };

3333

3434 nativeBuildInputs = with py.pkgs; [

@@ -81,6 +81,7 @@ buildPythonApplication rec {

8181

8282 postPatch = ''

8383 substituteInPlace setup.py \

84+ --replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \

8485 --replace "jsonschema==3.0.2" "jsonschema>=3.0.2"

8586 '';

8687

pkgs/development/tools/analysis/oclgrind/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python }:

1+{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, readline, python2 }:

22

33stdenv.mkDerivation rec {

44 pname = "oclgrind";

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

1212 };

1313

1414 nativeBuildInputs = [ cmake ];

15− buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python ];

15+ buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline python2 ];

1616

1717 cmakeFlags = [

1818 "-DCLANG_ROOT=${llvmPackages.clang-unwrapped}"

pkgs/development/tools/analysis/qcachegrind/default.nix+2−2

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

1−{ lib, stdenv, qmake, qtbase, perl, python, php, kcachegrind, wrapQtAppsHook }:

1+{ lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }:

22

33let

44 name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;

@@ -8,7 +8,7 @@ in stdenv.mkDerivation {

88

99 src = kcachegrind.src;

1010

11− buildInputs = [ qtbase perl python php ];

11+ buildInputs = [ qtbase perl python2 php ];

1212

1313 nativeBuildInputs = [ qmake wrapQtAppsHook ];

1414

pkgs/development/tools/analysis/rizin/cutter.nix+2−2

@@ -11,13 +11,13 @@

1111

1212mkDerivation rec {

1313 pname = "cutter";

14− version = "2.0.4";

14+ version = "2.0.5";

1515

1616 src = fetchFromGitHub {

1717 owner = "rizinorg";

1818 repo = "cutter";

1919 rev = "v${version}";

20− sha256 = "sha256-Z5mqLkeA7AZnvKdpdRzaYfNMsGUI7i7wPTXVyIRYwxI=";

20+ sha256 = "sha256-ljws9S7ZxZK/Ou8jgGSoR++vtzFTEBywHMhCC/UOLEs=";

2121 fetchSubmodules = true;

2222 };

2323

pkgs/development/tools/analysis/rizin/default.nix+2−2

@@ -23,11 +23,11 @@

2323

2424stdenv.mkDerivation rec {

2525 pname = "rizin";

26− version = "0.3.2";

26+ version = "0.3.4";

2727

2828 src = fetchurl {

2929 url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";

30− sha256 = "sha256-T65gm1tfRD7dZSL8qZKMTAbQ65Lx/ecidFc9T1b7cig=";

30+ sha256 = "sha256-7qSbOWOHwJ0ZcFqrAqYXzbFWgvymfxAf8rJ+75SnEOk=";

3131 };

3232

3333 mesonFlags = [

pkgs/development/tools/build-managers/mill/default.nix+2−2

@@ -2,11 +2,11 @@

22

33stdenv.mkDerivation rec {

44 pname = "mill";

5− version = "0.9.12";

5+ version = "0.10.0";

66

77 src = fetchurl {

88 url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly";

9− sha256 = "sha256-ct4SsIs6ErWl2XbxfqX3FTOU9K9tTKo8YWu1QT83iTI=";

9+ sha256 = "sha256:1acm1z24cw2yzykwwjfrcf66mi16xvsrnrrhrsd9yqrajqab707n";

1010 };

1111

1212 nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/continuous-integration/jenkins/default.nix+2−2

@@ -4,11 +4,11 @@

44

55stdenv.mkDerivation rec {

66 pname = "jenkins";

7− version = "2.319.1";

7+ version = "2.319.2";

88

99 src = fetchurl {

1010 url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";

11− sha256 = "0qm562v7jwc9mjpbn1f808kg97axy1mraq3s5h679niffn588jvy";

11+ sha256 = "0lx5fng98l9qci5jqwav8dmcnp7k7glfg0ccwqi0xqk90jqqs302";

1212 };

1313

1414 nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/cue/default.nix+13−7

@@ -1,18 +1,19 @@

1−{ buildGoModule, fetchgit, lib }:

1+{ buildGoModule, fetchFromGitHub, lib }:

22

33buildGoModule rec {

44 pname = "cue";

5− version = "0.4.0";

5+ version = "0.4.1";

66

7− src = fetchgit {

8− url = "https://cue.googlesource.com/cue";

7+ src = fetchFromGitHub {

8+ owner = "cue-lang";

9+ repo = "cue";

910 rev = "v${version}";

10− sha256 = "sha256-rcGEl+CMFyxZKsOKhVimhv5/ONo3xS6FjgKModZGR2o=";

11+ sha256 = "1q1mkqb6fk515g556yn8ks3gqrimfbadprmbv5rill1lpipq5xbj";

1112 };

1213

13− vendorSha256 = "sha256-eSKVlBgnHR1R0j1lNwtFoIgRuj8GqoMbvuBl/N1SanY=";

14+ vendorSha256 = "12p77a97lbff6qhncs5qx13k3wmf9hrr09mhh12isw5s0p0n53xm";

1415

15− doCheck = false;

16+ checkPhase = "go test ./...";

1617

1718 subPackages = [ "cmd/cue" ];

1819

@@ -20,6 +21,11 @@ buildGoModule rec {

2021 "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}"

2122 ];

2223

24+ doInstallCheck = true;

25+ installCheckPhase = ''

26+ $out/bin/cue eval - <<<'a: "all good"' > /dev/null

27+ '';

28+

2329 meta = {

2430 description = "A data constraint language which aims to simplify tasks involving defining and using data";

2531 homepage = "https://cuelang.org/";

pkgs/development/tools/database/pyrseas/default.nix+8−8

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

1−{ lib, pythonPackages, fetchFromGitHub }:

1+{ lib, python2Packages, fetchFromGitHub }:

22

33let

4− pgdbconn = pythonPackages.buildPythonPackage rec {

4+ pgdbconn = python2Packages.buildPythonPackage rec {

55 pname = "pgdbconn";

66 version = "0.8.0";

77 src = fetchFromGitHub {

@@ -13,13 +13,13 @@ let

1313 # The tests are impure (they try to access a PostgreSQL server)

1414 doCheck = false;

1515 propagatedBuildInputs = [

16− pythonPackages.psycopg2

17− pythonPackages.pytest

16+ python2Packages.psycopg2

17+ python2Packages.pytest

1818 ];

1919 };

2020in

2121

22−pythonPackages.buildPythonApplication {

22+python2Packages.buildPythonApplication {

2323 pname = "pyrseas";

2424 version = "0.8.0";

2525 src = fetchFromGitHub {

@@ -31,9 +31,9 @@ pythonPackages.buildPythonApplication {

3131 # The tests are impure (they try to access a PostgreSQL server)

3232 doCheck = false;

3333 propagatedBuildInputs = [

34− pythonPackages.psycopg2

35− pythonPackages.pytest

36− pythonPackages.pyyaml

34+ python2Packages.psycopg2

35+ python2Packages.pytest

36+ python2Packages.pyyaml

3737 pgdbconn

3838 ];

3939 meta = {

pkgs/development/tools/misc/gpuvis/default.nix+3−4

@@ -12,17 +12,16 @@

1212

1313stdenv.mkDerivation rec {

1414 pname = "gpuvis";

15− version = "20210220";

15+ version = "20211204";

1616

1717 src = fetchFromGitHub {

1818 owner = "mikesart";

1919 repo = pname;

20− rev = "216f7d810e182a89fd96ab9fad2a5c2b1e425ea9";

21− sha256 = "15pj7gy0irlp849a85z68n184jksjri0xhihgh56rs15kq333mwz";

20+ rev = "7f47419470687c7ecbdf086b81f5bafdb05d1bef";

21+ sha256 = "sha256-29Bv+y0zWzn7QtpsjRV6hr19bCeyVJusPcYiAIEIluk=";

2222 };

2323

2424 # patch dlopen path for gtk3

25− # python2 is wrongly added in the meson file, upstream PR: https://github.com/mikesart/gpuvis/pull/62

2625 postPatch = ''

2726 substituteInPlace src/hook_gtk3.h \

2827 --replace "libgtk-3.so" "${lib.getLib gtk3}/lib/libgtk-3.so"

pkgs/development/tools/misc/uncrustify/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, cmake, python }:

1+{ lib, stdenv, fetchFromGitHub, cmake, python2 }:

22

33stdenv.mkDerivation rec {

44 name = "${product}-${version}";

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

1212 sha256 = "sha256-ZVC5tsn2m1uB7EPNJFPLWLZpLSk4WrFOgJvy1KFYqBY=";

1313 };

1414

15− nativeBuildInputs = [ cmake python ];

15+ nativeBuildInputs = [ cmake python2 ];

1616

1717 meta = with lib; {

1818 description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA";

pkgs/development/tools/mold/default.nix+1

@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {

2323 buildInputs = [ zlib openssl ];

2424 nativeBuildInputs = [ autoPatchelfHook cmake xxHash ];

2525

26+ enableParallelBuilding = true;

2627 dontUseCmakeConfigure = true;

2728 EXTRA_LDFLAGS = "-fuse-ld=${llvmPackages_latest.lld}/bin/ld.lld";

2829 LTO = 1;

pkgs/development/tools/parsing/tree-sitter/grammars/default.nix+1

@@ -56,6 +56,7 @@

5656 tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json;

5757 tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json;

5858 tree-sitter-perl = lib.importJSON ./tree-sitter-perl.json;

59+ tree-sitter-org = lib.importJSON ./tree-sitter-org.json;

5960 tree-sitter-php = lib.importJSON ./tree-sitter-php.json;

6061 tree-sitter-pioasm = lib.importJSON ./tree-sitter-pioasm.json;

6162 tree-sitter-prisma = lib.importJSON ./tree-sitter-prisma.json;

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org.jsonnew file+11

@@ -0,0 +1,11 @@

1+{

2+ "url": "https://github.com/milisims/tree-sitter-org",

3+ "rev": "39a377f5072ee9f79884e227dc49d42c2eba67d8",

4+ "date": "2021-11-01T23:43:23-04:00",

5+ "path": "/nix/store/cgsn53p4gp1ahq2zl38jz51xal60dckf-tree-sitter-org",

6+ "sha256": "0vfnph4xxvkalzk3rgvzi6ckqkjg31ddzgh4mwbk7qwsacbq9rss",

7+ "fetchLFS": false,

8+ "fetchSubmodules": false,

9+ "deepClone": false,

10+ "leaveDotGit": false

11+}

pkgs/development/tools/phantomjs2/default.nix+2−2

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

11{ lib, stdenv, fetchFromGitHub, fetchpatch

22, bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg

3−, libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase

3+, libpng, perl, python2, ruby, sqlite, qtwebkit, qmake, qtbase

44, darwin, writeScriptBin, cups, makeWrapper

55}:

66

@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {

2828 nativeBuildInputs = [ qmake ];

2929 buildInputs = [

3030 bison flex fontconfig freetype gperf icu openssl

31− libjpeg libpng perl python ruby sqlite qtwebkit qtbase

31+ libjpeg libpng perl python2 ruby sqlite qtwebkit qtbase

3232 makeWrapper

3333 ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

3434 AGL ApplicationServices AppKit Cocoa OpenGL

pkgs/development/tools/pipenv/default.nix+10

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

11{ lib

22, python3

3+, installShellFiles

34}:

45

56with python3.pkgs;

@@ -27,6 +28,8 @@ in buildPythonApplication rec {

2728

2829 LC_ALL = "en_US.UTF-8";

2930

31+ nativeBuildInputs = [ installShellFiles ];

32+

3033 postPatch = ''

3134 # pipenv invokes python in a subprocess to create a virtualenv

3235 # and to call setup.py.

@@ -38,6 +41,13 @@ in buildPythonApplication rec {

3841

3942 propagatedBuildInputs = runtimeDeps python3.pkgs;

4043

44+ postInstall = ''

45+ installShellCompletion --cmd pipenv \

46+ --bash <(_PIPENV_COMPLETE=bash_source $out/bin/pipenv) \

47+ --zsh <(_PIPENV_COMPLETE=zsh_source $out/bin/pipenv) \

48+ --fish <(_PIPENV_COMPLETE=fish_source $out/bin/pipenv)

49+ '';

50+

4151 doCheck = true;

4252 checkPhase = ''

4353 export HOME=$(mktemp -d)

pkgs/development/tools/pur/default.nix+2−1

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

77 py = python3.override {

88 packageOverrides = self: super: {

99 # newest version doesn't support click >8.0 https://github.com/alanhamlett/pip-update-requirements/issues/38

10− click = self.callPackage ../../../development/python-modules/click/7.nix { };

10+ # Use click 7

11+ click = self.callPackage ../../../development/python2-modules/click/default.nix { };

1112 };

1213 };

1314 inherit (py.pkgs) buildPythonApplication click pytestCheckHook;

pkgs/development/tools/udis86/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, autoreconfHook, python }:

1+{ lib, stdenv, fetchFromGitHub, autoreconfHook, python2 }:

22

33stdenv.mkDerivation rec {

44 pname = "udis86";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "0c60zwimim6jrm4saw36s38w5sg5v8n9mr58pkqmjrlf7q9g6am1";

1212 };

1313

14− nativeBuildInputs = [ autoreconfHook python ];

14+ nativeBuildInputs = [ autoreconfHook python2 ];

1515

1616 configureFlags = [

1717 "--enable-shared"

pkgs/development/tools/winpdb/default.nix+3−3

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

1−{ lib, fetchurl, pythonPackages, makeDesktopItem }:

1+{ lib, fetchurl, python2Packages, makeDesktopItem }:

22

3−pythonPackages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44 pname = "winpdb";

55 version = "1.4.8";

66 namePrefix = "";

@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {

1010 sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs";

1111 };

1212

13− propagatedBuildInputs = [ pythonPackages.wxPython ];

13+ propagatedBuildInputs = [ python2Packages.wxPython ];

1414

1515 desktopItem = makeDesktopItem {

1616 name = "winpdb";

pkgs/development/web/deno/default.nix+3−3

@@ -17,15 +17,15 @@

1717

1818rustPlatform.buildRustPackage rec {

1919 pname = "deno";

20− version = "1.17.2";

20+ version = "1.17.3";

2121

2222 src = fetchFromGitHub {

2323 owner = "denoland";

2424 repo = pname;

2525 rev = "v${version}";

26− sha256 = "sha256-i8BfLnZnkHBPyNy4vUUA9J1f757KCjJ/DsWLPMVxsEg=";

26+ sha256 = "sha256-S4Dt6SrSE/TLGhjAkTrIdvNR71A6ykxSxq72aiyWUX8=";

2727 };

28− cargoSha256 = "sha256-bYRBIdB9/F9OgFxC2LZ24HJWQRLeji978Z2cpH18lY8=";

28+ cargoSha256 = "1ph392jxkln2ihq3x4hhjb1k3fsd2g54m37qgqkza4abvmc7adns";

2929

3030 # Install completions post-install

3131 nativeBuildInputs = [ installShellFiles ];

pkgs/games/amoeba/default.nix+1−1

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

11{ lib, stdenv, fetchurl, amoeba-data, alsa-lib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkg-config }:

22

33stdenv.mkDerivation rec {

4− name = "amoeba-${version}-${debver}";

4+ pname = "amoeba";

55 version = "1.1";

66 debver = "29.1";

77

pkgs/games/among-sus/default.nix+3−3

@@ -2,13 +2,13 @@

22

33stdenv.mkDerivation {

44 pname = "among-sus-unstable";

5− version = "2020-10-29";

5+ version = "2021-05-19";

66

77 src = fetchFromSourcehut {

88 owner = "~martijnbraam";

99 repo = "among-sus";

10− rev = "1f4c8d800d025d36ac66826937161be3252fbc57";

11− sha256 = "19jq7ygh9l11dl1h6702bg57m04y35nqd6yqx1rgp1kxwhp45xyh";

10+ rev = "554e60bf52e3fa931661b9414189a92bb8f69d78";

11+ sha256 = "0j1158nczhvy5i1ykvzvhlv4ndhibgng0dq1lw2bmi8q6k1q1s0w";

1212 };

1313

1414 patchPhase = ''

pkgs/games/blackshades/default.nix+9−11

@@ -1,29 +1,27 @@

11{ lib, stdenv, fetchFromSourcehut

2−, SDL, stb, libGLU, libGL, openal, libvorbis, freealut }:

2+, zig, glfw, libGLU, libGL, openal, libsndfile }:

33

44stdenv.mkDerivation rec {

55 pname = "blackshades";

6− version = "1.3.1";

6+ version = "2.4.7";

77

88 src = fetchFromSourcehut {

99 owner = "~cnx";

1010 repo = pname;

1111 rev = version;

12− sha256 = "0yzp74ynkcp6hh5m4zmvrgx5gwm186hq7p3m7qkww54qdyijb3rv";

12+ fetchSubmodules = true;

13+ sha256 = "sha256-hvJwWUUmGeb7MQgKe79cPS2ckPZ9z0Yc5S9IiwuXPD8=";

1314 };

1415

15− buildInputs = [ SDL stb libGLU libGL openal libvorbis freealut ];

16+ nativeBuildInputs = [ zig ];

17+ buildInputs = [ glfw libGLU libGL openal libsndfile ];

1618

17− postPatch = ''

18− sed -i -e s,Data/,$out/share/$pname/,g \

19− -e s,Data:,$out/share/$pname/,g \

20− src/*.cpp

19+ preBuild = ''

20+ export HOME=$TMPDIR

2121 '';

2222

2323 installPhase = ''

24− mkdir -p $out/bin $out/share

25− cp build/blackshades $out/bin

26− cp -R Data $out/share/$pname

24+ zig build -Drelease-fast -Dcpu=baseline --prefix $out install

2725 '';

2826

2927 meta = {

pkgs/games/crawl/default.nix+1−1

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

77}:

88

99stdenv.mkDerivation rec {

10− name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";

10+ pname = "crawl${lib.optionalString tileMode "-tiles"}";

1111 version = "0.27.1";

1212

1313 src = fetchFromGitHub {

pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix+2−1

@@ -9,7 +9,8 @@ let

99in

1010

1111stdenv.mkDerivation {

12− name = "dwarf-therapist-${dwarf-therapist.version}";

12+ pname = "dwarf-therapist";

13+ version = dwarf-therapist.version;

1314

1415 wrapper = substituteAll {

1516 src = ./dwarf-therapist.in;

pkgs/games/dwarf-fortress/unfuck.nix+2−1

@@ -72,7 +72,8 @@ let

7272in

7373

7474stdenv.mkDerivation {

75− name = "dwarf_fortress_unfuck-${release.unfuckRelease}";

75+ pname = "dwarf_fortress_unfuck";

76+ version = release.unfuckRelease;

7677

7778 src = fetchFromGitHub {

7879 owner = "svenstaro";

pkgs/games/dwarf-fortress/wrapper/default.nix+2−1

@@ -92,7 +92,8 @@ let

9292in

9393

9494stdenv.mkDerivation {

95− name = "dwarf-fortress-${dwarf-fortress.dfVersion}";

95+ pname = "dwarf-fortress";

96+ version = dwarf-fortress.dfVersion;

9697

9798 dfInit = substituteAll {

9899 name = "dwarf-fortress-init";

pkgs/games/gnubg/default.nix+3−3

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

11{ lib, stdenv, fetchurl, pkg-config, glib, python3, gtk2, readline }:

22

3−let version = "1.06.002"; in

4−stdenv.mkDerivation {

5− name = "gnubg-"+version;

3+stdenv.mkDerivation rec {

4+ pname = "gnubg";

5+ version = "1.06.002";

66

77 src = fetchurl {

88 url = "http://gnubg.org/media/sources/gnubg-release-${version}-sources.tar.gz";

pkgs/games/heroic/default.nix+1−1

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

1−{ lib, fetchurl, appimageTools, python, gsettings-desktop-schemas, gtk3 }:

1+{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:

22

33let

44 pname = "heroic";

pkgs/games/hhexen/default.nix+1−1

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

11{ lib, fetchurl, SDL, stdenv }:

22

33stdenv.mkDerivation rec {

4− name = "hhexen";

4+ pname = "hhexen";

55 version = "1.6.3";

66 src = fetchurl {

77 url = "mirror://sourceforge/hhexen/hhexen-${version}-src.tgz";

pkgs/games/instead/default.nix+3−4

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

11{ lib, stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkg-config, lua, zlib, unzip }:

22

33let

4− version = "3.3.2";

5−

64 # I took several games at random from https://instead.syscall.ru/games/

75 games = [

86 (fetchurl {

@@ -28,8 +26,9 @@ let

2826 ];

2927in

3028

31−stdenv.mkDerivation {

32− name = "instead-" + version;

29+stdenv.mkDerivation rec {

30+ pname = "instead";

31+ version = "3.3.2";

3332

3433 src = fetchurl {

3534 url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";

pkgs/games/legendary-gl/default.nix+2−2

@@ -7,13 +7,13 @@

77

88buildPythonApplication rec {

99 pname = "legendary-gl"; # Name in pypi

10− version = "0.20.18";

10+ version = "0.20.24";

1111

1212 src = fetchFromGitHub {

1313 owner = "derrod";

1414 repo = "legendary";

1515 rev = version;

16− sha256 = "0d31c8grvcw7y3sh2x90cxhj612k6f491w2r12j1q33d2v9sqm4j";

16+ sha256 = "sha256-4VN/2FoAXTaumPsplV9wgdUSQsFitC1hqWveAW/yt58=";

1717 };

1818

1919 propagatedBuildInputs = [ requests ];

pkgs/games/moon-buggy/default.nix+2−3

@@ -1,16 +1,15 @@

11{lib, stdenv, fetchurl, ncurses}:

22

33stdenv.mkDerivation rec {

4− baseName = "moon-buggy";

4+ pname = "moon-buggy";

55 version = "1.0.51";

6− name = "${baseName}-${version}";

76

87 buildInputs = [

98 ncurses

109 ];

1110

1211 src = fetchurl {

13− url = "http://m.seehuhn.de/programs/${name}.tar.gz";

12+ url = "http://m.seehuhn.de/programs/moon-buggy-${version}.tar.gz";

1413 sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m";

1514 };

1615

pkgs/games/n2048/default.nix+11−20

@@ -1,35 +1,26 @@

1−{lib, stdenv, fetchurl, ncurses}:

2−let

3− s =

4− rec {

5− baseName = "n2048";

6− version = "0.1";

7− name = "${baseName}-${version}";

8− url = "http://www.dettus.net/n2048/${baseName}_v${version}.tar.gz";

1+{ lib, stdenv, fetchurl, ncurses }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "n2048";

5+ version = "0.1";

6+ src = fetchurl {

7+ url = "http://www.dettus.net/n2048/n2048_v${version}.tar.gz";

98 sha256 = "184z2rr0rnj4p740qb4mzqr6kgd76ynb5gw9bj8hrfshcxdcg1kk";

109 };

1110 buildInputs = [

1211 ncurses

1312 ];

14−in

15−stdenv.mkDerivation {

16− inherit (s) name version;

17− inherit buildInputs;

18− src = fetchurl {

19− inherit (s) url sha256;

20− };

2113 makeFlags = [

2214 "DESTDIR=$(out)"

2315 ];

2416 preInstall = ''

2517 mkdir -p "$out"/{share/man,bin}

2618 '';

27− meta = {

28− inherit (s) version;

19+ meta = with lib; {

2920 description = "Console implementation of 2048 game";

30− license = lib.licenses.bsd2;

31− maintainers = [lib.maintainers.raskin];

32− platforms = lib.platforms.linux;

21+ license = licenses.bsd2;

22+ maintainers = with maintainers; [ raskin ];

23+ platforms = platforms.linux;

3324 homepage = "http://www.dettus.net/n2048/";

3425 };

3526}

pkgs/games/nethack/default.nix+3−3

@@ -20,9 +20,9 @@ let

2020

2121in stdenv.mkDerivation rec {

2222 version = "3.6.6";

23− name = if x11Mode then "nethack-x11-${version}"

24− else if qtMode then "nethack-qt-${version}"

25− else "nethack-${version}";

23+ pname = if x11Mode then "nethack-x11"

24+ else if qtMode then "nethack-qt"

25+ else "nethack";

2626

2727 src = fetchurl {

2828 url = "https://nethack.org/download/${version}/nethack-${lib.replaceStrings ["."] [""] version}-src.tgz";

pkgs/games/openra/common.nix+3−3

@@ -2,7 +2,7 @@

22 and out-of-tree mod packages (mod.nix).

33*/

44{ lib, makeSetupHook, curl, unzip, dos2unix, pkg-config, makeWrapper

5−, lua, mono, dotnetPackages, python

5+, lua, mono, dotnetPackages, python2

66, libGL, freetype, openal, SDL2

77, zenity

88}:

@@ -10,7 +10,7 @@

1010with lib;

1111

1212let

13− path = makeBinPath ([ mono python ] ++ optional (zenity != null) zenity);

13+ path = makeBinPath ([ mono python2 ] ++ optional (zenity != null) zenity);

1414 rpath = makeLibraryPath [ lua freetype openal SDL2 ];

1515 mkdirp = makeSetupHook { } ./mkdirp.sh;

1616

@@ -66,7 +66,7 @@ in {

6666 makeWrapper

6767 mkdirp

6868 mono

69− python

69+ python2

7070 ];

7171

7272 makeFlags = [ "prefix=$(out)" ];

pkgs/games/planetaryannihilation/default.nix+7−18

@@ -1,26 +1,15 @@

11{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk

2−, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }:

2+, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg, requireFile }:

33

4−# TODO: use dynamic attributes once Nix 1.7 is out

5−assert ((config.planetary_annihilation or null).url or null) != null;

6−assert ((config.planetary_annihilation or null).sha256 or null) != null;

4+stdenv.mkDerivation rec {

5+ pname = "planetary-annihalation";

6+ version = "62857";

77

8−/* to setup:

9− $ cat ~/.config/nixpkgs/config.nix

10− {

11− planetary_annihilation = {

12− url = "file:///home/user/PA_Linux_62857.tar.bz2";

8+ src = requireFile {

9+ message = "This file has to be downloaded manually via nix-prefetch-url.";

10+ name = "PA_Linux_${version}.tar.bz2";

1311 sha256 = "0imi3k5144dsn3ka9khx3dj76klkw46ga7m6rddqjk4yslwabh3k";

1412 };

15−}

16−*/

17−

18−stdenv.mkDerivation {

19− name = "planetary-annihalation";

20−

21− src = fetchurl {

22− inherit (config.planetary_annihilation) url sha256;

23− };

2413

2514 nativeBuildInputs = [ patchelf makeWrapper ];

2615

pkgs/games/tennix/default.nix+2−2

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

1−{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } :

1+{lib, stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python2 } :

22

33stdenv.mkDerivation rec {

44 pname = "tennix";

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {

88 sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm";

99 };

1010

11− buildInputs = [ python SDL SDL_mixer SDL_image SDL_ttf SDL_net ];

11+ buildInputs = [ python2 SDL SDL_mixer SDL_image SDL_ttf SDL_net ];

1212

1313 patches = [ ./fix_FTBFS.patch ];

1414

pkgs/games/tlauncher/default.nixdeleted−100

@@ -1,100 +0,0 @@

1−{ lib

2−, stdenv

3−, openjdk8

4−, buildFHSUserEnv

5−, fetchzip

6−, fetchurl

7−, copyDesktopItems

8−, makeDesktopItem

9−}:

10−let

11− version = "2.839";

12− src = stdenv.mkDerivation {

13− pname = "tlauncher";

14− inherit version;

15− src = fetchzip {

16− name = "tlauncher.zip";

17− url = "https://dl2.tlauncher.org/f.php?f=files%2FTLauncher-${version}.zip";

18− sha256 = "sha256-KphpNuTucpuJhXspKxqDyYQN6vbpY0XCB3GAd5YCGbc=";

19− stripRoot = false;

20− };

21− installPhase = ''

22− cp $src/*.jar $out

23− '';

24− };

25− fhs = buildFHSUserEnv {

26− name = "tlauncher";

27− runScript = ''

28− ${openjdk8}/bin/java -jar "${src}" "$@"

29− '';

30− targetPkgs = pkgs: with pkgs; [

31− alsa-lib

32− cpio

33− cups

34− file

35− fontconfig

36− freetype

37− giflib

38− glib

39− gnome2.GConf

40− gnome2.gnome_vfs

41− gtk2

42− libjpeg

43− libGL

44− openjdk8-bootstrap

45− perl

46− which

47− xorg.libICE

48− xorg.libX11

49− xorg.libXcursor

50− xorg.libXext

51− xorg.libXi

52− xorg.libXinerama

53− xorg.libXrandr

54− xorg.xrandr

55− xorg.libXrender

56− xorg.libXt

57− xorg.libXtst

58− xorg.libXtst

59− xorg.libXxf86vm

60− zip

61− zlib

62− ];

63− };

64− desktopItem = makeDesktopItem {

65− name = "tlauncher";

66− exec = "tlauncher";

67− icon = fetchurl {

68− url = "https://styles.redditmedia.com/t5_2o8oax/styles/communityIcon_gu5r5v8eaiq51.png";

69− sha256 = "sha256-ma8zxaUxdAw5VYfOK8i8s1kjwMgs80Eomq43Cb0HZWw=";

70− };

71− comment = "Minecraft launcher";

72− desktopName = "TLauncher";

73− categories = "Game;";

74− };

75−in stdenv.mkDerivation {

76− pname = "tlauncher-wrapper";

77− inherit version;

78−

79− dontUnpack = true;

80−

81− installPhase = ''

82− runHook preInstall

83−

84− mkdir $out/{bin,share/applications} -p

85− install ${fhs}/bin/tlauncher $out/bin

86−

87− runHook postInstall

88− '';

89−

90− nativeBuildInputs = [ copyDesktopItems ];

91− desktopItems = [ desktopItem ];

92−

93− meta = with lib; {

94− description = "Minecraft launcher that already deal with forge, optifine and mods";

95− homepage = "https://tlauncher.org/";

96− maintainers = with maintainers; [ lucasew ];

97− license = licenses.unfree;

98− platforms = openjdk8.meta.platforms;

99− };

100−}

pkgs/games/xconq/default.nix+2−3

@@ -2,12 +2,11 @@

22, libXext, fontconfig, makeWrapper }:

33

44stdenv.mkDerivation rec {

5− name = "${baseName}-${version}";

6− baseName = "xconq";

5+ pname = "xconq";

76 version = "7.5.0-0pre.0.20050612";

87

98 src = fetchurl {

10− url = "mirror://sourceforge/project/${baseName}/${baseName}/${name}/${name}.tar.gz";

9+ url = "mirror://sourceforge/project/xconq/xconq/xconq-${version}/xconq-${version}.tar.gz";

1110 sha256 = "1za78yx57mgwcmmi33wx3533yz1x093dnqis8q2qmqivxav51lca";

1211 };

1312

pkgs/misc/emulators/fceux/default.nix+2−2

@@ -2,13 +2,13 @@

22

33stdenv.mkDerivation rec {

44 pname = "fceux";

5− version = "2.6.0";

5+ version = "2.6.1";

66

77 src = fetchFromGitHub {

88 owner = "TASEmulators";

99 repo = pname;

1010 rev = "${pname}-${version}";

11− sha256 = "sha256-FNcybq0EFN0tWgWxzwEJQMpsnpvdRxDYnIWDXW2fXkw=";

11+ sha256 = "sha256-LlGM6sOjcpyHApUvSr5etKIqwDoheuiW53DSHs19W6Q=";

1212 };

1313

1414 nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

pkgs/misc/emulators/retrofe/default.nix+2−2

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

11{ lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config

2−, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell

2+, python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell

33}:

44

55stdenv.mkDerivation {

@@ -12,7 +12,7 @@ stdenv.mkDerivation {

1212 sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm";

1313 };

1414

15− nativeBuildInputs = [ cmake makeWrapper pkg-config python ];

15+ nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ];

1616

1717 buildInputs = [

1818 glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib

pkgs/misc/emulators/ryujinx/default.nix+6−2

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

11{ lib, buildDotnetModule, fetchFromGitHub, makeDesktopItem, copyDesktopItems

22, libX11, libgdiplus, ffmpeg

33, SDL2_mixer, openal, libsoundio, sndio, pulseaudio

4−, gtk3, gobject-introspection, gdk-pixbuf, wrapGAppsHook

4+, gtk3, gdk-pixbuf, wrapGAppsHook

55}:

66

77buildDotnetModule rec {

@@ -27,7 +27,10 @@ buildDotnetModule rec {

2727 nativeBuildInputs = [

2828 copyDesktopItems

2929 wrapGAppsHook

30− gobject-introspection

30+ ];

31+

32+ buildInputs = [

33+ gtk3

3134 gdk-pixbuf

3235 ];

3336

@@ -78,6 +81,7 @@ buildDotnetModule rec {

7881 changelog = "https://github.com/Ryujinx/Ryujinx/wiki/Changelog";

7982 maintainers = [ maintainers.ivar ];

8083 platforms = [ "x86_64-linux" ];

84+ mainProgram = "Ryujinx";

8185 };

8286 passthru.updateScript = ./updater.sh;

8387}

pkgs/misc/emulators/wxmupen64plus/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL

1+{ lib, stdenv, fetchurl, python2, wxGTK29, mupen64plus, SDL, libX11, libGLU, libGL

22, wafHook }:

33

44stdenv.mkDerivation rec {

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 };

1212

1313 nativeBuildInputs = [ wafHook ];

14− buildInputs = [ python wxGTK29 SDL libX11 libGLU libGL ];

14+ buildInputs = [ python2 wxGTK29 SDL libX11 libGLU libGL ];

1515

1616 preConfigure = ''

1717 tar xf ${mupen64plus.src}

pkgs/misc/screensavers/xtrlock-pam/default.nix+2−2

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

1−{ lib, stdenv, fetchgit, python, pkg-config, xlibsWrapper, pam }:

1+{ lib, stdenv, fetchgit, python2, pkg-config, xlibsWrapper, pam }:

22

33stdenv.mkDerivation {

44 pname = "xtrlock-pam";

@@ -11,7 +11,7 @@ stdenv.mkDerivation {

1111 };

1212

1313 nativeBuildInputs = [ pkg-config ];

14− buildInputs = [ python xlibsWrapper pam ];

14+ buildInputs = [ python2 xlibsWrapper pam ];

1515

1616 configurePhase = ''

1717 substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h

pkgs/misc/vim-plugins/overrides.nix+5−5

@@ -10,7 +10,7 @@

1010, substituteAll

1111

1212 # Language dependencies

13−, python

13+, python2

1414, python3

1515, rustPlatform

1616

@@ -184,7 +184,7 @@ self: super: {

184184 });

185185

186186 ctrlp-cmatcher = super.ctrlp-cmatcher.overrideAttrs (old: {

187− buildInputs = [ python ];

187+ buildInputs = [ python2 ];

188188 buildPhase = ''

189189 patchShebangs .

190190 ./install.sh

@@ -862,7 +862,7 @@ self: super: {

862862 vim-isort = super.vim-isort.overrideAttrs (old: {

863863 postPatch = ''

864864 substituteInPlace ftplugin/python_vimisort.vim \

865− --replace 'import vim' 'import vim; import sys; sys.path.append("${python.pkgs.isort}/${python.sitePackages}")'

865+ --replace 'import vim' 'import vim; import sys; sys.path.append("${python2.pkgs.isort}/${python2.sitePackages}")'

866866 '';

867867 });

868868

@@ -871,7 +871,7 @@ self: super: {

871871 vim-markdown-composer-bin = rustPlatform.buildRustPackage rec {

872872 pname = "vim-markdown-composer-bin";

873873 inherit (super.vim-markdown-composer) src version;

874− cargoSha256 = "1cvnjsw5dd02wrm1q5xi8b033rsn44f7fkmw5j7lhskv5j286zrh";

874+ cargoSha256 = "03d7kap6vha1jmyfrjqaja5439x6mhnvjjbz3rmxb3x4dpppbpj1";

875875 };

876876 in

877877 super.vim-markdown-composer.overrideAttrs (oldAttrs: rec {

@@ -916,7 +916,7 @@ self: super: {

916916 });

917917

918918 vim-wakatime = super.vim-wakatime.overrideAttrs (old: {

919− buildInputs = [ python ];

919+ buildInputs = [ python2 ];

920920 });

921921

922922 vim-xdebug = super.vim-xdebug.overrideAttrs (old: {

pkgs/misc/vscode-extensions/default.nix+40−6

@@ -367,6 +367,22 @@ let

367367

368368 chenglou92.rescript-vscode = callPackage ./rescript { };

369369

370+ christian-kohler.path-intellisense = buildVscodeMarketplaceExtension {

371+ mktplcRef = {

372+ name = "path-intellisense";

373+ publisher = "christian-kohler";

374+ version = "2.6.1";

375+ sha256 = "sha256-ol98g3pliBlyEQ+n7cR4O04J/0QB9U8+fvf+FC0j0Fc=";

376+ };

377+ meta = with lib; {

378+ description = "Visual Studio Code plugin that autocompletes filenames";

379+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense";

380+ homepage = "https://github.com/ChristianKohler/PathIntellisense";

381+ license = licenses.mit;

382+ maintainers = with maintainers; [ imgabe ];

383+ };

384+ };

385+

370386 cmschuetz12.wal = buildVscodeMarketplaceExtension {

371387 mktplcRef = {

372388 name = "wal";

@@ -1064,6 +1080,22 @@ let

10641080 };

10651081 };

10661082

1083+ jdinhlife.gruvbox = buildVscodeMarketplaceExtension {

1084+ mktplcRef = {

1085+ name = "gruvbox";

1086+ publisher = "jdinhlife";

1087+ version = "1.5.1";

1088+ sha256 = "sha256-0ghB0E+Wa9W2bNFFiH2Q3pUJ9HV5+JfKohX4cRyevC8=";

1089+ };

1090+ meta = with lib; {

1091+ description = "Gruvbox Theme";

1092+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=jdinhlife.gruvbox";

1093+ homepage = "https://github.com/jdinhify/vscode-theme-gruvbox";

1094+ license = licenses.mit;

1095+ maintainers = with maintainers; [ imgabe ];

1096+ };

1097+ };

1098+

10671099 jnoortheen.nix-ide = buildVscodeMarketplaceExtension {

10681100 mktplcRef = {

10691101 name = "nix-ide";

@@ -1250,6 +1282,8 @@ let

12501282 };

12511283 };

12521284

1285+ ms-ceintl = callPackage ./language-packs.nix {}; # non-English language packs

1286+

12531287 ms-dotnettools.csharp = callPackage ./ms-dotnettools-csharp { };

12541288

12551289 ms-kubernetes-tools.vscode-kubernetes-tools = buildVscodeMarketplaceExtension {

@@ -1472,8 +1506,8 @@ let

14721506 mktplcRef = {

14731507 name = "metals";

14741508 publisher = "scalameta";

1475− version = "1.11.0";

1476− sha256 = "0a4agm0g16cxhvhvsmbsvvicfsjr53330rsab5xdi7gcpx9a1dff";

1509+ version = "1.12.0";

1510+ sha256 = "13zwjnrmkrs3wxh8c9nz9zxxs3p6lkj41q30v4a1md5pscfa1s44";

14771511 };

14781512 meta = {

14791513 license = lib.licenses.asl20;

@@ -1574,8 +1608,8 @@ let

15741608 mktplcRef = {

15751609 publisher = "stkb";

15761610 name = "rewrap";

1577− version = "1.15.4";

1578− sha256 = "sha256-yuXyClvhGsonvddYHDMkLSvwEsD21vOeE54Gs9BRpeg=";

1611+ version = "1.16.0";

1612+ sha256 = "sha256-351zYmMupAv/8fQ+lOc0pYzy/wsE3JqTuxfKD+AdBAc=";

15791613 };

15801614 meta = with lib; {

15811615 changelog = "https://github.com/stkb/Rewrap/blob/master/CHANGELOG.md";

@@ -1591,8 +1625,8 @@ let

15911625 mktplcRef = {

15921626 name = "code-spell-checker";

15931627 publisher = "streetsidesoftware";

1594− version = "2.0.14";

1595− sha256 = "sha256-mwcssQvaztrnUuSoo8AWK3FXT4qKmPTRCGVYkAjgfXg=";

1628+ version = "2.1.4";

1629+ sha256 = "sha256-V8ug/EtDczjiofuL7HhpN1B+qbedpnvIlXnwiXJzD/g=";

15961630 };

15971631 meta = with lib; {

15981632 changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";

pkgs/misc/vscode-extensions/language-packs.nixnew file+89

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

1+{ lib, vscode-utils }:

2+

3+with vscode-utils;

4+

5+let

6+

7+ buildVscodeLanguagePack = { language, sha256 }:

8+ buildVscodeMarketplaceExtension {

9+ mktplcRef = {

10+ name = "vscode-language-pack-${language}";

11+ publisher = "MS-CEINTL";

12+ version = "1.64.3";

13+ inherit sha256;

14+ };

15+ meta = {

16+ license = lib.licenses.mit;

17+ };

18+ };

19+

20+in

21+

22+# See list of core language packs at https://github.com/Microsoft/vscode-loc

23+{

24+ # French

25+ vscode-language-pack-fr = buildVscodeLanguagePack {

26+ language = "fr";

27+ sha256 = "sha256-6ynT1sbMgKO8iZReQ6KxFpR1VL3Nuo58MvXCtp+67vA=";

28+ };

29+ # Italian

30+ vscode-language-pack-it = buildVscodeLanguagePack {

31+ language = "it";

32+ sha256 = "sha256-5aNFpzNMZAZJH3n0rJevke9P6AW0au5i8+r4PXsb9Rg=";

33+ };

34+ # German

35+ vscode-language-pack-de = buildVscodeLanguagePack {

36+ language = "de";

37+ sha256 = "sha256-oEaWtsgktHKw52lnZTESkpzC/TTY8LO4yX11IgtMG5U=";

38+ };

39+ # Spanish

40+ vscode-language-pack-es = buildVscodeLanguagePack {

41+ language = "es";

42+ sha256 = "sha256-utLWbved3WCCk3XzqedbYzmyaKfbMrAmR0btT09GlxA=";

43+ };

44+ # Russian

45+ vscode-language-pack-ru = buildVscodeLanguagePack {

46+ language = "ru";

47+ sha256 = "sha256-0Wr2ICOiaaj4jZ555bxUJcmXO/yWDyn0UmdvxUF3WSQ=";

48+ };

49+ # Chinese (Simplified)

50+ vscode-language-pack-zh-hans = buildVscodeLanguagePack {

51+ language = "zh-hans";

52+ sha256 = "sha256-irTSQcVXf/V3MuZwfx4tFcvBk+xhbFZTnb7IG28s/p4=";

53+ };

54+ # Chinese (Traditional)

55+ vscode-language-pack-zh-hant = buildVscodeLanguagePack {

56+ language = "zh-hant";

57+ sha256 = "sha256-3IA/VTTTEqS6jrDYv50GnLXOTSC1XAMvqOVfOuvIdIs=";

58+ };

59+ # Japanese

60+ vscode-language-pack-ja = buildVscodeLanguagePack {

61+ language = "ja";

62+ sha256 = "sha256-rxod70ddrppEYYzukksVY1dTXR8osLFAsIPr1fSFZDg=";

63+ };

64+ # Korean

65+ vscode-language-pack-ko = buildVscodeLanguagePack {

66+ language = "ko";

67+ sha256 = "sha256-QYFaxJz1PqKKIiLosLQ8Tu3JNXzpxLFqgIHjjRLwjA4=";

68+ };

69+ # Czech

70+ vscode-language-pack-cs = buildVscodeLanguagePack {

71+ language = "cs";

72+ sha256 = "sha256-eMk+syy2h+Xb3k6QB8PqYaF4I1ydaY6eRsvOXmelh9Q=";

73+ };

74+ # Portuguese (Brazil)

75+ vscode-language-pack-pt-br = buildVscodeLanguagePack {

76+ language = "pt-BR";

77+ sha256 = "sha256-7Trz38KBl4sD7608MvTs02pUsdD05oHEj3Sp1LvtI7I=";

78+ };

79+ # Turkish

80+ vscode-language-pack-tr = buildVscodeLanguagePack {

81+ language = "tr";

82+ sha256 = "sha256-T4CTpbve3vrNdW4VDfHDg8U8cQEtuxPV5LvNdtKrqzA";

83+ };

84+ # Pseudo Language

85+ vscode-language-pack-qps-ploc = buildVscodeLanguagePack {

86+ language = "qps-ploc";

87+ sha256 = "sha256-rPvCr3uQPfM8vwKoV7Un5aiMZClhf6TvG1PEe3xYNI0=";

88+ };

89+}

pkgs/misc/vscode-extensions/vscode-utils.nix+2−2

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

1616 '',

1717 dontPatchELF ? true,

1818 dontStrip ? true,

19− buildInputs ? [],

19+ nativeBuildInputs ? [],

2020 ...

2121 }:

2222 stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // {

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

2828

2929 installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";

3030

31− buildInputs = [ unzip ] ++ buildInputs;

31+ nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;

3232

3333 installPhase = ''

3434

pkgs/os-specific/linux/fbterm/default.nix+10−18

@@ -1,24 +1,17 @@

11{ stdenv, lib, fetchurl, gpm, freetype, fontconfig, pkg-config, ncurses, libx86 }:

2−let

3− s = # Generated upstream information

4− {

5− version = "1.7.0";

6− pname = "fbterm";

7− hash = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";

8− url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-1.7.0.tar.gz";

9− sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";

10− };

11− buildInputs = [ gpm freetype fontconfig ncurses ]

12− ++ lib.optional stdenv.hostPlatform.isx86 libx86;

13−in

14−stdenv.mkDerivation {

15− inherit (s) pname version;

2+

3+stdenv.mkDerivation rec {

4+ version = "1.7.0";

5+ pname = "fbterm";

6+

167 src = fetchurl {

17− inherit (s) url sha256;

8+ url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm/fbterm-${version}.tar.gz";

9+ sha256 = "0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";

1810 };

1911

2012 nativeBuildInputs = [ pkg-config ncurses ];

21− inherit buildInputs;

13+ buildInputs = [ gpm freetype fontconfig ncurses ]

14+ ++ lib.optional stdenv.hostPlatform.isx86 libx86;

2215

2316 preConfigure = ''

2417 sed -e '/ifdef SYS_signalfd/atypedef long long loff_t;' -i src/fbterm.cpp

@@ -51,10 +44,9 @@ stdenv.mkDerivation {

5144 ];

5245

5346 meta = with lib; {

54− inherit (s) version;

5547 description = "Framebuffer terminal emulator";

5648 homepage = "https://code.google.com/archive/p/fbterm/";

57− maintainers = [ maintainers.raskin ];

49+ maintainers = with maintainers; [ raskin ];

5850 license = licenses.gpl2;

5951 platforms = platforms.linux;

6052 };

pkgs/os-specific/linux/hostapd/default.nix+5−35

@@ -1,12 +1,12 @@

1−{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libnl, openssl, sqlite ? null }:

1+{ lib, stdenv, fetchurl, pkg-config, libnl, openssl, sqlite ? null }:

22

33stdenv.mkDerivation rec {

44 pname = "hostapd";

5− version = "2.9";

5+ version = "2.10";

66

77 src = fetchurl {

88 url = "https://w1.fi/releases/${pname}-${version}.tar.gz";

9− sha256 = "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8";

9+ sha256 = "sha256-IG58eZtnhXLC49EgMCOHhLxKn4IyOwFWtMlGbxSYkV0=";

1010 };

1111

1212 nativeBuildInputs = [ pkg-config ];

@@ -16,38 +16,8 @@ stdenv.mkDerivation rec {

1616 (fetchurl {

1717 # Note: fetchurl seems to be unhappy with openwrt git

1818 # server's URLs containing semicolons. Using the github mirror instead.

19− url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";

20− sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";

21− })

22− # AP mode PMF disconnection protection bypass (CVE.2019-16275), can be removed >= 2.10

23− # https://w1.fi/security/2019-7/

24− (fetchurl {

25− name = "CVE-2019-16275.patch";

26− url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch";

27− sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz";

28− })

29− # Fixes for UPnP SUBSCRIBE misbehavior in hostapd WPS AP (CVE-2020-12695), can be removed >= 2.10

30− # https://w1.fi/security/2020-1/

31− (fetchurl {

32− name = "CVE-2020-12695_0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch";

33− url = "https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch";

34− sha256 = "1mrbhicqb34jlw1nid5hk2vnjbvfhvp7r5iblaj4l6vgc6fmp6id";

35− })

36− (fetchurl {

37− name = "CVE-2020-12695_0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch";

38− url = "https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch";

39− sha256 = "1pk08b06b24is50bis3rr56xjd3b5kxdcdk8bx39n9vna9db7zj9";

40− })

41− (fetchurl {

42− name = "CVE-2020-12695_0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch";

43− url = "https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch";

44− sha256 = "12npqp2skgrj934wwkqicgqksma0fxz09di29n1b5fm5i4njl8d8";

45− })

46− # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c.

47− (fetchpatch {

48− name = "CVE-2021-30004.patch";

49− url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15";

50− sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg";

19+ url = "https://raw.githubusercontent.com/openwrt/openwrt/eefed841b05c3cd4c65a78b50ce0934d879e6acf/package/network/services/hostapd/patches/300-noscan.patch";

20+ sha256 = "08p5frxhpq1rp2nczkscapwwl8g9nc4fazhjpxic5bcbssc3sb00";

5121 })

5222 ];

5323

pkgs/os-specific/linux/kernel/perf.nix+2−1

@@ -12,7 +12,8 @@ with lib;

1212assert versionAtLeast kernel.version "3.12";

1313

1414stdenv.mkDerivation {

15− name = "perf-linux-${kernel.version}";

15+ pname = "perf-linux";

16+ version = kernel.version;

1617

1718 inherit (kernel) src;

1819

pkgs/os-specific/linux/klibc/default.nix+2−2

@@ -9,11 +9,11 @@ in

99

1010stdenv.mkDerivation rec {

1111 pname = "klibc";

12− version = "2.0.9";

12+ version = "2.0.10";

1313

1414 src = fetchurl {

1515 url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";

16− sha256 = "sha256-bcynCJEzINJjCfBbDCv2gHG/EbPa3MTmx9kjg3/CPuE=";

16+ sha256 = "sha256-ZidT2oiJ50TfwNtutAIcM3fufvjtZtfVd2X4yeJZOc0=";

1717 };

1818

1919 patches = [ ./no-reinstall-kernel-headers.patch ];

pkgs/os-specific/linux/kmod-debian-aliases/default.nix+1−1

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

11{ stdenv, fetchurl, lib }:

22

33stdenv.mkDerivation rec {

4− name = "kmod-debian-aliases-${version}.conf";

4+ pname = "kmod-debian-aliases.conf";

55 version = "22-1.1";

66

77 src = fetchurl {

pkgs/os-specific/linux/libevdevc/default.nix+1−1

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

11{ lib, stdenv, fetchFromGitHub, coreutils, pkg-config, glib, jsoncpp }:

22

33stdenv.mkDerivation rec {

4− name = "libevdevc";

4+ pname = "libevdevc";

55 version = "2.0.1";

66 src = fetchFromGitHub {

77 owner = "hugegreenbug";

pkgs/os-specific/linux/libgestures/default.nix+1−1

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

11{ lib, stdenv, fetchFromGitHub, pkg-config, glib, jsoncpp }:

22

33stdenv.mkDerivation rec {

4− name = "libgestures-${version}";

4+ pname = "libgestures";

55 version = "2.0.1";

66 src = fetchFromGitHub {

77 owner = "hugegreenbug";

pkgs/os-specific/linux/net-tools/mptcp.nix+1−1

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

11{ lib, nettools, fetchFromGitHub }:

22

33nettools.overrideAttrs(oa: rec {

4− name = "net-tools-mptcp";

4+ pname = "net-tools-mptcp";

55 version = "0.95";

66

77 src = fetchFromGitHub {

pkgs/os-specific/linux/pam_usb/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, pythonPackages, writeScript, runtimeShell }:

1+{ lib, stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkg-config, pmount, python2Packages, writeScript, runtimeShell }:

22

33let

44

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

2929

3030 pmountBin = useSetUID pmount "/bin/pmount";

3131 pumountBin = useSetUID pmount "/bin/pumount";

32− inherit (pythonPackages) python dbus-python;

32+ inherit (python2Packages) python dbus-python;

3333in

3434

3535stdenv.mkDerivation rec {

pkgs/os-specific/linux/pflask/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, python, wafHook }:

1+{ lib, stdenv, fetchFromGitHub, python2, wafHook }:

22

33stdenv.mkDerivation rec {

44 pname = "pflask";

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

1212 };

1313

1414 nativeBuildInputs = [ wafHook ];

15− buildInputs = [ python ];

15+ buildInputs = [ python2 ];

1616

1717 meta = {

1818 description = "Lightweight process containers for Linux";

pkgs/os-specific/linux/pommed-light/default.nix+2−3

@@ -10,13 +10,12 @@

1010}:

1111

1212stdenv.mkDerivation rec {

13− pkgname = "pommed-light";

13+ pname = "pommed-light";

1414 version = "1.51lw";

15− name = "${pkgname}-${version}";

1615

1716 src = fetchFromGitHub {

1817 owner = "bytbox";

19− repo = pkgname;

18+ repo = "pommed-light";

2019 rev = "v${version}";

2120 sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy";

2221 };

pkgs/os-specific/linux/sinit/default.nix+16−23

@@ -1,36 +1,29 @@

1−{lib, stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}:

2−let

3− s = # Generated upstream information

4− rec {

5− baseName="sinit";

6− version="1.1";

7− name="${baseName}-${version}";

8− url="https://git.suckless.org/sinit/";

9− sha256="sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";

1+{ lib, stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "sinit";

5+ version = "1.1";

6+

7+ src = fetchgit {

8+ url = "https://git.suckless.org/sinit/";

9+ sha256 = "sha256-VtXkgixgElKKOT26uKN9feXDVjjtSgTWvcgk5o5MLmw=";

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

1111 };

1212 buildInputs = [

1313 (lib.getOutput "static" stdenv.cc.libc)

1414 ];

15−in

16−stdenv.mkDerivation {

17− inherit (s) name version;

18− inherit buildInputs;

19− src = fetchgit {

20− inherit (s) url sha256 rev;

21− };

22− makeFlags = ["PREFIX=$(out)"];

15+ makeFlags = [ "PREFIX=$(out)" ];

2316 preConfigure = ""

2417 + (lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '')

2518 + (lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '')

2619 + (lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '')

27− ;

28− meta = {

29− inherit (s) version;

20+ ;

21+

22+ meta = with lib; {

3023 description = "A very minimal Linux init implementation from suckless.org";

31− license = lib.licenses.mit ;

32− maintainers = [lib.maintainers.raskin];

33− platforms = lib.platforms.linux;

24+ license = licenses.mit;

25+ maintainers = with maintainers; [ raskin ];

26+ platforms = platforms.linux;

3427 homepage = "https://tools.suckless.org/sinit";

3528 downloadPage = "https://git.suckless.org/sinit";

3629 };

pkgs/os-specific/linux/smem/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, python }:

1+{ lib, stdenv, fetchurl, python2 }:

22

33stdenv.mkDerivation rec {

44 pname = "smem";

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {

99 sha256 = "19ibv1byxf2b68186ysrgrhy5shkc5mc69abark1h18yigp3j34m";

1010 };

1111

12− buildInputs = [ python ];

12+ buildInputs = [ python2 ];

1313

1414 makeFlags = [ "smemcap" ];

1515

pkgs/os-specific/linux/speedometer/default.nix+3−3

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

1−{ lib, fetchurl, pythonPackages }:

1+{ lib, fetchurl, python2Packages }:

22

3−pythonPackages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44 pname = "speedometer";

55 version = "2.8";

66

@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {

99 sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm";

1010 };

1111

12− propagatedBuildInputs = [ pythonPackages.urwid ];

12+ propagatedBuildInputs = [ python2Packages.urwid ];

1313

1414 postPatch = ''

1515 sed -i "/'entry_points': {/d" setup.py

pkgs/os-specific/linux/statifier/default.nix+3−3

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

11{ lib, multiStdenv, fetchurl }:

22

3−let version = "1.7.4"; in

4−multiStdenv.mkDerivation {

5− name = "statifier-${version}";

3+multiStdenv.mkDerivation rec {

4+ pname = "statifier";

5+ version = "1.7.4";

66

77 src = fetchurl {

88 url = "mirror://sourceforge/statifier/statifier-${version}.tar.gz";

pkgs/os-specific/linux/sysvinit/default.nix+3−4

@@ -1,9 +1,8 @@

11{ lib, stdenv, fetchurl, withoutInitTools ? false }:

22

3−let version = "3.01"; in

4−

5−stdenv.mkDerivation {

6− name = (if withoutInitTools then "sysvtools" else "sysvinit") + "-" + version;

3+stdenv.mkDerivation rec {

4+ pname = if withoutInitTools then "sysvtools" else "sysvinit";

5+ version = "3.01";

76

87 src = fetchurl {

98 url = "mirror://savannah/sysvinit/sysvinit-${version}.tar.xz";

pkgs/os-specific/linux/tmon/default.nix+2−1

@@ -1,7 +1,8 @@

11{ lib, stdenv, kernel, ncurses }:

22

33stdenv.mkDerivation {

4− name = "tmon-${kernel.version}";

4+ pname = "tmon";

5+ version = kernel.version;

56

67 inherit (kernel) src;

78

pkgs/os-specific/linux/uclibc/default.nix+1−1

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

5454in

5555

5656stdenv.mkDerivation {

57− name = "uclibc-ng-${version}";

57+ pname = "uclibc-ng";

5858 inherit version;

5959

6060 src = fetchurl {

pkgs/os-specific/linux/unstick/default.nix+2−2

@@ -1,12 +1,12 @@

11{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libseccomp }:

22

33stdenv.mkDerivation rec {

4− name = "unstick";

4+ pname = "unstick";

55 version = "0.1.0";

66

77 src = fetchFromGitHub {

88 owner = "kwohlfahrt";

9− repo = name;

9+ repo = "unstick";

1010 rev = "effee9aa242ca12dc94cc6e96bc073f4cc9e8657";

1111 sha256 = "08la3jmmzlf4pm48bf9zx4cqj9gbqalpqy0s57bh5vfsdk74nnhv";

1212 };

pkgs/os-specific/linux/wpa_supplicant/default.nix+3−32

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

1−{ lib, stdenv, fetchurl, fetchpatch, openssl, pkg-config, libnl

1+{ lib, stdenv, fetchurl, openssl, pkg-config, libnl

22, nixosTests

33, withDbus ? true, dbus

44, withReadline ? true, readline

@@ -8,45 +8,16 @@

88

99with lib;

1010stdenv.mkDerivation rec {

11− version = "2.9";

11+ version = "2.10";

1212

1313 pname = "wpa_supplicant";

1414

1515 src = fetchurl {

1616 url = "https://w1.fi/releases/${pname}-${version}.tar.gz";

17− sha256 = "05qzak1mssnxcgdrafifxh9w86a4ha69qabkg4bsigk499xyxggw";

17+ sha256 = "sha256-IN965RVLODA1X4q0JpEjqHr/3qWf50/pKSqR0Nfhey8=";

1818 };

1919

2020 patches = [

21− (fetchurl {

22− name = "CVE-2019-16275.patch";

23− url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch";

24− sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz";

25− })

26− (fetchpatch {

27− # Expose OWE key management capability over DBus, remove >= 2.10

28− name = "dbus-Export-OWE-capability-and-OWE-BSS-key_mgmt.patch";

29− url = "https://w1.fi/cgit/hostap/patch/?id=7800725afb27397f7d6033d4969e2aeb61af4737";

30− sha256 = "0c1la7inf4m5y9gzdjjdnhpkx32pm8vi6m5knih8p77q4mbrdgg8";

31− })

32− # P2P: Fix copying of secondary device types for P2P group client (https://w1.fi/security/2020-2/)

33− (fetchurl {

34− name = "CVE-2021-0326.patch";

35− url = "https://w1.fi/security/2020-2/0001-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch";

36− sha256 = "19f4hx0p547mdx8y8arb3vclwyy4w9c8a6a40ryj7q33730mrmn4";

37− })

38− # P2P: Fix a corner case in peer addition based on PD Request (https://w1.fi/security/2021-1/)

39− (fetchurl {

40− name = "CVE-2021-27803.patch";

41− url = "https://w1.fi/security/2021-1/0001-P2P-Fix-a-corner-case-in-peer-addition-based-on-PD-R.patch";

42− sha256 = "04cnds7hmbqc44jasabjvrdnh66i5hwvk2h2m5z94pmgbzncyh3z";

43− })

44− # In wpa_supplicant and hostapd 2.9, forging attacks may occur because AlgorithmIdentifier parameters are mishandled in tls/pkcs1.c and tls/x509v3.c.

45− (fetchpatch {

46− name = "CVE-2021-30004.patch";

47− url = "https://w1.fi/cgit/hostap/patch/?id=a0541334a6394f8237a4393b7372693cd7e96f15";

48− sha256 = "1gbhlz41x1ar1hppnb76pqxj6vimiypy7c4kq6h658637s4am3xg";

49− })

5021 ] ++ lib.optionals readOnlyModeSSIDs [

5122 # Allow read-only networks

5223 ./0001-Implement-read-only-mode-for-ssids.patch

pkgs/os-specific/linux/x86info/default.nix+2−2

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

1−{lib, stdenv, fetchurl, pciutils, python}:

1+{lib, stdenv, fetchurl, pciutils, python2}:

22

33stdenv.mkDerivation rec {

44 version = "1.30";

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

1616 sed -i 's/-Werror -Wall//' Makefile

1717 '';

1818

19− buildInputs = [ pciutils python ];

19+ buildInputs = [ pciutils python2 ];

2020

2121 installPhase = ''

2222 mkdir -p $out/bin

pkgs/servers/adguardhome/default.nix+2−1

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

1−{ lib, stdenv, fetchurl, fetchzip }:

1+{ lib, stdenv, fetchurl, fetchzip, nixosTests }:

22

33stdenv.mkDerivation rec {

44 pname = "adguardhome";

@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {

1212

1313 passthru = {

1414 updateScript = ./update.sh;

15+ tests.adguardhome = nixosTests.adguardhome;

1516 };

1617

1718 meta = with lib; {

pkgs/servers/alps/default.nixnew file+24

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

1+{ lib, buildGoModule, fetchFromSourcehut }:

2+

3+buildGoModule rec {

4+ pname = "alps";

5+ version = "2021-09-29";

6+

7+ src = fetchFromSourcehut {

8+ owner = "~migadu";

9+ repo = "alps";

10+ rev = "d4c35f3c3157bece8e50fd95f2ee1081be30d7ae";

11+ sha256 = "sha256-xKfRLdfeD7lWdmC0iiq4dOIv2SmzbKH7HcAISCJgdug=";

12+ };

13+

14+ vendorSha256 = "sha256-8fmbv5uPRfzUqsYU95YzsnuFkq4cwj+LN2X3W/yBHyA=";

15+

16+ proxyVendor = true;

17+

18+ meta = with lib; {

19+ description = "A simple and extensible webmail.";

20+ homepage = "https://git.sr.ht/~migadu/alps";

21+ license = licenses.mit;

22+ maintainers = with maintainers; [ gordias ];

23+ };

24+}

pkgs/servers/amqp/rabbitmq-server/default.nix+2−2

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

33, fetchurl

44, erlang

55, elixir

6−, python

6+, python2

77, libxml2

88, libxslt

99, xmlto

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {

3636 };

3737

3838 nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];

39− buildInputs = [ erlang elixir python libxml2 libxslt glibcLocales ]

39+ buildInputs = [ erlang elixir python2 libxml2 libxslt glibcLocales ]

4040 ++ lib.optionals stdenv.isDarwin [ AppKit Carbon Cocoa ];

4141

4242 outputs = [ "out" "man" "doc" ];

pkgs/servers/computing/storm/default.nix+4−4

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

11{ stdenv, lib, fetchurl, zip, unzip

2−, jdk, python

2+, jdk, python2

33, confFile ? ""

44, extraLibraryPaths ? []

55, extraJars ? []

@@ -30,11 +30,11 @@ stdenv.mkDerivation rec {

3030 fixupPhase = ''

3131 # Fix python reference

3232 sed -i \

33− -e '19iPYTHON=${python}/bin/python' \

34− -e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \

33+ -e '19iPYTHON=${python2}/bin/python' \

34+ -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \

3535 $out/bin/storm

3636 sed -i \

37− -e 's|#!/usr/bin/.*python|#!${python}/bin/python|' \

37+ -e 's|#!/usr/bin/.*python|#!${python2}/bin/python|' \

3838 -e "s|STORM_CONF_DIR = .*|STORM_CONF_DIR = os.getenv('STORM_CONF_DIR','$out/conf')|" \

3939 -e 's|STORM_LOG4J2_CONF_DIR =.*|STORM_LOG4J2_CONF_DIR = os.path.join(STORM_CONF_DIR, "log4j2")|' \

4040 $out/bin/storm.py

pkgs/servers/home-assistant/component-packages.nix+1−1

@@ -2,7 +2,7 @@

22# Do not edit!

33

44{

5− version = "2021.12.9";

5+ version = "2021.12.10";

66 components = {

77 "abode" = ps: with ps; [ abodepy ];

88 "accuweather" = ps: with ps; [ accuweather ];

pkgs/servers/home-assistant/default.nix+2−2

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

177177 extraBuildInputs = extraPackages python.pkgs;

178178

179179 # Don't forget to run parse-requirements.py after updating

180− hassVersion = "2021.12.9";

180+ hassVersion = "2021.12.10";

181181

182182in python.pkgs.buildPythonApplication rec {

183183 pname = "homeassistant";

@@ -194,7 +194,7 @@ in python.pkgs.buildPythonApplication rec {

194194 owner = "home-assistant";

195195 repo = "core";

196196 rev = version;

197− hash = "sha256:17lh16c9kklx4q416ns12qjh1hc0g79y56kdkj1pvybblg0a07lm";

197+ hash = "sha256:0nyddcjy4diq5bakpb76frax44i0jraj2vvpfxrj50h9l5pdwsaf";

198198 };

199199

200200 # leave this in, so users don't have to constantly update their downstream patch handling

pkgs/servers/http/lighttpd/default.nix+15−2

@@ -9,21 +9,34 @@

99, enableWebDAV ? false, sqlite, libuuid

1010, enableExtendedAttrs ? false, attr

1111, perl

12+, fetchpatch

1213}:

1314

1415stdenv.mkDerivation rec {

1516 pname = "lighttpd";

16− version = "1.4.59";

17+ version = "1.4.63";

1718

1819 src = fetchurl {

1920 url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";

20− sha256 = "sha256-+5U9snPa7wjttuICVWyuij0H7tYIHJa9mQPblX0QhNU=";

21+ sha256 = "1fgasvif13gvzz4rf5mjpy28cbw9fs4ymhx18494mxgb080pzvra";

2122 };

2223

24+ patches = [

25+ (fetchpatch {

26+ name = "CVE-2022-22707.patch";

27+ url = "https://github.com/lighttpd/lighttpd1.4/commit/8c62a890e23f5853b1a562b03fe3e1bccc6e7664.patch";

28+ sha256 = "0zm2khgllsd1ivh9m7sisfsyrdfz45zsmiwl963wf0gn8m100gzk";

29+ })

30+ ];

31+

2332 postPatch = ''

2433 patchShebangs tests

2534 # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests

2635 sed -ire '/[$]self->{HOSTNAME} *=/i if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm

36+ # it's difficult to prevent this test from trying to use /var/tmp (which

37+ # the sandbox doesn't have) so until libredirect has support for mkstemp

38+ # calls it's easiest to disable it

39+ sed -i '/test_mod_ssi/d' src/t/test_mod.c

2740 '';

2841

2942 depsBuildBuild = [ buildPackages.stdenv.cc ];

pkgs/servers/keycloak/default.nix+2−2

@@ -18,11 +18,11 @@ let

1818in

1919stdenv.mkDerivation rec {

2020 pname = "keycloak";

21− version = "15.1.0";

21+ version = "16.1.0";

2222

2323 src = fetchzip {

2424 url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";

25− sha256 = "0s8nvp1ca30569k1a7glbn2zvvchz35s2r8d08fbs5zjngnz3276";

25+ sha256 = "sha256-QVFu3f+mwafoNUttLEVMdoZHMJjjH/TpZAGV7ZvIvh0=";

2626 };

2727

2828 nativeBuildInputs = [ makeWrapper ];

pkgs/servers/mapserver/default.nix+2−2

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

11{ lib, stdenv, fetchFromGitHub, cmake, pkg-config

22, cairo, curl, fcgi, freetype, fribidi, gdal, geos, giflib, harfbuzz

33, libjpeg, libpng, librsvg, libxml2, postgresql, proj, protobufc, zlib

4−, withPython ? true, swig, python

4+, withPython ? true, swig, python2

55}:

66

77stdenv.mkDerivation rec {

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {

3838 proj

3939 protobufc

4040 zlib

41− ] ++ lib.optional withPython python;

41+ ] ++ lib.optional withPython python2;

4242

4343 cmakeFlags = [

4444 "-DWITH_KML=ON"

pkgs/servers/matrix-synapse/default.nix+3−2

@@ -11,11 +11,11 @@ in

1111with python3.pkgs;

1212buildPythonApplication rec {

1313 pname = "matrix-synapse";

14− version = "1.49.2";

14+ version = "1.50.1";

1515

1616 src = fetchPypi {

1717 inherit pname version;

18− sha256 = "7b795ecfc36e3f57eb7cffbc5ef9da1745b777536416c31509b3e6220c39ca4d";

18+ sha256 = "sha256-fdO+HJ1+fk+s65jLkPDiG+Ei89x5Fbkh9BUUFQ3NJ3M=";

1919 };

2020

2121 buildInputs = [ openssl ];

@@ -31,6 +31,7 @@ buildPythonApplication rec {

3131 jinja2

3232 jsonschema

3333 lxml

34+ matrix-common

3435 msgpack

3536 netaddr

3637 phonenumbers

pkgs/servers/mattermost/default.nix+3−3

@@ -10,7 +10,7 @@

1010, storePathAsBuildHash ? false }:

1111

1212let

13− version = "6.2.1";

13+ version = "6.3.0";

1414

1515 goPackagePath = "github.com/mattermost/mattermost-server";

1616

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

2222 owner = "mattermost";

2323 repo = "mattermost-server";

2424 rev = "v${version}";

25− sha256 = "WjBsbW7aEI+MX2I1LrEJh8JgNQ4Do7PpeshXgaQAk1s=";

25+ sha256 = "y3VTDl01UrMpgoN06lf98C+uTu2N9u0EAWYADPpOI3w=";

2626 };

2727

2828 ldflags = [

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

6565

6666 src = fetchurl {

6767 url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";

68− sha256 = "pV/MwMCK8vMzASXuM1+ePcarIgrcNAkFLEdmPya911E=";

68+ sha256 = "PqinkPC7J6Ng1fjTrcAa6ZqiyB2JKkGRdvJ6h2wNS5w=";

6969 };

7070

7171 installPhase = ''

pkgs/servers/mautrix-facebook/default.nix+12−4

@@ -7,13 +7,13 @@

77

88python3.pkgs.buildPythonPackage rec {

99 pname = "mautrix-facebook";

10− version = "0.3.2";

10+ version = "2022-01-10";

1111

1212 src = fetchFromGitHub {

1313 owner = "mautrix";

1414 repo = "facebook";

15− rev = "v${version}";

16− sha256 = "1n7gshm2nir6vgjkj36lq9m2bclkgy0y236xi8zvdlvfcb2m596f";

15+ rev = "eebfbe49fc699806e1d71becf261ba0995c91f60";

16+ hash = "sha256-zfsuoPySIRAAmsSL0NUUVH7k+xV7rZOHOkIvBQdVe0A=";

1717 };

1818

1919 propagatedBuildInputs = with python3.pkgs; [

@@ -30,9 +30,13 @@ python3.pkgs.buildPythonPackage rec {

3030 ruamel-yaml

3131 unpaddedbase64

3232 yarl

33+ zstandard

3334 ] ++ lib.optional enableSystemd systemd;

3435

35− doCheck = false;

36+ postPatch = ''

37+ # Drop version limiting so that every dependency update doesn't break this package.

38+ sed -i -e 's/,<.*//' requirements.txt

39+ '';

3640

3741 postInstall = ''

3842 mkdir -p $out/bin

@@ -44,6 +48,10 @@ python3.pkgs.buildPythonPackage rec {

4448 chmod +x $out/bin/mautrix-facebook

4549 '';

4650

51+ checkPhase = ''

52+ $out/bin/mautrix-facebook --help

53+ '';

54+

4755 meta = with lib; {

4856 homepage = "https://github.com/mautrix/facebook";

4957 description = "A Matrix-Facebook Messenger puppeting bridge";

pkgs/servers/mautrix-whatsapp/default.nix+3−3

@@ -2,18 +2,18 @@

22

33buildGo117Module rec {

44 pname = "mautrix-whatsapp";

5− version = "0.2.2";

5+ version = "0.2.3";

66

77 src = fetchFromGitHub {

88 owner = "mautrix";

99 repo = "whatsapp";

1010 rev = "v${version}";

11− sha256 = "sha256-W+5DtCp7P/0azfusv+Nt3G9VcWKPUxVJmNwSfPjxjbw=";

11+ sha256 = "sha256-vMRmxu1TNCw5c+PuSdAPdMJpZGLdcCTzpTNz/AFrWi8=";

1212 };

1313

1414 buildInputs = [ olm ];

1515

16− vendorSha256 = "sha256-maGnlnxyhrvW0NkHmHWEvNge5c/HxLDm8NuWR6zcdYg=";

16+ vendorSha256 = "sha256-bvbZ7Tnd6s6zr9trN4egR/9KV5cU09mQI+U1UxyYzlE=";

1717

1818 doCheck = false;

1919

pkgs/servers/misc/oven-media-engine/default.nix+5−25

@@ -2,57 +2,37 @@

22, fetchFromGitHub

33, fetchpatch

44, srt

5−, ffmpeg_3_4

65, bc

76, pkg-config

87, perl

9−, openssl

8+, openssl_3_0

109, zlib

1110, ffmpeg

1211, libvpx

1312, libopus

13+, libuuid

1414, srtp

1515, jemalloc

1616, pcre2

1717}:

1818

19−let

20− ffmpeg = ffmpeg_3_4.overrideAttrs (super: {

21− pname = "${super.pname}-ovenmediaengine";

22− src = fetchFromGitHub {

23− owner = "Airensoft";

24− repo = "FFmpeg";

25− rev = "142b4bb64b64e337f80066e6af935a68627fedae"; # on branch ome/3.4

26− sha256 = "0fla3940q3z0c0ik2xzkbvdfvrdg06ban7wi6y94y8mcipszpp11";

27− };

28− });

29−in

3019stdenv.mkDerivation rec {

3120 pname = "oven-media-engine";

32− version = "0.10.9-hotfix";

21+ version = "0.12.9";

3322

3423 src = fetchFromGitHub {

3524 owner = "AirenSoft";

3625 repo = "OvenMediaEngine";

3726 rev = "v${version}";

38− sha256 = "1fhria0vwqsgmsglv5gn858li33vfy2dwy1f1qdd2jwikskb53am";

27+ sha256 = "0d3ymw747frl40w5d6r33lf1s72v7fiv742yjr1m6la2phb9h834";

3928 };

4029

41− patches = [

42− (fetchpatch {

43− # Needed to fix compilation under GCC 10.

44− url = "https://github.com/AirenSoft/OvenMediaEngine/commit/ad83e1d2226445d649e4b7e0c75106e31af4940d.patch";

45− sha256 = "1zk1rgi1wsjl6gdx3hdmgxlgindv6a3lsnkwcgi87ga9abw4vafw";

46− stripLen = 1;

47− })

48− ];

49−

5030 sourceRoot = "source/src";

5131 makeFlags = "release CONFIG_LIBRARY_PATHS= CONFIG_PKG_PATHS= GLOBAL_CC=$(CC) GLOBAL_CXX=$(CXX) GLOBAL_LD=$(CXX) SHELL=${stdenv.shell}";

5232 enableParallelBuilding = true;

5333

5434 nativeBuildInputs = [ bc pkg-config perl ];

55− buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 ];

35+ buildInputs = [ openssl_3_0 srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid ];

5636

5737 preBuild = ''

5838 patchShebangs core/colorg++

pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix+21−14

@@ -1,27 +1,32 @@

1−{ lib, stdenv, fetchFromGitHub, file, openssl, makeWrapper, which, curl, fetchpatch }:

1+{ lib

2+, stdenv

3+, fetchFromGitHub

4+, file

5+, openssl

6+, makeWrapper

7+, which

8+, curl

9+}:

210

311stdenv.mkDerivation rec {

412 pname = "check_ssl_cert";

5− version = "1.80.0";

13+ version = "2.19.0";

614

715 src = fetchFromGitHub {

816 owner = "matteocorti";

917 repo = "check_ssl_cert";

1018 rev = "v${version}";

11− sha256 = "1jkwii45hynil1jail9gmz4bak066rdi8zfcczicjsa6npbz50w4";

19+ sha256 = "sha256-HNvchmP975k971EYpDFCqxx8w1Oq/IIEy+r1il0PjmQ=";

1220 };

1321

14− patches = [

15− # https://github.com/matteocorti/check_ssl_cert/pull/114

16− (fetchpatch {

17− url = "https://github.com/matteocorti/check_ssl_cert/commit/2b7aad583d507a70605dd44d918739a65b267bfd.patch";

18− sha256 = "1jk872jgm6k3qc1ks1h3v6p804spjlnxcj2wc8v0hkmwfwiwd2k4";

19− })

22+ nativeBuildInputs = [

23+ makeWrapper

2024 ];

2125

22− nativeBuildInputs = [ makeWrapper ];

23−

24− makeFlags = [ "DESTDIR=$(out)/bin" "MANDIR=$(out)/share/man" ];

26+ makeFlags = [

27+ "DESTDIR=$(out)/bin"

28+ "MANDIR=$(out)/share/man"

29+ ];

2530

2631 postInstall = ''

2732 wrapProgram $out/bin/check_ssl_cert \

@@ -29,8 +34,10 @@ stdenv.mkDerivation rec {

2934 '';

3035

3136 meta = with lib; {

32− description = "A Nagios plugin to check the CA and validity of an X.509 certificate";

33− license = licenses.gpl3;

37+ description = "Nagios plugin to check the CA and validity of an X.509 certificate";

38+ homepage = "https://github.com/matteocorti/check_ssl_cert";

39+ license = licenses.gpl3Plus;

40+ maintainers = with maintainers; [ ];

3441 platforms = platforms.all;

3542 };

3643}

pkgs/servers/nats-server/default.nix+2−2

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

44

55buildGoPackage rec {

66 pname = "nats-server";

7− version = "2.6.3";

7+ version = "2.7.0";

88

99 goPackagePath = "github.com/nats-io/${pname}";

1010

@@ -12,7 +12,7 @@ buildGoPackage rec {

1212 rev = "v${version}";

1313 owner = "nats-io";

1414 repo = pname;

15− sha256 = "sha256-7srDyTsIyac4AYwTFpDji4Czg6rRK9evb4W25CqQgGk=";

15+ sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao=";

1616 };

1717

1818 meta = {

pkgs/servers/nats-streaming-server/default.nix+2−2

@@ -4,14 +4,14 @@ with lib;

44

55buildGoPackage rec {

66 pname = "nats-streaming-server";

7− version = "0.22.1";

7+ version = "0.23.0";

88 goPackagePath = "github.com/nats-io/${pname}";

99

1010 src = fetchFromGitHub {

1111 rev = "v${version}";

1212 owner = "nats-io";

1313 repo = pname;

14− sha256 = "sha256-VdYyui0fyoNf1q3M1xTg/UMlxIFABqAbqQaD0bLpKCY=";

14+ sha256 = "sha256-Uol1A4+0V4dUQ7Qw0qRUWHzFBugVDYSulDGTJZ4a+ts=";

1515 };

1616

1717 meta = {

pkgs/servers/nosql/apache-jena/binary.nix+11−22

@@ -1,38 +1,27 @@

1−{lib, stdenv, fetchurl, java, makeWrapper}:

2−let

3− s = # Generated upstream information

4− rec {

5− baseName="apache-jena";

6− version = "4.3.2";

7− name="${baseName}-${version}";

8− url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";

1+{ lib, stdenv, fetchurl, java, makeWrapper }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "apache-jena";

5+ version = "4.3.2";

6+ src = fetchurl {

7+ url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";

98 sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y=";

109 };

1110 buildInputs = [

1211 makeWrapper

1312 ];

14−in

15−stdenv.mkDerivation {

16− inherit (s) name version;

17− inherit buildInputs;

18− src = fetchurl {

19− inherit (s) url sha256;

20− };

2113 installPhase = ''

2214 cp -r . "$out"

2315 for i in "$out"/bin/*; do

2416 wrapProgram "$i" --prefix "PATH" : "${java}/bin/"

2517 done

2618 '';

27− meta = {

28− inherit (s) version;

19+ meta = with lib; {

2920 description = "RDF database";

30− license = lib.licenses.asl20;

31− maintainers = [lib.maintainers.raskin];

32− platforms = lib.platforms.linux;

21+ license = licenses.asl20;

22+ maintainers = with maintainers; [ raskin ];

23+ platforms = platforms.linux;

3324 homepage = "https://jena.apache.org";

3425 downloadPage = "https://archive.apache.org/dist/jena/binaries/";

35− updateWalker = true;

36− downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$";

3726 };

3827}

pkgs/servers/nosql/apache-jena/fuseki-binary.nix+11−21

@@ -1,23 +1,15 @@

1−{lib, stdenv, fetchurl, java, makeWrapper}:

2−let

3− s = # Generated upstream information

4− rec {

5− baseName="apache-jena-fuseki";

6− version = "4.3.1";

7− name="${baseName}-${version}";

8− url="https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";

1+{ lib, stdenv, fetchurl, java, makeWrapper }:

2+

3+stdenv.mkDerivation rec {

4+ pname = "apache-jena-fuseki";

5+ version = "4.3.1";

6+ src = fetchurl {

7+ url = "https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";

98 sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx";

109 };

1110 buildInputs = [

1211 makeWrapper

1312 ];

14−in

15−stdenv.mkDerivation {

16− inherit (s) name version;

17− inherit buildInputs;

18− src = fetchurl {

19− inherit (s) url sha256;

20− };

2113 installPhase = ''

2214 cp -r . "$out"

2315 chmod +x $out/fuseki

@@ -29,14 +21,12 @@ stdenv.mkDerivation {

2921 ;

3022 done

3123 '';

32− meta = {

33− inherit (s) version;

24+ meta = with lib; {

3425 description = "SPARQL server";

35− license = lib.licenses.asl20;

36− maintainers = [lib.maintainers.raskin];

37− platforms = lib.platforms.linux;

26+ license = licenses.asl20;

27+ maintainers = with maintainers; [ raskin ];

28+ platforms = platforms.linux;

3829 homepage = "https://jena.apache.org";

3930 downloadPage = "https://archive.apache.org/dist/jena/binaries/";

40− downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";

4131 };

4232}

pkgs/servers/ombi/default.nix+4−4

@@ -10,14 +10,14 @@ let

1010 "Unsupported system: ${stdenv.hostPlatform.system}");

1111

1212 hash = {

13− x64-linux_hash = "sha256-4kvcBRMMH4AnTKSES5Cpst/omTRXVRq1V1y/z5njKJI=";

14− arm64-linux_hash = "sha256-NLsf0ldvlKSrHJyAXv5Ar2zIetoga6iZPOGTxFOqoQQ=";

15− x64-osx_hash = "sha256-tjvGuShz/fv3qUknFVKJ+tE/bVtIyPZ7dr4JfTEcDJY=";

13+ x64-linux_hash = "sha256-BLtoT6UHsur+jFp4KBlE10/Z/V6RDy0k16H10IC98WQ=";

14+ arm64-linux_hash = "sha256-s8EV/VqiUXWRTNxacx4sy6r+TIAqkqhESAYYa9s0uAQ=";

15+ x64-osx_hash = "sha256-woXFYmX+499NTtWmmGBpZ12PxTUazJ8klA6IPQIDjLE=";

1616 }."${arch}-${os}_hash";

1717

1818in stdenv.mkDerivation rec {

1919 pname = "ombi";

20− version = "4.0.1468";

20+ version = "4.3.3";

2121

2222 sourceRoot = ".";

2323

pkgs/servers/ombi/update.sh+1−1

@@ -15,7 +15,7 @@ updateHash()

1515

1616 url="https://github.com/Ombi-app/Ombi/releases/download/v$version/$os-$arch.tar.gz"

1717 hash=$(nix-prefetch-url --type sha256 $url)

18− sriHash="$(nix to-sri --type sha256 $hash)"

18+ sriHash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)"

1919

2020 sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"

2121}

pkgs/servers/plex/raw.nix+3−3

@@ -12,16 +12,16 @@

1212# server, and the FHS userenv and corresponding NixOS module should

1313# automatically pick up the changes.

1414stdenv.mkDerivation rec {

15− version = "1.25.2.5319-c43dc0277";

15+ version = "1.25.3.5409-f11334058";

1616 pname = "plexmediaserver";

1717

1818 # Fetch the source

1919 src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {

2020 url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";

21− sha256 = "09kkkyli5fygyvlzqd46jzi0y4jp0a24d92ayvfm95gm3fcxl73x";

21+ hash = "sha256-Q0768UxZXSuUm26Ro2XIrw8qoQEWCU23P7EBtbiIa0c=";

2222 } else fetchurl {

2323 url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";

24− sha256 = "17whd724sjblqxz6d79jb6hrqvkgg5mbh3bh1lr9b8sswa3pxb07";

24+ hash = "sha256-TaOvXVeo385vqtv/dYvmQQx8c1K/EMw4MTDucg511Cs=";

2525 };

2626

2727 outputs = [ "out" "basedb" ];

pkgs/servers/sickbeard/sickgear.nix+2−2

@@ -4,13 +4,13 @@ let

44 pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 ]);

55in stdenv.mkDerivation rec {

66 pname = "sickgear";

7− version = "0.25.11";

7+ version = "0.25.24";

88

99 src = fetchFromGitHub {

1010 owner = "SickGear";

1111 repo = "SickGear";

1212 rev = "release_${version}";

13− sha256 = "sha256-0/Ez10IWvh84G//1vCZMLiu4+Y2+XcVLw9Gm9X+DY0s=";

13+ sha256 = "sha256-x6v7CKJkN6gt9askpp/W0CVCKvRaHLBXbagtC+rVNVc=";

1414 };

1515

1616 dontBuild = true;

pkgs/servers/sql/postgresql/ext/plv8.nix+37−7

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

1−{ lib, stdenv, fetchFromGitHub, v8, perl, postgresql }:

1+{ lib, stdenv, fetchFromGitHub, v8, perl, postgresql

2+# For test

3+, runCommand, coreutils, gnugrep }:

24

3−stdenv.mkDerivation rec {

5+let self = stdenv.mkDerivation rec {

46 pname = "plv8";

57 version = "3.0.0";

68

@@ -29,6 +31,8 @@ stdenv.mkDerivation rec {

2931 ];

3032

3133 preConfigure = ''

34+ # We build V8 as a monolith, so this is unnecessary.

35+ substituteInPlace Makefile.shared --replace "-lv8_libplatform" ""

3236 patchShebangs ./generate_upgrade.sh

3337 substituteInPlace generate_upgrade.sh \

3438 --replace " 2.3.10)" " 2.3.10 2.3.11 2.3.12 2.3.13 2.3.14 2.3.15)"

@@ -42,10 +46,36 @@ stdenv.mkDerivation rec {

4246 rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix"

4347 '';

4448

45− # Without this, PostgreSQL will crash at runtime.

46− # The flags are only included in Makefile, not Makefile.shared.

47− # https://github.com/plv8/plv8/pull/469

48− NIX_CFLAGS_COMPILE = "-DJSONB_DIRECT_CONVERSION -DV8_COMPRESS_POINTERS=1 -DV8_31BIT_SMIS_ON_64BIT_ARCH=1";

49+ NIX_CFLAGS_COMPILE = [

50+ # V8 depends on C++14.

51+ "-std=c++14"

52+ # Without this, PostgreSQL will crash at runtime.

53+ # The flags are only included in Makefile, not Makefile.shared.

54+ # https://github.com/plv8/plv8/pull/469

55+ "-DJSONB_DIRECT_CONVERSION" "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1"

56+ ];

57+

58+ passthru.tests.smoke = runCommand "${pname}-test" {} ''

59+ export PATH=${lib.makeBinPath [ (postgresql.withPackages (_: [self])) coreutils gnugrep ]}

60+ db="$PWD/testdb"

61+ initdb "$db"

62+ postgres -k "$db" -D "$db" &

63+ pid="$!"

64+

65+ for i in $(seq 1 100); do

66+ if psql -h "$db" -d postgres -c "" 2>/dev/null; then

67+ break

68+ elif ! kill -0 "$pid"; then

69+ exit 1

70+ else

71+ sleep 0.1

72+ fi

73+ done

74+

75+ psql -h "$db" -d postgres -c 'CREATE EXTENSION plv8; DO $$ plv8.elog(NOTICE, plv8.version); $$ LANGUAGE plv8;' 2> "$out"

76+ grep -q "${version}" "$out"

77+ kill -0 "$pid"

78+ '';

4979

5080 meta = with lib; {

5181 description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";

@@ -54,4 +84,4 @@ stdenv.mkDerivation rec {

5484 platforms = [ "x86_64-linux" ];

5585 license = licenses.postgresql;

5686 };

57−}

87+}; in self

pkgs/servers/sql/postgresql/packages.nix+3−1

@@ -26,7 +26,9 @@ self: super: {

2626

2727 plr = super.callPackage ./ext/plr.nix { };

2828

29− plv8 = super.callPackage ./ext/plv8.nix { };

29+ plv8 = super.callPackage ./ext/plv8.nix {

30+ v8 = self.v8_8_x;

31+ };

3032

3133 pgjwt = super.callPackage ./ext/pgjwt.nix { };

3234

pkgs/servers/sql/proxysql/default.nix+2−2

@@ -25,7 +25,7 @@

2525, pcre

2626, perl

2727, prometheus-cpp

28−, python

28+, python2

2929, re2

3030, zlib

3131}:

@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {

5656 cmake

5757 libtool

5858 perl

59− python

59+ python2

6060 ];

6161

6262 buildInputs = [

pkgs/servers/tailscale/default.nix+3−3

@@ -2,20 +2,20 @@

22

33buildGoModule rec {

44 pname = "tailscale";

5− version = "1.18.2";

5+ version = "1.20.1";

66

77 src = fetchFromGitHub {

88 owner = "tailscale";

99 repo = "tailscale";

1010 rev = "v${version}";

11− sha256 = "sha256-8leFG2gYXw+orN/2NfjTvgRqSZSdso7OHIgECEJrO9k=";

11+ sha256 = "sha256-n+94ipR1w63NS2tzMsJWY4oxeTBEWrp8e2gF+CTpvrI=";

1212 };

1313

1414 nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

1515

1616 CGO_ENABLED = 0;

1717

18− vendorSha256 = "sha256-ulgTwnuisnkQf0WLQhZ70MwuOpZuroh7ShxBGyv0d0k=";

18+ vendorSha256 = "sha256-ZbOxC8J843B8BMS/ZgfSZqU1YCUoWhPqbABzWZy3DMI=";

1919

2020 doCheck = false;

2121

pkgs/servers/tvheadend/default.nix+2−2

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

11{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config

2−, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python

2+, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python2

33, v4l-utils, which, zlib }:

44

55let

@@ -29,7 +29,7 @@ in stdenv.mkDerivation {

2929 };

3030

3131 buildInputs = [

32− avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python

32+ avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python2

3333 which zlib

3434 ];

3535

pkgs/servers/web-apps/lemmy/package.json+20−20

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

11{

22 "name": "lemmy-ui",

33 "description": "An isomorphic UI for lemmy",

4− "version": "0.14.0",

4+ "version": "0.15.1",

55 "author": "Dessalines <tyhou13@gmx.com>",

66 "license": "AGPL-3.0",

77 "scripts": {

@@ -17,13 +17,14 @@

1717 },

1818 "repository": "https://github.com/LemmyNet/lemmy-ui",

1919 "dependencies": {

20− "@typescript-eslint/parser": "^5.4.0",

20+ "@typescript-eslint/parser": "^5.6.0",

2121 "autosize": "^5.0.1",

2222 "check-password-strength": "^2.0.3",

23− "choices.js": "^9.0.1",

23+ "choices.js": "^10.0.0",

24+ "classnames": "^2.3.1",

2425 "emoji-short-name": "^1.0.0",

2526 "express": "~4.17.1",

26− "i18next": "^21.5.0",

27+ "i18next": "^21.5.4",

2728 "inferno": "^7.4.11",

2829 "inferno-create-element": "^7.4.11",

2930 "inferno-helmet": "^5.2.1",

@@ -39,46 +40,45 @@

3940 "markdown-it-sub": "^1.0.0",

4041 "markdown-it-sup": "^1.0.0",

4142 "moment": "^2.29.1",

42− "reconnecting-websocket": "^4.4.0",

4343 "register-service-worker": "^1.7.2",

4444 "rxjs": "^7.4.0",

45+ "sass": "^1.47.0",

4546 "serialize-javascript": "^6.0.0",

4647 "tippy.js": "^6.3.7",

4748 "toastify-js": "^1.11.2",

4849 "tributejs": "^5.1.3",

49− "ws": "^8.2.3"

50+ "websocket-ts": "^1.1.1"

5051 },

5152 "devDependencies": {

5253 "@babel/core": "^7.16.0",

53− "@babel/plugin-transform-runtime": "^7.16.0",

54+ "@babel/plugin-transform-runtime": "^7.16.4",

5455 "@babel/plugin-transform-typescript": "^7.16.1",

55− "@babel/preset-env": "7.16.0",

56+ "@babel/preset-env": "7.16.8",

5657 "@babel/preset-typescript": "^7.16.0",

5758 "@babel/runtime": "^7.16.3",

5859 "@types/autosize": "^4.0.0",

5960 "@types/express": "^4.17.13",

60− "@types/node": "^16.11.7",

61+ "@types/node": "^17.0.8",

6162 "@types/node-fetch": "^2.5.11",

6263 "@types/serialize-javascript": "^5.0.1",

63− "@typescript-eslint/eslint-plugin": "^5.4.0",

64+ "@typescript-eslint/eslint-plugin": "^5.6.0",

6465 "babel-loader": "^8.2.3",

6566 "babel-plugin-inferno": "^6.3.0",

6667 "bootstrap": "^5.1.3",

6768 "bootswatch": "^5.1.3",

6869 "clean-webpack-plugin": "^4.0.0",

69− "copy-webpack-plugin": "^9.1.0",

70+ "copy-webpack-plugin": "^10.0.0",

7071 "css-loader": "^6.5.1",

71− "eslint": "^8.2.0",

72+ "eslint": "^8.4.0",

7273 "eslint-plugin-prettier": "^4.0.0",

7374 "husky": "^7.0.4",

7475 "import-sort-style-module": "^6.0.0",

7576 "iso-639-1": "^2.1.10",

76− "lemmy-js-client": "0.14.0-rc.1",

77− "lint-staged": "^11.2.6",

78− "mini-css-extract-plugin": "^2.4.4",

77+ "lemmy-js-client": "0.15.0",

78+ "lint-staged": "^12.1.2",

79+ "mini-css-extract-plugin": "^2.4.5",

7980 "node-fetch": "^2.6.1",

80− "node-sass": "^6.0.1",

81− "prettier": "^2.4.1",

81+ "prettier": "^2.5.1",

8282 "prettier-plugin-import-sort": "^0.0.7",

8383 "prettier-plugin-organize-imports": "^2.3.4",

8484 "prettier-plugin-packagejson": "^2.2.15",

@@ -88,10 +88,10 @@

8888 "sortpack": "^2.2.0",

8989 "style-loader": "^3.3.1",

9090 "terser": "^5.10.0",

91− "typescript": "^4.4.4",

92− "webpack": "5.64.1",

91+ "typescript": "^4.5.2",

92+ "webpack": "5.66.0",

9393 "webpack-cli": "^4.9.1",

94− "webpack-dev-server": "4.5.0",

94+ "webpack-dev-server": "4.7.3",

9595 "webpack-node-externals": "^3.0.0"

9696 },

9797 "engines": {

pkgs/servers/web-apps/lemmy/pin.json+5−5

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

11{

2− "version": "0.14.0",

3− "serverSha256": "sha256-rrLOWoy4GkVtfIPpyR0Zwvnqq39CoZRDaVPNSpeJpkA=",

4− "serverCargoSha256": "sha256-6HrsMwzcmNw8udsCdvn8zgIWN0N3Vvsn9bFk+5tBOds=",

5− "uiSha256": "sha256-e+ajyUc2P5eK1dH7qQsC9BmZgT3NCGLbbzbUE3i2rXY=",

6− "uiYarnDepsSha256": "sha256-g3jCc98ftFyvZGD2bESY1eIsLZyQxZpDxgHdRGu78vs="

2+ "version": "0.15.1",

3+ "serverSha256": "sha256-HHr9mG0AuI/86+EjODE/GT9lhl5DeNkzQ4k077b7ICU=",

4+ "serverCargoSha256": "sha256-ErMNsyHfBiYZA4gjaxPHO+fQseUVIKy/928oGqw+Adg=",

5+ "uiSha256": "sha256-Al6Q1xXkjqIb2v2S4JbmlQAAFCKwzkAW924uolC0tu8=",

6+ "uiYarnDepsSha256": "sha256-Zadp74ZHmbxCHxpDAYOa6Ot2kWujIj8ZzrSaIEsYgMY="

77}

pkgs/servers/web-apps/lemmy/server.nix+5

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

66, postgresql

77, libiconv

88, Security

9+, protobuf

910}:

1011let

1112 pinData = lib.importJSON ./pin.json;

@@ -34,6 +35,10 @@ rustPlatform.buildRustPackage rec {

3435 OPENSSL_LIB_DIR = "${openssl.out}/lib";

3536 OPENSSL_INCLUDE_DIR = "${openssl.dev}/include";

3637

38+ PROTOC = "${protobuf}/bin/protoc";

39+ PROTOC_INCLUDE = "${protobuf}/include";

40+ nativeBuildInputs = [ protobuf ];

41+

3742 passthru.updateScript = ./update.sh;

3843

3944 meta = with lib; {

pkgs/servers/x11/xorg/default.nix+15

@@ -1344,6 +1344,21 @@ lib.makeScope newScope (self: with self; {

13441344 meta.platforms = lib.platforms.unix;

13451345 }) {};

13461346

1347+ # THIS IS A GENERATED FILE. DO NOT EDIT!

1348+ libxcvt = callPackage ({ stdenv, pkg-config, fetchurl, meson, ninja }: stdenv.mkDerivation {

1349+ pname = "libxcvt";

1350+ version = "0.1.1";

1351+ builder = ./builder.sh;

1352+ src = fetchurl {

1353+ url = "mirror://xorg/individual/lib/libxcvt-0.1.1.tar.xz";

1354+ sha256 = "0acc7vrj5kfb19zvyl7f29rnsvx383dvwc19k70r8prm1lccxsr7";

1355+ };

1356+ hardeningDisable = [ "bindnow" "relro" ];

1357+ nativeBuildInputs = [ pkg-config meson ninja ];

1358+ buildInputs = [ ];

1359+ meta.platforms = lib.platforms.unix;

1360+ }) {};

1361+

13471362 # THIS IS A GENERATED FILE. DO NOT EDIT!

13481363 libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11 }: stdenv.mkDerivation {

13491364 pname = "libxkbfile";

pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl+2−1

@@ -23,7 +23,7 @@ my %pcMap;

2323my %extraAttrs;

2424

2525

26−my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext" );

26+my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python3", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4", "libinput", "libevdev", "mtdev", "xorgproto", "cairo", "gettext", "meson", "ninja" );

2727$pcMap{$_} = $_ foreach @missingPCs;

2828$pcMap{"freetype2"} = "freetype";

2929$pcMap{"libpng12"} = "libpng";

@@ -229,6 +229,7 @@ while (<>) {

229229

230230 push @nativeRequires, "gettext" if $file =~ /USE_GETTEXT/;

231231 push @requires, "libxslt" if $pkg =~ /libxcb/;

232+ push @nativeRequires, "meson", "ninja" if $pkg =~ /libxcvt/;

232233 push @nativeRequires, "m4" if $pkg =~ /xcbutil/;

233234 push @requires, "gperf", "xorgproto" if $pkg =~ /xcbutil/;

234235

pkgs/servers/x11/xorg/tarballs.list+1

@@ -181,6 +181,7 @@ mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2

181181mirror://xorg/individual/lib/libxcb-1.14.tar.xz

182182mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2

183183mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2

184+mirror://xorg/individual/lib/libxcvt-0.1.1.tar.xz

184185mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2

185186mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2

186187mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2

pkgs/shells/zsh/zsh-git-prompt/default.nix+2−2

@@ -25,7 +25,7 @@

2525# installed.

2626#

2727{ fetchFromGitHub

28−, python

28+, python2

2929, git

3030, lib

3131, haskellPackages

@@ -45,7 +45,7 @@ haskellPackages.callPackage

4545 prePatch = ''

4646 substituteInPlace zshrc.sh \

4747 --replace ':-"python"' ':-"haskell"' \

48− --replace 'python ' '${python.interpreter} ' \

48+ --replace 'python ' '${python2.interpreter} ' \

4949 --replace 'git ' '${git}/bin/git '

5050 '';

5151 preCompileBuildDriver = "cd src";

pkgs/tools/X11/opentabletdriver/default.nix+19−8

@@ -19,13 +19,13 @@

1919

2020buildDotnetModule rec {

2121 pname = "OpenTabletDriver";

22− version = "0.5.3.3";

22+ version = "0.6.0.2";

2323

2424 src = fetchFromGitHub {

2525 owner = "OpenTabletDriver";

2626 repo = "OpenTabletDriver";

2727 rev = "v${version}";

28− sha256 = "sha256-k4SoOMKAwHeYSQ80M8Af1DiiDSZIi3gS7lGr2ZrXrEI=";

28+ sha256 = "sha256-qPlya5f12Cc1yAK8dliWelA7drAoeeIkFXOD+aDeToo=";

2929 };

3030

3131 debPkg = fetchurl {

@@ -33,10 +33,10 @@ buildDotnetModule rec {

3333 sha256 = "sha256-LJqH3+JckPF7S/1uBE2X81jxWg0MF9ff92Ei8WPEA2w=";

3434 };

3535

36− dotnet-sdk = dotnetCorePackages.sdk_5_0;

37− dotnet-runtime = dotnetCorePackages.runtime_5_0;

36+ dotnet-sdk = dotnetCorePackages.sdk_6_0;

37+ dotnet-runtime = dotnetCorePackages.runtime_6_0;

3838

39− dotnetInstallFlags = [ "--framework=net5" ];

39+ dotnetInstallFlags = [ "--framework=net6.0" ];

4040

4141 projectFile = [ "OpenTabletDriver.Console" "OpenTabletDriver.Daemon" "OpenTabletDriver.UX.Gtk" ];

4242 nugetDeps = ./deps.nix;

@@ -62,19 +62,30 @@ buildDotnetModule rec {

6262 doCheck = true;

6363 testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj";

6464

65− # Require networking

6665 disabledTests = [

66+ # Require networking

6767 "OpenTabletDriver.Tests.PluginRepositoryTest.ExpandRepositoryTarballFork"

6868 "OpenTabletDriver.Tests.PluginRepositoryTest.ExpandRepositoryTarball"

69+ # Require networking & unused in Linux build

70+ "OpenTabletDriver.Tests.UpdaterTests.UpdaterBase_ProperlyChecks_Version_Async"

71+ "OpenTabletDriver.Tests.UpdaterTests.Updater_PreventsUpdate_WhenAlreadyUpToDate_Async"

72+ "OpenTabletDriver.Tests.UpdaterTests.Updater_AllowsReupdate_WhenInstallFailed_Async"

73+ "OpenTabletDriver.Tests.UpdaterTests.Updater_HasUpdateReturnsFalse_During_UpdateInstall_Async"

74+ "OpenTabletDriver.Tests.UpdaterTests.Updater_HasUpdateReturnsFalse_After_UpdateInstall_Async"

75+ "OpenTabletDriver.Tests.UpdaterTests.Updater_Prevents_ConcurrentAndConsecutive_Updates_Async"

76+ "OpenTabletDriver.Tests.UpdaterTests.Updater_ProperlyBackups_BinAndAppDataDirectory_Async"

77+ # Intended only to be run in continuous integration, unnecessary for functionality

78+ "OpenTabletDriver.Tests.ConfigurationTest.Configurations_DeviceIdentifier_IsNotConflicting"

79+ # Depends on processor load

80+ "OpenTabletDriver.Tests.TimerTests.TimerAccuracy"

6981 ];

7082

71− postInstall = ''

83+ postFixup = ''

7284 # Give a more "*nix" name to the binaries

7385 mv $out/bin/OpenTabletDriver.Console $out/bin/otd

7486 mv $out/bin/OpenTabletDriver.Daemon $out/bin/otd-daemon

7587 mv $out/bin/OpenTabletDriver.UX.Gtk $out/bin/otd-gui

7688

77− cp -r ./OpenTabletDriver/Configurations $out/lib/${pname}

7889 install -Dm644 $src/OpenTabletDriver.UX/Assets/otd.png -t $out/share/pixmaps

7990

8091 # TODO: Ideally this should be build from OpenTabletDriver/OpenTabletDriver-udev instead

pkgs/tools/X11/opentabletdriver/deps.nix+28−8

@@ -1,7 +1,8 @@

11{ fetchNuGet }: [

22 (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; })

33 (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; })

4− (fetchNuGet { pname = "coverlet.collector"; version = "3.0.3"; sha256 = "1igcqqr2kh6w9qx0h89y6c2zg4g2h7g8kc2lv5pz3xk6nd8iv7pw"; })

4+ (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; })

5+ (fetchNuGet { pname = "coverlet.collector"; version = "3.0.2"; sha256 = "1xf6z6izmsl4g8w3z1wbp4pa8f8qsf6sil4mf1c9fb22hq8c5hkg"; })

56 (fetchNuGet { pname = "Eto.Forms"; version = "2.5.10"; sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7"; })

67 (fetchNuGet { pname = "Eto.Forms"; version = "2.5.11"; sha256 = "0h86jc19wy3ssj7pb34w1h02v92mg29gdipszwjs3y15piy66z3s"; })

78 (fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.5.11"; sha256 = "1s9njz7l9zghrbzli7lbiav5ss3glqf17npj07f3jldd933nb95j"; })

@@ -12,29 +13,33 @@

1213 (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; })

1314 (fetchNuGet { pname = "MessagePack"; version = "2.1.194"; sha256 = "1v2gyd9sd6hppfhlzngmzzhnpr39b95rwrqq0r9zzp480b6vzaj0"; })

1415 (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.1.194"; sha256 = "1jkhq3hiy4brvzsywl4p4jb9jrnzs3vmgr3s8fxpb1dzafadw8b0"; })

16+ (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "5.0.0"; sha256 = "0d7sjr89zwq0wxirf8la05hfalv9nhvlczg1c7a508k8aw79jvfg"; })

1517 (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; })

16− (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.1"; sha256 = "18isx8w4kwnlk6hq5ay8i4lgzwhx0zg9brayfdk2lakagvv6yyaf"; })

18+ (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.4"; sha256 = "11wiyy3ykgk1sa9amy3lgcsg2v7d1sz59ggw647vx8ibpjxijjpp"; })

1719 (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })

1820 (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.1"; sha256 = "0z6d1i6xcf0c00z6rs75rgw4ncs9q2m8amasf6mmbf40fm02ry7g"; })

21+ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-rc.1.21451.13"; sha256 = "0r6945jq7c2f1wjifq514zvngicndjqfnsjya6hqw0yzah0jr56c"; })

22+ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; })

23+ (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "5.0.0"; sha256 = "1p62khf9zk23lh91lvz7plv3g1nzmm3b5szqrcm6mb8w3sjk03wi"; })

1924 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })

2025 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })

2126 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; })

2227 (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; })

2328 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })

2429 (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })

25− (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.1"; sha256 = "1761mvkp5mwhw150fvazdhh4ybvxpvx05g9znf8n1fqx832wxrw5"; })

26− (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; })

27− (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.1"; sha256 = "1frx5r7l0jd3j6my4s2qas13fkljgfn87a84xk8l7sisafpfsvzp"; })

30+ (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.4"; sha256 = "1jdx05zmrqj1s7xfgn3wgy10qb5cl1n1jcj5kz43zvkw1amc7ra4"; })

31+ (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.4"; sha256 = "1jizkbrnm4pv60zch29ki7gj8m7j5whk141x9cwx4kwsd6cfzwi6"; })

32+ (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.4"; sha256 = "14110qzmypr72ywvx3npq7mf4n0gvdr4536v91z1xbapms65am6x"; })

2833 (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; })

2934 (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; })

3035 (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; })

3136 (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })

3237 (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; })

33− (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.1.2"; sha256 = "1390nyc0sf5c4j75cq58bzqjcw77sp2lmpllmm5sp8ysi0fjyfs5"; })

34− (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.1.2"; sha256 = "1617q2accpa8fwy9n1snmjxyx2fz3phks62mdi45cl65kdin0x4z"; })

38+ (fetchNuGet { pname = "Moq"; version = "4.16.1"; sha256 = "1m2gwbx0gsy84rl9c3hgdaw9gz8d08ffg19nwg0idsdqmmiq887l"; })

3539 (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.77"; sha256 = "13dnfwxa8syx7vfjmd5pcrqz31k0q8y3mmh6yz6bmljhjri65q5c"; })

3640 (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })

3741 (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; })

42+ (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })

3843 (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })

3944 (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; })

4045 (fetchNuGet { pname = "Octokit"; version = "0.50.0"; sha256 = "1ignj5i6a1c19qqrw00wlr9fdjmwrxkxz7gdxj0x653w84gbv7qq"; })

@@ -74,18 +79,23 @@

7479 (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })

7580 (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })

7681 (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })

82+ (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; })

83+ (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; })

7784 (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta1.20253.1"; sha256 = "16saf1fm9q80bb624fkqz0ksrwpnbw9617d7xg3jib7a2wgagm2r"; })

85+ (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; })

7886 (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.7.0"; sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; })

87+ (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; })

88+ (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; })

7989 (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })

8090 (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })

8191 (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })

8292 (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })

83− (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; })

8493 (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })

8594 (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })

8695 (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; })

8796 (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })

8897 (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; })

98+ (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })

8999 (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })

90100 (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })

91101 (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })

@@ -135,6 +145,7 @@

135145 (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })

136146 (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; })

137147 (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; })

148+ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0-rc.1.21451.13"; sha256 = "0v5bc80p35jj5b5xdgsn5r1v4w68gqz0sahi214rprrrlr3sl206"; })

138149 (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })

139150 (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })

140151 (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })

@@ -172,5 +183,14 @@

172183 (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })

173184 (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })

174185 (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })

186+ (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; })

175187 (fetchNuGet { pname = "WaylandNET"; version = "0.2.0"; sha256 = "1qjpvra08vdqdw4j1gamz6451x5sd5r1j86lsvrl8akq4nymfr8k"; })

188+ (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; })

189+ (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; })

190+ (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; })

191+ (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; })

192+ (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; })

193+ (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; })

194+ (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; })

195+ (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; })

176196]

pkgs/tools/X11/opentabletdriver/update.sh+1−1

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

11#!/usr/bin/env nix-shell

2−#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_5

2+#!nix-shell -i bash -p curl gnused jq common-updater-scripts nuget-to-nix dotnet-sdk_6 dotnet-sdk_5

33set -eo pipefail

44cd "$(dirname "${BASH_SOURCE[0]}")"

55

pkgs/tools/admin/pulumi/data.nix+49−49

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

11# DO NOT EDIT! This file is generated automatically by update.sh

22{ }:

33{

4− version = "3.21.0";

4+ version = "3.22.1";

55 pulumiPkgs = {

66 x86_64-linux = [

77 {

8− url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-linux-x64.tar.gz";

9− sha256 = "110ab7i3ynkjhbk10q150p7301prffk4xqma79rk28cxxvxf4kk3";

8+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-x64.tar.gz";

9+ sha256 = "0yxjlkvyxap4c7ny5x0ch0j4d5360qapb670f6im7vnaqhc00by0";

1010 }

1111 {

1212 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-amd64.tar.gz";

1313 sha256 = "02k3ars9i8pfby3070rnnldfcb5hbh32kd5xnbmgd0202yg5y3pd";

1414 }

1515 {

16− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.33.1-linux-amd64.tar.gz";

17− sha256 = "13i6jmy2nyv80d0ab29yw489qwnf7i0yjrns1d124gijdd30zh0l";

16+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-linux-amd64.tar.gz";

17+ sha256 = "0c61m2q7944a29dkcqcv5fv9jn2bz8mdfhnd33z8qaybhw2804rd";

1818 }

1919 {

20− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.32.0-linux-amd64.tar.gz";

21− sha256 = "1g0v7vqrf5237vv0ki74j6zb18zas8i3ii5w9fvy4mg9x4k37d4k";

20+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-linux-amd64.tar.gz";

21+ sha256 = "0k5bpg6lmhj3cxsg43dkyw9jlwyllwwdhml3brkyfgb307cypl9b";

2222 }

2323 {

2424 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-linux-amd64.tar.gz";

@@ -45,12 +45,12 @@

4545 sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";

4646 }

4747 {

48− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.6.0-linux-amd64.tar.gz";

49− sha256 = "0s9k26yw4lw8rlaz0zcim234bz4sz94x3y4sjh56sn3cd80zcp8i";

48+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-linux-amd64.tar.gz";

49+ sha256 = "074ihk1c3g580grbipy0acryjsmaz8n65siyc7yz4gcgcwqwb5mj";

5050 }

5151 {

52− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.0-linux-amd64.tar.gz";

53− sha256 = "1zvxqxvdi0szsy3bgyhqbwxbcrgq5zpqcawfq80h55g5bvvmjwk7";

52+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-linux-amd64.tar.gz";

53+ sha256 = "0ffbsnpgr6wz9xj5yq6m55xj4mqji7hir6dylyjcpdkrxnigyiss";

5454 }

5555 {

5656 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-amd64.tar.gz";

@@ -61,8 +61,8 @@

6161 sha256 = "0qv3a4d6hnpga7lli7xnbwiig56h080hxrxjr8jbqsy9ymsqb39a";

6262 }

6363 {

64− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.12.2-linux-amd64.tar.gz";

65− sha256 = "0lhxz3420ghjkny7r3gqfcf84mxm2j86npiwgg2lkgmsb2kmafj7";

64+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-linux-amd64.tar.gz";

65+ sha256 = "02xgkwfsfkqv38cjyc62rlsldbdd5j801gmlh9pf3qjdjj5d1fl3";

6666 }

6767 {

6868 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-amd64.tar.gz";

@@ -103,20 +103,20 @@

103103 ];

104104 x86_64-darwin = [

105105 {

106− url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-darwin-x64.tar.gz";

107− sha256 = "0pd6jlrw2cc4g33kkl2dfqks5xicmc2bnbrf0cd2ymx9mdnkdaq8";

106+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-x64.tar.gz";

107+ sha256 = "0b68pfrd83x02rs2saybxycpkirjciilp4a94ps3788y1plinyih";

108108 }

109109 {

110110 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-amd64.tar.gz";

111111 sha256 = "02s2lyd8rlz86rjraxk5g3g55qhih38kmvq0k2gwkdb2d11npf6r";

112112 }

113113 {

114− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.33.1-darwin-amd64.tar.gz";

115− sha256 = "1nkg7ybi8n60ypw69w0psap1k3m7pdk4z4vyfciv7lv3qc30nlfa";

114+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-darwin-amd64.tar.gz";

115+ sha256 = "1a26schi28ci0zbm85yx4hlhwlwx0j0kk6d6nk9x1zldc3qzhw4y";

116116 }

117117 {

118− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.32.0-darwin-amd64.tar.gz";

119− sha256 = "1nabijlwgp6jfhs9pjv5h4bg5s4nwiaqqa315q30ykna8dd7nl5r";

118+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-darwin-amd64.tar.gz";

119+ sha256 = "04sblbjnxvxhxvzvsgjm83p6qahswwb2mvlylfpgq74ay86l6hki";

120120 }

121121 {

122122 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-darwin-amd64.tar.gz";

@@ -143,12 +143,12 @@

143143 sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";

144144 }

145145 {

146− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.6.0-darwin-amd64.tar.gz";

147− sha256 = "12527gic3sf6ch1773yrwi1g5pp1iyc50q6nhdwwc7vq3sf1ngx9";

146+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-darwin-amd64.tar.gz";

147+ sha256 = "046j20xl3ibfyqkcra242a5rpix14n4w3h9w9x618fbznk24bcxb";

148148 }

149149 {

150− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.0-darwin-amd64.tar.gz";

151− sha256 = "0y5c4ifi4jr7nb33c35axmfwyq0c5si28mq0dvwppq0ffz0lifgk";

150+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-darwin-amd64.tar.gz";

151+ sha256 = "100rqkz0g1w0fhvgvgys9r6a7bqphzizn28lg7pbbkrwjh7s0bxq";

152152 }

153153 {

154154 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-amd64.tar.gz";

@@ -159,8 +159,8 @@

159159 sha256 = "1xminhpv7b4nnvfdy5ahlcfrkan1fsmn0sp6gzkp5y4kkjd4a6vy";

160160 }

161161 {

162− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.12.2-darwin-amd64.tar.gz";

163− sha256 = "113xcf5zg7h90r4w50ss3yjivn3vlq4icff76abhphi5m99b50f5";

162+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-darwin-amd64.tar.gz";

163+ sha256 = "1dpr4h35zby8say0kcvin5y5k4yryx06p3qcx16zrlsjaz6lj84k";

164164 }

165165 {

166166 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-amd64.tar.gz";

@@ -201,20 +201,20 @@

201201 ];

202202 aarch64-linux = [

203203 {

204− url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-linux-arm64.tar.gz";

205− sha256 = "0484hpbf25kfxac72r74h5rfp5r59hlkhzqib9vma3l1cz9icmyx";

204+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-linux-arm64.tar.gz";

205+ sha256 = "0551zp5n77jzh8k3jbqq75zj734faryxxdd2fvw881cxf95v39aj";

206206 }

207207 {

208208 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-linux-arm64.tar.gz";

209209 sha256 = "0rlbcxympplq1gwikxalz3c686kpy2vrsc2phfnm45vvrkl22k8j";

210210 }

211211 {

212− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.33.1-linux-arm64.tar.gz";

213− sha256 = "00gps0dmidkvbxcljwwxlrh6i9ci4lzgnycc4f2vibm2yfx38d4y";

212+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-linux-arm64.tar.gz";

213+ sha256 = "0639dl0hj2l33mc4vqbcyywpkfn30fikmiw10zjikcdg1jxzj4nd";

214214 }

215215 {

216− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.32.0-linux-arm64.tar.gz";

217− sha256 = "0zg7g4m9rvm24njn90m9ppfprzl08cmm0min0p467h617pyxlii2";

216+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-linux-arm64.tar.gz";

217+ sha256 = "15lxfilkgh9ansy9n2yv693fms3x718lrxz0g2nxi32hz9hq0ysl";

218218 }

219219 {

220220 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-linux-arm64.tar.gz";

@@ -241,12 +241,12 @@

241241 sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";

242242 }

243243 {

244− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.6.0-linux-arm64.tar.gz";

245− sha256 = "0s07gqviacygag8k4q8zbwwp127zsk0kiiqpz4y0gc95pg872bi1";

244+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-linux-arm64.tar.gz";

245+ sha256 = "0r53qwf1w68bnqii20b44q1xlgxggsisnlr46463nxm0jb0wwyn9";

246246 }

247247 {

248− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.0-linux-arm64.tar.gz";

249− sha256 = "1c2g5kzyi0vcah1inpa3a974kcsgdlw0a6gyiij23ryaa5vppk1l";

248+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-linux-arm64.tar.gz";

249+ sha256 = "1zr9vcr6qiql90bysapmrlafl7xmlv49bgp197w4w2290i5q7f6n";

250250 }

251251 {

252252 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-linux-arm64.tar.gz";

@@ -257,8 +257,8 @@

257257 sha256 = "14xqlgy0wy223hg9wp1rc4hbj1pvxrqnzxzv901dqjf5434n6aa0";

258258 }

259259 {

260− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.12.2-linux-arm64.tar.gz";

261− sha256 = "02hd6bkhvg27pnn0ph6vb0ns90m8kllfiv1xglsr9yxib25g3bci";

260+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-linux-arm64.tar.gz";

261+ sha256 = "12lnh8hk02w1n28v6i46kxxpkzw1j9zp84ha5p6bnarza6g4wxnk";

262262 }

263263 {

264264 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-linux-arm64.tar.gz";

@@ -296,20 +296,20 @@

296296 ];

297297 aarch64-darwin = [

298298 {

299− url = "https://get.pulumi.com/releases/sdk/pulumi-v3.21.0-darwin-arm64.tar.gz";

300− sha256 = "01446r5q9a684k0z5b6d2a7gdjszy2816v09jdxkc54cg37fhmlz";

299+ url = "https://get.pulumi.com/releases/sdk/pulumi-v3.22.1-darwin-arm64.tar.gz";

300+ sha256 = "00jzqrnw6khbw5hsaqwi73hx9h3yxdhy2n3jn3h76az27wfjkhkz";

301301 }

302302 {

303303 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.4.0-darwin-arm64.tar.gz";

304304 sha256 = "116f1psg3wdl81apxlhgz6w1ykhlqxwqk6ahp82mca1h2qc7bg0h";

305305 }

306306 {

307− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.33.1-darwin-arm64.tar.gz";

308− sha256 = "0b67z5ikmplnjcb3gghcmzkdj8sgv6kd0b1a4f9dbv22dds6qbih";

307+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v4.34.0-darwin-arm64.tar.gz";

308+ sha256 = "1rzds5wrq51mzs7sgzwna016qcay3dzp5ys25cxmr47025kyv84p";

309309 }

310310 {

311− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.32.0-darwin-arm64.tar.gz";

312− sha256 = "12rx7cma3mi8a6w09qzz138dns93y5rdgm5l9z422vjynhs0jpm4";

311+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v4.33.0-darwin-arm64.tar.gz";

312+ sha256 = "1lqmjkqqq3rlsixv2kam50d5m95c81mn23y3dblbkh8d6qpwkfdp";

313313 }

314314 {

315315 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.2.0-darwin-arm64.tar.gz";

@@ -336,12 +336,12 @@

336336 sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";

337337 }

338338 {

339− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.6.0-darwin-arm64.tar.gz";

340− sha256 = "1hswpbzzp18gzz8ggmyfs5ccbhnnk0w9064mvrbpj29baa1brhim";

339+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.7.0-darwin-arm64.tar.gz";

340+ sha256 = "1w5nhmc6bzfw0ihv5mwn316sj7w27psknnyffqm1pyw6drp0z58v";

341341 }

342342 {

343− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.0-darwin-arm64.tar.gz";

344− sha256 = "1znrkq3ch28xdgy6vbx91rb2s2nvm12ihpq945x76swya6z7dvcn";

343+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.9.1-darwin-arm64.tar.gz";

344+ sha256 = "13w91xxma00zi7llk0hnqi10m90a5b2zhb08j6l0dn7x5a33dqay";

345345 }

346346 {

347347 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.4.0-darwin-arm64.tar.gz";

@@ -352,8 +352,8 @@

352352 sha256 = "0n0303423gkwi3b6dwzaqmzsbn2rh4vki6n54mmgd44a3cxbhkak";

353353 }

354354 {

355− url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.12.2-darwin-arm64.tar.gz";

356− sha256 = "11mhabl8sk4q85hvg41l5s82hkw8rccjiw748wsl43wb3qmx66zx";

355+ url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.14.0-darwin-arm64.tar.gz";

356+ sha256 = "1rq2wxw0kch7xrk0sr1l6fyz1sslyvk44l3jilzbm7mgi0d77w23";

357357 }

358358 {

359359 url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.7.1-darwin-arm64.tar.gz";

pkgs/tools/admin/pulumi/update.sh+87−56

@@ -1,86 +1,117 @@

1−#!/usr/bin/env bash

1+#!/usr/bin/env nix-shell

2+#!nix-shell -i bash -p gh

3+# shellcheck shell=bash

24# Bash 3 compatible for Darwin

35

4−# For getting the latest version of plugins automatically

5−API_URL="https://api.github.com/repos/pulumi"

6+if [ -z "${GITHUB_TOKEN}" ]; then

7+ echo >&2 "usage: GITHUB_TOKEN=… ./update.sh"

8+ exit 1

9+fi

610

711# Version of Pulumi from

812# https://www.pulumi.com/docs/get-started/install/versions/

9−VERSION="3.21.0"

13+VERSION="3.22.1"

1014

1115# An array of plugin names. The respective repository inside Pulumi's

1216# Github organization is called pulumi-$name by convention.

1317

18+declare -a pulumi_repos

1419pulumi_repos=(

15− "auth0"

16− "aws"

17− "azure"

18− "cloudflare"

19− "consul"

20− "datadog"

21− "digitalocean"

22− "docker"

23− "equinix-metal"

24− "gcp"

25− "github"

26− "gitlab"

27− "hcloud"

28− "kubernetes"

29− "linode"

30− "mailgun"

31− "mysql"

32− "openstack"

33− "packet"

34− "postgresql"

35− "random"

36− "vault"

37− "vsphere"

20+ "auth0"

21+ "aws"

22+ "azure"

23+ "cloudflare"

24+ "consul"

25+ "datadog"

26+ "digitalocean"

27+ "docker"

28+ "equinix-metal"

29+ "gcp"

30+ "github"

31+ "gitlab"

32+ "hcloud"

33+ "kubernetes"

34+ "linode"

35+ "mailgun"

36+ "mysql"

37+ "openstack"

38+ "packet"

39+ "postgresql"

40+ "random"

41+ "vault"

42+ "vsphere"

3843)

3944

4045# Contains latest release ${VERSION} from

4146# https://github.com/pulumi/pulumi-${NAME}/releases

4247

43−# Dynamically builds the plugin array, using the API for getting the

48+# Dynamically builds the plugin array, using the GitHub API for getting the

4449# latest version.

50+plugin_num=1

4551plugins=()

4652for key in "${pulumi_repos[@]}"; do

47− repo="pulumi-${key}"

48− plugins+=("${key}=$(curl -s ${API_URL}/${repo}/releases/latest | jq -M -r .tag_name | sed 's/v//g')")

49− sleep 1

53+ plugin="${key}=$(gh api "repos/pulumi/pulumi-${key}/releases/latest" --jq '.tag_name | sub("^v"; "")')"

54+ printf "%20s: %s of %s\r" "${plugin}" "${plugin_num}" "${#pulumi_repos[@]}"

55+ plugins+=("${plugin}")

56+ sleep 1

57+ ((++plugin_num))

5058done

59+printf "\n"

5160

5261function genMainSrc() {

53− local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-${1}-${2}.tar.gz"

54− local sha256

55− sha256=$(nix-prefetch-url "$url")

56− echo " {"

57− echo " url = \"${url}\";"

58− echo " sha256 = \"$sha256\";"

59− echo " }"

62+ local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-${1}-${2}.tar.gz"

63+ local sha256

64+ sha256=$(nix-prefetch-url "$url")

65+ echo " {"

66+ echo " url = \"${url}\";"

67+ echo " sha256 = \"$sha256\";"

68+ echo " }"

69+}

70+

71+function genSrc() {

72+ local url="${1}"

73+ local plug="${2}"

74+ local tmpdir="${3}"

75+

76+ local sha256

77+ sha256=$(nix-prefetch-url "$url")

78+

79+ {

80+ if [ -n "$sha256" ]; then # file exists

81+ echo " {"

82+ echo " url = \"${url}\";"

83+ echo " sha256 = \"$sha256\";"

84+ echo " }"

85+ else

86+ echo " # pulumi-resource-${plug} skipped (does not exist on remote)"

87+ fi

88+ } > "${tmpdir}/${plug}.nix"

6089}

6190

6291function genSrcs() {

63− for plugVers in "${plugins[@]}"; do

64− local plug=${plugVers%=*}

65− local version=${plugVers#*=}

66− # url as defined here

67− # https://github.com/pulumi/pulumi/blob/06d4dde8898b2a0de2c3c7ff8e45f97495b89d82/pkg/workspace/plugins.go#L197

68− local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-${1}-${2}.tar.gz"

69− local sha256

70− sha256=$(nix-prefetch-url "$url")

71− if [ "$sha256" ]; then # file exists

72− echo " {"

73− echo " url = \"${url}\";"

74− echo " sha256 = \"$sha256\";"

75− echo " }"

76− else

77− echo " # pulumi-resource-${plug} skipped (does not exist on remote)"

78− fi

79− done

92+ local tmpdir

93+ tmpdir="$(mktemp -d)"

94+

95+ local i=0

96+

97+ for plugVers in "${plugins[@]}"; do

98+ local plug=${plugVers%=*}

99+ local version=${plugVers#*=}

100+ # url as defined here

101+ # https://github.com/pulumi/pulumi/blob/06d4dde8898b2a0de2c3c7ff8e45f97495b89d82/pkg/workspace/plugins.go#L197

102+ local url="https://api.pulumi.com/releases/plugins/pulumi-resource-${plug}-v${version}-${1}-${2}.tar.gz"

103+ genSrc "${url}" "${plug}" "${tmpdir}" &

104+ ((++i))

105+ done

106+

107+ wait

108+

109+ find "${tmpdir}" -name '*.nix' -print0 | sort -z | xargs -r0 cat

110+ rm -r "${tmpdir}"

80111}

81112

82113{

83− cat <<EOF

114+ cat << EOF

84115# DO NOT EDIT! This file is generated automatically by update.sh

85116{ }:

86117{

pkgs/tools/audio/abcmidi/default.nix+2−2

@@ -2,11 +2,11 @@

22

33stdenv.mkDerivation rec {

44 pname = "abcMIDI";

5− version = "2021.12.12";

5+ version = "2022.01.13";

66

77 src = fetchzip {

88 url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";

9− hash = "sha256-34yRMa68x93u8/fGTzflh1L/Lf7ULPXsDaC7GUy+i8g=";

9+ hash = "sha256-jXXUdPAmU6JcnqWBnzc9tfjEyLSdYxZZJh4w4iSCD1w=";

1010 };

1111

1212 meta = with lib; {

pkgs/tools/backup/kopia/default.nix+3−3

@@ -2,16 +2,16 @@

22

33buildGo117Module rec {

44 pname = "kopia";

5− version = "0.9.8";

5+ version = "0.10.0";

66

77 src = fetchFromGitHub {

88 owner = pname;

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-7Bvgtp6egZqpTv4Ac+OUkhKzTZhRRMwpdvwOCBA6Dso=";

11+ sha256 = "sha256-445E+RiYlfDNOuw51Wdsavb52RjL3FkcrN9EeKmJ+Q8=";

1212 };

1313

14− vendorSha256 = "sha256-/dCRM61Zl5YbIb0mKhcyLU15nQhR31QAaq+5TwRK4pM=";

14+ vendorSha256 = "sha256-wq/9MUCeJBZjrg0SXgHYMyXodqIF3KLRHQmvi7gbv5M=";

1515

1616 doCheck = false;

1717

pkgs/tools/backup/tsm-client/default.nix+76−36

@@ -1,15 +1,20 @@

11{ lib

2+, callPackage

3+, nixosTests

24, stdenv

5+, fetchurl

36, autoPatchelfHook

7+, rpmextract

8+, openssl

9+, zlib

10+, lvm2 # LVM image backup and restore functions (optional)

11+, acl # EXT2/EXT3/XFS ACL support (optional)

12+, gnugrep

13+, procps

14+, jdk8 # Java GUI (needed for `enableGui`)

415, buildEnv

5−, fetchurl

616, makeWrapper

7−, procps

8−, zlib

9−# optional packages that enable certain features

10−, acl ? null # EXT2/EXT3/XFS ACL support

11−, jdk8 ? null # Java GUI

12−, lvm2 ? null # LVM image backup and restore functions

17+, enableGui ? false # enables Java GUI `dsmj`

1318# path to `dsm.sys` configuration files

1419, dsmSysCli ? "/etc/tsm-client/cli.dsm.sys"

1520, dsmSysApi ? "/etc/tsm-client/api.dsm.sys"

@@ -18,7 +23,7 @@

1823

1924# For an explanation of optional packages

2025# (features provided by them, version limits), see

21−# https://www-01.ibm.com/support/docview.wss?uid=swg21052223#Version%208.1

26+# https://www.ibm.com/support/pages/node/660813#Version%208.1

2227

2328

2429# IBM Tivoli Storage Manager Client uses a system-wide

@@ -40,22 +45,33 @@

4045# point to this derivations `/dsmi_dir` directory symlink.

4146# Other environment variables might be necessary,

4247# depending on local configuration or usage; see:

43−# https://www.ibm.com/support/knowledgecenter/en/SSEQVQ_8.1.8/client/c_cfg_sapiunix.html

44−

45−

46−# The newest version of TSM client should be discoverable

47−# by going the the `downloadPage` (see `meta` below),

48−# there to "Client Latest Downloads",

49−# "IBM Spectrum Protect Client Downloads and READMEs",

50−# then to "Linux x86_64 Ubuntu client" (as of 2019-07-15).

48+# https://www.ibm.com/docs/en/spectrum-protect/8.1.13?topic=solaris-set-api-environment-variables

49+

50+

51+# The newest version of TSM client should be discoverable by

52+# going to the `downloadPage` (see `meta` below).

53+# Find the "Backup-archive client" table on that page.

54+# Look for "Download Documents" of the latest release.

55+# Here, two links must be checked:

56+# * "IBM Spectrum Protect Client ... Downloads and READMEs":

57+# In the table at the page's bottom,

58+# check the date of the "Linux x86_64 client"

59+# * "IBM Spectrum Protect BA client ... interim fix downloads"

60+# Look for the "Linux x86_64 client" rows

61+# in the table # at the bottom of each page.

62+# Follow the "HTTPS" link of the row with the latest date stamp.

63+# In the directory listing to show up, pick the big `.tar` file.

64+#

65+# (as of 2021-12-18)

5166

5267

5368let

5469

5570 meta = {

56− homepage = "https://www.ibm.com/us-en/marketplace/data-protection-and-recovery";

57− downloadPage = "https://www-01.ibm.com/support/docview.wss?uid=swg21239415";

71+ homepage = "https://www.ibm.com/products/data-protection-and-recovery";

72+ downloadPage = "https://www.ibm.com/support/pages/ibm-spectrum-protect-downloads-latest-fix-packs-and-interim-fixes";

5873 platforms = [ "x86_64-linux" ];

74+ mainProgram = "dsmc";

5975 license = lib.licenses.unfree;

6076 maintainers = [ lib.maintainers.yarny ];

6177 description = "IBM Spectrum Protect (Tivoli Storage Manager) CLI and API";

@@ -74,34 +90,53 @@ let

7490 '';

7591 };

7692

93+ passthru.tests = {

94+ test-cli = callPackage ./test-cli.nix {};

95+ test-gui = nixosTests.tsm-client-gui;

96+ };

97+

98+ mkSrcUrl = version:

99+ let

100+ major = lib.versions.major version;

101+ minor = lib.versions.minor version;

102+ patch = lib.versions.patch version;

103+ fixup = lib.lists.elemAt (lib.versions.splitVersion version) 3;

104+ in

105+ "https://public.dhe.ibm.com/storage/tivoli-storage-management/${if fixup=="0" then "maintenance" else "patches"}/client/v${major}r${minor}/Linux/LinuxX86/BA/v${major}${minor}${patch}/${version}-TIV-TSMBAC-LinuxX86.tar";

106+

77107 unwrapped = stdenv.mkDerivation rec {

78108 name = "tsm-client-${version}-unwrapped";

79− version = "8.1.8.0";

109+ version = "8.1.13.3";

80110 src = fetchurl {

81− url = "ftp://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86_DEB/BA/v818/${version}-TIV-TSMBAC-LinuxX86_DEB.tar";

82− sha256 = "0c1d0jm0i7qjd314nhj2vj8fs7sncm1x2n4d6dg4049jniyvjhpk";

111+ url = mkSrcUrl version;

112+ sha256 = "1dwczf236drdaf4jcfzz5154vdwvxf5zraxhrhiddl6n80hnvbcd";

83113 };

84− inherit meta;

114+ inherit meta passthru;

85115

86116 nativeBuildInputs = [

87117 autoPatchelfHook

118+ rpmextract

88119 ];

89120 buildInputs = [

121+ openssl

90122 stdenv.cc.cc

91123 zlib

92124 ];

93125 runtimeDependencies = [

94− lvm2

126+ (lib.attrsets.getLib lvm2)

95127 ];

96128 sourceRoot = ".";

97129

98130 postUnpack = ''

99− for debfile in *.deb

100− do

101− ar -x "$debfile"

102− tar --xz --extract --file=data.tar.xz

103− rm data.tar.xz

104− done

131+ rpmextract TIVsm-API64.x86_64.rpm

132+ rpmextract TIVsm-APIcit.x86_64.rpm

133+ rpmextract TIVsm-BA.x86_64.rpm

134+ rpmextract TIVsm-BAcit.x86_64.rpm

135+ rpmextract TIVsm-BAhdw.x86_64.rpm

136+ rpmextract TIVsm-JBB.x86_64.rpm

137+ # use globbing so that version updates don't break the build:

138+ rpmextract gskcrypt64-*.linux.x86_64.rpm

139+ rpmextract gskssl64-*.linux.x86_64.rpm

105140 '';

106141

107142 installPhase = ''

@@ -113,7 +148,7 @@ let

113148

114149 # Fix relative symlinks after `/usr` was moved up one level

115150 preFixup = ''

116− for link in $out/lib/* $out/bin/*

151+ for link in $out/lib{,64}/* $out/bin/*

117152 do

118153 target=$(readlink "$link")

119154 if [ "$(cut -b -6 <<< "$target")" != "../../" ]

@@ -126,14 +161,19 @@ let

126161 '';

127162 };

128163

164+ binPath = lib.makeBinPath ([ acl gnugrep procps ]

165+ ++ lib.optional enableGui jdk8);

166+

129167in

130168

131169buildEnv {

132170 name = "tsm-client-${unwrapped.version}";

133− inherit meta;

134− passthru = { inherit unwrapped; };

171+ meta = meta // lib.attrsets.optionalAttrs enableGui {

172+ mainProgram = "dsmj";

173+ };

174+ passthru = passthru // { inherit unwrapped; };

135175 paths = [ unwrapped ];

136− buildInputs = [ makeWrapper ];

176+ nativeBuildInputs = [ makeWrapper ];

137177 pathsToLink = [

138178 "/"

139179 "/bin"

@@ -144,7 +184,7 @@ buildEnv {

144184 # to the so-called "installation directories"

145185 # * Add symlinks to the "installation directories"

146186 # that point to the `dsm.sys` configuration files

147− # * Drop the Java GUI executable unless `jdk` is present

187+ # * Drop the Java GUI executable unless `enableGui` is set

148188 # * Create wrappers for the command-line interface to

149189 # prepare `PATH` and `DSM_DIR` environment variables

150190 postBuild = ''

@@ -152,13 +192,13 @@ buildEnv {

152192 ln --symbolic --no-target-directory opt/tivoli/tsm/client/api/bin64 $out/dsmi_dir

153193 ln --symbolic --no-target-directory "${dsmSysCli}" $out/dsm_dir/dsm.sys

154194 ln --symbolic --no-target-directory "${dsmSysApi}" $out/dsmi_dir/dsm.sys

155− ${lib.optionalString (jdk8==null) "rm $out/bin/dsmj"}

195+ ${lib.optionalString (!enableGui) "rm $out/bin/dsmj"}

156196 for bin in $out/bin/*

157197 do

158198 target=$(readlink "$bin")

159199 rm "$bin"

160200 makeWrapper "$target" "$bin" \

161− --prefix PATH : "$out/dsm_dir:${lib.strings.makeBinPath [ procps acl jdk8 ]}" \

201+ --prefix PATH : "$out/dsm_dir:${binPath}" \

162202 --set DSM_DIR $out/dsm_dir

163203 done

164204 '';

pkgs/tools/backup/tsm-client/test-cli.nixnew file+58

@@ -0,0 +1,58 @@

1+{ lib

2+, writeText

3+, runCommand

4+, tsm-client

5+}:

6+

7+# Let the client try to connect to a server.

8+# We can't simulate a server, so there's no more to test.

9+

10+let

11+

12+ # 192.0.0.8 is a "dummy address" according to RFC 7600

13+ dsmSysCli = writeText "cli.dsm.sys" ''

14+ defaultserver testserver

15+ server testserver

16+ commmethod v6tcpip

17+ tcpserveraddress 192.0.0.8

18+ nodename ARBITRARYNODENAME

19+ '';

20+

21+ tsm-client_ = tsm-client.override { inherit dsmSysCli; };

22+

23+ env.nativeBuildInputs = [ tsm-client_ ];

24+

25+ versionString =

26+ let

27+ inherit (tsm-client_.passthru.unwrapped) version;

28+ major = lib.versions.major version;

29+ minor = lib.versions.minor version;

30+ patch = lib.versions.patch version;

31+ fixup = lib.lists.elemAt (lib.versions.splitVersion version) 3;

32+ in

33+ "Client Version ${major}, Release ${minor}, Level ${patch}.${fixup}";

34+

35+in

36+

37+runCommand "${tsm-client.name}-test-cli" env ''

38+ set -o nounset

39+ set -o pipefail

40+

41+ export DSM_LOG=$(mktemp -d ./dsm_log.XXXXXXXXXXX)

42+

43+ { dsmc -optfile=/dev/null || true; } | tee dsmc-stdout

44+

45+ # does it report the correct version?

46+ grep --fixed-strings '${versionString}' dsmc-stdout

47+

48+ # does it use the provided dsm.sys config file?

49+ # if it does, it states the node's name

50+ grep ARBITRARYNODENAME dsmc-stdout

51+

52+ # does it try (and fail) to connect to the server?

53+ # if it does, it reports the "TCP/IP connection failure" error code

54+ grep ANS1017E dsmc-stdout

55+ grep ANS1017E $DSM_LOG/dsmerror.log

56+

57+ touch $out

58+''

pkgs/tools/backup/zrepl/default.nix+3−3

@@ -6,16 +6,16 @@

66}:

77buildGoModule rec {

88 pname = "zrepl";

9− version = "0.4.0";

9+ version = "0.5.0";

1010

1111 src = fetchFromGitHub {

1212 owner = "zrepl";

1313 repo = "zrepl";

1414 rev = "v${version}";

15− sha256 = "5Bp8XGCjibDJgeAjW98rcABuddI+CV4Fh3hFJaKKwbo=";

15+ sha256 = "4q/wwlF11HPDS2lTXUizJ3RFQ9sX5qNnWZUKAgnvDiE=";

1616 };

1717

18− vendorSha256 = "MwmYiK2z7ZK5kKBZV7K6kCZRSd7v5Sgjoih1eeOh6go=";

18+ vendorSha256 = "xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc=";

1919

2020 subPackages = [ "." ];

2121

pkgs/tools/cd-dvd/brasero/default.nix+2−2

@@ -4,7 +4,7 @@

44

55let

66 major = "3.12";

7− minor = "2";

7+ minor = "3";

88 binpath = lib.makeBinPath [ dvdauthor vcdimager ];

99

1010in stdenv.mkDerivation rec {

@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {

1313

1414 src = fetchurl {

1515 url = "mirror://gnome/sources/brasero/${major}/${pname}-${version}.tar.xz";

16− sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8";

16+ hash = "sha256-h3SerjOhQSB9GwC+IzttgEWYLtMkntS5ja4fOpdf6hU=";

1717 };

1818

1919 nativeBuildInputs = [ pkg-config itstool intltool wrapGAppsHook ];

pkgs/tools/filesystems/btrfs-progs/default.nix+12−6

@@ -1,14 +1,16 @@

1−{ lib, stdenv, fetchurl, pkg-config, attr, acl, zlib, libuuid, e2fsprogs, lzo

2−, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3

1+{ lib, stdenv, fetchurl

2+, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto

3+, zstd

4+, acl, attr, e2fsprogs, libuuid, lzo, systemd, zlib

35}:

46

57stdenv.mkDerivation rec {

68 pname = "btrfs-progs";

7− version = "5.14.1";

9+ version = "5.16";

810

911 src = fetchurl {

1012 url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";

11− sha256 = "sha256-1UqTRlRcpG3xKOPMt31gwJfZDJO34xSZAjbijPr4xVs=";

13+ sha256 = "0cqqlcq9bywfi3cpg5ivxiv7p9v6z1r6k4nnmin24mj1kp8krarq";

1214 };

1315

1416 nativeBuildInputs = [

@@ -16,7 +18,7 @@ stdenv.mkDerivation rec {

1618 python3 python3.pkgs.setuptools

1719 ];

1820

19− buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python3 ];

21+ buildInputs = [ acl attr e2fsprogs libuuid lzo python3 systemd zlib zstd ];

2022

2123 # for python cross-compiling

2224 _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config;

@@ -31,10 +33,14 @@ stdenv.mkDerivation rec {

3133

3234 configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace";

3335

36+ makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ];

37+

38+ enableParallelBuilding = true;

39+

3440 meta = with lib; {

3541 description = "Utilities for the btrfs filesystem";

3642 homepage = "https://btrfs.wiki.kernel.org/";

37− license = licenses.gpl2;

43+ license = licenses.gpl2Only;

3844 maintainers = with maintainers; [ raskin ];

3945 platforms = platforms.linux;

4046 };

pkgs/tools/filesystems/fuse-overlayfs/default.nix+2−2

@@ -2,13 +2,13 @@

22

33stdenv.mkDerivation rec {

44 pname = "fuse-overlayfs";

5− version = "1.8";

5+ version = "1.8.1";

66

77 src = fetchFromGitHub {

88 owner = "containers";

99 repo = pname;

1010 rev = "v${version}";

11− sha256 = "sha256-VqtBJ8HRyhjwKVoRu6+EArZMVbzXkaK89yV56MzRUJo=";

11+ sha256 = "sha256-0vmcn3AOASjN61QzxxGYpPMWlukanh8+vbZQcFpU/vs=";

1212 };

1313

1414 nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/tools/filesystems/xtreemfs/default.nix+2−2

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

1−{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python

1+{ stdenv, boost, fuse, openssl, cmake, attr, jdk, ant, which, file, python2

22, lib, valgrind, makeWrapper, fetchFromGitHub, fetchpatch }:

33

44stdenv.mkDerivation {

@@ -14,7 +14,7 @@ stdenv.mkDerivation {

1414 version = "1.5.1.81";

1515

1616 nativeBuildInputs = [ makeWrapper ];

17− buildInputs = [ which attr python ];

17+ buildInputs = [ which attr python2 ];

1818

1919 patches = [

2020 (fetchpatch {

pkgs/tools/games/opentracker/default.nix+3

@@ -41,6 +41,7 @@ buildDotnetModule rec {

4141 buildInputs = [

4242 stdenv.cc.cc.lib

4343 fontconfig

44+ gtk3

4445 ];

4546

4647 runtimeDeps = [

@@ -58,5 +59,7 @@ buildDotnetModule rec {

5859 homepage = "https://github.com/trippsc2/OpenTracker";

5960 license = licenses.mit;

6061 maintainers = [ maintainers.ivar ];

62+ mainProgram = "OpenTracker";

63+ platforms = platforms.linux;

6164 };

6265}

pkgs/tools/graphics/barcode/default.nix+9−1

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

1−{ lib, stdenv, fetchurl }:

1+{ lib, stdenv, fetchurl, fetchpatch }:

22

33stdenv.mkDerivation rec {

44 version = "0.99";

@@ -7,6 +7,14 @@ stdenv.mkDerivation rec {

77 url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";

88 sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8";

99 };

10+ patches = [

11+ # Pull upstream patch for -fno-common toolchains.

12+ (fetchpatch {

13+ name = "fno-common.patch";

14+ url = "http://git.savannah.gnu.org/cgit/barcode.git/patch/?id=4654f68706a459c9602d9932b56a56e8930f7d53";

15+ sha256 = "15kclzcwlh0ymr7m48vc0m8z98q0wf4xbfcky4g1y8yvvpvvrfgc";

16+ })

17+ ];

1018

1119 hardeningDisable = [ "format" ];

1220

pkgs/tools/misc/csvs-to-sqlite/default.nix+2−1

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

77 # Workaround the issue by providing click 7 explicitly.

88 python = python3.override {

99 packageOverrides = self: super: {

10− click = self.callPackage ../../../development/python-modules/click/7.nix { };

10+ # Use click 7

11+ click = self.callPackage ../../../development/python2-modules/click/default.nix { };

1112 };

1213 };

1314in with python.pkgs; buildPythonApplication rec {

pkgs/tools/misc/diffoscope/default.nix+17−2

@@ -4,16 +4,18 @@

44, gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R

55, radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd

66, enableBloat ? false

7+# updater only

8+, writeScript

79}:

810

911# Note: when upgrading this package, please run the list-missing-tools.sh script as described below!

1012python3Packages.buildPythonApplication rec {

1113 pname = "diffoscope";

12− version = "197";

14+ version = "200";

1315

1416 src = fetchurl {

1517 url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";

16− sha256 = "sha256-EKTknFa6gGqd1kpy/k1Vh1Zya+XvBMlU5G6Rg2p66es=";

18+ sha256 = "sha256-x6qAVEtvGmW0L4L/K+YKAp9jc9zz0Orrsl3qBkPYnW0=";

1719 };

1820

1921 outputs = [ "out" "man" ];

@@ -91,6 +93,19 @@ python3Packages.buildPythonApplication rec {

9193 "tests/comparators/test_macho.py"

9294 ];

9395

96+ passthru = {

97+ updateScript = writeScript "update-diffoscope" ''

98+ #!/usr/bin/env nix-shell

99+ #!nix-shell -i bash -p curl pcre common-updater-scripts

100+

101+ set -eu -o pipefail

102+

103+ # Expect the text in format of "Latest release: 198 (31 Dec 2021)"'.

104+ newVersion="$(curl -s https://diffoscope.org/ | pcregrep -o1 'Latest release: ([0-9]+)')"

105+ update-source-version ${pname} "$newVersion"

106+ '';

107+ };

108+

94109 meta = with lib; {

95110 description = "Perform in-depth comparison of files, archives, and directories";

96111 longDescription = ''

pkgs/tools/misc/flameshot/default.nix+2−20

@@ -1,7 +1,6 @@

11{ mkDerivation

22, lib

33, fetchFromGitHub

4−, fetchpatch

54, qtbase

65, cmake

76, qttools

@@ -11,32 +10,15 @@

1110

1211mkDerivation rec {

1312 pname = "flameshot";

14− version = "0.10.2";

13+ version = "11.0.0";

1514

1615 src = fetchFromGitHub {

1716 owner = "flameshot-org";

1817 repo = "flameshot";

1918 rev = "v${version}";

20− sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4=";

19+ sha256 = "sha256-SlnEXW3Uhdgl0icwYyYsKQOcYkAtHpAvL6LMXBF2gWM=";

2120 };

2221

23− patches = [

24− # Use absolute install path for `Exec=` in the desktop file.

25− # This is required since KWin relies on absolute paths in `Exec=` to find a process'

26− # corresponding desktop file and check if it's allowed to take screenshot.

27− # Should be removed when the next release comes out.

28− (fetchpatch {

29− url = "https://github.com/flameshot-org/flameshot/commit/1031980ed1e62d24d7f719998b7951d48801e3fa.patch";

30− sha256 = "sha256-o8Zz/bBvitXMDFt5rAfubiUPOx+EQ+ITgrfnFM3dFjE=";

31− })

32− # Fix autostart write path.

33− # Should be removed when the next release comes out.

34− (fetchpatch {

35− url = "https://github.com/flameshot-org/flameshot/commit/7977cbb52c2d785abd0d85d9df5991e8f7cae441.patch";

36− sha256 = "sha256-wWa9Y+4flBiggOMuX7KQyL+q3f2cALGeQBGusX2x6sk=";

37− })

38− ];

39−

4022 passthru = {

4123 updateScript = nix-update-script {

4224 attrPath = pname;

pkgs/tools/misc/grub/trusted.nix+2−2

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

1−{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python, autoconf, automake

1+{ lib, stdenv, fetchurl, fetchgit, fetchpatch, autogen, flex, bison, python2, autoconf, automake

22, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2

33, for_HP_laptop ? false

44}:

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {

4444 sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k";

4545 };

4646

47− nativeBuildInputs = [ autogen flex bison python autoconf automake ];

47+ nativeBuildInputs = [ autogen flex bison python2 autoconf automake ];

4848 buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]

4949 ++ optional doCheck qemu;

5050

pkgs/tools/misc/inav-blackbox-tools/default.nix+1

@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {

3030 license = licenses.gpl3Only;

3131 maintainers = with maintainers; [ expipiplus1 ];

3232 platforms = platforms.all;

33+ broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/inav-blackbox-tools.x86_64-darwin

3334 };

3435}

pkgs/tools/misc/lsd/default.nix+8−15

@@ -2,20 +2,22 @@

22, fetchFromGitHub

33, rustPlatform

44, installShellFiles

5+, testVersion

6+, lsd

57}:

68

79rustPlatform.buildRustPackage rec {

810 pname = "lsd";

9− version = "0.20.1";

11+ version = "0.21.0";

1012

1113 src = fetchFromGitHub {

1214 owner = "Peltoche";

1315 repo = pname;

1416 rev = version;

15− sha256 = "sha256-r/Rllu+tgKqz+vkxA8BSN+3V0lUUd6dEATfickQp4+s=";

17+ sha256 = "sha256-4pa8yJjUTO5MUDuljfU9Vo2ZjbsIwWJsJj6VVNfN25A=";

1618 };

1719

18− cargoSha256 = "sha256-O8P29eYlHgmmAADZ/DgTBmj0ZOa+4u/Oee+TMF+/4Ro=";

20+ cargoSha256 = "sha256-P0HJVp2ReJuLSZrArw/EAfLFDOZqswI0nD1SCHwegoE=";

1921

2022 nativeBuildInputs = [ installShellFiles ];

2123 postInstall = ''

@@ -25,18 +27,9 @@ rustPlatform.buildRustPackage rec {

2527 # Found argument '--test-threads' which wasn't expected, or isn't valid in this context

2628 doCheck = false;

2729

28− doInstallCheck = true;

29− installCheckPhase = ''

30− runHook preInstallCheck

31−

32− testFile=$(mktemp /tmp/lsd-test.XXXX)

33− echo 'abc' > $testFile

34− $out/bin/lsd --classic --blocks "size,name" -l $testFile | grep "4 B $testFile"

35− $out/bin/lsd --version | grep "${version}"

36− rm $testFile

37−

38− runHook postInstallCheck

39− '';

30+ passthru.tests.version = testVersion {

31+ package = lsd;

32+ };

4033

4134 meta = with lib; {

4235 homepage = "https://github.com/Peltoche/lsd";

pkgs/tools/misc/nncp/default.nix+2−2

@@ -3,12 +3,12 @@

33

44stdenv.mkDerivation rec {

55 pname = "nncp";

6− version = "8.0.2";

6+ version = "8.1.0";

77 outputs = [ "out" "doc" "info" ];

88

99 src = fetchurl {

1010 url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";

11− sha256 = "sha256-hMb7bAdk3xFcUe5CTu9LnIR3VSJDUKbMSE86s8d5udM=";

11+ sha256 = "sha256-d3U233dedtZrBWRdb0QElNOd/L1+Ut4CWvkZo5TPU+w=";

1212 };

1313

1414 nativeBuildInputs = [ go redo-apenwarr ];

pkgs/tools/misc/opentsdb/default.nix+2−2

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

11{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools

2−, python, git

2+, python2, git

33}:

44

55let jdk = jdk8; jre = jdk8.jre; in

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

2222 ];

2323

2424 nativeBuildInputs = [ makeWrapper ];

25− buildInputs = [ autoconf automake curl jdk nettools python git ];

25+ buildInputs = [ autoconf automake curl jdk nettools python2 git ];

2626

2727 preConfigure = ''

2828 patchShebangs ./build-aux/

pkgs/tools/misc/pferd/default.nix+2−2

@@ -5,14 +5,14 @@

55

66python3Packages.buildPythonApplication rec {

77 pname = "pferd";

8− version = "3.2.0";

8+ version = "3.3.1";

99 format = "pyproject";

1010

1111 src = fetchFromGitHub {

1212 owner = "Garmelon";

1313 repo = "PFERD";

1414 rev = "v${version}";

15− sha256 = "0r75a128r8ghrccc1flmpxblfrab5kg6fypzrlfmv2aqhkqg1brb";

15+ sha256 = "162s966kmpngmp0h55x185qxsy96q2kxz2dd8w0zyh0n2hbap3lh";

1616 };

1717

1818 propagatedBuildInputs = with python3Packages; [

pkgs/tools/misc/rpm-ostree/default.nix+2−2

@@ -29,7 +29,7 @@

2929, bubblewrap

3030, pcre

3131, check

32−, python

32+, python2

3333, json_c

3434, zchunk

3535, libmodulemd

@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {

8282 librepo

8383 pcre

8484 check

85− python

85+ python2

8686

8787 # libdnf # vendored unstable branch

8888 # required by vendored libdnf

pkgs/tools/misc/snapper/default.nix+2−2

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

11{ lib, stdenv, fetchFromGitHub

22, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45

33, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2

4−, lvm2, pam, python, util-linux, json_c, nixosTests

4+, lvm2, pam, python2, util-linux, json_c, nixosTests

55, ncurses }:

66

77stdenv.mkDerivation rec {

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

2121 ];

2222 buildInputs = [

2323 acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2

24− lvm2 pam python util-linux json_c ncurses

24+ lvm2 pam python2 util-linux json_c ncurses

2525 ];

2626

2727 passthru.tests.snapper = nixosTests.snapper;

pkgs/tools/misc/yle-dl/default.nix+2−2

@@ -2,13 +2,13 @@

22

33python3Packages.buildPythonApplication rec {

44 pname = "yle-dl";

5− version = "20210917";

5+ version = "20211213";

66

77 src = fetchFromGitHub {

88 owner = "aajanki";

99 repo = "yle-dl";

1010 rev = version;

11− sha256 = "sha256-l8Wv15DLWRvJ+I6KeTNbIjp+S5EgoqhLOWd0wEyXckk=";

11+ sha256 = "sha256-U7ydZ6nSVtMv9mxNSWT/IICwbjK3PCBKxfqjrQ9jwW0=";

1212 };

1313

1414 propagatedBuildInputs = with python3Packages; [

pkgs/tools/networking/eternal-terminal/default.nix+25−10

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

1−{ lib, stdenv

1+{ lib

2+, stdenv

23, fetchFromGitHub

34, cmake

45, gflags

@@ -10,32 +11,46 @@

1011

1112stdenv.mkDerivation rec {

1213 pname = "eternal-terminal";

13− version = "6.1.9";

14+ version = "6.1.11";

1415

1516 src = fetchFromGitHub {

1617 owner = "MisterTea";

1718 repo = "EternalTerminal";

1819 rev = "et-v${version}";

19− sha256 = "0kpabxpy779ppkaqaigq0x34ymz1jcwpsa78rm6nr55mdap2xxv6";

20+ hash = "sha256-cCZbG0CD5V/FTj1BuVr083EJ+BCgIcKHomNtpJb3lOo=";

2021 };

2122

22− cmakeFlags= [

23+ nativeBuildInputs = [

24+ cmake

25+ ];

26+

27+ buildInputs = [

28+ gflags

29+ libsodium

30+ openssl

31+ protobuf

32+ zlib

33+ ];

34+

35+ cmakeFlags = [

2336 "-DDISABLE_VCPKG=TRUE"

2437 "-DDISABLE_SENTRY=TRUE"

2538 "-DDISABLE_CRASH_LOG=TRUE"

2639 ];

2740

28− CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++17";

29− LDFLAGS = lib.optional stdenv.cc.isClang "-lc++fs";

41+ CXXFLAGS = lib.optional stdenv.cc.isClang [

42+ "-std=c++17"

43+ ];

3044

31− nativeBuildInputs = [ cmake ];

32− buildInputs = [ gflags openssl zlib libsodium protobuf ];

45+ LDFLAGS = lib.optional stdenv.cc.isClang [

46+ "-lc++fs"

47+ ];

3348

3449 meta = with lib; {

3550 description = "Remote shell that automatically reconnects without interrupting the session";

36− license = licenses.asl20;

3751 homepage = "https://eternalterminal.dev/";

38− platforms = platforms.linux ++ platforms.darwin;

52+ license = licenses.asl20;

3953 maintainers = with maintainers; [ dezgeg pingiun ];

54+ platforms = platforms.linux ++ platforms.darwin;

4055 };

4156}

pkgs/tools/networking/nss-pam-ldapd/default.nix+2−2

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

11{ lib, stdenv, fetchurl

22, pkg-config, makeWrapper, autoreconfHook

3−, openldap, python, pam

3+, openldap, python2, pam

44}:

55

66stdenv.mkDerivation rec {

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

1313 };

1414

1515 nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook ];

16− buildInputs = [ openldap pam python ];

16+ buildInputs = [ openldap pam python2 ];

1717

1818 preConfigure = ''

1919 substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: "

pkgs/tools/networking/openvpn/default.nix+3−3

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

2424

2525 generic = { version, sha256 }:

2626 let

27− withIpRoute = stdenv.isLinux && (versionOlder version "2.5");

27+ withIpRoute = stdenv.isLinux && (versionOlder version "2.5.4");

2828 in

2929 stdenv.mkDerivation

3030 rec {

@@ -83,7 +83,7 @@ in

8383 };

8484

8585 openvpn = generic {

86− version = "2.5.2";

87− sha256 = "sha256-sSdDg2kB82Xvr4KrJJOWfhshwh60POmo2hACoXycHcg=";

86+ version = "2.5.5";

87+ sha256 = "sha256-EZvWn6AhCDj2zaonNpbcc476IA9FTb4R6237dd+2ADs=";

8888 };

8989}

pkgs/tools/networking/philter/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, python }:

1+{ lib, stdenv, fetchurl, python2 }:

22

33stdenv.mkDerivation rec {

44 pname = "philter";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 installPhase = ''

1212 mkdir -p "$out"/{bin,share/philter}

1313 cp .philterrc "$out"/share/philter/philterrc

14− sed -i 's@/usr/local/bin@${python}/bin@' src/philter.py

14+ sed -i 's@/usr/local/bin@${python2}/bin@' src/philter.py

1515 cp src/philter.py "$out"/bin/philter

1616 chmod +x "$out"/bin/philter

1717 '';

pkgs/tools/networking/pssh/default.nix+2−2

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

1−{ lib, fetchFromGitHub, pythonPackages, openssh, rsync }:

1+{ lib, fetchFromGitHub, python2Packages, openssh, rsync }:

22

3−pythonPackages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44 pname = "pssh";

55 version = "2.3.1";

66

pkgs/tools/networking/py-wmi-client/default.nix+3−3

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

1−{ lib, pythonPackages, fetchFromGitHub }:

1+{ lib, python2Packages, fetchFromGitHub }:

22

3−pythonPackages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44 pname = "py-wmi-client";

55 version = "unstable-20160601";

66

@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {

1111 sha256 = "1kd12gi1knqv477f1shzqr0h349s5336vzp3fpfp3xl0b502ld8d";

1212 };

1313

14− propagatedBuildInputs = with pythonPackages; [ impacket natsort pyasn1 pycrypto ];

14+ propagatedBuildInputs = with python2Packages; [ impacket natsort pyasn1 pycrypto ];

1515

1616 # no tests

1717 doCheck = false;

pkgs/tools/networking/telepresence2/default.nix+3−3

@@ -2,13 +2,13 @@

22

33buildGoModule rec {

44 pname = "telepresence2";

5− version = "2.4.6";

5+ version = "2.4.9";

66

77 src = fetchFromGitHub {

88 owner = "telepresenceio";

99 repo = "telepresence";

1010 rev = "v${version}";

11− sha256 = "09w7yk7jk5m6clq3drbgdr61w60b21jmfd635brfahms8pykmmzl";

11+ sha256 = "sha256-cGG357Z0OI+aXGHWJaOPkkKUm1KcsYBvhHxNlIYlL+0=";

1212 };

1313

1414 # The Helm chart is go:embed'ed as a tarball in the binary.

@@ -21,7 +21,7 @@ buildGoModule rec {

2121 go run ./build-aux/package_embedded_chart/main.go ${src.rev}

2222 '';

2323

24− vendorSha256 = "0przkcqaf56a0sgan2xxqfpbs9nbmq4brwdv1qnag7i9myzvixxb";

24+ vendorSha256 = "sha256-DzAxqSiWag9mOgPznjhMCQJhtJZo7hsezhwJBidsvJQ=";

2525

2626 ldflags = [

2727 "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}"

pkgs/tools/networking/weighttp/default.nix+2−2

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

1−{ lib, stdenv, fetchgit, python, libev, wafHook }:

1+{ lib, stdenv, fetchgit, python2, libev, wafHook }:

22

33stdenv.mkDerivation rec {

44 pname = "weighttp";

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

1212

1313 nativeBuildInputs = [ wafHook ];

1414

15− buildInputs = [ python libev ];

15+ buildInputs = [ python2 libev ];

1616

1717 meta = with lib; {

1818 description = "Lightweight and simple webserver benchmarking tool";

pkgs/tools/security/firefox_decrypt/default.nixnew file+45

@@ -0,0 +1,45 @@

1+{ lib

2+, fetchFromGitHub

3+, stdenvNoCC

4+, nss

5+, wrapPython

6+}:

7+

8+stdenvNoCC.mkDerivation rec {

9+ pname = "firefox_decrypt";

10+ version = "unstable-2021-12-29";

11+

12+ src = fetchFromGitHub {

13+ owner = "unode";

14+ repo = pname;

15+ rev = "a3daadc09603a6cf8c4b7e49a59776340bc885e7";

16+ sha256 = "0g219zqbdnhh9j09d9a0b81vr6j44zzk13ckl5fzkr10gqndiscc";

17+ };

18+

19+ nativeBuildInputs = [ wrapPython ];

20+

21+ buildInputs = [ nss ];

22+

23+ installPhase = ''

24+ runHook preInstall

25+

26+ install -Dm 0755 firefox_decrypt.py "$out/bin/firefox_decrypt"

27+

28+ runHook postInstall

29+ '';

30+

31+ makeWrapperArgs = [ "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ nss ]) ];

32+

33+ postFixup = ''

34+ wrapPythonPrograms

35+ '';

36+

37+ passthru.updateScript = ./update.sh;

38+

39+ meta = with lib; {

40+ homepage = "https://github.com/unode/firefox_decrypt";

41+ description = "A tool to extract passwords from profiles of Mozilla Firefox and derivates";

42+ license = licenses.gpl3Plus;

43+ maintainers = with maintainers; [ schnusch ];

44+ };

45+}

pkgs/tools/security/firefox_decrypt/update.shnew file+49

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

1+#!/usr/bin/env nix-shell

2+#!nix-shell -i bash -p common-updater-scripts git jq nix nix-prefetch-git

3+git_url='https://github.com/unode/firefox_decrypt.git'

4+git_branch='master'

5+git_dir='/var/tmp/firefox_decrypt.git'

6+nix_file="$(dirname "${BASH_SOURCE[0]}")/default.nix"

7+pkg='firefox_decrypt'

8+

9+set -euo pipefail

10+

11+info() {

12+ if [ -t 2 ]; then

13+ set -- '\033[32m%s\033[39m\n' "$@"

14+ else

15+ set -- '%s\n' "$@"

16+ fi

17+ printf "$@" >&2

18+}

19+

20+old_rev=$(nix-instantiate --eval --strict --json -A "$pkg.src.rev" | jq -r)

21+old_version=$(nix-instantiate --eval --strict --json -A "$pkg.version" | jq -r)

22+today=$(LANG=C date -u +'%Y-%m-%d')

23+

24+info "fetching $git_url..."

25+if [ ! -d "$git_dir" ]; then

26+ git init --initial-branch="$git_branch" "$git_dir"

27+ git -C "$git_dir" remote add origin "$git_url"

28+fi

29+git -C "$git_dir" fetch origin "$git_branch"

30+

31+# use latest commit before today, we should not call the version *today*

32+# because there might still be commits coming

33+# use the day of the latest commit we picked as version

34+new_rev=$(git -C "$git_dir" log -n 1 --format='format:%H' --before="${today}T00:00:00Z" "origin/$git_branch")

35+new_version="unstable-$(git -C "$git_dir" log -n 1 --format='format:%cs' "$new_rev")"

36+info "latest commit before $today: $new_rev"

37+

38+if [ "$new_rev" = "$old_rev" ]; then

39+ info "$pkg is up-to-date."

40+ exit

41+fi

42+

43+new_sha256=$(nix-prefetch-git --rev "$new_rev" "$git_dir" | jq -r .sha256)

44+update-source-version "$pkg" \

45+ "$new_version" \

46+ "$new_sha256" \

47+ --rev="$new_rev"

48+git add "$nix_file"

49+git commit --verbose --message "$pkg: $old_version -> $new_version"

pkgs/tools/security/solo2-cli/default.nixnew file+48

@@ -0,0 +1,48 @@

1+{ lib

2+, stdenv

3+, rustPlatform

4+, fetchFromGitHub

5+, installShellFiles

6+, pkg-config

7+, pcsclite

8+, udev

9+, PCSC

10+, IOKit

11+, CoreFoundation

12+, AppKit

13+}:

14+

15+rustPlatform.buildRustPackage rec {

16+ pname = "solo2-cli";

17+ version = "0.1.1";

18+

19+ src = fetchFromGitHub {

20+ owner = "solokeys";

21+ repo = pname;

22+ rev = "v${version}";

23+ sha256 = "sha256-3GIK0boxGD4Xa5OskP1535zCQyhMQ/oXbgThRivJzww=";

24+ };

25+

26+ cargoSha256 = "sha256-MYxVegXUVeZ4AzDz+Si5TtTjUDEPTO0Nh008rgLtsLw=";

27+

28+ nativeBuildInputs = [ installShellFiles pkg-config ];

29+

30+ buildInputs = [ ]

31+ ++ lib.optionals stdenv.isLinux [ pcsclite udev ]

32+ ++ lib.optionals stdenv.isDarwin [ PCSC IOKit CoreFoundation AppKit ];

33+

34+ postInstall = ''

35+ installShellCompletion target/*/release/solo2.{bash,fish,zsh}

36+ '';

37+

38+ doCheck = true;

39+

40+ buildFeatures = [ "cli" ];

41+

42+ meta = with lib; {

43+ description = "A CLI tool for managing SoloKeys' Solo2 USB security keys.";

44+ homepage = "https://github.com/solokeys/solo2-cli";

45+ license = with licenses; [ asl20 mit ]; # either at your option

46+ maintainers = with maintainers; [ lukegb ];

47+ };

48+}

pkgs/tools/security/volatility/default.nix+3−3

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

1−{ lib, fetchFromGitHub, pythonPackages }:

1+{ lib, fetchFromGitHub, python2Packages }:

22

3−pythonPackages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44 pname = "volatility";

55 version = "2.6.1";

66

@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {

1313

1414 doCheck = false;

1515

16− propagatedBuildInputs = with pythonPackages; [ pycrypto distorm3 pillow ];

16+ propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ];

1717

1818 meta = with lib; {

1919 homepage = "https://www.volatilityfoundation.org/";

pkgs/tools/system/btop/default.nix+3−2

@@ -8,13 +8,14 @@

88

99stdenv.mkDerivation rec {

1010 pname = "btop";

11− version = "1.1.4";

11+ version = "1.2.0";

12+ hash = "qNm0mzPPh6jYIJX1W+macIDiGyWT+0jk7O0jCmvV/S4=";

1213

1314 src = fetchFromGitHub {

1415 owner = "aristocratos";

1516 repo = pname;

1617 rev = "v${version}";

17− sha256 = "1q8rp34fjbg9abbw5v6l5h9cmvzqq05cmkgavh8qd5xyimsx3xyh";

18+ sha256 = hash;

1819 };

1920

2021 hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];

pkgs/tools/system/collectd/plugins.nix+2−2

@@ -31,7 +31,7 @@

3131, perl

3232, postgresql

3333, protobufc

34−, python

34+, python2

3535, rabbitmq-c

3636, rdkafka

3737, riemann_c_client

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

102102 pinba.buildInputs = [ protobufc ];

103103 ping.buildInputs = [ liboping ];

104104 postgresql.buildInputs = [ postgresql ];

105− python.buildInputs = [ python ];

105+ python.buildInputs = [ python2 ];

106106 redis.buildInputs = [ hiredis ];

107107 rrdcached.buildInputs = [ rrdtool libxml2 ];

108108 rrdtool.buildInputs = [ rrdtool libxml2 ];

pkgs/tools/system/ps_mem/default.nix+2−2

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

1−{ lib, pythonPackages, fetchFromGitHub }:

1+{ lib, python2Packages, fetchFromGitHub }:

22

33let

44 version = "3.13";

55 pname = "ps_mem";

6−in pythonPackages.buildPythonApplication {

6+in python2Packages.buildPythonApplication {

77 name = "${pname}-${version}";

88

99 src = fetchFromGitHub {

pkgs/tools/system/rsyslog/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson

1+{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, docutils, fastJson

22, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null

33, libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null

44, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {

2525

2626 nativeBuildInputs = [ pkg-config autoreconfHook ];

2727 buildInputs = [

28− fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc

28+ fastJson libestr json_c zlib docutils libkrb5 jemalloc

2929 postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl

3030 librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq

3131 rabbitmq-c hiredis mongoc libmaxminddb

pkgs/tools/system/syslog-ng-incubator/default.nix+2−2

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

11{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng

2−, eventlog, perl, python, bison, protobufc, libivykis, libcap, czmq

2+, eventlog, perl, python2, bison, protobufc, libivykis, libcap, czmq

33}:

44

55stdenv.mkDerivation rec {

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

1616 nativeBuildInputs = [ pkg-config autoreconfHook bison ];

1717

1818 buildInputs = [

19− glib syslogng eventlog perl python protobufc libivykis libcap czmq

19+ glib syslogng eventlog perl python2 protobufc libivykis libcap czmq

2020 ];

2121

2222 configureFlags = [

pkgs/tools/system/syslog-ng/default.nix+2−2

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

11{ lib, stdenv, fetchurl, openssl, libcap, curl, which

2−, eventlog, pkg-config, glib, python, systemd, perl

2+, eventlog, pkg-config, glib, python2, systemd, perl

33, riemann_c_client, protobufc, pcre, libnet

44, json_c, libuuid, libivykis, mongoc, rabbitmq-c

55, libesmtp

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {

2323 eventlog

2424 glib

2525 perl

26− python

26+ python2

2727 systemd

2828 riemann_c_client

2929 protobufc

pkgs/tools/text/mdcat/default.nix+3−3

@@ -12,20 +12,20 @@

1212

1313rustPlatform.buildRustPackage rec {

1414 pname = "mdcat";

15− version = "0.25.0";

15+ version = "0.25.1";

1616

1717 src = fetchFromGitHub {

1818 owner = "lunaryorn";

1919 repo = pname;

2020 rev = "mdcat-${version}";

21− sha256 = "sha256-wrtvVFOSqpNBWLRGPL+08WBS4ltQyZwRE3/dqqT6IXg=";

21+ sha256 = "sha256-deG2VjyjFs0LFeTXfPYy3zzjj0rpVjxE0DhkpD5PzSQ=";

2222 };

2323

2424 nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ];

2525 buildInputs = [ openssl ]

2626 ++ lib.optional stdenv.isDarwin Security;

2727

28− cargoSha256 = "sha256-9I6/lt5VXfZp2/W6EoXtagcNj2kfxB5ZT2GkWgsUyM8=";

28+ cargoSha256 = "sha256-bPGSdXooBZMye3yj00f3rWIiW4wfg2B4meH44hpkXTY=";

2929

3030 checkInputs = [ ansi2html ];

3131 # Skip tests that use the network and that include files.

pkgs/tools/text/opencc/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, cmake, python }:

1+{ lib, stdenv, fetchFromGitHub, cmake, python2 }:

22

33stdenv.mkDerivation rec {

44 pname = "opencc";

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

1111 sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI=";

1212 };

1313

14− nativeBuildInputs = [ cmake python ];

14+ nativeBuildInputs = [ cmake python2 ];

1515

1616 # let intermediate tools find intermediate library

1717 preBuild = lib.optionalString stdenv.isLinux ''

pkgs/tools/text/shocco/default.nix+2−2

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

1−{ lib, stdenv, fetchFromGitHub, perlPackages, pythonPackages }:

1+{ lib, stdenv, fetchFromGitHub, perlPackages, python3 }:

22

33stdenv.mkDerivation rec {

44 pname = "shocco";

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {

1616 substituteInPlace configure --replace PATH= NIRVANA=

1717 '';

1818

19− buildInputs = [ perlPackages.TextMarkdown pythonPackages.pygments ];

19+ buildInputs = [ perlPackages.TextMarkdown python3.pkgs.pygments ];

2020

2121 meta = with lib; {

2222 description = "A quick-and-dirty, literate-programming-style documentation generator for / in POSIX shell";

pkgs/tools/text/txt2tags/default.nix+3−3

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

1−{ lib, stdenv, fetchurl, python }:

1+{ lib, stdenv, fetchurl, python2 }:

22

33stdenv.mkDerivation rec {

44 version = "2.6";

@@ -7,13 +7,13 @@ stdenv.mkDerivation rec {

77 dontBuild = true;

88

99 # Python script, needs the interpreter

10− propagatedBuildInputs = [ python ];

10+ propagatedBuildInputs = [ python2 ];

1111

1212 installPhase = ''

1313 mkdir -p "$out/bin"

1414 mkdir -p "$out/share/doc"

1515 mkdir -p "$out/share/man/man1/"

16− sed '1s|/usr/bin/env python|${python}/bin/python|' < txt2tags > "$out/bin/txt2tags"

16+ sed '1s|/usr/bin/env python|${python2}/bin/python|' < txt2tags > "$out/bin/txt2tags"

1717 chmod +x "$out/bin/txt2tags"

1818 gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz"

1919 cp doc/userguide.pdf "$out/share/doc"

pkgs/tools/typesetting/odpdown/default.nix+4−4

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

1−{ lib, fetchFromGitHub, pythonPackages, libreoffice }:

1+{ lib, fetchFromGitHub, python2Packages, libreoffice }:

22

3−pythonPackages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44

55 pname = "odpdown";

66 version = "0.4.1";

@@ -12,9 +12,9 @@ pythonPackages.buildPythonApplication rec {

1212 sha256 = "r2qbgD9PAalbypt+vjp2YcYggUGPQMEG2FDxMtohqG4=";

1313 };

1414

15− propagatedBuildInputs = with pythonPackages; [ libreoffice lpod lxml mistune pillow pygments ];

15+ propagatedBuildInputs = with python2Packages; [ libreoffice lpod lxml mistune pillow pygments ];

1616

17− checkInputs = with pythonPackages; [

17+ checkInputs = with python2Packages; [

1818 nose

1919 ];

2020

pkgs/tools/video/vnc2flv/default.nix+2−2

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

1−{ lib, fetchurl, pythonPackages }:

1+{ lib, fetchurl, python2Packages }:

22

3−pythonPackages.buildPythonApplication rec {

3+python2Packages.buildPythonApplication rec {

44 pname = "vnc2flv";

55 version = "20100207";

66

pkgs/tools/virtualization/cri-tools/default.nix+2−2

@@ -6,13 +6,13 @@

66

77buildGoModule rec {

88 pname = "cri-tools";

9− version = "1.22.0";

9+ version = "1.23.0";

1010

1111 src = fetchFromGitHub {

1212 owner = "kubernetes-sigs";

1313 repo = pname;

1414 rev = "v${version}";

15− sha256 = "sha256-+36lGLpNnTQnwwmXoVNPt3RMcnE46AdXOpghvhP0Bq0=";

15+ sha256 = "sha256-b65GY08vykVp/PUBmBXKIfykyPEJRgGjgu7zBoXx3K0=";

1616 };

1717

1818 vendorSha256 = null;

pkgs/tools/virtualization/xe-guest-utilities/default.nix+2−2

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

1−{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }:

1+{ lib, stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python2, gnutar, gnused, gnugrep, which }:

22

33stdenv.mkDerivation (rec {

44 pname = "xe-guest-utilities";

@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {

1414 url = "https://sources.archlinux.org/other/community/xe-guest-utilities/xe-guest-utilities_${version}-1120.tar.gz";

1515 sha256 = "f9593cd9588188f80253e736f48d8dd94c5b517abb18316085f86acffab48794";

1616 };

17− buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ];

17+ buildInputs = [ bzip2 gnutar gnused python2 lzo zlib xz stdenv gnugrep which ];

1818 patches = [ ./ip-address.patch ];

1919 postPatch = ''

2020 tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2"

pkgs/top-level/aliases.nix+7

@@ -346,6 +346,7 @@ mapAliases ({

346346 gnuradio-limesdr = gnuradio3_7.pkgs.limesdr; # added 2019-05-27, changed 2020-10-16

347347 gnuradio-rds = gnuradio3_7.pkgs.rds; # added 2019-05-27, changed 2020-10-16

348348 gnuradio-osmosdr = gnuradio3_7.pkgs.osmosdr; # added 2019-05-27, changed 2020-10-16

349+ gnuradio3_7 = throw "gnuradio3_7 has been removed because it required Python 2"; # added 2022-01-16

349350 gr-nacl = gnuradio3_7.pkgs.nacl; # added 2019-05-27, changed 2020-10-16

350351 gr-gsm = gnuradio3_7.pkgs.gsm; # added 2019-05-27, changed 2020-10-16

351352 gr-ais = gnuradio3_7.pkgs.ais; # added 2019-05-27, changed 2020-10-16

@@ -660,6 +661,7 @@ mapAliases ({

660661 nologin = shadow; # added 2018-04-25

661662 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # added 2021-05-27

662663 nottetris2 = throw "nottetris2 was removed because it is unmaintained by upstream and broken"; # added 2022-01-15

664+ noto-fonts-cjk = noto-fonts-cjk-sans; # added 2021-12-16

663665 now-cli = throw "now-cli has been replaced with nodePackages.vercel"; # added 2021-08-05

664666 nxproxy = nx-libs; # added 2019-02-15

665667 nylas-mail-bin = throw "nylas-mail-bin was deprecated on 2019-09-11: abandoned by upstream";

@@ -785,6 +787,7 @@ mapAliases ({

785787 pgtap = postgresqlPackages.pgtap;

786788 plv8 = postgresqlPackages.plv8;

787789 timescaledb = postgresqlPackages.timescaledb;

790+ tlauncher = throw "tlauncher has been removed because there questionable practices and legality concerns";

788791 tsearch_extras = postgresqlPackages.tsearch_extras;

789792 cstore_fdw = postgresqlPackages.cstore_fdw;

790793 pg_hll = postgresqlPackages.pg_hll;

@@ -821,8 +824,11 @@ mapAliases ({

821824 pyrex095 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12

822825 pyrex096 = throw "pyrex has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-12

823826 pyrit = throw "pyrit has been removed from nixpkgs as the project is still stuck on python2."; # added 2022-01-01

827+ python = python2; # added 2022-01-11

824828 python2nix = throw "python2nix has been removed as it is outdated. Use e.g. nixpkgs-pytools instead."; # added 2021-03-08

825829 python-swiftclient = swiftclient; # added 2021-09-09

830+ pythonFull = python2Full; # added 2022-01-11

831+ pythonPackages = python.pkgs; # added 2022-01-11

826832 quagga = throw "quagga is no longer maintained upstream"; # added 2021-04-22

827833 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19

828834 qcsxcad = libsForQt5.qcsxcad; # added 2020-11-05

@@ -998,6 +1004,7 @@ mapAliases ({

9981004 telepathy_salut = telepathy-salut; # added 2018-02-25

9991005 telnet = inetutils; # added 2018-05-15

10001006 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # added 2021-08-21

1007+ terraform_0_12 = throw "terraform_0_12 has been removed from nixpkgs on 2021/01";

10011008 terraform_1_0_0 = throw "terraform_1_0_0 has been renamed to terraform_1"; # added 2021-06-15

10021009 terraform_1_0 = throw "terraform_1_0 has been renamed to terraform_1"; # added 2021-12-08

10031010 terraform-provider-ibm = terraform-providers.ibm; # added 2018-09-28

pkgs/top-level/all-packages.nix+140−107

This diff is too big to show here.

pkgs/top-level/kodi-packages.nix+7

This diff is too big to show here.

pkgs/top-level/python-aliases.nix+1

This diff is too big to show here.

pkgs/top-level/python-packages.nix+54−47

This diff is too big to show here.

pkgs/top-level/python2-packages.nix+76−68

This diff is too big to show here.

pkgs/top-level/release.nix+11−8

This diff is too big to show here.