Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-11-01 00:02:47 +00:00 committed by GitHub
commit 18df2baed1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 1230 additions and 1050 deletions

2
.github/CODEOWNERS vendored
View file

@ -48,6 +48,8 @@
/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
/pkgs/build-support/setup-hooks/auto-patchelf.py @layus
/pkgs/pkgs-lib @infinisil
## Format generators/serializers
/pkgs/pkgs-lib/formats/libconfig @ckiee
# pkgs/by-name
/pkgs/test/nixpkgs-check-by-name @infinisil

View file

@ -45,7 +45,7 @@ rec {
}
```
This is where `fix` comes in, it contains the syntactic that's not in `f` anymore.
This is where `fix` comes in, it contains the syntactic recursion that's not in `f` anymore.
```nix
nix-repl> fix = f:

View file

@ -5969,6 +5969,11 @@
githubId = 119691;
name = "Michael Gough";
};
franciscod = {
github = "franciscod";
githubId = 726447;
name = "Francisco Demartino";
};
franzmondlichtmann = {
name = "Franz Schroepf";
email = "franz-schroepf@t-online.de";

View file

@ -352,6 +352,7 @@ in {
};
storage = {
tmp = lib.mkDefault "/var/lib/peertube/storage/tmp/";
tmp_persistent = lib.mkDefault "/var/lib/peertube/storage/tmp_persistent/";
bin = lib.mkDefault "/var/lib/peertube/storage/bin/";
avatars = lib.mkDefault "/var/lib/peertube/storage/avatars/";
videos = lib.mkDefault "/var/lib/peertube/storage/videos/";
@ -521,6 +522,21 @@ in {
'';
};
locations."~ ^/api/v1/runners/jobs/[^/]+/(update|success)$" = {
tryFiles = "/dev/null @api";
root = cfg.settings.storage.tmp;
priority = 1135;
extraConfig = ''
client_max_body_size 12G;
add_header X-File-Maximum-Size 8G always;
'' + lib.optionalString cfg.enableWebHttps ''
add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains';
'' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
add_header Alt-Svc 'h3=":443"; ma=86400';
'';
};
locations."~ ^/api/v1/(videos|video-playlists|video-channels|users/me)" = {
tryFiles = "/dev/null @api";
priority = 1140;
@ -607,70 +623,7 @@ in {
'';
};
locations."^~ /lazy-static/avatars/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.avatars;
priority = 1330;
extraConfig = ''
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
add_header Access-Control-Max-Age 1728000;
add_header Cache-Control 'no-cache';
add_header Content-Type 'text/plain charset=UTF-8';
add_header Content-Length 0;
return 204;
}
${nginxCommonHeaders}
add_header Cache-Control 'public, max-age=7200';
rewrite ^/lazy-static/avatars/(.*)$ /$1 break;
'';
};
locations."^~ /lazy-static/banners/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.avatars;
priority = 1340;
extraConfig = ''
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
add_header Access-Control-Max-Age 1728000;
add_header Cache-Control 'no-cache';
add_header Content-Type 'text/plain charset=UTF-8';
add_header Content-Length 0;
return 204;
}
${nginxCommonHeaders}
add_header Cache-Control 'public, max-age=7200';
rewrite ^/lazy-static/banners/(.*)$ /$1 break;
'';
};
locations."^~ /lazy-static/previews/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.previews;
priority = 1350;
extraConfig = ''
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
add_header Access-Control-Max-Age 1728000;
add_header Cache-Control 'no-cache';
add_header Content-Type 'text/plain charset=UTF-8';
add_header Content-Length 0;
return 204;
}
${nginxCommonHeaders}
add_header Cache-Control 'public, max-age=7200';
rewrite ^/lazy-static/previews/(.*)$ /$1 break;
'';
};
locations."^~ /static/streaming-playlists/private/" = {
locations."^~ /download/" = {
proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}";
priority = 1410;
extraConfig = ''
@ -682,7 +635,7 @@ in {
'';
};
locations."^~ /static/webseed/private/" = {
locations."^~ /static/streaming-playlists/private/" = {
proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}";
priority = 1420;
extraConfig = ''
@ -694,31 +647,34 @@ in {
'';
};
locations."^~ /static/thumbnails/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.thumbnails;
locations."^~ /static/web-videos/private/" = {
proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}";
priority = 1430;
extraConfig = ''
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
add_header Access-Control-Max-Age 1728000;
add_header Cache-Control 'no-cache';
add_header Content-Type 'text/plain charset=UTF-8';
add_header Content-Length 0;
return 204;
}
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
${nginxCommonHeaders}
add_header Cache-Control 'public, max-age=7200';
proxy_limit_rate 5M;
'';
};
rewrite ^/static/thumbnails/(.*)$ /$1 break;
locations."^~ /static/webseed/private/" = {
proxyPass = "http://127.0.0.1:${toString cfg.listenHttp}";
priority = 1440;
extraConfig = ''
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_limit_rate 5M;
'';
};
locations."^~ /static/redundancy/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.redundancy;
priority = 1440;
priority = 1450;
extraConfig = ''
set $peertube_limit_rate 800k;
@ -753,7 +709,42 @@ in {
locations."^~ /static/streaming-playlists/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.streaming_playlists;
priority = 1450;
priority = 1460;
extraConfig = ''
set $peertube_limit_rate 800k;
if ($request_uri ~ -fragmented.mp4$) {
set $peertube_limit_rate 5M;
}
if ($request_method = 'OPTIONS') {
${nginxCommonHeaders}
add_header Access-Control-Max-Age 1728000;
add_header Content-Type 'text/plain charset=UTF-8';
add_header Content-Length 0;
return 204;
}
if ($request_method = 'GET') {
${nginxCommonHeaders}
access_log off;
}
aio threads;
sendfile on;
sendfile_max_chunk 1M;
limit_rate $peertube_limit_rate;
limit_rate_after 5M;
rewrite ^/static/streaming-playlists/(.*)$ /$1 break;
'';
};
locations."^~ /static/web-videos/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.streaming_playlists;
priority = 1470;
extraConfig = ''
set $peertube_limit_rate 800k;
@ -788,7 +779,7 @@ in {
locations."^~ /static/webseed/" = {
tryFiles = "$uri @api";
root = cfg.settings.storage.videos;
priority = 1460;
priority = 1480;
extraConfig = ''
set $peertube_limit_rate 800k;

View file

@ -19,6 +19,8 @@ mkDerivation rec {
buildInputs = [ alsa-lib pipewire ];
cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ];
meta = with lib; {
description = "Qt graph manager for PipeWire, similar to QjackCtl.";
longDescription = ''

View file

@ -688,6 +688,27 @@ let
--replace '"mozc_emacs_helper"' '"${pkgs.ibus-engines.mozc}/lib/mozc/mozc_emacs_helper"'
'';
});
# Build a helper executable that interacts with the macOS Dictionary.app
osx-dictionary =
if pkgs.stdenv.isDarwin
then super.osx-dictionary.overrideAttrs (old: {
buildInputs =
old.buildInputs ++
(with pkgs.darwin.apple_sdk.frameworks; [CoreServices Foundation]);
dontUnpack = false;
buildPhase = (old.buildPhase or "") + ''
cd source
$CXX -O3 -framework CoreServices -framework Foundation osx-dictionary.m -o osx-dictionary-cli
'';
postInstall = (old.postInstall or "") + "\n" + ''
outd=$out/share/emacs/site-lisp/elpa/osx-dictionary-*
mkdir -p $out/bin
install -m444 -t $out/bin osx-dictionary-cli
rm $outd/osx-dictionary.m
'';
})
else super.osx-dictionary;
};
in lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super);

File diff suppressed because it is too large Load diff

View file

@ -11,13 +11,13 @@
}:
let
version = "0.45";
version = "0.46";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-clap";
rev = "v${version}";
hash = "sha256-espFos1Mrxdq2p+qi0ooTWAV8EgV/lTx9KuP3GkMWos=";
hash = "sha256-KWBuoZ2GxjwIu7L1PPq/7u3iuYFp5QrlsleL2RQTdUE=";
};
meta = with lib; {
@ -47,8 +47,7 @@ let
libgit2
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
];
};
in

View file

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "imgcat";
version = "2.5.1";
version = "2.5.2";
buildInputs = [ ncurses cimg ];
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
owner = "eddieantonio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-EkVE6BgoA1lo4oqlNETTxLILIVvGXspFyXykxpmYk8M=";
sha256 = "sha256-61xIB/Fa+Utu694aITzBoMQeYa0Trh5L0oIKp8Be+D0=";
};
env.NIX_CFLAGS_COMPILE = "-Wno-error";

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "helm-unittest";
version = "0.3.3";
version = "0.3.5";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-11rgARUfTbr8FkmR2lI4uoIqzi9cRuVPalUOsxsnO3E=";
hash = "sha256-RgEYFTI1uaW1aTr+/lpKQ39o5CLsj/p0JeSTUXti/IM=";
};
vendorHash = "sha256-E9HSP8c/rGG+PLbnT8V5GflpnFItCeXyeLGiqDj4tRI=";
vendorHash = "sha256-P0PVzgaUN9X9x77v1psV13vNl06HrHbdlA1YHCq/eCo=";
# NOTE: Remove the install and upgrade hooks.
postPatch = ''

View file

@ -22,6 +22,6 @@ buildGoModule rec {
description = "A Kubernetes credential plugin implementing Azure authentication";
inherit (src.meta) homepage;
license = licenses.mit;
maintainers = with maintainers; [ yurrriq ];
maintainers = [];
};
}

View file

@ -75,9 +75,9 @@ rec {
nomad_1_6 = generic {
buildGoModule = buildGo121Module;
version = "1.6.2";
sha256 = "sha256-Q0RyO9FZWGxWgVmTU07/pw5P4Ebcwcednq8TDmshuAk=";
vendorHash = "sha256-XCuWhKuBtSPTK8fXwgjMKMjwLnl1KWZKSJ4Ih9XDIDc=";
version = "1.6.3";
sha256 = "sha256-5UWGriDy15PX3+9UppcUsEwih/e9COLVBis3fn+24L0=";
vendorHash = "sha256-gXoheW6Ww9Iu4utKNHweP2blzhWid+Q9Tp0ZgCmBAVg=";
passthru.tests.nomad = nixosTests.nomad;
preCheck = ''
export PATH="$PATH:$NIX_BUILD_TOP/go/bin"

View file

@ -0,0 +1,38 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, doxygen
, boost
, zlib
}:
stdenv.mkDerivation rec {
pname = "axmldec";
version = "1.2.0";
src = fetchFromGitHub {
owner = "ytsutano";
repo = "axmldec";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-LFDZZbRDa8mQmglgS4DA/OqXp0HJZ2uqg1hbStdgvUw=";
};
nativeBuildInputs = [ cmake doxygen ];
buildInputs = [ boost zlib ];
meta = with lib; {
description = "Stand-alone binary AndroidManifest.xml decoder";
longDescription = ''
This tool accepts either a binary or a text XML file and prints the
decoded XML to the standard output or a file. It also allows you to
extract the decoded AndroidManifest.xml directly from an APK file.
'';
homepage = "https://github.com/ytsutano/axmldec";
license = licenses.isc;
mainProgram = "axmldec";
maintainers = with maintainers; [ franciscod ];
platforms = platforms.unix ++ platforms.windows;
};
}

View file

@ -0,0 +1 @@
{"depends":[{"method":"fetchzip","path":"/nix/store/vx0a8hw7hs5an0dnbrn6l16bd6is7hdr-source","rev":"07f6ba8ab96238e5bd1264cf0cea1d1746abb00c","sha256":"005nrldaasfl09zdsni1vi8s7dk0y85ijv6rm2wpj94435x66s36","url":"https://github.com/treeform/flatty/archive/07f6ba8ab96238e5bd1264cf0cea1d1746abb00c.tar.gz","ref":"0.3.4","packages":["flatty"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/lk4hcmvwvliliyyidx7k3fk9yfijddc5-source","rev":"b2e71179174e040884ebf6a16cbac711c84620b9","sha256":"0pi6cq43ysm1wy5vva3i2dqvyh4dqppjjjl04yj9wfq7mngpqaa1","url":"https://github.com/treeform/chroma/archive/b2e71179174e040884ebf6a16cbac711c84620b9.tar.gz","ref":"0.2.7","packages":["chroma"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/bah1zq369ikykm6dz3r0hzhcq4s88sxq-source","rev":"a2a5165c36e0098dea526712890fb7e988ba27f2","sha256":"0n42hlvh0d9wkjr01p04jnkyn7y4y62pwjdcqw52absapbpsr1lb","url":"https://github.com/treeform/typography/archive/a2a5165c36e0098dea526712890fb7e988ba27f2.tar.gz","ref":"0.7.14","packages":["typography"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/9hfg3703m28w76ics7rn0hw1qymz0jrh-source","rev":"156e424306756a106442aca985eed61a8d12097b","sha256":"0hg9iq509rjsgd33cp3452v7whgbc30b5lnajifkls0z66rc2ndh","url":"https://github.com/guzba/nimsimd/archive/156e424306756a106442aca985eed61a8d12097b.tar.gz","ref":"1.2.6","packages":["nimsimd"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/xjk8cg4dmja48rcswy0nphy3xhmf7nsz-source","rev":"f3e73f722fbb0e5d496fbc59ee860a9fd49983de","sha256":"12mqlczckhxcrg6il213fn7mcnqz3khwkh7i4bn57l55nzrhfvrh","url":"https://github.com/treeform/pixie/archive/f3e73f722fbb0e5d496fbc59ee860a9fd49983de.tar.gz","ref":"5.0.6","packages":["pixie"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/f9dp6njaay5rf32f6l9gkw0dm25gim47-source","rev":"7282ae1247f2f384ebeaec3826d7fa38fd0e1df1","sha256":"1plw9lfrm42qar01rnjhm0d9mkzsc7c3b8kz43w5pb8j8drx1lyn","url":"https://github.com/treeform/vmath/archive/7282ae1247f2f384ebeaec3826d7fa38fd0e1df1.tar.gz","ref":"2.0.0","packages":["vmath"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/16h19n8ndv42v8gn2vfdisdszv2wrln1-source","rev":"fb09637d6ebd6416b322a2b9bb95dd513040dea7","sha256":"1lyfnirwpy12lq9gr0sbnkf7ih7ayfvb1acjxk2z5gzlgxm1azp1","url":"https://github.com/treeform/print/archive/fb09637d6ebd6416b322a2b9bb95dd513040dea7.tar.gz","ref":"1.0.2","packages":["print"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/zrm3y895iwn057y5c4374bviih962w0v-source","rev":"d0c9ad33ae72aece49093d7688fc78a7101aa4b0","sha256":"14qgxcnyznjc180kdbilqzzya589rqaznfpp75yp37n47zdknfw0","url":"https://github.com/guzba/crunchy/archive/d0c9ad33ae72aece49093d7688fc78a7101aa4b0.tar.gz","ref":"0.1.9","packages":["crunchy"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/da49jl6rhz6jlix6mds0alhlbq1qlkfy-source","rev":"84d4702e838d684b7304882ffe796f57ef422fb6","sha256":"1vilid9xx5mp2yvssa3wf6g9svqdan87090klis891k9w1dd8i51","url":"https://github.com/nim-lang/sdl2/archive/84d4702e838d684b7304882ffe796f57ef422fb6.tar.gz","ref":"v2.0.5","packages":["sdl2"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/rpa0bv740i3yagp0ldkb68jp6scw4i5l-source","rev":"d7eaf00c24820ad0317c9926737402e62431e931","sha256":"0wrvdpvbwv4ysjsqc6hhvd97vql4k0m5l0zdrsrjlljd1n5g2haq","url":"https://github.com/treeform/bumpy/archive/d7eaf00c24820ad0317c9926737402e62431e931.tar.gz","ref":"1.1.2","packages":["bumpy"],"srcDir":"src"},{"method":"fetchzip","path":"/nix/store/b98qlpki45417ws4pmjq052q1s7333wc-source","rev":"a3fd6f0458ffdd7cbbd416be99f2ca80a7852d82","sha256":"0zmavr2jnyyqkvvi6hlg2kh6qv6lzakwvsqjy0sjm3qdsna0aldg","url":"https://github.com/guzba/zippy/archive/a3fd6f0458ffdd7cbbd416be99f2ca80a7852d82.tar.gz","ref":"0.10.10","packages":["zippy"],"srcDir":"src"}]}

View file

@ -0,0 +1,41 @@
{ lib, nim2Packages, fetchFromSourcehut, gentium, makeDesktopItem, nim_lk, SDL2 }:
nim2Packages.buildNimPackage (finalAttrs: {
pname = "hottext";
version = "20231003";
nimBinOnly = true;
src = fetchFromSourcehut {
owner = "~ehmry";
repo = "hottext";
rev = finalAttrs.version;
hash = "sha256-ncH/1PV4vZY7JCUJ87FPz5bdrQsNlYxzGdc5BQNfQeA=";
};
buildInputs = [ SDL2 ];
nimFlags = nim_lk.passthru.nimFlagsFromLockFile ./lock.json;
HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf";
desktopItem = makeDesktopItem {
categories = [ "Utility" ];
comment = finalAttrs.meta.description;
desktopName = finalAttrs.pname;
exec = finalAttrs.pname;
name = finalAttrs.pname;
};
postInstall = ''
cp -r $desktopItem/* $out
'';
meta = finalAttrs.src.meta // {
description = "Simple RSVP speed-reading utility";
license = lib.licenses.unlicense;
homepage = "https://git.sr.ht/~ehmry/hottext";
maintainers = with lib.maintainers; [ ehmry ];
mainProgram = "hottext";
};
})

View file

@ -2,25 +2,15 @@
stdenv.mkDerivation rec {
pname = "libcpuid";
version = "0.6.3";
version = "0.6.4";
src = fetchFromGitHub {
owner = "anrieff";
repo = "libcpuid";
rev = "v${version}";
sha256 = "sha256-lhoHqdS5tke462guORg+PURjVmjAgviT5KJHp6PyvUA=";
sha256 = "sha256-Zs5GKvSasdfLqo8oErDQNAuXRG27Bm9vNwyooqbol0Q=";
};
patches = [
# Fixes cross-compilation to NetBSD
# https://github.com/anrieff/libcpuid/pull/190
(fetchpatch {
name = "pass-pthread-to-linker.patch";
url = "https://github.com/anrieff/libcpuid/commit/c28436e7239f28dab0e2a3bcdbce95f41e1363b1.patch";
sha256 = "sha256-J2mB010JcE4si0rERjcrL9kJgbWHKaQCIZPDkmRvcq4=";
})
];
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {

View file

@ -0,0 +1 @@
{"depends":[{"method":"fetchzip","packages":["npeg"],"path":"/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source","ref":"1.2.1","rev":"26d62fdc40feb84c6533956dc11d5ee9ea9b6c09","sha256":"0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh","srcDir":"src","url":"https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz"},{"method":"fetchzip","packages":["preserves"],"path":"/nix/store/nrcpzf9hx70kry3gwhrdzcs3qicjncjh-source","ref":"20231021","rev":"edece399be70818208bf2263c30cb2bcf435bbff","sha256":"0xmw35wmw3a4lja9q4qvlvpxv3xk0hnkjg4fwfw6f3inh6zfiqki","srcDir":"src","url":"https://git.syndicate-lang.org/ehmry/preserves-nim/archive/edece399be70818208bf2263c30cb2bcf435bbff.tar.gz"}]}

View file

@ -0,0 +1,52 @@
{ lib, buildPackages, nim2Packages, fetchFromSourcehut, openssl }:
nim2Packages.buildNimPackage (finalAttrs: {
pname = "nim_lk";
version = "20231031";
nimBinOnly = true;
src = fetchFromSourcehut {
owner = "~ehmry";
repo = "nim_lk";
rev = finalAttrs.version;
hash = "sha256-dXm3dfXAxgucek19f1KdRShOsJyELPTB32qgGSKId6A=";
};
buildInputs = [ openssl ];
nimFlags = finalAttrs.passthru.nimFlagsFromLockFile ./lock.json;
meta = finalAttrs.src.meta // {
description = "Generate Nix specific lock files for Nim packages";
homepage = "https://git.sr.ht/~ehmry/nim_lk";
mainProgram = "nim_lk";
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ ehmry ];
};
passthru.nimFlagsFromLockFile = let
fetchDependency = let
methods = {
fetchzip = { url, sha256, ... }:
buildPackages.fetchzip {
name = "source";
inherit url sha256;
};
git = { fetchSubmodules, leaveDotGit, rev, sha256, url, ... }:
buildPackages.fetchgit {
inherit fetchSubmodules leaveDotGit rev sha256 url;
};
};
in attrs@{ method, ... }: methods.${method} attrs // attrs;
in lockFile:
with builtins;
lib.pipe lockFile [
readFile
fromJSON
(getAttr "depends")
(map fetchDependency)
(map ({ outPath, srcDir, ... }: ''--path:"${outPath}/${srcDir}"''))
];
})

View file

@ -0,0 +1,102 @@
{ lib
, stdenv
, perlPackages
, fetchFromGitHub
, makeWrapper
, shortenPerlShebang
, coreutils
, dmidecode
, findutils
, inetutils
, ipmitool
, iproute2
, lvm2
, nmap
, pciutils
, usbutils
, util-linux
, testers
, ocsinventory-agent
, nix-update-script
}:
perlPackages.buildPerlPackage rec {
version = "2.10.1";
pname = "ocsinventory-agent";
src = fetchFromGitHub {
owner = "OCSInventory-NG";
repo = "UnixAgent";
rev = "refs/tags/v${version}-MAC";
hash = "sha256-aFzBrUsVttUhpYGEYd/yYuXmE90PGCiBmBsVjtHcHLg=";
};
nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang;
buildInputs = with perlPackages; [
perl
DataUUID
IOCompress
IOSocketSSL
LWP
LWPProtocolHttps
NetIP
NetNetmask
NetSNMP
ParseEDID
ProcDaemon
ProcPIDFile
XMLSimple
] ++ lib.optionals stdenv.isLinux (with perlPackages; [
NetCUPS # cups-filters is broken on darwin
]) ++ lib.optionals stdenv.isDarwin (with perlPackages; [
MacSysProfile
]);
postInstall = let
runtimeDependencies = [
coreutils # uname, cut, df, stat, uptime
findutils # find
inetutils # ifconfig
ipmitool # ipmitool
nmap # nmap
pciutils # lspci
] ++ lib.optionals stdenv.isLinux [
dmidecode # dmidecode
iproute2 # ip
lvm2 # pvs
usbutils # lsusb
util-linux # last, lsblk, mount
];
in lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/ocsinventory-agent
'' + ''
wrapProgram $out/bin/ocsinventory-agent --prefix PATH : ${lib.makeBinPath runtimeDependencies}
'';
passthru = {
tests.version = testers.testVersion {
package = ocsinventory-agent;
command = "ocsinventory-agent --version";
# upstream has not updated version in lib/Ocsinventory/Agent/Config.pm
version = "2.10.0";
};
updateScript = nix-update-script { };
};
meta = with lib; {
description = "OCS Inventory unified agent for Unix operating systems";
longDescription = ''
Open Computers and Software Inventory (OCS) is an application designed
to help a network or system administrator to keep track of the hardware and
software configurations of computers that are installed on the network.
'';
homepage = "https://ocsinventory-ng.org";
changelog = "https://github.com/OCSInventory-NG/UnixAgent/releases/tag/v${version}";
downloadPage = "https://github.com/OCSInventory-NG/UnixAgent/releases";
license = licenses.gpl2Only;
mainProgram = "ocsinventory-agent";
maintainers = with maintainers; [ totoroot anthonyroussel ];
platforms = platforms.unix;
};
}

View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, callPackage
, cmake
, gmp
, halibut
@ -32,6 +33,12 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
passthru.tests = {
approximation = callPackage ./tests/approximation.nix {
spigot = finalAttrs.finalPackage;
};
};
meta = {
homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/";
description = "A command-line exact real calculator";

View file

@ -0,0 +1,21 @@
{ lib
, stdenv
, spigot
}:
stdenv.mkDerivation {
pname = "spigot-approximation";
inherit (spigot) version;
nativeBuildInputs = [ spigot ];
dontInstall = true;
buildCommand = ''
[ "$(spigot -b2 -d32 '(pi/1-355/113)')" = "-0.00000000000000000000010001111001" ]
[ "$(spigot -b2 -d32 '(e/1-1457/536)')" = "-0.00000000000000000001110101101011" ]
touch $out
'';
meta.timeout = 10;
}

View file

@ -2,20 +2,21 @@
, rustPlatform
, fetchFromGitHub
, installShellFiles
, nix-update-script
}:
rustPlatform.buildRustPackage rec {
pname = "thud";
version = "0.3.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "donovanglover";
repo = "thud";
rev = version;
hash = "sha256-3MxmVKs0huXPnL9mqDniaIarkAvJmwSOMii2ntXtOos=";
hash = "sha256-BmrJaZ1IKXjx4/QkBDZyXvTTaalfEOKsBp9ZCW8px7I=";
};
cargoHash = "sha256-Hk3HlcA253FAA9hw5p9W+Mvec84zLo7bEmM2/BbmjiM=";
cargoHash = "sha256-rmVVdes7GuGV+ClqJGxNIrs7oSwe8/ZHFD6OfP/UW7A=";
nativeBuildInputs = [
installShellFiles
@ -25,14 +26,16 @@ rustPlatform.buildRustPackage rec {
install -Dm644 assets/thud.thumbnailer $out/share/thumbnailers/thud.thumbnailer
substituteInPlace $out/share/thumbnailers/thud.thumbnailer --replace "thud" "$out/bin/thud"
installManPage man/thud.1
installManPage target/man/thud.1
installShellCompletion --cmd thud \
--bash <(cat completions/thud.bash) \
--fish <(cat completions/thud.fish) \
--zsh <(cat completions/_thud)
--bash <(cat target/completions/thud.bash) \
--fish <(cat target/completions/thud.fish) \
--zsh <(cat target/completions/_thud)
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "Generate directory thumbnails for GTK-based file browsers from images inside them";
homepage = "https://github.com/donovanglover/thud";

View file

@ -4,11 +4,11 @@
}:
stdenvNoCC.mkDerivation rec {
pname = "commit-mono";
version = "1.138";
version = "1.139";
src = fetchzip {
url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip";
sha256 = "sha256-ae2eeHh57i6d0kDMZ68aXvLGFj+rXhwg1CC8cV3ndAQ=";
url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip";
hash = "sha256-TrXuWQzNlJsFwwOsnLuCCEj/9B9XrTNHSDVES68gIYs=";
stripRoot = false;
};
@ -20,8 +20,8 @@ stdenvNoCC.mkDerivation rec {
installPhase = ''
runHook preInstall
install -Dm644 -t $out/share/fonts/opentype/ CommitMono-${version}/*.otf
install -Dm644 -t $out/share/fonts/truetype/ CommitMono-${version}/ttfautohint/*.ttf
install -Dm644 CommitMono-${version}/*.otf -t $out/share/fonts/opentype
install -Dm644 CommitMono-${version}/ttfautohint/*.ttf -t $out/share/fonts/truetype
runHook postInstall
'';

View file

@ -2,16 +2,16 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "intel-one-mono";
version = "1.2.1";
version = "1.3.0";
srcs = [
(fetchurl {
url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/otf.zip";
hash = "sha256-RBJwIUkmAZIRaIEWUxFZlRMfFTUFdLbHCMRkagU0gU0=";
hash = "sha256-iZIfkXH+GplVwES4LaQBIaCWs7OKmEto9J2SpzvagSs=";
})
(fetchurl {
url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/ttf.zip";
hash = "sha256-DV/PT+P+GGq/ejS5cx5ENuCy+iiE32AMOirwuTCP3vY=";
hash = "sha256-EeUTEMuoTHKmuO5Uj0jjiDRF9t7jxbIy45nTWozlgfc=";
})
];

View file

@ -77,6 +77,10 @@ stdenv.mkDerivation rec {
"-Dintrospection=enabled"
"-Dinstalled_test_datadir=${placeholder "installedTests"}/share"
"-Dinstalled_test_bindir=${placeholder "installedTests"}/libexec"
] ++ lib.optionals stdenv.isAarch32 [
# the box test is failing with SIGBUS on armv7l-linux
# https://github.com/ebassi/graphene/issues/215
"-Darm_neon=false"
];
doCheck = true;

View file

@ -52,6 +52,14 @@ let
# prevent headaches from stale qmlcache data
./qtdeclarative-default-disable-qmlcache.patch
];
qtmultimedia = lib.optionals stdenv.isDarwin [
# build patch for qtmultimedia with xcode 15
(fetchpatch {
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch";
stripLen = 1;
hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs=";
})
];
qtpim = [
## Upstream patches after the Qt6 transition that apply without problems & fix bugs

View file

@ -5,6 +5,8 @@
, buildPythonPackage
, dill
, fetchFromGitHub
, flask
, flask-cors
, moto
, pytest-asyncio
, pytestCheckHook
@ -41,6 +43,8 @@ buildPythonPackage rec {
nativeCheckInputs = [
dill
flask
flask-cors
moto
pytest-asyncio
pytestCheckHook

View file

@ -0,0 +1,42 @@
{ lib
, fetchPypi
, buildPythonPackage
, nix-update-script
, setuptools
, wheel
, jinja2
}:
buildPythonPackage rec {
pname = "junit2html";
version = "30.1.3";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-1q6KpKdrZvp8XvxGCkoorlZDDgvGg/imTX8+NEOBbWs=";
};
passthru.updateScript = nix-update-script { };
nativeBuildInputs = [
setuptools
wheel
];
propagatedBuildInputs = [
jinja2
];
pythonImportsCheck = [ "junit2htmlreport" ];
meta = with lib; {
description = "Generate HTML reports from Junit results";
homepage = "https://pypi.org/project/junit2html/";
license = licenses.mit;
maintainers = with maintainers; [ otavio ];
mainProgram = "junit2html";
};
}

View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "meross-iot";
version = "0.4.5.9";
version = "0.4.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "albertogeniola";
repo = "MerossIot";
rev = "refs/tags/${version}";
hash = "sha256-Wyg9Y4THnjNTWQsiOanoyEEBqVgsG5MeyoGE69/n8sM=";
hash = "sha256-8DnzTwW4fQQIGAHZJbu2aKkqOUU6a6IGgif5tIZCing=";
};
propagatedBuildInputs = [

View file

@ -1,36 +1,33 @@
{ buildPythonPackage
, fetchPypi
, fetchurl
, lib
, nixosTests
, python
, pythonOlder
# pythonPackages
, hatchling
, dnspython
, expiringdict
, publicsuffix2
, xmltodict
, geoip2
, urllib3
, requests
, imapclient
{ lib
, azure-identity
, boto3
, buildPythonPackage
, dateparser
, mailsuite
, dnspython
, elasticsearch
, elasticsearch-dsl
, kafka-python
, tqdm
, lxml
, boto3
, msgraph-core
, azure-identity
, expiringdict
, fetchPypi
, fetchurl
, geoip2
, google-api-core
, google-api-python-client
, google-auth
, google-auth-httplib2
, google-auth-oauthlib
, hatchling
, imapclient
, kafka-python
, lxml
, mailsuite
, msgraph-core
, nixosTests
, publicsuffixlist
, pythonOlder
, requests
, tqdm
, urllib3
, xmltodict
}:
let
@ -42,11 +39,10 @@ in
buildPythonPackage rec {
pname = "parsedmarc";
version = "8.6.1";
pyproject = true;
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-lnIhXkBodvLWVeqiwFcnU4M53zwWDmtFz+9TThQY63I=";
@ -62,32 +58,33 @@ buildPythonPackage rec {
];
propagatedBuildInputs = [
dnspython
expiringdict
publicsuffix2
xmltodict
geoip2
urllib3
requests
imapclient
azure-identity
boto3
dateparser
mailsuite
dnspython
elasticsearch
elasticsearch-dsl
kafka-python
tqdm
lxml
boto3
msgraph-core
azure-identity
expiringdict
geoip2
google-api-core
google-api-python-client
google-auth
google-auth-httplib2
google-auth-oauthlib
imapclient
kafka-python
lxml
mailsuite
msgraph-core
publicsuffixlist
requests
tqdm
urllib3
xmltodict
];
# no tests on PyPI, no tags on GitHub
# https://github.com/domainaware/parsedmarc/issues/426
doCheck = false;
pythonImportsCheck = [ "parsedmarc" ];
@ -97,11 +94,11 @@ buildPythonPackage rec {
tests = nixosTests.parsedmarc;
};
meta = {
meta = with lib; {
changelog = "https://github.com/domainaware/parsedmarc/blob/master/CHANGELOG.md#${lib.replaceStrings [ "." ] [ "" ] version}";
description = "Python module and CLI utility for parsing DMARC reports";
homepage = "https://domainaware.github.io/parsedmarc/";
maintainers = with lib.maintainers; [ talyz ];
license = lib.licenses.asl20;
maintainers = with maintainers; [ talyz ];
license = licenses.asl20;
};
}

View file

@ -0,0 +1,36 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, pyyaml
, twine
}:
buildPythonPackage rec {
pname = "pycomposefile";
version = "0.0.30";
src = fetchPypi {
inherit pname version;
extension = "tar.gz";
hash = "sha256-GQopIO8F+G5iDz4NF2GTHCpXo4uqKHdHIzffacihylM=";
};
nativeBuildInput = [
setuptools
];
propagatedBuildInputs = [
pyyaml
twine
];
doCheck = false; # tests are broken
meta = with lib; {
description = "Python library for structured deserialization of Docker Compose files";
homepage = "https://github.com/smurawski/pycomposefile";
license = licenses.mit;
maintainers = with maintainers; [ mdarocha ];
};
}

View file

@ -274,6 +274,11 @@ in buildPythonPackage rec {
# ... called on pointer <unknown> with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object]
++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12" ) [
"-Wno-error=free-nonheap-object"
]
# .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3:
# error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict]
++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [
"-Wno-error=cast-function-type-strict"
]));
nativeBuildInputs = [

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "fly";
version = "7.10.0";
version = "7.11.0";
src = fetchFromGitHub {
owner = "concourse";
repo = "concourse";
rev = "v${version}";
hash = "sha256-KmKIr7Y3CQmv1rXdju6xwUHABqj/dkXpgWc/yNrAza8=";
hash = "sha256-lp6EXdwmgmjhFxRQXn2P4iRrtJS1QTvg4225V/6E7MI=";
};
vendorHash = "sha256-lc0okniezfTNLsnCBIABQxSgakRUidsprrEnkH8il2g=";
vendorHash = "sha256-p3EhXrRjAFG7Ayfj/ArAWO7KL3S/iR/nwFwXcDc+DSs=";
subPackages = [ "fly" ];

View file

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "prqlc";
version = "0.9.5";
version = "0.10.0";
src = fetchFromGitHub {
owner = "prql";
repo = "prql";
rev = version;
hash = "sha256-t/l1fMZpGCLtxjCtOMv4eaj6oNyFX9BFgfc3OwYrxs0=";
hash = "sha256-McJ3V3kndawheWo/xsBU8Xi8K47vHMpQHTpDbR4vkWk=";
};
cargoHash = "sha256-bdPjLOHh5qC1/LNfsUC26h4v3EuwiM9HqoQxeeNCOIw=";
cargoHash = "sha256-Q1PSpGpd5QRT6QKQOd6hVdZrlDBawfsqqp/CTJfnl7E=";
nativeBuildInputs = [
pkg-config

View file

@ -21,6 +21,6 @@ buildGoModule rec {
description = "CLI to render Go template text files";
inherit (src.meta) homepage;
license = licenses.gpl3;
maintainers = with maintainers; [ yurrriq ];
maintainers = [];
};
}

View file

@ -1,126 +0,0 @@
See https://github.com/v8/v8/commit/d15d49b09dc7aef9edcc4cf6a0cb2b77a0db203f.
v8 doesnt compile with clang 16 due to an error regarding integer values being outside the enum
range. This is fixed in v8 upstream. This patch is a backport of the fix.
Note that this patch is only needed for node.js v18. It is not needed for node v20.
diff --git a/include/v8-internal.h b/include/v8-internal.h
index a27f3a34480..5fb0f2ac16d 100644
--- a/deps/v8/include/v8-internal.h
+++ b/deps/v8/include/v8-internal.h
@@ -574,7 +574,7 @@ class Internals {
static const int kNodeClassIdOffset = 1 * kApiSystemPointerSize;
static const int kNodeFlagsOffset = 1 * kApiSystemPointerSize + 3;
- static const int kNodeStateMask = 0x7;
+ static const int kNodeStateMask = 0x3;
static const int kNodeStateIsWeakValue = 2;
static const int kFirstNonstringType = 0x80;
diff --git a/src/ast/ast.h b/src/ast/ast.h
index 32438f9b249..8473f7fb67e 100644
--- a/deps/v8/src/ast/ast.h
+++ b/deps/v8/src/ast/ast.h
@@ -1006,7 +1006,7 @@ class Literal final : public Expression {
friend class AstNodeFactory;
friend Zone;
- using TypeField = Expression::NextBitField<Type, 4>;
+ using TypeField = Expression::NextBitField<Type, 3>;
Literal(int smi, int position) : Expression(position, kLiteral), smi_(smi) {
bit_field_ = TypeField::update(bit_field_, kSmi);
diff --git a/src/base/bit-field.h b/src/base/bit-field.h
index 9a66468d4e0..ccfc23a065d 100644
--- a/deps/v8/src/base/bit-field.h
+++ b/deps/v8/src/base/bit-field.h
@@ -40,6 +40,11 @@ class BitField final {
static constexpr U kNumValues = U{1} << kSize;
// Value for the field with all bits set.
+ // If clang complains
+ // "constexpr variable 'kMax' must be initialized by a constant expression"
+ // on this line, then you're creating a BitField for an enum with more bits
+ // than needed for the enum values. Either reduce the BitField size,
+ // or give the enum an explicit underlying type.
static constexpr T kMax = static_cast<T>(kNumValues - 1);
template <class T2, int size2>
diff --git a/src/compiler/backend/instruction-codes.h b/src/compiler/backend/instruction-codes.h
index 1add351b422..2fe2cd1a74f 100644
--- a/deps/v8/src/compiler/backend/instruction-codes.h
+++ b/deps/v8/src/compiler/backend/instruction-codes.h
@@ -198,7 +198,7 @@ V8_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& os,
V(None) \
TARGET_ADDRESSING_MODE_LIST(V)
-enum AddressingMode {
+enum AddressingMode : uint8_t {
#define DECLARE_ADDRESSING_MODE(Name) kMode_##Name,
ADDRESSING_MODE_LIST(DECLARE_ADDRESSING_MODE)
#undef DECLARE_ADDRESSING_MODE
@@ -309,7 +309,7 @@ using MiscField = base::BitField<int, 22, 10>;
// LaneSizeField and AccessModeField are helper types to encode/decode a lane
// size, an access mode, or both inside the overlapping MiscField.
using LaneSizeField = base::BitField<int, 22, 8>;
-using AccessModeField = base::BitField<MemoryAccessMode, 30, 2>;
+using AccessModeField = base::BitField<MemoryAccessMode, 30, 1>;
// TODO(turbofan): {HasMemoryAccessMode} is currently only used to guard
// decoding (in CodeGenerator and InstructionScheduler). Encoding (in
// InstructionSelector) is not yet guarded. There are in fact instructions for
diff --git a/src/compiler/backend/instruction.h b/src/compiler/backend/instruction.h
index bed43dc6363..64b9063bcf8 100644
--- a/deps/v8/src/compiler/backend/instruction.h
+++ b/deps/v8/src/compiler/backend/instruction.h
@@ -591,8 +591,8 @@ class LocationOperand : public InstructionOperand {
}
STATIC_ASSERT(KindField::kSize == 3);
- using LocationKindField = base::BitField64<LocationKind, 3, 2>;
- using RepresentationField = base::BitField64<MachineRepresentation, 5, 8>;
+ using LocationKindField = base::BitField64<LocationKind, 3, 1>;
+ using RepresentationField = LocationKindField::Next<MachineRepresentation, 8>;
using IndexField = base::BitField64<int32_t, 35, 29>;
};
diff --git a/src/handles/global-handles.cc b/src/handles/global-handles.cc
index 536059f3115..ae9e70b3a85 100644
--- a/deps/v8/src/handles/global-handles.cc
+++ b/deps/v8/src/handles/global-handles.cc
@@ -652,7 +652,7 @@ class GlobalHandles::Node final : public NodeBase<GlobalHandles::Node> {
// This stores three flags (independent, partially_dependent and
// in_young_list) and a State.
- using NodeState = base::BitField8<State, 0, 3>;
+ using NodeState = base::BitField8<State, 0, 2>;
using IsInYoungList = NodeState::Next<bool, 1>;
using NodeWeaknessType = IsInYoungList::Next<WeaknessType, 2>;
diff --git a/src/maglev/maglev-ir.h b/src/maglev/maglev-ir.h
index 95aadfb5e14..f07f9fecf8c 100644
--- a/deps/v8/src/maglev/maglev-ir.h
+++ b/deps/v8/src/maglev/maglev-ir.h
@@ -315,7 +315,7 @@ class OpProperties {
return kNeedsRegisterSnapshotBit::decode(bitfield_);
}
constexpr bool is_pure() const {
- return (bitfield_ | kPureMask) == kPureValue;
+ return (bitfield_ & kPureMask) == kPureValue;
}
constexpr bool is_required_when_unused() const {
return can_write() || non_memory_side_effects();
diff --git a/src/wasm/wasm-code-manager.h b/src/wasm/wasm-code-manager.h
index f8329424777..81c7cce62e8 100644
--- a/deps/v8/src/wasm/wasm-code-manager.h
+++ b/deps/v8/src/wasm/wasm-code-manager.h
@@ -487,7 +487,7 @@ class V8_EXPORT_PRIVATE WasmCode final {
int trap_handler_index_ = -1;
// Bits encoded in {flags_}:
- using KindField = base::BitField8<Kind, 0, 3>;
+ using KindField = base::BitField8<Kind, 0, 2>;
using ExecutionTierField = KindField::Next<ExecutionTier, 2>;
using ForDebuggingField = ExecutionTierField::Next<ForDebugging, 2>;

View file

@ -1,8 +1,20 @@
{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }:
{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }:
let
# Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors.
# Use an older version of clang with the current libc++ for compatibility (e.g., with icu).
ensureCompatibleCC = packages:
if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16"
then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override {
inherit (packages.llvmPackages) libcxx;
extraPackages = [ packages.llvmPackages.libcxxabi ];
})
else packages.stdenv;
buildNodejs = callPackage ./nodejs.nix {
inherit openssl;
stdenv = ensureCompatibleCC pkgs;
buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; };
python = python3;
};
in
@ -16,7 +28,5 @@ buildNodejs {
./revert-arm64-pointer-auth.patch
./node-npm-build-npm-package-logic.patch
./trap-handler-backport.patch
# Fix for enum width error when compiling with clang 16.
./enum-width-fix-backport.patch
];
}

View file

@ -7,11 +7,11 @@
stdenvNoCC.mkDerivation rec {
pname = "rectangle";
version = "0.73";
version = "0.74";
src = fetchurl {
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
hash = "sha256-D+heCrJVo2xsKY9XtEuhrG/59yFIJTGhKJIfN9Vhc+M=";
hash = "sha256-ERfzgw8R39dOc9F/dgcgCKbEVFNChC5LqDFBDzbS+Wg=";
};
sourceRoot = ".";

View file

@ -45,18 +45,18 @@ let
in
stdenv.mkDerivation rec {
pname = "peertube";
version = "5.1.0";
version = "5.2.1";
src = fetchFromGitHub {
owner = "Chocobozzz";
repo = "PeerTube";
rev = "v${version}";
hash = "sha256-C9mBF+QymGXyBB3IFX6MNgsZpHk739qv1/DLuvzrTaU=";
hash = "sha256-8JzU0JVb+JQCNiro8hPHBwkofNTUy90YkSCzTOoB+/A=";
};
yarnOfflineCacheServer = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-W+pX2XO27j6qAVxvo+Xf1h7g3V0LUMtwNf+meZmkgwE=";
hash = "sha256-pzXH6hdDf8O6Kr12Xw0jRcnPRD2TrDGdiEfxVr3KmwY=";
};
yarnOfflineCacheTools = fetchYarnDeps {
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
yarnOfflineCacheClient = fetchYarnDeps {
yarnLock = "${src}/client/yarn.lock";
hash = "sha256-TAv8QAAfT3q28jUo26h0uCGsoqBzAn8lybIaqNAApU8=";
hash = "sha256-Ejzk/VEx7YtJpsrkHcXAZnJ+yRx1VhBJGpqquHYULNU=";
};
nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ];

View file

@ -5,14 +5,14 @@
}:
let
version = "2.53.0";
version = "2.53.1";
src = fetchFromGitHub {
name = "azure-cli-${version}-src";
owner = "Azure";
repo = "azure-cli";
rev = "azure-cli-${version}";
hash = "sha256-5c2Z0EJnKyLqWiz8/BEFAdy5A0+sBbai7UQ2KPL1jr8=";
hash = "sha256-++JquLva3ij4NDhXnY7tSQMH4HCtJ8DhZIzE0XguInM=";
};
# put packages that needs to be overridden in the py package scope
@ -25,45 +25,35 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
sourceRoot = "${src.name}/src/azure-cli";
prePatch = ''
substituteInPlace setup.py \
--replace "chardet~=3.0.4" "chardet" \
--replace "javaproperties~=0.5.1" "javaproperties" \
--replace "scp~=0.13.2" "scp" \
--replace "fabric~=2.4" "fabric"
# remove namespace hacks
# remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well
sed -i setup.py \
-e '/urllib3/d'
'';
nativeBuildInputs = [
installShellFiles
];
propagatedBuildInputs = with py.pkgs; [
antlr4-python3-runtime
applicationinsights
argcomplete
asn1crypto
azure-appconfiguration
azure-batch
azure-cli-core
azure-cli-telemetry
azure-common
azure-core
azure-cosmos
azure-data-tables
azure-datalake-store
azure-functions-devops-build
azure-graphrbac
azure-identity
azure-keyvault
azure-keyvault-administration
azure-keyvault-keys
azure-keyvault-certificates
azure-keyvault-keys
azure-keyvault-secrets
azure-loganalytics
azure-mgmt-advisor
azure-mgmt-apimanagement
azure-mgmt-applicationinsights
azure-mgmt-appconfiguration
azure-mgmt-appcontainers
azure-mgmt-applicationinsights
azure-mgmt-authorization
azure-mgmt-batch
azure-mgmt-batchai
@ -76,12 +66,12 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-mgmt-containerinstance
azure-mgmt-containerregistry
azure-mgmt-containerservice
azure-mgmt-core
azure-mgmt-cosmosdb
azure-mgmt-databoxedge
azure-mgmt-datalake-analytics
azure-mgmt-datalake-nspkg
azure-mgmt-datalake-store
azure-mgmt-datamigration
azure-mgmt-deploymentmanager
azure-mgmt-devtestlabs
azure-mgmt-dns
azure-mgmt-eventgrid
@ -95,14 +85,13 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-mgmt-keyvault
azure-mgmt-kusto
azure-mgmt-loganalytics
azure-mgmt-managedservices
azure-mgmt-managementgroups
azure-mgmt-managedservices
azure-mgmt-maps
azure-mgmt-marketplaceordering
azure-mgmt-media
azure-mgmt-monitor
azure-mgmt-msi
azure-mgmt-network
azure-mgmt-netapp
azure-mgmt-policyinsights
azure-mgmt-privatedns
@ -112,7 +101,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-mgmt-redhatopenshift
azure-mgmt-redis
azure-mgmt-relay
azure-mgmt-reservations
azure-mgmt-resource
azure-mgmt-search
azure-mgmt-security
@ -120,51 +108,68 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
azure-mgmt-servicefabric
azure-mgmt-servicefabricmanagedclusters
azure-mgmt-servicelinker
azure-mgmt-signalr
azure-mgmt-sql
azure-mgmt-signalr
azure-mgmt-sqlvirtualmachine
azure-mgmt-storage
azure-mgmt-synapse
azure-mgmt-trafficmanager
azure-mgmt-web
azure-multiapi-storage
azure-storage-blob
azure-nspkg
azure-storage-common
azure-storage-blob
azure-synapse-accesscontrol
azure-synapse-artifacts
azure-synapse-managedprivateendpoints
azure-synapse-spark
bcrypt
certifi
cffi
chardet
colorama
cryptography
distro
fabric
jsmin
humanfriendly
idna
invoke
isodate
javaproperties
jinja2
jmespath
jsondiff
knack
mock
markupsafe
msal-extensions
msal
msrest
msrestazure
oauthlib
packaging
paramiko
pydocumentdb
pbr
pkginfo
portalocker
psutil
pycomposefile
pycparser
pygithub
pygments
pyjwt
pynacl
pyopenssl
pytz
pyyaml
psutil
python-dateutil
requests-oauthlib
requests
scp
semver
six
sshtunnel
tabulate
urllib3
vsts-cd-manager
wcwidth
websocket-client
xmltodict
javaproperties
jsondiff
# urllib3[secure]
# shell completion
argcomplete
];
postInstall = ''
@ -185,10 +190,12 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
--set PYTHONPATH $PYTHONPATH
'';
# almost the entire test suite requires an azure account setup and networking
# ensure that the azure namespaces are setup correctly and that azure.cli can be accessed
checkPhase = ''
HOME=$TMPDIR $out/bin/az --help > /dev/null
doInstallCheck = true;
installCheckPhase = ''
export HOME=$TMPDIR
$out/bin/az --version
$out/bin/az self-test
'';
# ensure these namespaces are able to be accessed
@ -198,7 +205,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
"azure.cli.telemetry"
"azure.cosmos"
"azure.datalake.store"
"azure_functions_devops_build"
"azure.graphrbac"
"azure.keyvault"
"azure.loganalytics"
@ -220,10 +226,8 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
"azure.mgmt.containerregistry"
"azure.mgmt.containerservice"
"azure.mgmt.cosmosdb"
"azure.mgmt.datalake.analytics"
"azure.mgmt.datalake.store"
"azure.mgmt.datamigration"
"azure.mgmt.deploymentmanager"
"azure.mgmt.devtestlabs"
"azure.mgmt.dns"
"azure.mgmt.eventgrid"
@ -243,7 +247,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
"azure.mgmt.media"
"azure.mgmt.monitor"
"azure.mgmt.msi"
"azure.mgmt.network"
"azure.mgmt.netapp"
"azure.mgmt.policyinsights"
"azure.mgmt.privatedns"
@ -252,7 +255,6 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage {
"azure.mgmt.recoveryservicesbackup"
"azure.mgmt.redis"
"azure.mgmt.relay"
"azure.mgmt.reservations"
"azure.mgmt.resource"
"azure.mgmt.search"
"azure.mgmt.security"

View file

@ -10,8 +10,7 @@ let
buildAzureCliPackage = with py.pkgs; buildPythonPackage;
overrideAzureMgmtPackage = package: version: extension: hash:
# check to make sure overriding is even necessary
package.overridePythonAttrs (oldAttrs: rec {
package.overridePythonAttrs (oldAttrs: {
inherit version;
src = fetchPypi {
@ -46,38 +45,25 @@ let
sourceRoot = "${src.name}/src/azure-cli-core";
propagatedBuildInputs = with self; [
adal
antlr4-python3-runtime
argcomplete
azure-common
azure-cli-telemetry
azure-data-tables
azure-mgmt-appcontainers
azure-common
azure-mgmt-core
azure-mgmt-resource
colorama
cryptography
distro
humanfriendly
jmespath
knack
msal
msal-extensions
msrest
msal
msrestazure
packaging
paramiko
pkginfo
psutil
pygments
pyjwt
pymysql
pyopenssl
pyperclip
pysocks
pyyaml
requests
six
tabulate
];
nativeCheckInputs = with self; [ pytest ];
@ -86,8 +72,8 @@ let
# ignore tests that does network call, or assume powershell
checkPhase = ''
rm azure/{,cli/}__init__.py
python -c 'import azure.common; print(azure.common)'
PYTHONPATH=$PWD:${src}/src/azure-cli-testsdk:$PYTHONPATH HOME=$TMPDIR pytest \
azure/cli/core/tests \
--ignore=azure/cli/core/tests/test_profile.py \
@ -103,18 +89,17 @@ let
azure-cli-telemetry = buildAzureCliPackage {
pname = "azure-cli-telemetry";
version = "1.0.8"; # might be wrong, but doesn't really matter
version = "1.1.0";
inherit src;
sourceRoot = "${src.name}/src/azure-cli-telemetry";
propagatedBuildInputs = with super; [
propagatedBuildInputs = with self; [
applicationinsights
knack
portalocker
];
nativeCheckInputs = [ py.pkgs.pytest ];
nativeCheckInputs = with self; [ pytest ];
# ignore flaky test
checkPhase = ''
cd azure
@ -126,89 +111,29 @@ let
antlr4 = super.pkgs.antlr4_9;
});
azure-batch = overrideAzureMgmtPackage super.azure-batch "14.0.0" "zip"
"sha256-FlsembhvghAkxProX7NIadQHqg67DKS5b7JthZwmyTQ=";
azure-data-tables = (overrideAzureMgmtPackage super.azure-data-tables "12.4.0" "zip"
"sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw=").overridePythonAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
});
azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "4.0.0" "zip"
"sha256-AiTjLJ28g80xnrRFLfPUevJgeaxLpuGmvkd3+FskNiw=";
azure-mgmt-appcontainers = (overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip"
"sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU=").overridePythonAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
});
azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip"
"sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo=";
azure-mgmt-appcontainers = overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip"
"sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU=";
azure-mgmt-batchai = overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip"
"sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y=";
azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip"
"sha256-1PXFpBiKRW/h6zK2xF9VyiBpx0vkHrdpIYQLOfL1wH8=";
azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "2.0.0b3" "zip"
"sha256-XZGQOeMw8usyQ1tl8j57fZ3uqLshomHY9jO/rbpQOvM=";
azure-mgmt-extendedlocation = overrideAzureMgmtPackage super.azure-mgmt-extendedlocation "1.0.0b2" "zip"
"sha256-mjfH35T81JQ97jVgElWmZ8P5MwXVxZQv/QJKNLS3T8A=";
azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b4" "zip"
"sha512-NW2BNj45lKzBmPXWMuBnVEDG2C6xzo9J/QjcC5fczvyhKBIkhugJVOWdPUsSzyGeQYKdqpRWPOl0yBG/eblHQA==";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip"
"sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";
azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b10" "zip"
"sha256-sM8oZdhv+5WCd4RnMtEmCikTBmzGsap5heKzSbHbRPI=";
azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.4.0" "zip"
"sha256-2JeOvtNxx6Z3AY4GI9fBRKbMcYVHsbrhk8C+5t5eelk=";
azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "6.0.0" "zip"
"sha256-lIEYi/jvF9pYbnH+clUzfU0fExlY+dZojIyZRtTLQh8=";
azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "3.0.0" "zip"
"sha256-FJhuVgqNjdRIegP4vUISrAtHvvVle5VQFVITPm4HLEw=";
azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.5.0" "zip"
"sha512-bUFY0+JipVihatMib0Giv7THnv4rRAbT36PhP+5tcsVlBVLmCYqjyp0iWnTfSbvRiljKOjbm3w+xeC0gL/IE7w==";
azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "30.0.0" "zip"
"sha256-cyD7r8OSdwsD7QK2h2AYXmCUVS7ZjX/V6nchClpRPHg=";
azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip"
"sha256-moWonzDyJNJhdJviC0YWoOuJSFhvfw8gVzuOoy8mUYk=";
azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip"
"sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4=";
azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "25.0.0" "zip"
"sha256-je7O92bklsbIlfsTUF2TXUqztAZxn8ep4ezCUHeLuhE=";
azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.2.0" "zip"
"sha256-PAaBkR77Ho2YI5I+lmazR/8vxEZWpbvM427yRu1ET0k=";
azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip"
"sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc=";
azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip"
"sha256-RuNCInmT/JrKsd2kLy61ZrUiqMlFq50O6lYna0b21zA=";
azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip"
"sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA=";
azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.2.0" "zip"
"sha256-XmGIzw+yGYgdaNGZJClFRl531BGsQUH+HESUXGVK6TI=";
azure-mgmt-iothub = (overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip"
"sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A=").overridePythonAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
});
azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip"
"sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4=";
azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip"
"sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A=";
azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "10.0.0b1" "zip"
"sha256-1CiZuTXYhIb74eGQZUJHHzovYNnnVd3Ydu1UCy2Bu00=";
@ -219,73 +144,20 @@ let
azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip"
"sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip"
"sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM=";
azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip"
"sha256-QHwtrLM1E/++nKS+Wt216dS64Mt++mE8P31THve/jeg=";
azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b4" "zip"
"sha256-Jm1t7v5vyFjNNM/evVaEI9sXJKNwJk6XAXuJSRSnKHk=";
azure-mgmt-network = (overrideAzureMgmtPackage super.azure-mgmt-network "21.0.1" "zip"
"sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8=").overridePythonAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
});
azure-mgmt-maps = (overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip"
"sha256-OE4X92potwCk+YhHiUXDqXIXEcBAByWv38tjz4ToXw4=").overridePythonAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
});
azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip"
"sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk=";
azure-mgmt-managementgroups = overrideAzureMgmtPackage super.azure-mgmt-managementgroups "1.0.0" "zip"
"sha256-urm9UyocNFV/Wwq5lQ5DHj8Au5boo85m3w9s4q4ZzXM=";
azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip"
"sha256-aLOB9SpN9ENdrK1al+HFmsTJgfZn3MqPnQRFNBfWCtg=";
azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "9.0.0" "zip"
"sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM=";
azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec {
version = "7.0.0";
src = old.src.override {
inherit version;
hash = "sha256-ctRsmmJ4PsTqthm+nRt4/+u9qhZNQG/TA/FjA/NyVrI=";
};
});
azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip"
"sha256-tg8W5D97KRWCxfV7rhsIMJbYMD6dmVjiwpInpVzCfEU=";
azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.0.0" "zip"
"sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA=";
azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.2.0" "zip"
"sha256-ZU4mKTzny9tsKDrFSU+lll5v6oDivYJlXDriWJLAYec=";
azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip"
"sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM=";
azure-mgmt-redis = (overrideAzureMgmtPackage super.azure-mgmt-redis "14.1.0" "zip"
"sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig=").overridePythonAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
});
azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "2.0.0" "zip"
"sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E=";
azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "9.0.0" "zip"
"sha256-Gc+qoTa1EE4/YmJvUSqVG+zZ50wfohvWOe/fLJ/vgb0=";
azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "5.0.0" "zip"
"sha512-wMI55Ou96rzUEZIeTDmMfR4KIz3tG98z6A6teJanGPyNgte9tGa0/+2ge0yX10iwRKZyZZPNTReCkcd+IOkS+A==";
azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.1.0" "zip"
"sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE=";
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b10" "zip"
"sha256-QHvbO6Toh5QflMIaNYmxXBy0Dmw++RVdim3HEDtLBrQ=";
azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b12" "tar.gz"
"sha256-LJx9cdtqpoHl1pPGYodoA50y8NP4ftbXhY7zohsCPH8=";
azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b5" "zip"
"sha256-ZFgJflgynRSxo+B+Vso4eX1JheWlDQjfJ9QmupXypMc=";
@ -293,296 +165,32 @@ let
azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip"
"sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k=";
azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "10.0.0" "zip"
"sha256-XO5w+X/joJPDy3DCoZDC35Nrdy6UoJ73496x7Rd8nzI=";
azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip"
"sha256-2fmHzymYuKNU8zGypxCCwEkZPx4c00WBLhS5uCE2Wss=";
azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.1.0" "zip"
"sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA=";
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.2" "zip"
"sha256-LG6oMTZepgT87KdJrwCpc4ZYEclUsEAHUitZrxFCkL4=";
azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip"
"sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0=";
azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip"
"sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc=";
azure-mgmt-monitor = (overrideAzureMgmtPackage super.azure-mgmt-monitor "6.0.2" "tar.gz"
"sha256-X/v1AOSZq3kSsbptJs7yZIDZrkEVMgGbt41yViGW4Hs=").overridePythonAttrs (attrs: {
propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ];
});
azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip"
"sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs=";
azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.2.3" "zip"
"sha256-JDM6F0ToMpUeBlLULih17TLzCbrNdxrGrcq5oIfsybU=";
azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip"
"sha256-woeix9703hn5LAwxugKGf6xvW433G129qxkoi7RV/Fs=";
azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "3.0.0" "zip"
"sha256-Cl1/aDvzNyI2uEHNvUZ39rCO185BuZnD5kTUKGJSBX0=";
azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.0.0" "zip"
"sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c=";
azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "8.2.0" "zip"
"sha256-i+kgjxQdmnifaNuNIZdU/3gGn9j5OQ6fdkS7laO+nsI=";
azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip"
"sha256-3jXhF5EoMsGp6TEJqNJMq5T1VwOpCHsuscWwZVs7GRM=";
azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.2.0b1" "zip"
"sha256-RK1Q51Q0wAG55oKrFmv65/2AUKl+gRdp27t/EcuMONk=";
azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip"
"sha256-QevcacDR+B0l3TBDjBT/9DMfZmOfVYBbkYuWSer/54o=";
azure-storage-common = overrideAzureMgmtPackage super.azure-storage-common "1.4.2" "tar.gz"
"sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE=";
azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.2.0" "tar.gz"
"sha256-CQuoWHeh0EMitTRsvifotrTwpWd/Q9LWWD7jZ2w9r8I=";
azure-keyvault-keys = overrideAzureMgmtPackage super.azure-keyvault-keys "4.8.0b2" "zip"
"sha256-VUwQJAwpZIQ8fzBUjUX0ui2yaVkDK7p0fwmnz373XbY=";
azure-appconfiguration = super.azure-appconfiguration.overrideAttrs (oldAttrs: rec {
version = "1.1.1";
azure-mgmt-datalake-store = overrideAzureMgmtPackage super.azure-mgmt-datalake-store "0.5.0" "zip"
"sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw=";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q=";
extension = "zip";
};
});
azure-graphrbac = super.azure-graphrbac.overrideAttrs (oldAttrs: rec {
version = "0.60.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-0Lti2L+OGWuQPzlxukr6RI5P4U6DlOv83ZQdhNYuyv4=";
extension = "zip";
};
});
azure-storage-common = super.azure-storage-common.overrideAttrs (oldAttrs: rec {
version = "1.4.2";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-Tsh8dTfUV+yVJS4ORkd+LBzPM3dP/v0F2FRGgssK5AE=";
};
});
azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs (oldAttrs: rec {
version = "0.15.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-XxryuN5HVuY9h6ioSEv9nwzkK6wYLupvFOCJqX82eWE=";
extension = "zip";
};
propagatedBuildInputs = with super; oldAttrs.propagatedBuildInputs ++ [
azure-mgmt-core
];
});
azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs (oldAttrs: rec {
version = "0.5.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-g14ySiByqPgkJGRH8EnIRJO9Q6H2usS5FOeMCQiUuwQ=";
extension = "zip";
};
});
azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs (oldAttrs: rec {
version = "0.4.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-kA6urM/9zQEBKySKfQSQCMkoB7dJ7dHJB0ypJIVUwX4=";
extension = "zip";
};
});
azure-synapse-spark = super.azure-synapse-spark.overrideAttrs (oldAttrs: rec {
version = "0.2.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-OQ5brhweEIrtN2iP4I5NacdC9t3YUiGIVhhqSs3FMuI=";
extension = "zip";
};
});
azure-keyvault = super.azure-keyvault.overrideAttrs (oldAttrs: rec {
version = "1.1.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
extension = "zip";
hash = "sha256-N6jl83brWjBPzQZtQUtdk7mH5o+SErDEHvo31Cmq3Uk=";
};
propagatedBuildInputs = with self; [
azure-common
azure-nspkg
msrest
msrestazure
cryptography
];
pythonNamespaces = [ "azure" ];
pythonImportsCheck = [ ];
});
azure-keyvault-administration = super.azure-keyvault-administration.overridePythonAttrs (oldAttrs: rec {
version = "4.3.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
extension = "zip";
hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY=";
};
});
azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs (oldAttrs: rec {
version = "4.8.0b2";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
extension = "zip";
hash = "sha256-VUwQJAwpZIQ8fzBUjUX0ui2yaVkDK7p0fwmnz373XbY=";
};
});
# part of azure.mgmt.datalake namespace
azure-mgmt-datalake-analytics = super.azure-mgmt-datalake-analytics.overrideAttrs (oldAttrs: rec {
version = "0.2.1";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-THlg0JT1hH2aRWwYuKPI5gxCjjCAo5BfHJQ9gbpjUaQ=";
extension = "zip";
};
preBuild = ''
rm azure_bdist_wheel.py
substituteInPlace setup.cfg \
--replace "azure-namespace-package = azure-mgmt-datalake-nspkg" ""
'';
});
azure-mgmt-datalake-store = super.azure-mgmt-datalake-store.overrideAttrs (oldAttrs: rec {
version = "0.5.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-k3bTVJVmHRn4rMVgT2ewvFlJOxg1u8SA+aGVL5ABekw=";
extension = "zip";
};
preBuild = ''
rm azure_bdist_wheel.py
substituteInPlace setup.cfg \
--replace "azure-namespace-package = azure-mgmt-datalake-nspkg" ""
'';
});
adal = super.adal.overridePythonAttrs (oldAttrs: rec {
version = "1.2.7";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-109FuBMXRU2W6YL9HFDm+1yZrCIjcorqh2RDOjn1ZvE=";
};
# sdist doesn't provide tests
doCheck = false;
});
msal = super.msal.overridePythonAttrs (oldAttrs: rec {
version = "1.24.0b1";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-ze5CqX+m8XH4NUECL2SgNT9EXV4wS/0DgO5XMDHo/Uo=";
};
});
semver = super.semver.overridePythonAttrs (oldAttrs: rec {
version = "2.13.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-+g/ici7hw/V+rEeIIMOlri9iSvgmTL35AAyYD/f3Xj8=";
};
});
jsondiff = super.jsondiff.overridePythonAttrs (oldAttrs: rec {
version = "2.0.0";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q=";
};
});
knack = super.knack.overridePythonAttrs (oldAttrs: rec {
version = "0.11.0";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-62VoAB6RELGzIJQUMcUQM9EEzJjNoiVKXCsJulaf1JQ=";
};
});
argcomplete = super.argcomplete.overridePythonAttrs (oldAttrs: rec {
version = "3.1.1";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-bExWPxTwFECq/6Pq4TRBxdsjV7Xuxjmr58CxUzRiff8=";
};
});
sshtunnel = super.sshtunnel.overridePythonAttrs (oldAttrs: rec {
name = "sshtunnel-${version}";
version = "0.1.5";
src = fetchPypi {
inherit (oldAttrs) pname;
inherit version;
hash = "sha256-yBP9zajoHDk2/+rEfLac+y0fXnetDeZWxtq1au69kkk=";
};
});
websocket-client = super.websocket-client.overridePythonAttrs (oldAttrs: rec {
version = "1.3.1";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-YninUGU5VBgoP4h958O+r7OqaNraXKy+SyFOjSbaSZs=";
};
});
azure-mgmt-resource = super.azure-mgmt-resource.overridePythonAttrs (oldAttrs: rec {
version = "23.1.0b2";
src = oldAttrs.src.override {
inherit version;
hash = "sha256-kMmiKVwjPgmsTIxxxDRNXE41jSTJkemnKhO+P/OcPZI=";
};
});
azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "23.1.0b2" "zip"
"sha256-kMmiKVwjPgmsTIxxxDRNXE41jSTJkemnKhO+P/OcPZI=";
};
};
in

View file

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "infracost";
version = "0.10.29";
version = "0.10.30";
src = fetchFromGitHub {
owner = "infracost";
rev = "v${version}";
repo = "infracost";
sha256 = "sha256-xtxTIC7DNTvcDMXtFJOJkJGn78HdzCWVrBMS5Ksmtcc=";
sha256 = "sha256-YHhaOf2MNrFHv29pEnhkOjFH30Mi5Oi6gYkSH6PZhU4=";
};
vendorHash = "sha256-ZKRtUlrEk/W2qZSbsh0ddwmspH6quzzY0cFSQmO0i10=";
vendorHash = "sha256-yjPtNTfkL8+fkmXW98SnpboMqdsjQYCif65sn0jjLgc=";
ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];

View file

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "httpx";
version = "1.3.5";
version = "1.3.6";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = "httpx";
rev = "refs/tags/v${version}";
hash = "sha256-DayYelnimsIvM5zkUoCQcS3TiZi81MDjvys/5M2xc48=";
hash = "sha256-oLx8fyFmK6SyFLw4yDwa+z5CpuAqebQdEH3JCbt9cg0=";
};
vendorHash = "sha256-aUQc8dv3IHTIgeg8YHcoMbT2EzBoqCj4ST2113tg73Q=";
vendorHash = "sha256-QggYz5vAzhqagYIRCa7R09px8qXaqsTcj659XIV/LR4=";
subPackages = [
"cmd/httpx"

View file

@ -9920,8 +9920,6 @@ with pkgs;
lhasa = callPackage ../tools/compression/lhasa { };
libcpuid = callPackage ../tools/misc/libcpuid { };
libcsptr = callPackage ../development/libraries/libcsptr { };
libgovirt = callPackage ../applications/virtualization/libgovirt { };
@ -13418,8 +13416,6 @@ with pkgs;
spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { };
spigot = callPackage ../tools/misc/spigot { };
spiped = callPackage ../tools/networking/spiped { };
sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { };

View file

@ -14761,6 +14761,36 @@ with self; {
};
};
MacPropertyList = buildPerlPackage {
pname = "Mac-PropertyList";
version = "1.504";
src = fetchurl {
url = "mirror://cpan/authors/id/B/BD/BDFOY/Mac-PropertyList-1.504.tar.gz";
hash = "sha256-aIl96Yw2j76c22iF1H3qADxG7Ho3MmNSPvZkVwc7eq4=";
};
propagatedBuildInputs = [ XMLEntities ];
meta = {
description = "Work with Mac plists at a low level";
homepage = "https://github.com/briandfoy/mac-propertylist";
license = lib.licenses.artistic2;
};
};
MacSysProfile = buildPerlPackage {
pname = "Mac-SysProfile";
version = "0.05";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DM/DMUEY/Mac-SysProfile-0.05.tar.gz";
hash = "sha256-QDOXa3dbOcwqaTtyoC1l71p7oDveTU2w3/RuEmx9n2w=";
};
propagatedBuildInputs = [ MacPropertyList ];
meta = {
description = "Perl extension for OS X system_profiler";
license = with lib.licenses; [ artistic1 gpl1Plus ];
platforms = lib.platforms.darwin;
};
};
MailAuthenticationResults = buildPerlPackage {
pname = "Mail-AuthenticationResults";
version = "2.20230112";
@ -18420,6 +18450,22 @@ with self; {
};
};
NetCUPS = buildPerlPackage {
pname = "Net-CUPS";
version = "0.64";
src = fetchurl {
url = "mirror://cpan/authors/id/N/NI/NINE/Net-CUPS-0.64.tar.gz";
hash = "sha256-17x3/w9iv4dMhDxZDrEqgLvUR0mi+3Tb7URcNdDoWoU=";
};
buildInputs = [ pkgs.cups pkgs.cups-filters ];
NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.cups}/lib -lcups";
meta = {
description = "Common Unix Printing System Interface";
homepage = "https://github.com/niner/perl-Net-CUPS";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
NetDBus = buildPerlPackage {
pname = "Net-DBus";
version = "1.2.0";
@ -19787,6 +19833,20 @@ with self; {
};
};
ParseEDID = buildPerlPackage {
pname = "Parse-Edid";
version = "1.0.7";
src = fetchurl {
url = "mirror://cpan/authors/id/G/GR/GROUSSE/Parse-EDID-1.0.7.tar.gz";
hash = "sha256-GtwPEFoyGYoqK02lsOD5hfBe/tmc42YZCnkOFl1nW/E=";
};
buildInputs = [ TestWarn ];
meta = {
description = "Extended display identification data (EDID) parser";
license = lib.licenses.gpl3Plus;
};
};
ParseDebControl = buildPerlPackage {
pname = "Parse-DebControl";
version = "2.005";
@ -20888,6 +20948,35 @@ with self; {
};
};
ProcDaemon = buildPerlPackage {
pname = "Proc-Daemon";
version = "0.23";
src = fetchurl {
url = "mirror://cpan/authors/id/A/AK/AKREAL/Proc-Daemon-0.23.tar.gz";
hash = "sha256-NMC4W3lItDHLq8l87lgINeUVzPQ7rb2DOesQlHQIm2k=";
};
buildInputs = [ ProcProcessTable ];
meta = {
description = "Run Perl program(s) as a daemon process";
homepage = "https://github.com/akreal/Proc-Daemon";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
ProcPIDFile = buildPerlPackage {
pname = "Proc-PID-File";
version = "1.29";
src = fetchurl {
url = "mirror://cpan/authors/id/D/DM/DMITRI/Proc-PID-File-1.29.tar.gz";
hash = "sha256-O87aSd8YLT2BaLcMKlGyBW8v1FlQptBCipmS/TVc1KQ=";
};
meta = {
description = "Manage process id files";
homepage = "https://github.com/dtikhonov/Proc-PID-File";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
ProcFind = buildPerlPackage {
pname = "Proc-Find";
version = "0.051";
@ -28244,6 +28333,24 @@ with self; {
};
};
XMLEntities = buildPerlPackage {
pname = "XML-Entities";
version = "1.0002";
src = fetchurl {
url = "mirror://cpan/authors/id/S/SI/SIXTEASE/XML-Entities-1.0002.tar.gz";
hash = "sha256-wyqk8wlXPXZIqy5Bb2K2sgZS8q2c/T7sgv1REB/nMQ0=";
};
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
propagatedBuildInputs = [ LWP ];
postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/download-entities.pl
'';
meta = {
description = "Mapping of XML entities to Unicode";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
XMLDOM = buildPerlPackage {
pname = "XML-DOM";
version = "1.46";

View file

@ -5753,6 +5753,8 @@ self: super: with self; {
junitparser = callPackage ../development/python-modules/junitparser { };
junit2html = callPackage ../development/python-modules/junit2html { };
junit-xml = callPackage ../development/python-modules/junit-xml { };
junos-eznc = callPackage ../development/python-modules/junos-eznc { };
@ -9125,6 +9127,7 @@ self: super: with self; {
pycketcasts = callPackage ../development/python-modules/pycketcasts { };
pycomposefile = callPackage ../development/python-modules/pycomposefile { };
pycontrol4 = callPackage ../development/python-modules/pycontrol4 { };
pycookiecheat = callPackage ../development/python-modules/pycookiecheat { };