Merge master into staging-next

main
github-actions[bot] 2 years ago committed by GitHub
commit 17dfec3606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      pkgs/applications/audio/mousai/default.nix
  2. 6
      pkgs/applications/audio/musikcube/default.nix
  3. 29
      pkgs/applications/backup/pika-backup/borg-path.patch
  4. 38
      pkgs/applications/backup/pika-backup/default.nix
  5. 6
      pkgs/applications/blockchains/alfis/default.nix
  6. 5
      pkgs/applications/blockchains/mycrypto/default.nix
  7. 6
      pkgs/applications/editors/standardnotes/default.nix
  8. 4
      pkgs/applications/graphics/megapixels/default.nix
  9. 4
      pkgs/applications/misc/authenticator/default.nix
  10. 4
      pkgs/applications/misc/bottles/default.nix
  11. 6
      pkgs/applications/misc/chrysalis/default.nix
  12. 6
      pkgs/applications/misc/devdocs-desktop/default.nix
  13. 3
      pkgs/applications/misc/joplin-desktop/default.nix
  14. 8
      pkgs/applications/misc/marktext/default.nix
  15. 4
      pkgs/applications/misc/metadata-cleaner/default.nix
  16. 3
      pkgs/applications/misc/notable/default.nix
  17. 20
      pkgs/applications/misc/tpmmanager/default.nix
  18. 6
      pkgs/applications/misc/zettlr/default.nix
  19. 3
      pkgs/applications/networking/Sylk/default.nix
  20. 6
      pkgs/applications/networking/cluster/lens/default.nix
  21. 3
      pkgs/applications/networking/cluster/octant/desktop.nix
  22. 6
      pkgs/applications/networking/cluster/terraform/default.nix
  23. 4
      pkgs/applications/networking/flexget/default.nix
  24. 3
      pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
  25. 5
      pkgs/applications/networking/instant-messengers/rambox/rambox.nix
  26. 220
      pkgs/applications/networking/n8n/node-packages.nix
  27. 3
      pkgs/applications/networking/station/default.nix
  28. 7
      pkgs/applications/office/banking/default.nix
  29. 2
      pkgs/applications/office/timeular/default.nix
  30. 5
      pkgs/applications/office/tusk/default.nix
  31. 8
      pkgs/applications/science/logic/easycrypt/default.nix
  32. 4
      pkgs/applications/science/logic/why3/default.nix
  33. 2
      pkgs/applications/science/logic/why3/with-provers.nix
  34. 4
      pkgs/applications/terminal-emulators/kitty/default.nix
  35. 10
      pkgs/applications/version-management/git-and-tools/cgit/pink.nix
  36. 6
      pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
  37. 6
      pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix
  38. 3
      pkgs/applications/video/losslesscut-bin/appimage.nix
  39. 9
      pkgs/data/themes/mojave/default.nix
  40. 4
      pkgs/development/interpreters/spidermonkey/91.nix
  41. 6
      pkgs/development/ocaml-modules/lwt/default.nix
  42. 4
      pkgs/development/python-modules/ansible/core.nix
  43. 4
      pkgs/development/python-modules/ansible/default.nix
  44. 2
      pkgs/development/python-modules/catboost/default.nix
  45. 6
      pkgs/development/python-modules/starline/default.nix
  46. 37
      pkgs/development/python-modules/uamqp/darwin-azure-c-shared-utility-corefoundation.patch
  47. 4
      pkgs/development/python-modules/uamqp/default.nix
  48. 6
      pkgs/development/tools/altair-graphql-client/default.nix
  49. 9
      pkgs/development/tools/analysis/frama-c/default.nix
  50. 6
      pkgs/development/tools/analysis/tfsec/default.nix
  51. 6
      pkgs/development/tools/misc/saleae-logic-2/default.nix
  52. 8
      pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
  53. 4
      pkgs/development/tools/qtcreator/default.nix
  54. 6
      pkgs/development/tools/rust/cargo-deny/default.nix
  55. 6
      pkgs/development/tools/unityhub/default.nix
  56. 3
      pkgs/development/web/bloomrpc/default.nix
  57. 14
      pkgs/games/cl-wordle/default.nix
  58. 6
      pkgs/games/heroic/default.nix
  59. 1
      pkgs/os-specific/darwin/moltenvk/default.nix
  60. 10
      pkgs/os-specific/linux/latencytop/default.nix
  61. 4
      pkgs/servers/home-assistant/component-packages.nix
  62. 4
      pkgs/servers/home-assistant/default.nix
  63. 4
      pkgs/tools/misc/diffoscope/default.nix
  64. 3
      pkgs/tools/misc/wootility/default.nix
  65. 10
      pkgs/tools/text/tab/default.nix
  66. 11
      pkgs/top-level/all-packages.nix
  67. 6
      pkgs/top-level/wine-packages.nix

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

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

