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: ef5fd41a1183
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: 6fa01d5be04e
Choose a head ref
  • 10 commits
  • 8 files changed
  • 10 contributors

Commits on Mar 18, 2019

  1. linux: Enable AMD's amdkfd kernel driver in >= 4.20

    The amdkfd driver was built (and loaded when support was detected)
    without explicit configuration in kernels 4.17-4.19, but not in newer
    kernels.
    acowley committed Mar 18, 2019
    Copy the full SHA
    7d9d887 View commit details

Commits on Apr 2, 2019

  1. parallel: 20190222 -> 20190322

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/parallel/versions
    r-ryantm committed Apr 2, 2019
    Copy the full SHA
    823240d View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    markuskowa Markus Kowalewski
    Copy the full SHA
    464a865 View commit details
  3. Merge pull request #58741 from r-ryantm/auto-update/parallel

    parallel: 20190222 -> 20190322
    ryantm authored Apr 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7c337cc View commit details
  4. Merge pull request #58758 from markuskowa/upd-grlime

    gnuradio-limesdr: 1.0.0-RC -> 2.0.0
    markuskowa authored Apr 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e23f1a2 View commit details
  5. Merge pull request #57885 from acowley/hsa_amd

    linux: Enable AMD's amdkfd kernel driver in >= 4.20
    samueldr authored Apr 2, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2f30b79 View commit details
  6. graylog: 3.0.0 -> 3.0.1 (#58811)

    fadenb authored and xeji committed Apr 2, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    41b60eb View commit details
  7. Copy the full SHA
    427320c View commit details
  8. shadowsocks-libev: 3.2.3 -> 3.2.5 (#58650)

    marsam authored and xeji committed Apr 2, 2019
    Copy the full SHA
    099af0e View commit details
  9. pytest-rerunfailures: 6.0 -> 7.0 (#58710)

    Meptl authored and xeji committed Apr 2, 2019
    Copy the full SHA
    6fa01d5 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/radio/gnuradio/limesdr.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
assert pythonSupport -> python != null && swig != null;

let
version = "1.0.0-RC";
version = "2.0.0";

in stdenv.mkDerivation rec {
name = "gnuradio-limesdr-${version}";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
owner = "myriadrf";
repo = "gr-limesdr";
rev = "v${version}";
sha256 = "0b34mg9nfar2gcir98004ixrxmxi8p3p2hrvvi1razd869x2a0lf";
sha256 = "0ldqvfwl0gil89l9s31fjf9d7ki0dk572i8vna336igfaz348ypq";
};

nativeBuildInputs = [
15 changes: 15 additions & 0 deletions pkgs/development/perl-modules/DBD-Oracle/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{ fetchurl, buildPerlPackage, DBI, TestNoWarnings, oracle-instantclient }:

buildPerlPackage rec {
name = "DBD-Oracle-1.76";

src = fetchurl {
url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz";
sha256 = "b6db7f43c6252179274cfe99c1950b93e248f8f0fe35b07e50388c85d814d5f3";
};

ORACLE_HOME = "${oracle-instantclient}/lib";

buildInputs = [ TestNoWarnings oracle-instantclient ] ;
propagatedBuildInputs = [ DBI ];
}
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

buildPythonPackage rec {
pname = "pytest-rerunfailures";
version = "6.0";
version = "7.0";

src = fetchPypi {
inherit pname version;
sha256 = "978349ae00687504fd0f9d0970c37199ccd89cbdb0cb8c4ed7ee417ede582b40";
sha256 = "1zfm9v80bqfdapygy9wmi6j6y5c179ixpnh9ih27py4v6cqwzjgk";
};

checkInputs = [ mock ];
checkInputs = [ mock pytest ];

propagatedBuildInputs = [ pytest ];

3 changes: 3 additions & 0 deletions pkgs/os-specific/linux/kernel/common-config.nix
Original file line number Diff line number Diff line change
@@ -681,6 +681,9 @@ let
HOTPLUG_PCI_ACPI = yes; # PCI hotplug using ACPI
HOTPLUG_PCI_PCIE = yes; # PCI-Expresscard hotplug support

# Enable AMD's ROCm GPU compute stack
HSA_AMD = whenAtLeast "4.20" yes;

} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") {
# Enable memory hotplug support
# Allows you to dynamically add & remove memory to a VM client running NixOS without requiring a reboot
4 changes: 2 additions & 2 deletions pkgs/tools/misc/graylog/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre_headless }:

stdenv.mkDerivation rec {
version = "3.0.0";
version = "3.0.1";
name = "graylog-${version}";

src = fetchurl {
url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
sha256 = "1jcc254z4xqybm1f5r0g4dfyd9ji0z5g45hcnds32w9h8zqk391k";
sha256 = "07a003c2d9hj6aczlbai279z9bw50yk0a6qx1cw44f8p08y6dnqi";
};

dontBuild = true;
4 changes: 2 additions & 2 deletions pkgs/tools/misc/parallel/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl, makeWrapper, procps }:

stdenv.mkDerivation rec {
name = "parallel-20190222";
name = "parallel-20190322";

src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "073bj0ji9liq07j6a7y9i4kxfkv06kvavhh7654f2bgfavfbmcc6";
sha256 = "12q0ys0dp019wykx7jcqbrilz8798hgb66k97aj2s2m7xdpw41ym";
};

nativeBuildInputs = [ makeWrapper ];
8 changes: 4 additions & 4 deletions pkgs/tools/networking/shadowsocks-libev/default.nix
Original file line number Diff line number Diff line change
@@ -4,15 +4,15 @@
}:

stdenv.mkDerivation rec {
name = "shadowsocks-libev-${version}";
version = "3.2.3";
pname = "shadowsocks-libev";
version = "3.2.5";

# Git tag includes CMake build files which are much more convenient.
src = fetchFromGitHub {
owner = "shadowsocks";
repo = "shadowsocks-libev";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "1nj2z3j41lqd6gvj6j7xc8g7jbn2f8b75phlkgwvw0j3zsqnbq30";
sha256 = "09z20y35zjzsx5fd5cnnxxgbfcrh2bp0z7m15l59wlmlsfp7r2pw";
fetchSubmodules = true;
};

2 changes: 2 additions & 0 deletions pkgs/top-level/perl-packages.nix
Original file line number Diff line number Diff line change
@@ -4030,6 +4030,8 @@ let

DBDmysql = callPackage ../development/perl-modules/DBD-mysql { };

DBDOracle = callPackage ../development/perl-modules/DBD-Oracle { };

DBDPg = callPackage ../development/perl-modules/DBD-Pg { };

DBDsybase = callPackage ../development/perl-modules/DBD-sybase { };