Merge master into haskell-updates

main
github-actions[bot] 2 years ago committed by GitHub
commit f86d2dd756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      doc/contributing/submitting-changes.chapter.md
  2. 30
      nixos/maintainers/scripts/ec2/create-amis.sh
  3. 10
      nixos/modules/installer/tools/nix-fallback-paths.nix
  4. 3
      nixos/modules/services/networking/ssh/sshd.nix
  5. 10
      nixos/modules/services/networking/wireguard.nix
  6. 14
      nixos/modules/services/web-apps/nextcloud.nix
  7. 2
      nixos/modules/services/web-apps/nextcloud.xml
  8. 2
      nixos/tests/nextcloud/default.nix
  9. 7
      pkgs/applications/audio/mousai/default.nix
  10. 6
      pkgs/applications/audio/musikcube/default.nix
  11. 29
      pkgs/applications/backup/pika-backup/borg-path.patch
  12. 38
      pkgs/applications/backup/pika-backup/default.nix
  13. 6
      pkgs/applications/blockchains/alfis/default.nix
  14. 4
      pkgs/applications/blockchains/ledger-live-desktop/default.nix
  15. 5
      pkgs/applications/blockchains/mycrypto/default.nix
  16. 4
      pkgs/applications/blockchains/wasabibackend/default.nix
  17. 6
      pkgs/applications/editors/standardnotes/default.nix
  18. 4
      pkgs/applications/graphics/drawio/default.nix
  19. 4
      pkgs/applications/graphics/megapixels/default.nix
  20. 4
      pkgs/applications/misc/authenticator/default.nix
  21. 4
      pkgs/applications/misc/bottles/default.nix
  22. 6
      pkgs/applications/misc/chrysalis/default.nix
  23. 6
      pkgs/applications/misc/devdocs-desktop/default.nix
  24. 3
      pkgs/applications/misc/joplin-desktop/default.nix
  25. 8
      pkgs/applications/misc/marktext/default.nix
  26. 4
      pkgs/applications/misc/metadata-cleaner/default.nix
  27. 3
      pkgs/applications/misc/notable/default.nix
  28. 20
      pkgs/applications/misc/tpmmanager/default.nix
  29. 6
      pkgs/applications/misc/zettlr/default.nix
  30. 3
      pkgs/applications/networking/Sylk/default.nix
  31. 6
      pkgs/applications/networking/cluster/lens/default.nix
  32. 8
      pkgs/applications/networking/cluster/nomad-pack/default.nix
  33. 3
      pkgs/applications/networking/cluster/octant/desktop.nix
  34. 30
      pkgs/applications/networking/cluster/temporal/default.nix
  35. 6
      pkgs/applications/networking/cluster/terraform/default.nix
  36. 10
      pkgs/applications/networking/cluster/tilt/default.nix
  37. 4
      pkgs/applications/networking/flexget/default.nix
  38. 3
      pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
  39. 5
      pkgs/applications/networking/instant-messengers/rambox/rambox.nix
  40. 35
      pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  41. 220
      pkgs/applications/networking/n8n/node-packages.nix
  42. 10
      pkgs/applications/networking/nextcloud-client/default.nix
  43. 4
      pkgs/applications/networking/p2p/tixati/default.nix
  44. 3
      pkgs/applications/networking/station/default.nix
  45. 7
      pkgs/applications/office/banking/default.nix
  46. 2
      pkgs/applications/office/timeular/default.nix
  47. 5
      pkgs/applications/office/tusk/default.nix
  48. 8
      pkgs/applications/science/logic/easycrypt/default.nix
  49. 6
      pkgs/applications/science/logic/lean/default.nix
  50. 4
      pkgs/applications/science/logic/why3/default.nix
  51. 2
      pkgs/applications/science/logic/why3/with-provers.nix
  52. 3
      pkgs/applications/science/math/mxnet/default.nix
  53. 4
      pkgs/applications/terminal-emulators/kitty/default.nix
  54. 2
      pkgs/applications/version-management/git-and-tools/cgit/common.nix
  55. 10
      pkgs/applications/version-management/git-and-tools/cgit/pink.nix
  56. 6
      pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
  57. 6
      pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
  58. 3
      pkgs/applications/video/losslesscut-bin/appimage.nix
  59. 6
      pkgs/build-support/go/garble.nix
  60. 15
      pkgs/build-support/testers/default.nix
  61. 9
      pkgs/data/themes/mojave/default.nix
  62. 14
      pkgs/desktops/pantheon/apps/elementary-photos/default.nix
  63. 4
      pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix
  64. 16
      pkgs/development/compilers/go/1.17.nix
  65. 16
      pkgs/development/compilers/go/1.18.nix
  66. 4
      pkgs/development/interpreters/spidermonkey/91.nix
  67. 4
      pkgs/development/libraries/dlib/default.nix
  68. 12
      pkgs/development/libraries/libfpx/default.nix
  69. 2
      pkgs/development/libraries/opensaml-cpp/default.nix
  70. 2
      pkgs/development/libraries/shibboleth-sp/default.nix
  71. 2
      pkgs/development/libraries/xml-tooling-c/default.nix
  72. 6
      pkgs/development/node-packages/main-programs.nix
  73. 4
      pkgs/development/ocaml-modules/graphql_ppx/default.nix
  74. 6
      pkgs/development/ocaml-modules/lwt/default.nix
  75. 4
      pkgs/development/python-modules/ailment/default.nix
  76. 4
      pkgs/development/python-modules/angr/default.nix
  77. 4
      pkgs/development/python-modules/angrop/default.nix
  78. 4
      pkgs/development/python-modules/ansible-later/default.nix
  79. 4
      pkgs/development/python-modules/ansible/core.nix
  80. 4
      pkgs/development/python-modules/ansible/default.nix
  81. 4
      pkgs/development/python-modules/archinfo/default.nix
  82. 11
      pkgs/development/python-modules/buildbot/default.nix
  83. 2
      pkgs/development/python-modules/catboost/default.nix
  84. 4
      pkgs/development/python-modules/claripy/default.nix
  85. 4
      pkgs/development/python-modules/cle/default.nix
  86. 4
      pkgs/development/python-modules/cyclonedx-python-lib/default.nix
  87. 16
      pkgs/development/python-modules/deepdiff/default.nix
  88. 4
      pkgs/development/python-modules/doc8/default.nix
  89. 4
      pkgs/development/python-modules/dulwich/default.nix
  90. 4
      pkgs/development/python-modules/elementpath/default.nix
  91. 4
      pkgs/development/python-modules/hahomematic/default.nix
  92. 24
      pkgs/development/python-modules/humanize/default.nix
  93. 4
      pkgs/development/python-modules/mailchecker/default.nix
  94. 37
      pkgs/development/python-modules/marshmallow-oneofschema/default.nix
  95. 17
      pkgs/development/python-modules/marshmallow/default.nix
  96. 29
      pkgs/development/python-modules/napalm/default.nix
  97. 6
      pkgs/development/python-modules/napalm/hp-procurve.nix
  98. 7
      pkgs/development/python-modules/netmiko/default.nix
  99. 4
      pkgs/development/python-modules/plugwise/default.nix
  100. 4
      pkgs/development/python-modules/pyrogram/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

@ -236,7 +236,7 @@ The `master` branch is the main development branch. It should only see non-break
### Staging branch {#submitting-changes-staging-branch} ### 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} ### Staging-next branch {#submitting-changes-staging-next-branch}

@ -26,12 +26,32 @@ var ${home_region:=eu-west-1}
var ${bucket:=nixos-amis} var ${bucket:=nixos-amis}
var ${service_role_name:=vmimport} var ${service_role_name:=vmimport}
var ${regions:=eu-west-1 eu-west-2 eu-west-3 eu-central-1 eu-north-1 # Output of the command:
us-east-1 us-east-2 us-west-1 us-west-2 # > 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 ca-central-1
ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 eu-central-1
ap-south-1 ap-east-1 eu-north-1
sa-east-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) regions=($regions)

@ -1,7 +1,7 @@
{ {
x86_64-linux = "/nix/store/yx36yzxpw1hn4fz8iyf1rfyd56jg3yf4-nix-2.8.0"; x86_64-linux = "/nix/store/6mjgljq8sm9bsz6k22as5ar3jw78644m-nix-2.8.1";
i686-linux = "/nix/store/c0hg806zvwg800qbszzj8ff4a224kjgf-nix-2.8.0"; i686-linux = "/nix/store/c4yjv4l8wncdla6ycicvsjrdf40xjkpp-nix-2.8.1";
aarch64-linux = "/nix/store/wic2832ll53q392r2wks4xr2nrk7p8p5-nix-2.8.0"; aarch64-linux = "/nix/store/qkgvks80mdibq7m86hqasgr5lpixbnmh-nix-2.8.1";
x86_64-darwin = "/nix/store/5yqdvnkmkrhl36xh0qy31pymdphjimdd-nix-2.8.0"; x86_64-darwin = "/nix/store/riz4mzb1xhp36088ffnp40lz52bpxz01-nix-2.8.1";
aarch64-darwin = "/nix/store/izc9592szrnpv8n86hr88bhpyc9g6b4s-nix-2.8.0"; aarch64-darwin = "/nix/store/dirm8hsnmvvzjs21hrx8i84w8k453jzp-nix-2.8.1";
} }

