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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-12-02 06:00:54 +00:00 committed by GitHub
commit 18f8671334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 2198 additions and 534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
maintainers/maintainer-list.nix
View File

@ -6555,6 +6555,12 @@
githubId = 67984144;
name = "Gerhard Schwanzer";
};
gernotfeichter = {
email = "gernotfeichter@gmail.com";
github = "gernotfeichter";
githubId = 23199375;
name = "Gernot Feichter";
};
gerschtli = {
email = "tobias.happ@gmx.de";
github = "Gerschtli";
@ -15230,6 +15236,12 @@
githubId = 816465;
name = "Redvers Davies";
};
redxtech = {
email = "gabe@gabedunn.dev";
github = "redxtech";
githubId = 18155001;
name = "Gabe Dunn";
};
reedrw = {
email = "reedrw5601@gmail.com";
github = "reedrw";
@ -15329,6 +15341,15 @@
githubId = 44014925;
name = "Rexx Larsson";
};
RGBCube = {
name = "RGBCube";
email = "rgbsphere+nixpkgs@gmail.com";
github = "RGBCube";
githubId = 78925721;
keys = [{
fingerprint = "jPaU3Vpm/GN0tUuDg72n2+bd9dDMWe4bnKM325eP7eI";
}];
};
rgnns = {
email = "jglievano@gmail.com";
github = "rgnns";

2
nixos/modules/services/web-apps/netbox.nix
View File

@ -317,7 +317,7 @@ in {
serviceConfig = defaultServiceConfig // {
ExecStart = ''
${pkgs.python3Packages.gunicorn}/bin/gunicorn netbox.wsgi \
${pkg.gunicorn}/bin/gunicorn netbox.wsgi \
--bind ${cfg.listenAddress}:${toString cfg.port} \
--pythonpath ${pkg}/opt/netbox/netbox
'';

6
nixos/tests/all-terminfo.nix
View File

@ -10,7 +10,11 @@ import ./make-test-python.nix ({ pkgs, ... }: rec {
let
o = builtins.tryEval drv;
in
o.success && lib.isDerivation o.value && o.value ? outputs && builtins.elem "terminfo" o.value.outputs;
o.success &&
lib.isDerivation o.value &&
o.value ? outputs &&
builtins.elem "terminfo" o.value.outputs &&
!o.value.meta.broken;
terminfos = lib.filterAttrs infoFilter pkgs;
excludedTerminfos = lib.filterAttrs (_: drv: !(builtins.elem drv.terminfo config.environment.systemPackages)) terminfos;
includedOuts = lib.filterAttrs (_: drv: builtins.elem drv.out config.environment.systemPackages) terminfos;

76
pkgs/applications/editors/cosmic-edit/default.nix
View File

@ -1,76 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, rust
, rustPlatform
, cmake
, makeWrapper
, cosmic-icons
, just
, pkg-config
, libxkbcommon
, glib
, gtk3
, libinput
, fontconfig
, freetype
, wayland
}:
rustPlatform.buildRustPackage rec {
pname = "cosmic-edit";
version = "unstable-2023-11-02";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-edit";
rev = "ee2dea71e6e21967bc705046f9650407d07cdada";
sha256 = "sha256-27j9Imlyzwy2yjpNsWWcX0qW38ZxMDkht1Eaggr4NYY=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
"cosmic-config-0.1.0" = "sha256-VKvJ7cNwMLLs6ElpgP6xwsBUnD5MDApwWl7rrb/Lr/U=";
"cosmic-text-0.10.0" = "sha256-g9y2qZ2ivpDtZAtsXqMXgGjUFi9QZx/weMhk7hmnB3E=";
"sctk-adwaita-0.5.4" = "sha256-yK0F2w/0nxyKrSiHZbx7+aPNY2vlFs7s8nu/COp2KqQ=";
"smithay-client-toolkit-0.16.1" = "sha256-z7EZThbh7YmKzAACv181zaEZmWxTrMkFRzP0nfsHK6c=";
"softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY=";
"taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw=";
"winit-0.28.6" = "sha256-FhW6d2XnXCGJUMoT9EMQew9/OPXiehy/JraeCiVd76M=";
};
};
postPatch = ''
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
'';
nativeBuildInputs = [ cmake just pkg-config makeWrapper ];
buildInputs = [ libxkbcommon libinput fontconfig freetype wayland glib gtk3 ];
dontUseJustBuild = true;
justFlags = [
"--set"
"prefix"
(placeholder "out")
"--set"
"bin-src"
"target/${rust.lib.toRustTargetSpecShort stdenv.hostPlatform}/release/cosmic-edit"
];
postInstall = ''
wrapProgram "$out/bin/${pname}" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share"
'';
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-edit";
description = "Text Editor for the COSMIC Desktop Environment";
license = licenses.gpl3Only;
mainProgram = "cosmic-edit";
maintainers = with maintainers; [ ahoneybun ];
platforms = platforms.linux;
};
}

