3384fec · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

Merge master into haskell-updates

commit3384fece4490d641dbeb2018cfa7027f2e581b97 authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> dateFri 2 Jul 2021, 00:07 (5 years ago) parent61c79ee 2e672ed

78 files changed+780−416

compare with master

unifiedsplit

doc/builders/packages/steam.section.md+1−10

@@ -56,16 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a

5656

5757## steam-run {#sec-steam-run}

5858

59−The FHS-compatible chroot used for steam can also be used to run other linux games that expect a FHS environment. To do it, add

60−

61−```nix

62−pkgs.steam.override ({

63− nativeOnly = true;

64− newStdcpp = true;

65−}).run

66−```

67−

68−to your configuration, rebuild, and run the game with

59+The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run-native` package and run the game with

6960

7061```

7162steam-run ./foo

nixos/modules/security/systemd-confinement.nix+1−1

@@ -105,7 +105,7 @@ in {

105105 wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs");

106106 in lib.mkIf config.confinement.enable {

107107 serviceConfig = {

108− RootDirectory = pkgs.runCommand rootName {} "mkdir \"$out\"";

108+ RootDirectory = "/var/empty";

109109 TemporaryFileSystem = "/";

110110 PrivateMounts = lib.mkDefault true;

111111

nixos/modules/services/network-filesystems/ipfs.nix+4−4

@@ -231,9 +231,9 @@ in {

231231 }

232232 fi

233233 '' + optionalString cfg.autoMount ''

234− ipfs --local config Mounts.FuseAllowOther --json true

235− ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}

236− ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}

234+ ipfs --offline config Mounts.FuseAllowOther --json true

235+ ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir}

236+ ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir}

237237 '' + concatStringsSep "\n" (collect

238238 isString

239239 (mapAttrsRecursive

@@ -243,7 +243,7 @@ in {

243243 read value <<EOF

244244 ${builtins.toJSON value}

245245 EOF

246− ipfs --local config --json "${concatStringsSep "." path}" "$value"

246+ ipfs --offline config --json "${concatStringsSep "." path}" "$value"

247247 '')

248248 ({ Addresses.API = cfg.apiAddress;

249249 Addresses.Gateway = cfg.gatewayAddress;

nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py+1−1

@@ -61,7 +61,7 @@ def write_loader_conf(profile: Optional[str], generation: int) -> None:

6161

6262

6363def profile_path(profile: Optional[str], generation: int, name: str) -> str:

64− return os.readlink("%s/%s" % (system_dir(profile, generation), name))

64+ return os.path.realpath("%s/%s" % (system_dir(profile, generation), name))

6565

6666

6767def copy_from_profile(profile: Optional[str], generation: int, name: str, dry_run: bool = False) -> str:

nixos/tests/vault.nix+3−1

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

1919 machine.wait_for_unit("vault.service")

2020 machine.wait_for_open_port(8200)

2121 machine.succeed("vault operator init")

22− machine.succeed("vault status | grep Sealed | grep true")

22+ # vault now returns exit code 2 for sealed vaults

23+ machine.fail("vault status")

24+ machine.succeed("vault status || test $? -eq 2")

2325 '';

2426})

pkgs/applications/networking/browsers/chromium/upstream-info.json+3−3

@@ -18,9 +18,9 @@

1818 }

1919 },

