diff options
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/lksctp-tools/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 31 insertions, 6 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 5f0a23853e4..21e0d2b5128 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -395,10 +395,14 @@ rec { layer = if runAsRoot == null - then mkPureLayer { inherit name baseJson contents extraCommands; } - else mkRootLayer { inherit name baseJson fromImage fromImageName - fromImageTag contents runAsRoot diskSize - extraCommands; }; + then mkPureLayer { + name = baseName; + inherit baseJson contents extraCommands; + } else mkRootLayer { + name = baseName; + inherit baseJson fromImage fromImageName fromImageTag + contents runAsRoot diskSize extraCommands; + }; result = runCommand "docker-image-${baseName}.tar.gz" { buildInputs = [ jshon pigz coreutils findutils ]; imageName = name; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index 5c7348678b7..b01620e7a9a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -60,4 +60,7 @@ self: super: { sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; }); + # https://github.com/christian-marie/xxhash/issues/3 + xxhash = doJailbreak super.xxhash; + } diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index bb86b41fd21..2930ebdfc7b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.28"; + version = "4.4.30"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z7ln5llv67n2y9k6ihy4l4zm03yabhma8xhc0psp4x8168wn6l4"; + sha256 = "0p4r779fyhjp9fxc00qqfanjxm1xlajabd2b8d7y1p8jplrr294x"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix new file mode 100644 index 00000000000..f5f08a3e7c6 --- /dev/null +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "lksctp-tools-1.0.17"; + + src = fetchurl { + url = "mirror://sourceforge/lksctp/${name}.tar.gz"; + sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs"; + }; + + meta = { + description = "Linux Kernel Stream Control Transmission Protocol Tools."; + homepage = http://lksctp.sourceforge.net/; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9583121c019..56011d3d254 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2327,6 +2327,8 @@ in ffmpeg = ffmpeg_2; }; + lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; + lnav = callPackage ../tools/misc/lnav { }; loc = callPackage ../development/misc/loc { }; |