6
pkgs/applications/misc/lscolors/default.nix
View File

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "lscolors";
version = "0.15.0";
version = "0.16.0";
src = fetchCrate {
inherit version pname;
sha256 = "sha256-C7aM9jlChRwPvYnBjLbV+sfbTHDVVi6evIR5PvT9jN4=";
hash = "sha256-gLtQIqdU6syTo+Z+P59kIpwEtiGCr/DOom9+jA8Uq98=";
};
cargoHash = "sha256-93FAEhl0WFXRq1SaoLRNDd/fy7NyDbeRFgIqUWAssQE=";
cargoHash = "sha256-OA9iYGwKElvRaKoyelH9w5ZphoLKrbk8VXwZ2NyLLQY=";
buildFeatures = [ "nu-ansi-term" ];

12
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -41,7 +41,7 @@
, at-spi2-core
, autoPatchelfHook
, wrapGAppsHook
, qt5
, qt6
, proprietaryCodecs ? false
, vivaldi-ffmpeg-codecs
}:
@ -51,11 +51,11 @@ let
in
stdenv.mkDerivation rec {
pname = "opera";
version = "100.0.4815.47";
version = "105.0.4970.21";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
hash = "sha256-746imLXqxzf9zK2QEVRuWkLA6m+HHXBYZFUwTD0HEVc=";
hash = "sha256-fgbR7qAWKaZgxMeMo1/le8g1/zSoTl+5iIJeKl1Rc3Y=";
};
unpackPhase = "dpkg-deb -x $src .";
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
dpkg
autoPatchelfHook
wrapGAppsHook
qt5.wrapQtAppsHook
qt6.wrapQtAppsHook
];
buildInputs = [
@ -103,6 +103,7 @@ stdenv.mkDerivation rec {
nss
pango
stdenv.cc.cc.lib
qt6.qtbase
];
runtimeDependencies = [
@ -128,6 +129,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -r usr $out
cp -r usr/share $out/share
# we already using QT6, autopatchelf wants to patch this as well
rm $out/usr/lib/x86_64-linux-gnu/opera/libqt5_shim.so
ln -s $out/usr/bin/opera $out/bin/opera
'';

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
version = "4.6.1";
version = "4.6.2";
src = fetchFromGitHub {
owner = "StackExchange";
repo = "dnscontrol";
rev = "v${version}";
sha256 = "sha256-FJxr3uq2f8jDG3g06SRO8sTIc6qHqSAOJVYHr4Ug1ag=";
hash = "sha256-FcEpUNFPwottpuIsO53voucKULTkWOdbDgEXKYLb9LQ=";
};
vendorHash = "sha256-O7uuUkS9kX0TdevSg1mrrPMVl4kMZW3rwoIVb/eaNiM=";
vendorHash = "sha256-cW6urAJ3H30HY4Q7JLWFsQebg6YhdGSBgICWMl85v9U=";
subPackages = [ "." ];

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

@ -1,8 +1,8 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
version = "6.39.1";
hash = "sha256-dDbUpxXpQg1SoVyYO33Nczqf+WmWDPNE6cmw792wjGY=";
version = "6.40.0";
hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4=";
};
signal-desktop-beta = {
dir = "Signal Beta";

4
pkgs/applications/science/misc/simgrid/default.nix
View File

@ -20,14 +20,14 @@ in
stdenv.mkDerivation rec {
pname = "simgrid";
version = "3.34";
version = "3.35";
src = fetchFromGitLab {
domain = "framagit.org";
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-EVTpW9jD1h8T2KRlDIqptKS6Wv1dVDfyJbXxrpsgmoo=";
sha256 = "sha256-WaFANZiPfiN/utfNZbwyH5mxgJNWafPMCcL863V8w0g=";
};
propagatedBuildInputs = [ boost ];

4
pkgs/applications/virtualization/tart/default.nix
View File

@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tart";
version = "2.3.0";
version = "2.4.1";
src = fetchurl {
url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz";
sha256 = "sha256-LdzP0Vovda0W6uBg71dJlTxP+Qly+c2Shv3xrMmxYDg=";
sha256 = "sha256-dCKUwDC7M3u8/8yJQp/v0zy7GuB7SvjnRmTLtodUz80=";
};
sourceRoot = ".";

16
pkgs/applications/window-managers/weston/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch2
{ lib, stdenv, fetchurl
, meson, ninja, pkg-config, python3, wayland-scanner
, cairo, libGL, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland
, wayland-protocols, xcbutilcursor
@ -19,23 +19,13 @@
stdenv.mkDerivation rec {
pname = "weston";
version = "12.0.2";
version = "13.0.0";
src = fetchurl {
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
hash = "sha256-62hqfPAJkqI7F/GS/KmohzE+ksNG7jXYV1GWmD1la0o=";
hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo=";
};
patches = [
# ci, backend-vnc: update to Neat VNC 0.7.0
# part of https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1051
(fetchpatch2 {
url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/8895b15f3dfc555a869e310ff6e16ff5dced1336.patch";
hash = "sha256-PGAmQhzG8gZcYRaZwhKPlgzfbILIXGAHLSd9dCHAP1A=";
excludes = [ ".gitlab-ci.yml" ];
})
];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
buildInputs = [

56
pkgs/by-name/al/alp/package.nix Normal file
View File

@ -0,0 +1,56 @@
{ stdenv
, lib
, buildGoModule
, fetchFromGitHub
, runCommand
, alp
}:
buildGoModule rec {
pname = "alp";
version = "1.1.17";
src = fetchFromGitHub {
owner = "gernotfeichter";
repo = "alp";
rev = version;
hash = "sha256-7lyWu1bVn7UwLb/Em6VBbg3FrMyxGjebxt5gJhm/xpI=";
};
vendorHash = "sha256-a2CQZKN/rPWh/Pn9gXfSArTCcGST472tsz1Kqm7M4vM=";
sourceRoot = "${src.name}/linux";
# Executing Go commands directly in checkPhase and buildPhase below,
# because the default testsuite runs all go tests, some of which require docker.
# Docker is too expensive for https://github.com/NixOS/ofborg.
checkPhase = ''
runHook preCheck
go test -run Test_main_init
runHook postCheck
'';
buildPhase = ''
runHook preBuild
go build -o $GOPATH/bin/${pname} main.go
runHook postBuild
'';
passthru.tests = {
test-version = runCommand "${pname}-test" {} ''
${alp}/bin/alp version > $out
cat $out | grep '${version}'
'';
};
meta = with lib; {
description = "A convenient authentication method that lets you use your android device as a key for your Linux machine";
homepage = "https://github.com/gernotfeichter/alp";
license = licenses.gpl2Only;
mainProgram = "alp";
maintainers = with maintainers; [ gernotfeichter ];
};
}

1964
pkgs/applications/editors/cosmic-edit/Cargo.lock → pkgs/by-name/co/cosmic-edit/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

97
pkgs/by-name/co/cosmic-edit/package.nix Normal file
View File

@ -0,0 +1,97 @@
{
lib,
stdenv,
fetchFromGitHub,
rust,
rustPlatform,
cmake,
makeBinaryWrapper,
cosmic-icons,
just,
pkg-config,
libxkbcommon,
glib,
gtk3,
libinput,
fontconfig,
freetype,
wayland,
xorg,
}:
rustPlatform.buildRustPackage rec {
pname = "cosmic-edit";
version = "unstable-2023-11-29";
src = fetchFromGitHub {
owner = "pop-os";
repo = pname;
rev = "4a3dd101f35eb3c1c585f104d78ed4ee31d393d3";
hash = "sha256-pk+4u13oWZ4fgXy1tlDgq+E4J+UddjTNSexMm4dgBSo=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
"cosmic-config-0.1.0" = "sha256-wBliqZbRHYiwZmu0vHeIP5DFzg/1IeQP3aMxiYC88bo=";
"cosmic-text-0.10.0" = "sha256-fE5HkhITLw0OBfFLFMsKEJw5idO265i4S7qylHTt7C0=";
"sctk-adwaita-0.5.4" = "sha256-yK0F2w/0nxyKrSiHZbx7+aPNY2vlFs7s8nu/COp2KqQ=";
"softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
"smithay-client-toolkit-0.16.1" = "sha256-z7EZThbh7YmKzAACv181zaEZmWxTrMkFRzP0nfsHK6c=";
"systemicons-0.7.0" = "sha256-zzAI+6mnpQOh+3mX7/sJ+w4a7uX27RduQ99PNxLNF78=";
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
"winit-0.28.6" = "sha256-FhW6d2XnXCGJUMoT9EMQew9/OPXiehy/JraeCiVd76M=";
};
};
postPatch = ''
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
'';
nativeBuildInputs = [
cmake
just
pkg-config
makeBinaryWrapper
];
buildInputs = [
libxkbcommon
xorg.libX11
libinput
fontconfig
freetype
wayland
glib
gtk3
];
dontUseJustBuild = true;
justFlags = [
"--set"
"prefix"
(placeholder "out")
"--set"
"bin-src"
"target/${
rust.lib.toRustTargetSpecShort stdenv.hostPlatform
}/release/cosmic-edit"
];
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
postInstall = ''
wrapProgram "$out/bin/${pname}" \
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 ]}
'';
meta = with lib; {
homepage = "https://github.com/pop-os/cosmic-edit";
description = "Text Editor for the COSMIC Desktop Environment";
license = licenses.gpl3Only;
maintainers = with maintainers; [ ahoneybun ];
platforms = platforms.linux;
};
}

33
pkgs/by-name/do/doge/package.nix Normal file
View File

@ -0,0 +1,33 @@
{
lib,
python3Packages,
fetchFromGitHub,
fetchpatch,
}:
python3Packages.buildPythonPackage rec {
pname = "doge";
version = "3.6.0";
src = fetchFromGitHub {
owner = "Olivia5k";
repo = "doge";
rev = version;
hash = "sha256-72nRghD5k0ofrlvV3hEdyrr6uzV4+8At1bOCmRZTxhk=";
};
patches = [
# https://github.com/Olivia5k/doge/pull/66, adds a small doge
(fetchpatch {
url = "https://github.com/Olivia5k/doge/commit/14e3ccc0a3f1e91862492e20a34d008768a34039.patch";
hash = "sha256-3F+7F9RuoiVWoN+69T7tM871AXX1IQbHqFxD+S3TjxQ=";
})
];
meta = {
homepage = "https://github.com/Olivia5k/doge";
description = "Wow very terminal doge";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [Gonzih quantenzitrone];
mainProgram = "doge";
};
}

56
pkgs/by-name/li/lib3270/package.nix Normal file
View File

@ -0,0 +1,56 @@
{ lib
, stdenv
, fetchFromGitHub
, which
, pkg-config
, autoconf
, automake
, libtool
, gettext
, openssl
, curl
}:
stdenv.mkDerivation rec {
pname = "lib3270";
version = "5.4";
src = fetchFromGitHub {
owner = "PerryWerneck";
repo = pname;
rev = version;
hash = "sha256-w6Bg+TvSDAuZwtu/nyAIuq6pgheM5nXtfuryECfnKng=";
};
nativeBuildInputs = [
which
pkg-config
autoconf
automake
libtool
];
buildInputs = [
gettext
openssl
curl
];
postPatch = ''
# Patch the required version.
sed -i -e "s/20211118/19800101/" src/core/session.c
'';
preConfigure = ''
NOCONFIGURE=1 sh autogen.sh
'';
enableParallelBuilds = true;
meta = with lib; {
description = "TN3270 client Library";
homepage = "https://github.com/PerryWerneck/lib3270";
license = licenses.lgpl3Plus;
maintainers = [ maintainers.vifino ];
};
}

58
pkgs/by-name/li/libv3270/package.nix Normal file
View File

@ -0,0 +1,58 @@
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, automake
, libtool
, which
, pkg-config
, gtk3
, lib3270
}:
stdenv.mkDerivation rec {
pname = "libv3270";
version = "5.4";
src = fetchFromGitHub {
owner = "PerryWerneck";
repo = pname;
rev = version;
hash = "sha256-Z3FvxPa1pfeECxfB5ZL6gwhkbTKFpfO3D/zLVLF+uiI=";
};
nativeBuildInputs = [
which
pkg-config
autoconf
automake
libtool
];
buildInputs = [
gtk3
lib3270
];
postPatch = ''
# lib3270_build_data_filename is relative to lib3270's share - not ours.
for f in $(find . -type f -iname "*.c"); do
sed -i -e "s@lib3270_build_data_filename(@g_build_filename(\"$out/share/pw3270\", @" "$f"
done
'';
preConfigure = ''
mkdir -p scripts
touch scripts/config.rpath
NOCONFIGURE=1 sh ./autogen.sh
'';
enableParallelBuilds = true;
meta = with lib; {
description = "3270 Virtual Terminal for GTK";
homepage = "https://github.com/PerryWerneck/libv3270";
license = licenses.lgpl3Plus;
maintainers = [ maintainers.vifino ];
};
}

42
pkgs/by-name/ma/material-cursors/package.nix Normal file
View File

@ -0,0 +1,42 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, inkscape
, xcursorgen
}:
stdenvNoCC.mkDerivation {
pname = "material-cursors";
version = "unstable-2023-11-30";
src = fetchFromGitHub {
owner = "varlesh";
repo = "material-cursors";
rev = "2a5f302fefe04678c421473bed636b4d87774b4a";
hash = "sha256-uC2qx3jF4d2tGLPnXEpogm0vyC053MvDVVdVXX8AZ60=";
};
nativeBuildInputs = [
inkscape
xcursorgen
];
buildPhase = ''
runHook preBuild
# Silences the inkscape warning spam.
HOME=$(pwd) bash build.sh 2> /dev/null
runHook postBuild
'';
installFlags = [ "PREFIX=$(out)" ];
meta = {
description = "Material cursors for Linux";
homepage = "https://github.com/varlesh/material-cursors";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ RGBCube ];
};
}

67
pkgs/by-name/pa/passwdqc/package.nix Normal file
View File

@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, libxcrypt
, pam
, pkg-config
}:
stdenv.mkDerivation (finalAttrs: {
pname = "passwdqc";
version = "2.0.3";
src = fetchFromGitHub {
owner = "openwall";
repo = "passwdqc";
rev = "v${finalAttrs.version}";
hash = "sha256-EgPeccqS+DDDMBVMc4bd70EMnXFuyglftxuqoaYHwNY=";
};
patches = [
(fetchpatch {
name = "0001-fix-solaris-macos-builds.patch";
url = "https://github.com/openwall/passwdqc/commit/fbf38229857f3d1982aa305c20da5e1ea0195b3e.patch";
hash = "sha256-FaEWROHwFzd4ZTeKyPvuAr9vcgnHEv8MhERblIU8JC4=";
})
];
outputs = [ "out" "man" ];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libxcrypt
pam
];
strictDeps = true;
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
installFlags = [
# Yet another software that does not use GNUInstallDirs Convention...
"BINDIR=$(out)/bin"
"CONFDIR=$(out)/etc"
"DEVEL_LIBDIR=$(out)/lib"
"INCLUDEDIR=$(out)/include"
"LOCALEDIR=$(out)/share/locale"
"MANDIR=$(man)/man"
"PKGCONFIGDIR=$(out)/lib/pkgconfig"
"SECUREDIR=$(out)/lib/security"
"SECUREDIR_DARWIN=$(out)/lib/security"
"SHARED_LIBDIR=$(out)/lib"
"SHARED_LIBDIR_REL=$(out)/lib"
];
meta = {
homepage = "https://www.openwall.com/passwdqc/";
description = "Passphrase strength checking and enforcement";
license = with lib.licenses; [ bsd3 ];
maintainers = with lib.maintainers; [ AndersonTorres ];
mainProgram = "passwdqc";
platforms = lib.platforms.unix;
};
})

76
pkgs/by-name/pw/pw3270/package.nix Normal file
View File

@ -0,0 +1,76 @@
{ lib
, stdenv
, fetchFromGitHub
, which
, pkg-config
, automake
, autoconf
, m4
, libtool
, gtk3
, libv3270
, lib3270
, openssl
, gettext
, desktop-file-utils
, glib
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "pw3270";
version = "5.4";
src = fetchFromGitHub {
owner = "PerryWerneck";
repo = pname;
rev = version;
hash = "sha256-Nk/OUqrWngKgb1D1Wi8q5ygKtvuRKUPhPQaLvWi1Z4g=";
};
nativeBuildInputs = [
which
pkg-config
autoconf
automake
libtool
desktop-file-utils
wrapGAppsHook
];
buildInputs = [
gtk3
gettext
libv3270
lib3270
openssl
];
postPatch = ''
# lib3270_build_data_filename is relative to lib3270's share - not ours.
for f in $(find . -type f -iname "*.c"); do
sed -i -e "s@lib3270_build_data_filename(@g_build_filename(\"$out/share/pw3270\", @" "$f"
done
'';
preConfigure = ''
NOCONFIGURE=1 sh autogen.sh
'';
postFixup = ''
# Schemas get installed to wrong directory.
mkdir -p $out/share/glib-2.0
mv $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas $out/share/glib-2.0/
rm -rf $out/share/gsettings-schemas
'';
enableParallelBuilds = true;
meta = with lib; {
description = "3270 Emulator for gtk";
homepage = "https://softwarepublico.gov.br/social/pw3270/";
license = licenses.lgpl3Plus;
maintainers = [ maintainers.vifino ];
mainProgram = "pw3270";
};
}

