diff --git a/doc/builders/packages/steam.section.md b/doc/builders/packages/steam.section.md index d7bb6e69d7d9..0cfc1a2c2458 100644 --- a/doc/builders/packages/steam.section.md +++ b/doc/builders/packages/steam.section.md @@ -56,16 +56,7 @@ Use `programs.steam.enable = true;` if you want to add steam to systemPackages a ## steam-run {#sec-steam-run} -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 - -```nix -pkgs.steam.override ({ - nativeOnly = true; - newStdcpp = true; -}).run -``` - -to your configuration, rebuild, and run the game with +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 ``` steam-run ./foo diff --git a/nixos/modules/security/systemd-confinement.nix b/nixos/modules/security/systemd-confinement.nix index afb81a2b56be..0a09a755e93c 100644 --- a/nixos/modules/security/systemd-confinement.nix +++ b/nixos/modules/security/systemd-confinement.nix @@ -105,7 +105,7 @@ in { wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs"); in lib.mkIf config.confinement.enable { serviceConfig = { - RootDirectory = pkgs.runCommand rootName {} "mkdir \"$out\""; + RootDirectory = "/var/empty"; TemporaryFileSystem = "/"; PrivateMounts = lib.mkDefault true; diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 6d8dfcce933c..2748571be1f7 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -231,9 +231,9 @@ in { } fi '' + optionalString cfg.autoMount '' - ipfs --local config Mounts.FuseAllowOther --json true - ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} - ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir} + ipfs --offline config Mounts.FuseAllowOther --json true + ipfs --offline config Mounts.IPFS ${cfg.ipfsMountDir} + ipfs --offline config Mounts.IPNS ${cfg.ipnsMountDir} '' + concatStringsSep "\n" (collect isString (mapAttrsRecursive @@ -243,7 +243,7 @@ in { read value < None: def profile_path(profile: Optional[str], generation: int, name: str) -> str: - return os.readlink("%s/%s" % (system_dir(profile, generation), name)) + return os.path.realpath("%s/%s" % (system_dir(profile, generation), name)) def copy_from_profile(profile: Optional[str], generation: int, name: str, dry_run: bool = False) -> str: diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index 59bccbe25959..c3b28b62695a 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -19,6 +19,8 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("vault.service") machine.wait_for_open_port(8200) machine.succeed("vault operator init") - machine.succeed("vault status | grep Sealed | grep true") + # vault now returns exit code 2 for sealed vaults + machine.fail("vault status") + machine.succeed("vault status || test $? -eq 2") ''; }) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9dc9c40df0c1..863510ded66c 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.70", - "sha256": "06yhpxr5bg0gx7hmrhc6zg4gr1d9s34y2rb98rpl4dilmc548i6q", - "sha256bin64": "1fkakh1r87pg5nr101m6v86y8iyyfba8vnzrg0229kcar7v8wzf7", + "version": "92.0.4515.80", + "sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i", + "sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp", "deps": { "gn": { "version": "2021-05-07", diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 272228878735..a49879e53528 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.8"; + version = "3.1.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-TOPJvOQKEMEsQ/wAJNF+08g4z75GGkNom6gRCrNOO2I="; + sha256 = "sha256-WErNPofVnV6L7DkYU/dh4mWm+u7UJNFUmRN6IZzMb2g="; }; - vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; + vendorSha256 = "sha256-99N//woGPx9QEtkFsktaiAbu7TS+3DHArBA52OUJFU4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 4d7e170c2018..ec3f21c69d15 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.7.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-AM+TLeSrXjn10DiQzXSqSwTqsc7CjTdnf6TWetden7g="; + hash = "sha256-UZu3jChEK59UrtUR2ze68Kkc6MkHRtTsfTOS/B96sLM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index cb2ca48b9077..b2788f8b0701 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.11"; + version = "0.24.12"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-UWY4r7pasFsmlRRKFANyxPIoNNuMPNg1gMXrAXEcqdw="; + sha256 = "sha256-GuN+OAzuNus1B32ZSsnrJPrE7MQ0ZqNKDmoNe7Sa7Zs="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-EEN3nKQBtAGG7MAa9h11KFPZ9g7xtNxhFB1i/2QS66g="; + vendorSha256 = "sha256-JBWQxRaMvIbUiOD7sJiZH1SHNCdysgh5FeSmYf+FdG4="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 30f90006239d..a9de901cd870 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.7.0"; # Please backport all updates to the stable channel. + version = "5.7.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "170x2zsp3z95b123ybs8zqr8sasd5jgd4gl1q32wvhk7m41fvkmd"; + sha256 = "1hjykjqf3n20aab9g3bwk5w8x8v61320xv6z4iqrwwdzfkb3ly20"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/timedoctor/default.nix b/pkgs/applications/office/timedoctor/default.nix index f4ce436e963b..e6d3186578a4 100644 --- a/pkgs/applications/office/timedoctor/default.nix +++ b/pkgs/applications/office/timedoctor/default.nix @@ -15,7 +15,7 @@ appimageTools.wrapType2 { url = "https://repo2.timedoctor.com/td-desktop-hybrid/prod/v${version}/timedoctor-desktop_${version}_linux-x86_64.AppImage"; }; multiPkgs = _: with _; [ - alsaLib + alsa-lib atk at-spi2-atk at-spi2-core diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c645693e19a1..92606f3f909c 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.41"; + version = "14.31.42"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-dI1WkQgFikxaIjjqVKZcsGvc3QIu/NMIcRW3N8PGbkY="; + sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw="; }; patchPhase = '' diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 569c455e6532..8427249c4ce9 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ mudri ]; }; } diff --git a/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch b/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch deleted file mode 100644 index f17897d4c89f..000000000000 --- a/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py -index 6bad826a88..f4d7b8651c 100644 ---- a/src/sage/misc/sagedoc.py -+++ b/src/sage/misc/sagedoc.py -@@ -24,7 +24,7 @@ see :trac:`12849`:: - ....: for line in fobj: - ....: if "#sage.symbolic.expression.Expression.numerical_approx" in line: - ....: print(line) -- numerical_approx(prec=None, digits=None, algorithm=None)... -+ numerical_approx(prec=None, digits=None, algorithm=None)... - - Check that sphinx is not imported at Sage start-up:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 57234c660a5a..1ed174ebd460 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -16,7 +16,12 @@ let fetchSageDiff = { base, name, rev, sha256, ...}@args: ( fetchpatch ({ inherit name sha256; - url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"; + + # We used to use + # "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}" + # but the former way does not squash multiple patches together. + url = "https://github.com/sagemath/sage/compare/${base}...${rev}.diff"; + # We don't care about sage's own build system (which builds all its dependencies). # Exclude build system changes to avoid conflicts. excludes = [ "build/*" ]; @@ -79,13 +84,6 @@ stdenv.mkDerivation rec { # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests ./patches/ignore-cmp-deprecation.patch - # sphinx 3.5 pretty-prints code slightly differently than sphinx - # 3.1--3.3. a similar patch is available at the sphinx 4 ticket - # (https://trac.sagemath.org/ticket/31696), but sphinx 3.5 uses - # tags while sphinx 4 uses tags so we cannot just - # import the patch from trac. - ./patches/sphinx-3.5-code-output.patch - # remove use of matplotlib function deprecated in 3.4 # https://trac.sagemath.org/ticket/31827 (fetchSageDiff { @@ -95,16 +93,38 @@ stdenv.mkDerivation rec { sha256 = "sha256-SXcUGBMOoE9HpuBzgKC3P6cUmM5MiktXbe/7dVdrfWo="; }) - # https://trac.sagemath.org/ticket/30801. this patch has - # positive_review but has not been merged upstream yet, so we - # don't use fetchSageDiff because it returns a file that contains - # each commit as a separate patch instead of a single diff, and - # some commits from the pari update branch are already in 9.3.rc5 - # (auto-resolvable merge conflicts). - (fetchpatch { + # pari 2.13 update + # https://trac.sagemath.org/ticket/30801 + # + # the last commit in that ticket is + # c78b1470fccd915e2fa93f95f2fefba6220fb1f7, but commits after + # 10a4531721d2700fd717e2b3a1364508ffd971c3 only deal with 32-bit + # and post-26635 breakage, none of which is relevant to us. since + # there are post-9.4.beta0 rebases after that, we just skip later + # commits. + (fetchSageDiff { + base = "9.3"; name = "pari-2.13.1.patch"; - url = "https://github.com/sagemath/sagetrac-mirror/compare/d6c5cd9be78cc448ee4c54bac93385b1244a234c...10a4531721d2700fd717e2b3a1364508ffd971c3.diff"; - sha256 = "sha256-zMjRMEReoiTvmt+vvV0Ij1jtyLSLwSXBEVXqgvmq1D4="; + rev = "10a4531721d2700fd717e2b3a1364508ffd971c3"; + sha256 = "sha256-gffWKK9CMREaNOb5zb63iZUgON4FvsPrMQNqe+5ZU9E="; + }) + + # sympy 1.8 update + # https://trac.sagemath.org/ticket/31647 + (fetchSageDiff { + base = "9.4.beta0"; + name = "sympy-1.8.patch"; + rev = "fa864b36e15696450c36d54215b1e68183b29d25"; + sha256 = "sha256-fj/9QEZlVF0fw9NpWflkTuBSKpGjCE6b96ECBgdn77o="; + }) + + # sphinx 4 update + # https://trac.sagemath.org/ticket/31696 + (fetchSageDiff { + base = "9.4.beta3"; + name = "sphinx-4.patch"; + rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8"; + sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM="; }) ]; diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 82b4fbd8a60b..16f87df678ca 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-b0pbcRcdfkHrqlALHcUzmVujkeKNFHdWd3ENPXZ5WYk="; + sha256 = "sha256-P9fbkJSXRYZdVD1EKWWs0FKs8aQdPqHWESUqjsGgyPU="; }; vendorSha256 = "sha256-ndsjmY/UCFyegm8yP7BopYMh5eZ8/fftWfxW4r5los0="; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index cc3d518ff884..b1c8f436884c 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -3,13 +3,9 @@ libsigcxx, libxmlxx, xdg-utils, isocodes, wrapGAppsHook }: -let - version = "0.54.0"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "subtitleeditor"; - inherit version; + version = "0.54.0"; src = fetchFromGitHub { owner = "kitone"; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index ed5976151301..6098aeba0514 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -24,11 +24,11 @@ with lib; stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.12"; + version = "3.0.16"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g"; + sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index f6d7ce3d6196..cbd7d8e5512d 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.23"; + version = "0.24"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "sha256-JQNidKqJROFVm+O1exTDon1fwU91zONqgKJIpe9gspY="; + sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 3622e1c3b3c7..9d0daf7182d5 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.000"; in fetchzip rec { name = "gentium-${version}"; @@ -10,12 +10,20 @@ in fetchzip rec { postFetch = '' mkdir -p $out/share/{doc,fonts} unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name} - unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation + unzip -j $downloadedFile \*.ttf \ + -d $out/share/fonts/truetype + unzip -j $downloadedFile \ + \*/FONTLOG.txt \ + \*/README.txt \ + -d $out/share/doc/${name} + unzip -j $downloadedFile \ + \*/documentation/\*.html \ + \*/documentation/\*.txt \ + -x \*/documentation/source/\* \ + -d $out/share/doc/${name}/documentation ''; - sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; + sha256 = "zhSpAYK3Lfzsx6Z1IA6aRFNNXdDGq/jWxsQ20c2HcxI="; meta = with lib; { homepage = "https://software.sil.org/gentium/"; diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 7640e6bc6463..1e72f7b48b4a 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.20"; - sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha"; + version = "7.4.21"; + sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n"; }); in diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 294f100dedd3..82d78d95314e 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.7"; - sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj"; + version = "8.0.8"; + sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l"; }); in diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index f181db108a45..dbe01acb6dfd 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -195,8 +195,6 @@ let # PCRE ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] ++ [ "PCRE_LIBDIR=${pcre2}" ] diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 37375f52c32e..7aefaa9d4936 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.2.2"; + version = "21.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48"; + sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 7387e9edc5b5..10d688d89b6c 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libconfig"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz"; - sha256 = "1ngs2qx3cx5cbwinc5mvadly0b5n7s86zsc68c404czzfff7lg3w"; + sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; }; doCheck = true; diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 18683d5f1709..f496ce91c826 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -5,27 +5,17 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4"; name = "ocaml${ocaml.version}-camlpdf-${version}"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4"; + sha256 = "09kzrgmlxb567315p3fy59ba0kv7xhp548n9i3l4wf9n06p0ww9m"; }; buildInputs = [ which ocaml findlib ]; - # Version number in META file is wrong - patchPhase = '' - patch -p 0 META < version="${version}" - EOF - ''; - preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index cc2aad52d3d6..2a0fae4a1dbb 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -1,6 +1,10 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: -let version = "2.3.1"; in +if !lib.versionAtLeast ocaml.version "4.10" +then throw "cpdf is not available for OCaml ${ocaml.version}" +else + +let version = "2.4"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpdf-${version}"; @@ -9,19 +13,14 @@ stdenv.mkDerivation { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z"; + sha256 = "1a8lmfc76dr8x6pxgm4aypbys02pfma9yh4z3l1qxp2q1909na5l"; }; - prePatch = '' - substituteInPlace META --replace 'version="1.7"' 'version="${version}"' - ''; - buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; - createFindlibDestdir = true; - - postInstall = '' + preInstall = '' + mkdir -p $OCAMLFIND_DESTDIR mkdir -p $out/bin cp cpdf $out/bin mkdir -p $out/share/ diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix index cb9cd327e8ce..36ea00234830 100644 --- a/pkgs/development/python-modules/aiopg/default.nix +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiopg"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4"; + sha256 = "sha256-/J53WqBag4ArSF7wETvmoBUtgNqp4eYGH0ytipiSKBI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index b3a2de5ed404..a714bbfaba95 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.1.5"; + version = "0.1.7"; disabled = !isPy3k; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw"; + sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix new file mode 100644 index 000000000000..be487199b38b --- /dev/null +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, authlib +, httpx +}: + +buildPythonPackage rec { + pname = "pypoint"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "fredrike"; + repo = "pypoint"; + rev = "v${version}"; + sha256 = "13p68d2qxfj31lfjv94wzpigjfgjw03yjpl2h16zgxbka2k8zf3x"; + }; + + propagatedBuildInputs = [ + authlib + httpx + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "pypoint" ]; + + meta = with lib; { + description = "API for Minut Point"; + homepage = "https://github.com/fredrike/pypoint"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 7d1dcdeb1c7b..3a3e9bced050 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,34 +1,19 @@ -{ buildPythonPackage, lib, fetchPypi, fetchpatch, numpy +{ buildPythonPackage, lib, fetchPypi, numpy , pydantic, pint, networkx, pytestrunner, pytestcov, pytest } : buildPythonPackage rec { pname = "qcelemental"; - version = "0.20.0"; + version = "0.21.0"; checkInputs = [ pytestrunner pytestcov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { inherit pname version; - sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni"; + sha256 = "1b3c78fxbpnddrm1fnbvv4x2840jcfjg2l5cb5w4p38vzksiv238"; }; - # FIXME: Fixed upstream but not released yet. Nevertheless critical for correct behaviour. - # See https://github.com/MolSSI/QCElemental/pull/265 - patches = [ - (fetchpatch { - name = "SearchPath1.patch"; - url = "https://github.com/MolSSI/QCElemental/commit/2211a4e59690bcb14265a60f199a5efe74fe44db.diff"; - sha256 = "1ibjvmdrc103jdj79xrr11y5yji5hc966rm4ihfhfzgbvfkbjg2l"; - }) - (fetchpatch { - name = "SearchPath2.patch"; - url = "https://github.com/MolSSI/QCElemental/commit/5a32ce33e8142047b0a00d0036621fe2750e872a.diff"; - sha256 = "0gmg70vdps7k6alqclwdlxkli9d8s1fphbdvyl8wy8xrh46jw6rk"; - }) - ]; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 1ae05cab9738..cb63f8d11ba4 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; rev = version; - sha256 = "0480bqprv8581cvnc80ls91rz9780wvdnfw99zsw44hvy2yg15a6"; + sha256 = "sha256-y87Cnci4gJHrttThGPeOS/h6VK8x95cQA9nZs1fBfAw="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { "samples" "tests/test_djangoclient.py" "tests/test_flaskclient.py" + "tests/test_popups.py" "tests/test_webdriver.py" "tests/test_webdriver_chrome.py" "tests/test_webdriver_firefox.py" diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 6c9cffe41b20..245aeeb4351b 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, buildGoModule }: -let version = "1.2.4"; +let version = "1.3.0"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7"; + vendorSha256 = "sha256-I+UBa6gqkPRXNV72iyJcCBLYShZxMtHFHSK77mhDv+U="; doCheck = false; @@ -18,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; + sha256 = "sha256-j6drDMxvAVfQ1aCFooc9g9HhMRMlFZXGZPiuJZKBbY4="; }; meta = with lib; { diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index 3045842d91f0..56d5161b49e9 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fission"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; + sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI="; }; vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 1220ec90d90f..b0d2cb719533 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.71.1"; + version = "0.72.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; + sha256 = "sha256-QMbkxfGJOMNTILmGYhbUdtq4zfe0Cc/IBftFdM+rT9c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 2acc7e5bdf32..3945389e8cd1 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.5"; + version = "2.9.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0a9n8ilsi3kyx5xqvk5s7iikk6y3pkpm5mvsn5za5ivlzf1i40br"; + sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 6ab1463917c8..60704fdd780b 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -28,9 +28,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.19.5"; - sha256 = "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn"; - cargoSha256 = "0hnjik3pymb1s7frhfpfzvd6w2k3lgpsmh6milpriwxmqsmkwdzz"; + version = "0.20.0"; + sha256 = "0hrcisvw44fjxix09lfbrz7majaj6njbnr6c92a6a5748p2jvyng"; + cargoSha256 = "029db3yy6nj18vxfvj0ra568a9k4x7znfj08spvzl5sxfbx6442r"; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 5ebc9c9a0f3c..8b8315e4abdc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "aa429589525bb849189a0c5ddb52267ce578f988", - "date": "2021-06-07T18:47:38+02:00", - "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp", - "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s", + "rev": "3953034ee61e8639100b063092d4280e047ca9e9", + "date": "2021-06-21T12:18:46+02:00", + "path": "/nix/store/8f2bnr790zwibhyd3jqjm38zfc1md5is-tree-sitter-c-sharp", + "sha256": "0k6pb27f463y88bf6ym0zl4d36182y5cr3013j71h3vlg264z96c", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index b8ca41abcf29..1e00f279d68f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "237f4eb4417c28f643a29d795ed227246afb66f9", - "date": "2021-06-05T13:41:42+02:00", - "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell", - "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd", + "rev": "a0c1adb59e390f7d839a146c57fdb33d36ed97e6", + "date": "2021-06-18T23:36:08+02:00", + "path": "/nix/store/7rl3najf8rn8ndh31vcxjz5px3r1scky-tree-sitter-haskell", + "sha256": "0a97w0qnj0fwy0yyg7hb9i1fyiwbyiz5mwx77aaw6md4jcsf4di8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 65066c66d539..24fd79d5116c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5", - "date": "2021-06-09T14:12:41-07:00", - "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript", - "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx", + "rev": "6de6d604c243b68f90dce14130d536c694d90dcc", + "date": "2021-06-29T15:54:12-07:00", + "path": "/nix/store/mmz8s440zplg88c0mb0w3dlg94dzgxmf-tree-sitter-javascript", + "sha256": "1bz8xhs7q4lp49q1id6dvz93l7vf0gxgngsbjk3x1nvw8rg171j6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 49b57f4d8a39..6b64a962a523 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04", - "date": "2021-06-01T20:33:20+02:00", - "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php", - "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086", + "rev": "5e89808d490d893799ebcf229130afe4cf2b0324", + "date": "2021-06-22T09:23:44+02:00", + "path": "/nix/store/5c1pn1p183czqb43a0va7whd4sz81jf1-tree-sitter-php", + "sha256": "1mp5kv305a4rrgh7kklifqfg3680krfsd0h76sxn4i0wxyqfgczi", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index a96363af7139..c8142974fd43 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "391269d74d20154bbd0ac9be20b35eced6920290", - "date": "2021-05-04T14:02:32-07:00", - "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby", - "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv", + "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", + "date": "2021-03-03T16:54:30-08:00", + "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", + "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index b7c214cc720a..75329fc63a00 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "fb23ed9a99da012d86b7a5059b9d8928607cce29", - "date": "2021-04-01T10:11:15-07:00", - "path": "/nix/store/n1wvxkz4h38770lxvwakway34ac2a8h7-tree-sitter-scala", - "sha256": "05g95340g4labkdvfka5cbg7pr6vzigc40y54js1b5wml0w3d8f7", + "rev": "bfa2a81388019d47f6a0a6a6e9c96910dec830b4", + "date": "2021-06-23T15:37:27-07:00", + "path": "/nix/store/nc5cndwzc5pzq3x64wa51bff0rl36hc8-tree-sitter-scala", + "sha256": "0x0lq78gjfsqi225mfvrpkl2jc6fbb378jgj04syxkm941lxc4bk", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index b224fa54dafe..41c4fcfe734d 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -1,9 +1,9 @@ { "url": "https://github.com/Himujjal/tree-sitter-svelte", - "rev": "10c113001acf9852817150acb3031a5e68d2b4cf", - "date": "2021-05-02T10:05:14+05:30", - "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte", - "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281", + "rev": "c696a13a587b0595baf7998f1fb9e95c42750263", + "date": "2021-03-20T16:45:11+05:30", + "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", + "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 901435bb631f..8d8b1a004d5e 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,10 +1,10 @@ { stdenv, lib, fetchurl, writeText, php, makeWrapper }: let - version = "2.4.0"; + version = "2.5.0"; completion = fetchurl { url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; - sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; + sha256 = "sha256-RDygYQzK6NLWrOug7EqnkpuH7Wz1T2Zq/tGNZjoYo5U="; }; ini = writeText "php.ini" '' @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "0h5mjxrw4z3648v4wb4pvapz2a1mlmbszgggg4b7bvrrxn3cr78k"; + sha256 = "sha256-vghT6fRD84SFZgcIcdNE6K2B6x4V0V3PkyS0p14nJ4k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 3ba900f3f691..8fcf4696d0e1 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.3.0"; + version = "2021.4.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-RtEkWi0J3nYzT+IhdyBlGeUE2SCmhlnfw0L6sOvE4WI="; + sha256 = "sha256-lMQWoShlEACTrcGgQtfPGVQ4X8pCG/6SkXtz+rWAOyg="; }; nativeBuildInputs = diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 88d8598e133c..d114ed848000 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "0.8.0"; + version = "0.8.1"; pname = "extremetuxracer"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b"; + sha256 = "sha256-ktqWPtMqub/xJjRu37lUnocdfDzsdT9KxQmODVPDg0E="; }; buildInputs = [ diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 58e91a44842c..1560a45b0618 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-MRaY10HliP8TA8/9s5caNtB5hks5SJcBJItFXOUryCI="; + sha256 = "sha256-7KVtBGihABpcbUm5ac2fuBVaDvbucEJSREPulGUdnUE="; }; postPatch = '' diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 49a45d6d24d4..ea9aaae53edc 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-06-30"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "01507625b76291bb41a3c92ca8a056d655b674cb"; - sha256 = "16n1vdgrn9rv7pzwzgisdhin81d5fhlyicp0m0md4g6sd6jfydqh"; + rev = "d66a7ec580c5e006bf44c5ffc0c17e39897b0c22"; + sha256 = "0an89qwx70gj3dzlmx9j61vmsqfzsh9p4jhqysrg1n6hx56ak7yj"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -810,12 +810,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-06-21"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "aa817559be68d9e90316bc7e5d3205fe2ffcffbe"; - sha256 = "06c9ab58rj0qx2nyl63qpx5r8lwlx320j7913nafpk268pmqdz4i"; + rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17"; + sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1364,12 +1364,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-06-17"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "f4a26c075f603c3d82baf56b04c9168a7e084c8b"; - sha256 = "02rsawnqixwq8cj8ryqg0nmmmzq5s1adfll9mmwa6bqh3nwxsb2s"; + rev = "1e540f25a4bb84fcc50b5f10c969fbda02d21027"; + sha256 = "17qpqiv63jpap10wgfkb6zmj2xqcl7jwjglg74y9pajkpm1l050h"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2039,12 +2039,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "00b0f865efdcb329629315c63e9dac5aa6a6e736"; - sha256 = "1c3bzhrsdbkwj9hj832bb9snr7b78yf8mbx9gm4fc2lbbnrxqvvp"; + rev = "0e9d4b4585f8a37d6cccbe9dd5993900b96a595b"; + sha256 = "0gpah47azk1miybwm2aa6m3vm08683z85rgrjfywx76fnih9rs66"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2316,12 +2316,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "26beb1213019d56767e7f14ba1f2cbc33cb315b8"; - sha256 = "05bqimb70r646q9v7nshwapqs8n9hvbx55cxx6khd6gwvpckh22w"; + rev = "6ff9e9938badea96f64154f2991e165e8d340cf2"; + sha256 = "11k1gjsh8fibdpg5lrcq3rz90gwjb7725krhimnvhrkwhcyl1bwb"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2676,24 +2676,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-06-27"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1e79310e57404e86e00ceca2c4657bb9a9072673"; - sha256 = "0v6kgjjy9ygr2vygh4zizfbnms33w3bn1b4zdljx79c358firgcx"; + rev = "b94accc40260be439b6bfa120402ebd10bd60577"; + sha256 = "19lz2l9dzq5a339rhp8xdzj1m0dxxnwm9w4kg4lizgxi1ck53dpq"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "850a2aa8366bbe8b07088a19e6b6f2e8e76f2c9f"; - sha256 = "048fjsxrshlgcscs9c1y29fgpcb9l9cnhpghkj9ailpzjv4j5hxf"; + rev = "3232af465ed86b9a188389e52ce3c47cd811c3f3"; + sha256 = "1qcvi8kklggzl4k88n6zhxb08hh2srhm9vvnfrknlz751pgd8z3x"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3084,12 +3084,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b03c121c66d859fa165aaab05ba9c1c1b2098007"; - sha256 = "0b72c14sqjq8bb0xz1spp5lq2bs1fsbp651qiwvvcdlma5yf5vxk"; + rev = "3fdfd45119be64945e635bf2406fdb0430cb85df"; + sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3144,12 +3144,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "639a2deb5e3783aeb8f7cddaade8e84575f3bc1e"; - sha256 = "0q890252cpcjy5a9xy6m5qlziqbqmfgy43l305aslv05yxbckk11"; + rev = "7fe4530c9a71f81444ad9fee9d89c5e2f5bfbf8d"; + sha256 = "1zyi32x8wfz3lqb2nqggrjlp8d0j4qpnkck4pfg15fgmkycrivf7"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3348,12 +3348,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-06-17"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "cbede2d4abef3f6054919863404ce46f3ed572a9"; - sha256 = "0w7fv6yl78inr81h57kgh5xfhha626sc2w8mmzgbwp7s7yhqxymk"; + rev = "98063a91de4179685c29acb1c765a99bf08ef0f2"; + sha256 = "18q05vfb4h94nlxylkir9chb3n62x2ibb3qlcij4rhn35fsnrfd9"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3468,12 +3468,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "9a1ab398bfdb4bda1134b7a0e7a379017d3bdefa"; - sha256 = "04khvbxx5qsfzhg5ari55ka8ff9gpd2kh7s3vc27z1jz43vizrsa"; + rev = "a46dfe7d7fc8f7af5bb84006db45ba11fb7b786c"; + sha256 = "161zrqvw5kpcphn747cpa4388x4c2flps5qwxkl5yxkn320937im"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3600,12 +3600,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-06-29"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "234a8cdad1104dd562796e6ca2c6c41e22e5f77a"; - sha256 = "0w10mx66p9sil1aa6jhkfb7k2p4m2vwjbyr8f1dr2apn07cr72w8"; + rev = "161ec66bda585fd7ba402cf7434bac87c927734f"; + sha256 = "1d4qwxrkx9cbbrxddg2n9f7sszmp23jnx83g52yydsxhlxq8dj8l"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3684,24 +3684,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "a80ea23b4c765efe3b6eaa9440d19d298e4c709b"; - sha256 = "11m62asv3qrv5kh4gb8xvhjmxwbzxf26902cxn8gncclc79cr42i"; + rev = "a01a33f9a8aea3eb19eb76601131c01e23d8e034"; + sha256 = "1jsf6prmf1555kd87gfjdiydkvl15qk0lk6x04dwbrx6wxfvd77a"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "917ae3da7c0d827c819405cc747aafc8bb041dbd"; - sha256 = "00mh980ffh3k0cp4dm1qvx5x803kw8xajgvv86hw0yspmjb98d5d"; + rev = "5fa8d5741dca82a15426db659f461244975678e6"; + sha256 = "1xqq1m27w3vh1dd9g3k4kwva92hr8zf1xnlvqhy2jz1xazx4k2m1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4008,12 +4008,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-06-19"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "268002fdba2f8f5a4e86574e3b9924ad6d42da20"; - sha256 = "07zskz9b5s4cainjqj431b2skzdrhnm8agydmjxmw13qjmwj0q7z"; + rev = "18da6621459032aa5608b760622f0bc8fdc0535c"; + sha256 = "1z1n3jpxmz3672f8bd6s898mlqjf17pv11qqy15l2npfd9crh5sv"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4057,12 +4057,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-06-14"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "65a16b25f98891e2832daa437cdd682e546a494e"; - sha256 = "0fwxxrwad3y69bczs7rxa0brff4vp139w2ylv8rfh0v2dgx2gmay"; + rev = "774994a5b930b9e6635e6a9b83b7f476bdd7dd23"; + sha256 = "0q6d5k2rf6ci3mgmdga304ihklb10falp4g29djnfxxsi2iapvjv"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4249,12 +4249,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-06-21"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "6817136df80ae9ddb980a97f7e4cf31cc4f9fa4a"; - sha256 = "13di6mjn6wb931ak98g1xl99j97c2kphhqrbwh673nl7syqwhnrf"; + rev = "fd21f094a460bb319a8f6eac18653a1a2122d41c"; + sha256 = "0y5qga2x767blzbrlbfxidz73fpby81xpsw133wmfy3hnkg8xdam"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4574,12 +4574,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-06-08"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "5c1fc0452387cae323692e3345238a780a942056"; - sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx"; + rev = "e8935bde797ce92318c60a21ee671caf04387a33"; + sha256 = "1sw8d7ipadpa4hazs2fija3rzlf6ch7h8lkm4k3hg9m9gpviygla"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4803,12 +4803,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-05-19"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "176f364f1b4acf894cdc248944f2d5506a37cc80"; - sha256 = "01ylf4vjlisgls2f2gwlagg7x1yyhcr64kzdlzhcs3r8s3wdsf25"; + rev = "c89741ef310fd0a380ffb80b80e10f197afd6224"; + sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -4984,12 +4984,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e5bd4963da81b5d044749ee4507061801aeb0f78"; - sha256 = "1dskr91qiark1z08yfjkbrnf1zvy2mci4avkdn574b7pz8v72lzb"; + rev = "5a53ec5c2fdab10ca8775d3979b1a85e63d57953"; + sha256 = "1mr98irwsc5pmj63ssxd3cdwb3x31lalbkk1pyp79bswdfjmx0nl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5837,12 +5837,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-06-26"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "492eca7ff8e162ec8a8e4535860de399d7e1cd57"; - sha256 = "1xxgf3mk26pj3w2lzdr4aw8xvya02ar57v01v1yajlw0rzx23crw"; + rev = "4402c9292c4495916b075e27dac88ad391c47ceb"; + sha256 = "0hwap5z5727iq42zpl769m1w84qr41xgbg7rfjbk94qb3kkikb4m"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9165,12 +9165,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-06-01"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "552403842b992efde3816a89b20055f7d66d9a0d"; - sha256 = "1pkkysv2mnbzm2bi33l1xccdb6sh06dgyg83dg0dgd0gmp94l7ya"; + rev = "a1d1841ecadc19eeab9efdd9fa17054cedcba6e6"; + sha256 = "0zzqxxv2jqi71p76z0fsnc25kmclazb3x6rg248npsn8pnfwwi1s"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -9502,12 +9502,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "299363d651c5a8c26a4440f434df613cdf66a4c4"; - sha256 = "18c9b35cjjrw2bf62j6ss5i7i21rz32nrm102bljybf2cfs700lf"; + rev = "c9b3b50427d97403e8a36b3fe2d636d0a97db0d8"; + sha256 = "1vpl02n2xy7b95mhagbsq7fiz55i0x3wpqpbmpmp16mva6r6agvr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 79271448b75b..17f8b3a28c4e 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}: +{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders }: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck"; + sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU="; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b51cc9f0ba6d..dbe9c938c678 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -646,7 +646,7 @@ "plugwise" = ps: with ps; [ plugwise ]; "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts - "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint + "point" = ps: with ps; [ aiohttp-cors pypoint ]; "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4b23b4a2bc42..c9a4a15a87c0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -606,6 +606,7 @@ in with py.pkgs; buildPythonApplication rec { "plant" "plex" "plugwise" + "point" "poolsense" "profiler" "prometheus" @@ -614,6 +615,7 @@ in with py.pkgs; buildPythonApplication rec { "pushbullet" "pvpc_hourly_pricing" "python_script" + "qld_bushfire" "rachio" "radarr" "rainmachine" diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index e445184b9561..2e825dc96152 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "389-ds-base"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "389ds"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8="; + sha256 = "sha256-MYLRrH3PrNdPVuRffiG39zzJK6eHJcvIDWn1q0IHrZ8="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/pkgs/servers/pufferpanel/default.nix b/pkgs/servers/pufferpanel/default.nix new file mode 100644 index 000000000000..67529b7d5bb8 --- /dev/null +++ b/pkgs/servers/pufferpanel/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, pkgs +, stdenv +, fetchzip +, openjdk16 +, nodejs +, pathDeps ? [ ] +}: + +buildGoModule rec { + pname = "pufferpanel"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "pufferpanel"; + repo = pname; + rev = "v${version}"; + sha256 = "1ifig8ckjlg47wj0lfk4q941dan7llb1i5l76akcpjq726b2j8lh"; + }; + + # PufferPanel is split into two parts: the backend daemon and the + # frontend. + # Getting the frontend to build in the Nix environment fails even + # with all the proper node_modules populated. To work around this, + # we just download the built frontend and package that. + frontend = fetchzip { + url = "https://github.com/PufferPanel/PufferPanel/releases/download/v${version}/pufferpanel_${version}_linux_arm64.zip"; + sha256 = "0phbf4asr0dns7if84crx05kfgr44yaxrbsbihdywbhh2mb16052"; + stripRoot = false; + } + "/www"; + + nativeBuildInputs = [ makeWrapper ]; + + vendorSha256 = "061l1sy0z3kd7rc2blqh333gy66nbadfxy9hyxgq07dszds4byys"; + + postFixup = '' + mkdir -p $out/share/pufferpanel + cp -r ${src}/assets/email $out/share/pufferpanel/templates + cp -r ${frontend} $out/share/pufferpanel/www + + # Wrap the binary with the path to the external files. + mv $out/bin/cmd $out/bin/pufferpanel + wrapProgram "$out/bin/pufferpanel" \ + --set PUFFER_PANEL_EMAIL_TEMPLATES $out/share/pufferpanel/templates/emails.json \ + --set GIN_MODE release \ + --set PUFFER_PANEL_WEB_FILES $out/share/pufferpanel/www \ + --prefix PATH : ${lib.makeBinPath pathDeps} + ''; + + meta = with lib; { + description = "A free, open source game management panel"; + homepage = "https://www.pufferpanel.com/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ ronthecookie ]; + }; +} diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 5973a1a190c6..8ef89031c182 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-oYlc6PSBLovNsEWDc6eGpDI85T6bTHgBvxA/PZP3aQU="; + sha256 = "sha256-a/IMroZ1zAgIv7Cx4kkj5byIMoC0o+seHhqVLaUUSqc="; }; buildInputs = with lib; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 69b55a6f3c29..bf0b7472c571 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -6,8 +6,6 @@ , withSqlite ? false, sqlite , withPam ? false, pam , withZlib ? true, zlib -, withRiak ? false -, withElixir ? false, elixir , withIconv ? true , withTools ? false , withRedis ? false @@ -24,12 +22,12 @@ let ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ]; in stdenv.mkDerivation rec { - version = "20.12"; + version = "21.04"; pname = "ejabberd"; src = fetchurl { url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz"; - sha256 = "sha256-nZxdYXRyv4UejPLHNT/p6CrvW22Koo7rZSi96KRjqFQ="; + sha256 = "09s8mj0dkvp9mxazsqxqqmnl5n2xyi8avx0rzgvqrbl3byanzfzr"; }; nativeBuildInputs = [ fakegit makeWrapper ]; @@ -38,11 +36,7 @@ in stdenv.mkDerivation rec { ++ lib.optional withSqlite sqlite ++ lib.optional withPam pam ++ lib.optional withZlib zlib - ++ lib.optional withElixir elixir - ; - - # Apparently needed for Elixir - LANG = "en_US.UTF-8"; + ; deps = stdenv.mkDerivation { pname = "ejabberd-deps"; @@ -52,7 +46,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; - nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ]; + nativeBuildInputs = [ git erlang openssl expat libyaml sqlite pam zlib ]; GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; @@ -76,7 +70,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-0/hBgA+9rsDOBcvbROSpc5Xnw4JkYpuLCl2V+lJnieY="; + outputHash = "1mvixgb46ss35abjwz3lw38c69bii1xyj557a92bvrxc1gc6gx31"; }; configureFlags = @@ -85,8 +79,6 @@ in stdenv.mkDerivation rec { (lib.enableFeature withSqlite "sqlite") (lib.enableFeature withPam "pam") (lib.enableFeature withZlib "zlib") - (lib.enableFeature withRiak "riak") - (lib.enableFeature withElixir "elixir") (lib.enableFeature withIconv "iconv") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") @@ -97,7 +89,7 @@ in stdenv.mkDerivation rec { preBuild = '' cp -r $deps deps chmod -R +w deps - patchShebangs deps + patchShebangs . ''; postInstall = '' @@ -108,6 +100,7 @@ in stdenv.mkDerivation rec { -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \ $out/sbin/ejabberdctl wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}" + rm $out/bin/{mix,iex,elixir} ''; meta = with lib; { @@ -116,6 +109,5 @@ in stdenv.mkDerivation rec { homepage = "https://www.ejabberd.im"; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ]; - broken = withElixir; }; } diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix new file mode 100644 index 000000000000..76b7d1da59b4 --- /dev/null +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -0,0 +1,87 @@ +{ lib, stdenv, fetchFromGitHub, fetchurl, linkFarmFromDrvs, makeWrapper, autoPatchelfHook +, dotnet-sdk_5, dotnetPackages, dotnetCorePackages, cacert +}: + +let + projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; +in +stdenv.mkDerivation rec { + pname = "discordchatexporter-cli"; + version = "2.28"; + + src = fetchFromGitHub { + owner = "tyrrrz"; + repo = "discordchatexporter"; + rev = version; + sha256 = "1bcq8mwjr8635g8mkgbxnszk20hnwf0zk672glrxjqga6f6fnykg"; + }; + + nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; + + nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { + fetchNuGet = { name, version, sha256 }: fetchurl { + name = "nuget-${name}-${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${name}/${version}"; + inherit sha256; + }; + }); + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_NOLOGO=1 + + nuget sources Add -Name nixos -Source "$PWD/nixos" + nuget init "$nugetDeps" "$PWD/nixos" + + # FIXME: https://github.com/NuGet/Home/issues/4413 + mkdir -p $HOME/.nuget/NuGet + cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet + + dotnet restore --source "$PWD/nixos" ${projectFile} + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + dotnet build ${projectFile} \ + --no-restore \ + --configuration Release \ + -p:Version=${version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dotnet publish ${projectFile} \ + --no-build \ + --configuration Release \ + --no-self-contained \ + --output $out/lib/${pname} + shopt -s extglob + + makeWrapper $out/lib/${pname}/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli \ + --set DOTNET_ROOT "${dotnetCorePackages.sdk_3_1}" + + runHook postInstall + ''; + + # Strip breaks the executable. + dontStrip = true; + + meta = with lib; { + description = "A tool to export Discord chat logs to a file"; + homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; + passthru.updateScript = ./updater.sh; +} diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix new file mode 100644 index 000000000000..a7703f2ba2c1 --- /dev/null +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -0,0 +1,67 @@ +{ fetchNuGet }: [ + (fetchNuGet { + name = "CliFx"; + version = "2.0.4"; + sha256 = "1wwpjli4y2545yi6k17mvjqy994wl3wm6nngszk87rbdwhkbncaj"; + }) + (fetchNuGet { + name = "Gress"; + version = "1.2.0"; + sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; + }) + (fetchNuGet { + name = "JsonExtensions"; + version = "1.1.0"; + sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; + }) + (fetchNuGet { + name = "Microsoft.AspNetCore.App.Ref"; + version = "3.1.10"; + sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Host.linux-x64"; + version = "3.1.14"; + sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; + }) + (fetchNuGet { + name = "Microsoft.NETCore.App.Ref"; + version = "3.1.0"; + sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; + }) + (fetchNuGet { + name = "MiniRazor.CodeGen"; + version = "2.1.2"; + sha256 = "0mg4zy4zq0ccrc9wchy796ln1znkmn3k1aax0kd2gha4fwa1d1fb"; + }) + (fetchNuGet { + name = "MiniRazor.Runtime"; + version = "2.1.2"; + sha256 = "1a6cm7j1f5n1bfzhg8w60xwa7cps2i82418k57dm2hgqla6p3rsp"; + }) + (fetchNuGet { + name = "Polly"; + version = "7.2.2"; + sha256 = "0s15n5zwj44i6sw3v40ca8l6j0ijydxcakvad49j52rp49iwrmkn"; + }) + (fetchNuGet { + name = "Spectre.Console"; + version = "0.40.0"; + sha256 = "17bb31nsvfk7m337zwqcz4v6cvayhfx51ri4yrv5i8nbp7f4rpb1"; + }) + (fetchNuGet { + name = "System.Memory"; + version = "4.5.0"; + sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; + }) + (fetchNuGet { + name = "Tyrrrz.Extensions"; + version = "1.6.5"; + sha256 = "1yzsii1pbp6b066wxwwws310p7h809apl81bhb8ad55hqlzy1rg3"; + }) + (fetchNuGet { + name = "Wcwidth"; + version = "0.2.0"; + sha256 = "0p7zaisix9ql4v5nyl9gfc93xcyj74j01rwvgm7jw29js3wlj10s"; + }) +] diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/tools/backup/discordchatexporter-cli/updater.sh new file mode 100755 index 000000000000..ff5c44a19bcd --- /dev/null +++ b/pkgs/tools/backup/discordchatexporter-cli/updater.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts dotnet-sdk_5 +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl -s "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 +fi + +cd ../../../.. +update-source-version discordchatexporter-cli "$new_version" +store_src="$(nix-build . -A discordchatexporter-cli.src --no-out-link)" +src="$(mktemp -d /tmp/discordexporter-src.XXX)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" + +pushd "$src" + +mkdir ./nuget_tmp.packages +dotnet restore DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj --packages ./nuget_tmp.packages + +echo "{ fetchNuGet }: [" >"$deps_file" +while read pkg_spec; do + { read pkg_name; read pkg_version; } < <( + # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` + sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") + pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" + cat >>"$deps_file" <>"$deps_file" + +popd +rm -r "$src" diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index c0a06e1b9ae5..405fc6c3955d 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -1,17 +1,33 @@ -{ lib, buildPythonPackage, fetchFromGitHub, update-dotdee, simpleeval, dateutil }: +{ lib +, python3 +, fetchFromGitHub +}: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "rotate-backups"; - version = "6.0"; + version = "8.1"; src = fetchFromGitHub { owner = "xolox"; repo = "python-rotate-backups"; rev = version; - sha256 = "0i59qfv1cfm0ss63ab2nrkn5wr4rxpqqmvfd7pf9c3pl9dbfq20c"; + sha256 = "0r4dyd7hj403rksgp3vh1azp9n4af75r3wq3x39wxcqizpms3vkx"; }; - propagatedBuildInputs = [ update-dotdee simpleeval dateutil ]; + propagatedBuildInputs = with python3.pkgs; [ + python-dateutil + simpleeval + update-dotdee + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/xolox/python-rotate-backups/issues/33 + "test_removal_command" + ]; meta = with lib; { description = "Simple command line interface for backup rotation"; @@ -20,4 +36,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ eyjhb ]; }; } - diff --git a/pkgs/tools/graphics/ploticus/builder.sh b/pkgs/tools/graphics/ploticus/builder.sh deleted file mode 100644 index 2fb16b259bdc..000000000000 --- a/pkgs/tools/graphics/ploticus/builder.sh +++ /dev/null @@ -1,33 +0,0 @@ -source $stdenv/setup - -preBuild() { - cd src -} - -preInstall() { - mkdir -p $out/bin -} - -postInstall() { - # Install the "prefabs". - mkdir -p $out/share/ploticus/prefabs && \ - cd .. && \ - cp -rv prefabs/* $out/share/ploticus/prefabs - - # Create a wrapper that knows where to find them. Debian's package - # does something similar by patching directly the C file that looks - # for `$PLOTICUS_PREFABS'. - cat > $out/bin/ploticus < + #include "plg.h" + +-#define PREFABS_DIR "" /* INSTALLERS can set this to a valid pathname, so that users don't need to set PLOTICUS_PREFABS env var */ ++#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 */ + + #define PLVERSION "2.42-May2013" /* see also the Copyright page, and page headers and footers */ + diff --git a/pkgs/tools/graphics/ploticus/use-gd-package.patch b/pkgs/tools/graphics/ploticus/use-gd-package.patch new file mode 100644 index 000000000000..9a72489ddaad --- /dev/null +++ b/pkgs/tools/graphics/ploticus/use-gd-package.patch @@ -0,0 +1,34 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -91,10 +91,10 @@ + + + ########### Option 1: use bundled GD16 (PNG only). Requires libpng and zlib. +-exetarget: plpng +-GD16LIBS = -lpng -lz +-GD16H = -I/usr/local/include +-ZFLAG = -DWZ ++# exetarget: plpng ++# GD16LIBS = -lpng -lz ++# GD16H = -I/usr/local/include ++# ZFLAG = -DWZ + ### These should remain commented unless your libs are not in usual places, then alter to suit... + ### GD16LIBS = /home/scg/lib/libpng.a /home/scg/lib/libz.a + ### GD16H = -I/home/scg/lib +@@ -111,11 +111,11 @@ + + ########### Option 4: use your own GD resource with FreeType2 (ttf) fonts enabled. + ########### Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype +-# exetarget: plgd18 +-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +-# GD18H = +-# GDFREETYPE = -DGDFREETYPE +-# ZFLAG = -DWZ ++exetarget: plgd18 ++GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype ++GD18H = ++GDFREETYPE = -DGDFREETYPE ++ZFLAG = -DWZ + + ########### Option 5: don't use GD at all. + # exetarget: plnogd diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 4d69f237a08c..81e2061b4cc1 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-PUcsDyszFT4DzTwvbcCO8FQErvmotmY7gREZ2sgpcw8="; + sha256 = "sha256-0m5ya3S/aqQr0n6MdfWfTo0Q7xTS5qY+iDhexwDGdWo="; }; - vendorSha256 = "sha256-7SfqBxCfOYwePK/6SsWS5StuVr0png6WjQXIDuQW0EE="; + vendorSha256 = "sha256-k2dw8WfOxK+VpnJonm/GXm49rUdIXSA81RO0g+8ocBs="; doCheck = false; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 07a2d02b0b2a..e4e4868e4d9f 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; - maintainers = with maintainers; [ funfunctor fpletz ]; + maintainers = with maintainers; [ funfunctor fpletz felixsinger ]; platforms = platforms.all; broken = stdenv.isDarwin; # requires DirectHW }; diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/tools/misc/yajsv/default.nix new file mode 100644 index 000000000000..6e5f20bfbd2b --- /dev/null +++ b/pkgs/tools/misc/yajsv/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +let version = "1.4.0"; +in buildGoModule { + pname = "yajsv"; + version = version; + + src = fetchFromGitHub { + owner = "neilpa"; + repo = "yajsv"; + rev = "v${version}"; + sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7"; + }; + + vendorSha256 = "0rmc31i5jra2qcqhw1azflmhawxasrq0d6qwd6qp250sj1jr6ahq"; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/yajsv -v > /dev/null + ''; + + meta = { + description = "Yet Another JSON Schema Validator"; + homepage = "https://github.com/neilpa/yajsv"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rycee ]; + }; +} diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index c8bb7d364132..b3e8b9d221a5 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -1,40 +1,36 @@ GEM remote: https://rubygems.org/ specs: - arr-pm (0.0.10) + arr-pm (0.0.11) cabin (> 0) - backports (3.14.0) + backports (3.21.0) cabin (0.9.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) clamp (1.0.1) - dotenv (2.7.2) - ffi (1.10.0) - fpm (1.11.0) - arr-pm (~> 0.0.10) + dotenv (2.7.6) + fpm (1.13.0) + arr-pm (~> 0.0.11) backports (>= 2.6.2) cabin (>= 0.6.0) - childprocess (= 0.9.0) clamp (~> 1.0.0) - ffi - json (>= 1.7.7, < 2.0) + git (>= 1.3.0, < 2.0) + json (>= 1.7.7, < 3.0) pleaserun (~> 0.0.29) - ruby-xz (~> 0.2.3) + rexml stud + git (1.8.1) + rchardet (~> 1.8) insist (1.0.0) - io-like (0.3.0) - json (1.8.6) + json (2.5.1) mustache (0.99.8) - pleaserun (0.0.30) + pleaserun (0.0.32) cabin (> 0) clamp dotenv insist mustache (= 0.99.8) stud - ruby-xz (0.2.3) - ffi (~> 1.9) - io-like (~> 0.3) + rchardet (1.8.0) + rexml (3.2.5) stud (0.0.23) PLATFORMS diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 654a640c6ec2..dca13598e8cc 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; + sha256 = "17qssricshzs2ml1jvn4bs2h85gxvrqm074pl5nl8vr74620iazi"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.11"; }; backports = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; + sha256 = "0xqvwj3mm28g1z4npya51zjcvxaniyyzn3fwgcdwmm8xrdbl8fgr"; type = "gem"; }; - version = "3.14.0"; + version = "3.21.0"; }; cabin = { groups = ["default"]; @@ -30,17 +30,6 @@ }; version = "0.9.0"; }; - childprocess = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; - type = "gem"; - }; - version = "0.9.0"; - }; clamp = { groups = ["default"]; platforms = []; @@ -56,31 +45,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag"; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; type = "gem"; }; - version = "2.7.2"; - }; - ffi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; - type = "gem"; - }; - version = "1.10.0"; + version = "2.7.6"; }; fpm = { - dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; + dependencies = ["arr-pm" "backports" "cabin" "clamp" "git" "json" "pleaserun" "rexml" "stud"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm"; + sha256 = "03ss7yh628f0m6by23q3sniq660gm07mkz6wqjpvr118gc0h53sa"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; + }; + git = { + dependencies = ["rchardet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vdcv93s33d9914a9nxrn2y2qv15xk7jx94007cmalp159l08cnl"; + type = "gem"; + }; + version = "1.8.1"; }; insist = { groups = ["default"]; @@ -92,25 +82,15 @@ }; version = "1.0.0"; }; - io-like = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k"; - type = "gem"; - }; - version = "0.3.0"; - }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "1.8.6"; + version = "2.5.1"; }; mustache = { groups = ["default"]; @@ -128,21 +108,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; + sha256 = "1aykf0l8327bqkkf5xd9jcglsib973zpy37cfnlf4j0vp0cdpn2d"; type = "gem"; }; - version = "0.0.30"; + version = "0.0.32"; }; - ruby-xz = { - dependencies = ["ffi" "io-like"]; + rchardet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; type = "gem"; }; - version = "0.2.3"; + version = "1.8.0"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; }; stud = { groups = ["default"]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index f1268717a917..ec240a7c7156 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.6.1"; + version = "5.7.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g"; + sha256 = "sha256-72rVk8pYIQFESQqBu4bmFBPpAOB0oG2Iu36TbAdecBw="; }; patches = [ diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 45bd76b90917..89900ff313b4 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests }: +{ lib, fetchFromGitHub, buildGoPackage, installShellFiles, nixosTests +, makeWrapper +, gawk +, glibc +}: buildGoPackage rec { pname = "vault"; @@ -15,13 +19,16 @@ buildGoPackage rec { subPackages = [ "." ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; buildFlagsArray = [ "-tags=vault" "-ldflags=-s -w -X ${goPackagePath}/sdk/version.GitCommit=${src.rev}" ]; postInstall = '' echo "complete -C $out/bin/vault vault" > vault.bash installShellCompletion vault.bash + + wrapProgram $out/bin/vault \ + --prefix PATH ${lib.makeBinPath [ gawk glibc ]} ''; passthru.tests.vault = nixosTests.vault; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 11175c3c889f..6ae4845346aa 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, gawk, glibc }: let version = "1.7.3"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ makeWrapper unzip ]; sourceRoot = "."; @@ -41,6 +41,9 @@ in stdenv.mkDerivation { mv vault $out/bin echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault + wrapProgram $out/bin/vault \ + --prefix PATH ${lib.makeBinPath [ gawk glibc ]} + runHook postInstall ''; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 673d29d61aa1..25d0366ef715 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -42,6 +42,11 @@ in stdenv.mkDerivation rec { # required to prevent plugins from relying on /etc # and /var ./no-files-in-etc-and-var.patch + # The current IPC location is unsafe as it writes + # a fixed path in /tmp, which is world-writable. + # Therefore we put it into `/run/netdata`, which is owned + # by netdata only. + ./ipc-socket-in-run.patch ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; diff --git a/pkgs/tools/system/netdata/ipc-socket-in-run.patch b/pkgs/tools/system/netdata/ipc-socket-in-run.patch new file mode 100644 index 000000000000..a117955af095 --- /dev/null +++ b/pkgs/tools/system/netdata/ipc-socket-in-run.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/commands.h b/daemon/commands.h +index bd4aabfe1cbe4..ce7eb3c730228 100644 +--- a/daemon/commands.h ++++ b/daemon/commands.h +@@ -6,7 +6,7 @@ + #ifdef _WIN32 + # define PIPENAME "\\\\?\\pipe\\netdata-cli" + #else +-# define PIPENAME "/tmp/netdata-ipc" ++# define PIPENAME "/run/netdata/ipc" + #endif + + #define MAX_COMMAND_LENGTH 4096 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99af01473a34..b6961be94b87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10168,6 +10168,8 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; + yajsv = callPackage ../tools/misc/yajsv { }; + yapf = with python3Packages; toPythonApplication yapf; yarn = callPackage ../development/tools/yarn { }; @@ -14856,6 +14858,8 @@ in directfb = callPackage ../development/libraries/directfb { }; + discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { }; + discord-rpc = callPackage ../development/libraries/discord-rpc { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -17836,6 +17840,8 @@ in pstreams = callPackage ../development/libraries/pstreams {}; + pufferpanel = callPackage ../servers/pufferpanel { }; + pugixml = callPackage ../development/libraries/pugixml { }; pylode = callPackage ../misc/pylode {}; @@ -18073,7 +18079,7 @@ in rocksdb_lite = rocksdb.override { enableLite = true; }; - rotate-backups = with python3Packages; toPythonApplication rotate-backups; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; rote = callPackage ../development/libraries/rote { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 16d3c71d5248..3ceaf784af3b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -257,20 +257,6 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "dom"; buildInputs = [ libxml2 ]; - patches = [ - # https://github.com/php/php-src/pull/7030 - (fetchpatch { - url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch"; - sha256 = "11qsdiwj1zmpfc2pgh6nr0sn7qa1nyjg4jwf69cgwnd57qfjcy4k"; - excludes = [ "ext/dom/tests/bug43364.phpt" "ext/dom/tests/bug80268.phpt" ]; - }) - ]; - # For some reason `patch` fails to remove these files correctly. - # Since `postPatch` is already used in `mkExtension`, we have to make it here. - preCheck = '' - rm tests/bug43364.phpt - rm tests/bug80268.phpt - ''; configureFlags = [ "--enable-dom" ] # Required to build on darwin. ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b796d9ac4427..7ea357116233 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -50,6 +50,7 @@ mapAliases ({ pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79b17a44d90e..5eac97ab1891 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5349,6 +5349,8 @@ in { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pypoint = callPackage ../development/python-modules/pypoint { }; + pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; pyrogram = callPackage ../development/python-modules/pyrogram { }; @@ -7622,8 +7624,6 @@ in { ropper = callPackage ../development/python-modules/ropper { }; - rotate-backups = callPackage ../tools/backup/rotate-backups { }; - routes = callPackage ../development/python-modules/routes { }; rpdb = callPackage ../development/python-modules/rpdb { };