@ -293,6 +293,7 @@ in
kexAlgorithms = mkOption { kexAlgorithms = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ default = [
"sntrup761x25519-sha512@openssh.com"
"curve25519-sha256" "curve25519-sha256"
"curve25519-sha256@libssh.org" "curve25519-sha256@libssh.org"
"diffie-hellman-group-exchange-sha256" "diffie-hellman-group-exchange-sha256"
@ -301,7 +302,7 @@ in
Allowed key exchange algorithms Allowed key exchange algorithms
</para> </para>
<para> <para>
Defaults to recommended settings from both Uses the lower bound recommended in both
<link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html" /> <link xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html" />
and and
<link xlink:href="https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67" /> <link xlink:href="https://infosec.mozilla.org/guidelines/openssh#modern-openssh-67" />

@ -301,8 +301,9 @@ let
{ {
description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}"; description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}";
requires = [ "wireguard-${interfaceName}.service" ]; requires = [ "wireguard-${interfaceName}.service" ];
after = [ "wireguard-${interfaceName}.service" ]; wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" "wireguard-${interfaceName}.service" ]; after = [ "wireguard-${interfaceName}.service" "network-online.target" ];
wantedBy = [ "wireguard-${interfaceName}.service" ];
environment.DEVICE = interfaceName; environment.DEVICE = interfaceName;
environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity"; environment.WG_ENDPOINT_RESOLUTION_RETRIES = "infinity";
path = with pkgs; [ iproute2 wireguard-tools ]; path = with pkgs; [ iproute2 wireguard-tools ];
@ -379,8 +380,9 @@ let
nameValuePair "wireguard-${name}" nameValuePair "wireguard-${name}"
{ {
description = "WireGuard Tunnel - ${name}"; description = "WireGuard Tunnel - ${name}";
requires = [ "network-online.target" ]; after = [ "network-pre.target" ];
after = [ "network.target" "network-online.target" ]; wants = [ "network.target" ];
before = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment.DEVICE = name; environment.DEVICE = name;
path = with pkgs; [ kmod iproute2 wireguard-tools ]; path = with pkgs; [ kmod iproute2 wireguard-tools ];

@ -153,11 +153,11 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
description = "Which package to use for the Nextcloud instance."; description = "Which package to use for the Nextcloud instance.";
relatedPackages = [ "nextcloud22" "nextcloud23" ]; relatedPackages = [ "nextcloud22" "nextcloud23" "nextcloud24" ];
}; };
phpPackage = mkOption { phpPackage = mkOption {
type = types.package; type = types.package;
relatedPackages = [ "php74" "php80" ]; relatedPackages = [ "php74" "php80" "php81" ];
defaultText = "pkgs.php"; defaultText = "pkgs.php";
description = '' description = ''
PHP package to use for Nextcloud. PHP package to use for Nextcloud.
@ -568,7 +568,7 @@ in {
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
{ warnings = let { warnings = let
latest = 23; latest = 24;
upgradeWarning = major: nixos: upgradeWarning = major: nixos:
'' ''
A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. 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 "21") (upgradeWarning 20 "21.05"))
++ (optional (versionOlder cfg.package.version "22") (upgradeWarning 21 "21.11")) ++ (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 "23") (upgradeWarning 22 "22.05"))
++ (optional (versionOlder cfg.package.version "24") (upgradeWarning 23 "22.05"))
++ (optional isUnsupportedMariadb '' ++ (optional isUnsupportedMariadb ''
You seem to be using MariaDB at an unsupported version (i.e. at least 10.6)! 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 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 "21.11" then nextcloud21
else if versionOlder stateVersion "22.05" then nextcloud22 else if versionOlder stateVersion "22.05" then nextcloud22
else nextcloud23 else nextcloud24
); );
services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home; services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;
services.nextcloud.phpPackage = services.nextcloud.phpPackage =
if versionOlder cfg.package.version "21" then pkgs.php74 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 = [ { assertions = [
@ -884,7 +886,7 @@ in {
# FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6, # FIXME(@Ma27) Nextcloud isn't compatible with mariadb 10.6,
# this is a workaround. # this is a workaround.
# See https://help.nextcloud.com/t/update-to-next-cloud-21-0-2-has-get-an-error/117028/22 # 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 = { mysqld = {
innodb_read_only_compressed = 0; innodb_read_only_compressed = 0;
}; };

@ -11,7 +11,7 @@
desktop client is packaged at <literal>pkgs.nextcloud-client</literal>. desktop client is packaged at <literal>pkgs.nextcloud-client</literal>.
</para> </para>
<para> <para>
The current default by NixOS is <package>nextcloud23</package> which is also the latest The current default by NixOS is <package>nextcloud24</package> which is also the latest
major version available. major version available.
</para> </para>
<section xml:id="module-services-nextcloud-basic-usage"> <section xml:id="module-services-nextcloud-basic-usage">

@ -18,4 +18,4 @@ foldl
}; };
}) })
{ } { }
[ 22 23 ] [ 22 23 24 ]

@ -15,7 +15,7 @@
, ninja , ninja
, pkg-config , pkg-config
, pulseaudio , pulseaudio
, wrapGAppsHook , wrapGAppsHook4
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -39,6 +39,9 @@ python3.pkgs.buildPythonApplication rec {
]; ];
postPatch = '' postPatch = ''
substituteInPlace build-aux/meson/postinstall.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
patchShebangs build-aux/meson patchShebangs build-aux/meson
''; '';
@ -51,7 +54,7 @@ python3.pkgs.buildPythonApplication rec {
meson meson
ninja ninja
pkg-config pkg-config
wrapGAppsHook wrapGAppsHook4
]; ];
buildInputs = [ buildInputs = [

@ -60,11 +60,11 @@ stdenv.mkDerivation rec {
libmicrohttpd libmicrohttpd
ncurses ncurses
taglib taglib
] ++ lib.optional systemdSupport [ ] ++ lib.optionals systemdSupport [
systemd systemd
] ++ lib.optional stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
alsa-lib pulseaudio alsa-lib pulseaudio
] ++ lib.optional stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Cocoa SystemConfiguration Cocoa SystemConfiguration
]; ];