@ -1,13 +1,22 @@
diff --git a/src/borg/utils.rs b/src/borg/utils.rs
index 4e30913..30d7d6f 100644
--- a/src/borg/utils.rs
+++ b/src/borg/utils.rs
@@ -223,7 +223,7 @@ impl BorgCall {
diff --git a/src/borg/process.rs b/src/borg/process.rs
index 63ea0ee..e3535e0 100644
--- a/src/borg/process.rs
+++ b/src/borg/process.rs
@@ -203,7 +203,7 @@ impl BorgCall {
}
pub fn cmd(&self) -> Command {
- let mut cmd = Command::new("borg");
+ let mut cmd = Command::new("@borg@");
pub fn cmd(&self) -> Result<process::Command> {
- let mut cmd = process::Command::new("borg");
+ let mut cmd = process::Command::new("@borg@");
cmd.envs([self.set_password()?]);
@@ -221,7 +221,7 @@ impl BorgCall {
}
pub fn cmd_async(&self) -> Result<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
, substituteAll
, desktop-file-utils
, itstool
, meson
, ninja
, pkg-config
, python3
, wrapGAppsHook
, wrapGAppsHook4
, borgbackup
, dbus
, gdk-pixbuf
, glib
, gtk3
, libhandy
, gtk4
, libadwaita
, libsecret
}:
stdenv.mkDerivation rec {
pname = "pika-backup";
version = "0.3.5";
version = "0.4.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "pika-backup";
rev = "v${version}";
sha256 = "sha256-8jT3n+bTNjhm64AMS24Ju+San75ytfqFXloH/TOgO1g=";
hash = "sha256-vQ0hlwsrY0WOUc/ppleE+kKRGHPt/ScEChXrkukln3U=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "198bs4z7l22sh8ck7v46s45mj8zpfbg03n1xzc6pnafdd8hf3q15";
hash = "sha256-IKUh5gkXTpmMToDaec+CpCIQqJjwJM2ZrmGQhZeTDsg=";
};
patches = [
@ -41,12 +40,10 @@ stdenv.mkDerivation rec {
src = ./borg-path.patch;
borg = "${borgbackup}/bin/borg";
})
# Fix build with meson 0.61, can be removed on next release.
# https://gitlab.gnome.org/World/pika-backup/-/issues/156
# https://github.com/mesonbuild/meson/issues/9441
(fetchpatch {
url = "https://gitlab.gnome.org/World/pika-backup/-/commit/54be149c88fd69fb9e74b7362fe7182863237869.patch";
sha256 = "sha256-Tffxo5hlf/gSkp1GfyL4eHthX49tuTq6B+S53N8oA2M=";
name = "use-gtk4-update-icon-cache.patch";
url = "https://gitlab.gnome.org/World/pika-backup/-/merge_requests/64.patch";
hash = "sha256-AttGQGWealvTIvPwBl5M6FiC4Al/UD4/XckUAxM38SE=";
})
];
@ -56,11 +53,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
desktop-file-utils
itstool
meson
ninja
pkg-config
python3
wrapGAppsHook
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook
rust.cargo
@ -68,16 +66,14 @@ stdenv.mkDerivation rec {
]);
buildInputs = [
dbus
gdk-pixbuf
glib
gtk3
libhandy
gtk4
libadwaita
libsecret
];
meta = with lib; {
description = "Simple backups based on borg";
homepage = "https://wiki.gnome.org/Apps/PikaBackup";
homepage = "https://apps.gnome.org/app/org.gnome.World.PikaBackup";
changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda ];

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

