gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

depdendeny-track: 4.13.6 -> 4.14.1

Browse Source
This commit is contained in:
Alexander Sieg
2026-03-17 09:49:04 +01:00
parent 1021c517a4
commit 0f5df67d6c
3 changed files with 48 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/de/dependency-track/0000-remove-frontend-download.patch
-44
View File
@@ -1,44 +0,0 @@
diff --git a/pom.xml b/pom.xml
index 9988e765..906917c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -660,38 +660,13 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
- <execution>
- <id>frontend-download</id>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <get src="https://github.com/DependencyTrack/frontend/releases/download/${frontend.version}/frontend-dist.zip" dest="${project.build.directory}" verbose="true"/>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>frontend-extract</id>
- <phase>prepare-package</phase>
- <configuration>
- <target>
- <unzip src="${project.build.directory}/frontend-dist.zip" dest="${project.build.directory}/frontend">
- </unzip>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
<execution>
<id>frontend-resource-deploy</id>
<phase>prepare-package</phase>
<configuration>
<target>
<copy todir="${project.build.directory}/${project.artifactId}">
- <fileset dir="${project.build.directory}/frontend/dist">
+ <fileset dir="${project.basedir}/frontend/dist">
<include name="**/*"/>
</fileset>
</copy>
pkgs/by-name/de/dependency-track/0001-add-junixsocket.patch
-17
View File
@@ -1,17 +0,0 @@
diff --git a/pom.xml b/pom.xml
index 9988e765..f69576b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -457,6 +457,12 @@
<version>${lib.testcontainers.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.kohlschutter.junixsocket</groupId>
+ <artifactId>junixsocket-core</artifactId>
+ <version>2.10.0</version>
+ <type>pom</type>
+ </dependency>
</dependencies>
<build>
pkgs/by-name/de/dependency-track/package.nix
+48 -15
View File
@@ -5,6 +5,7 @@
nodejs_20,
jre_headless,
protobuf_30,
xmlstarlet,
cyclonedx-cli,
makeWrapper,
maven,
@@ -12,7 +13,7 @@
nixosTests,
}:
let
version = "4.13.6";
version = "4.14.1";
frontend = buildNpmPackage {
pname = "dependency-track-frontend";
@@ -25,7 +26,7 @@ let
owner = "DependencyTrack";
repo = "frontend";
rev = version;
hash = "sha256-SSnbmAFXQwxAZQzMZeDzf/ebbWUVRICAs1msFXMMi98=";
hash = "sha256-xjIRkffmXYMAfZ8wJehnPRfTThJjTgNL8ONl9N9ZJ+M=";
};
installPhase = ''
@@ -33,7 +34,7 @@ let
cp -R ./dist $out/
'';
npmDepsHash = "sha256-2VK3LOqUxOJaR8cUuINhrhMkvHGyUr206RJR18NCvUo=";
npmDepsHash = "sha256-CW9LOur8N3obrOeHgYFH2OO/vg8XihUspuXS5Zrix8I=";
forceGitDeps = true;
makeCacheWritable = true;
@@ -50,23 +51,51 @@ maven.buildMavenPackage rec {
owner = "DependencyTrack";
repo = "dependency-track";
rev = version;
hash = "sha256-EL0Yd8pfTG8/DlY9A3F0lRuPl/wU2/LyACclzttrsjw=";
hash = "sha256-pIZM8FQ0IFqRbTQT5VIlCmS+fCCXULJJ6bdEv6xfjbc=";
};
patches = [
./0000-remove-frontend-download.patch
./0001-add-junixsocket.patch
];
postPatch = ''
substituteInPlace pom.xml \
--replace-fail '<protocArtifact>''${tool.protoc.version}</protocArtifact>' \
"<protocCommand>${protobuf_30}/bin/protoc</protocCommand>"
# update to version 5.1.3 to fix NullPointer and specify protoc path
xmlstarlet ed --inplace -N x=http://maven.apache.org/POM/4.0.0 \
--update '//x:plugin[x:artifactId="protobuf-maven-plugin"]/x:version' -v "5.1.3" \
--delete '//x:plugin[x:artifactId="protobuf-maven-plugin"]/x:configuration/x:protoc' \
--subnode '//x:plugin[x:artifactId="protobuf-maven-plugin"]/x:configuration' -t elem -n protoc -v "" \
--var protoc '$prev' \
--insert '$protoc' -t attr -n kind -v "path" \
--subnode '$protoc' -t elem -n name -v "protoc" \
pom.xml
# remove frontend related tasks
xmlstarlet ed --inplace -N x=http://maven.apache.org/POM/4.0.0 \
--delete '//x:execution[x:id="frontend-download"]' \
--delete '//x:execution[x:id="frontend-extract"]' \
--delete '//x:execution[x:id="frontend-resource-deploy"]' \
pom.xml
# add junixsocket to enable unixsocket connection to postgres
xmlstarlet ed --inplace -N x=http://maven.apache.org/POM/4.0.0 \
--subnode '/x:project/x:dependencies' -t elem -n dependency -v "" \
--var dependency '$prev' \
--subnode '$dependency' -t elem -n groupId -v "com.kohlschutter.junixsocket" \
--subnode '$dependency' -t elem -n artifactId -v "junixsocket-core" \
--subnode '$dependency' -t elem -n version -v "2.10.0" \
--subnode '$dependency' -t elem -n type -v "pom" \
pom.xml
'';
mvnJdk = jre_headless;
mvnHash = "sha256-UrLni4shNCv9aHvaGdkzFNBVe8BT4/z4cQ6Ekjr0l9s=";
manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ];
mvnHash = "sha256-4N4KuJBF/RFZwpp3dIgXntxSEfKHyfvrShKQoUqY5bE=";
manualMvnArtifacts = [
"com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1"
# added to saticfy protobuf compiler plugin dependency resolving
"jakarta.el:jakarta.el-api:5.0.1"
"com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.19.1"
"com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.0"
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.3"
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.0"
"io.micrometer:micrometer-core:1.16.0"
"io.micrometer:micrometer-observation:1.16.0"
];
buildOffline = true;
mvnDepsParameters = lib.escapeShellArgs [
@@ -91,7 +120,11 @@ maven.buildMavenPackage rec {
doCheck = false;
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [
makeWrapper
xmlstarlet
protobuf_30
];
installPhase = ''
runHook preInstall