colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2023-12-26 18:01:24 +00:00 committed by GitHub
commit b3ceb9c6b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
97 changed files with 561 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/CODEOWNERS vendored
View File

@ -268,13 +268,6 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
/pkgs/development/php-packages @aanderse @drupol @etu @globin @ma27 @talyz /pkgs/development/php-packages @aanderse @drupol @etu @globin @ma27 @talyz
/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz /pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz
# Podman, CRI-O modules and related
/nixos/modules/virtualisation/containers.nix @adisbladis
/nixos/modules/virtualisation/cri-o.nix @adisbladis
/nixos/modules/virtualisation/podman @adisbladis
/nixos/tests/cri-o.nix @adisbladis
/nixos/tests/podman @adisbladis
# Docker tools # Docker tools
/pkgs/build-support/docker @roberth /pkgs/build-support/docker @roberth
/nixos/tests/docker-tools* @roberth /nixos/tests/docker-tools* @roberth

9
lib/licenses.nix
View File

@ -104,6 +104,7 @@ in mkLicense lset) ({
}; };
arphicpl = { arphicpl = {
spdxId = "Arphic-1999";
fullName = "Arphic Public License"; fullName = "Arphic Public License";
url = "https://www.freedesktop.org/wiki/Arphic_Public_License/"; url = "https://www.freedesktop.org/wiki/Arphic_Public_License/";
}; };
@ -236,6 +237,7 @@ in mkLicense lset) ({
}; };
cal10 = { cal10 = {
spdxId = "CAL-1.0";
fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)"; fullName = "Cryptographic Autonomy License version 1.0 (CAL-1.0)";
url = "https://opensource.org/licenses/CAL-1.0"; url = "https://opensource.org/licenses/CAL-1.0";
}; };
@ -429,6 +431,7 @@ in mkLicense lset) ({
}; };
elastic20 = { elastic20 = {
spdxId = "Elastic-2.0";
fullName = "Elastic License 2.0"; fullName = "Elastic License 2.0";
url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt"; url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt";
free = false; free = false;
@ -598,6 +601,7 @@ in mkLicense lset) ({
# Intel's license, seems free # Intel's license, seems free
iasl = { iasl = {
spdxId = "Intel-ACPI";
fullName = "iASL"; fullName = "iASL";
url = "https://old.calculate-linux.org/packages/licenses/iASL"; url = "https://old.calculate-linux.org/packages/licenses/iASL";
}; };
@ -609,7 +613,7 @@ in mkLicense lset) ({
imagemagick = { imagemagick = {
fullName = "ImageMagick License"; fullName = "ImageMagick License";
spdxId = "imagemagick"; spdxId = "ImageMagick";
}; };
imlib2 = { imlib2 = {
@ -803,6 +807,7 @@ in mkLicense lset) ({
}; };
miros = { miros = {
spdxId = "MirOS";
fullName = "MirOS License"; fullName = "MirOS License";
url = "https://opensource.org/licenses/MirOS"; url = "https://opensource.org/licenses/MirOS";
}; };
@ -1138,6 +1143,7 @@ in mkLicense lset) ({
}; };
upl = { upl = {
spdxId = "UPL-1.0";
fullName = "Universal Permissive License"; fullName = "Universal Permissive License";
url = "https://oss.oracle.com/licenses/upl/"; url = "https://oss.oracle.com/licenses/upl/";
}; };
@ -1194,6 +1200,7 @@ in mkLicense lset) ({
}; };
xfig = { xfig = {
spdxId = "Xfig";
fullName = "xfig"; fullName = "xfig";
url = "https://mcj.sourceforge.net/authors.html#xfig"; url = "https://mcj.sourceforge.net/authors.html#xfig";
}; };

8
maintainers/maintainer-list.nix
View File

@ -1281,9 +1281,11 @@
githubId = 6060545; githubId = 6060545;
matrix = "@anpin:matrix.org"; matrix = "@anpin:matrix.org";
name = "Pavel Anpin"; name = "Pavel Anpin";
keys = [{ keys = [
fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; { fingerprint = "06E8 4FF6 0CCF 7AFD 5101 76C9 0FBC D3EE 6310 7407"; }
}]; # compare with https://keybase.io/anpin/pgp_keys.asc
{ fingerprint = "DADF F3EA 06DC 8C1B 100A 24DB 312E 8F17 91C5 DA8C"; }
];
}; };
anpryl = { anpryl = {
email = "anpryl@gmail.com"; email = "anpryl@gmail.com";

1
maintainers/scripts/luarocks-packages.csv
View File

@ -22,6 +22,7 @@ fzy,,,,,,mrcjkb
gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1, gitsigns.nvim,https://github.com/lewis6991/gitsigns.nvim.git,,,,5.1,
haskell-tools.nvim,,,,,, haskell-tools.nvim,,,,,,
http,,,,0.3-0,,vcunat http,,,,0.3-0,,vcunat
image.nvim,,,,,,teto
inspect,,,,,, inspect,,,,,,
jsregexp,,,,,, jsregexp,,,,,,
ldbus,,,http://luarocks.org/dev,,, ldbus,,,http://luarocks.org/dev,,,

1 name src ref server version luaversion maintainers
22 gitsigns.nvim https://github.com/lewis6991/gitsigns.nvim.git 5.1
23 haskell-tools.nvim
24 http 0.3-0 vcunat
25 image.nvim teto
26 inspect
27 jsregexp
28 ldbus http://luarocks.org/dev

1
maintainers/team-list.nix
View File

@ -767,7 +767,6 @@ with lib.maintainers; {
podman = { podman = {
members = [ members = [
adisbladis
saschagrunert saschagrunert
vdemeester vdemeester
]; ];

9
nixos/lib/make-disk-image.nix
View File

@ -522,11 +522,16 @@ let format' = format; in let
chmod 0644 $efiVars chmod 0644 $efiVars
''; '';
createHydraBuildProducts = ''
mkdir -p $out/nix-support
echo "file ${format}-image $out/${filename}" >> $out/nix-support/hydra-build-products
'';
buildImage = pkgs.vmTools.runInLinuxVM ( buildImage = pkgs.vmTools.runInLinuxVM (
pkgs.runCommand name { pkgs.runCommand name {
preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars; preVM = prepareImage + lib.optionalString touchEFIVars createEFIVars;
buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ]; buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ];
postVM = moveOrConvertImage + postVM; postVM = moveOrConvertImage + createHydraBuildProducts + postVM;
QEMU_OPTS = QEMU_OPTS =
concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}"
++ lib.optionals touchEFIVars [ ++ lib.optionals touchEFIVars [
@ -616,5 +621,5 @@ let format' = format; in let
in in
if onlyNixStore then if onlyNixStore then
pkgs.runCommand name {} pkgs.runCommand name {}
(prepareImage + moveOrConvertImage + postVM) (prepareImage + moveOrConvertImage + createHydraBuildProducts + postVM)
else buildImage else buildImage

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

@ -317,6 +317,7 @@ in {
freetube = discoverTests (import ./freetube.nix); freetube = discoverTests (import ./freetube.nix);
freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-sqlite = handleTest ./freshrss-sqlite.nix {};
freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {};
freshrss-http-auth = handleTest ./freshrss-http-auth.nix {};
frigate = handleTest ./frigate.nix {}; frigate = handleTest ./frigate.nix {};
frp = handleTest ./frp.nix {}; frp = handleTest ./frp.nix {};
frr = handleTest ./frr.nix {}; frr = handleTest ./frr.nix {};

4
pkgs/applications/editors/codux/default.nix
View File

@ -5,11 +5,11 @@
let let
pname = "codux"; pname = "codux";
version = "15.16.1"; version = "15.16.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
sha256 = "sha256-vc0lnYGOgb1uKAQlj6xc8mbSfJ6apGNSlyDRX3qHeTM="; sha256 = "sha256-GKn8T3MEh+MnOqUnxruTqbnfxUcjGh6EAt+6LHTNCiY=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

2
pkgs/applications/misc/audio/sox/default.nix
View File

@ -59,8 +59,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
autoconf-archive autoconf-archive
] ++ lib.optionals enableOpusfile [
# configure.ac uses pkg-config only to locate libopusfile
pkg-config pkg-config
]; ];

1
pkgs/applications/misc/bambu-studio/default.nix
View File

@ -168,5 +168,6 @@ stdenv.mkDerivation rec {
license = licenses.agpl3; license = licenses.agpl3;
maintainers = with maintainers; [ zhaofengli ]; maintainers = with maintainers; [ zhaofengli ];
mainProgram = "bambu-studio"; mainProgram = "bambu-studio";
platforms = platforms.linux;
}; };
} }

24
pkgs/applications/misc/bambu-studio/orca-slicer.nix Normal file
View File

@ -0,0 +1,24 @@
{ lib, fetchFromGitHub, makeDesktopItem, bambu-studio }:
let
orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: {
version = "1.8.1";
pname = "orca-slicer";
src = fetchFromGitHub {
owner = "SoftFever";
repo = "OrcaSlicer";
rev = "v${finalAttrs.version}";
hash = "sha256-3aIVi7Wsit4vpFrGdqe7DUEC6HieWAXCdAADVtB5HKc=";
};
meta = with lib; {
description = "G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc";
homepage = "https://github.com/SoftFever/OrcaSlicer";
license = licenses.agpl3Only;
maintainers = with maintainers; [ zhaofengli ovlach pinpox ];
mainProgram = "orca-slicer";
platforms = platforms.linux;
};
});
in
orca-slicer

4
pkgs/applications/misc/flashprint/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "flashprint"; pname = "flashprint";
version = "5.8.1"; version = "5.8.3";
src = fetchurl { src = fetchurl {
url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb";
hash = "sha256-X5CsJmJa3qGQxdZ1xg3xoVnIaChzxZ/GaLZFqBE2dIk="; hash = "sha256-6vBEthQD0HM2D+l+2dwWmdU+XPJpcvZQM+2GMuaf5Pw=";
}; };
nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ];

8
pkgs/applications/misc/joplin-desktop/default.nix
View File

@ -2,7 +2,7 @@
let let
pname = "joplin-desktop"; pname = "joplin-desktop";
version = "2.12.18"; version = "2.13.9";
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}"; throwSystem = throw "Unsupported system: ${system}";
@ -16,9 +16,9 @@ let
src = fetchurl { src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
sha256 = { sha256 = {
x86_64-linux = "1fwcqgqni7d9x0prdy3p8ccc5lzgn57rhph4498vs1q40kyq8823"; x86_64-linux = "sha256-1po4i+SG5o28uBtgmIXxnCP8/ZvFgTXxrdKVTSA7ndE=";
x86_64-darwin = "sha256-atd7nkefLvilTq39nTLbXQhm1zzBCHOLL7MRJwlTSMk="; x86_64-darwin = "sha256-4NeFVj+RB3CyCQxrMM7ZfFahBMa0WumY1YPslJ2votc=";
aarch64-darwin = "sha256-xiWXD+ULSVJ80uruYz0uRFkDRT1QOUd6FSWDKK9yLMc="; aarch64-darwin = "sha256-pxlato6AQYduTCXouGVNSGr5awhGwlC8jTkG9nB2U+4=";
}.${system} or throwSystem; }.${system} or throwSystem;
}; };

8
pkgs/applications/misc/wttrbar/default.nix
View File

@ -7,18 +7,18 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wttrbar"; pname = "wttrbar";
version = "0.6.0"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bjesus"; owner = "bjesus";
repo = "wttrbar"; repo = "wttrbar";
rev = version; rev = version;
hash = "sha256-Qe1Is13RXUIT5JkfuLK3Lj5gxKxVbfA4FCNgkqSTMNE="; hash = "sha256-AGIUMw4lvYiUJol4VYS+ozNMsCDNGPCsg+fwMlpWEJY=";
}; };
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]);
cargoHash = "sha256-IK6ciz+XtNsC4QsAop7Pf5qjiTCUQa30xnHWW4PobnA="; cargoHash = "sha256-3FDY0SUl1lb9jUjUj14j/5gF5NoSpS1PMj1AtXr/4Hk=";
meta = { meta = {
description = "A simple but detailed weather indicator for Waybar using wttr.in"; description = "A simple but detailed weather indicator for Waybar using wttr.in";

1
pkgs/applications/networking/cluster/argo/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, buildGoModule , buildGoModule
, buildGoPackage
, fetchFromGitHub , fetchFromGitHub
, installShellFiles , installShellFiles
, pkgsBuildBuild , pkgsBuildBuild

4
pkgs/applications/networking/cluster/arkade/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "arkade"; pname = "arkade";
version = "0.10.17"; version = "0.10.20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alexellis"; owner = "alexellis";
repo = "arkade"; repo = "arkade";
rev = version; rev = version;
hash = "sha256-Ubj2jrQFmMTSY2+Z4pqDIQ+K8JycX+NOpgcuyCrD4uo="; hash = "sha256-aOJ07Ks+J7cDvF3InKGYx4dJAql9ltJQqa8P+4cKhNk=";
}; };
CGO_ENABLED = 0; CGO_ENABLED = 0;

