public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

This commit is contained in:
github-actions[bot] 2021-08-16 12:03:37 +00:00 committed by GitHub
parent 4ae23495c2 b3743e6325
commit 0f0eda905a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1583,6 +1583,10 @@ self: super: {
addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
); );
# Readline uses Distribution.Simple from Cabal 2, in a way that is not
# compatible with Cabal 3. No upstream repository found so far
readline = appendPatch super.readline ./patches/readline-fix-for-cabal-3.patch;
# 2020-12-05: http-client is fixed on too old version # 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
http-client = self.http-client_0_7_8; http-client = self.http-client_0_7_8;

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -3772,7 +3772,6 @@ broken-packages:
- read-bounded - read-bounded
- read-ctags - read-ctags
- read-io - read-io
- readline
- readme-lhs - readme-lhs
- readshp - readshp
- really-simple-xml-parser - really-simple-xml-parser

2
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -216709,8 +216709,6 @@ self: {
librarySystemDepends = [ ncurses readline ]; librarySystemDepends = [ ncurses readline ];
description = "An interface to the GNU readline library"; description = "An interface to the GNU readline library";
license = "GPL"; license = "GPL";
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) ncurses; inherit (pkgs) readline;}; }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
"readline-statevar" = callPackage "readline-statevar" = callPackage

8
pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch Normal file
View File

@ -0,0 +1,8 @@
--- a/Setup.hs 2021-02-04 14:01:09.557970245 +0100
+++ b/Setup.hs 2021-02-04 14:07:45.047443753 +0100
@@ -3,4 +3,4 @@
import Distribution.Simple
main :: IO ()
-main = defaultMainWithHooks defaultUserHooks
+main = defaultMainWithHooks autoconfUserHooks

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -1,13 +1,13 @@
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.4.279"; version = "4.4.280";
extraMeta.branch = "4.4"; extraMeta.branch = "4.4";
extraMeta.broken = stdenv.isAarch64; extraMeta.broken = stdenv.isAarch64;
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1d3cfhs7ixk0dhh1mc1z6y73i816a2wl16zhayl1ssp69d4ndpsb"; sha256 = "1b9jx9zkycj0xjmy35890q5phiznayaz730dmsv3mdjg4qgfn18y";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

4
pkgs/os-specific/linux/kernel/linux-5.13.nix
View File

@ -3,7 +3,7 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.13.9"; version = "5.13.10";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed # modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@ -13,7 +13,7 @@ buildLinux (args // rec {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "16hm6sb64f1hlr0qmf2w81zv55s6flj1x8jr2q326d9ny30przkj"; sha256 = "01fpj02q4vdn7i6f6710lly0w33cd5gfvn6avgrjglcbiwdzbjih";
}; };
kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ]; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];

6
pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
View File

@ -6,7 +6,7 @@
, ... } @ args: , ... } @ args:
let let
version = "5.4.129-rt61"; # updated by ./update-rt.sh version = "5.4.138-rt62"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version; branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0; kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // { in buildLinux (args // {
@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; sha256 = "0mw6k9zrcmv1j4b3han5c0q8xbh38bka2wkkbl1y3ralg9r5ffd4";
}; };
kernelPatches = let rt-patch = { kernelPatches = let rt-patch = {
name = "rt"; name = "rt";
patch = fetchurl { patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0b3hp6a7afkjqd7an4hj423nq6flwzd42kjcyk4pifv5fx6c7pgq"; sha256 = "1zw7806fxx9cai9n6siv534x5r52d8fc13r07ypgw461pijcy5p6";
}; };
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;