Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-09-14 06:04:20 +00:00
committed by GitHub
56 changed files with 1774 additions and 1296 deletions
+3
View File
@@ -0,0 +1,3 @@
# CERNLIB {#cernlib-hook}
This hook sets the `CERN`, `CERN_LEVEL`, and `CERN_ROOT` environment variables. They are part of [CERNLIB's build system](https://cernlib.web.cern.ch/install/install.html), and are are needed for some programs to compile correctly.
+1
View File
@@ -10,6 +10,7 @@ automake.section.md
autopatchelf.section.md
bmake.section.md
breakpoint.section.md
cernlib.section.md
cmake.section.md
gdk-pixbuf.section.md
ghc.section.md
+15
View File
@@ -0,0 +1,15 @@
# Geant4 {#geant4}
[Geant4](https://www.geant4.org/) is a toolkit for simulating how particles pass through matter. It is available through the `geant4` package.
## Setup hook {#geant4-hook}
The setup hook included in the package applies the environment variables set by the [`geant4.sh` script](https://github.com/Geant4/geant4/blob/master/cmake/Modules/G4ConfigureGNUMakeHelpers.cmake#L4-L55), which is typically necessary for compiling `make`-based programs that depend on Geant4.
## Datasets {#geant4-datasets}
All of [the Geant4 datasets provided by CERN](https://geant4.web.cern.ch/support/download) are available through the `geant4.data` attrset.
### Setup hook {#geant4-datasets-hook}
The hook provided by the packages in `geant4.data` will set an appropriate environment variable in the form of `G4[...]DATA`. For example, for the `G4RadioactiveDecay` dataset, the `G4RADIOACTIVEDATA` environment variable is set to the value expected by Geant4.
+1
View File
@@ -12,6 +12,7 @@ emacs.section.md
firefox.section.md
fish.section.md
fuse.section.md
geant4.section.md
ibus.section.md
kakoune.section.md
krita.section.md
@@ -9,9 +9,6 @@
./installation-cd-base.nix
];
# Causes a lot of uncached builds for a negligible decrease in size.
environment.noXlibs = lib.mkOverride 500 false;
documentation.man.enable = lib.mkOverride 500 true;
# Although we don't really need HTML documentation in the minimal installer,
-2
View File
@@ -6,8 +6,6 @@
with lib;
{
environment.noXlibs = mkDefault true;
documentation.enable = mkDefault false;
documentation.doc.enable = mkDefault false;
@@ -5,7 +5,9 @@ with lib;
let
cfg = config.services.samba;
settingsFormat = pkgs.formats.ini { };
settingsFormat = pkgs.formats.ini {
listToValue = lib.concatMapStringsSep " " (generators.mkValueStringDefault { });
};
# Ensure the global section is always first
globalConfigFile = settingsFormat.generate "smb-global.conf" { global = cfg.settings.global; };
sharesConfigFile = settingsFormat.generate "smb-shares.conf" (lib.removeAttrs cfg.settings [ "global" ]);
@@ -122,7 +124,6 @@ in
type = lib.types.listOf lib.types.str;
default = [ "root" ];
description = "List of users who are denied to login via Samba.";
apply = x: lib.concatStringsSep " " x;
};
global."passwd program" = lib.mkOption {
type = lib.types.str;
@@ -27,7 +27,6 @@
services.openssh.startWhenNeeded = lib.mkDefault true;
# As this is intended as a standalone image, undo some of the minimal profile stuff
environment.noXlibs = false;
documentation.enable = true;
documentation.nixos.enable = true;
services.logrotate.enable = true;
@@ -45,7 +45,7 @@ self: let
});
};
super = removeAttrs imported [ "dash" ];
super = imported;
overrides = {
eglot = super.eglot.overrideAttrs (old: {
@@ -45,7 +45,7 @@ self: let
});
};
super = removeAttrs imported [ "dash" ];
super = imported;
overrides = {
# upstream issue: Wrong type argument: arrayp, nil
@@ -21,8 +21,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
mktplcRef = {
name = "python";
publisher = "ms-python";
version = "2024.15.2024091001";
hash = "sha256-CtPOLKaTIp4uMIaGVo3h6XxP/BYilgU6GBSA5wZMW8o=";
version = "2024.15.2024091301";
hash = "sha256-MB8Vq2rjO37yW3Zh+f8ek/yz0qT+ZYHn/JnF5ZA6CXQ=";
};
buildInputs = [ icu ];
File diff suppressed because it is too large Load Diff
@@ -23,7 +23,7 @@
}:
let
version = "nightly-2024-05-01";
version = "nightly-2024-09-12";
in
rustPlatform.buildRustPackage {
pname = "ruffle";
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage {
owner = "ruffle-rs";
repo = "ruffle";
rev = version;
hash = "sha256-WfoYQku1NFhvWyqeSVKtsMMEyUA97YFD7cvdn4XYIPI=";
hash = "sha256-wvgx6581vvUPb9evvJl328oTP/F8+LhpeHX3vCsHXCc=";
};
nativeBuildInputs =
@@ -98,11 +98,13 @@ rustPlatform.buildRustPackage {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"flash-lso-0.6.0" = "sha256-sVe53VRtBEEI6eERWRv6aG6BBT31sSLvJ6CSCcif2Lo=";
"h263-rs-0.1.0" = "sha256-EBYZ00axaILGc2CtJoPQpewlf6+jlmml+cXZFyoxhHQ=";
"jpegxr-0.3.1" = "sha256-YbQMi86DXqdi7o0s5ajAv7/vFaxNpShz19cNa9MpOsA=";
"ecolor-0.28.1" = "sha256-X1prQIc3jzmWyEmpfQMgowW2qM1r+2T12Nd7HCsPtpc=";
"flash-lso-0.6.0" = "sha256-X9XYj88GmkPRy+RxvGM6vFdBxif2XYesKtqwwW2DTw4=";
"h263-rs-0.1.0" = "sha256-dyQHnCe7LwwZYlF57sbRzir9vUavN3K8wLhwPIWlmik=";
"jpegxr-0.3.1" = "sha256-03gbXA5T02ofgfRaanaixqfrFpxw/UOOftgKZ7hPHY4=";
"nellymoser-rs-0.1.2" = "sha256-66yt+CKaw/QFIPeNkZA2mb9ke64rKcAw/6k/pjNYY04=";
"nihav_codec_support-0.1.0" = "sha256-HAJS4I6yyzQzCf+vmaFp1MWXpcUgFAHPxLhfMVXmN1c=";
"rfd-0.14.1" = "sha256-eq4OONgYrtWCogIpjws/1uRxmv3oyIdrimDVaLJ9IMo=";
};
};
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "bcftools";
version = "1.20";
version = "1.21";
src = fetchurl {
url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-MSuDKd5RMN06N2eMcSlR5h5XcVV8cSmnCjJ6MA/ahiA=";
sha256 = "sha256-UopMwdNVU2jbdacAsio8ldqJP9GCf20wRxbf1F6k4oI=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -9,14 +9,14 @@
buildLua (finalAttrs: {
pname = "uosc";
version = "5.2.0";
version = "5.5.0";
scriptPath = "src/uosc";
src = fetchFromGitHub {
owner = "tomasklaen";
repo = "uosc";
rev = finalAttrs.version;
hash = "sha256-0GPDna9uOuhFDhA9A1fbkoKkgSB76qiDzJVQ9gjGcWo=";
hash = "sha256-WFsqA5kGefQmvihLUuQBfMmKoUHiO7ofxpwISRygRm4=";
};
passthru.updateScript = gitUpdater { };
+2 -2
View File
@@ -34,8 +34,8 @@ in buildBazelPackage rec {
fetchAttrs = {
sha256 = {
aarch64-linux = "sha256-38O9HPKMjqpNCO+kC8hUlsJAclONVCj3oj/iVRwOEDo=";
x86_64-linux = "sha256-OUVjgVIBNh0j10dgk/l42bqmsGuBC56uf4Ei/IRXxBI=";
aarch64-linux = "sha256-UI+Vz/gU6ki0yulcDbA1lkKJg0MZWYMIpfIHHmIjVLo=";
x86_64-linux = "sha256-9ryJUrmLkhuH6wRuHkAXIvOC+xGJ+jHL6vlAkRuXcUI=";
}.${system} or (throw "No hash for system: ${system}");
};
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "bngblaster";
version = "0.9.5";
version = "0.9.6";
src = fetchFromGitHub {
owner = "rtbrick";
repo = "bngblaster";
rev = finalAttrs.version;
hash = "sha256-fJDoKGYal/wDpe2FALWDm0cVngP2ybWlrDIJLSEBIGY=";
hash = "sha256-VPzlORjLcsHY/rSYFlzKb5dh9D7j302dcRFULVjQSa0=";
};
nativeBuildInputs = [ cmake ];
+3 -3
View File
@@ -6,18 +6,18 @@
buildGoModule rec {
pname = "containerlab";
version = "0.57.0";
version = "0.57.1";
src = fetchFromGitHub {
owner = "srl-labs";
repo = "containerlab";
rev = "v${version}";
hash = "sha256-dqREbTDRhSEQg8swZ5ljhAtu3Yv421/QNmpkWopPWbk=";
hash = "sha256-b7Y65DCBDTyScGvYrz83ZN2oWN64ydoVXnssdnuZjQw=";
};
nativeBuildInputs = [ installShellFiles ];
vendorHash = "sha256-3ESz1wnbm6KfXSO5Fw4c7uUxL3K8Lsib5KAYoRD6vrw=";
vendorHash = "sha256-mI5w7hUfQZPWv5JPbBodHxonLxtZfnHRw2K7Nl6sDOE=";
ldflags = [
"-s"
+3 -3
View File
@@ -5,16 +5,16 @@
buildGoModule rec {
pname = "flarectl";
version = "0.103.0";
version = "0.104.0";
src = fetchFromGitHub {
owner = "cloudflare";
repo = "cloudflare-go";
rev = "v${version}";
hash = "sha256-mYdZgHJz2Ajrk/JRbaDeghm39PWidnAIZvjJTvl8lpM=";
hash = "sha256-XHvWdSqkVEM/0FWkvSZDLEh8W2h8f+12ROrZSgmZS1k=";
};
vendorHash = "sha256-R3By8/cR4pZQgUSyNGDnnvWwcpZqraqk5GRZ8Om9JOU=";
vendorHash = "sha256-KMCwbbDpj4QAgvKLlOPDKSlrDyf+K/tGTMM/GBlvyuc=";
subPackages = [ "cmd/flarectl" ];
+14 -5
View File
@@ -1,23 +1,32 @@
{
lib,
buildGoModule,
fetchpatch,
buildGo123Module,
fetchFromGitHub,
git,
nix-update-script,
}:
buildGoModule rec {
buildGo123Module rec {
pname = "git-spice";
version = "0.4.0";
version = "0.5.2";
src = fetchFromGitHub {
owner = "abhinav";
repo = "git-spice";
rev = "refs/tags/v${version}";
hash = "sha256-D+kwH7fBRvi+H0/L7Gezn1FMBk3AkL9MbLULAwvrzrg=";
hash = "sha256-ftNLe/3akvk6nUrseBqpbJQSiUPEJO6cTEc7uEBKX3k=";
};
vendorHash = "sha256-24jtlvp8xSMzNejyzqt+MiQHRKprps132Q+rP9wlA30=";
vendorHash = "sha256-f7bjlTVwCFoQrgbeyAvsVAS6vy5uE/AvMGKEutE1lfs=";
# Fixes flaky test. Remove next release.
patches = [
(fetchpatch {
url = "https://github.com/abhinav/git-spice/commit/92c28474bab81881443129e4a8e9bfc3f1564931.patch";
hash = "sha256-6v++jG7Wm6awqHRiNzwjX25BB8X9yGYhSzcUDNQKJ7k=";
})
];
subPackages = [ "." ];
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "kulala-fmt";
version = "1.3.1";
version = "1.3.2";
src = fetchFromGitHub {
owner = "mistweaverco";
repo = "kulala-fmt";
rev = "v${version}";
hash = "sha256-5MilRr5ictLVZtkB2boSoPktkDA0oOXRPkfREX5b448=";
hash = "sha256-VWd+lUPRgDVaM8nnwah/dXjQeHsLD3OM2D8coEJDCu4=";
};
vendorHash = "sha256-GazDEm/qv0nh8vYT+Tf0n4QDGHlcYtbMIj5rlZBvpKo=";
@@ -1,10 +1,12 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
, pkg-config
, libplist
, openssl
{
lib,
stdenv,
fetchFromGitHub,
installShellFiles,
fetchpatch,
pkg-config,
libplist,
openssl,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -18,15 +20,32 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-QnSmWY9zCOPYAn2VHc5H+VQXjTCyr0EuosxvKGGpDtQ=";
};
nativeBuildInputs = [ pkg-config installShellFiles ];
buildInputs = [ libplist openssl ];
nativeBuildInputs = [
pkg-config
installShellFiles
];
buildInputs = [
libplist
openssl
];
stripDebugFlags = [ "--strip-unneeded" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
dontConfigure = true;
patches = [
(fetchpatch {
name = "fix-memory-issues-with-various-entitlements.patch";
url = "https://github.com/ProcursusTeam/ldid/commit/f38a095aa0cc721c40050cb074116c153608a11b.patch";
hash = "sha256-D5o/E2tCbuNOv2D9UVaLEx8ZiwSB/wT0hf7XaTGzxE0=";
})
];
postPatch = ''
substituteInPlace Makefile \
--replace "pkg-config" "$PKG_CONFIG"
--replace-fail "pkg-config" "$PKG_CONFIG"
'';
postInstall = ''
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "media-downloader";
version = "5.0.1";
version = "5.1.0";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = "media-downloader";
rev = finalAttrs.version;
hash = "sha256-yAG9F9helGM8/TjJiqMDUviHK6uEUvHGny2QklwB2JY=";
hash = "sha256-uN7u6/XRDpJFaZiMOYzLvTC7f0MIlKUGh6ter6aPzbI=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "mods";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = "mods";
rev = "v${version}";
hash = "sha256-Niap2qsIJwlDRITkPD2Z7NCiJubkyy8/pvagj5Beq84=";
hash = "sha256-1Qx3P1q7zmrzNqmiivri0BxdEsRYgS1cOp17S44jRPI=";
};
vendorHash = "sha256-DaSbmu1P/umOAhG901aC+TKa3xXSvUbpYsaiYTr2RJs=";
vendorHash = "sha256-LarOXYkyhSCMXkD2G3/XYHnj5bDcL6nwWxlMAYy+9d8=";
nativeBuildInputs = [
installShellFiles
+3 -3
View File
@@ -8,17 +8,17 @@
rustPlatform.buildRustPackage rec {
pname = "mountpoint-s3";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "awslabs";
repo = "mountpoint-s3";
rev = "v${version}";
hash = "sha256-0SygSRp2HXgLhW0BscRhH3H/WUstAf6VbQPJ35ffrRM=";
hash = "sha256-uzTnkspTS3WvJUOmp8z7L/L1ut6NvnSlnsRa5yvaTRI=";
fetchSubmodules = true;
};
cargoHash = "sha256-nkTvVfbpi5yvWpRd1Tm6INi3PrR6mP8VkBpIVeCEkw0=";
cargoHash = "sha256-kru8CBN9Mqm8Og7SKICjqSvds7z58RRqI4W2txLvWXo=";
# thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
# cargo metadata failure: error: none of the selected packages contains these features: libfuse3
@@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "parinfer-rust-emacs";
version = "0.4.6";
version = "0.4.7";
src = fetchFromGitHub {
owner = "justinbarclay";
repo = "parinfer-rust-emacs";
rev = "v${version}";
hash = "sha256-SNs/75beomxvexfE4+3v/l9Xl5w5SY0EWcORHvRitOw=";
hash = "sha256-JYKFfbfpkvBRxYUDw2d6DD1mO27OKzdquSOhBk0lXr0=";
};
cargoHash = "sha256-LmfcY9iR7BGh3dF/raSZTIwburtaQRI3I3XvOZG343M=";
cargoHash = "sha256-E3x/Jy21qP1onABRmbrq51ZKrlqwiWIwSaqOCh28lKw=";
meta = with lib; {
description = "Emacs centric fork of parinfer-rust";
+3 -3
View File
@@ -15,18 +15,18 @@
buildGoModule rec {
pname = "picocrypt";
version = "1.42";
version = "1.43";
src = fetchFromGitHub {
owner = "Picocrypt";
repo = "Picocrypt";
rev = "refs/tags/${version}";
hash = "sha256-Ehsjt3zCtJFBJ0l707uRtEfDC3M99mb9HFcNlH1btVE=";
hash = "sha256-xxlmerEGujBvghC+OpMW0gkDl7zPOW4r6cM7T6qOc6A=";
};
sourceRoot = "${src.name}/src";
vendorHash = "sha256-S5iR0eeR+nqxNzE3+KDN1Yw7nmycN0IhhMZjIdVb6WQ=";
vendorHash = "sha256-QeNFXmWeA/hkYdFzJoHj61bo/DmGWakdhFRLtSYG7+Y=";
ldflags = [
"-s"
+4 -4
View File
@@ -1,13 +1,13 @@
{ lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }:
let
version = "1.1.378";
version = "1.1.380";
src = fetchFromGitHub {
owner = "Microsoft";
repo = "pyright";
rev = "${version}";
hash = "sha256-GFrVnMGYR57IKUybAuVyriwgOLfPBwf7H9NjJNvsTNE=";
hash = "sha256-Z73g4Fjj23rRTa2yIA3bjcZd2VHgXfDuHM6D77tHnZI=";
};
patchedPackageJSON = runCommand "package.json" { } ''
@@ -37,7 +37,7 @@ let
pname = "pyright-internal";
inherit version src;
sourceRoot = "${src.name}/packages/pyright-internal";
npmDepsHash = "sha256-Osz5c0HeJG1CgGiLuNUfIc5jvpY35a+y496JMt3FD+I=";
npmDepsHash = "sha256-YlhoMvqS7pOBmRBT4mrKPggBpT1DV9xn4OdlPCR9vv8=";
dontNpmBuild = true;
installPhase = ''
runHook preInstall
@@ -51,7 +51,7 @@ buildNpmPackage rec {
inherit version src;
sourceRoot = "${src.name}/packages/pyright";
npmDepsHash = "sha256-XvswAKYGRoydha+areiXfGN6nXQObQmOWKp49Rhmbv0=";
npmDepsHash = "sha256-Bs9GHjjSKqiu6EmeAVgyEj6QylDxK7majrlIMZgLGqU=";
postPatch = ''
chmod +w ../../
+3 -3
View File
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "railway";
version = "3.13.0";
version = "3.14.0";
src = fetchFromGitHub {
owner = "railwayapp";
repo = "cli";
rev = "v${version}";
hash = "sha256-uCgL08HADAtSt4OGqvHNGq95RG23QRYXHt0vIqCtjno=";
hash = "sha256-W9p987yn04Ije6JXFndHXB4rENGBTIiRmCh6fDhXJ4I=";
};
cargoHash = "sha256-UblS3jhn5yJTog/qblnoHVaJbXZKYRnw+ZgabZ+pPcI=";
cargoHash = "sha256-/Lot/Cxg/BUp4MFp6VkJHR7jy7mUe7qwJDhPS8kOeUk=";
nativeBuildInputs = [ pkg-config ];
+3 -2
View File
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchFromGitHub {
owner = "ZDoom";
repo = "Raze";
rev = finalAttrs.version;
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-R3Sm/cibg+D2QPS4UisRp91xvz3Ine2BUR8jF5Rbj1g=";
leaveDotGit = true;
postFetch = ''
@@ -68,7 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = ''
mv $out/bin/raze $out/share/raze
makeWrapper $out/share/raze/raze $out/bin/raze
makeWrapper $out/share/raze/raze $out/bin/raze \
--set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]}
install -Dm644 ../source/platform/posix/org.zdoom.Raze.256.png $out/share/pixmaps/org.zdoom.Raze.png
install -Dm644 ../source/platform/posix/org.zdoom.Raze.desktop $out/share/applications/org.zdoom.Raze.desktop
install -Dm644 ../soundfont/raze.sf2 $out/share/raze/soundfonts/raze.sf2
@@ -1,22 +1,17 @@
{ lib
, stdenv
, fetchFromGitHub
, wrapQtAppsHook
, cmake
, pkg-config
, util-linux
, curl
, libarchive
, qtbase
, qtdeclarative
, qtsvg
, qttools
, qtquickcontrols2
, qtgraphicaleffects
, xz
, testers
, nix-update-script
, enableTelemetry ? false
{
lib,
stdenv,
cmake,
curl,
fetchFromGitHub,
libarchive,
nix-update-script,
pkg-config,
qt5,
testers,
util-linux,
xz,
enableTelemetry ? false,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -30,38 +25,42 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-JrotKMyAgQO3Y5RsFAar9N5/wDpWiBcy8RfvBWDiJMs=";
};
sourceRoot = "${finalAttrs.src.name}/src";
# By default, the builder checks for JSON support in lsblk by running "lsblk --json",
# but that throws an error, as /sys/dev doesn't exist in the sandbox.
# This patch removes the check.
patches = [ ./lsblkCheckFix.patch ];
nativeBuildInputs = [
cmake
pkg-config
qt5.wrapQtAppsHook
util-linux
wrapQtAppsHook
];
buildInputs =
[
curl
libarchive
qt5.qtbase
qt5.qtdeclarative
qt5.qtgraphicaleffects
qt5.qtquickcontrols2
qt5.qtsvg
qt5.qttools
xz
]
++ lib.optionals stdenv.isLinux [
qt5.qtwayland
];
# Disable telemetry and update check.
cmakeFlags = lib.optionals (!enableTelemetry) [
"-DENABLE_CHECK_VERSION=OFF"
"-DENABLE_TELEMETRY=OFF"
];
buildInputs = [
curl
libarchive
qtbase
qtdeclarative
qtsvg
qttools
qtquickcontrols2
qtgraphicaleffects
xz
];
sourceRoot = "${finalAttrs.src.name}/src";
/* By default, the builder checks for JSON support in lsblk by running "lsblk --json",
but that throws an error, as /sys/dev doesn't exist in the sandbox.
This patch removes the check. */
patches = [ ./lsblkCheckFix.patch ];
passthru = {
tests.version = testers.testVersion {
package = finalAttrs.finalPackage;
@@ -76,7 +75,10 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://github.com/raspberrypi/rpi-imager/releases/tag/v${finalAttrs.version}";
license = licenses.asl20;
mainProgram = "rpi-imager";
maintainers = with maintainers; [ ymarkus anthonyroussel ];
maintainers = with maintainers; [
ymarkus
anthonyroussel
];
platforms = platforms.all;
# does not build on darwin
broken = stdenv.isDarwin;
+3 -3
View File
@@ -7,13 +7,13 @@
buildGoModule rec {
pname = "syft";
version = "1.11.1";
version = "1.12.2";
src = fetchFromGitHub {
owner = "anchore";
repo = "syft";
rev = "refs/tags/v${version}";
hash = "sha256-pHr0U7s4KOvPoLvcPbEANJeKN6CWI9Zfnu8/ZI1P3yw=";
hash = "sha256-SLNNaEF4Ep9fxYAsO+Qu+yKm+3CHs5kD//mgD8P4FxQ=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@@ -28,7 +28,7 @@ buildGoModule rec {
# hash mismatch with darwin
proxyVendor = true;
vendorHash = "sha256-DMS/oYD8jNdjDiuMWxDyYd/kSasfHEoRdd7l6SyacBo=";
vendorHash = "sha256-RVU6vr9ri+lx+PvFve/86cuQCnPnxA+z/lo2Hj4jnbg=";
nativeBuildInputs = [ installShellFiles ];
+7 -3
View File
@@ -7,14 +7,14 @@
python3Packages.buildPythonApplication rec {
pname = "twitch-dl";
version = "2.3.1";
version = "2.9.2";
pyproject = true;
src = fetchFromGitHub {
owner = "ihabunek";
repo = "twitch-dl";
rev = "refs/tags/${version}";
hash = "sha256-ixkIDJbysa3TOJiNmAG2SuJwCv5MaX6nCtUnS4901rg=";
hash = "sha256-BIE3+SDmc5ggF9P+qeloI1JYYrEtOJQ/8oDR76i0t6c=";
};
pythonRelaxDeps = [
@@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec {
pythonImportsCheck = [
"twitchdl"
"twitchdl.cli"
"twitchdl.download"
"twitchdl.naming"
"twitchdl.entities"
"twitchdl.http"
"twitchdl.output"
@@ -63,6 +63,10 @@ python3Packages.buildPythonApplication rec {
installManPage twitch-dl.1
'';
preInstallCheck = ''
export HOME="$(mktemp -d)"
'';
meta = with lib; {
description = "CLI tool for downloading videos from Twitch";
homepage = "https://github.com/ihabunek/twitch-dl";
+5
View File
@@ -0,0 +1,5 @@
{
python3Packages,
}:
with python3Packages;
toPythonApplication unicodeit
+3 -3
View File
@@ -25,9 +25,9 @@ let
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
"19.1.0-rc3".officialRelease.sha256 = "sha256-SRonSpXt1pH6Xk+rQZk9mrfMdvYIvOImwUfMUu3sBgs=";
"20.0.0-git".gitRelease = {
rev = "837ee5b46a5f7f898f0de7e46a19600b896a0a1f";
rev-version = "20.0.0-unstable-2024-09-01";
sha256 = "sha256-GZDc1o7dLhPWrHA/LELsKs5ydHv9gn1bNFMg6Lfjs5Y=";
rev = "ffcff4af59712792712b33648f8ea148b299c364";
rev-version = "20.0.0-unstable-2024-09-09";
sha256 = "sha256-RVxezpWFDH4prmaLhm0ASlpRwnMdmLqcZMsp2RiXq8I=";
};
} // llvmVersions;
@@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "coin";
version = "4.0.2";
version = "4.0.3";
src = fetchFromGitHub {
owner = "coin3d";
repo = "coin";
rev = "v${finalAttrs.version}";
hash = "sha256-tBegPZQme5McC0HGvjjdIBQQl59Ud4aJk2hONWMzEdc=";
hash = "sha256-EeLfIu+InGy56zqjhbNle4hPjQmzwqzHA4ODBMjb9kg=";
};
nativeBuildInputs = [ cmake ];
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "aiostreammagic";
version = "2.2.5";
version = "2.3.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "noahhusby";
repo = "aiostreammagic";
rev = "refs/tags/${version}";
hash = "sha256-fJiP16LvHuYlSkeq/SijWI8YEX8T4lGDJLAVvKplgHI=";
hash = "sha256-qfiLYl2FYT4SNv02aGQoRJPvMzBiPKj/yozdkTFOykU=";
};
pythonRelaxDeps = [ "websockets" ];
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "autarco";
version = "2.0.0";
version = "3.0.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "klaasnicolaas";
repo = "python-autarco";
rev = "refs/tags/v${version}";
hash = "sha256-e/wi4suDMSQTaSdyYsTiBxVUNvisYBVPqy9Rpk0lwJw=";
hash = "sha256-7Q6kvJxhds0myu3pMOLSCJKwoGPzHjNSo8H3ctgFvjM=";
};
pythonRelaxDeps = [ "orjson" ];
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "knocki";
version = "0.3.1";
version = "0.3.2";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "swan-solutions";
repo = "knocki-homeassistant";
rev = "v${version}";
hash = "sha256-tWtANsujAcdIddoUBrKWIPfiPzDqWhW94Goz0QQ2BfE=";
rev = "refs/tags/v${version}";
hash = "sha256-WdX/RvLjxkElgDXVMXcslYWlupQ7RDns5F+Y5XGQk5w=";
};
postPatch = ''
@@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "mplhep";
version = "0.3.51";
version = "0.3.52";
pyproject = true;
src = fetchFromGitHub {
owner = "scikit-hep";
repo = "mplhep";
rev = "refs/tags/v${version}";
hash = "sha256-5uXqBifJNWznXX4l5G79DLvD6VdD8xRBwZJbzp1+HP8=";
hash = "sha256-fcc/DG4irTvAOjCGAW7hW96z0yJNSvcpanfDGN9H9XI=";
};
build-system = [
@@ -31,7 +31,7 @@
buildPythonPackage rec {
pname = "optimum";
version = "1.21.4";
version = "1.22.0";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
owner = "huggingface";
repo = "optimum";
rev = "refs/tags/v${version}";
hash = "sha256-ElF+RmZjsXhaA8yhTEK2kp5gigGheyJL36R8e0hSgzA=";
hash = "sha256-fVpSoa6s7puYO8BiA6aSAhSOTfiZJgaX5iwYkd9VdVo=";
};
build-system = [ setuptools ];
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "pytest-ansible";
version = "24.8.0";
version = "24.9.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "ansible";
repo = "pytest-ansible";
rev = "refs/tags/v${version}";
hash = "sha256-+kGVSutTKO6eGH6oHSZ86Hp4jLbofYDcvsiJRXSGQHE=";
hash = "sha256-OlRWtKMgcZCDCFcUl3YXzG/ERPfx2KBEaKNf0strgCU=";
};
postPatch = ''
@@ -17,6 +17,9 @@
python-mistralclient,
python-neutronclient,
python-openstackclient,
python-watcherclient,
python-zaqarclient,
python-zunclient,
requests-mock,
requests,
setuptools,
@@ -79,6 +82,9 @@ buildPythonPackage rec {
python-manilaclient
python-mistralclient
python-neutronclient
python-watcherclient
python-zaqarclient
python-zunclient
];
};
tests.version = testers.testVersion {
@@ -0,0 +1,75 @@
{
lib,
buildPythonPackage,
cliff,
fetchFromGitHub,
keystoneauth1,
openstackdocstheme,
osc-lib,
oslo-i18n,
oslo-serialization,
oslo-utils,
pbr,
pythonOlder,
setuptools,
sphinxcontrib-apidoc,
sphinxHook,
stestr,
}:
buildPythonPackage rec {
pname = "python-watcherclient";
version = "4.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "openstack";
repo = "python-watcherclient";
rev = "refs/tags/${version}";
hash = "sha256-lDdiZKaeteKZEyfjpBx8KY+0FLFOYAnQXl0pTbqq0Ss=";
};
env.PBR_VERSION = version;
build-system = [
pbr
setuptools
];
nativeBuildInputs = [
openstackdocstheme
sphinxcontrib-apidoc
sphinxHook
];
sphinxBuilders = [ "man" ];
dependencies = [
cliff
keystoneauth1
osc-lib
oslo-i18n
oslo-serialization
oslo-utils
];
nativeCheckInputs = [ stestr ];
checkPhase = ''
runHook preCheck
stestr run
runHook postCheck
'';
pythonImportsCheck = [ "watcherclient" ];
meta = {
homepage = "https://opendev.org/openstack/python-watcherclient";
description = "Client library for OpenStack Watcher API";
license = lib.licenses.asl20;
mainProgram = "watcher";
maintainers = lib.teams.openstack.members;
};
}
@@ -0,0 +1,82 @@
{
lib,
buildPythonPackage,
ddt,
fetchFromGitHub,
jsonschema,
keystoneauth1,
openstackdocstheme,
osc-lib,
oslo-i18n,
oslo-log,
oslo-utils,
pbr,
pythonOlder,
requests-mock,
requests,
setuptools,
sphinxHook,
stestr,
stevedore,
}:
buildPythonPackage rec {
pname = "python-zaqarclient";
version = "2.7.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "openstack";
repo = "python-zaqarclient";
rev = "refs/tags/${version}";
hash = "sha256-WphTlqhrwxg5g88NH1W4b3uLAxLImnS34hDrlJjWeEU=";
};
env.PBR_VERSION = version;
build-system = [
pbr
setuptools
];
nativeBuildInputs = [
openstackdocstheme
sphinxHook
];
sphinxBuilders = [ "man" ];
dependencies = [
jsonschema
keystoneauth1
osc-lib
oslo-i18n
oslo-log
oslo-utils
requests
stevedore
];
nativeCheckInputs = [
ddt
requests-mock
stestr
];
checkPhase = ''
runHook preCheck
stestr run
runHook postCheck
'';
pythonImportsCheck = [ "zaqarclient" ];
meta = {
homepage = "https://opendev.org/openstack/python-zaqarclient";
description = "Client library for OpenStack Zaqar API";
license = lib.licenses.asl20;
maintainers = lib.teams.openstack.members;
};
}
@@ -0,0 +1,92 @@
{
lib,
buildPythonPackage,
docker,
fetchFromGitHub,
keystoneauth1,
openstackdocstheme,
osc-lib,
oslo-i18n,
oslo-log,
oslo-utils,
pbr,
prettytable,
pythonOlder,
setuptools,
sphinxHook,
stestr,
websocket-client,
}:
buildPythonPackage rec {
pname = "python-zunclient";
version = "5.0.0";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "openstack";
repo = "python-zunclient";
rev = "refs/tags/${version}";
hash = "sha256-EVfrxSc/eHYZR0FGFnNAxFCiXangt8uRkAC2zpwWqcA=";
};
env.PBR_VERSION = version;
build-system = [
pbr
setuptools
];
nativeBuildInputs = [
openstackdocstheme
sphinxHook
];
sphinxBuilders = [ "man" ];
# python-openstackclient is unused upstream
# and will cause infinite recursion in openstackclient-full package.
pythonRemoveDeps = [ "python-openstackclient" ];
dependencies = [
docker
keystoneauth1
osc-lib
oslo-i18n
oslo-log
oslo-utils
prettytable
websocket-client
];
nativeCheckInputs = [ stestr ];
checkPhase = ''
runHook preCheck
stestr run -e <(echo "
zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_internal
zunclient.tests.unit.test_shell.ShellTest.test_main_endpoint_public
zunclient.tests.unit.test_shell.ShellTest.test_main_env_region
zunclient.tests.unit.test_shell.ShellTest.test_main_no_region
zunclient.tests.unit.test_shell.ShellTest.test_main_option_region
zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_internal
zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_endpoint_public
zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_env_region
zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_no_region
zunclient.tests.unit.test_shell.ShellTestKeystoneV3.test_main_option_region
")
runHook postCheck
'';
pythonImportsCheck = [ "zunclient" ];
meta = {
homepage = "https://opendev.org/openstack/python-zunclient";
description = "Client library for OpenStack Zun API";
license = lib.licenses.asl20;
mainProgram = "zun";
maintainers = lib.teams.openstack.members;
};
}
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "sarif-tools";
version = "2.0.0";
version = "3.0.0";
pyproject = true;
src = fetchFromGitHub {
owner = "microsoft";
repo = "sarif-tools";
rev = "v${version}";
hash = "sha256-80amYGnf7xZdpxzTjBGwgg39YN/jJsEkTm0uAlVbH0w=";
rev = "refs/tags/v${version}";
hash = "sha256-MYwhewUTZ3Wl93p6bN3+bHqtXz+BAlAhte+JaetPQYU=";
};
disabled = pythonOlder "3.8";
@@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "snowflake-connector-python";
version = "3.12.1";
version = "3.12.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "snowflake_connector_python";
inherit version;
hash = "sha256-5Dt9S0SI7Nl7W/YlOcxQLX6E2CFcVH6utN2SjAtyErk=";
hash = "sha256-/ZvCqxv1OE0si2W8ALsEdVV9UvBHenESkzSqtT+Wef0=";
};
build-system = [
@@ -0,0 +1,61 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
pytestCheckHook,
runCommand,
setuptools,
unicodeit,
}:
buildPythonPackage rec {
pname = "unicodeit";
version = "0.7.5";
pyproject = true;
src = fetchFromGitHub {
owner = "svenkreiss";
repo = "unicodeit";
rev = "refs/tags/v${version}";
hash = "sha256-NeR3fGDbOzwyq85Sep9KuUiARCvefN6l5xcb8D/ntHE=";
};
patches = [
(fetchpatch {
# Defines a CLI entry point, so `setuptools` generates an `unicodeit` executable
url = "https://github.com/svenkreiss/unicodeit/pull/79/commits/9f4a4fee5cb62a101075adf3054832cdb1e6a5ad.patch";
hash = "sha256-mAhmU17K0adEFFAIf7ZeJ/cNohrzrL+sol7gYfWbPGo=";
})
];
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [
"unicodeit"
"unicodeit.cli"
];
passthru.tests.entrypoint =
runCommand "python3-unicodeit-test-entrypoint"
{
nativeBuildInputs = [ unicodeit ];
preferLocalBuild = true;
}
''
[[ "$(unicodeit "\BbbR")" = "" ]]
touch $out
'';
meta = {
description = "Converts LaTeX tags to unicode";
mainProgram = "unicodeit";
homepage = "https://github.com/svenkreiss/unicodeit";
license = with lib.licenses; [
lppl13c
mit
];
maintainers = with lib.maintainers; [ nicoo ];
};
}
@@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "neocmakelsp";
version = "0.8.2";
version = "0.8.4";
src = fetchFromGitHub {
owner = "Decodetalkers";
repo = "neocmakelsp";
rev = "v${version}";
hash = "sha256-t9cFECz4olFQ3VOuZzqHRMuvC8df1qaF7etb9ThJiok=";
hash = "sha256-DPKCAWIDw3ykYp2Cuwt9CcWHgdL7aoW5z2CjVFxizhg=";
};
cargoHash = "sha256-m+eO2y6TNRYc9Nau5ma9qcZcj7xUdxjo34eBmuXANkU=";
cargoHash = "sha256-wYh5JNT7HJnY6PLFCPm21LNFHsffFq53FTCRkUuHxWY=";
meta = with lib; {
description = "CMake lsp based on tower-lsp and treesitter";
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
# build time
, bison
@@ -52,6 +53,14 @@ stdenv.mkDerivation rec {
hash = "sha256-t6DeFmIgTomMNwE53n5JicnvuCd/QfpNYWCdwPwc30E=";
};
patches = [
(fetchpatch {
name = "basename.patch";
url = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/604dec781ef283885f65968358bd9ae88c5193c3.patch";
hash = "sha256-zU6U9uuTDvuADVYmT9sMYA85Xgtvqgy378LvWFDVEJw=";
})
];
nativeBuildInputs = [
bison
docbook_xsl
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "function-runner";
version = "5.1.4";
version = "6.0.0";
src = fetchFromGitHub {
owner = "Shopify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nKOgXUwhOHaOnxycTsEReS/4y9DNpyqDKz7ohfAaJ3U=";
sha256 = "sha256-ccj34BtP+KdfOr0jIGsSVtwbYRouv93kDORgOLPFXKk=";
};
cargoHash = "sha256-UDeHNIw7e+3zXO9Hggq3pVSDDp6iSoO8ikOl6RxZyb0=";
cargoHash = "sha256-Hs2xWGBlMLZlVMPByDVWNAytxMC7Nd3BUQLz1DJlTl4=";
meta = with lib; {
description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "linuxptp";
version = "4.3";
version = "4.4";
src = fetchFromGitHub {
owner = "nwtime";
repo = "linuxptp";
rev = "v${version}";
hash = "sha256-FFBbbmVPP74p/OkqNXXgynBS/NcuPoYs3OCof11NZOI=";
hash = "sha256-w1buo+D8Mnd6ytMhQYhvCDqt+RejlNSN/iVjrDR+Khk=";
};
outputs = [ "out" "man" ];
+2 -4
View File
@@ -12141,8 +12141,6 @@ with pkgs;
rpPPPoE = callPackage ../tools/networking/rp-pppoe { };
rpi-imager = libsForQt5.callPackage ../tools/misc/rpi-imager { };
rpiboot = callPackage ../development/misc/rpiboot { };
rpm = callPackage ../tools/package-management/rpm {
@@ -22916,6 +22914,8 @@ with pkgs;
mistralclient = with python311Packages; toPythonApplication python-mistralclient;
swiftclient = with python311Packages; toPythonApplication python-swiftclient;
troveclient = with python311Packages; toPythonApplication python-troveclient;
watcherclient = with python311Packages; toPythonApplication python-watcherclient;
zunclient = with python311Packages; toPythonApplication python-zunclient;
openvdb = callPackage ../development/libraries/openvdb { };
@@ -39534,8 +39534,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
ldid-procursus = callPackage ../development/tools/ldid-procursus { };
xcolor = callPackage ../tools/graphics/xcolor { };
xcfun = callPackage ../development/libraries/science/chemistry/xcfun { };
+8
View File
@@ -12846,6 +12846,8 @@ self: super: with self; {
python-vlc = callPackage ../development/python-modules/python-vlc { };
python-watcherclient = callPackage ../development/python-modules/python-watcherclient { };
python-whois = callPackage ../development/python-modules/python-whois { };
python-wifi = callPackage ../development/python-modules/python-wifi { };
@@ -12856,8 +12858,12 @@ self: super: with self; {
python-xz = callPackage ../development/python-modules/python-xz { };
python-zaqarclient = callPackage ../development/python-modules/python-zaqarclient { };
python-zbar = callPackage ../development/python-modules/python-zbar { };
python-zunclient = callPackage ../development/python-modules/python-zunclient { };
pythran = callPackage ../development/python-modules/pythran {
inherit (pkgs.llvmPackages) openmp;
};
@@ -16803,6 +16809,8 @@ self: super: with self; {
unicodedata2 = callPackage ../development/python-modules/unicodedata2 { };
unicodeit = callPackage ../development/python-modules/unicodeit { };
unicode-rbnf = callPackage ../development/python-modules/unicode-rbnf { };
unicode-slugify = callPackage ../development/python-modules/unicode-slugify { };