colin/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] 2024-04-25 06:01:20 +00:00 committed by GitHub
commit d0efe40740
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
66 changed files with 3497 additions and 2325 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/systems/examples.nix
View File

@ -235,6 +235,11 @@ rec {
libc = "newlib";
};
microblaze-embedded = {
config = "microblazeel-none-elf";
libc = "newlib";
};
#
# Redox
#

1
nixos/tests/all-tests.nix
View File

@ -941,7 +941,6 @@ in {
tiddlywiki = handleTest ./tiddlywiki.nix {};
tigervnc = handleTest ./tigervnc.nix {};
timescaledb = handleTest ./timescaledb.nix {};
promscale = handleTest ./promscale.nix {};
timezone = handleTest ./timezone.nix {};
tinc = handleTest ./tinc {};
tinydns = handleTest ./tinydns.nix {};

60
nixos/tests/promscale.nix
View File

@ -1,60 +0,0 @@
# mostly copied from ./timescaledb.nix which was copied from ./postgresql.nix
# as it seemed unapproriate to test additional extensions for postgresql there.
{ system ? builtins.currentSystem
, config ? { }
, pkgs ? import ../.. { inherit system config; }
}:
with import ../lib/testing-python.nix { inherit system pkgs; };
with pkgs.lib;
let
postgresql-versions = import ../../pkgs/servers/sql/postgresql pkgs;
test-sql = pkgs.writeText "postgresql-test" ''
CREATE USER promscale SUPERUSER PASSWORD 'promscale';
CREATE DATABASE promscale OWNER promscale;
'';
make-postgresql-test = postgresql-name: postgresql-package: makeTest {
name = postgresql-name;
meta = with pkgs.lib.maintainers; {
maintainers = [ anpin ];
};
nodes.machine = { config, pkgs, ... }:
{
services.postgresql = {
enable = true;
package = postgresql-package;
extraPlugins = ps: with ps; [
timescaledb
promscale_extension
];
settings = { shared_preload_libraries = "timescaledb, promscale"; };
};
environment.systemPackages = with pkgs; [ promscale ];
};
testScript = ''
machine.start()
machine.wait_for_unit("postgresql")
with subtest("Postgresql with extensions timescaledb and promscale is available just after unit start"):
print(machine.succeed("sudo -u postgres psql -f ${test-sql}"))
machine.succeed("sudo -u postgres psql promscale -c 'SHOW shared_preload_libraries;' | grep promscale")
machine.succeed(
"promscale --db.name promscale --db.password promscale --db.user promscale --db.ssl-mode allow --startup.install-extensions --startup.only"
)
machine.succeed("sudo -u postgres psql promscale -c 'SELECT ps_trace.get_trace_retention_period();' | grep '(1 row)'")
machine.shutdown()
'';
};
#version 15 is not supported yet
applicablePostgresqlVersions = filterAttrs (_: value: versionAtLeast value.version "12" && !(versionAtLeast value.version "15")) postgresql-versions;
in
mapAttrs'
(name: package: {
inherit name;
value = make-postgresql-test name package;
})
applicablePostgresqlVersions

6
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -1,7 +1,7 @@
{ fetchFromGitHub
, lib
, protobuf
, rocksdb
, rocksdb_8_3
, rust-jemalloc-sys-unprefixed
, rustPlatform
, rustc
@ -9,6 +9,10 @@
, Security
, SystemConfiguration
}:
let
rocksdb = rocksdb_8_3;
in
rustPlatform.buildRustPackage rec {
pname = "polkadot";
version = "1.10.0";

3
pkgs/applications/blockchains/solana-validator/default.nix
View File

@ -13,7 +13,7 @@
, openssl
, libclang
, libcxx
, rocksdb
, rocksdb_8_3
, rustfmt
, perl
, hidapi
@ -46,6 +46,7 @@ let
pinData = lib.importJSON ./pin.json;
version = pinData.version;
hash = pinData.hash;
rocksdb = rocksdb_8_3;
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;
in

82
pkgs/applications/networking/cluster/waypoint/default.nix
View File

@ -1,82 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }:
buildGoModule rec {
pname = "waypoint";
version = "0.11.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Zn11mVQV8lN62BVYfhXauKets7/mIqA0r+mG2TkRyPk=";
};
vendorHash = "sha256-z0qe8zSQ9PopGeyvMDhRpU+3jUgHoh+8jTsYGLPk3i4=";
nativeBuildInputs = [ go-bindata installShellFiles ];
# GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway
buildPhase = ''
runHook preBuild
make bin GIT_DESCRIBE="v${version}" GIT_COMMIT="" GIT_DIRTY=""
runHook postBuild
'';
doCheck = false;
installPhase = ''
runHook preInstall
local INSTALL="$out/bin/waypoint"
install -D waypoint $out/bin/waypoint
# waypoint's completion install command alters your <something>rc files
# below is the equivalent of what it injects
# Write to a file as it doesn't like EOF within <()
cat > waypoint.fish <<EOF
function __complete_waypoint
set -lx COMP_LINE (commandline -cp)
test -z (commandline -ct)
and set COMP_LINE "$COMP_LINE "
$INSTALL
end
complete -f -c waypoint -a "(__complete_waypoint)"
EOF
installShellCompletion --cmd waypoint \
--bash <(echo "complete -C $INSTALL waypoint") \
--fish <(cat waypoint.fish) \
--zsh <(echo "complete -o nospace -C $INSTALL waypoint")
runHook postInstall
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
# `version` tries to write to ~/.config/waypoint
export HOME="$TMPDIR"
$out/bin/waypoint --help
$out/bin/waypoint version | grep "CLI: v${version}"
runHook postInstallCheck
'';
# Binary is static
dontPatchELF = true;
dontPatchShebangs = true;
meta = with lib; {
homepage = "https://waypointproject.io";
changelog = "https://github.com/hashicorp/waypoint/blob/v${version}/CHANGELOG.md";
description = "A tool to build, deploy, and release any application on any platform";
mainProgram = "waypoint";
longDescription = ''
Waypoint allows developers to define their application build, deploy, and
release lifecycle as code, reducing the time to deliver deployments
through a consistent and repeatable workflow.
'';
license = licenses.mpl20;
maintainers = with maintainers; [ winpat jk techknowlogick ];
};
}

4
pkgs/applications/networking/flexget/default.nix
View File

@ -6,7 +6,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "flexget";
version = "3.11.27";
version = "3.11.29";
pyproject = true;
# Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "Flexget";
repo = "Flexget";
rev = "refs/tags/v${version}";
hash = "sha256-0ENBUOH+/pe4OsVQ6cu1xLTPPHtUMNARQGVyxOk60X0=";
hash = "sha256-rtLn3QkcVwCh2DfJmtkKvZQcFL/zlZCh7VTUpWtQErw=";
};
postPatch = ''

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "signalbackup-tools";
version = "20240420-1";
version = "20240424";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-FRsJeLOm29nlouTMPv5mdnDYWD28ydWQxsakvLxJ4Lg=";
hash = "sha256-kmVim3Kt6Uc/BW2dbBtceYKMf+Gvibpe+nHPs3+iZxo=";
};
postPatch = ''

13
pkgs/applications/science/biology/sortmerna/default.nix
View File

@ -1,5 +1,16 @@
{ lib, stdenv, cmake, rocksdb, rapidjson, pkg-config, fetchFromGitHub, zlib }:
{ lib
, stdenv
, cmake
, rocksdb_8_3
, rapidjson
, pkg-config
, fetchFromGitHub
, zlib
}:
let
rocksdb = rocksdb_8_3;
in
stdenv.mkDerivation rec {
pname = "sortmerna";
version = "4.2.0";

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

@ -1,15 +1,15 @@
{
"version": "16.10.3",
"repo_hash": "sha256-JeZHnoNMk7NYBeUy25YK+f6K7WOeTQnYV/pG08bmiwA=",
"version": "16.10.4",
"repo_hash": "sha256-ieS2MO5jBNBK0hmuWLfaDjRNhn98927hlTFrDbV0zCQ=",
"yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.10.3-ee",
"rev": "v16.10.4-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.10.3",
"GITLAB_PAGES_VERSION": "16.10.3",
"GITALY_SERVER_VERSION": "16.10.4",
"GITLAB_PAGES_VERSION": "16.10.4",
"GITLAB_SHELL_VERSION": "14.34.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
"GITLAB_WORKHORSE_VERSION": "16.10.3"
"GITLAB_WORKHORSE_VERSION": "16.10.4"
}
}

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

