diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md
index d428f00eea5..6f87e015b9c 100644
--- a/doc/contributing/submitting-changes.chapter.md
+++ b/doc/contributing/submitting-changes.chapter.md
@@ -236,7 +236,7 @@ The `master` branch is the main development branch. It should only see non-break
### Staging branch {#submitting-changes-staging-branch}
-The `staging` branch is a development branch where mass-rebuilds go. It should only see non-breaking mass-rebuild commits. That means it is not to be used for testing, and changes must have been well tested already. If the branch is already in a broken state, please refrain from adding extra new breakages.
+The `staging` branch is a development branch where mass-rebuilds go. Mass rebuilds are commits that cause rebuilds for many packages, like more than 500 (or perhaps, if it's 'light' packages, 1000). It should only see non-breaking mass-rebuild commits. That means it is not to be used for testing, and changes must have been well tested already. If the branch is already in a broken state, please refrain from adding extra new breakages.
### Staging-next branch {#submitting-changes-staging-next-branch}
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 797fe03e209..0c1656efaf1 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -26,12 +26,32 @@ var ${home_region:=eu-west-1}
var ${bucket:=nixos-amis}
var ${service_role_name:=vmimport}
-var ${regions:=eu-west-1 eu-west-2 eu-west-3 eu-central-1 eu-north-1
- us-east-1 us-east-2 us-west-1 us-west-2
+# Output of the command:
+# > aws ec2 describe-regions --all-regions --query "Regions[].{Name:RegionName}" --output text | sort
+var ${regions:=
+ af-south-1
+ ap-east-1
+ ap-northeast-1
+ ap-northeast-2
+ ap-northeast-3
+ ap-south-1
+ ap-southeast-1
+ ap-southeast-2
+ ap-southeast-3
ca-central-1
- ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2
- ap-south-1 ap-east-1
- sa-east-1}
+ eu-central-1
+ eu-north-1
+ eu-south-1
+ eu-west-1
+ eu-west-2
+ eu-west-3
+ me-south-1
+ sa-east-1
+ us-east-1
+ us-east-2
+ us-west-1
+ us-west-2
+ }
regions=($regions)
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 1707935ad5b..8fc8cc4baad 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,7 +1,7 @@
{
- x86_64-linux = "/nix/store/yx36yzxpw1hn4fz8iyf1rfyd56jg3yf4-nix-2.8.0";
- i686-linux = "/nix/store/c0hg806zvwg800qbszzj8ff4a224kjgf-nix-2.8.0";
- aarch64-linux = "/nix/store/wic2832ll53q392r2wks4xr2nrk7p8p5-nix-2.8.0";
- x86_64-darwin = "/nix/store/5yqdvnkmkrhl36xh0qy31pymdphjimdd-nix-2.8.0";
- aarch64-darwin = "/nix/store/izc9592szrnpv8n86hr88bhpyc9g6b4s-nix-2.8.0";
+ x86_64-linux = "/nix/store/6mjgljq8sm9bsz6k22as5ar3jw78644m-nix-2.8.1";
+ i686-linux = "/nix/store/c4yjv4l8wncdla6ycicvsjrdf40xjkpp-nix-2.8.1";
+ aarch64-linux = "/nix/store/qkgvks80mdibq7m86hqasgr5lpixbnmh-nix-2.8.1";
+ x86_64-darwin = "/nix/store/riz4mzb1xhp36088ffnp40lz52bpxz01-nix-2.8.1";
+ aarch64-darwin = "/nix/store/dirm8hsnmvvzjs21hrx8i84w8k453jzp-nix-2.8.1";
}
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index d467c3c0471..6b69d559748 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -293,6 +293,7 @@ in
kexAlgorithms = mkOption {
type = types.listOf types.str;
default = [
+ "sntrup761x25519-sha512@openssh.com"
"curve25519-sha256"
"curve25519-sha256@libssh.org"
"diffie-hellman-group-exchange-sha256"
@@ -301,7 +302,7 @@ in
Allowed key exchange algorithms
- Defaults to recommended settings from both
+ Uses the lower bound recommended in both
and
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 7cd44b2f8a0..a3c3c245f1d 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -301,8 +301,9 @@ let
{
description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}";
requires = [ "wireguard-${interfaceName}.service" ];
- after = [ "wireguard-${interfaceName}.service" ];
- wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ];
+ wants = [ "network-online.target" ];
+ after = [ "wireguard-${interfaceName}.service" "network-online.target" ];
+ wantedBy = [ "wireguard-${interfaceName}.service" ];
environment.DEVICE = interfaceName;
environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity";
path = with pkgs; [ iproute2 wireguard-tools ];
@@ -379,8 +380,9 @@ let
nameValuePair "wireguard-${name}"
{
description = "WireGuard Tunnel - ${name}";
- requires = [ "network-online.target" ];
- after = [ "network.target" "network-online.target" ];
+ after = [ "network-pre.target" ];
+ wants = [ "network.target" ];
+ before = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment.DEVICE = name;
path = with pkgs; [ kmod iproute2 wireguard-tools ];
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 87270776f5a..52287a834c9 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -153,11 +153,11 @@ in {
package = mkOption {
type = types.package;
description = "Which package to use for the Nextcloud instance.";
- relatedPackages = [ "nextcloud22" "nextcloud23" ];
+ relatedPackages = [ "nextcloud22" "nextcloud23" "nextcloud24" ];
};
phpPackage = mkOption {
type = types.package;
- relatedPackages = [ "php74" "php80" ];
+ relatedPackages = [ "php74" "php80" "php81" ];
defaultText = "pkgs.php";
description = ''
PHP package to use for Nextcloud.
@@ -568,7 +568,7 @@ in {
config = mkIf cfg.enable (mkMerge [
{ warnings = let
- latest = 23;
+ latest = 24;
upgradeWarning = major: nixos:
''
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed.
@@ -604,6 +604,7 @@ in {
++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05"))
++ (optional (versionOlder cfg.package.version "22") (upgradeWarning 21 "21.11"))
++ (optional (versionOlder cfg.package.version "23") (upgradeWarning 22 "22.05"))
+ ++ (optional (versionOlder cfg.package.version "24") (upgradeWarning 23 "22.05"))
++ (optional isUnsupportedMariadb ''
You seem to be using MariaDB at an unsupported version (i.e. at least 10.6)!
Please note that this isn't supported officially by Nextcloud. You can either
@@ -626,14 +627,15 @@ in {
''
else if versionOlder stateVersion "21.11" then nextcloud21
else if versionOlder stateVersion "22.05" then nextcloud22
- else nextcloud23
+ else nextcloud24
);
services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;
services.nextcloud.phpPackage =
if versionOlder cfg.package.version "21" then pkgs.php74
- else pkgs.php80;
+ else if versionOlder cfg.package.version "24" then pkgs.php80
+ else pkgs.php81;
}
{ assertions = [
@@ -884,7 +886,7 @@ in {
# FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6,
# this is a workaround.
# See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22
- settings = {
+ settings = mkIf (versionOlder cfg.package.version "24") {
mysqld = {
innodb_read_only_compressed = 0;
};
diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml
index 8f55086a2bd..b46f34420a7 100644
--- a/nixos/modules/services/web-apps/nextcloud.xml
+++ b/nixos/modules/services/web-apps/nextcloud.xml
@@ -11,7 +11,7 @@
desktop client is packaged at pkgs.nextcloud-client.
- The current default by NixOS is nextcloud23 which is also the latest
+ The current default by NixOS is nextcloud24 which is also the latest
major version available.
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
index b7b1c5c6600..76feac314d5 100644
--- a/nixos/tests/nextcloud/default.nix
+++ b/nixos/tests/nextcloud/default.nix
@@ -18,4 +18,4 @@ foldl
};
})
{ }
- [ 22 23 ]
+ [ 22 23 24 ]
diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix
index f61b7c5b7b9..96d686864fb 100644
--- a/pkgs/applications/audio/mousai/default.nix
+++ b/pkgs/applications/audio/mousai/default.nix
@@ -15,7 +15,7 @@
, ninja
, pkg-config
, pulseaudio
-, wrapGAppsHook
+, wrapGAppsHook4
}:
python3.pkgs.buildPythonApplication rec {
@@ -39,6 +39,9 @@ python3.pkgs.buildPythonApplication rec {
];
postPatch = ''
+ substituteInPlace build-aux/meson/postinstall.py \
+ --replace gtk-update-icon-cache gtk4-update-icon-cache
+
patchShebangs build-aux/meson
'';
@@ -51,7 +54,7 @@ python3.pkgs.buildPythonApplication rec {
meson
ninja
pkg-config
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix
index 0557ee2e676..0894a6410d8 100644
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@@ -60,11 +60,11 @@ stdenv.mkDerivation rec {
libmicrohttpd
ncurses
taglib
- ] ++ lib.optional systemdSupport [
+ ] ++ lib.optionals systemdSupport [
systemd
- ] ++ lib.optional stdenv.isLinux [
+ ] ++ lib.optionals stdenv.isLinux [
alsa-lib pulseaudio
- ] ++ lib.optional stdenv.isDarwin [
+ ] ++ lib.optionals stdenv.isDarwin [
Cocoa SystemConfiguration
];
diff --git a/pkgs/applications/backup/pika-backup/borg-path.patch b/pkgs/applications/backup/pika-backup/borg-path.patch
index c4ed649ffc9..faa4b76cec7 100644
--- a/pkgs/applications/backup/pika-backup/borg-path.patch
+++ b/pkgs/applications/backup/pika-backup/borg-path.patch
@@ -1,13 +1,22 @@
-diff --git a/src/borg/utils.rs b/src/borg/utils.rs
-index 4e30913..30d7d6f 100644
---- a/src/borg/utils.rs
-+++ b/src/borg/utils.rs
-@@ -223,7 +223,7 @@ impl BorgCall {
+diff --git a/src/borg/process.rs b/src/borg/process.rs
+index 63ea0ee..e3535e0 100644
+--- a/src/borg/process.rs
++++ b/src/borg/process.rs
+@@ -203,7 +203,7 @@ impl BorgCall {
}
- pub fn cmd(&self) -> Command {
-- let mut cmd = Command::new("borg");
-+ let mut cmd = Command::new("@borg@");
+ pub fn cmd(&self) -> Result {
+- let mut cmd = process::Command::new("borg");
++ let mut cmd = process::Command::new("@borg@");
+
+ cmd.envs([self.set_password()?]);
+
+@@ -221,7 +221,7 @@ impl BorgCall {
+ }
+
+ pub fn cmd_async(&self) -> Result {
+- let mut cmd = async_process::Command::new("borg");
++ let mut cmd = async_process::Command::new("@borg@");
+
+ cmd.envs([self.set_password()?]);
- cmd.args(self.args())
- .stderr(Stdio::piped())
diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix
index 604456c6583..a8524dea91b 100644
--- a/pkgs/applications/backup/pika-backup/default.nix
+++ b/pkgs/applications/backup/pika-backup/default.nix
@@ -5,35 +5,34 @@
, rustPlatform
, substituteAll
, desktop-file-utils
+, itstool
, meson
, ninja
, pkg-config
, python3
-, wrapGAppsHook
+, wrapGAppsHook4
, borgbackup
-, dbus
-, gdk-pixbuf
-, glib
-, gtk3
-, libhandy
+, gtk4
+, libadwaita
+, libsecret
}:
stdenv.mkDerivation rec {
pname = "pika-backup";
- version = "0.3.5";
+ version = "0.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "pika-backup";
rev = "v${version}";
- sha256 = "sha256-8jT3n+bTNjhm64AMS24Ju+San75ytfqFXloH/TOgO1g=";
+ hash = "sha256-vQ0hlwsrY0WOUc/ppleE+kKRGHPt/ScEChXrkukln3U=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
- sha256 = "198bs4z7l22sh8ck7v46s45mj8zpfbg03n1xzc6pnafdd8hf3q15";
+ hash = "sha256-IKUh5gkXTpmMToDaec+CpCIQqJjwJM2ZrmGQhZeTDsg=";
};
patches = [
@@ -41,12 +40,10 @@ stdenv.mkDerivation rec {
src = ./borg-path.patch;
borg = "${borgbackup}/bin/borg";
})
- # Fix build with meson 0.61, can be removed on next release.
- # https://gitlab.gnome.org/World/pika-backup/-/issues/156
- # https://github.com/mesonbuild/meson/issues/9441
(fetchpatch {
- url = "https://gitlab.gnome.org/World/pika-backup/-/commit/54be149c88fd69fb9e74b7362fe7182863237869.patch";
- sha256 = "sha256-Tffxo5hlf/gSkp1GfyL4eHthX49tuTq6B+S53N8oA2M=";
+ name = "use-gtk4-update-icon-cache.patch";
+ url = "https://gitlab.gnome.org/World/pika-backup/-/merge_requests/64.patch";
+ hash = "sha256-AttGQGWealvTIvPwBl5M6FiC4Al/UD4/XckUAxM38SE=";
})
];
@@ -56,11 +53,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
+ itstool
meson
ninja
pkg-config
python3
- wrapGAppsHook
+ wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
@@ -68,16 +66,14 @@ stdenv.mkDerivation rec {
]);
buildInputs = [
- dbus
- gdk-pixbuf
- glib
- gtk3
- libhandy
+ gtk4
+ libadwaita
+ libsecret
];
meta = with lib; {
description = "Simple backups based on borg";
- homepage = "https://wiki.gnome.org/Apps/PikaBackup";
+ homepage = "https://apps.gnome.org/app/org.gnome.World.PikaBackup";
changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];
diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix
index d42ee291cf0..8eb52f26cdb 100644
--- a/pkgs/applications/blockchains/alfis/default.nix
+++ b/pkgs/applications/blockchains/alfis/default.nix
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "alfis";
- version = "0.7.0";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Alfis";
rev = "v${version}";
- sha256 = "sha256-lamobXaDY+v8NpoI+TuuBO5Cdol9+7VPhdmLEH6sZIo=";
+ sha256 = "sha256-P+usJCzf92WZ46mdaDbej59/RUzmFcMvlYXVe2VpgY0=";
};
- cargoSha256 = "sha256-C5MCT4EG/lI4s2rVGSm9DgBu43FKpp3iTBbCf7N1jOA=";
+ cargoSha256 = "sha256-N5qHu0sCmIWtDYerWqMlD3qr8QtXLvEC7VqPEvnW2cw=";
checkFlags = [
# these want internet access, disable them
diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
index 59166149e6a..84f6df6350f 100644
--- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix
+++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix
@@ -2,12 +2,12 @@
let
pname = "ledger-live-desktop";
- version = "2.40.4";
+ version = "2.41.3";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage";
- hash = "sha256-ktmGXEWoCrhx9hGau2VkQi0GMa53EqHV1wGtUk6kicc=";
+ hash = "sha256-Bh3wB5AAgY6l1W3UtWUHW+lJgJ0w6gw23WvEe3/Xs1g=";
};
appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix
index ee7960a843b..fd2b3347afd 100644
--- a/pkgs/applications/blockchains/mycrypto/default.nix
+++ b/pkgs/applications/blockchains/mycrypto/default.nix
@@ -1,5 +1,4 @@
{ lib, appimageTools, fetchurl, makeDesktopItem
-, gsettings-desktop-schemas, gtk3
}:
let
@@ -29,10 +28,6 @@ let
in appimageTools.wrapType2 rec {
inherit name src;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
multiPkgs = null; # no p32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
diff --git a/pkgs/applications/blockchains/wasabibackend/default.nix b/pkgs/applications/blockchains/wasabibackend/default.nix
index 784b01192f7..df30302bc6c 100644
--- a/pkgs/applications/blockchains/wasabibackend/default.nix
+++ b/pkgs/applications/blockchains/wasabibackend/default.nix
@@ -10,13 +10,13 @@
buildDotnetModule rec {
pname = "wasabibackend";
- version = "1.1.13.0";
+ version = "1.1.13.1";
src = fetchFromGitHub {
owner = "zkSNACKs";
repo = "WalletWasabi";
rev = "v${version}";
- sha256 = "sha256-zDOk8MurT5NXOr4kvm5mnsphY+eDFWuVBcpeTZpcHOo=";
+ sha256 = "sha256-Hwav7moG6XKAcR7L0Q7CtifP3zCNRfHIihlaFw+dzbk=";
};
projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj";
diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix
index fa81414a7e7..e2e6bce72c4 100644
--- a/pkgs/applications/editors/standardnotes/default.nix
+++ b/pkgs/applications/editors/standardnotes/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
-, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:
+, fetchurl, libsecret }:
let
version = "3.11.1";
@@ -31,10 +31,6 @@ let
in appimageTools.wrapType2 rec {
inherit name src;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
extraPkgs = pkgs: with pkgs; [
libsecret
];
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 2f3728fa9bd..3e4ea214c47 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
- version = "18.0.4";
+ version = "18.0.6";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
- sha256 = "0ln9vs2zyqq0pz3af6i8ynjbg59j0y6y7f5qkrgk2yv2mpnncl3m";
+ sha256 = "939d23f45f82bc4978ff3cb5d15d096f8af9658fb9f9211d3849998f6a0bd3a9";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix
index 9ce07df3437..7a5729de5f5 100644
--- a/pkgs/applications/graphics/megapixels/default.nix
+++ b/pkgs/applications/graphics/megapixels/default.nix
@@ -5,7 +5,7 @@
, meson
, ninja
, pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
, libepoxy
, gtk4
, zbar
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
diff --git a/pkgs/applications/misc/authenticator/default.nix b/pkgs/applications/misc/authenticator/default.nix
index e100c880739..d7cf8f34b83 100644
--- a/pkgs/applications/misc/authenticator/default.nix
+++ b/pkgs/applications/misc/authenticator/default.nix
@@ -9,7 +9,7 @@
, ninja
, pkg-config
, rustPlatform
-, wrapGAppsHook
+, wrapGAppsHook4
, gdk-pixbuf
, glib
, gst_all_1
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
meson
ninja
pkg-config
- wrapGAppsHook
+ wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix
index 8af7fe1cf9a..bff4e724f61 100644
--- a/pkgs/applications/misc/bottles/default.nix
+++ b/pkgs/applications/misc/bottles/default.nix
@@ -20,13 +20,13 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "bottles";
- version = "2022.5.2-trento-2";
+ version = "2022.5.14-trento-1";
src = fetchFromGitHub {
owner = "bottlesdevs";
repo = pname;
rev = version;
- sha256 = "sha256-ufK+h4nblnftyIaRSq43H/q3VSquf1DnD6Z+iuPTJBE=";
+ sha256 = "sha256-w5nSMJnt4WO1KOJvdjM1TYSOvPnogERgQWp1JVr3TZY=";
};
postPatch = ''
diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/applications/misc/chrysalis/default.nix
index 058a0f656fb..f97d44d1ea8 100644
--- a/pkgs/applications/misc/chrysalis/default.nix
+++ b/pkgs/applications/misc/chrysalis/default.nix
@@ -1,4 +1,4 @@
-{ lib, appimageTools, fetchurl, gtk3, gsettings-desktop-schemas }:
+{ lib, appimageTools, fetchurl }:
let
pname = "chrysalis";
@@ -14,10 +14,6 @@ in appimageTools.wrapAppImage rec {
};
};
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
multiPkgs = null;
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.glib
diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix
index 85298bc3c75..97ed9ed7296 100644
--- a/pkgs/applications/misc/devdocs-desktop/default.nix
+++ b/pkgs/applications/misc/devdocs-desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
+{ lib, appimageTools, fetchurl }:
let
version = "0.7.2";
@@ -17,10 +17,6 @@ let
in appimageTools.wrapType2 rec {
inherit name src;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop
diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix
index c842b7c4b36..ecb553dbd66 100644
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }:
+{ lib, stdenv, appimageTools, fetchurl, undmg }:
let
pname = "joplin-desktop";
@@ -45,7 +45,6 @@ let
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix
index fc83e543dcf..a99332ae82f 100644
--- a/pkgs/applications/misc/marktext/default.nix
+++ b/pkgs/applications/misc/marktext/default.nix
@@ -1,4 +1,4 @@
-{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
+{ appimageTools, fetchurl, lib }:
let
pname = "marktext";
@@ -18,12 +18,6 @@ appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
- ''
- # Fixes file open dialog error
- # GLib-GIO-ERROR **: 20:36:48.243: No GSettings schemas are installed on the system
- # See https://github.com/NixOS/nixpkgs/pull/83701#issuecomment-608034097
- + ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix
index ee7703987ea..637c4add65d 100644
--- a/pkgs/applications/misc/metadata-cleaner/default.nix
+++ b/pkgs/applications/misc/metadata-cleaner/default.nix
@@ -13,7 +13,7 @@
, ninja
, pkg-config
, poppler_gi
-, wrapGAppsHook
+, wrapGAppsHook4
}:
python3.pkgs.buildPythonApplication rec {
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
meson
ninja
pkg-config
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix
index 923f5fb4528..9e701cdb33f 100644
--- a/pkgs/applications/misc/notable/default.nix
+++ b/pkgs/applications/misc/notable/default.nix
@@ -1,4 +1,4 @@
-{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
+{ appimageTools, fetchurl, lib }:
let
pname = "notable";
@@ -23,7 +23,6 @@ appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix
index a94363f4600..4523168314a 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/applications/misc/tpmmanager/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, qtbase, qmake, wrapQtAppsHook, trousers }:
stdenv.mkDerivation rec {
version = "0.8.1";
@@ -8,12 +8,24 @@ stdenv.mkDerivation rec {
owner = "Rohde-Schwarz";
repo = "TPMManager";
rev = "v${version}";
- sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4=";
+ sha256 = "sha256-UZYn4ssbvLpdB0DssT7MXqQZCu1KkLf/Bsb45Rvgm+E=";
};
- nativeBuildInputs = [ qmake4Hook ];
+ patches = [
+ # build with Qt5
+ (fetchpatch {
+ url = "https://github.com/Rohde-Schwarz/TPMManager/commit/f62c0f2de2097af9b504c80d6193818e6e4ca84f.patch";
+ sha256 = "sha256-gMhDNN2UkX2lJf/oJEzOkCvF6+EGdIj9xwtXb1rCeys=";
+ })
+ (fetchpatch {
+ url = "https://github.com/Rohde-Schwarz/TPMManager/commit/c287a841ac6b057ed35799949211866b9f533561.patch";
+ sha256 = "sha256-2ZyUml8Q9bKQLVZWr18AzLt8VYLICXH9VDeq6B5Xfto=";
+ })
+ ];
- buildInputs = [ qt4 trousers ];
+ nativeBuildInputs = [ qmake wrapQtAppsHook ];
+
+ buildInputs = [ qtbase trousers ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix
index d80c8d03bf4..21ac3a908d3 100644
--- a/pkgs/applications/misc/zettlr/default.nix
+++ b/pkgs/applications/misc/zettlr/default.nix
@@ -1,8 +1,6 @@
{ appimageTools
, lib
, fetchurl
-, gtk3
-, gsettings-desktop-schemas
, texlive
, pandoc
}:
@@ -23,10 +21,6 @@ in
appimageTools.wrapType2 rec {
inherit name src;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
multiPkgs = null; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = ''
diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix
index c514ec22f11..18e36cb7028 100644
--- a/pkgs/applications/networking/Sylk/default.nix
+++ b/pkgs/applications/networking/Sylk/default.nix
@@ -1,4 +1,4 @@
-{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
+{ appimageTools, fetchurl, lib }:
let
pname = "Sylk";
@@ -15,7 +15,6 @@ appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix
index 66c507312c2..151649ba22e 100644
--- a/pkgs/applications/networking/cluster/lens/default.nix
+++ b/pkgs/applications/networking/cluster/lens/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, appimageTools, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
+{ lib, fetchurl, appimageTools, wrapGAppsHook }:
let
pname = "lens";
@@ -20,10 +20,6 @@ in
appimageTools.wrapType2 {
inherit name src;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
extraInstallCommands =
''
mv $out/bin/${name} $out/bin/${pname}
diff --git a/pkgs/applications/networking/cluster/nomad-pack/default.nix b/pkgs/applications/networking/cluster/nomad-pack/default.nix
index 394e75f9112..5c5cb7c4a61 100644
--- a/pkgs/applications/networking/cluster/nomad-pack/default.nix
+++ b/pkgs/applications/networking/cluster/nomad-pack/default.nix
@@ -5,17 +5,17 @@
buildGoModule rec {
pname = "nomad-pack";
- version = "2022-04-12";
- rev = "50ad747d2a5a2b90af1b3564483510cb04fefbea";
+ version = "2022-05-12";
+ rev = "bee6e8e078ff31fee916b864fbf3648294dbcdf5";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
inherit rev;
- sha256 = "sha256-VG6Dmx5WD2AzKReMbmrpzXCNhrJqaZY3aQV9P+4ET68=";
+ sha256 = "sha256-28Dx9z7T+4WXl4voAzlSR2h3HcZMSzOuX7FHLJ4q9Sc=";
};
- vendorSha256 = "sha256-7ovR2F9N94iFK/B5OXRcqfykOYHST3354+Ge2L8yzq0=";
+ vendorSha256 = "sha256-hPsO842gmk77qc27slV2TiYNI7Ofw1RqGgcLP1gdgJ0=";
# skip running go tests as they require network access
doCheck = false;
diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix
index 1a86a66fa29..b34e167e8c9 100644
--- a/pkgs/applications/networking/cluster/octant/desktop.nix
+++ b/pkgs/applications/networking/cluster/octant/desktop.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }:
+{ lib, stdenv, appimageTools, fetchurl, undmg }:
let
pname = "octant-desktop";
@@ -25,7 +25,6 @@ let
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix
index 2475dd0f1d9..db423d619b5 100644
--- a/pkgs/applications/networking/cluster/temporal/default.nix
+++ b/pkgs/applications/networking/cluster/temporal/default.nix
@@ -1,38 +1,37 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule, testers, temporal }:
buildGoModule rec {
pname = "temporal";
- version = "1.15.0";
+ version = "1.16.2";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
- sha256 = "sha256-5Tu838086qgIa2fqda2xi7vn4JbkENVJH4XU3NwW7Ic=";
+ sha256 = "sha256-MPfyjRpjfnuVbj+Pd7yIlaEJCiX1IEy/Lwwkv23kugw=";
};
- vendorSha256 = "sha256-caRBgkuHQ38r6OsKQCJ2pxAe8s6mc4g/QCIsCEXvY3M=";
+ vendorSha256 = "sha256-82W1nHhHvvU6poh5szuH9lDkq6YHgyfsJSubxotV270=";
- # Errors:
- # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite
- # gocql: unable to dial control conn 127.0.0.1:9042: dial tcp 127.0.0.1:9042: connect: connection refused
- doCheck = false;
+ CGO_ENABLED = 0;
+
+ ldflags = [ "-s" "-w" ];
+
+ checkFlags = [ "-short" ];
installPhase = ''
runHook preInstall
- mkdir -p $out/bin
- install -Dm755 "$GOPATH/bin/cli" -T $out/bin/tctl
- install -Dm755 "$GOPATH/bin/authorization" -T $out/bin/tctl-authorization-plugin
+
install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server
install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool
install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool
+
runHook postInstall
'';
- doInstallCheck = true;
- installCheckPhase = ''
- $out/bin/tctl --version | grep ${version} > /dev/null
- '';
+ passthru.tests.version = testers.testVersion {
+ package = temporal;
+ };
meta = with lib; {
description = "A microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability";
@@ -40,5 +39,6 @@ buildGoModule rec {
changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ titanous ];
+ mainProgram = "temporal-server";
};
}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index b4191bbd78c..7e6a5f0d6a0 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -191,9 +191,9 @@ rec {
};
terraform_1 = mkTerraform {
- version = "1.1.9";
- sha256 = "sha256-6dyP3Y5cK+/qLoC2QPZW3QNgqOeVXegC06Pa7pSv1iE=";
- vendorSha256 = "sha256-YI/KeoOIxgCAS3Q6SXaW8my0PyFD+pyksshQEAknsz4=";
+ version = "1.2.0";
+ sha256 = "sha256-5um+zS7MVL59SlxchjXdlhBGNdacbQgvg7BRAWnW5XU=";
+ vendorSha256 = "sha256-6x1cv+DKXH2yyMjIA6JY5EkTmWbwH4LBammXKtw2EZo=";
patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; };
};
diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix
index 5532c644c2c..7aaf5b8bc75 100644
--- a/pkgs/applications/networking/cluster/tilt/default.nix
+++ b/pkgs/applications/networking/cluster/tilt/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "tilt";
@@ -24,5 +24,13 @@ buildGoModule rec {
homepage = "https://tilt.dev/";
license = licenses.asl20;
maintainers = with maintainers; [ anton-dessiatov ];
+
+ # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin
+ # Undefined symbols for architecture x86_64:
+ # "_SecTrustEvaluateWithError", referenced from:
+ # _crypto/x509/internal/macos.x509_SecTrustEvaluateWithError_trampoline.abi0 in go.o
+ # "_utimensat", referenced from:
+ # _syscall.libc_utimensat_trampoline.abi0 in go.o
+ broken = stdenv.isDarwin && stdenv.isx86_64;
};
}
diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index d74378378b9..b50c05fd180 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
- version = "3.3.9";
+ version = "3.3.10";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "refs/tags/v${version}";
- hash = "sha256-29V22B1Nkgj/qc6uyAOSOZ1rrjjtf75I9Eycu8I5ysQ=";
+ hash = "sha256-ESUkGHUVToM5rxpEa0zMo/LxWfPgovkNqDU5IAqQBZg=";
};
postPatch = ''
diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
index aa0a8f7bfc4..d08e1cd1ba4 100644
--- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
+++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
@@ -1,8 +1,6 @@
{ lib
, fetchurl
, appimageTools
-, gtk3
-, gsettings-desktop-schemas
, xorg
, pname
, version
@@ -24,7 +22,6 @@ in
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
diff --git a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
index d4329ed09d3..b9b5175d3b8 100644
--- a/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
+++ b/pkgs/applications/networking/instant-messengers/rambox/rambox.nix
@@ -1,6 +1,6 @@
{ pname, version, src, meta, desktopName ? "Rambox" }:
-{ appimageTools, lib, fetchurl, gsettings-desktop-schemas, gtk3, makeDesktopItem }:
+{ appimageTools, lib, fetchurl, makeDesktopItem }:
let
name = "${pname}-${version}";
@@ -18,9 +18,6 @@ let
};
in appimageTools.wrapType2 rec {
inherit name src meta;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index db38a2d0e86..1b15c2aa0cc 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -7,18 +7,27 @@
# Dynamic libraries
, alsa-lib
, atk
+, at-spi2-atk
+, at-spi2-core
, cairo
+, cups
, dbus
+, expat
+, libdrm
, libGL
, fontconfig
, freetype
, gtk3
, gdk-pixbuf
, glib
+, mesa
+, nspr
+, nss
, pango
, wayland
, xorg
, libxkbcommon
+, udev
, zlib
# Runtime
, coreutils
@@ -33,13 +42,11 @@ let
inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}";
- # Zoom versions are released at different times for each platform and linux
- # is stuck on 5.9.6 until https://github.com/NixOS/nixpkgs/pull/166085 is
- # resolved
+ # Zoom versions are released at different times for each platform
version = {
aarch64-darwin = "5.10.4.6592";
x86_64-darwin = "5.10.4.6592";
- x86_64-linux = "5.9.6.2225";
+ x86_64-linux = "5.10.4.2845";
}.${system} or throwSystem;
srcs = {
@@ -53,7 +60,7 @@ let
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz";
- sha256 = "0rynpw2fjn9j75f34rk0rgqn9wzyzgzmwh1a3xcx7hqingv45k53";
+ sha256 = "9gspydrGaEjzAM0nK1u0XNm07HTupJ2wnPxCFWy+Nts=";
};
};
@@ -61,28 +68,40 @@ let
# $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found'
alsa-lib
atk
+ at-spi2-atk
+ at-spi2-core
cairo
+ cups
dbus
+ expat
+ libdrm
libGL
fontconfig
freetype
gtk3
gdk-pixbuf
glib
+ mesa
+ nspr
+ nss
pango
stdenv.cc.cc
wayland
xorg.libX11
xorg.libxcb
xorg.libXcomposite
+ xorg.libXdamage
xorg.libXext
libxkbcommon
+ xorg.libXrandr
xorg.libXrender
- zlib
+ xorg.libxshmfence
xorg.xcbutilimage
xorg.xcbutilkeysyms
xorg.libXfixes
xorg.libXtst
+ udev
+ zlib
] ++ lib.optional (pulseaudioSupport) libpulseaudio);
in
@@ -134,7 +153,9 @@ stdenv.mkDerivation rec {
done
# ZoomLauncher sets LD_LIBRARY_PATH before execing zoom
- wrapProgram $out/opt/zoom/zoom \
+ # IPC breaks if the executable name does not end in 'zoom'
+ mv $out/opt/zoom/zoom $out/opt/zoom/.zoom
+ makeWrapper $out/opt/zoom/.zoom $out/opt/zoom/zoom \
--prefix LD_LIBRARY_PATH ":" ${libs}
rm $out/bin/zoom
diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix
index 1c0eeeb8266..60190f703aa 100644
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
@@ -103,13 +103,13 @@ let
sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA==";
};
};
- "@azure/storage-blob-12.9.0" = {
+ "@azure/storage-blob-12.10.0" = {
name = "_at_azure_slash_storage-blob";
packageName = "@azure/storage-blob";
- version = "12.9.0";
+ version = "12.10.0";
src = fetchurl {
- url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.9.0.tgz";
- sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg==";
+ url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.10.0.tgz";
+ sha512 = "FBEPKGnvtQJS8V8Tg1P9obgmVD9AodrIfwtwhBpsjenClhFyugMp3HPJY0tF7rInUB/CivKBCbnQKrUnKxqxzw==";
};
};
"@babel/runtime-7.17.9" = {
@@ -139,13 +139,13 @@ let
sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==";
};
};
- "@fontsource/open-sans-4.5.8" = {
+ "@fontsource/open-sans-4.5.10" = {
name = "_at_fontsource_slash_open-sans";
packageName = "@fontsource/open-sans";
- version = "4.5.8";
+ version = "4.5.10";
src = fetchurl {
- url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.8.tgz";
- sha512 = "3b94XDdRLqL7OlE7OjWg/4pgG825Juw8PLVEDm6h5pio0gMU89ICxfatGxHsBxMGfqad+wnvdmUweZWlELDFpQ==";
+ url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.10.tgz";
+ sha512 = "MrtTDfWb1Tu9YxVh2KaKmsKBn6O3KL/lHZS0KRKK58jgqvdwuiDt4QW4udmW4FQf0XOWgnZ+4vKUF80F3SqBAA==";
};
};
"@fortawesome/fontawesome-common-types-6.1.1" = {
@@ -517,22 +517,22 @@ let
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
};
};
- "@types/node-12.20.50" = {
+ "@types/node-12.20.52" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "12.20.50";
+ version = "12.20.52";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-12.20.50.tgz";
- sha512 = "+9axpWx2b2JCVovr7Ilgt96uc6C1zBKOQMpGtRbWT9IoR/8ue32GGMfGA4woP8QyP2gBs6GQWEVM3tCybGCxDA==";
+ url = "https://registry.npmjs.org/@types/node/-/node-12.20.52.tgz";
+ sha512 = "cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw==";
};
};
- "@types/node-17.0.31" = {
+ "@types/node-17.0.33" = {
name = "_at_types_slash_node";
packageName = "@types/node";
- version = "17.0.31";
+ version = "17.0.33";
src = fetchurl {
- url = "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz";
- sha512 = "AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==";
+ url = "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz";
+ sha512 = "miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==";
};
};
"@types/node-fetch-2.6.1" = {
@@ -703,7 +703,7 @@ let
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz";
- sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
+ sha512 = "/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==";
};
};
"adler-32-1.3.1" = {
@@ -757,7 +757,7 @@ let
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz";
- sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df";
+ sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==";
};
};
"ansi-regex-5.0.1" = {
@@ -775,7 +775,7 @@ let
version = "2.2.1";
src = fetchurl {
url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
- sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
+ sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==";
};
};
"ansi-styles-4.3.0" = {
@@ -793,7 +793,7 @@ let
version = "1.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz";
- sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f";
+ sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==";
};
};
"anymatch-3.1.2" = {
@@ -847,7 +847,7 @@ let
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
- sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+ sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==";
};
};
"array-parallel-0.1.3" = {
@@ -856,7 +856,7 @@ let
version = "0.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz";
- sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d";
+ sha512 = "TDPTwSWW5E4oiFiKmz6RGJ/a80Y91GuLgUYuLd49+XBS75tYo8PNgaT2K/OxuQYqkoI852MDGBorg9OcUSTQ8w==";
};
};
"array-series-0.1.5" = {
@@ -865,7 +865,7 @@ let
version = "0.1.5";
src = fetchurl {
url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz";
- sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f";
+ sha512 = "L0XlBwfx9QetHOsbLDrE/vh2t018w9462HM3iaFfxRiK83aJjAt/Ja3NMkOW7FICwWTlQBa3ZbL5FKhuQWkDrg==";
};
};
"array-union-2.1.0" = {
@@ -928,7 +928,7 @@ let
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
- sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+ sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==";
};
};
"async-2.6.4" = {
@@ -964,7 +964,7 @@ let
version = "0.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
- sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
+ sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==";
};
};
"auto-changelog-1.16.4" = {
@@ -985,13 +985,13 @@ let
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
};
};
- "aws-sdk-2.1131.0" = {
+ "aws-sdk-2.1135.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
- version = "2.1131.0";
+ version = "2.1135.0";
src = fetchurl {
- url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1131.0.tgz";
- sha512 = "Ic3f2fSgVhYDQ0OBGxE6ODtSwaKyxBPGrI2RGrYt2Oj0Z8f227P7dB90o9X7y2MtnuJ4WoAzkf3Vc1c1UnnZlA==";
+ url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1135.0.tgz";
+ sha512 = "bl9n4QgrEh52hmQ+Jo76BgJXM/p+PwfVZvImEQHFeel/33H/PDLcTJquEw5bzxM1HRNI24iH+FNPwyWLMrttTw==";
};
};
"aws-sign2-0.7.0" = {
@@ -1000,7 +1000,7 @@ let
version = "0.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz";
- sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
+ sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==";
};
};
"aws4-1.11.0" = {
@@ -1045,7 +1045,7 @@ let
version = "6.26.0";
src = fetchurl {
url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
- sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe";
+ sha512 = "ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==";
};
};
"balanced-match-1.0.2" = {
@@ -1081,7 +1081,7 @@ let
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
- sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
+ sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==";
};
};
"bcryptjs-2.4.3" = {
@@ -1090,7 +1090,7 @@ let
version = "2.4.3";
src = fetchurl {
url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz";
- sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb";
+ sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==";
};
};
"big-integer-1.6.51" = {
@@ -1108,7 +1108,7 @@ let
version = "2.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz";
- sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8";
+ sha512 = "uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ==";
};
};
"binary-extensions-2.2.0" = {
@@ -1126,7 +1126,7 @@ let
version = "0.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/binascii/-/binascii-0.0.2.tgz";
- sha1 = "a7f8a8801dbccf8b1756b743daa0fee9e2d9e0ee";
+ sha512 = "rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==";
};
};
"bintrees-1.0.1" = {
@@ -1135,7 +1135,7 @@ let
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz";
- sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524";
+ sha512 = "tbaUB1QpTIj4cKY8c1rvNAvEQXA+ekzHmbe4jzNfW3QWsF9GnnP/BRWyl6/qqS53heoYJ93naaFcm/jooONH8g==";
};
};
"bitsyntax-0.1.0" = {
@@ -1180,7 +1180,7 @@ let
version = "2.11.0";
src = fetchurl {
url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz";
- sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1";
+ sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==";
};
};
"bluebird-3.7.2" = {
@@ -1225,7 +1225,7 @@ let
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
- sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
+ sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==";
};
};
"brace-expansion-1.1.11" = {
@@ -1252,7 +1252,7 @@ let
version = "0.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
- sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17";
+ sha512 = "YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==";
};
};
"bson-1.1.6" = {
@@ -1288,7 +1288,7 @@ let
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
- sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
+ sha512 = "zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==";
};
};
"buffer-from-1.1.2" = {
@@ -1342,7 +1342,7 @@ let
version = "3.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
- sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
+ sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==";
};
};
"bytes-3.1.2" = {
@@ -1369,7 +1369,7 @@ let
version = "1.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz";
- sha1 = "4701a51266f06e06eaa71fc17233822d875f4908";
+ sha512 = "sAZ9kODla+mGACBZ1IpTCAisKoGnv6PykW7fPk1LrM+mMepE18Yz0515yoVcrZy7dQsTUp3uZLQ/9Sx1RnLoHw==";
};
};
"callsites-3.1.0" = {
@@ -1405,7 +1405,7 @@ let
version = "0.12.0";
src = fetchurl {
url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
- sha1 = "1b681c21ff84033c826543090689420d187151dc";
+ sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==";
};
};
"cfb-1.2.2" = {
@@ -1423,7 +1423,7 @@ let
version = "1.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
- sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+ sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==";
};
};
"chalk-4.1.2" = {
@@ -1459,7 +1459,7 @@ let
version = "0.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz";
- sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667";
+ sha512 = "yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==";
};
};
"cheerio-1.0.0-rc.6" = {
@@ -1504,7 +1504,7 @@ let
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz";
- sha1 = "66a0e64011816e37196828fdc8c8c147312c8634";
+ sha512 = "kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==";
};
};
"class-validator-0.13.2" = {
@@ -1531,7 +1531,7 @@ let
version = "0.1.7";
src = fetchurl {
url = "https://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz";
- sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347";
+ sha512 = "xNaQxWYgI6DD4xIJLn8GY2zDZVbrN0vsU1fEbDNAHZRyceWhpj7A08mYcG1AY92q1Aw0geYkVfiAcEYIZtuTSg==";
};
};
"cli-cursor-3.1.0" = {
@@ -2470,13 +2470,13 @@ let
sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==";
};
};
- "eventsource-1.1.0" = {
+ "eventsource-2.0.2" = {
name = "eventsource";
packageName = "eventsource";
- version = "1.1.0";
+ version = "2.0.2";
src = fetchurl {
- url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz";
- sha512 = "VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==";
+ url = "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz";
+ sha512 = "IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==";
};
};
"exit-on-epipe-1.0.1" = {
@@ -2893,13 +2893,13 @@ let
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
};
};
- "glob-7.2.0" = {
+ "glob-7.2.3" = {
name = "glob";
packageName = "glob";
- version = "7.2.0";
+ version = "7.2.3";
src = fetchurl {
- url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz";
- sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==";
+ url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz";
+ sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==";
};
};
"glob-parent-3.1.0" = {
@@ -3640,13 +3640,13 @@ let
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
};
};
- "isbot-3.4.6" = {
+ "isbot-3.4.7" = {
name = "isbot";
packageName = "isbot";
- version = "3.4.6";
+ version = "3.4.7";
src = fetchurl {
- url = "https://registry.npmjs.org/isbot/-/isbot-3.4.6.tgz";
- sha512 = "EEi3SVCPB4WHtMBaAYzYLgCP7yG9qixseYCf3IG0Yc+howLia+XFPLTT1437rzeViLeDInKOXOdFhs9Fa/xgWQ==";
+ url = "https://registry.npmjs.org/isbot/-/isbot-3.4.7.tgz";
+ sha512 = "huiRPlUf/je4GfR/pms78bOnUYRmwo2Dg/d9aRQCPXIIK3uX6u+iRFuTLsq969X40JcCunHrbS4SFlXIcEIoUw==";
};
};
"isexe-2.0.0" = {
@@ -4531,49 +4531,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
- "n8n-core-0.116.0" = {
+ "n8n-core-0.117.0" = {
name = "n8n-core";
packageName = "n8n-core";
- version = "0.116.0";
+ version = "0.117.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.116.0.tgz";
- sha512 = "D9X+D7gsUTKMacHIixEJuZpOB7DW/g42W+FBKLrj+6BUP1JMKG02G0C+Ef38e2XuNObMoLdLkI70snyvi1oq1g==";
+ url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.117.0.tgz";
+ sha512 = "GEU8qBS/Gt+2FHNNb8txDkerzG7vlfDdeiy56lPF+oZJyEZzqgSJ8fNRUcv2b2kd5XjU9zTDcmjARclDC6SNmA==";
};
};
- "n8n-design-system-0.19.0" = {
+ "n8n-design-system-0.20.0" = {
name = "n8n-design-system";
packageName = "n8n-design-system";
- version = "0.19.0";
+ version = "0.20.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.19.0.tgz";
- sha512 = "qIcmHAtVJotgiYo3vVMLwC9qaU5ih5ti4+aPu2I1onD6WEu8GMNF38AzIAceYl6U8EhvDB+DOsF/SjYHfl26iw==";
+ url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.20.0.tgz";
+ sha512 = "uqcrm+fRtTd7A6+ai48GFcjpU4nIV+UmPld8p/8hoUpwCY265AojGaSKCWHzt8TceLCJXx5rlmLliE+v69d/sA==";
};
};
- "n8n-editor-ui-0.142.1" = {
+ "n8n-editor-ui-0.143.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
- version = "0.142.1";
+ version = "0.143.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.1.tgz";
- sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw==";
+ url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.143.0.tgz";
+ sha512 = "deb5c30jpLw4YKetmTeLNIyki7td2R24uVzsZ3BDGElybR+0DaJbMBRIZ6+bjq8IS750gaTeumKrH8ZBq9BSkg==";
};
};
- "n8n-nodes-base-0.174.0" = {
+ "n8n-nodes-base-0.175.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
- version = "0.174.0";
+ version = "0.175.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.174.0.tgz";
- sha512 = "2yYWeSkfI08BtgGZvOksmQOpjNPYmhvkqO2SBTuTAqkryZ1AHiw6RtILsf2575prQDdep2clxIZxW7owxxFmLA==";
+ url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.175.0.tgz";
+ sha512 = "KfyEbhK4T0sULZ75jcjU0U1IqXm/MNzL7GpRhBjDumDE1WRfpKSBdtYGFsHCbUEXroHnJjF2/L+ADJ9CV0g5MQ==";
};
};
- "n8n-workflow-0.98.0" = {
+ "n8n-workflow-0.99.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
- version = "0.98.0";
+ version = "0.99.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.98.0.tgz";
- sha512 = "MrlEpSUueIkMc9P75h09ozXN2SQyV26qEe2PlQ9+nwRnCPYkikQQtgYZDqQI+bHVHFCMdBZOnq59fse0cMpYfQ==";
+ url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.99.0.tgz";
+ sha512 = "JVZQnncjVphY73jcPY2oW4fZ0WoKDDwC1Xzf509KAu362psOJ5Xrz4mAJwuj7Qv1H88UGhEOojvt/5gbRLi4zA==";
};
};
"named-placeholders-1.1.2" = {
@@ -4927,15 +4927,6 @@ let
sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e";
};
};
- "original-1.0.2" = {
- name = "original";
- packageName = "original";
- version = "1.0.2";
- src = fetchurl {
- url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz";
- sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==";
- };
- };
"os-tmpdir-1.0.2" = {
name = "os-tmpdir";
packageName = "os-tmpdir";
@@ -5089,13 +5080,13 @@ let
sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==";
};
};
- "passport-0.5.2" = {
+ "passport-0.5.3" = {
name = "passport";
packageName = "passport";
- version = "0.5.2";
+ version = "0.5.3";
src = fetchurl {
- url = "https://registry.npmjs.org/passport/-/passport-0.5.2.tgz";
- sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw==";
+ url = "https://registry.npmjs.org/passport/-/passport-0.5.3.tgz";
+ sha512 = "gGc+70h4gGdBWNsR3FuV3byLDY6KBTJAIExGFXTpQaYfbbcHCBlRRKx7RBQSpqEqc5Hh2qVzRs7ssvSfOpkUEA==";
};
};
"passport-cookie-1.0.9" = {
@@ -7186,13 +7177,13 @@ let
sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==";
};
};
- "v-click-outside-3.1.2" = {
+ "v-click-outside-3.2.0" = {
name = "v-click-outside";
packageName = "v-click-outside";
- version = "3.1.2";
+ version = "3.2.0";
src = fetchurl {
- url = "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.1.2.tgz";
- sha512 = "gMdRqfRE6m6XU6SiFi3dyBlFB2MWogiXpof8Aa3LQysrl9pzTndqp/iEaAphLoadaQUFnQ0ec6fLLaxr7LiY6A==";
+ url = "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.2.0.tgz";
+ sha512 = "QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w==";
};
};
"validator-13.7.0" = {
@@ -7570,10 +7561,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
- version = "0.176.0";
+ version = "0.177.0";
src = fetchurl {
- url = "https://registry.npmjs.org/n8n/-/n8n-0.176.0.tgz";
- sha512 = "eJTzCFcujAfJegWKQhGi+upAsfTEpW1/2HC5vwV2btdgm8XCMyhVBMJJR7ZJMozFNDz8ErLhwtlIfQCQSXRP0A==";
+ url = "https://registry.npmjs.org/n8n/-/n8n-0.177.0.tgz";
+ sha512 = "13x/zsHa64Dw/0BhjmlZEGvABJxkZeKTG0oKXzRf1Vq/zoctxofapx188ccJzYQ+tZnOHdX0arjf2baQDTNIGw==";
};
dependencies = [
(sources."@azure/abort-controller-1.1.0" // {
@@ -7620,7 +7611,7 @@ in
];
})
sources."@azure/ms-rest-nodeauth-3.1.1"
- (sources."@azure/storage-blob-12.9.0" // {
+ (sources."@azure/storage-blob-12.10.0" // {
dependencies = [
sources."tslib-2.4.0"
];
@@ -7633,7 +7624,7 @@ in
sources."kuler-2.0.0"
];
})
- sources."@fontsource/open-sans-4.5.8"
+ sources."@fontsource/open-sans-4.5.10"
sources."@fortawesome/fontawesome-common-types-6.1.1"
sources."@fortawesome/free-regular-svg-icons-6.1.1"
sources."@icetee/ftp-0.3.15"
@@ -7694,7 +7685,7 @@ in
sources."@types/lodash-4.14.182"
sources."@types/lossless-json-1.0.1"
sources."@types/mime-1.3.2"
- sources."@types/node-17.0.31"
+ sources."@types/node-17.0.33"
(sources."@types/node-fetch-2.6.1" // {
dependencies = [
sources."form-data-3.0.1"
@@ -7762,7 +7753,7 @@ in
];
})
sources."avsc-5.7.4"
- (sources."aws-sdk-2.1131.0" // {
+ (sources."aws-sdk-2.1135.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@@ -8014,7 +8005,7 @@ in
sources."etag-1.8.1"
sources."event-target-shim-5.0.1"
sources."events-3.3.0"
- sources."eventsource-1.1.0"
+ sources."eventsource-2.0.2"
sources."exit-on-epipe-1.0.1"
sources."expand-tilde-2.0.2"
(sources."express-4.18.1" // {
@@ -8072,7 +8063,7 @@ in
sources."get-symbol-description-1.0.0"
sources."get-system-fonts-2.0.2"
sources."getpass-0.1.7"
- sources."glob-7.2.0"
+ sources."glob-7.2.3"
sources."glob-parent-5.1.2"
(sources."glob-stream-6.1.0" // {
dependencies = [
@@ -8174,7 +8165,7 @@ in
sources."is-windows-1.0.2"
sources."is-wsl-2.2.0"
sources."isarray-0.0.1"
- sources."isbot-3.4.6"
+ sources."isbot-3.4.7"
sources."isexe-2.0.0"
sources."iso-639-1-2.1.13"
sources."isstream-0.1.2"
@@ -8319,15 +8310,15 @@ in
];
})
sources."mz-2.7.0"
- sources."n8n-core-0.116.0"
- sources."n8n-design-system-0.19.0"
- sources."n8n-editor-ui-0.142.1"
- (sources."n8n-nodes-base-0.174.0" // {
+ sources."n8n-core-0.117.0"
+ sources."n8n-design-system-0.20.0"
+ sources."n8n-editor-ui-0.143.0"
+ (sources."n8n-nodes-base-0.175.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
- sources."n8n-workflow-0.98.0"
+ sources."n8n-workflow-0.99.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@@ -8385,7 +8376,6 @@ in
sources."string_decoder-1.1.1"
];
})
- sources."original-1.0.2"
sources."os-tmpdir-1.0.2"
sources."p-cancelable-2.1.1"
sources."p-finally-1.0.0"
@@ -8410,7 +8400,7 @@ in
sources."tslib-2.4.0"
];
})
- sources."passport-0.5.2"
+ sources."passport-0.5.3"
sources."passport-cookie-1.0.9"
sources."passport-jwt-4.0.0"
sources."passport-strategy-1.0.0"
@@ -8642,7 +8632,7 @@ in
sources."tdigest-0.1.1"
(sources."tedious-6.7.1" // {
dependencies = [
- sources."@types/node-12.20.50"
+ sources."@types/node-12.20.52"
sources."bl-3.0.1"
sources."iconv-lite-0.5.2"
sources."readable-stream-3.6.0"
@@ -8737,7 +8727,7 @@ in
sources."utils-merge-1.0.1"
sources."uuencode-0.0.4"
sources."uuid-8.3.2"
- sources."v-click-outside-3.1.2"
+ sources."v-click-outside-3.2.0"
sources."validator-13.7.0"
sources."vary-1.1.2"
sources."verror-1.10.0"
diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix
index 52e2e083ca1..d2850b176f4 100644
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@@ -1,7 +1,6 @@
{ lib
, mkDerivation
, fetchFromGitHub
-, fetchpatch
, cmake
, extra-cmake-modules
, inotify-tools
@@ -27,7 +26,7 @@
mkDerivation rec {
pname = "nextcloud-client";
- version = "3.5.0";
+ version = "3.5.1";
outputs = [ "out" "dev" ];
@@ -35,18 +34,13 @@ mkDerivation rec {
owner = "nextcloud";
repo = "desktop";
rev = "v${version}";
- sha256 = "sha256-eFtBdnwHaLirzZaHDw6SRfmsqO3dmBB8Y9csJuiTf1A=";
+ sha256 = "sha256-/Bz3vkV4+ZFlGBNtkLIGsBk51a3wxy32U1KYcA3awcw=";
};
patches = [
# Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`.
./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
- # don't write cacheDir into home directory
- (fetchpatch {
- url = "https://github.com/nextcloud/desktop/commit/3a8aa8a2a88bc9b68098b7866e2a07aa23d3a33c.patch";
- sha256 = "sha256-OviPANvXap3mg4haxRir/CK1aq8maWZDM/IVsN+OHgk=";
- })
];
postPatch = ''
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 0d44f084086..9a0cc70c199 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tixati";
- version = "2.88";
+ version = "2.89";
src = fetchurl {
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
- sha256 = "sha256-9d9Z+3Uyxy4Bj8STtzHWwyyhWeMv3wo0IH6uxGTaA0I=";
+ sha256 = "sha256-fd7DMKoRxNmNjCxl2ViINjnCEXJrhJU4aaRT+NoB1vI=";
};
installPhase = ''
diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix
index b0e53a054d2..9409a3c5fcd 100644
--- a/pkgs/applications/networking/station/default.nix
+++ b/pkgs/applications/networking/station/default.nix
@@ -1,4 +1,4 @@
-{ appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, lib }:
+{ appimageTools, fetchurl, lib }:
let
pname = "station";
@@ -18,7 +18,6 @@ in appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null;
diff --git a/pkgs/applications/office/banking/default.nix b/pkgs/applications/office/banking/default.nix
index c46fba17149..07ce23a215e 100644
--- a/pkgs/applications/office/banking/default.nix
+++ b/pkgs/applications/office/banking/default.nix
@@ -9,7 +9,7 @@
, meson
, ninja
, pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
, gobject-introspection
, libadwaita
, librsvg
@@ -42,6 +42,9 @@ python3.pkgs.buildPythonApplication rec {
];
postPatch = ''
+ substituteInPlace meson_post_install.py \
+ --replace gtk-update-icon-cache gtk4-update-icon-cache
+
patchShebangs meson_post_conf.py meson_post_install.py
'';
@@ -53,7 +56,7 @@ python3.pkgs.buildPythonApplication rec {
meson
ninja
pkg-config
- wrapGAppsHook
+ wrapGAppsHook4
];
buildInputs = [
diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix
index aa591c225ad..e038749f44e 100644
--- a/pkgs/applications/office/timeular/default.nix
+++ b/pkgs/applications/office/timeular/default.nix
@@ -2,8 +2,6 @@
, fetchurl
, appimageTools
, libsecret
-, gtk3
-, gsettings-desktop-schemas
}:
let
diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix
index f23e88a323c..d3572067284 100644
--- a/pkgs/applications/office/tusk/default.nix
+++ b/pkgs/applications/office/tusk/default.nix
@@ -1,6 +1,4 @@
-{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3
-, makeDesktopItem
-}:
+{ appimageTools, fetchurl, lib, makeDesktopItem }:
let
pname = "tusk";
@@ -31,7 +29,6 @@ in appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix
index 5f28ca73c4e..da4ff212e29 100644
--- a/pkgs/applications/science/logic/easycrypt/default.nix
+++ b/pkgs/applications/science/logic/easycrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, ocamlPackages, why3 }:
stdenv.mkDerivation rec {
pname = "easycrypt";
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7";
};
+ # Fix build with Why3 1.5
+ patches = fetchpatch {
+ url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch";
+ sha256 = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm";
+ };
+
nativeBuildInputs = with ocamlPackages; [
dune_3
findlib
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index b5e5ca8723d..cbd09b2a1a8 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "lean";
- version = "3.42.0";
+ version = "3.43.0";
src = fetchFromGitHub {
owner = "leanprover-community";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# from. this is then used to check whether an olean file should be
# rebuilt. don't use a tag as rev because this will get replaced into
# src/githash.h.in in preConfigure.
- rev = "b35d4695da88139a9168f2ad7acf0782e66dc4f0";
- sha256 = "02rpigw6lnyjw8ccrlp2mcvswawkhl5y6kqa3zq76qp1fdjqjrbp";
+ rev = "bfce34363b0efe86e93e3fe75de76ab3740c772d";
+ sha256 = "100mb003zkgrv1wd2agbk41aipk3j78k8zcjbj7pv9ixh02c7ss8";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 0f3dab8038e..8917135b2c8 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "why3";
- version = "1.4.1";
+ version = "1.5.0";
src = fetchurl {
url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz";
- sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq";
+ sha256 = "sha256:0qjh49pyqmg3xi09fn4lyzz23i6h18y9sgc8ayscvx3bwr3vcqhr";
};
buildInputs = with ocamlPackages; [
diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix
index ae0acb1e525..739064bb616 100644
--- a/pkgs/applications/science/logic/why3/with-provers.nix
+++ b/pkgs/applications/science/logic/why3/with-provers.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin
- makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf"
+ makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--config $out/share/why3/why3.conf"
'';
}
diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix
index 8353226cefe..abff55413ce 100644
--- a/pkgs/applications/science/math/mxnet/default.nix
+++ b/pkgs/applications/science/math/mxnet/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
buildInputs = [ opencv3 gtest blas.provider ]
++ lib.optional stdenv.cc.isGNU gomp
++ lib.optional stdenv.cc.isClang llvmPackages.openmp
+ # FIXME: when cuda build is fixed, remove nvidia_x11, and use /run/opengl-driver/lib
++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
++ lib.optional cudnnSupport cudnn;
@@ -78,5 +79,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ abbradar ];
license = licenses.asl20;
platforms = platforms.unix;
+ # Build failures when linking mxnet_unit_tests: https://gist.github.com/6d17447ee3557967ec52c50d93b17a1d
+ broken = cudaSupport;
};
}
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index 65e15a12cc7..efd853b82b4 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring
-, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel
+, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick
, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
, libxkbcommon, libXi, libXext, wayland-protocols, wayland
, lcms2
@@ -157,7 +157,7 @@ buildPythonApplication rec {
'' else ''
cp -r linux-package/{bin,share,lib} $out
''}
- wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
+ wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}"
installShellCompletion --cmd kitty \
--bash <("$out/bin/kitty" +complete setup bash) \
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/common.nix b/pkgs/applications/version-management/git-and-tools/cgit/common.nix
index d6b787315b8..0cbc04b7bcc 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/common.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/common.nix
@@ -68,6 +68,8 @@ stdenv.mkDerivation {
stripDebugList = [ "cgit" ];
+ enableParallelBuilding = true;
+
meta = {
inherit homepage description;
license = lib.licenses.gpl2;
diff --git a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix b/pkgs/applications/version-management/git-and-tools/cgit/pink.nix
index 75e99a06b1d..73523a2d77a 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/pink.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/pink.nix
@@ -2,22 +2,22 @@
callPackage (import ./common.nix rec {
pname = "cgit-pink";
- version = "1.3.0";
+ version = "1.4.1";
src = fetchurl {
url = "https://git.causal.agency/cgit-pink/snapshot/cgit-pink-${version}.tar.gz";
- sha256 = "sha256-oL46NWgqi1VqKNEt0QGBWNXbi2l7nOQDZy1aMivcWuM=";
+ sha256 = "1ma6j3r4ba5fhd47pc6xn5bmxaqr8ci2pvky9v100n1hh5n6q97i";
};
# cgit-pink is tightly coupled with git and needs a git source tree to build.
# IMPORTANT: Remember to check which git version cgit-pink needs on every
# version bump (look for "GIT_VER" in the top-level Makefile).
gitSrc = fetchurl {
- url = "mirror://kernel/software/scm/git/git-2.35.1.tar.xz";
- sha256 = "sha256-12hSjmRD9logMDYmbxylD50Se6iXUeMurTcRftkZEIA=";
+ url = "mirror://kernel/software/scm/git/git-2.36.1.tar.xz";
+ sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0";
};
homepage = "https://git.causal.agency/cgit-pink/about/";
description = "cgit fork aiming for better maintenance";
- maintainers = with lib.maintainers; [ qyliss sternenseemann ];
+ maintainers = with lib.maintainers; [ sternenseemann ];
}) {}
diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
index 7783c28927c..a0136ba5e4d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-workspace";
- version = "0.9.0";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "orf";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-uP1sex4Hx57ZsqVG4b3809FzFB10Un48+vbwaWZ7HSg=";
+ sha256 = "sha256-sPvb8EKrr9ZUMV1yMTXkFYgjW+LRJwJAXoc7lrWykaI=";
};
- cargoSha256 = "sha256-mkrC8uzfNpL0MQUMjcNaJf5c1wSdlBVg8AMgc/zxM6A=";
+ cargoSha256 = "sha256-WAoYFCJCWKFvWN8XyRBZdzjCrcR6jMp8ZztSLHDP+r0=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
index d5791f6506c..c88d0b9d386 100644
--- a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl, undmg }:
+{ lib, stdenv, appimageTools, autoPatchelfHook, zlib, fetchurl, undmg }:
let
pname = "radicle-upstream";
@@ -39,10 +39,6 @@ let
linux = appimageTools.wrapType2 {
inherit name src meta;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
diff --git a/pkgs/applications/video/losslesscut-bin/appimage.nix b/pkgs/applications/video/losslesscut-bin/appimage.nix
index e6be6f54e1d..87518479db4 100644
--- a/pkgs/applications/video/losslesscut-bin/appimage.nix
+++ b/pkgs/applications/video/losslesscut-bin/appimage.nix
@@ -1,4 +1,4 @@
-{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }:
+{ appimageTools, lib, fetchurl, version, sha256 }:
let
pname = "losslesscut";
@@ -21,7 +21,6 @@ in appimageTools.wrapType2 {
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps;
diff --git a/pkgs/build-support/go/garble.nix b/pkgs/build-support/go/garble.nix
index c9bcf2cec15..502aba4e64a 100644
--- a/pkgs/build-support/go/garble.nix
+++ b/pkgs/build-support/go/garble.nix
@@ -6,16 +6,16 @@
}:
buildGoModule rec {
pname = "garble";
- version = "0.5.1";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "burrowers";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-F8O/33o//yGnum9sZo1dzcvf3ifRalva6SDC36iPbDA==";
+ sha256 = "sha256-VeqF1MB8knM+NtG9Y+x1g2OF7LFZRC8/c8jicGP3vpo=";
};
- vendorSha256 = "sha256-iNH/iBEOTkIhVlDGfI66ZYyVjyH6WrLbUSMyONPjUc4=";
+ vendorSha256 = "sha256-FQMeA6VUDQa6wpvMoYsigkzukQ0dArAkysiksJWq+iY=";
# Used for some of the tests.
checkInputs = [git];
diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index 3ab97760e72..020352836c8 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -9,10 +9,19 @@
version ? package.version,
}: runCommand "${package.name}-test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } ''
if output=$(${command} 2>&1); then
- grep -Fw "${version}" - <<< "$output"
- touch $out
+ if grep -Fw "${version}" - <<< "$output"; then
+ touch $out
+ else
+ echo "Version string '${version}' not found!" >&2
+ echo "The output was:" >&2
+ echo "$output" >&2
+ exit 1
+ fi
else
- echo "$output" >&2 && exit 1
+ echo -n ${lib.escapeShellArg command} >&2
+ echo " returned a non-zero exit code." >&2
+ echo "$output" >&2
+ exit 1
fi
'';
diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
index 56d7dfcf375..e8e98ab0ebf 100644
--- a/pkgs/data/themes/mojave/default.nix
+++ b/pkgs/data/themes/mojave/default.nix
@@ -16,6 +16,7 @@
, opacityVariants ? [] # default to all
, themeVariants ? [] # default to MacOS blue
, wallpapers ? false
+, gitUpdater
}:
let
@@ -29,14 +30,14 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink
stdenv.mkDerivation rec {
inherit pname;
- version = "unstable-2021-12-20";
+ version = "2022-05-12";
srcs = [
(fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
- rev = "c148646ccab382f7a2d5fdc421fc32d843cb4172";
- sha256 = "sha256-h4MSSh8cu9M81bM+WJSyl1SQ7CVth1DvjIVOUJXqpxs";
+ rev = version;
+ sha256 = "sha256-VrrxW16J+S21qBoAeVCWs0Q6bRL1jXAK7MOBpdSMJZY=";
})
]
++
@@ -114,6 +115,8 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
+ passthru.updateScript = gitUpdater {inherit pname version; };
+
meta = with lib; {
description = "Mac OSX Mojave like theme for GTK based desktop environments";
homepage = "https://github.com/vinceliuice/Mojave-gtk-theme";
diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 48cfda3df76..7edbc04e3ed 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, nix-update-script
, meson
, ninja
@@ -32,24 +31,15 @@
stdenv.mkDerivation rec {
pname = "elementary-photos";
- version = "2.7.4";
+ version = "2.7.5";
src = fetchFromGitHub {
owner = "elementary";
repo = "photos";
rev = version;
- sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI=";
+ sha256 = "sha256-zM32+bva+QD1Z/0vUD7K0/tnSzo+7GGLjJ1ytr64c0I=";
};
- patches = [
- # Fix build with vala 0.56
- # https://github.com/elementary/photos/pull/711
- (fetchpatch {
- url = "https://github.com/elementary/photos/commit/6594f1323726fb0d38519a7bdafe16f9170353cb.patch";
- sha256 = "sha256-Ie9ULC8Xw4KLQJANPXh4LDywMjWfniPX/P76eHW8LHc=";
- })
- ];
-
nativeBuildInputs = [
appstream
desktop-file-utils
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
index 70ab050c7ec..a3d8d049e3b 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts";
- version = "6.4.0";
+ version = "6.5.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
- sha256 = "sha256-Fppl/IvdlW8lZ6YKEHaHNticv3FFFKEKTPPVnz4u9b4=";
+ sha256 = "sha256-Q/vvXKyeedn5o7HnL9F5ixSjJS3OWrvvHbzvx2fW2qY=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix
index 1483660d1ec..2c673b7dd4e 100644
--- a/pkgs/development/compilers/go/1.17.nix
+++ b/pkgs/development/compilers/go/1.17.nix
@@ -18,8 +18,12 @@
, buildPackages
, pkgsBuildTarget
, callPackage
+, threadsCross ? null # for MinGW
}:
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
let
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@@ -50,6 +54,8 @@ let
# We need a target compiler which is still runnable at build time,
# to handle the cross-building case where build != host == target
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
+
+ isCross = stdenv.buildPlatform != stdenv.targetPlatform;
in
stdenv.mkDerivation rec {
@@ -71,6 +77,10 @@ stdenv.mkDerivation rec {
depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ];
+ depsBuildTarget = lib.optional isCross targetCC;
+
+ depsTargetTarget = lib.optional (threadsCross != null) threadsCross;
+
hardeningDisable = [ "all" ];
prePatch = ''
@@ -194,12 +204,12 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX
CC_FOR_TARGET =
- if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}cc"
else
null;
CXX_FOR_TARGET =
- if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}c++"
else
null;
@@ -223,7 +233,7 @@ stdenv.mkDerivation rec {
export PATH=$(pwd)/bin:$PATH
- ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) ''
+ ${lib.optionalString isCross ''
# Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix
index aad9c27fc56..48ca47321cd 100644
--- a/pkgs/development/compilers/go/1.18.nix
+++ b/pkgs/development/compilers/go/1.18.nix
@@ -18,8 +18,12 @@
, buildPackages
, pkgsBuildTarget
, callPackage
+, threadsCross ? null # for MinGW
}:
+# threadsCross is just for MinGW
+assert threadsCross != null -> stdenv.targetPlatform.isWindows;
+
let
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@@ -50,6 +54,8 @@ let
# We need a target compiler which is still runnable at build time,
# to handle the cross-building case where build != host == target
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
+
+ isCross = stdenv.buildPlatform != stdenv.targetPlatform;
in
stdenv.mkDerivation rec {
@@ -71,6 +77,10 @@ stdenv.mkDerivation rec {
depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ];
+ depsBuildTarget = lib.optional isCross targetCC;
+
+ depsTargetTarget = lib.optional (threadsCross != null) threadsCross;
+
hardeningDisable = [ "all" ];
prePatch = ''
@@ -188,12 +198,12 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX
CC_FOR_TARGET =
- if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}cc"
else
null;
CXX_FOR_TARGET =
- if (stdenv.buildPlatform != stdenv.targetPlatform) then
+ if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}c++"
else
null;
@@ -217,7 +227,7 @@ stdenv.mkDerivation rec {
export PATH=$(pwd)/bin:$PATH
- ${lib.optionalString (stdenv.buildPlatform != stdenv.targetPlatform) ''
+ ${lib.optionalString isCross ''
# Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc
diff --git a/pkgs/development/interpreters/spidermonkey/91.nix b/pkgs/development/interpreters/spidermonkey/91.nix
index c1e647deb70..f1f5c7bb56a 100644
--- a/pkgs/development/interpreters/spidermonkey/91.nix
+++ b/pkgs/development/interpreters/spidermonkey/91.nix
@@ -19,11 +19,11 @@
stdenv.mkDerivation rec {
pname = "spidermonkey";
- version = "91.8.0";
+ version = "91.9.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
- sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3";
+ sha512 = "fd69d489429052013d2c1b8b766a47920ecee62f0688505758f593b27ae66d6343b9107163749406251aedebdf836147e4d562415a811b04d7ab2ae31e32f133";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index ea6d45e5dff..11a80987dca 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "dlib";
- version = "19.23";
+ version = "19.24";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
- sha256 = "sha256-88vusoLEkjh3WRh/PxPtsVIFk85serRq2VxVcEus3IE=";
+ sha256 = "sha256-YhIjP9TIIyQF6lBj85gyVRIAAwgIodzh0ViQL8v2ACA=";
};
postPatch = ''
diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix
index 589c08399a7..963c93ffc59 100644
--- a/pkgs/development/libraries/libfpx/default.nix
+++ b/pkgs/development/libraries/libfpx/default.nix
@@ -17,13 +17,15 @@ stdenv.mkDerivation rec {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01";
sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p";
})
+ # Pull upstream fix for -fno-common:
+ # https://github.com/ImageMagick/libfpx/pull/1
+ (fetchpatch {
+ name = "fno-common.patch";
+ url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch";
+ sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9";
+ })
];
- # This dead code causes a duplicate symbol error in Clang so just remove it
- postPatch = if stdenv.cc.isClang then ''
- substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" ""
- '' else null;
-
meta = with lib; {
homepage = "http://www.imagemagick.org";
description = "A library for manipulating FlashPIX images";
diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix
index 4f83f22856e..1f4ad96c297 100644
--- a/pkgs/development/libraries/opensaml-cpp/default.nix
+++ b/pkgs/development/libraries/opensaml-cpp/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];
+ NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
+
enableParallelBuilding = true;
meta = with lib; {
diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix
index f3b80c0b548..5dd997352f1 100644
--- a/pkgs/development/libraries/shibboleth-sp/default.nix
+++ b/pkgs/development/libraries/shibboleth-sp/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
"--with-fastcgi"
];
+ NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
+
enableParallelBuilding = true;
meta = with lib; {
diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix
index 9cf3ddb9219..39e25241c94 100644
--- a/pkgs/development/libraries/xml-tooling-c/default.nix
+++ b/pkgs/development/libraries/xml-tooling-c/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
+ NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
+
enableParallelBuilding = true;
meta = with lib; {
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index bb9498a4cc9..8a4b390d65b 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -2,7 +2,13 @@
# executable that matches that packages name, so that they'll work with `nix run`.
{
# Packages that provide multiple executables where one is clearly the `mainProgram`.
+ "@antfu/ni" = "ni";
+ "@electron-forge/cli" = "electron-forge";
+ "@squoosh/cli" = "squoosh-cli";
+ "@webassemblyjs/cli" = "wasm2wast";
+ coffee-script = "coffee";
typescript = "tsc";
+ vue-cli = "vue";
# Packages that provide a single executable whose name differs from the package's `name`.
"@angular/cli" = "ng";
diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
index aa149d60e4d..5c38602e8df 100644
--- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
@@ -4,7 +4,7 @@
buildDunePackage rec {
pname = "graphql_ppx";
- version = "1.2.0";
+ version = "1.2.2";
minimalOCamlVersion = "4.08";
@@ -12,7 +12,7 @@ buildDunePackage rec {
owner = "reasonml-community";
repo = "graphql-ppx";
rev = "v${version}";
- sha256 = "1fymmvk616wv5xkwfdmqibdgfl47ry6idc5wfh20a3mz9mpaa13s";
+ sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44=";
};
buildInputs = [ ppxlib ];
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index 5f1059395ab..6afc65e386e 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -8,15 +8,13 @@ let inherit (lib) optional versionOlder; in
buildDunePackage rec {
pname = "lwt";
- version = "5.4.1";
-
- useDune2 = true;
+ version = "5.5.0";
src = fetchFromGitHub {
owner = "ocsigen";
repo = "lwt";
rev = version;
- sha256 = "sha256-XpoRKcdNo2j05Gxm5wmKSdwqimFDSWvmLyooPYTHAjM=";
+ sha256 = "sha256:1jbjz2rsz3j56k8vh5qlmm87hhkr250bs2m3dvpy9vsri8rkzj9z";
};
strictDeps = true;
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 498caa2045d..2a66a332c39 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "ailment";
- version = "9.2.3";
+ version = "9.2.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-R8AaQj/Rdz8SSN2L8v8ZzIxnPQqdg/SKUB6FV9uYFLs=";
+ hash = "sha256-YsH9QAKoM4WILabgLvEZMJXPfpkfn/h4tofNIcGJY+k=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index f8e3ac530f1..bbfdcb43732 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -46,7 +46,7 @@ in
buildPythonPackage rec {
pname = "angr";
- version = "9.2.3";
+ version = "9.2.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname;
repo = pname;
rev = "v${version}";
- hash = "sha256-RcAiPzz2JUlNIGU7+6WCd5JskRYmlMee8wOcOclfb0Q=";
+ hash = "sha256-3iw1tk2r6Ee302AMjgsRi6EL5py+4Blf47EWrWyiqNk=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix
index d46c18f6d17..8c40a51ff43 100644
--- a/pkgs/development/python-modules/angrop/default.nix
+++ b/pkgs/development/python-modules/angrop/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "angrop";
- version = "9.2.3";
+ version = "9.2.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-bhdn3uomvegpvynR0ts4KdwFapX2xGfuwp4e57Xtcoo=";
+ hash = "sha256-EMW2RxImYoPSnkBG027g5o5K3WT40F/Dj+GzqS8/K6g=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/development/python-modules/ansible-later/default.nix
index 8ad96e78bcf..c35cfcb6e45 100644
--- a/pkgs/development/python-modules/ansible-later/default.nix
+++ b/pkgs/development/python-modules/ansible-later/default.nix
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "ansible-later";
- version = "2.0.12";
+ version = "2.0.13";
format = "pyproject";
disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "thegeeklab";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-0N/BER7tV8Hv1pvHaf/46BKnzZfHBGuEaPPex/CDQe0=";
+ hash = "sha256-9xVFvXCHjgF+7asO1ialGIofJwsRRRiydo/Ui2C+Wig=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 49ae39feba7..e1e198ce179 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -24,11 +24,11 @@
buildPythonPackage rec {
pname = "ansible-core";
- version = "2.12.5";
+ version = "2.13.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M=";
+ sha256 = "sha256-COD7SnGNlnplTnDNpXz5MgGGkyndHPW4pCZ8V8XEyNM=";
};
# ansible_connection is already wrapped, so don't pass it through
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index 2e44fa4e243..6ca283a6e40 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -20,7 +20,7 @@
let
pname = "ansible";
- version = "5.7.1";
+ version = "5.8.0";
in
buildPythonPackage {
inherit pname version;
@@ -30,7 +30,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE=";
+ sha256 = "sha256-+gVkdiAfQGJfs22VxQQe9GOIC+GL5cc7mYtXtAGWeGM=";
};
postPatch = ''
diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 59a2f9ad9c9..da139209577 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "archinfo";
- version = "9.2.3";
+ version = "9.2.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-r0cZXyj47HmgFVyQ3POGexeQxBiQ1xx/ptsPMwCRjHY=";
+ hash = "sha256-d5SP9pnDWXEzjBXKeqnuKK6+lrFRWYwmiV4MjfqORwk=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix
index 2eff37314e8..61117721227 100644
--- a/pkgs/development/python-modules/buildbot/default.nix
+++ b/pkgs/development/python-modules/buildbot/default.nix
@@ -1,8 +1,9 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
-, python, twisted, jinja2, zope_interface, sqlalchemy, alembic, python-dateutil
-, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3
-, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker
-, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales
+, python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic
+, python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs
+, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8
+, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh
+, glibcLocales
, nixosTests
}:
@@ -42,6 +43,7 @@ let
# core
twisted
jinja2
+ msgpack
zope_interface
sqlalchemy
alembic
@@ -50,7 +52,6 @@ let
autobahn
pyjwt
pyyaml
- unidiff
]
# tls
++ twisted.extras-require.tls;
diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix
index 8c5184240f6..6cda5a23aee 100644
--- a/pkgs/development/python-modules/catboost/default.nix
+++ b/pkgs/development/python-modules/catboost/default.nix
@@ -52,5 +52,7 @@ buildPythonPackage rec {
platforms = [ "x86_64-linux" ];
homepage = "https://catboost.ai";
maintainers = with maintainers; [ PlushBeaver ];
+ # _catboost.pyx.cpp:226822:19: error: use of undeclared identifier '_PyGen_Send'
+ broken = withCuda;
};
}
diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index e37f1ee8dbd..49d82215e7c 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "claripy";
- version = "9.2.3";
+ version = "9.2.4";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-O2nkGIQfjGmhrqBPoMI97DsCvOUZix0VcUHwmDyF40Q=";
+ hash = "sha256-nP2mqBmgpn7zFtMd9suH3kfEqKtzIjaZl6ALsvihVgE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index f626e62db0d..2c7b80b524d 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
- version = "9.2.3";
+ version = "9.2.4";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
- hash = "sha256-gyWeE4sF9Bmk2CNmXh90xMtXlaz/Agm7wX6sWr0Fyco=";
+ hash = "sha256-SlYayKfosSicMxMZszZpxJ3ewKScyLpv6s5ayoVE9Ko=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index c8a2eefed24..9e32b3e4fea 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
- version = "2.3.0";
+ version = "2.4.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = pname;
rev = "refs/tags/v${version}";
- hash = "sha256-eZy+m6AkSlZM/i64FyFL+ZgeW86MOSM6sDYPT4ckaHE=";
+ hash = "sha256-IrMXHWeksEmON3LxJvQ3WSKwQTY0aRZ8XItWMr3p4gw=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
index 2601eedc2fa..cba0ac56396 100644
--- a/pkgs/development/python-modules/deepdiff/default.nix
+++ b/pkgs/development/python-modules/deepdiff/default.nix
@@ -8,19 +8,20 @@
, numpy
, pytestCheckHook
, pyyaml
+, pythonOlder
}:
buildPythonPackage rec {
pname = "deepdiff";
- version = "5.7.0";
+ version = "5.8.2";
format = "setuptools";
- # pypi source does not contain all fixtures required for tests
+ disabled = pythonOlder "3.6";
+
src = fetchFromGitHub {
owner = "seperman";
repo = "deepdiff";
- # 5.7.0 release not tagged https://github.com/seperman/deepdiff/issues/300
- rev = "f2ffdb83b2993f4f0bb7e854620f0acd0bf6339e";
+ rev = "v${version}";
hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk=";
};
@@ -48,10 +49,15 @@ buildPythonPackage rec {
pyyaml
];
+ disabledTests = [
+ # Assertion issue with the decimal places
+ "test_get_numeric_types_distance"
+ ];
+
meta = with lib; {
description = "Deep Difference and Search of any Python object/data";
homepage = "https://github.com/seperman/deepdiff";
license = licenses.mit;
- maintainers = [ maintainers.mic92 ];
+ maintainers = with maintainers; [ mic92 ];
};
}
diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix
index c02100e379e..97066662397 100644
--- a/pkgs/development/python-modules/doc8/default.nix
+++ b/pkgs/development/python-modules/doc8/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "doc8";
- version = "0.11.1";
+ version = "0.11.2";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-bby1Ry79Mydj/7KGK0/e7EDIpv3Gu2fmhxOtdJylgIw=";
+ sha256 = "sha256-w1ojH4jxXCBGWRVO09SZ+k1ALX5j1By6e1TPXmRhI6s=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 479af3a676f..b10d29a5943 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -17,7 +17,7 @@
}:
buildPythonPackage rec {
- version = "0.20.36";
+ version = "0.20.38";
pname = "dulwich";
format = "setuptools";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- hash = "sha256-2s7xVJwSdffS1v7NLyz6O6ozB9AJpRTAwjIDP2uqXSE=";
+ hash = "sha256-c0Z5DYc1yG+7xbcLZ08O+UCWweUJm6cnNJFigjmBf8g=";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix
index e3104d8d882..7f855242ebb 100644
--- a/pkgs/development/python-modules/elementpath/default.nix
+++ b/pkgs/development/python-modules/elementpath/default.nix
@@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "elementpath";
- version = "2.5.1";
+ version = "2.5.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "sissaschool";
repo = "elementpath";
rev = "refs/tags/v${version}";
- hash = "sha256-tejsQ6m9XyMGDIEDzWYwSav5Iqa9S/DIYShOpoSlTWo=";
+ hash = "sha256-JmNG6SXig24X34nQXrpMN9ir9+l8o23ddzw2uyR3qb0=";
};
# avoid circular dependency with xmlschema which directly depends on this
diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 27c1a673eee..5b205523f25 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "hahomematic";
- version = "1.3.1";
+ version = "1.4.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-RgjsaGtji5vSQcv+npOYcXJNYUhx9Snz56BXnfoc2QY=";
+ sha256 = "sha256-1JYakfs+lLCfB2Ann1QfNw+MBrB9PiixOUqdA7UgbWE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index fa13cdab0c2..299bd968594 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -1,25 +1,26 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
+, freezegun
+, importlib-metadata
+, pytestCheckHook
, pythonOlder
-, setuptools-scm
, setuptools
-, pytestCheckHook
-, freezegun
+, setuptools-scm
}:
buildPythonPackage rec {
- version = "4.0.0";
+ version = "4.1.0";
pname = "humanize";
format = "pyproject";
- disabled = pythonOlder "3.6";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
- owner = "jmoiron";
+ owner = "python-humanize";
repo = pname;
rev = version;
- sha256 = "sha256-v4OdZmUI2LCick4qCSGOHJ7jtWybwKTeTeIcly+QQQQ=";
+ hash = "sha256-5xL3gfEohDjnF085Pgx/PBXWWM76X4FU2KR+8OGshMw=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -30,6 +31,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [
setuptools
+ ] ++ lib.optionals (pythonOlder "3.8") [
+ importlib-metadata
];
checkInputs = [
@@ -37,11 +40,14 @@ buildPythonPackage rec {
pytestCheckHook
];
+ pythonImportsCheck = [
+ "humanize"
+ ];
+
meta = with lib; {
description = "Python humanize utilities";
- homepage = "https://github.com/jmoiron/humanize";
+ homepage = "https://github.com/python-humanize/humanize";
license = licenses.mit;
maintainers = with maintainers; [ rmcgibbo ];
};
-
}
diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix
index b62d4a67e75..ca5b0d3184e 100644
--- a/pkgs/development/python-modules/mailchecker/default.nix
+++ b/pkgs/development/python-modules/mailchecker/default.nix
@@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "mailchecker";
- version = "4.1.16";
+ version = "4.1.17";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-A+lh+BggMSJ/PIcYMfX3u/YlKVqhG5IxbrHPb1U6Ll4=";
+ hash = "sha256-NfgLI490/9YoHIXTVD890RTe+qP9rrwAFv8Xkc1IY5s=";
};
# Module has no tests
diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix
index a4b15ce9a54..8fc946305bc 100644
--- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix
+++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix
@@ -1,22 +1,43 @@
-{ lib, buildPythonPackage, fetchPypi, marshmallow, setuptools }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, marshmallow
+, pytestCheckHook
+, pythonOlder
+, setuptools
+}:
buildPythonPackage rec {
pname = "marshmallow-oneofschema";
version = "3.0.1";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "62cd2099b29188c92493c2940ee79d1bf2f2619a71721664e5a98ec2faa58237";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "marshmallow-code";
+ repo = pname;
+ rev = version;
+ hash = "sha256-x0v8WkfjGkP2668QIQiewQViYFDIS2zBWMULcDThWas=";
};
- propagatedBuildInputs = [ marshmallow setuptools ];
+ propagatedBuildInputs = [
+ marshmallow
+ setuptools
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ];
- pythonImportsCheck = [ "marshmallow_oneofschema" ];
+ pythonImportsCheck = [
+ "marshmallow_oneofschema"
+ ];
meta = with lib; {
- homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema";
description = "Marshmallow library extension that allows schema (de)multiplexing";
+ homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema";
license = licenses.mit;
- maintainers = [ maintainers.ivan-tkatchev ];
+ maintainers = with maintainers; [ ivan-tkatchev ];
};
}
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index a4f60d8202a..50e7e71cc9e 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -1,15 +1,17 @@
{ lib
, buildPythonPackage
-, pythonOlder
, fetchFromGitHub
, pytestCheckHook
+, pythonOlder
, pytz
, simplejson
+, packaging
}:
buildPythonPackage rec {
pname = "marshmallow";
- version = "3.13.0";
+ version = "3.15.0";
+ format = "setuptools";
disabled = pythonOlder "3.6";
@@ -17,9 +19,13 @@ buildPythonPackage rec {
owner = "marshmallow-code";
repo = pname;
rev = version;
- sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0=";
+ hash = "sha256-ZqMrMNfP/RKW2jQDNPgfhyeqmSc40pZbnrcXHbw2emc=";
};
+ propagatedBuildInputs = [
+ packaging
+ ];
+
checkInputs = [
pytestCheckHook
pytz
@@ -31,10 +37,7 @@ buildPythonPackage rec {
];
meta = with lib; {
- description = ''
- A lightweight library for converting complex objects to and from
- simple Python datatypes.
- '';
+ description = "Library for converting complex objects to and from simple Python datatypes";
homepage = "https://github.com/marshmallow-code/marshmallow";
license = licenses.mit;
maintainers = with maintainers; [ cript0nauta ];
diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix
index ef59a33a956..09d38875db8 100644
--- a/pkgs/development/python-modules/napalm/default.nix
+++ b/pkgs/development/python-modules/napalm/default.nix
@@ -1,23 +1,42 @@
-{ lib, buildPythonPackage, fetchFromGitHub, callPackage, setuptools, cffi
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, setuptools, cffi
, paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko
, junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock
-, pythonOlder, pythonAtLeast }:
+, pythonOlder }:
buildPythonPackage rec {
pname = "napalm";
- version = "3.3.1";
+ version = "3.4.1";
format = "setuptools";
- disabled = pythonOlder "3.6" || pythonAtLeast "3.9";
+ disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "napalm-automation";
repo = "napalm";
rev = version;
- sha256 = "15h1h1a3avv48i14x96b8v7zkhmwg7dnzxycxr18f9530j237rq6";
+ sha256 = "sha256-TNWRJtc6+VS6wgJGGvCPDoFQmOKQAyXdjFQo9bPJ2F8=";
};
+ patches = [
+ # netmiko 4.0.0 support
+ (fetchpatch{
+ url = "https://github.com/napalm-automation/napalm/commit/4b8cc85db3236099a04f742cf71773e74d9dd70e.patch";
+ excludes = [ "requirements.txt" ];
+ sha256 = "sha256-DBKp+wiKd+/j2xAqaQL3UCcGQd6wnWcNTsNXBBt9c98=";
+ })
+ (fetchpatch{
+ url = "https://github.com/napalm-automation/napalm/commit/4a8b5b1823335dd79aa5269c038a1f08ecd35cdd.patch";
+ sha256 = "sha256-uiou/rzmnFf4wAvXwmUsGJx99GeHWKJB2JrMM1kLakM=";
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace requirements.txt \
+ --replace "netmiko>=3.3.0,<4.0.0" "netmiko"
+ '';
+
buildInputs = [ setuptools ];
+
propagatedBuildInputs = [
cffi
paramiko
diff --git a/pkgs/development/python-modules/napalm/hp-procurve.nix b/pkgs/development/python-modules/napalm/hp-procurve.nix
index 774fdd2299c..f6ebfa980e6 100644
--- a/pkgs/development/python-modules/napalm/hp-procurve.nix
+++ b/pkgs/development/python-modules/napalm/hp-procurve.nix
@@ -30,12 +30,14 @@ buildPythonPackage rec {
"test_method_signatures"
# AttributeError: 'PatchedProcurveDriver' object has no attribute 'platform'
"test_get_config_filtered"
+ # AssertionError
+ "test_get_interfaces"
];
meta = with lib; {
description = "HP ProCurve Driver for NAPALM automation frontend";
- homepage =
- "https://github.com/napalm-automation-community/napalm-hp-procurve";
+ homepage = "https://github.com/napalm-automation-community/napalm-hp-procurve";
license = licenses.asl20;
+ maintainers = with maintainers; [ ];
};
}
diff --git a/pkgs/development/python-modules/netmiko/default.nix b/pkgs/development/python-modules/netmiko/default.nix
index 3081b5a6b7c..482c298a90e 100644
--- a/pkgs/development/python-modules/netmiko/default.nix
+++ b/pkgs/development/python-modules/netmiko/default.nix
@@ -3,16 +3,15 @@
buildPythonPackage rec {
pname = "netmiko";
- version = "4.0.0";
+ version = "4.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-fVhBkiO1JpqMIFl32xlwSjeCd7aObocXPAr069fKdmc=";
+ sha256 = "sha256-VwUZdHr82WsEprB7rk5d62AwaCxzngftDgjeBZW4OWQ=";
};
buildInputs = [ setuptools ];
- propagatedBuildInputs =
- [ paramiko scp tenacity textfsm ntc-templates pyserial ];
+ propagatedBuildInputs = [ paramiko scp tenacity pyyaml textfsm ntc-templates pyserial ];
# tests require closed-source pyats and genie packages
doCheck = false;
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 7bbfbdb27d3..ef88131bea6 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "plugwise";
- version = "0.18.3";
+ version = "0.18.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = pname;
repo = "python-plugwise";
rev = "refs/tags/v${version}";
- sha256 = "sha256-aNlPOgUChLFkPPZtb3o4A49uoSBjxKaq3WtuupHlmi8=";
+ sha256 = "sha256-a4mbkwjdLOnoxe4Cj43IXGALqbTKqinoJAiPWfc79/8=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix
index 37e6467c4a7..ae79f36a06c 100644
--- a/pkgs/development/python-modules/pyrogram/default.nix
+++ b/pkgs/development/python-modules/pyrogram/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyrogram";
- version = "2.0.23";
+ version = "2.0.24";
disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pyrogram";
repo = "pyrogram";
rev = "v${version}";
- hash = "sha256-+qJfqC6jLfrPwXl6zR7b21jY/s9leWeBxVgMa1IDRg4=";
+ hash = "sha256-YcVVXaPM+X+9prjgRYYSs8dkho3YKvtn/0FNJVnsrGM=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 682bc0d80ac..095de81b261 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "pyvex";
- version = "9.2.3";
+ version = "9.2.4";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- hash = "sha256-uGZlWDTDczBiNCd4D4y6Umz44G8Zn3Zr8/R7Kn+4aS8=";
+ hash = "sha256-r+dmf5qIjiN5vmdzBmPORnPWPrjLKGks+OAdZXdAbOc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index fde916994a4..26126e92b97 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rns";
- version = "0.3.5";
+ version = "0.3.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "markqvist";
repo = "Reticulum";
- rev = version;
- hash = "sha256-LzrI5pJ3mLaxikqS1eWFvdgneoCnsRTYWbshVX7U8lg=";
+ rev = "refs/tags/${version}";
+ hash = "sha256-awVUE5sViaGBne82oAxGeabZSnLn/dzBQTwP7xRdYKE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/starline/default.nix b/pkgs/development/python-modules/starline/default.nix
index 4f4ad545f2d..ce7418a8873 100644
--- a/pkgs/development/python-modules/starline/default.nix
+++ b/pkgs/development/python-modules/starline/default.nix
@@ -2,23 +2,21 @@
, buildPythonPackage
, pythonOlder
, fetchPypi
-, aiohttp
, requests
}:
buildPythonPackage rec {
pname = "starline";
- version = "0.1.5";
+ version = "0.2.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
- sha256 = "1753f5fcd2a6976aed775afb03f8392159f040c673917cc0c634510d95c13cb9";
+ sha256 = "550b00ab95cf59d933f7708abab40a4e41e5790e62b653471afe86a3af3320e6";
};
propagatedBuildInputs = [
- aiohttp
requests
];
diff --git a/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch b/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch
new file mode 100644
index 00000000000..ad2186543f3
--- /dev/null
+++ b/pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch
@@ -0,0 +1,37 @@
+From 52ab2095649b5951e6af77f68954209473296983 Mon Sep 17 00:00:00 2001
+From: Sandro
+Date: Sat, 16 Jan 2021 15:54:05 +0100
+Subject: [PATCH] Fix finding apple libraries
+
+---
+ CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+
+(rejected by upstream in https://github.com/Azure/azure-c-shared-utility/pull/499,
+seems problem it's solving is nixpkgs-specific)
+
+diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
+index 7bbfa6f3f..3567b18bc 100644
+--- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
++++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
+@@ -120,8 +120,9 @@ endif()
+
+ if(${use_applessl})
+ # MACOSX only has native tls and open ssl, so use the native apple tls
+- find_library(cf_foundation Foundation)
++ find_library(cf_foundation CoreFoundation)
+ find_library(cf_network CFNetwork)
++ find_library(cf_security Security)
+ endif()
+
+ if(${no_logging})
+@@ -581,7 +582,7 @@ endif()
+
+
+ if(${use_applessl})
+- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network})
++ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network} ${cf_security})
+ endif()
+
+ if(WIN32)
diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix
index a838f44eb95..61979da58d4 100644
--- a/pkgs/development/python-modules/uamqp/default.nix
+++ b/pkgs/development/python-modules/uamqp/default.nix
@@ -23,6 +23,10 @@ buildPythonPackage rec {
sha256 = "sha256-guhfOMvddC4E+oOmvpeG8GsXEfqLcSHVdtj3w8fF2Vs=";
};
+ patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+ ./darwin-azure-c-shared-utility-corefoundation.patch
+ ];
+
nativeBuildInputs = [
cmake
];
diff --git a/pkgs/development/python-modules/urlextract/default.nix b/pkgs/development/python-modules/urlextract/default.nix
index 8d2c62de4e8..ce520ba1cca 100644
--- a/pkgs/development/python-modules/urlextract/default.nix
+++ b/pkgs/development/python-modules/urlextract/default.nix
@@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "urlextract";
- version = "1.5.0";
+ version = "1.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- hash = "sha256-QKXIQ9HXJTdY9W8NZ0jF6iekoUVl46kvJakW3cTB5B8=";
+ hash = "sha256-V08NjFYtN3M2pRVIQMfk7s9UwQKlOJcciX9zEwdaiIc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 315ba9416d5..87a0fd54d2d 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
- version = "0.21.2";
+ version = "0.21.3";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = "refs/tags/${version}";
- sha256 = "sha256-GEjrqqmlGA6wG5x89AZXd8FLvrKEzCLmVhhZ7FxDB+w=";
+ sha256 = "sha256-AGKozbVdXfRPvaU1Et8GFu3vdNRLA8ZiV8Xc6T7BhOQ=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix
index 19650671f12..c4ead040593 100644
--- a/pkgs/development/tools/altair-graphql-client/default.nix
+++ b/pkgs/development/tools/altair-graphql-client/default.nix
@@ -1,4 +1,4 @@
-{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
+{ lib, appimageTools, fetchurl }:
let
pname = "altair";
@@ -14,10 +14,6 @@ in
appimageTools.wrapType2 {
inherit src pname version;
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index b5ae5055d02..0b962a97ef1 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -4,6 +4,15 @@
, gdk-pixbuf, wrapGAppsHook
}:
+let why3_1_5 = why3; in
+let why3 = why3_1_5.overrideAttrs (o: rec {
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz";
+ sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq";
+ };
+}); in
+
let
mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
runtimeDeps = with ocamlPackages; [
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix
index be622e99e91..0b395deda41 100644
--- a/pkgs/development/tools/analysis/tfsec/default.nix
+++ b/pkgs/development/tools/analysis/tfsec/default.nix
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
- version = "1.21.0";
+ version = "1.21.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-z2RVMPZykz2FUsmn5sQs3fAK/h+cWv+A/56rhOlHkGA=";
+ sha256 = "sha256-+yCRCHTx42wHnGi4jgre9gaa4LNrWjSNQdIONMWCTkc=";
};
ldflags = [
@@ -21,7 +21,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
- vendorSha256 = "sha256-R5sks8mbY3JpKcVl7XBKst/QI8ZWIqXAR3D6/eflV1Q=";
+ vendorSha256 = "sha256-IwHm70BSM1lIWc7MiL0Ye6Y7fGn6GnuELm082wIgtEk=";
subPackages = [
"cmd/tfsec"
diff --git a/pkgs/development/tools/apkid/default.nix b/pkgs/development/tools/apkid/default.nix
index 2cb1c4e8d00..71e1efa0524 100644
--- a/pkgs/development/tools/apkid/default.nix
+++ b/pkgs/development/tools/apkid/default.nix
@@ -5,13 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "apkid";
- version = "2.1.1";
+ version = "2.1.3";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "rednaga";
repo = "APKiD";
rev = "v${version}";
- sha256 = "1p6kdjjw2jhwr875445w43k46n6zwpz0l0phkl8d3y1v4gi5l6dx";
+ hash = "sha256-U4CsPTA0fXCzj5iLTbLFGudAvewVCzxe4xl0osoBy5A=";
};
propagatedBuildInputs = with python3.pkgs; [
@@ -28,12 +29,14 @@ python3.pkgs.buildPythonApplication rec {
'';
postPatch = ''
- # The next release will have support for later yara-python releases
+ # We have dex support enabled in yara-python
substituteInPlace setup.py \
- --replace "yara-python==3.11.0" "yara-python"
+ --replace "yara-python-dex>=1.0.1" "yara-python"
'';
- pythonImportsCheck = [ "apkid" ];
+ pythonImportsCheck = [
+ "apkid"
+ ];
meta = with lib; {
description = "Android Application Identifier";
diff --git a/pkgs/development/tools/cocoapods/Gemfile b/pkgs/development/tools/cocoapods/Gemfile
index 329b51518e4..00a6b3f80eb 100644
--- a/pkgs/development/tools/cocoapods/Gemfile
+++ b/pkgs/development/tools/cocoapods/Gemfile
@@ -1,3 +1,3 @@
-source 'https://rubygems.org' do
- gem 'cocoapods'
-end
+source 'https://rubygems.org'
+
+gem 'cocoapods'
diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta b/pkgs/development/tools/cocoapods/Gemfile-beta
index dd4b350b437..d8a7e8bb2e2 100644
--- a/pkgs/development/tools/cocoapods/Gemfile-beta
+++ b/pkgs/development/tools/cocoapods/Gemfile-beta
@@ -1,5 +1,5 @@
-source 'https://rubygems.org' do
- # We need to specify a version including prerelease to pick up prereleases.
- # This should pick up all future releases / prereleases.
- gem 'cocoapods', '>=1.7.0.beta.1'
-end
+source 'https://rubygems.org'
+
+# We need to specify a version including prerelease to pick up prereleases.
+# This should pick up all future releases / prereleases.
+gem 'cocoapods', '>=1.7.0.beta.1'
diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta.lock b/pkgs/development/tools/cocoapods/Gemfile-beta.lock
index 3904e6acf98..e0c2ff17070 100644
--- a/pkgs/development/tools/cocoapods/Gemfile-beta.lock
+++ b/pkgs/development/tools/cocoapods/Gemfile-beta.lock
@@ -1,11 +1,9 @@
-GEM
- specs:
-
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (3.0.3)
- activesupport (6.1.4.1)
+ CFPropertyList (3.0.5)
+ rexml
+ activesupport (6.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -17,11 +15,11 @@ GEM
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
- claide (1.0.3)
- cocoapods (1.11.0)
+ claide (1.1.0)
+ cocoapods (1.11.3)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.11.0)
+ cocoapods-core (= 1.11.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -36,7 +34,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
- cocoapods-core (1.11.0)
+ cocoapods-core (1.11.3)
activesupport (>= 5.0, < 7)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@@ -47,7 +45,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
- cocoapods-downloader (1.5.1)
+ cocoapods-downloader (1.6.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
@@ -56,24 +54,24 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
- concurrent-ruby (1.1.9)
+ concurrent-ruby (1.1.10)
escape (0.0.4)
- ethon (0.14.0)
+ ethon (0.15.0)
ffi (>= 1.15.0)
- ffi (1.15.4)
+ ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
- i18n (1.8.10)
+ i18n (1.10.0)
concurrent-ruby (~> 1.0)
- json (2.5.1)
- minitest (5.14.4)
+ json (2.6.2)
+ minitest (5.15.0)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
- public_suffix (4.0.6)
+ public_suffix (4.0.7)
rexml (3.2.5)
ruby-macho (2.5.1)
typhoeus (1.4.0)
@@ -87,13 +85,13 @@ GEM
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
- zeitwerk (2.4.2)
+ zeitwerk (2.5.4)
PLATFORMS
ruby
DEPENDENCIES
- cocoapods (>= 1.7.0.beta.1)!
+ cocoapods (>= 1.7.0.beta.1)
BUNDLED WITH
2.2.20
diff --git a/pkgs/development/tools/cocoapods/Gemfile.lock b/pkgs/development/tools/cocoapods/Gemfile.lock
index 2cc06eac273..293fe9406a9 100644
--- a/pkgs/development/tools/cocoapods/Gemfile.lock
+++ b/pkgs/development/tools/cocoapods/Gemfile.lock
@@ -1,11 +1,9 @@
-GEM
- specs:
-
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (3.0.3)
- activesupport (6.1.4.1)
+ CFPropertyList (3.0.5)
+ rexml
+ activesupport (6.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -17,11 +15,11 @@ GEM
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
- claide (1.0.3)
- cocoapods (1.11.0)
+ claide (1.1.0)
+ cocoapods (1.11.3)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
- cocoapods-core (= 1.11.0)
+ cocoapods-core (= 1.11.3)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.4.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -36,7 +34,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 1.0, < 3.0)
xcodeproj (>= 1.21.0, < 2.0)
- cocoapods-core (1.11.0)
+ cocoapods-core (1.11.3)
activesupport (>= 5.0, < 7)
addressable (~> 2.8)
algoliasearch (~> 1.0)
@@ -47,7 +45,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
- cocoapods-downloader (1.5.1)
+ cocoapods-downloader (1.6.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
@@ -56,24 +54,24 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
- concurrent-ruby (1.1.9)
+ concurrent-ruby (1.1.10)
escape (0.0.4)
- ethon (0.14.0)
+ ethon (0.15.0)
ffi (>= 1.15.0)
- ffi (1.15.4)
+ ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.8.3)
- i18n (1.8.10)
+ i18n (1.10.0)
concurrent-ruby (~> 1.0)
- json (2.5.1)
- minitest (5.14.4)
+ json (2.6.2)
+ minitest (5.15.0)
molinillo (0.8.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
- public_suffix (4.0.6)
+ public_suffix (4.0.7)
rexml (3.2.5)
ruby-macho (2.5.1)
typhoeus (1.4.0)
@@ -87,13 +85,13 @@ GEM
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
- zeitwerk (2.4.2)
+ zeitwerk (2.5.4)
PLATFORMS
ruby
DEPENDENCIES
- cocoapods!
+ cocoapods
BUNDLED WITH
2.2.20
diff --git a/pkgs/development/tools/cocoapods/gemset-beta.nix b/pkgs/development/tools/cocoapods/gemset-beta.nix
index e1f573b89c3..3091a85e0cc 100644
--- a/pkgs/development/tools/cocoapods/gemset-beta.nix
+++ b/pkgs/development/tools/cocoapods/gemset-beta.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";
+ sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw";
type = "gem";
};
- version = "6.1.4.1";
+ version = "6.1.6";
};
addressable = {
dependencies = ["public_suffix"];
@@ -43,24 +43,25 @@
version = "0.1.3";
};
CFPropertyList = {
+ dependencies = ["rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
+ sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
type = "gem";
};
- version = "3.0.3";
+ version = "3.0.5";
};
claide = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+ sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.0";
};
cocoapods = {
dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
@@ -68,10 +69,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1b8773v98vkcr55yx5ydc28wq8ya53ya1v51cj7fxg5n3aa5h0cz";
+ sha256 = "0cix57b2si8lc1m15mzg3mr1kmvn5sq0cy01vqwlfvvirrkf3ky3";
type = "gem";
};
- version = "1.11.0";
+ version = "1.11.3";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -79,10 +80,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19bik6yj125vhq0vxb6fsb41b3i2bi4437l7dkhgrw317gx3wf9b";
+ sha256 = "1lqcq7pk3znc9par217h4hv8g70w25m2a2llgyayp30dlgdj45iy";
type = "gem";
};
- version = "1.11.0";
+ version = "1.11.3";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -99,10 +100,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "161sjpyxipnbhwcr5kyfbcdbzs9zq20sigsazjm782cn3s466p0z";
+ sha256 = "0jgipkiah3z6qb9ax6qac3b2m1idavd5adc319k5rjsfddpfgszh";
type = "gem";
};
- version = "1.5.1";
+ version = "1.6.3";
};
cocoapods-plugins = {
dependencies = ["nap"];
@@ -161,10 +162,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
+ sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
type = "gem";
};
- version = "1.1.9";
+ version = "1.1.10";
};
escape = {
groups = ["default"];
@@ -182,20 +183,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh";
+ sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
type = "gem";
};
- version = "0.14.0";
+ version = "0.15.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
+ sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
- version = "1.15.4";
+ version = "1.15.5";
};
fourflusher = {
groups = ["default"];
@@ -243,30 +244,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
+ sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem";
};
- version = "1.8.10";
+ version = "1.10.0";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+ sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl";
type = "gem";
};
- version = "2.5.1";
+ version = "2.6.2";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
+ sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
type = "gem";
};
- version = "5.14.4";
+ version = "5.15.0";
};
molinillo = {
groups = ["default"];
@@ -313,10 +314,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+ sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
- version = "4.0.6";
+ version = "4.0.7";
};
rexml = {
groups = ["default"];
@@ -376,9 +377,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
+ sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem";
};
- version = "2.4.2";
+ version = "2.5.4";
};
}
diff --git a/pkgs/development/tools/cocoapods/gemset.nix b/pkgs/development/tools/cocoapods/gemset.nix
index 7d74b857cf5..533535ff013 100644
--- a/pkgs/development/tools/cocoapods/gemset.nix
+++ b/pkgs/development/tools/cocoapods/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4";
+ sha256 = "08wzpwgdm03vzb8gqr8bvfdarb89g5ah0skvwqk6qv87p55xqkyw";
type = "gem";
};
- version = "6.1.4.1";
+ version = "6.1.6";
};
addressable = {
dependencies = ["public_suffix"];
@@ -41,24 +41,25 @@
version = "0.1.3";
};
CFPropertyList = {
+ dependencies = ["rexml"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4";
+ sha256 = "193l8r1ycd3dcxa7lsb4pqcghbk56dzc5244m6y8xmv88z6m31d7";
type = "gem";
};
- version = "3.0.3";
+ version = "3.0.5";
};
claide = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z";
+ sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
type = "gem";
};
- version = "1.0.3";
+ version = "1.1.0";
};
cocoapods = {
dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
@@ -66,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1b8773v98vkcr55yx5ydc28wq8ya53ya1v51cj7fxg5n3aa5h0cz";
+ sha256 = "0cix57b2si8lc1m15mzg3mr1kmvn5sq0cy01vqwlfvvirrkf3ky3";
type = "gem";
};
- version = "1.11.0";
+ version = "1.11.3";
};
cocoapods-core = {
dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"];
@@ -77,10 +78,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19bik6yj125vhq0vxb6fsb41b3i2bi4437l7dkhgrw317gx3wf9b";
+ sha256 = "1lqcq7pk3znc9par217h4hv8g70w25m2a2llgyayp30dlgdj45iy";
type = "gem";
};
- version = "1.11.0";
+ version = "1.11.3";
};
cocoapods-deintegrate = {
groups = ["default"];
@@ -97,10 +98,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "161sjpyxipnbhwcr5kyfbcdbzs9zq20sigsazjm782cn3s466p0z";
+ sha256 = "0jgipkiah3z6qb9ax6qac3b2m1idavd5adc319k5rjsfddpfgszh";
type = "gem";
};
- version = "1.5.1";
+ version = "1.6.3";
};
cocoapods-plugins = {
dependencies = ["nap"];
@@ -155,10 +156,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
+ sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
type = "gem";
};
- version = "1.1.9";
+ version = "1.1.10";
};
escape = {
source = {
@@ -174,20 +175,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1bby4hbq96vnzcdbbybcbddin8dxdnj1ns758kcr4akykningqhh";
+ sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288";
type = "gem";
};
- version = "0.14.0";
+ version = "0.15.0";
};
ffi = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
+ sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
type = "gem";
};
- version = "1.15.4";
+ version = "1.15.5";
};
fourflusher = {
groups = ["default"];
@@ -231,30 +232,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
+ sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg";
type = "gem";
};
- version = "1.8.10";
+ version = "1.10.0";
};
json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
+ sha256 = "0yk5d10yvspkc5jyvx9gc1a9pn1z8v4k2hvjk1l88zixwf3wf3cl";
type = "gem";
};
- version = "2.5.1";
+ version = "2.6.2";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
+ sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
type = "gem";
};
- version = "5.14.4";
+ version = "5.15.0";
};
molinillo = {
groups = ["default"];
@@ -297,10 +298,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+ sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb";
type = "gem";
};
- version = "4.0.6";
+ version = "4.0.7";
};
rexml = {
groups = ["default"];
@@ -360,9 +361,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
+ sha256 = "09bq7j2p6mkbxnsg71s253dm2463kg51xc7bmjcxgyblqbh4ln7m";
type = "gem";
};
- version = "2.4.2";
+ version = "2.5.4";
};
}
diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix
index bc41263e96f..18bb6964ada 100644
--- a/pkgs/development/tools/jl/default.nix
+++ b/pkgs/development/tools/jl/default.nix
@@ -5,21 +5,8 @@
}:
mkDerivation rec {
pname = "jl";
- version = "0.0.5";
- src = fetchFromGitHub {
- owner = "chrisdone";
- repo = "jl";
- rev = "v${version}";
- sha256 = "1hlnwsl4cj0l4x8dxwda2fcnk789cwlphl9gv9cfrivl43mgkgar";
- };
- patches = [
- # MonadFail compatibility patch. Should be removed with the next release
- (fetchpatch {
- url = "https://github.com/chrisdone/jl/commit/6d40308811cbc22a96b47ebe69ec308b4e9fd356.patch";
- sha256 = "1pg92ffkg8kim5r8rz8js6fjqyjisg1266sf7p9jyxjgsskwpa4g";
- })
- ];
-
+ version = "0.1.0";
+ sha256 = "15vvn3swjpc5qmdng1fcd8m9nif4qnjmpmxc9hdw5cswzl055lkj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -34,10 +21,4 @@ mkDerivation rec {
description = "Functional sed for JSON";
maintainers = with lib.maintainers; [ fgaz ];
homepage = "https://github.com/chrisdone/jl";
-
- # jl needs to be updated to work with aeson-2.0.
- # As far as I can tell, there is unfortunately no where to report issues upstream
- # for us to be able to track when upstream adds aeson-2.0 support.
- hydraPlatforms = lib.platforms.none;
- broken = true;
}
diff --git a/pkgs/development/tools/konstraint/default.nix b/pkgs/development/tools/konstraint/default.nix
index 94578591003..ed11ab5b666 100644
--- a/pkgs/development/tools/konstraint/default.nix
+++ b/pkgs/development/tools/konstraint/default.nix
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "konstraint";
- version = "0.19.1";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "plexsystems";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-MQ9Rb8U1CGbEgNtkOdK879dr8uOro6CAl4wGMbuT+wo=";
+ sha256 = "sha256-xSJxBJzLfZhBcXqKs8EZRHTpgb1YeKDTzrOiBtGBwTI=";
};
vendorSha256 = "sha256-gUuceNwOI+ss2YDiIF+zxyOj53iV6kGtVhNCd5KQomo=";
diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix
index 7478c27ce9f..a0f1b097a98 100644
--- a/pkgs/development/tools/misc/saleae-logic-2/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }:
+{ lib, fetchurl, makeDesktopItem, appimageTools }:
let
name = "saleae-logic-2";
version = "2.3.52";
@@ -31,10 +31,6 @@ appimageTools.wrapType2 {
cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png
'';
- profile = ''
- export XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}''${XDG_DATA_DIRS:+:"''$XDG_DATA_DIRS"}"
- '';
-
extraPkgs = pkgs: with pkgs; [
wget
unzip
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index 4a4eecf5ddb..801634201c8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
- "rev": "470b15a60520ff7b86f51732b8d8f1118c86041e",
- "date": "2022-03-18T01:42:08-05:00",
- "path": "/nix/store/c5y76kz7wmfq05hfw4xpqz2ahcdy924f-tree-sitter-nix",
- "sha256": "1hl0mpy0i6r160v6v3nflrdi5fnmd8i5zbx963h5nj9fg4srkb5r",
+ "rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d",
+ "date": "2021-11-29T00:27:21-06:00",
+ "path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix",
+ "sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index 57a0f188dc8..04557a27f74 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -20,12 +20,12 @@ in
mkDerivation rec {
pname = "qtcreator";
- version = "5.0.2";
+ version = "5.0.3";
baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version));
src = fetchurl {
url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
- sha256 = "1bf07150226da46237f26f5eaa9f090ce81ed79b9bc75e0dfa6328043e360103";
+ sha256 = "1sz21ijzvhf5avblikffykbqa8zdq3sbg32g2dmyxv5w211v3lvz";
};
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++
diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix
index 8c05a5fc9a0..2aef56fcc1d 100644
--- a/pkgs/development/tools/rust/cargo-deny/default.nix
+++ b/pkgs/development/tools/rust/cargo-deny/default.nix
@@ -11,19 +11,19 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
- version = "0.11.4";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = pname;
rev = version;
- sha256 = "sha256-lwVoV+zxJfmWvlt14FFmxPCdKCoojVvRVGS1rq1QF44=";
+ sha256 = "sha256-8zJvVuEljCa63mQcgK3E3/SHica6DZbNys+PG7E2GtI=";
};
# enable pkg-config feature of zstd
cargoPatches = [ ./zstd-pkg-config.patch ];
- cargoSha256 = "sha256-I+kpHaCxuNzq8+GdqQEuSdE4aD+/lBccUrSf+XW2OKE=";
+ cargoSha256 = "sha256-bMm/JWzVrgS8XHV1ZXeGQm79JUC7zL0h6v92tqajXfU=";
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index e52c3882216..4a6ca92e964 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
+{ lib, fetchurl, appimageTools }:
appimageTools.wrapType2 rec {
pname = "unityhub";
@@ -31,10 +31,6 @@ appimageTools.wrapType2 rec {
$out/share/icons/hicolor/64x64/apps/unityhub.png
'';
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
meta = with lib; {
homepage = "https://unity3d.com/";
description = "Game development tool";
diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix
index 1c9ed7c2e10..59ab32131c2 100644
--- a/pkgs/development/web/bloomrpc/default.nix
+++ b/pkgs/development/web/bloomrpc/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, gsettings-desktop-schemas, gtk3, appimageTools }:
+{ lib, fetchurl, appimageTools }:
let
pname = "bloomrpc";
@@ -19,7 +19,6 @@ appimageTools.wrapType2 {
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix
index d2f63498947..7cae7dd557a 100644
--- a/pkgs/development/web/nodejs/v14.nix
+++ b/pkgs/development/web/nodejs/v14.nix
@@ -7,7 +7,7 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "14.19.2";
- sha256 = "sha256-70N1qRUv9p8oI9eyCjtTdnoEYWS7rHgkQpyyFtFojPA=";
+ version = "14.19.3";
+ sha256 = "sha256-XPRbHxrKd1I6zzYkDB1TqZknkHCncR6r8jNG+IsMyZQ=";
patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff;
}
diff --git a/pkgs/development/web/nodejs/v17.nix b/pkgs/development/web/nodejs/v17.nix
deleted file mode 100644
index 3fbaf223f30..00000000000
--- a/pkgs/development/web/nodejs/v17.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ callPackage, python3, enableNpm ? true }:
-
-let
- buildNodejs = callPackage ./nodejs.nix {
- python = python3;
- };
-in
-buildNodejs {
- inherit enableNpm;
- version = "17.9.0";
- sha256 = "1q1rr9kvlk9rd35x3x206iy894hq2ywyhqxbb6grak6wcvdgcnan";
- patches = [
- ./disable-darwin-v8-system-instrumentation.patch
- ];
-}
diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix
index 6a55c20b195..b0a9924cd82 100644
--- a/pkgs/development/web/nodejs/v18.nix
+++ b/pkgs/development/web/nodejs/v18.nix
@@ -7,8 +7,8 @@ let
in
buildNodejs {
inherit enableNpm;
- version = "18.1.0";
- sha256 = "0zhb61ihzslmpl1g3dd6vcxjccc8gwj1v4hfphk7f3cy10hcrc78";
+ version = "18.2.0";
+ sha256 = "sha256-IwWxXr9VR0dOkFtQAvm6mcfu7wHXOU3+bzhGzGvK1m0=";
patches = [
./disable-darwin-v8-system-instrumentation.patch
];
diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix
index aade2aaae9e..45ec432dc7b 100644
--- a/pkgs/games/anki/bin.nix
+++ b/pkgs/games/anki/bin.nix
@@ -3,22 +3,22 @@
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
- version = "2.1.51";
+ version = "2.1.52";
sources = {
linux = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
- sha256 = "sha256-ZKVc+TvkNu5mGgibhRIuoLuIfvyoVDy+c4h+Apz9P+0=";
+ sha256 = "sha256-+eRflNMxutoSY9yQfnhIjfLg9b9CNv+7UuYyg4jgfK4=";
};
# For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
darwin-x86_64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
- sha256 = "sha256-wZMJEbcpezVAuBSKlwNTHlqjp0FfmyDB7XD6BBuJhyA=";
+ sha256 = "sha256-keQxaf0KOQjCb22dQD/1VytW2fk35OPUJyJ42kaoAr8=";
};
darwin-aarch64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
- sha256 = "sha256-6RDTYKoisX5DJ9VPWrP9VH9DCABabb9MB3nG4S8jtR0=";
+ sha256 = "sha256-mYPSOjXh18nWpZjXLAjEodoxopr6rxadESMAf/t9SlI=";
};
};
@@ -44,7 +44,7 @@ let
meta = with lib; {
inherit (anki.meta) license homepage description longDescription;
- platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
maintainers = with maintainers; [ atemu ];
};
diff --git a/pkgs/games/cl-wordle/default.nix b/pkgs/games/cl-wordle/default.nix
index 1ad3487c3fe..505c5166e42 100644
--- a/pkgs/games/cl-wordle/default.nix
+++ b/pkgs/games/cl-wordle/default.nix
@@ -1,15 +1,17 @@
-{ lib, rustPlatform, fetchCrate }:
+{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cl-wordle";
- version = "0.4.0";
+ version = "0.5.0";
- src = fetchCrate {
- inherit pname version;
- sha256 = "sha256-z2XpXgOviBRcberwpxQ4ml1T04k5kMhG7wA0PAYWENg=";
+ src = fetchFromGitHub {
+ owner = "conradludgate";
+ repo = "wordle";
+ rev = "v${version}";
+ sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s=";
};
- cargoSha256 = "sha256-C7UMkhgez2CtddftARlwN1TjZ1N26NnZfpRiX1KkMEA=";
+ cargoSha256 = "sha256-PtJbLpAUH44alupFY6wX++t/QsKknn5bXvnXzdYsd9o=";
meta = with lib; {
description = "Wordle TUI in Rust";
diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix
index 565bb87f7e0..044d159cde1 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
+{ lib, fetchurl, appimageTools }:
let
pname = "heroic";
@@ -29,10 +29,6 @@ appimageTools.wrapType2 {
--replace 'Exec=AppRun' 'Exec=heroic'
'';
- profile = ''
- export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
- '';
-
meta = with lib; {
description = "A Native GUI Epic Games Launcher for Linux, Windows and Mac";
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
diff --git a/pkgs/os-specific/darwin/dockutil/default.nix b/pkgs/os-specific/darwin/dockutil/default.nix
index d937ce8fd12..5e4187f0728 100644
--- a/pkgs/os-specific/darwin/dockutil/default.nix
+++ b/pkgs/os-specific/darwin/dockutil/default.nix
@@ -1,24 +1,29 @@
-{ lib, stdenv, fetchFromGitHub }:
-
+{ lib, stdenv, fetchurl, libarchive, p7zip }:
stdenv.mkDerivation rec {
pname = "dockutil";
- version = "2.0.5";
+ version = "3.0.2";
- src = fetchFromGitHub {
- owner = "kcrawford";
- repo = "dockutil";
- rev = version;
- sha256 = "sha256-8tDkueCTCtvxc7owp3K9Tsrn4hL79CM04zBNv7AcHgA=";
+ src = fetchurl {
+ url =
+ "https://github.com/kcrawford/dockutil/releases/download/${version}/dockutil-${version}.pkg";
+ sha256 = "175137ea747e83ed221d60b18b712b256ed31531534cde84f679487d337668fd";
};
dontBuild = true;
+ nativeBuildInputs = [ libarchive p7zip ];
+
+ unpackPhase = ''
+ 7z x $src
+ bsdtar -xf Payload~
+ '';
+
installPhase = ''
runHook preInstall
-
mkdir -p $out/bin
- install -Dm755 scripts/dockutil -t $out/bin
-
+ mkdir -p $out/usr/local/bin
+ install -Dm755 usr/local/bin/dockutil -t $out/usr/local/bin
+ ln -rs $out/usr/local/bin/dockutil $out/bin/dockutil
runHook postInstall
'';
diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix
index b2bc7e376b5..14d6287c479 100644
--- a/pkgs/os-specific/darwin/moltenvk/default.nix
+++ b/pkgs/os-specific/darwin/moltenvk/default.nix
@@ -192,6 +192,7 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/KhronosGroup/MoltenVK";
changelog = "https://github.com/KhronosGroup/MoltenVK/releases";
maintainers = [ lib.maintainers.reckenrode ];
+ hydraPlatforms = [ ]; # Prevent building on Hydra until MoltenVK no longer requires Xcode.
license = lib.licenses.asl20;
platforms = lib.platforms.darwin;
};
diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 8464b9ad25f..14c4d00dccd 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -2,15 +2,15 @@
let
stableVariant = {
- version = "5.15.34";
+ version = "5.15.40";
suffix = "xanmod1";
- hash = "sha256-sfrcaFhrdvupygXvajGyl6ruuBu+vFsAKjLyINyV3pw=";
+ hash = "sha256-P9pRPfzBVQNhWp6ulDiBgV/ki2C0CTbIRV6KRhUD+vQ=";
};
edgeVariant = {
- version = "5.17.2";
+ version = "5.17.8";
suffix = "xanmod1";
- hash = "sha256-DK6yFZewqmr/BXFW5tqKXtWb1OLfqokZRQLOQxvBg6Q=";
+ hash = "sha256-Q8YmBeocolr6Ds2inwV299Td6/zE8RTA1SWve5ZykAs=";
};
xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec {
@@ -69,7 +69,7 @@ let
extraMeta = {
branch = lib.versions.majorMinor version;
- maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault ];
+ maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu ];
description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience";
broken = stdenv.isAarch64;
};
diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix
index 56e412379f8..a48abf85831 100644
--- a/pkgs/os-specific/linux/latencytop/default.nix
+++ b/pkgs/os-specific/linux/latencytop/default.nix
@@ -1,10 +1,16 @@
-{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }:
+{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2, util-linux }:
stdenv.mkDerivation rec {
pname = "latencytop";
version = "0.5";
- patchPhase = "sed -i s,/usr,$out, Makefile";
+ postPatch = ''
+ sed -i s,/usr,$out, Makefile
+
+ # Fix #171609
+ substituteInPlace fsync.c --replace /bin/mount ${util-linux}/bin/mount
+ '';
+
preInstall = "mkdir -p $out/sbin";
src = fetchurl {
diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix
index 995381c5340..6caa8e39450 100644
--- a/pkgs/os-specific/linux/light/default.nix
+++ b/pkgs/os-specific/linux/light/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, coreutils }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, coreutils }:
stdenv.mkDerivation rec {
version = "1.2.2";
@@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "1a70zcf88ifsnwll486aicjnh48zisdf8f7vi34ihw61kdadsq9s";
};
+ patches = [
+ # Pull upstream fix for -fno-common toolchains:
+ # https://github.com/haikarainen/light/pull/135
+ (fetchpatch {
+ name = "fno-common.patch";
+ url = "https://github.com/haikarainen/light/commit/eae912ca7ff3356805e47739114861d2b6ae7ec0.patch";
+ sha256 = "15jp8hm5scl0myiy1jmvd6m52lhx5jscvi3rgb5siwakmnkgzx9j";
+ })
+ ];
+
configureFlags = [ "--with-udev" ];
nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 15e3d7f89ab..c34f97a17db 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -37,6 +37,8 @@ lib.makeScope newScope (self: with self; {
stdenv = crossThreadsStdenv;
};
+ npiperelay = callPackage ./npiperelay { };
+
pthreads = callPackage ./pthread-w32 { };
wxMSW = callPackage ./wxMSW-2.8 { };
diff --git a/pkgs/os-specific/windows/npiperelay/default.nix b/pkgs/os-specific/windows/npiperelay/default.nix
new file mode 100644
index 00000000000..edc83a27e55
--- /dev/null
+++ b/pkgs/os-specific/windows/npiperelay/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "npiperelay";
+ version = "0.1.0";
+
+ src = fetchFromGitHub {
+ owner = "jstarks";
+ repo = "npiperelay";
+ rev = "v${version}";
+ sha256 = "sha256-cg4aZmpTysc8m1euxIO2XPv8OMnBk1DwhFcuIFHF/1o=";
+ };
+
+ vendorSha256 = null;
+
+ meta = {
+ description = "Access Windows named pipes from WSL";
+ homepage = "https://github.com/jstarks/npiperelay";
+ license = lib.licenses.mit;
+ maintainers = [ lib.maintainers.shlevy ];
+ platforms = lib.platforms.windows;
+ };
+}
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix
index cf6427c860c..53644d62e65 100644
--- a/pkgs/servers/computing/storm/default.nix
+++ b/pkgs/servers/computing/storm/default.nix
@@ -7,12 +7,12 @@
stdenv.mkDerivation rec {
pname = "apache-storm";
- version = "2.3.0";
+ version = "2.4.0";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://apache/storm/${name}/${name}.tar.gz";
- sha256 = "sha256-ScIlWyZjPG/ZY5nFIDOeRZ/NopoOfm0Mh3XO/P9sNjY=";
+ sha256 = "sha256-VFNcaISPBRMGR5l/P6/pGnK7lHClDW2AmXJ00gzxwMY=";
};
nativeBuildInputs = [ zip unzip ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index bc9e7339296..22ef7e00c92 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2022.5.4";
+ version = "2022.5.5";
components = {
"abode" = ps: with ps; [
abodepy
@@ -2440,7 +2440,7 @@
paho-mqtt
];
"snmp" = ps: with ps; [
- pysnmplib
+ pysnmp
];
"solaredge" = ps: with ps; [
solaredge
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index abaf16079d8..ff5c69b04fb 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -179,7 +179,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2022.5.4";
+ hassVersion = "2022.5.5";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- hash = "sha256-5juHG1bVeFYrjpAAlt3GoCRmBvyCSOdnSw1WuaNWF8w=";
+ hash = "sha256-uVB3Yg3f0fNkq2rav7hmbJ9IAMg0UIrdMshJVgOharA=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
index 505e9e4ebae..c9aa674cbdc 100644
--- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
+++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
@@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "matrix-synapse-mjolnir-antispam";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "mjolnir";
- rev = "v${version}";
- sha256 = "sha256-zVb0lD5tYhX2a2MzNVQ8u7rMuQ8yGC/JlodbY4nsqNU=";
+ rev = "refs/tags/v${version}";
+ sha256 = "sha256-887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM=";
};
sourceRoot = "./source/synapse_antispam";
diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 62cb43abefa..4b79103d7d5 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -55,6 +55,7 @@ buildGoModule rec {
# Enable only select service discovery to shrink binaries.
(
+ true # prevent bash syntax error when all plugins are disabled
${lib.optionalString (enableAWS)
"echo - github.com/prometheus/prometheus/discovery/aws"}
${lib.optionalString (enableAzure)
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index e71fb9db115..5b88481d1d2 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -54,6 +54,12 @@ in {
version = "23.0.4";
sha256 = "67191c2b8b41591ae42accfb32216313fde0e107201682cb39029f890712bc6a";
};
+
+ nextcloud24 = generic {
+ version = "24.0.0";
+ sha256 = "176cb5620f20465fb4759bdf3caaebeb7acff39d6c8630351af9f8738c173780";
+ };
+
# tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'
}
diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index 66b99c79453..f769850224b 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -1,23 +1,28 @@
{ lib
+, stdenv
, buildGoModule
, fetchFromGitHub
+, CoreFoundation
+, Security
}:
buildGoModule rec {
pname = "trivy";
- version = "0.27.1";
+ version = "0.28.0";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-eyvxBpGuOXicuqINYhl4/fUgN/j+Awe5vgMaMxtAMr0=";
+ sha256 = "sha256-zyTUGAxUAfrigRNiw03ZXFK+UkpuxwuU2xviZmAPuR8=";
};
-
- vendorSha256 = "sha256-91tq4ipi3JobVgffASn8KRd3JQkgbOx/7PsjKq5vJdE=";
+ vendorSha256 = "sha256-dgiKWHSm49/CB4dWrNWIzkkmj6Aw4l+9iLa6xe/umq0=";
excludedPackages = "misc";
+ buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64)
+ [ CoreFoundation Security ];
+
ldflags = [
"-s"
"-w"
diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix
index 03f082a4038..d9c609d7c0a 100644
--- a/pkgs/tools/filesystems/9pfs/default.nix
+++ b/pkgs/tools/filesystems/9pfs/default.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation {
buildInputs = [ fuse ];
+ # Workaround build failure on -fno-common toolchains like upstream
+ # gcc-10. Otherwise build fails as:
+ # ld: lib/auth_rpc.o:/build/source/lib/../9pfs.h:35: multiple definition of
+ # `logfile'; 9pfs.o:/build/source/9pfs.h:35: first defined here
+ NIX_CFLAGS_COMPILE = "-fcommon";
+
enableParallelBuilding = true;
meta = {
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index f9e5340802e..9d68d4fa272 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -23,9 +23,6 @@ stdenv.mkDerivation rec {
buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ];
- # for python cross-compiling
- _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config;
-
# gcc bug with -O1 on ARM with gcc 4.8
# This should be fine on all platforms so apply universally
postPatch = "sed -i s/-O1/-O2/ configure";
@@ -38,6 +35,8 @@ stdenv.mkDerivation rec {
makeFlags = lib.optionals stdenv.hostPlatform.isGnu [ "udevruledir=$(out)/lib/udev/rules.d" ];
+ installFlags = [ "install_python" ];
+
enableParallelBuilding = true;
passthru.tests = {
diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix
index 0ebc1f23223..95dabe2f97b 100644
--- a/pkgs/tools/filesystems/hubicfuse/default.nix
+++ b/pkgs/tools/filesystems/hubicfuse/default.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/TurboGit/hubicfuse/commit/b460f40d86bc281a21379158a7534dfb9f283786.patch";
sha256 = "0nqvcbrgbc5dms8fkz3brlj40yn48p36drabrnc26gvb3hydh5dl";
})
+ # UPstream fix for build failure on -fno-common toolchains
+ (fetchpatch {
+ name = "fno-common.patch";
+ url = "https://github.com/TurboGit/hubicfuse/commit/34a6c3e57467b5f7e9befe2171bf4292893c5a18.patch";
+ sha256 = "0k1jz2h8sdhmi0srx0adbyrcrm57j4annj84yw6hdrly5hsf7bzc";
+ })
];
nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index b07947e672f..b0f6c6c24e8 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
pythonPath = [
binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
- libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
+ libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
xz zip zstd
]
++ (with python3Packages; [
@@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
++ lib.optionals enableBloat ([
abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
- hdf5 imagemagick llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans
+ hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans
] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ]));
checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;
diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix
index a79f414a359..cb3eeca27af 100644
--- a/pkgs/tools/misc/wootility/default.nix
+++ b/pkgs/tools/misc/wootility/default.nix
@@ -1,8 +1,6 @@
{ appimageTools
, fetchurl
, lib
-, gsettings-desktop-schemas
-, gtk3
, libxkbfile
, udev
, wooting-udev-rules
@@ -21,7 +19,6 @@ appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
- export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
'';
multiPkgs = extraPkgs;
diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix
index cd935a5f5d7..30367eb14e4 100644
--- a/pkgs/tools/networking/argus-clients/default.nix
+++ b/pkgs/tools/networking/argus-clients/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "argus-clients";
- version = "3.0.8.2";
+ version = "3.0.8.3";
src = fetchurl {
url = "http://qosient.com/argus/src/${pname}-${version}.tar.gz";
- sha256 = "1c9vj6ma00gqq9h92fg71sxcsjzz912166sdg90ahvnmvmh3l1rj";
+ sha256 = "sha256-uNTvi6zbrYHAivQMPkhlNCoqRW9GOkgKvCf3mInds80=";
};
NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ];
diff --git a/pkgs/tools/networking/proxychains-ng/default.nix b/pkgs/tools/networking/proxychains-ng/default.nix
index 35a6c7d7f87..12b3932b8f9 100644
--- a/pkgs/tools/networking/proxychains-ng/default.nix
+++ b/pkgs/tools/networking/proxychains-ng/default.nix
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
+, fetchpatch
}:
stdenv.mkDerivation rec {
@@ -14,6 +15,28 @@ stdenv.mkDerivation rec {
sha256 = "sha256-uu/zN6W0ue526/3a9QeYg6J4HLaovZJVOYXksjouYok=";
};
+ patches = [
+ # zsh completion
+ (fetchpatch {
+ url = "https://github.com/rofl0r/proxychains-ng/commit/04023d3811d8ee34b498b429bac7a871045de59c.patch";
+ sha256 = "sha256-Xcg2kmAhj/OJn/RKJAxb9MOJNJQY7FXmxEIzQ5dvabo=";
+ })
+ (fetchpatch {
+ url = "https://github.com/rofl0r/proxychains-ng/commit/9b42da71f4df7b783cf07a58ffa095e293c43380.patch";
+ sha256 = "sha256-tYv9XP51WtsjaoklwQk3D/MQceoOvtdMwBraECt6AXQ=";
+ })
+ ];
+
+ installFlags = [
+ "install-config"
+ # TODO: check on next update if that works and remove postInstall
+ # "install-zsh-completion"
+ ];
+
+ postInstall = ''
+ ./tools/install.sh -D -m 644 completions/_proxychains $out/share/zsh/site_functions/_proxychains4
+ '';
+
meta = with lib; {
description = "A preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies";
homepage = "https://github.com/rofl0r/proxychains-ng";
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
index b93c6ae12cf..df692f372c8 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile --replace "-Werror" "-Werror -Wno-stringop-truncation"
'';
+ installFlags = [
+ "install-config"
+ ];
+
meta = with lib; {
description = "Proxifier for SOCKS proxies";
homepage = "http://proxychains.sourceforge.net";
diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix
index 18d3e3d004a..b70171e2908 100644
--- a/pkgs/tools/text/tab/default.nix
+++ b/pkgs/tools/text/tab/default.nix
@@ -1,24 +1,20 @@
{ lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
- version = "9.0";
+ version = "9.1";
pname = "tab";
src = fetchFromGitHub {
owner = "ivan-tkatchev";
repo = pname;
rev = version;
- sha256 = "sha256-2keVGPRYV2KCeJ+LgAcl74cjW5wvp6Rmy7VNMtdliBE=";
+ sha256 = "sha256-AhgWeV/ojB8jM16A5ggrOD1YjWfRVcoQbkd3S2bgdyE=";
};
checkInputs = [ python3 ];
doCheck = !stdenv.isDarwin;
- preCheck = ''
- substituteInPlace Makefile --replace "python2 go2.py" "python go.py"
- '';
-
checkTarget = "test";
installPhase = ''
@@ -32,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Programming language/shell calculator";
- homepage = "https://tkatchev.bitbucket.io/tab/";
+ homepage = "http://tab-lang.xyz";
license = licenses.boost;
maintainers = with maintainers; [ mstarzyk ];
platforms = with platforms; unix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd2206f92bb..7552933a48e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5457,6 +5457,7 @@ with pkgs;
trivy = callPackage ../tools/admin/trivy {
buildGoModule = buildGo118Module;
+ inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
trompeloeil = callPackage ../development/libraries/trompeloeil { };
@@ -7841,10 +7842,6 @@ with pkgs;
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix {
enableNpm = false;
};
- nodejs-17_x = callPackage ../development/web/nodejs/v17.nix { };
- nodejs-slim-17_x = callPackage ../development/web/nodejs/v17.nix {
- enableNpm = false;
- };
nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { };
nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix {
enableNpm = false;
@@ -8607,7 +8604,7 @@ with pkgs;
grocy = callPackage ../servers/grocy { };
inherit (callPackage ../servers/nextcloud {})
- nextcloud21 nextcloud22 nextcloud23;
+ nextcloud21 nextcloud22 nextcloud23 nextcloud24;
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
@@ -10975,7 +10972,7 @@ with pkgs;
toybox = callPackage ../tools/misc/toybox { };
- tpmmanager = callPackage ../applications/misc/tpmmanager { };
+ tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
@@ -14791,7 +14788,14 @@ with pkgs;
autoadb = callPackage ../misc/autoadb { };
ansible = ansible_2_12;
- ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core;
+ ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core;
+ ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
+ version = "2.12.5";
+ src = oldAttrs.src.override {
+ inherit version;
+ hash = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M=";
+ };
+ }));
ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
@@ -29878,7 +29882,9 @@ with pkgs;
tempo = callPackage ../servers/tracing/tempo {};
- temporal = callPackage ../applications/networking/cluster/temporal { };
+ temporal = callPackage ../applications/networking/cluster/temporal {
+ buildGoModule = buildGo118Module;
+ };
tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f538812767..0ed03be8d5e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1405,6 +1405,8 @@ in {
btrfs = callPackage ../development/python-modules/btrfs { };
+ btrfsutil = toPythonModule (pkgs.btrfs-progs.override { python3 = self.python; });
+
bugsnag = callPackage ../development/python-modules/bugsnag { };
bugwarrior = callPackage ../development/python-modules/bugwarrior { };
diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix
index c8bdaeb426e..d50b979fdce 100644
--- a/pkgs/top-level/wine-packages.nix
+++ b/pkgs/top-level/wine-packages.nix
@@ -12,7 +12,8 @@ rec {
fontconfigSupport = stdenv.isLinux;
alsaSupport = stdenv.isLinux;
openglSupport = true;
- vulkanSupport = true;
+ # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK.
+ vulkanSupport = stdenv.isLinux;
tlsSupport = true;
cupsSupport = true;
dbusSupport = stdenv.isLinux;
@@ -40,7 +41,8 @@ rec {
gphoto2Support = true;
krb5Support = true;
ldapSupport = true;
- vkd3dSupport = true;
+ # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK.
+ vkd3dSupport = stdenv.isLinux;
embedInstallers = true;
};