colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source
This commit is contained in:
Martin Weinelt 2023-01-06 19:10:05 +01:00
commit 5b308cd1df
70 changed files with 6341 additions and 4681 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/ldtk/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
pname = "ldtk";
version = "1.1.3";
version = "1.2.2";
src = fetchurl {
url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip";
sha256 = "sha256-qw7+4k4IH2+9DX4ny8EBbSlyXBrk/y91W04+zWPGupk=";
sha256 = "sha256-t1fKf+y1lHuBKnyh0j4RoDZziIOu1tlona1xyBsl6+Q=";
};
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ];

4
pkgs/applications/graphics/krita/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // {
version = "5.1.3";
version = "5.1.4";
kde-channel = "stable";
sha256 = "sha256-69+P0wMIciGxuc6tmWG1OospmvvwcZl6zHNQygEngo0=";
sha256 = "sha256-wisCCGJZbrL92RHhsXnbvOewgb4RFFei6sr2rhzKLcs=";
})

66
pkgs/applications/graphics/oculante/default.nix Normal file
View File

@ -0,0 +1,66 @@
{ lib
, rustPlatform
, fetchFromGitHub
, cmake
, pkg-config
, openssl
, fontconfig
, nasm
, libX11
, libXcursor
, libXrandr
, libXi
, libGL
, stdenv
, gtk3
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.6.38";
src = fetchFromGitHub {
owner = "woelper";
repo = pname;
rev = version;
sha256 = "sha256-0msPeW0FoBzHBDfX2iFH4HzAknaGPNThuCLi2vhdK08=";
};
cargoSha256 = "sha256-eKRn8MC4/jjPRoajhwrtXsa8n9bGO5MAKjDuwHWs7Oc=";
nativeBuildInputs = [
cmake
pkg-config
nasm
];
checkFlagsArray = [ "--skip=tests::net" ]; # requires network access
buildInputs = [
openssl
fontconfig
] ++ lib.optionals stdenv.isLinux [
libX11
libXcursor
libXi
libXrandr
libGL
gtk3
] ++ lib.optionals stdenv.isDarwin [
darwin.libobjc
];
postFixup = lib.optionalString stdenv.isLinux ''
patchelf $out/bin/oculante --add-rpath ${lib.makeLibraryPath [ libGL ]}
'';
meta = with lib; {
broken = stdenv.isDarwin;
description = "A minimalistic crossplatform image viewer written in Rust";
homepage = "https://github.com/woelper/oculante";
changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};
}

6
pkgs/applications/misc/geek-life/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "geek-life";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "ajaxray";
repo = "geek-life";
rev = "v${version}";
sha256 = "083y2kv5vb217ghy9g2qylqgdgbjjggjj3cq454csnn3cjgq9zfh";
sha256 = "sha256-7B/4pDOVXef2MaWKvzkUZH0/KM/O1gJjI3xPjEXqc/E=";
};
vendorSha256 = "05fcnmg2rygccf65r8js6kbijx740vfnvbrc035bjs1jvdw29h9j";
vendorHash = "sha256-U80Yb8YXKQ8KJf+FxkC0EIUFKP4PKAFRtKTCvXSc0WI=";
postInstall = ''
mv $out/bin/app $out/bin/geek-life

6
pkgs/applications/misc/tut/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "tut";
version = "1.0.26";
version = "1.0.30";
src = fetchFromGitHub {
owner = "RasmusLindroth";
repo = pname;
rev = version;
sha256 = "sha256-ZSlrPhCArPEVTKX7BbUfKA+hYi7TpmJbGjWmbBUwes0=";
sha256 = "sha256-Cr9aDfreTDeFV5mws29pYRUkUjHVcLGEZyUvZYAp3B8=";
};
vendorSha256 = "sha256-PYVXEPmWgtME3XljJzyGAri/GW19PIkQpscFFRNuVXQ=";
vendorSha256 = "sha256-ECaePGmSaf0vuKbvgdUMOF8oCpc14srFFMmPJPFFqw4=";
meta = with lib; {
description = "A TUI for Mastodon with vim inspired keys";

49
pkgs/applications/networking/coreth/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ buildGoModule
, fetchFromGitHub
, lib
, stdenv
}:
buildGoModule rec {
pname = "coreth";
version = "0.11.5";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-tXwcwMNSrjgQOXcEIucEZjpmPL0cvgYPOV4CMU51Bz8=";
};
# go mod vendor has a bug, see: golang/go#57529
proxyVendor = true;
vendorHash = "sha256-Wd0m/Bcbn3so0mh83tTfebfOBn51MiAxF3Azmu6ZA0o=";
ldflags = [
"-s"
"-w"
"-X github.com/ava-labs/coreth/plugin/evm.Version=${version}"
"-X github.com/ava-labs/coreth/cmd/abigen.gitCommit=${version}"
"-X github.com/ava-labs/coreth/cmd/abigen.gitDate=1970-01-01"
];
subPackages = [
"cmd/abigen"
"plugin"
];
postInstall = "mv $out/bin/{plugin,evm}";
meta = with lib; {
description = "Code and wrapper to extract Ethereum blockchain functionalities without network/consensus, for building custom blockchain services";
homepage = "https://github.com/ava-labs/coreth";
changelog = "https://github.com/ava-labs/coreth/releases/tag/v${version}";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ urandom ];
# In file included from ../go/pkg/mod/github.com/zondax/hid@v0.9.1-0.20220302062450-5552068d2266/hid_enabled.go:38:
# ./hidapi/mac/hid.c:693:34: error: use of undeclared identifier 'kIOMainPortDefault'
# entry = IORegistryEntryFromPath(kIOMainPortDefault, path);
broken = stdenv.isDarwin;
};
}

