nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-22.11 into staging-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-06-30 00:14:49 +00:00
committed by GitHub
parent b5f328e907 e5a8c2598c
commit e32fb89b28
6 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-11";
version = "7.1.1-12";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-/CZRnNy/p87sEcH94RkRYgYXexFSU0Bm809pcvDFdV4=";
hash = "sha256-URwSufiTcLGWRFNOJidJyEcIPxWUSdN7yHaCiFh7GEI=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

16
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@@ -1,8 +1,8 @@
{
"stable": {
"version": "114.0.5735.133",
"sha256": "0qnj4gr4b9gmla1hbz1ir64hfmpc45vzkg0hmw9h6m72r4gfr2c2",
"sha256bin64": "0gk9l1xspbqdxv9q16zdcrrr6bxx677cnz7vv4pgg85k1pwhyw3g",
"version": "114.0.5735.198",
"sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9",
"sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92",
"deps": {
"gn": {
"version": "2023-04-19",
@@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
"version": "114.0.5735.133",
"sha256": "0qnj4gr4b9gmla1hbz1ir64hfmpc45vzkg0hmw9h6m72r4gfr2c2",
"sha256bin64": "0gk9l1xspbqdxv9q16zdcrrr6bxx677cnz7vv4pgg85k1pwhyw3g",
"version": "114.0.5735.198",
"sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9",
"sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92",
"deps": {
"gn": {
"version": "2023-04-19",
@@ -56,8 +56,8 @@
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
},
"ungoogled-patches": {
"rev": "114.0.5735.133-1",
"sha256": "1i9ql4b2rn9jryyc3hfr9kh8ccf5a4gvpwsp9lnp9jc2gryrv70y"
"rev": "114.0.5735.198-1",
"sha256": "1zda5c7n43zviwj3n2r2zbhmylkrfy54hggq8cisbdrhhfn96vii"
}
}
}

12
pkgs/applications/version-management/gitlab/data.json
View File

@@ -1,14 +1,14 @@
{
"version": "15.11.9",
"repo_hash": "sha256-G8Z8EYEtsSg3MH4ILeX9m/WLmE+XbcgZsPMORcyIKKw=",
"version": "15.11.10",
"repo_hash": "sha256-9s9RlUFI70UoJWKRTSf4bcR0ZPix5MqgGSraJCjQoNU=",
"yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v15.11.9-ee",
"rev": "v15.11.10-ee",
"passthru": {
"GITALY_SERVER_VERSION": "15.11.9",
"GITLAB_PAGES_VERSION": "15.11.9",
"GITALY_SERVER_VERSION": "15.11.10",
"GITLAB_PAGES_VERSION": "15.11.10",
"GITLAB_SHELL_VERSION": "14.18.0",
"GITLAB_WORKHORSE_VERSION": "15.11.9"
"GITLAB_WORKHORSE_VERSION": "15.11.10"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@@ -11,7 +11,7 @@ let
gemdir = ./.;
};
version = "15.11.9";
version = "15.11.10";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -22,7 +22,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-ISrSU2r+IUDBSdMhfbpO08fqhdlEtliyU6UHTkQ+koE=";
sha256 = "sha256-iIaLxvGz+VFOdCzrNbp1RuY1OW/TYOSAeLk4HVavBUI=";
};
vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "15.11.9";
version = "15.11.10";
src = fetchFromGitLab {
owner = data.owner;

1
pkgs/development/python-modules/scikit-optimize/default.nix
View File

@@ -39,5 +39,6 @@ buildPythonPackage rec {
homepage = "https://scikit-optimize.github.io/";
license = licenses.bsd3;
maintainers = [ maintainers.costrouc ];
broken = true; # It will fix by https://github.com/scikit-optimize/scikit-optimize/pull/1123
};
}