Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-04-18 18:01:19 +00:00 committed by GitHub
commit 9233921313
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 417 additions and 85 deletions

View File

@ -4,28 +4,34 @@ with lib;
let
cfg = config.services.nbd;
configFormat = pkgs.formats.ini { };
iniFields = with types; attrsOf (oneOf [ bool int float str ]);
serverConfig = configFormat.generate "nbd-server-config"
({
generic =
(cfg.server.extraOptions // {
user = "root";
group = "root";
port = cfg.server.listenPort;
} // (optionalAttrs (cfg.server.listenAddress != null) {
listenaddr = cfg.server.listenAddress;
}));
}
// (mapAttrs
# The `[generic]` section must come before all the others in the
# config file. This means we can't just dump an attrset to INI
# because that sorts the sections by name. Instead, we serialize it
# on its own first.
genericSection = {
generic = (cfg.server.extraOptions // {
user = "root";
group = "root";
port = cfg.server.listenPort;
} // (optionalAttrs (cfg.server.listenAddress != null) {
listenaddr = cfg.server.listenAddress;
}));
};
exportSections =
mapAttrs
(_: { path, allowAddresses, extraOptions }:
extraOptions // {
exportname = path;
} // (optionalAttrs (allowAddresses != null) {
authfile = pkgs.writeText "authfile" (concatStringsSep "\n" allowAddresses);
}))
cfg.server.exports)
);
cfg.server.exports;
serverConfig =
pkgs.writeText "nbd-server-config" ''
${lib.generators.toINI {} genericSection}
${lib.generators.toINI {} exportSections}
'';
splitLists =
partition
(path: hasPrefix "/dev/" path)
@ -103,6 +109,13 @@ in
};
config = mkIf cfg.server.enable {
assertions = [
{
assertion = !(cfg.server.exports ? "generic");
message = "services.nbd.server exports must not be named 'generic'";
}
];
boot.kernelModules = [ "nbd" ];
systemd.services.nbd-server = {

View File

@ -38,6 +38,11 @@ in
default = if pkgs.stdenv.hostPlatform.libc == "glibc"
then pkgs.stdenv.cc.libc.bin
else pkgs.glibc.bin;
defaultText = literalExample ''
if pkgs.stdenv.hostPlatform.libc == "glibc"
then pkgs.stdenv.cc.libc.bin
else pkgs.glibc.bin;
'';
description = "package containing the nscd binary to be used by the service";
};

View File

@ -403,6 +403,15 @@ let
</itemizedlist>
'';
hostidFile = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } ''
hi="${cfg.hostId}"
${if pkgs.stdenv.isBigEndian then ''
echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out
'' else ''
echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out
''}
'';
in
{
@ -1383,16 +1392,8 @@ in
domainname "${cfg.domain}"
'';
environment.etc.hostid = mkIf (cfg.hostId != null)
{ source = pkgs.runCommand "gen-hostid" { preferLocalBuild = true; } ''
hi="${cfg.hostId}"
${if pkgs.stdenv.isBigEndian then ''
echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out
'' else ''
echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out
''}
'';
};
environment.etc.hostid = mkIf (cfg.hostId != null) { source = hostidFile; };
boot.initrd.systemd.contents."/etc/hostid" = mkIf (cfg.hostId != null) { source = hostidFile; };
# static hostname configuration needed for hostnamectl and the
# org.freedesktop.hostname1 dbus service (both provided by systemd)

View File

@ -28,6 +28,11 @@ import ./make-test-python.nix ({ pkgs, ... }:
## It's also a loopback device to test exporting /dev/...
systemd.services.create-priv-file =
mkCreateSmallFileService { path = "/vault-priv.disk"; loop = true; };
## `aaa.disk` is just here because "[aaa]" sorts before
## "[generic]" lexicographically, and nbd-server breaks if
## "[generic]" isn't the first section.
systemd.services.create-aaa-file =
mkCreateSmallFileService { path = "/aaa.disk"; };
# Needed only for nbd-client used in the tests.
environment.systemPackages = [ pkgs.nbd ];
@ -39,6 +44,9 @@ import ./make-test-python.nix ({ pkgs, ... }:
services.nbd.server = {
enable = true;
exports = {
aaa = {
path = "/aaa.disk";
};
vault-pub = {
path = "/vault-pub.disk";
};
@ -83,5 +91,13 @@ import ./make-test-python.nix ({ pkgs, ... }:
if foundString != testString:
raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'")
server.succeed("nbd-client -d /dev/nbd0")
# Server: Successfully connect to the aaa disk
server.succeed("nbd-client localhost ${toString listenPort} /dev/nbd0 -name aaa -persist")
server.succeed(f"echo '{testString}' | dd of=/dev/nbd0 conv=notrunc")
foundString = server.succeed(f"dd status=none if=/aaa.disk count={len(testString)}")[:len(testString)]
if foundString != testString:
raise Exception(f"Read the wrong string from nbd disk. Expected: '{testString}'. Found: '{foundString}'")
server.succeed("nbd-client -d /dev/nbd0")
'';
})

View File

@ -8,7 +8,7 @@
}:
{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm
, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux
, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
, sigtool, jansson, harfbuzz, sqlite, nixosTests
, dontRecurseIntoAttrs, emacsPackagesFor
@ -22,6 +22,7 @@
, withMotif ? false, motif ? null
, withSQLite3 ? false
, withCsrc ? true
, withWebP ? false
, srcRepo ? false, autoreconfHook ? null, texinfo ? null
, siteStart ? ./site-start.el
, nativeComp ? false
@ -134,6 +135,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
++ lib.optional (withX && withMotif) motif
++ lib.optional withSQLite3 sqlite
++ lib.optional withWebP libwebp
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
++ lib.optionals withNS [ AppKit GSS ImageIO ]
++ lib.optionals stdenv.isDarwin [ sigtool ]

View File

@ -10,13 +10,13 @@
stdenvNoCC.mkDerivation rec {
pname = "irpf";
version = "2022-1.0";
version = "2022-1.3";
src = let
year = lib.head (lib.splitVersion version);
in fetchzip {
url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip";
sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68";
sha256 = "sha256-nAmcVPSnMIWuq2zj1xq/657RmzaSmdtxlI9cp9v5P0A=";
};
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ];
@ -57,7 +57,12 @@ stdenvNoCC.mkDerivation rec {
'';
meta = with lib; {
description = "Programa Oficial da Receita para elaboração do IRPF";
description = "Brazillian government application for reporting income tax";
longDescription = ''
Brazillian government application for reporting income tax.
IRFP - Imposto de Renda Pessoa Física - Receita Federal do Brasil.
'';
homepage = "https://www.gov.br/receitafederal/pt-br";
license = licenses.unfree;
platforms = platforms.all;

View File

@ -10,14 +10,14 @@
python3Packages.buildPythonPackage rec {
pname = "hydrus";
version = "480";
version = "481";
format = "other";
src = fetchFromGitHub {
owner = "hydrusnetwork";
repo = "hydrus";
rev = "v${version}";
sha256 = "sha256-TZQY9wFXJFJtMAw2N+mlfVymewL96rn0Lza9jnDOGNA=";
rev = "refs/tags/v${version}";
sha256 = "sha256-6I4vLJj5WzC2bCtQYnoLGOL6N6pKFU+PZQqaOqhZhWU=";
};
nativeBuildInputs = [

View File

@ -46,13 +46,13 @@ let
in
mkDerivation rec {
pname = "obs-studio";
version = "27.2.2";
version = "27.2.4";
src = fetchFromGitHub {
owner = "obsproject";
repo = "obs-studio";
rev = version;
sha256 = "sha256-iZekhsqvtlMeKX2bQ+w/womkOTDLbbP0MmoTzbvpNtU=";
sha256 = "sha256-OiSejQovSmhItrnrQlcVp9PCDRgAhuxTinSpXbH8bo0=";
fetchSubmodules = true;
};

View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc
, vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt
, gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio
, e2fsprogs, findutils, gzip, cdrtools, xorriso
, e2fsprogs, findutils, gzip, cdrtools, xorriso, fetchpatch
, spiceSupport ? true, spice-gtk ? null
}:
@ -35,11 +35,21 @@ python3.pkgs.buildPythonApplication rec {
pygobject3 ipaddress libvirt libxml2 requests cdrtools
];
patchPhase = ''
prePatch = ''
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
sed -i "/'install_egg_info'/d" setup.py
'';
patches = [
# due to a recent change in setuptools-61, "packages=[]" needs to be included
# this patch can hopefully be removed, once virt-manager has an upstream version bump
(fetchpatch {
name = "fix-for-setuptools-61.patch";
url = "https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474.patch";
sha256 = "sha256-/RZG+7Pmd7rmxMZf8Fvg09dUggs2MqXZahfRQ5cLcuM=";
})
];
postConfigure = ''
${python3.interpreter} setup.py configure --prefix=$out
'';

View File

@ -12,14 +12,14 @@
stdenv.mkDerivation rec {
pname = "open-watcom-v2";
version = "unstable-2022-03-14";
version = "unstable-2022-04-18";
name = "${pname}-unwrapped-${version}";
src = fetchFromGitHub {
owner = "open-watcom";
repo = "open-watcom-v2";
rev = "22627ccc1bd3de70aff9ac056e0dc9ecf7f7b6ec";
sha256 = "khy/fhmQjTGKfx6iOUBt+ySwpEx0df/7meyNvBnJAPY=";
rev = "3e762ff7342f9d82b7d8df54db9558158332ac02";
sha256 = "KMFvLIUqor2wxeO03Uh/jycvnCTOd1ySxYTq4PJ0tHk=";
};
postPatch = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "stm32flash";
version = "0.6";
version = "0.7";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
sha256 = "sha256-7ptA1NPlzSi5k+CK4qLDxVm2vqhzDNfh1Acn3tsd2gk=";
sha256 = "sha256-xMnNi+x52mOxEdFXE+9cws2UfeykEdNdbjBl4ifcQUo=";
};
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

View File

@ -0,0 +1,25 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate, libjack2 }:
buildDunePackage rec {
pname = "bjack";
version = "0.1.6";
useDune2 = true;
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-bjack";
rev = "v${version}";
sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c";
};
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ libsamplerate libjack2 ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-bjack";
description = "Blocking API for the jack audio connection kit";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -1,20 +1,19 @@
{ buildDunePackage
, fetchzip
, fetchurl
, findlib
, lib
, menhir
, ocaml
, re
}:
buildDunePackage rec {
pname = "coin";
version = "0.1.3";
version = "0.1.4";
minimalOCamlVersion = "4.03";
src = fetchzip {
url = "https://github.com/mirage/coin/releases/download/v${version}/coin-v${version}.tbz";
sha256 = "06bfidvglyp9hzvr2xwbdx8wf26is2xrzc31fldzjf5ab0vd076p";
src = fetchurl {
url = "https://github.com/mirage/coin/releases/download/v${version}/coin-${version}.tbz";
sha256 = "sha256:0069qqswd1ik5ay3d5q1v1pz0ql31kblfsnv0ax0z8jwvacp3ack";
};
postPatch = ''
@ -22,9 +21,7 @@ buildDunePackage rec {
'ocaml} -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib '
'';
useDune2 = true;
nativeBuildInputs = [ menhir findlib ];
nativeBuildInputs = [ findlib ];
buildInputs = [ re ];
strictDeps = true;

View File

@ -0,0 +1,25 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ladspa, alsa-lib }:
buildDunePackage rec {
pname = "dssi";
version = "0.1.5";
useDune2 = true;
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-dssi";
rev = "v${version}";
sha256 = "1frbmx1aznwp60r6bkx1whqyr6mkflvd9ysmjg7s7b80mh0s4ix6";
};
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ ladspa alsa-lib ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-dssi";
description = "Bindings for the DSSI API which provides audio synthesizers";
license = licenses.gpl2Only;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,41 @@
{ buildDunePackage
, lib
, ppxlib
, fetchFromGitHub
, ojs
, js_of_ocaml-compiler
, nodejs
}:
buildDunePackage rec {
pname = "gen_js_api";
version = "1.0.9";
src = fetchFromGitHub {
owner = "LexiFi";
repo = pname;
rev = "v${version}";
sha256 = "1qx6if1avr484bl9x1h0cksdc6gqw5i4pwzdr27h46hppnnvi8y8";
};
minimalOCamlVersion = "4.08";
propagatedBuildInputs = [ ojs ppxlib ];
checkInputs = [ js_of_ocaml-compiler nodejs ];
doCheck = true;
meta = {
homepage = "https://github.com/LexiFi/gen_js_api";
description = "Easy OCaml bindings for JavaScript libraries";
longDescription = ''
gen_js_api aims at simplifying the creation of OCaml bindings for
JavaScript libraries. Authors of bindings write OCaml signatures for
JavaScript libraries and the tool generates the actual binding code with a
combination of implicit conventions and explicit annotations.
gen_js_api is to be used with the js_of_ocaml compiler.
'';
license = lib.licenses.mit;
maintainers = [ lib.maintainers.bcc32 ];
};
}

View File

@ -0,0 +1,21 @@
{ buildDunePackage
, gen_js_api
}:
buildDunePackage rec {
pname = "ojs";
inherit (gen_js_api) version src;
doCheck = false; # checks depend on gen_js_api, which is a cycle
minimalOCamlVersion = "4.08";
meta = {
inherit (gen_js_api.meta) homepage license maintainers;
description = "Runtime Library for gen_js_api generated libraries";
longDescription = ''
To be used in conjunction with gen_js_api
'';
};
}

View File

@ -0,0 +1,25 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ladspaH }:
buildDunePackage rec {
pname = "ladspa";
version = "0.2.2";
useDune2 = true;
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-ladspa";
rev = "v${version}";
sha256 = "1y83infjaz9apzyvaaqw331zqdysmn3bpidfab061v3bczv4jzbz";
};
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ ladspaH ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-alsa";
description = "Bindings for the LADSPA API which provides audio effects";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,32 @@
{ lib
, buildDunePackage
, fetchFromGitHub
, pkg-config
, dune-configurator
, xmlplaylist
, ocaml_pcre
, ocamlnet
}:
buildDunePackage rec {
pname = "lastfm";
version = "0.3.3";
useDune2 = true;
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-lastfm";
rev = "v${version}";
sha256 = "1sz400ny9h7fs20k7600q475q164x49ba30ls3q9y35rhm3g2y2b";
};
propagatedBuildInputs = [ xmlplaylist ocaml_pcre ocamlnet ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-lastfm";
description = "OCaml API to lastfm radio and audioscrobbler";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,25 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, libsamplerate }:
buildDunePackage rec {
pname = "samplerate";
version = "0.1.6";
useDune2 = true;
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-samplerate";
rev = "v${version}";
sha256 = "0h0i9v9p9n2givv3wys8qrfi1i7vp8kq7lnkf14s7d3m4r8x4wrp";
};
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ libsamplerate ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-samplerate";
description = "Interface for libsamplerate";
license = licenses.bsd2;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -0,0 +1,25 @@
{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, xmlm }:
buildDunePackage rec {
pname = "xmlplaylist";
version = "0.1.5";
useDune2 = true;
src = fetchFromGitHub {
owner = "savonet";
repo = "ocaml-xmlplaylist";
rev = "v${version}";
sha256 = "1x5lbwkr2ip00x8vyfbl8936yy79j138vx8a16ix7g9p2j5qsfcq";
};
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ xmlm ];
meta = with lib; {
homepage = "https://github.com/savonet/ocaml-xmlplaylist";
description = "Module to parse various RSS playlist formats";
license = licenses.lgpl21Only;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "azure-mgmt-containerservice";
version = "18.0.0";
version = "19.0.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-b4AwcnSp6JOtG8VaBbUN7d/NIhHN2TPnyjzCUVhMOzg=";
sha256 = "sha256-UHkSUoNzXWomr4vczGRRXVJplVRfqDjwFczkOP2Jwsc=";
};
propagatedBuildInputs = [

View File

@ -5,18 +5,20 @@
, msrestazure
, azure-common
, azure-mgmt-core
, azure-mgmt-nspkg
, isPy3k
, pythonOlder
}:
buildPythonPackage rec {
pname = "azure-mgmt-datafactory";
version = "2.3.0";
version = "2.4.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "sha256-pjBjFPkKhKd8XI6wmzX/rAssHINMzDAZa+XRqG/pLYo=";
hash = "sha256-oCDh7tWsBA6z/auQm3AtkRzT9IUrq8HJ+R//HDJ+1nw=";
};
propagatedBuildInputs = [
@ -24,8 +26,6 @@ buildPythonPackage rec {
msrestazure
azure-common
azure-mgmt-core
] ++ lib.optionals (!isPy3k) [
azure-mgmt-nspkg
];
# has no tests

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools-scm
, atom
, ply
, kiwisolver
@ -12,13 +13,13 @@
buildPythonPackage rec {
pname = "enaml";
version = "0.14.1";
version = "0.15.0";
src = fetchFromGitHub {
owner = "nucleic";
repo = pname;
rev = version;
sha256 = "sha256-QfI7cwl2c5HOlFNNdG+oOv48X9jJZnZNU/kWgutWe6k=";
rev = "refs/tags/${version}";
sha256 = "sha256-xSMgT8VooDS5kvf4BCcVbv/MNfRDTVnPKU3Ou+/Gq7I=";
};
# qt bindings cannot be found during tests
@ -39,6 +40,7 @@ buildPythonPackage rec {
"enaml.workbench"
];
nativeBuildInputs = [ setuptools-scm ];
propagatedBuildInputs = [
atom
ply
@ -48,6 +50,7 @@ buildPythonPackage rec {
cppy
bytecode
];
SETUPTOOLS_SCM_PRETEND_VERSION = version;
meta = with lib; {
homepage = "https://github.com/nucleic/enaml";

View File

@ -15,7 +15,7 @@
let
pname = "findpython";
version = "0.1.4";
version = "0.1.5";
in
buildPythonPackage {
inherit pname version;
@ -25,7 +25,7 @@ buildPythonPackage {
src = fetchPypi {
inherit pname version;
hash = "sha256-TOGYRUaW7lOcp5kNTq3NBHHKXvA7XE7y+SWJGsZPgok=";
hash = "sha256-AjTmTKIhWhl39O18S2XRVxeDiIzCpKH2qdjkY2h+i8M=";
};
nativeBuildInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "lightwave2";
version = "0.8.1";
version = "0.8.4";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-UULOQawsY2N0xxYlgIZKs8Xyl0XDqC6fSSKvo8ZBEcY=";
sha256 = "sha256-WB5U8VjUKx2hCcJX2JeFgEiwzweGzROEK3pox3l/wrE=";
};
propagatedBuildInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pg8000";
version = "1.24.2";
version = "1.25.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-q3/ASKVvysTZwkeyKoNW5gjdmgPUg18ch/ui5PJihKU=";
sha256 = "sha256-i8/HmxxqoFj1OEwtXjF/u+yOmQ33RJbVHYmx78/d9Ng=";
};
propagatedBuildInputs = [

View File

@ -1,20 +1,36 @@
{ lib, buildPythonPackage, fetchPypi, aiohttp, requests }:
{ lib
, buildPythonPackage
, fetchPypi
, aiohttp
, requests
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyTelegramBotAPI";
version = "4.4.0";
version = "4.4.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-5vIjVqvr/+Cok9z3L+CaDIve2tb0mMVaMMPdMs5Ijmo=";
hash = "sha256-3Qppp/UDKiGChnvMOgW8EKygI75gYzv37c0ctExmK+g=";
};
propagatedBuildInputs = [ aiohttp requests ];
propagatedBuildInputs = [
aiohttp
requests
];
pythonImportsCheck = [
"telebot"
];
meta = with lib; {
homepage = "https://github.com/eternnoir/pyTelegramBotAPI";
description = "A simple, but extensible Python implementation for the Telegram Bot API";
license = licenses.gpl2;
license = licenses.gpl2Only;
maintainers = with maintainers; [ das_j ];
};
}

View File

@ -48,6 +48,13 @@ let newPython = python3.override {
sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b";
};
});
distro = super.distro.overridePythonAttrs (oldAttrs: rec {
version = "1.5.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "14nz51cqlnxmgfqqilxyvjwwa5xfivdvlm0d0b1qzgcgwdm7an0f";
};
});
};
};

View File

@ -1,4 +1,9 @@
{ lib, stdenv, fetchurl, kernel }:
{ lib
, stdenv
, fetchurl
, fetchpatch
, kernel
}:
let cfg = import ./version.nix; in
@ -11,6 +16,19 @@ stdenv.mkDerivation rec {
sha256 = cfg.sha256.${pname};
};
patches = [
# batman-adv: make mc_forwarding atomic
(fetchpatch {
url = "https://git.open-mesh.org/batman-adv.git/blobdiff_plain/c142c00f6b1a2ad5f5d74202fb1249e6a6575407..56db7c0540e733a1f063ccd6bab1b537a80857eb:/net/batman-adv/multicast.c";
hash = "sha256-2zXg8mZ3/iK9E/kyn+wHSrlLq87HuK72xuXojQ9KjkI=";
})
# batman-adv: compat: Add atomic mc_fowarding support for stable kernels
(fetchpatch {
url = "https://git.open-mesh.org/batman-adv.git/blobdiff_plain/f07a0c37ab278fb6a9e95cad89429b1282f1ab59..350adcaec82fbaa358a2406343b6130ac8dad126:/net/batman-adv/multicast.c";
hash = "sha256-r/Xp5bmDo9GVfAF6bn2Xq+cOq5ddQe+D5s/h37uI6bM=";
})
];
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = kernel.makeFlags ++ [
"KERNELPATH=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

View File

@ -1,9 +1,9 @@
{
version = "2021.4";
version = "2022.0";
sha256 = {
batman-adv = "06zbyf8s7njn6wdm1fdq3kl8kx1vx4spxkgiy7dx0pq4c3qs5xyg";
alfred = "15fbw80ix95zy8i4c6acm1631vxlz2hakjv4zv5wig74bp2bcyac";
batctl = "1ryqz90av2p5pgmmpi1afmycd18zhpwz1i4f7r0s359jis86xndn";
batman-adv = "sha256-STOHBbwgdwmshNdmaI5wJXEAnIJ8CjIHiOpR+4h3FKo=";
alfred = "sha256-q7odrGHsz81jKeczHQVV/syTd2D7NsbPVc5sHXUc/Zg=";
batctl = "sha256-iTlm+aLWpQch3hJM5i2l096cIOBVdspIK8VwTMWm9z0=";
};
}

View File

@ -5,15 +5,15 @@
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }:
stdenv.mkDerivation rec {
version = "2022-04-13";
version = "2022-04-14";
pname = "oh-my-zsh";
rev = "7ea6ff8d04acd665ebcd151d183ec67af5be1281";
rev = "eb00b95d26e8f264af80f508d50ac32e50619027";
src = fetchFromGitHub {
inherit rev;
owner = "ohmyzsh";
repo = "ohmyzsh";
sha256 = "xi/jhaOLYggoI/xkfcX1f+1/puWtcZ4WqlC105oYvF8=";
sha256 = "kEyvSBVgHuTaBQu2X9OJ+eu2serHq9IyfJHxTmpv2BU=";
};
installPhase = ''

View File

@ -14,6 +14,10 @@ stdenv.mkDerivation {
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/a2ec92f05de006b56d16ac6a6c370d54a554861a/cuneiform/trunk/build-fix.patch";
sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj";
})
(fetchurl {
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/cuneiform/files/cuneiform-1.1.0-gcc11.patch";
sha256 = "14bp2f4dvlgxnpdza1rgszhkbxhp6p7lhgnb1s7c1x7vwdrx0ri7";
})
];
postPatch = ''

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "gitleaks";
version = "8.6.1";
version = "8.7.0";
src = fetchFromGitHub {
owner = "zricethezav";
repo = pname;
rev = "v${version}";
sha256 = "sha256-rXnP9vU8kHkMPl7Xur4pf3rvw12ADtkZxZnBO1LaFzs=";
sha256 = "sha256-4ED7xmwbFXs6OnCtG+xrY50kBsgESxw/a8slhWOo+30=";
};
vendorSha256 = "sha256-gelUrZOYiThO0+COIv9cOgho/tjv7ZqSKOktWIbdADw=";
vendorSha256 = "sha256-ls6zuouCAmE3y9011CK1YADy/v87Ft8tb85LyJ4bEF4=";
ldflags = [
"-s"

View File

@ -38,11 +38,11 @@ in
stdenv.mkDerivation rec {
pname = "sile";
version = "0.12.4";
version = "0.12.5";
src = fetchurl {
url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz";
sha256 = "1n46q7xwawz5nipmyz4gy0njaq5svidi9r54wxry6h95b70ax3r2";
sha256 = "0z9wdiqwarysh3lhxss3w53vq58ml46bdi9ymr853kfl7m4gz5yy";
};
configureFlags = [

View File

@ -78,6 +78,8 @@ let
bitv = callPackage ../development/ocaml-modules/bitv { };
bjack = callPackage ../development/ocaml-modules/bjack { };
bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { };
bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { };
bls12-381-unix = callPackage ../development/ocaml-modules/bls12-381/unix.nix { };
@ -293,6 +295,8 @@ let
dose3 = callPackage ../development/ocaml-modules/dose3 { };
dssi = callPackage ../development/ocaml-modules/dssi { };
dtoa = callPackage ../development/ocaml-modules/dtoa { };
duff = callPackage ../development/ocaml-modules/duff { };
@ -508,6 +512,8 @@ let
gapi_ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { };
gen_js_api = callPackage ../development/ocaml-modules/gen_js_api { };
gg = callPackage ../development/ocaml-modules/gg { };
git = callPackage ../development/ocaml-modules/git {
@ -641,10 +647,14 @@ let
lacaml = callPackage ../development/ocaml-modules/lacaml { };
ladspa = callPackage ../development/ocaml-modules/ladspa { };
lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { };
lambda-term = callPackage ../development/ocaml-modules/lambda-term { };
lastfm = callPackage ../development/ocaml-modules/lastfm { };
lens = callPackage ../development/ocaml-modules/lens { };
letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { };
@ -998,6 +1008,8 @@ let
odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { };
ojs = callPackage ../development/ocaml-modules/gen_js_api/ojs.nix { };
omd = callPackage ../development/ocaml-modules/omd { };
opam-core = callPackage ../development/ocaml-modules/opam-core {
@ -1102,6 +1114,8 @@ let
result = callPackage ../development/ocaml-modules/ocaml-result { };
samplerate = callPackage ../development/ocaml-modules/samplerate { };
secp256k1 = callPackage ../development/ocaml-modules/secp256k1 {
inherit (pkgs) secp256k1;
};
@ -1455,6 +1469,8 @@ let
xmlm = callPackage ../development/ocaml-modules/xmlm { };
xmlplaylist = callPackage ../development/ocaml-modules/xmlplaylist { };
xml-light = callPackage ../development/ocaml-modules/xml-light { };
xtmpl = callPackage ../development/ocaml-modules/xtmpl { };