diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
| commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
| tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/by-name/ce/certificate-ripper | |
| parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
| parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
| download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/by-name/ce/certificate-ripper')
| -rw-r--r-- | nixpkgs/pkgs/by-name/ce/certificate-ripper/package.nix | 13 | ||||
| -rw-r--r-- | nixpkgs/pkgs/by-name/ce/certificate-ripper/pin-default-maven-plguin-versions.patch (renamed from nixpkgs/pkgs/by-name/ce/certificate-ripper/make-deterministic.patch) | 10 |
2 files changed, 10 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/by-name/ce/certificate-ripper/package.nix b/nixpkgs/pkgs/by-name/ce/certificate-ripper/package.nix index 0b03b395789f..439d8079d764 100644 --- a/nixpkgs/pkgs/by-name/ce/certificate-ripper/package.nix +++ b/nixpkgs/pkgs/by-name/ce/certificate-ripper/package.nix @@ -6,7 +6,7 @@ let pname = "certificate-ripper"; - version = "2.2.0"; + version = "2.3.0"; jar = maven.buildMavenPackage { pname = "${pname}-jar"; @@ -16,15 +16,20 @@ let owner = "Hakky54"; repo = "certificate-ripper"; rev = version; - hash = "sha256-snavZVLY8sHinLnG6k61eSQlR9sb8+k5tRHqu4kzQKM="; + hash = "sha256-q/UhKLFAre3YUH2W7e+SH4kRM0GIZAUyNJFDm02eL+8="; }; patches = [ - ./make-deterministic.patch + ./pin-default-maven-plguin-versions.patch ./fix-test-temp-dir-path.patch ]; - mvnHash = "sha256-ahw9VVlvBPlWChcJzXFna55kxqVeJMmdaLtwWcJ+qSA="; + mvnHash = "sha256-/iy7DXBAyq8TIpvrd2WAQh+9OApfxCWo1NoGwbzbq7s="; + + mvnParameters = lib.escapeShellArgs [ + "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z" # make timestamp deterministic + "-Dtest=!PemExportCommandShould#resolveRootCaOnlyWhenEnabled" # disable test using network + ]; installPhase = '' install -Dm644 target/crip.jar $out diff --git a/nixpkgs/pkgs/by-name/ce/certificate-ripper/make-deterministic.patch b/nixpkgs/pkgs/by-name/ce/certificate-ripper/pin-default-maven-plguin-versions.patch index b9e7aa1d0a1e..bce8fab057a7 100644 --- a/nixpkgs/pkgs/by-name/ce/certificate-ripper/make-deterministic.patch +++ b/nixpkgs/pkgs/by-name/ce/certificate-ripper/pin-default-maven-plguin-versions.patch @@ -2,15 +2,7 @@ diff --git a/pom.xml b/pom.xml index dd0075d..46ac184 100644 --- a/pom.xml +++ b/pom.xml -@@ -46,6 +46,7 @@ - <version.license-maven-plugin>4.2.rc3</version.license-maven-plugin> - <license.git.copyrightYears>2021</license.git.copyrightYears> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> -+ <project.build.outputTimestamp>1980-01-01T00:00:02Z</project.build.outputTimestamp> - </properties> - - <scm> -@@ -103,6 +104,55 @@ +@@ -103,6 +103,55 @@ <build> <plugins> |