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: 29cc418d9458
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: 0aa5f60434dc
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 27, 2020

  1. ip2unix: 2.1.1 -> 2.1.2 

    This fixes the issues with glibc 2.30, which were caused because glibc
no longer allows to dlopen/LD_PRELOAD a PIE executable.

So this release is essentially just a hotfix release which addresses
this issue by splitting the executable and library.

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: @zimbatm
(cherry picked from commit b51d39f)
    @aszlig
    aszlig committed May 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ijjk JJ Kasper
    GPG key ID: 47B7C67C7B64BEE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4cdf2a5 View commit details

  2. python: svgwrite: disable on Python 3.8

    @sbourdeauducq
    sbourdeauducq authored and Jon committed May 27, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    ijjk JJ Kasper
    GPG key ID: 47B7C67C7B64BEE6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0aa5f60 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −1 pkgs/development/python-modules/svgwrite/default.nix
  2. +2 −3 pkgs/tools/networking/ip2unix/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/svgwrite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ lib
, buildPythonPackage
, pythonAtLeast
, fetchFromGitHub
, pyparsing
, pytest
@@ -8,6 +9,7 @@
buildPythonPackage rec {
pname = "svgwrite";
version = "1.3.1";
disabled = pythonAtLeast "3.8";

src = fetchFromGitHub {
owner = "mozman";
@@ -33,7 +35,6 @@ buildPythonPackage rec {
description = "A Python library to create SVG drawings";
homepage = https://github.com/mozman/svgwrite;
license = licenses.mit;
broken = true;
};

}
5 changes: 2 additions & 3 deletions pkgs/tools/networking/ip2unix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

stdenv.mkDerivation rec {
pname = "ip2unix";
version = "2.1.1";
version = "2.1.2";

src = fetchFromGitHub {
owner = "nixcloud";
repo = "ip2unix";
rev = "v${version}";
sha256 = "121ygj50i7ja9bv76y51qsjbjmmydhpi0sd3xb6pysmlzv0bxn17";
sha256 = "1ci0k3zy3hjkg65ah5h75mfvrd578xf2z1449xmgjm3iz3d6kqs2";
};

nativeBuildInputs = [
@@ -42,6 +42,5 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
maintainers = [ stdenv.lib.maintainers.aszlig ];
broken = true;
};
}