From d1c08981f676d9205080ffec5cba364257b50aa0 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 29 Sep 2021 21:18:21 -0400 Subject: [PATCH 1/5] newlib: Add parameter for "nano" variant --- pkgs/development/misc/newlib/default.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/misc/newlib/default.nix b/pkgs/development/misc/newlib/default.nix index 193ec53d5ad..93c50ea3cc5 100644 --- a/pkgs/development/misc/newlib/default.nix +++ b/pkgs/development/misc/newlib/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchurl, buildPackages }: +{ stdenv, fetchurl, buildPackages +, # "newlib-nano" is what the official ARM embedded toolchain calls this build + # configuration that prioritizes low space usage. We include it as a preset + # for embedded projects striving for a similar configuration. + nanoizeNewlib ? false +}: let version = "3.3.0"; in stdenv.mkDerivation { @@ -22,10 +27,21 @@ in stdenv.mkDerivation { "--disable-newlib-supplied-syscalls" "--disable-nls" + "--enable-newlib-retargetable-locking" + ] ++ (if !nanoizeNewlib then [ "--enable-newlib-io-long-long" "--enable-newlib-register-fini" - "--enable-newlib-retargetable-locking" - ]; + ] else [ + "--enable-newlib-reent-small" + "--disable-newlib-fvwrite-in-streamio" + "--disable-newlib-fseek-optimization" + "--disable-newlib-wide-orient" + "--enable-newlib-nano-malloc" + "--disable-newlib-unbuf-stream-opt" + "--enable-lite-exit" + "--enable-newlib-global-atexit" + "--enable-newlib-nano-formatted-io" + ]); dontDisableStatic = true; From 4c4cc6f430cd6d6377c48ca6bbd563ad7ae45bbc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 4 Oct 2021 04:20:00 +0000 Subject: [PATCH 2/5] redis: 6.2.5 -> 6.2.6 https://github.com/redis/redis/releases/tag/6.2.6 (cherry picked from commit 6ea41eaabb48dd8401d0d30b85fb7004a615a320) --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index d9c17bcca9b..5c05f4ce3eb 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "6.2.5"; + version = "6.2.6"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1bjismh8lrvsjkm1wf5ak0igak5rr9cc39i0brwb6x0vk9q7b6jb"; + sha256 = "1ariw5x33hmmm3d5al0j3307l5kf3vhmn78wpyaz67hia1x8nasv"; }; # Cross-compiling fixes From 92162ff87fb2bcf9099a2591dca0ee22446bab2c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 30 Sep 2021 20:49:31 -0400 Subject: [PATCH 3/5] newlib-nano: Init This ensures CI tests the nano variant. It also makes it easier to use with `libc = "newlib-nano";` in a platform description. (cherry picked from commit e3ff6189f6aa641e108876de32ad83a542259b60) --- pkgs/top-level/all-packages.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 941dbd125f4..5eb15a817ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15006,6 +15006,7 @@ in else if name == "newlib" && stdenv.targetPlatform.isVc4 then targetPackages.vc4-newlib or vc4-newlib else if name == "newlib" && stdenv.targetPlatform.isOr1k then targetPackages.or1k-newlib or or1k-newlib else if name == "newlib" then targetPackages.newlibCross or newlibCross + else if name == "newlib-nano" then targetPackages.newlib-nanoCross or newlib-nanoCross else if name == "musl" then targetPackages.muslCross or muslCross else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64 else if name == "libSystem" then @@ -31635,7 +31636,15 @@ in newlib = callPackage ../development/misc/newlib { }; newlibCross = callPackage ../development/misc/newlib { stdenv = crossLibcStdenv; - }; + }; + + newlib-nano = callPackage ../development/misc/newlib { + nanoizeNewlib = true; + }; + newlib-nanoCross = callPackage ../development/misc/newlib { + nanoizeNewlib = true; + stdenv = crossLibcStdenv; + }; omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; From 6d0ceff09d30ab1b72eaaa27bdfe5d423331d989 Mon Sep 17 00:00:00 2001 From: Lara Date: Mon, 4 Oct 2021 04:51:27 +0000 Subject: [PATCH 4/5] gitlab: 14.3.1 -> 14.3.2 (cherry picked from commit b00924518c5b580ffec242e4c7ee8521ce041ac7) --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-shell/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 3372b7aa77b..6578d5e2a0f 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.3.1", - "repo_hash": "1ahqiczp978hc0i45djiz2c9pf32hw8hrmk3pg4bb6wg6315zmvl", + "version": "14.3.2", + "repo_hash": "1vsppz5akx5l54riacqbzkgdy47j9r71550mg2ay5ihy6iqxa2xr", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.3.1-ee", + "rev": "v14.3.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.3.1", + "GITALY_SERVER_VERSION": "14.3.2", "GITLAB_PAGES_VERSION": "1.44.0", - "GITLAB_SHELL_VERSION": "13.21.0", - "GITLAB_WORKHORSE_VERSION": "14.3.1" + "GITLAB_SHELL_VERSION": "13.21.1", + "GITLAB_WORKHORSE_VERSION": "14.3.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index dc855e9db3a..e833ebd84ac 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,7 +20,7 @@ let }; }; }; - version = "14.3.1"; + version = "14.3.2"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -32,7 +32,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-0jjzrBpt8/wTnUAvrZi8lH9SknfYZawBbE/QmDxsVqM="; + sha256 = "sha256-00Sgv1b3dwbN7ic//7NtrdiliunOnXRJ0GTQHYFjuqo="; }; vendorSha256 = "sha256-9RhPQosen70E9t1iAoc2SeKs9pYMMpMqgXLekWfKNf8="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index b87f87b06b1..2ffc52f3b12 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.21.0"; + version = "13.21.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-klj5N3UKCwJ5LveaiWv3i13GV/svZKeA1ZKKfvOjhg4="; + sha256 = "sha256-FBkxJLl58ZbqM1P4LohsozGiKg38gQwVGOV9AAjVE0M="; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index f84af7e759c..c696afaa4f2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.3.1"; + version = "14.3.2"; src = fetchFromGitLab { owner = data.owner; From 849fed9f963638871ba3d548480a5e93d77f7449 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 4 Oct 2021 21:31:30 +0200 Subject: [PATCH 5/5] haskell-language-server: remove ghc8107 from the wrapper GHC 8.10.7 is only in 21.05 for bootstrapping GHCJS, so it shouldn't be included in the hls wrapper. This change was a result of an overeager backport and we'll revert it here. Also rollback some unnecessary change to release-haskell.nix, so it can be used for testing evaluation still. --- .../tools/haskell/haskell-language-server/withWrapper.nix | 2 +- pkgs/top-level/release-haskell.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 729edf44a4f..23bd3dd3267 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "884" "8104" "8107" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "884" "8104" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 9a57989430e..48128489bbd 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -207,7 +207,7 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = all; - Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ghc8107 ]; + Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ghc8107 ]; funcmp = all; # Doesn't currently work on ghc-9.0: # https://github.com/haskell/haskell-language-server/issues/297