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: 4e3aa3de4122
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: 46347794a94c
Choose a head ref
  • 9 commits
  • 8 files changed
  • 7 contributors

Commits on Feb 5, 2020

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    picnoir Félix
    Copy the full SHA
    931c610 View commit details
  2. lorri: unstable-2020-01-09 -> 1.0

    (cherry picked from commit 42a2668)
    curiousleo committed Feb 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    f375592 View commit details
  3. Merge pull request #79261 from curiousleo/lorri-1.0-backport

    lorri: unstable-2020-01-09 -> 1.0 (backport to release-19.09)
    grahamc authored Feb 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    andir Andreas Rammhold
    Copy the full SHA
    34b08ff View commit details
  4. Copy the full SHA
    69e5728 View commit details
  5. Copy the full SHA
    5ee0221 View commit details
  6. Merge pull request #79257 from das-g/release-19.09_gdal-3.0.3

    [19.09] gdal: 3.0.1 -> 3.0.3
    lsix authored Feb 5, 2020
    Copy the full SHA
    8e46ed8 View commit details
  7. sudo: 1.8.30 -> 1.8.31

    (cherry picked from commit f58c90f)
    tilpner committed Feb 5, 2020
    Copy the full SHA
    3cac4ba View commit details
  8. Merge pull request #79265 from tilpner/sudo-update-backport-19.09

    [19.09] sudo: 1.8.30 -> 1.8.31
    grahamc authored Feb 5, 2020
    Copy the full SHA
    4ed8867 View commit details
  9. Copy the full SHA
    4634779 View commit details
6 changes: 3 additions & 3 deletions nixos/tests/lorri/default.nix
Original file line number Diff line number Diff line change
@@ -13,12 +13,12 @@ import ../make-test.nix {
# Start the daemon and wait until it is ready
$machine->execute("lorri daemon > lorri.stdout 2> lorri.stderr &");
$machine->waitUntilSucceeds("grep --fixed-strings 'lorri: ready' lorri.stdout");
$machine->waitUntilSucceeds("grep --fixed-strings 'ready' lorri.stdout");
# Ping the daemon
$machine->execute("lorri ping_ \$(readlink -f shell.nix)");
$machine->succeed("lorri internal__ping shell.nix");
# Wait for the daemon to finish the build
$machine->waitUntilSucceeds("grep --fixed-strings 'OutputPaths' lorri.stdout");
$machine->waitUntilSucceeds("grep --fixed-strings 'Completed' lorri.stdout");
'';
}
29 changes: 0 additions & 29 deletions pkgs/development/libraries/gdal/001.3_0_1.darwin.patch

This file was deleted.

14 changes: 2 additions & 12 deletions pkgs/development/libraries/gdal/default.nix
Original file line number Diff line number Diff line change
@@ -9,27 +9,17 @@ with stdenv.lib;

stdenv.mkDerivation rec {
pname = "gdal";
version = "3.0.1";
version = "3.0.3";

src = fetchFromGitHub {
owner = "OSGeo";
repo = "gdal";
rev = "v${version}";
sha256 = "04rraqhygv8b8fy87qvdhkgx87whby9n98p3gxqr7kdrfymwnh8l";
sha256 = "1rbyxmgmp27a5wvm4g70jr79bazhdl8q9rcch2b78m73njdv73xa";
};

sourceRoot = "source/gdal";

patches = [
./001.3_0_1.darwin.patch
(fetchpatch {
name = "CVE-2019-17545.patch";
url = "https://github.com/OSGeo/gdal/commit/148115fcc40f1651a5d15fa34c9a8c528e7147bb.patch";
stripLen = 1;
sha256 = "0hai59hhvrci9xwjw4lp3wc1brn00imngmqrbbs8v9yr3b0fzbgs";
})
];

nativeBuildInputs = [ autoreconfHook ];

buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.4.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.4.212";
version = "4.4.213";
extraMeta.branch = "4.4";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0mx3qyj6w6h7gw7drsfsgl4iyz1695sjnf9hqh4kczci48kw5rj7";
sha256 = "1cmwn9zvz14jqjy6qkszglhs2p5h6yh82b2269cbzvibg8y3rxq0";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/kernel/linux-4.9.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

buildLinux (args // rec {
version = "4.9.212";
version = "4.9.213";
extraMeta.branch = "4.9";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0c5yjilaq86j6i2hzlxbp2ia7jhnf7kv952ffv7jxdf90sk3irxd";
sha256 = "0r7bqpvbpiiniwsm338b38mv6flfgm1r09avxqsakhkh8rvgz1dg";
};
} // (args.argsOverride or {}))
4 changes: 2 additions & 2 deletions pkgs/os-specific/linux/wireguard/default.nix
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6";

stdenv.mkDerivation rec {
pname = "wireguard";
version = "0.0.20200128";
version = "0.0.20200205";

src = fetchzip {
url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz";
sha256 = "05iz0pl0znx5yham8qzpym2ggc9babh36xaa504k99qqvddg8b11";
sha256 = "084bvjhfqxvbh5wv7a2cj8k1i1lfix2l9972xwr36hw9kvqpynnm";
};

preConfigure = ''
8 changes: 4 additions & 4 deletions pkgs/tools/misc/lorri/default.nix
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@

rustPlatform.buildRustPackage rec {
pname = "lorri";
version = "unstable-2020-01-09";
version = "1.0";

meta = with stdenv.lib; {
description = "Your project's nix-env";
@@ -28,11 +28,11 @@ rustPlatform.buildRustPackage rec {
owner = "target";
repo = pname;
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
rev = "7b84837b9988d121dd72178e81afd440288106c5";
sha256 = "0rkga944jl6i0051vbsddfqbvzy12168cbg4ly2ng1rk0x97dbr8";
rev = "88c680c9abf0f04f2e294436d20073ccf26f0781";
sha256 = "1415mhdr0pwvshs04clfz1ys76r5qf9jz8jchm63l6llaj6m7mrv";
};

cargoSha256 = "0k7l0zhk2vzf4nlwv4xr207irqib2dqjxfdjk1fprff84c4kblx8";
cargoSha256 = "1kdpzbn3353yk7i65hll480fcy16wdvppdr6xgfh06x88xhim4mp";
doCheck = false;

BUILD_REV_COUNT = src.revCount or 1;
10 changes: 4 additions & 6 deletions pkgs/tools/security/sudo/default.nix
Original file line number Diff line number Diff line change
@@ -5,14 +5,12 @@
}:

stdenv.mkDerivation rec {
name = "sudo-1.8.28";
pname = "sudo";
version = "1.8.31";

src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
sha256 = "188k3w67aflbmi4b5z23pxrvzfcfndi22b84w86gzjh8b9sglaci";
url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz";
sha256 = "0ks5mm9hda5idivncyfpiz4lrd8fv0dpmsl711788k7f7ixdka3y";
};

prePatch = ''