2020 "beta": {

21− "version": "92.0.4515.70",

22− "sha256": "06yhpxr5bg0gx7hmrhc6zg4gr1d9s34y2rb98rpl4dilmc548i6q",

23− "sha256bin64": "1fkakh1r87pg5nr101m6v86y8iyyfba8vnzrg0229kcar7v8wzf7",

21+ "version": "92.0.4515.80",

22+ "sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i",

23+ "sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp",

2424 "deps": {

2525 "gn": {

2626 "version": "2021-05-07",

pkgs/applications/networking/cluster/argo/default.nix+3−3

@@ -19,16 +19,16 @@ let

1919in

2020buildGoModule rec {

2121 pname = "argo";

22− version = "3.0.8";

22+ version = "3.1.1";

2323

2424 src = fetchFromGitHub {

2525 owner = "argoproj";

2626 repo = "argo";

2727 rev = "v${version}";

28− sha256 = "sha256-TOPJvOQKEMEsQ/wAJNF+08g4z75GGkNom6gRCrNOO2I=";

28+ sha256 = "sha256-WErNPofVnV6L7DkYU/dh4mWm+u7UJNFUmRN6IZzMb2g=";

2929 };

3030

31− vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg=";

31+ vendorSha256 = "sha256-99N//woGPx9QEtkFsktaiAbu7TS+3DHArBA52OUJFU4=";

3232

3333 doCheck = false;

3434

pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix+2−2

@@ -2,13 +2,13 @@

33stdenv.mkDerivation rec {

44 pname = "helm-secrets";

5− version = "3.7.0";

5+ version = "3.8.1";

77 src = fetchFromGitHub {

88 owner = "jkroepke";

99 repo = pname;

1010 rev = "v${version}";

11− hash = "sha256-AM+TLeSrXjn10DiQzXSqSwTqsc7CjTdnf6TWetden7g=";

11+ hash = "sha256-UZu3jChEK59UrtUR2ze68Kkc6MkHRtTsfTOS/B96sLM=";

1212 };

1313

1414 nativeBuildInputs = [ makeWrapper ];

pkgs/applications/networking/cluster/k9s/default.nix+3−3

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "k9s";

5− version = "0.24.11";

5+ version = "0.24.12";

77 src = fetchFromGitHub {

88 owner = "derailed";

99 repo = "k9s";

1010 rev = "v${version}";

11− sha256 = "sha256-UWY4r7pasFsmlRRKFANyxPIoNNuMPNg1gMXrAXEcqdw=";

11+ sha256 = "sha256-GuN+OAzuNus1B32ZSsnrJPrE7MQ0ZqNKDmoNe7Sa7Zs=";

1212 };

1313

1414 buildFlagsArray = ''

@@ -18,7 +18,7 @@ buildGoModule rec {

1818 -X github.com/derailed/k9s/cmd.commit=${src.rev}

1919 '';

2020

21− vendorSha256 = "sha256-EEN3nKQBtAGG7MAa9h11KFPZ9g7xtNxhFB1i/2QS66g=";

21+ vendorSha256 = "sha256-JBWQxRaMvIbUiOD7sJiZH1SHNCdysgh5FeSmYf+FdG4=";

2222

2323 doCheck = false;

2424

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix+2−2

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

2828 else "");

2929in stdenv.mkDerivation rec {

3030 pname = "signal-desktop";

31− version = "5.7.0"; # Please backport all updates to the stable channel.

31+ version = "5.7.1"; # Please backport all updates to the stable channel.

3232 # All releases have a limited lifetime and "expire" 90 days after the release.

3333 # When releases "expire" the application becomes unusable until an update is

3434 # applied. The expiration date for the current release can be extracted with:

@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {

3838

3939 src = fetchurl {

4040 url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";

41− sha256 = "170x2zsp3z95b123ybs8zqr8sasd5jgd4gl1q32wvhk7m41fvkmd";

41+ sha256 = "1hjykjqf3n20aab9g3bwk5w8x8v61320xv6z4iqrwwdzfkb3ly20";

4242 };

4343

4444 nativeBuildInputs = [

pkgs/applications/office/timedoctor/default.nix+1−1

@@ -15,7 +15,7 @@ appimageTools.wrapType2 {

1515 url = "https://repo2.timedoctor.com/td-desktop-hybrid/prod/v${version}/timedoctor-desktop_${version}_linux-x86_64.AppImage";

1616 };

1717 multiPkgs = _: with _; [

18− alsaLib

18+ alsa-lib

1919 atk

2020 at-spi2-atk

2121 at-spi2-core

pkgs/applications/science/chemistry/jmol/default.nix+2−2

@@ -17,14 +17,14 @@ let

1717 };

1818in

1919stdenv.mkDerivation rec {

20− version = "14.31.41";

20+ version = "14.31.42";

2121 pname = "jmol";

2222

2323 src = let

2424 baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";

2525 in fetchurl {

2626 url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";

27− sha256 = "sha256-dI1WkQgFikxaIjjqVKZcsGvc3QIu/NMIcRW3N8PGbkY=";

27+ sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw=";

2828 };

2929

3030 patchPhase = ''

pkgs/applications/science/logic/hol/default.nix+1−1

@@ -81,7 +81,7 @@ stdenv.mkDerivation {

8181 '';

8282 homepage = "http://hol.sourceforge.net/";

8383 license = licenses.bsd3;

84− platforms = [ "x86_64-linux" ];

84+ platforms = platforms.unix;

8585 maintainers = with maintainers; [ mudri ];

8686 };

8787}

pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patchdeleted−13

@@ -1,13 +0,0 @@

1−diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py

2−index 6bad826a88..f4d7b8651c 100644

3−--- a/src/sage/misc/sagedoc.py

4−+++ b/src/sage/misc/sagedoc.py

5−@@ -24,7 +24,7 @@ see :trac:`12849`::

6− ....: for line in fobj:

7− ....: if "#sage.symbolic.expression.Expression.numerical_approx" in line:

8− ....: print(line)

9−- <code class="sig-name descname">numerical_approx</code>(prec=None, digits=None, algorithm=None)...

10−+ <code class="sig-name descname">numerical_approx</code>(prec=None, digits=None, algorithm=None)...

11−

12− Check that sphinx is not imported at Sage start-up::

13−

pkgs/applications/science/math/sage/sage-src.nix+37−17

@@ -16,7 +16,12 @@ let

1616 fetchSageDiff = { base, name, rev, sha256, ...}@args: (

1717 fetchpatch ({

1818 inherit name sha256;

19− url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";

19+

20+ # We used to use

21+ # "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"

22+ # but the former way does not squash multiple patches together.

23+ url = "https://github.com/sagemath/sage/compare/${base}...${rev}.diff";

24+

2025 # We don't care about sage's own build system (which builds all its dependencies).

2126 # Exclude build system changes to avoid conflicts.

2227 excludes = [ "build/*" ];

@@ -79,13 +84,6 @@ stdenv.mkDerivation rec {

7984 # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests

8085 ./patches/ignore-cmp-deprecation.patch

8186

82− # sphinx 3.5 pretty-prints code slightly differently than sphinx

83− # 3.1--3.3. a similar patch is available at the sphinx 4 ticket

84− # (https://trac.sagemath.org/ticket/31696), but sphinx 3.5 uses

85− # <code> tags while sphinx 4 uses tags so we cannot just

86− # import the patch from trac.

87− ./patches/sphinx-3.5-code-output.patch

88−

8987 # remove use of matplotlib function deprecated in 3.4

9088 # https://trac.sagemath.org/ticket/31827

9189 (fetchSageDiff {

@@ -95,16 +93,38 @@ stdenv.mkDerivation rec {

9593 sha256 = "sha256-SXcUGBMOoE9HpuBzgKC3P6cUmM5MiktXbe/7dVdrfWo=";

9694 })

9795

98− # https://trac.sagemath.org/ticket/30801. this patch has

99− # positive_review but has not been merged upstream yet, so we

100− # don't use fetchSageDiff because it returns a file that contains

101− # each commit as a separate patch instead of a single diff, and

102− # some commits from the pari update branch are already in 9.3.rc5

103− # (auto-resolvable merge conflicts).

104− (fetchpatch {

96+ # pari 2.13 update

97+ # https://trac.sagemath.org/ticket/30801

98+ #

99+ # the last commit in that ticket is

100+ # c78b1470fccd915e2fa93f95f2fefba6220fb1f7, but commits after

101+ # 10a4531721d2700fd717e2b3a1364508ffd971c3 only deal with 32-bit

102+ # and post-26635 breakage, none of which is relevant to us. since

103+ # there are post-9.4.beta0 rebases after that, we just skip later

104+ # commits.

105+ (fetchSageDiff {

106+ base = "9.3";

105107 name = "pari-2.13.1.patch";

106− url = "https://github.com/sagemath/sagetrac-mirror/compare/d6c5cd9be78cc448ee4c54bac93385b1244a234c...10a4531721d2700fd717e2b3a1364508ffd971c3.diff";

107− sha256 = "sha256-zMjRMEReoiTvmt+vvV0Ij1jtyLSLwSXBEVXqgvmq1D4=";

108+ rev = "10a4531721d2700fd717e2b3a1364508ffd971c3";

109+ sha256 = "sha256-gffWKK9CMREaNOb5zb63iZUgON4FvsPrMQNqe+5ZU9E=";

110+ })

111+

112+ # sympy 1.8 update

113+ # https://trac.sagemath.org/ticket/31647

114+ (fetchSageDiff {

115+ base = "9.4.beta0";

116+ name = "sympy-1.8.patch";

117+ rev = "fa864b36e15696450c36d54215b1e68183b29d25";

118+ sha256 = "sha256-fj/9QEZlVF0fw9NpWflkTuBSKpGjCE6b96ECBgdn77o=";

119+ })

120+

121+ # sphinx 4 update

122+ # https://trac.sagemath.org/ticket/31696

123+ (fetchSageDiff {

124+ base = "9.4.beta3";

125+ name = "sphinx-4.patch";

126+ rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8";

127+ sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM=";

108128 })

109129 ];

110130

pkgs/applications/version-management/git-and-tools/gh/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "gh";

5− version = "1.12.0";

5+ version = "1.12.1";

77 src = fetchFromGitHub {

88 owner = "cli";

99 repo = "cli";

1010 rev = "v${version}";

11− sha256 = "sha256-b0pbcRcdfkHrqlALHcUzmVujkeKNFHdWd3ENPXZ5WYk=";

11+ sha256 = "sha256-P9fbkJSXRYZdVD1EKWWs0FKs8aQdPqHWESUqjsGgyPU=";

1212 };

1313

1414 vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0=";

pkgs/applications/video/subtitleeditor/default.nix+2−6

@@ -3,13 +3,9 @@

33 libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook

44}:

6−let

7− version = "0.54.0";

8−in

9−

10−stdenv.mkDerivation {

6+stdenv.mkDerivation rec {

117 pname = "subtitleeditor";

12− inherit version;

8+ version = "0.54.0";

139

1410 src = fetchFromGitHub {

1511 owner = "kitone";

pkgs/applications/video/vlc/default.nix+2−2

@@ -24,11 +24,11 @@ with lib;

2424

2525stdenv.mkDerivation rec {

2626 pname = "${optionalString onlyLibVLC "lib"}vlc";

27− version = "3.0.12";

27+ version = "3.0.16";

2828

2929 src = fetchurl {

3030 url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz";

31− sha256 = "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g";

31+ sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY=";

3232 };

3333

3434 # VLC uses a *ton* of libraries for various pieces of functionality, many of

pkgs/applications/virtualization/charliecloud/default.nix+2−2

@@ -2,14 +2,14 @@

33stdenv.mkDerivation rec {

5− version = "0.23";

5+ version = "0.24";

66 pname = "charliecloud";

88 src = fetchFromGitHub {

99 owner = "hpc";

1010 repo = "charliecloud";

1111 rev = "v${version}";

12− sha256 = "sha256-JQNidKqJROFVm+O1exTDon1fwU91zONqgKJIpe9gspY=";

12+ sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM=";

1313 };

1414

1515 nativeBuildInputs = [ autoreconfHook makeWrapper ];

pkgs/data/fonts/gentium/default.nix+13−5

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

11{ lib, fetchzip }:

33let

4− version = "5.000";

4+ version = "6.000";

55in fetchzip rec {

66 name = "gentium-${version}";

@@ -10,12 +10,20 @@ in fetchzip rec {

1010 postFetch = ''

1111 mkdir -p $out/share/{doc,fonts}

1212 unzip -l $downloadedFile

13− unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype

14− unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name}

15− unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation

13+ unzip -j $downloadedFile \*.ttf \

14+ -d $out/share/fonts/truetype

15+ unzip -j $downloadedFile \

16+ \*/FONTLOG.txt \

17+ \*/README.txt \

18+ -d $out/share/doc/${name}

19+ unzip -j $downloadedFile \

20+ \*/documentation/\*.html \

21+ \*/documentation/\*.txt \

22+ -x \*/documentation/source/\* \

23+ -d $out/share/doc/${name}/documentation

1624 '';

1725

18− sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp";

26+ sha256 = "zhSpAYK3Lfzsx6Z1IA6aRFNNXdDGq/jWxsQ20c2HcxI=";

1927

2028 meta = with lib; {

2129 homepage = "https://software.sil.org/gentium/";

pkgs/development/interpreters/php/7.4.nix+2−2

@@ -2,8 +2,8 @@

33let

44 base = callPackage ./generic.nix (_args // {

5− version = "7.4.20";

6− sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha";

5+ version = "7.4.21";

6+ sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n";

77 });

99in

pkgs/development/interpreters/php/8.0.nix+2−2

@@ -2,8 +2,8 @@

33let

44 base = callPackage ./generic.nix (_args // {

5− version = "8.0.7";

6− sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj";

5+ version = "8.0.8";

6+ sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l";

77 });

99in

pkgs/development/interpreters/php/generic.nix−2

@@ -195,8 +195,6 @@ let

195195

196196 # PCRE

197197 ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ]

198− ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ]

199− ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ]

200198 ++ [ "PCRE_LIBDIR=${pcre2}" ]

201199

202200

pkgs/development/libraries/intel-media-driver/default.nix+2−2

@@ -6,13 +6,13 @@

77stdenv.mkDerivation rec {

88 pname = "intel-media-driver";

9− version = "21.2.2";

9+ version = "21.2.3";

1010

1111 src = fetchFromGitHub {

1212 owner = "intel";

1313 repo = "media-driver";

1414 rev = "intel-media-${version}";

15− sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48";

15+ sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c";

1616 };

1717

1818 cmakeFlags = [

pkgs/development/libraries/libconfig/default.nix+2−2

@@ -2,11 +2,11 @@

33stdenv.mkDerivation rec {

44 pname = "libconfig";

5− version = "1.7.2";

5+ version = "1.7.3";

77 src = fetchurl {

88 url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz";

9− sha256 = "1ngs2qx3cx5cbwinc5mvadly0b5n7s86zsc68c404czzfff7lg3w";

9+ sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc=";

1010 };

1111

1212 doCheck = true;

pkgs/development/ocaml-modules/camlpdf/default.nix+2−12

@@ -5,27 +5,17 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}"

55else

77stdenv.mkDerivation rec {

8− version = "2.3.1";

8+ version = "2.4";

99 name = "ocaml${ocaml.version}-camlpdf-${version}";

1010 src = fetchFromGitHub {

1111 owner = "johnwhitington";

1212 repo = "camlpdf";

1313 rev = "v${version}";

14− sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4";

14+ sha256 = "09kzrgmlxb567315p3fy59ba0kv7xhp548n9i3l4wf9n06p0ww9m";

1515 };

1616

1717 buildInputs = [ which ocaml findlib ];

1818

19− # Version number in META file is wrong

20− patchPhase = ''

21− patch -p 0 META <<EOF

22− 3c3

23− < version="1.7.1"

24− ---

25− > version="${version}"

26− EOF

27− '';

28−

2919 preInstall = ''

3020 mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs

3121 '';

pkgs/development/ocaml-modules/cpdf/default.nix+8−9

@@ -1,6 +1,10 @@

11{ lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }:

3−let version = "2.3.1"; in

3+if !lib.versionAtLeast ocaml.version "4.10"

4+then throw "cpdf is not available for OCaml ${ocaml.version}"

5+else

7+let version = "2.4"; in

59stdenv.mkDerivation {

610 name = "ocaml${ocaml.version}-cpdf-${version}";

@@ -9,19 +13,14 @@ stdenv.mkDerivation {

913 owner = "johnwhitington";

1014 repo = "cpdf-source";

1115 rev = "v${version}";

12− sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z";

16+ sha256 = "1a8lmfc76dr8x6pxgm4aypbys02pfma9yh4z3l1qxp2q1909na5l";

1317 };

1418

15− prePatch = ''

16− substituteInPlace META --replace 'version="1.7"' 'version="${version}"'

17− '';

18−

1919 buildInputs = [ ocaml findlib ncurses ];

2020 propagatedBuildInputs = [ camlpdf ];

2121

22− createFindlibDestdir = true;

23−

24− postInstall = ''

22+ preInstall = ''

23+ mkdir -p $OCAMLFIND_DESTDIR

2524 mkdir -p $out/bin

2625 cp cpdf $out/bin

2726 mkdir -p $out/share/

pkgs/development/python-modules/aiopg/default.nix+2−2

@@ -8,14 +8,14 @@

99buildPythonPackage rec {

1010 pname = "aiopg";

11− version = "1.2.1";

11+ version = "1.3.0";

1212 disabled = pythonOlder "3.6";

1313

1414 src = fetchFromGitHub {

1515 owner = "aio-libs";

1616 repo = pname;

1717 rev = "v${version}";

18− sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4";

18+ sha256 = "sha256-/J53WqBag4ArSF7wETvmoBUtgNqp4eYGH0ytipiSKBI=";

1919 };

2020

2121 propagatedBuildInputs = [

pkgs/development/python-modules/pyeight/default.nix+2−2

@@ -8,14 +8,14 @@

99buildPythonPackage rec {

1010 pname = "pyeight";

11− version = "0.1.5";

11+ version = "0.1.7";

1212 disabled = !isPy3k;

1313

1414 src = fetchFromGitHub {

1515 owner = "mezz64";

1616 repo = "pyEight";

1717 rev = version;

18− sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw";

18+ sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM=";

1919 };

2020

2121 propagatedBuildInputs = [

pkgs/development/python-modules/pypoint/default.nixnew file+35

@@ -0,0 +1,35 @@

1+{ lib

2+, buildPythonPackage

3+, fetchFromGitHub

4+, authlib

5+, httpx

6+}:

8+buildPythonPackage rec {

9+ pname = "pypoint";

10+ version = "2.1.0";

11+

12+ src = fetchFromGitHub {

13+ owner = "fredrike";

14+ repo = "pypoint";

15+ rev = "v${version}";

16+ sha256 = "13p68d2qxfj31lfjv94wzpigjfgjw03yjpl2h16zgxbka2k8zf3x";

17+ };

18+

19+ propagatedBuildInputs = [

20+ authlib

21+ httpx

22+ ];

23+

24+ # upstream has no tests

25+ doCheck = false;

26+

27+ pythonImportsCheck = [ "pypoint" ];

28+

29+ meta = with lib; {

30+ description = "API for Minut Point";

31+ homepage = "https://github.com/fredrike/pypoint";

32+ license = licenses.mit;

33+ maintainers = with maintainers; [ dotlambda ];

34+ };

35+}

pkgs/development/python-modules/qcelemental/default.nix+3−18

@@ -1,34 +1,19 @@

1−{ buildPythonPackage, lib, fetchPypi, fetchpatch, numpy

1+{ buildPythonPackage, lib, fetchPypi, numpy

22, pydantic, pint, networkx, pytestrunner, pytestcov, pytest

33} :

55buildPythonPackage rec {

66 pname = "qcelemental";

7− version = "0.20.0";

7+ version = "0.21.0";

99 checkInputs = [ pytestrunner pytestcov pytest ];

1010 propagatedBuildInputs = [ numpy pydantic pint networkx ];

1111

1212 src = fetchPypi {

1313 inherit pname version;

14− sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni";

14+ sha256 = "1b3c78fxbpnddrm1fnbvv4x2840jcfjg2l5cb5w4p38vzksiv238";

1515 };

1616

17− # FIXME: Fixed upstream but not released yet. Nevertheless critical for correct behaviour.

18− # See https://github.com/MolSSI/QCElemental/pull/265

19− patches = [

20− (fetchpatch {

21− name = "SearchPath1.patch";

22− url = "https://github.com/MolSSI/QCElemental/commit/2211a4e59690bcb14265a60f199a5efe74fe44db.diff";

23− sha256 = "1ibjvmdrc103jdj79xrr11y5yji5hc966rm4ihfhfzgbvfkbjg2l";

24− })

25− (fetchpatch {

26− name = "SearchPath2.patch";

27− url = "https://github.com/MolSSI/QCElemental/commit/5a32ce33e8142047b0a00d0036621fe2750e872a.diff";

28− sha256 = "0gmg70vdps7k6alqclwdlxkli9d8s1fphbdvyl8wy8xrh46jw6rk";

29− })

30− ];

31−

3217 doCheck = true;

3318

3419 meta = with lib; {

pkgs/development/python-modules/splinter/default.nix+3−2

@@ -9,13 +9,13 @@

1010buildPythonPackage rec {

1111 pname = "splinter";

12− version = "0.14.0";

12+ version = "0.15.0";

1313

1414 src = fetchFromGitHub {

1515 owner = "cobrateam";

1616 repo = "splinter";

1717 rev = version;

18− sha256 = "0480bqprv8581cvnc80ls91rz9780wvdnfw99zsw44hvy2yg15a6";

18+ sha256 = "sha256-y87Cnci4gJHrttThGPeOS/h6VK8x95cQA9nZs1fBfAw=";

1919 };

2020

2121 propagatedBuildInputs = [

@@ -32,6 +32,7 @@ buildPythonPackage rec {

3232 "samples"

3333 "tests/test_djangoclient.py"

3434 "tests/test_flaskclient.py"

35+ "tests/test_popups.py"

3536 "tests/test_webdriver.py"

3637 "tests/test_webdriver_chrome.py"

3738 "tests/test_webdriver_firefox.py"

pkgs/development/tools/continuous-integration/drone-cli/default.nix+3−3

@@ -1,12 +1,12 @@

11{ lib, fetchFromGitHub, buildGoModule }:

3−let version = "1.2.4";

3+let version = "1.3.0";

44in buildGoModule rec {

55 inherit version;

66 pname = "drone-cli";

77 revision = "v${version}";

9− vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7";

9+ vendorSha256 = "sha256-I+UBa6gqkPRXNV72iyJcCBLYShZxMtHFHSK77mhDv+U=";

1010

1111 doCheck = false;

1212

@@ -18,7 +18,7 @@ in buildGoModule rec {

1818 owner = "drone";

1919 repo = "drone-cli";

2020 rev = revision;

21− sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8";

21+ sha256 = "sha256-j6drDMxvAVfQ1aCFooc9g9HhMRMlFZXGZPiuJZKBbY4=";

2222 };

2323

2424 meta = with lib; {

pkgs/development/tools/fission/default.nix+2−2

@@ -2,13 +2,13 @@

33buildGoModule rec {

44 pname = "fission";

5− version = "1.13.0";

5+ version = "1.13.1";

77 src = fetchFromGitHub {

88 owner = "fission";

99 repo = "fission";

1010 rev = version;

11− sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4=";

11+ sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI=";

1212 };

1313

1414 vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg=";

pkgs/development/tools/jbang/default.nix+2−2

@@ -1,12 +1,12 @@

11{ stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:

33stdenv.mkDerivation rec {

4− version = "0.71.1";

4+ version = "0.72.0";

55 pname = "jbang";

77 src = fetchzip {

88 url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";

9− sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs=";

9+ sha256 = "sha256-QMbkxfGJOMNTILmGYhbUdtq4zfe0Cc/IBftFdM+rT9c=";

1010 };

1111

1212 nativeBuildInputs = [ makeWrapper ];

pkgs/development/tools/ocaml/dune/2.nix+2−2

@@ -6,11 +6,11 @@ else

77stdenv.mkDerivation rec {

88 pname = "dune";

9− version = "2.8.5";

9+ version = "2.9.0";

1010

1111 src = fetchurl {

1212 url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";

13− sha256 = "0a9n8ilsi3kyx5xqvk5s7iikk6y3pkpm5mvsn5za5ivlzf1i40br";

13+ sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv";

1414 };

1515

1616 buildInputs = [ ocaml findlib ];

pkgs/development/tools/parsing/tree-sitter/default.nix+3−3

@@ -28,9 +28,9 @@ let

2828 # 1) change all these hashes

2929 # 2) nix-build -A tree-sitter.updater.update-all-grammars

3030 # 3) run the ./result script that is output by that (it updates ./grammars)

31− version = "0.19.5";

32− sha256 = "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn";

33− cargoSha256 = "0hnjik3pymb1s7frhfpfzvd6w2k3lgpsmh6milpriwxmqsmkwdzz";

31+ version = "0.20.0";

32+ sha256 = "0hrcisvw44fjxix09lfbrz7majaj6njbnr6c92a6a5748p2jvyng";

33+ cargoSha256 = "029db3yy6nj18vxfvj0ra568a9k4x7znfj08spvzl5sxfbx6442r";

3434

3535 src = fetchFromGitHub {

3636 owner = "tree-sitter";

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json+4−4

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

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-c-sharp",

3− "rev": "aa429589525bb849189a0c5ddb52267ce578f988",

4− "date": "2021-06-07T18:47:38+02:00",

5− "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp",

6− "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s",

3+ "rev": "3953034ee61e8639100b063092d4280e047ca9e9",

4+ "date": "2021-06-21T12:18:46+02:00",

5+ "path": "/nix/store/8f2bnr790zwibhyd3jqjm38zfc1md5is-tree-sitter-c-sharp",

6+ "sha256": "0k6pb27f463y88bf6ym0zl4d36182y5cr3013j71h3vlg264z96c",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json+4−4

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

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-haskell",

3− "rev": "237f4eb4417c28f643a29d795ed227246afb66f9",

4− "date": "2021-06-05T13:41:42+02:00",

5− "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell",

6− "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd",

3+ "rev": "a0c1adb59e390f7d839a146c57fdb33d36ed97e6",

4+ "date": "2021-06-18T23:36:08+02:00",

5+ "path": "/nix/store/7rl3najf8rn8ndh31vcxjz5px3r1scky-tree-sitter-haskell",

6+ "sha256": "0a97w0qnj0fwy0yyg7hb9i1fyiwbyiz5mwx77aaw6md4jcsf4di8",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json+4−4

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

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-javascript",

3− "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5",

4− "date": "2021-06-09T14:12:41-07:00",

5− "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript",

6− "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx",

3+ "rev": "6de6d604c243b68f90dce14130d536c694d90dcc",

4+ "date": "2021-06-29T15:54:12-07:00",

5+ "path": "/nix/store/mmz8s440zplg88c0mb0w3dlg94dzgxmf-tree-sitter-javascript",

6+ "sha256": "1bz8xhs7q4lp49q1id6dvz93l7vf0gxgngsbjk3x1nvw8rg171j6",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json+4−4

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

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-php",

3− "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04",

4− "date": "2021-06-01T20:33:20+02:00",

5− "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php",

6− "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086",

3+ "rev": "5e89808d490d893799ebcf229130afe4cf2b0324",

4+ "date": "2021-06-22T09:23:44+02:00",

5+ "path": "/nix/store/5c1pn1p183czqb43a0va7whd4sz81jf1-tree-sitter-php",

6+ "sha256": "1mp5kv305a4rrgh7kklifqfg3680krfsd0h76sxn4i0wxyqfgczi",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json+4−4

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

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-ruby",

3− "rev": "391269d74d20154bbd0ac9be20b35eced6920290",

4− "date": "2021-05-04T14:02:32-07:00",

5− "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby",

6− "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv",

3+ "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd",

4+ "date": "2021-03-03T16:54:30-08:00",

5+ "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby",

6+ "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json+4−4

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

11{

22 "url": "https://github.com/tree-sitter/tree-sitter-scala",

3− "rev": "fb23ed9a99da012d86b7a5059b9d8928607cce29",

4− "date": "2021-04-01T10:11:15-07:00",

5− "path": "/nix/store/n1wvxkz4h38770lxvwakway34ac2a8h7-tree-sitter-scala",

6− "sha256": "05g95340g4labkdvfka5cbg7pr6vzigc40y54js1b5wml0w3d8f7",

3+ "rev": "bfa2a81388019d47f6a0a6a6e9c96910dec830b4",

4+ "date": "2021-06-23T15:37:27-07:00",

5+ "path": "/nix/store/nc5cndwzc5pzq3x64wa51bff0rl36hc8-tree-sitter-scala",

6+ "sha256": "0x0lq78gjfsqi225mfvrpkl2jc6fbb378jgj04syxkm941lxc4bk",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json+4−4

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

11{

22 "url": "https://github.com/Himujjal/tree-sitter-svelte",

3− "rev": "10c113001acf9852817150acb3031a5e68d2b4cf",

4− "date": "2021-05-02T10:05:14+05:30",

5− "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte",

6− "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281",

3+ "rev": "c696a13a587b0595baf7998f1fb9e95c42750263",

4+ "date": "2021-03-20T16:45:11+05:30",

5+ "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte",

6+ "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3",

77 "fetchSubmodules": false,

88 "deepClone": false,

99 "leaveDotGit": false

pkgs/development/tools/wp-cli/default.nix+3−3

@@ -1,10 +1,10 @@

11{ stdenv, lib, fetchurl, writeText, php, makeWrapper }:

22let

3− version = "2.4.0";

3+ version = "2.5.0";

55 completion = fetchurl {

66 url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";

7− sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24";

7+ sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U=";

88 };

1010 ini = writeText "php.ini" ''

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

2121

2222 src = fetchurl {

2323 url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar";

24− sha256 = "0h5mjxrw4z3648v4wb4pvapz2a1mlmbszgggg4b7bvrrxn3cr78k";

24+ sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k=";

2525 };

2626

2727 nativeBuildInputs = [ makeWrapper ];

pkgs/development/web/insomnia/default.nix+2−2

@@ -16,12 +16,12 @@ let

1616 ];

1717in stdenv.mkDerivation rec {

1818 pname = "insomnia";

19− version = "2021.3.0";

19+ version = "2021.4.0";

2020

2121 src = fetchurl {

2222 url =

2323 "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";

24− sha256 = "sha256-RtEkWi0J3nYzT+IhdyBlGeUE2SCmhlnfw0L6sOvE4WI=";

24+ sha256 = "sha256-lMQWoShlEACTrcGgQtfPGVQ4X8pCG/6SkXtz+rWAOyg=";

2525 };

2626

2727 nativeBuildInputs =

pkgs/games/extremetuxracer/default.nix+2−2

@@ -5,12 +5,12 @@

55}:

77stdenv.mkDerivation rec {

8− version = "0.8.0";

8+ version = "0.8.1";

99 pname = "extremetuxracer";

1010

1111 src = fetchurl {

1212 url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";

13− sha256 = "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b";

13+ sha256 = "sha256-ktqWPtMqub/xJjRu37lUnocdfDzsdT9KxQmODVPDg0E=";

1414 };

1515

1616 buildInputs = [

pkgs/games/freeciv/default.nix+2−2

@@ -12,13 +12,13 @@ let

1212

1313in stdenv.mkDerivation rec {

1414 pname = "freeciv";

15− version = "2.6.4";

15+ version = "2.6.5";

1616

1717 src = fetchFromGitHub {

1818 owner = "freeciv";

1919 repo = "freeciv";

2020 rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}";

21− sha256 = "sha256-MRaY10HliP8TA8/9s5caNtB5hks5SJcBJItFXOUryCI=";

21+ sha256 = "sha256-7KVtBGihABpcbUm5ac2fuBVaDvbucEJSREPulGUdnUE=";

2222 };

2323

2424 postPatch = ''

pkgs/misc/vim-plugins/generated.nix+69−69

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

413413

414414 chadtree = buildVimPluginFrom2Nix {

415415 pname = "chadtree";

416− version = "2021-06-30";

416+ version = "2021-07-01";

417417 src = fetchFromGitHub {

418418 owner = "ms-jpq";

419419 repo = "chadtree";

420− rev = "01507625b76291bb41a3c92ca8a056d655b674cb";

421− sha256 = "16n1vdgrn9rv7pzwzgisdhin81d5fhlyicp0m0md4g6sd6jfydqh";

420+ rev = "d66a7ec580c5e006bf44c5ffc0c17e39897b0c22";

421+ sha256 = "0an89qwx70gj3dzlmx9j61vmsqfzsh9p4jhqysrg1n6hx56ak7yj";

422422 };

423423 meta.homepage = "https://github.com/ms-jpq/chadtree/";

424424 };

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

810810

811811 Coqtail = buildVimPluginFrom2Nix {

812812 pname = "Coqtail";

813− version = "2021-06-21";

813+ version = "2021-06-30";

814814 src = fetchFromGitHub {

815815 owner = "whonore";

816816 repo = "Coqtail";

817− rev = "aa817559be68d9e90316bc7e5d3205fe2ffcffbe";

818− sha256 = "06c9ab58rj0qx2nyl63qpx5r8lwlx320j7913nafpk268pmqdz4i";

817+ rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17";

818+ sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861";

819819 };

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

821821 };

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

13641364

13651365 edge = buildVimPluginFrom2Nix {

13661366 pname = "edge";

1367− version = "2021-06-17";

1367+ version = "2021-07-01";

13681368 src = fetchFromGitHub {

13691369 owner = "sainnhe";

13701370 repo = "edge";

1371− rev = "f4a26c075f603c3d82baf56b04c9168a7e084c8b";

1372− sha256 = "02rsawnqixwq8cj8ryqg0nmmmzq5s1adfll9mmwa6bqh3nwxsb2s";

1371+ rev = "1e540f25a4bb84fcc50b5f10c969fbda02d21027";

1372+ sha256 = "17qpqiv63jpap10wgfkb6zmj2xqcl7jwjglg74y9pajkpm1l050h";

13731373 };

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

13751375 };

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

20392039

20402040 hop-nvim = buildVimPluginFrom2Nix {

20412041 pname = "hop-nvim";

2042− version = "2021-06-27";

2042+ version = "2021-07-01";

20432043 src = fetchFromGitHub {

20442044 owner = "phaazon";

20452045 repo = "hop.nvim";

2046− rev = "00b0f865efdcb329629315c63e9dac5aa6a6e736";

2047− sha256 = "1c3bzhrsdbkwj9hj832bb9snr7b78yf8mbx9gm4fc2lbbnrxqvvp";

2046+ rev = "0e9d4b4585f8a37d6cccbe9dd5993900b96a595b";

2047+ sha256 = "0gpah47azk1miybwm2aa6m3vm08683z85rgrjfywx76fnih9rs66";

20482048 };

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

20502050 };

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

23162316

23172317 julia-vim = buildVimPluginFrom2Nix {

23182318 pname = "julia-vim";

2319− version = "2021-06-29";

2319+ version = "2021-07-01";

23202320 src = fetchFromGitHub {

23212321 owner = "JuliaEditorSupport";

23222322 repo = "julia-vim";

2323− rev = "26beb1213019d56767e7f14ba1f2cbc33cb315b8";

2324− sha256 = "05bqimb70r646q9v7nshwapqs8n9hvbx55cxx6khd6gwvpckh22w";

2323+ rev = "6ff9e9938badea96f64154f2991e165e8d340cf2";

2324+ sha256 = "11k1gjsh8fibdpg5lrcq3rz90gwjb7725krhimnvhrkwhcyl1bwb";

23252325 };

23262326 meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/";

23272327 };

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

26762676

26772677 luasnip = buildVimPluginFrom2Nix {

26782678 pname = "luasnip";

2679− version = "2021-06-27";

2679+ version = "2021-06-30";

26802680 src = fetchFromGitHub {

26812681 owner = "l3mon4d3";

26822682 repo = "luasnip";

2683− rev = "1e79310e57404e86e00ceca2c4657bb9a9072673";

2684− sha256 = "0v6kgjjy9ygr2vygh4zizfbnms33w3bn1b4zdljx79c358firgcx";

2683+ rev = "b94accc40260be439b6bfa120402ebd10bd60577";

2684+ sha256 = "19lz2l9dzq5a339rhp8xdzj1m0dxxnwm9w4kg4lizgxi1ck53dpq";

26852685 };

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

26872687 };

26882688

26892689 lush-nvim = buildVimPluginFrom2Nix {

26902690 pname = "lush-nvim";

2691− version = "2021-06-28";

2691+ version = "2021-06-30";

26922692 src = fetchFromGitHub {

26932693 owner = "rktjmp";

26942694 repo = "lush.nvim";

2695− rev = "850a2aa8366bbe8b07088a19e6b6f2e8e76f2c9f";

2696− sha256 = "048fjsxrshlgcscs9c1y29fgpcb9l9cnhpghkj9ailpzjv4j5hxf";

2695+ rev = "3232af465ed86b9a188389e52ce3c47cd811c3f3";

2696+ sha256 = "1qcvi8kklggzl4k88n6zhxb08hh2srhm9vvnfrknlz751pgd8z3x";

26972697 };

26982698 meta.homepage = "https://github.com/rktjmp/lush.nvim/";

26992699 };

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

30843084

30853085 neoformat = buildVimPluginFrom2Nix {

30863086 pname = "neoformat";

3087− version = "2021-06-28";

3087+ version = "2021-06-30";

30883088 src = fetchFromGitHub {

30893089 owner = "sbdchd";

30903090 repo = "neoformat";

3091− rev = "b03c121c66d859fa165aaab05ba9c1c1b2098007";

3092− sha256 = "0b72c14sqjq8bb0xz1spp5lq2bs1fsbp651qiwvvcdlma5yf5vxk";

3091+ rev = "3fdfd45119be64945e635bf2406fdb0430cb85df";

3092+ sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4";

30933093 };

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

30953095 };

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

31443144

31453145 neorg = buildVimPluginFrom2Nix {

31463146 pname = "neorg";

3147− version = "2021-06-27";

3147+ version = "2021-07-01";

31483148 src = fetchFromGitHub {

31493149 owner = "vhyrro";

31503150 repo = "neorg";

3151− rev = "639a2deb5e3783aeb8f7cddaade8e84575f3bc1e";

3152− sha256 = "0q890252cpcjy5a9xy6m5qlziqbqmfgy43l305aslv05yxbckk11";

3151+ rev = "7fe4530c9a71f81444ad9fee9d89c5e2f5bfbf8d";

3152+ sha256 = "1zyi32x8wfz3lqb2nqggrjlp8d0j4qpnkck4pfg15fgmkycrivf7";

31533153 };

31543154 meta.homepage = "https://github.com/vhyrro/neorg/";

31553155 };

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

33483348

33493349 nord-nvim = buildVimPluginFrom2Nix {

33503350 pname = "nord-nvim";

3351− version = "2021-06-17";

3351+ version = "2021-07-01";

33523352 src = fetchFromGitHub {

33533353 owner = "shaunsingh";

33543354 repo = "nord.nvim";

3355− rev = "cbede2d4abef3f6054919863404ce46f3ed572a9";

3356− sha256 = "0w7fv6yl78inr81h57kgh5xfhha626sc2w8mmzgbwp7s7yhqxymk";

3355+ rev = "98063a91de4179685c29acb1c765a99bf08ef0f2";

3356+ sha256 = "18q05vfb4h94nlxylkir9chb3n62x2ibb3qlcij4rhn35fsnrfd9";

33573357 };

33583358 meta.homepage = "https://github.com/shaunsingh/nord.nvim/";

33593359 };

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

34683468

34693469 nvim-compe = buildVimPluginFrom2Nix {

34703470 pname = "nvim-compe";

3471− version = "2021-06-29";

3471+ version = "2021-07-01";

34723472 src = fetchFromGitHub {

34733473 owner = "hrsh7th";

34743474 repo = "nvim-compe";

3475− rev = "9a1ab398bfdb4bda1134b7a0e7a379017d3bdefa";

3476− sha256 = "04khvbxx5qsfzhg5ari55ka8ff9gpd2kh7s3vc27z1jz43vizrsa";

3475+ rev = "a46dfe7d7fc8f7af5bb84006db45ba11fb7b786c";

3476+ sha256 = "161zrqvw5kpcphn747cpa4388x4c2flps5qwxkl5yxkn320937im";

34773477 };

34783478 meta.homepage = "https://github.com/hrsh7th/nvim-compe/";

34793479 };

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

36003600

36013601 nvim-lspconfig = buildVimPluginFrom2Nix {

36023602 pname = "nvim-lspconfig";

3603− version = "2021-06-29";

3603+ version = "2021-06-30";

36043604 src = fetchFromGitHub {

36053605 owner = "neovim";

36063606 repo = "nvim-lspconfig";

3607− rev = "234a8cdad1104dd562796e6ca2c6c41e22e5f77a";

3608− sha256 = "0w10mx66p9sil1aa6jhkfb7k2p4m2vwjbyr8f1dr2apn07cr72w8";

3607+ rev = "161ec66bda585fd7ba402cf7434bac87c927734f";

3608+ sha256 = "1d4qwxrkx9cbbrxddg2n9f7sszmp23jnx83g52yydsxhlxq8dj8l";

36093609 };

36103610 meta.homepage = "https://github.com/neovim/nvim-lspconfig/";

36113611 };

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

36843684

36853685 nvim-tree-lua = buildVimPluginFrom2Nix {

36863686 pname = "nvim-tree-lua";

3687− version = "2021-06-29";

3687+ version = "2021-07-01";

36883688 src = fetchFromGitHub {

36893689 owner = "kyazdani42";

36903690 repo = "nvim-tree.lua";

3691− rev = "a80ea23b4c765efe3b6eaa9440d19d298e4c709b";

3692− sha256 = "11m62asv3qrv5kh4gb8xvhjmxwbzxf26902cxn8gncclc79cr42i";

3691+ rev = "a01a33f9a8aea3eb19eb76601131c01e23d8e034";

3692+ sha256 = "1jsf6prmf1555kd87gfjdiydkvl15qk0lk6x04dwbrx6wxfvd77a";

36933693 };

36943694 meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/";

36953695 };

36963696

36973697 nvim-treesitter = buildVimPluginFrom2Nix {

36983698 pname = "nvim-treesitter";

3699− version = "2021-06-29";

3699+ version = "2021-07-01";

37003700 src = fetchFromGitHub {

37013701 owner = "nvim-treesitter";

37023702 repo = "nvim-treesitter";

3703− rev = "917ae3da7c0d827c819405cc747aafc8bb041dbd";

3704− sha256 = "00mh980ffh3k0cp4dm1qvx5x803kw8xajgvv86hw0yspmjb98d5d";

3703+ rev = "5fa8d5741dca82a15426db659f461244975678e6";

3704+ sha256 = "1xqq1m27w3vh1dd9g3k4kwva92hr8zf1xnlvqhy2jz1xazx4k2m1";

37053705 };

37063706 meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";

37073707 };

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

40084008

40094009 plenary-nvim = buildVimPluginFrom2Nix {

40104010 pname = "plenary-nvim";

4011− version = "2021-06-19";

4011+ version = "2021-06-30";

40124012 src = fetchFromGitHub {

40134013 owner = "nvim-lua";

40144014 repo = "plenary.nvim";

4015− rev = "268002fdba2f8f5a4e86574e3b9924ad6d42da20";

4016− sha256 = "07zskz9b5s4cainjqj431b2skzdrhnm8agydmjxmw13qjmwj0q7z";

4015+ rev = "18da6621459032aa5608b760622f0bc8fdc0535c";

4016+ sha256 = "1z1n3jpxmz3672f8bd6s898mlqjf17pv11qqy15l2npfd9crh5sv";

40174017 };

40184018 meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";

40194019 };

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

40574057

40584058 presence-nvim = buildVimPluginFrom2Nix {

40594059 pname = "presence-nvim";

4060− version = "2021-06-14";

4060+ version = "2021-06-30";

40614061 src = fetchFromGitHub {

40624062 owner = "andweeb";

40634063 repo = "presence.nvim";

4064− rev = "65a16b25f98891e2832daa437cdd682e546a494e";

4065− sha256 = "0fwxxrwad3y69bczs7rxa0brff4vp139w2ylv8rfh0v2dgx2gmay";

4064+ rev = "774994a5b930b9e6635e6a9b83b7f476bdd7dd23";

4065+ sha256 = "0q6d5k2rf6ci3mgmdga304ihklb10falp4g29djnfxxsi2iapvjv";

40664066 };

40674067 meta.homepage = "https://github.com/andweeb/presence.nvim/";

40684068 };

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

42494249

42504250 registers-nvim = buildVimPluginFrom2Nix {

42514251 pname = "registers-nvim";

4252− version = "2021-06-21";

4252+ version = "2021-07-01";

42534253 src = fetchFromGitHub {

42544254 owner = "tversteeg";

42554255 repo = "registers.nvim";

4256− rev = "6817136df80ae9ddb980a97f7e4cf31cc4f9fa4a";

4257− sha256 = "13di6mjn6wb931ak98g1xl99j97c2kphhqrbwh673nl7syqwhnrf";

4256+ rev = "fd21f094a460bb319a8f6eac18653a1a2122d41c";

4257+ sha256 = "0y5qga2x767blzbrlbfxidz73fpby81xpsw133wmfy3hnkg8xdam";

42584258 };

42594259 meta.homepage = "https://github.com/tversteeg/registers.nvim/";

42604260 };

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

45744574

45754575 sonokai = buildVimPluginFrom2Nix {

45764576 pname = "sonokai";

4577− version = "2021-06-08";

4577+ version = "2021-07-01";

45784578 src = fetchFromGitHub {

45794579 owner = "sainnhe";

45804580 repo = "sonokai";

4581− rev = "5c1fc0452387cae323692e3345238a780a942056";

4582− sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx";

4581+ rev = "e8935bde797ce92318c60a21ee671caf04387a33";

4582+ sha256 = "1sw8d7ipadpa4hazs2fija3rzlf6ch7h8lkm4k3hg9m9gpviygla";

45834583 };

45844584 meta.homepage = "https://github.com/sainnhe/sonokai/";

45854585 };

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

48034803

48044804 syntastic = buildVimPluginFrom2Nix {

48054805 pname = "syntastic";

4806− version = "2021-05-19";

4806+ version = "2021-07-01";

48074807 src = fetchFromGitHub {

48084808 owner = "vim-syntastic";

48094809 repo = "syntastic";

4810− rev = "176f364f1b4acf894cdc248944f2d5506a37cc80";

4811− sha256 = "01ylf4vjlisgls2f2gwlagg7x1yyhcr64kzdlzhcs3r8s3wdsf25";

4810+ rev = "c89741ef310fd0a380ffb80b80e10f197afd6224";

4811+ sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh";

48124812 };

48134813 meta.homepage = "https://github.com/vim-syntastic/syntastic/";

48144814 };

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

49844984

49854985 telescope-nvim = buildVimPluginFrom2Nix {

49864986 pname = "telescope-nvim";

4987− version = "2021-06-27";

4987+ version = "2021-07-01";

49884988 src = fetchFromGitHub {

49894989 owner = "nvim-telescope";

49904990 repo = "telescope.nvim";

4991− rev = "e5bd4963da81b5d044749ee4507061801aeb0f78";

4992− sha256 = "1dskr91qiark1z08yfjkbrnf1zvy2mci4avkdn574b7pz8v72lzb";

4991+ rev = "5a53ec5c2fdab10ca8775d3979b1a85e63d57953";

4992+ sha256 = "1mr98irwsc5pmj63ssxd3cdwb3x31lalbkk1pyp79bswdfjmx0nl";

49934993 };

49944994 meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";

49954995 };

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

58375837

58385838 vim-clap = buildVimPluginFrom2Nix {

58395839 pname = "vim-clap";

5840− version = "2021-06-26";

5840+ version = "2021-07-01";

58415841 src = fetchFromGitHub {

58425842 owner = "liuchengxu";

58435843 repo = "vim-clap";

5844− rev = "492eca7ff8e162ec8a8e4535860de399d7e1cd57";

5845− sha256 = "1xxgf3mk26pj3w2lzdr4aw8xvya02ar57v01v1yajlw0rzx23crw";

5844+ rev = "4402c9292c4495916b075e27dac88ad391c47ceb";

5845+ sha256 = "0hwap5z5727iq42zpl769m1w84qr41xgbg7rfjbk94qb3kkikb4m";

58465846 };

58475847 meta.homepage = "https://github.com/liuchengxu/vim-clap/";

58485848 };

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

91659165

91669166 vim-vsnip = buildVimPluginFrom2Nix {

91679167 pname = "vim-vsnip";

9168− version = "2021-06-01";

9168+ version = "2021-07-01";

91699169 src = fetchFromGitHub {

91709170 owner = "hrsh7th";

91719171 repo = "vim-vsnip";

9172− rev = "552403842b992efde3816a89b20055f7d66d9a0d";

9173− sha256 = "1pkkysv2mnbzm2bi33l1xccdb6sh06dgyg83dg0dgd0gmp94l7ya";

9172+ rev = "a1d1841ecadc19eeab9efdd9fa17054cedcba6e6";

9173+ sha256 = "0zzqxxv2jqi71p76z0fsnc25kmclazb3x6rg248npsn8pnfwwi1s";

91749174 };

91759175 meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";

91769176 };

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

95029502

95039503 vimtex = buildVimPluginFrom2Nix {

95049504 pname = "vimtex";

9505− version = "2021-06-28";

9505+ version = "2021-06-30";

95069506 src = fetchFromGitHub {

95079507 owner = "lervag";

95089508 repo = "vimtex";

9509− rev = "299363d651c5a8c26a4440f434df613cdf66a4c4";

9510− sha256 = "18c9b35cjjrw2bf62j6ss5i7i21rz32nrm102bljybf2cfs700lf";

9509+ rev = "c9b3b50427d97403e8a36b3fe2d636d0a97db0d8";

9510+ sha256 = "1vpl02n2xy7b95mhagbsq7fiz55i0x3wpqpbmpmp16mva6r6agvr";

95119511 };

95129512 meta.homepage = "https://github.com/lervag/vimtex/";

95139513 };

pkgs/os-specific/linux/tuxedo-keyboard/default.nix+3−3

@@ -1,14 +1,14 @@

1−{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}:

1+{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders }:

33stdenv.mkDerivation rec {

44 pname = "tuxedo-keyboard-${kernel.version}";

5− version = "3.0.5";

5+ version = "3.0.7";

77 src = fetchFromGitHub {

88 owner = "tuxedocomputers";

99 repo = "tuxedo-keyboard";

1010 rev = "v${version}";

11− sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck";

11+ sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU=";

1212 };

1313

1414 buildInputs = [ linuxHeaders ];

pkgs/servers/home-assistant/component-packages.nix+1−1

@@ -646,7 +646,7 @@

646646 "plugwise" = ps: with ps; [ plugwise ];

647647 "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad

648648 "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts

649− "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint

649+ "point" = ps: with ps; [ aiohttp-cors pypoint ];

650650 "poolsense" = ps: with ps; [ poolsense ];

651651 "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall

652652 "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ];

pkgs/servers/home-assistant/default.nix+2

@@ -606,6 +606,7 @@ in with py.pkgs; buildPythonApplication rec {

606606 "plant"

607607 "plex"

608608 "plugwise"

609+ "point"

609610 "poolsense"

610611 "profiler"

611612 "prometheus"

@@ -614,6 +615,7 @@ in with py.pkgs; buildPythonApplication rec {

614615 "pushbullet"

615616 "pvpc_hourly_pricing"

616617 "python_script"

618+ "qld_bushfire"

617619 "rachio"

618620 "radarr"

619621 "rainmachine"

pkgs/servers/ldap/389/default.nix+2−2

@@ -43,13 +43,13 @@

4343

4444stdenv.mkDerivation rec {

4545 pname = "389-ds-base";

46− version = "2.0.5";

46+ version = "2.0.6";

4747

4848 src = fetchFromGitHub {

4949 owner = "389ds";

5050 repo = pname;

5151 rev = "${pname}-${version}";

52− sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8=";

52+ sha256 = "sha256-MYLRrH3PrNdPVuRffiG39zzJK6eHJcvIDWn1q0IHrZ8=";

5353 };

5454

5555 nativeBuildInputs = [ autoreconfHook pkg-config doxygen ];

pkgs/servers/pufferpanel/default.nixnew file+59

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

1+{ lib

2+, buildGoModule

3+, fetchFromGitHub

4+, makeWrapper

5+, pkgs

6+, stdenv

7+, fetchzip

8+, openjdk16

9+, nodejs

10+, pathDeps ? [ ]

11+}:

12+

13+buildGoModule rec {

14+ pname = "pufferpanel";

15+ version = "2.2.0";

16+

17+ src = fetchFromGitHub {

18+ owner = "pufferpanel";

19+ repo = pname;

20+ rev = "v${version}";

21+ sha256 = "1ifig8ckjlg47wj0lfk4q941dan7llb1i5l76akcpjq726b2j8lh";

22+ };

23+

24+ # PufferPanel is split into two parts: the backend daemon and the

25+ # frontend.

26+ # Getting the frontend to build in the Nix environment fails even

27+ # with all the proper node_modules populated. To work around this,

28+ # we just download the built frontend and package that.

29+ frontend = fetchzip {

30+ url = "https://github.com/PufferPanel/PufferPanel/releases/download/v${version}/pufferpanel_${version}_linux_arm64.zip";

31+ sha256 = "0phbf4asr0dns7if84crx05kfgr44yaxrbsbihdywbhh2mb16052";

32+ stripRoot = false;

33+ } + "/www";

34+

35+ nativeBuildInputs = [ makeWrapper ];

36+

37+ vendorSha256 = "061l1sy0z3kd7rc2blqh333gy66nbadfxy9hyxgq07dszds4byys";

38+

39+ postFixup = ''

40+ mkdir -p $out/share/pufferpanel

41+ cp -r ${src}/assets/email $out/share/pufferpanel/templates

42+ cp -r ${frontend} $out/share/pufferpanel/www

43+

44+ # Wrap the binary with the path to the external files.

45+ mv $out/bin/cmd $out/bin/pufferpanel

46+ wrapProgram "$out/bin/pufferpanel" \

47+ --set PUFFER_PANEL_EMAIL_TEMPLATES $out/share/pufferpanel/templates/emails.json \

48+ --set GIN_MODE release \

49+ --set PUFFER_PANEL_WEB_FILES $out/share/pufferpanel/www \

50+ --prefix PATH : ${lib.makeBinPath pathDeps}

51+ '';

52+

53+ meta = with lib; {

54+ description = "A free, open source game management panel";

55+ homepage = "https://www.pufferpanel.com/";

56+ license = with licenses; [ asl20 ];

57+ maintainers = with maintainers; [ ronthecookie ];

58+ };

59+}

pkgs/servers/search/groonga/default.nix+2−2

@@ -7,11 +7,11 @@

77stdenv.mkDerivation rec {

99 pname = "groonga";

10− version = "11.0.3";

10+ version = "11.0.4";

1111

1212 src = fetchurl {

1313 url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz";

14− sha256 = "sha256-oYlc6PSBLovNsEWDc6eGpDI85T6bTHgBvxA/PZP3aQU=";

14+ sha256 = "sha256-a/IMroZ1zAgIv7Cx4kkj5byIMoC0o+seHhqVLaUUSqc=";

1515 };

1616

1717 buildInputs = with lib;

pkgs/servers/xmpp/ejabberd/default.nix+7−15

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

66, withSqlite ? false, sqlite

77, withPam ? false, pam

88, withZlib ? true, zlib

9−, withRiak ? false

10−, withElixir ? false, elixir

119, withIconv ? true

1210, withTools ? false

1311, withRedis ? false

@@ -24,12 +22,12 @@ let

2422 ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ];

2523

2624in stdenv.mkDerivation rec {

27− version = "20.12";

25+ version = "21.04";

2826 pname = "ejabberd";

2927

3028 src = fetchurl {

3129 url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz";

32− sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ=";

30+ sha256 = "09s8mj0dkvp9mxazsqxqqmnl5n2xyi8avx0rzgvqrbl3byanzfzr";

3331 };

3432

3533 nativeBuildInputs = [ fakegit makeWrapper ];

@@ -38,11 +36,7 @@ in stdenv.mkDerivation rec {

3836 ++ lib.optional withSqlite sqlite

3937 ++ lib.optional withPam pam

4038 ++ lib.optional withZlib zlib

41− ++ lib.optional withElixir elixir

42− ;

43−

44− # Apparently needed for Elixir

45− LANG = "en_US.UTF-8";

39+ ;

4640

4741 deps = stdenv.mkDerivation {

4842 pname = "ejabberd-deps";

@@ -52,7 +46,7 @@ in stdenv.mkDerivation rec {

5246

5347 configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];

5448

55− nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];

49+ nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib ];

5650

5751 GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

5852

@@ -76,7 +70,7 @@ in stdenv.mkDerivation rec {

7670

7771 outputHashMode = "recursive";

7872 outputHashAlgo = "sha256";

79− outputHash = "sha256-0/hBgA+9rsDOBcvbROSpc5Xnw4JkYpuLCl2V+lJnieY=";

73+ outputHash = "1mvixgb46ss35abjwz3lw38c69bii1xyj557a92bvrxc1gc6gx31";

8074 };

8175

8276 configureFlags =

@@ -85,8 +79,6 @@ in stdenv.mkDerivation rec {

8579 (lib.enableFeature withSqlite "sqlite")

8680 (lib.enableFeature withPam "pam")

8781 (lib.enableFeature withZlib "zlib")

88− (lib.enableFeature withRiak "riak")

89− (lib.enableFeature withElixir "elixir")

9082 (lib.enableFeature withIconv "iconv")

9183 (lib.enableFeature withTools "tools")

9284 (lib.enableFeature withRedis "redis")

@@ -97,7 +89,7 @@ in stdenv.mkDerivation rec {

9789 preBuild = ''

9890 cp -r $deps deps

9991 chmod -R +w deps

100− patchShebangs deps

92+ patchShebangs .

10193 '';

10294

10395 postInstall = ''

@@ -108,6 +100,7 @@ in stdenv.mkDerivation rec {

108100 -e 's,$^ *CONNLOCKDIR=$.*,\1/var/lock/ejabberdctl,' \

109101 $out/sbin/ejabberdctl

110102 wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}"

103+ rm $out/bin/{mix,iex,elixir}

111104 '';

112105

113106 meta = with lib; {

@@ -116,6 +109,5 @@ in stdenv.mkDerivation rec {

116109 homepage = "https://www.ejabberd.im";

117110 platforms = platforms.linux;

118111 maintainers = with maintainers; [ sander abbradar ];

119− broken = withElixir;

120112 };

121113}

pkgs/tools/backup/discordchatexporter-cli/default.nixnew file+87

@@ -0,0 +1,87 @@

1+{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, autoPatchelfHook

2+, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert

3+}:

5+let

6+ projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj";

7+in

8+stdenv.mkDerivation rec {

9+ pname = "discordchatexporter-cli";

10+ version = "2.28";

11+

12+ src = fetchFromGitHub {

13+ owner = "tyrrrz";

14+ repo = "discordchatexporter";

15+ rev = version;

16+ sha256 = "1bcq8mwjr8635g8mkgbxnszk20hnwf0zk672glrxjqga6f6fnykg";

17+ };

18+

19+ nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ];

20+ buildInputs = [ stdenv.cc.cc.lib ];

21+

22+ nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix {

23+ fetchNuGet = { name, version, sha256 }: fetchurl {

24+ name = "nuget-${name}-${version}.nupkg";

25+ url = "https://www.nuget.org/api/v2/package/${name}/${version}";

26+ inherit sha256;

27+ };

28+ });

29+

30+ configurePhase = ''

31+ runHook preConfigure

32+

33+ export HOME=$(mktemp -d)

34+ export DOTNET_CLI_TELEMETRY_OPTOUT=1

35+ export DOTNET_NOLOGO=1

36+

37+ nuget sources Add -Name nixos -Source "$PWD/nixos"

38+ nuget init "$nugetDeps" "$PWD/nixos"

39+

40+ # FIXME: https://github.com/NuGet/Home/issues/4413

41+ mkdir -p $HOME/.nuget/NuGet

42+ cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet

43+

44+ dotnet restore --source "$PWD/nixos" ${projectFile}

45+

46+ runHook postConfigure

47+ '';

48+

49+ buildPhase = ''

50+ runHook preBuild

51+

52+ dotnet build ${projectFile} \

53+ --no-restore \

54+ --configuration Release \

55+ -p:Version=${version}

56+

57+ runHook postBuild

58+ '';

59+

60+ installPhase = ''

61+ runHook preInstall

62+

63+ dotnet publish ${projectFile} \

64+ --no-build \

65+ --configuration Release \

66+ --no-self-contained \

67+ --output $out/lib/${pname}

68+ shopt -s extglob

69+

70+ makeWrapper $out/lib/${pname}/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli \

71+ --set DOTNET_ROOT "${dotnetCorePackages.sdk_3_1}"

72+

73+ runHook postInstall

74+ '';

75+

76+ # Strip breaks the executable.

77+ dontStrip = true;

78+

79+ meta = with lib; {

80+ description = "A tool to export Discord chat logs to a file";

81+ homepage = "https://github.com/Tyrrrz/DiscordChatExporter";

82+ license = licenses.gpl3Plus;

83+ maintainers = [ maintainers.ivar ];

84+ platforms = [ "x86_64-linux" ];

85+ };

86+ passthru.updateScript = ./updater.sh;

87+}

pkgs/tools/backup/discordchatexporter-cli/deps.nixnew file+67

@@ -0,0 +1,67 @@

1+{ fetchNuGet }: [

2+ (fetchNuGet {

3+ name = "CliFx";

4+ version = "2.0.4";

5+ sha256 = "1wwpjli4y2545yi6k17mvjqy994wl3wm6nngszk87rbdwhkbncaj";

6+ })

7+ (fetchNuGet {

8+ name = "Gress";

9+ version = "1.2.0";

10+ sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn";

11+ })

12+ (fetchNuGet {

13+ name = "JsonExtensions";

14+ version = "1.1.0";

15+ sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy";

16+ })

17+ (fetchNuGet {

18+ name = "Microsoft.AspNetCore.App.Ref";

19+ version = "3.1.10";

20+ sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77";

21+ })

22+ (fetchNuGet {

23+ name = "Microsoft.NETCore.App.Host.linux-x64";

24+ version = "3.1.14";

25+ sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h";

26+ })

27+ (fetchNuGet {

28+ name = "Microsoft.NETCore.App.Ref";

29+ version = "3.1.0";

30+ sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y";

31+ })

32+ (fetchNuGet {

33+ name = "MiniRazor.CodeGen";

34+ version = "2.1.2";

35+ sha256 = "0mg4zy4zq0ccrc9wchy796ln1znkmn3k1aax0kd2gha4fwa1d1fb";

36+ })

37+ (fetchNuGet {

38+ name = "MiniRazor.Runtime";

39+ version = "2.1.2";

40+ sha256 = "1a6cm7j1f5n1bfzhg8w60xwa7cps2i82418k57dm2hgqla6p3rsp";

41+ })

42+ (fetchNuGet {

43+ name = "Polly";

44+ version = "7.2.2";

45+ sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn";

46+ })

47+ (fetchNuGet {

48+ name = "Spectre.Console";

49+ version = "0.40.0";

50+ sha256 = "17bb31nsvfk7m337zwqcz4v6cvayhfx51ri4yrv5i8nbp7f4rpb1";

51+ })

52+ (fetchNuGet {

53+ name = "System.Memory";

54+ version = "4.5.0";

55+ sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30";

56+ })

57+ (fetchNuGet {

58+ name = "Tyrrrz.Extensions";

59+ version = "1.6.5";

60+ sha256 = "1yzsii1pbp6b066wxwwws310p7h809apl81bhb8ad55hqlzy1rg3";

61+ })

62+ (fetchNuGet {

63+ name = "Wcwidth";

64+ version = "0.2.0";

65+ sha256 = "0p7zaisix9ql4v5nyl9gfc93xcyj74j01rwvgm7jw29js3wlj10s";

66+ })

67+]

pkgs/tools/backup/discordchatexporter-cli/updater.shnew file+44

@@ -0,0 +1,44 @@

1+#!/usr/bin/env nix-shell

2+#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5

3+set -eo pipefail

4+cd "$(dirname "${BASH_SOURCE[0]}")"

6+deps_file="$(realpath "./deps.nix")"

8+new_version="$(curl -s "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')"

9+old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)"

10+if [[ "$new_version" == "$old_version" ]]; then

11+ echo "Up to date"

12+ exit 0

13+fi

14+

15+cd ../../../..

16+update-source-version discordchatexporter-cli "$new_version"

17+store_src="$(nix-build . -A discordchatexporter-cli.src --no-out-link)"

18+src="$(mktemp -d /tmp/discordexporter-src.XXX)"

19+cp -rT "$store_src" "$src"

20+chmod -R +w "$src"

21+

22+pushd "$src"

23+

24+mkdir ./nuget_tmp.packages

25+dotnet restore DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj --packages ./nuget_tmp.packages

26+

27+echo "{ fetchNuGet }: [" >"$deps_file"

28+while read pkg_spec; do

29+ { read pkg_name; read pkg_version; } < <(

30+ # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3`

31+ sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec")

32+ pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"

33+ cat >>"$deps_file" <<EOF

34+ (fetchNuGet {

35+ name = "$pkg_name";

36+ version = "$pkg_version";

37+ sha256 = "$pkg_sha256";

38+ })

39+EOF

40+done < <(find ./nuget_tmp.packages -name '*.nuspec' | sort)

41+echo "]" >>"$deps_file"

42+

43+popd

44+rm -r "$src"

pkgs/tools/backup/rotate-backups/default.nix+21−6

@@ -1,17 +1,33 @@

1−{ lib, buildPythonPackage, fetchFromGitHub, update-dotdee, simpleeval, dateutil }:

1+{ lib

2+, python3

3+, fetchFromGitHub

4+}:

3−buildPythonPackage rec {

6+python3.pkgs.buildPythonApplication rec {

47 pname = "rotate-backups";

5− version = "6.0";

8+ version = "8.1";

710 src = fetchFromGitHub {

811 owner = "xolox";

912 repo = "python-rotate-backups";

1013 rev = version;

11− sha256 = "0i59qfv1cfm0ss63ab2nrkn5wr4rxpqqmvfd7pf9c3pl9dbfq20c";

14+ sha256 = "0r4dyd7hj403rksgp3vh1azp9n4af75r3wq3x39wxcqizpms3vkx";

1215 };

1316

14− propagatedBuildInputs = [ update-dotdee simpleeval dateutil ];

17+ propagatedBuildInputs = with python3.pkgs; [

18+ python-dateutil

19+ simpleeval

20+ update-dotdee

21+ ];

22+

23+ checkInputs = with python3.pkgs; [

24+ pytestCheckHook

25+ ];

26+

27+ disabledTests = [

28+ # https://github.com/xolox/python-rotate-backups/issues/33

29+ "test_removal_command"

30+ ];

1531

1632 meta = with lib; {

1733 description = "Simple command line interface for backup rotation";

@@ -20,4 +36,3 @@ buildPythonPackage rec {

2036 maintainers = with maintainers; [ eyjhb ];

2137 };

2238}

23−

pkgs/tools/graphics/ploticus/builder.shdeleted−33

@@ -1,33 +0,0 @@

1−source $stdenv/setup

2−

3−preBuild() {

4− cd src

5−}

6−

7−preInstall() {

8− mkdir -p $out/bin

9−}

10−

11−postInstall() {

12− # Install the "prefabs".

13− mkdir -p $out/share/ploticus/prefabs && \

14− cd .. && \

15− cp -rv prefabs/* $out/share/ploticus/prefabs

16−

17− # Create a wrapper that knows where to find them. Debian's package

18− # does something similar by patching directly the C file that looks

19− # for `$PLOTICUS_PREFABS'.

20− cat > $out/bin/ploticus <<EOF

21−#! $SHELL -e

22−PLOTICUS_PREFABS="$out/share/ploticus/prefabs"

23−export PLOTICUS_PREFABS

24−exec "$out/bin/pl" \$@

25−EOF

26− chmod +x $out/bin/ploticus

27−

28− # Install the man pages.

29− cp -rv man $out

30− ln -s "$out/man/man1/pl.1" "$out/man/man1/ploticus.1"

31−}

32−

33−genericBuild

pkgs/tools/graphics/ploticus/default.nix+54−14

@@ -1,34 +1,74 @@

1−{lib, stdenv, fetchurl, zlib, libX11, libpng}:

1+{ lib

2+, stdenv

3+, fetchurl

4+, zlib

5+, libX11

6+, libpng

7+, gd

8+, freetype

9+}:

210

3−stdenv.mkDerivation {

4− name = "ploticus-2.42";

11+stdenv.mkDerivation rec {

12+ pname = "ploticus";

13+ version = "2.42";

514

6− builder = ./builder.sh;

715 src = fetchurl {

8− url = "mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz";

9− sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c";

16+ url = "mirror://sourceforge/ploticus/ploticus/${version}/ploticus${lib.replaceStrings [ "." ] [ "" ] version}_src.tar.gz";

17+ sha256 = "PynkufQFIDqT7+yQDlgW2eG0OBghiB4kHAjKt91m4LA=";

1018 };

1119

12− buildInputs = [ zlib libX11 libpng ];

20+ patches = [

21+ # Replace hardcoded FHS path with $out.

22+ ./ploticus-install.patch

23+

24+ # Set the location of the PREFABS directory.

25+ ./set-prefabs-dir.patch

26+

27+ # Use gd from Nixpkgs instead of the vendored one.

28+ # This is required for non-ASCII fonts to work:

29+ # http://ploticus.sourceforge.net/doc/fonts.html

30+ ./use-gd-package.patch

31+ ];

32+

33+ buildInputs = [

34+ zlib

35+ libX11

36+ libpng

37+ gd

38+ freetype

39+ ];

1340

1441 hardeningDisable = [ "format" ];

1542

16− patches = [ ./ploticus-install.patch ];

43+ preBuild = ''

44+ cd src

45+ '';

46+

47+ preInstall = ''

48+ mkdir -p "$out/bin"

49+ '';

50+

51+ postInstall = ''

52+ cd ..

53+

54+ # Install the “prefabs”.

55+ mkdir -p "$out/share/ploticus/prefabs"

56+ cp -rv prefabs/* "$out/share/ploticus/prefabs"

1757

18− # Make the symlink relative instead of absolute.

19− # Otherwise it breaks when auto-moved to $out/share.

20− preFixup = ''

21− ln -sf pl.1 "$out"/man/man1/ploticus.1

58+ # Add aliases for backwards compatibility.

59+ ln -s "pl" "$out/bin/ploticus"

2260 '';

2361

2462 meta = with lib; {

2563 description = "A non-interactive software package for producing plots and charts";

26− longDescription = ''Ploticus is a free, GPL'd, non-interactive

64+ longDescription = ''

65+ Ploticus is a free, GPL'd, non-interactive

2766 software package for producing plots, charts, and graphics from

2867 data. Ploticus is good for automated or just-in-time graph

2968 generation, handles date and time data nicely, and has basic

3069 statistical capabilities. It allows significant user control

31− over colors, styles, options and details.'';

70+ over colors, styles, options and details.

71+ '';

3272 license = licenses.gpl2Plus;

3373 maintainers = with maintainers; [ pSub ];

3474 homepage = "http://ploticus.sourceforge.net/";

pkgs/tools/graphics/ploticus/set-prefabs-dir.patchnew file+11

@@ -0,0 +1,11 @@

1+--- a/src/pl.h

2++++ b/src/pl.h

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

4+ #include <stdlib.h>

5+ #include "plg.h"

7+-#define PREFABS_DIR "" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */

8++#define PREFABS_DIR "@out@/share/ploticus/prefabs" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */

10+ #define PLVERSION "2.42-May2013" /* see also the Copyright page, and page headers and footers */

11+

pkgs/tools/graphics/ploticus/use-gd-package.patchnew file+34

@@ -0,0 +1,34 @@

1+--- a/src/Makefile

2++++ b/src/Makefile

3+@@ -91,10 +91,10 @@

6+ ########### Option 1: use bundled GD16 (PNG only). Requires libpng and zlib.

7+-exetarget: plpng

8+-GD16LIBS = -lpng -lz

9+-GD16H = -I/usr/local/include

10+-ZFLAG = -DWZ

11++# exetarget: plpng

12++# GD16LIBS = -lpng -lz

13++# GD16H = -I/usr/local/include

14++# ZFLAG = -DWZ

15+ ### These should remain commented unless your libs are not in usual places, then alter to suit...

16+ ### GD16LIBS = /home/scg/lib/libpng.a /home/scg/lib/libz.a

17+ ### GD16H = -I/home/scg/lib

18+@@ -111,11 +111,11 @@

19+

20+ ########### Option 4: use your own GD resource with FreeType2 (ttf) fonts enabled.

21+ ########### Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype

22+-# exetarget: plgd18

23+-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype

24+-# GD18H =

25+-# GDFREETYPE = -DGDFREETYPE

26+-# ZFLAG = -DWZ

27++exetarget: plgd18

28++GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype

29++GD18H =

30++GDFREETYPE = -DGDFREETYPE

31++ZFLAG = -DWZ

32+

33+ ########### Option 5: don't use GD at all.

34+ # exetarget: plnogd

pkgs/tools/misc/chezmoi/default.nix+3−3

@@ -2,16 +2,16 @@

33buildGoModule rec {

44 pname = "chezmoi";

5− version = "2.0.15";

5+ version = "2.0.16";

77 src = fetchFromGitHub {

88 owner = "twpayne";

99 repo = "chezmoi";

1010 rev = "v${version}";

11− sha256 = "sha256-PUcsDyszFT4DzTwvbcCO8FQErvmotmY7gREZ2sgpcw8=";

11+ sha256 = "sha256-0m5ya3S/aqQr0n6MdfWfTo0Q7xTS5qY+iDhexwDGdWo=";

1212 };

1313

14− vendorSha256 = "sha256-7SfqBxCfOYwePK/6SsWS5StuVr0png6WjQXIDuQW0EE=";

14+ vendorSha256 = "sha256-k2dw8WfOxK+VpnJonm/GXm49rUdIXSA81RO0g+8ocBs=";

1515

1616 doCheck = false;

1717

pkgs/tools/misc/flashrom/default.nix+1−1

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {

4040 homepage = "http://www.flashrom.org";

4141 description = "Utility for reading, writing, erasing and verifying flash ROM chips";

4242 license = licenses.gpl2;

43− maintainers = with maintainers; [ funfunctor fpletz ];

43+ maintainers = with maintainers; [ funfunctor fpletz felixsinger ];

4444 platforms = platforms.all;

4545 broken = stdenv.isDarwin; # requires DirectHW

4646 };

pkgs/tools/misc/yajsv/default.nixnew file+28

@@ -0,0 +1,28 @@

1+{ buildGoModule, fetchFromGitHub, lib }:

3+let version = "1.4.0";

4+in buildGoModule {

5+ pname = "yajsv";

6+ version = version;

8+ src = fetchFromGitHub {

9+ owner = "neilpa";

10+ repo = "yajsv";

11+ rev = "v${version}";

12+ sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7";

13+ };

14+

15+ vendorSha256 = "0rmc31i5jra2qcqhw1azflmhawxasrq0d6qwd6qp250sj1jr6ahq";

16+

17+ doInstallCheck = true;

18+ installCheckPhase = ''

19+ $out/bin/yajsv -v > /dev/null

20+ '';

21+

22+ meta = {

23+ description = "Yet Another JSON Schema Validator";

24+ homepage = "https://github.com/neilpa/yajsv";

25+ license = lib.licenses.mit;

26+ maintainers = with lib.maintainers; [ rycee ];

27+ };

28+}

pkgs/tools/package-management/fpm/Gemfile.lock+14−18

@@ -1,40 +1,36 @@

11GEM

22 remote: https://rubygems.org/

33 specs:

4− arr-pm (0.0.10)

4+ arr-pm (0.0.11)

55 cabin (> 0)

6− backports (3.14.0)

6+ backports (3.21.0)

77 cabin (0.9.0)

8− childprocess (0.9.0)

9− ffi (~> 1.0, >= 1.0.11)

108 clamp (1.0.1)

11− dotenv (2.7.2)

12− ffi (1.10.0)

13− fpm (1.11.0)

14− arr-pm (~> 0.0.10)

9+ dotenv (2.7.6)

10+ fpm (1.13.0)

11+ arr-pm (~> 0.0.11)

1512 backports (>= 2.6.2)

1613 cabin (>= 0.6.0)

17− childprocess (= 0.9.0)

1814 clamp (~> 1.0.0)

19− ffi

20− json (>= 1.7.7, < 2.0)

15+ git (>= 1.3.0, < 2.0)

16+ json (>= 1.7.7, < 3.0)

2117 pleaserun (~> 0.0.29)

22− ruby-xz (~> 0.2.3)

18+ rexml

2319 stud

20+ git (1.8.1)

21+ rchardet (~> 1.8)

2422 insist (1.0.0)

25− io-like (0.3.0)

26− json (1.8.6)

23+ json (2.5.1)

2724 mustache (0.99.8)

28− pleaserun (0.0.30)

25+ pleaserun (0.0.32)

2926 cabin (> 0)

3027 clamp

3128 dotenv

3229 insist

3330 mustache (= 0.99.8)

3431 stud

35− ruby-xz (0.2.3)

36− ffi (~> 1.9)

37− io-like (~> 0.3)

32+ rchardet (1.8.0)

33+ rexml (3.2.5)

3834 stud (0.0.23)

3935

4036PLATFORMS

pkgs/tools/package-management/fpm/gemset.nix+30−41

@@ -5,20 +5,20 @@

55 platforms = [];

66 source = {

77 remotes = ["https://rubygems.org"];

8− sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg";

8+ sha256 = "17qssricshzs2ml1jvn4bs2h85gxvrqm074pl5nl8vr74620iazi";

99 type = "gem";

1010 };

11− version = "0.0.10";

11+ version = "0.0.11";

1212 };

1313 backports = {

1414 groups = ["default"];

1515 platforms = [];

1616 source = {

1717 remotes = ["https://rubygems.org"];

18− sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn";

18+ sha256 = "0xqvwj3mm28g1z4npya51zjcvxaniyyzn3fwgcdwmm8xrdbl8fgr";

1919 type = "gem";

2020 };

21− version = "3.14.0";

21+ version = "3.21.0";

2222 };

2323 cabin = {

2424 groups = ["default"];

@@ -30,17 +30,6 @@

3030 };

3131 version = "0.9.0";

3232 };

33− childprocess = {

34− dependencies = ["ffi"];

35− groups = ["default"];

36− platforms = [];

37− source = {

38− remotes = ["https://rubygems.org"];

39− sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p";

40− type = "gem";

41− };

42− version = "0.9.0";

43− };

4433 clamp = {

4534 groups = ["default"];

4635 platforms = [];

@@ -56,31 +45,32 @@

5645 platforms = [];

5746 source = {

5847 remotes = ["https://rubygems.org"];

59− sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag";

48+ sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94";

6049 type = "gem";

6150 };

62− version = "2.7.2";

51+ version = "2.7.6";

6352 };

64− ffi = {

53+ fpm = {

54+ dependencies = ["arr-pm" "backports" "cabin" "clamp" "git" "json" "pleaserun" "rexml" "stud"];

6555 groups = ["default"];

6656 platforms = [];

6757 source = {

6858 remotes = ["https://rubygems.org"];

69− sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";

59+ sha256 = "03ss7yh628f0m6by23q3sniq660gm07mkz6wqjpvr118gc0h53sa";

7060 type = "gem";

7161 };

72− version = "1.10.0";

62+ version = "1.13.0";

7363 };

74− fpm = {

75− dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"];

64+ git = {

65+ dependencies = ["rchardet"];

7666 groups = ["default"];

7767 platforms = [];

7868 source = {

7969 remotes = ["https://rubygems.org"];

80− sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm";

70+ sha256 = "0vdcv93s33d9914a9nxrn2y2qv15xk7jx94007cmalp159l08cnl";

8171 type = "gem";

8272 };

83− version = "1.11.0";

73+ version = "1.8.1";

8474 };

8575 insist = {

8676 groups = ["default"];

@@ -92,57 +82,56 @@

9282 };

9383 version = "1.0.0";

9484 };

95− io-like = {

85+ json = {

9686 groups = ["default"];

9787 platforms = [];

9888 source = {

9989 remotes = ["https://rubygems.org"];

100− sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k";

90+ sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";

10191 type = "gem";

10292 };

103− version = "0.3.0";

93+ version = "2.5.1";

10494 };

105− json = {

95+ mustache = {

10696 groups = ["default"];

10797 platforms = [];

10898 source = {

10999 remotes = ["https://rubygems.org"];

110− sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5";

100+ sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";

111101 type = "gem";

112102 };

113− version = "1.8.6";

103+ version = "0.99.8";

114104 };

115− mustache = {

105+ pleaserun = {

106+ dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"];

116107 groups = ["default"];

117108 platforms = [];

118109 source = {

119110 remotes = ["https://rubygems.org"];

120− sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";

111+ sha256 = "1aykf0l8327bqkkf5xd9jcglsib973zpy37cfnlf4j0vp0cdpn2d";

121112 type = "gem";

122113 };

123− version = "0.99.8";

114+ version = "0.0.32";

124115 };

125− pleaserun = {

126− dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"];

116+ rchardet = {

127117 groups = ["default"];

128118 platforms = [];

129119 source = {

130120 remotes = ["https://rubygems.org"];

131− sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p";

121+ sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9";

132122 type = "gem";

133123 };

134− version = "0.0.30";

124+ version = "1.8.0";

135125 };

136− ruby-xz = {

137− dependencies = ["ffi" "io-like"];

126+ rexml = {

138127 groups = ["default"];

139128 platforms = [];

140129 source = {

141130 remotes = ["https://rubygems.org"];

142− sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw";

131+ sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";

143132 type = "gem";

144133 };

145− version = "0.2.3";

134+ version = "3.2.5";

146135 };

147136 stud = {

148137 groups = ["default"];

pkgs/tools/security/keybase/default.nix+2−2

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

77buildGoPackage rec {

88 pname = "keybase";

9− version = "5.6.1";

9+ version = "5.7.1";

1010

1111 goPackagePath = "github.com/keybase/client";

1212 subPackages = [ "go/kbnm" "go/keybase" ];

@@ -17,7 +17,7 @@ buildGoPackage rec {

1717 owner = "keybase";

1818 repo = "client";

1919 rev = "v${version}";

20− sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g";

20+ sha256 = "sha256-72rVk8pYIQFESQqBu4bmFBPpAOB0oG2Iu36TbAdecBw=";

2121 };

2222

2323 patches = [

pkgs/tools/security/vault/default.nix+9−2

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

1−{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }:

1+{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests

2+, makeWrapper

3+, gawk

4+, glibc

5+}:

37buildGoPackage rec {

48 pname = "vault";

@@ -15,13 +19,16 @@ buildGoPackage rec {

1519

1620 subPackages = [ "." ];

1721

18− nativeBuildInputs = [ installShellFiles ];

22+ nativeBuildInputs = [ installShellFiles makeWrapper ];

1923

2024 buildFlagsArray = [ "-tags=vault" "-ldflags=-s -w -X ${goPackagePath}/sdk/version.GitCommit=${src.rev}" ];

2125

2226 postInstall = ''

2327 echo "complete -C $out/bin/vault vault" > vault.bash

2428 installShellCompletion vault.bash

29+

30+ wrapProgram $out/bin/vault \

31+ --prefix PATH ${lib.makeBinPath [ gawk glibc ]}

2532 '';

2633

2734 passthru.tests.vault = nixosTests.vault;

pkgs/tools/security/vault/vault-bin.nix+5−2

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

1−{ lib, stdenv, fetchurl, unzip }:

1+{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }:

33let

44 version = "1.7.3";

@@ -30,7 +30,7 @@ in stdenv.mkDerivation {

3030

3131 src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");

3232

33− nativeBuildInputs = [ unzip ];

33+ nativeBuildInputs = [ makeWrapper unzip ];

3434

3535 sourceRoot = ".";

3636

@@ -41,6 +41,9 @@ in stdenv.mkDerivation {

4141 mv vault $out/bin

4242 echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault

4343

44+ wrapProgram $out/bin/vault \

45+ --prefix PATH ${lib.makeBinPath [ gawk glibc ]}

46+

4447 runHook postInstall

4548 '';

4649

pkgs/tools/system/netdata/default.nix+5

@@ -42,6 +42,11 @@ in stdenv.mkDerivation rec {

4242 # required to prevent plugins from relying on /etc

4343 # and /var

4444 ./no-files-in-etc-and-var.patch

45+ # The current IPC location is unsafe as it writes

46+ # a fixed path in /tmp, which is world-writable.

47+ # Therefore we put it into `/run/netdata`, which is owned

48+ # by netdata only.

49+ ./ipc-socket-in-run.patch

4550 ];

4651

4752 NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";

pkgs/tools/system/netdata/ipc-socket-in-run.patchnew file+13

@@ -0,0 +1,13 @@

1+diff --git a/daemon/commands.h b/daemon/commands.h

2+index bd4aabfe1cbe4..ce7eb3c730228 100644

3+--- a/daemon/commands.h

4++++ b/daemon/commands.h

5+@@ -6,7 +6,7 @@

6+ #ifdef _WIN32

7+ # define PIPENAME "\\\\?\\pipe\\netdata-cli"

8+ #else

9+-# define PIPENAME "/tmp/netdata-ipc"

10++# define PIPENAME "/run/netdata/ipc"

11+ #endif

12+

13+ #define MAX_COMMAND_LENGTH 4096

pkgs/top-level/all-packages.nix+7−1

@@ -10168,6 +10168,8 @@ in

1016810168

1016910169 yafaray-core = callPackage ../tools/graphics/yafaray-core { };

1017010170

10171+ yajsv = callPackage ../tools/misc/yajsv { };

10172+

1017110173 yapf = with python3Packages; toPythonApplication yapf;

1017210174

1017310175 yarn = callPackage ../development/tools/yarn { };

@@ -14856,6 +14858,8 @@ in

1485614858

1485714859 directfb = callPackage ../development/libraries/directfb { };

1485814860

14861+ discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { };

14862+

1485914863 discord-rpc = callPackage ../development/libraries/discord-rpc {

1486014864 inherit (darwin.apple_sdk.frameworks) AppKit;

1486114865 };

@@ -17836,6 +17840,8 @@ in

1783617840

1783717841 pstreams = callPackage ../development/libraries/pstreams {};

1783817842

17843+ pufferpanel = callPackage ../servers/pufferpanel { };

17844+

1783917845 pugixml = callPackage ../development/libraries/pugixml { };

1784017846

1784117847 pylode = callPackage ../misc/pylode {};

@@ -18073,7 +18079,7 @@ in

1807318079

1807418080 rocksdb_lite = rocksdb.override { enableLite = true; };

1807518081

18076− rotate-backups = with python3Packages; toPythonApplication rotate-backups;

18082+ rotate-backups = callPackage ../tools/backup/rotate-backups { };

1807718083

1807818084 rote = callPackage ../development/libraries/rote { };

1807918085

pkgs/top-level/php-packages.nix−14

@@ -257,20 +257,6 @@ lib.makeScope pkgs.newScope (self: with self; {

257257 {

258258 name = "dom";

259259 buildInputs = [ libxml2 ];

260− patches = [

261− # https://github.com/php/php-src/pull/7030

262− (fetchpatch {

263− url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch";

264− sha256 = "11qsdiwj1zmpfc2pgh6nr0sn7qa1nyjg4jwf69cgwnd57qfjcy4k";

265− excludes = [ "ext/dom/tests/bug43364.phpt" "ext/dom/tests/bug80268.phpt" ];

266− })

267− ];

268− # For some reason `patch` fails to remove these files correctly.

269− # Since `postPatch` is already used in `mkExtension`, we have to make it here.

270− preCheck = ''

271− rm tests/bug43364.phpt

272− rm tests/bug80268.phpt

273− '';

274260 configureFlags = [ "--enable-dom" ]

275261 # Required to build on darwin.

276262 ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];

pkgs/top-level/python-aliases.nix+1

@@ -50,6 +50,7 @@ mapAliases ({

5050 pytest-pep8 = pytestpep8; # added 2021-01-04

5151 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10

5252 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09

53+ rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01

5354 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10

5455 setuptools_scm = setuptools-scm; # added 2021-06-03

5556 smart_open = smart-open; # added 2021-03-14

pkgs/top-level/python-packages.nix+2−2

@@ -5349,6 +5349,8 @@ in {

53495349

53505350 pynx584 = callPackage ../development/python-modules/pynx584 { };

53515351

5352+ pypoint = callPackage ../development/python-modules/pypoint { };

5353+

53525354 pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { };

53535355

53545356 pyrogram = callPackage ../development/python-modules/pyrogram { };

@@ -7622,8 +7624,6 @@ in {

76227624

76237625 ropper = callPackage ../development/python-modules/ropper { };

76247626

7625− rotate-backups = callPackage ../tools/backup/rotate-backups { };

7626−

76277627 routes = callPackage ../development/python-modules/routes { };

76287628

76297629 rpdb = callPackage ../development/python-modules/rpdb { };