4
pkgs/applications/networking/cluster/cilium/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "cilium-cli"; pname = "cilium-cli";
version = "0.15.17"; version = "0.15.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cilium"; owner = "cilium";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Gb3S3R9gt/4sCOxjiIEXDnVEUEt7Zgz0GJZFEP9D+h8="; hash = "sha256-52i3Ek/rXFF9rMMiXNMnRjT2HYsknGKvVtCRrVDmo9U=";
}; };
vendorHash = null; vendorHash = null;

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

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "glooctl"; pname = "glooctl";
version = "1.15.17"; version = "1.15.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "solo-io"; owner = "solo-io";
repo = "gloo"; repo = "gloo";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-tTsiDlpjQ86CAMzyZhRKPYrEqFm8sCPoeCRzTrmfyx4="; hash = "sha256-oHwo0I3OFfilLg2tlL0EycTo6BC7LYbzg7dxgfz/XeI=";
}; };
vendorHash = "sha256-/JliAQtUd8fbKThqkwC4u4XNawXhoZaV1XdJRciJxmw="; vendorHash = "sha256-MrTiZCvYUmdX4sK85jeeQpUupvitH6PfbQ+RfwELaV4=";
subPackages = [ "projects/gloo/cli/cmd" ]; subPackages = [ "projects/gloo/cli/cmd" ];

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

@ -8,16 +8,16 @@
buildGoModule rec { buildGoModule rec {
pname = "helmfile"; pname = "helmfile";
version = "0.159.0"; version = "0.160.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "helmfile"; owner = "helmfile";
repo = "helmfile"; repo = "helmfile";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-7RFDa8Yw2tPjVvJLVPb7VbDNhrHNxzqmE0uogm7X/HY="; sha256 = "sha256-sPHEYhKiKzB5MYylWeHKpVjjXbDsWbg99TKqT/d3uJ0=";
}; };
vendorHash = "sha256-kVr6h5u71RimRER6tNxZUewSqqjaAPptriD5bfsE85U="; vendorHash = "sha256-LkmPytmXrense/M0erBkxeQ7XXGlHDLY1yedsOxk4+E=";
doCheck = false; doCheck = false;

4
pkgs/applications/networking/cluster/kaniko/default.nix
View File

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kaniko"; pname = "kaniko";
version = "1.19.1"; version = "1.19.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleContainerTools"; owner = "GoogleContainerTools";
repo = "kaniko"; repo = "kaniko";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-iSiVRbq6ohAXAWhHUUFUG/6rjlsmgYmy9VAzx76JIt0="; hash = "sha256-YxOuZb1R9Orm3RTnZyzi54VzQbbmE+lO+4osvG97pwE=";
}; };
vendorHash = null; vendorHash = null;

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

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kubecm"; pname = "kubecm";
version = "0.25.0"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sunny0826"; owner = "sunny0826";
repo = "kubecm"; repo = "kubecm";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-8Y8JChZxjbN/nOw2tzDfJvYSMAtAadf6QMsDFK4IIOg="; hash = "sha256-53diz+TNGRmNbSZJAIKPFi0x/BdL02Tjb847I/XdhW0=";
}; };
vendorHash = "sha256-HjMgXEDX9pDpK+1Hm0xI0wYRfpj7K6xkZJXCUBqbE3Y="; vendorHash = "sha256-QPd7gUEY6qNdl96slKvY7+Av6fCU9q+XdjKNKUXz2Wo=";
ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"];
doCheck = false; doCheck = false;

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

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubefirst"; pname = "kubefirst";
version = "2.3.6"; version = "2.3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubefirst"; owner = "kubefirst";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PFI7sBLcDIxes7fJnT1sgJbRITyoYptpupfOd6lisjs="; hash = "sha256-oJWQ5u85uQrHnf3VxY0vJwgGePxB4pg+LD0gofYIB1g=";
}; };
vendorHash = "sha256-blMKBgSBRCVlXu8n3wcd2iMkBTALe2gPxy0Z4uwxUWI="; vendorHash = "sha256-blMKBgSBRCVlXu8n3wcd2iMkBTALe2gPxy0Z4uwxUWI=";

4
pkgs/applications/networking/cluster/kubevpn/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kubevpn"; pname = "kubevpn";
version = "2.1.3"; version = "2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "KubeNetworks"; owner = "KubeNetworks";
repo = "kubevpn"; repo = "kubevpn";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-KHOqVVB1QjhhPUopeZd/A/htanmIoLCNhtnWrqyEN2A="; sha256 = "sha256-n65z7L82qQE4Xao5W99zIkXGEx2BFM4n/6C1cuTJXsk=";
}; };
vendorHash = null; vendorHash = null;

12
pkgs/applications/networking/cluster/vcluster/default.nix
View File

@ -1,14 +1,14 @@
{ lib, go, buildGoModule, fetchFromGitHub, installShellFiles }: { lib, go, buildGoModule, fetchFromGitHub, installShellFiles, testers, vcluster }:
buildGoModule rec { buildGoModule rec {
pname = "vcluster"; pname = "vcluster";
version = "0.17.0"; version = "0.18.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "loft-sh"; owner = "loft-sh";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-xmSp3cNqNv48gBWpt0Pnvl3l5gIyV1oPNGrB58X+OVU="; hash = "sha256-TJjMB7x8MOlr3GexsnOZBFPJovVkf4ByRn1aGprvZFQ=";
}; };
vendorHash = null; vendorHash = null;
@ -36,9 +36,15 @@ buildGoModule rec {
postInstall = '' postInstall = ''
installShellCompletion --cmd vcluster \ installShellCompletion --cmd vcluster \
--bash <($out/bin/vcluster completion bash) \ --bash <($out/bin/vcluster completion bash) \
--fish <($out/bin/vcluster completion fish) \
--zsh <($out/bin/vcluster completion zsh) --zsh <($out/bin/vcluster completion zsh)
''; '';
passthru.tests.version = testers.testVersion {
package = vcluster;
command = "vcluster --version";
};
meta = with lib; { meta = with lib; {
description = "Create fully functional virtual Kubernetes clusters"; description = "Create fully functional virtual Kubernetes clusters";
downloadPage = "https://github.com/loft-sh/vcluster"; downloadPage = "https://github.com/loft-sh/vcluster";

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

@ -2,7 +2,7 @@
let let
versions = versions =
if stdenv.isLinux then { if stdenv.isLinux then {
stable = "0.0.38"; stable = "0.0.39";
ptb = "0.0.61"; ptb = "0.0.61";
canary = "0.0.224"; canary = "0.0.224";
development = "0.0.1"; development = "0.0.1";
@ -17,7 +17,7 @@ let
x86_64-linux = { x86_64-linux = {
stable = fetchurl { stable = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
hash = "sha256-0i3xtArA/5LDyGiNQ/FjV3tU7Jzs8E6ZRuSUFNEJyDo="; hash = "sha256-KZLKBzd9hdOQkp7mN0rUZ8TbMvH2G0/AfwHPLAlDpug=";
}; };
ptb = fetchurl { ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";

86
pkgs/applications/networking/instant-messengers/jami/default.nix
View File

@ -2,7 +2,6 @@
, lib , lib
, pkg-config , pkg-config
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, gitUpdater , gitUpdater
, ffmpeg_6 , ffmpeg_6
@ -66,14 +65,14 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "jami"; pname = "jami";
version = "20230619.1"; version = "20231201.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "git.jami.net"; domain = "git.jami.net";
owner = "savoirfairelinux"; owner = "savoirfairelinux";
repo = "jami-client-qt"; repo = "jami-client-qt";
rev = "stable/${version}"; rev = "stable/${version}";
hash = "sha256-gOl4GtGmEvhM8xtlyFvTwXrUsbocUKULnVy9cnCNAM0="; hash = "sha256-A38JwjqdQVy03d738p2tpTFA6EWRSPNiesS5wZfti7Y=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -82,24 +81,16 @@ stdenv.mkDerivation rec {
patch-src = src + "/daemon/contrib/src/pjproject/"; patch-src = src + "/daemon/contrib/src/pjproject/";
in in
rec { rec {
version = "e4b83585a0bdf1523e808a4fc1946ec82ac733d0"; version = "311bd018fc07aaf62d4c2d2494e08b5ee97e6846";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "savoirfairelinux"; owner = "savoirfairelinux";
repo = "pjproject"; repo = "pjproject";
rev = version; rev = version;
hash = "sha256-QeD2o6uz9r5vc3Scs1oRKYZ+aNH+01TSxLBj71ssfj4="; hash = "sha256-pZiOSOUxAXzMY4c1/AyKcwa7nyIJC/ZVOqDg9/QO/Nk=";
}; };
patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches)) ++ [ patches = (map (x: patch-src + x) (readLinesToList ./config/pjsip_patches));
(fetchpatch {
name = "CVE-2023-27585.patch";
url = "https://github.com/pjsip/pjproject/commit/d1c5e4da5bae7f220bc30719888bb389c905c0c5.patch";
hash = "sha256-+yyKKTKG2FnfyLWnc4S80vYtDzmiu9yRmuqb5eIulPg=";
})
];
patchFlags = [ "-p1" "-l" ];
configureFlags = (readLinesToList ./config/pjsip_args_common) configureFlags = (readLinesToList ./config/pjsip_args_common)
++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux); ++ lib.optionals stdenv.isLinux (readLinesToList ./config/pjsip_args_linux);
@ -110,6 +101,52 @@ stdenv.mkDerivation rec {
enablePushNotifications = true; enablePushNotifications = true;
}; };
dhtnet = stdenv.mkDerivation {
pname = "dhtnet";
version = "unstable-2023-11-23";
src = fetchFromGitLab {
domain = "git.jami.net";
owner = "savoirfairelinux";
repo = "dhtnet";
rev = "b1bcdecbac2a41de3941ef5a34faa6fbe4472535";
hash = "sha256-EucSsUuHXbVqr7drrTLK0f+WZT2k9Tx/LV+IBldTQO8=";
};
nativeBuildInputs = [
cmake
pkg-config
];
buildInputs = [
asio
fmt
gnutls
http-parser
jsoncpp
libupnp
msgpack
opendht-jami
openssl
pjsip-jami
restinio
];
cmakeFlags = [
"-DBUILD_SHARED_LIBS=Off"
"-DBUILD_BENCHMARKS=Off"
"-DBUILD_TOOLS=Off"
"-DBUILD_TESTING=Off"
];
meta = with lib; {
description = "Lightweight Peer-to-Peer Communication Library";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = [ maintainers.linsui ];
};
};
daemon = stdenv.mkDerivation { daemon = stdenv.mkDerivation {
pname = "jami-daemon"; pname = "jami-daemon";
inherit src version meta; inherit src version meta;
@ -125,6 +162,7 @@ stdenv.mkDerivation rec {
alsa-lib alsa-lib
asio asio
dbus dbus
dhtnet
sdbus-cpp sdbus-cpp
fmt fmt
ffmpeg_6 ffmpeg_6
@ -154,13 +192,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
}; };
postPatch = ''
substituteInPlace src/app/commoncomponents/ModalTextEdit.qml \
--replace 'required property string placeholderText' 'property string placeholderText: ""'
'';
preConfigure = '' preConfigure = ''
echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h echo 'const char VERSION_STRING[] = "${version}";' > src/app/version.h
# Currently the daemon is still built seperately but jami expects it in CMAKE_INSTALL_PREFIX
# This can be removed in future versions when JAMICORE_AS_SUBDIR is on
mkdir -p $out
ln -s ${daemon} $out/daemon
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -172,7 +209,6 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
daemon
ffmpeg_6 ffmpeg_6
libnotify libnotify
networkmanager networkmanager
@ -189,10 +225,7 @@ stdenv.mkDerivation rec {
qtwebengine qtwebengine
]; ];
cmakeFlags = [ cmakeFlags = lib.optionals (!withWebengine) [
"-DLIBJAMI_INCLUDE_DIR=${daemon}/include/jami"
"-DLIBJAMI_XML_INTERFACES_DIR=${daemon}/share/dbus-1/interfaces"
] ++ lib.optionals (!withWebengine) [
"-DWITH_WEBENGINE=false" "-DWITH_WEBENGINE=false"
]; ];
@ -201,11 +234,6 @@ stdenv.mkDerivation rec {
"--set-default QT_QPA_PLATFORM xcb" "--set-default QT_QPA_PLATFORM xcb"
]; ];
postInstall = ''
# Make the jamid d-bus services available
ln -s ${daemon}/share/dbus-1 $out/share
'';
passthru.updateScript = gitUpdater { passthru.updateScript = gitUpdater {
rev-prefix = "stable/"; rev-prefix = "stable/";
}; };

6
pkgs/applications/networking/netmaker/default.nix
View File

@ -10,16 +10,16 @@
buildGoModule rec { buildGoModule rec {
pname = "netmaker"; pname = "netmaker";
version = "0.21.1"; version = "0.21.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gravitl"; owner = "gravitl";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-LfvO95jqzJzB44JxzB00GubTKJkvK/NR42eGYipirbM="; hash = "sha256-0KyBRIMXGqg4MdTyN3Kw1rVbZ7ULlfW6M9DSfAUQF8A=";
}; };
vendorHash = "sha256-BRgzPH7uiUHcouEw0KNpM5k0/kZMImvI9MFn4ahXIRM="; vendorHash = "sha256-B9r+p9kL/8h5qGmJ2WChnU3qKFf9z76YFqn6M2dXsDg=";
inherit subPackages; inherit subPackages;

57
pkgs/applications/networking/remote/anydesk/default.nix
View File

@ -1,44 +1,22 @@
{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript
, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip
, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils , lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils, copyDesktopItems
, pulseaudio }: , pulseaudio }:
let let
description = "Desktop sharing application, providing remote support and online meetings"; description = "Desktop sharing application, providing remote support and online meetings";
desktopItem = makeDesktopItem {
name = "AnyDesk";
exec = "@out@/bin/anydesk %u";
icon = "anydesk";
desktopName = "AnyDesk";
genericName = description;
categories = [ "Network" ];
startupNotify = false;
};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "anydesk"; pname = "anydesk";
version = "6.3.0"; version = "6.3.0";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
"https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz"
]; ];
hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI=";
}; };
passthru = {
updateScript = genericUpdater {
versionLister = writeShellScript "anydesk-versionLister" ''
curl -s https://anydesk.com/en/downloads/linux \
| grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
| uniq \
| sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g'
'';
};
};
buildInputs = [ buildInputs = [
atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
gnome2.gtkglext libGLU libGL minizip freetype gnome2.gtkglext libGLU libGL minizip freetype
@ -48,7 +26,19 @@ in stdenv.mkDerivation rec {
libXrandr libXtst libXt libICE libSM libXrender libXrandr libXtst libXt libICE libSM libXrender
]); ]);
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ copyDesktopItems makeWrapper ];
desktopItems = [
(makeDesktopItem {
name = "AnyDesk";
exec = "${placeholder "out"}/bin/anydesk %u";
icon = "anydesk";
desktopName = "AnyDesk";
genericName = description;
categories = [ "Network" ];
startupNotify = false;
})
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -57,7 +47,6 @@ in stdenv.mkDerivation rec {
install -m755 anydesk $out/bin/anydesk install -m755 anydesk $out/bin/anydesk
cp copyright README $out/share/doc/anydesk cp copyright README $out/share/doc/anydesk
cp -r icons/hicolor/* $out/share/icons/hicolor/ cp -r icons/hicolor/* $out/share/icons/hicolor/
cp ${desktopItem}/share/applications/*.desktop $out/share/applications
runHook postInstall runHook postInstall
''; '';
@ -75,11 +64,19 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/anydesk \ wrapProgram $out/bin/anydesk \
--prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]} --prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]}
substituteInPlace $out/share/applications/*.desktop \
--subst-var out
''; '';
passthru = {
updateScript = genericUpdater {
versionLister = writeShellScript "anydesk-versionLister" ''
curl -s https://anydesk.com/en/downloads/linux \
| grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \
| uniq \
| sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g'
'';
};
};
meta = with lib; { meta = with lib; {
inherit description; inherit description;
homepage = "https://www.anydesk.com"; homepage = "https://www.anydesk.com";

4
pkgs/applications/radio/freedv/default.nix
View File

@ -25,13 +25,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "freedv"; pname = "freedv";
version = "1.9.5"; version = "1.9.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "drowe67"; owner = "drowe67";
repo = "freedv-gui"; repo = "freedv-gui";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-uCWdDmHzNx1vkZFttQZLD4YfXoXz5VZQfir9sGOoDhw="; hash = "sha256-2TqlBlbMhBqe8WqoyYLJ9B82sAy3MdoaYvvk+XB5CdQ=";
}; };
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''

6
pkgs/applications/version-management/git-mit/default.nix
View File

@ -10,7 +10,7 @@
}: }:
let let
version = "5.12.180"; version = "5.12.181";
in in
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "git-mit"; pname = "git-mit";
@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
owner = "PurpleBooth"; owner = "PurpleBooth";
repo = "git-mit"; repo = "git-mit";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-12ZMyKIar5ck4jr7PCmyrnGWd6iv9cCwvTGSLbOCl4o="; hash = "sha256-XXVLYKicFcYNx33eElqlZcDNZgq4FnbwvYSshZwwHls=";
}; };
cargoHash = "sha256-n2wsOJrQvMKI1mNYGxntz8hZt5adL3obSdIo4DqF1Fs="; cargoHash = "sha256-PskRV+LfHjHK0WTwb9Lt2E2R9g+lyyEY7A1vvFLhPdw=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/video/droidcam/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "droidcam"; pname = "droidcam";
version = "2.1.1"; version = "2.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aramg"; owner = "aramg";
repo = "droidcam"; repo = "droidcam";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-NdVnls1DvcaI/bVrc5gN96+KQZDgt0M8zkNn93QJYG0="; sha256 = "sha256-NZ6sKLE/Sq4VBJSf7iG0CgdVwmU8JXQH/utbobBEFi0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/applications/virtualization/cntr/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cntr"; pname = "cntr";
version = "1.5.1"; version = "1.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Mic92"; owner = "Mic92";
repo = "cntr"; repo = "cntr";
rev = version; rev = version;
sha256 = "sha256-z+0bSxoLJTK4e5xS4CHZ2hNUI56Ci1gbWJsRcN6ZqZA="; sha256 = "sha256-eDozoYN2iOFUY/w7Gjki4nnASyZo4V/YGPjdX2xjNGY=";
}; };
cargoSha256 = "sha256-3e5wDne6Idu+kDinHPcAKHfH/d4DrGg90GkiMbyF280="; cargoHash = "sha256-UZrVZBdaiIrMajePKWXDZI+Z+nXTGadNKmoa3gdfzp4=";
passthru.tests = nixosTests.cntr; passthru.tests = nixosTests.cntr;

9
pkgs/applications/virtualization/qemu/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages { lib, stdenv, fetchurl, fetchpatch, python3Packages, zlib, pkg-config, glib, buildPackages
, pixman, vde2, alsa-lib, texinfo, flex , pixman, vde2, alsa-lib, texinfo, flex
, bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, ninja, meson, sigtool , bison, lzo, snappy, libaio, libtasn1, gnutls, nettle, curl, dtc, ninja, meson
, sigtool
, makeWrapper, removeReferencesTo , makeWrapper, removeReferencesTo
, attr, libcap, libcap_ng, socat, libslirp , attr, libcap, libcap_ng, socat, libslirp
, CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet , CoreServices, Cocoa, Hypervisor, rez, setfile, vmnet
@ -53,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString hostCpuOnly "-host-cpu-only"
+ lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString nixosTestRunner "-for-vm-tests"
+ lib.optionalString toolsOnly "-utils"; + lib.optionalString toolsOnly "-utils";
version = "8.1.3"; version = "8.2.0";
src = fetchurl { src = fetchurl {
url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
hash = "sha256-Q8wXaAQQVYb3T5A5jzTp+FeH3/QA07ZA2B93efviZbs="; hash = "sha256-vwDS+hIBDfiwrekzcd71jmMssypr/cX1oP+Oah+xvzI=";
}; };
depsBuildBuild = [ buildPackages.stdenv.cc ] depsBuildBuild = [ buildPackages.stdenv.cc ]
@ -65,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper removeReferencesTo makeWrapper removeReferencesTo
pkg-config flex bison meson ninja pkg-config flex bison dtc meson ninja
# Don't change this to python3 and python3.pkgs.*, breaks cross-compilation # Don't change this to python3 and python3.pkgs.*, breaks cross-compilation
python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme python3Packages.python python3Packages.sphinx python3Packages.sphinx-rtd-theme

4
pkgs/applications/window-managers/cagebreak/default.nix
View File

@ -25,13 +25,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cagebreak"; pname = "cagebreak";
version = "2.2.1"; version = "2.2.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "project-repo"; owner = "project-repo";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-cJEJ8V9lDbNb07eY3nWmNcT7ULGlcmOeyb9UDOLGWfI="; hash = "sha256-ppNzc6ojxF9FkgsqSWBSbtmI9aRc+RGN1R1RQLwCtv0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
View File

@ -23,13 +23,13 @@
}: }:
stdenv.mkDerivation (self: { stdenv.mkDerivation (self: {
pname = "xdg-desktop-portal-hyprland"; pname = "xdg-desktop-portal-hyprland";
version = "1.2.5"; version = "1.2.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hyprwm"; owner = "hyprwm";
repo = "xdg-desktop-portal-hyprland"; repo = "xdg-desktop-portal-hyprland";
rev = "v${self.version}"; rev = "v${self.version}";
hash = "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE="; hash = "sha256-VRr5Xc4S/VPr/gU3fiOD3vSIL2+GJ+LUrmFTWTwnTz4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/by-name/ca/cargo-swift/package.nix
View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-swift"; pname = "cargo-swift";
version = "0.4.0"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "antoniusnaumann"; owner = "antoniusnaumann";
repo = "cargo-swift"; repo = "cargo-swift";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dW0/h7uS0BEstiochACIySSKXsz+E6Tj5MaLtdin7gw="; hash = "sha256-v7ZZ3tMM8KmRk6y3uSw8ZBEcByQ95XQv3XPTUtDGUQ0=";
}; };
cargoHash = "sha256-LsjDeKfAvgVYM4qYyWq9MoXB4jIh870urrFHpiGCGPc="; cargoHash = "sha256-K3xZytJJ9/CaHWHL1fX0vKYpzH9yz3xOs2J5PoZWWv0=";
meta = with lib; { meta = with lib; {
description = "A cargo plugin to easily build Swift packages from Rust code"; description = "A cargo plugin to easily build Swift packages from Rust code";

6
pkgs/by-name/ek/eksctl/package.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "eksctl"; pname = "eksctl";
version = "0.165.0"; version = "0.167.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "weaveworks"; owner = "weaveworks";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-Gx8HobnE7qAfX79ZSLaN8fki+TQYz6XLyxnoSpvFOyk="; hash = "sha256-8CxXfjYN9i2AxuKeYmmYN0TQROGkurfmzbqU+aOMbTY=";
}; };
vendorHash = "sha256-niULedV/9r3PFI69AenGfk3oCTvKE/h6edjW5sgHg3Q="; vendorHash = "sha256-cuLzn0OZ5VC+RWGsJ8DCdJN8wm0DrsjH55K/cnyuqB8=";
doCheck = false; doCheck = false;

1
pkgs/tools/networking/pacproxy/default.nix → pkgs/by-name/pa/pacproxy/package.nix
View File

@ -22,5 +22,6 @@ buildGoModule rec {
changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}"; changelog = "https://github.com/williambailey/pacproxy/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ terlar ]; maintainers = with maintainers; [ terlar ];
mainProgram = "pacproxy";
}; };
} }

4
pkgs/data/fonts/spleen/default.nix
View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "spleen"; pname = "spleen";
version = "2.0.1"; version = "2.0.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
hash = "sha256-N9kJrWaQN9eeNoOVJu9UN2+jcEbHqRWxV+X0DXNJLuA="; hash = "sha256-+TDrAolKoG61CuqqELAEICVNcjIPoow6QPFXqMKUN1U=";
}; };
nativeBuildInputs = [ xorg.mkfontscale ]; nativeBuildInputs = [ xorg.mkfontscale ];

4
pkgs/development/compilers/kotlin/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kotlin"; pname = "kotlin";
version = "1.9.20"; version = "1.9.22";
src = fetchurl { src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "sha256-Faiiglt0zPbETgTpdnLbgC0t91zi+7Y+8FOb865QBvA="; sha256 = "1rn3rabwyqqhs6xgyfwl326hrzpfpc3qqd2nzwbchck5a09r5cw8";
}; };
propagatedBuildInputs = [ jre ] ; propagatedBuildInputs = [ jre ] ;

8
pkgs/development/compilers/kotlin/native.nix
View File

@ -7,7 +7,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kotlin-native"; pname = "kotlin-native";
version = "1.9.20"; version = "1.9.22";
src = let src = let
getArch = { getArch = {
@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
"https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz";
getHash = arch: { getHash = arch: {
"macos-aarch64" = "sha256-Yw6IO8pj0C9XHfzVshcovkoFBUXJ3KixhGoybBRFL2U="; "macos-aarch64" = "1pf81rplikbp194pjrm2la101iz8vz3jv55109nipd26xghc15ca";
"macos-x86_64" = "sha256-mnDi8dMCDzGsdPdD1dw4YMBxAfo5FvwDJVU/ew70z9U="; "macos-x86_64" = "1r7dmk8cc7f3iwaxamlnlcjl4mbvx443nwvsp8141a21ibrvrmx9";
"linux-x86_64" = "sha256-faMuBYUG5qj0N4vg5EcfWIC3UjXiPhFJuikzXVgNsjw="; "linux-x86_64" = "1m77qld44gbarjxm99gsdscncx4v0cf6ca3h9bdh2m7d3i4adc62";
}.${arch}; }.${arch};
in in
fetchurl { fetchurl {

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

@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "freetds"; pname = "freetds";
version = "1.4.8"; version = "1.4.10";
src = fetchurl { src = fetchurl {
url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
hash = "sha256-KzXaLxxmxUrE9uQD2zpKuYOhLpi4a7xMgiZxaf+Tq2k="; hash = "sha256-x+ryJr3LHNwbIhaWUyzNJfTk53VCZaKXd6NAAIS95pg=";
}; };
buildInputs = [ buildInputs = [

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

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "httplib"; pname = "httplib";
version = "0.14.2"; version = "0.14.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yhirose"; owner = "yhirose";
repo = "cpp-httplib"; repo = "cpp-httplib";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-JfxeXHo34MKtAkMO3pNWiPorh3f8s4SVrdAaydVYdrY="; hash = "sha256-53EBZTpz0INtjVSmjvg7XOQf0Bs2ADVe2//+nK6xRyE=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

6
pkgs/development/libraries/opendht/default.nix
View File

@ -21,13 +21,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opendht"; pname = "opendht";
version = "2.5.5"; version = "3.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "savoirfairelinux"; owner = "savoirfairelinux";
repo = "opendht"; repo = "opendht";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-OXLVuyPFlo7VD8f9wAN71p4PZpfM2ISq9UoUiAYEXUQ="; hash = "sha256-KtsQ25uStmlf7RZLAcabhPMyGbxKxvpR6Vm632+EBvw=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
asio asio
fmt
nettle nettle
gnutls gnutls
msgpack msgpack
@ -47,7 +48,6 @@ stdenv.mkDerivation rec {
restinio restinio
http-parser http-parser
openssl openssl
fmt
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Security Security
]; ];

4
pkgs/development/libraries/science/math/blas/default.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "blas"; pname = "blas";
version = "3.11.0"; version = "3.12.0";
src = fetchurl { src = fetchurl {
url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
sha256 = "sha256-LZ/e59NhlU/uUyEApQ5gKCbJzBFT+M0Fe6pl7VfpAoM="; sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0=";
}; };
passthru = { inherit blas64; }; passthru = { inherit blas64; };

24
pkgs/development/lua-modules/generated-packages.nix
View File

@ -645,6 +645,30 @@ buildLuarocksPackage {
}; };
}) {}; }) {};
image-nvim = callPackage(
{ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, magick }:
buildLuarocksPackage {
pname = "image.nvim";
version = "1.2.0-1";
knownRockspec = (fetchurl {
url = "mirror://luarocks/image.nvim-1.2.0-1.rockspec";
sha256 = "0732fk2p2v9f72689jms4pdjsx9m7vdi1ib65jfz7q4lv9pdx508";
}).outPath;
src = fetchzip {
url = "https://github.com/3rd/image.nvim/archive/v1.2.0.zip";
sha256 = "1v4db60yykjajabmf12zjcg47bb814scjrig0wvn4yc11isinymg";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua magick ];
meta = {
homepage = "https://github.com/3rd/image.nvim";
description = "🖼️ Bringing images to Neovim.";
license.fullName = "MIT";
};
}) {};
inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }:
buildLuarocksPackage { buildLuarocksPackage {
pname = "inspect"; pname = "inspect";

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

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiopurpleair"; pname = "aiopurpleair";
version = "2023.10.0"; version = "2023.12.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bachya"; owner = "bachya";
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-SNgdz3pnPyEH9qIi+aTBbEG6YBIXpwPYZuNJ4dEPLW8="; hash = "sha256-2Ngo2pvzwcgQvpyW5Q97VQN/tGSVhVJwRj0DMaPn+O4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

2
pkgs/development/python-modules/gst-python/default.nix
View File

@ -21,7 +21,7 @@ buildPythonPackage rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz";
hash = "sha256-1cuPFEBUoqEQ5mcr1RLksV1bG42YecGSuXI1Ne+3C48="; hash = "sha256-1cuPFEBUoqEQ5mcr1RLksV1bG42YecGSuXI1Ne+3C48=";
}; };

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

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jaraco-logging"; pname = "jaraco-logging";
version = "3.2.0"; version = "3.3.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "jaraco.logging"; pname = "jaraco.logging";
inherit version; inherit version;
hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c="; hash = "sha256-9KfPusuGqDTCiGwBo7UrxM3icowdlxfEnU3OHWJI8Hs=";
}; };
pythonNamespaces = [ pythonNamespaces = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mysqlclient"; pname = "mysqlclient";
version = "2.2.0"; version = "2.2.1";
format = "setuptools"; format = "setuptools";
nativeBuildInputs = [ nativeBuildInputs = [
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-BDaERfnEh9irt6h449I+kj5gcsBKbDIPng3IqC77oU4="; hash = "sha256-LHrRW4cpOxL9RLR8RoeeyV7GR/RWfoZszXC4M3WE6bI=";
}; };
meta = with lib; { meta = with lib; {

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

@ -8,14 +8,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pglast"; pname = "pglast";
version = "5.6"; version = "5.7";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-WHFc8rXzdcRrp1U6tAuepQYagFYo8+0WQr8783w/Ql8="; hash = "sha256-5JYygEthxFvjjbKpzw2CJNAvtrnCqdnR0sbJHhNRYFw=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -29,7 +29,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyatv"; pname = "pyatv";
version = "0.14.4"; version = "0.14.5";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "postlund"; owner = "postlund";
repo = "pyatv"; repo = "pyatv";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-w3WOlZFfuCmekUsr8msi2LXTm6j8/Bk49L3MiYF7lOM="; hash = "sha256-Uykj9MIUFcZyTWOBjUhL9+qItbnpwtuTd2Cx5jI7Wtw=";
}; };
postPatch = '' postPatch = ''

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

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyenphase"; pname = "pyenphase";
version = "1.15.1"; version = "1.15.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "pyenphase"; owner = "pyenphase";
repo = "pyenphase"; repo = "pyenphase";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-XhcCNp7iA7wTd5ldoCO9QC7o3kmL3jIlumjg8Y5mkVQ="; hash = "sha256-4vKfgpCo28btFCTbj7xge7bDImafbOWsabhdMJK5p3Q=";
}; };
postPatch = '' postPatch = ''

8
pkgs/development/python-modules/python-roborock/default.nix
View File

@ -19,8 +19,8 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "python-roborock"; pname = "python-roborock";
version = "0.36.2"; version = "0.38.0";
format = "pyproject"; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -28,12 +28,12 @@ buildPythonPackage rec {
owner = "humbertogontijo"; owner = "humbertogontijo";
repo = "python-roborock"; repo = "python-roborock";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-FyoYAXWdNANxZJ9EKyfRrywKPJmSyt8QRPBlrk9jRIw="; hash = "sha256-jYESUMhLb5oiM3PWIIIU4dn/waGUnCAaXe0URnIq0C8=";
}; };
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace "poetry-core==1.7.0" "poetry-core" --replace "poetry-core==1.7.1" "poetry-core"
''; '';
pythonRelaxDeps = [ pythonRelaxDeps = [

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

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvicare"; pname = "pyvicare";
version = "2.29.0"; version = "2.30.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "somm15"; owner = "somm15";
repo = "PyViCare"; repo = "PyViCare";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-FTvlRCPajRqKLCb5x1Gz/EGZIdMhXow4nP+WlWbjLko="; hash = "sha256-jcnA5qxS4eq1nZ0uo8NGPoSGTI/JrrH02MJPFxL3hQM=";
}; };
postPatch = '' postPatch = ''

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

@ -9,7 +9,7 @@
buildPythonPackage { buildPythonPackage {
pname = "remotezip"; pname = "remotezip";
version = "0.12.1"; version = "0.12.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -17,8 +17,8 @@ buildPythonPackage {
repo = "python-remotezip"; repo = "python-remotezip";
# upstream does not tag releases, determined with git blame # upstream does not tag releases, determined with git blame
# pypi archive lacks files for tests # pypi archive lacks files for tests
rev = "da62e115bdb2071ad08a8c91f7ae48f2c1827e0c"; rev = "3723724d6d877d3166d52f4528ffa7bd5bf6627f";
hash = "sha256-su4dlV8KZuewf/yGdTnGHK9hNLHwGe10ditmFcne4Us="; hash = "sha256-iYxHW8RdLFrpjkcEvpfF/NWBnw7Dd5cx2ghpof2XFn4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "stdlibs"; pname = "stdlibs";
version = "2023.11.2"; version = "2023.12.15";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "omnilib"; owner = "omnilib";
repo = "stdlibs"; repo = "stdlibs";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o="; hash = "sha256-1Av10FNJkCC2XGNx1LDqd0GwiNPIDPXPFatW8+2XoaI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -10,14 +10,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "trimesh"; pname = "trimesh";
version = "4.0.6"; version = "4.0.8";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-wbcNtIErAOS2IHKNa+EfSEmxZulQ2TarBdO8SmtefU0="; hash = "sha256-FvMFC1h3gu61jZPSPmxYHQmxnxYKmtYAecc/0IT9E8I=";
}; };
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];

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

@ -10,7 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "ttls"; pname = "ttls";
version = "1.8.1"; version = "1.8.2";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jschlyter"; owner = "jschlyter";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-7w+VFxqv1htN5rKvMbcBV6uYqT3PT0ocv3S9Om2Ol3k="; hash = "sha256-i9vJr7uTpkUZ9WiL0BGidIgCdG87k8JnmZuPqt6qLQE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -7,7 +7,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-awscrt"; pname = "types-awscrt";
version = "0.19.19"; version = "0.20.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "types_awscrt"; pname = "types_awscrt";
inherit version; inherit version;
hash = "sha256-hQ1a2V2PM3sV+xVHkPOa8Hf69cCNQ3WP11Dzeah9X3M="; hash = "sha256-mXeMlS4erhDMelNGhBMAEXcCbJQ0NFvwASC7LqW3kQk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -6,13 +6,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "types-s3transfer"; pname = "types-s3transfer";
version = "0.8.2"; version = "0.10.0";
pyproject = true; pyproject = true;
src = fetchPypi { src = fetchPypi {
pname = "types_s3transfer"; pname = "types_s3transfer";
inherit version; inherit version;
hash = "sha256-LkF1b8+Ud1qZSa+oVkiaxFcDCGCbBJPfvXtNMz60I+Y="; hash = "sha256-NeSZjCXff4mFrWne3I5IYOivO0O3YV6UDVPADUE73Gk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "usb-devices"; pname = "usb-devices";
version = "0.4.1"; version = "0.4.5";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices"; owner = "Bluetooth-Devices";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-9w7YCAEpdptQC0GCnJCEyhZgcHMDIw0alj7q4Y82hmA="; hash = "sha256-Nfdl5oRIdOfAo5PFAJJpadRyu2zeEkmYzxDQxbvpt6c=";
}; };
postPatch = '' postPatch = ''

13
pkgs/development/python-modules/whois/default.nix
View File

@ -1,14 +1,15 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, hatchling
, inetutils , inetutils
, pythonOlder , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "whois"; pname = "whois";
version = "0.9.27"; version = "0.99.3";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -16,15 +17,19 @@ buildPythonPackage rec {
owner = "DannyCork"; owner = "DannyCork";
repo = "python-whois"; repo = "python-whois";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-hs4iCv2OqwLhTj2H4oijRYIyqXrHmewqgnMtU+3Uup0="; hash = "sha256-uKAqpxb72fo0DiaChuJvDizq0z/oFSDHWJuK4vuYIzo=";
}; };
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [ propagatedBuildInputs = [
# whois is needed # whois is needed
inetutils inetutils
]; ];
# tests require network access # Tests require network access
doCheck = false; doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [

12
pkgs/development/python-modules/xhtml2pdf/default.nix
View File

@ -16,9 +16,9 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "xhtml2pdf"; pname = "xhtml2pdf";
version = "0.2.13"; version = "0.2.13";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
@ -42,8 +42,15 @@ buildPythonPackage rec {
pytestCheckHook pytestCheckHook
]; ];
disabledTests = [
# Tests requires network access
"test_document_cannot_identify_image"
"test_document_with_broken_image"
];
pythonImportsCheck = [ pythonImportsCheck = [
"xhtml2pdf" "xhtml2pdf"
"xhtml2pdf.pisa"
]; ];
meta = with lib; { meta = with lib; {
@ -52,5 +59,6 @@ buildPythonPackage rec {
changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}"; changelog = "https://github.com/xhtml2pdf/xhtml2pdf/releases/tag/v${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ ];
mainProgram = "xhtml2pdf";
}; };
} }

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "flow"; pname = "flow";
version = "0.224.0"; version = "0.225.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = "flow"; repo = "flow";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-HxJRsIjNXbalqfCBnx5yfWhxdgud1nCNlx1WPUJmALU="; hash = "sha256-tJWq2l5axnukjqJGZwrVF/UDcPdPGDyjol8fs0a777g=";
}; };
postPatch = '' postPatch = ''

6
pkgs/development/tools/bacon/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "bacon"; pname = "bacon";
version = "2.13.0"; version = "2.14.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Canop"; owner = "Canop";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-KFBb5poogtFnYePu9E5XBE0sKKev2Fuxaqj5ypscuqA="; hash = "sha256-fhAKTZk+51KYjEnVWNLwpUWx+Quj3tmvmIvULQTbGf8=";
}; };
cargoHash = "sha256-OA8068ISy2WoC34Q0ANrWX27ESErntCfZ5IrO8Lvm10="; cargoHash = "sha256-eBWmb6YaGZX31K3jKNKXgTGOOQm/WiSupckkpi49dWI=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
CoreServices CoreServices

26
pkgs/development/tools/dep/default.nix
View File

@ -1,26 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "dep";
version = "0.5.4";
rev = "v${version}";
goPackagePath = "github.com/golang/dep";
subPackages = [ "cmd/dep" ];
src = fetchFromGitHub {
inherit rev;
owner = "golang";
repo = "dep";
sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd";
};
ldflags = [ "-s" "-w" "-X main.commitHash=${rev}" "-X main.version=${version}" ];
meta = with lib; {
homepage = "https://github.com/golang/dep";
description = "Go dependency management tool";
license = licenses.bsd3;
maintainers = with maintainers; [ carlsverre rvolosatovs ];
};
}

6
pkgs/development/tools/devbox/default.nix
View File

@ -5,13 +5,13 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "devbox"; pname = "devbox";
version = "0.8.4"; version = "0.8.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jetpack-io"; owner = "jetpack-io";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-B+7c27xq+JNhP6s9mS5t7AURPV9/HFf5o1jtqyH4x2g="; hash = "sha256-Vgke4CTVU5KW7iDyzk6P1ab5nOyICblvJtUQTISc2jg=";
}; };
ldflags = [ ldflags = [
@ -23,7 +23,7 @@ buildGoModule rec {
# integration tests want file system access # integration tests want file system access
doCheck = false; doCheck = false;
vendorHash = "sha256-4HdBTOTQGMAez5gg1R7+M3EqrP0cv8iNjD7ayZD95aU="; vendorHash = "sha256-rP3vktCfmUeZhc0DaU2osVryNabsnaWWyfFYFy7W1pc=";
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

6
pkgs/development/tools/firebase-tools/default.nix
View File

@ -8,16 +8,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "firebase-tools"; pname = "firebase-tools";
version = "12.4.8"; version = "13.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "firebase"; owner = "firebase";
repo = "firebase-tools"; repo = "firebase-tools";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-uyw3M6EWRaiDLZg1MH1weiXih5hWh5Kz3HnB1xXISNA="; hash = "sha256-vR4WvnZjxdbebXWdVbM8vQTCo7pgRMcu9A2KygHZCMk=";
}; };
npmDepsHash = "sha256-AjUREpqQX9+7tjO68Q9WIWQ71l5O641Oc+3Pr2khP4s="; npmDepsHash = "sha256-h99Zj+yJJvLKc/B6AbKKQTOdrZCIT3BVlkxrOtOyNA4=";
postPatch = '' postPatch = ''
ln -s npm-shrinkwrap.json package-lock.json ln -s npm-shrinkwrap.json package-lock.json

22
pkgs/development/tools/govendor/default.nix
View File

@ -1,22 +0,0 @@
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "govendor";
version = "1.0.9";
goPackagePath = "github.com/kardianos/govendor";
src = fetchFromGitHub {
owner = "kardianos";
repo = "govendor";
rev = "v${version}";
sha256 = "0g02cd25chyijg0rzab4xr627pkvk5k33mscd6r0gf1v5xvadcfq";
};
meta = with lib; {
homepage = "https://github.com/kardianos/govendor";
description = "Go vendor tool that works with the standard vendor file";
license = licenses.bsd3;
maintainers = with maintainers; [ zimbatm ];
};
}

6
pkgs/development/tools/hcloud/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec { buildGoModule rec {
pname = "hcloud"; pname = "hcloud";
version = "1.41.0"; version = "1.41.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hetznercloud"; owner = "hetznercloud";
repo = "cli"; repo = "cli";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-NcEJgC3FtGgv0m7qisCB8vaHvD5Yw/UIHsOFBYiID4c="; hash = "sha256-ZC71++aC0fUkUG0h5aRxU0FpR1eNruFWAB1e2e5c/Vo=";
}; };
vendorHash = "sha256-qAgKotc+ypm0pHcbKCgpFmTY5W1b8Oq3XrrP6RVulig="; vendorHash = "sha256-T407Y4IZlJnrCGSWpuN1wv8Dng2F7++2cMfLGjYC2vM=";
ldflags = [ ldflags = [
"-s" "-s"

6
pkgs/development/tools/rust/cargo-workspaces/default.nix
View File

@ -12,14 +12,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-workspaces"; pname = "cargo-workspaces";
version = "0.2.44"; version = "0.3.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
hash = "sha256-5r5XRb/RWHv0Am58VPOxe+QSKn2QT4JZYp5LjTh20KM="; hash = "sha256-1wNoMVfouuPRGFGB6XIhgeeWgknxMctrBl5Vfco6qug=";
}; };
cargoHash = "sha256-p+7CWvspYk1LRO2s8Sstlven/2edNe+JYFQHaDFlGkM="; cargoHash = "sha256-OJGqIo6mYqXjmQb/2CVVTskecYZretw+K46Fvbu/PcQ=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

6
pkgs/development/web/flyctl/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "flyctl"; pname = "flyctl";
version = "0.1.134"; version = "0.1.135";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "superfly"; owner = "superfly";
repo = "flyctl"; repo = "flyctl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dkzoSu9Aug1PyYwjVEvoAXPHa4a5tTTd6CaUjs+x9+I="; hash = "sha256-eQqYfH/qNlUkqd82h8O7kSa/QTL+Y9vRKd3LDqCnnCI=";
}; };
vendorHash = "sha256-MUsZ/OXPoaHvLLabC0/MvvcYn1VcgDBjiq3kKhyvr6g="; vendorHash = "sha256-IM4xk+KAimBBR1Mq4ptfA9LbC1YZLErP1XtSEPeGi/c=";
subPackages = [ "." ]; subPackages = [ "." ];

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libtraceevent"; pname = "libtraceevent";
version = "1.7.3"; version = "1.8.0";
src = fetchzip { src = fetchzip {
url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-libtraceevent-${version}.tar.gz"; url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/snapshot/libtraceevent-libtraceevent-${version}.tar.gz";
hash = "sha256-poF+Cqcdj0KIgEJWW7XDAlRLz2/Egi948s1M24ETvBo="; hash = "sha256-l1x9tiHKhfdetlnn9S/EfpcHDzZqiTOrdFhHQtOC6Do=";
}; };
postPatch = '' postPatch = ''

1
pkgs/servers/gotify/default.nix
View File

@ -1,5 +1,4 @@
{ lib { lib
, buildGoPackage
, fetchFromGitHub , fetchFromGitHub
, buildGoModule , buildGoModule
, sqlite , sqlite

6
pkgs/servers/home-assistant/custom-lovelace-modules/mini-media-player/default.nix
View File

@ -5,16 +5,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "mini-media-player"; pname = "mini-media-player";
version = "1.16.6"; version = "1.16.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kalkih"; owner = "kalkih";
repo = "mini-media-player"; repo = "mini-media-player";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-1cC9dyZ9+7dXSL/dmFD0HV7SgsBW2zA7a+eOKVwbzg8="; hash = "sha256-mBxK/Y+gesaJwPYHB4P8FCkyfoV9lwC8jAzPZJV+B+M=";
}; };
npmDepsHash = "sha256-/7roW1xkZmGuB/8nFaQz0Yeuai6yJ+cH7Uqa/zxfa5w="; npmDepsHash = "sha256-kuEgX5PX7RKhaJPzx+GW37TiSISvz+51tKGacvAMlfg=";
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall

176
pkgs/servers/home-assistant/default.nix
View File

@ -3,6 +3,7 @@
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, fetchPypi , fetchPypi
, fetchpatch
, python311 , python311
, substituteAll , substituteAll
, ffmpeg-headless , ffmpeg-headless
@ -30,6 +31,16 @@ let
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
(self: super: { (self: super: {
aioairzone = super.aioairzone.overridePythonAttrs (oldAttrs: rec {
version = "0.6.9";
src = fetchFromGitHub {
owner = "Noltari";
repo = "aioairzone";
rev = "refs/tags/${version}";
hash = "sha256-0nbH0pnTYRuSOkzG5Yn/fJmRKtXBMd6ti6Z+AW72j3Q=";
};
});
aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec { aioesphomeapi = super.aioesphomeapi.overridePythonAttrs (oldAttrs: rec {
version = "19.2.1"; version = "19.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -40,16 +51,46 @@ let
}; };
}); });
# https://github.com/home-assistant/core/pull/101913 aiogithubapi = super.aiogithubapi.overridePythonAttrs (oldAttrs: rec {
aiohttp = super.aiohttp.overridePythonAttrs (old: rec { version = "22.10.1";
version = "3.9.1"; src = fetchFromGitHub {
src = fetchPypi { owner = "ludeeus";
inherit (old) pname; repo = "aiogithubapi";
inherit version; rev = "refs/tags/${version}";
hash = "sha256-j8Sah6wmnUUp2kWHHi/7aHTod3nD0OLM2BPAiZIhI50="; hash = "sha256-ceBuqaMqqL6qwN52765MG4sLt+08hx2G9rUVNC7x6ik=";
};
propagatedBuildInputs = with self; [
aiohttp
async-timeout
backoff
];
});
aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec {
version = "2023.05.5";
src = fetchFromGitHub {
owner = "bachya";
repo = "aionotion";
rev = "refs/tags/${version}";
hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o=";
};
patches = [
(fetchpatch {
# clean up build dependencies; https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83
url = "https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83.patch";
hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM=";
})
];
});
aiopvapi = super.aiopvapi.overridePythonAttrs (oldAttrs: rec {
version = "2.0.4";
src = fetchFromGitHub {
owner = "sander76";
repo = "aio-powerview-api";
rev = "refs/tags/v${version}";
hash = "sha256-cghfNi5T343/7GxNLDrE0iAewMlRMycQTP7SvDVpU2M=";
}; };
patches = [];
doCheck = false;
}); });
aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec {
@ -60,14 +101,19 @@ let
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-tWnxGLJT+CRFvkhxFamHxnLXBvoR8tfOvzH1o1i5JJg="; hash = "sha256-tWnxGLJT+CRFvkhxFamHxnLXBvoR8tfOvzH1o1i5JJg=";
}; };
postPatch = ''
substituteInPlace pyproject.toml --replace \
'"setuptools >= 35.0.2", "wheel >= 0.29.0", "poetry>=0.12"' \
'"poetry-core"'
'';
}); });
aioresponses = super.aioresponses.overridePythonAttrs (oldAttrs: rec { amberelectric = super.amberelectric.overridePythonAttrs (oldAttrs: rec {
pname = "aioresponses"; version = "1.0.4";
version = "0.7.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit (oldAttrs) pname;
hash = "sha256-95XZ29otYXdIQOfjL1Nm9FdS0a3Bt0yTYq/QFylsfuE="; inherit version;
hash = "sha256-5SWJnTxRm6mzP0RxrgA+jnV+Gp23WjqQA57wbT2V9Dk=";
}; };
}); });
@ -123,6 +169,7 @@ let
aenum aenum
aiohttp aiohttp
pydantic pydantic
requests
]; ];
doCheck = false; # requires asynctest, which does not work on python 3.11 doCheck = false; # requires asynctest, which does not work on python 3.11
}); });
@ -146,6 +193,16 @@ let
}; };
}); });
mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec {
version = "11.0.0";
src = fetchFromGitHub {
owner = "py-mine";
repo = "mcstatus";
rev = "refs/tags/v${version}";
hash = "sha256-1jPIsFEJ17kjtCBiX4IvSf2FxYw9DkH3MrrJ85N71tc=";
};
});
notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec { notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec {
version = "0.1.5"; version = "0.1.5";
format = "setuptools"; format = "setuptools";
@ -168,6 +225,32 @@ let
doCheck = false; # no tests doCheck = false; # no tests
}); });
openai = super.openai.overridePythonAttrs (oldAttrs: rec {
version = "0.28.1";
src = fetchFromGitHub {
owner = "openai";
repo = "openai-python";
rev = "refs/tags/v${version}";
hash = "sha256-liJyeGxnYIC/jUQKdeATHpVJb/12KGbeM94Y2YQphfY=";
};
nativeBuildInputs = with self; [
setuptools
];
propagatedBuildInputs = with self; [
aiohttp
requests
tqdm
];
disabledTestPaths = [
# Requires a real API key
"openai/tests/test_endpoints.py"
"openai/tests/asyncio/test_endpoints.py"
# openai: command not found
"openai/tests/test_file_cli.py"
"openai/tests/test_long_examples_validator.py"
];
});
# Pinned due to API changes in 1.3.0 # Pinned due to API changes in 1.3.0
ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec { ovoenergy = super.ovoenergy.overridePythonAttrs (oldAttrs: rec {
version = "1.2.0"; version = "1.2.0";
@ -189,15 +272,6 @@ let
}; };
}); });
psutil = super.psutil.overridePythonAttrs (oldAttrs: rec {
version = "5.9.6";
src = fetchPypi {
pname = "psutil";
inherit version;
hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo=";
};
});
py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec { py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec {
version = "2.1.4"; version = "2.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -228,6 +302,16 @@ let
}; };
}); });
pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec {
version = "7.6.0";
src = fetchFromGitHub {
owner = "jabesq";
repo = "pyatmo";
rev = "refs/tags/v${version}";
hash = "sha256-rAmSxayXljOJchiMtSOgnotzQmapK2n86HwNi9HJX68=";
};
});
pyaussiebb = super.pyaussiebb.overridePythonAttrs (oldAttrs: rec { pyaussiebb = super.pyaussiebb.overridePythonAttrs (oldAttrs: rec {
version = "0.0.18"; version = "0.0.18";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -250,6 +334,16 @@ let
}; };
}); });
pydrawise = super.pydrawise.overridePythonAttrs (oldAttrs: rec {
version = "2023.11.0";
src = fetchFromGitHub {
owner = "dknowles2";
repo = "pydrawise";
rev = "refs/tags/${version}";
hash = "sha256-gKOyTvdETGzKlpU67UKaHYTIvnAX9znHIynP3BiVbt4=";
};
});
pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec { pykaleidescape = super.pykaleidescape.overridePythonAttrs (oldAttrs: rec {
version = "1.0.1"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -259,6 +353,22 @@ let
}; };
}); });
pyprusalink = super.pyprusalink.overridePythonAttrs (oldAttrs: rec {
version = "1.1.0";
src = fetchFromGitHub {
owner = "home-assistant-libs";
repo = "pyprusalink";
rev = "refs/tags/${version}";
hash = "sha256-XRtbb7kceiqi8pioTWStRo0drCtQfy1t62jCMihlIec=";
};
patches = [
(fetchpatch {
url = "https://github.com/home-assistant-libs/pyprusalink/commit/bc3a2f4a00979e7daaf783cdc1f1862087e8d4df.patch";
hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
})
];
});
pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec { pysnooz = super.pysnooz.overridePythonAttrs (oldAttrs: rec {
version = "0.8.6"; version = "0.8.6";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -298,6 +408,26 @@ let
}; };
}); });
screenlogicpy = super.screenlogicpy.overridePythonAttrs (oldAttrs: rec {
version = "0.9.4";
src = fetchFromGitHub {
owner = "dieselrabbit";
repo = "screenlogicpy";
rev = "refs/tags/v${version}";
hash = "sha256-OdAhA+vzIrUnE8Xdv52x7ij0LJKyxawaSY4QORP1TUg=";
};
});
tesla-powerwall = super.tesla-powerwall.overridePythonAttrs (oldAttrs: rec {
version = "0.3.19";
src = fetchFromGitHub {
owner = "jrester";
repo = "tesla_powerwall";
rev = "refs/tags/v${version}";
hash = "sha256-ClrMgPAMBtDMfD6hCJIN1u4mp75QW+c3re28v3FreQg=";
};
});
versioningit = super.versioningit.overridePythonAttrs (oldAttrs: rec { versioningit = super.versioningit.overridePythonAttrs (oldAttrs: rec {
version = "2.2.0"; version = "2.2.0";
src = fetchPypi { src = fetchPypi {

8
pkgs/servers/home-automation/evcc/default.nix
View File

@ -16,20 +16,20 @@
buildGoModule rec { buildGoModule rec {
pname = "evcc"; pname = "evcc";
version = "0.122.1"; version = "0.123.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "evcc-io"; owner = "evcc-io";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-mD4D2DVai9KV7/RYFmcY7iOGVQGRpwg+rTfNsP8OpCY="; hash = "sha256-jqlGjDwi+QGh5gmYVoSlxQjyKvNrE9nmSfh1cOlwnoM=";
}; };
vendorHash = "sha256-B4gR9sXpGuVv3x6sktFSPlbhq5n5aD5d7ksz67X5nY8="; vendorHash = "sha256-rhGMN5v+JzNg1p2GptomDDtqS7M4EafROXXy185qtmU=";
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {
inherit src; inherit src;
hash = "sha256-KTMUZOW56vPGoJviKRJWM9UL28gXL0L3j4ZmUzSeavU="; hash = "sha256-a3AyqQ8GYP3g9KGbjtLHjHBrJGHg2sNjAQlMUa26pOY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

6
pkgs/servers/mqtt/nanomq/default.nix
View File

@ -42,13 +42,13 @@ let
in stdenv.mkDerivation (finalAttrs: { in stdenv.mkDerivation (finalAttrs: {
pname = "nanomq"; pname = "nanomq";
version = "0.18.2"; version = "0.20.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emqx"; owner = "emqx";
repo = "nanomq"; repo = "nanomq";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-XGJBBuRSL3InXUMGxOttdbt0zmI1APFlc4IvwC2up8g="; hash = "sha256-VCKlXQ7qvBab+wRDnJ6EUA5qaQ36gTFfuerN1GU6sW0=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -71,7 +71,7 @@ in stdenv.mkDerivation (finalAttrs: {
"-DNNG_ENABLE_TLS=ON" "-DNNG_ENABLE_TLS=ON"
]; ];
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-return-type -Wno-implicit-function-declaration -Wno-error=implicit-int";
# disabled by default - not 100% reliable and making nanomq depend on # disabled by default - not 100% reliable and making nanomq depend on
# mosquitto would annoy people # mosquitto would annoy people

1
pkgs/servers/nosql/influxdb2/cli.nix
View File

@ -1,5 +1,4 @@
{ buildGoModule { buildGoModule
, buildGoPackage
, fetchFromGitHub , fetchFromGitHub
, lib , lib
}: }:

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

@ -7,11 +7,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snappymail"; pname = "snappymail";
version = "2.29.4"; version = "2.31.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
sha256 = "sha256-dWWwBee7pfYMo8trX9KnqNaMw+CZe8svj/pjmZnl/qo="; sha256 = "sha256-5fDHXoa8ra+VDrViG7Xu9yQSAN/a3lL+rz0rVAmCD/0=";
}; };
sourceRoot = "snappymail"; sourceRoot = "snappymail";

49
pkgs/servers/sql/postgresql/ext/pg_repack.nix
View File

@ -1,24 +1,54 @@
{ lib, stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: { lib
, stdenv
, fetchFromGitHub
, openssl
, postgresql
, postgresqlTestHook
, readline
, testers
, zlib
}:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "pg_repack"; pname = "pg_repack";
version = "1.4.8"; version = "1.5.0";
buildInputs = [ postgresql openssl zlib readline ]; buildInputs = [ postgresql openssl zlib readline ];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "reorg"; owner = "reorg";
repo = "pg_repack"; repo = "pg_repack";
rev = "ver_${version}"; rev = "ver_${finalAttrs.version}";
sha256 = "sha256-Et8aMRzG7ez0uy9wG6qsg57/kPPZdUhb+/gFxW86D08="; sha256 = "sha256-do80phyMxwcRIkYyUt9z02z7byNQhK+pbSaCUmzG+4c=";
}; };
installPhase = '' installPhase = ''
install -D bin/pg_repack -t $out/bin/ install -D bin/pg_repack -t $out/bin/
install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/ install -D lib/pg_repack${postgresql.dlSuffix} -t $out/lib/
install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/postgresql/extension install -D lib/{pg_repack--${finalAttrs.version}.sql,pg_repack.control} -t $out/share/postgresql/extension
''; '';
passthru.tests = {
version = testers.testVersion {
package = finalAttrs.finalPackage;
};
extension = stdenv.mkDerivation {
name = "plpgsql-check-test";
dontUnpack = true;
doCheck = true;
buildInputs = [ postgresqlTestHook ];
nativeCheckInputs = [ (postgresql.withPackages (ps: [ ps.pg_repack ])) ];
postgresqlTestUserOptions = "LOGIN SUPERUSER";
failureHook = "postgresqlStop";
checkPhase = ''
runHook preCheck
psql -a -v ON_ERROR_STOP=1 -c "CREATE EXTENSION pg_repack;"
runHook postCheck
'';
installPhase = "touch $out";
};
};
meta = with lib; { meta = with lib; {
description = "Reorganize tables in PostgreSQL databases with minimal locks"; description = "Reorganize tables in PostgreSQL databases with minimal locks";
longDescription = '' longDescription = ''
@ -31,5 +61,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ danbst ]; maintainers = with maintainers; [ danbst ];
inherit (postgresql.meta) platforms; inherit (postgresql.meta) platforms;
mainProgram = "pg_repack";
}; };
} })

4
pkgs/servers/web-apps/freshrss/default.nix
View File

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "FreshRSS"; pname = "FreshRSS";
version = "1.22.1"; version = "1.23.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "FreshRSS"; owner = "FreshRSS";
repo = "FreshRSS"; repo = "FreshRSS";
rev = version; rev = version;
hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU="; hash = "sha256-X7MYPn1OFmzMWGGlZZ67EHEaRJRKGrdnw6nCzuUfbgU=";
}; };
passthru.tests = { passthru.tests = {

6
pkgs/tools/admin/aliyun-cli/default.nix
View File

@ -2,17 +2,17 @@
buildGoModule rec { buildGoModule rec {
pname = "aliyun-cli"; pname = "aliyun-cli";
version = "3.0.189"; version = "3.0.190";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "aliyun"; owner = "aliyun";
repo = pname; repo = pname;
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-XSFIf2/k6uRHTSpvSpFApU+RjS5WlYVFoVJiyOU7Lvg="; sha256 = "sha256-16mHIvrXtFHmH6Uc2qcBTSltuHDs5jfZ2+hHvUpOjOQ=";
}; };
vendorHash = "sha256-5Pmd1gQ0nS3h43YXGP4s8uZNQAH30o1s8y8r1nuh6b0="; vendorHash = "sha256-ZcW0Ab7uPx8XUpo3tSSt2eKjUlRlbiMvrLGJK2StKf8=";
subPackages = [ "main" ]; subPackages = [ "main" ];

6
pkgs/tools/admin/fits-cloudctl/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "fits-cloudctl"; pname = "fits-cloudctl";
version = "0.12.11"; version = "0.12.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fi-ts"; owner = "fi-ts";
repo = "cloudctl"; repo = "cloudctl";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-rp5iMp6Ah2JESpY8mdwez25D9GghoIMUqMNst72z2fM="; sha256 = "sha256-jNs1I6aVmyHbVghO30r6+gVg0vVLqHpddX1KVX1Xh+s=";
}; };
vendorHash = "sha256-3RowPOLtEDxXFcb2KizuVP3O0uTwkuUQ8UB2AFPaVVE="; vendorHash = "sha256-NR5Jw4zCYRg6xc9priCVNH+9wOVWx3bmstc3nkQDmv8=";
meta = with lib; { meta = with lib; {
description = "Command-line client for FI-TS Finance Cloud Native services"; description = "Command-line client for FI-TS Finance Cloud Native services";

4
pkgs/tools/admin/granted/default.nix
View File

@ -12,13 +12,13 @@
buildGoModule rec { buildGoModule rec {
pname = "granted"; pname = "granted";
version = "0.20.3"; version = "0.20.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "common-fate"; owner = "common-fate";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-U8j1IxeBcm9aEJ8LtIxNPdz5mqkSGQ6Ldn7F3HomvGE="; sha256 = "sha256-s1hPyvpk78MgEK+t5r9iFNHBXDnnNLNoAy0jUB9X8wU=";
}; };
vendorHash = "sha256-HRZKvs3q79Q94TYvdIx2NQU49MmS2PD1lRndcV0Ys/o="; vendorHash = "sha256-HRZKvs3q79Q94TYvdIx2NQU49MmS2PD1lRndcV0Ys/o=";

6
pkgs/tools/misc/dua/default.nix
View File

@ -7,13 +7,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "dua"; pname = "dua";
version = "2.23.0"; version = "2.24.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Byron"; owner = "Byron";
repo = "dua-cli"; repo = "dua-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dHtPz5TxNQyBHOuCYH1XRIeR63ghMP/moaULI++tg8Y="; hash = "sha256-CezZ0Nse1s1jSwPoaY5Gvpfg3ztM5e8OjvW+WsMMrDM=";
# Remove unicode file names which leads to different checksums on HFS+ # Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation. # vs. other filesystems because of unicode normalisation.
postFetch = '' postFetch = ''
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
''; '';
}; };
cargoHash = "sha256-10etmf0eQw9nD74dJMpQGAV4cK9FnTWKSrhBT3ZJblc="; cargoHash = "sha256-oDDQPN2bLHJFMmdKoB+0qbcVOMVnamF23Phzq7eLFJ4=";
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Foundation

4
pkgs/tools/misc/esphome/default.nix
View File

@ -16,14 +16,14 @@ let
in in
python.pkgs.buildPythonApplication rec { python.pkgs.buildPythonApplication rec {
pname = "esphome"; pname = "esphome";
version = "2023.11.6"; version = "2023.12.5";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-9LqZlhCt+7p6tnSHFhbnUzkEOJQDsg/Pd/hgd/Il0ZQ="; hash = "sha256-ajpYwquVyznIngZKcWxI9Pyiqf4VYcWtGFRZSpi6+3I=";
}; };
nativeBuildInputs = with python.pkgs; [ nativeBuildInputs = with python.pkgs; [

6
pkgs/tools/misc/hsd/default.nix
View File

@ -9,16 +9,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "hsd"; pname = "hsd";
version = "6.0.0"; version = "6.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "handshake-org"; owner = "handshake-org";
repo = "hsd"; repo = "hsd";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-4dWCCybhcdrkLFqUVTajRMnhzNgjpXUN2a+TNIi+Dqo="; hash = "sha256-T57kDEQwHIyW7xVXrzjJdUcocST9ks4x3JR8yytH8P4=";
}; };
npmDepsHash = "sha256-ZbBu9hnRsC9LrHozny3OlHhgcDbp6ACjXRV4UHneHQc="; npmDepsHash = "sha256-EBrCuRckBg42k6ZUoB25xObv3lULnSPNJ2nO9l/TWvA=";
nativeBuildInputs = [ nativeBuildInputs = [
python3 python3

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

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "frp"; pname = "frp";
version = "0.52.0"; version = "0.53.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fatedier"; owner = "fatedier";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8cpNKXEQI+3VaP1qwXTd5L9y0EKR2LfxrCU5i+K2ptY="; sha256 = "sha256-/z/pZgB4PepJXXjOBuuq1wHXI2pn/KCxY9cdfANdWGQ=";
}; };
vendorHash = "sha256-4+qzaSdku6qSqF0eT45sJ1zxw/zXYhxhNgq3WwrBIY0="; vendorHash = "sha256-mcgHbwdqcIu4BceuQg+Es0dsIpWG0bsIpd056IOxuiY=";
doCheck = false; doCheck = false;

6
pkgs/tools/networking/ligolo-ng/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "ligolo-ng"; pname = "ligolo-ng";
version = "0.4.4"; version = "0.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tnpitsecurity"; owner = "tnpitsecurity";
repo = "ligolo-ng"; repo = "ligolo-ng";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-bv611kvjyXvWVkWpymQn4NLtDAYuXnNi1c3yT3t3p+8="; hash = "sha256-T+SBGAE+hzHzrYLTm6t7NGh78B1/84TMiT1odGSPtKo=";
}; };
vendorHash = "sha256-MEG1p8PJinFOPIU9+9cxtU9FweCgVMYX8KojQ3ZhKKs="; vendorHash = "sha256-QEGF12yJ+CQjIHx6kOwsykVhelp5npnglk7mIbOeIpI=";
postConfigure = '' postConfigure = ''
export CGO_ENABLED=0 export CGO_ENABLED=0

2
pkgs/tools/networking/ofono/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchzip { src = fetchzip {
url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/snapshot/ofono-${version}.tar.gz"; url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/snapshot/ofono-${version}.tar.gz";
sha256 = "sha256-GxQfh/ps5oM9G6B1EVgnjo8LqHD1hMqdnju1PCQq3kA="; sha256 = "sha256-mnh0qzmgPDfimN/M33HntYj90Xcgc/uF8tKbzeQV1Yg=";
}; };
patches = [ patches = [

4
pkgs/tools/security/buttercup-desktop/default.nix
View File

@ -2,10 +2,10 @@
let let
pname = "buttercup-desktop"; pname = "buttercup-desktop";
version = "2.24.3"; version = "2.24.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage";
sha256 = "sha256-ZSKsxlxP2jNUxEeF2Lfuj2yW0KqHozjPoioq4t0uzfo="; sha256 = "sha256-c5MLj/1OSjGsySCENeJqEhubxl2y7uDhnOBAtLGy92I=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname src version; }; appimageContents = appimageTools.extractType2 { inherit pname src version; };

6
pkgs/tools/system/gtop/default.nix
View File

@ -5,16 +5,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "gtop"; pname = "gtop";
version = "1.1.3"; version = "1.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aksakalli"; owner = "aksakalli";
repo = "gtop"; repo = "gtop";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-7jcfJOdy3PKT6+07iaZnjWnlPLk9BhPn8LApk23E8l4="; hash = "sha256-FKbaUV28d0JH9tmTSJBFYQrM5iensnIpcXUFFvXDMe4=";
}; };
npmDepsHash = "sha256-CUfoVkG74C7HpcO3T9HmwbxHsYAgW1vYBAgNvx2av0k="; npmDepsHash = "sha256-QKMLFalaOQjhgVkv8lIDnKyH7+GOqOKIl3zoLwrHIF4=";
dontNpmBuild = true; dontNpmBuild = true;

4
pkgs/tools/video/bento4/default.nix
View File

@ -3,13 +3,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bento4"; pname = "bento4";
version = "1.6.0-640"; version = "1.6.0-641";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "axiomatic-systems"; owner = "axiomatic-systems";
repo = "Bento4"; repo = "Bento4";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-VhlFfNYw3xpAIyWqDyhgXIv3JtpFJH0BL97dFX8diRY="; hash = "sha256-Qy8D3cbCVHmLAaXtiF64rL2oRurXNCtd5Dsgt0W7WdY=";
}; };
patches = [ patches = [

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

@ -193,6 +193,7 @@ mapAliases ({
deltachat-electron = deltachat-desktop; # added 2021-07-18 deltachat-electron = deltachat-desktop; # added 2021-07-18
demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18 demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18
dep = throw "'dep' has been removed, because it is deprecated and archived in favor of Go modules"; # Added 2023-12-26
devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13
dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04
dnnl = oneDNN; # Added 2020-04-22 dnnl = oneDNN; # Added 2020-04-22
@ -343,6 +344,7 @@ mapAliases ({
google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18 google-chrome-dev = throw "'google-chrome-dev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'google-chrome' instead."; # Added 2023-10-18
google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10 google-gflags = throw "'google-gflags' has been renamed to/replaced by 'gflags'"; # Converted to throw 2023-09-10
go-thumbnailer = thud; # Added 2023-09-21 go-thumbnailer = thud; # Added 2023-09-21
govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26
gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10
graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26

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

@ -1090,8 +1090,6 @@ with pkgs;
packr = callPackage ../development/libraries/packr { }; packr = callPackage ../development/libraries/packr { };
pacproxy = callPackage ../tools/networking/pacproxy { };
pacup = callPackage ../tools/package-management/pacup { }; pacup = callPackage ../tools/package-management/pacup { };
patcher9x = callPackage ../development/tools/patcher9x { }; patcher9x = callPackage ../development/tools/patcher9x { };
@ -22446,7 +22444,7 @@ with pkgs;
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };
libao = callPackage ../development/libraries/libao { libao = callPackage ../development/libraries/libao {
usePulseAudio = config.pulseaudio or stdenv.isLinux; usePulseAudio = config.pulseaudio or lib.meta.availableOn stdenv.hostPlatform libpulseaudio;
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
}; };
@ -28423,8 +28421,6 @@ with pkgs;
delve = callPackage ../development/tools/delve { }; delve = callPackage ../development/tools/delve { };
dep = callPackage ../development/tools/dep { };
dep2nix = callPackage ../development/tools/dep2nix { }; dep2nix = callPackage ../development/tools/dep2nix { };
easyjson = callPackage ../development/tools/easyjson { }; easyjson = callPackage ../development/tools/easyjson { };
@ -28497,8 +28493,6 @@ with pkgs;
govers = callPackage ../development/tools/govers { }; govers = callPackage ../development/tools/govers { };
govendor = callPackage ../development/tools/govendor { };
goverview = callPackage ../tools/security/goverview { }; goverview = callPackage ../tools/security/goverview { };
go-tools = callPackage ../development/tools/go-tools { }; go-tools = callPackage ../development/tools/go-tools { };
@ -35489,6 +35483,8 @@ with pkgs;
}; };
}; };
orca-slicer = callPackage ../applications/misc/bambu-studio/orca-slicer.nix {};
snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { };
robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { };
@ -41978,7 +41974,6 @@ with pkgs;
btcdeb = callPackage ../applications/blockchains/btcdeb { }; btcdeb = callPackage ../applications/blockchains/btcdeb { };
jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami { jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
fmt = fmt_9;
# TODO: remove once `udev` is `systemdMinimal` everywhere. # TODO: remove once `udev` is `systemdMinimal` everywhere.
udev = systemdMinimal; udev = systemdMinimal;
jack = libjack2; jack = libjack2;
@ -42011,7 +42006,7 @@ with pkgs;
bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { }; bottom = darwin.apple_sdk_11_0.callPackage ../tools/system/bottom { };
cagebreak = callPackage ../applications/window-managers/cagebreak { cagebreak = callPackage ../applications/window-managers/cagebreak {
wlroots = wlroots_0_16; wlroots = wlroots_0_17;
}; };
psftools = callPackage ../os-specific/linux/psftools { }; psftools = callPackage ../os-specific/linux/psftools { };