Merge staging-next-21.05 into staging-21.05
This commit is contained in:
github-actions[bot]
GitHub
commit
97c6ed64eb
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "14.3.1";
|
||||
version = "14.3.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -31621,7 +31622,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 { };
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue