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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2023-07-24 06:01:13 +00:00 committed by GitHub
commit aae1f8ef06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 633 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/systems/platforms.nix
View File

@ -213,7 +213,6 @@ rec {
bluefield2 = {
gcc = {
arch = "armv8-a+fp+simd+crc+crypto";
cpu = "cortex-a72";
};
};

24
nixos/modules/services/networking/tailscale.nix
View File

@ -49,6 +49,15 @@ in {
When set to `server` or `both`, IP forwarding will be enabled.
'';
};
authKeyFile = mkOption {
type = types.nullOr types.path;
default = null;
example = "/run/secrets/tailscale_key";
description = lib.mdDoc ''
A file containing the auth key.
'';
};
};
config = mkIf cfg.enable {
@ -82,6 +91,21 @@ in {
stopIfChanged = false;
};
systemd.services.tailscaled-autoconnect = mkIf (cfg.authKeyFile != null) {
after = ["tailscale.service"];
wants = ["tailscale.service"];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
};
script = with pkgs; ''
status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service)
if [[ $status != Connected* ]]; then
${pkgs.tailscale}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}'
fi
'';
};
boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") {
"net.ipv4.conf.all.forwarding" = mkOverride 97 true;
"net.ipv6.conf.all.forwarding" = mkOverride 97 true;

2
nixos/tests/systemd-networkd-dhcpserver-static-leases.nix
View File

@ -3,7 +3,7 @@
import ./make-test-python.nix ({ lib, ... }: {
name = "systemd-networkd-dhcpserver-static-leases";
meta = with lib.maintainers; {
maintainers = [ veehaitch tomfitzhenry ];
maintainers = [ veehaitch ];
};
nodes = {
router = {

2
nixos/tests/systemd-networkd-dhcpserver.nix
View File

@ -10,7 +10,7 @@
import ./make-test-python.nix ({pkgs, ...}: {
name = "systemd-networkd-dhcpserver";
meta = with pkgs.lib.maintainers; {
maintainers = [ tomfitzhenry ];
maintainers = [ ];
};
nodes = {
router = { config, pkgs, ... }: {

6
pkgs/applications/audio/ncspot/default.nix
View File

@ -16,16 +16,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "0.13.3";
version = "0.13.4";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
hash = "sha256-AXe/ysNYSWC4cuzvN4fLmDyeBxpzciDo8PFjXdzFMl0=";
hash = "sha256-pYPUYy/ODzg9HN0/PTGZkV1NFBPmluhEwoJjYuZ6DTg=";
};
cargoHash = "sha256-y7Vaf4jp2Zds0KsYqF0JBWsbq9IQVu6n0TMo3oGL14A=";
cargoHash = "sha256-FdXk6SzW0f3jkTfxMd8TMzfJGTRaZjG4qp56yHqDAuw=";
nativeBuildInputs = [ pkg-config ]
++ lib.optional withClipboard python3;

6
pkgs/applications/audio/plexamp/default.nix
View File

@ -2,12 +2,12 @@
let
pname = "plexamp";
version = "4.7.4";
version = "4.8.1";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
sha512 = "TZ7JNSrUtsqnH+fWIcd1v4fY0jPnMV7nqV/QsbD7ZpqIBCkN3R9WQvc/E9gah163Ab40g9CmdghTGo3v8VW2Rw==";
sha512 = "iPCiBbb6alQspEPccxn1XHik0GbksZoe5jb0u8VuUdybO+xVb6sIxTNi6sxTG32uSRH6o16EHNUhLKeb6OcEtA==";
};
appimageContents = appimageTools.extractType2 {
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/50";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/51";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];

2
pkgs/applications/audio/spot/default.nix
View File

@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
description = "Native Spotify client for the GNOME desktop";
homepage = "https://github.com/xou816/spot";
license = licenses.mit;
maintainers = with maintainers; [ tomfitzhenry ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

6
pkgs/applications/editors/emacs/sources.nix
View File

@ -50,12 +50,12 @@ in
emacs29 = import ./generic.nix {
pname = "emacs";
version = "29.0.92";
version = "29.1-rc1";
variant = "mainline";
src = fetchFromSavannah {
repo = "emacs";
rev = "29.0.92";
hash = "sha256-Vkry+2zYejZVwZKQlmQiAJnbjsj87DiIZ1ungooYd8A=";
rev = "29.1-rc1";
hash = "sha256-p0lBSKsHrFwYTqO5UVIF/PgiqwdhYQE4oUVcPtd+gsU=";
};
meta = mainlineMeta;

2
pkgs/applications/misc/numberstation/default.nix
View File

@ -63,6 +63,6 @@ python3.pkgs.buildPythonApplication rec {
description = "TOTP Authentication application for mobile";
homepage = "https://sr.ht/~martijnbraam/numberstation/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ dotlambda tomfitzhenry ];
maintainers = with maintainers; [ dotlambda ];
};
}

2
pkgs/applications/misc/siglo/default.nix
View File

@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/theironrobin/siglo";
changelog = "https://github.com/theironrobin/siglo/tags/v${version}";
license = licenses.mpl20;
maintainers = with maintainers; [ tomfitzhenry ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}

810
pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
View File

File diff suppressed because it is too large Load Diff

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

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "terragrunt";
version = "0.48.1";
version = "0.48.4";
src = fetchFromGitHub {
owner = "gruntwork-io";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-zBjIUoH5s7Yo1qrzSY4LhxPBDcxxqZmvJt8z50FRro0=";
hash = "sha256-3hHCNiuff8CgnQ6hB4I8jODINKA6ZpNOkKwVcCqKDo4=";
};
vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA=";

2
pkgs/applications/networking/instant-messengers/flare-signal/default.nix
View File

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
description = "An unofficial Signal GTK client";
homepage = "https://gitlab.com/Schmiddiii/flare";
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ dotlambda tomfitzhenry ];
maintainers = with lib.maintainers; [ dotlambda ];
platforms = lib.platforms.linux;
};
}

2
pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
View File

@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
description = "A libpurple plugin for sending and receiving SMS via Modemmanager";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ tomfitzhenry ];
maintainers = with maintainers; [ ];
};
}

6
pkgs/applications/video/youtube-tui/default.nix
View File

@ -15,16 +15,16 @@
rustPlatform.buildRustPackage rec {
pname = "youtube-tui";
version = "0.7.2";
version = "0.7.4";
src = fetchFromGitHub {
owner = "Siriusmart";
repo = pname;
rev = "v${version}";
hash = "sha256-gogV/+zo/Spg5d8Fh4gDTJL4ojdWbB6mDbppF0i+H20=";
hash = "sha256-UN70V+RGYlYJxCQGPH8cnQDSqpihGuwzETYEhbG6Ggo=";
};
cargoHash = "sha256-TUq/Kix+Z+rELN7x3/gmFOtpa1bj/xakiYDYSyVtA/s=";
cargoHash = "sha256-kAhxsSFIJAoKlmN7hVUoTSSHQ2G23f21rEvxcIRQ+kw=";
nativeBuildInputs = [
pkg-config

4
pkgs/data/icons/numix-icon-theme-square/default.nix
View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-square";
version = "23.07.08";
version = "23.07.21";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-wT71uGYaZ1URzDrtpWPvcMxuwoJoztJPCtnEOVJ1xUY=";
sha256 = "sha256-rHT4lD+RcwRmE63Dd7/oXVAltRTfpisptzyD1EQG4Aw=";
};
nativeBuildInputs = [ gtk3 ];

6
pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, mkXfceDerivation
, exo
, glib
, gtk3
, libXtst
, libxfce4ui
@ -13,13 +14,14 @@
mkXfceDerivation rec {
category = "panel-plugins";
pname = "xfce4-cpugraph-plugin";
version = "1.2.7";
version = "1.2.8";
rev-prefix = "xfce4-cpugraph-plugin-";
odd-unstable = false;
sha256 = "sha256-IgxljHJAg9Bp/OFFZiQ6QwE5vtAtQ0WmYHs78NVsmCw=";
sha256 = "sha256-GNoODnw9Z9MTlvxCOTeZt61A/0AGhMwjrRGdM35XU+M=";
buildInputs = [
exo
glib
gtk3
libXtst
libxfce4ui

2
pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix
View File

@ -3,6 +3,7 @@
, automakeAddFlags
, exo
, gtk3
, libcanberra
, libpulseaudio
, libnotify
, libxfce4ui
@ -32,6 +33,7 @@ mkXfceDerivation {
glib
gtk3
keybinder3
libcanberra
libnotify
libpulseaudio
libxfce4ui

6
pkgs/development/compilers/erg/default.nix
View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "erg";
version = "0.6.16";
version = "0.6.17";
src = fetchFromGitHub {
owner = "erg-lang";
repo = "erg";
rev = "v${version}";
hash = "sha256-HBi9QDSrAkBORswoNXDGZaABQYFDQGC8WKdzhk4KKhw=";
hash = "sha256-KHfKV0i3jYwzD/PQ0TSOlxjUnc08pk0yKrLQlg5eQvg=";
};
cargoHash = "sha256-YQYyH+iypORcAEyVhHqYw0aHi1QtCgNuwyg/SnmGVIE=";
cargoHash = "sha256-PD1C3IsupjyQndD971zbfHYxizOQd/t770u48o/aGmk=";
nativeBuildInputs = [
makeWrapper

22
pkgs/development/ocaml-modules/dolog/default.nix
View File

@ -1,29 +1,19 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:
{ lib, buildDunePackage, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "ocaml-dolog";
version = "3.0";
buildDunePackage rec {
pname = "dolog";
version = "6.0.0";
src = fetchFromGitHub {
owner = "UnixJunkie";
repo = "dolog";
repo = pname;
rev = "v${version}";
sha256 = "sha256-6wfqT5sqo4YA8XoHH3QhG6/TyzzXCzqjmnPuBArRoj8=";
hash = "sha256-g68260mcb4G4wX8y4T0MTaXsYnM9wn2d0V1VCdSFZjY=";
};
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
strictDeps = true;
createFindlibDestdir = true;
doCheck = true;
checkTarget = "test";
meta = {
homepage = "https://github.com/UnixJunkie/dolog";
description = "Minimalistic lazy logger in OCaml";
platforms = ocaml.meta.platforms or [ ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ vbgl ];
};

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

@ -5,7 +5,7 @@
, importlib-metadata
, pytestCheckHook
# large-rebuild downstream dependencies and applications
# large-rebuild downstream dependencies and applications
, flask
, black
, magic-wormhole
@ -43,6 +43,6 @@ buildPythonPackage rec {
composable way, with as little code as necessary.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ nickcao ];
};
}

2
pkgs/development/python-modules/debian/default.nix
View File

@ -33,6 +33,6 @@ buildPythonPackage rec {
homepage = "https://salsa.debian.org/python-debian-team/python-debian";
changelog = "https://salsa.debian.org/python-debian-team/python-debian/-/blob/master/debian/changelog";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ nickcao ];
};
}

2
pkgs/development/python-modules/editorconfig/default.nix
View File

@ -48,6 +48,6 @@ buildPythonPackage rec {
description = "EditorConfig File Locator and Interpreter for Python";
homepage = "https://github.com/editorconfig/editorconfig-core-py";
license = licenses.psfl;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ nickcao ];
};
}

2
pkgs/development/python-modules/flask/default.nix
View File

@ -57,6 +57,6 @@ buildPythonPackage rec {
Python web application frameworks.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ nickcao ];
};
}

