Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f9e482e48979
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c6b5c12d02f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 11, 2019

  1. nexus: 3.15.0-01 -> 3.16.1-02 

    New upstream release with some minor improvements:
https://help.sonatype.com/repomanager3/release-notes/2019-release-notes#id-2019ReleaseNotes-RepositoryManager3.16.1
    @Ma27
    Ma27 committed May 11, 2019
    Copy the full SHA
    212e4e1 View commit details

Commits on May 14, 2019

  1. Merge pull request #61304 from Ma27/bump-nexus 

    nexus: 3.15.0-01 -> 3.16.1-02
    @c0bw3b
    c0bw3b authored May 14, 2019
    Copy the full SHA
    4c6b5c1 View commit details
Showing with 13 additions and 19 deletions.
  1. +2 −2 pkgs/development/tools/repository-managers/nexus/default.nix
  2. +11 −17 pkgs/development/tools/repository-managers/nexus/nexus-bin.patch
4 changes: 2 additions & 2 deletions pkgs/development/tools/repository-managers/nexus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "nexus-${version}";
version = "3.15.0-01";
version = "3.16.1-02";

src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
sha256 = "0akizdljcjl1nh25k01wxvp5wp4i2jphsj0hh5rqbd0fk1pjivkv";
sha256 = "0nfcpsb7byykiwrdz01c99a6hr5ww2d4471spzpgs9i64kbjj7ln";
};

sourceRoot = name;
28 changes: 11 additions & 17 deletions pkgs/development/tools/repository-managers/nexus/nexus-bin.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
--- nexus-3.5.1-02/bin/nexus 2017-08-18 17:51:08.000000000 +0200
+++ nexus 2017-08-31 12:41:01.271475645 +0200
@@ -72,7 +72,7 @@
diff --git a/bin/nexus b/bin/nexus
index d06cb44..37c606e 100755
--- a/bin/nexus
+++ b/bin/nexus
@@ -88,7 +88,7 @@ create_db_entry() {
fi
db_new_file=${db_file}_new
if [ -f "$db_file" ]; then
- awk '$1 != "'"$test_dir"'" {print $0}' $db_file > $db_new_file
+ awk '$1 != "'"$test_dir"'" {print $scriptname}' $db_file > $db_new_file
- awk '$2 != "'"$test_dir"'" {print $0}' $db_file > $db_new_file
+ awk '$2 != "'"$test_dir"'" {print $scriptname}' $db_file > $db_new_file
rm "$db_file"
mv "$db_new_file" "$db_file"
fi
@@ -236,7 +236,7 @@
@@ -246,7 +246,7 @@ read_vmoptions() {

unpack_file() {
if [ -f "$1" ]; then
@@ -18,32 +20,24 @@
bin/unpack200 -r "$1" "$jar_file"

if [ $? -ne 0 ]; then
@@ -360,8 +360,14 @@
@@ -377,9 +377,14 @@ fi

old_pwd=`pwd`

-progname=`basename "$0"`
-linkdir=`dirname "$0"`
+scriptname=$0
+
+if [ ! -z "$ALTERNATIVE_NAME" ]; then
+ scriptname=`dirname "$0"`"/"$ALTERNATIVE_NAME
+fi
+
+progname=`basename "$scriptname"`
+linkdir=`dirname "$scriptname"`

cd "$linkdir"
prg="$progname"
@@ -522,7 +528,6 @@

$INSTALL4J_JAVA_PREFIX nohup "$app_java_home/bin/java" -server -Dinstall4j.jvmDir="$app_java_home" -Dexe4j.moduleName="$prg_dir/$progname" "-XX:+UnlockDiagnosticVMOptions" "-Dinstall4j.launcherId=245" "-Dinstall4j.swt=false" "$vmov_1" "$vmov_2" "$vmov_3" "$vmov_4" "$vmov_5" $INSTALL4J_ADD_VM_PARAMS -classpath "$local_classpath" com.install4j.runtime.launcher.UnixLauncher start 9d17dc87 "" "" org.sonatype.nexus.karaf.NexusMain > /dev/null 2>&1 &

-
;;
start-launchd)
echo "Starting nexus"
@@ -569,7 +574,7 @@
@@ -590,7 +595,7 @@ return_code=$?

;;
*)