@ -6,7 +6,7 @@
}:
let
version = "16.10.3";
version = "16.10.4";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -18,10 +18,10 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-WdEYZL3g/aYh2Iy1ZgJhIHgQ4967FOxhiuQEokk1S2A=";
hash = "sha256-dzHGnZwXomCUrlup9VD/0l084Swp9CVi4nJi6MtOwi8=";
};
vendorHash = "sha256-zaldiRg7fk/HncpfR7k+dDprsOp1ziQHgX8B4l7bwe0=";
vendorHash = "sha256-mPoz+y1LWpGr+zYqAhxzznMyKIPehsDW+WFxklYSC10=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];

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

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "3.92.0";
version = "3.93.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-NHpqfqv3RCbWZilhXLGnQTN+ytzifAix6mcLk5Bw124=";
hash = "sha256-4jsnfkHXs9FSnyQ6JP/zmW51x8fHyQ0n+B8EPOoTSAA=";
};
vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4=";

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

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.10.3";
version = "16.10.4";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-mQNDnxdrM679ejjXZuqSV8SwLXFcKKKGOQt3DJWOZOo=";
hash = "sha256-Jdg1cxHra4lHvf8+cojaE9OXR40w24OiwMhDYvmUBkI=";
};
vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";

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

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.10.3";
version = "16.10.4";
# nixpkgs-update: no auto update
src = fetchFromGitLab {

6
pkgs/applications/virtualization/singularity/packages.nix
View File

@ -7,20 +7,20 @@ let
apptainer = callPackage
(import ./generic.nix rec {
pname = "apptainer";
version = "1.3.0";
version = "1.3.1";
projectName = "apptainer";
src = fetchFromGitHub {
owner = "apptainer";
repo = "apptainer";
rev = "refs/tags/v${version}";
hash = "sha256-YqPPTs7cIiMbOc8jOwr8KgUBVu2pTPlSL0Vvw/1n4co=";
hash = "sha256-XhJecINx8jC6pRzIoM4nC6Aunj40xL8EmYIA4UizfAY=";
};
# Update by running
# nix-prefetch -E "{ sha256 }: ((import ./. { }).apptainer.override { vendorHash = sha256; }).goModules"
# at the root directory of the Nixpkgs repository
vendorHash = "sha256-lWo6ic3Tdv1UInA5MtEaAgiheCin2JSh4nmheUooENY=";
vendorHash = "sha256-MXW1U13uDRAx4tqZvqsuJvoD22nEL2gcxiGaa/6zwU0=";
extraDescription = " (previously known as Singularity)";
extraMeta.homepage = "https://apptainer.org";

4
pkgs/by-name/ga/garnet/package.nix
View File

@ -7,13 +7,13 @@
}:
buildDotnetModule {
pname = "garnet";
version = "1.0.1";
version = "1.0.5";
src = fetchFromGitHub {
owner = "microsoft";
repo = "garnet";
rev = "v${garnet.version}";
hash = "sha256-elUmM9Yw1/gazIV194P+noIm7ajQpRTccEhD5gN9D2Q=";
hash = "sha256-e5XmLxECrQA+Fx0BMDJ1xlfnh0HtztqfF5cLm9Z1eCc=";
};
projectFile = "main/GarnetServer/GarnetServer.csproj";

6
pkgs/by-name/gh/gh-notify/package.nix
View File

@ -23,13 +23,13 @@ let
in
stdenvNoCC.mkDerivation {
pname = "gh-notify";
version = "0-unstable-2024-03-19";
version = "0-unstable-2024-04-24";
src = fetchFromGitHub {
owner = "meiji163";
repo = "gh-notify";
rev = "0d8fa377d79cfef0f66d2f03a5921a5e598e6807";
hash = "sha256-Ao6gUtgW7enVlWBQhlQDc8ZW/gP90atc2F4rDNUnjj8=";
rev = "5c2db4cffe39f312d25979dc366f2bc219def9a2";
hash = "sha256-AgpNjeRz0RHf8D3ib7x1zixBxh32UUZJleub5W/suuM=";
};
nativeBuildInputs = [

4
pkgs/by-name/ma/markdown-oxide/package.nix
View File

@ -5,13 +5,13 @@
rustPlatform.buildRustPackage rec {
pname = "markdown-oxide";
version = "0.0.17";
version = "0.0.21";
src = fetchFromGitHub {
owner = "Feel-ix-343";
repo = "markdown-oxide";
rev = "v${version}";
hash = "sha256-bJlyzBnxUw1OyWLbVEFXgPc/YjmfyyQjfeGAA7G1QlY=";
hash = "sha256-PrsTHAlFFeqyZTsoKvoe19P2ed7xDtOlBgoKftFytVw=";
};
cargoLock = {

6
pkgs/by-name/po/powersploit/package.nix
View File

@ -16,9 +16,9 @@ stdenvNoCC.mkDerivation {
installPhase = ''
runHook preInstall
mkdir -p $out/share/powersploit
cp -a * $out/share/powersploit
find $out/share -type f -exec chmod -x {} \;
mkdir -p $out/share/windows/powersploit
cp -a * $out/share/windows/powersploit
find $out/share/windows -type f -exec chmod -x {} \;
runHook postInstall
'';

4
pkgs/by-name/pw/pwru/package.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "pwru";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "cilium";
repo = "pwru";
rev = "v${version}";
hash = "sha256-2CpjTVBuiGU5cYkdSIxIpk1EoZAUhlXxVU+KJXHosiA=";
hash = "sha256-8pXyzmzMCxOzwstzvzeZB2HBMeMzGMLZesTURZD3Rt8=";
};
vendorHash = null;

3
pkgs/by-name/so/solana-cli/package.nix
View File

@ -6,7 +6,7 @@
, udev
, protobuf
, libcxx
, rocksdb
, rocksdb_8_3
, installShellFiles
, pkg-config
, openssl
@ -33,6 +33,7 @@
let
version = "1.17.31";
sha256 = "sha256-5qPW199o+CVJlqGwiAegsquBRWEb5uDKITxjN5dQYAQ=";
rocksdb = rocksdb_8_3;
inherit (darwin.apple_sdk_11_0) Libsystem;
inherit (darwin.apple_sdk_11_0.frameworks) System IOKit AppKit Security;

5
pkgs/by-name/su/surrealdb/package.nix
View File

@ -4,13 +4,16 @@
, fetchFromGitHub
, pkg-config
, openssl
, rocksdb
, rocksdb_8_3
, testers
, surrealdb
, darwin
, protobuf
}:
let
rocksdb = rocksdb_8_3;
in
rustPlatform.buildRustPackage rec {
pname = "surrealdb";
version = "1.3.1";

32
pkgs/by-name/to/torctl/package.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "torctl";
version = "0.5.7";
src = fetchFromGitHub {
owner = "BlackArch";
repo = "torctl";
rev = "v${version}";
hash = "sha256-rTJR+9pbK/sWMqdHyIqJgASgCGtGtpUPoHmYZJ7COFQ=";
};
installPhase = ''
mkdir -p $out/{bin,etc/{systemd,bash_completion.d}}
cp -R torctl $out/bin
cp -R bash-completion $out/etc/bash_completion.d/
cp -R service $out/etc/systemd/
'';
meta = with lib; {
description = "Script to redirect all traffic through tor network including dns queries for anonymizing entire system";
homepage = "https://github.com/BlackArch/torctl";
license = licenses.gpl3Only;
maintainers = with maintainers; [ tochiaha ];
mainProgram = "torctl";
platforms = platforms.all;
};
}

704
pkgs/by-name/ze/zed-editor/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

15
pkgs/by-name/ze/zed-editor/package.nix
View File

@ -27,13 +27,13 @@
rustPlatform.buildRustPackage rec {
pname = "zed";
version = "0.131.6";
version = "0.132.2";
src = fetchFromGitHub {
owner = "zed-industries";
repo = "zed";
rev = "refs/tags/v${version}";
hash = "sha256-IhFOA+g2I5vb72CTSZ8WTa9K0ieYbPD/BMShGqaUb84=";
hash = "sha256-KojFa22CLne36kGfMvZGWjo2Ae3tjYAfL371c0qe/Bk=";
fetchSubmodules = true;
};
@ -42,8 +42,8 @@ rustPlatform.buildRustPackage rec {
outputHashes = {
"async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
"blade-graphics-0.4.0" = "sha256-S1PNdQ9YbJgLLsJU1mvDZ3feVDIrZGwU37JqIm+kfcE=";
"bromberg_sl2-0.6.0" = "sha256-+bwdnk3EgYEAxQSP4KpEPicCfO+r2er1DRZjvfF4jSM=";
"font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8=";
"heed-0.20.0-alpha.9" = "sha256-8bzoMmfKS+6AmeTzh0/F7WM9OBdIex+NYFER28bpA/s=";
"lsp-types-0.94.1" = "sha256-kplgPsafrgZFMI1D9pQCwmg+FKMn5HNWLbcgdXHUFVU=";
"nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8=";
"pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM=";
@ -53,24 +53,15 @@ rustPlatform.buildRustPackage rec {
"tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM=";
"tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU=";
"tree-sitter-elixir-0.1.0" = "sha256-hBHqQ3eBjknRPJjP+lQJU6NPFhUMtiv4FbKsTw28Bog=";
"tree-sitter-elm-5.6.4" = "sha256-0LpuyebOB5ew9fULBcaw8aUbF7HM5sXQpv+Jroz4tXg=";
"tree-sitter-glsl-0.1.4" = "sha256-TRuiT3ndCeDCsCFokAN8cosNKccB0NjWVRiBJuBJXZw=";
"tree-sitter-go-0.19.1" = "sha256-5+L5QqVjZyeh+sKfxKZWrjIBFE5xM9KZlHcLiHzJCIA=";
"tree-sitter-gomod-1.0.2" = "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI=";
"tree-sitter-gowork-0.0.1" = "sha256-lM4L4Ap/c8uCr4xUw9+l/vaGb3FxxnuZI0+xKYFDPVg=";
"tree-sitter-hcl-0.0.1" = "sha256-saVKSYUJY7OuIuNm9EpQnhFO/vQGKxCXuv3EKYOJzfs=";
"tree-sitter-heex-0.0.1" = "sha256-6LREyZhdTDt3YHVRPDyqCaDXqcsPlHOoMFDb2B3+3xM=";
"tree-sitter-jsdoc-0.20.0" = "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y=";
"tree-sitter-json-0.20.0" = "sha256-fZNftzNavJQPQE4S1VLhRyGQRoJgbWA5xTPa8ZI5UX4=";
"tree-sitter-markdown-0.0.1" = "sha256-F8VVd7yYa4nCrj/HEC13BTC7lkV3XSb2Z3BNi/VfSbs=";
"tree-sitter-nix-0.0.1" = "sha256-+o+f1TlhcrcCB3TNw1RyCjVZ+37e11nL+GWBPo0Mxxg=";
"tree-sitter-nu-0.0.1" = "sha256-V6EZfba5e0NdOG4n3DNI25luNXfcCN3+/vNYuz9llUk=";
"tree-sitter-ocaml-0.20.4" = "sha256-ycmjIKfrsVSVHmPP3HCxfk5wcBIF/JFH8OnU8mY1Cc8=";
"tree-sitter-proto-0.0.2" = "sha256-W0diP2ByAXYrc7Mu/sbqST6lgVIyHeSBmH7/y/X3NhU=";
"tree-sitter-racket-0.0.1" = "sha256-ie64no94TtAWsSYaBXmic4oyRAA01fMl97+JWcFU1E8=";
"tree-sitter-scheme-0.2.0" = "sha256-K3+zmykjq2DpCnk17Ko9LOyGQTBZb1/dgVXIVynCYd4=";
"tree-sitter-typescript-0.20.2" = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ=";
"tree-sitter-vue-0.0.1" = "sha256-8v2e03A/Uj6zCJTH4j6TPwDQcNFeze1jepMADT6UVis=";
"tree-sitter-yaml-0.0.1" = "sha256-S59jLlipBI2kwFuZDMmpv0TOZpGyXpbAizN3yC6wJ5I=";
};
};

2
pkgs/development/compilers/chicken/5/overrides.nix
View File

@ -65,7 +65,7 @@ in
openssl = addToBuildInputs pkgs.openssl;
plot = addToBuildInputs pkgs.plotutils;
postgresql = addToBuildInputsWithPkgConfig pkgs.postgresql;
rocksdb = addToBuildInputs pkgs.rocksdb;
rocksdb = addToBuildInputs pkgs.rocksdb_8_3;
scheme2c-compatibility = old:
addToNativeBuildInputs (lib.optionals (stdenv.system == "x86_64-darwin") [ pkgs.memorymappingHook ])
(addPkgConfig old);

6
pkgs/development/interpreters/nelua/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nelua";
version = "unstable-2024-02-03";
version = "unstable-2024-04-20";
src = fetchFromGitHub {
owner = "edubart";
repo = "nelua-lang";
rev = "05a2633a18dfdde7389394b9289da582c10e79bc";
hash = "sha256-oRW+pCB10T0A6fEPP3S+8iurQ2J5WMpQlCYScfIk07c=";
rev = "9f75e009db190feda0f90ae858b48fd82f51b8b1";
hash = "sha256-JwuZZXYcH8KRPxt4PBwhYDjZlwqe6VfaONU8rdLIDs4=";
};
postPatch = ''

4
pkgs/development/libraries/rocksdb/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rocksdb";
version = "8.3.2";
version = "9.1.0";
src = fetchFromGitHub {
owner = "facebook";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg=";
hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8=";
};
nativeBuildInputs = [ cmake ninja ];

4
pkgs/development/python-modules/plaid-python/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "plaid-python";
version = "20.0.1";
version = "21.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-TSydetm05gELugfRr6IGEfSrDhCOHzm73BTqbGkAXpk=";
hash = "sha256-ksYTV10FGUjBIkJru4CiJIlPLT4S7fbpsNrjYczTFlI=";
};
propagatedBuildInputs = [

6
pkgs/development/python-modules/pycec/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pycec";
version = "0.5.2";
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "konikvranik";
repo = pname;
rev = "v${version}";
hash = "sha256-H18petSiUdftZN8Q3fPmfSJA3OZks+gI+FAq9LwkRsk=";
rev = "refs/tags/v${version}";
hash = "sha256-5KQyHjAvHWeHFqcFHFJxDOPwWuVcFAN2wVdz9a77dzU=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/reptor/default.nix
View File

@ -33,7 +33,7 @@
buildPythonPackage rec {
pname = "reptor";
version = "0.18";
version = "0.19";
pyproject = true;
disabled = pythonOlder "3.8";
@ -42,7 +42,7 @@ buildPythonPackage rec {
owner = "Syslifters";
repo = "reptor";
rev = "refs/tags/${version}";
hash = "sha256-sojU2Asop0b/b/gfKXoRseuT1zHEO00JNrRWhMYh0Vo=";
hash = "sha256-7ZmMG1Fil8/JAks50baT/p1H7wHjap58+i81/DFlSAk=";
};
pythonRelaxDeps = true;

4
pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "robotframework-seleniumlibrary";
version = "6.2.0";
version = "6.3.0";
pyproject = true;
# no tests included in PyPI tarball
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "robotframework";
repo = "SeleniumLibrary";
rev = "refs/tags/v${version}";
sha256 = "sha256-lvtu6z/PD2Ckj70SgDF69BwrhaoA36SDrAvj0XJsmCc=";
sha256 = "sha256-/bYk8S9fGTsftBokz1FH+7HwdhhtAvZgtQscUESTsjY=";
};
nativeBuildInputs = [

1
pkgs/development/ruby-modules/with-packages/Gemfile
View File

@ -138,6 +138,7 @@ gem 'rubyzip'
gem 'rugged'
gem 'sassc'
gem 'scrypt'
gem 'seccomp-tools'
gem 'semian'
gem 'sequel'
gem 'sequel_pg'

4
pkgs/development/tools/allure/default.nix
View File

@ -2,7 +2,7 @@
let
pname = "allure";
version = "2.28.0";
version = "2.29.0";
in
stdenv.mkDerivation rec {
inherit pname version;
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz";
sha256 = "sha256-n+wmmY2936PQkHuS9DS7f51n3Eko/OM7nHHFbi85+Lk=";
sha256 = "sha256-ohcVXblnCrNs57BWmz+wUwplfIG9fOW8l08LuipNhPs=";
};
dontConfigure = true;
dontBuild = true;

4
pkgs/development/tools/analysis/flow/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.234.0";
version = "0.235.1";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
hash = "sha256-ChAgAYvNjQ60ly8B4i4M0awjgke8IcjJK72TOQZNnzw=";
hash = "sha256-aSL6C9MBn3fmuUrtWvb+6VBd1tpoIyqDXEqThGRNx7U=";
};
postPatch = ''

56
pkgs/development/tools/build-managers/bazel/bazel_6/darwin_sleep.patch Normal file
View File

@ -0,0 +1,56 @@
diff --git a/src/main/native/darwin/sleep_prevention_jni.cc b/src/main/native/darwin/sleep_prevention_jni.cc
index 67c35b201e..e50a58320e 100644
--- a/src/main/native/darwin/sleep_prevention_jni.cc
+++ b/src/main/native/darwin/sleep_prevention_jni.cc
@@ -33,31 +33,13 @@ static int g_sleep_state_stack = 0;
static IOPMAssertionID g_sleep_state_assertion = kIOPMNullAssertionID;
int portable_push_disable_sleep() {
- std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
- BAZEL_CHECK_GE(g_sleep_state_stack, 0);
- if (g_sleep_state_stack == 0) {
- BAZEL_CHECK_EQ(g_sleep_state_assertion, kIOPMNullAssertionID);
- CFStringRef reasonForActivity = CFSTR("build.bazel");
- IOReturn success = IOPMAssertionCreateWithName(
- kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, reasonForActivity,
- &g_sleep_state_assertion);
- BAZEL_CHECK_EQ(success, kIOReturnSuccess);
- }
- g_sleep_state_stack += 1;
- return 0;
+ // Unreliable, disable for now
+ return -1;
}
int portable_pop_disable_sleep() {
- std::lock_guard<std::mutex> lock(g_sleep_state_mutex);
- BAZEL_CHECK_GT(g_sleep_state_stack, 0);
- g_sleep_state_stack -= 1;
- if (g_sleep_state_stack == 0) {
- BAZEL_CHECK_NE(g_sleep_state_assertion, kIOPMNullAssertionID);
- IOReturn success = IOPMAssertionRelease(g_sleep_state_assertion);
- BAZEL_CHECK_EQ(success, kIOReturnSuccess);
- g_sleep_state_assertion = kIOPMNullAssertionID;
- }
- return 0;
+ // Unreliable, disable for now
+ return -1;
}
} // namespace blaze_jni
diff --git a/src/main/native/darwin/system_suspension_monitor_jni.cc b/src/main/native/darwin/system_suspension_monitor_jni.cc
index 3483aa7935..51782986ec 100644
--- a/src/main/native/darwin/system_suspension_monitor_jni.cc
+++ b/src/main/native/darwin/system_suspension_monitor_jni.cc
@@ -83,10 +83,7 @@ void portable_start_suspend_monitoring() {
// Register to receive system sleep notifications.
// Testing needs to be done manually. Use the logging to verify
// that sleeps are being caught here.
- suspend_state.connect_port = IORegisterForSystemPower(
- &suspend_state, &notifyPortRef, SleepCallBack, &notifierObject);
- BAZEL_CHECK_NE(suspend_state.connect_port, MACH_PORT_NULL);
- IONotificationPortSetDispatchQueue(notifyPortRef, queue);
+ // XXX: Unreliable, disable for now
// Register to deal with SIGCONT.
// We register for SIGCONT because we can't catch SIGSTOP.

60
pkgs/development/tools/build-managers/bazel/bazel_6/default.nix
View File

@ -8,7 +8,7 @@
# updater
, python3, writeScript
# Apple dependencies
, cctools, libcxx, CoreFoundation, CoreServices, Foundation
, cctools, libcxx, CoreFoundation, CoreServices, Foundation, sigtool
# Allow to independently override the jdks used to build and run respectively
, buildJdk, runJdk
, runtimeShell
@ -25,12 +25,12 @@
}:
let
version = "6.4.0";
version = "6.5.0";
sourceRoot = ".";
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
hash = "sha256-vYj/YCyLuynugroqaxKtCS1R7GaMZXf5Yo8Y5I/05R4=";
hash = "sha256-/InakZQVKJ8p5P8YpeAScOzppv6Dy2CWchi6xKO7PtI=";
};
# Update with
@ -179,7 +179,7 @@ let
in
stdenv.mkDerivation rec {
pname = "bazel";
pname = "bazel${ lib.optionalString enableNixHacks "-hacks" }";
inherit version;
meta = with lib; {
@ -205,6 +205,27 @@ stdenv.mkDerivation rec {
# the prebuilt one does not work in nix world.
./java_toolchain.patch
# Bazel integrates with apple IOKit to inhibit and track system sleep.
# Inside the darwin sandbox, these API calls are blocked, and bazel
# crashes. It seems possible to allow these APIs inside the sandbox, but it
# feels simpler to patch bazel not to use it at all. So our bazel is
# incapable of preventing system sleep, which is a small price to pay to
# guarantee that it will always run in any nix context.
#
# See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
# NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
# sandbox.
#
# If you want to investigate the sandbox profile path,
# IORegisterForSystemPower can be allowed with
#
# propagatedSandboxProfile = ''
# (allow iokit-open (iokit-user-client-class "RootDomainUserClient"))
# '';
#
# I do not know yet how to allow IOPMAssertion{CreateWithName,Release}
./darwin_sleep.patch
# On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
# This is breaking the build of any C target. This patch removes the last
# argument if it's found to be an empty string.
@ -289,7 +310,11 @@ stdenv.mkDerivation rec {
bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }:
let
be = extracted bazelPkg;
in runLocal name { inherit buildInputs; } (
in runLocal name {
inherit buildInputs;
# Necessary for the tests to pass on Darwin with sandbox enabled.
__darwinAllowLocalNetworking = true;
} (
# skip extraction caching on Darwin, because nobody knows how Darwin works
(lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
# set up home with pre-unpacked bazel
@ -403,7 +428,10 @@ stdenv.mkDerivation rec {
export NIX_CFLAGS_COMPILE+=" -Wno-deprecated-builtins -Wno-gnu-offsetof-extensions"
# don't use system installed Xcode to run clang, use Nix clang instead
sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
sed -i -E \
-e "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \
-e "s;/usr/bin/codesign;CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
-e "s;env -i codesign;env -i CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate ${sigtool}/bin/codesign;" \
scripts/bootstrap/compile.sh \
tools/osx/BUILD
@ -557,7 +585,7 @@ stdenv.mkDerivation rec {
which
zip
python3.pkgs.absl-py # Needed to build fish completion
] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx sigtool CoreFoundation CoreServices Foundation ];
# Bazel makes extensive use of symlinks in the WORKSPACE.
# This causes problems with infinite symlinks if the build output is in the same location as the
@ -593,7 +621,10 @@ stdenv.mkDerivation rec {
${python3}/bin/python3 ./bazel_src/scripts/generate_fish_completion.py \
--bazel=./bazel_src/output/bazel \
--output=./bazel_src/output/bazel-complete.fish
'' +
# disable execlog parser on darwin, since it fails to build
# see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055
lib.optionalString (!stdenv.isDarwin) ''
# need to change directory for bazel to find the workspace
cd ./bazel_src
# build execlog tooling
@ -617,6 +648,10 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/bazel $wrapperfile --suffix PATH : ${defaultShellPath}
mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch}
'' +
# disable execlog parser on darwin, since it fails to build
# see https://github.com/NixOS/nixpkgs/pull/273774#issuecomment-1865322055
(lib.optionalString (!stdenv.isDarwin) ''
mkdir $out/share
cp ./bazel_src/bazel-bin/src/tools/execlog/parser_deploy.jar $out/share/parser_deploy.jar
cat <<EOF > $out/bin/bazel-execlog
@ -624,7 +659,7 @@ stdenv.mkDerivation rec {
${runJdk}/bin/java -jar $out/share/parser_deploy.jar \$@
EOF
chmod +x $out/bin/bazel-execlog
'') + ''
# shell completion files
installShellCompletion --bash \
--name bazel.bash \
@ -678,6 +713,13 @@ stdenv.mkDerivation rec {
# second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch}
hello_test
## Test that the GSON serialisation files are present
gson_classes=$(unzip -l $($out/bin/bazel info install_base)/A-server.jar | grep -F -c _GsonTypeAdapter.class)
if [ "$gson_classes" -lt 10 ]; then
echo "Missing GsonTypeAdapter classes in A-server.jar. Lockfile generation will not work"
exit 1
fi
runHook postInstall
'';

46
pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json
View File

@ -22,12 +22,11 @@
"https://github.com/bazelbuild/stardoc/archive/1ef781ced3b1443dca3ed05dec1989eca1a4e1cd.tar.gz"
]
},
"20211102.0.tar.gz": {
"name": "20211102.0.tar.gz",
"sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
"20230802.0.tar.gz": {
"name": "20230802.0.tar.gz",
"sha256": "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
"urls": [
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz"
]
},
"2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz": {
@ -365,11 +364,10 @@
"generator_function": "dist_http_archive",
"generator_name": "com_google_absl",
"name": "com_google_absl",
"sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
"strip_prefix": "abseil-cpp-20211102.0",
"sha256": "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
"strip_prefix": "abseil-cpp-20230802.0",
"urls": [
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz"
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz"
]
},
"com_google_googleapis": {
@ -1149,20 +1147,20 @@
"generator_function": "maybe",
"generator_name": "remote_java_tools",
"name": "remote_java_tools",
"sha256": "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5",
"sha256": "aa11ecd5fc0af2769f0f2bdd25e2f4de7c1291ed24326fb23fa69bdd5dcae2b5",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip"
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools-v12.7.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools-v12.7.zip"
]
},
"remote_java_tools_darwin_arm64": {
"generator_function": "maybe",
"generator_name": "remote_java_tools_darwin_arm64",
"name": "remote_java_tools_darwin_arm64",
"sha256": "c6ffcaf87965c436cc86fc0e9673dafc97c0761efae8225ad2691cf6cfe3d87a",
"sha256": "ecedf6305768dfd51751d0ad732898af092bd7710d497c6c6c3214af7e49395f",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_arm64-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_arm64-v12.6.zip"
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_arm64-v12.7.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_arm64-v12.7.zip"
]
},
"remote_java_tools_darwin_arm64_for_testing": {
@ -1187,10 +1185,10 @@
"generator_function": "maybe",
"generator_name": "remote_java_tools_darwin_x86_64",
"name": "remote_java_tools_darwin_x86_64",
"sha256": "c6545e82e543cb5775d3b8909d6270b5f481864b5ff083d20bfa5dcf77ac3ef7",
"sha256": "e116c649c0355ab57ffcc870ce1139e5e1528cabac458bd50263d2b84ea4ffb2",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_darwin_x86_64-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_darwin_x86_64-v12.6.zip"
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_darwin_x86_64-v12.7.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_darwin_x86_64-v12.7.zip"
]
},
"remote_java_tools_darwin_x86_64_for_testing": {
@ -1233,10 +1231,10 @@
"generator_function": "maybe",
"generator_name": "remote_java_tools_linux",
"name": "remote_java_tools_linux",
"sha256": "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066",
"sha256": "a346b9a291b6db1bb06f7955f267e47522d99963fe14e337da1d75d125a8599f",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip"
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_linux-v12.7.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_linux-v12.7.zip"
]
},
"remote_java_tools_linux_for_testing": {
@ -1351,10 +1349,10 @@
"generator_function": "maybe",
"generator_name": "remote_java_tools_windows",
"name": "remote_java_tools_windows",
"sha256": "63f727d44011b8c504bb4e6d89c2cd982278efb34dae8629687e9483d8f7d62d",
"sha256": "bae6a03b5aeead5804ba7bcdcc8b14ec3ed05b37f3db5519f788ab060bc53b05",
"urls": [
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_windows-v12.6.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_windows-v12.6.zip"
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.7/java_tools_windows-v12.7.zip",
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.7/java_tools_windows-v12.7.zip"
]
},
"remote_java_tools_windows_for_testing": {

1748
pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock
View File

File diff suppressed because it is too large Load Diff

1295
pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock
View File

File diff suppressed because it is too large Load Diff

6
pkgs/development/tools/build-managers/bazel/bazel_7/default.nix
View File

@ -43,7 +43,7 @@
# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic).
# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers).
, enableNixHacks ? false
, version ? "7.0.2",
, version ? "7.1.0",
}:
let
@ -51,7 +51,7 @@ let
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
hash = "sha256-3qK5BXXUPvPkHEAvZMJIGETsvwtA+FSLdaIEpNUE4DU=";
hash = "sha256-HiDQyJ98nRtKOBqMWGtKQ1qWv8Qfu880osKUlOs4Z6E=";
};
# Use builtins.fetchurl to avoid IFD, in particular on hydra
@ -213,7 +213,7 @@ stdenv.mkDerivation rec {
#
# See also ./bazel_darwin_sandbox.patch in bazel_5. That patch uses
# NIX_BUILD_TOP env var to conditionnally disable sleep features inside the
# sandbox. Oddly, bazel_6 does not need that patch :-/.
# sandbox.
#
# If you want to investigate the sandbox profile path,
# IORegisterForSystemPower can be allowed with

40
pkgs/development/tools/build-managers/bazel/bazel_7/nix-hacks.patch
View File

@ -1,25 +1,29 @@
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
index 845c8b6aa3..6f07298bd0 100644
index 4d8c46f8d5..ed311226f0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
@@ -171,14 +171,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
@@ -178,18 +178,8 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
}
}
if (shouldUseCachedRepos(env, handler, repoRoot, rule)) {
- // Make sure marker file is up-to-date; correctly describes the current repository state
- byte[] markerHash = digestWriter.areRepositoryAndMarkerFileConsistent(handler, env);
- if (env.valuesMissing()) {
- return null;
- }
- if (markerHash != null) { // repo exist & up-to-date
- return RepositoryDirectoryValue.builder()
- .setPath(repoRoot)
- .setDigest(markerHash)
- .setExcludeFromVendoring(shouldExcludeRepoFromVendoring(handler, rule))
- .build();
- }
+ // Nix hack: Always consider cached dirs as up-to-date
+ return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(digestWriter.writeMarkerFile()).build();
}
DigestWriter digestWriter = new DigestWriter(directories, repositoryName, rule);
if (shouldUseCachedRepos(env, handler, repoRoot, rule)) {
- // Make sure marker file is up-to-date; correctly describes the current repository state
- byte[] markerHash = digestWriter.areRepositoryAndMarkerFileConsistent(handler, env);
- if (env.valuesMissing()) {
- return null;
- }
- if (markerHash != null) {
- return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(markerHash).build();
- }
+ // Nix hack: Always consider cached dirs as up-to-date
+ return RepositoryDirectoryValue.builder().setPath(repoRoot).setDigest(digestWriter.writeMarkerFile()).build();
}
/* At this point: This is a force fetch, a local repository, OR The repository cache is old or
@@ -512,11 +506,12 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
/* At this point: This is a force fetch, a local repository, OR The repository cache is old or
@@ -610,11 +600,12 @@ public final class RepositoryDelegatorFunction implements SkyFunction {
builder.append(escape(key)).append(" ").append(escape(value)).append("\n");
}
String content = builder.toString();

1114
pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock
View File

File diff suppressed because it is too large Load Diff

2
pkgs/development/tools/build-managers/bazel/cpp-test.nix
View File

@ -41,7 +41,7 @@ let
''));
testBazel = bazelTest {
name = "bazel-test-cpp";
name = "${bazel.pname}-test-cpp";
inherit workspaceDir;
bazelPkg = bazel;
bazelScript = ''

2
pkgs/development/tools/build-managers/bazel/java-test.nix
View File

@ -41,7 +41,7 @@ let
''));
testBazel = bazelTest {
name = "bazel-test-java";
name = "${bazel.pname}-test-java";
inherit workspaceDir;
bazelPkg = bazel;
buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ];

2
pkgs/development/tools/build-managers/bazel/protobuf-test.nix
View File

@ -160,7 +160,7 @@ let
''));
testBazel = bazelTest {
name = "bazel-test-protocol-buffers";
name = "${bazel.pname}-test-protocol-buffers";
inherit workspaceDir;
bazelPkg = bazel;
buildInputs = [ (if lib.strings.versionOlder bazel.version "5.0.0" then openjdk8 else jdk11_headless) ];

2
pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
View File

@ -71,7 +71,7 @@ let
''));
testBazel = bazelTest {
name = "bazel-test-builtin-rules";
name = "${bazel.pname}-test-builtin-rules";
inherit workspaceDir;
bazelPkg = bazel;
bazelScript = ''

26
pkgs/development/tools/rust/cargo-pgx/0_6_1.nix
View File

@ -1,26 +0,0 @@
{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "cargo-pgx";
version = "0.6.1";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-O4eHVbJBudybsPab+zr2eXnfheREMqLAHAKm2GDbfrs=";
};
cargoSha256 = "sha256-MucGrA3qXgJOcT2LMNmoNOhQi8QA3LuqgZEHKycLCCo=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy";
mainProgram = "cargo-pgx";
homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx";
license = licenses.mit;
maintainers = with maintainers; [ typetetris ];
};
}

26
pkgs/development/tools/rust/cargo-pgx/0_7_1.nix
View File

@ -1,26 +0,0 @@
{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "cargo-pgx";
version = "0.7.1";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-t/gdlrBeP6KFkBFJiZUa8KKVJVYMf6753vQGKJdytss=";
};
cargoSha256 = "sha256-muce9wT4LAJmfNLWWEShARnpZgglXe/KrfxlitmGgXk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy";
mainProgram = "cargo-pgx";
homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx";
license = licenses.mit;
maintainers = with maintainers; [ typetetris ];
};
}

26
pkgs/development/tools/rust/cargo-pgx/0_7_4.nix
View File

@ -1,26 +0,0 @@
{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "cargo-pgx";
version = "0.7.4";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-uyMWfxI+A8mws8oZFm2pmvr7hJgSNIb328SrVtIDGdA=";
};
cargoSha256 = "sha256-RgpL/hJdfrtLDANs5U53m5a6aEEAhZ9SFOIM7V8xABM=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy";
mainProgram = "cargo-pgx";
homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx";
license = licenses.mit;
maintainers = with maintainers; [ typetetris ];
};
}

160
pkgs/development/tools/rust/cargo-pgx/buildPgxExtension.nix
View File

@ -1,160 +0,0 @@
# preBuildAndTest and some small other bits
# taken from https://github.com/tcdi/pgx/blob/v0.4.5/nix/extension.nix
# (but now heavily modified)
# which uses MIT License with the following license file
#
# MIT License
#
# Portions Copyright 2019-2021 ZomboDB, LLC.
# Portions Copyright 2021-2022 Technology Concepts & Design, Inc. <support@tcdi.com>.
# All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
{ lib
, cargo-pgx
, pkg-config
, rustPlatform
, stdenv
, Security
, writeShellScriptBin
}:
# The idea behind: Use it mostly like rustPlatform.buildRustPackage and so
# we hand most of the arguments down.
#
# Additional arguments are:
# - `postgresql` postgresql package of the version of postgresql this extension should be build for.
# Needs to be the build platform variant.
# - `useFakeRustfmt` Whether to use a noop fake command as rustfmt. cargo-pgx tries to call rustfmt.
# If the generated rust bindings aren't needed to use the extension, its a
# unnecessary and heavy dependency. If you set this to true, you also
# have to add `rustfmt` to `nativeBuildInputs`.
{ buildAndTestSubdir ? null
, buildType ? "release"
, buildFeatures ? [ ]
, cargoBuildFlags ? [ ]
, postgresql
# cargo-pgx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the
# dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g.
# if you include the generated code in the output via postInstall.
, useFakeRustfmt ? true
, ...
} @ args:
let
rustfmtInNativeBuildInputs = lib.lists.any (dep: lib.getName dep == "rustfmt") (args.nativeBuildInputs or []);
in
assert lib.asserts.assertMsg ((args.installPhase or "") == "")
"buildPgxExtensions overwrites the installPhase, so providing one does nothing";
assert lib.asserts.assertMsg ((args.buildPhase or "") == "")
"buildPgxExtensions overwrites the buildPhase, so providing one does nothing";
assert lib.asserts.assertMsg (useFakeRustfmt -> !rustfmtInNativeBuildInputs)
"The parameter useFakeRustfmt is set to true, but rustfmt is included in nativeBuildInputs. Either set useFakeRustfmt to false or remove rustfmt from nativeBuildInputs.";
assert lib.asserts.assertMsg (!useFakeRustfmt -> rustfmtInNativeBuildInputs)
"The parameter useFakeRustfmt is set to false, but rustfmt is not included in nativeBuildInputs. Either set useFakeRustfmt to true or add rustfmt from nativeBuildInputs.";
let
fakeRustfmt = writeShellScriptBin "rustfmt" ''
exit 0
'';
maybeDebugFlag = lib.optionalString (buildType != "release") "--debug";
maybeEnterBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) ''
export CARGO_TARGET_DIR="$(pwd)/target"
pushd "${buildAndTestSubdir}"
'';
maybeLeaveBuildAndTestSubdir = lib.optionalString (buildAndTestSubdir != null) "popd";
pgxPostgresMajor = lib.versions.major postgresql.version;
preBuildAndTest = ''
export PGX_HOME=$(mktemp -d)
export PGDATA="$PGX_HOME/data-${pgxPostgresMajor}/"
cargo-pgx pgx init "--pg${pgxPostgresMajor}" ${postgresql}/bin/pg_config
echo "unix_socket_directories = '$(mktemp -d)'" > "$PGDATA/postgresql.conf"
# This is primarily for Mac or other Nix systems that don't use the nixbld user.
export USER="$(whoami)"
pg_ctl start
createuser -h localhost --superuser --createdb "$USER" || true
pg_ctl stop
'';
argsForBuildRustPackage = builtins.removeAttrs args [ "postgresql" "useFakeRustfmt" ];
# so we don't accidentally `(rustPlatform.buildRustPackage argsForBuildRustPackage) // { ... }` because
# we forgot parentheses
finalArgs = argsForBuildRustPackage // {
buildInputs = (args.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [ Security ];
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
cargo-pgx
postgresql
pkg-config
rustPlatform.bindgenHook
] ++ lib.optionals useFakeRustfmt [ fakeRustfmt ];
buildPhase = ''
runHook preBuild
echo "Executing cargo-pgx buildPhase"
${preBuildAndTest}
${maybeEnterBuildAndTestSubdir}
NIX_PGLIBDIR="${postgresql}/lib" \
PGX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \
cargo-pgx pgx package \
--pg-config ${postgresql}/bin/pg_config \
${maybeDebugFlag} \
--features "${builtins.concatStringsSep " " buildFeatures}" \
--out-dir "$out"
${maybeLeaveBuildAndTestSubdir}
runHook postBuild
'';
preCheck = preBuildAndTest + args.preCheck or "";
installPhase = ''
runHook preInstall
echo "Executing buildPgxExtension install"
${maybeEnterBuildAndTestSubdir}
cargo-pgx pgx stop all
mv $out/${postgresql}/* $out
rm -rf $out/nix
${maybeLeaveBuildAndTestSubdir}
runHook postInstall
'';
PGX_PG_SYS_SKIP_BINDING_REWRITE = "1";
CARGO_BUILD_INCREMENTAL = "false";
RUST_BACKTRACE = "full";
checkNoDefaultFeatures = true;
checkFeatures = (args.checkFeatures or [ ]) ++ [ "pg_test pg${pgxPostgresMajor}" ];
};
in
rustPlatform.buildRustPackage finalArgs

4
pkgs/development/web/nodejs/v21.nix → pkgs/development/web/nodejs/v22.nix
View File

@ -8,8 +8,8 @@ let
in
buildNodejs {
inherit enableNpm;
version = "21.7.3";
sha256 = "08csswa1h55l9zvfjc4g1ksicgl42pbz7g1bc9hgy77w3gxjd2v6";
version = "22.0.0";
sha256 = "sha256-IuKPv/MfaQc7gCTLQnReUQX4QEHzR1smC5fVoUEDnRo=";
patches = [
./disable-darwin-v8-system-instrumentation-node19.patch
./bypass-darwin-xcrun-node16.patch

2
pkgs/os-specific/linux/device-tree/default.nix
View File

@ -32,7 +32,7 @@ with lib; {
in ''
mkdir -p $out
cd "${base}"
find . -type f -name '*.dtb' -print0 \
find -L . -type f -name '*.dtb' -print0 \
| xargs -0 cp -v --no-preserve=mode --target-directory "$out" --parents
for dtb in $(find "$out" -type f -name '*.dtb'); do

6
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -64,11 +64,11 @@ rec {
# Vulkan developer beta driver
# See here for more information: https://developer.nvidia.com/vulkan-driver
vulkan_beta = generic rec {
version = "550.40.59";
version = "550.40.61";
persistencedVersion = "550.54.14";
settingsVersion = "550.54.14";
sha256_64bit = "sha256-hVwYC454vkxcK8I9bj1kp6iFS667em0c+Ral243C0J8=";
openSha256 = "sha256-/v1iVcmHhdvib54LDktNBHkcmgFxZVwQxwPdWSi0l/U=";
sha256_64bit = "sha256-JNVeA5/u5/ictU3QpPnbXIHDKOtwou8wGmMt3We4FJY=";
openSha256 = "sha256-kWGTj3eAvwLTJ7zgzRFvyhXmfpxQbUMmyxWxER9i9m0=";
settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4=";
persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4=";
url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";

3
pkgs/servers/mail/stalwart/default.nix
View File

@ -10,11 +10,12 @@
, stdenv
, darwin
, nix-update-script
, rocksdb
, rocksdb_8_3
}:
let
version = "0.6.0";
rocksdb = rocksdb_8_3;
in
rustPlatform.buildRustPackage {
pname = "stalwart-mail";

5
pkgs/servers/matrix-conduit/default.nix
View File

@ -6,10 +6,13 @@
, stdenv
, darwin
, nixosTests
, rocksdb
, rocksdb_8_3
, rust-jemalloc-sys
}:
let
rocksdb = rocksdb_8_3;
in
rustPlatform.buildRustPackage rec {
pname = "matrix-conduit";
version = "0.6.0";

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

@ -14,16 +14,16 @@ in
buildGoModule rec {
pname = "mediamtx";
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "bluenviron";
repo = pname;
rev = "v${version}";
hash = "sha256-i4tuGlRW5/HZobeSsgzWjHxIxZKB0cZIJcJyD0O/eIY=";
hash = "sha256-IIm+ZJYHGEfT+mvyq84L5hnkUPX784gjJUMzkE5kbaE=";
};
vendorHash = "sha256-RWHu6VuL9RmmAS1CyInXVbn3dxU6yTAze92C19Fm6gM=";
vendorHash = "sha256-GGyacAN9Vs0SsLO7ZfyfOXznTJZg1V13DJucfzUGA/Q=";
postPatch = ''
cp ${hlsJs} internal/servers/hls/hls.min.js

2
pkgs/servers/sql/postgresql/ext/default.nix
View File

@ -99,8 +99,6 @@ self: super: {
pg_uuidv7 = super.callPackage ./pg_uuidv7.nix { };
promscale_extension = super.callPackage ./promscale_extension.nix { };
repmgr = super.callPackage ./repmgr.nix { };
rum = super.callPackage ./rum.nix { };

59
pkgs/servers/sql/postgresql/ext/promscale_extension.nix
View File

@ -1,59 +0,0 @@
{ lib
, fetchFromGitHub
, fetchpatch
, buildPgxExtension
, postgresql
, stdenv
, nixosTests
}:
buildPgxExtension rec {
inherit postgresql;
pname = "promscale_extension";
version = "0.8.0";
src = fetchFromGitHub {
owner = "timescale";
repo = "promscale_extension";
rev = version;
sha256 = "sha256-vyEfQMGguHrHYdBEEmbev29L2uCa/4xL9DpGIniUwfI=";
};
cargoSha256 = "sha256-VK9DObkg4trcGUXxxISCd0zqU3vc1Qt6NxqpgKIARCQ=";
cargoPatches = [
# there is a duplicate definition in the lock file which fails to build with buildRustPackage
(fetchpatch {
name = "cargo-vendor.patch";
url = "https://github.com/timescale/promscale_extension/commit/3048bd959430e9abc2c1d5c772ab6b4fc1dc6a95.patch";
hash = "sha256-xTk4Ml8GN06QlJdrvAdVK21r30ZR/S83y5A5jJPdOw4=";
})
];
preBuild = ''
patchShebangs create-upgrade-symlinks.sh extract-extension-version.sh
## Hack to boostrap the build because some pgx commands require this file. It gets re-generated later.
cp templates/promscale.control ./promscale.control
'';
postInstall = ''
ln -s $out/lib/promscale-${version}.so $out/lib/promscale.so
'';
passthru.tests = {
promscale = nixosTests.promscale;
};
# tests take really long
doCheck = false;
meta = with lib; {
description = "Promscale is an open source observability backend for metrics and traces powered by SQL";
homepage = "https://github.com/timescale/promscale_extension";
maintainers = with maintainers; [ anpin ];
platforms = postgresql.meta.platforms;
license = licenses.unfree;
# as it needs to be used with timescaledb, simply use the condition from there
broken = versionAtLeast postgresql.version "15";
};
}

8
pkgs/servers/sql/postgresql/generic.nix
View File

@ -24,7 +24,6 @@ let
# JIT
, jitSupport
, nukeReferences, patchelf, llvmPackages
, makeRustPlatform, buildPgxExtension, cargo, rustc
# PL/Python
, pythonSupport ? false
@ -233,13 +232,6 @@ let
inherit (llvmPackages) llvm;
postgresql = this;
stdenv = stdenv';
buildPgxExtension = buildPgxExtension.override {
stdenv = stdenv';
rustPlatform = makeRustPlatform {
stdenv = stdenv';
inherit rustc cargo;
};
};
};
newSelf = self // scope;
newSuper = { callPackage = newScope (scope // this.pkgs); };

6
pkgs/tools/misc/wasm-tools/default.nix
View File

@ -5,19 +5,19 @@
rustPlatform.buildRustPackage rec {
pname = "wasm-tools";
version = "1.202.0";
version = "1.205.0";
src = fetchFromGitHub {
owner = "bytecodealliance";
repo = pname;
rev = "v${version}";
hash = "sha256-7JH93VaRQTi2pcHYB+oDqe1FDiyNDWXwRnw5qZMEi7c=";
hash = "sha256-p7MkuPMy0w4o5c3ofJ37PpmGsXfQ4be/R4t7Iw8vDvQ=";
fetchSubmodules = true;
};
# Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
auditable = false;
cargoHash = "sha256-8W2x9pbIu/9DXrRXo4IbSBSa8wAFj5djNpHq7gfa46E=";
cargoHash = "sha256-Nb0aZjPwFmSoQOTrm+zBG53VR5ogdLmsG6YTz5cR43g=";
cargoBuildFlags = [ "--package" "wasm-tools" ];
cargoTestFlags = [ "--all" ];

6
pkgs/tools/networking/ockam/default.nix
View File

@ -13,7 +13,7 @@
let
pname = "ockam";
version = "0.121.0";
version = "0.122.0";
in
rustPlatform.buildRustPackage {
inherit pname version;
@ -22,10 +22,10 @@ rustPlatform.buildRustPackage {
owner = "build-trust";
repo = pname;
rev = "ockam_v${version}";
hash = "sha256-WXkprfA7DY3ZKCtTkVYMqYxyhLbfXPbXhYd0Oj5mJ+w=";
hash = "sha256-0iFY9T+44V3hT21OLGeao2dyEbyNWrQdLAFhMe8QD5o=";
};
cargoHash = "sha256-TLNV+6n9J9rhf8Lck0HK+ZNPDDh8C+M+MLbIWBS8cO0=";
cargoHash = "sha256-yctLLRX6ZHIA19cfQhnbvcveMq2HVyTBrG8aRbr5HXw=";
nativeBuildInputs = [ git pkg-config ];
buildInputs = [ openssl dbus ]
++ lib.optionals stdenv.isDarwin [ AppKit Security ];

4
pkgs/tools/text/tml/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "tml";
version = "0.6.1";
version = "0.7.0";
src = fetchFromGitHub {
owner = "liamg";
repo = "tml";
rev = "v${version}";
hash = "sha256-y9iv6s+ShKLxd+SOBQxwvPwuEL1kepJL6ukA4aoV9Z8=";
hash = "sha256-QMXEKjOKYQlzXc2ds8OAAL5xUxayGb6mxxyeHsCkfwo=";
};
vendorHash = "sha256-CHZS1SpPko8u3tZAYbf+Di882W55X9Q/zd4SmFCRgKM=";

1
pkgs/top-level/aliases.nix
View File

@ -1311,6 +1311,7 @@ mapAliases ({
'wayfireApplications-unwrapped.wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'
'wayfireApplications-unwrapped.wlroots' has been removed
''; # Add 2023-07-29
waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24
wcm = throw "'wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'"; # Add 2023-07-29
webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25
wineWayland = wine-wayland;

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

@ -4074,8 +4074,6 @@ with pkgs;
wiimms-iso-tools = callPackage ../tools/filesystems/wiimms-iso-tools { };
waypoint = callPackage ../applications/networking/cluster/waypoint { };
xc = callPackage ../development/tools/xc { };
ios-webkit-debug-proxy = callPackage ../development/mobile/ios-webkit-debug-proxy { };
@ -10155,14 +10153,14 @@ with pkgs;
nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; };
corepack_20 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; });
nodejs_21 = callPackage ../development/web/nodejs/v21.nix { };
nodejs-slim_21 = callPackage ../development/web/nodejs/v21.nix { enableNpm = false; };
corepack_21 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_21; });
nodejs_22 = callPackage ../development/web/nodejs/v22.nix { };
nodejs-slim_22 = callPackage ../development/web/nodejs/v22.nix { enableNpm = false; };
corepack_22 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_22; });
# Update this when adding the newest nodejs major version!
nodejs_latest = nodejs_21;
nodejs-slim_latest = nodejs-slim_21;
corepack_latest = hiPrio corepack_21;
nodejs_latest = nodejs_22;
nodejs-slim_latest = nodejs-slim_22;
corepack_latest = hiPrio corepack_22;
buildNpmPackage = callPackage ../build-support/node/build-npm-package { };
@ -16744,19 +16742,6 @@ with pkgs;
cargo-outdated = callPackage ../development/tools/rust/cargo-outdated {
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
};
cargo-pgx_0_6_1 = callPackage ../development/tools/rust/cargo-pgx/0_6_1.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-pgx_0_7_1 = callPackage ../development/tools/rust/cargo-pgx/0_7_1.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-pgx_0_7_4 = callPackage ../development/tools/rust/cargo-pgx/0_7_4.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-pgx = cargo-pgx_0_7_4;
buildPgxExtension = callPackage ../development/tools/rust/cargo-pgx/buildPgxExtension.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
inherit (callPackages ../development/tools/rust/cargo-pgrx { })
cargo-pgrx_0_10_2
cargo-pgrx_0_11_2
@ -18202,7 +18187,7 @@ with pkgs;
};
bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {
inherit (darwin) cctools;
inherit (darwin) cctools sigtool;
inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk11_headless;
runJdk = jdk11_headless;
@ -24242,6 +24227,17 @@ with pkgs;
rocksdb = callPackage ../development/libraries/rocksdb { };
rocksdb_8_3 = rocksdb.overrideAttrs rec {
pname = "rocksdb";
version = "8.3.2";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = "v${version}";
hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg=";
};
};
rocksdb_7_10 = rocksdb.overrideAttrs rec {
pname = "rocksdb";
version = "7.10.2";
@ -24249,8 +24245,8 @@ with pkgs;
owner = "facebook";
repo = pname;
rev = "v${version}";
hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs=";
};
hash = "sha256-U2ReSrJwjAXUdRmwixC0DQXht/h/6rV8SOf5e2NozIs=";
};
};
rocksdb_6_23 = rocksdb.overrideAttrs rec {

21
pkgs/top-level/ruby-packages.nix
View File

@ -2549,6 +2549,16 @@
};
version = "1.0.1";
};
os = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap";
type = "gem";
};
version = "1.1.4";
};
ovirt-engine-sdk = {
dependencies = ["json"];
groups = ["default"];
@ -3452,6 +3462,17 @@
};
version = "3.0.7";
};
seccomp-tools = {
dependencies = ["os"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v5zyby5glih0prddxm8wp6gn2glrnvf7y4r64k4iqfpdazdpsa3";
type = "gem";
};
version = "1.6.1";
};
semian = {
groups = ["default"];
platforms = [];