33
pkgs/data/icons/vimix-cursor-theme/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenvNoCC
, fetchFromGitHub
, lib
}:
stdenvNoCC.mkDerivation rec {
pname = "vimix-cursor-theme";
version = "2020-02-24";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "Vimix-cursors";
rev = version;
hash = "sha256-TfcDer85+UOtDMJVZJQr81dDy4ekjYgEvH1RE1IHMi4=";
};
installPhase = ''
sed -i 's/Vimix Cursors$/Vimix-Cursors/g' dist{,-white}/index.theme
install -dm 755 $out/share/icons/Vimix-Cursors{,-White}
cp -dr --no-preserve='ownership' dist/* $out/share/icons/Vimix-Cursors
cp -dr --no-preserve='ownership' dist-white/* $out/share/icons/Vimix-Cursors-White
'';
meta = with lib; {
description = "An x-cursor theme inspired by Materia design and based on capitaine-cursors";
homepage = "https://github.com/vinceliuice/Vimix-cursors";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ redxtech ];
};
}

6
pkgs/development/compilers/sagittarius-scheme/default.nix
View File

@ -6,7 +6,7 @@
, boehmgc
, openssl
, zlib
, odbcSupport ? true
, odbcSupport ? !stdenv.isDarwin
, libiodbc
}:
@ -31,8 +31,10 @@ stdenv.mkDerivation rec {
buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc;
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=int-conversion";
meta = with lib; {
broken = stdenv.isDarwin;
broken = stdenv.isDarwin && stdenv.isAarch64;
description = "An R6RS/R7RS Scheme system";
longDescription = ''
Sagittarius Scheme is a free Scheme implementation supporting

5
pkgs/development/interpreters/rakudo/moarvm.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, cctools-port
, perl
, CoreServices
, ApplicationServices
@ -29,6 +30,10 @@ stdenv.mkDerivation rec {
--replace '`sw_vers -productVersion`' '"$MACOSX_DEPLOYMENT_TARGET"'
'';
nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
cctools-port
];
buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
doCheck = false; # MoarVM does not come with its own test suite

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

@ -23,7 +23,7 @@ let
in
buildPythonPackage rec {
pname = "dataprep-ml";
version = "0.0.18";
version = "0.0.20";
pyproject = true;
disabled = pythonOlder "3.8";
@ -32,7 +32,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "dataprep_ml";
inherit version;
hash = "sha256-nIqyRwv62j8x5Fy7ILMLWxw6yJmkkNRE1zyUlfvRYTI=";
hash = "sha256-X6mTTj4hfnqiCPMFrc8ESFp2E7bRNELLR1uL/dGzsPg=";
};
nativeBuildInputs = [

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "dvc-objects";
version = "1.2.0";
version = "1.3.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-kTp0CowXtnLXetcnoCeqlXoadgaQhL5mTYTfq9QLIl8=";
hash = "sha256-mqFrXwXMvndXb9oUVwu2IOG7Ltti6AT9acsQx/gdRSs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -20,7 +20,7 @@
let
pname = "torchmetrics";
version = "1.2.0";
version = "1.2.1";
in
buildPythonPackage {
inherit pname version;
@ -30,7 +30,7 @@ buildPythonPackage {
owner = "Lightning-AI";
repo = "torchmetrics";
rev = "refs/tags/v${version}";
hash = "sha256-g5JuTbiRd8yWx2nM3UE8ejOhuZ0XpAQdS5AC9AlrSFY=";
hash = "sha256-uvebKCJL2TSQUGmtVE1MtYwzgs+0lWvHvsN5PwJyl/g=";
};
disabled = pythonOlder "3.8";
@ -90,6 +90,7 @@ buildPythonPackage {
meta = with lib; {
description = "Machine learning metrics for distributed, scalable PyTorch applications (used in pytorch-lightning)";
homepage = "https://lightning.ai/docs/torchmetrics/";
changelog = "https://github.com/Lightning-AI/torchmetrics/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [
SomeoneSerge

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

@ -24,7 +24,7 @@ let
in
buildPythonPackage rec {
pname = "type-infer";
version = "0.0.15";
version = "0.0.16";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -33,7 +33,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "type_infer";
inherit version;
hash = "sha256-AnThYE6hHc3Pwu8fl0VBiQJfGVjeEKo4RrCsOl2pfCA=";
hash = "sha256-EWH8odCHAzrEcBtFEYBm5gt4zlrwrK33c6uEfFBgPfA=";
};
nativeBuildInputs = [

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gojq";
version = "0.12.13";
version = "0.12.14";
src = fetchFromGitHub {
owner = "itchyny";
repo = pname;
rev = "v${version}";
hash = "sha256-tlnj0CCsPZRQjIZCvNPjN0JD6oqRDvdWOCYR3tYMPUA=";
hash = "sha256-mgmgOi3nMPwmcofEAVIN9nTE2oXnNN89lqT+Vi+sjzY=";
};
vendorHash = "sha256-DVJZ35C+6SuhaaGDM3u+3fB1497qaW6oTByAUPVwhJI=";
vendorHash = "sha256-dv4k2dIFnlJrGDTDM4mXBOpr4MF7oxms0y02ml50YyY=";
ldflags = [ "-s" "-w" ];

19
pkgs/development/tools/heroku/default.nix
View File

@ -1,12 +1,19 @@
{ stdenv, lib, fetchurl, makeWrapper, nodejs }:
{ stdenv, lib, fetchzip, makeWrapper, nodejs }:
stdenv.mkDerivation rec {
let
# version and commit pairs can be found in the URLs at
# https://cli-assets.heroku.com/versions/heroku-linux-x64-tar-xz.json
version = "8.7.1";
commit = "3f5e369";
hash = "sha256-3pCutQBS8N1Yw4JKTvU046UrOxBi0wLRQywxwezAEeU";
in
stdenv.mkDerivation {
pname = "heroku";
version = "7.66.4";
inherit version;
src = fetchurl {
url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz";
sha256 = "sha256-AAiC88RBqR5RXeIj39in7hlvI3JNQB6KUwGmt9jo93A=";
src = fetchzip {
url = "https://cli-assets.heroku.com/versions/${version}/${commit}/heroku-v${version}-${commit}-linux-x64.tar.xz";
inherit hash;
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/misc/ycmd/default.nix
View File

@ -9,15 +9,15 @@
stdenv.mkDerivation {
pname = "ycmd";
version = "unstable-2022-08-15";
version = "unstable-2023-11-06";
disabled = !python.isPy3k;
# required for third_party directory creation
src = fetchFromGitHub {
owner = "ycm-core";
repo = "ycmd";
rev = "323d4b60f077bd07945f25a60c4584843ca851fb";
sha256 = "sha256-5IpXMQc3QIkKJkUrOPSRzciLvL1nhQw6wlP+pVnIucE=";
rev = "0607eed2bc211f88f82657b7781f4fe66579855b";
hash = "sha256-SzEcMQ4lX7NL2/g9tuhA6CaZ8pX/DGs7Fla/gr+RcOU=";
fetchSubmodules = true;
};

19
pkgs/misc/doge/default.nix
View File

@ -1,19 +0,0 @@
{ lib, python3Packages, fetchPypi }:
python3Packages.buildPythonPackage rec {
pname = "doge";
version = "3.5.0";
src = fetchPypi {
inherit pname version;
sha256 = "0lwdl06lbpnaqqjk8ap9dsags3bzma30z17v0zc7spng1gz8m6xj";
};
meta = with lib; {
homepage = "https://github.com/thiderman/doge";
description = "wow very terminal doge";
license = licenses.mit;
maintainers = with maintainers; [ Gonzih ];
mainProgram = "doge";
};
}

6
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -275,6 +275,12 @@ let
INFINIBAND = module;
INFINIBAND_IPOIB = module;
INFINIBAND_IPOIB_CM = yes;
} // optionalAttrs (stdenv.hostPlatform.system == "aarch64-linux") {
# Not enabled by default, hides modules behind it
NET_VENDOR_MEDIATEK = yes;
# Enable SoC interface for MT7915 module, required for MT798X.
MT7986_WMAC = whenBetween "5.18" "6.6" yes;
MT798X_WMAC = whenAtLeast "6.6" yes;
};
wireless = {

2
pkgs/servers/web-apps/netbox/generic.nix
View File

@ -1,6 +1,5 @@
{ lib
, fetchFromGitHub
, fetchpatch
, python3
, version
, hash
@ -94,6 +93,7 @@
passthru = {
# PYTHONPATH of all dependencies used by the package
pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;
gunicorn = python3.pkgs.gunicorn;
inherit tests;
};

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

@ -17952,6 +17952,7 @@ with pkgs;
rakudo = callPackage ../development/interpreters/rakudo { };
moarvm = callPackage ../development/interpreters/rakudo/moarvm.nix {
inherit (darwin) cctools-port;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
};
nqp = callPackage ../development/interpreters/rakudo/nqp.nix { };
@ -29230,8 +29231,6 @@ with pkgs;
documize-community = callPackage ../servers/documize-community { };
doge = callPackage ../misc/doge { };
doulos-sil = callPackage ../data/fonts/doulos-sil { };
cabin = callPackage ../data/fonts/cabin { };
@ -30195,6 +30194,8 @@ with pkgs;
victor-mono = callPackage ../data/fonts/victor-mono { };
vimix-cursor-theme = callPackage ../data/icons/vimix-cursor-theme { };
vimix-gtk-themes = callPackage ../data/themes/vimix {
inherit (gnome) gnome-shell;
};
@ -31008,8 +31009,6 @@ with pkgs;
cosmic-settings = callPackage ../applications/window-managers/cosmic/settings { };
cosmic-edit = callPackage ../applications/editors/cosmic-edit { };
coursera-dl = callPackage ../applications/misc/coursera-dl { };
coyim = callPackage ../applications/networking/instant-messengers/coyim { };