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: 630380651deb
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: ca9be2e87269
Choose a head ref

Commits on Nov 5, 2019

  1. python3Packages.hdbscan: add missing dependency

    Jonathan Ringer committed Nov 5, 2019
    Copy the full SHA
    c2c1227 View commit details

Commits on Nov 6, 2019

  1. Copy the full SHA
    079849e View commit details
  2. jo: 1.2 -> 1.3

    markus1189 committed Nov 6, 2019
    Copy the full SHA
    e68fce0 View commit details

Commits on Nov 9, 2019

  1. Copy the full SHA
    802d520 View commit details

Commits on Nov 10, 2019

  1. Copy the full SHA
    92d66a9 View commit details
  2. Copy the full SHA
    35ab777 View commit details
  3. gputils: add missing description

    cko committed Nov 10, 2019
    Copy the full SHA
    a09f706 View commit details
  4. Copy the full SHA
    e2ef352 View commit details
  5. Copy the full SHA
    0d6182a View commit details

Commits on Nov 11, 2019

  1. slirp4netns: 0.3.0 -> 0.4.2

    Signed-off-by: Sascha Grunert <sgrunert@suse.com>
    saschagrunert committed Nov 11, 2019
    Copy the full SHA
    f94d457 View commit details

Commits on Nov 12, 2019

  1. moodle: 3.7.2 -> 3.7.3

    aanderse committed Nov 12, 2019
    Copy the full SHA
    afe2883 View commit details
  2. Merge pull request #73156 from maximedenes/purescript-0.13.4

    purescript: 0.13.3 -> 0.13.4
    c0bw3b authored Nov 12, 2019
    Copy the full SHA
    f55563b View commit details
  3. Merge pull request #73103 from doronbehar/update-imapfilter

    imapfilter: 2.6.13 -> 2.6.14
    c0bw3b authored Nov 12, 2019
    Copy the full SHA
    7fb8545 View commit details
  4. Merge pull request #73072 from cko/missing_descriptions

    treewide: add missing descriptions & homepages
    c0bw3b authored Nov 12, 2019
    Copy the full SHA
    a6220c3 View commit details
  5. hubstaff: 1.5.0 -> 1.5.2

     (#73030)
    srghma authored and c0bw3b committed Nov 12, 2019
    Copy the full SHA
    6e4a224 View commit details
  6. snakemake: 5.4.4 -> 5.7.4 (#72929)

     (#72929)
    veprbl authored and c0bw3b committed Nov 12, 2019
    Copy the full SHA
    93ee809 View commit details
  7. Merge pull request #72913 from markus1189/jo-1-3

    jo: 1.2 -> 1.3
    c0bw3b authored Nov 12, 2019
    Copy the full SHA
    cff6c70 View commit details
  8. Merge pull request #72840 from jonringer/fix-hdbscan

    python3Packages.hdbscan: add missing dependency
    c0bw3b authored Nov 12, 2019
    Copy the full SHA
    c3af84d View commit details

Commits on Nov 13, 2019

  1. Merge pull request #67692 from saschagrunert/slirp4netns

    slirp4netns: 0.3.0 -> 0.4.2
    peterhoeg authored Nov 13, 2019
    Copy the full SHA
    8fa83bd View commit details
  2. Merge pull request #72858 from nshalman/displaylink5

    displaylink: 4.4.24 -> 5.2.14
    grahamc authored Nov 13, 2019
    Copy the full SHA
    8e069a1 View commit details
  3. Merge pull request #73285 from aanderse/moodle

    moodle: 3.7.2 -> 3.7.3
    aanderse authored Nov 13, 2019
    Copy the full SHA
    ca9be2e View commit details
2 changes: 2 additions & 0 deletions pkgs/applications/audio/amarok/default.nix
Original file line number Diff line number Diff line change
@@ -33,6 +33,8 @@ mkDerivation rec {
enableParallelBuilding = true;

meta = with lib; {
homepage = "https://amarok.kde.org";
description = "A powerful music player with an intuitive interface";
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
6 changes: 3 additions & 3 deletions pkgs/applications/misc/hubstaff/revision.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.0-4309ed45/Hubstaff-1.5.0-4309ed45.sh",
"version": "1.5.0-4309ed45",
"sha256": "1rfxizb28b8r344d18jh6shfcxz35vx8vh10c3j6zdcc998zkcr1"
"url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.2-bead991b/Hubstaff-1.5.2-bead991b.sh",
"version": "1.5.2-bead991b",
"sha256": "068b0q94ydldyjmzbka1j94vr1xdxvkxq79pp7ria81hvpp68yxf"
}
4 changes: 2 additions & 2 deletions pkgs/applications/networking/mailreaders/imapfilter.nix
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "imapfilter";
version = "2.6.13";
version = "2.6.14";

src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi";
sha256 = "09aq9gw1vz0zl6k4fb4zdm6cpjhddsl13asfjx3qy21pbw0azmj6";
};

makeFlagsArray = "PREFIX=$(out)";
16 changes: 7 additions & 9 deletions pkgs/applications/science/misc/snakemake/default.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
{
stdenv
, python
}:
{ stdenv, python3Packages }:

python.buildPythonPackage rec {
python3Packages.buildPythonApplication rec {
pname = "snakemake";
version = "5.4.4";
version = "5.7.4";

propagatedBuildInputs = with python; [
propagatedBuildInputs = with python3Packages; [
appdirs
ConfigArgParse
datrie
docutils
GitPython
jsonschema
psutil
pyyaml
ratelimiter
requests
wrapt
];

src = python.fetchPypi {
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "157323e0e1be34302edbbf399b2acbe25a4291bceffd47a0469963a970c9375f";
sha256 = "11f2f00c505d928b91332056667d49c96ed1694bf78e798ce27613948d44a2a2";
};

doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json
6 changes: 3 additions & 3 deletions pkgs/development/compilers/purescript/purescript/default.nix
Original file line number Diff line number Diff line change
@@ -18,19 +18,19 @@ let

in stdenv.mkDerivation rec {
pname = "purescript";
version = "0.13.3";
version = "0.13.4";

src =
if stdenv.isDarwin
then
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
sha256 = "04ylhqadj7wnclhiar9il6fkrxmh9qkz6fpas7z3b37w4qg0gshl";
sha256 = "0rqjair1r1yr1k8rva3ly16dv5594f4s8xwpnrz9n7x3f99mk4fx";
}
else
fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
sha256 = "1xcn694qfql87pdjh09hhvfvpakzxb2hagss61vh9msqq3s96l3z";
sha256 = "1ajzi5ikgzgdfrgq36r9pc3yc6f7h0qgnqcq414zd66z08mbggng";
};


3 changes: 2 additions & 1 deletion pkgs/development/python-modules/hdbscan/default.nix
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
, scikitlearn
, fetchPypi
, joblib
, six
}:

buildPythonPackage rec {
@@ -21,7 +22,7 @@ buildPythonPackage rec {
checkInputs = [ nose ];

nativeBuildInputs = [ cython ];
propagatedBuildInputs = [ numpy scipy scikitlearn joblib ];
propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ];

meta = with lib; {
description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";
8 changes: 4 additions & 4 deletions pkgs/development/tools/jo/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{stdenv, fetchFromGitHub, autoreconfHook}:
{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}:

stdenv.mkDerivation rec {
pname = "jo";
version = "1.2";
version = "1.3";

src = fetchFromGitHub {
owner = "jpmens";
repo = "jo";
rev = version;
sha256 ="03b22zb5034ccqyp4ynfzknxagb3jz2dppl0kqz2nv4a08aglpmy";
sha256 ="11miqg0i83drwkn66b4333vhfdw62al11dyfgp30alg6pcab3icl";
};

enableParallelBuilding = true;

nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ];

meta = with stdenv.lib; {
description = "A small utility to create JSON objects";
3 changes: 2 additions & 1 deletion pkgs/development/tools/misc/gputils/default.nix
Original file line number Diff line number Diff line change
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};

meta = with stdenv.lib; {
homepage = https://gputils.sourceforge.io/;
homepage = "https://gputils.sourceforge.io";
description = "A collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib";
license = licenses.gpl2;
maintainers = with maintainers; [ yorickvp ];
platforms = platforms.linux;
11 changes: 6 additions & 5 deletions pkgs/os-specific/linux/displaylink/default.nix
Original file line number Diff line number Diff line change
@@ -11,22 +11,22 @@ let

in stdenv.mkDerivation rec {
pname = "displaylink";
version = "4.4.24";
version = "5.2.14";

src = requireFile rec {
name = "displaylink.zip";
sha256 = "0c02mg7vbijpfpk9imh0hmls1yiglc216zfllw5ar86r1slhd5y0";
sha256 = "03b176y95f04rg3lcnjps9llsjbvd8yksh1fpvjwaciz48mnxh2i";
message = ''
In order to install the DisplayLink drivers, you must first
comply with DisplayLink's EULA and download the binaries and
sources from here:
http://www.displaylink.com/downloads/file?id=1261
http://www.displaylink.com/downloads/file?id=1369
Once you have downloaded the file, please use the following
commands and re-run the installation:
mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu ${version}.zip" \$PWD/${name}
mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu ${lib.versions.majorMinor version}.zip" \$PWD/${name}
nix-prefetch-url file://\$PWD/${name}
'';
};
@@ -67,8 +67,9 @@ in stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux";
maintainers = with maintainers; [ nshalman abbradar peterhoeg ];
platforms = [ "x86_64-linux" "i686-linux" ];
license = licenses.unfree;
homepage = https://www.displaylink.com/;
homepage = "https://www.displaylink.com/";
};
}
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/displaylink/udev-installer.patch
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@
cat <<'EOF'
start_service()
{
- systemctl start dlm
- systemctl start displaylink-driver
+ @systemd@/bin/systemctl start --no-block dlm
}

stop_service()
{
- systemctl stop dlm
- systemctl stop displaylink-driver
+ @systemd@/bin/systemctl stop dlm
}

4 changes: 2 additions & 2 deletions pkgs/servers/web-apps/moodle/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, writeText }:

let
version = "3.7.2";
version = "3.7.3";
stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
in

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
sha256 = "1mvrmpqkcz7m7yplqi0lwgnal79n747f7nwcgd2nfrvz7jv3s8ir";
sha256 = "1n82n77lw83a5wjfjbvc74h2ny2z0zkdprxk7sai88rg6rix33ak";
};

phpConfig = writeText "config.php" ''
8 changes: 7 additions & 1 deletion pkgs/shells/oh/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchgit }:
{ stdenv, buildGoPackage, fetchgit, lib }:

buildGoPackage rec {
pname = "oh";
@@ -14,4 +14,10 @@ buildGoPackage rec {
};

goDeps = ./deps.nix;

meta = with lib;{
homepage = "https://github.com/michaelmacinnis/oh";
description = "A Unix shell";
license = stdenv.lib.licenses.mit;
};
}
2 changes: 2 additions & 0 deletions pkgs/tools/misc/peruse/default.nix
Original file line number Diff line number Diff line change
@@ -26,6 +26,8 @@ in mkDerivation {
pathsToLink = [ "/etc/xdg/peruse.knsrc"];

meta = with lib; {
homepage = "https://peruse.kde.org";
description = "A comic book reader";
license = licenses.gpl2;
maintainers = with maintainers; [ peterhoeg ];
};
10 changes: 5 additions & 5 deletions pkgs/tools/networking/slirp4netns/default.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, libcap, libseccomp }:

stdenv.mkDerivation rec {
pname = "slirp4netns";
version = "0.3.0";
version = "0.4.2";

src = fetchFromGitHub {
owner = "rootless-containers";
repo = "slirp4netns";
rev = "v${version}";
sha256 = "079m44l4l0p1c2sbkpzsy6zpv94glwmrc72ip2djcscnaq4b1763";
sha256 = "0i0rhb7n2i2nmbvdqdx83vi3kw4r17p7p099sr857cr3f3c221qx";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];

buildInputs = [ glib ];
buildInputs = [ libcap libseccomp glib ];

enableParallelBuilding = true;

meta = with stdenv.lib; {
homepage = https://github.com/rootless-containers/slirp4netns;
description = "User-mode networking for unprivileged network namespaces";
license = licenses.gpl2;
maintainers = with maintainers; [ orivej ];
maintainers = with maintainers; [ orivej saschagrunert ];
platforms = platforms.linux;
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -10339,7 +10339,7 @@ in

smc = callPackage ../tools/misc/smc { };

snakemake = callPackage ../applications/science/misc/snakemake { python = python3Packages; };
snakemake = callPackage ../applications/science/misc/snakemake { };

snore = callPackage ../tools/misc/snore { };