Merge master into staging-next

4 files changed, 107 insertions, 7 deletions

diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix
index 60dfb62567bf4..e91299ae97208 100644
--- a/pkgs/by-name/be/bevelbar/package.nix
+++ b/pkgs/by-name/be/bevelbar/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bevelbar";
-  version = "23.08";
+  version = "24.06";
 
   src = fetchurl {
     url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-4wMSPi9tu+z1AW2uvPefxkeT/5DYo2oJybhNnpe82QU=";
+    hash = "sha256-A7nrpMty4uxbiLzW83cmxlhQh8et1qo/n0mwBXNLJOc=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
new file mode 100644
index 0000000000000..8e0bb92906c8c
--- /dev/null
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -0,0 +1,99 @@
+{
+  stdenv,
+  lib,
+  nixosTests,
+  fetchFromGitHub,
+  nodejs,
+  pnpm,
+  python3,
+  nodePackages,
+  cacert,
+  xcbuild,
+  libkrb5,
+  libmongocrypt,
+  postgresql,
+  makeWrapper,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "n8n";
+  version = "1.46.0";
+
+  src = fetchFromGitHub {
+    owner = "n8n-io";
+    repo = "n8n";
+    rev = "n8n@${finalAttrs.version}";
+    hash = "sha256-9T/x2k7XIO+PV0olTQhb4WF1congTbXFvHqaxoaNbp4=";
+  };
+
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-oldvZC0B/r3fagI5hCn16wjQsD9n4q9foo73lJBJXeU=";
+  };
+
+  nativeBuildInputs = [
+    pnpm.configHook
+    python3 # required to build sqlite3 bindings
+    nodePackages.node-gyp # required to build sqlite3 bindings
+    cacert # required for rustls-native-certs (dependency of turbo build tool)
+    makeWrapper
+  ] ++ lib.optional stdenv.isDarwin [ xcbuild ];
+
+  buildInputs = [
+    nodejs
+    libkrb5
+    libmongocrypt
+    postgresql
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pushd node_modules/sqlite3
+    node-gyp rebuild
+    popd
+
+    pnpm build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{lib,bin}
+    cp -r {packages,node_modules} $out/lib
+
+    makeWrapper $out/lib/packages/cli/bin/n8n $out/bin/n8n \
+      --set N8N_RELEASE_TYPE "stable"
+
+    runHook postInstall
+  '';
+
+  # makes libmongocrypt bindings not look for static libraries in completely wrong places
+  BUILD_TYPE = "dynamic";
+
+  passthru = {
+    tests = nixosTests.n8n;
+  };
+
+  dontStrip = true;
+
+  meta = with lib; {
+    description = "Free and source-available fair-code licensed workflow automation tool";
+    longDescription = ''
+      Free and source-available fair-code licensed workflow automation tool.
+      Easily automate tasks across different services.
+    '';
+    homepage = "https://n8n.io";
+    changelog = "https://github.com/n8n-io/n8n/releases/tag/${finalAttrs.src.rev}";
+    maintainers = with maintainers; [
+      freezeboy
+      gepbird
+      k900
+    ];
+    license = licenses.sustainableUse;
+    mainProgram = "n8n";
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 2bfb8eb97c3ca..94de36bce94d6 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -31,13 +31,13 @@
 let
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.1.45";
+  version = "0.1.47";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     rev = "v${version}";
-    hash = "sha256-AKAuySyReG6kkwwgWodAso44+kri2Gz5VSLco8GBoIw=";
+    hash = "sha256-gxai2ORHABchnmdzjr9oYzk9p21qQjSIxrKt5k356i4=";
     fetchSubmodules = true;
   };
 
@@ -53,6 +53,7 @@ let
     (preparePatch "04-metal.diff" "sha256-Ne8J9R8NndUosSK0qoMvFfKNwqV5xhhce1nSoYrZo7Y=")
     (preparePatch "05-default-pretokenizer.diff" "sha256-JnCmFzAkmuI1AqATG3jbX7nGIam4hdDKqqbG5oh7h70=")
     (preparePatch "06-qwen2.diff" "sha256-nMtoAQUsjYuJv45uTlz8r/K1oF5NUsc75SnhgfSkE30=")
+    (preparePatch "07-gemma.diff" "sha256-dKJrRvg/XC6xtwxLHZ7lFkLNMwT8Ugmd5xRPuKQDXvU=")
   ];
 
   preparePatch = patch: hash: fetchpatch {
diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index d1218c05c9c10..8709e0b4de992 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2024-06-16";
+  version = "0-unstable-2024-06-27";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "747292e95402298553dec3b2dd923a6c62ad2077";
-    hash = "sha256-SWNo6qJNR4XGZc79JQXsab0vppDf1D5GXH/iMmdi5WQ=";
+    rev = "86b2f74a24fdf2957f6aad28fb999fa6a2e43e82";
+    hash = "sha256-ns6j8ChJpV4ryxajGmdbRlJj3eL8qRIYzrD4VPfTYDY=";
   };
 
   dontConfigure = true;