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] 2023-07-10 18:01:32 +00:00 committed by GitHub
commit 7df9bccc89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 3408 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/labeler.yml vendored
View File

@ -64,6 +64,9 @@
- pkgs/build-support/kernel/**/*
- pkgs/os-specific/linux/kernel/**/*
"6.topic: lib":
- lib/**
"6.topic: lua":
- pkgs/development/interpreters/lua-5/**/*
- pkgs/development/interpreters/luajit/**/*
@ -83,6 +86,13 @@
- nixos/tests/mate.nix
- pkgs/desktops/mate/**/*
"6.topic: module system":
- lib/modules.nix
- lib/types.nix
- lib/options.nix
- lib/tests/modules.sh
- lib/tests/modules/**
"6.topic: nixos":
- nixos/**/*
- pkgs/os-specific/linux/nixos-rebuild/**/*

13
pkgs/applications/audio/opustags/default.nix
View File

@ -3,22 +3,25 @@
stdenv.mkDerivation rec {
pname = "opustags";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "fmang";
repo = "opustags";
rev = version;
sha256 = "sha256-qxtTJ4Hl2ccL+rhONeoOfV6ZyJaWaVDPMsXYJkXCWkY=";
sha256 = "sha256-cRDyE6/nv8g0OWxZ/AqfwVrk3cSIycvbjvQm9CyQK7g=";
};
nativeBuildInputs = [ cmake pkg-config ]
++ lib.optionals stdenv.isDarwin [ libiconv ];
buildInputs = [ libogg ];
nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
doCheck = true;
nativeCheckInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]);
nativeCheckInputs = [ ffmpeg glibcLocales perl ]
++ (with perlPackages; [ ListMoreUtils TestDeep ]);
checkPhase = ''
export LANG="en_US.UTF-8"

56
pkgs/applications/misc/nut/default.nix
View File

