about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/clickhouse/default.nix45
-rw-r--r--pkgs/servers/exhibitor/default.nix51
-rw-r--r--pkgs/servers/home-automation/evcc/default.nix17
-rw-r--r--pkgs/servers/jackett/default.nix4
-rw-r--r--pkgs/servers/keycloak/scim-for-keycloak/default.nix4
-rw-r--r--pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix4
-rw-r--r--pkgs/servers/mail/public-inbox/default.nix1
-rw-r--r--pkgs/servers/matrix-synapse/default.nix6
-rw-r--r--pkgs/servers/nosql/dragonflydb/default.nix11
-rw-r--r--pkgs/servers/redpanda/server.nix4
10 files changed, 70 insertions, 77 deletions
diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix
index 92955d9d8e91b..12d2b3228304e 100644
--- a/pkgs/servers/clickhouse/default.nix
+++ b/pkgs/servers/clickhouse/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, llvmPackages
 , fetchFromGitHub
 , cmake
 , ninja
@@ -7,6 +7,8 @@
 , perl
 , yasm
 , nixosTests
+, darwin
+, findutils
 
 # currently for BLAKE3 hash function
 , rustSupport ? true
@@ -17,7 +19,13 @@
 , rustPlatform
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (llvmPackages) stdenv;
+  mkDerivation = (
+    if stdenv.isDarwin
+    then darwin.apple_sdk_11_0.llvmPackages_15.stdenv
+    else llvmPackages.stdenv).mkDerivation;
+in mkDerivation rec {
   pname = "clickhouse";
   version = "23.3.3.52";
 
@@ -26,20 +34,16 @@ stdenv.mkDerivation rec {
     repo = "ClickHouse";
     rev = "v${version}-lts";
     fetchSubmodules = true;
-    hash = "sha256-yeoL3HA1wRDg2+t3FtrM4wBtuu94Lpe4xxGxc09duQI=";
-    name = "clickhouse-${rev}.tar.gz";
+    hash = "sha256-fVwwMj0WbyCbe4WfpYMGVM6vXFgHsjg9MUZbNyd+a/w=";
     postFetch = ''
-      # compress to not exceed the 4GB output limit
-      # try to make a deterministic tarball
-      tar -I 'gzip -n' \
-        --sort=name \
-        --mtime=1970-01-01 \
-        --owner=root --group=root \
-        --numeric-owner --mode=go=rX,u+rw,a-s \
-        --transform='s@^@source/@S' \
-        -cf temp  -C "$out" .
-      rm -r "$out"
-      mv temp "$out"
+      # delete files that make the source too big
+      rm -rf $out/contrib/llvm-project/llvm/test
+      rm -rf $out/contrib/llvm-project/clang/test
+      rm -rf $out/contrib/croaring/benchmarks
+
+      # fix case insensitivity on macos https://github.com/NixOS/nixpkgs/issues/39308
+      rm -rf $out/contrib/sysroot/linux-*
+      rm -rf $out/contrib/liburing/man
     '';
   };
 
@@ -51,6 +55,10 @@ stdenv.mkDerivation rec {
     perl
   ] ++ lib.optionals stdenv.isx86_64 [
     yasm
+  ] ++ lib.optionals stdenv.isDarwin [
+    llvmPackages.bintools
+    findutils
+    darwin.bootstrap_cmds
   ] ++ lib.optionals rustSupport [
     rustc
     cargo
@@ -110,6 +118,9 @@ stdenv.mkDerivation rec {
       --replace 'git rev-parse --show-toplevel' '$src'
     substituteInPlace utils/check-style/check-style \
       --replace 'git rev-parse --show-toplevel' '$src'
+  '' + lib.optionalString stdenv.isDarwin ''
+    sed -i 's|gfind|find|' cmake/tools.cmake
+    sed -i 's|ggrep|grep|' cmake/tools.cmake
   '' + lib.optionalString rustSupport ''
 
     pushd contrib/corrosion/generator
@@ -129,7 +140,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DENABLE_TESTS=OFF"
-    "-DENABLE_CCACHE=0"
+    "-DCOMPILER_CACHE=disabled"
     "-DENABLE_EMBEDDED_COMPILER=ON"
     "-DWERROR=OFF"
   ];
@@ -157,7 +168,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ orivej ];
 
     # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
-    platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) platforms.linux;
+    platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (platforms.linux ++ platforms.darwin);
     broken = stdenv.buildPlatform != stdenv.hostPlatform;
   };
 }
diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix
index fa5c4a948ce4e..ead65a9b2055a 100644
--- a/pkgs/servers/exhibitor/default.nix
+++ b/pkgs/servers/exhibitor/default.nix
@@ -1,41 +1,36 @@
-{ fetchFromGitHub, maven, jdk, makeWrapper, lib, stdenv, ... }:
-stdenv.mkDerivation rec {
+{ lib, fetchFromGitHub, maven, makeWrapper, jdk }:
+
+maven.buildMavenPackage rec {
   pname = "exhibitor";
   version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "soabase";
     repo = "exhibitor";
-    sha256 = "07vikhkldxy51jbpy3jgva6wz75jksch6bjd6dqkagfgqd6baw45";
-    rev = "5fcdb411d06e8638c2380f7acb72a8a6909739cd";
-  };
-  mavenDependenciesSha256 = "00r69n9hwvrn5cbhxklx7w00sjmqvcxs7gvhbm150ggy7bc865qv";
-  # This is adapted from https://github.com/volth/nixpkgs/blob/6aa470dfd57cae46758b62010a93c5ff115215d7/pkgs/applications/networking/cluster/hadoop/default.nix#L20-L32
-  fetchedMavenDeps = stdenv.mkDerivation {
-    name = "exhibitor-${version}-maven-deps";
-    inherit src nativeBuildInputs;
-    buildPhase = ''
-      cd ${pomFileDir};
-      while timeout --kill-after=21m 20m mvn package -Dmaven.repo.local=$out/.m2; [ $? = 124 ]; do
-        echo "maven hangs while downloading :("
-      done
-    '';
-    installPhase = ''find $out/.m2 -type f \! -regex '.+\(pom\|jar\|xml\|sha1\)' -delete''; # delete files with lastModified timestamps inside
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = mavenDependenciesSha256;
+    rev = "v${version}";
+    hash = "sha256-PZRT2C4CfYCbaHE9tEnwpyzEsJ6ZaS//zUDweR4YKrI=";
   };
 
   # The purpose of this is to fetch the jar file out of public Maven and use Maven
   # to build a monolithic, standalone jar, rather than build everything from source
   # (given the state of Maven support in Nix). We're not actually building any java
   # source here.
-  pomFileDir = "exhibitor-standalone/src/main/resources/buildscripts/standalone/maven";
+  sourceRoot = "source/exhibitor-standalone/src/main/resources/buildscripts/standalone/maven";
+  mvnFetchExtraArgs = {
+    inherit sourceRoot;
+  };
+  mvnHash = "sha256-xhLnjtaF5eFUuBo5aHdp0j2sPfxYhFEZYJwVQlkqARs=";
+
   nativeBuildInputs = [ maven makeWrapper ];
-  buildPhase = ''
-      cd ${pomFileDir}
-      mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/java
+    filename=$(basename target/*.jar)
+    mv target/$filename $out/share/java/
+    makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$filename" --suffix PATH : ${lib.makeBinPath [ jdk ]}
   '';
+
   meta = with lib; {
     description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization";
     homepage = "https://github.com/soabase/exhibitor";
@@ -44,12 +39,4 @@ stdenv.mkDerivation rec {
     mainProgram = "startExhibitor.sh";
     platforms = platforms.unix;
   };
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/java
-    mv target/$name.jar $out/share/java/
-    makeWrapper ${jdk}/bin/java $out/bin/startExhibitor.sh --add-flags "-jar $out/share/java/$name.jar" --suffix PATH : ${lib.makeBinPath [ jdk ]}
-  '';
-
 }
diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 9b94f895d8e75..77e9d73d078c9 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -2,7 +2,6 @@
 , buildGoModule
 , fetchFromGitHub
 , fetchNpmDeps
-, fetchpatch
 , cacert
 , go
 , git
@@ -17,28 +16,20 @@
 
 buildGoModule rec {
   pname = "evcc";
-  version = "0.118.0";
+  version = "0.118.1";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = pname;
     rev = version;
-    hash = "sha256-LQtFmN4IyDj/SRTik+ML3h1/tMwnTQ13dQHnghcDuUo=";
+    hash = "sha256-EAvY+JNk1V4oWW5mbbEIRjaUqTOib6zY8hab0Mw2hUk=";
   };
 
-  patches = [
-    (fetchpatch {
-      # fix ISO15118 vehicle setup
-      url = "https://github.com/evcc-io/evcc/commit/cc22337b422e4ee541a2c75740c039f2d029bd9b.patch";
-      hash = "sha256-Q+5Klpdv1cWVg716lbKl1JLwkr4LiLPRUoZHemFUQZc=";
-    })
-  ];
-
-  vendorHash = "sha256-1YTVFn/DngzSQwYxGHCAaJl4ZnVj4au32YcpNo1m4w8=";
+  vendorHash = "sha256-CkJpTXbjHRXcZp+FWGal91kkFkIMoKZ6/zmY+8Udmos=";
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-QRjOmanO+phyqgZb/cAyU0dFKI6T6o84MuObANZoYNE=";
+    hash = "sha256-w2xMG0vHx4g9AAvNWRwR3u9w6PrHtQV7TETnDRkmkBk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 5c6aa964ad6a6..d5271cadd24a1 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule rec {
   pname = "jackett";
-  version = "0.21.241";
+  version = "0.21.258";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha512-3FFcc6t+6aljVa0sDb+F6cM8FeGsv+rQ70Rgyf1kZaBCqIFoAK23bVB7TYnTR+yBLAhV6v6CDZaZ/rqrh6blqg==";
+    hash = "sha512-Y+vYh6T1NvOGGyZwzFY+h24CWhRtKGQSxTTqWL3xMQC6YB74W1I7hnQPz+X4Gae9/5ozShOzBzpcsMOvUQWl5Q==";
   };
 
   projectFile = "src/Jackett.Server/Jackett.Server.csproj";
diff --git a/pkgs/servers/keycloak/scim-for-keycloak/default.nix b/pkgs/servers/keycloak/scim-for-keycloak/default.nix
index e2dca3f632e1d..f694c3f32e583 100644
--- a/pkgs/servers/keycloak/scim-for-keycloak/default.nix
+++ b/pkgs/servers/keycloak/scim-for-keycloak/default.nix
@@ -1,11 +1,9 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , maven
-, javaPackages
 }:
 
-javaPackages.mavenfod rec {
+maven.buildMavenPackage rec {
   pname = "scim-for-keycloak";
   version = "kc-15-b2"; # When updating also update mvnHash
 
diff --git a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
index 8f0ecd740488a..74b2d2efa8e05 100644
--- a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
+++ b/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix
@@ -1,11 +1,9 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , maven
-, javaPackages
 }:
 
-javaPackages.mavenfod rec {
+maven.buildMavenPackage {
   pname = "scim-keycloak-user-storage-spi";
   version = "unstable-2023-04-12";
 
diff --git a/pkgs/servers/mail/public-inbox/default.nix b/pkgs/servers/mail/public-inbox/default.nix
index 02ab293c1af17..302473b975a91 100644
--- a/pkgs/servers/mail/public-inbox/default.nix
+++ b/pkgs/servers/mail/public-inbox/default.nix
@@ -153,6 +153,7 @@ buildPerlPackage rec {
             --set NIX_CFLAGS_COMPILE_${stdenv.cc.suffixSalt} -I${lib.getDev libxcrypt}/include \
             --prefix PATH : ${lib.makeBinPath [
               git
+              xapian
               /* for InlineC */
               gnumake
               stdenv.cc
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 5f48ee51e79c7..78458382c7e46 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -12,20 +12,20 @@ in
 with python3.pkgs;
 buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.85.2";
+  version = "1.86.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-pFafBsisBPfpDnFYWcimUuBgfFVPZzLna3yHeqIBAAE=";
+    hash = "sha256-vSNAISWTTT3IAeA8hxQhQNp9T3soey4vgh7v+BxI+K0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-dnno+5Ma0YNYpmj3oZ5UG22uAanKwVT67BwQW+mHoFc=";
+    hash = "sha256-lPLhh5FkxpBUQ5UH6eAfUIyGvHIcZHmbYBT5QUW/W4k=";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/nosql/dragonflydb/default.nix b/pkgs/servers/nosql/dragonflydb/default.nix
index db00061348018..e73f00164fe9c 100644
--- a/pkgs/servers/nosql/dragonflydb/default.nix
+++ b/pkgs/servers/nosql/dragonflydb/default.nix
@@ -8,7 +8,6 @@
 , rapidjson
 , liburing
 , xxHash
-, abseil-cpp_202111
 , gbenchmark
 , glog
 , gtest
@@ -42,6 +41,14 @@ let
     url = "https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz";
     hash = "sha256-L/ibvqIqfIuRDWsAb1ukVZ7c9GiiVTfO35mI7ZD2tFA=";
   };
+
+  # Needed exactly 20211102.0 for patch to work
+  abseil-cpp_202111 = fetchFromGitHub {
+    owner = "abseil";
+    repo = "abseil-cpp";
+    rev = "20211102.0";
+    sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk=";
+  };
 in
 stdenv.mkDerivation {
   inherit pname version src;
@@ -56,7 +63,7 @@ stdenv.mkDerivation {
     cp -R --no-preserve=mode,ownership ${gperftools.src} ./build/third_party/gperf
     cp -R --no-preserve=mode,ownership ${liburing.src} ./build/third_party/uring
     cp -R --no-preserve=mode,ownership ${xxHash.src} ./build/third_party/xxhash
-    cp -R --no-preserve=mode,ownership ${abseil-cpp_202111.src} ./build/_deps/abseil_cpp-src
+    cp -R --no-preserve=mode,ownership ${abseil-cpp_202111} ./build/_deps/abseil_cpp-src
     cp -R --no-preserve=mode,ownership ${glog.src} ./build/_deps/glog-src
     chmod u+x ./build/third_party/uring/configure
     cp ./build/third_party/xxhash/cli/xxhsum.{1,c} ./build/third_party/xxhash
diff --git a/pkgs/servers/redpanda/server.nix b/pkgs/servers/redpanda/server.nix
index 9cb050eb5f45a..fa86b5437c867 100644
--- a/pkgs/servers/redpanda/server.nix
+++ b/pkgs/servers/redpanda/server.nix
@@ -1,4 +1,4 @@
-{ abseil-cpp
+{ abseil-cpp_202206
 , avro-cpp
 , callPackage
 , ccache
@@ -91,7 +91,7 @@ llvmPackages_14.stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    abseil-cpp
+    abseil-cpp_202206
     avro-cpp
     base64
     crc32c
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-31 11:44:26 +0000