From ad40c4059c29aaa34bbf1d76b587de7a418010ef Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 15:00:56 +0000 Subject: [PATCH 1/4] linux: 4.4.279 -> 4.4.280 (cherry picked from commit 20ed07939ee194195f1b5ded634ae0bc7252dbf4) --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index da435b307e5..78192baa816 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.279"; + version = "4.4.280"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { 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 ]; From 08b33c754dba9d033112b264ebad47332e727479 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 15:01:11 +0000 Subject: [PATCH 2/4] linux: 5.13.9 -> 5.13.10 (cherry picked from commit ff1408d8b0d0baadb5e61f93904b820d0232bbbb) --- pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix index 4086299c0c3..73625913354 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; 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 = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { 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 ]; From 1cd2856e049f1f12b707d009ec72a58636cebffe Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 12 Aug 2021 15:01:53 +0000 Subject: [PATCH 3/4] linux-rt_5_4: 5.4.129-rt61 -> 5.4.138-rt62 (cherry picked from commit 89a50ded986523e04028e8ebc1b12274c52ea96d) --- pkgs/os-specific/linux/kernel/linux-rt-5.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 03ee0f3238f..b1fcfd0da0a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: 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; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; + sha256 = "0mw6k9zrcmv1j4b3han5c0q8xbh38bka2wkkbl1y3ralg9r5ffd4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { 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; From b3743e632534da9416c44a7a12ae4b1a36b82a77 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Sat, 14 Aug 2021 09:59:29 +0200 Subject: [PATCH 4/4] haskellPackages.readline: fix Setup.hs to work with Cabal 3 See https://github.com/NixOS/nixpkgs/pull/111985/ for previous discussion (cherry picked from commit b950ecaf3a49662ba92e6c978aa472155eddd47f) --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- .../patches/readline-fix-for-cabal-3.patch | 8 ++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d62741d590e..2f142d29a38 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1583,6 +1583,10 @@ self: super: { 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 essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { http-client = self.http-client_0_7_8; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ad6dd7115ae..5c7568416b7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3772,7 +3772,6 @@ broken-packages: - read-bounded - read-ctags - read-io - - readline - readme-lhs - readshp - really-simple-xml-parser diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 198ce1cc4a5..ba4e363423e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -216709,8 +216709,6 @@ self: { librarySystemDepends = [ ncurses readline ]; description = "An interface to the GNU readline library"; license = "GPL"; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) ncurses; inherit (pkgs) readline;}; "readline-statevar" = callPackage diff --git a/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch b/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch new file mode 100644 index 00000000000..95853b32a14 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/readline-fix-for-cabal-3.patch @@ -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