Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b69542ae15a0^
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f33f9c662d3b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jun 30, 2019

  1. texmacs: 1.99.2 -> 1.99.10 

    Packaging changes:

* Switch from autoconf to cmake.
  Fixes error
      checking for guile-config... guile-config
      sh: =~: unknown operand
      ./configure: ./configure.lineno: line 8057: syntax error: bad substitution
  that appared with the new version.
* Also add new dependencies for new features: git, python
  * (fixes all "missing" errors in cmake's output)
* Stay at Qt4 for now to not introduce too many changes
  * Upgrading to Qt5 in the future is feasible (#33248); it builds
  * I'm not doing it here because Qt5 apps apparently don't run yet on non-NixOS
    @nh2
    nh2 committed Jun 30, 2019
    Copy the full SHA
    b69542a View commit details

Commits on Aug 12, 2019

  1. texmacs: 1.99.10 -> 1.99.11 

    Changelog: https://github.com/texmacs/texmacs/releases/tag/v1.99.11
    @nh2
    nh2 committed Aug 12, 2019
    Copy the full SHA
    f33f9c6 View commit details
Showing with 31 additions and 4 deletions.
  1. +31 −4 pkgs/applications/editors/texmacs/default.nix
35 changes: 31 additions & 4 deletions pkgs/applications/editors/texmacs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{ stdenv, callPackage,
fetchurl, guile_1_8, qt4, xmodmap, which, makeWrapper, freetype,
libjpeg,
sqlite,
tex ? null,
aspell ? null,
git ? null,
python3 ? null,
cmake,
pkgconfig,
ghostscriptX ? null,
extraFonts ? false,
chineseFonts ? false,
@@ -10,7 +16,7 @@

let
pname = "TeXmacs";
version = "1.99.2";
version = "1.99.11";
common = callPackage ./common.nix {
inherit tex extraFonts chineseFonts japaneseFonts koreanFonts;
};
@@ -19,17 +25,38 @@ stdenv.mkDerivation {
name = "${pname}-${version}";

src = fetchurl {
url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
sha256 = "0l48g9746igiaxw657shm8g3xxk565vzsviajlrxqyljbh6py0fs";
url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz";
sha256 = "12bp0f34izzqimz49lfpgf4lyz3h45s9xbmk8v6zsawdjki76alg";
};

buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ];
cmakeFlags = [
# Texmacs' cmake build as of writing defaults to Qt5,
# but we haven't updated to that yet.
"-DTEXMACS_GUI=Qt4"
];

enableParallelBuilding = true;

nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
guile_1_8
qt4
makeWrapper
ghostscriptX
freetype
libjpeg
sqlite
git
python3
];
NIX_LDFLAGS = [ "-lz" ];

postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
(if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
(if aspell == null then "" else "${aspell}/bin:") +
(if tex == null then "" else "${tex}/bin:") +
(if git == null then "" else "${git}/bin:") +
(if python3 == null then "" else "${python3}/bin:") +
"${xmodmap}/bin:${which}/bin";

inherit (common) postPatch;