@ -1,13 +1,22 @@
diff --git a/src/borg/utils.rs b/src/borg/utils.rs diff --git a/src/borg/process.rs b/src/borg/process.rs
index 4e30913..30d7d6f 100644 index 63ea0ee..e3535e0 100644
--- a/src/borg/utils.rs --- a/src/borg/process.rs
+++ b/src/borg/utils.rs +++ b/src/borg/process.rs
@@ -223,7 +223,7 @@ impl BorgCall { @@ -203,7 +203,7 @@ impl BorgCall {
} }
pub fn cmd(&self) -> Command { pub fn cmd(&self) -> Result<process::Command> {
- let mut cmd = Command::new("borg"); - let mut cmd = process::Command::new("borg");
+ let mut cmd = 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<async_process::Command> {
- 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())

@ -5,35 +5,34 @@
, rustPlatform , rustPlatform
, substituteAll , substituteAll
, desktop-file-utils , desktop-file-utils
, itstool
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, python3 , python3
, wrapGAppsHook , wrapGAppsHook4
, borgbackup , borgbackup
, dbus , gtk4
, gdk-pixbuf , libadwaita
, glib , libsecret
, gtk3
, libhandy
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pika-backup"; pname = "pika-backup";
version = "0.3.5"; version = "0.4.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "World"; owner = "World";
repo = "pika-backup"; repo = "pika-backup";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8jT3n+bTNjhm64AMS24Ju+San75ytfqFXloH/TOgO1g="; hash = "sha256-vQ0hlwsrY0WOUc/ppleE+kKRGHPt/ScEChXrkukln3U=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
sha256 = "198bs4z7l22sh8ck7v46s45mj8zpfbg03n1xzc6pnafdd8hf3q15"; hash = "sha256-IKUh5gkXTpmMToDaec+CpCIQqJjwJM2ZrmGQhZeTDsg=";
}; };
patches = [ patches = [
@ -41,12 +40,10 @@ stdenv.mkDerivation rec {
src = ./borg-path.patch; src = ./borg-path.patch;
borg = "${borgbackup}/bin/borg"; 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 { (fetchpatch {
url = "https://gitlab.gnome.org/World/pika-backup/-/commit/54be149c88fd69fb9e74b7362fe7182863237869.patch"; name = "use-gtk4-update-icon-cache.patch";
sha256 = "sha256-Tffxo5hlf/gSkp1GfyL4eHthX49tuTq6B+S53N8oA2M="; 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 = [ nativeBuildInputs = [
desktop-file-utils desktop-file-utils
itstool
meson meson
ninja ninja
pkg-config pkg-config
python3 python3
wrapGAppsHook wrapGAppsHook4
] ++ (with rustPlatform; [ ] ++ (with rustPlatform; [
cargoSetupHook cargoSetupHook
rust.cargo rust.cargo
@ -68,16 +66,14 @@ stdenv.mkDerivation rec {
]); ]);
buildInputs = [ buildInputs = [
dbus gtk4
gdk-pixbuf libadwaita
glib libsecret
gtk3
libhandy
]; ];
meta = with lib; { meta = with lib; {
description = "Simple backups based on borg"; 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"; changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ]; maintainers = with maintainers; [ dotlambda ];

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "alfis"; pname = "alfis";
version = "0.7.0"; version = "0.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Revertron"; owner = "Revertron";
repo = "Alfis"; repo = "Alfis";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-lamobXaDY+v8NpoI+TuuBO5Cdol9+7VPhdmLEH6sZIo="; sha256 = "sha256-P+usJCzf92WZ46mdaDbej59/RUzmFcMvlYXVe2VpgY0=";
}; };
cargoSha256 = "sha256-C5MCT4EG/lI4s2rVGSm9DgBu43FKpp3iTBbCf7N1jOA="; cargoSha256 = "sha256-N5qHu0sCmIWtDYerWqMlD3qr8QtXLvEC7VqPEvnW2cw=";
checkFlags = [ checkFlags = [
# these want internet access, disable them # these want internet access, disable them

@ -2,12 +2,12 @@
let let
pname = "ledger-live-desktop"; pname = "ledger-live-desktop";
version = "2.40.4"; version = "2.41.3";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; 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 { appimageContents = appimageTools.extractType2 {

@ -1,5 +1,4 @@
{ lib, appimageTools, fetchurl, makeDesktopItem { lib, appimageTools, fetchurl, makeDesktopItem
, gsettings-desktop-schemas, gtk3
}: }:
let let
@ -29,10 +28,6 @@ let
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src; 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 multiPkgs = null; # no p32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

@ -10,13 +10,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "wasabibackend"; pname = "wasabibackend";
version = "1.1.13.0"; version = "1.1.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zkSNACKs"; owner = "zkSNACKs";
repo = "WalletWasabi"; repo = "WalletWasabi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zDOk8MurT5NXOr4kvm5mnsphY+eDFWuVBcpeTZpcHOo="; sha256 = "sha256-Hwav7moG6XKAcR7L0Q7CtifP3zCNRfHIihlaFw+dzbk=";
}; };
projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj"; projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj";

@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils { lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }: , fetchurl, libsecret }:
let let
version = "3.11.1"; version = "3.11.1";
@ -31,10 +31,6 @@ let
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src; 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; [ extraPkgs = pkgs: with pkgs; [
libsecret libsecret
]; ];

@ -11,11 +11,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "drawio"; pname = "drawio";
version = "18.0.4"; version = "18.0.6";
src = fetchurl { src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "0ln9vs2zyqq0pz3af6i8ynjbg59j0y6y7f5qkrgk2yv2mpnncl3m"; sha256 = "939d23f45f82bc4978ff3cb5d15d096f8af9658fb9f9211d3849998f6a0bd3a9";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -5,7 +5,7 @@
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, wrapGAppsHook , wrapGAppsHook4
, libepoxy , libepoxy
, gtk4 , gtk4
, zbar , zbar
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
wrapGAppsHook wrapGAppsHook4
]; ];
buildInputs = [ buildInputs = [

@ -9,7 +9,7 @@
, ninja , ninja
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, wrapGAppsHook , wrapGAppsHook4
, gdk-pixbuf , gdk-pixbuf
, glib , glib
, gst_all_1 , gst_all_1
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
wrapGAppsHook wrapGAppsHook4
] ++ (with rustPlatform; [ ] ++ (with rustPlatform; [
cargoSetupHook cargoSetupHook
rust.cargo rust.cargo

@ -20,13 +20,13 @@ let
in in
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "bottles"; pname = "bottles";
version = "2022.5.2-trento-2"; version = "2022.5.14-trento-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bottlesdevs"; owner = "bottlesdevs";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-ufK+h4nblnftyIaRSq43H/q3VSquf1DnD6Z+iuPTJBE="; sha256 = "sha256-w5nSMJnt4WO1KOJvdjM1TYSOvPnogERgQWp1JVr3TZY=";
}; };
postPatch = '' postPatch = ''

@ -1,4 +1,4 @@
{ lib, appimageTools, fetchurl, gtk3, gsettings-desktop-schemas }: { lib, appimageTools, fetchurl }:
let let
pname = "chrysalis"; 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; multiPkgs = null;
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.glib p.glib

@ -1,4 +1,4 @@
{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }: { lib, appimageTools, fetchurl }:
let let
version = "0.7.2"; version = "0.7.2";
@ -17,10 +17,6 @@ let
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src; 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 = '' extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop install -m 444 -D ${appimageContents}/devdocs.desktop $out/share/applications/devdocs.desktop

@ -1,4 +1,4 @@
{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: { lib, stdenv, appimageTools, fetchurl, undmg }:
let let
pname = "joplin-desktop"; pname = "joplin-desktop";
@ -45,7 +45,6 @@ let
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: { appimageTools, fetchurl, lib }:
let let
pname = "marktext"; pname = "marktext";
@ -18,12 +18,6 @@ appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

@ -13,7 +13,7 @@
, ninja , ninja
, pkg-config , pkg-config
, poppler_gi , poppler_gi
, wrapGAppsHook , wrapGAppsHook4
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
meson meson
ninja ninja
pkg-config pkg-config
wrapGAppsHook wrapGAppsHook4
]; ];
buildInputs = [ buildInputs = [

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: { appimageTools, fetchurl, lib }:
let let
pname = "notable"; pname = "notable";
@ -23,7 +23,6 @@ appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }: { lib, stdenv, fetchFromGitHub, fetchpatch, qtbase, qmake, wrapQtAppsHook, trousers }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.8.1"; version = "0.8.1";
@ -8,12 +8,24 @@ stdenv.mkDerivation rec {
owner = "Rohde-Schwarz"; owner = "Rohde-Schwarz";
repo = "TPMManager"; repo = "TPMManager";
rev = "v${version}"; 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 = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin

@ -1,8 +1,6 @@
{ appimageTools { appimageTools
, lib , lib
, fetchurl , fetchurl
, gtk3
, gsettings-desktop-schemas
, texlive , texlive
, pandoc , pandoc
}: }:
@ -23,10 +21,6 @@ in
appimageTools.wrapType2 rec { appimageTools.wrapType2 rec {
inherit name src; 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 multiPkgs = null; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = '' extraInstallCommands = ''

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }: { appimageTools, fetchurl, lib }:
let let
pname = "Sylk"; pname = "Sylk";
@ -15,7 +15,6 @@ appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: { lib, fetchurl, appimageTools, wrapGAppsHook }:
let let
pname = "lens"; pname = "lens";
@ -20,10 +20,6 @@ in
appimageTools.wrapType2 { appimageTools.wrapType2 {
inherit name src; 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 = extraInstallCommands =
'' ''
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/${name} $out/bin/${pname}

@ -5,17 +5,17 @@
buildGoModule rec { buildGoModule rec {
pname = "nomad-pack"; pname = "nomad-pack";
version = "2022-04-12"; version = "2022-05-12";
rev = "50ad747d2a5a2b90af1b3564483510cb04fefbea"; rev = "bee6e8e078ff31fee916b864fbf3648294dbcdf5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hashicorp"; owner = "hashicorp";
repo = pname; repo = pname;
inherit rev; 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 # skip running go tests as they require network access
doCheck = false; doCheck = false;

@ -1,4 +1,4 @@
{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }: { lib, stdenv, appimageTools, fetchurl, undmg }:
let let
pname = "octant-desktop"; pname = "octant-desktop";
@ -25,7 +25,6 @@ let
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

@ -1,38 +1,37 @@
{ lib, fetchFromGitHub, buildGoModule }: { lib, fetchFromGitHub, buildGoModule, testers, temporal }:
buildGoModule rec { buildGoModule rec {
pname = "temporal"; pname = "temporal";
version = "1.15.0"; version = "1.16.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "temporalio"; owner = "temporalio";
repo = "temporal"; repo = "temporal";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-5Tu838086qgIa2fqda2xi7vn4JbkENVJH4XU3NwW7Ic="; sha256 = "sha256-MPfyjRpjfnuVbj+Pd7yIlaEJCiX1IEy/Lwwkv23kugw=";
}; };
vendorSha256 = "sha256-caRBgkuHQ38r6OsKQCJ2pxAe8s6mc4g/QCIsCEXvY3M="; vendorSha256 = "sha256-82W1nHhHvvU6poh5szuH9lDkq6YHgyfsJSubxotV270=";
# Errors: CGO_ENABLED = 0;
# > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite
# gocql: unable to dial control conn 127.0.0.1:9042: dial tcp 127.0.0.1:9042: connect: connection refused ldflags = [ "-s" "-w" ];
doCheck = false;
checkFlags = [ "-short" ];
installPhase = '' installPhase = ''
runHook preInstall 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/server" -T $out/bin/temporal-server
install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool
install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool
runHook postInstall runHook postInstall
''; '';
doInstallCheck = true; passthru.tests.version = testers.testVersion {
installCheckPhase = '' package = temporal;
$out/bin/tctl --version | grep ${version} > /dev/null };
'';
meta = with lib; { meta = with lib; {
description = "A microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability"; 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}"; changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ titanous ]; maintainers = with maintainers; [ titanous ];
mainProgram = "temporal-server";
}; };
} }

@ -191,9 +191,9 @@ rec {
}; };
terraform_1 = mkTerraform { terraform_1 = mkTerraform {
version = "1.1.9"; version = "1.2.0";
sha256 = "sha256-6dyP3Y5cK+/qLoC2QPZW3QNgqOeVXegC06Pa7pSv1iE="; sha256 = "sha256-5um+zS7MVL59SlxchjXdlhBGNdacbQgvg7BRAWnW5XU=";
vendorSha256 = "sha256-YI/KeoOIxgCAS3Q6SXaW8my0PyFD+pyksshQEAknsz4="; vendorSha256 = "sha256-6x1cv+DKXH2yyMjIA6JY5EkTmWbwH4LBammXKtw2EZo=";
patches = [ ./provider-path-0_15.patch ]; patches = [ ./provider-path-0_15.patch ];
passthru = { inherit plugins; }; passthru = { inherit plugins; };
}; };

@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }: { stdenv, lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec { buildGoModule rec {
pname = "tilt"; pname = "tilt";
@ -24,5 +24,13 @@ buildGoModule rec {
homepage = "https://tilt.dev/"; homepage = "https://tilt.dev/";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ anton-dessiatov ]; 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;
}; };
} }

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "flexget"; pname = "flexget";
version = "3.3.9"; version = "3.3.10";
# Fetch from GitHub in order to use `requirements.in` # Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "flexget"; owner = "flexget";
repo = "flexget"; repo = "flexget";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-29V22B1Nkgj/qc6uyAOSOZ1rrjjtf75I9Eycu8I5ysQ="; hash = "sha256-ESUkGHUVToM5rxpEa0zMo/LxWfPgovkNqDU5IAqQBZg=";
}; };
postPatch = '' postPatch = ''

@ -1,8 +1,6 @@
{ lib { lib
, fetchurl , fetchurl
, appimageTools , appimageTools
, gtk3
, gsettings-desktop-schemas
, xorg , xorg
, pname , pname
, version , version
@ -24,7 +22,6 @@ in
profile = '' profile = ''
export LC_ALL=C.UTF-8 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; extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;

@ -1,6 +1,6 @@
{ pname, version, src, meta, desktopName ? "Rambox" }: { pname, version, src, meta, desktopName ? "Rambox" }:
{ appimageTools, lib, fetchurl, gsettings-desktop-schemas, gtk3, makeDesktopItem }: { appimageTools, lib, fetchurl, makeDesktopItem }:
let let
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -18,9 +18,6 @@ let
}; };
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src meta; 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 = '' extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps

@ -7,18 +7,27 @@
# Dynamic libraries # Dynamic libraries
, alsa-lib , alsa-lib
, atk , atk
, at-spi2-atk
, at-spi2-core
, cairo , cairo
, cups
, dbus , dbus
, expat
, libdrm
, libGL , libGL
, fontconfig , fontconfig
, freetype , freetype
, gtk3 , gtk3
, gdk-pixbuf , gdk-pixbuf
, glib , glib
, mesa
, nspr
, nss
, pango , pango
, wayland , wayland
, xorg , xorg
, libxkbcommon , libxkbcommon
, udev
, zlib , zlib
# Runtime # Runtime
, coreutils , coreutils
@ -33,13 +42,11 @@ let
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}"; throwSystem = throw "Unsupported system: ${system}";
# Zoom versions are released at different times for each platform and linux # Zoom versions are released at different times for each platform
# is stuck on 5.9.6 until https://github.com/NixOS/nixpkgs/pull/166085 is
# resolved
version = { version = {
aarch64-darwin = "5.10.4.6592"; aarch64-darwin = "5.10.4.6592";
x86_64-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; }.${system} or throwSystem;
srcs = { srcs = {
@ -53,7 +60,7 @@ let
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; 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' # $ LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH:$PWD ldd zoom | grep 'not found'
alsa-lib alsa-lib
atk atk
at-spi2-atk
at-spi2-core
cairo cairo
cups
dbus dbus
expat
libdrm
libGL libGL
fontconfig fontconfig
freetype freetype
gtk3 gtk3
gdk-pixbuf gdk-pixbuf
glib glib
mesa
nspr
nss
pango pango
stdenv.cc.cc stdenv.cc.cc
wayland wayland
xorg.libX11 xorg.libX11
xorg.libxcb xorg.libxcb
xorg.libXcomposite xorg.libXcomposite
xorg.libXdamage
xorg.libXext xorg.libXext
libxkbcommon libxkbcommon
xorg.libXrandr
xorg.libXrender xorg.libXrender
zlib xorg.libxshmfence
xorg.xcbutilimage xorg.xcbutilimage
xorg.xcbutilkeysyms xorg.xcbutilkeysyms
xorg.libXfixes xorg.libXfixes
xorg.libXtst xorg.libXtst
udev
zlib
] ++ lib.optional (pulseaudioSupport) libpulseaudio); ] ++ lib.optional (pulseaudioSupport) libpulseaudio);
in in
@ -134,7 +153,9 @@ stdenv.mkDerivation rec {
done done
# ZoomLauncher sets LD_LIBRARY_PATH before execing zoom # 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} --prefix LD_LIBRARY_PATH ":" ${libs}
rm $out/bin/zoom rm $out/bin/zoom

@ -103,13 +103,13 @@ let
sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; 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"; name = "_at_azure_slash_storage-blob";
packageName = "@azure/storage-blob"; packageName = "@azure/storage-blob";
version = "12.9.0"; version = "12.10.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.9.0.tgz"; url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.10.0.tgz";
sha512 = "ank38FdCLfJ+EoeMzCz3hkYJuZAd63ARvDKkxZYRDb+beBYf+/+gx8jNTqkq/hfyUl4dJQ/a7tECU0Y0F98CHg=="; sha512 = "FBEPKGnvtQJS8V8Tg1P9obgmVD9AodrIfwtwhBpsjenClhFyugMp3HPJY0tF7rInUB/CivKBCbnQKrUnKxqxzw==";
}; };
}; };
"@babel/runtime-7.17.9" = { "@babel/runtime-7.17.9" = {
@ -139,13 +139,13 @@ let
sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==";
}; };
}; };
"@fontsource/open-sans-4.5.8" = { "@fontsource/open-sans-4.5.10" = {
name = "_at_fontsource_slash_open-sans"; name = "_at_fontsource_slash_open-sans";
packageName = "@fontsource/open-sans"; packageName = "@fontsource/open-sans";
version = "4.5.8"; version = "4.5.10";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.8.tgz"; url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.10.tgz";
sha512 = "3b94XDdRLqL7OlE7OjWg/4pgG825Juw8PLVEDm6h5pio0gMU89ICxfatGxHsBxMGfqad+wnvdmUweZWlELDFpQ=="; sha512 = "MrtTDfWb1Tu9YxVh2KaKmsKBn6O3KL/lHZS0KRKK58jgqvdwuiDt4QW4udmW4FQf0XOWgnZ+4vKUF80F3SqBAA==";
}; };
}; };
"@fortawesome/fontawesome-common-types-6.1.1" = { "@fortawesome/fontawesome-common-types-6.1.1" = {
@ -517,22 +517,22 @@ let
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
}; };
}; };
"@types/node-12.20.50" = { "@types/node-12.20.52" = {
name = "_at_types_slash_node"; name = "_at_types_slash_node";
packageName = "@types/node"; packageName = "@types/node";
version = "12.20.50"; version = "12.20.52";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-12.20.50.tgz"; url = "https://registry.npmjs.org/@types/node/-/node-12.20.52.tgz";
sha512 = "+9axpWx2b2JCVovr7Ilgt96uc6C1zBKOQMpGtRbWT9IoR/8ue32GGMfGA4woP8QyP2gBs6GQWEVM3tCybGCxDA=="; sha512 = "cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw==";
}; };
}; };
"@types/node-17.0.31" = { "@types/node-17.0.33" = {
name = "_at_types_slash_node"; name = "_at_types_slash_node";
packageName = "@types/node"; packageName = "@types/node";
version = "17.0.31"; version = "17.0.33";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz"; url = "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz";
sha512 = "AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q=="; sha512 = "miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==";
}; };
}; };
"@types/node-fetch-2.6.1" = { "@types/node-fetch-2.6.1" = {
@ -703,7 +703,7 @@ let
version = "1.2.0"; version = "1.2.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz"; 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" = { "adler-32-1.3.1" = {
@ -757,7 +757,7 @@ let
version = "2.1.1"; version = "2.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; 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" = { "ansi-regex-5.0.1" = {
@ -775,7 +775,7 @@ let
version = "2.2.1"; version = "2.2.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==";
}; };
}; };
"ansi-styles-4.3.0" = { "ansi-styles-4.3.0" = {
@ -793,7 +793,7 @@ let
version = "1.3.0"; version = "1.3.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz";
sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==";
}; };
}; };
"anymatch-3.1.2" = { "anymatch-3.1.2" = {
@ -847,7 +847,7 @@ let
version = "1.1.1"; version = "1.1.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; sha512 = "PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==";
}; };
}; };
"array-parallel-0.1.3" = { "array-parallel-0.1.3" = {
@ -856,7 +856,7 @@ let
version = "0.1.3"; version = "0.1.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; 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" = { "array-series-0.1.5" = {
@ -865,7 +865,7 @@ let
version = "0.1.5"; version = "0.1.5";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz";
sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; sha512 = "L0XlBwfx9QetHOsbLDrE/vh2t018w9462HM3iaFfxRiK83aJjAt/Ja3NMkOW7FICwWTlQBa3ZbL5FKhuQWkDrg==";
}; };
}; };
"array-union-2.1.0" = { "array-union-2.1.0" = {
@ -928,7 +928,7 @@ let
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==";
}; };
}; };
"async-2.6.4" = { "async-2.6.4" = {
@ -964,7 +964,7 @@ let
version = "0.4.0"; version = "0.4.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz";
sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==";
}; };
}; };
"auto-changelog-1.16.4" = { "auto-changelog-1.16.4" = {
@ -985,13 +985,13 @@ let
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
}; };
}; };
"aws-sdk-2.1131.0" = { "aws-sdk-2.1135.0" = {
name = "aws-sdk"; name = "aws-sdk";
packageName = "aws-sdk"; packageName = "aws-sdk";
version = "2.1131.0"; version = "2.1135.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1131.0.tgz"; url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1135.0.tgz";
sha512 = "Ic3f2fSgVhYDQ0OBGxE6ODtSwaKyxBPGrI2RGrYt2Oj0Z8f227P7dB90o9X7y2MtnuJ4WoAzkf3Vc1c1UnnZlA=="; sha512 = "bl9n4QgrEh52hmQ+Jo76BgJXM/p+PwfVZvImEQHFeel/33H/PDLcTJquEw5bzxM1HRNI24iH+FNPwyWLMrttTw==";
}; };
}; };
"aws-sign2-0.7.0" = { "aws-sign2-0.7.0" = {
@ -1000,7 +1000,7 @@ let
version = "0.7.0"; version = "0.7.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; 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" = { "aws4-1.11.0" = {
@ -1045,7 +1045,7 @@ let
version = "6.26.0"; version = "6.26.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"; url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz";
sha1 = "965c7058668e82b55d7bfe04ff2337bc8b5647fe"; sha512 = "ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==";
}; };
}; };
"balanced-match-1.0.2" = { "balanced-match-1.0.2" = {
@ -1081,7 +1081,7 @@ let
version = "1.0.2"; version = "1.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==";
}; };
}; };
"bcryptjs-2.4.3" = { "bcryptjs-2.4.3" = {
@ -1090,7 +1090,7 @@ let
version = "2.4.3"; version = "2.4.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; 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" = { "big-integer-1.6.51" = {
@ -1108,7 +1108,7 @@ let
version = "2.4.0"; version = "2.4.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz"; url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz";
sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; sha512 = "uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ==";
}; };
}; };
"binary-extensions-2.2.0" = { "binary-extensions-2.2.0" = {
@ -1126,7 +1126,7 @@ let
version = "0.0.2"; version = "0.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/binascii/-/binascii-0.0.2.tgz"; url = "https://registry.npmjs.org/binascii/-/binascii-0.0.2.tgz";
sha1 = "a7f8a8801dbccf8b1756b743daa0fee9e2d9e0ee"; sha512 = "rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==";
}; };
}; };
"bintrees-1.0.1" = { "bintrees-1.0.1" = {
@ -1135,7 +1135,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz"; url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz";
sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; sha512 = "tbaUB1QpTIj4cKY8c1rvNAvEQXA+ekzHmbe4jzNfW3QWsF9GnnP/BRWyl6/qqS53heoYJ93naaFcm/jooONH8g==";
}; };
}; };
"bitsyntax-0.1.0" = { "bitsyntax-0.1.0" = {
@ -1180,7 +1180,7 @@ let
version = "2.11.0"; version = "2.11.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz";
sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ==";
}; };
}; };
"bluebird-3.7.2" = { "bluebird-3.7.2" = {
@ -1225,7 +1225,7 @@ let
version = "1.0.0"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==";
}; };
}; };
"brace-expansion-1.1.11" = { "brace-expansion-1.1.11" = {
@ -1252,7 +1252,7 @@ let
version = "0.3.3"; version = "0.3.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; sha512 = "YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==";
}; };
}; };
"bson-1.1.6" = { "bson-1.1.6" = {
@ -1288,7 +1288,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; 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" = { "buffer-from-1.1.2" = {
@ -1342,7 +1342,7 @@ let
version = "3.0.0"; version = "3.0.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz";
sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==";
}; };
}; };
"bytes-3.1.2" = { "bytes-3.1.2" = {
@ -1369,7 +1369,7 @@ let
version = "1.1.0"; version = "1.1.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz";
sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; sha512 = "sAZ9kODla+mGACBZ1IpTCAisKoGnv6PykW7fPk1LrM+mMepE18Yz0515yoVcrZy7dQsTUp3uZLQ/9Sx1RnLoHw==";
}; };
}; };
"callsites-3.1.0" = { "callsites-3.1.0" = {
@ -1405,7 +1405,7 @@ let
version = "0.12.0"; version = "0.12.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz";
sha1 = "1b681c21ff84033c826543090689420d187151dc"; sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==";
}; };
}; };
"cfb-1.2.2" = { "cfb-1.2.2" = {
@ -1423,7 +1423,7 @@ let
version = "1.1.3"; version = "1.1.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==";
}; };
}; };
"chalk-4.1.2" = { "chalk-4.1.2" = {
@ -1459,7 +1459,7 @@ let
version = "0.0.2"; version = "0.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; 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" = { "cheerio-1.0.0-rc.6" = {
@ -1504,7 +1504,7 @@ let
version = "1.0.1"; version = "1.0.1";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz"; url = "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz";
sha1 = "66a0e64011816e37196828fdc8c8c147312c8634"; sha512 = "kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==";
}; };
}; };
"class-validator-0.13.2" = { "class-validator-0.13.2" = {
@ -1531,7 +1531,7 @@ let
version = "0.1.7"; version = "0.1.7";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz"; url = "https://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz";
sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; sha512 = "xNaQxWYgI6DD4xIJLn8GY2zDZVbrN0vsU1fEbDNAHZRyceWhpj7A08mYcG1AY92q1Aw0geYkVfiAcEYIZtuTSg==";
}; };
}; };
"cli-cursor-3.1.0" = { "cli-cursor-3.1.0" = {
@ -2470,13 +2470,13 @@ let
sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==";
}; };
}; };
"eventsource-1.1.0" = { "eventsource-2.0.2" = {
name = "eventsource"; name = "eventsource";
packageName = "eventsource"; packageName = "eventsource";
version = "1.1.0"; version = "2.0.2";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz"; url = "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz";
sha512 = "VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg=="; sha512 = "IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==";
}; };
}; };
"exit-on-epipe-1.0.1" = { "exit-on-epipe-1.0.1" = {
@ -2893,13 +2893,13 @@ let
sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa";
}; };
}; };
"glob-7.2.0" = { "glob-7.2.3" = {
name = "glob"; name = "glob";
packageName = "glob"; packageName = "glob";
version = "7.2.0"; version = "7.2.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz";
sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==";
}; };
}; };
"glob-parent-3.1.0" = { "glob-parent-3.1.0" = {
@ -3640,13 +3640,13 @@ let
sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
}; };
}; };
"isbot-3.4.6" = { "isbot-3.4.7" = {
name = "isbot"; name = "isbot";
packageName = "isbot"; packageName = "isbot";
version = "3.4.6"; version = "3.4.7";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/isbot/-/isbot-3.4.6.tgz"; url = "https://registry.npmjs.org/isbot/-/isbot-3.4.7.tgz";
sha512 = "EEi3SVCPB4WHtMBaAYzYLgCP7yG9qixseYCf3IG0Yc+howLia+XFPLTT1437rzeViLeDInKOXOdFhs9Fa/xgWQ=="; sha512 = "huiRPlUf/je4GfR/pms78bOnUYRmwo2Dg/d9aRQCPXIIK3uX6u+iRFuTLsq969X40JcCunHrbS4SFlXIcEIoUw==";
}; };
}; };
"isexe-2.0.0" = { "isexe-2.0.0" = {
@ -4531,49 +4531,49 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
}; };
}; };
"n8n-core-0.116.0" = { "n8n-core-0.117.0" = {
name = "n8n-core"; name = "n8n-core";
packageName = "n8n-core"; packageName = "n8n-core";
version = "0.116.0"; version = "0.117.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.116.0.tgz"; url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.117.0.tgz";
sha512 = "D9X+D7gsUTKMacHIixEJuZpOB7DW/g42W+FBKLrj+6BUP1JMKG02G0C+Ef38e2XuNObMoLdLkI70snyvi1oq1g=="; sha512 = "GEU8qBS/Gt+2FHNNb8txDkerzG7vlfDdeiy56lPF+oZJyEZzqgSJ8fNRUcv2b2kd5XjU9zTDcmjARclDC6SNmA==";
}; };
}; };
"n8n-design-system-0.19.0" = { "n8n-design-system-0.20.0" = {
name = "n8n-design-system"; name = "n8n-design-system";
packageName = "n8n-design-system"; packageName = "n8n-design-system";
version = "0.19.0"; version = "0.20.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.19.0.tgz"; url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.20.0.tgz";
sha512 = "qIcmHAtVJotgiYo3vVMLwC9qaU5ih5ti4+aPu2I1onD6WEu8GMNF38AzIAceYl6U8EhvDB+DOsF/SjYHfl26iw=="; sha512 = "uqcrm+fRtTd7A6+ai48GFcjpU4nIV+UmPld8p/8hoUpwCY265AojGaSKCWHzt8TceLCJXx5rlmLliE+v69d/sA==";
}; };
}; };
"n8n-editor-ui-0.142.1" = { "n8n-editor-ui-0.143.0" = {
name = "n8n-editor-ui"; name = "n8n-editor-ui";
packageName = "n8n-editor-ui"; packageName = "n8n-editor-ui";
version = "0.142.1"; version = "0.143.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.142.1.tgz"; url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.143.0.tgz";
sha512 = "Me8fk76HeWUmTPnksH4kzG0bKOp1yLFjAC4F+EcEllIIf+x75kjN+gSH4uwgvspzGCVO88ZnppWoGQwvHQpXQw=="; sha512 = "deb5c30jpLw4YKetmTeLNIyki7td2R24uVzsZ3BDGElybR+0DaJbMBRIZ6+bjq8IS750gaTeumKrH8ZBq9BSkg==";
}; };
}; };
"n8n-nodes-base-0.174.0" = { "n8n-nodes-base-0.175.0" = {
name = "n8n-nodes-base"; name = "n8n-nodes-base";
packageName = "n8n-nodes-base"; packageName = "n8n-nodes-base";
version = "0.174.0"; version = "0.175.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.174.0.tgz"; url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.175.0.tgz";
sha512 = "2yYWeSkfI08BtgGZvOksmQOpjNPYmhvkqO2SBTuTAqkryZ1AHiw6RtILsf2575prQDdep2clxIZxW7owxxFmLA=="; sha512 = "KfyEbhK4T0sULZ75jcjU0U1IqXm/MNzL7GpRhBjDumDE1WRfpKSBdtYGFsHCbUEXroHnJjF2/L+ADJ9CV0g5MQ==";
}; };
}; };
"n8n-workflow-0.98.0" = { "n8n-workflow-0.99.0" = {
name = "n8n-workflow"; name = "n8n-workflow";
packageName = "n8n-workflow"; packageName = "n8n-workflow";
version = "0.98.0"; version = "0.99.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.98.0.tgz"; url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.99.0.tgz";
sha512 = "MrlEpSUueIkMc9P75h09ozXN2SQyV26qEe2PlQ9+nwRnCPYkikQQtgYZDqQI+bHVHFCMdBZOnq59fse0cMpYfQ=="; sha512 = "JVZQnncjVphY73jcPY2oW4fZ0WoKDDwC1Xzf509KAu362psOJ5Xrz4mAJwuj7Qv1H88UGhEOojvt/5gbRLi4zA==";
}; };
}; };
"named-placeholders-1.1.2" = { "named-placeholders-1.1.2" = {
@ -4927,15 +4927,6 @@ let
sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; 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" = { "os-tmpdir-1.0.2" = {
name = "os-tmpdir"; name = "os-tmpdir";
packageName = "os-tmpdir"; packageName = "os-tmpdir";
@ -5089,13 +5080,13 @@ let
sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==";
}; };
}; };
"passport-0.5.2" = { "passport-0.5.3" = {
name = "passport"; name = "passport";
packageName = "passport"; packageName = "passport";
version = "0.5.2"; version = "0.5.3";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/passport/-/passport-0.5.2.tgz"; url = "https://registry.npmjs.org/passport/-/passport-0.5.3.tgz";
sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw=="; sha512 = "gGc+70h4gGdBWNsR3FuV3byLDY6KBTJAIExGFXTpQaYfbbcHCBlRRKx7RBQSpqEqc5Hh2qVzRs7ssvSfOpkUEA==";
}; };
}; };
"passport-cookie-1.0.9" = { "passport-cookie-1.0.9" = {
@ -7186,13 +7177,13 @@ let
sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==";
}; };
}; };
"v-click-outside-3.1.2" = { "v-click-outside-3.2.0" = {
name = "v-click-outside"; name = "v-click-outside";
packageName = "v-click-outside"; packageName = "v-click-outside";
version = "3.1.2"; version = "3.2.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.1.2.tgz"; url = "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.2.0.tgz";
sha512 = "gMdRqfRE6m6XU6SiFi3dyBlFB2MWogiXpof8Aa3LQysrl9pzTndqp/iEaAphLoadaQUFnQ0ec6fLLaxr7LiY6A=="; sha512 = "QD0bDy38SHJXQBjgnllmkI/rbdiwmq9RC+/+pvrFjYJKTn8dtp7Penf9q1lLBta280fYG2q53mgLhQ+3l3z74w==";
}; };
}; };
"validator-13.7.0" = { "validator-13.7.0" = {
@ -7570,10 +7561,10 @@ in
n8n = nodeEnv.buildNodePackage { n8n = nodeEnv.buildNodePackage {
name = "n8n"; name = "n8n";
packageName = "n8n"; packageName = "n8n";
version = "0.176.0"; version = "0.177.0";
src = fetchurl { src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.176.0.tgz"; url = "https://registry.npmjs.org/n8n/-/n8n-0.177.0.tgz";
sha512 = "eJTzCFcujAfJegWKQhGi+upAsfTEpW1/2HC5vwV2btdgm8XCMyhVBMJJR7ZJMozFNDz8ErLhwtlIfQCQSXRP0A=="; sha512 = "13x/zsHa64Dw/0BhjmlZEGvABJxkZeKTG0oKXzRf1Vq/zoctxofapx188ccJzYQ+tZnOHdX0arjf2baQDTNIGw==";
}; };
dependencies = [ dependencies = [
(sources."@azure/abort-controller-1.1.0" // { (sources."@azure/abort-controller-1.1.0" // {
@ -7620,7 +7611,7 @@ in
]; ];
}) })
sources."@azure/ms-rest-nodeauth-3.1.1" sources."@azure/ms-rest-nodeauth-3.1.1"
(sources."@azure/storage-blob-12.9.0" // { (sources."@azure/storage-blob-12.10.0" // {
dependencies = [ dependencies = [
sources."tslib-2.4.0" sources."tslib-2.4.0"
]; ];
@ -7633,7 +7624,7 @@ in
sources."kuler-2.0.0" 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/fontawesome-common-types-6.1.1"
sources."@fortawesome/free-regular-svg-icons-6.1.1" sources."@fortawesome/free-regular-svg-icons-6.1.1"
sources."@icetee/ftp-0.3.15" sources."@icetee/ftp-0.3.15"
@ -7694,7 +7685,7 @@ in
sources."@types/lodash-4.14.182" sources."@types/lodash-4.14.182"
sources."@types/lossless-json-1.0.1" sources."@types/lossless-json-1.0.1"
sources."@types/mime-1.3.2" 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" // { (sources."@types/node-fetch-2.6.1" // {
dependencies = [ dependencies = [
sources."form-data-3.0.1" sources."form-data-3.0.1"
@ -7762,7 +7753,7 @@ in
]; ];
}) })
sources."avsc-5.7.4" sources."avsc-5.7.4"
(sources."aws-sdk-2.1131.0" // { (sources."aws-sdk-2.1135.0" // {
dependencies = [ dependencies = [
sources."buffer-4.9.2" sources."buffer-4.9.2"
sources."events-1.1.1" sources."events-1.1.1"
@ -8014,7 +8005,7 @@ in
sources."etag-1.8.1" sources."etag-1.8.1"
sources."event-target-shim-5.0.1" sources."event-target-shim-5.0.1"
sources."events-3.3.0" sources."events-3.3.0"
sources."eventsource-1.1.0" sources."eventsource-2.0.2"
sources."exit-on-epipe-1.0.1" sources."exit-on-epipe-1.0.1"
sources."expand-tilde-2.0.2" sources."expand-tilde-2.0.2"
(sources."express-4.18.1" // { (sources."express-4.18.1" // {
@ -8072,7 +8063,7 @@ in
sources."get-symbol-description-1.0.0" sources."get-symbol-description-1.0.0"
sources."get-system-fonts-2.0.2" sources."get-system-fonts-2.0.2"
sources."getpass-0.1.7" sources."getpass-0.1.7"
sources."glob-7.2.0" sources."glob-7.2.3"
sources."glob-parent-5.1.2" sources."glob-parent-5.1.2"
(sources."glob-stream-6.1.0" // { (sources."glob-stream-6.1.0" // {
dependencies = [ dependencies = [
@ -8174,7 +8165,7 @@ in
sources."is-windows-1.0.2" sources."is-windows-1.0.2"
sources."is-wsl-2.2.0" sources."is-wsl-2.2.0"
sources."isarray-0.0.1" sources."isarray-0.0.1"
sources."isbot-3.4.6" sources."isbot-3.4.7"
sources."isexe-2.0.0" sources."isexe-2.0.0"
sources."iso-639-1-2.1.13" sources."iso-639-1-2.1.13"
sources."isstream-0.1.2" sources."isstream-0.1.2"
@ -8319,15 +8310,15 @@ in
]; ];
}) })
sources."mz-2.7.0" sources."mz-2.7.0"
sources."n8n-core-0.116.0" sources."n8n-core-0.117.0"
sources."n8n-design-system-0.19.0" sources."n8n-design-system-0.20.0"
sources."n8n-editor-ui-0.142.1" sources."n8n-editor-ui-0.143.0"
(sources."n8n-nodes-base-0.174.0" // { (sources."n8n-nodes-base-0.175.0" // {
dependencies = [ dependencies = [
sources."iconv-lite-0.6.3" sources."iconv-lite-0.6.3"
]; ];
}) })
sources."n8n-workflow-0.98.0" sources."n8n-workflow-0.99.0"
(sources."named-placeholders-1.1.2" // { (sources."named-placeholders-1.1.2" // {
dependencies = [ dependencies = [
sources."lru-cache-4.1.5" sources."lru-cache-4.1.5"
@ -8385,7 +8376,6 @@ in
sources."string_decoder-1.1.1" sources."string_decoder-1.1.1"
]; ];
}) })
sources."original-1.0.2"
sources."os-tmpdir-1.0.2" sources."os-tmpdir-1.0.2"
sources."p-cancelable-2.1.1" sources."p-cancelable-2.1.1"
sources."p-finally-1.0.0" sources."p-finally-1.0.0"
@ -8410,7 +8400,7 @@ in
sources."tslib-2.4.0" sources."tslib-2.4.0"
]; ];
}) })
sources."passport-0.5.2" sources."passport-0.5.3"
sources."passport-cookie-1.0.9" sources."passport-cookie-1.0.9"
sources."passport-jwt-4.0.0" sources."passport-jwt-4.0.0"
sources."passport-strategy-1.0.0" sources."passport-strategy-1.0.0"
@ -8642,7 +8632,7 @@ in
sources."tdigest-0.1.1" sources."tdigest-0.1.1"
(sources."tedious-6.7.1" // { (sources."tedious-6.7.1" // {
dependencies = [ dependencies = [
sources."@types/node-12.20.50" sources."@types/node-12.20.52"
sources."bl-3.0.1" sources."bl-3.0.1"
sources."iconv-lite-0.5.2" sources."iconv-lite-0.5.2"
sources."readable-stream-3.6.0" sources."readable-stream-3.6.0"
@ -8737,7 +8727,7 @@ in
sources."utils-merge-1.0.1" sources."utils-merge-1.0.1"
sources."uuencode-0.0.4" sources."uuencode-0.0.4"
sources."uuid-8.3.2" 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."validator-13.7.0"
sources."vary-1.1.2" sources."vary-1.1.2"
sources."verror-1.10.0" sources."verror-1.10.0"

@ -1,7 +1,6 @@
{ lib { lib
, mkDerivation , mkDerivation
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, extra-cmake-modules , extra-cmake-modules
, inotify-tools , inotify-tools
@ -27,7 +26,7 @@
mkDerivation rec { mkDerivation rec {
pname = "nextcloud-client"; pname = "nextcloud-client";
version = "3.5.0"; version = "3.5.1";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -35,18 +34,13 @@ mkDerivation rec {
owner = "nextcloud"; owner = "nextcloud";
repo = "desktop"; repo = "desktop";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-eFtBdnwHaLirzZaHDw6SRfmsqO3dmBB8Y9csJuiTf1A="; sha256 = "sha256-/Bz3vkV4+ZFlGBNtkLIGsBk51a3wxy32U1KYcA3awcw=";
}; };
patches = [ patches = [
# Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`. # 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-Explicitly-copy-dbus-files-into-the-store-dir.patch
./0001-When-creating-the-autostart-entry-do-not-use-an-abso.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 = '' postPatch = ''

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tixati"; pname = "tixati";
version = "2.88"; version = "2.89";
src = fetchurl { src = fetchurl {
url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz";
sha256 = "sha256-9d9Z+3Uyxy4Bj8STtzHWwyyhWeMv3wo0IH6uxGTaA0I="; sha256 = "sha256-fd7DMKoRxNmNjCxl2ViINjnCEXJrhJU4aaRT+NoB1vI=";
}; };
installPhase = '' installPhase = ''

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, lib }: { appimageTools, fetchurl, lib }:
let let
pname = "station"; pname = "station";
@ -18,7 +18,6 @@ in appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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; multiPkgs = null;

@ -9,7 +9,7 @@
, meson , meson
, ninja , ninja
, pkg-config , pkg-config
, wrapGAppsHook , wrapGAppsHook4
, gobject-introspection , gobject-introspection
, libadwaita , libadwaita
, librsvg , librsvg
@ -42,6 +42,9 @@ python3.pkgs.buildPythonApplication rec {
]; ];
postPatch = '' postPatch = ''
substituteInPlace meson_post_install.py \
--replace gtk-update-icon-cache gtk4-update-icon-cache
patchShebangs meson_post_conf.py meson_post_install.py patchShebangs meson_post_conf.py meson_post_install.py
''; '';
@ -53,7 +56,7 @@ python3.pkgs.buildPythonApplication rec {
meson meson
ninja ninja
pkg-config pkg-config
wrapGAppsHook wrapGAppsHook4
]; ];
buildInputs = [ buildInputs = [

@ -2,8 +2,6 @@
, fetchurl , fetchurl
, appimageTools , appimageTools
, libsecret , libsecret
, gtk3
, gsettings-desktop-schemas
}: }:
let let

@ -1,6 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 { appimageTools, fetchurl, lib, makeDesktopItem }:
, makeDesktopItem
}:
let let
pname = "tusk"; pname = "tusk";
@ -31,7 +29,6 @@ in appimageTools.wrapType2 rec {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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 multiPkgs = null; # no 32bit needed

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }: { lib, stdenv, fetchFromGitHub, fetchpatch, ocamlPackages, why3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "easycrypt"; pname = "easycrypt";
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7"; 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; [ nativeBuildInputs = with ocamlPackages; [
dune_3 dune_3
findlib findlib

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lean"; pname = "lean";
version = "3.42.0"; version = "3.43.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "leanprover-community"; owner = "leanprover-community";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
# from. this is then used to check whether an olean file should be # 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 # rebuilt. don't use a tag as rev because this will get replaced into
# src/githash.h.in in preConfigure. # src/githash.h.in in preConfigure.
rev = "b35d4695da88139a9168f2ad7acf0782e66dc4f0"; rev = "bfce34363b0efe86e93e3fe75de76ab3740c772d";
sha256 = "02rpigw6lnyjw8ccrlp2mcvswawkhl5y6kqa3zq76qp1fdjqjrbp"; sha256 = "100mb003zkgrv1wd2agbk41aipk3j78k8zcjbj7pv9ixh02c7ss8";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "why3"; pname = "why3";
version = "1.4.1"; version = "1.5.0";
src = fetchurl { src = fetchurl {
url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz";
sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq"; sha256 = "sha256:0qjh49pyqmg3xi09fn4lyzz23i6h18y9sgc8ayscvx3bwr3vcqhr";
}; };
buildInputs = with ocamlPackages; [ buildInputs = with ocamlPackages; [

@ -27,6 +27,6 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p $out/bin 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"
''; '';
} }

@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
buildInputs = [ opencv3 gtest blas.provider ] buildInputs = [ opencv3 gtest blas.provider ]
++ lib.optional stdenv.cc.isGNU gomp ++ lib.optional stdenv.cc.isGNU gomp
++ lib.optional stdenv.cc.isClang llvmPackages.openmp ++ 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.optionals cudaSupport [ cudatoolkit nvidia_x11 ]
++ lib.optional cudnnSupport cudnn; ++ lib.optional cudnnSupport cudnn;
@ -78,5 +79,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.unix; platforms = platforms.unix;
# Build failures when linking mxnet_unit_tests: https://gist.github.com/6d17447ee3557967ec52c50d93b17a1d
broken = cudaSupport;
}; };
} }

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring { 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 , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
, libxkbcommon, libXi, libXext, wayland-protocols, wayland , libxkbcommon, libXi, libXext, wayland-protocols, wayland
, lcms2 , lcms2
@ -157,7 +157,7 @@ buildPythonApplication rec {
'' else '' '' else ''
cp -r linux-package/{bin,share,lib} $out 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 \ installShellCompletion --cmd kitty \
--bash <("$out/bin/kitty" +complete setup bash) \ --bash <("$out/bin/kitty" +complete setup bash) \

@ -68,6 +68,8 @@ stdenv.mkDerivation {
stripDebugList = [ "cgit" ]; stripDebugList = [ "cgit" ];
enableParallelBuilding = true;
meta = { meta = {
inherit homepage description; inherit homepage description;
license = lib.licenses.gpl2; license = lib.licenses.gpl2;

@ -2,22 +2,22 @@
callPackage (import ./common.nix rec { callPackage (import ./common.nix rec {
pname = "cgit-pink"; pname = "cgit-pink";
version = "1.3.0"; version = "1.4.1";
src = fetchurl { src = fetchurl {
url = "https://git.causal.agency/cgit-pink/snapshot/cgit-pink-${version}.tar.gz"; 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. # 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 # IMPORTANT: Remember to check which git version cgit-pink needs on every
# version bump (look for "GIT_VER" in the top-level Makefile). # version bump (look for "GIT_VER" in the top-level Makefile).
gitSrc = fetchurl { gitSrc = fetchurl {
url = "mirror://kernel/software/scm/git/git-2.35.1.tar.xz"; url = "mirror://kernel/software/scm/git/git-2.36.1.tar.xz";
sha256 = "sha256-12hSjmRD9logMDYmbxylD50Se6iXUeMurTcRftkZEIA="; sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0";
}; };
homepage = "https://git.causal.agency/cgit-pink/about/"; homepage = "https://git.causal.agency/cgit-pink/about/";
description = "cgit fork aiming for better maintenance"; description = "cgit fork aiming for better maintenance";
maintainers = with lib.maintainers; [ qyliss sternenseemann ]; maintainers = with lib.maintainers; [ sternenseemann ];
}) {} }) {}

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "git-workspace"; pname = "git-workspace";
version = "0.9.0"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "orf"; owner = "orf";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uP1sex4Hx57ZsqVG4b3809FzFB10Un48+vbwaWZ7HSg="; sha256 = "sha256-sPvb8EKrr9ZUMV1yMTXkFYgjW+LRJwJAXoc7lrWykaI=";
}; };
cargoSha256 = "sha256-mkrC8uzfNpL0MQUMjcNaJf5c1wSdlBVg8AMgc/zxM6A="; cargoSha256 = "sha256-WAoYFCJCWKFvWN8XyRBZdzjCrcR6jMp8ZztSLHDP+r0=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ] buildInputs = [ openssl ]

@ -1,4 +1,4 @@
{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl, undmg }: { lib, stdenv, appimageTools, autoPatchelfHook, zlib, fetchurl, undmg }:
let let
pname = "radicle-upstream"; pname = "radicle-upstream";
@ -39,10 +39,6 @@ let
linux = appimageTools.wrapType2 { linux = appimageTools.wrapType2 {
inherit name src meta; 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 = '' extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname} mv $out/bin/${name} $out/bin/${pname}

@ -1,4 +1,4 @@
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }: { appimageTools, lib, fetchurl, version, sha256 }:
let let
pname = "losslesscut"; pname = "losslesscut";
@ -21,7 +21,6 @@ in appimageTools.wrapType2 {
profile = '' profile = ''
export LC_ALL=C.UTF-8 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; extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps;

@ -6,16 +6,16 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "garble"; pname = "garble";
version = "0.5.1"; version = "0.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "burrowers"; owner = "burrowers";
repo = pname; repo = pname;
rev = "v${version}"; 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. # Used for some of the tests.
checkInputs = [git]; checkInputs = [git];

@ -9,10 +9,19 @@
version ? package.version, version ? package.version,
}: runCommand "${package.name}-test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } '' }: runCommand "${package.name}-test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } ''
if output=$(${command} 2>&1); then if output=$(${command} 2>&1); then
grep -Fw "${version}" - <<< "$output" if grep -Fw "${version}" - <<< "$output"; then
touch $out touch $out
else
echo "Version string '${version}' not found!" >&2
echo "The output was:" >&2
echo "$output" >&2
exit 1
fi
else 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 fi
''; '';

@ -16,6 +16,7 @@
, opacityVariants ? [] # default to all , opacityVariants ? [] # default to all
, themeVariants ? [] # default to MacOS blue , themeVariants ? [] # default to MacOS blue
, wallpapers ? false , wallpapers ? false
, gitUpdater
}: }:
let let
@ -29,14 +30,14 @@ lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname; inherit pname;
version = "unstable-2021-12-20"; version = "2022-05-12";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
owner = "vinceliuice"; owner = "vinceliuice";
repo = pname; repo = pname;
rev = "c148646ccab382f7a2d5fdc421fc32d843cb4172"; rev = version;
sha256 = "sha256-h4MSSh8cu9M81bM+WJSyl1SQ7CVth1DvjIVOUJXqpxs"; sha256 = "sha256-VrrxW16J+S21qBoAeVCWs0Q6bRL1jXAK7MOBpdSMJZY=";
}) })
] ]
++ ++
@ -114,6 +115,8 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
passthru.updateScript = gitUpdater {inherit pname version; };
meta = with lib; { meta = with lib; {
description = "Mac OSX Mojave like theme for GTK based desktop environments"; description = "Mac OSX Mojave like theme for GTK based desktop environments";
homepage = "https://github.com/vinceliuice/Mojave-gtk-theme"; homepage = "https://github.com/vinceliuice/Mojave-gtk-theme";

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, nix-update-script , nix-update-script
, meson , meson
, ninja , ninja
@ -32,24 +31,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "elementary-photos"; pname = "elementary-photos";
version = "2.7.4"; version = "2.7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = "photos"; repo = "photos";
rev = version; 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 = [ nativeBuildInputs = [
appstream appstream
desktop-file-utils desktop-file-utils

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts"; pname = "switchboard-plug-onlineaccounts";
version = "6.4.0"; version = "6.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elementary"; owner = "elementary";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-Fppl/IvdlW8lZ6YKEHaHNticv3FFFKEKTPPVnz4u9b4="; sha256 = "sha256-Q/vvXKyeedn5o7HnL9F5ixSjJS3OWrvvHbzvx2fW2qY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -18,8 +18,12 @@
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, callPackage , callPackage
, threadsCross ? null # for MinGW
}: }:
# threadsCross is just for MinGW
assert threadsCross != null -> stdenv.targetPlatform.isWindows;
let let
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@ -50,6 +54,8 @@ let
# We need a target compiler which is still runnable at build time, # We need a target compiler which is still runnable at build time,
# to handle the cross-building case where build != host == target # to handle the cross-building case where build != host == target
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -71,6 +77,10 @@ stdenv.mkDerivation rec {
depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ];
depsBuildTarget = lib.optional isCross targetCC;
depsTargetTarget = lib.optional (threadsCross != null) threadsCross;
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
prePatch = '' prePatch = ''
@ -194,12 +204,12 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX # to be different from CC/CXX
CC_FOR_TARGET = CC_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}cc" "${targetCC}/bin/${targetCC.targetPrefix}cc"
else else
null; null;
CXX_FOR_TARGET = CXX_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}c++" "${targetCC}/bin/${targetCC.targetPrefix}c++"
else else
null; null;
@ -223,7 +233,7 @@ stdenv.mkDerivation rec {
export PATH=$(pwd)/bin:$PATH 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. # Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling. # We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc export CC=${buildPackages.stdenv.cc}/bin/cc

@ -18,8 +18,12 @@
, buildPackages , buildPackages
, pkgsBuildTarget , pkgsBuildTarget
, callPackage , callPackage
, threadsCross ? null # for MinGW
}: }:
# threadsCross is just for MinGW
assert threadsCross != null -> stdenv.targetPlatform.isWindows;
let let
go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
@ -50,6 +54,8 @@ let
# We need a target compiler which is still runnable at build time, # We need a target compiler which is still runnable at build time,
# to handle the cross-building case where build != host == target # to handle the cross-building case where build != host == target
targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
isCross = stdenv.buildPlatform != stdenv.targetPlatform;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -71,6 +77,10 @@ stdenv.mkDerivation rec {
depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ];
depsBuildTarget = lib.optional isCross targetCC;
depsTargetTarget = lib.optional (threadsCross != null) threadsCross;
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ];
prePatch = '' prePatch = ''
@ -188,12 +198,12 @@ stdenv.mkDerivation rec {
# {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those
# to be different from CC/CXX # to be different from CC/CXX
CC_FOR_TARGET = CC_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}cc" "${targetCC}/bin/${targetCC.targetPrefix}cc"
else else
null; null;
CXX_FOR_TARGET = CXX_FOR_TARGET =
if (stdenv.buildPlatform != stdenv.targetPlatform) then if isCross then
"${targetCC}/bin/${targetCC.targetPrefix}c++" "${targetCC}/bin/${targetCC.targetPrefix}c++"
else else
null; null;
@ -217,7 +227,7 @@ stdenv.mkDerivation rec {
export PATH=$(pwd)/bin:$PATH 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. # Independent from host/target, CC should produce code for the building system.
# We only set it when cross-compiling. # We only set it when cross-compiling.
export CC=${buildPackages.stdenv.cc}/bin/cc export CC=${buildPackages.stdenv.cc}/bin/cc

@ -19,11 +19,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spidermonkey"; pname = "spidermonkey";
version = "91.8.0"; version = "91.9.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
sha512 = "edea2c7d4d3d0322091b20b623019ef041090d9f89f33c8e3140f66a54624261f278257393db70d2038154de8ee02da0bee6ecf85c281f3558338da71fc173c3"; sha512 = "fd69d489429052013d2c1b8b766a47920ecee62f0688505758f593b27ae66d6343b9107163749406251aedebdf836147e4d562415a811b04d7ab2ae31e32f133";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dlib"; pname = "dlib";
version = "19.23"; version = "19.24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "davisking"; owner = "davisking";
repo = "dlib"; repo = "dlib";
rev ="v${version}"; rev ="v${version}";
sha256 = "sha256-88vusoLEkjh3WRh/PxPtsVIFk85serRq2VxVcEus3IE="; sha256 = "sha256-YhIjP9TIIyQF6lBj85gyVRIAAwgIodzh0ViQL8v2ACA=";
}; };
postPatch = '' postPatch = ''

@ -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"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch?id=f28a947813dbc0a1fd1a8d4a712d58a64c48ca01";
sha256 = "032y8110zgnkdhkdq3745zk53am1x34d912rai8q70k3sskyq22p"; 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; { meta = with lib; {
homepage = "http://www.imagemagick.org"; homepage = "http://www.imagemagick.org";
description = "A library for manipulating FlashPIX images"; description = "A library for manipulating FlashPIX images";

@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ]; configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
"--with-fastcgi" "--with-fastcgi"
]; ];
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {

@ -2,7 +2,13 @@
# executable that matches that packages name, so that they'll work with `nix run`. # 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`. # 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"; typescript = "tsc";
vue-cli = "vue";
# Packages that provide a single executable whose name differs from the package's `name`. # Packages that provide a single executable whose name differs from the package's `name`.
"@angular/cli" = "ng"; "@angular/cli" = "ng";

@ -4,7 +4,7 @@
buildDunePackage rec { buildDunePackage rec {
pname = "graphql_ppx"; pname = "graphql_ppx";
version = "1.2.0"; version = "1.2.2";
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
@ -12,7 +12,7 @@ buildDunePackage rec {
owner = "reasonml-community"; owner = "reasonml-community";
repo = "graphql-ppx"; repo = "graphql-ppx";
rev = "v${version}"; rev = "v${version}";
sha256 = "1fymmvk616wv5xkwfdmqibdgfl47ry6idc5wfh20a3mz9mpaa13s"; sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44=";
}; };
buildInputs = [ ppxlib ]; buildInputs = [ ppxlib ];

@ -8,15 +8,13 @@ let inherit (lib) optional versionOlder; in
buildDunePackage rec { buildDunePackage rec {
pname = "lwt"; pname = "lwt";
version = "5.4.1"; version = "5.5.0";
useDune2 = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocsigen"; owner = "ocsigen";
repo = "lwt"; repo = "lwt";
rev = version; rev = version;
sha256 = "sha256-XpoRKcdNo2j05Gxm5wmKSdwqimFDSWvmLyooPYTHAjM="; sha256 = "sha256:1jbjz2rsz3j56k8vh5qlmm87hhkr250bs2m3dvpy9vsri8rkzj9z";
}; };
strictDeps = true; strictDeps = true;

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ailment"; pname = "ailment";
version = "9.2.3"; version = "9.2.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-R8AaQj/Rdz8SSN2L8v8ZzIxnPQqdg/SKUB6FV9uYFLs="; hash = "sha256-YsH9QAKoM4WILabgLvEZMJXPfpkfn/h4tofNIcGJY+k=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -46,7 +46,7 @@ in
buildPythonPackage rec { buildPythonPackage rec {
pname = "angr"; pname = "angr";
version = "9.2.3"; version = "9.2.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -55,7 +55,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-RcAiPzz2JUlNIGU7+6WCd5JskRYmlMee8wOcOclfb0Q="; hash = "sha256-3iw1tk2r6Ee302AMjgsRi6EL5py+4Blf47EWrWyiqNk=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "angrop"; pname = "angrop";
version = "9.2.3"; version = "9.2.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-bhdn3uomvegpvynR0ts4KdwFapX2xGfuwp4e57Xtcoo="; hash = "sha256-EMW2RxImYoPSnkBG027g5o5K3WT40F/Dj+GzqS8/K6g=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -21,7 +21,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-later"; pname = "ansible-later";
version = "2.0.12"; version = "2.0.13";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "thegeeklab"; owner = "thegeeklab";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-0N/BER7tV8Hv1pvHaf/46BKnzZfHBGuEaPPex/CDQe0="; hash = "sha256-9xVFvXCHjgF+7asO1ialGIofJwsRRRiydo/Ui2C+Wig=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -24,11 +24,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ansible-core"; pname = "ansible-core";
version = "2.12.5"; version = "2.13.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M="; sha256 = "sha256-COD7SnGNlnplTnDNpXz5MgGGkyndHPW4pCZ8V8XEyNM=";
}; };
# ansible_connection is already wrapped, so don't pass it through # ansible_connection is already wrapped, so don't pass it through

@ -20,7 +20,7 @@
let let
pname = "ansible"; pname = "ansible";
version = "5.7.1"; version = "5.8.0";
in in
buildPythonPackage { buildPythonPackage {
inherit pname version; inherit pname version;
@ -30,7 +30,7 @@ buildPythonPackage {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-kKCaNFENGU1jVWiVoiWonkqLdIua4hW1XlF6N94GOmE="; sha256 = "sha256-+gVkdiAfQGJfs22VxQQe9GOIC+GL5cc7mYtXtAGWeGM=";
}; };
postPatch = '' postPatch = ''

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "archinfo"; pname = "archinfo";
version = "9.2.3"; version = "9.2.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-r0cZXyj47HmgFVyQ3POGexeQxBiQ1xx/ptsPMwCRjHY="; hash = "sha256-d5SP9pnDWXEzjBXKeqnuKK6+lrFRWYwmiV4MjfqORwk=";
}; };
checkInputs = [ checkInputs = [

@ -1,8 +1,9 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k
, python, twisted, jinja2, zope_interface, sqlalchemy, alembic, python-dateutil , python, twisted, jinja2, msgpack, zope_interface, sqlalchemy, alembic
, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3 , python-dateutil, txaio, autobahn, pyjwt, pyyaml, treq, txrequests, pypugjs
, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker , boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8
, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales , buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh
, glibcLocales
, nixosTests , nixosTests
}: }:
@ -42,6 +43,7 @@ let
# core # core
twisted twisted
jinja2 jinja2
msgpack
zope_interface zope_interface
sqlalchemy sqlalchemy
alembic alembic
@ -50,7 +52,6 @@ let
autobahn autobahn
pyjwt pyjwt
pyyaml pyyaml
unidiff
] ]
# tls # tls
++ twisted.extras-require.tls; ++ twisted.extras-require.tls;