@ -1,5 +1,23 @@
{ lib, stdenv, fetchurl, substituteAll, pkg-config, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi
, libtool, makeWrapper, autoreconfHook, fetchpatch
{ lib
, stdenv
, autoreconfHook
, avahi
, coreutils
, fetchurl
, freeipmi
, gd
, i2c-tools
, libmodbus
, libtool
, libusb1
, makeWrapper
, neon
, net-snmp
, openssl
, pkg-config
, substituteAll
, systemd
, udev
}:
stdenv.mkDerivation rec {
@ -8,42 +26,50 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://networkupstools.org/source/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq";
sha256 = "sha256-w+WnCNp5e3xwtlPTexIGoAD8tQO4VRn+TN9jU/eSv+U=";
};
patches = [
(fetchpatch {
# Fix build with openssl >= 1.1.0
url = "https://github.com/networkupstools/nut/commit/612c05efb3c3b243da603a3a050993281888b6e3.patch";
sha256 = "0jdbii1z5sqyv24286j5px65j7b3gp8zk3ahbph83pig6g46m3hs";
})
(substituteAll {
src = ./hardcode-paths.patch;
avahi = "${avahi}/lib";
freeipmi = "${freeipmi}/lib";
libusb = "${libusb-compat-0_1}/lib";
libusb = "${libusb1}/lib";
neon = "${neon}/lib";
libmodbus = "${libmodbus}/lib";
netsnmp = "${net-snmp.lib}/lib";
})
];
buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ];
buildInputs = [ neon libusb1 openssl udev avahi freeipmi libmodbus i2c-tools net-snmp gd ];
nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ];
configureFlags =
[ "--with-all"
"--with-ssl"
"--without-snmp" # Until we have it ...
"--without-powerman" # Until we have it ...
"--without-cgi"
"--without-hal"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-systemdsystemunitdir=$(out)/lib/systemd/system"
"--with-systemdshutdowndir=$(out)/lib/systemd/system-shutdown"
"--with-systemdtmpfilesdir=$(out)/lib/tmpfiles.d"
"--with-udev-dir=$(out)/etc/udev"
];
enableParallelBuilding = true;
env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
postInstall = ''
substituteInPlace $out/lib/systemd/system-shutdown/nutshutdown \
--replace /bin/sleep "${coreutils}/bin/sleep" \
--replace /bin/systemctl "${systemd}/bin/systemctl"
for file in system/{nut-monitor.service,nut-driver-enumerator.service,nut-server.service,nut-driver@.service} system-shutdown/nutshutdown; do
substituteInPlace $out/lib/systemd/$file \
--replace "$out/etc/nut.conf" "/etc/nut.conf"
done
# we don't need init.d scripts
rm -r $out/share/solaris-init
'';
meta = with lib; {
description = "Network UPS Tools";

18
pkgs/applications/misc/nut/hardcode-paths.patch
View File

@ -1,13 +1,15 @@
--- a/tools/nut-scanner/nutscan-init.c
+++ b/tools/nut-scanner/nutscan-init.c
@@ -44,6 +44,10 @@ int nutscan_load_upsclient_library(const char *libname_path);
/* FIXME: would be good to get more from /etc/ld.so.conf[.d] */
char * search_paths[] = {
--- a/common/common.c
+++ b/common/common.c
@@ -991,6 +991,12 @@ ssize_t select_write(const int fd, const void *buf, const size_t buflen, const t
* communications media and/or vendor protocol.
*/
static const char * search_paths[] = {
+ "@avahi@",
+ "@freeipmi@",
+ "@libusb@",
+ "@neon@",
+ "@libmodbus@",
+ "@netsnmp@",
/* Use the library path (and bitness) provided during ./configure first */
LIBDIR,
"/usr/lib64",
"/lib64",
"/usr"LIBDIR,

6
pkgs/applications/networking/cluster/kubefirst/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubefirst";
version = "2.2.0";
version = "2.2.2";
src = fetchFromGitHub {
owner = "kubefirst";
repo = pname;
rev = "v${version}";
hash = "sha256-6vtuMUTlMOgdUqoCidSKg5liOQWfM+cppUXwX4YYGGA=";
hash = "sha256-pTy7uwPEUmeEQ/3oCeUr5544PRA+xXp5TCbzEuwY8mE=";
};
vendorHash = "sha256-4q/r6LR97uX6QZQN6Y7NCf1ilcGjorIUGIvhTVfkeZg=";
vendorHash = "sha256-uEZY9erGZ19aNGSraD7Zdj8GTCRM247lYAhwqfMznpE=";
ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"];

2
pkgs/applications/networking/cluster/terraspace/Gemfile
View File

@ -1,2 +1,2 @@
source "https://rubygems.org"
gem "terraspace", '~> 2.2.7'
gem "terraspace", '~> 2.2.8'

28
pkgs/applications/networking/cluster/terraspace/Gemfile.lock
View File

@ -1,26 +1,26 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.0.5)
activesupport (7.0.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
aws-eventstream (1.2.0)
aws-partitions (1.781.0)
aws-sdk-core (3.175.0)
aws-partitions (1.785.0)
aws-sdk-core (3.177.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.67.0)
aws-sdk-core (~> 3, >= 3.174.0)
aws-sdk-kms (1.70.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.126.0)
aws-sdk-core (~> 3, >= 3.174.0)
aws-sdk-s3 (1.128.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.2)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
cli-format (0.2.2)
activesupport
@ -46,11 +46,11 @@ GEM
jmespath (1.6.2)
memoist (0.16.2)
minitest (5.18.1)
mini_portile2 (2.8.2)
nokogiri (1.15.2)
nokogiri (1.15.3)
racc (~> 1.4)
mini_portile2 (~> 2.8.2)
racc (1.7.1)
mini_portile2 (2.8.2)
rainbow (3.1.1)
render_me_pretty (0.9.0)
activesupport
@ -71,7 +71,7 @@ GEM
rspec-mocks (3.12.5)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (3.12.0)
rspec-support (3.12.1)
rspec-terraspace (0.3.3)
activesupport
memoist
@ -79,7 +79,7 @@ GEM
rspec
zeitwerk
rubyzip (2.3.2)
terraspace (2.2.7)
terraspace (2.2.8)
activesupport
bundler
cli-format
@ -123,7 +123,7 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
terraspace (~> 2.2.7)
terraspace (~> 2.2.8)
BUNDLED WITH
2.3.26

36
pkgs/applications/networking/cluster/terraspace/gemset.nix
View File

@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym";
sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk";
type = "gem";
};
version = "7.0.5";
version = "7.0.6";
};
aws-eventstream = {
groups = ["default"];
@ -25,10 +25,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y9ghr029lf5kbci9xylhqqjfphfx5ds8g1n72x90r9qdzn1wr1z";
sha256 = "05m0c3h1z0jhaqiciil55fshrjvc725cf1lc0g933pf98vqflb0r";
type = "gem";
};
version = "1.781.0";
version = "1.785.0";
};
aws-sdk-core = {
dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@ -36,10 +36,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fbbzcszpdjy2yzxfvl5fzgn0jgznkwxvqpb46nxv69gqhv3dpsg";
sha256 = "09firi4bin3ay4pd59qgxspq2f1isfi1li8rabpw6lvvbhnar168";
type = "gem";
};
version = "3.175.0";
version = "3.177.0";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -47,10 +47,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dkgcgvif4hjlq5jhixd2hf17pm2pib7p3jxg9g92pybsff9rk7c";
sha256 = "1x73qj2c39ap926by14x56cjmp2cd5jpq5gv33xynypy1idyb0fj";
type = "gem";
};
version = "1.67.0";
version = "1.70.0";
};
aws-sdk-s3 = {
dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
@ -58,10 +58,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "17ya49rwjzimqhzsj6vlc4xfvj2sixy04kr4b6ddg3r6y0jrsixi";
sha256 = "11cxk6b3p1bsl1gg3pi93qx2ynbjrrsrsc68nnqsjm4npvaj052v";
type = "gem";
};
version = "1.126.0";
version = "1.128.0";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -69,10 +69,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m";
sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na";
type = "gem";
};
version = "1.5.2";
version = "1.6.0";
};
cli-format = {
dependencies = ["activesupport" "text-table" "zeitwerk"];
@ -235,10 +235,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10";
sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7";
type = "gem";
};
version = "1.15.2";
version = "1.15.3";
};
racc = {
groups = ["default"];
@ -341,10 +341,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr";
type = "gem";
};
version = "3.12.0";
version = "3.12.1";
};
rspec-terraspace = {
dependencies = ["activesupport" "memoist" "rainbow" "rspec" "zeitwerk"];
@ -373,10 +373,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13z7f7abd02wwa3k431xnikjlrmhm8vfvq907b706s64wqbi04s4";
sha256 = "1zhcdaiq0sgk2gcy4krkzm4qrvcaibkf5n755qgqgcp1f1b0w6gl";
type = "gem";
};
version = "2.2.7";
version = "2.2.8";
};
terraspace-bundler = {
dependencies = ["activesupport" "aws-sdk-s3" "dsl_evaluator" "memoist" "nokogiri" "rainbow" "rubyzip" "thor" "zeitwerk"];

15
pkgs/development/interpreters/nickel/default.nix
View File

@ -1,21 +1,28 @@
{ lib
, rustPlatform
, fetchFromGitHub
, python3
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "nickel";
version = "1.0.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "tweag";
repo = pname;
rev = "refs/tags/${version}"; # because pure ${version} doesn't work
hash = "sha256-8peoO3B5LHKiTUyDLpe0A2xg82LPI7l2vuGdyNhV478=";
rev = "refs/tags/${version}";
hash = "sha256-bG0vNfKQpFQHDBfokvTpfXgVmKg6u/BcIz139pLwwsE=";
};
cargoHash = "sha256-lrRCc5kUekUHrJTznR8xRiLVgQLJ/PsMP967PS41UJU=";
cargoHash = "sha256-qPKAozFXv94wgY99ugjsSuaN92SXZGgZwI2+7UlerHQ=";
cargoBuildFlags = [ "-p nickel-lang-cli" ];
nativeBuildInputs = [
python3
];
passthru.updateScript = nix-update-script { };

3007
pkgs/development/php-packages/datadog_trace/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

50
pkgs/development/php-packages/datadog_trace/default.nix
View File

@ -1,22 +1,56 @@
{ buildPecl, curl, fetchFromGitHub, lib, pcre2, php }:
{ lib
, stdenv
, buildPecl
, cargo
, rustc
, fetchFromGitHub
, rustPlatform
, curl
, pcre2
, libiconv
, darwin
}:
buildPecl rec {
pname = "ddtrace";
version = "0.82.0";
pname = "datadog_trace";
version = "0.89.0";
src = fetchFromGitHub {
owner = "DataDog";
repo = "dd-trace-php";
rev = version;
sha256 = "sha256-QTqZRHh57mRkg0HT9qQS13emGobB0IRqM+mdImAPgtE=";
fetchSubmodules = true;
hash = "sha256-wTGQV80XQsBdmTQ+xaBKtFwLO3S+//9Yli9aReXDlLA=";
};
buildInputs = [ curl pcre2 ];
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"datadog-profiling-2.2.0" = "sha256-PWzC+E2u0hM0HhU0mgZJZvFomEJdQag/3ZK1FibSLG8=";
};
};
meta = with lib; {
env.NIX_CFLAGS_COMPILE = "-O2";
nativeBuildInputs = [
cargo
rustc
darwin.apple_sdk_11_0.rustPlatform.bindgenHook
darwin.apple_sdk_11_0.rustPlatform.cargoSetupHook
];
buildInputs = [ curl pcre2 ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.CoreFoundation
darwin.apple_sdk_11_0.frameworks.Security
darwin.apple_sdk_11_0.Libsystem
libiconv
];
meta = {
changelog = "https://github.com/DataDog/dd-trace-php/blob/${src.rev}/CHANGELOG.md";
description = "Datadog Tracing PHP Client";
homepage = "https://github.com/DataDog/dd-trace-php";
license = with licenses; [ asl20 /* or */ bsd3 ];
maintainers = teams.php.members;
license = with lib.licenses; [ asl20 bsd3 ];
maintainers = lib.teams.php.members;
};
}

