diff options
author | Guillaume Maudoux <layus.on@gmail.com> | 2023-12-20 23:29:29 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-20 23:29:29 +0100 |
commit | 26241b64586cf10f5c0cb2bd39a74e977fd7303d (patch) | |
tree | cf19fed1c72afd6d57f0487262805bf6eb3d40d9 /pkgs/applications/science/logic/dafny/default.nix | |
parent | b21d62223e01fa300390b7fe5531bc664b34fc99 (diff) | |
parent | 9e1d149f0582ac8d5ac96f6c44e9cf5db3e4c422 (diff) | |
download | nixlib-26241b64586cf10f5c0cb2bd39a74e977fd7303d.tar nixlib-26241b64586cf10f5c0cb2bd39a74e977fd7303d.tar.gz nixlib-26241b64586cf10f5c0cb2bd39a74e977fd7303d.tar.bz2 nixlib-26241b64586cf10f5c0cb2bd39a74e977fd7303d.tar.lz nixlib-26241b64586cf10f5c0cb2bd39a74e977fd7303d.tar.xz nixlib-26241b64586cf10f5c0cb2bd39a74e977fd7303d.tar.zst nixlib-26241b64586cf10f5c0cb2bd39a74e977fd7303d.zip |
Merge pull request #274496 from whonore/update-dafny-4.4.0
dafny: 4.3.0 -> 4.4.0
Diffstat (limited to 'pkgs/applications/science/logic/dafny/default.nix')
-rw-r--r-- | pkgs/applications/science/logic/dafny/default.nix | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index 7da1958af386..5f56d612ab24 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,36 +8,32 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-bnKaaqh1/921SRwnwqgYb31SJ8vguEBtzywPTz79S6I="; + hash = "sha256-rnPZms60vRtefEV+3IeVXoZJU9WMjVxPVioRaEcyw/o="; }; - postPatch = - # This version number seems to be hardcoded and didn't get updated with the - # version bump from 4.2.0 to 4.3.0. - let dafnyRuntimeJarVersion = "4.2.0"; - in '' - cp ${ - writeScript "fake-gradlew-for-dafny" '' - mkdir -p build/libs/ - javac $(find -name "*.java" | grep "^./src/main") -d classes - jar cf build/libs/DafnyRuntime-${dafnyRuntimeJarVersion}.jar -C classes dafny - ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew + postPatch = '' + cp ${ + writeScript "fake-gradlew-for-dafny" '' + mkdir -p build/libs/ + javac $(find -name "*.java" | grep "^./src/main") -d classes + jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny + ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew - # Needed to fix - # "error NETSDK1129: The 'Publish' target is not supported without - # specifying a target framework. The current project targets multiple - # frameworks, you must specify the framework for the published - # application." - substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ - --replace TargetFrameworks TargetFramework \ - --replace "netstandard2.0;net452" net6.0 - ''; + # Needed to fix + # "error NETSDK1129: The 'Publish' target is not supported without + # specifying a target framework. The current project targets multiple + # frameworks, you must specify the framework for the published + # application." + substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ + --replace TargetFrameworks TargetFramework \ + --replace "netstandard2.0;net452" net6.0 + ''; buildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; |