b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2023-06-24 00:02:43 +00:00 committed by GitHub
parent ea69de970d ecc86467d1
commit eda8cc3756
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 5340 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/monitoring/grafana.nix
View file

@ -1773,7 +1773,7 @@ in
# Warn about deprecated notifiers.
deprecatedNotifiers = optional (cfg.provision.notifiers != [ ]) ''
Notifiers are deprecated upstream and will be removed in Grafana 10.
Notifiers are deprecated upstream and will be removed in Grafana 11.
Use `services.grafana.provision.alerting.contactPoints` instead.
'';

6
nixos/modules/services/networking/syncthing.nix
View file

@ -55,9 +55,9 @@ let
# generate the new config by merging with the NixOS config options
new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
"devices": (${builtins.toJSON devices}${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}),
"folders": (${builtins.toJSON folders}${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"})
} * ${builtins.toJSON cfg.extraOptions}')
"devices": ('${escapeShellArg (builtins.toJSON devices)}'${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}),
"folders": ('${escapeShellArg (builtins.toJSON folders)}'${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"})
} * '${escapeShellArg (builtins.toJSON cfg.extraOptions)})
# send the new config
curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config

5
nixos/tests/syncthing-init.nix
View file

@ -1,6 +1,7 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: let
testId = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
testName = "testDevice foo'bar";
in {
name = "syncthing-init";
@ -9,12 +10,12 @@ in {
nodes.machine = {
services.syncthing = {
enable = true;
devices.testDevice = {
devices.${testName} = {
id = testId;
};
folders.testFolder = {
path = "/tmp/test";
devices = [ "testDevice" ];
devices = [ testName ];
};
extraOptions.gui.user = "guiUser";
};

6
pkgs/applications/blockchains/erigon/default.nix
View file

@ -2,7 +2,7 @@
let
pname = "erigon";
version = "2.45.1";
version = "2.47.0";
in
buildGoModule {
inherit pname version;
@ -11,11 +11,11 @@ buildGoModule {
owner = "ledgerwatch";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uaEGshpAmCXIIcpN5Fx/VNUK8DgQp9yFm2xBDGz7FNo=";
sha256 = "sha256-LmubFpewCEPcLzezEWye8y4Vjv68coxoCtrffxJsodY=";
fetchSubmodules = true;
};
vendorSha256 = "sha256-Yd78OW48HsOgxT5R3QT6/xDzPsRNFRE2nKocljTKKBA=";
vendorSha256 = "sha256-zgBStaULqbdZmBDi/3AjGx35mh45M3uFkDd5z/vQeMQ=";
proxyVendor = true;
# Build errors in mdbx when format hardening is enabled:

26
pkgs/applications/file-managers/browsr/default.nix
View file

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "browsr";
version = "1.10.7";
version = "1.11.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "juftin";
repo = "browsr";
rev = "v${version}";
hash = "sha256-AT5cFQ4CldlHv3MQYAGXdZVB3bNAAvbJeosdxZjcPBM=";
hash = "sha256-LhrMQFkvdkYra/6jQtMAooGy76qLYldHoxEGMPhde7Q=";
};
nativeBuildInputs = with python3.pkgs; [
@ -25,7 +25,6 @@ python3.pkgs.buildPythonApplication rec {
propagatedBuildInputs = with python3.pkgs; [
art
click
fsspec
pandas
pillow
pymupdf
@ -33,35 +32,24 @@ python3.pkgs.buildPythonApplication rec {
rich-click
rich-pixels
textual
universal-pathlib
textual-universal-directorytree
] ++ lib.attrVals extras passthru.optional-dependencies;
passthru.optional-dependencies = with python3.pkgs; {
all = [
adlfs
aiohttp
gcsfs
paramiko
pyarrow
requests
s3fs
textual-universal-directorytree.optional-dependencies.remote
];
parquet = [
pyarrow
];
remote = [
adlfs
aiohttp
gcsfs
paramiko
requests
s3fs
textual-universal-directorytree.optional-dependencies.remote
];
};
pythonRelaxDeps = [
"art"
"fsspec"
"pymupdf"
"rich-click"
"textual"
@ -78,8 +66,8 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "A file explorer in your terminal";
homepage = "https://github.com/juftin/browsr";
changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/${src.rev}";
homepage = "https://juftin.com/browsr";
changelog = "https://github.com/juftin/browsr/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};

2
pkgs/applications/networking/browsers/chromium/common.nix
View file

@ -249,7 +249,7 @@ let
# Allow building against system libraries in official builds
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py
'' + lib.optionalString stdenv.isAarch64 ''
'' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.isAarch64) ''
substituteInPlace build/toolchain/linux/BUILD.gn \
--replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
'' + lib.optionalString ungoogled ''

3
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -1,4 +1,5 @@
{ newScope, config, stdenv, fetchurl, makeWrapper
, buildPackages
, llvmPackages_16
, ed, gnugrep, coreutils, xdg-utils
, glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit
@ -47,7 +48,7 @@ let
inherit channel chromiumVersionAtLeast versionRange;
inherit proprietaryCodecs
cupsSupport pulseSupport ungoogled;
gnChromium = gn.overrideAttrs (oldAttrs: {
gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: {
inherit (upstream-info.deps.gn) version;
src = fetchgit {
inherit (upstream-info.deps.gn) url rev sha256;

8
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -89,7 +89,7 @@ let
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "12.0.7";
version = "12.5";
lang = "ALL";
@ -101,7 +101,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
hash = "sha256-lo+Iy6I7S1NV1E9CBPqJjRFzuEXGC80NRUUlpZfG5wU=";
hash = "sha256-ois/0ghnQVX6A4OsGybOX2Ph0eKHOHX0+qfR9rnA3v8=";
};
i686-linux = fetchurl {
@ -111,7 +111,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
hash = "sha256-aLHZUFDZZ4i7BXoM5YxPrznYw812/OGmhG97t9okOvs=";
hash = "sha256-Wee3wCVT+Ius9qOJOLTdAEysMh6Z2+swoS9obF28bYo=";
};
};
@ -248,7 +248,7 @@ stdenv.mkDerivation rec {
# Hard-code path to TBB fonts; see also FONTCONFIG_FILE in
# the wrapper below.
FONTCONFIG_FILE=$TBB_IN_STORE/TorBrowser/Data/fontconfig/fonts.conf
FONTCONFIG_FILE=$TBB_IN_STORE/fontconfig/fonts.conf
sed -i "$FONTCONFIG_FILE" \
-e "s,<dir>fonts</dir>,<dir>$TBB_IN_STORE/fonts</dir>,"

4
pkgs/applications/version-management/lefthook/default.nix
View file

@ -6,7 +6,7 @@
let
pname = "lefthook";
version = "1.4.2";
version = "1.4.3";
in
buildGoModule rec {
inherit pname version;
@ -15,7 +15,7 @@ buildGoModule rec {
owner = "evilmartians";
repo = "lefthook";
rev = "v${version}";
hash = "sha256-rghjOfQXs7udTjBdsCG6Rx7gI/6WGkRPXE/fsGCTCxA=";
hash = "sha256-y3oTGFZ3AXlNVt3NDfjM3audxZ4/zqt1SME+2g8nut8=";
};
vendorHash = "sha256-xeOWbfKy+LeInxcRM9evE/kmqlWlKy0mcHopWpc/DO0=";

6
pkgs/applications/virtualization/nixpacks/default.nix
View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "1.9.0";
version = "1.9.1";
src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-abdNKaasnygKm8X6/ybwXbHqvjLuV5FzKsJuWbADY5s=";
sha256 = "sha256-LTZl9ErmapABeVJyaVjO9Ulq0chDoRzwPBd6GzwYioI=";
};
cargoHash = "sha256-qj6Y/dDpX4pnWxxlgsxjDx0l9Yw5tizQrCZo0p/U9IE=";
cargoHash = "sha256-EIEfoSpNU/+GlxOd+oSw9QbURfp/yn7g13teuyjPJX0=";
# skip test due FHS dependency
doCheck = false;

10
pkgs/applications/window-managers/gamescope/default.nix
View file

@ -9,6 +9,7 @@
, vulkan-loader
, vulkan-headers
, wayland
, wayland-scanner
, wayland-protocols
, libxkbcommon
, libcap
@ -79,10 +80,18 @@ stdenv.mkDerivation {
})
];
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
meson
pkg-config
ninja
wayland-scanner
glslang
makeBinaryWrapper
];
@ -100,7 +109,6 @@ stdenv.mkDerivation {
libliftoff
vulkan-loader
vulkan-headers
glslang
SDL2
wayland
wayland-protocols

9
pkgs/development/compilers/llvm/16/clang/default.nix
View file

@ -36,9 +36,14 @@ let
"-DSPHINX_OUTPUT_MAN=ON"
"-DSPHINX_OUTPUT_HTML=OFF"
"-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
"-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"
"-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen"
# Added in LLVM15:
# `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb
# `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7
"-DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${buildLlvmTools.libclang.dev}/bin/clang-tidy-confusable-chars-gen"
"-DCLANG_PSEUDO_GEN=${buildLlvmTools.libclang.dev}/bin/clang-pseudo-gen"
];
patches = [
@ -81,7 +86,7 @@ let
patchShebangs $python/bin
mkdir -p $dev/bin
cp bin/clang-tblgen $dev/bin
cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin
'';
passthru = {

4
pkgs/development/python-modules/griffe/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "griffe";
version = "0.29.0";
version = "0.29.1";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-WZJogwxhSScJpTFVJaMn6LyIyZtOAxTnY3232NW0bds=";
hash = "sha256-df6uFIaTdTy5VMKxBZew5zK0/iO7KbttbjGBJp1Vhjw=";
};
postPatch = ''

4
pkgs/development/python-modules/jc/default.nix
View file

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "jc";
version = "1.23.2";
version = "1.23.3";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "kellyjonbrazil";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-nj7HyYjo5jDnA+H5/er/GPgC/bUR0UYBqu5zOSDA4p0=";
hash = "sha256-feD/8GLkewfVwtGRZs8YaWnb96bFICpcH6nkJmCmPgs=";
};
propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ];

4
pkgs/development/python-modules/lsprotocol/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "lsprotocol";
version = "2023.0.0a1";
version = "2023.0.0a2";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "microsoft";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-gfsqn9NtO7meMks4dUhrTYVlr69Ffh339GD9FvCJvJM=";
hash = "sha256-AEvs2fb8nhWEFMyLvwNv9HoxxxE50/KW3TGZ5pDf4dc=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/pyatv/default.nix
View file

@ -24,7 +24,7 @@
buildPythonPackage rec {
pname = "pyatv";
version = "0.13.0";
version = "0.13.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -33,7 +33,7 @@ buildPythonPackage rec {
owner = "postlund";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-xRQsPj44ydciOMj8wKTqJbKUJOxcItPi64qu4nhHY4U=";
hash = "sha256-2hRpjv9Yf4vpkZCYh2W0Lt6AlaO/RfpW3tNiovkwOnU=";
};
postPatch = ''

56
pkgs/development/python-modules/textual-universal-directorytree/default.nix Normal file
View file

@ -0,0 +1,56 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, hatchling
, textual
, universal-pathlib
, adlfs
, aiohttp
, gcsfs
, paramiko
, requests
, s3fs
}:
buildPythonPackage rec {
pname = "textual-universal-directorytree";
version = "1.0.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "juftin";
repo = "textual-universal-directorytree";
rev = "v${version}";
hash = "sha256-a7alxVmHTKJnJiU7X6UlUD2y7MY4O5TMR+02KcyPwEs=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
textual
universal-pathlib
];
passthru.optional-dependencies = {
remote = [
adlfs
aiohttp
gcsfs
paramiko
requests
s3fs
];
};
pythonImportsCheck = [ "textual_universal_directorytree" ];
meta = with lib; {
description = "Textual plugin for a DirectoryTree compatible with remote filesystems";
homepage = "https://github.com/juftin/textual-universal-directorytree";
changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/${src.rev}";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

5
pkgs/development/tools/misc/blackfire/php-probe.nix
View file

@ -19,7 +19,6 @@ let
"x86_64-linux" = {
system = "amd64";
sha256 = {
"8.0" = "ylzxQlyk6jpyO9Zcqv/uUiRWcMSkPKFBgiCDnyU8lWI=";
"8.1" = "FEb0NBJpwoYaNdEHEn4TkSQR7VShGpHptaDIRKwrmkQ=";
"8.2" = "itB0Zm1Mog18F8vIHn9AZMYMzafLQR0v5zcOgqy1ouI=";
};
@ -27,7 +26,6 @@ let
"i686-linux" = {
system = "i386";
sha256 = {
"8.0" = "DL5wiaez4tzrn8xY+ptYiCvZ1HWaStT9vGWPd5whTaE=";
"8.1" = "0bX2frll0ne6H6o7HNH4TRV2D+NDe11mVvqwhvSDg9E=";
"8.2" = "U6zmbEkRr3+9yVwUgQ1+SBNK0zWD92S2KBOHJ1gMmjM=";
};
@ -35,7 +33,6 @@ let
"aarch64-linux" = {
system = "arm64";
sha256 = {
"8.0" = "R6zdOw/K+/YPYzSEOEyz83hqiLHCM4EOjz2tLrJOPlE=";
"8.1" = "agLQVI3u7ENcWLDRx7YSEBZobRnwEaKAmFpIU5AXhqo=";
"8.2" = "Y2bUYaymoZ/Ct5a7K+5U+zNh9ZKUaq0Oal/v04nzuaU=";
};
@ -43,7 +40,6 @@ let
"aarch64-darwin" = {
system = "arm64";
sha256 = {
"8.0" = "XcFU1lq694aLIn1HQdDSg2Zx68/fLew3GjkTLsxHYvk=";
"8.1" = "ovTtwXPut9jCvxVyd5mQzrfJPCy+rQvUi4c74NrBzY4=";
"8.2" = "8hybE62l8vSwbqpcrnj/lI2Wjy8R3wuO04zwofLi9EY=";
};
@ -51,7 +47,6 @@ let
"x86_64-darwin" = {
system = "amd64";
sha256 = {
"8.0" = "F4mIvjyf3Zi3icKcPe6KP2gR9jeC7EJskw9TfsTHz6Y=";
"8.1" = "WsHH/XJboHeRhxpYY0WtXEJwOsGNFtfexBShC/J7GaQ=";
"8.2" = "w3Vu7CTFebn59i1FYVCYHiOadTIPlPCkQ1QHEfvHWig=";
};

4
pkgs/development/tools/misc/runme/default.nix
View file

@ -10,13 +10,13 @@
buildGoModule rec {
pname = "runme";
version = "1.2.4";
version = "1.2.5";
src = fetchFromGitHub {
owner = "stateful";
repo = "runme";
rev = "v${version}";
hash = "sha256-AhGApOUzmdf9TOF0cESrvg8CVT918nzolVHriVNxsaE=";
hash = "sha256-1rtYp5LH+PBUV9CJIn7V69BmQOin3/RHQ0MDZMAJH1k=";
};
vendorHash = "sha256-el+gM3GRN5KU4RlSAx02rn+22xj28IZq3erZUzPbUUw=";

4955
pkgs/development/tools/rust/cargo-component/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

73
pkgs/development/tools/rust/cargo-component/default.nix Normal file
View file

@ -0,0 +1,73 @@
{ lib
, rustPlatform
, fetchFromGitHub
, fetchpatch
, curl
, pkg-config
, protobuf
, libgit2
, openssl
, zlib
, stdenv
, darwin
}:
rustPlatform.buildRustPackage {
pname = "cargo-component";
version = "unstable-2023-06-20";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = "cargo-component";
rev = "277728b729577540fdd5977a59a4e51c061c6fcb";
hash = "sha256-Uu+S4TRbtei78ZNkYNkwHiIot0L7fUODJgd5xDjw8rg=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"warg-api-0.1.0" = "sha256-GYmHrGCmEMYCi8S+hd0CuBxkwF4BM1B9pJ1TOGCqHuk=";
};
};
patches = [
# update dependencies to make it work when dependencies are vendored
# https://github.com/bytecodealliance/registry/pull/138
./update-registry.patch
# fix build when it is not in a git repository
# https://github.com/bytecodealliance/cargo-component/pull/92
(fetchpatch {
name = "export-wasi-adapter-version-even-if-git-fails.patch";
url = "https://github.com/bytecodealliance/cargo-component/commit/9b2517fe2c4dbb1077a8785fd79c677ad1b7fc6b.patch";
hash = "sha256-nY8ltBb8H7zkE2JLhXJiBOMwTM8CVvkXTSHTUyMqamo=";
})
];
nativeBuildInputs = [
curl
pkg-config
protobuf
];
buildInputs = [
curl
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
darwin.apple_sdk.frameworks.CoreFoundation
];
# requires the wasm32-wasi target
doCheck = false;
meta = with lib; {
description = "A Cargo subcommand for creating WebAssembly components based on the component model proposal";
homepage = "https://github.com/bytecodealliance/cargo-component";
license = licenses.asl20;
maintainers = with maintainers; [ figsoda ];
};
}

93
pkgs/development/tools/rust/cargo-component/update-registry.patch Normal file
View file

@ -0,0 +1,93 @@
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4258,7 +4258,7 @@ dependencies = [
[[package]]
name = "warg-api"
version = "0.1.0"
-source = "git+https://github.com/bytecodealliance/registry#f0e45fc765e24e7bb6671f568ee4d3f80a723689"
+source = "git+https://github.com/bytecodealliance/registry?rev=a19e85a48f806599e3709332aa102623a0084277#a19e85a48f806599e3709332aa102623a0084277"
dependencies = [
"serde",
"serde_with",
@@ -4270,7 +4270,7 @@ dependencies = [
[[package]]
name = "warg-client"
version = "0.1.0"
-source = "git+https://github.com/bytecodealliance/registry#f0e45fc765e24e7bb6671f568ee4d3f80a723689"
+source = "git+https://github.com/bytecodealliance/registry?rev=a19e85a48f806599e3709332aa102623a0084277#a19e85a48f806599e3709332aa102623a0084277"
dependencies = [
"anyhow",
"async-trait",
@@ -4303,7 +4303,7 @@ dependencies = [
[[package]]
name = "warg-crypto"
version = "0.1.0"
-source = "git+https://github.com/bytecodealliance/registry#f0e45fc765e24e7bb6671f568ee4d3f80a723689"
+source = "git+https://github.com/bytecodealliance/registry?rev=a19e85a48f806599e3709332aa102623a0084277#a19e85a48f806599e3709332aa102623a0084277"
dependencies = [
"anyhow",
"base64 0.21.2",
@@ -4322,7 +4322,7 @@ dependencies = [
[[package]]
name = "warg-protocol"
version = "0.1.0"
-source = "git+https://github.com/bytecodealliance/registry#f0e45fc765e24e7bb6671f568ee4d3f80a723689"
+source = "git+https://github.com/bytecodealliance/registry?rev=a19e85a48f806599e3709332aa102623a0084277#a19e85a48f806599e3709332aa102623a0084277"
dependencies = [
"anyhow",
"base64 0.21.2",
@@ -4347,7 +4347,7 @@ dependencies = [
[[package]]
name = "warg-server"
version = "0.1.0"
-source = "git+https://github.com/bytecodealliance/registry#f0e45fc765e24e7bb6671f568ee4d3f80a723689"
+source = "git+https://github.com/bytecodealliance/registry?rev=a19e85a48f806599e3709332aa102623a0084277#a19e85a48f806599e3709332aa102623a0084277"
dependencies = [
"anyhow",
"axum",
@@ -4355,7 +4355,6 @@ dependencies = [
"clap",
"futures",
"indexmap",
- "reqwest",
"serde",
"tempfile",
"thiserror",
@@ -4365,6 +4364,7 @@ dependencies = [
"tower-http",
"tracing",
"tracing-subscriber",
+ "url",
"warg-api",
"warg-crypto",
"warg-protocol",
@@ -4375,7 +4375,7 @@ dependencies = [
[[package]]
name = "warg-transparency"
version = "0.1.0"
-source = "git+https://github.com/bytecodealliance/registry#f0e45fc765e24e7bb6671f568ee4d3f80a723689"
+source = "git+https://github.com/bytecodealliance/registry?rev=a19e85a48f806599e3709332aa102623a0084277#a19e85a48f806599e3709332aa102623a0084277"
dependencies = [
"anyhow",
"pbjson",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,9 +9,9 @@ cargo = "0.71.0"
cargo-util = "0.2.4"
clap = { version = "4.3.3", features = ["derive"] }
toml_edit = { version = "0.19.10", features = ["serde"] }
-warg-protocol = { git = "https://github.com/bytecodealliance/registry" }
-warg-crypto = { git = "https://github.com/bytecodealliance/registry" }
-warg-client = { git = "https://github.com/bytecodealliance/registry" }
+warg-protocol = { git = "https://github.com/bytecodealliance/registry", rev = "a19e85a48f806599e3709332aa102623a0084277" }
+warg-crypto = { git = "https://github.com/bytecodealliance/registry", rev = "a19e85a48f806599e3709332aa102623a0084277" }
+warg-client = { git = "https://github.com/bytecodealliance/registry", rev = "a19e85a48f806599e3709332aa102623a0084277" }
wit-bindgen-core = "0.7.0"
wit-bindgen-rust = "0.7.0"
wit-bindgen-rust-lib = "0.7.0"
@@ -47,4 +47,4 @@ default = ["pretty_env_logger"]
assert_cmd = "2.0.11"
predicates = "3.0.3"
wasmparser = "0.107.0"
-warg-server = { git = "https://github.com/bytecodealliance/registry" }
+warg-server = { git = "https://github.com/bytecodealliance/registry", rev = "a19e85a48f806599e3709332aa102623a0084277" }

15
pkgs/development/tools/wgo/default.nix
View file

@ -1,8 +1,14 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
let
pname = "wgo";
version = "0.5.1";
in
buildGoModule {
inherit pname version;
src = fetchFromGitHub {
owner = "bokwoon95";
@ -11,7 +17,7 @@ buildGoModule rec {
hash = "sha256-kfa3Lm2oJomhoHbtSPLylRr+BFGV/y7xqSIv3xHHg3Q=";
};
vendorSha256 = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A=";
vendorHash = "sha256-jxyO3MGrC+y/jJuwur/+tLIsbxGnT57ZXYzaf1lCv7A=";
ldflags = [ "-s" "-w" ];
@ -21,7 +27,6 @@ buildGoModule rec {
description = "Live reload for Go apps";
homepage = "https://github.com/bokwoon95/wgo";
license = licenses.mit;
maintainers = with maintainers; [ bokwoon95 ];
maintainers = with maintainers; [ ];
};
}

3
pkgs/development/web/nodejs/v16.nix
View file

@ -10,6 +10,9 @@ let
in
buildNodejs {
inherit enableNpm;
# If you do upgrade here, please update in pkgs/top-level/release.nix
# the permitted insecure version to ensure it gets cached for our users
# and backport this to stable release (23.05).
version = "16.20.1";
sha256 = "sha256-g+AzgeJx8aVhkYjnrqnYXZt+EvW+KijOt41ySe0it/E=";
patches = [

6
pkgs/servers/dict/dictd-db-collector.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, dict }:
{ stdenv, lib, dict, libfaketime }:
({ dictlist, allowList ? [ "127.0.0.1" ], denyList ? [ ] }:
/*
@ -56,7 +56,8 @@ let
ln -s "$i".dict.dz
else
cp "$i".dict .
dictzip "$base".dict
source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T")
faketime -f "$source_date" dictzip "$base".dict
fi
ln -s "$i".index .
dictfmt_index2word --locale $locale < "$base".index > "$base".word || true
@ -76,6 +77,7 @@ in
stdenv.mkDerivation {
name = "dictd-dbs";
nativeBuildInputs = [ libfaketime ];
buildInputs = [ dict ];
dontUnpack = true;

7
pkgs/servers/dict/dictd-wordnet.nix
View file

@ -1,10 +1,10 @@
{lib, stdenv, python3, wordnet, writeScript}:
{lib, stdenv, python3, wordnet, writeScript, libfaketime}:
stdenv.mkDerivation rec {
version = "542";
pname = "dict-db-wordnet";
buildInputs = [python3 wordnet];
buildInputs = [python3 wordnet libfaketime];
convert = ./wordnet_structures.py;
builder = writeScript "builder.sh" ''
@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
DATA="$DATA `echo $i | sed -e s,data,index,` $i";
done
python ${convert} $DATA
source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T")
faketime -f "$source_date" python ${convert} $DATA
echo en_US.UTF-8 > locale
'';

9
pkgs/servers/dict/wiktionary/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python3, dict, glibcLocales }:
{ lib, stdenv, fetchurl, python3, dict, glibcLocales, libfaketime }:
stdenv.mkDerivation rec {
pname = "dict-db-wiktionary";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "qsha26LL2513SDtriE/0zdPX1zlnpzk1KKk+R9dSdew=";
};
nativeBuildInputs = [ python3 dict glibcLocales ];
nativeBuildInputs = [ python3 dict glibcLocales libfaketime ];
dontUnpack = true;
@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/dictd/
cd $out/share/dictd
${python3.interpreter} -O ${./wiktionary2dict.py} "${src}"
dictzip wiktionary-en.dict
source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T")
faketime -f "$source_date" ${python3.interpreter} -O ${./wiktionary2dict.py} "${src}"
faketime -f "$source_date" dictzip wiktionary-en.dict
echo en_US.UTF-8 > locale
'';

8
pkgs/servers/monitoring/grafana/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
version = "9.5.3";
version = "10.0.1";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
hash = "sha256-b9FkyDEidM7n+eY9IlZT9vysphe4CW5vGXYn9M5BIJM=";
hash = "sha256-7yxdUb0rP8yCyiy/IsMD3De66fwhY7KI8GNhwsbIB1o=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
hash = "sha256-PfdRPMQrEaTwg9wWeyJo6I9HuQX6sxl1JbT9CTixnyc=";
hash = "sha256-dENdPLbXka1NKix9KqgZ/K5RAB4jVZsVeDpnoPllnEM=";
};
vendorHash = "sha256-E9Qdsk691+laPrQQnYBIwxAIbXh7wxB0G2e/Vp+4x98=";
vendorHash = "sha256-ZDUEqueAr0z8+8+CxgfWhc4xgYU+X+aU9Kl48NcNIbM=";
nativeBuildInputs = [ wire ];

18
pkgs/servers/monitoring/prometheus/postgres-exporter.nix
View file

@ -2,16 +2,28 @@
buildGoModule rec {
pname = "postgres_exporter";
version = "0.12.1";
version = "0.13.0";
src = fetchFromGitHub {
owner = "prometheus-community";
repo = "postgres_exporter";
rev = "v${version}";
sha256 = "sha256-/IIMtLjOKmkqsNVgqrMo8D8r/NDmg4NRWCEMJTNgLbk=";
sha256 = "sha256-lFkxX8j0IDDmxNz4BQCCYaox2yrtMkKphK02emrg8Rs=";
};
vendorSha256 = "sha256-sMWprCRUvF6voLM3GjTq9tId1GoCPac/RE6hXL+LBEE=";
vendorSha256 = "sha256-0MQS42/4iImtq3yBGVCe0BwV0HiJCo7LVEAbsKltE4g=";
ldflags =
let
t = "github.com/prometheus/common/version";
in
[ "-s" "-w"
"-X ${t}.Version=${version}"
"-X ${t}.Revision=unknown"
"-X ${t}.Branch=unknown"
"-X ${t}.BuildUser=nix@nixpkgs"
"-X ${t}.BuildDate=unknown"
];
doCheck = true;

8
pkgs/servers/nextcloud/default.nix
View file

@ -60,14 +60,14 @@ in {
'';
nextcloud25 = generic {
version = "25.0.7";
sha256 = "sha256-LpAUcSXW1riFpW3PnAC774tKE1PNE6ypVRXZlnZvNF8=";
version = "25.0.8";
sha256 = "sha256-Ia6afooDCNDZsGSoh5dddZvLUE3fU+jU6sy6MrxUMVs=";
packages = nextcloud25Packages;
};
nextcloud26 = generic {
version = "26.0.2";
sha256 = "sha256-89sOxeCq/3wIjrNPdS1315kTvGeE4PxHqEzaoo5WejM=";
version = "26.0.3";
sha256 = "sha256-pagQy818Pc/yXyKAkyHy7UHtfMBgEgRImskOJYBgtck=";
packages = nextcloud26Packages;
};

46
pkgs/tools/security/msldapdump/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "msldapdump";
version = "unstable-2023-06-12";
format = "other";
src = fetchFromGitHub {
owner = "dievus";
repo = "msLDAPDump";
rev = "bdffe66be20ff844f55f69fd6d842d7f75f66f2d";
hash = "sha256-qH4AaebrTKYxxjXawllxgiG9fVm03zmTRv/HAyNpewg=";
};
propagatedBuildInputs = with python3.pkgs; [
colorama
ldap3
];
dontBuild = true;
installPhase = ''
runHook preInstall
install -vD msLDAPDump.py $out/bin/msLDAPDump.py
makeWrapper ${python3.interpreter} $out/bin/msldapdump \
--set PYTHONPATH "$PYTHONPATH:$out/bin/msLDAPDump.py" \
--add-flags "-O $out/bin/msLDAPDump.py"
runHook postInstall
'';
# Project has no tests
doCheck = false;
meta = with lib; {
description = "LDAP enumeration tool";
homepage = "https://github.com/dievus/msLDAPDump";
license = licenses.agpl3Only;
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/tools/security/ssh-to-pgp/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ssh-to-pgp";
version = "1.0.1";
version = "1.0.4";
src = fetchFromGitHub {
owner = "Mic92";
repo = "ssh-to-pgp";
rev = version;
sha256 = "sha256-5Wg0ItAkAb0zlhzcuDT9o0XIIbG9kqk4mIYb6hSJlsI=";
sha256 = "sha256-WdSa7rLUGcn1XZSnbwglp4I432XzB3vXb6IO3biE+Js=";
};
vendorSha256 = "sha256-OMWiJ1n8ynvIGcmotjuGGsRuAidYgVo5Y5JjrAw8fpc=";
vendorHash = "sha256-J9HuZhjeXSS4ej1RM+yn2VGoSdiS39PDM4fScAh6Eps=";
nativeCheckInputs = [ gnupg ];
checkPhase = ''

5
pkgs/top-level/all-packages.nix
View file

@ -3794,6 +3794,8 @@ with pkgs;
waydroid = callPackage ../os-specific/linux/waydroid { };
wgo = callPackage ../development/tools/wgo { };
wiiload = callPackage ../development/tools/wiiload { };
winhelpcgi = callPackage ../development/tools/winhelpcgi {
@ -6091,6 +6093,8 @@ with pkgs;
mstflint = callPackage ../tools/misc/mstflint { };
msldapdump = callPackage ../tools/security/msldapdump { };
mslink = callPackage ../tools/misc/mslink { };
mceinject = callPackage ../os-specific/linux/mceinject { };
@ -16541,6 +16545,7 @@ with pkgs;
cargo-clone = callPackage ../development/tools/rust/cargo-clone {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
cargo-component = callPackage ../development/tools/rust/cargo-component { };
cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { };
cargo-cyclonedx = callPackage ../development/tools/rust/cargo-cyclonedx {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;

5
pkgs/top-level/php-packages.nix
View file

@ -440,7 +440,7 @@ lib.makeScope pkgs.newScope (self: with self; {
}
{
name = "openssl";
buildInputs = if (lib.versionAtLeast php.version "8.1") then [ openssl ] else [ openssl_1_1 ];
buildInputs = [ openssl ];
configureFlags = [ "--with-openssl" ];
doCheck = false;
}
@ -556,8 +556,7 @@ lib.makeScope pkgs.newScope (self: with self; {
{ name = "tidy"; configureFlags = [ "--with-tidy=${html-tidy}" ]; doCheck = false; }
{
name = "tokenizer";
patches = lib.optional (lib.versionAtLeast php.version "8.1")
../development/interpreters/php/fix-tokenizer-php81.patch;
patches = [ ../development/interpreters/php/fix-tokenizer-php81.patch ];
}
{
name = "xml";

2
pkgs/top-level/python-packages.nix
View file

@ -12106,6 +12106,8 @@ self: super: with self; {
textual = callPackage ../development/python-modules/textual { };
textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { };
testbook = callPackage ../development/python-modules/testbook { };
testing-common-database = callPackage ../development/python-modules/testing-common-database { };

2
pkgs/top-level/release.nix
View file

@ -25,7 +25,7 @@
# and it will be too much painful for our users to recompile them
# for no real reason.
# Remove them for 23.11.
"nodejs-16.20.0"
"nodejs-16.20.1"
"openssl-1.1.1u"
];
}; }