@ -1,5 +1,4 @@
{ lib, appimageTools, fetchurl, makeDesktopItem
, gsettings-desktop-schemas, gtk3
}:
let
@ -29,10 +28,6 @@ let
in appimageTools.wrapType2 rec {
inherit name src;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no p32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

@ -1,5 +1,5 @@
{ lib, stdenv, appimageTools, autoPatchelfHook, desktop-file-utils
, fetchurl, libsecret, gtk3, gsettings-desktop-schemas }:
, fetchurl, libsecret }:
let
version = "3.11.1";
@ -31,10 +31,6 @@ let
in appimageTools.wrapType2 rec {
inherit name src;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraPkgs = pkgs: with pkgs; [
libsecret
];

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

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

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

@ -1,4 +1,4 @@
{ lib, appimageTools, fetchurl, gtk3, gsettings-desktop-schemas }:
{ lib, appimageTools, fetchurl }:
let
pname = "chrysalis";
@ -14,10 +14,6 @@ in appimageTools.wrapAppImage rec {
};
};
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null;
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.glib

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

@ -1,4 +1,4 @@
{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }:
{ lib, stdenv, appimageTools, fetchurl, undmg }:
let
pname = "joplin-desktop";
@ -45,7 +45,6 @@ let
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
{ appimageTools, fetchurl, lib }:
let
pname = "marktext";
@ -18,12 +18,6 @@ appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
''
# Fixes file open dialog error
# GLib-GIO-ERROR **: 20:36:48.243: No GSettings schemas are installed on the system
# See https://github.com/NixOS/nixpkgs/pull/83701#issuecomment-608034097
+ ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed

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

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
{ appimageTools, fetchurl, lib }:
let
pname = "notable";
@ -23,7 +23,6 @@ appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, qt4, qmake4Hook, trousers }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, qtbase, qmake, wrapQtAppsHook, trousers }:
stdenv.mkDerivation rec {
version = "0.8.1";
@ -8,12 +8,24 @@ stdenv.mkDerivation rec {
owner = "Rohde-Schwarz";
repo = "TPMManager";
rev = "v${version}";
sha256 = "sha256-JKYG+I/tZ+0NDmHcIgKV6eGrjbPvPQKPo0sE/zBlLY4=";
sha256 = "sha256-UZYn4ssbvLpdB0DssT7MXqQZCu1KkLf/Bsb45Rvgm+E=";
};
nativeBuildInputs = [ qmake4Hook ];
patches = [
# build with Qt5
(fetchpatch {
url = "https://github.com/Rohde-Schwarz/TPMManager/commit/f62c0f2de2097af9b504c80d6193818e6e4ca84f.patch";
sha256 = "sha256-gMhDNN2UkX2lJf/oJEzOkCvF6+EGdIj9xwtXb1rCeys=";
})
(fetchpatch {
url = "https://github.com/Rohde-Schwarz/TPMManager/commit/c287a841ac6b057ed35799949211866b9f533561.patch";
sha256 = "sha256-2ZyUml8Q9bKQLVZWr18AzLt8VYLICXH9VDeq6B5Xfto=";
})
];
buildInputs = [ qt4 trousers ];
nativeBuildInputs = [ qmake wrapQtAppsHook ];
buildInputs = [ qtbase trousers ];
installPhase = ''
mkdir -p $out/bin

@ -1,8 +1,6 @@
{ appimageTools
, lib
, fetchurl
, gtk3
, gsettings-desktop-schemas
, texlive
, pandoc
}:
@ -23,10 +21,6 @@ in
appimageTools.wrapType2 rec {
inherit name src;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = ''

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, lib, gsettings-desktop-schemas, gtk3 }:
{ appimageTools, fetchurl, lib }:
let
pname = "Sylk";
@ -15,7 +15,6 @@ appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }:
{ lib, fetchurl, appimageTools, wrapGAppsHook }:
let
pname = "lens";
@ -20,10 +20,6 @@ in
appimageTools.wrapType2 {
inherit name src;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraInstallCommands =
''
mv $out/bin/${name} $out/bin/${pname}

@ -1,4 +1,4 @@
{ lib, stdenv, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, undmg }:
{ lib, stdenv, appimageTools, fetchurl, undmg }:
let
pname = "octant-desktop";
@ -25,7 +25,6 @@ let
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed

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

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

@ -1,8 +1,6 @@
{ lib
, fetchurl
, appimageTools
, gtk3
, gsettings-desktop-schemas
, xorg
, pname
, version
@ -24,7 +22,6 @@ in
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;

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

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

@ -1,4 +1,4 @@
{ appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, lib }:
{ appimageTools, fetchurl, lib }:
let
pname = "station";
@ -18,7 +18,6 @@ in appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null;

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

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

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, ocamlPackages, why3 }:
stdenv.mkDerivation rec {
pname = "easycrypt";
@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7";
};
# Fix build with Why3 1.5
patches = fetchpatch {
url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch";
sha256 = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm";
};
nativeBuildInputs = with ocamlPackages; [
dune_3
findlib

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

@ -27,6 +27,6 @@ stdenv.mkDerivation {
installPhase = ''
mkdir -p $out/bin
makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf"
makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--config $out/share/why3/why3.conf"
'';
}

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, python3Packages, libunistring
, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick, xsel
, harfbuzz, fontconfig, pkg-config, ncurses, imagemagick
, libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
, libxkbcommon, libXi, libXext, wayland-protocols, wayland
, lcms2
@ -157,7 +157,7 @@ buildPythonApplication rec {
'' else ''
cp -r linux-package/{bin,share,lib} $out
''}
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick xsel ncurses.dev ]}"
wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}"
installShellCompletion --cmd kitty \
--bash <("$out/bin/kitty" +complete setup bash) \

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

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

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

@ -1,4 +1,4 @@
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }:
{ appimageTools, lib, fetchurl, version, sha256 }:
let
pname = "losslesscut";
@ -21,7 +21,6 @@ in appimageTools.wrapType2 {
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps;

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

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

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

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

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

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

@ -2,23 +2,21 @@
, buildPythonPackage
, pythonOlder
, fetchPypi
, aiohttp
, requests
}:
buildPythonPackage rec {
pname = "starline";
version = "0.1.5";
version = "0.2.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "1753f5fcd2a6976aed775afb03f8392159f040c673917cc0c634510d95c13cb9";
sha256 = "550b00ab95cf59d933f7708abab40a4e41e5790e62b653471afe86a3af3320e6";
};
propagatedBuildInputs = [
aiohttp
requests
];

@ -0,0 +1,37 @@
From 52ab2095649b5951e6af77f68954209473296983 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sat, 16 Jan 2021 15:54:05 +0100
Subject: [PATCH] Fix finding apple libraries
---
CMakeLists.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(rejected by upstream in https://github.com/Azure/azure-c-shared-utility/pull/499,
seems problem it's solving is nixpkgs-specific)
diff --git a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
index 7bbfa6f3f..3567b18bc 100644
--- a/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
+++ b/src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/CMakeLists.txt
@@ -120,8 +120,9 @@ endif()
if(${use_applessl})
# MACOSX only has native tls and open ssl, so use the native apple tls
- find_library(cf_foundation Foundation)
+ find_library(cf_foundation CoreFoundation)
find_library(cf_network CFNetwork)
+ find_library(cf_security Security)
endif()
if(${no_logging})
@@ -581,7 +582,7 @@ endif()
if(${use_applessl})
- set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network})
+ set(aziotsharedutil_target_libs ${aziotsharedutil_target_libs} ${cf_foundation} ${cf_network} ${cf_security})
endif()
if(WIN32)