@ -52,5 +52,7 @@ buildPythonPackage rec {
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
homepage = "https://catboost.ai"; homepage = "https://catboost.ai";
maintainers = with maintainers; [ PlushBeaver ]; maintainers = with maintainers; [ PlushBeaver ];
# _catboost.pyx.cpp:226822:19: error: use of undeclared identifier '_PyGen_Send'
broken = withCuda;
}; };
} }

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "claripy"; pname = "claripy";
version = "9.2.3"; version = "9.2.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-O2nkGIQfjGmhrqBPoMI97DsCvOUZix0VcUHwmDyF40Q="; hash = "sha256-nP2mqBmgpn7zFtMd9suH3kfEqKtzIjaZl6ALsvihVgE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -15,7 +15,7 @@
let let
# The binaries are following the argr projects release cycle # 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) # Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub { binaries = fetchFromGitHub {
@ -37,7 +37,7 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-gyWeE4sF9Bmk2CNmXh90xMtXlaz/Agm7wX6sWr0Fyco="; hash = "sha256-SlYayKfosSicMxMZszZpxJ3ewKScyLpv6s5ayoVE9Ko=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cyclonedx-python-lib"; pname = "cyclonedx-python-lib";
version = "2.3.0"; version = "2.4.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "CycloneDX"; owner = "CycloneDX";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-eZy+m6AkSlZM/i64FyFL+ZgeW86MOSM6sDYPT4ckaHE="; hash = "sha256-IrMXHWeksEmON3LxJvQ3WSKwQTY0aRZ8XItWMr3p4gw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -8,19 +8,20 @@
, numpy , numpy
, pytestCheckHook , pytestCheckHook
, pyyaml , pyyaml
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "deepdiff"; pname = "deepdiff";
version = "5.7.0"; version = "5.8.2";
format = "setuptools"; format = "setuptools";
# pypi source does not contain all fixtures required for tests disabled = pythonOlder "3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "seperman"; owner = "seperman";
repo = "deepdiff"; repo = "deepdiff";
# 5.7.0 release not tagged https://github.com/seperman/deepdiff/issues/300 rev = "v${version}";
rev = "f2ffdb83b2993f4f0bb7e854620f0acd0bf6339e";
hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk="; hash = "sha256-0UBx7sH2iMrLVl5FtHNTwoecLHi8GbInn75G3FSg4gk=";
}; };
@ -48,10 +49,15 @@ buildPythonPackage rec {
pyyaml pyyaml
]; ];
disabledTests = [
# Assertion issue with the decimal places
"test_get_numeric_types_distance"
];
meta = with lib; { meta = with lib; {
description = "Deep Difference and Search of any Python object/data"; description = "Deep Difference and Search of any Python object/data";
homepage = "https://github.com/seperman/deepdiff"; homepage = "https://github.com/seperman/deepdiff";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.mic92 ]; maintainers = with maintainers; [ mic92 ];
}; };
} }

@ -14,14 +14,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "doc8"; pname = "doc8";
version = "0.11.1"; version = "0.11.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-bby1Ry79Mydj/7KGK0/e7EDIpv3Gu2fmhxOtdJylgIw="; sha256 = "sha256-w1ojH4jxXCBGWRVO09SZ+k1ALX5j1By6e1TPXmRhI6s=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

@ -17,7 +17,7 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "0.20.36"; version = "0.20.38";
pname = "dulwich"; pname = "dulwich";
format = "setuptools"; format = "setuptools";
@ -25,7 +25,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-2s7xVJwSdffS1v7NLyz6O6ozB9AJpRTAwjIDP2uqXSE="; hash = "sha256-c0Z5DYc1yG+7xbcLZ08O+UCWweUJm6cnNJFigjmBf8g=";
}; };
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";

@ -6,7 +6,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "elementpath"; pname = "elementpath";
version = "2.5.1"; version = "2.5.2";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
owner = "sissaschool"; owner = "sissaschool";
repo = "elementpath"; repo = "elementpath";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-tejsQ6m9XyMGDIEDzWYwSav5Iqa9S/DIYShOpoSlTWo="; hash = "sha256-JmNG6SXig24X34nQXrpMN9ir9+l8o23ddzw2uyR3qb0=";
}; };
# avoid circular dependency with xmlschema which directly depends on this # avoid circular dependency with xmlschema which directly depends on this

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "hahomematic"; pname = "hahomematic";
version = "1.3.1"; version = "1.4.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "danielperna84"; owner = "danielperna84";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-RgjsaGtji5vSQcv+npOYcXJNYUhx9Snz56BXnfoc2QY="; sha256 = "sha256-1JYakfs+lLCfB2Ann1QfNw+MBrB9PiixOUqdA7UgbWE=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -1,25 +1,26 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, freezegun
, importlib-metadata
, pytestCheckHook
, pythonOlder , pythonOlder
, setuptools-scm
, setuptools , setuptools
, pytestCheckHook , setuptools-scm
, freezegun
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "4.0.0"; version = "4.1.0";
pname = "humanize"; pname = "humanize";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jmoiron"; owner = "python-humanize";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-v4OdZmUI2LCick4qCSGOHJ7jtWybwKTeTeIcly+QQQQ="; hash = "sha256-5xL3gfEohDjnF085Pgx/PBXWWM76X4FU2KR+8OGshMw=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version; SETUPTOOLS_SCM_PRETEND_VERSION = version;
@ -30,6 +31,8 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
setuptools setuptools
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
]; ];
checkInputs = [ checkInputs = [
@ -37,11 +40,14 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
pythonImportsCheck = [
"humanize"
];
meta = with lib; { meta = with lib; {
description = "Python humanize utilities"; description = "Python humanize utilities";
homepage = "https://github.com/jmoiron/humanize"; homepage = "https://github.com/python-humanize/humanize";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ rmcgibbo ]; maintainers = with maintainers; [ rmcgibbo ];
}; };
} }

