cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge master into haskell-updates

Browse source
This commit is contained in:
github-actions[bot] 2022-05-09 00:12:20 +00:00 committed by GitHub
commit 83285f2bc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
193 changed files with 2030 additions and 5025 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
maintainers/maintainer-list.nix
View file

@ -530,9 +530,9 @@
githubId = 782180;
name = "Alex Vorobiev";
};
alex-eyre = {
alexeyre = {
email = "A.Eyre@sms.ed.ac.uk";
github = "alex-eyre";
github = "alexeyre";
githubId = 38869148;
name = "Alex Eyre";
};
@ -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";

21
nixos/modules/hardware/keyboard/uhk.nix Normal file
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 ];
};
}

2
nixos/modules/installer/cd-dvd/installation-cd-base.nix
View file

@ -46,5 +46,5 @@ with lib;
done
'';
system.stateVersion = mkDefault "18.03";
system.stateVersion = lib.mkDefault lib.trivial.release;
}

5
nixos/modules/installer/tools/tools.nix
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

1
nixos/modules/module-list.nix
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

5
nixos/modules/services/backup/borgmatic.nix
View file

@ -4,7 +4,8 @@ with lib;
let
cfg = config.services.borgmatic;
cfgfile = pkgs.writeText "config.yaml" (builtins.toJSON cfg.settings);
settingsFormat = pkgs.formats.yaml { };
cfgfile = settingsFormat.generate "config.yaml" cfg.settings;
in {
options.services.borgmatic = {
enable = mkEnableOption "borgmatic";
@ -14,7 +15,7 @@ in {
See https://torsion.org/borgmatic/docs/reference/configuration/
'';
type = types.submodule {
freeformType = with lib.types; attrsOf anything;
freeformType = settingsFormat.type;
options.location = {
source_directories = mkOption {
type = types.listOf types.str;

7
nixos/modules/services/hardware/usbrelayd.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 ];
};
}

9
nixos/modules/services/monitoring/prometheus/default.nix
View file

@ -3,6 +3,7 @@
with lib;
let
json = pkgs.formats.json { };
cfg = config.services.prometheus;
workingDir = "/var/lib/" + cfg.stateDir;
@ -34,13 +35,7 @@ let
promtool ${what} $out
'' else file;
# Pretty-print JSON to a file
writePrettyJSON = name: x:
pkgs.runCommandLocal name { } ''
echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out
'';
generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig;
generatedPrometheusYml = json.generate "prometheus.yml" promConfig;
# This becomes the main config file for Prometheus
promConfig = {

4
nixos/modules/services/networking/tinc.nix
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

8
pkgs/applications/audio/amberol/default.nix
View file

@ -8,6 +8,7 @@
, ninja
, pkg-config
, reuse
, m4
, wrapGAppsHook4
, glib
, gtk4
@ -18,20 +19,20 @@
stdenv.mkDerivation rec {
pname = "amberol";
version = "0.4.3";
version = "0.6.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = pname;
rev = version;
sha256 = "sha256-4yW7rVlP9Zskyt4l/VQoX+9q3TUdEuLZrNQuQvziIf4=";
hash = "sha256-7cwoP2Dvlrq44orckhCjFGrSVDuG8WdW8wbpAjD5zhI=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
sha256 = "sha256-1ahEWLBmkT+B8qD0Qd1skXqk1wvP6yuFNAQBRdispC4=";
hash = "sha256-CGPDaVS8F7H/tH0lRjFloWmZmW8NHheyZRCCqEavWeo=";
};
postPatch = ''
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
ninja
pkg-config
reuse
m4
wrapGAppsHook4
] ++ (with rustPlatform; [
cargoSetupHook

21
pkgs/applications/audio/monkeys-audio/default.nix
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 = [ ];
};
}

7
pkgs/applications/editors/deadpixi-sam/default.nix
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; {

4
pkgs/applications/graphics/ImageMagick/7.0.nix
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

4
pkgs/applications/graphics/hydrus/default.nix
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 = [

29
pkgs/applications/graphics/jpegrescan/default.nix
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";
};
}

31
pkgs/applications/misc/bicon/default.nix
View file

@ -1,24 +1,35 @@
{ lib, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, perl
, fribidi
, kbd
, xkbutils
, fetchFromGitHub
, fetchpatch
, autoreconfHook
, pkg-config
, perl
, fribidi
, kbd
, xkbutils
}:
stdenv.mkDerivation rec {
pname = "bicon";
version = "unstable-2018-09-10";
version = "unstable-2020-06-04";
src = fetchFromGitHub {
owner = "behdad";
repo = pname;
rev = "38725c062a83ab19c4e4b4bc20eb9535561aa76c";
sha256 = "0hdslrci8pq300f3rrjsvl5psfrxdwyxf9g2m5g789sr049dksnq";
rev = "64ae10c94b94a573735a2c2b1502334b86d3b1f7";
sha256 = "0ixsf65j4dbdl2aazjc2j0hiagbp6svvfwfmyivha0i1k5yx12v1";
};
patches = [
# Fix build on clang-13. Pull the change pending upstream
# inclusion: https://github.com/behdad/bicon/pull/29
(fetchpatch {
name = "clang.patch";
url = "https://github.com/behdad/bicon/commit/20f5a79571f222f96e07d7c0c5e76e2c9ff1c59a.patch";
sha256 = "0l1dm7w52k57nv3lvz5pkbwp021mlsk3csyalxi90np1lx5sqbd1";
})
];
buildInputs = [ fribidi kbd xkbutils perl ];
nativeBuildInputs = [ autoreconfHook pkg-config ];

4
pkgs/applications/misc/binance/default.nix
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 = [

4
pkgs/applications/misc/logseq/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "logseq";
version = "0.6.5";
version = "0.6.6";
src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "WKROcCv0IzRnQd74j5Iget5jlfyDbeJ/PXgZmSNrSsQ=";
sha256 = "r6IBvhA8H8XnMIBgZZodyU61xtqNA4N9kCRv/QWQc9M=";
name = "${pname}-${version}.AppImage";
};

2
pkgs/applications/misc/nimbo/default.nix
View file

@ -52,6 +52,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Run machine learning jobs on AWS with a single command";
homepage = "https://github.com/nimbo-sh/nimbo";
license = licenses.bsl11;
maintainers = with maintainers; [ alex-eyre noreferences ];
maintainers = with maintainers; [ alexeyre noreferences ];
};
}

2
pkgs/applications/misc/privacyidea/default.nix
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 {

26
pkgs/applications/misc/rofi-rbw/default.nix Normal file
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;
};
}

6
pkgs/applications/misc/scli/default.nix
View file

@ -8,13 +8,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "scli";
version = "0.7.0";
version = "0.7.1";
src = fetchFromGitHub {
owner = "isamert";
repo = pname;
rev = "v${version}";
sha256 = "sha256-DUDf5FlcNZzZASa8vTc72Z1/Dk+iAhtcgVJtjDUwyEo=";
sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -47,6 +47,6 @@ python3.pkgs.buildPythonApplication rec {
description = "Simple terminal user interface for Signal";
homepage = "https://github.com/isamert/scli";
license = licenses.gpl3Only;
maintainers = with maintainers; [ alex-eyre ];
maintainers = with maintainers; [ alexeyre ];
};
}

4
pkgs/applications/networking/browsers/brave/default.nix
View file

@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.38.109";
version = "1.38.111";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-w/Wm8msW4etF6E1UDujLfixhxmKBcnB+uw/CMcj4jGI=";
sha256 = "sha256-sUTQktCQOVyXbw58u9ilFZaKg6D24Okpa+rUIO56ors=";
};
dontConfigure = true;

20
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View file

@ -87,7 +87,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "11.0.10";
version = "11.0.11";
lang = "en-US";
@ -98,7 +98,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "1j39v01bb97hkhkfvz7xyfmv6y0sjjcymvn3sa9ahz2av1xlrplp";
sha256 = "1dx92jdnvs7w52mps4zhnnjym6jsl9vwfiav1jw8qq0g8hslgybd";
};
i686-linux = fetchurl {
@ -107,7 +107,7 @@ let
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "0vh913z828ncb8pwz461xx61ylxqp44rf9iah7n6lzda7hcw79r3";
sha256 = "165mg9gwmlqwskbk3i8lhjjqp4lmpq5vzdvd9zalx69xqh9v85i5";
};
};
in
@ -357,7 +357,7 @@ stdenv.mkDerivation rec {
TMPDIR="\''${TMPDIR:-/tmp}" \
HOME="\$HOME" \
XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \
DISPLAY="\$DISPLAY" \
DISPLAY="\''${DISPLAY:-}" \
DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\
\
XDG_DATA_HOME="\$HOME/.local/share" \
@ -366,10 +366,10 @@ stdenv.mkDerivation rec {
PULSE_SERVER="\''${PULSE_SERVER:-}" \
PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
\
MOZ_ENABLE_WAYLAND=\$MOZ_ENABLE_WAYLAND \
WAYLAND_DISPLAY="\$WAYLAND_DISPLAY" \
XDG_RUNTIME_DIR="\$XDG_RUNTIME_DIR" \
XCURSOR_PATH="\$XCURSOR_PATH" \
MOZ_ENABLE_WAYLAND="\''${MOZ_ENABLE_WAYLAND:-}" \
WAYLAND_DISPLAY="\''${WAYLAND_DISPLAY:-}" \
XDG_RUNTIME_DIR="\''${XDG_RUNTIME_DIR:-}" \
XCURSOR_PATH="\''${XCURSOR_PATH:-}" \
\
APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
\
@ -409,9 +409,7 @@ stdenv.mkDerivation rec {
LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
echo "Checking tor-browser wrapper ..."
DISPLAY="" MOZ_ENABLE_WAYLAND="" WAYLAND_DISPLAY="" XAUTHORITY="" \
XCURSOR_PATH="" XDG_RUNTIME_DIR="" XDG_SESSION_TYPE="" \
DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
TBB_HOME=$(mktemp -d) \
$out/bin/tor-browser --version >/dev/null
'';

4
pkgs/applications/networking/browsers/vimb/default.nix
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 ];

21
pkgs/applications/networking/cluster/k3s/default.nix
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 = [

13
pkgs/applications/networking/cluster/k3s/update.sh
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

6
pkgs/applications/networking/cluster/minikube/default.nix
View file

@ -7,6 +7,7 @@
, which
, libvirt
, vmnet
, makeWrapper
}:
buildGoModule rec {
@ -24,7 +25,7 @@ buildGoModule rec {
sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg=";
};
nativeBuildInputs = [ installShellFiles pkg-config which ];
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];
buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null;
@ -35,9 +36,8 @@ buildGoModule rec {
installPhase = ''
install out/minikube -Dt $out/bin
wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false
export HOME=$PWD
export MINIKUBE_WANTUPDATENOTIFICATION=false
export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false
for shell in bash zsh fish; do
$out/bin/minikube completion $shell > minikube.$shell

6
pkgs/applications/networking/flexget/default.nix
View file

@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "flexget";
version = "3.3.8";
version = "3.3.9";
# Fetch from GitHub in order to use `requirements.in`
src = fetchFromGitHub {
owner = "flexget";
repo = "flexget";
rev = "v${version}";
hash = "sha256-ZGs5ixNcrkoZ4TRVuIUeNF1FNJwKpYElNv6oPhGiEmU=";
rev = "refs/tags/v${version}";
hash = "sha256-29V22B1Nkgj/qc6uyAOSOZ1rrjjtf75I9Eycu8I5ysQ=";
};
postPatch = ''

12
pkgs/applications/networking/instant-messengers/freetalk/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub
{ lib, stdenv, fetchFromGitHub, fetchpatch
, guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool
, libunwind, ncurses, curl, jansson, texinfo
, automake, autoconf }:
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757";
};
patches = [
# Pull pending patch for -fno-common tuulchain support:
# https://github.com/GNUFreetalk/freetalk/pull/39
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch";
sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf";
})
];
preConfigure = ''
./autogen.sh
'';

4
pkgs/applications/networking/mailreaders/aerc/default.nix
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;

2
pkgs/applications/networking/syncplay/default.nix
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 ];

2
pkgs/applications/office/paperless-ngx/default.nix
View file

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

12
pkgs/applications/science/biology/bwa/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, zlib }:
{ lib, stdenv, fetchurl, fetchpatch, zlib }:
stdenv.mkDerivation rec {
pname = "bwa";
@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy";
};
patches = [
# Pull upstream patch for -fno-common toolchain support like upstream
# gcc-10: https://github.com/lh3/bwa/pull/267
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/lh3/bwa/commit/2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch";
sha256 = "1lihfxai6vcshv5vr3m7yhk833bdivkja3gld6ilwrc4z28f6wqy";
})
];
buildInputs = [ zlib ];
# Avoid hardcoding gcc to allow environments with a different

10
pkgs/applications/science/electronics/horizon-eda/default.nix
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

42
pkgs/applications/science/electronics/kicad/versions.nix
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";
};
};
};

6
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View file

@ -68,6 +68,12 @@ mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# fix build problems caused by https://github.com/mavlink/qgroundcontrol/pull/10132
# remove once updated past 4.2.0
./fix-10132.patch
];
meta = with lib; {
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
homepage = "http://qgroundcontrol.com/";

62
pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch Normal file
View file

@ -0,0 +1,62 @@
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
index 2b314e0..ad1425e 100644
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc
@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
GstQSGTexture::GstQSGTexture ()
{
- static volatile gsize _debug;
+ static gsize _debug;
initializeOpenGLFunctions();
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
index 3a68576..5203d13 100644
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc
@@ -58,7 +58,7 @@ gst_qt_get_gl_display ()
{
GstGLDisplay *display = NULL;
QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
- static volatile gsize _debug;
+ static gsize _debug;
g_assert (app != NULL);
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
index f031b36..3c6722a 100644
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc
@@ -106,7 +106,7 @@ void InitializeSceneGraph::run()
QtGLVideoItem::QtGLVideoItem()
{
- static volatile gsize _debug;
+ static gsize _debug;
if (g_once_init_enter (&_debug)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
index 8bf14ae..2f88aa9 100644
--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
+++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc
@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) :
QQuickWindow( parent ), source (src)
{
QGuiApplication *app = static_cast<QGuiApplication *> (QCoreApplication::instance ());
- static volatile gsize _debug;
+ static gsize _debug;
g_assert (app != NULL);
@@ -156,7 +156,7 @@ QtGLWindow::beforeRendering()
g_mutex_lock (&this->priv->lock);
- static volatile gsize once = 0;
+ static gsize once = 0;
if (g_once_init_enter(&once)) {
this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
g_once_init_leave(&once,1);

4
pkgs/applications/terminal-emulators/kitty/default.nix
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 = [

11
pkgs/applications/version-management/fnc/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }:
{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }:
stdenv.mkDerivation rec {
pname = "fnc";
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk";
};
patches = [
(fetchpatch {
name = "sqlite3-upgrade.patch";
url = "https://fnc.bsdbox.org/vpatch?from=12e8919d436f52ca&to=091ce838edf67f1d";
sha256 = "sha256-uKSO+lCY6h7Wkv5T7zeagMbpDxj6oirA/bty6i6Py8s=";
})
];
patchFlags = [ "-p0" ];
buildInputs = [ libiconv ncurses zlib ];
makeFlags = [ "PREFIX=$(out)" ];

8
pkgs/applications/version-management/sublime-merge/default.nix
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;
} {};
}

1
pkgs/applications/window-managers/sway/bg.nix
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 ];

4
pkgs/applications/window-managers/sway/contrib.nix
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

1
pkgs/applications/window-managers/sway/default.nix
View file

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

1
pkgs/applications/window-managers/sway/idle.nix
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 ];

4
pkgs/applications/window-managers/sway/lock-effects.nix
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 = [

4
pkgs/applications/window-managers/sway/lock-fancy.nix
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"}" ];

13
pkgs/applications/window-managers/sway/lock.nix
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 ];

1
pkgs/applications/window-managers/sway/wrapper.nix
View file

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

13
pkgs/applications/window-managers/wmfs/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub,
{ lib, stdenv, fetchFromGitHub, fetchpatch,
libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }:
stdenv.mkDerivation {
pname = "wmfs";
@ -12,6 +12,17 @@ stdenv.mkDerivation {
rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2";
};
patches = [
# Pull patch pending upstream inclusion to fix build on
# -fno-common toolchain like upstream gcc-10:
# https://github.com/xorg62/wmfs/pull/104
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/xorg62/wmfs/commit/e4ec12618f4689d791892ebb49df9610a25d24d3.patch";
sha256 = "0qvwry9sikvr85anzha9x4gcx0r2ckwdxqw2in2l6bl9z9d9c0w2";
})
];
buildInputs = [
imlib2
libX11

2
pkgs/data/fonts/iosevka/bin.nix
View file

@ -11,7 +11,7 @@ let
(builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
in stdenv.mkDerivation rec {
pname = "${name}-bin";
version = "15.2.0";
version = "15.3.0";
src = fetchurl {
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";

184
pkgs/data/fonts/iosevka/variants.nix
View file

@ -1,95 +1,95 @@
# This file was autogenerated. DO NOT EDIT!
{
iosevka = "0yyz8vmpi8pww0p9na564lvbkwhdhpk4bcyrli91dn5gq0pc1pvv";
iosevka-aile = "1lciycahvxgvmcniq4h3m1v3rc42nmv8ydb0fpbl9g4sc0qp81hq";
iosevka-curly = "02jvrj7kzd4bx3maj1bq2p9j746b8c5713d8lqkxx4fn9fm0zppq";
iosevka-curly-slab = "1bhvf95xs74wm8srsvl4yxwvl36llk93mpl1y9acc5z9rdcpzjqq";
iosevka-etoile = "1zmgfxfsbxv1k4fwnc7g2jlfhmlzp5kap8m3f10fqanpnkd0yf08";
iosevka-slab = "1qy86kdl6lgq5k1qb97adibpfjm4vg1wdnxbqizhqka5bc7avyzb";
iosevka-ss01 = "1k451iv9fvp86arw0z685xyixlkpnsg3mxl6k9s47xxf9r82ab2a";
iosevka-ss02 = "066l1jamvlnksl1jn4l5qqll4wi19w0jr9x7bw0lpdic9478cs8g";
iosevka-ss03 = "0qh5ds9s7rghmar90ymxvcninmcm2hc05f83ixjadjfg9a27sff7";
iosevka-ss04 = "1zl2m68wqync8n93n06yj49r6n652yakrvdcsdvqm3agajnz0wnk";
iosevka-ss05 = "0rxakr04kwrwjfq7a6y2vdyjfgn162d8353pn7nc9wsfyrjbqpc2";
iosevka-ss06 = "0lfv6cvqy1mcn7zds7c6w68ky4y3clmvxcrg5knilm7sfql1jis1";
iosevka-ss07 = "1cc15rnnq2vzp22p8ld94jl2lyn6k8bra5792yqvyg23lf493jk2";
iosevka-ss08 = "0ysrq40kpvgfiapk1x9nzvvd81r0kyl1jlywwhmm3f4qca86a3ja";
iosevka-ss09 = "1535y8gmlkd1nqywcbmp7x9y9ahmskmwgs138baaj642jbq85l1b";
iosevka-ss10 = "01z7nwyqqda6jw819ajr9cd691yxd0b3irj4amdwnl6b46a278q7";
iosevka-ss11 = "0zi2n6h7jqf4vbg6r5vjzk0y8fj1lfjifsa1s3j0dmgs05m2bzc8";
iosevka-ss12 = "1h5bw4fp6kgszzwd9dpi461yf3mnkm0b5cgpaliyl2qpd8jivmm1";
iosevka-ss13 = "06v5angxqnbz9a53358ls0w78ib1d57g3svnfyplw7ynd0rrvw93";
iosevka-ss14 = "0ic0hh6xh1pl1jzkmp1ddbzhvfzislimlgwsdcnimzxk6ga5k44j";
iosevka-ss15 = "1mg363g47j90z00dpha81jk0n2ck59ca172g165m7cmz1bb425iq";
iosevka-ss16 = "0bs3rhwgnv9cwzgmsgzgjgv6awz5igxcvq64xpycw0dp17wbfl1z";
iosevka-ss17 = "0ssi56j8jdkhpsq7acczy3z9v8q3amr6a6jxv49rd4473fxzh3zc";
iosevka-ss18 = "13s77f1ki09szpa64qb00421kj2n5q2lv0vb2ahnlvphsbgik1j6";
sgr-iosevka = "0pqhpm13q23f82lkcimk8pinm41j6xmdlqxmfzg1y7m50gzdm10r";
sgr-iosevka-aile = "1malyfkc9dd552p04vq2b2nlv613pjzw84q8gnlpy8bycgx5np3s";
sgr-iosevka-curly = "0b8gnk8hsily9wp91hi66xjyj5hwqcab7j64x1xzzdc7fnfaz0qq";
sgr-iosevka-curly-slab = "0i9k38a7fb9z6jwds92kz3pgf1ryjz1m12ad1mslwq82kwy00h3f";
sgr-iosevka-etoile = "0rw4dhivxf3yls28zs34xia56dzx1w2as2j619ji36dpmh1v3ljn";
sgr-iosevka-fixed = "1zcr7zcpca5bhgaisjjlbn7zn1ih6mz6k4nj27y4ya8hnasfqxlh";
sgr-iosevka-fixed-curly = "17jvx2rvfqx6ip8h8srr6iwy55nnwvkrrflr4hxdyv8ggi8d8y7d";
sgr-iosevka-fixed-curly-slab = "01s3wz0r2wmybws96s1mcplx7zrbciqabsgaa5jy4kwn8rg0ajpi";
sgr-iosevka-fixed-slab = "1xbsrywi413r6gkmwc11yw8pkrc6hkf5309dfr25qwnn6c8wvqiy";
sgr-iosevka-fixed-ss01 = "17776y4lv7vyqhcanmayvksh85v0907vys4f3hpxjbw86497f4zj";
sgr-iosevka-fixed-ss02 = "0cwz8bfj05vr2800r35nd8d7r05hr4fd2wbx26dga3qnddawcgbp";
sgr-iosevka-fixed-ss03 = "1df1aigpy5g46g68l9fln2af4fafl9fs197nz49biw66ndraym4c";
sgr-iosevka-fixed-ss04 = "02g22kfd4nw8cvfkcjw9mixvw2abfzpbalcwcqidyn8qd3s51x1v";
sgr-iosevka-fixed-ss05 = "12zwmzh0ilclkpw18lqkp4dpawngwf21ah90ywi3spzl9whqk5wc";
sgr-iosevka-fixed-ss06 = "01ajn8gwqljx8da9fv9dlawwafcnqvf9pld9h8lygrg67kf3p1j6";
sgr-iosevka-fixed-ss07 = "000sk29gfp9z7690880kixmk08swnwpp8zs89idgpg5qhs5479qm";
sgr-iosevka-fixed-ss08 = "1fcw4wmz12ar5hy3r5hmagwss46yjsckk4hxhjfphbapznmyw2dx";
sgr-iosevka-fixed-ss09 = "0jxpf854njzjw7r1q1jaizbfhaal7idhs9v5l64c03q40s2cycxr";
sgr-iosevka-fixed-ss10 = "0n40gl7ygcc03n6673rkjdfqshd6fx7f0a831fz007s61c38rdl9";
sgr-iosevka-fixed-ss11 = "0r0wlmpa5nmgwx92f6x2jimgyh5x05id39wsmxpyhjfrl4dchkgm";
sgr-iosevka-fixed-ss12 = "02dvkr2vim8zyd1gngjk41bbg5ncjr6yfxigy5l9gjm64x6q2szz";
sgr-iosevka-fixed-ss13 = "14vz894yxw5252krpwh9981hmslwmyxdgp96kpq37lp35w7bhkc0";
sgr-iosevka-fixed-ss14 = "0jaz1g89dj27s3xgcginxx4s3kr7114x7wqqda96jyc1zrg79am4";
sgr-iosevka-fixed-ss15 = "1h12kcik341vp3yra8izcbj3490payjqy8b0y739s4bj6zmx7zb3";
sgr-iosevka-fixed-ss16 = "0yiyxbi1snd33ys8ip29xprwm0876j818g3fr2g6d955lp94crkp";
sgr-iosevka-fixed-ss17 = "1sv4zf5w7amhd591cjky7z2fc90hiiwj1g987scwcbvc0fb5gj86";
sgr-iosevka-fixed-ss18 = "09yh76152ar2lkw1gavd9x5i6a6vswhw9qyic0zixzr2rmcm2j35";
sgr-iosevka-slab = "0xdljj5bh4jsbwjgicpbi91hkjqvzxis9asd4g0vy3qqdr393i9k";
sgr-iosevka-ss01 = "0fllywsy23d6nfvgpb98af76cwbq8pizjvcah0p8j4qql6353d5y";
sgr-iosevka-ss02 = "0mlp4l3bbm2rm9gjb4pa8k730x3yb85qck7a1n5wdfz881mz6z59";
sgr-iosevka-ss03 = "0kcimy2i28a82s74987f6dxkdxzr06fzsi6rb7wz5v4rn5v7vmm9";
sgr-iosevka-ss04 = "0ynrq7di10349lfqm34vzr6z9z5hx6lz4q2z73ri91si224qsgih";
sgr-iosevka-ss05 = "1p2062x9wd5kkas3j5aqkx7r4asm2727i0sjf207w4lh3r37k9by";
sgr-iosevka-ss06 = "0zcpnw5mk3js5rc0cgpn5fncqqwf5s032z04xbaagzsmp7f3f1p9";
sgr-iosevka-ss07 = "09h686i2jq2p9i0684kjmsfgdpfwkbncbg3zxhz4m1x4wpfblhk8";
sgr-iosevka-ss08 = "0jbzr6saijbmbj1dkc4djawr75agp2c8krsnwskqr9dhisrmnjfk";
sgr-iosevka-ss09 = "10ffzi57gibz6w7yn4ign8vn6cagc680jrv81aqdkgav2bx71z9g";
sgr-iosevka-ss10 = "0d0wn7564zyvfk79hfqgnm3aa94k8xbddgmmxpq5jk918a1m6614";
sgr-iosevka-ss11 = "1zmbnhr1jz53yhighcn8dkj72s4y66ma61qjf5y3z64j7ql99kxi";
sgr-iosevka-ss12 = "06czjy90yx7pv958agwwnwn2vpfv1ha2j90bmcjg2c6shvnz5hsr";
sgr-iosevka-ss13 = "19k47hb167l6jsymznivdy6mgz228vcc4r5mzjjcszy4ba6n5qvg";
sgr-iosevka-ss14 = "0nkj7jmpbwfq7pl7s3ih30zs0szqf7xsbjn70w5i5x2g8fc3sffj";
sgr-iosevka-ss15 = "18l78cg3vxibngdbx2ikqhgz1v499ihf7bmdd5w92wrkkjgd0q8m";
sgr-iosevka-ss16 = "00mn81r50aw3ymp3mnwb8j6z6n98y03z0g5b8jfybpah65rgsrra";
sgr-iosevka-ss17 = "07vpvldkph4wn50vj5179h6zrw7vaf9mylksscw4wyqalinhiiqk";
sgr-iosevka-ss18 = "1h0jq8d2lbh0lfsmqcwbw6q9fbhbfrnn3c58xnknr9ys32xc88l2";
sgr-iosevka-term = "1j7sv5k4pbrq278nwfxshw23f7hdigy90w82a11s8nkq5b7f81wd";
sgr-iosevka-term-curly = "1v3vcvq6p4a3y1alkg45l2jipf0mwsv4x57yxl0dd41fb30araxw";
sgr-iosevka-term-curly-slab = "05is4yw7v32yf1h3b5j86wmz0x9fgbp5q99jw2zgn5lmv8x71dgh";
sgr-iosevka-term-slab = "1a0fn07ykx93y2myxdmg4xnz67dwmdl66n8la8x1h502b4hacqpl";
sgr-iosevka-term-ss01 = "1bwnyd6g0c185ny3d34pza1szc8pzkj15hk76g7s3jancgyajcj8";
sgr-iosevka-term-ss02 = "17srbkd4pbr2wwzcw6ycm1c4n5jlk4p5wlm1baqfzvffldbp609k";
sgr-iosevka-term-ss03 = "1w9ydkm0lsd0chyhi3b24n6syns55jwgnxkbnn7z7hh9llglplsj";
sgr-iosevka-term-ss04 = "1znabmm2plb5w5f8qj61shzm4v6kdqdak547j64w768g6pgc61hh";
sgr-iosevka-term-ss05 = "0pg3zannb29pxbfcjarj39my2lhwnid3yr7sbhk5i6sxy8klwjdv";
sgr-iosevka-term-ss06 = "0n25hc5gfi4zcc2zr0r5zh0q8v16z8ak2iphh5406pdgj3n9lmi9";
sgr-iosevka-term-ss07 = "0kmv8p689wf3mpiaq3749a3361nsckg0v4hsaw2mlshvhp4159h4";
sgr-iosevka-term-ss08 = "04g0q2pgimj73hgxr9nv8qmbc6n6fsadhy5x3l3cwcw7wh7s0g37";
sgr-iosevka-term-ss09 = "19qssfrmkvdq7bl0bg3a9v6sgnn2hg93kq0qh4j9chr7ffxnlmb2";
sgr-iosevka-term-ss10 = "1qc3cfw9f959h1gafhsddrlw2cbvazv17yllsj6rw4rff3bqscaq";
sgr-iosevka-term-ss11 = "1jbz5qg2vgrqmhbz8yvmampv7zkmksilvd7y2zrz4h5s2jbr32sg";
sgr-iosevka-term-ss12 = "0afcjcpb4dw4d3dggm82yls09rl71x4jqavbil4z7br96vgipdg9";
sgr-iosevka-term-ss13 = "04zbhi5mpycb9c6gf5ci1h6pbghy8vmajmzifcpg8d0fb9vyz370";
sgr-iosevka-term-ss14 = "0bps3zgarjdq5xn92rgdasnhcqlrmxwpa4bv9wr40df7zxhlvkr4";
sgr-iosevka-term-ss15 = "0ylxgmrsl596zdlph2f2lcfy9a37wi0x7418y53g43bdd33kcpxp";
sgr-iosevka-term-ss16 = "1ql8x3r19sa36424wijrzxnl3mfz7rjnwlavd0bz8qinfdvjvdsf";
sgr-iosevka-term-ss17 = "0plhqk7j64wfs61snly0m49lghk4srmribfqlzdk9xrvnv9h7zv1";
sgr-iosevka-term-ss18 = "1h7z1cnd4ia1pbyj5sq1718z8n747cq8kdy97c4vdmw6gjl8wp5x";
iosevka = "0nh0vsm9gpl5fsyfp11f8ks5jk4wf5r0nhqq92p7fdyrv6x8ygci";
iosevka-aile = "0hjys81klq8f2vhk68bmd2vd6fzpbhvkx74jxbfi6fq487a5g6ix";
iosevka-curly = "06npnjgwn3a78p3i5pdjs4bg69r3jz7y25qdii6wri3zna21w55r";
iosevka-curly-slab = "0mr8v0k8v9b45hyylmyjqa2npi16zq0ga4kdx7782qy5x96fxkwh";
iosevka-etoile = "0q1w9xqjr7zfghpvqp1c54y8z1i353fgfshj11bva3bb1vcgllk7";
iosevka-slab = "1pppsjj8nwg76lidv52z0swlhrg44lw5y0kcv5hw56cgz17vnhw0";
iosevka-ss01 = "1xj6zsadpxd7rcx5sklvzbcis09xpkdj0rcxjb87d6da6x52897a";
iosevka-ss02 = "0nj50p4wbin3cjsyw1mviy4s4asy77z8kgmbwl43cqyh8693q61i";
iosevka-ss03 = "0ksdy6dz5nh13j95vq6r0z56lgzw9rxk6w3c1g4h9qr8x0h81i9s";
iosevka-ss04 = "0qyrycc0ly69hs8zva0mqlbpxqcx4kcpw05li96bbigjv481li5g";
iosevka-ss05 = "01kyjl53afz6s21ca7csr1pmn2b80cr55raq9maacx7dkphs85pk";
iosevka-ss06 = "0ay7qzh17l3fpsfj48kiadbvs02v8jh3g0xz6rr6948z08sw2qx2";
iosevka-ss07 = "0wwn88y7k6gxwvg34wpfg95biip45viarm5h4dv06ygfl8sjva1a";
iosevka-ss08 = "00y5l3zb1b3l6yh0m5v80jwhkdj1njnk165wnjbg1w5qgl0yr3ww";
iosevka-ss09 = "1f42cwz34zqc8dkw1ahypj5f31fsxs9rx3zyqk58w7pn85sjq3n6";
iosevka-ss10 = "0bvip0lvmh11x0l0pj94n1akn0y18srai0k737xdn5s1h86jg2nf";
iosevka-ss11 = "0m4h9i7fmicxh3g57fprcgfhh4255vyc5sdkvd5iv225bwsfr4mr";
iosevka-ss12 = "13qxfz3d2h1w8gicssadgfr5inr6i7mmyjni4wi2ij6p4y0dlg5f";
iosevka-ss13 = "0q5xkxv040j1h1p11w6b0ngyzjkhhfzclxssrcyaxfkcnn7nkfqq";
iosevka-ss14 = "0xkhcjzha9kkgymcq18n50jp1ikd0n8nisii40ihibiifcgrfp28";
iosevka-ss15 = "17m7v4p62apnj7i86b6gm6yg1kyyawjly9qch1ii1wawj6aixyrp";
iosevka-ss16 = "1amyc0f1mmwqz161m9jxgasgij6bzxazm6r4r1y1z800z6zd03hm";
iosevka-ss17 = "0ia2p364avlad7v0z50zvzkaj33c2ys90dywy8i877nh2hzj61ky";
iosevka-ss18 = "12rfjmfc8vkj6r91idlic2gpmr7gba2dg79s71jgiclkfr0fsb1m";
sgr-iosevka = "1wqcx09aps43yavm5gm43xgq5xzrs0bs6abspqxzg7hpzfh0s5fn";
sgr-iosevka-aile = "0335bfjc0ddia8y2sv6h5x4hdg1abwsdfy3cb59w25y46l7vlk3k";
sgr-iosevka-curly = "1clspm5b30253d5qg23sklvgvvcnvrhb7hjxgyglg6abksw1r7xj";
sgr-iosevka-curly-slab = "0m9km2bvjmd09nj4gqwnjxik4iq7qabcaa42r5kdkj2b214hz622";
sgr-iosevka-etoile = "0yg0086d4dl5faadcvv20kbppi75msc8680v8w8g8db2w6b0ahfh";
sgr-iosevka-fixed = "19msi71p9d2kvm2yr6gxg08wzhnhx3vxn7ivq89yxs4793mznbza";
sgr-iosevka-fixed-curly = "0fxwlcpl8mxkk4gcs53fadfcc3fayyg3vpplvvhq6vj6rh4fsmjd";
sgr-iosevka-fixed-curly-slab = "1kfvzan5h6b790ci9b8dsv3k89l181fj39x0yn2i4va10vhrif8j";
sgr-iosevka-fixed-slab = "0h7rnmrabay0qvs2l40s2sn5hlx1q02n1wdl9zbjnc0mkhlyhpav";
sgr-iosevka-fixed-ss01 = "0ssyd2x43bxv7b3giirsnxr6mp33l27iph8gcfnb7bqxb6iy8iar";
sgr-iosevka-fixed-ss02 = "0vliidfhihkvhslhbd39kj4f909k9m3jl0dkjvlyxhwcabydcqwp";
sgr-iosevka-fixed-ss03 = "1l2b2svij67m2dgv036a0sv66w84j64wgizv1m4zk1i70i529l4a";
sgr-iosevka-fixed-ss04 = "0g32q7l5ppl15jvfdhl3hr1a3jm48bzsqsdw5zby1qi9v004bcq6";
sgr-iosevka-fixed-ss05 = "0rf36r4yidjfid5rxvsg2pxmlzhk48vb307ilyqahdlffhncac9f";
sgr-iosevka-fixed-ss06 = "170m8fsgy0spv311ddg11nzhpf030b0psxd7q654xylfcbldzwxa";
sgr-iosevka-fixed-ss07 = "16vym343hp6m9ln4swlypws9sbwn4grj772yxckfdj1w91hk9a3a";
sgr-iosevka-fixed-ss08 = "13xrjbxss2dahqnxalr5afky8056ysdrw9m2schnd9r885lfjdaw";
sgr-iosevka-fixed-ss09 = "1v11x60fnrchghvj0m10dzi17b2i844588gkrn71bz5xjdvd2cf9";
sgr-iosevka-fixed-ss10 = "1hi5wsf2fjs1j6iahlv9pyhfzswz1sly89wi2lw4ll5s42na31qb";
sgr-iosevka-fixed-ss11 = "1mzz3rvg35k796rra19rb5zmffwhjfr6q8q5632cjygiqizd99k2";
sgr-iosevka-fixed-ss12 = "11k9z0k0p0nf9c6yi5m19nnzf6pbq6zqjlcp9cz4snz91wg4py9b";
sgr-iosevka-fixed-ss13 = "1mdwd5xb0c5ypjbr6bgd378kid01lqq2knmrbvlq7py145c8wnhq";
sgr-iosevka-fixed-ss14 = "0qzr0iw1axpn1dv5zpkcnk5r7678093q7cas9kbf4nb69r59zg3w";
sgr-iosevka-fixed-ss15 = "13aqp10x0zdah7337pl8wr0v0w61yj70pracxh9znwl5a62rq98l";
sgr-iosevka-fixed-ss16 = "082zh32xghi7vavadgkx85lbqsmmzn9dv26ywvzkw9kf8v1kp931";
sgr-iosevka-fixed-ss17 = "0biijj9iwpa8i5sg721r3a6i3mbmyz9hc7j35dqxjvzyxa1c8lqf";
sgr-iosevka-fixed-ss18 = "07s5lq0cm00ja3l0wq01y5nky7jhjsizx71rz63p1ln7iakq84fl";
sgr-iosevka-slab = "1sqw8v56qgs5hvnm48psdv27gs83mn37hiqzskgqbyx1njkncrw1";
sgr-iosevka-ss01 = "094bx7vkqjx4wpc0wqylviwy0k00w4wshngw6nk4mgsxbirxlvnm";
sgr-iosevka-ss02 = "1m7ny32qx7s42lvnq6xw45ij7l270wj1nk2dkjdpfsagfyg869kv";
sgr-iosevka-ss03 = "1z947mrpr9lz7wk3357y81yb8adqi8hn32bqm14bp330n658a5jj";
sgr-iosevka-ss04 = "0jn0g2hy7l98sw3z1wvr263fqca6a4cmljsfam6qm48z3izcya2n";
sgr-iosevka-ss05 = "0k5s1q84ssy95k4szd614y9f8cibhj7an9lalb5h4ds4mbmhsc4y";
sgr-iosevka-ss06 = "170jz7fppj4zc1ik033jbkp71grkm2fyfybvy48zdbdzan050b87";
sgr-iosevka-ss07 = "1s8y27fv0klijsz9wac7nyxcj8mqcj3a09qmifaqvx80zl50yjwy";
sgr-iosevka-ss08 = "0002i1411s82qm75hmdshry4k5fs1bsj4s8ardy8llpfs3z9w501";
sgr-iosevka-ss09 = "16l3099djsxb42j51yr21xjamws731f87c2dgrkxhf2hy8rr2pv4";
sgr-iosevka-ss10 = "1r67zpqai0c4cjpfslapdp411c62vlbjsf2qdwws5fk0s6sk4wra";
sgr-iosevka-ss11 = "0y2qbrgsfcssqwq8ljqhz7wzpyg5z7ji5a35w9dp7wfaz4fmiifh";
sgr-iosevka-ss12 = "1zy4972m7wdawjx4rlwkf78fg6l53gyqc368dk8c0ng5sz5s5jc9";
sgr-iosevka-ss13 = "0yrg0pdandgqcz3dqjm5y8kaapryxynrj9v2br542vh6vp0w13zn";
sgr-iosevka-ss14 = "1c0bh3qach06wiprpi3mglnkzmmb6asah9d1s9g2vpx825vvwf6f";
sgr-iosevka-ss15 = "0qqqjh1rlz3al9qs09iqzgmsjww1cnp4vy700b2hmdhl46rjjipy";
sgr-iosevka-ss16 = "030x1234vhnryvy4hlw5b42blx2yrm0kikr07clmp8fqvdba1wy1";
sgr-iosevka-ss17 = "0k1sjpphgajdxk1l41fhfl93mj58ijhyba40m4h261p58ygbnszv";
sgr-iosevka-ss18 = "1sf5zcp3js6hsm47mr4kbx7q4x1kk999080jfx118yfvgj5whmq1";
sgr-iosevka-term = "0vxgcp3mi1brbcz6xvf6y3kbfd11x35blkf2aa82f47yqh26n96w";
sgr-iosevka-term-curly = "0fgvsq28g63xbcxbcfrkbina5cvvj6c677mgadhbvyjml4lm57pz";
sgr-iosevka-term-curly-slab = "0sqi5iz4pz7l5jqxw0a150j3nffzivlpzsaglzfrq50xcqqk3an1";
sgr-iosevka-term-slab = "1yihqfandm61rfkiifw7mxi10b59cvf41k4mgviw9ylrg7ca47km";
sgr-iosevka-term-ss01 = "10phwnsc4my2gr38974mf1qy4fwp9bqd06bwqcafxvp776s0ya1x";
sgr-iosevka-term-ss02 = "0zvi1114hw4xp68cgyp8n4i7lfm547l9awz1ffkvj07l5zshhjpf";
sgr-iosevka-term-ss03 = "1g1l9dq0fgywfxzdlwc0h8a8x8178m7x74rms6vwsgjgjfz83cca";
sgr-iosevka-term-ss04 = "13gcv4nn06jwafm74km0j48lmfjyi5x0hcgf1wrbhrabd06vrbc5";
sgr-iosevka-term-ss05 = "13i912b8s42gjcxrhiqp26779zfpy38rr8pf2gyb5njv4pvxxk6m";
sgr-iosevka-term-ss06 = "1k631gf37maz6zi1cf46nr93x7lvdmdl43ri4c9mbx1q5f36ys8w";
sgr-iosevka-term-ss07 = "0zr85cmrg4my5f255wbg27rhlkflsbp2jksrhgm4f6a2fn2qn0fy";
sgr-iosevka-term-ss08 = "1y9ly507xqp6h3bldfw1fji1gxszpj3jxv1by4b3r1as63vdhqkj";
sgr-iosevka-term-ss09 = "198myb085pp427lwf7ih2kddh52jpn1930p6a8q1n6fig1vbk76x";
sgr-iosevka-term-ss10 = "1csdkbfffjpcqhhf9n7c3gxar2403x2zwqg7nlsnih1hgpvhvxx8";
sgr-iosevka-term-ss11 = "0yid9w70jqvy4a6mglfi3n12g0k0ad52zdx0szgjsrbw98mfrqdr";
sgr-iosevka-term-ss12 = "08ad3mwp3rfd3mikah9nhcn4d3is5gqqfza3vz3ddnj48fdqd4sm";
sgr-iosevka-term-ss13 = "0myic6pzhdbmcp8fdhc5idsspsrrrxvb7m7ycc8vigqd1inmz091";
sgr-iosevka-term-ss14 = "1yw6zv4hfksmkdh0403l6dmc54hd04qfzafhvhc5r53kd4ja1k93";
sgr-iosevka-term-ss15 = "1y9gclnvidhadcr842ah3s16wrv0mbil7z5varri9hambaryz3z5";
sgr-iosevka-term-ss16 = "0qn3k93scc6hsxayfzagdgxqiv40vgz0ac0fa93zdyp5krb46rff";
sgr-iosevka-term-ss17 = "1l7jfb3x83kxlhj4zi8w1adxzf6k66zdzp93zif0mhvk9718ckws";
sgr-iosevka-term-ss18 = "19ip13fmkrismwm1ymhwfsv9a4w57460dkjmngpk2kp1av5nqc0m";
}

9
pkgs/data/themes/qogir/default.nix
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";

0
pkgs/desktops/lxde/core/lxmenu-data.nix → pkgs/desktops/lxde/core/lxmenu-data/default.nix
View file

25
pkgs/desktops/lxde/default.nix Normal file
View file

@ -0,0 +1,25 @@
{ config, lib, pkgs }:
lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) gtk2-x11;
lxappearance = callPackage ./core/lxappearance { };
lxappearance-gtk2 = callPackage ./core/lxappearance {
gtk2 = gtk2-x11;
withGtk3 = false;
};
lxmenu-data = callPackage ./core/lxmenu-data { };
lxpanel = callPackage ./core/lxpanel {
gtk2 = gtk2-x11;
};
lxrandr = callPackage ./core/lxrandr { };
lxsession = callPackage ./core/lxsession { };
lxtask = callPackage ./core/lxtask { };
})

12
pkgs/desktops/rox/rox-filer/default.nix
View file

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, wrapGAppsHook
, libxml2
@ -27,13 +28,20 @@ stdenv.mkDerivation rec {
patches = [
./rox-filer-2.11-in-source-build.patch
# Pull upstream fix for -fno-common toolchains like upstream gcc-10:
# https://github.com/rox-desktop/rox-filer/pull/15
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/rox-desktop/rox-filer/commit/86b0bb9144186d51ea9b898905111bd8b143b552.patch";
sha256 = "1csyx229i09p00lbdlkdqdhn3x2lb5zby1h9rkjgzlr2qz74gc69";
})
];
# go to the source directory after unpacking the sources
setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/";
# patch source with defined patches
patchFlags = [ "-p0" ];
# account for 'setSourceRoot' offset
patchFlags = [ "-p2" ];
# patch the main.c to disable the lookup of the APP_DIR environment variable,
# which is used to lookup the location for certain images when rox-filer

4
pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch
View file

@ -1,5 +1,5 @@
--- src/configure 2011-10-09 16:32:14.000000000 +0200
+++ src/configure2 2016-03-20 09:26:31.640891863 +0100
--- a/Rox-Filer/src/configure 2011-10-09 16:32:14.000000000 +0200
+++ b/Rox-Filer/src/configure 2016-03-20 09:26:31.640891863 +0100
@@ -2132,13 +2132,6 @@

2
pkgs/development/compilers/chicken/4/default.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 { };
};

2
pkgs/development/compilers/chicken/5/default.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 { };
};

2
pkgs/development/compilers/openjdk/11.nix
View file

@ -147,7 +147,7 @@ let
disallowedReferences = [ openjdk11-bootstrap ];
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
passthru = {
architecture = "";

2
pkgs/development/compilers/openjdk/12.nix
View file

@ -151,7 +151,7 @@ let
disallowedReferences = [ openjdk11 ];
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
passthru = {
architecture = "";

2
pkgs/development/compilers/openjdk/13.nix
View file

@ -151,7 +151,7 @@ let
disallowedReferences = [ openjdk13-bootstrap ];
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
passthru = {
architecture = "";

2
pkgs/development/compilers/openjdk/14.nix
View file

@ -147,7 +147,7 @@ let
disallowedReferences = [ openjdk14-bootstrap ];
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
passthru = {
architecture = "";

2
pkgs/development/compilers/openjdk/15.nix
View file

@ -147,7 +147,7 @@ let
disallowedReferences = [ openjdk15-bootstrap ];
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
passthru = {
architecture = "";

2
pkgs/development/compilers/openjdk/16.nix
View file

@ -154,7 +154,7 @@ let
disallowedReferences = [ openjdk16-bootstrap ];
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version.feature;
passthru = {
architecture = "";

2
pkgs/development/compilers/openjdk/17.nix
View file

@ -157,7 +157,7 @@ let
disallowedReferences = [ openjdk17-bootstrap ];
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version.feature;
passthru = {
architecture = "";

2
pkgs/development/compilers/openjdk/darwin/11.nix
View file

@ -86,7 +86,7 @@ let
home = jdk;
};
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
};
in
jdk

2
pkgs/development/compilers/openjdk/darwin/16.nix
View file

@ -86,7 +86,7 @@ let
home = jdk;
};
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
};
in
jdk

2
pkgs/development/compilers/openjdk/darwin/17.nix
View file

@ -75,7 +75,7 @@ let
home = jdk;
};
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
};
in
jdk

2
pkgs/development/compilers/openjdk/darwin/8.nix
View file

@ -90,7 +90,7 @@ let
home = jdk;
};
meta = import ./meta.nix lib;
meta = import ./meta.nix lib version;
};
in
jdk

2
pkgs/development/compilers/openjdk/darwin/meta.nix
View file

@ -1,4 +1,4 @@
lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // {
lib: version: (removeAttrs (import ../meta.nix lib version) [ "maintainers" ]) // {
platforms = lib.platforms.darwin;
homepage = "https://www.azul.com/";
}

5
pkgs/development/compilers/openjdk/meta.nix
View file

@ -1,8 +1,11 @@
lib: with lib; {
lib: version: with lib; {
homepage = "https://openjdk.java.net/";
license = licenses.gpl2Only;
description = "The open-source Java Development Kit";
maintainers = with maintainers; [ edwtjo asbachb ];
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ];
mainProgram = "java";
knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" ]) [
"This OpenJDK version has reached its end of life."
];
}

4
pkgs/development/embedded/arduino/arduino-cli/default.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 = [ "." ];

47
pkgs/development/libraries/kompute/default.nix Normal file
View file

@ -0,0 +1,47 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
, vulkan-headers
, vulkan-loader
, fmt
, glslang
, ninja
}:
stdenv.mkDerivation rec {
pname = "kompute";
version = "0.8.1";
src = fetchFromGitHub {
owner = "KomputeProject";
repo = "kompute";
rev = "v${version}";
sha256 = "sha256-OkVGYh8QrD7JNqWFBLrDTYlk6IYHdvt4i7UtC4sQTzo=";
};
cmakeFlags = [
"-DKOMPUTE_OPT_INSTALL=1"
"-DRELEASE=1"
"-DKOMPUTE_ENABLE_SPDLOG=1"
];
nativeBuildInputs = [ cmake ninja ];
buildInputs = [ fmt ];
propagatedBuildInputs = [ glslang vulkan-headers vulkan-loader ];
meta = with lib; {
description = "General purpose GPU compute framework built on Vulkan";
longDescription = ''
General purpose GPU compute framework built on Vulkan to
support 1000s of cross vendor graphics cards (AMD,
Qualcomm, NVIDIA & friends). Blazing fast, mobile-enabled,
asynchronous and optimized for advanced GPU data
processing usecases. Backed by the Linux Foundation"
'';
homepage = "https://kompute.cc/";
license = licenses.asl20;
maintainers = with maintainers; [ atila ];
platforms = platforms.linux;
};
}

5
pkgs/development/libraries/libressl/default.nix
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=";
};
}

4
pkgs/development/libraries/libsolv/default.nix
View file

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }:
stdenv.mkDerivation rec {
version = "0.7.21";
version = "0.7.22";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0=";
sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE=";
};
cmakeFlags = [

40
pkgs/development/libraries/mauikit-accounts/default.nix Normal file
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 ];
};
}

42
pkgs/development/libraries/mauikit-texteditor/default.nix Normal file
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 ];
};
}

6
pkgs/development/libraries/protobuf/3.1.nix
View file

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

2
pkgs/development/libraries/science/astronomy/cfitsio/default.nix
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" ];

13
pkgs/development/libraries/spglib/default.nix
View file

@ -1,24 +1,27 @@
{ stdenv, lib, fetchFromGitHub, cmake } :
{ stdenv, lib, fetchFromGitHub, cmake, openmp }:
stdenv.mkDerivation rec {
pname = "spglib";
version = "1.16.3";
version = "1.16.5"; # N.B: if you change this, please update: pythonPackages.spglib
src = fetchFromGitHub {
owner = "atztogo";
owner = "spglib";
repo = "spglib";
rev = "v${version}";
sha256 = "sha256-sM6+RBAVc2aJYlWatdD4nYZkFnaTFVjBzd/VDSSA+kk=";
sha256 = "sha256-BbqyL7WJ/jpOls1MmY7VNCN+OlF6u4uz/pZjMAqk87w=";
};
nativeBuildInputs = [ cmake ];
buildInputs = lib.optionals stdenv.isDarwin [ openmp ];
checkTarget = "check";
doCheck = true;
meta = with lib; {
description = "C library for finding and handling crystal symmetries";
homepage = "https://atztogo.github.io/spglib/";
homepage = "https://spglib.github.io/spglib/";
changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog";
license = licenses.bsd3;
maintainers = [ maintainers.markuskowa ];
platforms = platforms.all;

4
pkgs/development/lua-modules/overrides.nix
View file

@ -240,7 +240,9 @@ with prev;
];
});
luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: { buildInputs = [ pkgs.glibc.out ]; });
luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
buildInputs = [ pkgs.glibc.out ];
});
luazip = prev.lib.overrideLuarocks prev.luazip (drv: {
buildInputs = [

10
pkgs/development/python-modules/beaker/default.nix
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
'';

2
pkgs/development/python-modules/buildbot/default.nix
View file

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

4
pkgs/development/python-modules/cachy/default.nix
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
];

4
pkgs/development/python-modules/devolo-home-control-api/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "devolo-home-control-api";
version = "0.18.1";
version = "0.18.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "2Fake";
repo = "devolo_home_control_api";
rev = "v${version}";
sha256 = "sha256-Xj5k09uEVxZgG0oLbiPOBx/dALsRjqkZbLKit4X4q9Q=";
sha256 = "sha256-H4kLomHM0qq6LqsRMEp34oKy/4Me7AQi6dij2vraBS8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/devolo-plc-api/default.nix
View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "devolo-plc-api";
version = "0.7.1";
version = "0.8.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "2Fake";
repo = "devolo_plc_api";
rev = "v${version}";
sha256 = "sha256-XR/daDrnfbLBrUTTMFYtndr6+RxPwnF4qbXAdXsXKHk=";
sha256 = "sha256-LMwvIwbP/nRFby295ur6QTgyXLLJ8ip30V9bti27qKQ=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

4
pkgs/development/python-modules/django/4.nix
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

4
pkgs/development/python-modules/fakeredis/default.nix
View file

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "fakeredis";
version = "1.7.1";
version = "1.7.4";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw=";
hash = "sha256-aWl//usJk5BzYF7qyX9SS8yrrgQmV1eldcf8kjCHqmU=";
};
postPatch = ''

2
pkgs/development/python-modules/fastapi/default.nix
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

2
pkgs/development/python-modules/flask-security-too/default.nix
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

4
pkgs/development/python-modules/graphite-web/default.nix
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

10
pkgs/development/python-modules/influxgraph/default.nix
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";

6
pkgs/development/python-modules/linkify-it-py/default.nix
View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "linkify-it-py";
version = "1.0.3";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -16,8 +16,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "tsutsu3";
repo = pname;
rev = "v${version}";
hash = "sha256-1QqfqFdTEdZr02jQnmHmvw3fgnC/ktsfALyhtkGSXoY=";
rev = "refs/tags/v${version}";
hash = "sha256-3bgkhIC6tHl5zieiyllvqFCKwLms55m8MGt1xGhQ4Dk=";
};
propagatedBuildInputs = [ uc-micro-py ];

4
pkgs/development/python-modules/mcstatus/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "mcstatus";
version = "9.0.4";
version = "9.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "py-mine";
repo = pname;
rev = "v${version}";
hash = "sha256-h5pPtzs04TDqOkDFBpcn6faFN4sz/nEMsjjiH7mTEH0=";
hash = "sha256-qKQs0uGPMUtueOryVzFk37Th+N9vmApr/IzJ6jZI2Ic=";
};
nativeBuildInputs = [

27
pkgs/development/python-modules/memcached/default.nix
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;
};
}

2
pkgs/development/python-modules/ocrmypdf/default.nix
View file

@ -83,7 +83,7 @@ buildPythonPackage rec {
postPatch = ''
# https://github.com/ocrmypdf/OCRmyPDF/issues/933
substituteInPlace setup.cfg \
--replace "pdfminer.six!=20200720,>=20191110,<=20211012" "pdfminer.six!=20200720,>=20191110,<=20220319"
--replace "pdfminer.six!=20200720,>=20191110,<=20220319" "pdfminer.six!=20200720,>=20191110"
'';
pythonImportsCheck = [

44
pkgs/development/python-modules/oscrypto/default.nix
View file

@ -1,24 +1,25 @@
{ lib
, stdenv
, buildPythonPackage
, asn1crypto
, fetchPypi
, buildPythonPackage
, fetchFromGitHub
, openssl
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "oscrypto";
version = "1.2.1";
version = "1.3.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "1546si2bdgkqnbvv4mw1hr4mhh6bq39d9z4wxgv1m7fq6miclb3x";
};
disabled = pythonOlder "3.7";
testSources = fetchPypi {
inherit version;
pname = "oscrypto_tests";
sha256 = "1ha68dsrbx6mlra44x0n81vscn17pajbl4yg7cqkk7mq1zfmjwks";
src = fetchFromGitHub {
owner = "wbond";
repo = pname;
rev = version;
hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw=";
};
propagatedBuildInputs = [
@ -26,21 +27,26 @@ buildPythonPackage rec {
openssl
];
preCheck = ''
tar -xf ${testSources}
mv oscrypto_tests-${version} tests
checkInputs = [
pytestCheckHook
];
# remove tests that require network
sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py
'';
pythonImportsCheck = [ "oscrypto" ];
pythonImportsCheck = [
"oscrypto"
];
doCheck = !stdenv.isDarwin;
disabledTests = [
# Tests require network access
"TLSTests"
"TrustListTests"
];
meta = with lib; {
description = "Encryption library for Python";
homepage = "https://github.com/wbond/oscrypto";
license = licenses.mit;
maintainers = with maintainers; [ ];
};
}

19
pkgs/development/python-modules/passlib/default.nix
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";

24
pkgs/development/python-modules/pdfminer_six/default.nix
View file

@ -1,8 +1,16 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, pytestCheckHook }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, isPy3k
, cryptography
, charset-normalizer
, pytestCheckHook
, ocrmypdf
}:
buildPythonPackage rec {
pname = "pdfminer_six";
version = "20220319";
version = "20220506";
disabled = !isPy3k;
@ -10,10 +18,10 @@ buildPythonPackage rec {
owner = "pdfminer";
repo = "pdfminer.six";
rev = version;
sha256 = "sha256-sjO7jmHSe4EDmJ1rfiXx+lsHxc+DfKeMet37Nbg03WQ=";
sha256 = "sha256-Lq+ou7+Lmr1H69L8X/vuky+/tXDD3bBBaCysymeRuXA=";
};
propagatedBuildInputs = [ chardet cryptography ];
propagatedBuildInputs = [ charset-normalizer cryptography ];
postInstall = ''
for file in $out/bin/*.py; do
@ -27,8 +35,16 @@ buildPythonPackage rec {
substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version}
'';
pythonImportsCheck = [ "pdfminer" ];
checkInputs = [ pytestCheckHook ];
passthru = {
tests = {
inherit ocrmypdf;
};
};
meta = with lib; {
description = "PDF parser and analyzer";
homepage = "https://github.com/pdfminer/pdfminer.six";

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