diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md
index dac6d828ac0..41973292863 100644
--- a/doc/contributing/coding-conventions.chapter.md
+++ b/doc/contributing/coding-conventions.chapter.md
@@ -214,15 +214,15 @@ Most of the time, these are the same. For instance, the package `e2fsprogs` has
There are a few naming guidelines:
-- The `name` attribute _should_ be identical to the upstream package name.
+- The `pname` attribute _should_ be identical to the upstream package name.
-- The `name` attribute _must not_ contain uppercase letters — e.g., `"mplayer-1.0rc2"` instead of `"MPlayer-1.0rc2"`.
+- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer" instead of `"MPlayer"`.
-- The version part of the `name` attribute _must_ start with a digit (following a dash) — e.g., `"hello-0.3.1rc2"`.
+- The `version` attribute _must_ start with a digit e.g`"0.3.1rc2".
-- If a package is not a release but a commit from a repository, then the version part of the name _must_ be the date of that (fetched) commit. The date _must_ be in `"YYYY-MM-DD"` format. Also append `"unstable"` to the name - e.g., `"pkgname-unstable-2014-09-23"`.
+- If a package is not a release but a commit from a repository, then the `version` attribute _must_ be the date of that (fetched) commit. The date _must_ be in `"unstable-YYYY-MM-DD"` format.
-- Dashes in the package name _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names.
+- Dashes in the package `pname` _should_ be preserved in new variable names, rather than converted to underscores or camel cased — e.g., `http-parser` instead of `http_parser` or `httpParser`. The hyphenated style is preferred in all three package names.
- If there are multiple versions of a package, this _should_ be reflected in the variable names in `all-packages.nix`, e.g. `json-c_0_9` and `json-c_0_11`. If there is an obvious “default” version, make an attribute like `json-c = json-c_0_9;`. See also [](#sec-versioning)
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index b2ca9f457a2..ea96f49fa97 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -548,6 +548,14 @@
(user@host). You can also set ssh options by
defining the NIX_SSHOPTS environment variable.
+
+
+ Note that nixos-rebuild honors the
+ nixpkgs.crossSystem setting of the given configuration
+ but disregards the true architecture of the target host. Hence the
+ nixpkgs.crossSystem setting has to match the target
+ platform or else activation will fail.
+
diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py
index 0e5f013193f..e32f6810ca8 100644
--- a/nixos/lib/test-driver/test_driver/driver.py
+++ b/nixos/lib/test-driver/test_driver/driver.py
@@ -86,7 +86,7 @@ class Driver:
def subtest(self, name: str) -> Iterator[None]:
"""Group logs under a given test name"""
- with rootlog.nested(name):
+ with rootlog.nested("subtest: " + name):
try:
yield
return True
diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py
index 5b3091a5129..59ed2954723 100644
--- a/nixos/lib/test-driver/test_driver/logger.py
+++ b/nixos/lib/test-driver/test_driver/logger.py
@@ -1,4 +1,4 @@
-from colorama import Style
+from colorama import Style, Fore
from contextlib import contextmanager
from typing import Any, Dict, Iterator
from queue import Queue, Empty
@@ -81,7 +81,11 @@ class Logger:
@contextmanager
def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
- self._eprint(self.maybe_prefix(message, attributes))
+ self._eprint(
+ self.maybe_prefix(
+ Style.BRIGHT + Fore.GREEN + message + Style.RESET_ALL, attributes
+ )
+ )
self.xml.startElement("nest", attrs={})
self.xml.startElement("head", attributes)
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 9e5b760434a..3f0d976e70b 100755
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -1,5 +1,17 @@
#! @perl@/bin/perl
+# Issue #166838 uncovered a situation in which a configuration not suitable
+# for the target architecture caused a cryptic error message instead of
+# a clean failure. Due to this mismatch, the perl interpreter in the shebang
+# line wasn't able to be executed, causing this script to be misinterpreted
+# as a shell script.
+#
+# Let's detect this situation to give a more meaningful error
+# message. The following two lines are carefully written to be both valid Perl
+# and Bash.
+printf "Perl script erroneously interpreted as shell script,\ndoes target platform match nixpkgs.crossSystem platform?\n" && exit 1
+ if 0;
+
use strict;
use warnings;
use Config::IniFiles;
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index df8db7f34d0..f016fff824c 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -59,7 +59,10 @@ let
${if config.boot.initrd.systemd.enable then ''
cp ${config.system.build.bootStage2} $out/prepare-root
substituteInPlace $out/prepare-root --subst-var-by systemConfig $out
- ln -s "$systemd/lib/systemd/systemd" $out/init
+ # This must not be a symlink or the abs_path of the grub builder for the tests
+ # will resolve the symlink and we end up with a path that doesn't point to a
+ # system closure.
+ cp "$systemd/lib/systemd/systemd" $out/init
'' else ''
cp ${config.system.build.bootStage2} $out/init
substituteInPlace $out/init --subst-var-by systemConfig $out
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 3af124d06a9..c900348619c 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -503,5 +503,8 @@ in {
];
};
};
+
+ boot.kernelParams = lib.mkIf (config.boot.resumeDevice != "") [ "resume=${config.boot.resumeDevice}" ];
+
};
}
diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix
index 59711f90dce..4108b482cce 100644
--- a/nixos/modules/tasks/lvm.nix
+++ b/nixos/modules/tasks/lvm.nix
@@ -21,6 +21,10 @@ in {
boot.vdo.enable = mkEnableOption "support for booting from VDOLVs";
};
+ options.boot.initrd.services.lvm.enable = (mkEnableOption "enable booting from LVM2 in the initrd") // {
+ visible = false;
+ };
+
config = mkMerge [
({
# minimal configuration file to make lvmconfig/lvm2-activation-generator happy
@@ -31,8 +35,13 @@ in {
environment.systemPackages = [ cfg.package ];
systemd.packages = [ cfg.package ];
- # TODO: update once https://github.com/NixOS/nixpkgs/pull/93006 was merged
services.udev.packages = [ cfg.package.out ];
+
+ # We need lvm2 for the device-mapper rules
+ boot.initrd.services.udev.packages = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ];
+ # The device-mapper rules want to call tools from lvm2
+ boot.initrd.systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ];
+ boot.initrd.services.udev.binPackages = lib.mkIf config.boot.initrd.services.lvm.enable [ cfg.package ];
})
(mkIf cfg.dmeventd.enable {
systemd.sockets."dm-event".wantedBy = [ "sockets.target" ];
@@ -47,13 +56,15 @@ in {
boot.initrd = {
kernelModules = [ "dm-snapshot" "dm-thin-pool" ];
- extraUtilsCommands = ''
+ systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.thin-provisioning-tools ];
+
+ extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) ''
for BIN in ${pkgs.thin-provisioning-tools}/bin/*; do
copy_bin_and_libs $BIN
done
'';
- extraUtilsCommandsTest = ''
+ extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable) ''
ls ${pkgs.thin-provisioning-tools}/bin/ | grep -v pdata_tools | while read BIN; do
$out/bin/$(basename $BIN) --help > /dev/null
done
@@ -71,13 +82,15 @@ in {
initrd = {
kernelModules = [ "kvdo" ];
- extraUtilsCommands = ''
+ systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.vdo ];
+
+ extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable)''
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
copy_bin_and_libs ${pkgs.vdo}/bin/$BIN
done
'';
- extraUtilsCommandsTest = ''
+ extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable)''
ls ${pkgs.vdo}/bin/ | grep -v adaptLVMVDO | while read BIN; do
$out/bin/$(basename $BIN) --help > /dev/null
done
@@ -91,7 +104,15 @@ in {
environment.systemPackages = [ pkgs.vdo ];
})
(mkIf (cfg.dmeventd.enable || cfg.boot.thin.enable) {
- boot.initrd.preLVMCommands = ''
+ boot.initrd.systemd.contents."/etc/lvm/lvm.conf".text = optionalString (config.boot.initrd.services.lvm.enable && cfg.boot.thin.enable) (concatMapStringsSep "\n"
+ (bin: "global/${bin}_executable = /bin/${bin}")
+ [ "thin_check" "thin_dump" "thin_repair" "cache_check" "cache_dump" "cache_repair" ]
+ ) + "\n" + optionalString cfg.dmeventd.enable ''
+ dmeventd/executable = /bin/false
+ activation/monitoring = 0
+ '';
+
+ boot.initrd.preLVMCommands = mkIf (!config.boot.initrd.systemd.enable) ''
mkdir -p /etc/lvm
cat << EOF >> /etc/lvm/lvm.conf
${optionalString cfg.boot.thin.enable (
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a1d4e284657..a229fa65faf 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -208,6 +208,7 @@ in
# hibernation. This test happens to work on x86_64-linux but
# not on other platforms.
hibernate = handleTestOn ["x86_64-linux"] ./hibernate.nix {};
+ hibernate-systemd-stage-1 = handleTestOn ["x86_64-linux"] ./hibernate.nix { systemdStage1 = true; };
hitch = handleTest ./hitch {};
hledger-web = handleTest ./hledger-web.nix {};
hocker-fetchdocker = handleTest ./hocker-fetchdocker {};
@@ -365,7 +366,7 @@ in
nginx-variants = handleTest ./nginx-variants.nix {};
nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {};
nitter = handleTest ./nitter.nix {};
- nix-ld = handleTest ./nix-ld {};
+ nix-ld = handleTest ./nix-ld.nix {};
nix-serve = handleTest ./nix-serve.nix {};
nix-serve-ssh = handleTest ./nix-serve-ssh.nix {};
nixops = handleTest ./nixops/default.nix {};
diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index 032ac6527bc..7a4b331169a 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -3,6 +3,7 @@
{ system ? builtins.currentSystem
, config ? {}
, pkgs ? import ../.. { inherit system config; }
+, systemdStage1 ? false
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
@@ -29,6 +30,11 @@ let
"/".device = "/dev/vda2";
};
swapDevices = mkOverride 0 [ { device = "/dev/vda1"; } ];
+ boot.resumeDevice = mkIf systemdStage1 "/dev/vda1";
+ boot.initrd.systemd = mkIf systemdStage1 {
+ enable = true;
+ emergencyAccess = true;
+ };
};
installedSystem = (import ../lib/eval-config.nix {
inherit system;
diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix
index 2ba17809569..1eb9f572a4d 100644
--- a/nixos/tests/lvm2/default.nix
+++ b/nixos/tests/lvm2/default.nix
@@ -11,6 +11,24 @@ let
thinpool = { test = callTest ./thinpool.nix; kernelFilter = lib.id; };
# we would like to test all versions, but the kernel module currently does not compile against the other versions
vdo = { test = callTest ./vdo.nix; kernelFilter = lib.filter (v: v == "5.15"); };
+
+
+ # systemd in stage 1
+ raid-sd-stage-1 = {
+ test = callTest ./systemd-stage-1.nix;
+ kernelFilter = lib.id;
+ flavour = "raid";
+ };
+ thinpool-sd-stage-1 = {
+ test = callTest ./systemd-stage-1.nix;
+ kernelFilter = lib.id;
+ flavour = "thinpool";
+ };
+ vdo-sd-stage-1 = {
+ test = callTest ./systemd-stage-1.nix;
+ kernelFilter = lib.filter (v: v == "5.15");
+ flavour = "vdo";
+ };
};
in
lib.listToAttrs (
@@ -20,7 +38,7 @@ lib.listToAttrs (
v' = lib.replaceStrings [ "." ] [ "_" ] version;
in
lib.flip lib.mapAttrsToList tests (name: t:
- lib.nameValuePair "lvm-${name}-linux-${v'}" (lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) (t.test { kernelPackages = pkgs."linuxPackages_${v'}"; }))
+ lib.nameValuePair "lvm-${name}-linux-${v'}" (lib.optionalAttrs (builtins.elem version (t.kernelFilter kernelVersionsToTest)) (t.test ({ kernelPackages = pkgs."linuxPackages_${v'}"; } // builtins.removeAttrs t [ "test" "kernelFilter" ])))
)
)
)
diff --git a/nixos/tests/lvm2/systemd-stage-1.nix b/nixos/tests/lvm2/systemd-stage-1.nix
new file mode 100644
index 00000000000..617ba77b179
--- /dev/null
+++ b/nixos/tests/lvm2/systemd-stage-1.nix
@@ -0,0 +1,104 @@
+{ kernelPackages ? null, flavour }: let
+ preparationCode = {
+ raid = ''
+ machine.succeed("vgcreate test_vg /dev/vdc /dev/vdd")
+ machine.succeed("lvcreate -L 512M --type raid0 test_vg -n test_lv")
+ '';
+
+ thinpool = ''
+ machine.succeed("vgcreate test_vg /dev/vdc")
+ machine.succeed("lvcreate -L 512M -T test_vg/test_thin_pool")
+ machine.succeed("lvcreate -n test_lv -V 16G --thinpool test_thin_pool test_vg")
+ '';
+
+ vdo = ''
+ machine.succeed("vgcreate test_vg /dev/vdc")
+ machine.succeed("lvcreate --type vdo -n test_lv -L 6G -V 12G test_vg/vdo_pool_lv")
+ '';
+ }.${flavour};
+
+ extraConfig = {
+ raid = {
+ boot.initrd.kernelModules = [
+ "dm-raid"
+ "raid0"
+ ];
+ };
+
+ thinpool = {
+ services.lvm = {
+ boot.thin.enable = true;
+ dmeventd.enable = true;
+ };
+ };
+
+ vdo = {
+ services.lvm = {
+ boot.vdo.enable = true;
+ dmeventd.enable = true;
+ };
+ };
+ }.${flavour};
+
+ extraCheck = {
+ raid = ''
+ "test_lv" in machine.succeed("lvs --select segtype=raid0")
+ '';
+
+ thinpool = ''
+ "test_lv" in machine.succeed("lvs --select segtype=thin-pool")
+ '';
+
+ vdo = ''
+ "test_lv" in machine.succeed("lvs --select segtype=vdo")
+ '';
+ }.${flavour};
+
+in import ../make-test-python.nix ({ pkgs, ... }: {
+ name = "lvm2-${flavour}-systemd-stage-1";
+ meta.maintainers = with pkgs.lib.maintainers; [ das_j ];
+
+ nodes.machine = { pkgs, lib, ... }: {
+ imports = [ extraConfig ];
+ # Use systemd-boot
+ virtualisation = {
+ emptyDiskImages = [ 8192 8192 ];
+ useBootLoader = true;
+ useEFIBoot = true;
+ };
+ boot.loader.systemd-boot.enable = true;
+ boot.loader.efi.canTouchEfiVariables = true;
+
+ environment.systemPackages = with pkgs; [ e2fsprogs ]; # for mkfs.ext4
+ boot = {
+ initrd.systemd = {
+ enable = true;
+ emergencyAccess = true;
+ };
+ initrd.services.lvm.enable = true;
+ kernelPackages = lib.mkIf (kernelPackages != null) kernelPackages;
+ };
+
+ specialisation.boot-lvm.configuration.virtualisation.bootDevice = "/dev/test_vg/test_lv";
+ };
+
+ testScript = ''
+ machine.wait_for_unit("multi-user.target")
+ # Create a VG for the root
+ ${preparationCode}
+ machine.succeed("mkfs.ext4 /dev/test_vg/test_lv")
+ machine.succeed("mkdir -p /mnt && mount /dev/test_vg/test_lv /mnt && echo hello > /mnt/test && umount /mnt")
+
+ # Boot from LVM
+ machine.succeed("bootctl set-default nixos-generation-1-specialisation-boot-lvm.conf")
+ machine.succeed("sync")
+ machine.crash()
+ machine.wait_for_unit("multi-user.target")
+
+ # Ensure we have successfully booted from LVM
+ assert "(initrd)" in machine.succeed("systemd-analyze") # booted with systemd in stage 1
+ assert "/dev/mapper/test_vg-test_lv on / type ext4" in machine.succeed("mount")
+ assert "hello" in machine.succeed("cat /test")
+ ${extraCheck}
+ '';
+})
diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix
index 9c6fdfb1ca7..edd074f5163 100644
--- a/nixos/tests/mongodb.nix
+++ b/nixos/tests/mongodb.nix
@@ -37,6 +37,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
mongodb-3_6
mongodb-4_0
mongodb-4_2
+ mongodb-4_4
+ mongodb-5_0
];
};
};
@@ -48,6 +50,8 @@ import ./make-test-python.nix ({ pkgs, ... }:
+ runMongoDBTest pkgs.mongodb-3_6
+ runMongoDBTest pkgs.mongodb-4_0
+ runMongoDBTest pkgs.mongodb-4_2
+ + runMongoDBTest pkgs.mongodb-4_4
+ + runMongoDBTest pkgs.mongodb-5_0
+ ''
node.shutdown()
'';
diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix
index fc7ab505ac2..f2d912a7861 100644
--- a/pkgs/applications/audio/ncspot/default.nix
+++ b/pkgs/applications/audio/ncspot/default.nix
@@ -7,20 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.9.5";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "sha256-HnP0dXKkMssDAhrsA99bTCVGdov9t5+1y8fJ+BWTM80=";
+ sha256 = "sha256-s2rWn6EK+io/yxQiWsWuXpqLOGd0F6ehWqVqgHBGZd0=";
};
- # Upstream now only supports rust 1.58+, but this version is not yet available in nixpkgs.
- # See https://github.com/hrkfdn/ncspot/issues/714
- patches = [ ./rust_1_57_support.patch ];
-
- cargoSha256 = "sha256-g6UMwirsSV+/NtFIfEZrz5h/OitPQcDeSawh7wq4TLI=";
+ cargoSha256 = "sha256-aorRy5j3VaOIibuHc6gf6HuB3g739T59vzbybehPirc=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/applications/audio/ncspot/rust_1_57_support.patch b/pkgs/applications/audio/ncspot/rust_1_57_support.patch
deleted file mode 100644
index ce4d473989c..00000000000
--- a/pkgs/applications/audio/ncspot/rust_1_57_support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/ui/listview.rs b/src/ui/listview.rs
-index 17fead7..e6c72b6 100644
---- a/src/ui/listview.rs
-+++ b/src/ui/listview.rs
-@@ -85,7 +85,7 @@ impl ListView {
-
- pub fn content_height_with_paginator(&self) -> usize {
- let content_len = self.content.read().unwrap().len();
-- log::info!("content len: {content_len}");
-+ log::info!("content len: {}", content_len);
-
- // add 1 more row for paginator if we can paginate
- if self.can_paginate() {
-@@ -97,7 +97,7 @@ impl ListView {
-
- fn can_paginate(&self) -> bool {
- let loaded = self.get_pagination().loaded_content();
-- log::info!("can paginate: {loaded}");
-+ log::info!("can paginate: {}", loaded);
- self.get_pagination().max_content().unwrap_or(0) > self.get_pagination().loaded_content()
- }
diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix
index 8dc15e7c9d8..5e9f4200141 100644
--- a/pkgs/applications/blockchains/zcash/default.nix
+++ b/pkgs/applications/blockchains/zcash/default.nix
@@ -1,24 +1,24 @@
{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper
-, cargo, pkg-config, curl, coreutils, boost175, db62, hexdump, libsodium
+, cargo, pkg-config, curl, coreutils, boost177, db62, hexdump, libsodium
, libevent, utf8cpp, util-linux, withDaemon ? true, withMining ? true
, withUtils ? true, withWallet ? true, withZmq ? true, zeromq
}:
rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
pname = "zcash";
- version = "4.6.0-1";
+ version = "4.6.0-2";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
rev = "v${version}";
- sha256 = "sha256-YJ5ufo+LYbOTr9SyiEzzp1pcSx6+cHSvDLBOIcx9X+4=";
+ sha256 = "sha256-RvUa8CKPBFfsqzrJkPHePZMqpCfyVafrUbftMdTviHA=";
};
- cargoSha256 = "sha256-m/SBHv3BNYKkSXxHnCdVng3blbHrTc/HxX/nEIa1DnM=";
+ cargoSha256 = "sha256-qWimataBZ/rLDOLgetNfFAzi/psXcJV54b3WGm9k+b4=";
nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ];
- buildInputs = [ boost175 libevent libsodium utf8cpp ]
+ buildInputs = [ boost177 libevent libsodium utf8cpp ]
++ lib.optional withWallet db62
++ lib.optional withZmq zeromq;
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec {
configureFlags = [
"--disable-tests"
- "--with-boost-libdir=${lib.getLib boost175}/lib"
+ "--with-boost-libdir=${lib.getLib boost177}/lib"
"CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp"
"RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}"
] ++ lib.optional (!withWallet) "--disable-wallet"
diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix
index b8a651b2d44..bfc413c24ad 100644
--- a/pkgs/applications/editors/bluej/default.nix
+++ b/pkgs/applications/editors/bluej/default.nix
@@ -1,8 +1,9 @@
-{ lib, stdenv, fetchurl, makeWrapper, jdk }:
+{ lib, stdenv, fetchurl, jdk, glib, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "bluej";
version = "5.0.3";
+
src = fetchurl {
# We use the deb here. First instinct might be to go for the "generic" JAR
# download, but that is actually a graphical installer that is much harder
@@ -11,18 +12,44 @@ stdenv.mkDerivation rec {
sha256 = "sha256-OarqmptxZc7xEEYeoCVqHXkAvfzfSYx5nUp/iWPyoqw=";
};
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ wrapGAppsHook ];
+ buildInputs = [ glib ];
- unpackPhase = ''
- ar xf $src
- tar xf data.tar.xz
+ sourceRoot = ".";
+ preUnpack = ''
+ unpackCmdHooks+=(_tryDebData)
+ _tryDebData() {
+ if ! [[ "$1" =~ \.deb$ ]]; then return 1; fi
+ ar xf "$1"
+ if ! [[ -e data.tar.xz ]]; then return 1; fi
+ unpackFile data.tar.xz
+ }
'';
installPhase = ''
- mkdir -p $out
- cp -r usr/* $out
+ runHook preInstall
+
+ if [ -n "$prefix" ]; then
+ mkdir -p "$prefix"
+ fi
+
+ mkdir -p "$out"
+
+ if shopt -q dotglob; then dotglobOpt=$?; else dotglobOpt=$?; fi
+ shopt -s dotglob
+ for file in usr/*; do
+ cp -R "$file" "$out"
+ done
+ if (( !dotglobOpt )); then shopt -u dotglob; fi
+
+ runHook postInstall
+ '';
+
+ dontWrapGApps = true;
+ preFixup = ''
makeWrapper ${jdk}/bin/java $out/bin/bluej \
+ "''${gappsWrapperArgs[@]}" \
--add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot"
'';
@@ -30,7 +57,7 @@ stdenv.mkDerivation rec {
description = "A simple integrated development environment for Java";
homepage = "https://www.bluej.org/";
license = licenses.gpl2ClasspathPlus;
- maintainers = [ maintainers.chvp ];
+ maintainers = with maintainers; [ chvp ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 46864a05570..f479c6686af 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -14,17 +14,17 @@ let
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "1j75ivy7lwxjpfhwsikk517a9bxhrbwfy8f8liql392839qryblj";
- x86_64-darwin = "0sjsrm31rbgq9j6hnry8f69mhhwlsd7drzz5jr31ljk75vgx3j8f";
- aarch64-linux = "1ll28djzf5xvc0yin1irxzn3nkizpgfz0azknaycjar261q3akdp";
- aarch64-darwin = "0mfhbdmz0db851mab83dmq654gwgdz9p20igwm9g5h4y6zrvdhg6";
- armv7l-linux = "1vicvzdj83vcj64rla9v5n9bmi0wgz507xxch3anjszah3n7ld89";
+ x86_64-linux = "1si0r8nww5m3yn3vzw0pk3nykfvxnlwna4pp11bsli4vqj1ym2nz";
+ x86_64-darwin = "002rkvc8fa7r9x2dsjhkwzmc1sp5mq998frrw5xd6bym0cp4j76l";
+ aarch64-linux = "0w9gjk2a5z8cqlg43jn2r588asymiklm1b28l54gvqp7jawlb0fd";
+ aarch64-darwin = "18h2kk6fcdz38xzyn37brbbj4nbrjgzv9xsz7c7iai8d01vh7s33";
+ armv7l-linux = "16cs2ald40nh76m3fxxfd233hr687dhwbqdkvjz4s6xxwi0rhvwc";
}.${system};
in
callPackage ./generic.nix rec {
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.66.1";
+ version = "1.66.2";
pname = "vscode";
executableName = "code" + lib.optionalString isInsiders "-insiders";
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 50bfcc48f2f..6f42778d31e 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -13,10 +13,10 @@ let
archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz";
sha256 = {
- x86_64-linux = "0r5bzy1r9f0rp2wvcb703vpcfclqn8d4n9g8p9021hz0llslfha7";
- x86_64-darwin = "15aawk2b7a5dack2bgnp4axki8y3n0ilncww15sjnvwbgk94d4pg";
- aarch64-linux = "0kq39jx9nrfikcfcylz2gcg2d89yw6gf9sc8blyg1yfimfr9jcjv";
- armv7l-linux = "0581ksdb1j9xsin7s505gk9kxhf3i5dw8yvyfkxck84wrrvfh6pq";
+ x86_64-linux = "1i76ix318y6b2dcfnisg13bp5d7nzvcx7zcpl94mkrn974db30pn";
+ x86_64-darwin = "1qk1vykl838vwsffyjpazx7x9ajwxczpgz5vhch16iikfz2vh1vk";
+ aarch64-linux = "13jifiqn2v17d6vwacq6aib1lzyp2021kjdswkp7wpx6ck5lkm21";
+ armv7l-linux = "1zhriscsmfcsagsp2ds0fn316fybs5f2f2r3w5q29jwczgcnlam4";
}.${system};
sourceRoot = {
@@ -31,7 +31,7 @@ in
# Please backport all compatible updates to the stable release.
# This is important for the extension ecosystem.
- version = "1.66.1";
+ version = "1.66.2";
pname = "vscodium";
executableName = "codium";
diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix
index e1524270fab..47a5e8d22fa 100644
--- a/pkgs/applications/networking/cluster/arkade/default.nix
+++ b/pkgs/applications/networking/cluster/arkade/default.nix
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "arkade";
- version = "0.8.22";
+ version = "0.8.23";
src = fetchFromGitHub {
owner = "alexellis";
repo = "arkade";
rev = version;
- sha256 = "sha256-mn/UX2xNMthCtXYFUXqiiPnMltwO2Hk/qveudEYAOZ0=";
+ sha256 = "sha256-y3NsYPGVlWA/N2AYw3EQKUwLeGYwRI29tC9iTPeyU3Q=";
};
CGO_ENABLED = 0;
- vendorSha256 = "sha256-An52QMjHaHRIicxCBpjgi+S2QeKXhB9rndjV+FIkS3c=";
+ vendorSha256 = "sha256-E+fjDW7UIAYDiDI8Eb8atAtccEIRcV5hqYdSxRYM9fc=";
# Exclude pkg/get: tests downloading of binaries which fail when sandbox=true
subPackages = [
diff --git a/pkgs/applications/networking/cluster/driftctl/default.nix b/pkgs/applications/networking/cluster/driftctl/default.nix
index 2961521af5f..9a3a024d58d 100644
--- a/pkgs/applications/networking/cluster/driftctl/default.nix
+++ b/pkgs/applications/networking/cluster/driftctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "driftctl";
- version = "0.27.0";
+ version = "0.28.0";
src = fetchFromGitHub {
owner = "snyk";
repo = "driftctl";
rev = "v${version}";
- sha256 = "sha256-C+3eXdSU4FdJVlFvZw8LH768Yx6xvlElV1wsKgoju4o=";
+ sha256 = "sha256-sh4A3f6Wnq9yic2p42SEvoIXeh0dm8pQ0e/5Pr04koE=";
};
- vendorSha256 = "sha256-verxBwk83Xgg3XEMZpOXD3j3IgE7G4rHWJTj09BW74g=";
+ vendorSha256 = "sha256-2mAPOUAv0ORRCMxesmcwZZh9SCa12k94y/iiN/rzUbs=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix
index 96c853d21e4..9dc32d67dff 100644
--- a/pkgs/applications/networking/cluster/starboard/default.nix
+++ b/pkgs/applications/networking/cluster/starboard/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "starboard";
- version = "0.15.3";
+ version = "0.15.4";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-EBjAB0uSMAyiVr6KxqrT/F+GIkntmOKNPHL1D0RBdG0=";
+ sha256 = "sha256-GhcHvKqYktBAPB443ZjJ3LYRJZorO7IH1OEnEQKUO0g=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -20,7 +20,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
- vendorSha256 = "sha256-BxXH+dJyAQRGAq25CljUImxYIT+nCQpmUPUjHOYF0kc=";
+ vendorSha256 = "sha256-ozbejIFR0mDgCgca+2yaPRiMMHLOEsC9u+kQUe69spc=";
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index 172cea3d061..6b5ad03366d 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -1,21 +1,27 @@
-{ lib, buildGoModule, fetchFromSourcehut
-, ncurses, notmuch, scdoc
-, python3, w3m, dante
+{ lib
+, buildGoModule
+, fetchFromSourcehut
+, ncurses
+, notmuch
+, scdoc
+, python3
+, w3m
+, dante
}:
buildGoModule rec {
pname = "aerc";
- version = "0.7.1";
+ version = "0.9.0";
src = fetchFromSourcehut {
owner = "~rjarry";
repo = pname;
rev = version;
- sha256 = "sha256-wiylBBqnivDnMUyCg3Zateu4jcjicTfrQFALT8dg5No=";
+ sha256 = "sha256-D4cZVNh3YFaVRHGFn5Nt6kMSRCShj0w5n7pTxgYik2s=";
};
proxyVendor = true;
- vendorSha256 = "sha256-hpGd78PWk3tIwB+TPmPy0gKkU8+t5NTm9RzPuLae+Fk=";
+ vendorSha256 = "sha256-fGQ15i3mWNmmfypRt5A7SAVYSEg9m4so4FYlUY+7mW8=";
doCheck = false;
@@ -28,6 +34,12 @@ buildGoModule rec {
./runtime-sharedir.patch
];
+ postPatch = ''
+ substituteAllInPlace config/aerc.conf
+ substituteAllInPlace config/config.go
+ substituteAllInPlace doc/aerc-config.5.scd
+ '';
+
pythonPath = [
python3.pkgs.colorama
];
diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
index e08161e61eb..d5e40edeb66 100644
--- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
+++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
@@ -1,60 +1,90 @@
-From c715a96c693baa0e6c8ab3c96b6c10e0a40bf7af Mon Sep 17 00:00:00 2001
-From: Tadeo Kondrak
-Date: Thu, 21 Jan 2021 10:40:49 +0100
-Subject: [PATCH] Fix aerc breaking every time the package is rebuilt.
-
-On NixOS, the SHAREDIR changes on every rebuild to the package, but aerc
-fills it in as part of the default config and then installs that config
-to the users home folder. Fix this by not substituting @SHAREDIR@ in the
-default config until runtime.
----
- Makefile | 2 +-
- config/config.go | 13 +++++++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 77f5e61..98cbc11 100644
---- a/Makefile
-+++ b/Makefile
-@@ -23,7 +23,7 @@ aerc: $(GOSRC)
- -o $@
-
- aerc.conf: config/aerc.conf.in
-- sed -e 's:@SHAREDIR@:$(SHAREDIR):g' > $@ < config/aerc.conf.in
-+ cat config/aerc.conf.in > $@
-
- debug: $(GOSRC)
- GOFLAGS="-tags=notmuch" \
+diff --git a/config/aerc.conf b/config/aerc.conf
+index fbbf587..ede1a03 100644
+--- a/config/aerc.conf
++++ b/config/aerc.conf
+@@ -107,8 +107,7 @@ next-message-on-delete=true
+ #
+ # ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
+ # ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
+-# /usr/local/share/aerc/stylesets
+-# /usr/share/aerc/stylesets
++# @out@/share/aerc/stylesets
+ #
+ # default: ""
+ stylesets-dirs=
+@@ -254,8 +253,7 @@ new-email=
+ #
+ # ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
+ # ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
+-# /usr/local/share/aerc/templates
+-# /usr/share/aerc/templates
++# @out@/share/aerc/templates
+ #
+ # default: ""
+ template-dirs=
diff --git a/config/config.go b/config/config.go
-index 87d183a..cb6611a 100644
+index 2120310..92b7655 100644
--- a/config/config.go
+++ b/config/config.go
-@@ -470,6 +470,16 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
- return nil, err
- }
+@@ -331,8 +331,8 @@ func buildDefaultDirs() []string {
}
-+ if sec, err := file.GetSection("templates"); err == nil {
-+ if key, err := sec.GetKey("template-dirs"); err == nil {
-+ sec.NewKey("template-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir))
-+ }
-+ }
-+ if sec, err := file.GetSection("ui"); err == nil {
-+ if key, err := sec.GetKey("stylesets-dirs"); err == nil {
-+ sec.NewKey("stylesets-dirs", strings.ReplaceAll(key.String(), "@SHAREDIR@", sharedir))
-+ }
-+ }
- file.NameMapper = mapName
- config := &AercConfig{
- Bindings: BindingConfig{
-@@ -547,6 +557,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) {
- return nil, err
- }
-
-+ for i, filter := range config.Filters {
-+ config.Filters[i].Command = strings.ReplaceAll(filter.Command, "@SHAREDIR@", sharedir)
-+ }
- if ui, err := file.GetSection("general"); err == nil {
- if err := ui.MapTo(&config.General); err != nil {
- return nil, err
---
-2.30.0
+
+ // Add fixed fallback locations
+- defaultDirs = append(defaultDirs, "/usr/local/share/aerc")
+- defaultDirs = append(defaultDirs, "/usr/share/aerc")
++ defaultDirs = append(defaultDirs, "@out@/local/share/aerc")
++ defaultDirs = append(defaultDirs, "@out@/share/aerc")
+
+ return defaultDirs
+ }
+diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
+index 885c4f8..77a853e 100644
+--- a/doc/aerc-config.5.scd
++++ b/doc/aerc-config.5.scd
+@@ -12,7 +12,7 @@ account credentials. We look for these files in your XDG config home plus
+ "aerc", which defaults to ~/.config/aerc.
+
+ Examples of these config files are typically included with your installation of
+-aerc and are usually installed in /usr/share/aerc.
++aerc and are usually installed in @out@/share/aerc.
+
+ Each file uses the _ini_ format, and consists of sections with keys and values.
+ A line beginning with # is considered a comment and ignored, as are empty lines.
+@@ -221,8 +221,7 @@ These options are configured in the *[ui]* section of aerc.conf.
+ ```
+ ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
+ ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
+- /usr/local/share/aerc/stylesets
+- /usr/share/aerc/stylesets
++ @out@/share/aerc/stylesets
+ ```
+
+ Default: ""
+@@ -381,7 +380,7 @@ against (non-case-sensitive) and a comma, e.g. subject,text will match a
+ subject which contains "text". Use header,~regex to match against a regex.
+
+ aerc ships with some default filters installed in the share directory (usually
+-_/usr/share/aerc/filters_). Note that these may have additional dependencies
++_@out@/share/aerc/filters_). Note that these may have additional dependencies
+ that aerc does not have alone.
+
+ ## TRIGGERS
+@@ -407,7 +406,7 @@ and forward commands can be called with the -T flag with the name of the
+ template name.
+
+ aerc ships with some default templates installed in the share directory (usually
+-_/usr/share/aerc/templates_).
++_@out@/share/aerc/templates_).
+
+ These options are configured in the *[templates]* section of aerc.conf.
+
+@@ -419,8 +418,7 @@ These options are configured in the *[templates]* section of aerc.conf.
+ ```
+ ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
+ ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
+- /usr/local/share/aerc/templates
+- /usr/share/aerc/templates
++ @out@/share/aerc/templates
+ ```
+
+ Default: ""
diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 829ebedc1e8..573f69fef00 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -10,13 +10,13 @@
buildPythonApplication rec {
pname = "git-machete";
- version = "3.7.2";
+ version = "3.8.0";
src = fetchFromGitHub {
owner = "virtuslab";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-7WaLUCJr29i7JW5YAJG1AuYnSLKRMpAEnCY2i4Zle+c=";
+ sha256 = "sha256-WVPcyooShgFPZaIfEzV2zUA6tCHhuTM8MbrGVNr0neM=";
};
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 7fe27da6080..eb87a20e3eb 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
- version = "2.22";
+ version = "2.23";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
- sha256 = "sha256-oVwvoZdjD6V3CHECZOYBSYVtCX1XwW5fynyCn7Oj+Bc=";
+ sha256 = "sha256-YW6MBX/NGQXuFWvzISWKJZkvxWc0jasxmzy/Zh1TjY0=";
};
# Fix 'NameError: name 'ssl' is not defined'
diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index d6f2c128908..6c6ba7e93ec 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -8,16 +8,16 @@
buildPythonPackage rec {
pname = "aioshelly";
- version = "1.0.11";
+ version = "2.0.0";
format = "setuptools";
- disabled = pythonOlder "3.8";
+ disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = pname;
rev = version;
- hash = "sha256-N+8vmB41AUu4aTUTBYX6SPVsW1PARaq5mCOdhg9h0/g=";
+ hash = "sha256-1bIlK/5UoGq6xTjcpkAkHPBlM+ifZhnbWzGbPRdFGkU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix
index 4543d009849..5a6ad1f0fac 100644
--- a/pkgs/development/python-modules/elkm1-lib/default.nix
+++ b/pkgs/development/python-modules/elkm1-lib/default.nix
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "elkm1-lib";
- version = "1.2.2";
+ version = "1.3.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "gwww";
repo = "elkm1";
rev = version;
- hash = "sha256-JZohQ0xLFfLVMGlw89uC9OQF6SMddcCOsotshavynCk=";
+ hash = "sha256-z6iiXMvBZs4JshQofQpPA7u89wu8owW1wi+JAYk/R9k=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix
index ec3b134f16b..32a27cf5441 100644
--- a/pkgs/development/python-modules/gspread/default.nix
+++ b/pkgs/development/python-modules/gspread/default.nix
@@ -7,12 +7,12 @@
}:
buildPythonPackage rec {
- version = "5.3.0";
+ version = "5.3.2";
pname = "gspread";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-viIg4ZcjVw7ZjouOtqW24Er6DwjsHwi4niF8NUSIoEc=";
+ sha256 = "sha256-MZdm2Q2wUFYpP37grSs1UDoaQGg6dYl6KSI5jNIBYoM=";
};
propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ];
diff --git a/pkgs/development/python-modules/mariadb/default.nix b/pkgs/development/python-modules/mariadb/default.nix
index 987fe203edb..93260e9aac2 100644
--- a/pkgs/development/python-modules/mariadb/default.nix
+++ b/pkgs/development/python-modules/mariadb/default.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "mariadb";
- version = "1.0.10";
+ version = "1.0.11";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-eQKLpgURc9rRrQvnUYOJyrcCOfkrT/i4gT2uVcPyxT0=";
+ hash = "sha256-dpFsiSvJNsWw824loUEfZRp7fOl4mSrjqN5+KD79rL8=";
extension = "zip";
};
diff --git a/pkgs/development/python-modules/openhomedevice/default.nix b/pkgs/development/python-modules/openhomedevice/default.nix
index 57c0182abd7..533a6f66f7f 100644
--- a/pkgs/development/python-modules/openhomedevice/default.nix
+++ b/pkgs/development/python-modules/openhomedevice/default.nix
@@ -8,14 +8,16 @@
buildPythonPackage rec {
pname = "openhomedevice";
- version = "2.0.1";
+ version = "2.0.2";
+ format = "setuptools";
+
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "bazwilliams";
repo = pname;
rev = version;
- sha256 = "sha256-BQgwXg15+xEGfPm0HJWpKXbNuCgc0VcAD5AuVSDXd8g=";
+ hash = "sha256-D4n/fv+tgdKiU7CemI+12cqoox2hsqRYlCHY7daD5fM=";
};
propagatedBuildInputs = [
@@ -26,7 +28,10 @@ buildPythonPackage rec {
# Tests are currently outdated
# https://github.com/bazwilliams/openhomedevice/issues/20
doCheck = false;
- pythonImportsCheck = [ "openhomedevice" ];
+
+ pythonImportsCheck = [
+ "openhomedevice"
+ ];
meta = with lib; {
description = "Python module to access Linn Ds and Openhome devices";
diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix
index 9a3f46d476c..45ad26ab279 100644
--- a/pkgs/development/python-modules/pytest-astropy/default.nix
+++ b/pkgs/development/python-modules/pytest-astropy/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "pytest-astropy";
- version = "0.9.0";
+ version = "0.10.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "7cdac1b2a5460f37477a329712c3a5d4af4ddf876b064731995663621be4308b";
+ sha256 = "sha256-hePGbO7eTOZo9HOzzzd/yyqjxI4k8oqqN3roYATM4hE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index 09c2c1ca7a6..e2c48948b97 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pyupgrade";
- version = "2.31.1";
+ version = "2.32.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "asottile";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-l4wF/I3wsA9nowIdLjNPUxCaTPBu5v5oPQ3oNbLh+/o=";
+ sha256 = "sha256-VSGi93R8O0LGKFBkWMclje64suOqq/Gf2vE2OHXLP5Q=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix
index a9319779060..e9c054bdd4e 100644
--- a/pkgs/development/python-modules/simple-salesforce/default.nix
+++ b/pkgs/development/python-modules/simple-salesforce/default.nix
@@ -4,13 +4,18 @@
, authlib
, requests
, nose
+, pythonOlder
, pytz
, responses
+, zeep
}:
buildPythonPackage rec {
pname = "simple-salesforce";
version = "1.11.6";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
@@ -22,6 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
authlib
requests
+ zeep
];
checkInputs = [
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index 7b817adb33e..b2362d8ed77 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "stripe";
- version = "2.71.0";
+ version = "2.72.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-38AE/EOfylmYsVVBTyq46Ou3WJ5LdJJlP0usgQCDYcM=";
+ hash = "sha256-nKjoejNzV9IAjSdP9WNi8hnnNnEDC+KmNnSN7rE3d/s=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile
index ca8e09704a1..0b886ee1b14 100644
--- a/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -93,6 +93,7 @@ source 'https://rubygems.org' do
gem 'nokogiri'
gem 'opus-ruby'
gem 'ovirt-engine-sdk'
+ gem 'pandocomatic'
gem 'pango'
gem 'patron'
gem 'pcaprub'
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index d9d973d0ff5..8fcd53cf48f 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
- version = "0.174.1";
+ version = "0.175.1";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
- sha256 = "sha256-lfj6KyB9QYvUy4Ybo8f30omAg4K/jT5MEERJPm0aJ7U=";
+ sha256 = "sha256-40Kc/Qg0ppTQLU2ySbKXZyhap3hH4BiIMhJeNDU6mKA=";
};
makeFlags = [ "FLOW_RELEASE=1" ];
diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix
index dca74fa76b7..81f7aa764f2 100644
--- a/pkgs/development/tools/asmfmt/default.nix
+++ b/pkgs/development/tools/asmfmt/default.nix
@@ -5,7 +5,7 @@
buildGoPackage rec {
pname = "asmfmt";
- version = "1.2.3";
+ version = "1.3.2";
goPackagePath = "github.com/klauspost/asmfmt";
@@ -13,7 +13,7 @@ buildGoPackage rec {
owner = "klauspost";
repo = "asmfmt";
rev = "v${version}";
- sha256 = "0f2cgwxs2b2kpq5348h8hjkcqc40p8ajapzpcy9ia2fsmsn2a2s4";
+ sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc=";
};
goDeps = ./deps.nix;
diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix
index 4aefc02e152..d0f02795ce3 100644
--- a/pkgs/development/tools/go-containerregistry/default.nix
+++ b/pkgs/development/tools/go-containerregistry/default.nix
@@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in
buildGoModule rec {
pname = "go-containerregistry";
- version = "0.6.0";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "google";
repo = pname;
rev = "v${version}";
- sha256 = "0sk3g1i4w8sh40y1ffa61ap7jsscdvnhvh09k8nznydi465csbmq";
+ sha256 = "sha256-TbMx+DVIYzhQ50f7sDXfhQnT/U6U+G9GTUbtYSu4/KI=";
};
vendorSha256 = null;
diff --git a/pkgs/development/tools/htmltest/default.nix b/pkgs/development/tools/htmltest/default.nix
index 06e92e3639f..aac3096a722 100644
--- a/pkgs/development/tools/htmltest/default.nix
+++ b/pkgs/development/tools/htmltest/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "htmltest";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "wjdp";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-lj+bR27huswHemF8M+G69PblqnQQUWsg4jtLfz89yVY=";
+ sha256 = "sha256-Om3jnaHFEq8XJZhGolPax2NH7PFqtqMG5Rd7JTBdGf8=";
};
vendorSha256 = "0zx3ii9crick647kslzwg4d39li6jds938f9j9dp287rhrlzjfbm";
diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix
index c07f1bbcb4c..4aa1b8c0b91 100644
--- a/pkgs/development/tools/misc/circleci-cli/default.nix
+++ b/pkgs/development/tools/misc/circleci-cli/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circleci-cli";
- version = "0.1.17087";
+ version = "0.1.17110";
src = fetchFromGitHub {
owner = "CircleCI-Public";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-abXJ91U/qh/bitms1ZLxgAr80swFk8sBGPUHi08+Kcc=";
+ sha256 = "sha256-zCX6LWIPiHDOnSBE+BeePjeQ1evTWhLY0Pqk7NmMMlc=";
};
vendorSha256 = "sha256-7u2y1yBVpXf+D19tslD4s3B1KmABl4OWNzzLaBNL/2U=";
diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix
index a3f3c7ce440..031d2a4b3ac 100644
--- a/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/default.nix
@@ -64,13 +64,13 @@ let
in stdenv.mkDerivation rec {
pname = "omnisharp-roslyn";
- version = "1.38.1";
+ version = "1.38.2";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = pname;
rev = "v${version}";
- sha256 = "At8yfp5SDwPSoJM/WdQEBM4EG8q2SlHvp8qZIc9ftlE=";
+ sha256 = "7XJIdotfffu8xo+S6xlc1zcK3oY9QIg1CJhCNJh5co0=";
};
nativeBuildInputs = [ makeWrapper dotnet-sdk ];
diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix
index 2744a81f758..0d3bba7722b 100644
--- a/pkgs/development/tools/omnisharp-roslyn/deps.nix
+++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix
@@ -177,82 +177,90 @@
}
{
pname = "microsoft.codeanalysis.common";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.2.0-1.22074.8/microsoft.codeanalysis.common.4.2.0-1.22074.8.nupkg";
- sha256 = "113232x2s787mm0bfvw0iiy5gl2wxs9jw6yrsxah2h7mg8q0s1h8";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.2.0-3.22169.1/microsoft.codeanalysis.common.4.2.0-3.22169.1.nupkg";
+ sha256 = "0505svp6y5nbmkh22gz6g4bcxxsmbpc9jy08h8lz5z4i3bikl30b";
};
}
{
pname = "microsoft.codeanalysis.csharp";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.2.0-1.22074.8/microsoft.codeanalysis.csharp.4.2.0-1.22074.8.nupkg";
- sha256 = "017cljjhqyjxdp66f1l1pwxdi2qbfkbabih41frp93n0ips4qzkb";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.2.0-3.22169.1/microsoft.codeanalysis.csharp.4.2.0-3.22169.1.nupkg";
+ sha256 = "1shvi06n4n2yxvmjzvvx5h9zcc1jwqjfcxr2lbagdcq9bmnvlikw";
};
}
{
pname = "microsoft.codeanalysis.csharp.features";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.2.0-1.22074.8/microsoft.codeanalysis.csharp.features.4.2.0-1.22074.8.nupkg";
- sha256 = "04x7jdvlrg4syc3w3j2l3rz9icd6p64km3caaa93pb53k1wmhqb0";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.2.0-3.22169.1/microsoft.codeanalysis.csharp.features.4.2.0-3.22169.1.nupkg";
+ sha256 = "1aq1qqdvq06h6247m3hpgzkgwpj3a48jl5b98hp4aj9kb5wkmnil";
};
}
{
pname = "microsoft.codeanalysis.csharp.scripting";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.2.0-1.22074.8/microsoft.codeanalysis.csharp.scripting.4.2.0-1.22074.8.nupkg";
- sha256 = "1lbgxqwi07wfy1xsvqkd4lsw0rmbjkdnwzmzpzaa2lf9k07p9n3h";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.2.0-3.22169.1/microsoft.codeanalysis.csharp.scripting.4.2.0-3.22169.1.nupkg";
+ sha256 = "0nhng62lfn4r300g2z3vp4qw51w8vzb5gl3wkd77p9lx2n1ma7n2";
};
}
{
pname = "microsoft.codeanalysis.csharp.workspaces";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.2.0-1.22074.8/microsoft.codeanalysis.csharp.workspaces.4.2.0-1.22074.8.nupkg";
- sha256 = "0jq0g8yi105vap8ssxir86ysmpj61gqh6lgfg2k0y1q67swganlw";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.2.0-3.22169.1/microsoft.codeanalysis.csharp.workspaces.4.2.0-3.22169.1.nupkg";
+ sha256 = "16vsx5yb3fmyx1nqnbsd5iy46v7s0gf8aikxl12yy7ajdd4mapxj";
+ };
+ }
+ {
+ pname = "microsoft.codeanalysis.elfie";
+ version = "1.0.0-rc14";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.codeanalysis.elfie/1.0.0-rc14/microsoft.codeanalysis.elfie.1.0.0-rc14.nupkg";
+ sha256 = "0774fkq08a3h0yn22glfcvwzrwc0ll7dh71k0p1mg7m3biyy8a2f";
};
}
{
pname = "microsoft.codeanalysis.externalaccess.omnisharp";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.2.0-1.22074.8/microsoft.codeanalysis.externalaccess.omnisharp.4.2.0-1.22074.8.nupkg";
- sha256 = "0wbbdqvzy0viz4vy6w1vpzjr7gpirkmvz5lcfvcvxv5ygjvxxi2w";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.2.0-3.22169.1/microsoft.codeanalysis.externalaccess.omnisharp.4.2.0-3.22169.1.nupkg";
+ sha256 = "02c7m8gy3jkbvn8dcrzc00ngg80xq90cfa1yspk4y4pdcjf6mrbc";
};
}
{
pname = "microsoft.codeanalysis.externalaccess.omnisharp.csharp";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.2.0-1.22074.8/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.2.0-1.22074.8.nupkg";
- sha256 = "0k5lr898hywfcbkfyiz60c28ccd1dka9l07b3c6ccmbpc68ras1w";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.2.0-3.22169.1/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.2.0-3.22169.1.nupkg";
+ sha256 = "1wj6r0ara77fibvxh8s518isgwxwcd41c0iw7fmvz2pd94l16hgz";
};
}
{
pname = "microsoft.codeanalysis.features";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.2.0-1.22074.8/microsoft.codeanalysis.features.4.2.0-1.22074.8.nupkg";
- sha256 = "1h0wsw4zg0f36ib3hjcc9y2y8jhaazwy17j2jv17363abbc3pf3l";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.2.0-3.22169.1/microsoft.codeanalysis.features.4.2.0-3.22169.1.nupkg";
+ sha256 = "1xpsjsxm7hnl9wzfp0nz9prv72jgf0r9ljqynab3gaipsdaswddk";
};
}
{
pname = "microsoft.codeanalysis.scripting.common";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.2.0-1.22074.8/microsoft.codeanalysis.scripting.common.4.2.0-1.22074.8.nupkg";
- sha256 = "06xzv4jlmz1q9v5r6d2ak734wwskld66maqp763nq3h62nhrxyxg";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.2.0-3.22169.1/microsoft.codeanalysis.scripting.common.4.2.0-3.22169.1.nupkg";
+ sha256 = "0w0z3njcbq6n0a24xvxcp461898zlkwqs6p1gdpnpxks5vvgah12";
};
}
{
pname = "microsoft.codeanalysis.workspaces.common";
- version = "4.2.0-1.22074.8";
+ version = "4.2.0-3.22169.1";
src = fetchurl {
- url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.2.0-1.22074.8/microsoft.codeanalysis.workspaces.common.4.2.0-1.22074.8.nupkg";
- sha256 = "09fivivc5s2p7iy5939gizs7kyvhn647sgjz55dbhmla5z774l80";
+ url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.2.0-3.22169.1/microsoft.codeanalysis.workspaces.common.4.2.0-3.22169.1.nupkg";
+ sha256 = "0psy2ifls96mif6kvr242v1s1zmawdljwmcxaj20rl3m7v0nlwmd";
};
}
{
@@ -273,10 +281,10 @@
}
{
pname = "microsoft.diasymreader";
- version = "1.4.0-beta2-21528-02";
+ version = "1.4.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.diasymreader/1.4.0-beta2-21528-02/microsoft.diasymreader.1.4.0-beta2-21528-02.nupkg";
- sha256 = "14yfqjfmibyzipy0rdvknvy19brydac9llzrzj82wv6kwb8ap5x2";
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.diasymreader/1.4.0/microsoft.diasymreader.1.4.0.nupkg";
+ sha256 = "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d";
};
}
{
@@ -543,14 +551,6 @@
sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2";
};
}
- {
- pname = "microsoft.net.stringtools";
- version = "1.0.0";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg";
- sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj";
- };
- }
{
pname = "microsoft.netcore.app.host.win-arm64";
version = "6.0.3";
@@ -623,14 +623,6 @@
sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0";
};
}
- {
- pname = "microsoft.netcore.platforms";
- version = "2.1.2";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/2.1.2/microsoft.netcore.platforms.2.1.2.nupkg";
- sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141";
- };
- }
{
pname = "microsoft.netcore.platforms";
version = "3.0.0";
@@ -679,6 +671,14 @@
sha256 = "1bqinq2nxnpqxziypg1sqy3ly0nymxxjpn8fwkn3rl4vl6gdg3rc";
};
}
+ {
+ pname = "microsoft.net.stringtools";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.net.stringtools/1.0.0/microsoft.net.stringtools.1.0.0.nupkg";
+ sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj";
+ };
+ }
{
pname = "microsoft.sourcelink.common";
version = "1.0.0";
@@ -711,6 +711,14 @@
sha256 = "08c6d9aiicpj8hsjb77rz7d2vmw7ivkcc0l1vgdgxddzjhjpy0pi";
};
}
+ {
+ pname = "microsoft.visualstudio.remotecontrol";
+ version = "16.3.44";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.remotecontrol/16.3.44/microsoft.visualstudio.remotecontrol.16.3.44.nupkg";
+ sha256 = "0kjvxpx45vvaxqm6k632gqi0zaw7w5m4h8wgmsaj15r4ihl49c3a";
+ };
+ }
{
pname = "microsoft.visualstudio.sdk.embedinteroptypes";
version = "15.0.12";
@@ -751,6 +759,14 @@
sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2";
};
}
+ {
+ pname = "microsoft.visualstudio.utilities.internal";
+ version = "16.3.36";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.visualstudio.utilities.internal/16.3.36/microsoft.visualstudio.utilities.internal.16.3.36.nupkg";
+ sha256 = "1sg4vjm7735rkvxdmsb7wvjqrxy4gcvhhczv5dhpjayg7885k8cx";
+ };
+ }
{
pname = "microsoft.visualstudio.validation";
version = "15.5.31";
@@ -775,6 +791,14 @@
sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7";
};
}
+ {
+ pname = "microsoft.win32.registry";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/microsoft.win32.registry/4.5.0/microsoft.win32.registry.4.5.0.nupkg";
+ sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q";
+ };
+ }
{
pname = "microsoft.win32.registry";
version = "4.6.0";
@@ -1311,6 +1335,38 @@
sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5";
};
}
+ {
+ pname = "runtime.win10-arm64.runtime.native.system.io.compression";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/runtime.win10-arm64.runtime.native.system.io.compression/4.3.0/runtime.win10-arm64.runtime.native.system.io.compression.4.3.0.nupkg";
+ sha256 = "1jrmrmqscn8cn2n3piar8n85gfsra7vlai23w9ldzprh0y4dw3v1";
+ };
+ }
+ {
+ pname = "runtime.win7.system.private.uri";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/runtime.win7.system.private.uri/4.3.0/runtime.win7.system.private.uri.4.3.0.nupkg";
+ sha256 = "0bxkcmklp556dc43bra8ngc8wymcbbflcydi0xwq0j22gm66xf2m";
+ };
+ }
+ {
+ pname = "runtime.win7-x64.runtime.native.system.io.compression";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x64.runtime.native.system.io.compression/4.3.0/runtime.win7-x64.runtime.native.system.io.compression.4.3.0.nupkg";
+ sha256 = "1dmbmksnxg12fk2p0k7rzy16448mddr2sfrnqs0rhhrzl0z22zi5";
+ };
+ }
+ {
+ pname = "runtime.win7-x86.runtime.native.system.io.compression";
+ version = "4.3.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x86.runtime.native.system.io.compression/4.3.0/runtime.win7-x86.runtime.native.system.io.compression.4.3.0.nupkg";
+ sha256 = "08ppln62lcq3bz2kyxqyvh98payd5a7w8fzmb53mznkcfv32n55b";
+ };
+ }
{
pname = "runtime.win.microsoft.win32.primitives";
version = "4.3.0";
@@ -1367,76 +1423,44 @@
sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr";
};
}
- {
- pname = "runtime.win10-arm64.runtime.native.system.io.compression";
- version = "4.3.0";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/runtime.win10-arm64.runtime.native.system.io.compression/4.3.0/runtime.win10-arm64.runtime.native.system.io.compression.4.3.0.nupkg";
- sha256 = "1jrmrmqscn8cn2n3piar8n85gfsra7vlai23w9ldzprh0y4dw3v1";
- };
- }
- {
- pname = "runtime.win7-x64.runtime.native.system.io.compression";
- version = "4.3.0";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x64.runtime.native.system.io.compression/4.3.0/runtime.win7-x64.runtime.native.system.io.compression.4.3.0.nupkg";
- sha256 = "1dmbmksnxg12fk2p0k7rzy16448mddr2sfrnqs0rhhrzl0z22zi5";
- };
- }
- {
- pname = "runtime.win7-x86.runtime.native.system.io.compression";
- version = "4.3.0";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/runtime.win7-x86.runtime.native.system.io.compression/4.3.0/runtime.win7-x86.runtime.native.system.io.compression.4.3.0.nupkg";
- sha256 = "08ppln62lcq3bz2kyxqyvh98payd5a7w8fzmb53mznkcfv32n55b";
- };
- }
- {
- pname = "runtime.win7.system.private.uri";
- version = "4.3.0";
- src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/runtime.win7.system.private.uri/4.3.0/runtime.win7.system.private.uri.4.3.0.nupkg";
- sha256 = "0bxkcmklp556dc43bra8ngc8wymcbbflcydi0xwq0j22gm66xf2m";
- };
- }
{
pname = "sqlitepclraw.bundle_green";
- version = "2.0.4";
+ version = "2.0.7";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.bundle_green/2.0.4/sqlitepclraw.bundle_green.2.0.4.nupkg";
- sha256 = "1197ynpm4fl6il9vi0mi1s1pmw3rk3j0a05kwrxpqlfgp7iwhc22";
+ url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.bundle_green/2.0.7/sqlitepclraw.bundle_green.2.0.7.nupkg";
+ sha256 = "083saqlwx1hbhy0rv7vi973aw7jv8q53fcxlrprx1wgxdwnbi5ni";
};
}
{
pname = "sqlitepclraw.core";
- version = "2.0.4";
+ version = "2.0.7";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.0.4/sqlitepclraw.core.2.0.4.nupkg";
- sha256 = "0lb5vwfl1hd24xzzdaj2p4k2hv2k0i3mgdri6fjj0ssb37mcyir1";
+ url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.core/2.0.7/sqlitepclraw.core.2.0.7.nupkg";
+ sha256 = "0b25qz3h1aarza2b74alsl9v6czns3y61i8p10yqgd9djk1b1byj";
};
}
{
pname = "sqlitepclraw.lib.e_sqlite3";
- version = "2.0.4";
+ version = "2.0.7";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.lib.e_sqlite3/2.0.4/sqlitepclraw.lib.e_sqlite3.2.0.4.nupkg";
- sha256 = "0kmx1w5qllmwxldr8338qxwmpfzc6g2lmyrah7wfaxd3mvfzky5c";
+ url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.lib.e_sqlite3/2.0.7/sqlitepclraw.lib.e_sqlite3.2.0.7.nupkg";
+ sha256 = "0wkrzcpc9vcd27gwj6w537i1i5i3h5zsips8b9v9ngk003n50mia";
};
}
{
pname = "sqlitepclraw.provider.dynamic_cdecl";
- version = "2.0.4";
+ version = "2.0.7";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.dynamic_cdecl/2.0.4/sqlitepclraw.provider.dynamic_cdecl.2.0.4.nupkg";
- sha256 = "084r98kilpm0q1aw41idq8slncpd7cz65g0m1wr0p8d12x8z5g6j";
+ url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.dynamic_cdecl/2.0.7/sqlitepclraw.provider.dynamic_cdecl.2.0.7.nupkg";
+ sha256 = "1kmyf4v4157n2194j17ijf62xnqiapxhg4aka851zx0hzlxm7ygp";
};
}
{
pname = "sqlitepclraw.provider.e_sqlite3";
- version = "2.0.4";
+ version = "2.0.7";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.e_sqlite3/2.0.4/sqlitepclraw.provider.e_sqlite3.2.0.4.nupkg";
- sha256 = "1vm8w8xvqi11sihdz5s6y4w7ghq4pp5f2ksixdhlbycvs6m4h7i7";
+ url = "https://api.nuget.org/v3-flatcontainer/sqlitepclraw.provider.e_sqlite3/2.0.7/sqlitepclraw.provider.e_sqlite3.2.0.7.nupkg";
+ sha256 = "1davv3fqd05353d7dl7wm2sg58fyy59b29pk58w1vf7m33580grj";
};
}
{
@@ -1551,6 +1575,14 @@
sha256 = "0aa27jz73qb0xm6dyxv22qhfrmyyqjyn2dvvsd9asi82lcdh9i61";
};
}
+ {
+ pname = "system.composition";
+ version = "6.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.composition/6.0.0/system.composition.6.0.0.nupkg";
+ sha256 = "1p7hysns39cc24af6dwd4m48bqjsrr3clvi4aws152mh2fgyg50z";
+ };
+ }
{
pname = "system.composition.attributedmodel";
version = "1.0.31";
@@ -1559,6 +1591,14 @@
sha256 = "1ipyb86hvw754kmk47vjmzyilvj5hymg9nqabz70sbgsz1fygrdv";
};
}
+ {
+ pname = "system.composition.attributedmodel";
+ version = "6.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.composition.attributedmodel/6.0.0/system.composition.attributedmodel.6.0.0.nupkg";
+ sha256 = "1mqrblb0l65hw39d0hnspqcv85didpn4wbiwhfgj4784wzqx2w6k";
+ };
+ }
{
pname = "system.composition.convention";
version = "1.0.31";
@@ -1567,6 +1607,14 @@
sha256 = "00gqcdrql7vhynxh4xq0s9j5nw27kghmn2n773v7lhzjh3ash18r";
};
}
+ {
+ pname = "system.composition.convention";
+ version = "6.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.composition.convention/6.0.0/system.composition.convention.6.0.0.nupkg";
+ sha256 = "02km3yb94p1c4s7liyhkmda0g71zm1rc8ijsfmy4bnlkq15xjw3b";
+ };
+ }
{
pname = "system.composition.hosting";
version = "1.0.31";
@@ -1575,6 +1623,14 @@
sha256 = "1f1bnk3j7ndx9r7zpzibmrhw78clys1pspl20j2dhnmkiwhl23vy";
};
}
+ {
+ pname = "system.composition.hosting";
+ version = "6.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.composition.hosting/6.0.0/system.composition.hosting.6.0.0.nupkg";
+ sha256 = "0big5nk8c44rxp6cfykhk7rxvn2cgwa99w6c3v2a36adc3lj36ky";
+ };
+ }
{
pname = "system.composition.runtime";
version = "1.0.31";
@@ -1583,6 +1639,14 @@
sha256 = "1shfybfzsn4g6aim4pggb5ha31g0fz2kkk0519c4vj6m166g39ws";
};
}
+ {
+ pname = "system.composition.runtime";
+ version = "6.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.composition.runtime/6.0.0/system.composition.runtime.6.0.0.nupkg";
+ sha256 = "0vq5ik63yii1784gsa2f2kx9w6xllmm8b8rk0arid1jqdj1nyrlw";
+ };
+ }
{
pname = "system.composition.typedparts";
version = "1.0.31";
@@ -1591,6 +1655,22 @@
sha256 = "1m4j19zx50lbbdx1xxbgpsd1dai2r3kzkyapw47kdvkb89qjkl63";
};
}
+ {
+ pname = "system.composition.typedparts";
+ version = "6.0.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.composition.typedparts/6.0.0/system.composition.typedparts.6.0.0.nupkg";
+ sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72";
+ };
+ }
+ {
+ pname = "system.configuration.configurationmanager";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.configuration.configurationmanager/4.5.0/system.configuration.configurationmanager.4.5.0.nupkg";
+ sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c";
+ };
+ }
{
pname = "system.configuration.configurationmanager";
version = "4.7.0";
@@ -1607,6 +1687,14 @@
sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay";
};
}
+ {
+ pname = "system.data.datasetextensions";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.data.datasetextensions/4.5.0/system.data.datasetextensions.4.5.0.nupkg";
+ sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma";
+ };
+ }
{
pname = "system.diagnostics.debug";
version = "4.0.11";
@@ -1775,6 +1863,14 @@
sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw";
};
}
+ {
+ pname = "system.io.filesystem.accesscontrol";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.io.filesystem.accesscontrol/4.5.0/system.io.filesystem.accesscontrol.4.5.0.nupkg";
+ sha256 = "1gq4s8w7ds1sp8f9wqzf8nrzal40q5cd2w4pkf4fscrl2ih3hkkj";
+ };
+ }
{
pname = "system.io.filesystem.primitives";
version = "4.0.1";
@@ -1801,10 +1897,10 @@
}
{
pname = "system.io.pipelines";
- version = "5.0.1";
+ version = "6.0.1";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/5.0.1/system.io.pipelines.5.0.1.nupkg";
- sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v";
+ url = "https://api.nuget.org/v3-flatcontainer/system.io.pipelines/6.0.1/system.io.pipelines.6.0.1.nupkg";
+ sha256 = "0b6zvhhfdxx0wx3bzyvxbq0mk8l5lbjak5124sn0gkif5jb388w4";
};
}
{
@@ -1839,6 +1935,14 @@
sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv";
};
}
+ {
+ pname = "system.memory";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.memory/4.5.0/system.memory.4.5.0.nupkg";
+ sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30";
+ };
+ }
{
pname = "system.memory";
version = "4.5.3";
@@ -2135,6 +2239,14 @@
sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29";
};
}
+ {
+ pname = "system.runtime.compilerservices.unsafe";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.runtime.compilerservices.unsafe/4.5.0/system.runtime.compilerservices.unsafe.4.5.0.nupkg";
+ sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43";
+ };
+ }
{
pname = "system.runtime.compilerservices.unsafe";
version = "4.5.2";
@@ -2399,6 +2511,14 @@
sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6";
};
}
+ {
+ pname = "system.security.cryptography.protecteddata";
+ version = "4.5.0";
+ src = fetchurl {
+ url = "https://api.nuget.org/v3-flatcontainer/system.security.cryptography.protecteddata/4.5.0/system.security.cryptography.protecteddata.4.5.0.nupkg";
+ sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7";
+ };
+ }
{
pname = "system.security.cryptography.protecteddata";
version = "4.7.0";
@@ -2505,10 +2625,10 @@
}
{
pname = "system.text.encoding.codepages";
- version = "4.5.1";
+ version = "6.0.0";
src = fetchurl {
- url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/4.5.1/system.text.encoding.codepages.4.5.1.nupkg";
- sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w";
+ url = "https://api.nuget.org/v3-flatcontainer/system.text.encoding.codepages/6.0.0/system.text.encoding.codepages.6.0.0.nupkg";
+ sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww";
};
}
{
diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix
new file mode 100644
index 00000000000..32c10a1bf5d
--- /dev/null
+++ b/pkgs/development/tools/rbspy/default.nix
@@ -0,0 +1,25 @@
+{rustPlatform, fetchFromGitHub, lib}:
+rustPlatform.buildRustPackage rec {
+ pname = "rbspy";
+ version = "0.11.1";
+
+ src = fetchFromGitHub {
+ owner = pname;
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-9BeQHwwnirK5Wquj6Tal8yCU/NXZGaPjXZe3cy5m98s=";
+ };
+
+ cargoSha256 = "sha256-DHdfv6210wAkL9vXxLr76ejFWU/eV/q3lmgsYa5Rn54=";
+ doCheck = true;
+
+ meta = with lib; {
+ homepage = "https://rbspy.github.io/";
+ description = ''
+ A Sampling CPU Profiler for Ruby.
+ '';
+ license = licenses.mit;
+ maintainers = with maintainers; [ viraptor ];
+ platforms = platforms.linux ++ platforms.darwin;
+ };
+}
diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix
index fa2fe98f76c..1bcb1f4fc60 100644
--- a/pkgs/development/web/deno/default.nix
+++ b/pkgs/development/web/deno/default.nix
@@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
- version = "1.19.1";
+ version = "1.20.5";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-BqwiconG5hn5RPV+hlKu6e6+GjZA4Im/dD+no3IduYw=";
+ sha256 = "sha256-j8aYps70yPH7excYdU99zWbtVsr/ok5cRX2Z6DAW0qU=";
};
- cargoSha256 = "sha256-q/5AezLQgN7WdGsbHoxX5riJMlxw3cTFhVs5OvCeI5U=";
+ cargoSha256 = "sha256-NIUb9ifA06cPwMU3tY0lWJLcK8a8hjkdu/nlADPxWNg=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix
index a1ea206fabd..d60fdad1b08 100644
--- a/pkgs/development/web/deno/librusty_v8.nix
+++ b/pkgs/development/web/deno/librusty_v8.nix
@@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
- version = "0.40.0";
+ version = "0.41.0";
shas = {
- x86_64-linux = "sha256-VHkopvK6f5lxdFLBywHe0Z+su2g5hgBsLcTxrwFgq0Y=";
- aarch64-linux = "sha256-awWjziqqUDAl9fcLADUjytLFds1y93y5gZoOtvReL9w=";
- x86_64-darwin = "sha256-WlRnGiJK3iFgTjNzr25rvmmiPAICPRLaD5hbys7MoJA=";
- aarch64-darwin = "sha256-zblcAQVwnLQWh85wajg8CalqxycSR+4WGoSC2dnX7jA=";
+ x86_64-linux = "sha256-f5HWLe1wF6nA+e5SwWd+DwXtYnOrcXI8kLIwdi8scmg=";
+ aarch64-linux = "sha256-tLCR1CBeM+1vRThsJNtEtKH6iJluxdCfnbCNkQQjNfM=";
+ x86_64-darwin = "sha256-KVBskUTr1SXL/hm9gnHvGGd3TO3QVESiZy0EYXDwPo0=";
+ aarch64-darwin = "sha256-KjBO6cgibo98P8n1kiMIT1cJ7Aa6BnQeMku71j4sgZY=";
};
}
diff --git a/pkgs/servers/nosql/mongodb/4.4.nix b/pkgs/servers/nosql/mongodb/4.4.nix
new file mode 100644
index 00000000000..7dd74e24fc4
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/4.4.nix
@@ -0,0 +1,14 @@
+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
+
+let
+ buildMongoDB = callPackage ./mongodb.nix {
+ inherit sasl boost Security CoreFoundation cctools;
+ };
+in
+buildMongoDB {
+ version = "4.4.13";
+ sha256 = "sha256-ebg3R6P+tjRvizDzsl7mZzhTfqIaRJPfHBu0IfRvtS8=";
+ patches = [
+ ./forget-build-dependencies-4-4.patch
+ ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-4.patch ];
+}
diff --git a/pkgs/servers/nosql/mongodb/5.0.nix b/pkgs/servers/nosql/mongodb/5.0.nix
new file mode 100644
index 00000000000..6bb2294cfff
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/5.0.nix
@@ -0,0 +1,25 @@
+{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }:
+
+let
+ buildMongoDB = callPackage ./mongodb.nix {
+ inherit sasl boost Security CoreFoundation cctools;
+ };
+ variants = if stdenv.isLinux then
+ {
+ version = "5.0.7";
+ sha256 = "sha256-1PeDBZJNqJXHH/cSh2e+WR0PfS/b7XuJEzkkbrRT/gc=";
+ }
+ else
+ {
+ version = "5.0.3"; # at least darwin has to stay on 5.0.3 until the SDK used by nixpkgs is bumped to 10.13
+ sha256 = "1p9pq0dfd6lynvnz5p1c8dqp4filzrz86j840xwxwx82dm1zl6p0";
+ };
+in
+buildMongoDB {
+ version = variants.version;
+ sha256 = variants.sha256;
+ patches = [
+ ./forget-build-dependencies-4-4.patch
+ ./asio-no-experimental-string-view-4-4.patch
+ ];
+}
diff --git a/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-4.patch b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-4.patch
new file mode 100644
index 00000000000..b27145d57ec
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/asio-no-experimental-string-view-4-4.patch
@@ -0,0 +1,23 @@
+--- a/src/third_party/asio-master/asio/include/asio/detail/config.hpp
+--- b/src/third_party/asio-master/asio/include/asio/detail/config.hpp
+@@ -831,20 +831,8 @@
+ # endif // (__cplusplus >= 201402)
+ # endif // (_LIBCPP_VERSION < 7000)
+ # else // defined(ASIO_HAS_CLANG_LIBCXX)
+-# if (__cplusplus >= 201402)
+-# if __has_include()
+-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
+-# endif // __has_include()
+-# endif // (__cplusplus >= 201402)
+ # endif // // defined(ASIO_HAS_CLANG_LIBCXX)
+ # endif // defined(__clang__)
+-# if defined(__GNUC__)
+-# if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
+-# if (__cplusplus >= 201402)
+-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
+-# endif // (__cplusplus >= 201402)
+-# endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4)
+-# endif // defined(__GNUC__)
+ # endif // !defined(ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
+ #endif // !defined(ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW)
+
diff --git a/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-4.patch b/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-4.patch
new file mode 100644
index 00000000000..1c3e0982a8c
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/forget-build-dependencies-4-4.patch
@@ -0,0 +1,33 @@
+--- a/site_scons/mongo/generators.py
++++ b/site_scons/mongo/generators.py
+@@ -34,30 +34,12 @@ def default_buildinfo_environment_data():
+ False,
+ ),
+ (
+- 'ccflags',
+- '$CCFLAGS',
+- True,
+- False,
+- ),
+- (
+ 'cxx',
+ '$CXX_VERSION',
+ True,
+ False,
+ ),
+ (
+- 'cxxflags',
+- '$CXXFLAGS',
+- True,
+- False,
+- ),
+- (
+- 'linkflags',
+- '$LINKFLAGS',
+- True,
+- False,
+- ),
+- (
+ 'target_arch',
+ '$TARGET_ARCH',
+ True,
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 7c66d348ffb..28795890069 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, sconsPackages, boost, gperftools, pcre-cpp, snappy, zlib, libyamlcpp
-, sasl, openssl, libpcap, curl, Security, CoreFoundation, cctools }:
+, sasl, openssl, libpcap, python3, curl, Security, CoreFoundation, cctools, xz }:
# Note:
# The command line tools are written in Go as part of a different package (mongodb-tools)
@@ -8,12 +8,12 @@ with lib;
{ version, sha256, patches ? []
, license ? lib.licenses.sspl
-}@args:
+}:
let
variants = if versionAtLeast version "4.2"
then rec { python = scons.python.withPackages (ps: with ps; [ pyyaml cheetah3 psutil setuptools ]);
- scons = sconsPackages.scons_latest;
+ scons = sconsPackages.scons_3_1_2.override { python = python3; }; # 4.2 < mongodb <= 5.0.x needs scons 3.x built with python3
mozjsVersion = "60";
mozjsReplace = "defined(HAVE___SINCOS)";
}
@@ -44,7 +44,9 @@ in stdenv.mkDerivation rec {
inherit sha256;
};
- nativeBuildInputs = [ variants.scons ];
+ nativeBuildInputs = [ variants.scons ]
+ ++ lib.optionals (versionAtLeast version "4.4") [ xz ];
+
buildInputs = [
boost
curl
@@ -70,7 +72,6 @@ in stdenv.mkDerivation rec {
--replace "env = Environment(" "env = Environment(ENV = os.environ,"
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0
-
substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
substituteInPlace src/third_party/s2/s1interval.cc --replace drem remainder
substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder
@@ -95,7 +96,8 @@ in stdenv.mkDerivation rec {
"--use-sasl-client"
"--disable-warnings-as-errors"
"VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld
- ] ++ map (lib: "--use-system-${lib}") system-libraries;
+ ] ++ lib.optionals (versionAtLeast version "4.4") [ "--link-model=static" ]
+ ++ map (lib: "--use-system-${lib}") system-libraries;
preBuild = ''
sconsFlags+=" CC=$CC"
@@ -119,7 +121,9 @@ in stdenv.mkDerivation rec {
runHook postInstallCheck
'';
- prefixKey = "--prefix=";
+ installTargets = if (versionAtLeast version "4.4") then "install-core" else "install";
+
+ prefixKey = if (versionAtLeast version "4.4") then "DESTDIR=" else "--prefix=";
enableParallelBuilding = true;
diff --git a/pkgs/servers/nosql/mongodb/v4_2.nix b/pkgs/servers/nosql/mongodb/v4_2.nix
index e638cddd232..3759cc1e6d5 100644
--- a/pkgs/servers/nosql/mongodb/v4_2.nix
+++ b/pkgs/servers/nosql/mongodb/v4_2.nix
@@ -9,8 +9,8 @@ let
inherit cctools;
};
in buildMongoDB {
- version = "4.2.17";
- sha256 = "sha256-4ynvImVjN674VdD/bJ55Vy/IrOlMN8iZb2PAhxwbv1A=";
+ version = "4.2.19";
+ sha256 = "sha256-fngTHd+fSdHqiqQYOYS7o6P5eHybeZy3iNKkGzFmjTw=";
patches =
[ ./forget-build-dependencies-4-2.patch ]
++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view-4-2.patch ];
diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
index fb62bdd94ee..6f0a22167a9 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix
@@ -1,26 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql, openssl, zlib, readline, libkrb5 }:
+{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline, libkrb5 }:
stdenv.mkDerivation rec {
pname = "pg_auto_failover";
- version = "1.6.3";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "citusdata";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-hGpcHV4ai9mxaJ/u/o9LNFWPGsW22W7ak2pbvAUgmwU=";
+ sha256 = "sha256-MzMKVS86ymfRwZqTzJsdophRrIIPDp50Wpt7QkGA6Nc=";
};
- patches = [
- # Pull upstream fix for ncurses-6.3 support:
- # https://github.com/citusdata/pg_auto_failover/pull/830
- (fetchpatch {
- name = "ncurses-6.3.patch";
- url = "https://github.com/citusdata/pg_auto_failover/commit/fc92546965437a6d5f82ed9a6bdc8204a3bca725.patch";
- sha256 = "sha256-t4DC/d/2s/Mc44rpFxBMOWGhACG0s5wAWyeDD7Mefo8=";
- })
- ];
-
buildInputs = [ postgresql openssl zlib readline libkrb5 ];
installPhase = ''
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix
index fdb9a37806a..c031051e89a 100644
--- a/pkgs/tools/admin/eksctl/default.nix
+++ b/pkgs/tools/admin/eksctl/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "eksctl";
- version = "0.92.0";
+ version = "0.93.0";
src = fetchFromGitHub {
owner = "weaveworks";
repo = pname;
rev = version;
- sha256 = "sha256-CsOR5S2FpIE/T1N/wLzXs5ltuLkice0YRKgdZUTz3ic=";
+ sha256 = "sha256-Ku6GmUaaiw1pePIWJcJgSjnLWiAfFsG8BGphT+4z6ss=";
};
- vendorSha256 = "sha256-gNmIBjGG/EieNNjC7XLOD/SXQm96kRxbiT2JmdaPrh4=";
+ vendorSha256 = "sha256-ATrEDavlr14i0L28KEuivlRjVxnnFVZPDjZ4Ni+8kbo=";
doCheck = false;
diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix
index b494ed7e997..af2f1ee352a 100644
--- a/pkgs/tools/admin/google-cloud-sdk/data.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/data.nix
@@ -1,32 +1,32 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
- version = "370.0.0";
+ version = "381.0.0";
googleCloudSdkPkgs = {
x86_64-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-x86_64.tar.gz";
- sha256 = "0qkgny15k8bni5zwkqqcn9h7nzy9g71ykbxf33g3zni7l2icy985";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-x86_64.tar.gz";
+ sha256 = "1m5npilxagnl8zdx2i5vgcgalbcsnd4zvi0f2y5ic3dlfgibmlxb";
};
x86_64-darwin =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-darwin-x86_64.tar.gz";
- sha256 = "15p1gvwd1wzjl6a4pa7madbakvy5xmjd0k0mp6c7ci8rwgi431g0";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-darwin-x86_64.tar.gz";
+ sha256 = "0vdbm2pl2wbyrdlf5dxs0djs6dn7kv17qvl8jxca8ylz2k296a0x";
};
aarch64-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-arm.tar.gz";
- sha256 = "1xgxg6w7j8y7q8glzji69sh5g3bz1jhjk6jhmmv68c1l7p5na3bg";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-arm.tar.gz";
+ sha256 = "03mkhp7kvakv8bzpj9yk9anj8y5k7iina876f7dcsbm9fiwl4g9w";
};
aarch64-darwin =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-darwin-arm.tar.gz";
- sha256 = "19ywsi52sla9wprgmrhlr3q91np9pacspjj58qb7m506pl44hmk4";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-darwin-arm.tar.gz";
+ sha256 = "1dsfn7rdmg1m7d9cfirl6xsdwzbzh6v62xp6nd9b17s05d4sh0kl";
};
i686-linux =
{
- url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-370.0.0-linux-x86.tar.gz";
- sha256 = "0k4c1kgkvbhwm5fy3yfc2i9rlf7wf186v20nl428dd9742ppa92f";
+ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-381.0.0-linux-x86.tar.gz";
+ sha256 = "0y95lvky62f7pfz4g3476ci239p5c8q9p9l2xh59x38xaa69gnvb";
};
};
}
diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh
index 2aae6129db5..b26950087a1 100755
--- a/pkgs/tools/admin/google-cloud-sdk/update.sh
+++ b/pkgs/tools/admin/google-cloud-sdk/update.sh
@@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou
# Version of Google Cloud SDK from
# https://cloud.google.com/sdk/docs/release-notes
-VERSION="370.0.0"
+VERSION="381.0.0"
function genMainSrc() {
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
index 6ff6c838708..204fc2be589 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,7 +1,7 @@
{ lib, stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
- versionMajor = "7.8";
+ versionMajor = "7.9";
versionMinor = "2";
versionBuild_x86_64 = "1";
versionBuild_i686 = "1";
@@ -14,12 +14,12 @@ in
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
- sha256 = "sha256-DZtEt3zBhkvANlCvDwhFY3X+46zzhmKrm6zKPA99w7o=";
+ sha256 = "sha256-Gsi0Hj6cfpxzr0zbWfsq0ZJvCPATQn9YvHbx0Cziia4=";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
- sha256 = "sha256-T38lOp4R1CoU6TZYeYcZkeZUi9l613LxLUZaEScOcHg=";
+ sha256 = "sha256-zmXOLzFePAD+oH00bAkNsEFviQwkjjqC/gAv87E1qX4=";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index 8ea8855a100..3b9051ae510 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "debianutils";
- version = "4.11.2";
+ version = "5.7";
src = fetchurl {
- url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz";
- sha256 = "1pjh2s5f8qp8jaky2x08yvf125np0s48zb2z6f3h6x4vf20hws1v";
+ url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.orig.tar.gz";
+ sha256 = "sha256-J+yeDn5E3Iq2EapXYzBHG6ywfkSR/+zw06ppCckvkCI=";
};
meta = with lib; {
diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix
index 650be8cd480..4f25b996f78 100644
--- a/pkgs/tools/misc/infracost/default.nix
+++ b/pkgs/tools/misc/infracost/default.nix
@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "infracost";
- version = "0.9.21";
+ version = "0.9.22";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
- sha256 = "sha256-LoIZbA1K1s3ZLHlRz2SOFxC4nv/Vgpae0qdxIcvAVRQ=";
+ sha256 = "sha256-JYC5wsv3JIqzv2woHits3wMpvPZ70lVrAZDh/DB1SVE=";
};
- vendorSha256 = "sha256-TfO3+pGxR9dPzigkx89a/Ak+tKiBa6Z0a6U4kIdRsSQ=";
+ vendorSha256 = "sha256-/B3hXHRNk6DJ6iC0RalsoWsb6vK0md8asnLkhSAeHXU=";
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
@@ -18,17 +18,18 @@ buildGoModule rec {
nativeBuildInputs = [ installShellFiles ];
- # -short only runs the unit-tests tagged short
- checkFlags = [ "-short" ];
- checkPhase = ''
- runHook preCheck
+ preCheck = ''
+ # Feed in all tests for testing
+ # This is because subPackages above limits what is built to just what we
+ # want but also limits the tests
+ unset subPackages
+
+ # checkFlags aren't correctly passed through via buildGoModule so we use buildFlagsArray
+ # -short only runs the unit-tests tagged short
+ buildFlagsArray+="-short"
# remove tests that require networking
rm cmd/infracost/{breakdown,diff,hcl,run}_test.go
- # checkFlags aren't correctly passed through via buildGoModule
- go test $checkFlags ''${ldflags:+-ldflags="$ldflags"} -v -p $NIX_BUILD_CORES ./...
-
- runHook postCheck
'';
postInstall = ''
diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix
index 7e824cf90ca..13d54c5f90c 100644
--- a/pkgs/tools/misc/mutagen/default.nix
+++ b/pkgs/tools/misc/mutagen/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "mutagen";
- version = "0.11.8";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "mutagen-io";
repo = pname;
rev = "v${version}";
- sha256 = "17ycd2y7hgwa2yxbin86i6aj67x7xaajwz3mqgdyfvkja5hgbjyr";
+ sha256 = "sha256-WFEbiPyE029q9+ZXYioESXLm9fmpwihaNwgLcPYQYFE=";
};
- vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l";
+ vendorSha256 = "sha256-kMX0E3yCg+wRaVMRWNSkeW+dN8b/EG04C0P77x9TQC0=";
agents = fetchzip {
name = "mutagen-agents-${version}";
@@ -21,7 +21,7 @@ buildGoModule rec {
extraPostFetch = ''
rm $out/mutagen # Keep only mutagen-agents.tar.gz.
'';
- sha256 = "0k8iif09kvxfxx6qm5qmkf3lr7ar6i98ivkndimj680ah9v1hkj8";
+ sha256 = "sha256-QwPOt2pK9fRPrfvpc6qqr/uBZ/XK8CMlYNSLb7eWzg4=";
};
doCheck = false;
diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix
index d36a1fa8a4a..2d24c8292b6 100644
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "cosign";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "sigstore";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-TyU5aznt3xra23Q52LUmvWlHYkw0s7E3Wqw9ppmzScw=";
+ sha256 = "sha256-Jxtu4f3JeQ1LH2IjSc5hRKDrWXllczQWWHBa4eTzOIY=";
};
buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@@ -16,7 +16,7 @@ buildGoModule rec {
nativeBuildInputs = [ pkg-config installShellFiles ];
- vendorSha256 = "sha256-WhixkCKW/vQ6J3vJp+KX0JmZxHN38nzzAi5TS2lF3CM=";
+ vendorSha256 = "sha256-fBmSuxjguNc1LOoXqOue0/Ki3979NpqJTzuuqqsjooM=";
subPackages = [
"cmd/cosign"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c76aba7468d..91ac2e105a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14302,7 +14302,9 @@ with pkgs;
inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { };
- infracost = callPackage ../tools/misc/infracost { };
+ infracost = callPackage ../tools/misc/infracost {
+ buildGoModule = buildGo118Module;
+ };
msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { };
@@ -21804,6 +21806,20 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
+ mongodb-4_4 = callPackage ../servers/nosql/mongodb/4.4.nix {
+ sasl = cyrus_sasl;
+ boost = boost17x.override { enableShared = false; };
+ inherit (darwin) cctools;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ };
+
+ mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix {
+ sasl = cyrus_sasl;
+ boost = boost17x.override { enableShared = false; };
+ inherit (darwin) cctools;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+ };
+
nginx-sso = callPackage ../servers/nginx-sso { };
percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { };
@@ -34009,6 +34025,8 @@ with pkgs;
rauc = callPackage ../tools/misc/rauc { };
+ rbspy = callPackage ../development/tools/rbspy { };
+
redprl = callPackage ../applications/science/logic/redprl { };
renderizer = callPackage ../development/tools/renderizer {};
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 9e64afe31f3..4933478950e 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "121zl6435dwz1d14xviyynxj4njbawbv1ljxj5p0cxlhql1n3jsm";
+ sha256 = "05abj034rvyc1hgywp1gvj8bkxgp151aryxgmivxzk6sd29saq9q";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
actionmailbox = {
dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"];
@@ -16,10 +16,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1jkxqdp9ha8pm2cd61ajs2pgn41adz3x1f8yqvdca3fvfrlgirjg";
+ sha256 = "0ryx9y27m6bp6mwkk0v6sq48kpvq9i15pwhfvq2gvkph1d41vx1k";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
actionmailer = {
dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"];
@@ -27,10 +27,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0r27a5g0r7b27mzcl150hdc7ljgl5iyrxw1z4wn3n1jfb7xs5rkq";
+ sha256 = "0qsns7caqymk0zm5nn5dylqzgjvdjs96fp8l0ycadi5j2q93klxg";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
actionpack = {
dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
@@ -38,10 +38,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0q27kqcl369g9y7sxxcfigrm1yyj3q22kd135l7ahx977vcy5hjm";
+ sha256 = "1yb36akfg61zq210sc9y1l3a0jz10m61a81iqxiczknsfh9d76rb";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
actiontext = {
dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"];
@@ -49,10 +49,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0yya6xda23q8p3knvg5c8zfqk7xwnkjplf2bxnvmipn88918cz6w";
+ sha256 = "0bky0ixc4b1si0zhywm8cds73bvxprga86yap3z8p95irarziybq";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
actionview = {
dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"];
@@ -60,10 +60,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nc0v74mdlag3kxcby0rrcz2ivvc94sfdrw3zm5ng2qrchh56w1b";
+ sha256 = "1nldiqlj9jlnfvqblhk6c4md77nqri24ln10ajhfbgrx9b6h140h";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
activejob = {
dependencies = ["activesupport" "globalid"];
@@ -71,10 +71,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yshbsy4k8702x9jv90yr6cjjpn5vxlw42pb878g70cgp2wq45r3";
+ sha256 = "12ycizvhxcp7mz99g6ap9y67z5n2wy0bbbm8s5il765xsfizi76k";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
activemodel = {
dependencies = ["activesupport"];
@@ -82,10 +82,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vr3ayykc1s7n12ajddcyff751v9j48yfimgxrys6qsxj89gmnmh";
+ sha256 = "1r2657xaa6zfvp3y04nrl4hnjpvd9m9sl7hs83q4nbnclkgzhb4w";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
activerecord = {
dependencies = ["activemodel" "activesupport"];
@@ -93,10 +93,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dpn1r1v2165bx9wj07rh1g27jl49yr6kyd34xhkd48hxfadq3jb";
+ sha256 = "104jdjghliw33zmivlmvq70l40dyyz6gh1qsb0z82n9wyp861s18";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
activestorage = {
dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"];
@@ -104,10 +104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pxjxyjgh4al11k7z1lbnsc5wx5dnraz95p2wx00dkrvpgw8gm8b";
+ sha256 = "143bfqq9m1mvmvm4s7qvgqzfl8fqa46a45kz5f4v0zfbflqx6f6v";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
@@ -115,21 +115,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6";
+ sha256 = "1jpydd414j0fig3r0f6ci67mchclg6cq2qgqbq9zplrbg40pzfi8";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
addressable = {
- dependencies = ["idn-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "sha256-920p0tH1S2xqSa7Fj5WDsI2X4IjCJ6P8upL2xlMdWQg=";
+ sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs";
type = "gem";
};
- version = "2.8.0";
+ version = "2.4.0";
};
ansi = {
groups = ["default"];
@@ -312,10 +311,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "10vcm1dadj5sjrg31afzv7h1f0irhc7va5sr5y0fcvlkg2hms8jk";
+ sha256 = "03qb3k30j05b20xhjcp30p384n3aw5b5g1y2s2wrmndfizjv4hr9";
type = "gem";
};
- version = "3.4.3";
+ version = "3.4.4";
};
cocoapods = {
dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored" "escape" "fourflusher" "molinillo" "nap" "xcodeproj"];
@@ -715,10 +714,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0py4n868h0whr5n8a4943nyagkpf0vnldk9nyizgf1q1lmrj1pkx";
+ sha256 = "00y9g79lzfffxarj3rmhnkblsnyx7izx91mh8c1sdcs9y2pdfq53";
type = "gem";
};
- version = "1.4.3";
+ version = "1.4.4";
};
daemons = {
groups = ["default"];
@@ -879,10 +878,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bkh80zzjpfglm14rhz116qgz0nb5gvk3ydfjpg14av5407srgh1";
+ sha256 = "1yff4s5b8wcrk9ldils2k84l46m9nxr0my0wxchzdmgjbjdfsvww";
type = "gem";
};
- version = "0.90.0";
+ version = "0.92.0";
};
execjs = {
groups = ["default"];
@@ -900,10 +899,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
+ sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4";
type = "gem";
};
- version = "1.9.3";
+ version = "1.10.0";
};
faraday-em_http = {
groups = ["default"];
@@ -1044,10 +1043,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0l5zk5pzyrydavyw2ai6yz97alg4qvd93mb19m6460vzrj6x00qg";
+ sha256 = "06m6hxq8vspx9h9bgc2s19m56jzasvl45vblrfv1q5h1qg1k6amw";
type = "gem";
};
- version = "2.2.4";
+ version = "2.3.0";
};
fog-dnsimple = {
dependencies = ["fog-core" "fog-json"];
@@ -1076,10 +1075,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mprf1dwznz5ld0q1jpbyl59fwnwk6azspnd0am7zz7kfg3pxhv5";
+ sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl";
type = "gem";
};
- version = "0.3.0";
+ version = "1.1.0";
};
fourflusher = {
groups = ["default"];
@@ -1318,10 +1317,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
+ sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem";
};
- version = "1.8.11";
+ version = "1.10.0";
};
iconv = {
groups = ["default"];
@@ -1519,10 +1518,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan";
+ sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0";
type = "gem";
};
- version = "1.5.0";
+ version = "1.6.1";
};
json = {
groups = ["default"];
@@ -1612,10 +1611,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "17rvbrqcci1579d7dpbsfmz1f9g7msk82lyh9ip5h29dkrnixcgg";
+ sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23";
type = "gem";
};
- version = "2.13.0";
+ version = "2.15.0";
};
mab = {
groups = ["default"];
@@ -1756,10 +1755,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z";
+ sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy";
type = "gem";
};
- version = "2.7.1";
+ version = "2.8.0";
};
minitest = {
groups = ["default"];
@@ -1786,10 +1785,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6";
+ sha256 = "1cshgsx3hmpgx639xyqjqa2q3hgrhlyr9rpwhsglsx529alqq125";
type = "gem";
};
- version = "1.4.2";
+ version = "1.4.5";
};
multi_json = {
groups = ["default"];
@@ -1973,10 +1972,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11";
+ sha256 = "1p6b3q411h2mw4dsvhjrp1hh66hha5cm69fqg85vn2lizz71n6xz";
type = "gem";
};
- version = "1.13.1";
+ version = "1.13.3";
};
octokit = {
dependencies = ["faraday" "sawyer"];
@@ -1989,6 +1988,16 @@
};
version = "4.22.0";
};
+ optimist = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
+ type = "gem";
+ };
+ version = "3.0.1";
+ };
opus-ruby = {
dependencies = ["ffi"];
groups = ["default"];
@@ -2022,6 +2031,17 @@
};
version = "4.4.1";
};
+ pandocomatic = {
+ dependencies = ["optimist" "paru"];
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0cdhkc7vp8hcb86ps94all4hrvhzfgs4d98kvss5rqh34v7ibs6m";
+ type = "gem";
+ };
+ version = "0.2.8";
+ };
pango = {
dependencies = ["cairo-gobject" "gobject-introspection"];
groups = ["default"];
@@ -2054,6 +2074,16 @@
};
version = "2.7.2.0";
};
+ paru = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0h9ab29r6fmblklxvhkpifmmpyzq7qw01lca00sn2ikkx2in3g6v";
+ type = "gem";
+ };
+ version = "0.4.3";
+ };
patron = {
groups = ["default"];
platforms = [];
@@ -2079,10 +2109,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj";
+ sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb";
type = "gem";
};
- version = "1.2.3";
+ version = "1.3.4";
};
pkg-config = {
groups = ["default"];
@@ -2163,10 +2193,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xblxnrs0c5m326v7kgr32k4m00cl2ipcf5m0qvyisrw62vd5dbn";
+ sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56";
type = "gem";
};
- version = "5.5.2";
+ version = "5.6.2";
};
racc = {
groups = ["default"];
@@ -2194,10 +2224,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "159a4j4kragqh0z0z8vrpilpmaisnlz3n7kgiyf16bxkwlb3qlhz";
+ sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
rack-test = {
dependencies = ["rack"];
@@ -2216,10 +2246,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1yfqhxa89331mk0z33l12pvzdm4y35fx41kjb2p9jzl06jhz00rz";
+ sha256 = "10x2vb9rd3zpnp6f9vv60kmv9hlrcg4dxk9z5vhcdpkjbh3j8kpf";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
rails-dom-testing = {
dependencies = ["activesupport" "nokogiri"];
@@ -2249,10 +2279,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0gi4q1j3n7vb79ijsqjgy1fnqqxypk4zdj61kic4py19pn6xqaxw";
+ sha256 = "12jxqfalhac6q3v0rasm5r5c406knngrgdblhl41m753gn9hrzx4";
type = "gem";
};
- version = "7.0.1";
+ version = "7.0.2.3";
};
rainbow = {
groups = ["default"];
@@ -2279,10 +2309,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is";
+ sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm";
type = "gem";
};
- version = "0.11.0";
+ version = "0.11.1";
};
rb-inotify = {
dependencies = ["ffi"];
@@ -2352,10 +2382,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "03r9739q3vq38g456snf3rk9hadf955bs5im6qs6m69h19mrz2yw";
+ sha256 = "1lhdfkl4r6dnhlr8jpz4a21ca6c76jfy7fj7gf4j2qpbh8ld8qyb";
type = "gem";
};
- version = "4.5.1";
+ version = "4.6.0";
};
redis-rack = {
dependencies = ["rack" "redis-store"];
@@ -2363,10 +2393,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1nblbxg1f051dn83jp92lz3lc1wxm18nviglrabv2l0vz6rd0pkb";
+ sha256 = "0k3pn706wnf7lb24l6hwsi00c8rx693hvgfnccw3qj1y635ywwh8";
type = "gem";
};
- version = "2.1.3";
+ version = "2.1.4";
};
redis-store = {
dependencies = ["redis"];
@@ -2374,20 +2404,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0cpzbf2svnk4j5awb24ncl0mih45zkbdrd7q23jdg1r8k3q7mdg6";
+ sha256 = "0787fwmlvpx5k360dxlcs8r7vijgl2iyvh3zyvl7qyvgshw78k3v";
type = "gem";
};
- version = "1.9.0";
+ version = "1.9.1";
};
regexp_parser = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "008yn8j44414qxhn1c0nxp4a70rq0bqhz70hnjpgx8cjh2g0makp";
+ sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
type = "gem";
};
- version = "2.2.0";
+ version = "2.2.1";
};
rest-client = {
dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
@@ -2457,10 +2487,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1dwai7jnwmdmd7ajbi2q0k0lx1dh88knv5wl7c34wjmf94yv8w5q";
+ sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9";
type = "gem";
};
- version = "3.10.0";
+ version = "3.11.0";
};
rspec-core = {
dependencies = ["rspec-support"];
@@ -2468,10 +2498,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0wwnfhxxvrlxlk1a3yxlb82k2f9lm0yn0598x7lk8fksaz4vv6mc";
+ sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6";
type = "gem";
};
- version = "3.10.1";
+ version = "3.11.0";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -2479,10 +2509,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1qrj2j9jcd3m4aksk4kbv439882yl3z1harv2jrybrgjgdzdz7zs";
+ sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53";
type = "gem";
};
- version = "3.10.2";
+ version = "3.11.0";
};
rspec-mocks = {
dependencies = ["diff-lcs" "rspec-support"];
@@ -2490,20 +2520,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1d13g6kipqqc9lmwz5b244pdwc97z15vcbnbq6n9rlf32bipdz4k";
+ sha256 = "0y38dc66yhnfcf4ky3k47c20xak1rax940s4a96qkjxqrniy5ys3";
type = "gem";
};
- version = "3.10.2";
+ version = "3.11.0";
};
rspec-support = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0pjckrh8q6sqxy38xw7f4ziylq1983k84xh927s6352pps68zj35";
+ sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03";
type = "gem";
};
- version = "3.10.3";
+ version = "3.11.0";
};
rubocop = {
dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
@@ -2636,10 +2666,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0x00xqq666wfi53w2bb7lgqrr3diyakncbr4sxpbvkd2yvvra913";
+ sha256 = "0m94p1fdgn6m16vnw4qs3ja2xd8kiz1z67glyp0c56g0bfghbx3q";
type = "gem";
};
- version = "1.3.0";
+ version = "1.4.2";
};
safe_yaml = {
groups = ["default"];
@@ -2711,20 +2741,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0k7iz98xfv84dkdjk2d90vxnzrjqx20gg6k3fdm45q5rnp2lb9j7";
+ sha256 = "1s98gvp8fzxyz57lvnmb44vn93d4cyipw4qwk1ykikgml289zqwy";
type = "gem";
};
- version = "0.11.8";
+ version = "0.11.9";
};
sequel = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0z0s3xq6dmak96296dchi8j61m0cih7j9pzdpxxsh786vrpznwlj";
+ sha256 = "1wzb16vyslr7bpy7g5k2m35yz90bpf12f3pzj5w6icf1vldnc3nf";
type = "gem";
};
- version = "5.52.0";
+ version = "5.54.0";
};
sequel_pg = {
dependencies = ["pg" "sequel"];
@@ -2732,10 +2762,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0mkbnc96bfpl5wqacblzwiwqywbx4vqrvkz57fj1h2f0bn635nk6";
+ sha256 = "1m0ywaql7naj5y823s8h413gzc9h3vd4yr6mws94rcr8dr9hky77";
type = "gem";
};
- version = "1.14.0";
+ version = "1.15.0";
};
simplecov = {
dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"];
@@ -2763,10 +2793,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19r15hyvh52jx7fmsrcflb58xh8l7l0zx4sxkh3hqzhq68y81pjl";
+ sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j";
type = "gem";
};
- version = "0.1.3";
+ version = "0.1.4";
};
sinatra = {
dependencies = ["mustermann" "rack" "rack-protection" "tilt"];
@@ -2774,10 +2804,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0dd53rzpkxgs697pycbhhgc9vcnxra4ly4xar8ni6aiydx2f88zk";
+ sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
slather = {
dependencies = ["CFPropertyList" "activesupport" "clamp" "nokogiri" "xcodeproj"];
@@ -2805,10 +2835,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0xl54r1vvrhlkxf16mxqk4kz18j0igf1f7l66kqd9dbyv6x99zfg";
+ sha256 = "1a77kysns9pz4nx149df0f987qj1pdfyjby2jr3iwmj2zj7r3klp";
type = "gem";
};
- version = "0.2.0";
+ version = "0.3.0";
};
snmp = {
groups = ["default"];
@@ -2887,10 +2917,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0rb9nax4k72zbriq7k98shfcj4lf54sqjpin2xm6ma7bb48ra8mc";
+ sha256 = "1knw2xa3pkfql4np9qazz2mdi1vz21vdsa0wkx648c4ym1p2h8yh";
type = "gem";
};
- version = "0.15.0";
+ version = "0.16.0";
};
tilt = {
groups = ["default"];
@@ -2971,10 +3001,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jmbimpnpjdzz8hlrppgl9spm99qh3qzbx0b81k3gkgwba8nk3yd";
+ sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz";
type = "gem";
};
- version = "0.0.8";
+ version = "0.0.8.1";
};
unicode-display_width = {
groups = ["default"];
@@ -3032,10 +3062,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "092y84kak86ds2as9kwn5a9m2yzqwqcz4wx31jk3kin32c3hwcrn";
+ sha256 = "1mbpija1z2ia0bgqm950z564pk8x8zisjnlxpqhysffczz7hv46z";
type = "gem";
};
- version = "5.0.2";
+ version = "5.1.0";
};
xcodeproj = {
dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
@@ -3074,10 +3104,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx";
+ sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem";
};
- version = "2.5.3";
+ version = "2.5.4";
};
ZenTest = {
groups = ["default"];