30
pkgs/development/php-packages/mongodb/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv
, buildPecl
, fetchFromGitHub
, lib
, libiconv
, pcre2
, pkg-config
, cyrus_sasl
@ -11,11 +13,17 @@
, darwin
}:
buildPecl {
buildPecl rec {
pname = "mongodb";
version = "1.16.1";
version = "1.15.0";
sha256 = "sha256-7rYmjTS9C0o9zGDd5OSE9c9PokOco9nwJMAADpnuckA=";
src = fetchFromGitHub {
owner = "mongodb";
repo = "mongo-php-driver";
rev = version;
hash = "sha256-nVkue3qB6OwXKcyaYU1WmXG7pamKQtk8cbztVVkNejo=";
fetchSubmodules = true;
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
@ -25,12 +33,16 @@ buildPecl {
snappy
zlib
pcre2
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.Security
darwin.apple_sdk_11_0.Libsystem
libiconv
];
meta = with lib; {
description = "MongoDB driver for PHP";
license = licenses.asl20;
homepage = "https://docs.mongodb.com/drivers/php/";
maintainers = teams.php.members;
meta = {
description = "The Official MongoDB PHP driver";
homepage = "https://github.com/mongodb/mongo-php-driver";
license = lib.licenses.asl20;
maintainers = lib.teams.php.members;
};
}

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

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "django-mysql";
version = "4.10.0";
version = "4.11.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "adamchainz";
repo = "django-mysql";
rev = "refs/tags/${version}";
hash = "sha256-5RmNYOY0m6BRD/3cENQLWPJ+dElR53oZaqk616kfQTA=";
hash = "sha256-4PxJH5P/a4oNigbTjrZa3q+FeDQTdkvCKonUUl4I8m0=";
};
nativeBuildInputs = [

100
pkgs/development/python-modules/layoutparser/default.nix Normal file
View File

@ -0,0 +1,100 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
# build inputs
, numpy
, opencv4
, scipy
, pandas
, pillow
, pyyaml
, iopath
, pdfplumber
, pdf2image
, google-cloud-vision
, pytesseract
, torch
, torchvision
, effdet
# check inputs
, pytestCheckHook
}:
let
pname = "layoutparser";
version = "0.3.4";
optional-dependencies = {
ocr = [ google-cloud-vision pytesseract ];
gcv = [ google-cloud-vision ];
tesseract = [ pytesseract ];
layoutmodels = [ torch torchvision effdet ];
effdet = [ torch torchvision effdet ];
# paddledetection = [ paddlepaddle ]
};
in
buildPythonPackage {
inherit pname version;
format = "setuptools";
src = fetchFromGitHub {
owner = "Layout-Parser";
repo = "layout-parser";
rev = "refs/tags/v${version}";
hash = "sha256-qBzcIUmgnGy/Xn/B+7UrLrRhCvCkapL+ymqGS2sMVgA=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "opencv-python" "opencv"
'';
propagatedBuildInputs = [
numpy
opencv4
scipy
pandas
pillow
pyyaml
iopath
pdfplumber
pdf2image
];
pythonImportsCheck = [
"layoutparser"
];
nativeCheckInputs = [
pytestCheckHook
] ++ optional-dependencies.ocr;
disabledTests = [
"test_PaddleDetectionModel" # requires paddlepaddle not yet packaged
# requires detectron2 not yet packaged
"test_Detectron2Model"
"test_AutoModel"
# requires effdet (disable for now until effdet builds on darwin)
"test_EffDetModel"
# problems with google-cloud-vision
# AttributeError: module 'google.cloud.vision' has no attribute 'types'
"test_gcv_agent"
"test_viz"
# - Failed: DID NOT RAISE <class 'ImportError'>
"test_when_backends_are_not_loaded"
];
disabledTestPaths = [
"tests_deps/test_only_detectron2.py" # requires detectron2 not yet packaged
"tests_deps/test_only_effdet.py" # requires effdet (disable for now until effdet builds on darwin)
"tests_deps/test_only_paddledetection.py" # requires paddlepaddle not yet packaged
];
passthru.optional-dependencies = optional-dependencies;
meta = with lib; {
description = "A unified toolkit for Deep Learning Based Document Image Analysis";
homepage = "https://github.com/Layout-Parser/layout-parser";
changelog = "https://github.com/Layout-Parser/layout-parser/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ happysalada ];
};
}

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "uproot";
version = "5.0.9";
version = "5.0.10";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "scikit-hep";
repo = "uproot5";
rev = "refs/tags/v${version}";
hash = "sha256-7TCwVqSwgjM01FE3KMXBbvOKbLsk6xWNxQA46B45RFw=";
hash = "sha256-xLyb0isWQro6RlIT7a4IBkB+m0/fF55CRLrYgi5WLrM=";
};
nativeBuildInputs = [

4
pkgs/development/tools/build-managers/sbt/default.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "sbt";
version = "1.9.1";
version = "1.9.2";
src = fetchurl {
url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz";
hash = "sha256-KcylFTzJYxXW5CN3flgAuDHkVyO0dzLCB6Zu+lyk/Cs=";
hash = "sha256-XdQ69GFnoboN9jhZv65uNS++1SXnZiLY69yJFCIlMrI=";
};
postPatch = ''

10
pkgs/development/tools/kubepug/default.nix
View File

@ -2,19 +2,21 @@
buildGoModule rec {
pname = "kubepug";
version = "1.4.0";
version = "1.5.0";
src = fetchFromGitHub {
owner = "rikatz";
repo = "kubepug";
rev = "v${version}";
sha256 = "sha256-ySGNEs9PwkpjcLaCZ9M6ewE0/PRdwDksJMJ2GZUUrng=";
hash = "sha256-/VkJSZdiU93+GnLxIPPE2ewlm52tp7Wqry0TvjyeqhI=";
};
vendorSha256 = "sha256-faco4/6ldZiD2pkvjFgWDHbpCcNA4dGXxVhuO3PK77k=";
vendorHash = "sha256-fPyXOMJ0rRssGzOca54A5l8ZWixOC58Xtb3SOYSibCo=";
ldflags = [
"-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}"
"-s"
"-w"
"-X sigs.k8s.io/release-utils/version.gitVersion=${version}"
];
patches = [

4
pkgs/development/tools/language-servers/nls/default.nix
View File

@ -6,9 +6,9 @@
rustPlatform.buildRustPackage {
pname = "nls";
inherit (nickel) src version;
inherit (nickel) src version nativeBuildInputs;
cargoHash = "sha256-tahSuSc16oUUjeBBAnTDAiSaLr0zMKgN/XvypXqvvxw=";
cargoHash = "sha256-UGfc5cr6vl10aCVihOEEZktF8MzT56C9/wSvSQhCiVs=";
cargoBuildFlags = [ "-p nickel-lang-lsp" ];

17
pkgs/development/tools/py-spy/default.nix
View File

@ -3,10 +3,7 @@
, darwin
, fetchFromGitHub
, libunwind
, pkg-config
, pkgsBuildBuild
, python3
, runCommand
, rustPlatform
}:
@ -23,6 +20,11 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-nm+44YWSJOOg9a9d8b3APXW50ThV3iA2C/QsJMttscE=";
# error: linker `arm-linux-gnueabihf-gcc` not found
postPatch = ''
rm .cargo/config
'';
nativeBuildInputs = [
rustPlatform.bindgenHook
];
@ -33,18 +35,11 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
# Pull a header that contains a definition of proc_pid_rusage().
(runCommand "${pname}_headers" { } ''
install -Dm444 ${lib.getDev darwin.apple_sdk.sdk}/include/libproc.h $out/include/libproc.h
'')
darwin.apple_sdk_11_0.Libsystem
];
env.NIX_CFLAGS_COMPILE = "-L${libunwind}/lib";
# error: linker `arm-linux-gnueabihf-gcc` not found
preConfigure = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
export RUSTFLAGS="-Clinker=$CC"
'';
checkFlags = [
# thread 'python_data_access::tests::test_copy_string' panicked at 'called `Result::unwrap()` on an `Err`
"--skip=python_data_access::tests::test_copy_string"

4
pkgs/os-specific/darwin/raycast/default.nix
View File

@ -6,12 +6,12 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "raycast";
version = "1.54.1";
version = "1.55.1";
src = fetchurl {
name = "Raycast.dmg";
url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
hash = "sha256-lnP0wSTC7oCji24RSk1fY+QSwoYioMPtvOb4Ey1MzVY=";
hash = "sha256-LklPE08OnrDQbHSYLplzVs8IkkuVrjq2fsBDCRD4dv0=";
};
dontPatch = true;

2
pkgs/os-specific/darwin/raycast/update.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../. -i bash -p common-updater-scripts internetarchive
#!nix-shell -I nixpkgs=../../../../. -i bash -p common-updater-scripts jq
set -eo pipefail

6
pkgs/os-specific/darwin/yabai/default.nix
View File

@ -18,7 +18,7 @@
let
pname = "yabai";
version = "5.0.4";
version = "5.0.6";
test-version = testers.testVersion {
package = yabai;
@ -52,7 +52,7 @@ in
src = fetchzip {
url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz";
sha256 = "sha256-2PH3Hi9x0323MjKHPybNmFddvNNlsaDb1LdiVcZTNJc=";
sha256 = "sha256-1szyjcwkhn2wbrcfhh9lh5bnfm1cavxrx6xj4q7521z3zj29a9kf";
};
nativeBuildInputs = [
@ -88,7 +88,7 @@ in
owner = "koekeishiya";
repo = "yabai";
rev = "v${version}";
sha256 = "sha256-TCY0EvP0+2+U1k9kYIi8jMt4mj3ZRaQPsb1wtU3Z2U4=";
sha256 = "sha256-1/h8f1FQNHn5eVprPVd0can8XHjNyF7j4H3LSN0K8rI=";
};
nativeBuildInputs = [

4
pkgs/os-specific/linux/iwd/default.nix
View File

@ -12,12 +12,12 @@
stdenv.mkDerivation rec {
pname = "iwd";
version = "2.6";
version = "2.7";
src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version;
sha256 = "sha256-Lz36JhsmZ/mfWMc4reJqQahOtzE57tQl6keQjozUZgo=";
sha256 = "sha256-UsyJYQB6YzwcL6H1nyCW8ZTpBzacZMAp39mCfsZqwHY=";
};
outputs = [ "out" "man" "doc" ]

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

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.21.364";
version = "0.21.449";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-PILqSKjuc0XinumQ0D255zOh/S35Xe9qdBMpcUok0b0YoFt25h7kE5FSucBOOBXL9f9tXyL2RI+o/Dxb2CvyLQ==";
hash = "sha512-QbxFpXWrqJjajvWvuWDD8K9Y88rIvaj+cnbu4K84g0MXuhfD0fyxJoRb5d4SewJWbWEQ6dXzEiQ6fPdqY+MYew==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

6
pkgs/servers/nosql/eventstore/default.nix
View File

@ -8,6 +8,9 @@
, stdenv
, mono
}:
let
mainProgram = "EventStore.ClusterNode";
in
buildDotnetModule rec {
pname = "EventStore";
@ -31,7 +34,7 @@ buildDotnetModule rec {
runtimeDeps = [ mono ];
executables = [ "EventStore.ClusterNode" ];
executables = [ mainProgram ];
# This test has a problem running on macOS
disabledTests = lib.optionals stdenv.isDarwin [
@ -76,5 +79,6 @@ buildDotnetModule rec {
license = licenses.bsd3;
maintainers = with maintainers; [ puffnfresh mdarocha ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
inherit mainProgram;
};
}

43
pkgs/tools/audio/catnip-gtk4/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, wrapGAppsHook4
, gobject-introspection
, gtk4
, libadwaita
}:
buildGoModule {
pname = "catnip-gtk4";
version = "unstable-2023-06-17";
src = fetchFromGitHub {
owner = "diamondburned";
repo = "catnip-gtk4";
rev = "e635904af952fcee7e9f4b1a3e45ce8519428d9f";
hash = "sha256-yJNw/pDgvIzcX4H6RoFJBiRwzWQXWF3obUPxYf4ALOY=";
};
vendorHash = "sha256-gcr3e5Fm2xCTOoTgl71Dv3rxI6gQbqRz0M1NO7fAZk0=";
nativeBuildInputs = [
pkg-config
wrapGAppsHook4
];
buildInputs = [
gobject-introspection
gtk4
libadwaita
];
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "GTK4 frontend for catnip";
homepage = "https://github.com/diamondburned/catnip-gtk4";
license = licenses.gpl3Only;
maintainers = with maintainers; [ figsoda ];
};
}

2
pkgs/tools/backup/bup/default.nix
View File

@ -37,6 +37,8 @@ stdenv.mkDerivation {
"LIBDIR=$(out)/lib/bup"
];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration";
postInstall = ''
wrapProgram $out/bin/bup \
--prefix PATH : ${lib.makeBinPath [ git par2cmdline ]} \

18
pkgs/tools/misc/lineselect/default.nix
View File

@ -1,20 +1,32 @@
{ lib
, buildNpmPackage
, fetchFromGitHub
, makeBinaryWrapper
, nodejs
}:
buildNpmPackage rec {
pname = "lineselect";
version = "0.1.3";
version = "0.1.6";
src = fetchFromGitHub {
owner = "chfritz";
repo = "lineselect";
rev = "v${version}";
hash = "sha256-qEAfXBqIuEJ7JPowEJrmo2+xSrLRfhfktAd1Q7NDnAI=";
hash = "sha256-dCmLD4Wjsdlta2xsFCMj1zWQr4HWCfcWsKVmrTND4Yw=";
};
npmDepsHash = "sha256-y4J/EuOHVQHDCId6WTcphNY4LxMyNIGkXeEUoHRaYos=";
npmDepsHash = "sha256-wBtswfXtJTI7um0HZQk1YygpSggZ4j0/7IBcJiQpOUY=";
nativeBuildInputs = [
makeBinaryWrapper
];
postInstall = ''
makeWrapper ${lib.getExe nodejs} $out/bin/lineselect \
--set FORCE_COLOR 2 \
--add-flags $out/lib/node_modules/lineselect/dist/cli.js
'';
meta = with lib; {
description = "Shell utility to interactively select lines from stdin";

12
pkgs/tools/misc/neo-cowsay/default.nix
View File

@ -2,25 +2,27 @@
buildGoModule rec {
pname = "neo-cowsay";
version = "2.0.1";
version = "2.0.4";
src = fetchFromGitHub {
owner = "Code-Hex";
repo = "Neo-cowsay";
rev = "v${version}";
sha256 = "sha256-VswknPs/yCUOUsXoGlGNF22i7dK8FrYzWkUWlfIPrNo=";
hash = "sha256-DmIjqBTIzwkQ8aJ6xCgIwjDtczlTH5AKbPKFUGx3qQ8=";
};
vendorSha256 = "sha256-kJSKDqw2NpnPjotUM6Ck6sixCJt3nVOdx800/+JBiWM=";
vendorHash = "sha256-gBURmodXkod4fukw6LWEY+MBxPcf4vn/f6K78UR77n0=";
modRoot = "./cmd";
doCheck = false;
subPackages = [ "cmd/cowsay" "cmd/cowthink" ];
subPackages = [ "cowsay" "cowthink" ];
meta = with lib; {
description = "Cowsay reborn, written in Go";
homepage = "https://github.com/Code-Hex/Neo-cowsay";
license = with licenses; [artistic1 /* or */ gpl3];
license = with licenses; [ artistic1 /* or */ gpl3 ];
maintainers = with maintainers; [ Br1ght0ne ];
};
}

4
pkgs/tools/networking/mu/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
version = "1.10.4";
version = "1.10.5";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
hash = "sha256-vwStqrw/fPYUpBhBsLX0MPXtBtP5LwU0AYmUbP+Ywgo=";
hash = "sha256-ha3ckyRNzWF52unY6Pw2M6qeUdC68SGHFvzJ8Jbk2fY=";
};
postPatch = ''

23
pkgs/tools/system/btop/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, runCommand
, darwin
, removeReferencesTo
}:
@ -17,23 +16,13 @@ stdenv.mkDerivation rec {
hash = "sha256-F/muCjhcnM+VqAn6FlD4lv23OLITrmtnHkFc5zv97yk=";
};
ADDFLAGS = with darwin.apple_sdk.frameworks;
lib.optional stdenv.isDarwin
"-F${IOKit}/Library/Frameworks/";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk_11_0.frameworks.CoreFoundation
darwin.apple_sdk_11_0.frameworks.IOKit
];
buildInputs = with darwin.apple_sdk;
lib.optionals stdenv.isDarwin [
frameworks.CoreFoundation
frameworks.IOKit
] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) (
# Found this explanation for needing to create a header directory for libproc.h alone.
# https://github.com/NixOS/nixpkgs/blob/049e5e93af9bbbe06b4c40fd001a4e138ce1d677/pkgs/development/libraries/webkitgtk/default.nix#L154
# TL;DR, the other headers in the include path for the macOS SDK is not compatible with the C++ stdlib and causes issues, so we copy
# this to avoid those issues
runCommand "${pname}_headers" { } ''
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
''
);
env.ADDFLAGS = lib.optionalString stdenv.isDarwin
"-F${darwin.apple_sdk_11_0.frameworks.IOKit}/Library/Frameworks/";
installFlags = [ "PREFIX=$(out)" ];

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

@ -11843,7 +11843,7 @@ with pkgs;
pythonPackages = python27Packages;
};
py-spy = callPackage ../development/tools/py-spy { };
py-spy = darwin.apple_sdk_11_0.callPackage ../development/tools/py-spy { };
pydeps = with python3Packages; toPythonApplication pydeps;
@ -18413,6 +18413,8 @@ with pkgs;
catnip = callPackage ../tools/audio/catnip { };
catnip-gtk4 = callPackage ../tools/audio/catnip-gtk4 { };
cbrowser = callPackage ../development/tools/misc/cbrowser { };
cc-tool = callPackage ../development/embedded/cc-tool { };
@ -27355,7 +27357,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) AppKit;
};
btop = callPackage ../tools/system/btop {
btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop {
stdenv = gcc12Stdenv;
};

8
pkgs/top-level/php-packages.nix
View File

@ -222,7 +222,9 @@ lib.makeScope pkgs.newScope (self: with self; {
couchbase = callPackage ../development/php-packages/couchbase { };
datadog_trace = callPackage ../development/php-packages/datadog_trace { };
datadog_trace = callPackage ../development/php-packages/datadog_trace {
inherit (pkgs) darwin;
};
ds = callPackage ../development/php-packages/ds { };
@ -244,7 +246,9 @@ lib.makeScope pkgs.newScope (self: with self; {
memcached = callPackage ../development/php-packages/memcached { };
mongodb = callPackage ../development/php-packages/mongodb { };
mongodb = callPackage ../development/php-packages/mongodb {
inherit (pkgs) darwin;
};
msgpack = callPackage ../development/php-packages/msgpack { };

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

@ -5642,6 +5642,8 @@ self: super: with self; {
laundrify-aio = callPackage ../development/python-modules/laundrify-aio { };
layoutparser = callPackage ../development/python-modules/layoutparser { };
lazr_config = callPackage ../development/python-modules/lazr/config.nix { };
lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { };