diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-06-08 22:22:26 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-06-08 22:22:26 +0200 |
| commit | 6451e9d4a54ec941ac1722a2b335898118a5b347 (patch) | |
| tree | e9ad5860b4ab19946d2a133a30c072f226b46937 /pkgs/applications/science | |
| parent | 351556ffacfaf628fec725f36e2430816b0357f0 (diff) | |
| parent | 53ca59a8a34423c0c742226b37e51ee78ab75ef9 (diff) | |
| download | nixpkgs-6451e9d4a54ec941ac1722a2b335898118a5b347.tar nixpkgs-6451e9d4a54ec941ac1722a2b335898118a5b347.tar.gz nixpkgs-6451e9d4a54ec941ac1722a2b335898118a5b347.tar.bz2 nixpkgs-6451e9d4a54ec941ac1722a2b335898118a5b347.tar.lz nixpkgs-6451e9d4a54ec941ac1722a2b335898118a5b347.tar.xz nixpkgs-6451e9d4a54ec941ac1722a2b335898118a5b347.tar.zst nixpkgs-6451e9d4a54ec941ac1722a2b335898118a5b347.zip | |
Merge remote-tracking branch 'origin/staging-next' into staging
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/astronomy/gpredict/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 3f82ff7b52a..1fd2d4ac2ad 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -14,6 +14,16 @@ in stdenv.mkDerivation { sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/csete/gpredict/issues/195 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; + sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; + }) + ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index c85bcd21a0c..f91b336cbf6 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -49,6 +49,7 @@ let "8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx"; "8.15.1".sha256 = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6"; "8.15.2".sha256 = "sha256:0gn8dz69scxnxaq6ycb3x34bjfk9wlp1y2xn8w69kg9fm4b6gkc7"; + "8.16+rc1".sha256 = "sha256-dU+E0Mz7MVntbQIeG9I59ANBaHaXXSrjCRdoqZ5TO60="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix |