mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 21:03:15 +00:00
Merge staging-next into staging
This commit is contained in:
commit
a65a635a42
@ -4606,6 +4606,16 @@
|
||||
githubId = 541748;
|
||||
name = "Felipe Espinoza";
|
||||
};
|
||||
federicoschonborn = {
|
||||
name = "Federico Damián Schonborn";
|
||||
email = "fdschonborn@gmail.com";
|
||||
github = "FedericoSchonborn";
|
||||
githubId = 62166915;
|
||||
matrix = "@FedericoDSchonborn:matrix.org";
|
||||
keys = [
|
||||
{ fingerprint = "517A 8A6A 09CA A11C 9667 CEE3 193F 70F1 5C9A B0A0"; }
|
||||
];
|
||||
};
|
||||
fedx-sudo = {
|
||||
email = "fedx-sudo@pm.me";
|
||||
github = "FedX-sudo";
|
||||
|
@ -28,6 +28,8 @@ let
|
||||
DOCUMENTATION_URL = "https://nixos.org/learn.html";
|
||||
SUPPORT_URL = "https://nixos.org/community.html";
|
||||
BUG_REPORT_URL = "https://github.com/NixOS/nixpkgs/issues";
|
||||
} // lib.optionalAttrs (cfg.variant_id != null) {
|
||||
VARIANT_ID = cfg.variant_id;
|
||||
};
|
||||
|
||||
initrdReleaseContents = osReleaseContents // {
|
||||
@ -87,6 +89,13 @@ in
|
||||
description = lib.mdDoc "The NixOS release code name (e.g. `Emu`).";
|
||||
};
|
||||
|
||||
nixos.variant_id = mkOption {
|
||||
type = types.nullOr (types.strMatching "^[a-z0-9._-]+$");
|
||||
default = null;
|
||||
description = lib.mdDoc "A lower-case string identifying a specific variant or edition of the operating system";
|
||||
example = "installer";
|
||||
};
|
||||
|
||||
stateVersion = mkOption {
|
||||
type = types.str;
|
||||
# TODO Remove this and drop the default of the option so people are forced to set it.
|
||||
|
@ -20,6 +20,7 @@ with lib;
|
||||
];
|
||||
|
||||
config = {
|
||||
system.nixos.variant_id = lib.mkDefault "installer";
|
||||
|
||||
# Enable in installer, even if the minimal profile disables it.
|
||||
documentation.enable = mkImageMediaOverride true;
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv
|
||||
, fetchpatch
|
||||
, libuv, lua, ncurses, pkg-config
|
||||
, unibilium, gperf
|
||||
, libvterm-neovim
|
||||
@ -19,6 +20,16 @@ let
|
||||
nvim-client luv coxpcall busted luafilesystem penlight inspect
|
||||
]
|
||||
));
|
||||
codegenLua =
|
||||
if lua.pkgs.isLuaJIT
|
||||
then
|
||||
let deterministicLuajit =
|
||||
lua.override {
|
||||
deterministicStringIds = true;
|
||||
self = deterministicLuajit;
|
||||
};
|
||||
in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ])
|
||||
else lua;
|
||||
|
||||
pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]);
|
||||
in
|
||||
@ -38,6 +49,13 @@ in
|
||||
# necessary so that nix can handle `UpdateRemotePlugins` for the plugins
|
||||
# it installs. See https://github.com/neovim/neovim/issues/9413.
|
||||
./system_rplugin_manifest.patch
|
||||
# make the build reproducible, rebased version of
|
||||
# https://github.com/neovim/neovim/pull/21586
|
||||
(fetchpatch {
|
||||
name = "neovim-build-make-generated-source-files-reproducible.patch";
|
||||
url = "https://github.com/raboof/neovim/commit/485dd2af3efbfd174163583c46e0bb2a01ff04f1.patch";
|
||||
hash = "sha256-9aRVK4lDkL/W4RVjeKptrZFY7rYYBx6/RGR4bQSbCsM=";
|
||||
})
|
||||
];
|
||||
|
||||
dontFixCmake = true;
|
||||
@ -89,7 +107,7 @@ in
|
||||
substituteInPlace src/nvim/version.c --replace NVIM_VERSION_CFLAGS "";
|
||||
'';
|
||||
# check that the above patching actually works
|
||||
disallowedReferences = [ stdenv.cc ];
|
||||
disallowedReferences = [ stdenv.cc ] ++ lib.optional (lua != codegenLua) codegenLua;
|
||||
|
||||
cmakeFlags = [
|
||||
# Don't use downloaded dependencies. At the end of the configurePhase one
|
||||
@ -101,7 +119,12 @@ in
|
||||
++ lib.optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"
|
||||
;
|
||||
|
||||
preConfigure = lib.optionalString stdenv.isDarwin ''
|
||||
preConfigure = lib.optionalString lua.pkgs.isLuaJIT ''
|
||||
cmakeFlagsArray+=(
|
||||
"-DLUAC_PRG=${codegenLua}/bin/luajit -b -s %s -"
|
||||
"-DLUA_GEN_PRG=${codegenLua}/bin/luajit"
|
||||
)
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace src/nvim/CMakeLists.txt --replace " util" ""
|
||||
'';
|
||||
|
||||
|
@ -73,14 +73,14 @@ let
|
||||
six
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.22.13";
|
||||
version = "3.22.14";
|
||||
pname = "qgis-ltr-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-l9UaxPBTkKrTygise0nVBDrPX3aRRW62HtIYwrtYp3Q=";
|
||||
hash = "sha256-VT85cVeKuHQCGQokID9yrbents7ewHK1j7I17oFTvlo=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sigi";
|
||||
version = "3.5.0";
|
||||
version = "3.6.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-VUf5fCVOZCn0iY51eBS/fIvlxQF+BY+k75I+NY7yqzM=";
|
||||
sha256 = "sha256-VhBrSepJdwJRu+AqXWUzdDO4ukJPeoZr07B/X8Jr/RA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ivSVcpUDGK0dJDy+jY7BYQIFCXu/npV0MiNe3nlsUho=";
|
||||
cargoSha256 = "sha256-R1U0ZYQMA1VFd5zEjFzl5QhwqqEMaCFb/5H509IBj60=";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# In case anything goes wrong.
|
||||
|
@ -7,6 +7,14 @@
|
||||
, zlib
|
||||
}:
|
||||
|
||||
let
|
||||
zig_0_10_0 = fetchFromGitHub {
|
||||
owner = "ziglang";
|
||||
repo = "zig";
|
||||
rev = "0.10.0";
|
||||
hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zig";
|
||||
version = "0.9.1";
|
||||
@ -18,8 +26,20 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k=";
|
||||
};
|
||||
|
||||
# Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev)
|
||||
patches = [ ./rpath.patch ];
|
||||
patches = [
|
||||
# Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev)
|
||||
./rpath.patch
|
||||
# Fix build on macOS 13 (cherry-picked from 0.10-dev)
|
||||
./ventura.patch
|
||||
];
|
||||
|
||||
# TODO: remove on next upgrade
|
||||
prePatch = ''
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu
|
||||
cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu
|
||||
cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
50
pkgs/development/compilers/zig/ventura.patch
Normal file
50
pkgs/development/compilers/zig/ventura.patch
Normal file
@ -0,0 +1,50 @@
|
||||
From 98285b17b3887de37b630da66f09a44f42ddbe01 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Konka <kubkon@jakubkonka.com>
|
||||
Date: Tue, 25 Oct 2022 11:46:42 +0200
|
||||
Subject: [PATCH] darwin: bump max macOS version to 13.0
|
||||
|
||||
---
|
||||
lib/std/target.zig | 4 ++--
|
||||
src/target.zig | 2 ++
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/std/target.zig b/lib/std/target.zig
|
||||
index d791e3b0350..7fbad5baa3c 100644
|
||||
--- a/lib/std/target.zig
|
||||
+++ b/lib/std/target.zig
|
||||
@@ -277,13 +277,13 @@ pub const Target = struct {
|
||||
.aarch64 => VersionRange{
|
||||
.semver = .{
|
||||
.min = .{ .major = 11, .minor = 6 },
|
||||
- .max = .{ .major = 12, .minor = 0 },
|
||||
+ .max = .{ .major = 13, .minor = 0 },
|
||||
},
|
||||
},
|
||||
.x86_64 => VersionRange{
|
||||
.semver = .{
|
||||
.min = .{ .major = 10, .minor = 13 },
|
||||
- .max = .{ .major = 12, .minor = 0 },
|
||||
+ .max = .{ .major = 13, .minor = 0 },
|
||||
},
|
||||
},
|
||||
else => unreachable,
|
||||
diff --git a/src/target.zig b/src/target.zig
|
||||
index 9e2d26dac65..fc585912c45 100644
|
||||
--- a/src/target.zig
|
||||
+++ b/src/target.zig
|
||||
@@ -18,6 +18,7 @@ pub const available_libcs = [_]ArchOsAbi{
|
||||
.{ .arch = .aarch64, .os = .windows, .abi = .gnu },
|
||||
.{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } },
|
||||
.{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } },
|
||||
+ .{ .arch = .aarch64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } },
|
||||
.{ .arch = .armeb, .os = .linux, .abi = .gnueabi },
|
||||
.{ .arch = .armeb, .os = .linux, .abi = .gnueabihf },
|
||||
.{ .arch = .armeb, .os = .linux, .abi = .musleabi },
|
||||
@@ -73,6 +74,7 @@ pub const available_libcs = [_]ArchOsAbi{
|
||||
.{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 10, .minor = 0 } },
|
||||
.{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 11, .minor = 0 } },
|
||||
.{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 12, .minor = 0 } },
|
||||
+ .{ .arch = .x86_64, .os = .macos, .abi = .gnu, .os_ver = .{ .major = 13, .minor = 0 } },
|
||||
};
|
||||
|
||||
pub fn libCGenericName(target: std.Target) [:0]const u8 {
|
@ -25,6 +25,12 @@
|
||||
, enableAPICheck ? false
|
||||
, enableVMAssertions ? false
|
||||
, useSystemMalloc ? false
|
||||
# Upstream generates randomized string id's by default for security reasons
|
||||
# https://github.com/LuaJIT/LuaJIT/issues/626. Deterministic string id's should
|
||||
# never be needed for correctness (that should be fixed in the lua code),
|
||||
# but may be helpful when you want to embed jit-compiled raw lua blobs in
|
||||
# binaries that you want to be reproducible.
|
||||
, deterministicStringIds ? false
|
||||
, luaAttr ? "luajit_${lib.versions.major version}_${lib.versions.minor version}"
|
||||
} @ inputs:
|
||||
assert enableJITDebugModule -> enableJIT;
|
||||
@ -44,6 +50,7 @@ let
|
||||
++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT"
|
||||
++ optional enableAPICheck "-DLUAJIT_USE_APICHECK"
|
||||
++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT"
|
||||
++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0"
|
||||
;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -27,6 +27,10 @@ let
|
||||
, system-sendmail
|
||||
, valgrind
|
||||
, xcbuild
|
||||
, writeShellScript
|
||||
, common-updater-scripts
|
||||
, curl
|
||||
, jq
|
||||
|
||||
, version
|
||||
, hash
|
||||
@ -300,6 +304,19 @@ let
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
passthru = {
|
||||
updateScript =
|
||||
let
|
||||
script = writeShellScript "php${lib.versions.major version}${lib.versions.minor version}-update-script" ''
|
||||
set -o errexit
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts curl jq ]}
|
||||
new_version=$(curl --silent "https://www.php.net/releases/active" | jq --raw-output '."${lib.versions.major version}"."${lib.versions.majorMinor version}".version')
|
||||
update-source-version "$UPDATE_NIX_ATTR_PATH.unwrapped" "$new_version" "--file=$1"
|
||||
'';
|
||||
in [
|
||||
script
|
||||
# Passed as an argument so that update.nix can ensure it does not become a store path.
|
||||
(./. + "/${lib.versions.majorMinor version}.nix")
|
||||
];
|
||||
buildEnv = mkBuildEnv { } [ ];
|
||||
withExtensions = mkWithExtensions { } [ ];
|
||||
overrideAttrs =
|
||||
|
@ -128,13 +128,6 @@ let
|
||||
# Backport from CPython 3.8 of a good list of tests to run for PGO.
|
||||
./profile-task.patch
|
||||
|
||||
# remove once 2.7.18.6 is released
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-3733.patch";
|
||||
url = "https://github.com/ActiveState/cpython/commit/eeb7fe50450f08a782921f3229abed2f23e7b2d7.patch";
|
||||
sha256 = "sha256-ch4cMoFythDmyvlVxOAVw3Ow4PPWVDq5o9c1qox2824=";
|
||||
})
|
||||
|
||||
# The workaround is for unittests on Win64, which we don't support.
|
||||
# It does break aarch64-darwin, which we do support. See:
|
||||
# * https://bugs.python.org/issue35523
|
||||
|
@ -144,9 +144,9 @@ in {
|
||||
major = "2";
|
||||
minor = "7";
|
||||
patch = "18";
|
||||
suffix = ".5"; # ActiveState's Python 2 extended support
|
||||
suffix = ".6"; # ActiveState's Python 2 extended support
|
||||
};
|
||||
sha256 = "sha256-f5A0go0mUEv8cXuXo0ZRNfGwNPjnDhP7KqhkETOoqsw=";
|
||||
sha256 = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
62
pkgs/development/libraries/minilibx/default.nix
Normal file
62
pkgs/development/libraries/minilibx/default.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, libX11
|
||||
, libXext
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "minilibx";
|
||||
version = "unstable-2021-10-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "42Paris";
|
||||
repo = "minilibx-linux";
|
||||
rev = "7dc53a411a7d4ae286c60c6229bd1e395b0efb82";
|
||||
hash = "sha256-aRYMpaPC7dC6EHmmXugvwcQnaizRCQZKFcQX0K2MLM4=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXext
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
makefile = "Makefile.mk";
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{include,lib}
|
||||
cp mlx*.h $out/include
|
||||
cp libmlx*.a $out/lib
|
||||
installManPage man/man*/*
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = unstableGitUpdater { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple X-Window (X11R6) programming API in C";
|
||||
homepage = "https://github.com/42Paris/minilibx-linux";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ wegank ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
@ -12,15 +12,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.5.1";
|
||||
version = "0.6.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-${pname}";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HAgt52Bo2NOUkpr5xvWTcRyrLKpfcBDlVAZxgDNI7hY=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZeajC8FM7Py+DWknVjnwiM4jaCCcnxfC+kTbHEEmyms=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -32,7 +33,9 @@ buildPythonPackage rec {
|
||||
--replace 0.0.0 ${version}
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
@ -45,11 +48,14 @@ buildPythonPackage rec {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "adguardhome" ];
|
||||
pythonImportsCheck = [
|
||||
"adguardhome"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for the AdGuard Home API";
|
||||
homepage = "https://github.com/frenck/python-adguardhome";
|
||||
changelog = "https://github.com/frenck/python-adguardhome/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jamiemagee ];
|
||||
};
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "async-upnp-client";
|
||||
version = "0.32.3";
|
||||
version = "0.33.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "StevenLooman";
|
||||
repo = "async_upnp_client";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1/RW84ammc6mu90izMtL7Cv11krc4WhdqCSq9ncFibI=";
|
||||
hash = "sha256-I7C2ho+pmowerJFK82wYcqEOhRV3KZ5j5IBVCKjhllM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,28 +1,33 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "garages-amsterdam";
|
||||
version = "4.1.0";
|
||||
pname = "odp-amsterdam";
|
||||
version = "5.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "garages_amsterdam";
|
||||
repo = "python-odp-amsterdam";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-ZWp543msRAgn/fFplEt6saSNbZ2flC5gwjxrll4w0W0=";
|
||||
hash = "sha256-zVnM4KYH4R6n2y9IAaYGOZVPnc8RuT/S2bseKJBO9bg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace '"0.0.0"' '"${version}"'
|
||||
|
||||
sed -i '/addopts/d' pyproject.toml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -33,11 +38,14 @@ buildPythonPackage rec {
|
||||
aiohttp
|
||||
];
|
||||
|
||||
# The only test requires network access
|
||||
doCheck = false;
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"garages_amsterdam"
|
||||
"odp_amsterdam"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydeconz";
|
||||
version = "105";
|
||||
version = "106";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8GQJ4PCl8te3sovC5FwWoaQnXIRR27b7gPwfmyPRVBE=";
|
||||
hash = "sha256-13of5ohz/hezlmGvSNqCu9QoOPKdPPtrhQHbxmG2/Do=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyisy";
|
||||
version = "3.0.9";
|
||||
version = "3.0.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "automicus";
|
||||
repo = "PyISY";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-95MUOxWR4YUce0fFcasKc6YjoSHTGhXJcUAg0mbXxCs=";
|
||||
hash = "sha256-nThHJYU23I9q5Irk5SoW1+dy5Agl9IJc5gnLirzp3YM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "PyNINA";
|
||||
inherit version;
|
||||
sha256 = "sha256-2Ujq2+6xQXPjKzK3HQbJnjz8cX3ALUV+22gdQflFxFY=";
|
||||
hash = "sha256-2Ujq2+6xQXPjKzK3HQbJnjz8cX3ALUV+22gdQflFxFY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,25 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-unordered";
|
||||
version = "0.4.1";
|
||||
version = "0.5.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utapyngo";
|
||||
repo = pname;
|
||||
rev = "972012a984b1e9fb3e98f9e8fe9e2ada16ad8110";
|
||||
hash = "sha256-mCcR6WZb2+V5n0PwgsjvnChWnANkIyQ0YtqwTKBYtaA=";
|
||||
repo = "pytest-unordered";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-51UJjnGBO7qBvQlY8F0B29n8+EO2aa3DF3WOwcjZzSo=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pytest_unordered" ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pytest_unordered"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/utapyngo/pytest-unordered/blob/v${version}/CHANGELOG.md";
|
||||
description = "Test equality of unordered collections in pytest";
|
||||
homepage = "https://github.com/utapyngo/pytest-unordered";
|
||||
license = licenses.mit;
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.43.1";
|
||||
version = "0.44.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qnGMUY7c2jqLQbVybVdu9vWcPMFoxCnCCTBhWP+AXE0=";
|
||||
hash = "sha256-AG8LXdQvutlgeg7543bDx8Znidf67CzusnnD6GOakf4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bloop";
|
||||
version = "1.5.4";
|
||||
version = "1.5.6";
|
||||
|
||||
platform =
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
|
||||
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
|
||||
bloop-binary = fetchurl rec {
|
||||
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
|
||||
sha256 =
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "sha256-q8K5dzzLhQ8T6VzhoJ5iGk0yz9pOPrP/V4eiTwyzlgo="
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-7zTKOAnlQWk9BbdBZLBfSLyBhFqhkscbcHN1zVTjDjQ="
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "sha256-s/N0+5GQ1MzIxecn7QeJTZ8E+TCF+smL2nObGRkGMys="
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-xOAuMLVzhYsUd3HyWeAESEjhBG3FUeTiqyi91t0rSgQ="
|
||||
else throw "unsupported platform";
|
||||
};
|
||||
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "devspace";
|
||||
version = "6.2.2";
|
||||
version = "6.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "loft-sh";
|
||||
repo = "devspace";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eET7Q0UvpvmPPgnrc6tX69dYhrsO2bsyzFkAJyp9FLg=";
|
||||
sha256 = "sha256-AaEShzCdDcYCFXZRqr+Q98xsh5Ml7pcwcqIzGEa11oo=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
40
pkgs/development/tools/twilio-cli/default.nix
Normal file
40
pkgs/development/tools/twilio-cli/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib, stdenvNoCC, nodejs, fetchzip, makeBinaryWrapper, testers }:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "twilio-cli";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-NmxIDE2LXHTixqhV/Ov/B2H25KhvEay9BKq5MXSXHnk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
buildInputs = [ nodejs ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/libexec/twilio-cli
|
||||
cp -R . $out/libexec/twilio-cli
|
||||
ln -s $out/libexec/twilio-cli/bin/run $out/bin/twilio
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = testers.testVersion {
|
||||
package = finalAttrs.finalPackage;
|
||||
command = "twilio version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unleash the power of Twilio from your command prompt";
|
||||
homepage = "https://github.com/twilio/twilio-cli";
|
||||
changelog = "https://github.com/twilio/twilio-cli/blob/${version}/CHANGES.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marsam ];
|
||||
platforms = nodejs.meta.platforms;
|
||||
mainProgram = "twilio";
|
||||
};
|
||||
})
|
@ -32,12 +32,12 @@
|
||||
"5.15": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-5.15.85-hardened1.patch",
|
||||
"sha256": "03zjcjyiklhxhq958hx1mlhhjcz0isdrij217q8ji78bz3y40m0q",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.85-hardened1/linux-hardened-5.15.85-hardened1.patch"
|
||||
"name": "linux-hardened-5.15.86-hardened1.patch",
|
||||
"sha256": "04yp2qqn9axvkaqgihb1vxnkwnjs5s2q9106y5x4r1q4bf42nz2v",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.86-hardened1/linux-hardened-5.15.86-hardened1.patch"
|
||||
},
|
||||
"sha256": "024qhjh9mgfnanr1qd8002n6a4wpn98lajli12a0m3n9z8lsw2rc",
|
||||
"version": "5.15.85"
|
||||
"sha256": "1vpjnmwqsx6akph2nvbsv2jl7pp8b7xns3vmwbljsl23lkpxkz40",
|
||||
"version": "5.15.86"
|
||||
},
|
||||
"5.4": {
|
||||
"patch": {
|
||||
@ -52,11 +52,11 @@
|
||||
"6.0": {
|
||||
"patch": {
|
||||
"extra": "-hardened1",
|
||||
"name": "linux-hardened-6.0.15-hardened1.patch",
|
||||
"sha256": "0v7aqxa6ba2jkx1dd9axr9vsnn3pbq30vwfd0akc72zc8c5zll1r",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.15-hardened1/linux-hardened-6.0.15-hardened1.patch"
|
||||
"name": "linux-hardened-6.0.16-hardened1.patch",
|
||||
"sha256": "19rakmfdkkbvvzphsksccgad3wc2khlcynzdqx10d7spldj8nkp1",
|
||||
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.16-hardened1/linux-hardened-6.0.16-hardened1.patch"
|
||||
},
|
||||
"sha256": "08389890gq4b9vkvrb22lzkr4blkn3a5ma074ns19gl89wyyp16l",
|
||||
"version": "6.0.15"
|
||||
"sha256": "1r2wf3hf7yxl7lxma7plyi8pk3dmlsrpm763rf0g1h8ilsy72844",
|
||||
"version": "6.0.16"
|
||||
}
|
||||
}
|
||||
|
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.10.161";
|
||||
version = "5.10.162";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
|
||||
sha256 = "0ya04njrxr4d37zkxvivmn5f0bdvcb504pyp9ahwz8nqpk8gdaks";
|
||||
sha256 = "05yjgp1la5flwqji9b6j7nbdgg5fwzv2ph536v4f9pzza3y01i1f";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
||||
|
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.0.16";
|
||||
version = "6.0.17";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "1r2wf3hf7yxl7lxma7plyi8pk3dmlsrpm763rf0g1h8ilsy72844";
|
||||
sha256 = "020xrv9449gd0jnfgi0sb69bgs2p9sd49dghmd3bnnal584r5vm7";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.1.2";
|
||||
version = "6.1.3";
|
||||
|
||||
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
|
||||
modDirVersion = versions.pad 3 version;
|
||||
@ -13,6 +13,6 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
|
||||
sha256 = "1bni72q0jjg39vqckcif57kh7d1x4k4jir5a11pz9clryp2g6hgf";
|
||||
sha256 = "05q3b32kinvbgbibb8s3x8ax3gzlgznlcwvwb4y46gjilzkrmj3d";
|
||||
};
|
||||
} // (args.argsOverride or { }))
|
||||
|
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.1-rc8";
|
||||
version = "6.2-rc2";
|
||||
extraMeta.branch = lib.versions.majorMinor version;
|
||||
|
||||
# modDirVersion needs to be x.y.z, will always add .0
|
||||
@ -11,7 +11,7 @@ buildLinux (args // rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
hash = "sha256-YQYxNWZ7HmF3z5M88S8I8tjOaglNYWFtCGlGbDttx64=";
|
||||
hash = "sha256-QRmOwtoGG2uNCNcAIAltrCT7zaD2V+RNe3bjHGn5+ts=";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.12.9";
|
||||
version = "2023.1.0";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
@ -79,6 +79,9 @@
|
||||
"airvisual" = ps: with ps; [
|
||||
pyairvisual
|
||||
];
|
||||
"airvisual_pro" = ps: with ps; [
|
||||
pyairvisual
|
||||
];
|
||||
"airzone" = ps: with ps; [
|
||||
aioairzone
|
||||
];
|
||||
@ -657,9 +660,6 @@
|
||||
];
|
||||
"derivative" = ps: with ps; [
|
||||
];
|
||||
"deutsche_bahn" = ps: with ps; [
|
||||
schiene
|
||||
];
|
||||
"device_automation" = ps: with ps; [
|
||||
];
|
||||
"device_sun_light_trigger" = ps: with ps; [
|
||||
@ -728,6 +728,7 @@
|
||||
aiohttp-cors
|
||||
async-upnp-client
|
||||
fnvhash
|
||||
getmac
|
||||
ifaddr
|
||||
sqlalchemy
|
||||
zeroconf
|
||||
@ -1147,7 +1148,7 @@
|
||||
"garadget" = ps: with ps; [
|
||||
];
|
||||
"garages_amsterdam" = ps: with ps; [
|
||||
garages-amsterdam
|
||||
odp-amsterdam
|
||||
];
|
||||
"gaviota" = ps: with ps; [
|
||||
];
|
||||
@ -1229,6 +1230,11 @@
|
||||
pyturbojpeg
|
||||
aiohttp-cors
|
||||
];
|
||||
"google_assistant_sdk" = ps: with ps; [
|
||||
aiohttp-cors
|
||||
fnvhash
|
||||
sqlalchemy
|
||||
]; # missing inputs: gassist-text
|
||||
"google_cloud" = ps: with ps; [
|
||||
google-cloud-texttospeech
|
||||
];
|
||||
@ -1459,12 +1465,12 @@
|
||||
zigpy
|
||||
];
|
||||
"homekit" = ps: with ps; [
|
||||
hap-python
|
||||
pyqrcode
|
||||
pyturbojpeg
|
||||
aiohttp-cors
|
||||
base36
|
||||
fnvhash
|
||||
hap-python
|
||||
ha-ffmpeg
|
||||
ifaddr
|
||||
sqlalchemy
|
||||
@ -1586,14 +1592,14 @@
|
||||
"ihc" = ps: with ps; [
|
||||
defusedxml
|
||||
]; # missing inputs: ihcsdk
|
||||
"image" = ps: with ps; [
|
||||
aiohttp-cors
|
||||
pillow
|
||||
];
|
||||
"image_processing" = ps: with ps; [
|
||||
pyturbojpeg
|
||||
aiohttp-cors
|
||||
];
|
||||
"image_upload" = ps: with ps; [
|
||||
aiohttp-cors
|
||||
pillow
|
||||
];
|
||||
"imap" = ps: with ps; [
|
||||
aioimaplib
|
||||
];
|
||||
@ -2667,6 +2673,8 @@
|
||||
"pure_energie" = ps: with ps; [
|
||||
gridnet
|
||||
];
|
||||
"purpleair" = ps: with ps; [
|
||||
]; # missing inputs: aiopurpleair
|
||||
"push" = ps: with ps; [
|
||||
aiohttp-cors
|
||||
];
|
||||
@ -2801,6 +2809,9 @@
|
||||
"renault" = ps: with ps; [
|
||||
renault-api
|
||||
];
|
||||
"reolink" = ps: with ps; [
|
||||
reolink-aio
|
||||
];
|
||||
"repairs" = ps: with ps; [
|
||||
aiohttp-cors
|
||||
];
|
||||
@ -3619,7 +3630,7 @@
|
||||
pytrafikverket
|
||||
];
|
||||
"transmission" = ps: with ps; [
|
||||
transmissionrpc
|
||||
transmission-rpc
|
||||
];
|
||||
"transport_nsw" = ps: with ps; [
|
||||
pytransportnsw
|
||||
@ -4102,6 +4113,7 @@
|
||||
"airthings_ble"
|
||||
"airtouch4"
|
||||
"airvisual"
|
||||
"airvisual_pro"
|
||||
"airzone"
|
||||
"aladdin_connect"
|
||||
"alarm_control_panel"
|
||||
@ -4354,8 +4366,8 @@
|
||||
"icloud"
|
||||
"ifttt"
|
||||
"ign_sismologia"
|
||||
"image"
|
||||
"image_processing"
|
||||
"image_upload"
|
||||
"imap_email_content"
|
||||
"influxdb"
|
||||
"inkbird"
|
||||
@ -4552,6 +4564,7 @@
|
||||
"radarr"
|
||||
"radio_browser"
|
||||
"radiotherm"
|
||||
"rainbird"
|
||||
"rainforest_eagle"
|
||||
"rainmachine"
|
||||
"random"
|
||||
@ -4562,6 +4575,7 @@
|
||||
"reddit"
|
||||
"remote"
|
||||
"renault"
|
||||
"reolink"
|
||||
"repairs"
|
||||
"rest"
|
||||
"rest_command"
|
||||
|
@ -85,17 +85,6 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
hap-python = super.hap-python.overridePythonAttrs (oldAtrs: rec {
|
||||
pname = "ha-hap-python";
|
||||
version = "4.5.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bdraco";
|
||||
repo = "ha-HAP-python";
|
||||
rev = "refs/tags/v4.5.2";
|
||||
hash = "sha256-xCmx5QopNShKIuXewT+T86Bxyi4P0ddh8r2UlJ48Wig=";
|
||||
};
|
||||
});
|
||||
|
||||
# Pinned due to API changes in 0.1.0
|
||||
poolsense = super.poolsense.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.0.8";
|
||||
@ -216,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 = "2022.12.9";
|
||||
hassVersion = "2023.1.0";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -234,7 +223,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tf2H4+79CGTmbKZtJpzYOzAgi90RpSy89hoDNS24m0Q=";
|
||||
hash = "sha256-uYQnymJQ893F5fX/yi8S3OZL4LkT5z7QNOzkoedXllM=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
@ -311,11 +300,13 @@ in python.pkgs.buildPythonApplication rec {
|
||||
checkInputs = with python.pkgs; [
|
||||
# test infrastructure (selectively from requirement_test.txt)
|
||||
freezegun
|
||||
pytest-asyncio
|
||||
pytest-aiohttp
|
||||
pytest-freezegun
|
||||
pytest-mock
|
||||
pytest-rerunfailures
|
||||
pytest-socket
|
||||
pytest-unordered
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
|
@ -4,7 +4,7 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20221213.1";
|
||||
version = "20230104.0";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
||||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-QL+3dIZlUJstRgK80ANnK9CKR4muvfEQz16bTTMS3Fs=";
|
||||
hash = "sha256-tzn+TGhEcbXRly1iTLQr1UkG7y2NwLZTobDqmDe1JHo=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
@ -39,7 +39,7 @@ PKG_SET = "home-assistant.python.pkgs"
|
||||
PKG_PREFERENCES = {
|
||||
"fiblary3": "fiblary3-fork", # https://github.com/home-assistant/core/issues/66466
|
||||
"ha-av": "av",
|
||||
"ha-HAP-python": "hap-python",
|
||||
"HAP-python": "hap-python",
|
||||
"tensorflow": "tensorflow",
|
||||
"youtube_dl": "youtube-dl-light",
|
||||
}
|
||||
|
@ -14,6 +14,7 @@ let
|
||||
generic = [ av ];
|
||||
google_translate = [ mutagen ];
|
||||
google_sheets = [ oauth2client ];
|
||||
govee_ble = [ ibeacon-ble ];
|
||||
hassio = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];
|
||||
homeassistant_sky_connect = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zwave-js-server-python ];
|
||||
homeassistant_yellow = [ bellows zha-quirks zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp ];
|
||||
|
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tailscale";
|
||||
version = "1.34.1";
|
||||
version = "1.34.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C+Ae90mDzMwnBlKpr3ysdGypo4UaqRfSMfOl3zcuKRE=";
|
||||
sha256 = "sha256-uFr7swB7AQLvjDg+1KBCQuoLkDw454+gVe+6/iD74LM=";
|
||||
};
|
||||
vendorSha256 = "sha256-nSllDi6G4QAGyuoGduDhI0vaVuN2//eg+gXRSZ3ERiQ=";
|
||||
vendorSha256 = "sha256-//qhvzZzaAqfcj4HZIy6ZkGyfAwtRdf7ARaXI+trTe0=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
|
||||
|
||||
|
@ -4,20 +4,24 @@ with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "iredis";
|
||||
version = "1.12.1";
|
||||
version = "1.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nLwu47wV5QqgtiyiN9bbKzjlZdgd6Qt5KjBlipwRW1Q=";
|
||||
sha256 = "d1e4e7936d0be456f70a39abeb1c97d931f66ccd60e891f4fd796ffb06dfeaf9";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "click>=7.0,<8.0" "click" \
|
||||
--replace "wcwidth==0.1.9" "wcwidth" \
|
||||
--replace "redis>=3.4.0,<4.0.0" "redis"
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'click = "^7.0"' 'click = "*"' \
|
||||
--replace 'wcwidth = "0.1.9"' 'wcwidth = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pygments
|
||||
click
|
||||
@ -41,6 +45,7 @@ buildPythonApplication rec {
|
||||
"--ignore=tests/unittests/test_client.py"
|
||||
"--deselect=tests/unittests/test_render_functions.py::test_render_unixtime_config_raw"
|
||||
"--deselect=tests/unittests/test_render_functions.py::test_render_time"
|
||||
"--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority"
|
||||
# Only execute unittests, because cli tests require a running Redis
|
||||
"tests/unittests/"
|
||||
];
|
||||
|
@ -1,24 +1,16 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.2";
|
||||
version = "0.3.1";
|
||||
pname = "snore";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "clamiax";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EOwbRqtQEuGZ+aeCBNVfLUq4m/bFWJTvMDM6a+y74qc=";
|
||||
hash = "sha256-bKPGSePzp4XEZFY0QQr37fm3R1v3hLD6FeySFd7zNJc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix POSIX_C_SOURCE macro. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/clamiax/snore/commit/284e5aa56e775803d24879954136401a106aa063.patch";
|
||||
sha256 = "sha256-len8E8h9CXC25WB2lmnLLJ0PR903tgllDh9K2RqzQk0=";
|
||||
})
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -5,6 +5,7 @@
|
||||
, installShellFiles
|
||||
, cmake
|
||||
, fetchpatch
|
||||
, git
|
||||
, nixosTests
|
||||
, Security
|
||||
, Foundation
|
||||
@ -37,6 +38,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoHash = "sha256-hs0ImaozKH6QcUfts+oseUqecg7bGX5cx50ixnNamW8=";
|
||||
|
||||
checkInputs = [ git ];
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
'';
|
||||
|
@ -55,7 +55,8 @@ buildPythonApplication rec {
|
||||
--replace "pynetdicom>=1.5.1,<2" "pynetdicom>=2,<3" \
|
||||
--replace "cryptography>=3.0,<4" "cryptography>=35,<40" \
|
||||
--replace "python-can>=3.3.3,<4" "python-can>=3.3.3,<5" \
|
||||
--replace "pyparsing>=2.4.7,<3" "pyparsing>=2.4.7,<4"
|
||||
--replace "pyparsing>=2.4.7,<3" "pyparsing>=2.4.7,<4" \
|
||||
--replace "zeroconf>=0.30,<0.40" "zeroconf"
|
||||
'';
|
||||
|
||||
# Project has no tests
|
||||
|
@ -9569,6 +9569,8 @@ with pkgs;
|
||||
|
||||
minijail-tools = python3.pkgs.callPackage ../tools/system/minijail/tools.nix { };
|
||||
|
||||
minilibx = callPackage ../development/libraries/minilibx { };
|
||||
|
||||
minixml = callPackage ../development/libraries/minixml { };
|
||||
|
||||
mir-qualia = callPackage ../tools/text/mir-qualia {
|
||||
@ -12824,6 +12826,8 @@ with pkgs;
|
||||
|
||||
sentry-native = callPackage ../development/libraries/sentry-native { };
|
||||
|
||||
twilio-cli = callPackage ../development/tools/twilio-cli { };
|
||||
|
||||
waifu2x-converter-cpp = callPackage ../tools/graphics/waifu2x-converter-cpp {
|
||||
inherit (darwin.apple_sdk.frameworks) OpenCL;
|
||||
};
|
||||
|
@ -85,6 +85,7 @@ mapAliases ({
|
||||
flask_testing = flask-testing; # added 2022-04-25
|
||||
flask_wtf = flask-wtf; # added 2022-05-24
|
||||
functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
|
||||
garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
|
||||
garminconnect-ha = garminconnect; # added 2022-02-05
|
||||
gigalixir = throw "gigalixir has been promoted to a top-level attribute"; # Added 2022-10-02
|
||||
gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
|
||||
|
@ -3628,8 +3628,6 @@ self: super: with self; {
|
||||
|
||||
gast = callPackage ../development/python-modules/gast { };
|
||||
|
||||
garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { };
|
||||
|
||||
gatt = callPackage ../development/python-modules/gatt { };
|
||||
|
||||
gattlib = callPackage ../development/python-modules/gattlib {
|
||||
@ -6472,6 +6470,8 @@ self: super: with self; {
|
||||
|
||||
odfpy = callPackage ../development/python-modules/odfpy { };
|
||||
|
||||
odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { };
|
||||
|
||||
offtrac = callPackage ../development/python-modules/offtrac { };
|
||||
|
||||
ofxclient = callPackage ../development/python-modules/ofxclient { };
|
||||
|
Loading…
Reference in New Issue
Block a user