nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 04:50: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-03-15 00:14:26 +00:00
committed by GitHub
parent b60c754ed8 a9c06a4d0f
commit 346abf46bc
12 changed files with 509 additions and 420 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-0";
version = "7.1.1-2";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-FaoiB8qnzgREaslEXRituToIbU9tK3FnvC5ptFkctjA=";
hash = "sha256-5B8grg05n+MkHZU76QBsrrU5Z3VZRGMRHX35HXtTbe8=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

806
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

3
pkgs/applications/networking/browsers/firefox/common.nix
View File

@@ -230,7 +230,8 @@ buildStdenv.mkDerivation ({
hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o=";
})
]
++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch
++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch
++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch
++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch
++ extraPatches;

22
pkgs/applications/networking/browsers/firefox/env_var_for_system_dir-ff111.patch Normal file
View File

@@ -0,0 +1,22 @@
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 6db876975187..5882c5d7f1d6 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -11,6 +11,7 @@
#include "jsapi.h"
#include "xpcpublic.h"
+#include "prenv.h"
#include "prprf.h"
#include "nsIAppStartup.h"
@@ -309,7 +310,8 @@ static nsresult GetSystemParentDirectory(nsIFile** aFile) {
"/usr/lib/mozilla"_ns
# endif
;
- rv = NS_NewNativeLocalFile(dirname, false, getter_AddRefs(localDir));
+ const char* pathVar = PR_GetEnv("MOZ_SYSTEM_DIR");
+ rv = NS_NewNativeLocalFile((pathVar && *pathVar) ? nsDependentCString(pathVar) : reinterpret_cast<const nsCString&>(dirname), false, getter_AddRefs(localDir));
# endif
if (NS_SUCCEEDED(rv)) {

8
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "110.0.1";
version = "111.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "42c6a99a3874a0f60121188c43788fb35577734d9366c3f89ad41b8328cc542ce172ec81ca35b9ea551eaa698197ccdb43922ec3215d311e0770aaaa59625d21";
sha512 = "cdb300fdbb2b60068b0fc10a18df587b417e484901d36f52dd174d320d3440a42b02ea000f325c5781fd8853a5171b1a5184562fb535ece90619e4c64d46bb82";
};
meta = {
@@ -29,11 +29,11 @@ rec {
firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102";
version = "102.8.0esr";
version = "102.9.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275";
sha512 = "3923212ce4b7d1f589129025961ff1b380b8aaf1dd074674f3bd63cf14e9a44ff051bda556b7796c25634e153de00ce62243ece15a520f63dd0791a19b2a6685";
};
meta = {

27
pkgs/applications/networking/cluster/kubernetes-metrics-server/default.nix Normal file
View File

@@ -0,0 +1,27 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "kubernetes-metrics-server";
version = "0.6.2";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "metrics-server";
rev = "v${version}";
sha256 = "sha256-TTI+dNBQ/jKt6Yhud3/OO+zOkeO46CmUz6J6ByX26JE=";
};
vendorSha256 = "sha256-lpSMvHYlPtlJQUqsdXJ6ewBEBiwLPvP/rsUgYzJhOxc=";
preCheck = ''
# the e2e test breaks the sandbox, so let's skip that
rm test/e2e_test.go
'';
meta = with lib; {
homepage = "https://github.com/kubernetes-sigs/metrics-server";
description = "Kubernetes container resource metrics collector";
license = licenses.asl20;
maintainers = with maintainers; [ eskytthe ];
};
}

4
pkgs/applications/networking/instant-messengers/discord/default.nix
View File

@@ -3,7 +3,7 @@ let
versions = if stdenv.isLinux then {
stable = "0.0.25";
ptb = "0.0.39";
canary = "0.0.148";
canary = "0.0.149";
} else {
stable = "0.0.264";
ptb = "0.0.59";
@@ -22,7 +22,7 @@ let
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-2ZrSDyPj3AHriCWZ/bb303H3J97TTun//WjmInNEmwk=";
sha256 = "sha256-8DHr7adczIv9FXaxPxSfZPn+8ogWLWHRp9l0JpKhoiY=";
};
};
x86_64-darwin = {

6
pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
View File

@@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "git-workspace";
version = "1.1.0";
version = "1.2.1";
src = fetchFromGitHub {
owner = "orf";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rCy6+cjjFgcMqYn48Gfw+tTIMmsTD9lz8h14EfXWatI=";
sha256 = "sha256-Ppb42u31/iJd743vKX+5RdI7aITsWg9Jg0Aheguep5s=";
};
cargoSha256 = "sha256-aO9DYD20KQL2cLWy3uIQLJ1oR4PHNbgZLYi/Y8O6UHk=";
cargoSha256 = "sha256-O0wyNdgY1meEBJh/tEHxwzjNQdzxbKn5Ji+gdd146vQ=";
nativeBuildInputs = [ pkg-config ];

37
pkgs/development/haskell-modules/configuration-nix.nix
View File

@@ -907,34 +907,51 @@ self: super: builtins.intersectAttrs super {
(overrideCabal { doCheck = pkgs.postgresql.doCheck; })
];
cachix = overrideCabal (drv: {
version = "1.1";
cachix = let
hnix-store-core_0_6_1_0 = overrideCabal (drv: {
version = "0.6.1.0";
src = "${pkgs.fetchFromGitHub {
owner = "haskell-nix";
repo = "hnix-store";
rev = "core-0.6.1.0";
sha256 = "sha256-UOe+dY1dhCvdEKjPF1gNpfc4cNhZSKSbvu4yG+XVqbg=";
}}/hnix-store-core";
}) super.hnix-store-core;
in overrideCabal (drv: {
version = "1.3.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.1";
sha256 = "sha256-lML+E5RR5Pk2Do85+8Qs7mMVqp7ImlCIqEYjUAS08W4=";
rev = "v1.3.1";
sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU=";
};
buildDepends = [ self.conduit-zstd ];
buildDepends = [ self.conduit-zstd self.conduit-concurrent-map self.fsnotify_0_4_1_0 hnix-store-core_0_6_1_0 ];
postUnpack = "sourceRoot=$sourceRoot/cachix";
postPatch = ''
sed -i 's/1.0.1/1.1/' cachix.cabal
sed -i 's/1.3/1.3.1/' cachix.cabal
'';
}) (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; });
cachix-api = overrideCabal (drv: {
version = "1.1";
version = "1.3.1";
src = pkgs.fetchFromGitHub {
owner = "cachix";
repo = "cachix";
rev = "v1.1";
sha256 = "sha256-lML+E5RR5Pk2Do85+8Qs7mMVqp7ImlCIqEYjUAS08W4=";
rev = "v1.3.1";
sha256 = "sha256-fYQrAgxEMdtMAYadff9Hg4MAh0PSfGPiYw5Z4BrvgFU=";
};
buildDepends = [ self.stm-chans ];
postUnpack = "sourceRoot=$sourceRoot/cachix-api";
}) super.cachix-api;
hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; };
hercules-ci-agent =
appendPatch (pkgs.fetchpatch {
name = "hercules-ci-agent-support-cachix-1.3.patch";
url = "https://github.com/hercules-ci/hercules-ci-agent/pull/500.diff";
sha256 = "sha256-ErrFvzB1NiIJLpsP2wfx5CX8DnH1x5i/ijQZEeuOzeI=";
relative = "hercules-ci-agent";
})
(super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_9; });
hercules-ci-cnix-expr =
addTestToolDepend pkgs.git (
super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_9; }

