From a9c0317c521da35b5f7c120fcfc7585469277b90 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Tue, 2 Jul 2024 17:59:04 +0200 Subject: [PATCH 1/2] =?UTF-8?q?nexus:=203.68.1-02=20=E2=86=92=203.69.0-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository-managers/nexus/default.nix | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 5f8a751aa0c7..00e4e7325e04 100644 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ b/pkgs/development/tools/repository-managers/nexus/default.nix @@ -1,12 +1,19 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gawk }: +{ + lib, + stdenv, + fetchurl, + makeWrapper, + jre_headless, + gawk, +}: stdenv.mkDerivation rec { pname = "nexus"; - version = "3.68.1-02"; + version = "3.69.0-02"; src = fetchurl { url = "https://download.sonatype.com/nexus/3/nexus-${version}-unix.tar.gz"; - hash = "sha256-VHS4KDFgU3djteDzDAe43TZIwRG/8bb7u3usoOCJS5M="; + hash = "sha256-7sgLPuM93mFEPlTd3qJY+FGVHErvgcTGJWwSBcqBgWI="; }; preferLocalBuild = true; @@ -15,13 +22,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - patches = [ ./nexus-bin.patch ./nexus-vm-opts.patch ]; + patches = [ + ./nexus-bin.patch + ./nexus-vm-opts.patch + ]; postPatch = '' substituteInPlace bin/nexus.vmoptions \ - --replace ../sonatype-work /var/lib/sonatype-work \ - --replace etc/karaf $out/etc/karaf \ - --replace =. =$out + --replace-fail ../sonatype-work /var/lib/sonatype-work \ + --replace-fail etc/karaf $out/etc/karaf \ + --replace-fail =. =$out ''; installPhase = '' @@ -39,12 +49,17 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "Repository manager for binary software components"; homepage = "https://www.sonatype.com/products/sonatype-nexus-oss"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; - platforms = platforms.all; - maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.epl10; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ + aespinosa + ironpinguin + luftmensch-luftmensch + zaninime + ]; }; } From ffc8d31212d6a93d09df668fe46b8286aaa20835 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Tue, 2 Jul 2024 17:59:38 +0200 Subject: [PATCH 2/2] nexus: move to pkgs/by-name --- .../repository-managers => by-name/ne}/nexus/nexus-bin.patch | 0 .../ne}/nexus/nexus-vm-opts.patch | 0 .../nexus/default.nix => by-name/ne/nexus/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 4 deletions(-) rename pkgs/{development/tools/repository-managers => by-name/ne}/nexus/nexus-bin.patch (100%) rename pkgs/{development/tools/repository-managers => by-name/ne}/nexus/nexus-vm-opts.patch (100%) rename pkgs/{development/tools/repository-managers/nexus/default.nix => by-name/ne/nexus/package.nix} (100%) diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch b/pkgs/by-name/ne/nexus/nexus-bin.patch similarity index 100% rename from pkgs/development/tools/repository-managers/nexus/nexus-bin.patch rename to pkgs/by-name/ne/nexus/nexus-bin.patch diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch b/pkgs/by-name/ne/nexus/nexus-vm-opts.patch similarity index 100% rename from pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch rename to pkgs/by-name/ne/nexus/nexus-vm-opts.patch diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/by-name/ne/nexus/package.nix similarity index 100% rename from pkgs/development/tools/repository-managers/nexus/default.nix rename to pkgs/by-name/ne/nexus/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bd9658c7540..771b65633732 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19016,10 +19016,6 @@ with pkgs; nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { - jre_headless = jre8_headless; - }; - nexusmods-app-unfree = callPackage ../by-name/ne/nexusmods-app/package.nix { enableUnfree = true; };