From 30b5330e85883acdcb0502349ce67878529f58ce Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 9 May 2021 11:39:58 +0200 Subject: eukleides: Fix build, expose tex package --- .../science/math/eukleides/default.nix | 50 +++++++++++++++++----- 1 file changed, 39 insertions(+), 11 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 5f7fe58465d00..94a90127ed8ba 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -1,21 +1,49 @@ -{ lib, stdenv, fetchurl, bison, flex, texinfo, readline, texLive }: +{ lib, stdenv, fetchurl, bison, flex, makeWrapper, texinfo, readline, texLive }: -let - name = "eukleides"; +lib.fix (eukleides: stdenv.mkDerivation rec { + pname = "eukleides"; version = "1.5.4"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "http://www.eukleides.org/files/${name}-${version}.tar.bz2"; + url = "http://www.eukleides.org/files/${pname}-${version}.tar.bz2"; sha256 = "0s8cyh75hdj89v6kpm3z24i48yzpkr8qf0cwxbs9ijxj1i38ki0q"; }; - buildInputs = [bison flex texinfo readline texLive]; + nativeBuildInputs = [ bison flex texinfo makeWrapper ]; - preConfigure = "sed -i 's/ginstall-info/install-info/g' doc/Makefile"; - installPhase = "mkdir -p $out/bin ; make PREFIX=$out install"; + buildInputs = [ readline texLive ]; + + preConfigure = '' + substituteInPlace Makefile \ + --replace mktexlsr true + + substituteInPlace doc/Makefile \ + --replace ginstall-info install-info + + substituteInPlace Config \ + --replace '/usr/local' "$out" \ + --replace '$(SHARE_DIR)/texmf' "$tex" + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + postInstall = '' + wrapProgram $out/bin/euktoeps \ + --set-default TEXINPUTS : \ + --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ + --prefix PATH : "${texLive}/bin" + wrapProgram $out/bin/euktopdf \ + --set-default TEXINPUTS : \ + --prefix TEXINPUTS : "$tex/tex/latex/eukleides" \ + --prefix PATH : "${texLive}/bin" + ''; + + outputs = [ "out" "doc" "tex" ]; + + passthru.tlType = "run"; + passthru.pkgs = [ eukleides.tex ]; meta = { description = "Geometry Drawing Language"; @@ -34,4 +62,4 @@ stdenv.mkDerivation { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.peti ]; }; -} +}) -- cgit 1.4.1 From 06e7dc2f436dadcaefe946d43f3810b67f34fef7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 9 May 2021 13:39:46 +0200 Subject: eukleides: Update license See license section in the README. --- pkgs/applications/science/math/eukleides/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 94a90127ed8ba..fe498fdbd8a1b 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -48,7 +48,7 @@ lib.fix (eukleides: stdenv.mkDerivation rec { meta = { description = "Geometry Drawing Language"; homepage = "http://www.eukleides.org/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl3Plus; longDescription = '' Eukleides is a computer language devoted to elementary plane -- cgit 1.4.1 From 2558acf87072f09181dfff7bf0ce47828e2490ec Mon Sep 17 00:00:00 2001 From: sophrosyne97 Date: Sat, 15 May 2021 18:04:01 -0400 Subject: pulseview: fix build error --- pkgs/applications/science/electronics/pulseview/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 00c830fcd3370..3266b3802a4a2 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok +{ mkDerivation, lib, fetchurl, fetchpatch, pkg-config, cmake, glib, boost, libsigrok , libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm , pcre, librevisa, python3, qtbase, qtsvg }: @@ -20,6 +20,15 @@ mkDerivation rec { qtbase qtsvg ]; + patches = [ + # Allow building with glib 2.68 + # PR at https://github.com/sigrokproject/pulseview/pull/39 + (fetchpatch { + url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch"; + sha256 = "153lrvbj0qf8qxx3l01v3ln8g5qjmlapwp8h1k1iir3xx3lyy37k"; + }) + ]; + meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; homepage = "https://sigrok.org/"; -- cgit 1.4.1 From 9528bf9fd93b97d49c69098e773779f7ab1b70c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 01:23:50 +0000 Subject: bowtie2: 2.4.2 -> 2.4.3 --- pkgs/applications/science/biology/bowtie2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 715f5bb8bfa68..4f5872de07dd9 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "11apzq7l1lk3yxw97g9dfr0gwnvfh58x6apifcblgd66gbip3y1y"; + sha256 = "sha256-uEKTB8935YY6lpXv2tJBQ1hrRk63vALLQb6SUXsVyhQ="; }; nativeBuildInputs = [ cmake ]; -- cgit 1.4.1 From 3d18eddae244c9a88fc5d8dfe2e90a29d412bb0f Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sun, 16 May 2021 08:55:10 +0200 Subject: pulseview: fix patch hash --- pkgs/applications/science/electronics/pulseview/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index 3266b3802a4a2..e9496ce60c229 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { # PR at https://github.com/sigrokproject/pulseview/pull/39 (fetchpatch { url = "https://github.com/sigrokproject/pulseview/commit/fb89dd11f2a4a08b73c498869789e38677181a8d.patch"; - sha256 = "153lrvbj0qf8qxx3l01v3ln8g5qjmlapwp8h1k1iir3xx3lyy37k"; + sha256 = "07ifsis9jlc0jjp2d11f7hvw9kaxcbk0a57h2m4xsv1d7vzl9yfh"; }) ]; -- cgit 1.4.1