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

Commits on Oct 30, 2019

  1. polkit: Fix unstable patch URL. 

    Unmerged upstream merge requests can change when iterated on!
    @nh2
    nh2 committed Oct 30, 2019
    Copy the full SHA
    0e10ad9 View commit details

  2. Merge pull request #72301 from nh2/polkit-stable-patch-url 

    polkit: Fix unstable patch URL
    @nh2
    nh2 authored Oct 30, 2019
    Copy the full SHA
    6b7f343 View commit details

Commits on Oct 31, 2019

  1. itstool: 2.0.2 -> 2.0.6 

    To get python3 support.  #63174 flipped itstool to python3, but itstool
doesn't support python3 until 2.0.3 (and perhaps does not support it
well until 2.0.5).

Pressing forward instead of rolling back at worldofpeace's suggestion,
who mentions that other distros seem to be able to ship recent versions
of itstool.

Tensions in this space seem two-fold.  One set centers around libxml2
being a low-level C library with sharp edges, manual memory management,
and performance concerns; the python libxml2 wrapper being quite thin
(the most dubious character in this drama); and python's sentiment that
it ought to be quite hard to crash the interpreter casually.  This comes
to a head in https://gitlab.gnome.org/GNOME/libxml2/issues/12 , where a
use-after-free problem in idiomatic-looking python code is declared
working-as-designed.

The other set is around python3 being more UTF-8-aware than libxml2's
python wrapper, such as https://bugzilla.gnome.org/show_bug.cgi?id=789714
and https://src.fedoraproject.org/rpms/libxml2/blob/master/f/libxml2-2.9.8-python3-unicode-errors.patch

itstool is caught in this crossfire merely for being a widely-used
python program that uses XML.
    @chkno
    chkno committed Oct 31, 2019
    Copy the full SHA
    0c999c7 View commit details

  2. libxml2: add patch for python3 compat

    @FRidh
    FRidh committed Oct 31, 2019
    Copy the full SHA
    20d6988 View commit details
Showing with 13 additions and 6 deletions.
  1. +9 −1 pkgs/development/libraries/libxml2/default.nix
  2. +2 −1 pkgs/development/libraries/polkit/default.nix
  3. +2 −4 pkgs/development/tools/misc/itstool/default.nix
10 changes: 9 additions & 1 deletion pkgs/development/libraries/libxml2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,8 @@
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
, icuSupport ? false, icu ? null
, enableShared ? stdenv.hostPlatform.libc != "msvcrt"
, enableStatic ? !enableShared,
, enableStatic ? !enableShared
, fetchpatch
}:

stdenv.mkDerivation rec {
@@ -37,6 +38,13 @@ stdenv.mkDerivation rec {
(lib.withFeatureAs pythonSupport "python" python)
];

patches = [
(fetchpatch {
url = https://src.fedoraproject.org/rpms/libxml2/raw/master/f/libxml2-2.9.8-python3-unicode-errors.patch;
sha256 = "1p64ngqk2n6fbrnmvl515ynvzsp32yn99fkixd8crj9n2xrgzf60";
})
];

enableParallelBuilding = true;

doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin &&
3 changes: 2 additions & 1 deletion pkgs/development/libraries/polkit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,8 +24,9 @@ stdenv.mkDerivation rec {

patches = [
# Don't use etc/dbus-1/system.d
# Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11
(fetchpatch {
url = "https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11.patch";
url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5dd4e22efd05d55833c4634b56e473812b5acbf2.patch";
sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp";
})
];
6 changes: 2 additions & 4 deletions pkgs/development/tools/misc/itstool/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{ stdenv, fetchurl, python3 }:

stdenv.mkDerivation rec {
# 2.0.3+ breaks the build of gnome3.gnome-desktop
# https://github.com/itstool/itstool/issues/17
name = "itstool-2.0.2";
name = "itstool-2.0.6";

src = fetchurl {
url = "http://files.itstool.org/itstool/${name}.tar.bz2";
sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a";
sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2";
};

buildInputs = [ (python3.withPackages(ps: with ps; [ libxml2 ])) ];