nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-25 05:23:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-11-13 12:01:24 +00:00 committed by GitHub
commit 006069390c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 316 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -2638,6 +2638,12 @@
githubId = 71959829;
name = "Cleeyv";
};
clerie = {
email = "nix@clerie.de";
github = "clerie";
githubId = 9381848;
name = "clerie";
};
cleverca22 = {
email = "cleverca22@gmail.com";
matrix = "@cleverca22:matrix.org";

1
nixos/modules/module-list.nix
View File

@ -774,6 +774,7 @@
./services/networking/blockbook-frontend.nix
./services/networking/blocky.nix
./services/networking/charybdis.nix
./services/networking/chisel-server.nix
./services/networking/cjdns.nix
./services/networking/cloudflare-dyndns.nix
./services/networking/cntlm.nix

6
nixos/modules/services/hardware/sane.nix
View File

@ -28,8 +28,8 @@ let
};
env = {
SANE_CONFIG_DIR = config.hardware.sane.configDir;
LD_LIBRARY_PATH = [ "${saneConfig}/lib/sane" ];
SANE_CONFIG_DIR = "/etc/sane.d";
LD_LIBRARY_PATH = [ "/etc/sane-libs" ];
};
backends = [ pkg netConf ] ++ optional config.services.saned.enable sanedConf ++ config.hardware.sane.extraBackends;
@ -158,6 +158,8 @@ in
environment.systemPackages = backends;
environment.sessionVariables = env;
environment.etc."sane.d".source = config.hardware.sane.configDir;
environment.etc."sane-libs".source = "${saneConfig}/lib/sane";
services.udev.packages = backends;
users.groups.scanner.gid = config.ids.gids.scanner;

99
nixos/modules/services/networking/chisel-server.nix Normal file
View File

@ -0,0 +1,99 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.chisel-server;
in {
options = {
services.chisel-server = {
enable = mkEnableOption (mdDoc "Chisel Tunnel Server");
host = mkOption {
description = mdDoc "Address to listen on, falls back to 0.0.0.0";
type = with types; nullOr str;
default = null;
example = "[::1]";
};
port = mkOption {
description = mdDoc "Port to listen on, falls back to 8080";
type = with types; nullOr int;
default = null;
};
authfile = mkOption {
description = mdDoc "Path to auth.json file";
type = with types; nullOr path;
default = null;
};
keepalive = mkOption {
description = mdDoc "Keepalive interval, falls back to 25s";
type = with types; nullOr str;
default = null;
example = "5s";
};
backend = mkOption {
description = mdDoc "HTTP server to proxy normal requests to";
type = with types; nullOr str;
default = null;
example = "http://127.0.0.1:8888";
};
socks5 = mkOption {
description = mdDoc "Allow clients access to internal SOCKS5 proxy";
type = types.bool;
default = false;
};
reverse = mkOption {
description = mdDoc "Allow clients reverse port forwarding";
type = types.bool;
default = false;
};
};
};
config = mkIf cfg.enable {
systemd.services.chisel-server = {
description = "Chisel Tunnel Server";
wantedBy = [ "network-online.target" ];
serviceConfig = {
ExecStart = "${pkgs.chisel}/bin/chisel server " + concatStringsSep " " (
optional (cfg.host != null) "--host ${cfg.host}"
++ optional (cfg.port != null) "--port ${builtins.toString cfg.port}"
++ optional (cfg.authfile != null) "--authfile ${cfg.authfile}"
++ optional (cfg.keepalive != null) "--keepalive ${cfg.keepalive}"
++ optional (cfg.backend != null) "--backend ${cfg.backend}"
++ optional cfg.socks5 "--socks5"
++ optional cfg.reverse "--reverse"
);
# Security Hardening
# Refer to systemd.exec(5) for option descriptions.
CapabilityBoundingSet = "";
# implies RemoveIPC=, PrivateTmp=, NoNewPrivileges=, RestrictSUIDSGID=,
# ProtectSystem=strict, ProtectHome=read-only
DynamicUser = true;
LockPersonality = true;
PrivateDevices = true;
PrivateUsers = true;
ProcSubset = "pid";
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectProc = "invisible";
ProtectKernelModules = true;
ProtectKernelTunables = true;
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
RestrictNamespaces = true;
RestrictRealtime = true;
SystemCallArchitectures = "native";
SystemCallFilter = "~@clock @cpu-emulation @debug @mount @obsolete @reboot @swap @privileged @resources";
UMask = "0077";
};
};
};
meta.maintainers = with maintainers; [ clerie ];
}

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

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.40.1";
version = "0.40.2";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "v${version}";
sha256 = "sha256-jTo+CydRpb0Pak8NUwAJbSJDUZnDz4vUZ1577OZQOHg=";
sha256 = "sha256-wNedd6C4NPLPw8CA1tyKx2MWsKatFbN4xt3Us2SC/ME=";
};
vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg=";
vendorSha256 = "sha256-Qc0FnNxyErtieVvEj/eKPW5PpvYFwiYtv+ReJTVFAPA=";
doCheck = false;

6
pkgs/applications/office/treesheets/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "treesheets";
version = "unstable-2022-10-20";
version = "unstable-2022-11-11";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "12580ce39ee89f0ae6b9bdb304f7bc68a74ecdf7";
sha256 = "Z1BAYRcoeYOWomfwgBS/CQbejARs6sqsyZorhbJ/RdI=";
rev = "94881402b4730f598a536d8cddb3314eaf16defc";
sha256 = "+fv05KqfhpFeufUduOikXJuQmZfOq+i97B8kP//hsk0=";
};
nativeBuildInputs = [

19
pkgs/development/libraries/webp-pixbuf-loader/default.nix
View File

@ -18,17 +18,17 @@ let
in
stdenv.mkDerivation rec {
pname = "webp-pixbuf-loader";
version = "0.0.6";
version = "0.0.7";
src = fetchFromGitHub {
owner = "aruiz";
repo = "webp-pixbuf-loader";
rev = version;
sha256 = "sha256-dcdydWYrXZJjo4FxJtvzGzrQLOs87/BmxshFZwsT2ws=";
sha256 = "sha256-Za5/9YlDRqF5oGI8ZfLhx2ZT0XvXK6Z0h6fu5CGvizc=";
};
nativeBuildInputs = [
gdk-pixbuf
gdk-pixbuf.dev
meson
ninja
pkg-config
@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
];
mesonFlags = [
"-Dgdk_pixbuf_query_loaders_path=${gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders"
"-Dgdk_pixbuf_moduledir=${placeholder "out"}/${moduleDir}"
];
@ -51,13 +50,11 @@ stdenv.mkDerivation rec {
--replace "@bindir@/gdk-pixbuf-thumbnailer" "$out/bin/webp-thumbnailer"
'';
preInstall = ''
# environment variables controlling loaders.cache generation by gdk-pixbuf-query-loaders
export GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}"
export GDK_PIXBUF_MODULEDIR="$out/${moduleDir}"
'';
postInstall = ''
GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \
GDK_PIXBUF_MODULEDIR="$out/${moduleDir}" \
gdk-pixbuf-query-loaders --update-cache
# It assumes gdk-pixbuf-thumbnailer can find the webp loader in the loaders.cache referenced by environment variable, breaking containment.
# So we replace it with a wrapped executable.
mkdir -p "$out/bin"
@ -71,7 +68,5 @@ stdenv.mkDerivation rec {
license = licenses.lgpl2Plus;
platforms = platforms.unix;
maintainers = teams.gnome.members ++ [ maintainers.cwyc ];
# meson.build:16:0: ERROR: Program or command 'gcc' not found or not executable
broken = stdenv.isDarwin;
};
}

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aeppl";
version = "0.0.38";
version = "0.0.39";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "aesara-devs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-B9ZZEzGW4i0RRUaTAYiQ7+7pe4ArpSGcp/x4B6G7EYo=";
hash = "sha256-ILyE3tqoDHNmrKpHPBUJ02jrGevsU5864rjhgmgjwvo=";
};
propagatedBuildInputs = [

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

@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "aesara";
version = "2.8.4";
version = "2.8.9";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "aesara-devs";
repo = "aesara";
rev = "refs/tags/rel-${version}";
hash = "sha256-xtnz+qKW2l8ze0EXdL9mkx0MzfAnmauC9042W2cVc5o=";
hash = "sha256-xHh7u0NDMjQiu0TdjmiHQebfpXJkuAF7dUAAtXrmrPo=";
};
nativeBuildInputs = [

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

@ -0,0 +1,56 @@
{ lib
, aiohttp
, aresponses
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "aioweenect";
version = "1.1.1";
format = "pyproject";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "eifinger";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-9CYdOUPCt4TkepVuVJHMZngFHyCLFwVvik1xDnfneEc=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace "--cov --cov-report term-missing --cov-report xml --cov=aioweenect tests" ""
'';
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [
"aioweenect"
];
meta = with lib; {
description = "Library for the weenect API";
homepage = "https://github.com/eifinger/aioweenect";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "crownstone-core";
version = "3.2.0";
version = "3.2.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "crownstone";
repo = "crownstone-lib-python-core";
rev = version;
sha256 = "sha256-SZ2vJwKLo/C5lkTtLar5BGv7xzzRoUtxS1y8jiheRy4=";
sha256 = "sha256-zrlCzx7N3aUcTUNa64jSzDdWgQneX+Hc5n8TTTcZ4ck=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "dbus-fast";
version = "1.72.0";
version = "1.73.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-7KsikrHfk0EGtLOzO8qGyU8ZzqNshijDJgnDLn16Eis=";
hash = "sha256-JkhcDefz7SiZ+w6ijPAnKNyxTZ/5tmQUyOPnKb3EFGc=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/google-cloud-pubsub/default.nix
View File

@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "google-cloud-pubsub";
version = "2.13.10";
version = "2.13.11";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-PnRqGpfJa9xj/FSZUp7XJi8UZPbejIuuYjjBIgCRmsA=";
hash = "sha256-CFh47PuzmR/qavOgEaot2fVBXRnHYNDemlhSTSqhut4=";
};
propagatedBuildInputs = [

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

@ -4,11 +4,11 @@
buildPythonPackage rec {
pname = "mautrix";
version = "0.18.4";
version = "0.18.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-ymSnGgcy1sW7HlWsSbSRty+60MtChzpF56eH7wrdfh8=";
sha256 = "sha256-fxDkHSlfiyxDdCvz3CyAWeip08ozH+lqEzmM26a4/Xg=";
};
propagatedBuildInputs = [

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "praw";
version = "7.6.0";
version = "7.6.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "praw-dev";
repo = pname;
rev = "v${version}";
sha256 = "sha256-y2eynMsjF4wZd31YoLdtk8F+ga7Z3R+IQkQK0x0RAGA=";
sha256 = "sha256-ZGPtgpVTiGkInWDjsIcK7geu+TxAwDxbh2oyf2D65bo=";
};
propagatedBuildInputs = [

17
pkgs/development/python-modules/pynuki/default.nix
View File

@ -2,13 +2,14 @@
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, requests
, pynacl
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pynuki";
version = "1.5.2";
version = "1.6.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -17,17 +18,15 @@ buildPythonPackage rec {
owner = "pschmitt";
repo = pname;
rev = version;
sha256 = "sha256-Uqw1Xa0pBQmQsFEBv/l1gtsPy+owYcTZITOYUmMvT5Y=";
hash = "sha256-9WiPApesocE9wXyI/qH+TTfbsTgJTyifSW3tfNro7XI=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'requests = ">=2.27,<3"' 'requests = "*"'
'';
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
pynacl
requests
];

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

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pyrisco";
version = "0.5.5";
version = "0.5.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "OnFreund";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yUWZfCrd2w2jg34FrVwfYyQPSLHOz9RiZQpri4YXV1k=";
sha256 = "sha256-jhThPU4wlujZVC9v/8JSRFxC0LlJedFevOENdRHidV8=";
};
propagatedBuildInputs = [ aiohttp ];

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyskyqremote";
version = "0.3.19";
version = "0.3.20";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "RogerSelwyn";
repo = "skyq_remote";
rev = "refs/tags/${version}";
sha256 = "sha256-yN1d0Q6kbtQ+f+3WgTVZR9NVcV5K7VEZQ44H1bcP5Fk=";
sha256 = "sha256-HLiLFuMJL9iXv7FckoVVK02jOhSRMrU8FohkD4gKjmM=";
};
propagatedBuildInputs = [

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.20.2";
version = "0.20.3";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-GNjyDkqhOP9sq2qoAZCdSrUNte3FynVxhy9RSUn9j/c=";
hash = "sha256-kyCCGXvjE3Ufmc473GiYDVZ9QpNn1GTuVbwvd3NUTwo=";
};
propagatedBuildInputs = [

44
pkgs/development/python-modules/tplink-omada-client/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchPypi
, hatchling
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "tplink-omada-client";
version = "1.0.1";
format = "pyproject";
disabled = pythonOlder "3.9";
src = fetchPypi {
pname = "tplink_omada_client";
inherit version;
hash = "sha256-72Oxrjn1KNasdW9XITuqM5L59/5/R/BvM175d18eFmI=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
aiohttp
];
# Module have no tests
doCheck = false;
pythonImportsCheck = [
"tplink_omada_client"
];
meta = with lib; {
description = "Library for the TP-Link Omada SDN Controller API";
homepage = "https://github.com/MarkGodwin/tplink-omada-api";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "7.15.1";
version = "7.15.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-Ud4NbiTO7ki+l8hPzGP7DlReRA0XK0OJhDZRPNLWm7A=";
hash = "sha256-Y7rQxoculQ2Dp02/sEowsEf677pDA7AQpWuEiiywvwo=";
};
propagatedBuildInputs = [

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

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "wsgidav";
version = "4.0.2";
version = "4.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "mar10";
repo = pname;
rev = "v${version}";
hash = "sha256-LQdS9d2DB4PXqRSzmtZCSyCQI47ncLCG+RSB+goZYoA=";
hash = "sha256-iNyXY0txKX4X1+O27T7my8dfs8wqXoG7Kuo9yN9SRnY=";
};
nativeBuildInputs = [

6
pkgs/servers/mautrix-signal/default.nix
View File

@ -2,13 +2,13 @@
python3.pkgs.buildPythonPackage rec {
pname = "mautrix-signal";
version = "0.3.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "mautrix";
repo = "signal";
rev = "v${version}";
sha256 = "sha256-khtvfZbqBRQyHteil+H/b3EktjRet6DRcKMHmCClNq0=";
rev = "refs/tags/v${version}";
sha256 = "sha256-WcyBv7b1JxiZJSqxgAUUgTa5Q/aNzU9SfXfdXKVuuXQ=";
};
propagatedBuildInputs = with python3.pkgs; [

2
pkgs/servers/polaris/node-packages.nix generated
View File

@ -3564,7 +3564,7 @@ let
name = "polaris-web";
packageName = "polaris-web";
version = "1.0.0";
src = ../../../../../../../../../nix/store/jmc09cn278v9s9s503ani8jn55gqwfx7-source;
src = ../../../../../../../../../nix/store/fgp5qgah5zc0x8fx5la4fvnnmp45avzw-source;
dependencies = [
sources."@babel/code-frame-7.16.7"
(sources."@babel/highlight-7.16.10" // {

4
pkgs/servers/polaris/web.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "polaris-web";
version = "build-54";
version = "build-55";
src = fetchFromGitHub {
owner = "agersant";
repo = "polaris-web";
rev = "${version}";
sha256 = "+Tpj4XgWL1U+Y33YbEruilfV/6WGl8Dtj9FdXm2JVNU=";
sha256 = "2XqU4sExF7Or7RxpOK2XU9APtBujfPhM/VkOLKVDvF4=";
};
nativeBuildInputs = [

4
pkgs/servers/snappymail/default.nix
View File

@ -2,11 +2,11 @@
, dataPath ? "/var/lib/snappymail" }:
stdenv.mkDerivation rec {
pname = "snappymail";
version = "2.20.6";
version = "2.21.0";
src = fetchurl {
url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
sha256 = "sha256-xALHgE+N/X2YqGd3qZxAiZF1onzO/FVfxSbwjAaep/A=";
sha256 = "sha256-rJRNSlzGPNRFsvloTatB0o9uumbp18I15L5G6ms47EM=";
};
sourceRoot = "snappymail";

33
pkgs/tools/networking/tran/default.nix Normal file
View File

@ -0,0 +1,33 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "tran";
version = "0.1.43";
src = fetchFromGitHub {
owner = "abdfnx";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qp4g1ZLRIIz0CZ/Zey354g0j9ePE4pGb82IivLezU7s=";
};
vendorSha256 = "sha256-JmRTI5ZBSFULfI+ki3hI8TPaS6IVP9D14r4DwK/nx1Y=";
ldflags = [
"-w"
"-s"
"-X main.version=v${version}"
];
subPackages = [ "." ];
meta = with lib; {
description = "Securely transfer and send anything between computers with TUI";
homepage = "https://github.com/abdfnx/tran";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};
}

6
pkgs/tools/security/step-ca/default.nix
View File

@ -12,16 +12,16 @@
buildGoModule rec {
pname = "step-ca";
version = "0.22.1";
version = "0.23.0";
src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
sha256 = "sha256-iWThTFH36NNjO9Acx5QyxJrUzKFl7vD/seWF/Rz05CU=";
sha256 = "sha256-upi0EL6iviLV7hrLkh5PUAhx3/98kMISqHdy7NFODwI=";
};
vendorSha256 = "sha256-AcjICy991WPQyXp/9j6rgedg4FTYXilH7O4dy8gGYq8=";
vendorSha256 = "sha256-2uxDQVNTNBTj40vYMlCuwMPCQDGQfkdUc67qmP5+j7g=";
ldflags = [ "-buildid=" ];

6
pkgs/tools/security/step-cli/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "step-cli";
version = "0.22.0";
version = "0.23.0";
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-X99/Fnow6l47T9ZAhEjRNOsVWO48utuCr3jW9Emb0T4=";
sha256 = "sha256-GNFzP/qs8tRfp1IEa0Th/nVi31YKQWT77HJHJNEUzoQ=";
};
ldflags = [
@ -25,7 +25,7 @@ buildGoModule rec {
rm command/certificate/remote_test.go
'';
vendorSha256 = "sha256-USDr/16cPR7PjWnXpQvi+4sKRyyFw+1EdCDE7vWs7LQ=";
vendorSha256 = "sha256-vDdc5lT2/4BFz8gbF9o8ld09b6p7LuqcKrA5ypTkpgc=";
meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

9
pkgs/tools/system/efivar/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, pkg-config, popt, mandoc }:
{ lib, stdenv, buildPackages, fetchFromGitHub, fetchpatch, pkg-config, popt, mandoc }:
stdenv.mkDerivation rec {
pname = "efivar";
@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
hash = "sha256-A38BKGMK3Vo+85wzgxmzTjzZXtpcY9OpbZaONWnMYNk=";
};
patches = [
(fetchpatch {
url = "https://github.com/rhboot/efivar/commit/15622b7e5761f3dde3f0e42081380b2b41639a48.patch";
sha256 = "sha256-SjZXj0hA2eQu2MfBoNjFPtd2DMYadtL7ZqwjKSf2cmI=";
})
];
nativeBuildInputs = [ pkg-config mandoc ];
buildInputs = [ popt ];
depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@ -12120,6 +12120,8 @@ with pkgs;
trackma-qt = trackma.override { withQT = true; };
tran = callPackage ../tools/networking/tran { };
tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
tpm-quote-tools = callPackage ../tools/security/tpm-quote-tools { };

4
pkgs/top-level/python-packages.nix
View File

@ -344,6 +344,8 @@ self: super: with self; {
aiowatttime = callPackage ../development/python-modules/aiowatttime { };
aioweenect = callPackage ../development/python-modules/aioweenect { };
aiowebostv = callPackage ../development/python-modules/aiowebostv { };
aiowinreg = callPackage ../development/python-modules/aiowinreg { };
@ -11221,6 +11223,8 @@ self: super: with self; {
tox = callPackage ../development/python-modules/tox { };
tplink-omada-client = callPackage ../development/python-modules/tplink-omada-client { };
tpm2-pytss = callPackage ../development/python-modules/tpm2-pytss { };
tqdm = callPackage ../development/python-modules/tqdm { };