@ -23,6 +23,10 @@ buildPythonPackage rec {
sha256 = "sha256-guhfOMvddC4E+oOmvpeG8GsXEfqLcSHVdtj3w8fF2Vs=";
};
patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
./darwin-azure-c-shared-utility-corefoundation.patch
];
nativeBuildInputs = [
cmake
];

@ -1,4 +1,4 @@
{ lib, appimageTools, fetchurl, gsettings-desktop-schemas, gtk3 }:
{ lib, appimageTools, fetchurl }:
let
pname = "altair";
@ -14,10 +14,6 @@ in
appimageTools.wrapType2 {
inherit src pname version;
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}

@ -4,6 +4,15 @@
, gdk-pixbuf, wrapGAppsHook
}:
let why3_1_5 = why3; in
let why3 = why3_1_5.overrideAttrs (o: rec {
version = "1.4.1";
src = fetchurl {
url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz";
sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq";
};
}); in
let
mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
runtimeDeps = with ocamlPackages; [

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tfsec";
version = "1.21.0";
version = "1.21.1";
src = fetchFromGitHub {
owner = "aquasecurity";
repo = pname;
rev = "v${version}";
sha256 = "sha256-z2RVMPZykz2FUsmn5sQs3fAK/h+cWv+A/56rhOlHkGA=";
sha256 = "sha256-+yCRCHTx42wHnGi4jgre9gaa4LNrWjSNQdIONMWCTkc=";
};
ldflags = [
@ -21,7 +21,7 @@ buildGoModule rec {
# "-extldflags '-fno-PIC -static'"
];
vendorSha256 = "sha256-R5sks8mbY3JpKcVl7XBKst/QI8ZWIqXAR3D6/eflV1Q=";
vendorSha256 = "sha256-IwHm70BSM1lIWc7MiL0Ye6Y7fGn6GnuELm082wIgtEk=";
subPackages = [
"cmd/tfsec"

@ -1,4 +1,4 @@
{ lib, fetchurl, makeDesktopItem, appimageTools, gtk3 }:
{ lib, fetchurl, makeDesktopItem, appimageTools }:
let
name = "saleae-logic-2";
version = "2.3.52";
@ -31,10 +31,6 @@ appimageTools.wrapType2 {
cp ${appimageContents}/usr/share/icons/hicolor/256x256/apps/Logic.png $out/share/pixmaps/Logic.png
'';
profile = ''
export XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}''${XDG_DATA_DIRS:+:"''$XDG_DATA_DIRS"}"
'';
extraPkgs = pkgs: with pkgs; [
wget
unzip

@ -1,9 +1,9 @@
{
"url": "https://github.com/cstrahan/tree-sitter-nix",
"rev": "470b15a60520ff7b86f51732b8d8f1118c86041e",
"date": "2022-03-18T01:42:08-05:00",
"path": "/nix/store/c5y76kz7wmfq05hfw4xpqz2ahcdy924f-tree-sitter-nix",
"sha256": "1hl0mpy0i6r160v6v3nflrdi5fnmd8i5zbx963h5nj9fg4srkb5r",
"rev": "6d6aaa50793b8265b6a8b6628577a0083d3b923d",
"date": "2021-11-29T00:27:21-06:00",
"path": "/nix/store/6cjadxvqbrh205lsqnk2rnzq3badxdxv-tree-sitter-nix",
"sha256": "0cbk6dqppasrvnm87pwfgm718z6b0xmy9m7zj8ysil0h8bklz1w9",
"fetchLFS": false,
"fetchSubmodules": false,
"deepClone": false,

@ -20,12 +20,12 @@ in
mkDerivation rec {
pname = "qtcreator";
version = "5.0.2";
version = "5.0.3";
baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version));
src = fetchurl {
url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
sha256 = "1bf07150226da46237f26f5eaa9f090ce81ed79b9bc75e0dfa6328043e360103";
sha256 = "1sz21ijzvhf5avblikffykbqa8zdq3sbg32g2dmyxv5w211v3lvz";
};
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++

@ -11,19 +11,19 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-deny";
version = "0.11.4";
version = "0.12.0";
src = fetchFromGitHub {
owner = "EmbarkStudios";
repo = pname;
rev = version;
sha256 = "sha256-lwVoV+zxJfmWvlt14FFmxPCdKCoojVvRVGS1rq1QF44=";
sha256 = "sha256-8zJvVuEljCa63mQcgK3E3/SHica6DZbNys+PG7E2GtI=";
};
# enable pkg-config feature of zstd
cargoPatches = [ ./zstd-pkg-config.patch ];
cargoSha256 = "sha256-I+kpHaCxuNzq8+GdqQEuSdE4aD+/lBccUrSf+XW2OKE=";
cargoSha256 = "sha256-bMm/JWzVrgS8XHV1ZXeGQm79JUC7zL0h6v92tqajXfU=";
nativeBuildInputs = [ pkg-config ];

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
{ lib, fetchurl, appimageTools }:
appimageTools.wrapType2 rec {
pname = "unityhub";
@ -31,10 +31,6 @@ appimageTools.wrapType2 rec {
$out/share/icons/hicolor/64x64/apps/unityhub.png
'';
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
meta = with lib; {
homepage = "https://unity3d.com/";
description = "Game development tool";

@ -1,4 +1,4 @@
{ lib, fetchurl, gsettings-desktop-schemas, gtk3, appimageTools }:
{ lib, fetchurl, appimageTools }:
let
pname = "bloomrpc";
@ -19,7 +19,6 @@ appimageTools.wrapType2 {
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
multiPkgs = null; # no 32bit needed

@ -1,15 +1,17 @@
{ lib, rustPlatform, fetchCrate }:
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "cl-wordle";
version = "0.4.0";
version = "0.5.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-z2XpXgOviBRcberwpxQ4ml1T04k5kMhG7wA0PAYWENg=";
src = fetchFromGitHub {
owner = "conradludgate";
repo = "wordle";
rev = "v${version}";
sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s=";
};
cargoSha256 = "sha256-C7UMkhgez2CtddftARlwN1TjZ1N26NnZfpRiX1KkMEA=";
cargoSha256 = "sha256-PtJbLpAUH44alupFY6wX++t/QsKknn5bXvnXzdYsd9o=";
meta = with lib; {
description = "Wordle TUI in Rust";

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }:
{ lib, fetchurl, appimageTools }:
let
pname = "heroic";
@ -29,10 +29,6 @@ appimageTools.wrapType2 {
--replace 'Exec=AppRun' 'Exec=heroic'
'';
profile = ''
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
'';
meta = with lib; {
description = "A Native GUI Epic Games Launcher for Linux, Windows and Mac";
homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";

@ -192,6 +192,7 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/KhronosGroup/MoltenVK";
changelog = "https://github.com/KhronosGroup/MoltenVK/releases";
maintainers = [ lib.maintainers.reckenrode ];
hydraPlatforms = [ ]; # Prevent building on Hydra until MoltenVK no longer requires Xcode.
license = lib.licenses.asl20;
platforms = lib.platforms.darwin;
};

@ -1,10 +1,16 @@
{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }:
{ lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2, util-linux }:
stdenv.mkDerivation rec {
pname = "latencytop";
version = "0.5";
patchPhase = "sed -i s,/usr,$out, Makefile";
postPatch = ''
sed -i s,/usr,$out, Makefile
# Fix #171609
substituteInPlace fsync.c --replace /bin/mount ${util-linux}/bin/mount
'';
preInstall = "mkdir -p $out/sbin";
src = fetchurl {

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.5.4";
version = "2022.5.5";
components = {
"abode" = ps: with ps; [
abodepy
@ -2440,7 +2440,7 @@
paho-mqtt
];
"snmp" = ps: with ps; [
pysnmplib
pysnmp
];
"solaredge" = ps: with ps; [
solaredge

@ -179,7 +179,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.5.4";
hassVersion = "2022.5.5";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-5juHG1bVeFYrjpAAlt3GoCRmBvyCSOdnSw1WuaNWF8w=";
hash = "sha256-uVB3Yg3f0fNkq2rav7hmbJ9IAMg0UIrdMshJVgOharA=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
pythonPath = [
binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils
e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip
libarchive libcaca lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd
xz zip zstd
]
++ (with python3Packages; [
@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec {
++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ]
++ lib.optionals enableBloat ([
abootimg apksigner apktool cbfstool colord enjarify ffmpeg fpc ghc ghostscriptX giflib gnupg gnumeric
hdf5 imagemagick llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans
hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans
] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer ]));
checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath;

@ -1,8 +1,6 @@
{ appimageTools
, fetchurl
, lib
, gsettings-desktop-schemas
, gtk3
, libxkbfile
, udev
, wooting-udev-rules
@ -21,7 +19,6 @@ appimageTools.wrapType2 rec {
profile = ''
export LC_ALL=C.UTF-8
export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS"
'';
multiPkgs = extraPkgs;

@ -1,24 +1,20 @@
{ lib, stdenv, fetchFromGitHub, python3 }:
stdenv.mkDerivation rec {
version = "9.0";
version = "9.1";
pname = "tab";
src = fetchFromGitHub {
owner = "ivan-tkatchev";
repo = pname;
rev = version;
sha256 = "sha256-2keVGPRYV2KCeJ+LgAcl74cjW5wvp6Rmy7VNMtdliBE=";
sha256 = "sha256-AhgWeV/ojB8jM16A5ggrOD1YjWfRVcoQbkd3S2bgdyE=";
};
checkInputs = [ python3 ];
doCheck = !stdenv.isDarwin;
preCheck = ''
substituteInPlace Makefile --replace "python2 go2.py" "python go.py"
'';
checkTarget = "test";
installPhase = ''
@ -32,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Programming language/shell calculator";
homepage = "https://tkatchev.bitbucket.io/tab/";
homepage = "http://tab-lang.xyz";
license = licenses.boost;
maintainers = with maintainers; [ mstarzyk ];
platforms = with platforms; unix;

@ -10953,7 +10953,7 @@ with pkgs;
toybox = callPackage ../tools/misc/toybox { };
tpmmanager = callPackage ../applications/misc/tpmmanager { };
tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };
@ -14770,7 +14770,14 @@ with pkgs;
autoadb = callPackage ../misc/autoadb { };
ansible = ansible_2_12;
ansible_2_12 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_13 = python3Packages.toPythonApplication python3Packages.ansible-core;
ansible_2_12 = python3Packages.toPythonApplication (python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
version = "2.12.5";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-HMyZRPEBMxra0e1A1axmqBSRMwUq402wJnp0qnO+67M=";
};
}));
ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;

@ -12,7 +12,8 @@ rec {
fontconfigSupport = stdenv.isLinux;
alsaSupport = stdenv.isLinux;
openglSupport = true;
vulkanSupport = true;
# Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK.
vulkanSupport = stdenv.isLinux;
tlsSupport = true;
cupsSupport = true;
dbusSupport = stdenv.isLinux;
@ -40,7 +41,8 @@ rec {
gphoto2Support = true;
krb5Support = true;
ldapSupport = true;
vkd3dSupport = true;
# Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK.
vkd3dSupport = stdenv.isLinux;
embedInstallers = true;
};

Loading…
Cancel
Save