diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-02-16 18:32:21 +0000 |
| commit | 9becdcc5df71b47a5da84ad670e9a7eae9e0c65a (patch) | |
| tree | 2ddf0335eb393f89501e3753b50c3f7ab0552d12 /nixpkgs/pkgs/applications/editors/texmacs | |
| parent | 49f2a77ac9abc88c253f68952eda26557fc3b555 (diff) | |
| parent | ff96a0fa5635770390b184ae74debea75c3fd534 (diff) | |
| download | nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.gz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.bz2 nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.lz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.xz nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.tar.zst nixlib-9becdcc5df71b47a5da84ad670e9a7eae9e0c65a.zip | |
nixpkgs: merge nixos-unstable
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/texmacs')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/texmacs/common.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/texmacs/default.nix | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/editors/texmacs/common.nix b/nixpkgs/pkgs/applications/editors/texmacs/common.nix index 3ffcc8ecf45c..e52d95f837df 100644 --- a/nixpkgs/pkgs/applications/editors/texmacs/common.nix +++ b/nixpkgs/pkgs/applications/editors/texmacs/common.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: +{ lib, fetchurl, tex, extraFonts, chineseFonts, japaneseFonts, koreanFonts }: rec { extraFontsSrc = fetchurl { url = "ftp://ftp.texmacs.org/pub/TeXmacs/fonts/TeXmacs-extra-fonts-1.0-noarch.tar.gz"; diff --git a/nixpkgs/pkgs/applications/editors/texmacs/default.nix b/nixpkgs/pkgs/applications/editors/texmacs/default.nix index 6046a3aa313d..dd5e5e61b29c 100644 --- a/nixpkgs/pkgs/applications/editors/texmacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/texmacs/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, callPackage, fetchFromGitHub, +{ lib, mkDerivation, callPackage, fetchurl, guile_1_8, qtbase, xmodmap, which, freetype, libjpeg, sqlite, @@ -16,19 +16,17 @@ let pname = "TeXmacs"; - version = "1.99.15"; + version = "1.99.18"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; in mkDerivation { - name = "${pname}-${version}"; + inherit pname version; - src = fetchFromGitHub { - owner = "texmacs"; - repo = "texmacs"; - rev = "v${version}"; - sha256 = "04585hdh98fvyhj4wsxf69xal2wvfa6lg76gad8pr6ww9abi5105"; + src = fetchurl { + url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; + sha256 = "0il3fwgw20421aj90wg8kyhkwk6lbgb3bb2g5qamh5lk90yj725i"; }; nativeBuildInputs = [ cmake pkg-config ]; |