2
pkgs/development/python-modules/gatt/default.nix
View File

@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "Bluetooth (Generic Attribute Profile) GATT SDK for Python";
homepage = "https://github.com/getsenic/gatt-python/";
license = licenses.mit;
maintainers = with maintainers; [ tomfitzhenry ];
maintainers = with maintainers; [ ];
};
}

2
pkgs/development/python-modules/msgpack/default.nix
View File

@ -35,6 +35,6 @@ buildPythonPackage rec {
homepage = "https://github.com/msgpack/msgpack-python";
changelog = "https://github.com/msgpack/msgpack-python/blob/v${version}/ChangeLog.rst";
license = licenses.asl20;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ nickcao ];
};
}

6
pkgs/development/python-modules/piccolo-theme/default.nix
View File

@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "piccolo-theme";
version = "0.15.0";
version = "0.16.1";
src = fetchPypi {
pname = "piccolo_theme";
inherit version;
hash = "sha256-8VxkrzADp3yCeb02BxtT6oSP1FCX8GW4oc6OECK2hJw=";
hash = "sha256-4VOJ7l6tBhMBZ2x+T5Bl5WdnMg4JEBkwaGDA/9XUmc8=";
};
propagatedBuildInputs = [
@ -19,7 +19,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Clean and modern Sphinx theme";
homepage = "https://piccolo-theme.readthedocs.io";
license = licenses.mit;
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ loicreynier ];
platforms = platforms.unix;
};

2
pkgs/development/python-modules/pkgconfig/default.nix
View File

@ -45,6 +45,6 @@ buildPythonPackage rec {
description = "Interface Python with pkg-config";
homepage = "https://github.com/matze/pkgconfig";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ nickcao ];
};
}

2
pkgs/development/python-modules/setuptools-scm/default.nix
View File

@ -49,6 +49,6 @@ buildPythonPackage rec {
homepage = "https://github.com/pypa/setuptools_scm/";
description = "Handles managing your python package versions in scm metadata";
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ nickcao ];
};
}

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

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "tubeup";
version = "2023.5.29";
version = "2023.7.23";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-5tvRaIXVzZcNy40uOEPwwN4EKPvvZPiR3qIdmiZSXWw=";
sha256 = "sha256-lI+Ws1uVC8cnRERmfY7j5vPjQGEAH6zef7nBnd/hC+I=";
};
nativeBuildInputs = [
@ -33,7 +33,6 @@ buildPythonPackage rec {
];
pythonRelaxDeps = [
"internetarchive"
"urllib3"
"docopt"
];

4
pkgs/development/tools/analysis/codeql/default.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "codeql";
version = "2.13.5";
version = "2.14.0";
dontConfigure = true;
dontBuild = true;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
src = fetchzip {
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
sha256 = "sha256-/carrJ87XvnD5Pd+MJAqNdXxA5vyJl0mX1hEbykhSUk=";
sha256 = "sha256-ogodg7BFacM5gMMB04R7SBPiVGHBea/lwzTZo04jtWY=";
};
nativeBuildInputs = [

31
pkgs/development/tools/misc/terramate/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ lib
, buildGoModule
, fetchFromGitHub
, git
}:
buildGoModule rec {
pname = "terramate";
version = "0.3.0";
src = fetchFromGitHub {
owner = "terramate-io";
repo = "terramate";
rev = "v${version}";
hash = "sha256-/e3NbUhHQlREjb3YYSfrPq/GE+BfFI3mUO4eRE4mk9U=";
};
vendorHash = "sha256-bja4v48BSPZC/vJVps2LKq90fReYpMY/yKTThsQQCHE=";
# required for version info
nativeBuildInputs = [ git ];
ldflags = [ "-extldflags" "-static" ];
meta = with lib; {
description = "Adds code generation, stacks, orchestration, change detection, data sharing and more to Terraform";
homepage = "https://github.com/terramate-io/terramate";
license = licenses.mpl20;
maintainers = with maintainers; [ dit7ya ];
};
}

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

@ -2,13 +2,13 @@
python3.pkgs.buildPythonPackage rec {
pname = "mautrix-signal";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "mautrix";
repo = "signal";
rev = "refs/tags/v${version}";
sha256 = "sha256-UbetU1n9zD/mVFaJc9FECDq/Zell1TI/aYPsGXGB8Js=";
sha256 = "sha256-QShyuwHiWRcP1hGkvCQfixvoUQ/FXr2DYC5VrcMKX48=";
};
postPatch = ''
@ -28,6 +28,7 @@ python3.pkgs.buildPythonPackage rec {
propagatedBuildInputs = with python3.pkgs; [
commonmark
aiohttp
aiosqlite
asyncpg
attrs
commonmark

4
pkgs/shells/zsh/zsh-vi-mode/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-vi-mode";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "jeffreytse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KQ7UKudrpqUwI6gMluDTVN0qKpB15PI5P1YHHCBIlpg=";
sha256 = "sha256-QE6ZwwM2X0aPqNnbVrj0y7w9hmuRf0H1j8nXYwyoLo4=";
};
strictDeps = true;

4
pkgs/tools/X11/opentabletdriver/default.nix
View File

@ -24,12 +24,12 @@ buildDotnetModule rec {
owner = "OpenTabletDriver";
repo = "OpenTabletDriver";
rev = "v${version}";
sha256 = "sha256-D1/DGvSBgG8wZMmyJ7QAHDcsMjC1YgSpxmSYzs6ntJg=";
hash = "sha256-D1/DGvSBgG8wZMmyJ7QAHDcsMjC1YgSpxmSYzs6ntJg=";
};
debPkg = fetchurl {
url = "https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb";
sha256 = "sha256-LJqH3+JckPF7S/1uBE2X81jxWg0MF9ff92Ei8WPEA2w=";
hash = "sha256-zWSJlkn7K/meTycWNTinC0hp0JubF22dJNOJeEIfGtI=";
};
dotnetInstallFlags = [ "--framework=net6.0" ];

4
pkgs/tools/cd-dvd/ventoy/default.nix
View File

@ -51,7 +51,7 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "ventoy";
version = "1.0.93";
version = "1.0.94";
src =
let
@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
in
fetchurl {
url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";
hash = "sha256-oz5IVq0QsPX90N4EBold2QQ8/CY4XF+KcQ41L+TR4iI=";
hash = "sha256-dVcr0qDG95QC9ay1Sbhs9IxCGzpLvej2XRmje29fWhQ=";
};
patches = [

4
pkgs/tools/misc/mmv/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "mmv";
version = "2.4";
version = "2.5";
src = fetchFromGitHub {
owner = "rrthomas";
repo = "mmv";
rev = "v${version}";
sha256 = "sha256-0Zj58su/4XRjK2KuzIIzTLbXgKa0WSa1mBH2q4pLTrI=";
sha256 = "sha256-tQk3AwmUuhbxvFm9wiO7BM2GChGopvpCZAp8J9XCDF0=";
fetchSubmodules = true;
};

4
pkgs/tools/misc/plantuml-server/default.nix
View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchurl }:
let
version = "1.2023.8";
version = "1.2023.10";
in
stdenv.mkDerivation rec {
pname = "plantuml-server";
inherit version;
src = fetchurl {
url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
sha256 = "sha256-2rvYoDna9zV+KAsSNYsThWLyu0BTtFm5GMBTXB7DRkA=";
sha256 = "sha256-EIdqY8sonLaHZCfOfAaUhm4M1XOek2M1OqPZkb/CTg4=";
};
dontUnpack = true;

44
pkgs/tools/security/age-plugin-ledger/default.nix Normal file
View File

@ -0,0 +1,44 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, libusb1
, openssl
, rage
, AppKit
}:
rustPlatform.buildRustPackage rec {
pname = "age-plugin-ledger";
version = "0.1.2";
src = fetchFromGitHub {
owner = "Ledger-Donjon";
repo = "age-plugin-ledger";
rev = "v${version}";
hash = "sha256-g5GbWXhaGEafiM3qkGlRXHcOzPZl2pbDWEBPg4gQWcg=";
};
cargoHash = "sha256-SbgH67XuxBa7WFirSdOIUxfJGlIYezISCEA3LJGN3ys=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libusb1
openssl
] ++ lib.optional stdenv.isDarwin AppKit;
nativeCheckInputs = [
rage
];
meta = with lib; {
description = "A Ledger Nano plugin for age";
homepage = "https://github.com/Ledger-Donjon/age-plugin-ledger";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ erdnaxe ];
};
}

