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: 1780ecb041bd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2595be06af5c
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 25, 2018

  1. tikzit: init at 2.0 (#48479) 

    * tikzit: init at 2.0

* tikzit: Parallel building and qualification
    @iblech @c0bw3b
    iblech authored and c0bw3b committed Oct 25, 2018
    Copy the full SHA
    2595be0 View commit details
Showing with 33 additions and 0 deletions.
  1. +31 −0 pkgs/tools/typesetting/tikzit/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
31 changes: 31 additions & 0 deletions pkgs/tools/typesetting/tikzit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, qmake, qttools, qtbase, flex, bison }:

stdenv.mkDerivation rec {
name = "tikzit-${version}";
version = "2.0";

src = fetchFromGitHub {
owner = "tikzit";
repo = "tikzit";
rev = "v${version}";
sha256 = "0fwxr9rc9vmw2jzpj084rygzyhp4xm3vm737668az600ln2scyad";
};

nativeBuildInputs = [ qmake qttools flex bison ];
buildInputs = [ qtbase ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "A graphical tool for rapidly creating graphs and diagrams using PGF/TikZ";
longDescription = ''
TikZiT is a simple GUI editor for graphs and string diagrams.
Its native file format is a subset of PGF/TikZ, which means TikZiT files
can be included directly in papers typeset using LaTeX.
'';
homepage = https://tikzit.github.io/;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.iblech maintainers.mgttlinger ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5633,6 +5633,8 @@ with pkgs;

tie = callPackage ../development/tools/misc/tie { };

tikzit = libsForQt5.callPackage ../tools/typesetting/tikzit { };

tilix = callPackage ../applications/misc/tilix { };

tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };