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

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt 2023-01-08 16:34:30 +01:00
commit 4d65509504
109 changed files with 2814 additions and 2327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maintainers/maintainer-list.nix
View File

@ -4647,10 +4647,11 @@
};
felipeqq2 = {
name = "Felipe Silva";
email = "felipeqq2@outlook.com";
email = "nixpkgs@felipeqq2.rocks";
github = "felipeqq2";
githubId = 71830138;
keys = [{ fingerprint = "F5F0 2BCE 3580 BF2B 707A AA8C 2FD3 4A9E 2671 91B8"; }];
matrix = "@felipeqq2:pub.solar";
};
felixscheinost = {
name = "Felix Scheinost";

32
nixos/lib/make-options-doc/generateDoc.py
View File

@ -21,18 +21,22 @@ parser.add_argument(
args = parser.parse_args()
# Pretty-print certain Nix types, like literal expressions.
def render_types(obj):
if '_type' not in obj: return obj
class OptionsEncoder(json.JSONEncoder):
def encode(self, obj):
# Unpack literal expressions and other Nix types.
# Don't escape the strings: they were escaped when initially serialized to JSON.
if isinstance(obj, dict):
_type = obj.get('_type')
if _type is not None:
if _type == 'literalExpression' or _type == 'literalDocBook':
return obj['text']
_type = obj['_type']
if _type == 'literalExpression' or _type == 'literalDocBook':
return obj['text']
if _type == 'derivation':
return obj['name']
if _type == 'derivation':
return obj['name']
raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}')
raise Exception(f'Unexpected type `{_type}` in {json.dumps(obj)}')
return super().encode(obj)
def generate_commonmark(options):
for (name, value) in options.items():
@ -49,14 +53,14 @@ def generate_commonmark(options):
if 'default' in value:
print('*_Default_*')
print('```')
print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':')))
print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
print('```')
print()
print()
if 'example' in value:
print('*_Example_*')
print('```')
print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':')))
print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
print('```')
print()
print()
@ -76,7 +80,7 @@ def generate_asciidoc(options):
print('Default::')
print('+')
print('----')
print(json.dumps(value['default'], ensure_ascii=False, separators=(',', ':')))
print(json.dumps(value['default'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
print('----')
print()
else:
@ -89,7 +93,7 @@ def generate_asciidoc(options):
print('Example::')
print('+')
print('----')
print(json.dumps(value['example'], ensure_ascii=False, separators=(',', ':')))
print(json.dumps(value['example'], cls=OptionsEncoder, ensure_ascii=False, separators=(',', ':')))
print('----')
print()
else:
@ -97,7 +101,7 @@ def generate_asciidoc(options):
print()
with open(args.nix_options_path) as nix_options_json:
options = json.load(nix_options_json, object_hook=render_types)
options = json.load(nix_options_json)
if args.format == 'commonmark':
generate_commonmark(options)

7
nixos/modules/services/misc/n8n.nix
View File

@ -9,7 +9,6 @@ let
in
{
options.services.n8n = {
enable = mkEnableOption (lib.mdDoc "n8n server");
openFirewall = mkOption {
@ -22,7 +21,7 @@ in
type = format.type;
default = {};
description = lib.mdDoc ''
Configuration for n8n, see <https://docs.n8n.io/reference/configuration.html>
Configuration for n8n, see <https://docs.n8n.io/hosting/environment-variables/configuration-methods/>
for supported values.
'';
};
@ -45,6 +44,10 @@ in
N8N_USER_FOLDER = "/var/lib/n8n";
HOME = "/var/lib/n8n";
N8N_CONFIG_FILES = "${configFile}";
# Don't phone home
N8N_DIAGNOSTICS_ENABLED = "false";
N8N_VERSION_NOTIFICATIONS_ENABLED = "false";
};
serviceConfig = {
Type = "simple";

4
nixos/tests/n8n.nix
View File

@ -19,7 +19,7 @@ in
testScript = ''
machine.wait_for_unit("n8n.service")
machine.wait_for_open_port(${toString port})
machine.succeed("curl --fail http://localhost:${toString port}/")
machine.wait_for_console_text("Editor is now accessible via")
machine.succeed("curl --fail -vvv http://localhost:${toString port}/")
'';
})

26
pkgs/applications/audio/chuck/default.nix
View File

@ -1,35 +1,27 @@
{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which
, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel
{ stdenv, lib, fetchurl, alsa-lib, bison, flex, libsndfile, which, DarwinTools, xcbuild
, AppKit, Carbon, CoreAudio, CoreMIDI, CoreServices, Kernel, MultitouchSupport
}:
stdenv.mkDerivation rec {
version = "1.4.1.0";
version = "1.4.1.1";
pname = "chuck";
src = fetchurl {
url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
sha256 = "sha256-dL+ZrVFeMRPFW4MxUpNvrQKjzwBqVBBf8Rd3xHMZSSg=";
sha256 = "sha256-RFnubxUdpy3N4VJeCv4FMp1hCGNWsWjs/AvDpXApD2M=";
};
nativeBuildInputs = [ flex bison which ];
nativeBuildInputs = [ flex bison which ]
++ lib.optionals stdenv.isDarwin [ DarwinTools xcbuild ];
buildInputs = [ libsndfile ]
++ lib.optional (!stdenv.isDarwin) alsa-lib
++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel ];
++ lib.optionals stdenv.isDarwin [ AppKit Carbon CoreAudio CoreMIDI CoreServices Kernel MultitouchSupport ];
patches = [ ./darwin-limits.patch ];
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-missing-sysroot";
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework MultitouchSupport";
postPatch = ''
substituteInPlace src/core/makefile.x/makefile.osx \
--replace "weak_framework" "framework" \
--replace "MACOSX_DEPLOYMENT_TARGET=10.9" "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET"
'';
makeFlags = [ "-C src" "DESTDIR=$(out)/bin" ];
buildFlags = [ (if stdenv.isDarwin then "osx" else "linux-alsa") ];
buildFlags = [ (if stdenv.isDarwin then "mac" else "linux-alsa") ];
meta = with lib; {
description = "Programming language for real-time sound synthesis and music creation";
@ -37,7 +29,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ ftrvxmtrx ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

19
pkgs/applications/audio/csound/csound-qt/default.nix
View File

@ -1,28 +1,23 @@
{ lib, stdenv, csound, desktop-file-utils,
fetchFromGitHub, python, python-qt, qmake,
qtwebengine, qtxmlpatterns, rtmidi, fetchpatch }:
qtwebengine, qtxmlpatterns, rtmidi, wrapQtAppsHook }:
stdenv.mkDerivation rec {
pname = "csound-qt";
version = "0.9.6-beta3";
version = "1.1.1";
src = fetchFromGitHub {
owner = "CsoundQt";
repo = "CsoundQt";
rev = version;
sha256 = "007jhkh0k6qk52r77i067999dwdiimazix6ggp2hvyc4pj6n5dip";
rev = "v${version}";
hash = "sha256-PdylVOnunbB36dbZX/wzd9A8CJPDv/xH5HPLAUkRu28=";
};
patches = [
(fetchpatch {
name = "examplepath.patch";
url = "https://github.com/CsoundQt/CsoundQt/commit/09f2d515bff638cbcacb450979d66e273a59fdec.diff";
sha256 = "0y23kf8m1mh9mklsvf908b2b8m2w2rji8qvws44paf1kpwnwdmgm";
})
./rtmidipath.patch
];
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns ];
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns wrapQtAppsHook ];
buildInputs = [ csound desktop-file-utils rtmidi ];
@ -35,13 +30,11 @@ stdenv.mkDerivation rec {
"PYTHONQT_LIB_DIR=${python-qt}/lib"
"LIBS+=-L${python-qt}/lib"
"INCLUDEPATH+=${python-qt}/include/PythonQt"
"INCLUDEPATH+=${python}/include/python2.7"
"INCLUDEPATH+=${python}/include/python${python.pythonVersion}"
"INSTALL_DIR=${placeholder "out"}"
"SHARE_DIR=${placeholder "out"}/share"
];
dontWrapQtApps = true;
meta = with lib; {
description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features";
homepage = "https://csoundqt.github.io/";

10
pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/src.pri b/src/src.pri
index e5e0c896..9a9fa513 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -155,9 +155,9 @@ pythonqt {
diff --git a/src/src.pri b/src/src.pri
index e5e0c896..9a9fa513 100644
--- a/src/src.pri
+++ b/src/src.pri
@@ -155,9 +155,9 @@ pythonqt {
"src/pyqcsobject.cpp"
}
rtmidi {

4
pkgs/applications/audio/tageditor/default.nix
View File

@ -17,13 +17,13 @@
stdenv.mkDerivation rec {
pname = "tageditor";
version = "3.7.5";
version = "3.7.7";
src = fetchFromGitHub {
owner = "martchus";
repo = pname;
rev = "v${version}";
hash = "sha256-/0zzzOEkzNr1aIpPFdflFaM/0HTs3TlIRxau3Yt+Hog=";
hash = "sha256-CjbV/Uwpe+x7LBDUDY+NRonUt549MrjGnlJ2olIrKQ4=";
};
nativeBuildInputs = [

6
pkgs/applications/audio/termusic/default.nix
View File

@ -7,14 +7,14 @@
rustPlatform.buildRustPackage rec {
pname = "termusic";
version = "0.7.5";
version = "0.7.7";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-/wpaxXY0hT7XX44cW1f3JuowE5u46/aLMC2VXgty/jE=";
sha256 = "sha256-ynSNgiy8TUxRBDAi4rSPd5ztSLMaaFg1yEMTD1TI3V4=";
};
cargoHash = "sha256-TznzZ1dcun57IQ8e2T2FOxSdyqxS6etnuvxOY8n1y14=";
cargoHash = "sha256-jD+oJw9xGY9ItYvoIUMwn8HrM72+02wOTeXEJjkZAfk=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsa-lib ];

1
pkgs/applications/editors/vscode/generic.nix
View File

@ -162,6 +162,7 @@ let
icu
libunwind
libuuid
lttng-ust
openssl
zlib

7
pkgs/applications/emulators/retroarch/default.nix
View File

@ -33,12 +33,15 @@
, nvidia_cg_toolkit
, pkg-config
, python3
, qtbase
, retroarch-assets
, SDL2
, spirv-tools
, substituteAll
, udev
, vulkan-loader
, wayland
, wrapQtAppsHook
, zlib
}:
@ -71,7 +74,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkg-config ] ++
nativeBuildInputs = [ pkg-config wrapQtAppsHook ] ++
lib.optional withWayland wayland ++
lib.optional (runtimeLibs != [ ]) makeWrapper;
@ -84,7 +87,9 @@ stdenv.mkDerivation rec {
libxml2
mbedtls_2
python3
qtbase
SDL2
spirv-tools
zlib
] ++
lib.optional enableNvidiaCgToolkit nvidia_cg_toolkit ++

6
pkgs/applications/file-managers/llama/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "llama";
version = "1.2.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "antonmedv";
repo = "llama";
rev = "v${version}";
sha256 = "sha256-32UyFy269rifw4Hjw18FO0F79sDNW8dgJ2MdGXSzLWo=";
sha256 = "sha256-mJUxi2gqTMcodznCUDb2iB6j/p7bMUhhBLtZMbvfE1c=";
};
vendorSha256 = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ=";
vendorHash = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ=";
meta = with lib; {
description = "Terminal file manager";

51
pkgs/applications/graphics/vipsdisp/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ stdenv
, lib
, fetchFromGitHub
, meson
, ninja
, pkg-config
, wrapGAppsHook4
, vips
, gtk4
, python3
}:
stdenv.mkDerivation rec {
pname = "vipsdisp";
version = "2.4.1";
src = fetchFromGitHub {
owner = "jcupitt";
repo = "vipsdisp";
rev = "v${version}";
sha256 = "sha256-zftvjH5hyWBpjRe5uQBDAqbThQaQFHz0UhzM5q8hSk8=";
};
postPatch = ''
chmod +x ./meson_post_install.py
patchShebangs ./meson_post_install.py
'';
nativeBuildInputs = [
meson
ninja
pkg-config
wrapGAppsHook4
];
buildInputs = [
vips
gtk4
python3
];
# No tests implemented.
doCheck = false;
meta = with lib; {
homepage = "https://github.com/jcupitt/vipsdisp";
description = "Tiny image viewer with libvips";
license = licenses.mit;
maintainers = with maintainers; [ foo-dogsquared ];
};
}

10
pkgs/applications/misc/1password/default.nix
View File

@ -12,12 +12,12 @@ let
if extension == "zip" then fetchzip args else fetchurl args;
pname = "1password-cli";
version = "2.11.0";
version = "2.12.0";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-UCPF+tj1ELzLO4+UAYS/SS0i645oO55grbGGAhe7zBE=" "zip";
i686-linux = fetch "linux_386" "sha256-7vCCOKMSc2vrwSpAO5hYgdz/e6bveG0liG7fjbWge6c=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-mtD1caAc0PIFN8L+pw5tO0Tkg+JD99xBUvPwejVgVwU=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-5oZQEAnRPgE9GABoR0UCr6qjUwAdtFADoonJIeRHGdE=" "pkg";
aarch64-linux = fetch "linux_arm64" "sha256-WCu1/5dewsjVMyFo+BaAgCOcK08Fe3ldJhDzCl8B+2M=" "zip";
i686-linux = fetch "linux_386" "sha256-eRNX7+IF9v3JzXxwp5WshqYOC5/uizniWOKSc3q2yL8=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-wvhWwcDufwvh8Isx4QpyyHEJ+3yU7f/0a4r5Itns68c=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-ZOU4huC1FUj0ZiqIgs+4tU8t/w5VVD/UiWGVFHS50sw=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;

66
pkgs/applications/misc/lenmus/default.nix
View File

@ -1,9 +1,10 @@
{ lib
, stdenv
, pkg-config
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, makeWrapper
, boost
, portmidi
, sqlite
@ -11,40 +12,40 @@
, libpng
, pngpp
, zlib
, wxGTK30
, wxGTK32
, wxsqlite3
, fluidsynth
, fontconfig
, darwin
, soundfont-fluid
, openlilylib-fonts
}:
let
inherit (darwin.apple_sdk.frameworks) Cocoa;
in
stdenv.mkDerivation rec {
pname = "lenmus";
version = "5.4.2";
version = "6.0.1";
src = fetchFromGitHub {
owner = "lenmus";
repo = "lenmus";
rev = "Release_${version}";
sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p";
sha256 = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE=";
};
patches = [
(fetchpatch {
url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch";
sha256 = "1z1wwh0pcr8w1zlr8swx99si9y2kxx5bmavgwvy6bvdhxgm58yqs";
})
(fetchpatch {
url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch";
sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn";
})
(fetchpatch {
url = "https://github.com/lenmus/lenmus/commit/37ee8ac9c8faff65a14e8f7ed2bc22e6dc48d91f.patch";
includes = [ "src/app/lenmus_midi_wizard.cpp" ];
sha256 = "sha256-nlT6ZbSCIXUk2Ufv/SDn2A0Rt+s/7m+7l9HOoQmaIhc=";
})
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "/usr" "${placeholder "out"}"
sed -i 's/fixup_bundle.*")/")/g' CMakeLists.txt
'';
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optionals stdenv.isDarwin [
makeWrapper
];
buildInputs = [
@ -55,10 +56,33 @@ stdenv.mkDerivation rec {
libpng
pngpp
zlib
wxGTK30
wxGTK32
wxsqlite3
fluidsynth
fontconfig
] ++ lib.optionals stdenv.isDarwin [
Cocoa
];
preConfigure = ''
mkdir res/fonts
ln -s ${openlilylib-fonts.bravura}/share/lilypond/*/fonts/otf/Bravura.otf res/fonts/Bravura.otf
ln -s ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 res/sounds/FluidR3_GM.sf2
'';
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
"-DLENMUS_INSTALL_SOUNDFONT=ON"
"-DMAN_INSTALL_DIR=${placeholder "out"}/share/man"
];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir -p $out/{Applications,bin}
mv $out/lenmus.app $out/Applications
mv $out/Resources $out/Applications/lenmus.app/Contents
makeWrapper $out/{Applications/lenmus.app/Contents/MacOS,bin}/lenmus
'';
meta = with lib; {
description = "LenMus Phonascus is a program for learning music";
longDescription = ''
@ -69,6 +93,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.lenmus.org/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux;
platforms = with platforms; unix;
};
}

16
pkgs/applications/misc/mediainfo-gui/default.nix
View File

@ -1,16 +1,20 @@
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30
, desktop-file-utils, libSM, imagemagick }:
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK32
, desktop-file-utils, libSM, imagemagick, darwin }:
let
inherit (darwin.apple_sdk.frameworks) Cocoa;
in
stdenv.mkDerivation rec {
version = "22.06";
version = "22.12";
pname = "mediainfo-gui";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30=";
sha256 = "sha256-kyuCc59zjn22A89bsXByBzGp58YdFFwqVKq7PNC3U7w=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libmediainfo wxGTK30 desktop-file-utils libSM imagemagick ];
buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://mediaarea.net/";
license = licenses.bsd2;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.devhell ];
};
}

2
pkgs/applications/misc/prusa-slicer/default.nix
View File

@ -183,5 +183,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/prusa3d/PrusaSlicer";
license = licenses.agpl3;
maintainers = with maintainers; [ moredread tweber ];
} // lib.optionalAttrs (stdenv.isDarwin) {
mainProgram = "PrusaSlicer";
};
}

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

@ -6,7 +6,7 @@
, zip
, gettext
, perl
, wxGTK30
, wxGTK32
, libXext
, libXi
, libXt
@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "pwsafe";
version = "1.15.0"; # do NOT update to 3.x Windows releases
version = "1.16.0"; # do NOT update to 3.x Windows releases
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
hash = "sha256-EyyQHp2MlGgUnikClgvP7I313Bh6H3yVPXel8Z/U6gQ=";
hash = "sha256-5/TOg+hiy22vlPJHheE638abhS3B5Jrul0Umgwu+gi0=";
};
nativeBuildInputs = [
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libXi
libXt
libXtst
wxGTK30
wxGTK32
curl
qrencode
libuuid

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

@ -12,14 +12,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sticky";
version = "1.13";
version = "1.14";
format = "other";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-oirTDIbvG9/iAkYrquX+ciujAnLUmubkBVvTyaiz2g8=";
hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E=";
};
postPatch = ''

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

@ -24,14 +24,14 @@
mkDerivation rec {
pname = "tellico";
version = "3.4.4";
version = "3.4.5";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "office";
repo = pname;
rev = "v${version}";
hash = "sha256-Qgan0mnDTQx+KKCAnRpgi9CCbXIRBMQtAyH/Mr20VSw=";
hash = "sha256-XWzSbtyxOkASTwT5b7+hIEwaKe2bEo6ij+CnPbYNEc0=";
};
postPatch = ''

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "karmor";
version = "0.11.1";
version = "0.11.4";
src = fetchFromGitHub {
owner = "kubearmor";
repo = "kubearmor-client";
rev = "v${version}";
hash = "sha256-s1G5ZcXtjL9TxYpEUvnqiQXaY7OFUwCDXFongRM48Xk=";
hash = "sha256-UN0b4OFyszM6F0vut70pnoxhI8Qf2Ed4/BdBeWLWEOA=";
};
vendorHash = "sha256-VvjcGiBxK2OVvIEc/ScwUT6zJZTccnXu/JfXKXc5WNY=";
vendorHash = "sha256-eShJFjSmyny8eWmj6G/cXwFkThlXqxeef5tjqe3srxw=";
nativeBuildInputs = [ installShellFiles ];

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kluctl";
version = "2.16.1";
version = "2.18.3";
src = fetchFromGitHub {
owner = "kluctl";
repo = "kluctl";
rev = "v${version}";
hash = "sha256-rcwtVhtLc49rD6J3AZFumLQrZuTveE7OY+agufe/4MQ=";
hash = "sha256-vlNFIxhytgRtECj42Xng+j69JPciID26g1q8w9K14xY=";
};
vendorHash = "sha256-IC+sjctDqd0lQD5labl+UYWsRiptQKSjSHYf2SGkp14=";
vendorHash = "sha256-JpAQ8tyGJXOUH13uHHCtaYd/jbqZ8zZNCNq7ddPf6U8=";
ldflags = [ "-s" "-w" "-X main.version=v${version}" ];

20
pkgs/applications/networking/cluster/terragrunt/default.nix
View File

@ -1,23 +1,31 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "terragrunt";
version = "0.42.5";
version = "0.42.7";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-hF40Tb9NND8az9zOOvh9w/VyjbpVlKqnMT7J9oDJjBM=";
rev = "refs/tags/v${version}";
hash = "sha256-WbvRqXzqPBBhJU2ELgNC2jHnOYxmR7dZ1ynA8ObWdxU=";
};
vendorSha256 = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4=";
vendorHash = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4=";
doCheck = false;
ldflags = [ "-s" "-w" "-X main.VERSION=v${version}" ];
ldflags = [
"-s"
"-w"
"-X main.VERSION=v${version}"
];
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/terragrunt --help

7
pkgs/applications/networking/feedreaders/newsboat/default.nix
View File

@ -3,16 +3,16 @@
rustPlatform.buildRustPackage rec {
pname = "newsboat";
version = "2.29";
version = "2.30.1";
src = fetchFromGitHub {
owner = "newsboat";
repo = "newsboat";
rev = "r${version}";
hash = "sha256-/R+ahUOgQR71kTZIpsic1gEYxJzbnY8x6AxtkzYTCDo=";
hash = "sha256-hiZN3wWknshP8MG4ThhbMLyhQkuFozzoETs3mYaMVro=";
};
cargoHash = "sha256-uHhP5XurJHM31fJqsqW9tumPzzMMOEeEWAAsllazcME=";
cargoHash = "sha256-Ap8i8hLqrUi6aSn4wKAdG3Z/5or+bF+epDaWUdWYt78";
# TODO: Check if that's still needed
postPatch = lib.optionalString stdenv.isDarwin ''
@ -49,7 +49,6 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
make prefix="$out" install
cp -r contrib $out
'' + lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"

583
pkgs/applications/networking/n8n/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/science/machine-learning/starspace/default.nix
View File

@ -1,8 +1,8 @@
{ lib, stdenv, fetchFromGitHub, boost165, zlib }:
{ lib, stdenv, fetchFromGitHub, boost, zlib }:
stdenv.mkDerivation rec {
pname = "starspace";
version = "unstable-2021-01-17";
version = "unstable-2019-12-13";
src = fetchFromGitHub {
owner = "facebookresearch";
@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "0sc7a37z1skb9377a1qs8ggwrkz0nmpybx7sms38xj05b702kbvj";
};
buildInputs = [ boost165 zlib ];
buildInputs = [ boost zlib ];
makeFlags = [
"CXX=${stdenv.cc.targetPrefix}c++"
"BOOST_DIR=${boost165.dev}/include"
"BOOST_DIR=${boost.dev}/include"
];
preBuild = ''

4
pkgs/applications/version-management/git-cola/default.nix
View File

@ -5,13 +5,13 @@ let
in buildPythonApplication rec {
pname = "git-cola";
version = "4.0.4";
version = "4.1.0";
src = fetchFromGitHub {
owner = "git-cola";
repo = "git-cola";
rev = "refs/tags/v${version}";
hash = "sha256-++cpzspN7REp9dOcsostcaJPnFHUW624hlgngQWjQCs=";
hash = "sha256-s+acQo9b+ZQ31qXBf0m8ajXYuYEQzNybmX9nw+c0DQY=";
};
buildInputs = [ git gettext ];

8
pkgs/applications/video/hypnotix/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "hypnotix";
version = "3.1";
version = "3.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "hypnotix";
rev = version;
hash = "sha256-hCVItxvYTE0G5inI/A4w4FYfSfrACINBSaKXhA1mh4A=";
hash = "sha256-R9bp1RQHHCrIE/3rIAHzWHXpXBUDUpJTkO53n+xZw3Q=";
};
patches = [
@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
src = ./libmpv-path.patch;
libmpv = "${lib.getLib mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}";
})
# Fix launching with mpv 0.35.0 (ubuntu 22.04 doesn't have libmpv.so.2)
# https://github.com/linuxmint/hypnotix/issues/254
./fix-deprecated-mpv-detach-destroy.patch
];
postPatch = ''

22
pkgs/applications/video/hypnotix/fix-deprecated-mpv-detach-destroy.patch
View File

@ -1,22 +0,0 @@
diff --git a/usr/lib/hypnotix/mpv.py b/usr/lib/hypnotix/mpv.py
index f42a3be..db94bf6 100644
--- a/usr/lib/hypnotix/mpv.py
+++ b/usr/lib/hypnotix/mpv.py
@@ -528,7 +528,7 @@ _mpv_create = backend.mpv_create
_handle_func('mpv_create_client', [c_char_p], MpvHandle, notnull_errcheck)
_handle_func('mpv_client_name', [], c_char_p, errcheck=None)
_handle_func('mpv_initialize', [], c_int, ec_errcheck)
-_handle_func('mpv_detach_destroy', [], None, errcheck=None)
+_handle_func('mpv_destroy', [], None, errcheck=None)
_handle_func('mpv_terminate_destroy', [], None, errcheck=None)
_handle_func('mpv_load_config_file', [c_char_p], c_int, ec_errcheck)
_handle_func('mpv_get_time_us', [], c_ulonglong, errcheck=None)
@@ -881,7 +881,7 @@ class MPV(object):
self._message_handlers[target](*args)
if eid == MpvEventID.SHUTDOWN:
- _mpv_detach_destroy(self._event_handle)
+ _mpv_destroy(self._event_handle)
return
except Exception as e:

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

@ -24,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "cagebreak";
version = "1.8.1";
version = "1.9.1";
src = fetchFromGitHub {
owner = "project-repo";
repo = pname;
rev = version;
hash = "sha256-YaLGRlvppTUCSHFlt3sEfHgN3pYHuc5oGt3dt0DDw3I=";
hash = "sha256-pU1QHYOqnkb3L4iSKbZY9Vo60Z6EaX9mp2Nw48NSPic=";
};
nativeBuildInputs = [
@ -82,6 +82,7 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ berbiche ];
platforms = platforms.linux;
changelog = "https://github.com/project-repo/cagebreak/blob/${version}/Changelog.md";
};
passthru.tests.basic = nixosTests.cagebreak;

11
pkgs/development/compilers/ats2/default.nix
View File

@ -34,12 +34,21 @@ stdenv.mkDerivation rec {
hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM=";
};
postPatch = lib.optionalString stdenv.cc.isClang ''
sed -i 's/gcc/clang/g' utils/*/DATS/atscc_util.dats
'';
buildInputs = [ gmp ];
# Disable parallel build, errors:
# *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop.
enableParallelBuilding = false;
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
"CCOMP=${stdenv.cc.targetPrefix}cc"
];
setupHook = with lib;
let
hookFiles =
@ -55,7 +64,7 @@ stdenv.mkDerivation rec {
description = "Functional programming language with dependent types";
homepage = "http://www.ats-lang.org";
license = licenses.gpl3Plus;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ];
};
}

8
pkgs/development/compilers/flutter/default.nix
View File

@ -24,9 +24,11 @@ let
sha256 = hash;
};
};
flutter2Patches = getPatches ./patches/flutter2;
flutter3Patches = getPatches ./patches/flutter3;
in
{
inherit mkFlutter;
inherit mkFlutter flutterDrv flutter2Patches flutter3Patches;
stable = flutterDrv {
pname = "flutter";
version = "3.3.8";
@ -36,7 +38,7 @@ in
x86_64-linux = "sha256-lFw+KaxzhuAMnu6ypczINqywzpiD+8Kd+C/UHJDrO9Y=";
aarch64-linux = "sha256-snlFTY4oJ4ALGLc210USbI2Z///cx1IVYUWm7Vo5z2I=";
};
patches = getPatches ./patches/flutter3;
patches = flutter3Patches;
};
v2 = flutterDrv {
@ -48,6 +50,6 @@ in
x86_64-linux = "sha256-egrYd7B4XhkBiHPIFE2zopxKtQ58GqlogAKA/UeiXnI=";
aarch64-linux = "sha256-vmerjXkUAUnI8FjK+62qLqgETmA+BLPEZXFxwYpI+KY=";
};
patches = getPatches ./patches/flutter2;
patches = flutter2Patches;
};
}

15
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -875,17 +875,16 @@ self: super: builtins.intersectAttrs super {
];
cachix = super.cachix.override {
nix = pkgs.nixVersions.nix_2_10;
fsnotify = super.fsnotify_0_4_1_0;
nix = self.hercules-ci-cnix-store.passthru.nixPackage;
fsnotify = dontCheck super.fsnotify_0_4_1_0;
hnix-store-core = super.hnix-store-core_0_6_1_0;
};
hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_10; };
hercules-ci-cnix-expr =
addTestToolDepend pkgs.git (
super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_10; }
);
hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_10; };
hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: {
passthru.nixPackage = pkgs.nixVersions.nix_2_12;
});
# the testsuite fails because of not finding tsc without some help
aeson-typescript = overrideCabal (drv: {

4
pkgs/development/interpreters/luau/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "luau";
version = "0.555";
version = "0.558";
src = fetchFromGitHub {
owner = "Roblox";
repo = "luau";
rev = version;
sha256 = "sha256-p3BTtjTmg8sS0gOugPCO1oqqboppcXa0wLHmRqmf3AA=";
hash = "sha256-103TLfVmXBN3Vd31nbBu7RlxrG4DX6xn/vpveIdnm5E=";
};
nativeBuildInputs = [ cmake ];

7
pkgs/development/interpreters/python/default.nix
View File

@ -298,7 +298,12 @@ in {
minor = "3";
patch = "11";
};
sha256 = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE="; # linux64
sha256 = {
aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk=";
x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE=";
aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4=";
x86_64-darwin = "sha256-0z9AsgcJmHJYWv1xhzV1ym6mOKJ9gjvGISOMWuglQu0=";
}.${stdenv.system};
pythonVersion = "3.9";
inherit passthruFun;
};

52
pkgs/development/interpreters/python/pypy/prebuilt.nix
View File

@ -12,6 +12,8 @@
, sqlite
, tcl-8_5
, tk-8_5
, tcl-8_6
, tk-8_6
, zlib
# For the Python package set
, packageOverrides ? (self: super: {})
@ -48,11 +50,18 @@ let
majorVersion = lib.versions.major pythonVersion;
downloadUrls = {
aarch64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-aarch64.tar.bz2";
x86_64-linux = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
aarch64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_arm64.tar.bz2";
x86_64-darwin = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-macos_x86_64.tar.bz2";
};
in with passthru; stdenv.mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://downloads.python.org/pypy/pypy${pythonVersion}-v${version}-linux64.tar.bz2";
url = downloadUrls.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
inherit sha256;
};
@ -62,12 +71,16 @@ in with passthru; stdenv.mkDerivation {
gdbm
ncurses6
sqlite
zlib
] ++ lib.optionals stdenv.isLinux [
tcl-8_5
tk-8_5
zlib
] ++ lib.optionals stdenv.isDarwin [
tcl-8_6
tk-8_6
];
nativeBuildInputs = [ autoPatchelfHook ];
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
installPhase = ''
runHook preInstall
@ -75,10 +88,10 @@ in with passthru; stdenv.mkDerivation {
mkdir -p $out
echo "Moving files to $out"
mv -t $out bin include lib
mv $out/bin/libpypy*-c.so $out/lib/
rm $out/bin/*.debug
mv $out/bin/libpypy*-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
${lib.optionalString stdenv.isLinux ''
rm $out/bin/*.debug
''}
echo "Removing bytecode"
find . -name "__pycache__" -type d -depth -delete
@ -89,11 +102,32 @@ in with passthru; stdenv.mkDerivation {
runHook postInstall
'';
preFixup = ''
preFixup = lib.optionalString stdenv.isLinux ''
find $out/{lib,lib_pypy*} -name "*.so" \
-exec patchelf \
--replace-needed libtinfow.so.6 libncursesw.so.6 \
--replace-needed libgdbm.so.4 libgdbm_compat.so.4 {} \;
'' + lib.optionalString stdenv.isDarwin ''
install_name_tool \
-change \
@rpath/lib${libPrefix}-c.dylib \
$out/lib/lib${libPrefix}-c.dylib \
$out/bin/${executable}
install_name_tool \
-change \
@rpath/lib${libPrefix}-c.dylib \
$out/lib/lib${libPrefix}-c.dylib \
$out/bin/${libPrefix}
install_name_tool \
-change \
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \
${tcl-8_6}/lib/libtcl8.6.dylib \
$out/lib/${libPrefix}/_tkinter/*.so
install_name_tool \
-change \
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \
${tk-8_6}/lib/libtk8.6.dylib \
$out/lib/${libPrefix}/_tkinter/*.so
'';
doInstallCheck = true;
@ -126,7 +160,7 @@ in with passthru; stdenv.mkDerivation {
homepage = "http://pypy.org/";
description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
license = licenses.mit;
platforms = [ "x86_64-linux" ];
platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls;
};
}

21
pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
View File

@ -12,6 +12,8 @@
, sqlite
, tcl-8_5
, tk-8_5
, tcl-8_6
, tk-8_6
, zlib
# For the Python package set
, packageOverrides ? (self: super: {})
@ -69,9 +71,13 @@ in with passthru; stdenv.mkDerivation {
gdbm
ncurses6
sqlite
zlib
] ++ lib.optionals stdenv.isLinux [
tcl-8_5
tk-8_5
zlib
] ++ lib.optionals stdenv.isDarwin [
tcl-8_6
tk-8_6
];
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
@ -108,10 +114,19 @@ in with passthru; stdenv.mkDerivation {
@rpath/lib${executable}-c.dylib \
$out/lib/lib${executable}-c.dylib \
$out/bin/${executable}
install_name_tool \
-change \
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \
${tcl-8_6}/lib/libtcl8.6.dylib \
$out/lib_pypy/_tkinter/*.so
install_name_tool \
-change \
/opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \
${tk-8_6}/lib/libtk8.6.dylib \
$out/lib_pypy/_tkinter/*.so
'';
# Native libraries are not working in darwin
doInstallCheck = !stdenv.isDarwin;
doInstallCheck = true;
# Check whether importing of (extension) modules functions
installCheckPhase = let

2
pkgs/development/libraries/boost/default.nix
View File

@ -16,8 +16,6 @@ let
}
);
in {
boost159 = makeBoost ./1.59.nix;
boost160 = makeBoost ./1.60.nix;
boost165 = makeBoost ./1.65.nix;
boost166 = makeBoost ./1.66.nix;
boost167 = makeBoost ./1.67.nix;

22
pkgs/development/libraries/clfft/default.nix
View File

@ -1,5 +1,8 @@
{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }:
{ lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost, opencl-clhpp, ocl-icd, darwin }:
let
inherit (darwin.apple_sdk.frameworks) OpenCL;
in
stdenv.mkDerivation rec {
pname = "clfft";
version = "2.12.2";
@ -7,15 +10,24 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "clMathLibraries";
repo = "clFFT";
rev = "refs/tags/v${version}";
sha256 = "134vb6214hn00qy84m4djg4hqs6hw19gkp8d0wlq8gb9m3mfx7na";
rev = "v${version}";
hash = "sha256-yp7u6qhpPYQpBw3d+VLg0GgMyZONVII8BsBCEoRZm4w=";
};
sourceRoot = "source/src";
postPatch = ''
sed -i '/-m64/d;/-m32/d' CMakeLists.txt
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ fftw fftwFloat boost166 opencl-clhpp ocl-icd ];
buildInputs = [ fftw fftwFloat boost ]
++ lib.optionals stdenv.isLinux [ opencl-clhpp ocl-icd ]
++ lib.optionals stdenv.isDarwin [ OpenCL ];
# https://github.com/clMathLibraries/clFFT/issues/237
CXXFLAGS = "-std=c++98";
meta = with lib; {
description = "Library containing FFT functions written in OpenCL";
@ -25,7 +37,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.asl20;
homepage = "http://clmathlibraries.github.io/clFFT/";
platforms = [ "i686-linux" "x86_64-linux" ];
platforms = platforms.unix;
maintainers = with maintainers; [ chessai ];
};
}

5
pkgs/development/libraries/htmlcxx/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libiconv }:
{ lib, stdenv, fetchurl, autoreconfHook, libiconv }:
stdenv.mkDerivation rec {
pname = "htmlcxx";
@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-XTj5OM9N+aKYpTRq8nGV//q/759GD8KgIjPLz6j8dcg=";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ libiconv ];
patches = [
./ptrdiff.patch
@ -20,7 +21,5 @@ stdenv.mkDerivation rec {
description = "A simple non-validating css1 and html parser for C++";
license = licenses.lgpl2;
platforms = platforms.all;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

4
pkgs/development/libraries/jellyfin-ffmpeg/default.nix
View File

@ -9,13 +9,13 @@
nv-codec-headers = nv-codec-headers-11;
}).overrideAttrs (old: rec {
pname = "jellyfin-ffmpeg";
version = "5.1.2-5";
version = "5.1.2-6";
src = fetchFromGitHub {
owner = "jellyfin";
repo = "jellyfin-ffmpeg";
rev = "v${version}";
sha256 = "sha256-2mSixlrTgAVD2ZRGoi1+UEbhba7QEVvKmigwC9dLk2g=";
sha256 = "sha256-YPw29cnScchL4Y2CEatUjzqUW/U9kOdi29Dr577Qy5A=";
};
buildInputs = old.buildInputs ++ [ chromaprint ];

12
pkgs/development/libraries/libLAS/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
{ lib, stdenv, fetchurl, fetchpatch, boost, cmake, gdal, libgeotiff, libtiff, LASzip2, fixDarwinDylibNames }:
stdenv.mkDerivation rec {
pname = "libLAS";
@ -9,6 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws";
};
patches = [
(fetchpatch {
name = "aarch64-darwin.patch";
url = "https://github.com/libLAS/libLAS/commit/ded463732db1f9baf461be6f3fe5b8bb683c41cd.patch";
sha256 = "sha256-aWMpazeefDHE9OzuLR3FJ8+oXeGhEsk1igEm6j2DUnw=";
})
];
nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ boost gdal libgeotiff libtiff LASzip2 ];
@ -31,7 +39,5 @@ stdenv.mkDerivation rec {
license = lib.licenses.bsd3;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.michelk ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, libnfc, openssl
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libnfc, openssl
, libobjc ? null
, IOKit, Security
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "0r5wfvwgf35lb1v65wavnwz2wlfyfdims6a9xpslf4lsm4a1v8xz";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libnfc openssl ] ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ];
meta = with lib; {
@ -21,7 +21,5 @@ stdenv.mkDerivation {
homepage = "https://github.com/nfc-tools/libfreefare";
maintainers = with maintainers; [bobvanderlinden];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

12
pkgs/development/libraries/libhdhomerun/default.nix
View File

@ -13,11 +13,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc=";
};
patchPhase = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile --replace "gcc" "cc"
substituteInPlace Makefile --replace "-arch i386" ""
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile \
--replace "-arch x86_64" "-arch ${stdenv.hostPlatform.darwinArch}"
'';
makeFlags = [
"CC=${stdenv.cc.targetPrefix}cc"
];
installPhase = ''
mkdir -p $out/{bin,lib,include/hdhomerun}
install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
@ -31,7 +35,5 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Only;
platforms = platforms.unix;
maintainers = [ maintainers.titanous ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

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

@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps;
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ];
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" ]
++ lib.optionals (stdenv.hostPlatform.isDarwin || !stdenv.hostPlatform.isx86) [ "-DWITH_SUPERCOP=OFF" ]
++ lib.optionals (!stdenv.hostPlatform.isx86) [ "-DCURVE=ALT_BN128" ];
src = fetchFromGitHub {
rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07";
@ -22,7 +24,5 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/scipr-lab/libsnark";
license = licenses.mit;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);
};
}

12
pkgs/development/libraries/libticables2/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, pkg-config
, autoreconfHook
, glib
@ -15,6 +16,15 @@ stdenv.mkDerivation rec {
sha256 = "08j5di0cgix9vcpdv7b8xhxdjkk9zz7fqfnv3l4apk3jdr8vcvqc";
};
patches = [
(fetchpatch {
name = "add-support-for-aarch64-macos-target-triple.patch";
url = "https://github.com/debrouxl/tilibs/commit/ef41c51363b11521460f33e8c332db7b0a9ca085.patch";
stripLen = 2;
sha256 = "sha256-oTR1ACEZI0fjErpnFXTCnfLT1mo10Ypy0q0D8NOPNsM=";
})
];
nativeBuildInputs = [
autoreconfHook
pkg-config
@ -60,7 +70,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ siraben luc65r ];
platforms = with platforms; linux ++ darwin;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

7
pkgs/development/libraries/physics/hepmc3/default.nix
View File

@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
]
++ lib.optional withPython python;
# error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0'
preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
MACOSX_DEPLOYMENT_TARGET=10.16
'';
cmakeFlags = [
"-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}"
] ++ lib.optionals withPython [
@ -57,7 +62,5 @@ stdenv.mkDerivation rec {
homepage = "http://hepmc.web.cern.ch/hepmc/";
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

35
pkgs/development/libraries/python-qt/default.nix
View File

@ -1,26 +1,43 @@
{ lib, stdenv, fetchurl, python, qmake,
{ lib, stdenv, fetchFromGitHub, fetchpatch, python, qmake,
qtwebengine, qtxmlpatterns,
qttools, unzip }:
stdenv.mkDerivation rec {
version = "3.2";
pname = "python-qt";
version = "3.3.0";
src = fetchurl {
url="mirror://sourceforge/pythonqt/PythonQt${version}.zip";
sha256="13hzprk58m3yj39sj0xn6acg8796lll1256mpd81kw0z3yykyl8c";
src = fetchFromGitHub {
owner = "MeVisLab";
repo = "pythonqt";
rev = "v${version}";
hash = "sha256-zbQ6X4Q2/QChaw3GAz/aVBj2JjWEz52YuPuHbBz935k=";
};
patches = [
(fetchpatch {
name = "remove-unneeded-pydebug-include.patch";
url = "https://github.com/MeVisLab/pythonqt/commit/a93104dea4d9c79351276ec963e931ca617625ec.patch";
includes = [ "src/PythonQt.cpp" ];
hash = "sha256-Tc4+6dIdvrda/z3Nz1s9Xz+ZWJLV2BQh8i552UynSI0=";
})
];
# https://github.com/CsoundQt/CsoundQt/blob/develop/BUILDING.md#pythonqt
postPatch = ''
substituteInPlace build/python.prf \
--replace "unix:PYTHON_VERSION=2.7" "unix:PYTHON_VERSION=${python.pythonVersion}"
'';
hardeningDisable = [ "all" ];
nativeBuildInputs = [ qmake qtwebengine qtxmlpatterns qttools unzip ];
buildInputs = [ python ];
qmakeFlags = [ "PythonQt.pro"
"INCLUDEPATH+=${python}/include/python3.6"
"PYTHON_PATH=${python}/bin"
"PYTHON_LIB=${python}/lib"];
qmakeFlags = [
"PythonQt.pro"
"PYTHON_DIR=${python}"
];
dontWrapQtApps = true;

4
pkgs/development/libraries/s2n-tls/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "s2n-tls";
version = "1.3.31";
version = "1.3.32";
src = fetchFromGitHub {
owner = "aws";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jdjy5Th73Sd/8NvivB2g9dVRDW3DEvUSYXZ1o2U6Y88=";
sha256 = "sha256-LKJubTzV4B7aimKtnODUJJil3b55qKuDkCe7TLa8tjQ=";
};
nativeBuildInputs = [ cmake ];

38
pkgs/development/libraries/vte/2.90.nix
View File

@ -1,38 +0,0 @@
{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk3, ncurses, gobject-introspection }:
stdenv.mkDerivation rec {
pname = "vte";
version = "0.36.3";
src = fetchurl {
url = "mirror://gnome/sources/vte/${lib.versions.majorMinor version}/vte-${version}.tar.xz";
sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
};
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ gobject-introspection glib gtk3 ncurses ];
configureFlags = [ "--enable-introspection" ];
enableParallelBuilding = true;
postInstall = ''
substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
'';
meta = with lib; {
homepage = "https://www.gnome.org/";
description = "A library implementing a terminal emulator widget for GTK";
longDescription = ''
VTE is a library (libvte) implementing a terminal emulator widget for
GTK, and a minimal sample application (vte) using that. Vte is
mainly used in gnome-terminal, but can also be used to embed a
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = licenses.lgpl2;
maintainers = with maintainers; [ astsmtl antono ];
platforms = platforms.linux;
};
}

7
pkgs/development/python-modules/accuweather/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "accuweather";
version = "0.4.0";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -20,8 +20,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
hash = "sha256-NnDpSOEIqPuPLIr0Ty6yjrs9WRKyhykcdyiRPB/cHEw=";
rev = "refs/tags/${version}";
hash = "sha256-v4mFvW+p0g+5IeZT8o0Z60MafHyYZ62d4lNH27wlAeI=";
};
postPatch = ''
@ -50,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python wrapper for getting weather data from AccuWeather servers";
homepage = "https://github.com/bieniu/accuweather";
changelog = "https://github.com/bieniu/accuweather/releases/tag/${version}";
license = licenses.asl20;
maintainers = with maintainers; [ jamiemagee ];
};

7
pkgs/development/python-modules/aioblescan/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "aioblescan";
version = "0.2.13";
version = "0.2.14";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -15,8 +15,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "frawau";
repo = pname;
rev = version;
hash = "sha256-n1FiBsuVpVJrIq6+kuMNugpEaUOFQ/Gk/QU7Hry4YrU=";
rev = "refs/tags/${version}";
hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc=";
};
checkInputs = [
@ -30,6 +30,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to listen for BLE advertized packets";
homepage = "https://github.com/frawau/aioblescan";
changelog = "https://github.com/frawau/aioblescan/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

40
pkgs/development/python-modules/archspec/default.nix
View File

@ -1,35 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, click
, six
, pytestCheckHook
, fetchFromGitHub
, jsonschema
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "archspec";
version = "0.1.4";
version = "0.2.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
rev = "refs/tags/v${version}";
fetchSubmodules = true;
sha256 = "sha256-ScigEpYNArveqi5tlqiA7LwsVs2RkjT+GChxhSy/ndw=";
hash = "sha256-Zu7/zx3FTVJVGpAdRDdnLBokeodspZg6ou/GBaqz4XY=";
};
nativeBuildInputs = [ poetry-core ];
propagatedBuildInputs = [ click six ];
checkInputs = [ pytestCheckHook jsonschema ];
nativeBuildInputs = [
poetry-core
];
pythonImportsCheck = [ "archspec" ];
propagatedBuildInputs = [
click
];
checkInputs = [
pytestCheckHook
jsonschema
];
pythonImportsCheck = [
"archspec"
];
meta = with lib; {
description = "A library for detecting, labeling, and reasoning about microarchitectures";
homepage = "https://archspec.readthedocs.io/en/latest/";
description = "Library for detecting, labeling, and reasoning about microarchitectures";
homepage = "https://archspec.readthedocs.io/";
changelog = "https://github.com/archspec/archspec/releases/tag/v0.2.0";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ atila ];
};

7
pkgs/development/python-modules/debuglater/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "debuglater";
version = "1.4.3";
version = "1.4.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "ploomber";
repo = pname;
rev = version;
hash = "sha256-0fnWXmrlZjlLFGbiLC7HuDgMEM6OJVn8ajjNRqFg3Lc=";
rev = "refs/tags/${version}";
hash = "sha256-o9IAk3EN8ghEft7Y7Xx+sEjWMNgoyiZ0eiBqnCyXkm8=";
};
propagatedBuildInputs = [
@ -46,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Module for post-mortem debugging of Python programs";
homepage = "https://github.com/ploomber/debuglater";
changelog = "https://github.com/ploomber/debuglater/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

10
pkgs/development/python-modules/envisage/default.nix
View File

@ -2,6 +2,7 @@
, apptools
, buildPythonPackage
, fetchPypi
, fetchpatch
, ipython
, pytestCheckHook
, pythonAtLeast
@ -22,6 +23,15 @@ buildPythonPackage rec {
sha256 = "sha256-AATsUNcYLB4vtyvuooAMDZx8p5fayijb6yJoUKTCW40=";
};
patches = [
# TODO: remove on next release
(fetchpatch {
name = "fix-mistake-in-menu-group-specification.patch";
url = "https://github.com/enthought/envisage/commit/f23ea3864a5f6ffca665d47dec755992e062029b.patch";
sha256 = "sha256-l4CWB4jRkSmoTDoV8CtP2w87Io2cLINKfOSaSPy7cXE=";
})
];
# for the optional dependency ipykernel, only versions < 6 are
# supported, so it's not included in the tests, and not propagated
propagatedBuildInputs = [

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

@ -16,13 +16,15 @@
buildPythonPackage rec {
pname = "internetarchive";
version = "3.0.2";
version = "3.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-3oVkZcLvaFIYTQi/1ZwMoBkEhls3OiezgwNKxrQSjrY=";
sha256 = "sha256-cB7nRDmO2NNaHjNkHCuXH0+15WZfxseS8DBdIqefSzk=";
};
propagatedBuildInputs = [

56
pkgs/development/python-modules/ld2410-ble/default.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, async-timeout
, bleak
, bleak-retry-connector
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "ld2410-ble";
version = "0.1.1";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchFromGitHub {
owner = "930913";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-D8Z3OXlXWsaN0Ck9gx//J9TCaQmirYDbaXK7aTpI7ns=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
async-timeout
bleak
bleak-retry-connector
];
checkInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace " --cov=ld2410_ble --cov-report=term-missing:skip-covered" ""
'';
pythonImportsCheck = [
"ld2410_ble"
];
meta = with lib; {
description = "Library for the LD2410B modules from HiLinks";
homepage = "https://github.com/930913/ld2410-ble";
changelog = "https://github.com/930913/ld2410-ble/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -4,6 +4,7 @@
, envisage
, fetchPypi
, numpy
, packaging
, pyface
, pygments
, pyqt5
@ -43,6 +44,7 @@ buildPythonPackage rec {
apptools
envisage
numpy
packaging
pyface
pygments
pyqt5
@ -50,6 +52,8 @@ buildPythonPackage rec {
vtk
];
NIX_CFLAGS_COMPILE = "-Wno-error";
# Needs X server
doCheck = false;

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "md-toc";
version = "8.1.7";
version = "8.1.8";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
hash = "sha256-zC7//0q4jkj2yjex/Ea4fslCvPQbd8S1LmvL01kSZZk=";
hash = "sha256-2Q/NcsGupYV80byrKmuoxA0d6/z7Z+fmGB6bfzDRvqQ=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "mkdocstrings-python";
version = "0.8.2";
version = "0.8.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = "python";
rev = version;
hash = "sha256-TwvXH/n2do4GnkxStW8fk9MRm59t/eP0sOjGnl3fYkw=";
hash = "sha256-JGk6oJQ6mcLtn7SDtltsLPT+CxPZNRbq8bnY9pMcXHc=";
};
nativeBuildInputs = [

14
pkgs/development/python-modules/posix_ipc/default.nix
View File

@ -1,22 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, isPy3k
, pythonOlder
}:
buildPythonPackage rec {
pname = "posix_ipc";
version = "1.1.0";
pname = "posix-ipc";
version = "1.1.1";
format = "setuptools";
disabled = !isPy3k;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-+GoVsys4Vzx44wXr2RANgZij2frMA/+v457cNYM3OOM=";
hash = "sha256-4kVroM+y7luhQSFFDo2CWzxKFGH8oHYSIKq2bUERy7c=";
};
pythonImportsCheckHook = [ "posix_ipc" ];
pythonImportsCheckHook = [
"posix_ipc"
];
meta = with lib; {
description = "POSIX IPC primitives (semaphores, shared memory and message queues)";

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.25.0";
version = "5.26.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-siIi3RWiQUddiuA4ce3D6Js9n7X294oD6zwSMsIH0OI=";
hash = "sha256-2sx8a+ga77asp5onfjcGLm+3hCHdCXzFNmmgqzEJfJE=";
};
sourceRoot = "${src.name}/sdk/python";

5
pkgs/development/python-modules/pydmd/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pydmd";
version = "0.4.0.post2212";
version = "0.4.0.post2301";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "mathLab";
repo = "PyDMD";
rev = "refs/tags/v${version}";
sha256 = "sha256-VaBITKRSyMlBoaH0ej4tMob0CjStUsED2/G1iqpkG4c=";
hash = "sha256-0ss7yyT6u0if+YjBYNbKtx5beJU43JC1LD9rqHPKBS8=";
};
propagatedBuildInputs = [
@ -50,6 +50,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python Dynamic Mode Decomposition";
homepage = "https://mathlab.github.io/PyDMD/";
changelog = "https://github.com/mathLab/PyDMD/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ yl3dy ];
broken = stdenv.hostPlatform.isAarch64;

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyisy";
version = "3.0.10";
version = "3.0.11";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "automicus";
repo = "PyISY";
rev = "refs/tags/v${version}";
hash = "sha256-nThHJYU23I9q5Irk5SoW1+dy5Agl9IJc5gnLirzp3YM=";
hash = "sha256-oJ6Y4Bo4OLPVEy8vygU1FeRpZskfkCFBObvzTMuif5M=";
};
postPatch = ''

5
pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-elasticsearch";
version = "0.1.1";
version = "0.1.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-elasticsearch";
rev = "refs/tags/v${version}";
hash = "sha256-Niix0j4xaoQBMxvTOhy7hgmZ5btjs+0ovTEJcXAzjNY=";
hash = "sha256-HzvL6b2zeUrAAJ4mmKPOacZzHVVxfs3gjzP+fZIhApI=";
};
nativeBuildInputs = [
@ -47,6 +47,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to support Elasticsearch for pySigma";
homepage = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch";
changelog = "https://github.com/SigmaHQ/pySigma-backend-elasticsearch/releases/tag/v${version}";
license = with licenses; [ lgpl21Only ];
maintainers = with maintainers; [ fab ];
};

5
pkgs/development/python-modules/pysigma-backend-opensearch/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma-backend-opensearch";
version = "0.1.3";
version = "0.1.4";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma-backend-opensearch";
rev = "refs/tags/v${version}";
hash = "sha256-lRw9zNyAIdwCT0uhZ9NxJXWs+sB/cyGFtZIIBImTNcM=";
hash = "sha256-ZcX8LK/qckNEhMWljv73QHtWv4IY7Xtr4ISrlnrUaAY=";
};
nativeBuildInputs = [
@ -49,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to support OpenSearch for pySigma";
homepage = "https://github.com/SigmaHQ/pySigma-backend-opensearch";
changelog = "https://github.com/SigmaHQ/pySigma-backend-opensearch/releases/tag/v${version}";
license = with licenses; [ lgpl21Only ];
maintainers = with maintainers; [ fab ];
};

1
pkgs/development/python-modules/pysigma-pipeline-windows/default.nix
View File

@ -40,6 +40,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to support Windows service pipeline for pySigma";
homepage = "https://github.com/SigmaHQ/pySigma-pipeline-windows";
changelog = "https://github.com/SigmaHQ/pySigma-pipeline-windows/releases/tag/v${version}";
license = with licenses; [ lgpl21Only ];
maintainers = with maintainers; [ fab ];
};

5
pkgs/development/python-modules/pysigma/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pysigma";
version = "0.8.10";
version = "0.8.12";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "SigmaHQ";
repo = "pySigma";
rev = "refs/tags/v${version}";
hash = "sha256-/MprHx4MlbdY22K8hWDPj7owwZcgWjRyVYDrPqB3oIE=";
hash = "sha256-OAhKeAKRT2/A6VO+PxUBi7bkaQVNRT59boyLPGdO+Yw=";
};
nativeBuildInputs = [
@ -43,6 +43,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to parse and convert Sigma rules into queries";
homepage = "https://github.com/SigmaHQ/pySigma";
changelog = "https://github.com/SigmaHQ/pySigma/releases/tag/v${version}";
license = with licenses; [ lgpl21Only ];
maintainers = with maintainers; [ fab ];
};

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "sphinxcontrib-katex";
version = "0.9.3";
version = "0.9.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-6IUTUc4HOK2e++3qMfT2MVm+cBnfVyohSiyROtiRGzI=";
hash = "sha256-Mcn+gcP6ywhVlguCggJkH4SA6n1ikmviRbah7LejDZE=";
};
propagatedBuildInputs = [

5
pkgs/development/tools/ats-acc/default.nix
View File

@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-Wp39488YNL40GKp4KaJwhi75PsYP+gMtrZqAvs4Q/sw=";
};
postPatch = ''
substituteInPlace Makefile \
--replace "mv acc \''$(PATSHOME)/bin/" "install -Dm755 acc ${placeholder "out"}/bin/"
'';
nativeBuildInputs = [ ats2 ];
meta = with lib; {

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

@ -6,15 +6,15 @@
buildGoModule rec {
pname = "conftest";
version = "0.36.0";
version = "0.37.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "conftest";
rev = "refs/tags/v${version}";
hash = "sha256-MzvCMPGg2FYInyXcTh/Y7RhhxH4Z7Y3m4Hkni1hi8wI=";
hash = "sha256-zJvBa7LIm14HI8//J3mfnXb506O3EJ7zrypMYni287Y=";
};
vendorHash = "sha256-Dl+ErHyHBf5KbHs7H6RmXT0cMIAQ6hReX4aGsoggWbo=";
vendorHash = "sha256-A0rEPfNMrb/Z7Y5j1uf9Q5uYqnvyxy0D0p7USyhf2DU=";
ldflags = [
"-s"

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

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.16.13";
version = "0.16.15";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-X4UB2RDfupUP+u+4g2jLxbpx4n4uarhcjs5VtP9Zi20=";
hash = "sha256-iTAtPHjrBvHweSIiAbkkbBLgjF3v68jipJEzc0I4G04=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

12
pkgs/development/tools/misc/blackfire/default.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "blackfire";
version = "2.13.1";
version = "2.13.2";
src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}");
@ -57,23 +57,23 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
sha256 = "ErlIjReX6ui3rLeEpZ87HjagRp+RswpOcEk17FFd0Rk=";
sha256 = "1/O1n0nO+adY7KNVnz6xkESyODiLw61x68xE84EKW+I=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
sha256 = "S/bV7AAsZhGrOZEeAY9E78nYcIykNMNzWobulUE06XE=";
sha256 = "fy3i++HpGuKH9ijPY61O66PhFyORIpjkZV++75H5738=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
sha256 = "SDIaZ4k5y85cJKrQOEPehj/vhActl49UHNXSqpspaog=";
sha256 = "zO3KWbrudhCGpbdCUBRWQkK/snvDdUOxKF9ukZC+vno=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
sha256 = "GAc3ikI8FVT9xFhrTWeX/pJVo147B0luPsS0QDYPv54=";
sha256 = "Sqn5tFpvlF9LbUyC1i38BsyM9B+MOmykt+5COMhuO1A=";
};
"x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
sha256 = "hy7u0lYI0qBdIDENFWea5aBeZWwwDITAl7WTlXjQuyM=";
sha256 = "9vrrBiz744s1W5FV7QO8QKL7pfK6OGPinnSOJSvMIOk=";
};
};

28
pkgs/development/tools/mold/default.nix
View File

@ -12,27 +12,38 @@
stdenv.mkDerivation rec {
pname = "mold";
version = "1.8.0";
version = "1.9.0";
src = fetchFromGitHub {
owner = "rui314";
repo = pname;
rev = "v${version}";
hash = "sha256-VykBOXeU3I6ZSmRIlngLdoLF4V2nb5QW/f8tr9Wn9o8=";
rev = "refs/tags/v${version}";
hash = "sha256-i4+MOEZWt+Qb05HgXcGR0uDuMoOAyMhVeLPQwnGiEw8=";
};
nativeBuildInputs = [ cmake ninja ];
nativeBuildInputs = [
cmake
ninja
];
buildInputs = [ openssl zlib ]
++ lib.optionals (!stdenv.isDarwin) [ mimalloc ];
buildInputs = [
openssl
zlib
] ++ lib.optionals (!stdenv.isDarwin) [
mimalloc
];
postPatch = ''
sed -i CMakeLists.txt -e '/.*set(DEST\ .*/d'
'';
cmakeFlags = [ "-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON" ];
cmakeFlags = [
"-DMOLD_USE_SYSTEM_MIMALLOC:BOOL=ON"
];
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-faligned-allocation" ];
NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [
"-faligned-allocation"
];
passthru.tests.version = testers.testVersion { package = mold; };
@ -45,6 +56,7 @@ stdenv.mkDerivation rec {
rapid debug-edit-rebuild cycles.
'';
homepage = "https://github.com/rui314/mold";
changelog = "https://github.com/rui314/mold/releases/tag/v${version}";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ azahi nitsky ];
platforms = platforms.unix;

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

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.212";
version = "0.0.215";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-1ZtuoKzmbnH/uGC8Fmyd3eihH+eyE3mtUrTteKGirAA=";
sha256 = "sha256-f/ZqHPZ1lhYn1iPz0dwIQQpjWmZj1fxBiVMTbT8bTRo=";
};
cargoSha256 = "sha256-yVoMxzI84jKrnntABHc65rzUX+R6P3z1J84x1hRrvTU=";
cargoSha256 = "sha256-o3W0yyqGh3CDgymISsJyxLolxwOAY4p8ldrCwU8qwiA=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices

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

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-chef";
version = "0.1.50";
version = "0.1.51";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-d467uk4UCtAKcpFYODxIhRrYoIOHzxhoaJVMA9ErRAw=";
sha256 = "sha256-K9oryItevSABbklaX5KKvKHuebFX8B0AgnizlpDhM5o=";
};
cargoSha256 = "sha256-5xj4/uxuMhlqY1ncrMU1IFWdVB4ZjHVXg0ZbRXDvIak=";
cargoHash = "sha256-KRhgYN8YMfotjkWAYP9RITbH9hudkakpWk53YZe9+Ks=";
meta = with lib; {
description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching";

17
pkgs/development/tools/rust/cargo-modules/default.nix
View File

@ -1,26 +1,17 @@
{ lib, rustPlatform, fetchFromGitHub, fetchpatch, stdenv, darwin }:
{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin }:
rustPlatform.buildRustPackage rec {
pname = "cargo-modules";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "regexident";
repo = pname;
rev = version;
sha256 = "sha256-QRBhlSHqOTJCdzZhqpcfLeCDuCfJsjyxa2+6yzzN52g=";
sha256 = "sha256-xjAjm23hzuyvxU0S7m9AsfvXui/jb0oFrAqcY8m9Cq0=";
};
cargoSha256 = "sha256-+asFAkUOHP9u/nOoHsr81KeqQkLqaRXhJH32oTG5vYo=";
cargoPatches = [
# https://github.com/regexident/cargo-modules/pull/161;
(fetchpatch {
name = "update-outdated-lock-file.patsh";
url = "https://github.com/regexident/cargo-modules/commit/ea9029b79acdadddbaf4067076690153c38cd09c.patch";
sha256 = "sha256-DOLvo/PP+4/6i1IYbl9oGC6BAnXNI88hK5he9549EJk=";
})
];
cargoSha256 = "sha256-XU4kNP0xODuY5I16zLZeQqpxS37HJI67YF3enB/5N+s=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreServices

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.0.441";
version = "0.0.443";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
sha256 = "sha256-T69OGS9w0furVOABvctzCxSgUJpwppWRFCmOlWzgagE=";
sha256 = "sha256-v4N2Li7AGPMMIfleJ6sk2fEwJ9cYXJeV6WcDp1rI0xY=";
};
vendorSha256 = "sha256-yVR3pUsveZf4052hr6aO4fnvEOQyHdm3N7khcobcoyE=";
vendorHash = "sha256-l921q3RHyEZ6dx8gHThrC18IUChUOYvB+W5PYsE7Nu0=";
subPackages = [ "." ];

6
pkgs/games/solicurses/default.nix
View File

@ -23,6 +23,10 @@ stdenv.mkDerivation {
cd build
'';
makeFlags = [
"CC=${stdenv.cc.targetPrefix}c++"
];
installPhase = ''
install -D SoliCurses.out $out/bin/solicurses
'';
@ -33,7 +37,5 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ laalsaas ];
license = licenses.gpl3Only;
inherit (ncurses.meta) platforms;
# never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin;
};
}

4
pkgs/games/tintin/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "tintin";
version = "2.02.20";
version = "2.02.30";
src = fetchFromGitHub {
owner = "scandum";
repo = "tintin";
rev = version;
hash = "sha256-H9Cjg/GkyV50pgewv77zOJ8/Op78P9sQmZ5LorO4L+A=";
hash = "sha256-zZ7bajZURMuaTn7vhN5DF2HUfNVlDWnp71FXPCbidnM=";
};
buildInputs = [ zlib pcre gnutls ]

4
pkgs/games/warzone2100/default.nix
View File

@ -44,11 +44,11 @@ in
stdenv.mkDerivation rec {
inherit pname;
version = "4.3.2";
version = "4.3.3";
src = fetchurl {
url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz";
sha256 = "sha256-RcpHk+p9Adu9zkd2J54hspeolZr/xsBsY8eUHLGY0xw=";
sha256 = "sha256-PDy5mIYAoQ9VAJCTRMiBqUlRtKIqVHiMuBiozTtH5Z4=";
};
buildInputs = [

3
pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix
View File

@ -21,4 +21,7 @@
# Also expose DebugSymbols; used by `llvmPackages_8.lldb` package.
DebugSymbols = {};
# Also expose MultitouchSupport; used by `chuck` package.
MultitouchSupport = {};
}

11
pkgs/os-specific/darwin/apple-sdk/default.nix
View File

@ -326,7 +326,16 @@ in rec {
"Versions/A/Frameworks/WebKitLegacy.framework/Versions/A/WebKitLegacy.tbd"
];
});
} // lib.genAttrs [ "ContactsPersistence" "CoreSymbolication" "DebugSymbols" "GameCenter" "SkyLight" "UIFoundation" ] (x: tbdOnlyFramework x {});
} // lib.genAttrs [
"ContactsPersistence"
"CoreSymbolication"
"DebugSymbols"
"GameCenter"
"MultitouchSupport"
"SkyLight"
"UIFoundation"
]
(x: tbdOnlyFramework x {});
bareFrameworks = lib.mapAttrs framework (import ./frameworks.nix {
inherit frameworks libs;

4
pkgs/servers/gotify/package.json
View File

@ -45,7 +45,7 @@
"@types/js-base64": "^3.3.1",
"@types/node": "^15.12.2",
"@types/notifyjs": "^3.0.2",
"@types/puppeteer": "^5.4.3",
"@types/puppeteer": "^5.4.6",
"@types/react": "^16.9.49",
"@types/react-dom": "^16.9.8",
"@types/react-infinite": "0.0.35",
@ -62,7 +62,7 @@
"eslint-plugin-unicorn": "^21.0.0",
"get-port": "^5.1.1",
"prettier": "^2.3.1",
"puppeteer": "^10.0.0",
"puppeteer": "^17.1.3",
"react-scripts": "^4.0.3",
"rimraf": "^3.0.2",
"tree-kill": "^1.2.0",

2
pkgs/servers/gotify/source-sha.nix
View File

@ -1 +1 @@
"1c8f7y580sq9495l2cxb2jkhgqs2wf0j3x073l1xnr9lv6crfvhn"
"0rpjn10ia47nia0g5a8khxy0r8grlfvcf1s5kdyj9512hcy25aca"

2
pkgs/servers/gotify/vendor-sha.nix
View File

@ -1 +1 @@
"sha256-ktmJ8rIBYL6/gwYG109sLqo16M0Xgre3wLBTuOTz3CY="
"sha256-TxxiyfWzlzQ2R2hgeBzB11FIiOz5rIBfaIm15DQ+dL0="

2
pkgs/servers/gotify/version.nix
View File

@ -1 +1 @@
"2.1.4"
"2.2.2"

3430
pkgs/servers/gotify/yarndeps.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/servers/http/lighttpd/default.nix
View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "lighttpd";
version = "1.4.67";
version = "1.4.68";
src = fetchurl {
url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz";
sha256 = "sha256-fgTXZ/UajYJLMuJIPvKVCYKSDUJ9EnLvRmf0nW+J81g=";
sha256 = "sha256-5W83rlK2PhraTXbOeABa/7blbuova9sM4X1tNulYM4Q=";
};
postPatch = ''

4
pkgs/servers/mail/postfix/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, gnused, db, openssl, cyrus_sasl, libnsl
, coreutils, findutils, gnugrep, gawk, icu, pcre, m4
, coreutils, findutils, gnugrep, gawk, icu, pcre2, m4
, fetchpatch
, buildPackages, nixosTests
, withLDAP ? true, openldap
@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper m4 ];
buildInputs = [ db openssl cyrus_sasl icu libnsl pcre ]
buildInputs = [ db openssl cyrus_sasl icu libnsl pcre2 ]
++ lib.optional withPgSQL postgresql
++ lib.optional withMySQL libmysqlclient
++ lib.optional withSQLite sqlite

6
pkgs/servers/search/meilisearch/default.nix
View File

@ -8,7 +8,7 @@
, nixosTests
}:
let version = "0.30.2";
let version = "0.30.5";
in
rustPlatform.buildRustPackage {
pname = "meilisearch";
@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
owner = "meilisearch";
repo = "MeiliSearch";
rev = "v${version}";
hash = "sha256-kxANzEORvR+BJDfLUD1FLorBuYjnUQixgD2jDoX6jrg=";
hash = "sha256-DvMMBF5Z2VdV3ObuD/gquZeimglyzFFVzgUq+/ra+Hc=";
};
cargoHash = "sha256-IYNIr7PBNNloPizaauFYR9/NPnBMS8kQi+RNsKsNjLE=";
cargoHash = "sha256-vA3DhGc0EuSdUeXYyG5iuuy7yK+22xPJjI67+/ctUFA=";
# Default features include mini dashboard which downloads something from the internet.
buildNoDefaultFeatures = true;

6
pkgs/shells/zsh/zsh-prezto/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-prezto";
version = "unstable-2022-04-05";
version = "unstable-2022-10-26";
src = fetchFromGitHub {
owner = "sorin-ionescu";
repo = "prezto";
rev = "2c663313168490d28f607738e962aa45ada0e26b";
sha256 = "05n2801xqdxc5nx0709mak1pr73l7aq5azd9adm0ym7si3vl59sj";
rev = "e3a9583f3370e11a0da1414d3f335eac40c1e922";
sha256 = "P4hgs6b3lKQCDCeyhepCn4HSZu7WuJE+j96PfFOLfl4=";
fetchSubmodules = true;
};

6
pkgs/tools/admin/kics/default.nix
View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "kics";
version = "1.6.6";
version = "1.6.7";
src = fetchFromGitHub {
owner = "Checkmarx";
repo = "kics";
rev = "v${version}";
sha256 = "sha256-/ceo4/dq9K3yZBl0P5C018C4IyhINUuZLTtA5t5K+v0=";
sha256 = "sha256-VtQauOf3FavXULFeWWw3aThHZAFMuwuI/FYr0dtZc0A=";
};
vendorSha256 = "sha256-1C2Sf9yvjklXOFy181VaeQ205VnlhLd8ucD9TsLIyg0=";
vendorHash = "sha256-0Y4+tG54McwcRVuHXJBfs6Zg1fJBffeDs7JYInqfXe0=";
subPackages = [ "cmd/console" ];

