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: fe9abc43c7da
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: ff9c3f0f26de
Choose a head ref
  • 4 commits
  • 4 files changed
  • 4 contributors

Commits on Mar 24, 2019

  1. fix: csound-manual by using newer git revision (#57663)

    (cherry picked from commit 990eaa3)
    
    cc #57663
    hlolli authored and veprbl committed Mar 24, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veprbl Dmitry Kalinkin
    Copy the full SHA
    b0200b7 View commit details
  2. systemd: update debian patches url to snapshots.debian.org

    The current approach will fail when enough time has passed. We ideally
    want to be reproducible even in a few years of time. So we should pick
    the sources of patches wisely as otherwise we can not do that.
    
    (cherry picked from commit bb821c6)
    andir authored and Mic92 committed Mar 24, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    Copy the full SHA
    ad02408 View commit details
  3. python.pkgs.joblib: 0.12.4 -> 0.13.2 (#57906)

    (cherry picked from commit 2c07a08)
    dotlambda authored and Robert Schütz committed Mar 24, 2019
    Copy the full SHA
    9965ac0 View commit details
  4. slack: 3.3.7 -> 3.3.8

    Backport of #58170
    (cherry picked from commit dad85bd)
    dtzWill authored and srhb committed Mar 24, 2019
    Copy the full SHA
    ff9c3f0 View commit details
24 changes: 12 additions & 12 deletions pkgs/applications/audio/csound/csound-manual/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
{
stdenv, fetchurl, docbook_xsl,
docbook_xml_dtd_45, python, pygments,
libxslt
{
stdenv, fetchFromGitHub, docbook_xsl,
docbook_xml_dtd_45, python, pygments,
libxslt
}:

stdenv.mkDerivation rec {
version = "6.12.0";
name = "csound-manual-${version}";

src = fetchurl {
url = "https://github.com/csound/manual/archive/${version}.tar.gz";
sha256 = "1v1scp468rnfbcajnp020kdj8zigimc2mbcwzxxqi8sf8paccdrp";
pname = "csound-manual";
version = "unstable-2019-02-22";

src = fetchFromGitHub {
owner = "csound";
repo = "manual";
rev = "3b0bdc83f9245261b4b85a57c3ed636d5d924a4f";
sha256 = "074byjhaxraapyg54dxgg7hi1d4978aa9c1rmyi50p970nsxnacn";
};


prePatch = ''
substituteInPlace manual.xml \
--replace "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
@@ -41,4 +42,3 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all;
};
}

Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@

let

version = "3.3.7";
version = "3.3.8";

rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -48,7 +48,7 @@ let
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
sha256 = "1q3866iaby8rqim8h2m398wzi0isnnlsxirlq63fzz7a4g1hnc8p";
sha256 = "02435zvpyr95fljx3xgqz0b0npim1j0611p4rc1azwgdf8hjn11p";
}
else
throw "Slack is not supported on ${stdenv.hostPlatform.system}";
31 changes: 23 additions & 8 deletions pkgs/development/python-modules/joblib/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, fetchpatch
, sphinx
, numpydoc
, pytest
@@ -10,16 +11,30 @@

buildPythonPackage rec {
pname = "joblib";
version = "0.12.4";
version = "0.13.2";

# get full repository inorder to run tests
src = fetchFromGitHub {
owner = "joblib";
repo = pname;
rev = version;
sha256 = "06zszgp7wpa4jr554wkk6kkigp4k9n5ad5h08i6w9qih963rlimb";
src = fetchPypi {
inherit pname version;
sha256 = "315d6b19643ec4afd4c41c671f9f2d65ea9d787da093487a81ead7b0bac94524";
};

# python-lz4 compatibility
# https://github.com/joblib/joblib/pull/847
patches = [
(fetchpatch {
url = https://github.com/joblib/joblib/commit/d3235fd601f40c91e074d48a411d7380329fe155.patch;
sha256 = "1hg1vfbba7mfilrpvmd97s68v03vs4bhlp1c1dj9lizi51mj2q2h";
})
(fetchpatch {
url = https://github.com/joblib/joblib/commit/884c92cd2aa5c2c1975ab48786da75556d779833.patch;
sha256 = "11kvpkvi428dq13ayy7vfyrib8isvcrdw8cd5hxkp5axr7sl12ba";
})
(fetchpatch {
url = https://github.com/joblib/joblib/commit/f1e177d781cc0d64420ec964a0b17d8268cb42a0.patch;
sha256 = "1sq6wcw4bhaq8cqwcd43fdws3467qy342xx3pgv62hp2nn75a21d";
})
];

checkInputs = [ sphinx numpydoc pytest ];
propagatedBuildInputs = [ python-lz4 ];

8 changes: 5 additions & 3 deletions pkgs/os-specific/linux/systemd/default.nix
Original file line number Diff line number Diff line change
@@ -34,10 +34,12 @@ in stdenv.mkDerivation rec {
# Upstream's maintenance branches are still too intrusive:
# https://github.com/systemd/systemd-stable/tree/v239-stable
patches-deb = fetchurl {
# When the URL disappears, it typically means that Debian has new patches
# (probably security) and updating to new tarball will apply them as well.
# This URL should point to a stable location that does not easily
# disappear. In the past we were using `mirror://debian` but that
# eventually causes the files to disappear. While that was a good sign
# for us to update our patch collection it does break reproducibility.
name = "systemd-debian-patches.tar.xz";
url = mirror://debian/pool/main/s/systemd/systemd_239-12~bpo9+1.debian.tar.xz;
url = http://snapshot.debian.org/archive/debian/20190301T035241Z/pool/main/s/systemd/systemd_239-12%7Ebpo9%2B1.debian.tar.xz;
sha256 = "0v9f62gyfiw5icdrdlcvjcipsqrsm49w6n8bqp9nb8s2ih6rsfhg";
};
# Note that we skip debian-specific patches, i.e. ./debian/patches/debian/*