Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c1328a1779a0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d10c5b88de75
Choose a head ref
  • 6 commits
  • 4 files changed
  • 5 contributors

Commits on Sep 18, 2018

  1. texlive: fix missing synctex header 

    The automake file was patched but `automake` not run.
Also since the texk/web2c folder is not in autoconfig's
SUBDIRS the autoreconfHook has to be run in there.

Completely fixes #46376

(cherry picked from commit ce6e72a)
    @globin
    globin committed Sep 18, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    ncfavier Naïm Camille Favier
    GPG key ID: 49B07322580B7EE2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    69da311 View commit details

  2. gtk-doc: don't build with dblatex by default 

    make it optional: withDblatex ? false
This removes the dependency of gtk-doc on texlive.

(cherry picked from commit d6ecbe1)
    @xeji
    xeji committed Sep 18, 2018
    Copy the full SHA
    3d94991 View commit details

  3. Merge remote-tracking branch 'upstream/release-18.09' into staging-18.09

    @Ericson2314
    Ericson2314 committed Sep 18, 2018
    Copy the full SHA
    d29a153 View commit details

Commits on Sep 21, 2018

  1. nixos/tests/ferm: disable dhcpcd 

    The test failed in one run on Hydra, logs look like
dhcpcd changed ipv6 routing at just the wrong time.
Disable dhcpcd. It's not needed, the test uses static IPs anyway.

(cherry picked from commit 5e7b7b8)
    @xeji @Mic92
    xeji authored and Mic92 committed Sep 21, 2018
    Copy the full SHA
    793776b View commit details

  2. Merge branch 'staging-18.09' into release-18.09 

    The comparison seems very good on Hydra.
    @vcunat
    vcunat committed Sep 21, 2018
    Copy the full SHA
    7eec667 View commit details

  3. acl2: 8.0 -> 8.0.post.2018.09.20; fixes build with fresher SBCL 

    (cherry picked from commit de764e6)
    @7c6f434c @xeji
    7c6f434c authored and xeji committed Sep 21, 2018
    Copy the full SHA
    d10c5b8 View commit details
4 changes: 3 additions & 1 deletion nixos/tests/ferm.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
with pkgs.lib;
{
networking = {
dhcpcd.enable = false;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ];
};
@@ -20,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
with pkgs.lib;
{
networking = {
dhcpcd.enable = false;
interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
};
@@ -51,7 +53,7 @@ import ./make-test.nix ({ pkgs, ...} : {
''
startAll;
$client->waitForUnit("network.target");
$client->waitForUnit("network-online.target");
$server->waitForUnit("ferm.service");
$server->waitForUnit("nginx.service");
$server->waitUntilSucceeds("ss -ntl | grep -q 80");
9 changes: 7 additions & 2 deletions pkgs/development/interpreters/acl2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,15 +4,20 @@

let hashes = {
"8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r";
"8.0.post.2018.09.20" = "1dj1dkkj6drk23h7cckyhcfplyzqlbz288wpxm77zr0gazxz8mw6";
};
revs = {
"8.0" = "8.0";
"8.0.post.2018.09.20" = "531089336bb1734ff82c7b3b3fc05917451db770";
};
in stdenv.mkDerivation rec {
name = "acl2-${version}";
version = "8.0";
version = "8.0.post.2018.09.20";

src = fetchFromGitHub {
owner = "acl2-devel";
repo = "acl2-devel";
rev = "${version}";
rev = revs."${version}";
sha256 = hashes."${version}";
};

7 changes: 4 additions & 3 deletions pkgs/development/tools/documentation/gtk-doc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool
, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, gettext, itstool
, withDblatex ? false, dblatex
}:

stdenv.mkDerivation rec {
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
buildInputs =
[ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
gnome-doc-utils dblatex gettext which itstool
];
gnome-doc-utils gettext which itstool
] ++ stdenv.lib.optional withDblatex dblatex;

configureFlags = [ "--disable-scrollkeeper" ];

12 changes: 7 additions & 5 deletions pkgs/tools/typesetting/tex/texlive/bin.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
, texlive
, zlib, libiconv, libpng, libX11
, freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext
, perl, pkgconfig
, perl, pkgconfig, autoreconfHook
, poppler, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr
, cairo, pixman, xorg, clisp, biber
, makeWrapper
@@ -38,6 +38,9 @@ let
sha256 = "1c4aq8lk8g3mlfq3mdjnxvmhss3qs7nni5rmw0k054dmj6q1xj5n";
})
];
# remove when removing synctex-missing-header.patch
preAutoreconf = "pushd texk/web2c";
postAutoreconf = "popd";

configureFlags = [
"--with-banner-add=/NixOS.org"
@@ -69,11 +72,11 @@ texliveYear = year;
core = stdenv.mkDerivation rec {
name = "texlive-bin-${version}";

inherit (common) src patches;
inherit (common) src patches preAutoreconf postAutoreconf;

outputs = [ "out" "doc" ];

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
/*teckit*/ zziplib poppler mpfr gmp
pixman potrace gd freetype libpng libpaper zlib
@@ -106,7 +109,6 @@ core = stdenv.mkDerivation rec {
"xetex" "bibtexu" "bibtex8" "bibtex-x" "upmendex" # ICU isn't small
] ++ stdenv.lib.optional (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) "mfluajit")
++ [ "--without-system-harfbuzz" "--without-system-icu" ] # bogus configure

;

enableParallelBuilding = true;
@@ -170,7 +172,7 @@ inherit (core-big) metafont metapost luatex xetex;
core-big = stdenv.mkDerivation { #TODO: upmendex
name = "texlive-core-big.bin-${version}";

inherit (common) src patches;
inherit (common) src patches preAutoreconf postAutoreconf;

hardeningDisable = [ "format" ];