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: c14e23d0e682
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 22b3b54749e3
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 10, 2019

  1. ipe: 7.2.10 -> 7.2.11 

    https://mailman.science.uu.nl/pipermail/ipe-announce/2019-March/000082.html
    @dtzWill
    dtzWill committed Mar 10, 2019
    Copy the full SHA
    39a8578 View commit details

  2. ipe: be explicit about libpng, use lua 5.3 per readme

    @dtzWill
    dtzWill committed Mar 10, 2019
    Copy the full SHA
    812a99c View commit details

Commits on Mar 11, 2019

  1. Merge pull request #57200 from dtzWill/update/ipe-7.2.11 

    ipe: 7.2.10 -> 7.2.11, touchup
    @dtzWill
    dtzWill authored Mar 11, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    22b3b54 View commit details
Showing with 5 additions and 4 deletions.
  1. +4 −4 pkgs/applications/graphics/ipe/default.nix
  2. +1 −0 pkgs/top-level/all-packages.nix
8 changes: 4 additions & 4 deletions pkgs/applications/graphics/ipe/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
, libjpeg, qtbase
, libjpeg, libpng, qtbase
}:

stdenv.mkDerivation rec {
name = "ipe-7.2.10";
name = "ipe-7.2.11";

src = fetchurl {
url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz";
sha256 = "0gw45d0albrsa0pbc5g4w3fmmjfxrdbpzyc7723ncbhncdyda01h";
sha256 = "09d71fdpiz359mcnb57460w2mcfizvlnidd6g1k4c3v6rglwlbd2";
};

sourceRoot = "${name}/src";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
LUA_PACKAGE = "lua";

buildInputs = [
libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript
libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript
];

nativeBuildInputs = [ makeWrapper pkgconfig ];
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -17865,6 +17865,7 @@ in
ipe = libsForQt5.callPackage ../applications/graphics/ipe {
ghostscript = ghostscriptX;
texlive = texlive.combine { inherit (texlive) scheme-small; };
lua5 = lua5_3;
};

iptraf = callPackage ../applications/networking/iptraf { };