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-10-29 00:02:24 +00:00 committed by GitHub
commit 954eb09381
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 285 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maintainers/maintainer-list.nix
View File

@ -13330,6 +13330,15 @@
githubId = 75299;
name = "Malcolm Matalka";
};
orhun = {
email = "orhunparmaksiz@gmail.com";
github = "orhun";
githubId = 24392180;
name = "Orhun Parmaksız";
keys = [{
fingerprint = "165E 0FF7 C48C 226E 1EC3 63A7 F834 2482 4B3E 4B90";
}];
};
orichter = {
email = "richter-oliver@gmx.net";
github = "ORichterSec";

4
nixos/modules/services/networking/unifi.nix
View File

@ -6,9 +6,9 @@ let
cmd = ''
@${cfg.jrePackage}/bin/java java \
${optionalString (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16")
"--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED "
("--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED "
+ "--add-opens java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED "
+ "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"} \
+ "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED")} \
${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
-jar ${stateDir}/lib/ace.jar

64
nixos/modules/tasks/encrypted-devices.nix
View File

@ -5,8 +5,22 @@ with lib;
let
fileSystems = config.system.build.fileSystems ++ config.swapDevices;
encDevs = filter (dev: dev.encrypted.enable) fileSystems;
keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs;
keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs;
# With scripted initrd, devices with a keyFile have to be opened
# late, after file systems are mounted, because that could be where
# the keyFile is located. With systemd initrd, each individual
# systemd-cryptsetup@ unit has RequiresMountsFor= to delay until all
# the mount units for the key file are done; i.e. no special
# treatment is needed.
lateEncDevs =
if config.boot.initrd.systemd.enable
then { }
else filter (dev: dev.encrypted.keyFile != null) encDevs;
earlyEncDevs =
if config.boot.initrd.systemd.enable
then encDevs
else filter (dev: dev.encrypted.keyFile == null) encDevs;
anyEncrypted =
foldr (j: v: v || j.encrypted.enable) false encDevs;
@ -39,11 +53,14 @@ let
type = types.nullOr types.str;
description = lib.mdDoc ''
Path to a keyfile used to unlock the backing encrypted
device. At the time this keyfile is accessed, the
`neededForBoot` filesystems (see
`fileSystems.<name?>.neededForBoot`)
will have been mounted under `/mnt-root`,
so the keyfile path should usually start with "/mnt-root/".
device. When systemd stage 1 is not enabled, at the time
this keyfile is accessed, the `neededForBoot` filesystems
(see `utils.fsNeededForBoot`) will have been mounted under
`/mnt-root`, so the keyfile path should usually start with
"/mnt-root/". When systemd stage 1 is enabled,
`fsNeededForBoot` file systems will be mounted as needed
under `/sysroot`, and the keyfile will not be accessed until
its requisite mounts are done.
'';
};
};
@ -62,26 +79,41 @@ in
};
config = mkIf anyEncrypted {
assertions = map (dev: {
assertion = dev.encrypted.label != null;
message = ''
The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set
'';
}) encDevs;
assertions = concatMap (dev: [
{
assertion = dev.encrypted.label != null;
message = ''
The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set
'';
}
{
assertion =
config.boot.initrd.systemd.enable -> (
dev.encrypted.keyFile == null
|| !lib.any (x: lib.hasPrefix x dev.encrypted.keyFile) ["/mnt-root" "$targetRoot"]
);
message = ''
Bad use of '/mnt-root' or '$targetRoot` in 'keyFile'.
When 'boot.initrd.systemd.enable' is enabled, file systems
are mounted at '/sysroot' instead of '/mnt-root'.
'';
}
]) encDevs;
boot.initrd = {
luks = {
devices =
builtins.listToAttrs (map (dev: {
name = dev.encrypted.label;
value = { device = dev.encrypted.blkDev; };
}) keylessEncDevs);
value = { device = dev.encrypted.blkDev; inherit (dev.encrypted) keyFile; };
}) earlyEncDevs);
forceLuksSupportInInitrd = true;
};
postMountCommands =
concatMapStrings (dev:
"cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n"
) keyedEncDevs;
) lateEncDevs;
};
};
}

8
nixos/tests/installer-systemd-stage-1.nix
View File

@ -12,11 +12,11 @@
btrfsSubvolDefault
btrfsSubvolEscape
btrfsSubvols
# encryptedFSWithKeyfile
encryptedFSWithKeyfile
# grub1
# luksroot
# luksroot-format1
# luksroot-format2
luksroot
luksroot-format1
luksroot-format2
# lvm
separateBoot
separateBootFat

4
nixos/tests/installer.nix
View File

@ -515,7 +515,7 @@ let
enableOCR = true;
preBootCommands = ''
machine.start()
machine.wait_for_text("Passphrase for")
machine.wait_for_text("[Pp]assphrase for")
machine.send_chars("supersecret\n")
'';
};
@ -781,7 +781,7 @@ in {
encrypted.enable = true;
encrypted.blkDev = "/dev/vda3";
encrypted.label = "crypt";
encrypted.keyFile = "/mnt-root/keyfile";
encrypted.keyFile = "/${if systemdStage1 then "sysroot" else "mnt-root"}/keyfile";
};
'';
};

6
pkgs/applications/graphics/drawio/default.nix
View File

@ -13,19 +13,19 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "22.0.2";
version = "22.0.3";
src = fetchFromGitHub {
owner = "jgraph";
repo = "drawio-desktop";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-L+tbNCokVoiS2KkaPVBjG7H/8cqz1e8dlXC5H8BkPvU=";
hash = "sha256-Im0T+1jm1IZT3UILsOJ4Rp5P5IiBUKcJJ+cqv3WsqXw=";
};
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
hash = "sha256-d8AquOKdrPQHBhRG9o1GB18LpwlwQK6ZaM1gLAcjilM=";
hash = "sha256-Abyu/WoNOPAIfRIThG7vKFECW9NQMgcBAkLgEPwdJDQ=";
};
nativeBuildInputs = [

4
pkgs/applications/misc/gpxsee/default.nix
View File

@ -18,13 +18,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gpxsee";
version = "13.9";
version = "13.10";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = finalAttrs.version;
hash = "sha256-vzbZN+0lDSmvZnQCuvNJCYHTYKqErFhW4RI5Mfbgr6o=";
hash = "sha256-84F4B2yQREPosH1bK74nOby3o/C0isKq4t2CJprsblU=";
};
buildInputs = [

1
pkgs/applications/networking/sync/rclone/default.nix
View File

@ -63,6 +63,7 @@ buildGoModule rec {
homepage = "https://rclone.org";
changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md";
license = licenses.mit;
mainProgram = "rclone";
maintainers = with maintainers; [ marsam SuperSandro2000 ];
};
}

55
pkgs/by-name/la/lanzaboote-tool/package.nix Normal file
View File

@ -0,0 +1,55 @@
{ systemd
, stdenv
, makeWrapper
, binutils-unwrapped
, sbsigntool
, rustPlatform
, fetchFromGitHub
, lib
}:
rustPlatform.buildRustPackage rec {
pname = "lanzaboote-tool";
version = "0.3.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = "lanzaboote";
rev = "v${version}";
hash = "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs=";
};
sourceRoot = "source/rust/tool";
cargoHash = "sha256-g4WzqfH6DZVUuNb0jV3MFdm3h7zy2bQ6d3agrXesWgc=";
env.TEST_SYSTEMD = systemd;
doCheck = lib.meta.availableOn stdenv.hostPlatform systemd;
nativeBuildInputs = [
makeWrapper
];
postInstall = ''
# Clean PATH to only contain what we need to do objcopy.
# This is still an unwrapped lanzaboote tool lacking of the
# UEFI stub location.
mv $out/bin/lzbt $out/bin/lzbt-unwrapped
wrapProgram $out/bin/lzbt-unwrapped \
--set PATH ${lib.makeBinPath [ binutils-unwrapped sbsigntool ]}
'';
nativeCheckInputs = [
binutils-unwrapped
sbsigntool
];
meta = with lib; {
description = "Lanzaboote UEFI tooling for SecureBoot enablement on NixOS systems";
homepage = "https://github.com/nix-community/lanzaboote";
license = licenses.gpl3Only;
mainProgram = "lzbt";
maintainers = with maintainers; [ raitobezarius nikstur ];
# Broken on aarch64-linux and any other architecture for now.
# Wait for 0.4.0.
platforms = [ "x86_64-linux" "i686-linux" ];
};
}