@ -6,14 +6,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mailchecker"; pname = "mailchecker";
version = "4.1.16"; version = "4.1.17";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-A+lh+BggMSJ/PIcYMfX3u/YlKVqhG5IxbrHPb1U6Ll4="; hash = "sha256-NfgLI490/9YoHIXTVD890RTe+qP9rrwAFv8Xkc1IY5s=";
}; };
# Module has no tests # Module has no tests

@ -1,22 +1,43 @@
{ lib, buildPythonPackage, fetchPypi, marshmallow, setuptools }: { lib
, buildPythonPackage
, fetchFromGitHub
, marshmallow
, pytestCheckHook
, pythonOlder
, setuptools
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "marshmallow-oneofschema"; pname = "marshmallow-oneofschema";
version = "3.0.1"; version = "3.0.1";
format = "setuptools";
src = fetchPypi { disabled = pythonOlder "3.6";
inherit pname version;
sha256 = "62cd2099b29188c92493c2940ee79d1bf2f2619a71721664e5a98ec2faa58237"; 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; { meta = with lib; {
homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema";
description = "Marshmallow library extension that allows schema (de)multiplexing"; description = "Marshmallow library extension that allows schema (de)multiplexing";
homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.ivan-tkatchev ]; maintainers = with maintainers; [ ivan-tkatchev ];
}; };
} }

@ -1,15 +1,17 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, pythonOlder
, fetchFromGitHub , fetchFromGitHub
, pytestCheckHook , pytestCheckHook
, pythonOlder
, pytz , pytz
, simplejson , simplejson
, packaging
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "marshmallow"; pname = "marshmallow";
version = "3.13.0"; version = "3.15.0";
format = "setuptools";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
@ -17,9 +19,13 @@ buildPythonPackage rec {
owner = "marshmallow-code"; owner = "marshmallow-code";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0="; hash = "sha256-ZqMrMNfP/RKW2jQDNPgfhyeqmSc40pZbnrcXHbw2emc=";
}; };
propagatedBuildInputs = [
packaging
];
checkInputs = [ checkInputs = [
pytestCheckHook pytestCheckHook
pytz pytz
@ -31,10 +37,7 @@ buildPythonPackage rec {
]; ];
meta = with lib; { meta = with lib; {
description = '' description = "Library for converting complex objects to and from simple Python datatypes";
A lightweight library for converting complex objects to and from
simple Python datatypes.
'';
homepage = "https://github.com/marshmallow-code/marshmallow"; homepage = "https://github.com/marshmallow-code/marshmallow";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ cript0nauta ]; maintainers = with maintainers; [ cript0nauta ];

@ -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 , paramiko, requests, future, textfsm, jinja2, netaddr, pyyaml, pyeapi, netmiko
, junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock , junos-eznc, ciscoconfparse, scp, lxml, ncclient, pytestCheckHook, ddt, mock
, pythonOlder, pythonAtLeast }: , pythonOlder }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "napalm"; pname = "napalm";
version = "3.3.1"; version = "3.4.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "napalm-automation"; owner = "napalm-automation";
repo = "napalm"; repo = "napalm";
rev = version; 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 ]; buildInputs = [ setuptools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
cffi cffi
paramiko paramiko

@ -30,12 +30,14 @@ buildPythonPackage rec {
"test_method_signatures" "test_method_signatures"
# AttributeError: 'PatchedProcurveDriver' object has no attribute 'platform' # AttributeError: 'PatchedProcurveDriver' object has no attribute 'platform'
"test_get_config_filtered" "test_get_config_filtered"
# AssertionError
"test_get_interfaces"
]; ];
meta = with lib; { meta = with lib; {
description = "HP ProCurve Driver for NAPALM automation frontend"; description = "HP ProCurve Driver for NAPALM automation frontend";
homepage = homepage = "https://github.com/napalm-automation-community/napalm-hp-procurve";
"https://github.com/napalm-automation-community/napalm-hp-procurve";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ];
}; };
} }

@ -3,16 +3,15 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "netmiko"; pname = "netmiko";
version = "4.0.0"; version = "4.1.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-fVhBkiO1JpqMIFl32xlwSjeCd7aObocXPAr069fKdmc="; sha256 = "sha256-VwUZdHr82WsEprB7rk5d62AwaCxzngftDgjeBZW4OWQ=";
}; };
buildInputs = [ setuptools ]; buildInputs = [ setuptools ];
propagatedBuildInputs = propagatedBuildInputs = [ paramiko scp tenacity pyyaml textfsm ntc-templates pyserial ];
[ paramiko scp tenacity textfsm ntc-templates pyserial ];
# tests require closed-source pyats and genie packages # tests require closed-source pyats and genie packages
doCheck = false; doCheck = false;

@ -20,7 +20,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "plugwise"; pname = "plugwise";
version = "0.18.3"; version = "0.18.4";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -29,7 +29,7 @@ buildPythonPackage rec {
owner = pname; owner = pname;
repo = "python-plugwise"; repo = "python-plugwise";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-aNlPOgUChLFkPPZtb3o4A49uoSBjxKaq3WtuupHlmi8="; sha256 = "sha256-a4mbkwjdLOnoxe4Cj43IXGALqbTKqinoJAiPWfc79/8=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyrogram"; pname = "pyrogram";
version = "2.0.23"; version = "2.0.24";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "pyrogram"; owner = "pyrogram";
repo = "pyrogram"; repo = "pyrogram";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-+qJfqC6jLfrPwXl6zR7b21jY/s9leWeBxVgMa1IDRg4="; hash = "sha256-YcVVXaPM+X+9prjgRYYSs8dkho3YKvtn/0FNJVnsrGM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save