4
pkgs/tools/compression/imagelol/default.nix
View File

@ -27,13 +27,13 @@ stdenv.mkDerivation rec {
cp ./ImageLOL $out/bin
'';
cmakeFlags = lib.optional (stdenv.isDarwin && stdenv.isAarch64) "-DPNG_ARM_NEON=off";
meta = with lib; {
homepage = "https://github.com/MCredstoner2004/ImageLOL";
description = "Simple program to store a file into a PNG image";
license = licenses.mit;
maintainers = [ maintainers.ivar ];
platforms = platforms.unix;
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

2
pkgs/tools/misc/nautilus-open-any-terminal/default.nix
View File

@ -52,8 +52,6 @@ python3.pkgs.buildPythonPackage rec {
glib-compile-schemas "$out/share/glib-2.0/schemas"
'';
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
meta = with lib; {
description = "Extension for nautilus, which adds an context-entry for opening other terminal-emulators then `gnome-terminal`";
license = licenses.gpl3Plus;

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

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "tbls";
version = "1.56.9";
version = "1.57.1";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "tbls";
rev = "v${version}";
hash = "sha256-mZUmQoGfTc8nwzcAMIewB7usO5vfBZNCtZEOfYkYgvY=";
hash = "sha256-tFUkI+QNvvlorg2xk0obeFdEVKxv0T1rXr3tZUP0sGE=";
};
vendorHash = "sha256-pmnSeQHZEtsshldfq6D/r5pMYA5ivMWkzjOq2/WseYU=";
vendorHash = "sha256-E44gUzA9FW1TM0wfjVEmF5w/bgBrockluNIDkA7/hnU=";
CGO_CFLAGS = [ "-Wno-format-security" ];

13
pkgs/tools/networking/junkie/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libpcap, guile, openssl }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }:
stdenv.mkDerivation rec {
pname = "junkie";
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
rev = "v${version}";
sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31";
};
patches = [
# Pull upstream patch for -fno-common toolchains:
(fetchpatch {
@ -18,8 +19,14 @@ stdenv.mkDerivation rec {
sha256 = "1qg01jinqn5wr2mz77rzaidnrli35di0k7lnx6kfm7dh7v8kxbrr";
})
];
# IP_DONTFRAG is defined on macOS from Big Sur
postPatch = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") ''
sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h
'';
buildInputs = [ libpcap guile openssl ];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [
"GUILELIBDIR=\${out}/share/guile/site"
"GUILECACHEDIR=\${out}/lib/guile/ccache"
@ -40,7 +47,5 @@ stdenv.mkDerivation rec {
- a nettop tool;
- a tool listing TLS certificates...
'';
# never built on aarch64-darwin since first introduction in nixpkgs
broken = stdenv.isDarwin && stdenv.isAarch64;
};
}

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

@ -18,14 +18,14 @@
}:
stdenv.mkDerivation rec {
version = "1.7.7";
version = "1.7.8";
pname = "pmacct";
src = fetchFromGitHub {
owner = "pmacct";
repo = "pmacct";
rev = "v${version}";
sha256 = "1pjaa44qj3y5dfwsd1a9r7a4riy7afza8phx2npcsyyarssxc63w";
sha256 = "sha256-AcgZ5/8d1U/zGs4QeOkgkZS7ttCW6gtUv/Xuf4O4VE0=";
};
nativeBuildInputs = [

18
pkgs/tools/networking/tinyssh/default.nix
View File

@ -1,14 +1,17 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib
, stdenv
, fetchFromGitHub
}:
stdenv.mkDerivation rec {
pname = "tinyssh";
version = "20220801";
version = "20230101";
src = fetchFromGitHub {
owner = "janmojzis";
repo = "tinyssh";
rev = version;
sha256 = "sha256-y01Uq7SyIsFX3KL3V+fF6x3ukrUTuijxwwhPBE3ehI0=";
rev = "refs/tags/${version}";
hash = "sha256-yEqPrLp14AF0L1QLoIcBhTphmd6qVzOB9EVW0Miy8yM=";
};
preConfigure = ''
@ -19,10 +22,11 @@ stdenv.mkDerivation rec {
DESTDIR = placeholder "out";
meta = with lib; {
description = "minimalistic SSH server";
description = "Minimalistic SSH server";
homepage = "https://tinyssh.org";
license = licenses.publicDomain;
changelog = "https://github.com/janmojzis/tinyssh/releases/tag/${version}";
license = licenses.cc0;
platforms = platforms.unix;
maintainers = [ maintainers.kaction ];
maintainers = with maintainers; [ kaction ];
};
}

9
pkgs/tools/security/cdk-go/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "cdk-go";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "cdk-team";
repo = "CDK";
rev = "v${version}";
sha256 = "sha256-17LeHYhOhRt6s9Hhb5yhCUUdauVgYHI4QCUPoPMr4DI=";
rev = "refs/tags/v${version}";
hash = "sha256-d1EwKu3QUbIhpgSQLL3GqaPQJ1K/QxwhsHuX5y1jWH0=";
};
vendorSha256 = "sha256-aJN/d/BxmleRXKw6++k6e0Vb0Gs5zg1QfakviABYTog=";
vendorHash = "sha256-aJN/d/BxmleRXKw6++k6e0Vb0Gs5zg1QfakviABYTog=";
# At least one test is outdated
doCheck = false;
@ -23,6 +23,7 @@ buildGoModule rec {
meta = with lib; {
description = "Container penetration toolkit";
homepage = "https://github.com/cdk-team/CDK";
changelog = "https://github.com/cdk-team/CDK/releases/tag/v${version}";
license = with licenses; [ gpl2Only ];
maintainers = with maintainers; [ fab ];
mainProgram = "cdk";

Some files were not shown because too many files have changed in this diff Show More