33
pkgs/by-name/ws/wslay/package.nix Normal file
View File

@ -0,0 +1,33 @@
{ stdenv, lib, fetchFromGitHub, cmake, cunit }:
stdenv.mkDerivation rec {
pname = "wslay";
version = "1.1.1";
src = fetchFromGitHub {
owner = "tatsuhiro-t";
repo = "wslay";
rev = "release-${version}";
hash = "sha256-xKQGZO5hNzMg+JYKeqOBsu73YO+ucBEOcNhG8iSNYvA=";
};
strictDeps = true;
nativeBuildInputs = [ cmake ];
cmakeFlags = [
(lib.cmakeBool "WSLAY_TESTS" true)
];
doCheck = true;
checkInputs = [ cunit ];
meta = with lib; {
homepage = "https://tatsuhiro-t.github.io/wslay/";
description = "The WebSocket library in C";
license = with licenses; [ mit ];
maintainers = with maintainers; [ pingiun ];
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/clap/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "clap";
version = "1.1.8";
version = "1.1.9";
src = fetchFromGitHub {
owner = "free-audio";
repo = "clap";
rev = version;
hash = "sha256-UY6HSth3xuXVfiKolttpYf19rZ2c/X1FXHV7TA/hAiM=";
hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w=";
};
postPatch = ''

4
pkgs/development/libraries/minizip-ng/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "minizip-ng";
version = "4.0.1";
version = "4.0.2";
src = fetchFromGitHub {
owner = "zlib-ng";
repo = finalAttrs.pname;
rev = finalAttrs.version;
sha256 = "sha256-3bCGZupdJWcwp2d+XeqKZG3GxzXFm1UftV/PiN0u5iA=";
hash = "sha256-aJ6KYR9DazVQoPuc4w/gClKH9ditNE1JDU/F9dCJOsw=";
};
nativeBuildInputs = [ cmake pkg-config ];

43
pkgs/development/python-modules/enhancements/default.nix
View File

@ -1,43 +0,0 @@
{ lib
, argcomplete
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
, typeguard
}:
buildPythonPackage rec {
pname = "enhancements";
version = "0.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ssh-mitm";
repo = "python-enhancements";
rev = version;
hash = "sha256-Nff44WAQwSbkRpUHb9ANsQWWH2B819gtwQdXAjWJJls=";
};
propagatedBuildInputs = [
argcomplete
typeguard
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"enhancements"
];
meta = with lib; {
description = "Library which extends various Python classes";
homepage = "https://enhancements.readthedocs.io";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/python-modules/home-assistant-chip-clusters/default.nix
View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-clusters";
version = "2023.6.0";
version = "2023.10.1";
format = "wheel";
src = fetchPypi {
@ -15,7 +15,7 @@ buildPythonPackage rec {
pname = "home_assistant_chip_clusters";
dist = "py3";
python = "py3";
hash = "sha256-8LYB3BEDHOj6ItfFRK7ewbhjN604xXKY0YlymNjEO+g=";
hash = "sha256-KI5idrD8SIpzSYopELYWJJaaiAFQzwRwhFBfb4BEw2o=";
};
propagatedBuildInputs = [
@ -25,6 +25,8 @@ buildPythonPackage rec {
pythonImportsCheck = [
"chip.clusters"
"chip.clusters.ClusterObjects"
"chip.tlv"
];
doCheck = false; # no tests

13
pkgs/development/python-modules/home-assistant-chip-core/default.nix
View File

@ -28,7 +28,7 @@
buildPythonPackage rec {
pname = "home-assistant-chip-core";
version = "2023.6.0";
version = "2023.10.1";
format = "wheel";
disabled = pythonOlder "3.7";
@ -41,7 +41,7 @@ buildPythonPackage rec {
};
"x86_64-linux" = {
name = "x86_64";
hash = "sha256-bRP82jTVSJS46WuO8MVWFvte+2mCOSsGFDBaXdmdPHI=";
hash = "sha256-mffjJtn0LmRz9DOWMMw9soYDDm/M1C5Tdj6YbWHaq2o=";
};
}.${stdenv.system} or (throw "Unsupported system");
in fetchPypi {
@ -78,12 +78,17 @@ buildPythonPackage rec {
pygobject3
];
pythonNamespaces = [
"chip"
"chip.clusters"
];
pythonImportsCheck = [
"chip"
"chip.ble"
# https://github.com/project-chip/connectedhomeip/pull/24376
#"chip.configuration"
"chip.configuration"
"chip.discovery"
"chip.exceptions"
"chip.native"
"chip.storage"
];

14
pkgs/development/python-modules/python-matter-server/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchpatch
, pythonOlder
# build
@ -29,7 +28,7 @@
buildPythonPackage rec {
pname = "python-matter-server";
version = "3.7.0";
version = "4.0.0";
format = "pyproject";
disabled = pythonOlder "3.10";
@ -38,18 +37,9 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "python-matter-server";
rev = "refs/tags/${version}";
hash = "sha256-t++7jQreibGpJRjJawicxjFIye5X6R1dpFqiM6yvRf0=";
hash = "sha256-7MBQo4jzBU/n7gVdGzVHlQl8Vj3OjfK4gk1vhLQQUE0=";
};
patches = [
# https://github.com/home-assistant-libs/python-matter-server/pull/379
(fetchpatch {
name = "relax-setuptools-dependency.patch";
url = "https://github.com/home-assistant-libs/python-matter-server/commit/1bbc945634db92ea081051645b03c3d9c358fb15.patch";
hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
})
];
nativeBuildInputs = [
setuptools
wheel

4
pkgs/development/tools/goimports-reviser/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "goimports-reviser";
version = "3.4.5";
version = "3.5.6";
src = fetchFromGitHub {
owner = "incu6us";
repo = "goimports-reviser";
rev = "v${version}";
hash = "sha256-VsG3Y7V59tTh1XS45s3NKGwMxS/y6KbIxWbRK6bHdaw=";
hash = "sha256-OMCmW2GhByuVN8+Kuaw9o2oCrdA6C9fK/C7yl7wI2Ls=";
};
vendorHash = "sha256-aYhUsO3Z0uue66XB+/oSVYLG9QGyVcFeZ0ngzhpBZxo=";

4
pkgs/development/tools/hclfmt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hclfmt";
version = "2.18.1";
version = "2.19.1";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "hcl";
rev = "v${version}";
hash = "sha256-31Xqgzd208ypK8u1JV5Rh5cCqGr1MJkLP490nIeovsE=";
hash = "sha256-A7YfjXdblFGBABD/PeJMzh9WdPeIUWOWAr/UlD3ki28=";
};
vendorHash = "sha256-DA1IKaC+YSBzCfEMqHsHfwu1o5qvYFaFgDoGG0RZnoo=";

11
pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
View File

@ -1,6 +1,5 @@
{ lib, stdenv
, fetchFromGitHub
, fetchpatch
, cmake
, pkg-config
, bzip2
@ -22,16 +21,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go=";
};
patches = [
# Backport upstream fix for gcc-13 support:
# https://github.com/nxp-imx/mfgtools/pull/360
(fetchpatch {
name = "gcc-13.patch";
url = "https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1.patch";
hash = "sha256-P7n6+Tiz10GIQ7QOd/qQ3BI7Wo5/66b0EwjFSpOUSJg=";
})
];
nativeBuildInputs = [ cmake pkg-config installShellFiles ];
buildInputs = [ bzip2 libusb1 libzip openssl zstd ];

11
pkgs/games/doom-ports/slade/git.nix
View File

@ -15,17 +15,18 @@
, glew
, lua
, mpg123
, unstableGitUpdater
}:
stdenv.mkDerivation rec {
pname = "slade";
version = "unstable-2022-08-15";
version = "unstable-2023-09-30";
src = fetchFromGitHub {
owner = "sirjuddington";
repo = "SLADE";
rev = "1a0d25eec54f9ca2eb3667676d93fb0b6b6aea26";
sha256 = "sha256-mtaJr4HJbp2UnzwaLq12V69DqPYDmSNqMGiuPpMlznI=";
rev = "d05af4bd3a9a655dfe17d02760bab3542cc0b909";
sha256 = "sha256-lzTSE0WH+4fOad9E/pL3LDc4L151W0hFEmD0zsS0gpQ=";
};
postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) ''
@ -58,6 +59,10 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = "-Wno-narrowing";
passthru.updateScript = unstableGitUpdater {
url = "https://github.com/sirjuddington/SLADE.git";
};
meta = with lib; {
description = "Doom editor";
homepage = "http://slade.mancubus.net/";

21
pkgs/os-specific/linux/lenovo-legion/app.nix
View File

@ -2,13 +2,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "lenovo-legion-app";
version = "0.0.5";
version = "0.0.9";
src = fetchFromGitHub {
owner = "johnfanv2";
repo = "LenovoLegionLinux";
rev = "v${version}-prerelease";
sha256 = "sha256-s4JFFmawokdC4qoqNvZDhuJSinhQ3YKSIfAYi79VTTA=";
rev = "v${version}-prerelese";
hash = "sha256-P4vqzNX2nF4LnoQDOV8WEiXAICQCyjj9xPpFNvMu93k=";
};
sourceRoot = "${src.name}/python/legion_linux";
@ -19,15 +19,22 @@ python3.pkgs.buildPythonApplication rec {
pyqt5
argcomplete
pyyaml
darkdetect
xorg.libxcb
libsForQt5.qtbase
];
postInstall = ''
cp -r ./{legion.py,legion_cli.py,legion_gui.py} $out/${python3.sitePackages}
cp ./legion_logo.png $out/${python3.sitePackages}/legion_logo.png
postPatch = ''
substituteInPlace ./setup.cfg \
--replace "_VERSION" "${version}"
substituteInPlace ../../extra/service/fancurve-set \
--replace "FOLDER=/etc/legion_linux/" "FOLDER=$out/share/legion_linux"
substituteInPlace ./legion_linux/legion.py \
--replace "/etc/legion_linux" "$out/share/legion_linux"
'';
rm -rf $out/data
postInstall = ''
cp ./legion_linux/legion_logo.png $out/${python3.sitePackages}/legion_logo.png
'';
dontWrapQtApps = true;

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

@ -7,13 +7,13 @@
, enableSqlite ? true
}: python3.pkgs.buildPythonApplication rec {
pname = "mautrix-googlechat";
version = "unstable-2023-07-16";
version = "0.5.1";
src = fetchFromGitHub {
owner = "mautrix";
repo = "googlechat";
rev = "f4cddafd474b12be09efd15c6652c04d0650458e";
sha256 = "sha256-WMJVAX5oUdYYuXoJKk7OoERR0LJM0Er5444xwqIUTm8=";
rev = "refs/tags/v${version}";
hash = "sha256-a/EWz/aCkBE6XdDpmZcx2Q7/xKNwGCiZUhZc9YIIDhU=";
};
patches = [

66
pkgs/tools/misc/daktilo/default.nix Normal file
View File

@ -0,0 +1,66 @@
{ lib
, rustPlatform
, fetchFromGitHub
, installShellFiles
, stdenv
, darwin
, unixtools
, pkg-config
, alsa-lib
, xorg
}:
rustPlatform.buildRustPackage rec {
pname = "daktilo";
version = "0.5.0";
src = fetchFromGitHub {
owner = "orhun";
repo = "daktilo";
rev = "v${version}";
hash = "sha256-kbJwBOUODtHdngbfa6HbbQJ0kgW6f64c0EG3y8wLymw=";
};
cargoHash = "sha256-u9vL2HAUgP43ZDwIEK2u/I+KUEjQsfXda03gnGJ1Krc=";
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = [
alsa-lib
xorg.libX11
xorg.libXi
xorg.libXtst
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
nativeCheckInputs = [
unixtools.script
];
postInstall = ''
mkdir -p man completions
OUT_DIR=man $out/bin/daktilo-mangen
OUT_DIR=completions $out/bin/daktilo-completions
installManPage man/daktilo.1
installShellCompletion \
completions/daktilo.{bash,fish} \
--zsh completions/_daktilo
rm $out/bin/daktilo-{completions,mangen}
'';
meta = with lib; {
description = "Turn your keyboard into a typewriter";
homepage = "https://github.com/orhun/daktilo";
changelog = "https://github.com/orhun/daktilo/blob/${src.rev}/CHANGELOG.md";
license = with licenses; [ asl20 mit ];
maintainers = with maintainers; [ orhun ];
mainProgram = "daktilo";
};
}

4
pkgs/tools/networking/speedtest-go/default.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "speedtest-go";
version = "1.6.6";
version = "1.6.7";
src = fetchFromGitHub {
owner = "showwin";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-aVvowxwP9Mr1hmcgwizXPfy5527iR7cjsNaND/nmXUw=";
hash = "sha256-7wUgmIScrj47QigIKHLMcvaJ/LTRHcMnJGKPBUTzVYo=";
};
vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E=";

19
pkgs/tools/text/tesh/default.nix
View File

@ -1,7 +1,7 @@
{ python3Packages, fetchFromGitHub, fetchpatch }:
let
version = "0.3.0";
version = "0.3.2";
in python3Packages.buildPythonPackage rec {
pname = "tesh";
inherit version;
@ -12,24 +12,9 @@ in python3Packages.buildPythonPackage rec {
owner = "OceanSprint";
repo = "tesh";
rev = version;
hash = "sha256-/CSYz2YXbjKZszb1HMOCS+srVJ+TcFSeLeuz9VvtlI4=";
hash = "sha256-GIwg7Cv7tkLu81dmKT65c34eeVnRR5MIYfNwTE7j2Vs=";
};
patches = [
# https://github.com/OceanSprint/tesh/pull/49
(fetchpatch {
name = "replace-poetry-with-poetry-core-1.patch";
url = "https://github.com/OceanSprint/tesh/commit/49b90f5a3c9cf111931393248943b1da966dc3ec.patch";
hash = "sha256-s+eGO4NXTGbyXcLP37kCg4GDrjAsYIlOwNDR1Q7+1Uc=";
})
# https://github.com/OceanSprint/tesh/pull/50
(fetchpatch {
name = "replace-poetry-with-poetry-core-2.patch";
url = "https://github.com/OceanSprint/tesh/commit/66798b54f28dc0b72159ee3a2144895cf945eaf0.patch";
hash = "sha256-f3uL7TZlkrTOWYihwWNfhrY5/xlBrclAMnbxRNXCGJw=";
})
];
checkInputs = [ python3Packages.pytest ];
nativeBuildInputs = [ python3Packages.poetry-core ];
propagatedBuildInputs = with python3Packages; [ click pexpect ];

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

@ -19657,7 +19657,11 @@ with pkgs;
mermerd = callPackage ../development/tools/database/mermerd { };
python-matter-server = with python3Packages; toPythonApplication python-matter-server;
python-matter-server = with python3Packages; toPythonApplication (
python-matter-server.overridePythonAttrs (oldAttrs: {
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ oldAttrs.passthru.optional-dependencies.server;
})
);
minify = callPackage ../development/web/minify { };
@ -31047,6 +31051,8 @@ with pkgs;
dablin = callPackage ../applications/radio/dablin { };
daktilo = callPackage ../tools/misc/daktilo { };
darcs = haskell.lib.compose.overrideCabal (drv: {
configureFlags = (lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
}) (haskell.lib.compose.justStaticExecutables haskellPackages.darcs);

1
pkgs/top-level/python-aliases.nix
View File

@ -129,6 +129,7 @@ mapAliases ({
eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
EasyProcess = easyprocess; # added 2023-02-19
email_validator = email-validator; # added 2022-06-22
enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27
et_xmlfile = et-xmlfile; # added 2023-10-16
ev3dev2 = python-ev3dev2; # added 2023-06-19
Fabric = fabric; # addedd 2023-02-19

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

@ -3533,8 +3533,6 @@ self: super: with self; {
energyzero = callPackage ../development/python-modules/energyzero { };
enhancements = callPackage ../development/python-modules/enhancements { };
enlighten = callPackage ../development/python-modules/enlighten { };
enocean = callPackage ../development/python-modules/enocean { };