Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53c5b9163eb3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 29a485a8cda4
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 21, 2017

  1. utillinux: 2.29.2 -> 2.30

    @fpletz
    fpletz committed Jun 21, 2017
    Copy the full SHA
    5389caa View commit details

  2. libev: 4.22 -> 4.24

    @fpletz
    fpletz committed Jun 21, 2017
    Copy the full SHA
    29a485a View commit details
Showing with 5 additions and 5 deletions.
  1. +2 −2 pkgs/development/libraries/libev/default.nix
  2. +3 −3 pkgs/os-specific/linux/util-linux/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libev/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "libev-${version}";
version="4.22";
version="4.24";

src = fetchurl {
url = "http://dist.schmorp.de/libev/Attic/${name}.tar.gz";
sha256 = "1mhvy38g9947bbr0n0hzc34zwfvvfd99qgzpkbap8g2lmkl7jq3k";
sha256 = "08gqsza1czx0nf62nkk183jb0946yzjsymaacxbzdgcs8z9r6dcp";
};

meta = {
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/util-linux/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@
let
version = lib.concatStringsSep "." ([ majorVersion ]
++ lib.optional (patchVersion != "") patchVersion);
majorVersion = "2.29";
patchVersion = "2";
majorVersion = "2.30";
patchVersion = "";

fstrimPatch = fetchpatch {
url = "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/patch/?id=155d48f590a50bb5dc265162ff2f9a971daed543";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc";
sha256 = "13d0ax8bcapga8phj2nclx86w57ddqxbr98ajibpzjq6d7zs8262";
};

patches = [