4
pkgs/tools/system/logcheck/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "logcheck";
version = "1.4.2";
version = "1.4.3";
_name = "logcheck_${version}";
src = fetchurl {
url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
sha256 = "sha256-DGUd6zHcIB8VhOzqKSslmTK65uPozvhG2zEJ6Jp/IX4=";
sha256 = "sha256-rYOugL14C9rl7v1ArVmj6XuFrTpJYqp8ANmO073/zdA=";
};
prePatch = ''

2
pkgs/tools/system/tree/default.nix
View File

@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
the LS_COLORS environment variable is set and output is to tty.
'';
platforms = platforms.all;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ nickcao ];
};
}

51
pkgs/tools/text/pyp/default.nix Normal file
View File

@ -0,0 +1,51 @@
{ lib
, fetchFromGitHub
, python3
, bc
, jq
}:
let
version = "1.1.0";
in python3.pkgs.buildPythonApplication {
pname = "pyp";
inherit version;
format = "pyproject";
src = fetchFromGitHub {
owner = "hauntsaninja";
repo = "pyp";
rev = "v${version}";
hash = "sha256-A1Ip41kxH17BakHEWEuymfa24eBEl5FIHAWL+iZFM4I=";
};
nativeBuildInputs = [
python3.pkgs.flit-core
];
nativeCheckInputs = [
python3.pkgs.pytestCheckHook
bc
jq
];
# without this, the tests fail because they are unable to find the pyp tool
# itself...
preCheck = ''
_OLD_PATH_=$PATH
PATH=$out/bin:$PATH
'';
# And a cleanup
postCheck = ''
PATH=$_OLD_PATH_
'';
meta = {
homepage = "https://github.com/hauntsaninja/pyp";
description = "Easily run Python at the shell";
changelog = "https://github.com/hauntsaninja/pyp/blob/${version}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

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

@ -6796,6 +6796,10 @@ with pkgs;
agebox = callPackage ../tools/security/agebox { };
age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger {
inherit (darwin.apple_sdk.frameworks) AppKit;
};
age-plugin-tpm = callPackage ../tools/security/age-plugin-tpm { };
age-plugin-yubikey = darwin.apple_sdk_11_0.callPackage ../tools/security/age-plugin-yubikey {
@ -19981,6 +19985,8 @@ with pkgs;
terraformer = callPackage ../development/tools/misc/terraformer { };
terramate = callPackage ../development/tools/misc/terramate { };
terrascan = callPackage ../tools/security/terrascan { };
texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
@ -24220,6 +24226,8 @@ with pkgs;
buildPythonApplication click future six;
};
pyp = callPackage ../tools/text/pyp { };
pru = callPackage ../tools/text/pru { };
prospector = callPackage ../development/tools/prospector { };