Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-05-09 00:02:27 +00:00 committed by GitHub
commit f39e774f11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
95 changed files with 1245 additions and 4490 deletions

View File

@ -9026,6 +9026,12 @@
email = "nfjinjing@gmail.com";
name = "Jinjing Wang";
};
ngiger = {
email = "niklaus.giger@member.fsf.org";
github = "ngiger";
githubId = 265800;
name = "Niklaus Giger";
};
nh2 = {
email = "mail@nh2.me";
matrix = "@nh2:matrix.org";

View File

@ -0,0 +1,21 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.hardware.keyboard.uhk;
in
{
options.hardware.keyboard.uhk = {
enable = mkEnableOption ''
non-root access to the firmware of UHK keyboards.
You need it when you want to flash a new firmware on the keyboard.
Access to the keyboard is granted to users in the "input" group.
You may want to install the uhk-agent package.
'';
};
config = mkIf cfg.enable {
services.udev.packages = [ pkgs.uhk-udev-rules ];
};
}

View File

@ -177,6 +177,10 @@ in
# users.users.jane = {
# isNormalUser = true;
# extraGroups = [ "wheel" ]; # Enable sudo for the user.
# packages = with pkgs; [
# firefox
# thunderbird
# ];
# };
# List packages installed in system profile. To search, run:
@ -184,7 +188,6 @@ in
# environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
# firefox
# ];
# Some programs need SUID wrappers, can be configured further or are

View File

@ -57,6 +57,7 @@
./hardware/sensor/hddtemp.nix
./hardware/sensor/iio.nix
./hardware/keyboard/teck.nix
./hardware/keyboard/uhk.nix
./hardware/keyboard/zsa.nix
./hardware/ksm.nix
./hardware/ledger.nix

View File

@ -26,8 +26,7 @@ in
config = mkIf cfg.enable {
# TODO: Rename to .conf in upcomming release
environment.etc."usbrelayd.ini".text = ''
environment.etc."usbrelayd.conf".text = ''
[MQTT]
BROKER = ${cfg.broker}
CLIENTNAME = ${cfg.clientName}
@ -41,4 +40,8 @@ in
};
users.groups.usbrelay = { };
};
meta = {
maintainers = with lib.maintainers; [ wentasah ];
};
}

View File

@ -383,9 +383,9 @@ in
};
preStart = ''
mkdir -p /etc/tinc/${network}/hosts
chown tinc:${network} /etc/tinc/${network}/hosts
chown tinc.${network} /etc/tinc/${network}/hosts
mkdir -p /etc/tinc/${network}/invitations
chown tinc:${network} /etc/tinc/${network}/invitations
chown tinc.${network} /etc/tinc/${network}/invitations
# Determine how we should generate our keys
if type tinc >/dev/null 2>&1; then

View File

@ -1,12 +1,22 @@
{lib, stdenv, fetchurl}:
{lib, gcc10Stdenv, fetchurl}:
stdenv.mkDerivation rec {
gcc10Stdenv.mkDerivation rec {
version = "3.99-u4-b5";
pname = "monkeys-audio";
pname = "monkeys-audio-old";
patches = [ ./buildfix.diff ];
src = fetchurl {
/*
The real homepage is <https://monkeysaudio.com/>, but in fact we are
getting an old, ported to Linux version of the sources, made by (quoting
from the AUTHORS file found in the source):
Frank Klemm : First port to linux (with makefile)
SuperMMX <SuperMMX AT GMail DOT com> : Package the source, include the frontend and shared lib,
porting to Big Endian platform and adding other non-win32 enhancement.
*/
url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz";
};
@ -14,7 +24,10 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Lossless audio codec";
platforms = platforms.linux;
license = licenses.lgpl2;
# This is not considered a GPL license, but it seems rather free although
# it's not standard, see a quote of it:
# https://github.com/NixOS/nixpkgs/pull/171682#issuecomment-1120260551
license = licenses.free;
maintainers = [ ];
};
}

View File

@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace config.mk.def \
--replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \
--replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc"
--replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" \
--replace "RXPATH=/usr/bin/ssh" "RXPATH=ssh"
'';
CFLAGS = "-D_DARWIN_C_SOURCE";
@ -24,8 +25,12 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
postInstall = ''
substituteInPlace deadpixi-sam.desktop \
--replace "accessories-text-editor" "$out/share/icons/hicolor/scalable/apps/sam.svg"
mkdir -p $out/share/applications
mkdir -p $out/share/icons/hicolor/scalable/apps
mv deadpixi-sam.desktop $out/share/applications
mv sam.svg $out/share/icons/hicolor/scalable/apps
'';
meta = with lib; {

View File

@ -45,13 +45,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-32";
version = "7.1.0-33";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-blDdNZJCyBdPEgdZXwgNUGSdSIwnqRaVLsLdFeA4JzQ=";
hash = "sha256-qiXTSQcc48IIzz7RUcyOH2w8JUOTdU1zg43gJhoELXo=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

View File

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "482";
version = "483";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "refs/tags/v${version}";
sha256 = "sha256-b7zMHwsyZv4dCn4Gd/2a+MHhT3IHISJup/zm95pEcQ4=";
sha256 = "sha256-UU3XQ0NC/apJ0S/uDDNG+8DOD+sRyX98yMcjtL2Htig=";
};
nativeBuildInputs = [

View File

@ -1,15 +1,17 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper, libjpeg_turbo, perl, perlPackages }:
{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages, libjpeg_original }:
stdenv.mkDerivation rec {
pname = "jpegrescan";
date = "2016-06-01";
name = "${pname}-${date}";
version = "unstable-2019-03-27";
dontBuild = true;
dontConfigure = true;
src = fetchFromGitHub {
owner = "kud";
repo = pname;
rev = "e5e39cd972b48ccfb2cba4da6855c511385c05f9";
sha256 = "0jbx1vzkzif6yjx1fnsm7fjsmq166sh7mn22lf01ll7s245nmpdp";
rev = "3a7de06feabeb3c3235c3decbe2557893c1abe51";
sha256 = "0cnl46z28lkqc5x27b8rpghvagahivrqcfvhzcsv9w1qs8qbd6dm";
};
patchPhase = ''
@ -23,24 +25,23 @@ stdenv.mkDerivation rec {
mv jpegrescan $out/bin
chmod +x $out/bin/jpegrescan
wrapProgram $out/bin/jpegrescan --prefix PERL5LIB : $PERL5LIB
wrapProgram $out/bin/jpegrescan \
--prefix PATH : "${libjpeg_original}/bin:" \
--prefix PERL5LIB : $PERL5LIB
'';
propagatedBuildInputs = [ perlPackages.FileSlurp ];
nativeBuildInputs = [
makeWrapper
];
nativeBuildInputs = [ makeWrapper ];
buildInputs = [
perl libjpeg_turbo
];
buildInputs = [ perl ];
meta = with lib; {
description = "losslessly shrink any JPEG file";
description = "Losslessly shrink any JPEG file";
homepage = "https://github.com/kud/jpegrescan";
license = licenses.publicDomain;
maintainers = [ maintainers.ramkromberg ];
maintainers = with maintainers; [ ramkromberg ];
platforms = platforms.all;
mainProgram = "jpegrescan";
};
}

View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "binance";
version = "1.30.1";
version = "1.35.0";
src = fetchurl {
url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb";
sha256 = "sha256-Su8pVf5GSBK770D778MmrgYr0ov/JBTNcnL8EZzoG3U=";
sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ=";
};
nativeBuildInputs = [

View File

@ -9,7 +9,7 @@ let
version = "1.3.24";
src = oldAttrs.src.override {
inherit version;
sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519";
hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk=";
};
});
flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec {

View File

@ -0,0 +1,26 @@
{ lib, buildPythonApplication, fetchFromGitHub, configargparse }:
buildPythonApplication rec {
pname = "rofi-rbw";
version = "0.5.0";
format = "pyproject";
src = fetchFromGitHub {
owner = "fdw";
repo = "rofi-rbw";
rev = version;
hash = "sha256-1RDwb8lKls6+X/XtARbi4F7sK4nT03Iy3Wb9N1LEa5o=";
};
propagatedBuildInputs = [ configargparse ];
pythonImportsCheck = [ "rofi_rbw" ];
meta = with lib; {
description = "Rofi frontend for Bitwarden";
homepage = "https://github.com/fdw/rofi-rbw";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
platforms = platforms.linux;
};
}

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "vimb";
version = "3.3.0";
version = "3.6.0";
src = fetchFromGitHub {
owner = "fanglingsu";
repo = "vimb";
rev = version;
sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf";
sha256 = "sha256-Eq4riJSznKpkW9JJDnTCLxZ9oMJTmWkIoGphOiCcSAg=";
};
nativeBuildInputs = [ wrapGAppsHook pkg-config ];

View File

@ -46,17 +46,15 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.23.5+k3s1"; # k3s git tag
k3sCommit = "313aaca547f030752788dce696fdf8c9568bc035"; # k3s git commit at the above version
k3sRepoSha256 = "0vk72609cyyh64irp14jp2zspnxw34jm710cbwgklx0ch6kiz88d";
k3sVendorSha256 = "sha256-d7kQsJi/eQbaTUDglp3gFpc5Im6CyD9coKeM3kMrbjI=";
k3sServerVendorSha256 = "sha256-E3USXNuXY0lzZH+t3O7BOQ8rKNNQ6avOMItgOEi1cEg=";
k3sVersion = "1.23.6+k3s1"; # k3s git tag
k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version
k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i";
k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs=";
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
traefikChartVersion = "10.14.1";
traefikChartSha256 = "09a6cialx7nrh7nwi1gkkh8zcsasxcgb52dyx0r8bjq9ng29simj";
traefikChartVersion = "10.19.3";
traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058";
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47
k3sRootVersion = "0.11.0";
@ -68,8 +66,8 @@ let
# taken from go.mod, the 'github.com/containerd/containerd' line
# run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'`
containerdVersion = "1.5.10-k3s1";
containerdSha256 = "1ff2sfaqpjimq7w0lprci6ibyi6v65ap6b9sr6b0j12gqr2sqwa5";
containerdVersion = "1.5.11-k3s2";
containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2";
# run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag
criCtlVersion = "1.22.0-k3s1";
@ -175,7 +173,7 @@ let
version = k3sVersion;
src = k3sRepo;
vendorSha256 = k3sServerVendorSha256;
vendorSha256 = k3sVendorSha256;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libseccomp ];
@ -223,7 +221,6 @@ buildGoModule rec {
version = k3sVersion;
src = k3sRepo;
proxyVendor = true;
vendorSha256 = k3sVendorSha256;
patches = [

View File

@ -81,19 +81,6 @@ setKV containerdSha256 ${CONTAINERD_SHA256}
setKV criCtlVersion ${CRI_CTL_VERSION}
setKV k3sServerVendorSha256 "0000000000000000000000000000000000000000000000000000"
set +e
K3S_SERVER_VENDOR_SHA256=$(nix-build ${NIXPKGS_ROOT} --no-out-link -A k3s 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
set -e
if [ -n "${K3S_SERVER_VENDOR_SHA256:-}" ]; then
setKV k3sServerVendorSha256 ${K3S_SERVER_VENDOR_SHA256}
else
echo "Update failed. K3S_SERVER_VENDOR_SHA256 is empty."
exit 1
fi
set +e
K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })")
set -e

View File

@ -11,13 +11,13 @@
buildGoModule rec {
pname = "aerc";
version = "0.9.0";
version = "0.10.0";
src = fetchFromSourcehut {
owner = "~rjarry";
repo = pname;
rev = version;
sha256 = "sha256-D4cZVNh3YFaVRHGFn5Nt6kMSRCShj0w5n7pTxgYik2s=";
sha256 = "sha256-v1+12UCgBbH/2PxZ9QdDN30LmyzVcfGlYiVNVPYO3zs=";
};
proxyVendor = true;

View File

@ -14,7 +14,7 @@ buildPythonApplication rec {
};
propagatedBuildInputs = [ twisted certifi ]
++ twisted.extras.tls
++ twisted.extras-require.tls
++ lib.optional enableGUI pyside2;
nativeBuildInputs = lib.optionals enableGUI [ qt5.wrapQtAppsHook ];

View File

@ -122,7 +122,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec {
threadpoolctl
tika
tqdm
twisted.extras.tls
twisted.extras-require.tls
txaio
tzlocal
urllib3

View File

@ -8,10 +8,11 @@
, glm
, gtkmm3
, lib
, libarchive
, libgit2
, librsvg
, libspnav
, libuuid
, libzip
, opencascade
, pkg-config
, podofo
@ -23,13 +24,13 @@
stdenv.mkDerivation rec {
pname = "horizon-eda";
version = "2.2.0";
version = "2.3.0";
src = fetchFromGitHub {
owner = "horizon-eda";
repo = "horizon";
rev = "v${version}";
sha256 = "sha256-MUS1dIsULDJ5DahCtDpbHZq56nltHShli7+uoW1/Tqw=";
sha256 = "0lw5j1zqd2wdafgxl4ahcphaabs7vlw4kaa1c566hwfjxs46dmg9";
};
buildInputs = [
@ -38,10 +39,11 @@ stdenv.mkDerivation rec {
libepoxy
glm
gtkmm3
libarchive
libgit2
librsvg
libspnav
libuuid
libzip
opencascade
podofo
python3

View File

@ -3,45 +3,45 @@
{
"kicad" = {
kicadVersion = {
version = "6.0.4";
version = "6.0.5";
src = {
rev = "6f826c9f35a3dc9a104bb24a0a89a2e04b2d9721";
sha256 = "0lki59ws0ncqkp9wxrhyni1ck2sx5z07mmpkjg0d9jpkync9hx9y";
rev = "a6ca702e916df70e499615d8613102e780e96a40";
sha256 = "19mg672h1gjdvnkp13cpkhk67xpwms72y4gd6g8983fcsxr8nq23";
};
};
libVersion = {
version = "6.0.4";
version = "6.0.5";
libSources = {
symbols.rev = "9d00fbb9373571e54d9f29985b21a03d862795a4";
symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y";
templates.rev = "c4f4fe4b821e062a3ddd275f9313d5d81ff8f8d7";
symbols.rev = "c7f82c947ab3a1afec8d7b602ee7c6bfdfb24693";
symbols.sha256 = "1dhgdp08ah08fc5nvwkqmgpl2any9vgy1gykmyzsd4dl8hhvznh5";
templates.rev = "5ec65bfd3ecefaf85f79db02981f0568fe8b0eb8";
templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm";
footprints.rev = "c48d3dfcfa6ce58ec11e10b7a74878bb69fae580";
footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y";
packages3d.rev = "b1de0b5c3edc16999602b809a05017da62ff52cc";
packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja";
footprints.rev = "35e3d08f1ab23b5b08ba903572776aab6de7499f";
footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai";
packages3d.rev = "6ea94caf40c4bdccecb569e81ed82b902d4c104e";
packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc";
};
};
};
"kicad-unstable" = {
kicadVersion = {
version = "2022-03-19";
version = "2022-05-06";
src = {
rev = "58c146a7c00ee64ca07cacbcc594121f40aa2aeb";
sha256 = "0gcbl11pq0dgp590hdwsh5np7spixk5kgva0v8mx9rqd374z4bdm";
rev = "dfdedfa605f58711d286d6e24e4ae9b5f75444e6";
sha256 = "1bs7s2x0zh3wbk2hawg47v1s3nidmcl0xaardbpiafrrnh1qprf2";
};
};
libVersion = {
version = "2022-03-19";
version = "2022-05-06";
libSources = {
symbols.rev = "9b8d3163450172a7f368462c6d005841ad199144";
symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y";
symbols.rev = "e1d70243a68a721a9f94a7df1d04c9c6ebc056ef";
symbols.sha256 = "0gbl22g73cms9jrk9f6dlgd3ksnhiik39aywfm15m98jfglnlbg8";
templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4";
templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm";
footprints.rev = "c871df2c81a894bc5e91d2d517b76884d5a918aa";
footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y";
packages3d.rev = "6ff98426fd51d53c55bc48025d66d3d0b0c5df92";
packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja";
footprints.rev = "25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9";
footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai";
packages3d.rev = "ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e";
packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc";
};
};
};

View File

@ -58,7 +58,7 @@ buildPythonApplication rec {
] ++ lib.optionals stdenv.isLinux [
fontconfig libunistring libcanberra libX11
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
wayland-protocols wayland dbus
wayland-protocols wayland dbus libGL
];
nativeBuildInputs = [
@ -75,8 +75,6 @@ buildPythonApplication rec {
libicns # For the png2icns tool.
];
propagatedBuildInputs = lib.optional stdenv.isLinux libGL;
outputs = [ "out" "terminfo" "shell_integration" ];
patches = [

View File

@ -4,13 +4,13 @@ let
common = opts: callPackage (import ./common.nix opts);
in {
sublime-merge = common {
buildVersion = "2068";
sha256 = "sha256-CseZQgjqr8B66Slf/yFZZsnRFc3zqCGKFAzSdMRQdNI=";
buildVersion = "2071";
sha256 = "xYVk5Fx6VdoHzf0cbmhwKyEr5HDEZgPgDoBWQg/tS0U=";
} {};
sublime-merge-dev = common {
buildVersion = "2067";
sha256 = "sha256-ViBBi9Ghh4dHg7Gmg4i/B+Q4OgDd4XiHNIs12qffZdg=";
buildVersion = "2070";
sha256 = "2AA2HBF19g34ov6ytjL2caqS7Ro4eyj18vzwINm0CTw=";
dev = true;
} {};
}

View File

@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc=";
};
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];

View File

@ -10,6 +10,7 @@
, slurp
, grim
, jq
, bash
, python3Packages
}:
@ -27,8 +28,9 @@ grimshot = stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
strictDeps = true;
nativeBuildInputs = [ makeWrapper installShellFiles ];
buildInputs = [ bash ];
installPhase = ''
installManPage contrib/grimshot.1

View File

@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
./sway-config-nixos-paths.patch
];
strictDeps = true;
depsBuildBuild = [
pkg-config
];

View File

@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl";
};
strictDeps = true;
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland wayland-protocols ]
++ lib.optionals systemdSupport [ systemd ];

View File

@ -8,6 +8,7 @@
, scdoc
, wayland
, wayland-protocols
, wayland-scanner
, libxkbcommon
, cairo
, gdk-pixbuf
@ -36,7 +37,8 @@ stdenv.mkDerivation rec {
sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build
'';
nativeBuildInputs = [ meson ninja pkg-config scdoc ];
strictDeps = true;
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner];
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
mesonFlags = [

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock
, imagemagick, getopt, fontconfig, wmctrl, makeWrapper
, imagemagick, getopt, fontconfig, wmctrl, makeWrapper, bash
}:
let
@ -30,7 +30,9 @@ in stdenv.mkDerivation rec {
--replace "/usr/share" "$out/share"
'';
strictDeps = true;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ bash ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, meson, ninja, pkg-config, scdoc, wayland-scanner
, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
}:
@ -14,6 +14,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY=";
};
patches = [
# remove once when updating to 1.7
# https://github.com/swaywm/swaylock/pull/235
(fetchpatch {
url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff";
sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ=";
})
];
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];

View File

@ -37,6 +37,7 @@ in symlinkJoin {
paths = (optional withBaseWrapper baseWrapper)
++ [ sway ];
strictDeps = true;
nativeBuildInputs = [ makeWrapper ]
++ (optional withGtkWrapper wrapGAppsHook);

View File

@ -7,17 +7,18 @@
, librsvg
, sassc
, which
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "qogir-theme";
version = "2021-12-25";
version = "2022-04-29";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "1h10yqz3i59bxhkk2r2p8as8g9ibx38bbpdxi7jgg2pxr581mn4f";
sha256 = "oFGJ29He7ZmryW/Eg+JLM9C3FzNjmKjzNtyXDHGuhwo=";
};
nativeBuildInputs = [
@ -38,12 +39,14 @@ stdenv.mkDerivation rec {
installPhase = ''
patchShebangs .
mkdir -p $out/share/themes
name= ./install.sh -t all -d $out/share/themes
name= HOME="$TMPDIR" ./install.sh -t all -d $out/share/themes
mkdir -p $out/share/doc/${pname}
cp -a src/firefox $out/share/doc/${pname}
rm $out/share/themes/*/{AUTHORS,COPYING}
'';
passthru.updateScript = gitUpdater { inherit pname version; };
meta = with lib; {
description = "Flat Design theme for GTK based desktop environments";
homepage = "https://vinceliuice.github.io/Qogir-theme";

View File

@ -13,7 +13,7 @@ let
bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; };
};
chickenEggs = callPackage ./eggs.nix { };
chickenEggs = lib.recurseIntoAttrs (callPackage ./eggs.nix { });
egg2nix = callPackage ./egg2nix.nix { };
};

View File

@ -13,7 +13,7 @@ let
bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; };
};
chickenEggs = callPackage ./eggs.nix { };
chickenEggs = lib.recurseIntoAttrs (callPackage ./eggs.nix { });
egg2nix = callPackage ./egg2nix.nix { };
};

View File

@ -4,13 +4,13 @@ let
pkg = buildGoModule rec {
pname = "arduino-cli";
version = "0.20.2";
version = "0.21.1";
src = fetchFromGitHub {
owner = "arduino";
repo = pname;
rev = version;
sha256 = "sha256-q2uaJTfCcS/kv6xU5NjafzfcM3TixJlH5KzgEpLJKkQ=";
sha256 = "sha256-IXzN6CnZCzrkcLVNmKc1WB0V+TTa56CBzASzK0FQO8c=";
};
subPackages = [ "." ];

View File

@ -90,4 +90,9 @@ in {
version = "3.4.3";
sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
};
libressl_3_5 = generic {
version = "3.5.2";
sha256 = "sha256-Vv6rjiHD+mVJ+LfXURZYuOmFGBYoOKeVMUcyZUrfPl8=";
};
}

View File

@ -0,0 +1,40 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
, kio
, mauikit
}:
mkDerivation rec {
pname = "mauikit-accounts";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-accounts";
rev = "v${version}";
sha256 = "sha256-B0VmgE0L8kBOqR/lrWCHO3psCQ7GZVPIGljGAwpuymE=";
};
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kconfig
kio
mauikit
];
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-accounts";
description = "MauiKit utilities to handle User Accounts";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ onny ];
};
}

View File

@ -0,0 +1,42 @@
{ lib
, mkDerivation
, fetchFromGitLab
, cmake
, extra-cmake-modules
, kconfig
, kio
, mauikit
, syntax-highlighting
}:
mkDerivation rec {
pname = "mauikit-texteditor";
version = "2.1.1";
src = fetchFromGitLab {
domain = "invent.kde.org";
owner = "maui";
repo = "mauikit-texteditor";
rev = "v${version}";
sha256 = "sha256-C0EOc0CE6Ef7vnmOKRqTzeJUamGXsvREpHRPGTcAaIc=";
};
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kconfig
kio
mauikit
syntax-highlighting
];
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-texteditor";
description = "MauiKit Text Editor components";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ onny ];
};
}

View File

@ -1,6 +0,0 @@
{ callPackage, ... }:
callPackage ./generic-v3.nix {
version = "3.1.0";
sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i";
}

View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
patches = [ ./darwin-rpath-universal.patch ];
configureFlags = [ "--with-bzip2=${bzip2.out}" ];
configureFlags = [ "--with-bzip2=${bzip2.out}" "--enable-reentrant" ];
hardeningDisable = [ "format" ];

View File

@ -5,7 +5,7 @@
, glibcLocales
, nose
, pylibmc
, memcached
, python-memcached
, redis
, pymongo
, mock
@ -42,7 +42,7 @@ buildPythonPackage rec {
checkInputs = [
glibcLocales
memcached
python-memcached
mock
nose
pylibmc
@ -52,11 +52,7 @@ buildPythonPackage rec {
];
# Can not run memcached tests because it immediately tries to connect
postPatch = lib.optionalString isPy3k ''
substituteInPlace setup.py \
--replace "python-memcached" "python3-memcached"
'' + ''
postPatch = ''
rm tests/test_memcached.py
'';

View File

@ -53,7 +53,7 @@ let
unidiff
]
# tls
++ twisted.extras.tls;
++ twisted.extras-require.tls;
checkInputs = [
treq

View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, redis
, memcached
, python-memcached
, msgpack
}:
@ -15,7 +15,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
redis
memcached
python-memcached
msgpack
];

View File

@ -22,7 +22,7 @@
, docutils
, geoip2
, jinja2
, memcached
, python-memcached
, numpy
, pillow
, pylibmc
@ -76,7 +76,7 @@ buildPythonPackage rec {
docutils
geoip2
jinja2
memcached
python-memcached
numpy
pillow
pylibmc

View File

@ -49,7 +49,7 @@ buildPythonPackage rec {
pytest-asyncio
sqlalchemy
trio
];
] ++ passlib.extras-require.bcrypt;
patches = [
# Bump starlette, https://github.com/tiangolo/fastapi/pull/4483

View File

@ -32,6 +32,7 @@
, passlib
# tests
, argon2_cffi
, flask-mongoengine
, mongoengine
, mongomock
@ -85,6 +86,7 @@ buildPythonPackage rec {
};
checkInputs = [
argon2_cffi
flask-mongoengine
mongoengine
mongomock

View File

@ -2,7 +2,7 @@
, buildPythonPackage
, fetchPypi
, django
, memcached
, python-memcached
, txamqp
, django_tagging
, gunicorn
@ -36,7 +36,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
django
memcached
python-memcached
txamqp
django_tagging
gunicorn

View File

@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, influxdb, graphite_api, memcached
, influxdb, graphite_api, python-memcached
}:
buildPythonPackage rec {
@ -11,13 +11,7 @@ buildPythonPackage rec {
sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy";
};
patchPhase = lib.optionalString isPy3k ''
sed 's/python-memcached/python3-memcached/' \
-i ./influxgraph.egg-info/requires.txt \
-i ./setup.py
'';
propagatedBuildInputs = [ influxdb graphite_api memcached ];
propagatedBuildInputs = [ influxdb graphite_api python-memcached ];
passthru.moduleName = "influxgraph.InfluxDBFinder";

View File

@ -1,27 +0,0 @@
{ lib
, buildPythonPackage
, fetchurl
, fetchPypi
, isPy3k
}:
buildPythonPackage rec {
pname = "memcached";
version = "1.51";
src = if isPy3k then fetchPypi {
inherit version;
pname = "python3-${pname}";
sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw";
} else fetchurl {
url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${pname}-${version}.tar.gz";
sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192";
};
meta = with lib; {
description = "Python API for communicating with the memcached distributed memory object cache daemon";
homepage = "https://github.com/linsomniac/python-memcached";
license = licenses.psfl;
};
}

View File

@ -1,9 +1,10 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, bcrypt
, argon2_cffi
, bcrypt
, cryptography
, pytestCheckHook
}:
buildPythonPackage rec {
@ -15,9 +16,17 @@ buildPythonPackage rec {
sha256 = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04";
};
checkInputs = [ nose ];
propagatedBuildInputs = [ bcrypt argon2_cffi ];
propagatedNativeBuildInputs = [ argon2_cffi ];
passthru.extras-require = {
argon2 = [ argon2_cffi ];
bcrypt = [ bcrypt ];
totp = [ cryptography ];
};
checkInputs = [
pytestCheckHook
] ++ passthru.extras-require.argon2
++ passthru.extras-require.bcrypt
++ passthru.extras-require.totp;
meta = with lib; {
description = "A password hashing library for Python";

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pkutils";
version = "2.0.0";
version = "3.0.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "reubano";
repo = "pkutils";
rev = "v${version}";
sha256 = "sha256-jvRUjuxlcfmJOX50bnZR/pP2Axe1KDy9/KGXTL4yPxA=";
hash = "sha256-AK+xX+LPz6IVLZedsqMUm7G28ue0s3pXgIzxS4EHHLE=";
};
propagatedBuildInputs = [
@ -28,12 +28,6 @@ buildPythonPackage rec {
nose
];
postPatch = ''
# Remove when https://github.com/reubano/pkutils/pull/4 merged
substituteInPlace requirements.txt \
--replace "semver>=2.2.1,<2.7.3" "semver"
'';
checkPhase = ''
runHook preCheck
nosetests

View File

@ -87,7 +87,16 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://pylint.pycqa.org/";
description = "A bug and style checker for Python";
longDescription = ''
Pylint is a Python static code analysis tool which looks for programming errors,
helps enforcing a coding standard, sniffs for code smells and offers simple
refactoring suggestions.
Pylint is shipped with following additional commands:
- pyreverse: an UML diagram generator
- symilar: an independent similarities checker
- epylint: Emacs and Flymake compatible Pylint
'';
license = licenses.gpl1Plus;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ totoroot ];
};
}

View File

@ -0,0 +1,40 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, six
, mock
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "python-memcached";
version = "1.59";
src = fetchFromGitHub {
owner = "linsomniac";
repo = "python-memcached";
rev = version;
hash = "sha256-tHqkwNloPTXOrEGtuDLu1cTw4SKJ4auv8UUbqdNp698=";
};
propagatedBuildInputs = [
six
];
checkInputs = [
mock
pytestCheckHook
];
# all tests fail
doCheck = false;
pythonImportsCheck = [ "memcache" ];
meta = with lib; {
description = "Pure python memcached client";
homepage = "https://github.com/linsomniac/python-memcached";
license = licenses.psfl;
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@ -1,24 +1,48 @@
{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python-magic }:
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, genshi
, lxml
, pyyaml
, python-magic
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "relatorio";
version = "0.10.0";
version = "0.10.1";
disabled = pythonOlder "3.5";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "6b9390eab696bdf569639ff58794fb9ef8ff19f94feea5b505a6ba06d0cfd026";
sha256 = "a0c72302d50d5dfa433ddab191672eec1dde1c6ed26330a378b720e5a3012e23";
};
propagatedBuildInputs = [
genshi
lxml
python-magic
];
passthru.extras-require = {
chart = [ /* pycha */ pyyaml ];
fodt = [ python-magic ];
};
checkInputs = [
pytestCheckHook
] ++ passthru.extras-require.fodt;
pythonImportsCheck = [ "relatorio" ];
meta = {
homepage = "https://relatorio.tryton.org/";
changelog = "https://hg.tryton.org/relatorio/file/${version}/CHANGELOG";
description = "A templating library able to output odt and pdf files";
maintainers = with lib.maintainers; [ johbo ];
license = lib.licenses.gpl3;
license = lib.licenses.gpl2Plus;
};
}

View File

@ -1,5 +1,10 @@
{ lib, fetchPypi, buildPythonPackage, service-identity, requests, six
, mock, twisted, incremental, pep8, httpbin
{ lib
, fetchPypi
, buildPythonPackage
, requests
, twisted
, incremental
, httpbin
}:
buildPythonPackage rec {
@ -13,44 +18,23 @@ buildPythonPackage rec {
propagatedBuildInputs = [
requests
six
incremental
service-identity
twisted
]
# twisted [tls] requirements (we should find a way to list "extras")
++ twisted.extras.tls;
] ++ twisted.extras-require.tls;
checkInputs = [
pep8
mock
httpbin
twisted
];
postPatch = ''
rm -fv src/treq/test/test_treq_integration.py
'';
# XXX tox tries to install coverage despite it is installed
#postBuild = ''
# # build documentation and install in $out
# tox -e docs
# mkdir -pv $out/docs
# cp -rv docs/* $out/docs/
#'';
checkPhase = ''
pep8 --ignore=E902 treq
trial treq
'';
# Failing tests https://github.com/twisted/treq/issues/208
doCheck = false;
meta = with lib; {
homepage = "https://github.com/twisted/treq";
description = "A requests-like API built on top of twisted.web's Agent";
description = "Requests-like API built on top of twisted.web's Agent";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
}

View File

@ -1,9 +1,8 @@
{ lib
, buildPythonApplication
, fetchpatch
, buildPythonPackage
, fetchPypi
, pythonOlder
, mock
, defusedxml
, lxml
, relatorio
, genshi
@ -13,44 +12,30 @@
, werkzeug
, wrapt
, passlib
, pillow
, bcrypt
, pydot
, python-Levenshtein
, simplejson
, html2text
, psycopg2
, withPostgresql ? true
, weasyprint
, gevent
, pillow
, withPostgresql ? true, psycopg2
, python
}:
buildPythonApplication rec {
buildPythonPackage rec {
pname = "trytond";
version = "6.2.6";
version = "6.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Sof6A9lxU70YnCbboJr56CAdTL0cRbaRNxdvG5Tnqnw=";
sha256 = "3c04d75c2a779b88b8c7ab6dd252cf4fc51f9546bf42760d10dbd1a17f61b288";
};
patches = [
(fetchpatch {
# werkzeug 2.1 compatibility for the tests
url = "https://github.com/tryton/trytond/commit/86a50ca06cf0d79404dbd731141ed29f8e9fcb9d.patch";
hash = "sha256-xY5Sdhkd0lEgscV7NHwX2YWxobWqQFElY5BJvDT+we8=";
})
];
# Tells the tests which database to use
DB_NAME = ":memory:";
buildInputs = [
mock
];
propagatedBuildInputs = [
defusedxml
lxml
relatorio
genshi
@ -59,20 +44,29 @@ buildPythonApplication rec {
python-sql
werkzeug
wrapt
pillow
passlib
# extra dependencies
bcrypt
pydot
python-Levenshtein
simplejson
html2text
] ++ lib.optional withPostgresql psycopg2;
weasyprint
gevent
pillow
] ++ relatorio.extras-require.fodt
++ passlib.extras-require.bcrypt
++ passlib.extras-require.argon2
++ lib.optional withPostgresql psycopg2;
checkPhase = ''
runHook preCheck
# If unset, trytond will try to mkdir /homeless-shelter
preCheck = ''
export HOME=$(mktemp -d)
export TRYTOND_DATABASE_URI="sqlite://"
export DB_NAME=":memory:";
${python.interpreter} -m unittest discover -s trytond.tests
runHook postCheck
'';
meta = with lib; {
@ -86,6 +80,7 @@ buildPythonApplication rec {
modularity, scalability and security.
'';
homepage = "http://www.tryton.org/";
changelog = "https://hg.tryton.org/trytond/file/${version}/CHANGELOG";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ udono johbo ];
};

View File

@ -1,5 +1,6 @@
{ lib, stdenv
, buildPythonPackage
, pythonOlder
, fetchPypi
, python
, zope_interface
@ -14,11 +15,24 @@
, setuptools
, idna
, typing-extensions
, pyasn1
, cryptography
, appdirs
, bcrypt
, pynacl
, pyserial
, h2
, priority
, contextvars
}:
buildPythonPackage rec {
pname = "Twisted";
version = "22.4.0";
disabled = pythonOlder "3.6";
format = "setuptools";
src = fetchPypi {
inherit pname version;
extension = "tar.gz";
@ -27,7 +41,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ];
passthru.extras.tls = [ pyopenssl service-identity idna ];
passthru.extras-require = rec {
tls = [ pyopenssl service-identity idna ];
conch = [ pyasn1 cryptography appdirs bcrypt ];
conch_nacl = conch ++ [ pynacl ];
serial = [ pyserial ];
http2 = [ h2 priority ];
contextvars = lib.optionals (pythonOlder "3.7") [ contextvars ];
};
# Patch t.p._inotify to point to libc. Without this,
# twisted.python.runtime.platform.supportsINotify() == False

View File

@ -13,7 +13,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
incremental twisted automat zope_interface
] ++ twisted.extras.tls
] ++ twisted.extras-require.tls
++ lib.optionals (!isPy3k) [ ipaddress ];
checkInputs = [ pytestCheckHook mock lsof GeoIP ];

View File

@ -0,0 +1,58 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
# build time
, setuptools-scm
# propagates
, aiohttp
# tests
, pytestCheckHook
}:
let
pname = "ukrainealarm";
version = "0.0.1";
in
buildPythonPackage {
inherit pname version;
format = "setuptools";
src = fetchFromGitHub {
owner = "PaulAnnekov";
repo = pname;
rev = "v${version}";
hash = "sha256-0gsxXQiSkJIM/I0VYsjdCCB3NjPr6QJbD/rBkGrwtW8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"ukrainealarm"
"ukrainealarm.client"
];
meta = with lib; {
changelog = "https://github.com/PaulAnnekov/ukrainealarm/releases/tag/v${version}";
description = "Implements api.ukrainealarm.com API that returns info about Ukraine air raid alarms";
homepage = "https://github.com/PaulAnnekov/ukrainealarm";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}

View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "jenkins";
version = "2.332.2";
version = "2.332.3";
src = fetchurl {
url = "http://get.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "0z0igaq29nsxbkdzqfgrh10206a7ndsvz79bj8078hq8hqvl3an7";
url = "https://get.jenkins.io/war-stable/${version}/jenkins.war";
sha256 = "sha256-0ZPxearfOnzrYa3rw6tRIYrEp4UriJMv8ztE/XvmAQ8=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -46,7 +46,7 @@ buildPythonApplication rec {
pyramid
strictyaml
waitress
];
] ++ passlib.extras-require.argon2;
checkInputs = [
beautifulsoup4

View File

@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
doCheck = false;
configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ];
configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]
++ lib.optional stdenv.hostPlatform.isMinGW "CFLAGS=-fno-stack-protector";
meta = {
description = "GNU M4, a macro processor";

View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, libusb1
, gtk3
@ -27,6 +28,13 @@ in stdenv.mkDerivation rec {
sha256 = "03xypffpbp4imrczbxmq69vgkr7mbp0ps9dk815br5wwlz6vgygl";
};
patches = [
(fetchpatch {
url = "https://github.com/stlink-org/stlink/commit/468b1d2daa853b975c33ab69876c486734f2c6a7.diff";
sha256 = "sha256-ueSi/zc7xbOATl0yBtCL4U64IQ/yqu6sMYDOiPl1JBI=";
})
];
buildInputs = [
libusb1'
] ++ lib.optionals withGUI [

View File

@ -1,24 +1,31 @@
{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg }:
{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd }:
let
pname = "anki-bin";
# Update hashes for both Linux and Darwin!
version = "2.1.49";
version = "2.1.51";
sources = {
linux = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2";
sha256 = "sha256-uG39g9CXnquArFsxtFHWWoDaNwu8y2KKh+SqGt8aqi0=";
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
sha256 = "sha256-ZKVc+TvkNu5mGgibhRIuoLuIfvyoVDy+c4h+Apz9P+0=";
};
darwin = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg";
sha256 = "sha256-sEVWZQpICL7RYrOuPm1Y5XhzPxCwNk1WGP1rctTtE4Y=";
# For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
darwin-x86_64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
sha256 = "sha256-wZMJEbcpezVAuBSKlwNTHlqjp0FfmyDB7XD6BBuJhyA=";
};
darwin-aarch64 = fetchurl {
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
sha256 = "sha256-6RDTYKoisX5DJ9VPWrP9VH9DCABabb9MB3nG4S8jtR0=";
};
};
unpacked = stdenv.mkDerivation {
inherit pname version;
nativeBuildInputs = [ zstd ];
src = sources.linux;
installPhase = ''
@ -47,6 +54,9 @@ in
if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
name = "anki";
# Dependencies of anki
targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]);
runScript = writeShellScript "anki-wrapper.sh" ''
exec ${unpacked}/bin/anki
'';
@ -63,7 +73,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // {
}) else stdenv.mkDerivation {
inherit pname version passthru;
src = sources.darwin;
src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";

View File

@ -18,13 +18,13 @@
mkDerivation rec {
pname = "polymc";
version = "1.2.1";
version = "1.2.2";
src = fetchFromGitHub {
owner = "PolyMC";
repo = "PolyMC";
rev = version;
sha256 = "sha256-pnMmmeIKAaX+z1YzzowotjaG/HKdiqcz2tJ5eGRR77I=";
sha256 = "sha256-lxiMz7vuq+BkNVjWWJbPUk68DSe8zVZPcvZ1iXDsfCY=";
fetchSubmodules = true;
};

View File

@ -1,4 +1,4 @@
{ lib, python3 }:
{ lib, python3, netcat-openbsd }:
python3.pkgs.buildPythonApplication rec {
pname = "flashfocus";
@ -12,6 +12,9 @@ python3.pkgs.buildPythonApplication rec {
postPatch = ''
substituteInPlace setup.py \
--replace "pyyaml>=5.1,<6.0" "pyyaml>=5.1"
substituteInPlace bin/nc_flash_window \
--replace "nc" "${lib.getExe netcat-openbsd}"
'';
nativeBuildInputs = with python3.pkgs; [

View File

@ -0,0 +1,39 @@
{ appimageTools, lib, fetchurl, polkit, udev }:
let
pname = "uhk-agent";
version = "1.5.17";
src = fetchurl {
url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
name = "${pname}-${version}.AppImage";
sha256 = "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc=";
};
appimageContents = appimageTools.extract {
name = "${pname}-${version}";
inherit src;
};
in appimageTools.wrapType2 {
inherit pname version src;
extraPkgs = pkgs: with pkgs; [ polkit udev ];
extraInstallCommands = ''
mv $out/bin/${pname}-${version} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
install -m 644 -D ${appimageContents}/resources/rules/50-uhk60.rules $out/rules/50-uhk60.rules
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
# wrapType2 does not passthru pname+version
passthru.version = version;
meta = with lib; {
description = "Agent is the configuration application of the Ultimate Hacking Keyboard";
homepage = "https://github.com/UltimateHackingKeyboard/agent";
license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ ngiger ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -0,0 +1,20 @@
{ lib, stdenv, uhk-agent }:
stdenv.mkDerivation {
pname = "uhk-udev-rules";
inherit (uhk-agent) version;
dontUnpack = true;
dontBuild = true;
installPhase = ''
runHook preInstall
install -D -m 644 ${uhk-agent.out}/rules/50-uhk60.rules $out/lib/udev/rules.d/50-uhk60.rules
runHook postInstall
'';
meta = {
description = "udev rules for UHK keyboards from https://ultimatehackingkeyboard.com";
inherit (uhk-agent.meta) license;
maintainers = [ lib.maintainers.ngiger ];
};
}

View File

@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
install -m 644 -D usbrelayd $out/bin/usbrelayd
install -m 644 -D usbrelayd.service $out/lib/systemd/system/usbrelayd.service
install -m 644 -D 50-usbrelay.rules $out/lib/udev/rules.d/50-usbrelay.rules
install -m 644 -D usbrelayd.conf $out/etc/usbrelayd.conf # include this as an example
runHook postInstall
'';
# TODO for later releases: install -D usbrelayd.conf $out/etc/usbrelayd.conf # include this as an example
meta = {
description = "USB Relay MQTT service";

View File

@ -1,15 +1,19 @@
{ stdenv, lib, fetchFromGitHub, hidapi }:
{ stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }:
stdenv.mkDerivation rec {
pname = "usbrelay";
version = "0.9";
version = "1.0";
src = fetchFromGitHub {
owner = "darrylb123";
repo = "usbrelay";
rev = version;
sha256 = "sha256-bxME4r5W5bZKxMZ/Svi1EenqHKVWIjU6iiKaM8U6lmA=";
sha256 = "sha256-5zgpN4a+r0tmw0ISTJM+d9mo+L/qwUvpWPSsykuG0cg=";
};
nativeBuildInputs = [
installShellFiles
];
buildInputs = [
hidapi
];
@ -19,6 +23,10 @@ stdenv.mkDerivation rec {
"PREFIX=${placeholder "out"}"
];
postInstall = ''
installManPage usbrelay.1
'';
meta = with lib; {
description = "Tool to control USB HID relays";
homepage = "https://github.com/darrylb123/usbrelay";

View File

@ -1,15 +1,18 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl
, python3, munge, perl, pam, zlib, shadow, coreutils
, python3, munge, perl, pam, shadow, coreutils
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, xorg, lz4, rdma-core, nixosTests
, pmix
, libjwt
, libyaml
, json_c
# enable internal X11 support via libssh2
, enableX11 ? true
}:
stdenv.mkDerivation rec {
pname = "slurm";
version = "21.08.7.1";
version = "21.08.8.2";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@ -18,7 +21,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "1rhhfiwpfrg3mpdpvmdl3qz20ydi5m88dfv9hhwqm95sldqb6qw1";
sha256 = "1n9gn879lff3iv2yi163fv2cwymgfqigh0jxs2kklc97g3nn23yx";
};
outputs = [ "out" "dev" ];
@ -46,18 +49,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config libtool python3 ];
buildInputs = [
curl python3 munge perl pam zlib
curl python3 munge perl pam
libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi shadow.su
pmix
pmix json_c libjwt libyaml
] ++ lib.optionals enableX11 [ xorg.xauth ];
configureFlags = with lib;
[ "--with-freeipmi=${freeipmi}"
"--with-hwloc=${hwloc.dev}"
"--with-json=${json_c.dev}"
"--with-jwt=${libjwt}"
"--with-lz4=${lz4.dev}"
"--with-munge=${munge}"
"--with-zlib=${zlib}"
"--with-yaml=${libyaml}"
"--with-ofed=${rdma-core}"
"--sysconfdir=/etc/slurm"
"--with-pmix=${pmix}"

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2022.5.2";
version = "2022.5.3";
components = {
"abode" = ps: with ps; [
abodepy
@ -2823,6 +2823,9 @@
];
"uk_transport" = ps: with ps; [
];
"ukraine_alarm" = ps: with ps; [
ukrainealarm
];
"unifi" = ps: with ps; [
aiounifi
];
@ -3710,6 +3713,7 @@
"twinkly"
"twitch"
"uk_transport"
"ukraine_alarm"
"unifi"
"unifi_direct"
"universal"

View File

@ -179,7 +179,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2022.5.2";
hassVersion = "2022.5.3";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
hash = "sha256-n8lM1Z5fkZRW0E9J7nPRYntoaUuug9XPoRAKl+5XC6Y=";
hash = "sha256-g15bMS6xOz6w7JLSVP/tqlKBGWkFsG093GF7fcoHvlg=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

View File

@ -4,7 +4,7 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20220504.0";
version = "20220504.1";
format = "wheel";
src = fetchPypi {
@ -12,7 +12,7 @@ buildPythonPackage rec {
pname = "home_assistant_frontend";
dist = "py3";
python = "py3";
sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog=";
sha256 = "sha256-EU9I/0+EmcNr7eYq3Z5J5/KiWu+Qz0+wn7UZMJFBxp0=";
};
# there is nothing to strip in this package

View File

@ -1,5 +1,6 @@
{ enableSystemd ? stdenv.isLinux
, fetchFromGitHub
, fetchpatch
, lib
, python3
, stdenv
@ -7,13 +8,13 @@
python3.pkgs.buildPythonPackage rec {
pname = "mautrix-facebook";
version = "0.4.0";
version = "unstable-2022-05-06";
src = fetchFromGitHub {
owner = "mautrix";
repo = "facebook";
rev = "v${version}";
hash = "sha256-Yc8W8A11dnXrJdLtu/rJHTVlu2pEawXn5xuT8Ez+h9U=";
rev = "5e2c4e7f5a38e3c5d984d690c0ebee9b6bb4768c";
hash = "sha256-ukFtVRrmaJVVwgp5siwEwbfq6Yq5rmu3XJA5H2n/eJU=";
};
propagatedBuildInputs = with python3.pkgs; [

View File

@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
passlib
vobject
python-dateutil
];
] ++ passlib.extras-require.bcrypt;
checkInputs = with python3.pkgs; [
pytestCheckHook

View File

@ -351,6 +351,10 @@ self: super:
outputs = [ "out" "dev" ];
});
xcbutilerrors = super.xcbutilerrors.overrideAttrs (attrs: {
outputs = [ "out" "dev" ]; # mainly to get rid of propagating others
});
xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
meta = attrs.meta // { maintainers = [ lib.maintainers.lovek323 ]; };

View File

@ -3,14 +3,14 @@ let
package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package;
in
package.override rec {
version = "1.25.0";
version = "1.25.1";
reconstructLock = true;
src = pkgs.fetchFromGitHub {
owner = "Koenkk";
repo = "zigbee2mqtt";
rev = version;
sha256 = "Wp3+N3np/biNw2xaR79PpQ/S7o3FftjH6AgyMLM+ya8=";
sha256 = "IMRpT4BQvnsk8rl2bxiUbzVp4UcEaPLsniKneOq7Av4=";
};
passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt;

File diff suppressed because it is too large Load Diff

View File

@ -149,25 +149,15 @@ rec {
});
/* Return a modified stdenv that builds packages with GCC's coverage
instrumentation. The coverage note files (*.gcno) are stored in
$out/.build, along with the source code of the package, to enable
programs like lcov to produce pretty-printed reports.
*/
# remove after 22.05 and before 22.11
addCoverageInstrumentation = stdenv:
builtins.trace "'addCoverageInstrumentation' adapter is deprecated and will be removed before 22.11"
overrideInStdenv stdenv [ pkgs.enableGCOVInstrumentation pkgs.keepBuildTree ];
/* Replace the meta.maintainers field of a derivation. This is useful
when you want to fork to update some packages without disturbing other
developers.
e.g.: in all-packages.nix:
# remove all maintainers.
defaultStdenv = replaceMaintainersField allStdenvs.stdenv pkgs [];
*/
# remove after 22.05 and before 22.11
replaceMaintainersField = stdenv: pkgs: maintainers:
builtins.trace "'replaceMaintainersField' adapter is deprecated and will be removed before 22.11"
stdenv.override (old: {
mkDerivationFromStdenv = overrideMkDerivationResult (pkg:
lib.recursiveUpdate pkg { meta.maintainers = maintainers; });
@ -193,22 +183,9 @@ rec {
});
/* Abort if the license predicate is not verified for a derivation
declared with mkDerivation.
One possible predicate to avoid all non-free packages can be achieved
with the following function:
isFree = license: with builtins;
if license == null then true
else if isList license then lib.all isFree license
else license != "non-free" && license != "unfree";
This adapter can be defined on the defaultStdenv definition. You can
use it by patching the all-packages.nix file or by using the override
feature of ~/.config/nixpkgs/config.nix .
*/
# remove after 22.05 and before 22.11
validateLicenses = licensePred: stdenv:
builtins.trace "'validateLicenses' adapter is deprecated and will be removed before 22.11"
stdenv.override (old: {
mkDerivationFromStdenv = overrideMkDerivationResult (pkg:
let

View File

@ -83,7 +83,7 @@ makeOverlayable (overrideAttrs:
# * https://nixos.org/nixpkgs/manual/#sec-using-stdenv
# Details on how to use this mkDerivation function
#
# * https://nixos.org/nix/manual/#ssec-derivation
# * https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations
# Explanation about derivations in general
{

View File

@ -0,0 +1,20 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "bdfresize";
version = "1.5";
src = fetchurl {
url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/${pname}-${version}.tar.gz";
hash = "sha256-RAz8BiCgI35GNSwUoHdMqj8wWXWbCiDe/vyU6EkIl6Y=";
};
patches = [ ./remove-malloc-declaration.patch ];
meta = with lib; {
description = "Tool to resize BDF fonts";
homepage = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/";
license = licenses.gpl2Only;
maintainers = with maintainers; [ malvo ];
};
}

View File

@ -0,0 +1,11 @@
Remove an unneeded declaration of malloc so gcc doesn't complain.
--- a/charresize.c
+++ b/charresize.c
@@ -46,7 +46,6 @@ static int bit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
void
processChar(void)
{
- char *malloc();
char *srcimage;
int *dstgray;

View File

@ -1,14 +1,14 @@
{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qttools }:
{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qttools, gitUpdater }:
mkDerivation rec {
pname = "cmst";
version = "2022.03.13";
version = "2022.05.01";
src = fetchFromGitHub {
repo = "cmst";
owner = "andrew-bibb";
rev = "${pname}-${version}";
sha256 = "sha256-PIS77yYM7tR+0vpTDh9Li/dnaWHUQW+w1NLRb5g+sz8=";
sha256 = "sha256-d3uvJf1tI9vXyq1eIbHkKrinBuPkYoBUcusHsJmSqMA=";
};
nativeBuildInputs = [ qmake qttools ];
@ -21,6 +21,11 @@ mkDerivation rec {
done
'';
passthru.updateScript = gitUpdater {
inherit pname version;
rev-prefix = "${pname}-";
};
meta = with lib; {
description = "QT GUI for Connman with system tray icon";
homepage = "https://github.com/andrew-bibb/cmst";

View File

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "getmail6";
version = "6.18.6";
version = "6.18.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "08a5yw6ll1kmd1ardj8rzhsw4wl48zzdc87g5lh4p5snv8w2m4ja";
hash = "sha256-JghiV0zC9xtOGuGcf0lY5e73/04n6Bat/xOGgXyDWJk=";
};
# needs a Docker setup
@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "A program for retrieving mail";
homepage = "https://getmail6.org";
changelog = "https://github.com/getmail6/getmail6/blob/${src.rev}/docs/CHANGELOG";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ abbe dotlambda ];
};

View File

@ -0,0 +1,54 @@
{ lib, stdenv, fetchFromGitLab, pkg-config, libbsd, installShellFiles }:
stdenv.mkDerivation rec {
pname = "netcat-openbsd";
version = "1.218-5";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "debian";
repo = "netcat-openbsd";
rev = "refs/tags/debian/${version}";
sha256 = "sha256-jEJ8x49Z1UN2qOChGp173aQuPkgl2fWwUUJgUdOv60I=";
};
strictDeps = true;
nativeBuildInputs = [ pkg-config installShellFiles ];
buildInputs = [ libbsd ];
NIX_CFLAGS_COMPILE = [
"-I${lib.getDev libbsd}/include/libbsd"
];
NIX_LDFLAGS = [ "-lbsd" ];
postPatch = ''
for file in $(cat debian/patches/series); do
patch -p1 < debian/patches/$file
done
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
mv nc $out/bin/nc
installManPage nc.1
runHook postInstall
'';
doInstallCheck = true;
installCheckPhase = ''
$out/bin/nc -h 2> /dev/null
'';
meta = with lib; {
description = "TCP/IP swiss army knife. OpenBSD variant";
homepage = "https://salsa.debian.org/debian/netcat-openbsd";
maintainers = with maintainers; [ artturin ];
license = licenses.bsd3;
platforms = platforms.unix;
mainProgram = "nc";
};
}

View File

@ -60,7 +60,8 @@ python3Packages.buildPythonApplication rec {
html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark
service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec
zope_interface
];
] ++ twisted.extras-require.tls
++ twisted.extras-require.conch;
checkInputs = with python3Packages; [ mock hypothesis twisted ];

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "swtpm";
version = "0.7.2";
version = "0.7.3";
src = fetchFromGitHub {
owner = "stefanberger";
repo = "swtpm";
rev = "v${version}";
sha256 = "sha256-qeyPCJTNnwuaCosHzqnrQc0JNznGBfDTLsuDmuKREjU=";
sha256 = "sha256-YaNQgxk0uT8FLUIxF80jpgO/L9ygGRHaABEcs5ukq5E=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,43 @@
{ buildGoModule
, fetchFromGitHub
, lib
, testers
, kubevirt
}:
buildGoModule rec {
pname = "kubevirt";
version = "0.52.0";
src = fetchFromGitHub {
owner = "kubevirt";
repo = "kubevirt";
rev = "v${version}";
sha256 = "0ldc13nypbk3r9ihbdfibpyvzyzz4m68zzb7g6cq551ks9qdiyma";
};
vendorSha256 = null;
subPackages = [ "cmd/virtctl" ];
tags = [ "selinux" ];
ldflags = [
"-X kubevirt.io/client-go/version.gitCommit=v${version}"
"-X kubevirt.io/client-go/version.gitTreeState=clean"
"-X kubevirt.io/client-go/version.gitVersion=v${version}"
];
passthru.tests.version = testers.testVersion {
package = kubevirt;
command = "virtctl version --client";
version = "v${version}";
};
meta = with lib; {
description = "Client tool to use advanced features such as console access";
homepage = "https://kubevirt.io/";
license = licenses.asl20;
maintainers = with maintainers; [ haslersn ];
};
}

View File

@ -850,7 +850,6 @@ mapAliases ({
navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07
ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22
neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22
netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22
networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22

View File

@ -1213,6 +1213,8 @@ with pkgs;
ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { };
kubevirt = callPackage ../tools/virtualization/kubevirt { };
vopono = callPackage ../tools/networking/vopono { };
winbox = callPackage ../tools/admin/winbox {
@ -2629,6 +2631,8 @@ with pkgs;
bdf2sfd = callPackage ../tools/misc/bdf2sfd { };
bdfresize = callPackage ../tools/misc/bdfresize { };
bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
bchunk = callPackage ../tools/cd-dvd/bchunk { };
@ -8555,6 +8559,8 @@ with pkgs;
netcat-gnu = callPackage ../tools/networking/netcat { };
netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
netdiscover = callPackage ../tools/networking/netdiscover { };
nethogs = callPackage ../tools/networking/nethogs { };
@ -9578,6 +9584,8 @@ with pkgs;
pyinfra = with python3Packages; toPythonApplication pyinfra;
pylint = with python3Packages; toPythonApplication pylint;
pympress = callPackage ../applications/office/pympress { };
pyspread = libsForQt5.callPackage ../applications/office/pyspread { };
@ -11143,6 +11151,10 @@ with pkgs;
ugrep = callPackage ../tools/text/ugrep { };
uhk-agent = callPackage ../os-specific/linux/uhk-agent { };
uhk-udev-rules = callPackage ../os-specific/linux/uhk-udev-rules { };
uif2iso = callPackage ../tools/cd-dvd/uif2iso { };
uivonim = callPackage ../applications/editors/uivonim { };
@ -19951,7 +19963,8 @@ with pkgs;
openvdb = callPackage ../development/libraries/openvdb {};
inherit (callPackages ../development/libraries/libressl { })
libressl_3_4;
libressl_3_4
libressl_3_5;
libressl = libressl_3_4;
@ -20126,7 +20139,6 @@ with pkgs;
protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { };
protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { };
protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { };
protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
protobufc = callPackage ../development/libraries/protobufc/1.3.nix { };
@ -28218,6 +28230,8 @@ with pkgs;
rofi-pulse-select = callPackage ../applications/audio/rofi-pulse-select { };
rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { };
rofi-vpn = callPackage ../applications/networking/rofi-vpn { };
ympd = callPackage ../applications/audio/ympd { };

View File

@ -82,6 +82,7 @@ mapAliases ({
loo-py = loopy; # added 2022-05-03
Markups = markups; # added 2022-02-14
MechanicalSoup = mechanicalsoup; # added 2021-06-01
memcached = python-memcached; # added 2022-05-06
net2grid = gridnet; # add 2022-04-22
nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
pam = python-pam; # added 2020-09-07.

View File

@ -5194,8 +5194,6 @@ in {
meld3 = callPackage ../development/python-modules/meld3 { };
memcached = callPackage ../development/python-modules/memcached { };
memory-allocator = callPackage ../development/python-modules/memory-allocator { };
memory_profiler = callPackage ../development/python-modules/memory_profiler { };
@ -6476,6 +6474,8 @@ in {
python-lsp-black = callPackage ../development/python-modules/python-lsp-black { };
python-memcached = callPackage ../development/python-modules/python-memcached { };
python-openems = callPackage ../development/python-modules/python-openems { };
python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { };
@ -10580,6 +10580,8 @@ in {
ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { };
ukrainealarm = callPackage ../development/python-modules/ukrainealarm { };
umalqurra = callPackage ../development/python-modules/umalqurra { };
umap-learn = callPackage ../development/python-modules/umap-learn { };

View File

@ -146,8 +146,12 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
mauikit = callPackage ../development/libraries/mauikit { };
mauikit-accounts = callPackage ../development/libraries/mauikit-accounts { };
mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { };
mauikit-texteditor = callPackage ../development/libraries/mauikit-texteditor { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix { };
openbr = callPackage ../development/libraries/openbr { };