15
pkgs/applications/networking/netmaker/default.nix
View File

@ -1,4 +1,12 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib, libglvnd, pkg-config, xorg }:
{ buildGoModule
, fetchFromGitHub
, installShellFiles
, lib
, libglvnd
, pkg-config
, subPackages ? ["." "netclient"]
, xorg
}:
buildGoModule rec {
pname = "netmaker";
@ -13,10 +21,7 @@ buildGoModule rec {
vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI=";
subPackages = [
"."
"netclient"
];
inherit subPackages;
nativeBuildInputs = [ pkg-config ];

1
pkgs/applications/science/logic/coq/default.nix
View File

@ -53,6 +53,7 @@ let
"8.15.2".sha256 = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd";
"8.16.0".sha256 = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is=";
"8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc=";
"8.17+rc1".sha256 = "sha256-BsVgYa2fAYqRmQNSaY/YSiZhqkmwM+xbE5T4FHOEqkc=";
};
releaseRev = v: "V${v}";
fetched = import ../../../../build-support/coq/meta-fetch/default.nix

16
pkgs/applications/terminal-emulators/kitty/default.nix
View File

@ -7,12 +7,13 @@
, openssl
, installShellFiles
, dbus
, darwin
, Cocoa
, CoreGraphics
, Foundation
, IOKit
, Kernel
, UniformTypeIdentifiers
, UserNotifications
, OpenGL
, libcanberra
, libicns
@ -28,14 +29,14 @@
with python3Packages;
buildPythonApplication rec {
pname = "kitty";
version = "0.26.2";
version = "0.26.5";
format = "other";
src = fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty";
rev = "v${version}";
sha256 = "sha256-IqXRkKzOfqWolH/534nmM2R/69olhFOk6wbbF4ifRd0=";
rev = "refs/tags/v${version}";
sha256 = "sha256-UloBlV26HnkvbzP/NynlPI77z09MBEVgtrg5SeTmwB4=";
};
buildInputs = [
@ -51,11 +52,11 @@ buildPythonApplication rec {
IOKit
Kernel
OpenGL
UniformTypeIdentifiers
UserNotifications
libpng
python3
zlib
] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [
darwin.apple_sdk.frameworks.UserNotifications
] ++ lib.optionals stdenv.isLinux [
fontconfig libunistring libcanberra libX11
libXrandr libXinerama libXcursor libxkbcommon libXi libXext
@ -218,6 +219,7 @@ buildPythonApplication rec {
license = licenses.gpl3Only;
changelog = "https://sw.kovidgoyal.net/kitty/changelog/";
platforms = platforms.darwin ++ platforms.linux;
maintainers = with maintainers; [ tex rvolosatovs Luflosi ];
broken = (stdenv.isDarwin && stdenv.isx86_64);
maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ];
};
}

6
pkgs/applications/virtualization/OVMF/default.nix
View File

@ -13,7 +13,7 @@ let
"OvmfPkg/OvmfPkgIa32.dsc"
else if stdenv.isx86_64 then
"OvmfPkg/OvmfPkgX64.dsc"
else if stdenv.isAarch64 then
else if stdenv.hostPlatform.isAarch then
"ArmVirtPkg/ArmVirtQemu.dsc"
else
throw "Unsupported architecture";
@ -52,7 +52,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
'';
postFixup = if stdenv.isAarch64 then ''
postFixup = if stdenv.hostPlatform.isAarch then ''
mkdir -vp $fd/FV
mkdir -vp $fd/AAVMF
mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
@ -88,7 +88,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
description = "Sample UEFI firmware for QEMU and KVM";
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF";
license = lib.licenses.bsd2;
platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"];
inherit (edk2.meta) platforms;
maintainers = [ lib.maintainers.raitobezarius ];
};
})

2
pkgs/build-support/src-only/default.nix
View File

@ -17,5 +17,7 @@ stdenv.mkDerivation (args // {
installPhase = "cp -r . $out";
outputs = [ "out" ];
separateDebugInfo = false;
dontUnpack = false;
dontInstall = false;
phases = ["unpackPhase" "patchPhase" "installPhase"];
})

4
pkgs/development/compilers/edk2/default.nix
View File

@ -17,6 +17,8 @@ targetArch = if stdenv.isi686 then
"IA32"
else if stdenv.isx86_64 then
"X64"
else if stdenv.isAarch32 then
"ARM"
else if stdenv.isAarch64 then
"AARCH64"
else
@ -83,7 +85,7 @@ edk2 = buildStdenv.mkDerivation {
description = "Intel EFI development kit";
homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/";
license = licenses.bsd2;
platforms = with platforms; aarch64 ++ i686 ++ x86_64;
platforms = with platforms; aarch64 ++ arm ++ i686 ++ x86_64;
};
passthru = {

2
pkgs/development/coq-modules/Cheerios/default.nix
View File

@ -4,7 +4,7 @@ with lib; mkCoqDerivation {
pname = "cheerios";
owner = "uwplse";
inherit version;
defaultVersion = if versions.isGe "8.6" coq.version then "20200201" else null;
defaultVersion = if versions.range "8.6" "8.16" coq.version then "20200201" else null;
release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d";
release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1";

2
pkgs/development/coq-modules/InfSeqExt/default.nix
View File

@ -4,7 +4,7 @@ mkCoqDerivation {
pname = "InfSeqExt";
owner = "DistributedComponents";
inherit version;
defaultVersion = if lib.versions.isGe "8.5" coq.version then "20200131" else null;
defaultVersion = if lib.versions.range "8.5" "8.16" coq.version then "20200131" else null;
release."20200131".rev = "203d4c20211d6b17741f1fdca46dbc091f5e961a";
release."20200131".sha256 = "0xylkdmb2dqnnqinf3pigz4mf4zmczcbpjnn59g5g76m7f2cqxl0";
preConfigure = ''

1
pkgs/development/coq-modules/bignums/default.nix
View File

@ -8,6 +8,7 @@ with lib; mkCoqDerivation {
defaultVersion = if versions.isGe "8.6" coq.coq-version
then "${coq.coq-version}.0" else null;
release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw=";
release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4=";
release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns";
release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06";

2
pkgs/development/coq-modules/ceres/default.nix
View File

@ -8,7 +8,7 @@ mkCoqDerivation {
owner = "Lysxia";
inherit version;
defaultVersion = if versions.isGe "8.8" coq.version then "0.4.0" else null;
defaultVersion = if versions.range "8.8" "8.16" coq.version then "0.4.0" else null;
release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi";
meta = {

2
pkgs/development/coq-modules/mathcomp-bigenough/default.nix
View File

@ -12,7 +12,7 @@ with lib; mkCoqDerivation {
};
inherit version;
defaultVersion = with versions; switch coq.version [
{ case = isGe "8.10" ; out = "1.0.1"; }
{ case = range "8.10" "8.16"; out = "1.0.1"; }
{ case = range "8.5" "8.14"; out = "1.0.0"; }
] null;

2
pkgs/development/coq-modules/topology/default.nix
View File

@ -16,7 +16,7 @@ mkCoqDerivation rec {
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "9.0.0"; }
{ case = range "8.10" "8.16"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }

2
pkgs/development/coq-modules/zorns-lemma/default.nix
View File

@ -17,7 +17,7 @@ with lib;
inherit version;
defaultVersion = with versions; switch coq.coq-version [
{ case = isGe "8.10"; out = "9.0.0"; }
{ case = range "8.10" "8.16"; out = "9.0.0"; }
{ case = "8.9"; out = "8.9.0"; }
{ case = "8.8"; out = "8.8.0"; }
{ case = "8.7"; out = "8.7.0"; }

6
pkgs/development/interpreters/luajit/default.nix
View File

@ -127,8 +127,10 @@ stdenv.mkDerivation rec {
homepage = "https://luajit.org/";
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
# See https://github.com/LuaJIT/LuaJIT/issues/628
badPlatforms = [ "riscv64-linux" "riscv64-linux" ];
badPlatforms = [
"riscv64-linux" "riscv64-linux" # See https://github.com/LuaJIT/LuaJIT/issues/628
"powerpc64le-linux" # `#error "No support for PPC64"`
];
maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ];
} // extraMeta;
}

1
pkgs/development/libraries/libva/1.nix
View File

@ -18,6 +18,7 @@
stdenv.mkDerivation rec {
pname = "libva" + lib.optionalString minimal "-minimal";
# nixpkgs-update: no auto update
version = "1.8.3";
src = fetchFromGitHub {

4
pkgs/development/libraries/nss/latest.nix
View File

@ -5,6 +5,6 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.86";
hash = "sha256-PzhfxoZHa7uoEQNfpoIbVCR11VdHsYwgwiHU1mVzuXU=";
version = "3.87";
hash = "sha256-aKGJRJbT0Vi6vHX4pd2j9Vt8FWBXOTbjsQGhD6SsFS0=";
}

1
pkgs/development/node-packages/main-programs.nix
View File

@ -4,6 +4,7 @@
# Packages that provide multiple executables where one is clearly the `mainProgram`.
"@antfu/ni" = "ni";
"@electron-forge/cli" = "electron-forge";
"@microsoft/rush" = "rush";
"@squoosh/cli" = "squoosh-cli";
"@webassemblyjs/cli-1.11.1" = "wasm2wast";
coffee-script = "coffee";

1
pkgs/development/node-packages/node-packages.json
View File

@ -11,6 +11,7 @@
, "@forge/cli"
, "@google/clasp"
, "@medable/mdctl-cli"
, "@microsoft/rush"
, "@nerdwallet/shepherd"
, "@nestjs/cli"
, "@squoosh/cli"

10549
pkgs/development/node-packages/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

4
pkgs/development/node-packages/overrides.nix
View File

@ -453,6 +453,10 @@ final: prev: {
}
);
rush = prev."@microsoft/rush".override {
name = "rush";
};
ssb-server = prev.ssb-server.override (oldAttrs: {
buildInputs = [ pkgs.automake pkgs.autoconf final.node-gyp-build ];
meta = oldAttrs.meta // { broken = since "10"; };

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "bimmer-connected";
version = "0.11.0";
version = "0.12.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = "refs/tags/${version}";
hash = "sha256-2WT6+KYQ9wKS7al1qfEDfDcEFaOR/fC1tBi+t1Iyqbw=";
hash = "sha256-Efa3Z4pWn+TkpA61COQTFCl+gOc5IGqYv6ZHTqiTC2c=";
};
nativeBuildInputs = [

1
pkgs/development/python-modules/bleak/default.nix
View File

@ -53,6 +53,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Bluetooth Low Energy platform agnostic client";
homepage = "https://github.com/hbldh/bleak";
changelog = "https://github.com/hbldh/bleak/blob/v${version}/CHANGELOG.rst";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ oxzi ];

7
pkgs/development/python-modules/bless/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bless";
version = "0.2.4";
version = "0.2.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "kevincar";
repo = pname;
rev = "v${version}";
hash = "sha256-lC1M6/9uawi4KpcK4/fAygENa9rZv9c7qCVdsZYtl5Q=";
rev = "refs/tags/v${version}";
hash = "sha256-+rnMLqNfhIJASCKkIfOKpVil3S/d8BcMxnLHmdOcRIY=";
};
propagatedBuildInputs = [
@ -41,6 +41,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for creating a BLE Generic Attribute Profile (GATT) server";
homepage = "https://github.com/kevincar/bless";
changelog = "https://github.com/kevincar/bless/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

7
pkgs/development/python-modules/bluemaestro-ble/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "bluemaestro-ble";
version = "0.2.0";
version = "0.2.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -19,8 +19,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Bluetooth-Devices";
repo = pname;
rev = "v${version}";
hash = "sha256-lJYbbF6b1CazD/aVTNoZvyfH/XQf5jWBsddDdrP+FKA=";
rev = "refs/tags/v${version}";
hash = "sha256-QGad5o9JZ6ansVh3bRBO+9mE4PKw05acY+9+Ur2OBsY=";
};
nativeBuildInputs = [
@ -49,6 +49,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library for bluemaestro BLE devices";
homepage = "https://github.com/Bluetooth-Devices/bluemaestro-ble";
changelog = "https://github.com/Bluetooth-Devices/bluemaestro-ble/blob/v${version}/CHANGELOG.md";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "bthome-ble";
version = "2.4.0";
version = "2.4.1";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-BLRXoKZkSWgzGIztwmO8El8pF25QBrTEX05FWXZrHxc=";
hash = "sha256-BGUqvlikvlZbGB5pNo03QIfG1BBRZFl3/MKymQ/yBxM=";
};
nativeBuildInputs = [

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

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "faraday-plugins";
version = "1.9.0";
version = "1.9.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "infobyte";
repo = "faraday_plugins";
rev = "refs/tags/${version}";
hash = "sha256-ZWPImBqBpiz3y4OpDZLCfL3Oe/J+qP1Hduas3p0unCg=";
hash = "sha256-qtHa2JQ9dl9NzhNZ9l6vRe9wR9rCx7+WwDBhRG+Btj4=";
};
postPatch = ''

9
pkgs/development/python-modules/fpyutils/default.nix
View File

@ -9,16 +9,16 @@
buildPythonPackage rec {
pname = "fpyutils";
version = "2.2.1";
version = "3.0.1";
format = "setuptools";
disabled = pythonOlder "3.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "frnmst";
repo = pname;
rev = version;
sha256 = "sha256-5dikfR648AhQUMX/hS0igIy9gnMyxUHddp1xaxNyYCo=";
rev = "refs/tags/${version}";
hash = "sha256-cmCD8uKPX/7Ak6jAqzCvDqR1FgH09GaLfLTZdBQB+bs=";
};
propagatedBuildInputs = [
@ -46,6 +46,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Collection of useful non-standard Python functions";
homepage = "https://github.com/frnmst/fpyutils";
changelog = "https://blog.franco.net.eu.org/software/fpyutils-${version}/release.html";
license = with licenses; [ gpl3Plus ];
maintainers = with maintainers; [ fab ];
};

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "griffe";
version = "0.25.1";
version = "0.25.3";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mkdocstrings";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-DBjwqQ7tmvpHa0FZYS6Jsb/wQ7cnoynhybBWl9PNejs=";
hash = "sha256-t36uWIREn01/+dIYP5HYlkSPPjgoZoYbJYnFo3Y6qSw=";
};
postPatch = ''

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "growattserver";
version = "1.3.0";
version = "1.4.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "indykoning";
repo = "PyPi_GrowattServer";
rev = "refs/tags/${version}";
hash = "sha256-xriI4VFLTTeYkfIu7kb/k1OcgnHhCdvl5Ic/JF4Pf6s=";
hash = "sha256-V0EW3I0FIDx9urbxX/zh3A51B/BiDqUfsrKbKU9FKiE=";
};
propagatedBuildInputs = [

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

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2022.12.12";
version = "2023.1.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "danielperna84";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-AnGoXAeasPwbErTwWZJHzSnvxx4MreHrgbYHKLZQfRA=";
sha256 = "sha256-NS5X/camPjQxQ6paJxu1qpw+Dv2b/dJrA5OkzUufCR0=";
};
nativeBuildInputs = [

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

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "hatasmota";
version = "0.6.1";
version = "0.6.2";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "emontnemery";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-8B3xdSvvxmbjpPk6aWHQTraf2J1oCBvP0/UxTxaN0jY=";
hash = "sha256-viMqtrqyM+O2VEwHp4FJRlJcfj58GjSD37gtv01/sOo=";
};
propagatedBuildInputs = [
@ -35,6 +35,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python module to help parse and construct Tasmota MQTT messages";
homepage = "https://github.com/emontnemery/hatasmota";
changelog = "https://github.com/emontnemery/hatasmota/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

4
pkgs/development/python-modules/home-assistant-bluetooth/default.nix
View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "home-assistant-bluetooth";
version = "1.9.0";
version = "1.9.2";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-/ne2pnSmeHuwlGCrMC0x/yNDCvB/P4SqmK/wwcmHlJQ=";
hash = "sha256-8RGwWx/I6Log7qyGiP+LAWC1GCG2A7UEXnO5fGoTsb4=";
};
postPatch = ''

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "identify";
version = "2.5.11";
version = "2.5.12";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "pre-commit";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KnOPrJoHaT0XMhv2HoGKt+a6bsLHouCqZqdl1LlB+9g=";
sha256 = "sha256-8hfO2gmgSdhrECsXgG2i+REBIV+OqsQeAabvqKJOU1c=";
};
checkInputs = [

38
pkgs/development/python-modules/keyrings-passwordstore/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, keyring
, setuptools-scm
}:
buildPythonPackage rec {
pname = "keyrings.passwordstore";
version = "0.1.0";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pylZw45FUtLHzUV4cDyl/nT8tCZwNj4Jf41MMlyskoU=";
};
nativeBuildInputs = [
setuptools-scm
];
checkInputs = [
keyring
];
pythonImportsCheck = [
"keyrings.passwordstore.backend"
];
meta = {
license = lib.licenses.mit;
description = "Keyring backend for password-store";
homepage = "https://github.com/stv0g/keyrings.passwordstore";
maintainers = [ lib.maintainers.shlevy ];
};
}

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "md-toc";
version = "8.1.6";
version = "8.1.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
hash = "sha256-Wtb2xHBj6RYVfUkPmRMxUti7UBj1PVh9ZCDienYX4Bw=";
hash = "sha256-zC7//0q4jkj2yjex/Ea4fslCvPQbd8S1LmvL01kSZZk=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "meross-iot";
version = "0.4.5.4";
version = "0.4.5.7";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "albertogeniola";
repo = "MerossIot";
rev = "refs/tags/${version}";
hash = "sha256-HPA3oeanFHx+g0nt/nsTzG3RTCdsjNSvDCXILR271P4=";
hash = "sha256-nheTAMXX0IZE1XH2+o9ML1Qt9zMw7oTZi4Cba+LdG4s=";
};
propagatedBuildInputs = [

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

@ -7,16 +7,16 @@
buildPythonPackage rec {
pname = "ofxtools";
version = "0.8.20";
version = "0.9.5";
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
# PyPI distribution does not include tests
src = fetchFromGitHub {
owner = "csingley";
repo = pname;
rev = version;
sha256 = "1s3fhhmj1acnmqglh39003db0bi451m4hcrkcpyrkqf5m32lslz8";
sha256 = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc=";
};
checkInputs = [ nose ];

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

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "9.2.3";
version = "10.1.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-/NsPRspe/Q1hgcgMatFUPWuSfNz0rnmQ2k2fYDo5CnQ=";
hash = "sha256-h3kNmWa9ZOpI0DG49H3n1MPZu753nrdzSIh8V5N3H6I=";
};
postPatch = ''

7
pkgs/development/python-modules/pydevccu/default.nix
View File

@ -6,7 +6,7 @@
buildPythonPackage rec {
pname = "pydevccu";
version = "0.1.3";
version = "0.1.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -14,8 +14,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "danielperna84";
repo = pname;
rev = version;
sha256 = "sha256-rbxYTpB6ieZBYbbE1AKVEc/lapWlOUMOrSHCkuwkzLg=";
rev = "refs/tags/${version}";
hash = "sha256-VneuAnt9HkIRBeK2T71MIHbZbz6zY1vVy5vOYZ+82gM=";
};
# Module has no tests
@ -28,6 +28,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "HomeMatic CCU XML-RPC Server with fake devices";
homepage = "https://github.com/danielperna84/pydevccu";
changelog = "https://github.com/danielperna84/pydevccu/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};

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

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pyeconet";
version = "0.1.17";
version = "0.1.18";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "w1ll1am23";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-ntxITedoJOt5d7V9TSFQHg0oqBEw8jNGeDLM00RRWHI=";
hash = "sha256-nKXYjv1a6nEuy8X0HnLSrvQDV2XVQhQuEm/gqnEVaoY=";
};
nativeBuildInputs = [

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyswitchbot";
version = "0.36.1";
version = "0.36.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Danielhiversen";
repo = "pySwitchbot";
rev = "refs/tags/${version}";
hash = "sha256-eXCHmtdizRJJdwFeZU0yLi8NWwMqbET6ZItQQClYVI4=";
hash = "sha256-I+OnxSQ/984aoloe/1673JDaVzG6yKOSrDvGuupAnkc=";
};
propagatedBuildInputs = [

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

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "reolink-aio";
version = "0.1.1";
version = "0.1.3";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "starkillerOG";
repo = "reolink_aio";
rev = "refs/tags/${version}";
sha256 = "sha256-KUsBCV8OVPj0QC1DKUBVRqtt1dpGq+JunuBZsZKfQno=";
sha256 = "sha256-4qg43qxrgBSES2ng7DbjgWrsXY+3+olvUe19zW2UXCE=";
};
propagatedBuildInputs = [

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

@ -130,7 +130,7 @@ buildPythonPackage rec {
#pytestFlagsArray = ["-x" "-W" "ignore"]; # uncomment this to debug
pythonImportCheck = [
pythonImportsCheck = [
"shap"
"shap.explainers"
"shap.explainers.other"

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

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "skodaconnect";
version = "1.3.0";
version = "1.3.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "lendy007";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1x1TQNhKL3RgoeYSB8l607mHt0VrHwOU1CFemoaTCt8=";
hash = "sha256-iaA4mvt9R/OH3RS62b6tfKWEYITfYrGY8lP45mGlN/w=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

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

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "whois";
version = "0.9.20";
version = "0.9.21";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "DannyCork";
repo = "python-whois";
rev = "refs/tags/${version}";
hash = "sha256-J2v2TKTrzhi1XLW2e/N3jAGCy3W8cQEFV5cJAf8gT4g=";
hash = "sha256-gsWvmAnzlm31UHT//VbXvryKWN8m/+hvLoKxLmQOK5k=";
};
propagatedBuildInputs = [

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

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "xiaomi-ble";
version = "0.12.2";
version = "0.15.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "Bluetooth-Devices";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-MwKhoerfloFT5/x1darfMP/qF5sEy6LiKEogINIUq0c=";
hash = "sha256-6j5hZ9NGmAFpbgYTyC4UuI4XkQwotZND1UMHnmJHCdo=";
};
nativeBuildInputs = [

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

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "bbin";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "babashka";
repo = "bbin";
rev = "v${version}";
sha256 = "sha256-Oo6YF+uxcUG26Pz1X5uzPE/Hsx0UToOErZ2oUiKuZyI=";
sha256 = "sha256-5hohAr6a8C9jPwhQi3E66onSa6+P9plS939fQM/fl9Q=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/development/tools/eclint/default.nix
View File

@ -6,16 +6,16 @@
buildGoModule
rec {
pname = "eclint";
version = "0.3.6";
version = "0.3.8";
src = fetchFromGitLab {
owner = "greut";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+ZbBmdCl1v4msFFA2kzL/IQTQtR39O5XYgCj7w+QGzE=";
sha256 = "sha256-wAT+lc8cFf9zOZ72EwIeE2z5mCjGN8vpRoS1k15X738=";
};
vendorSha256 = "sha256-CdvxY3uX6i3Xtg50jqlNr+VXpeOeg8M27huasbzA96M=";
vendorHash = "sha256-6aIE6MyNDOLRxn+CYSCVNj4Q50HywSh/Q0WxnxCEtg8=";
ldflags = [ "-X main.version=${version}" ];

6
pkgs/development/tools/rust/cargo-expand/default.nix
View File

@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.36";
version = "1.0.37";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-8h20Cnu72ychSdtKlAz6US0wXMIcn1ZUWMgF6a0K4uI=";
sha256 = "sha256-BdaOtbZ+F1cgoZRmoQM/5Rzx4OUHmqSnsApeNfWz+J8=";
};
cargoSha256 = "sha256-xIVoEIyp8NygfNu/aola1pM6KokjrPQ5v55eBc7zPZc=";
cargoHash = "sha256-2wD0QJFTW8cIv8S1JSgffBqlcPOVd151WuKlaZF+6aA=";
buildInputs = lib.optional stdenv.isDarwin libiconv;

18
pkgs/games/globulation/default.nix
View File

@ -24,6 +24,22 @@ stdenv.mkDerivation rec {
url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw";
sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/10_pthread_underlinkage.patch";
sha256 = "sha256-L9POADlkgQbUQEUmx4s3dxXG9tS0w2IefpRGuQNRMI0=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/link-boost-system.patch";
sha256 = "sha256-ne6F2ZowB+TUmg3ePuUoPNxXI0ZJC6HEol3oQQHJTy4=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/scons.patch";
sha256 = "sha256-Gah7SoVcd/Aljs0Nqo3YF0lZImUWtrGM4HbbQ4yrhHU=";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/g/glob2/0.9.4.4-6/debian/patches/boost-1.69.patch";
sha256 = "sha256-D7agFR4uyIHxQz690Q8EHPF+rTEoiGUpgkm7r5cL5SI=";
})
];
postPatch = ''
@ -32,7 +48,7 @@ stdenv.mkDerivation rec {
sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct
'';
nativeBuildInputs = [ sconsPackages.scons_3_0_1 ];
nativeBuildInputs = [ sconsPackages.scons_latest ];
buildInputs = [ libGLU libGL SDL SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ];
postConfigure = ''

13
pkgs/os-specific/linux/kernel/manual-config.nix
View File

@ -1,5 +1,6 @@
{ lib, stdenv, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl
, libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole
, fetchpatch
}:
let
@ -103,7 +104,17 @@ let
++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch
# Fixes determinism by normalizing metadata for the archive of kheaders
++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch;
++ optional (lib.versionAtLeast version "5.2" && lib.versionOlder version "5.4") ./gen-kheaders-metadata.patch
# Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks
# OpenZFS; this was fixed in Linux 5.19 so we backport the fix
# https://github.com/openzfs/zfs/pull/13367
++ optional (lib.versionAtLeast version "5.12" &&
lib.versionOlder version "5.19" &&
stdenv.hostPlatform.isPower)
(fetchpatch {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23";
hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";
});
postPatch = ''
sed -i Makefile -e 's|= depmod|= ${buildPackages.kmod}/bin/depmod|'

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@ -3,14 +3,14 @@
let
# These names are how they are designated in https://xanmod.org.
ltsVariant = {
version = "5.15.81";
hash = "sha256-EKC1Jvy1ju+HzavmIDYsnvZyicsbXAmsJuIpO1LDLZ0=";
version = "5.15.84";
hash = "sha256-CN3GOuwSicJ6Oa9BiKTyZg7fpzWc846v2SV9JRiOu3M=";
variant = "lts";
};
mainVariant = {
version = "6.1.0";
hash = "sha256-Idt7M6o2Zxqi3LBwuKu+pTHJA5OuP+KgEt2C+GcdO14=";
version = "6.1.3";
hash = "sha256-YtkmbbFEfvww7yJ4MpLQ3M6QjbBXSU9Pjwu0Dq/dIcs=";
variant = "main";
};

1
pkgs/servers/dns/bind/default.nix
View File

@ -60,6 +60,7 @@ stdenv.mkDerivation rec {
'';
doCheck = false; # requires root and the net
enableParallelBuilding = true;
passthru.tests = {
inherit (nixosTests) bind;

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.1.0";
version = "2023.1.1";
components = {
"3_day_blinds" = ps: with ps; [
];

4
pkgs/servers/home-assistant/default.nix
View File

@ -205,7 +205,7 @@ let
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.1.0";
hassVersion = "2023.1.1";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -223,7 +223,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-uYQnymJQ893F5fX/yi8S3OZL4LkT5z7QNOzkoedXllM=";
hash = "sha256-qgrUVPh/lSOwRm0FIU6kLuj591XdtNCtA2IMOfhKw/0=";
};
# leave this in, so users don't have to constantly update their downstream patch handling

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "cpufetch";
version = "1.02";
version = "1.03";
src = fetchFromGitHub {
owner = "Dr-Noob";
repo = "cpufetch";
rev = "v${version}";
sha256 = "sha256-bhw7+z4/50MrC5WyexHhtzmqnovwiA9X6Q2TcznDYZM=";
sha256 = "sha256-SiIRw2nWCoe3pfFp1xyzkuFK5fe++0ypSxblYViRgZY=";
};
nativeBuildInputs = [

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

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nb";
version = "7.2.0";
version = "7.2.1";
src = fetchFromGitHub {
owner = "xwmx";
repo = "nb";
rev = version;
sha256 = "sha256-/ibKlmLWmW1Gp95Bd/23CkRs0XVsy6gScmws3gUlszo=";
sha256 = "sha256-JBWZsMs1FijV1gWw2+K8DturOSEosGRfYmeHDPCwIs8=";
};
nativeBuildInputs = [ installShellFiles ];

6
pkgs/tools/security/age-plugin-yubikey/default.nix
View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "age-plugin-yubikey";
version = "0.3.0";
version = "0.3.2";
src = fetchFromGitHub {
owner = "str4d";
repo = pname;
rev = "v${version}";
sha256 = "sha256-KXqicTZ9GZlNj1AH3tMmOrC8zjXoEnqo4JJJTBdiI4E=";
sha256 = "sha256-x4J8lE4Peenu3I7bZ3yoLpyukkMHD2re63GCni0cfnI=";
};
cargoSha256 = "sha256-m/v4E7KHyLIWZHX0TKpqwBVDDwLjhYpOjYMrKEtx6/4=";
cargoSha256 = "sha256-Qp7AXy044G17FxR2sopN00cgX91A8TAydrwvJrAfhns=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];

6
pkgs/tools/security/tlsx/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "tlsx";
version = "1.0.0";
version = "1.0.3";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
hash = "sha256-IkN7AhfQ998eH50DcvTsSg9x2QwC7Ccpx+sZNa8nlSA=";
hash = "sha256-aT6CfoYm1giMJgWdUyLw/eT4vSI6k8OG6kjbYtu0lwI=";
};
vendorHash = "sha256-cDKifPNXXMSRKtl0yWTJj5FwBt545eYAlbgJbgEj6L8=";
vendorHash = "sha256-fnBN3K1XMfrfp3l4syMFRCnzHvpX6CgUVo9qotrudaI=";
# Tests require network access
doCheck = false;

6
pkgs/tools/system/bottom/default.nix
View File

@ -11,13 +11,13 @@
rustPlatform.buildRustPackage rec {
pname = "bottom";
version = "0.6.8";
version = "0.7.0";
src = fetchFromGitHub {
owner = "ClementTsang";
repo = pname;
rev = version;
sha256 = "sha256-zmiYVLaXKHH+MObO75wOiGkDetKy4bVLe7IAqiO2ER8=";
sha256 = "sha256-rCjRuRVa4ewyHcYpF8FPpuOsJ1ppB5C/Y7L+ju35+cI=";
};
prePatch = ''
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
libiconv
];
cargoSha256 = "sha256-GMG6YBm/jA5D7wxC2gczMn/6Lkqiq/toSPNf86kgOys=";
cargoHash = "sha256-c0zBLTcvIuNM9s7p3zIFbd4hB8WkMzCJW+Y/1Swrxlk=";
doCheck = false;

4
pkgs/tools/text/ugrep/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "ugrep";
version = "3.9.3";
version = "3.9.4";
src = fetchFromGitHub {
owner = "Genivia";
repo = pname;
rev = "v${version}";
hash = "sha256-mELI0mAkIERq8lfO5CdZcVgrsR5sybMEjKXJVPeg+dg=";
hash = "sha256-uAu2116gUYeO6vtwa3/4VzqDL0ROJxnrdxDLFoMlFow=";
};
buildInputs = [

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

@ -2339,9 +2339,9 @@ with pkgs;
kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { };
kitty = callPackage ../applications/terminal-emulators/kitty {
kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel OpenGL;
inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation IOKit Kernel UniformTypeIdentifiers OpenGL UserNotifications;
};
kitty-themes = callPackage ../misc/kitty-themes {};
@ -28269,6 +28269,8 @@ with pkgs;
corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };
coreth = callPackage ../applications/networking/coreth {};
coriander = callPackage ../applications/video/coriander {
inherit (gnome2) libgnomeui GConf;
};
@ -31097,7 +31099,8 @@ with pkgs;
nerd-font-patcher = callPackage ../applications/misc/nerd-font-patcher { };
netmaker = callPackage ../applications/networking/netmaker {};
netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];};
netmaker-full = callPackage ../applications/networking/netmaker {};
newsflash = callPackage ../applications/networking/feedreaders/newsflash {
webkitgtk = webkitgtk_5_0;
@ -31457,6 +31460,8 @@ with pkgs;
octoprint = callPackage ../applications/misc/octoprint { };
oculante = callPackage ../applications/graphics/oculante { };
ocr-a = callPackage ../data/fonts/ocr-a {};
ocrad = callPackage ../applications/graphics/ocrad { };
@ -33124,7 +33129,7 @@ with pkgs;
wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
neovim-unwrapped = callPackage ../applications/editors/neovim {
CoreServices = darwin.apple_sdk.frameworks.CoreServices;
lua = if (stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isRiscV64) then lua5_1 else luajit;
lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1;
};
neovimUtils = callPackage ../applications/editors/neovim/utils.nix {
@ -34643,9 +34648,7 @@ with pkgs;
gl117 = callPackage ../games/gl-117 { };
globulation2 = callPackage ../games/globulation {
boost = boost168; # breaks with >= boost169
};
globulation2 = callPackage ../games/globulation { };
gltron = callPackage ../games/gltron { };
@ -36202,6 +36205,7 @@ with pkgs;
coqPackages_8_14 coq_8_14
coqPackages_8_15 coq_8_15
coqPackages_8_16 coq_8_16
coqPackages_8_17 coq_8_17
coqPackages coq
;

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

@ -161,6 +161,7 @@ in rec {
coq_8_14 = mkCoq "8.14";
coq_8_15 = mkCoq "8.15";
coq_8_16 = mkCoq "8.16";
coq_8_17 = mkCoq "8.17";
coqPackages_8_5 = mkCoqPackages coq_8_5;
coqPackages_8_6 = mkCoqPackages coq_8_6;
@ -174,6 +175,7 @@ in rec {
coqPackages_8_14 = mkCoqPackages coq_8_14;
coqPackages_8_15 = mkCoqPackages coq_8_15;
coqPackages_8_16 = mkCoqPackages coq_8_16;
coqPackages_8_17 = mkCoqPackages coq_8_17;
coqPackages = recurseIntoAttrs coqPackages_8_16;
coq = coqPackages.coq;

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

@ -5067,6 +5067,8 @@ self: super: with self; {
keystone-engine = callPackage ../development/python-modules/keystone-engine { };
keyrings-passwordstore = callPackage ../development/python-modules/keyrings-passwordstore { };
keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 { };
keyutils = callPackage ../development/python-modules/keyutils {