4
pkgs/servers/maddy/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "maddy";
version = "0.6.2";
version = "0.6.3";
src = fetchFromGitHub {
owner = "foxcpp";
repo = "maddy";
rev = "v${version}";
sha256 = "sha256-DBSqC4EteESYb6RbC2xyS+6YczGviWYnyMz7QvCO3Uc=";
sha256 = "sha256-vf+jkXerdwvQhtyiOObBRxh8sYMEcgXC5vNzm5wquBs=";
};
vendorSha256 = "sha256-10cLNl9jWYX8XIKQkCxJ+/ymZC1YJRHUJWZQhq7zeV4=";

6
pkgs/servers/tailscale/default.nix
View File

@@ -2,15 +2,15 @@
buildGoModule rec {
pname = "tailscale";
version = "1.32.3";
version = "1.36.2";
src = fetchFromGitHub {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
sha256 = "sha256-mM9+qumB7pbP1LIN3ZJRNYHywwASKL4jmsmz5jQGRtg=";
hash = "sha256-5rGRe4ENIQVz8KDy1OuSKtD7UMVYmU2DaJAn7wrhXVQ=";
};
vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE=";
vendorHash = "sha256-xdZlwv/2knOE7xaGeNHYNdztflhLLmirGzPOJpDvk3s=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

2
pkgs/top-level/all-packages.nix
View File

@@ -29933,6 +29933,8 @@ with pkgs;
kubectl = callPackage ../applications/networking/cluster/kubernetes/kubectl.nix { };
kubectl-convert = kubectl.convert;
kubernetes-metrics-server = callPackage ../applications/networking/cluster/kubernetes-metrics-server { };
kubemqctl = callPackage ../applications/networking/cluster/kubemqctl { };
kubent = callPackage ../applications/networking/cluster/kubent { };