Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
bbf9b5deb7
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, nixpkgs ? { }, libsets }:
|
||||
let
|
||||
revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");
|
||||
revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master");
|
||||
|
||||
libDefPos = prefix: set:
|
||||
builtins.concatMap
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
|
|||
* `buildInputs` (optional), is a list of libraries and dependencies that are required to build and run the current derivation, in addition to the default one `[ coq ]`,
|
||||
* `extraBuildInputs` (optional, deprecated), an additional list of derivation to add to `buildInputs`,
|
||||
* `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements,
|
||||
* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environements of subsequent derivation, which is necessary for Coq packages to work correctly,
|
||||
* `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Coq libraries and Coq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environments of subsequent derivation, which is necessary for Coq packages to work correctly,
|
||||
* `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Coq was built against.
|
||||
* `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`,
|
||||
* `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
|
||||
|
|
|
|||
|
|
@ -4149,6 +4149,16 @@
|
|||
githubId = 1931963;
|
||||
name = "David Sferruzza";
|
||||
};
|
||||
dsuetin = {
|
||||
name = "Danil Suetin";
|
||||
email = "suetin085@gmail.com";
|
||||
matrix = "@dani0854:matrix.org";
|
||||
github = "dani0854";
|
||||
githubId = 32674935;
|
||||
keys = [{
|
||||
fingerprint = "6CC2 D713 6703 0D86 CA29 C71F 23B5 AA6F A374 F2FE";
|
||||
}];
|
||||
};
|
||||
dsymbol = {
|
||||
name = "dsymbol";
|
||||
github = "dsymbol";
|
||||
|
|
@ -12615,6 +12625,15 @@
|
|||
githubId = 1024891;
|
||||
name = "Jens Nolte";
|
||||
};
|
||||
quentin = {
|
||||
email = "quentin@mit.edu";
|
||||
github = "quentinmit";
|
||||
githubId = 115761;
|
||||
name = "Quentin Smith";
|
||||
keys = [{
|
||||
fingerprint = "1C71 A066 5400 AACD 142E B1A0 04EE 05A8 FCEF B697";
|
||||
}];
|
||||
};
|
||||
quentini = {
|
||||
email = "quentini@airmail.cc";
|
||||
github = "QuentinI";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
in
|
||||
{
|
||||
options.services.peroxide = {
|
||||
enable = mkEnableOption (lib.mdDoc "enable");
|
||||
enable = mkEnableOption (lib.mdDoc "peroxide");
|
||||
|
||||
package = mkPackageOptionMD pkgs "peroxide" {
|
||||
default = [ "peroxide" ];
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
# gcc only supports objc on darwin
|
||||
buildGoModule.override { stdenv = clangStdenv; } rec {
|
||||
pname = "go-musicfox";
|
||||
version = "4.0.1";
|
||||
version = "4.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anhoder";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eOcQWw5wXU59/EzDLk028mV/Ro6Ii0DYcp4wdDedhrA=";
|
||||
hash = "sha256-ZxyW/NUKSCcx/KGgFV2pt5ucTBP7BE7qFeTvBoRmUvQ=";
|
||||
};
|
||||
|
||||
deleteVendor = true;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
# Darwin-only dependencies
|
||||
, CoreBluetooth
|
||||
, ForceFeedback
|
||||
, IOBluetooth
|
||||
, IOKit
|
||||
, moltenvk
|
||||
, OpenGL
|
||||
|
|
@ -106,6 +107,7 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals stdenv.isDarwin [
|
||||
CoreBluetooth
|
||||
ForceFeedback
|
||||
IOBluetooth
|
||||
IOKit
|
||||
moltenvk
|
||||
OpenGL
|
||||
|
|
|
|||
|
|
@ -8,16 +8,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "artem";
|
||||
version = "1.1.5";
|
||||
version = "1.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "finefindus";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1jax39gizlcbqnkjckxwm5h0wdk5dk8dasaj9wxv7yidbcbgj4zh";
|
||||
sha256 = "sha256-wd8csdt7qOWFhUBRjqfJSEGnNDyHD7lJA8CtW+q4Kxg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-n2NOWrgcMVHpNCHL7r8+Kl1e01XYadaNM7UdE8fQo1U=";
|
||||
cargoSha256 = "sha256-zFXQUQVPqTur7m+aL0JhSiZI+EEFo9nCTVu1yAOgp/I=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oxker";
|
||||
version = "0.2.5";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-w0YLSwRv6uhDwi06q0/mhGc5C6O2xq3vc9Se7/xXkhA=";
|
||||
sha256 = "sha256-VIsop0XjadZQecKRbt+2U2qrMVmPaLZGUuMEY8v+aJ8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Q0+6YgcdWa4RjNA7ffQJN0uIN8UFuCdbYjTFoM8w8uo=";
|
||||
cargoHash = "sha256-wBTbHHCNZvp1xc6iiK6LzBFYsF9RPHA74YM6SDv6x94=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple tui to view & control docker containers";
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport);
|
|||
|
||||
gnuradio3_8Minimal.pkgs.mkDerivation rec {
|
||||
pname = "gqrx";
|
||||
version = "2.15.9";
|
||||
version = "2.15.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gqrx-sdr";
|
||||
repo = "gqrx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KQBtYVEfOXpzfxNMgTu6Hup7XpjubrpvZazcFlml4Kg=";
|
||||
hash = "sha256-oynon3bInIBZxGo2PjNY6jMGzJp82mqM2Yo9wI8fOjA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,16 +13,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "git-dive";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitext-rs";
|
||||
repo = "git-dive";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LOvrPId/GBWPq73hdCdaMNKH7K7cmGmlkepkQiwGC60=";
|
||||
hash = "sha256-sy2qNFn8JLE173HVWfFXBx21jcx4kpFMwi9a0m38lso=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JDybjIUjj9ivJ5hJJB9bvGB18TdwEXQZfKfXPkyopK0=";
|
||||
cargoHash = "sha256-Z3TgVunC/qNzUe0X9xIg3fTFXFk2w9yDA+EskSCg0Qo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
811
pkgs/applications/virtualization/pods/Cargo.lock
generated
811
pkgs/applications/virtualization/pods/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -17,20 +17,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pods";
|
||||
version = "1.0.6";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marhkb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZryzNlEj/2JTp5FJiDzXN9v1DvczfebqEOrJP+dKaRw=";
|
||||
sha256 = "sha256-BvSDFWmIQ55kbZtWybemZXT7lSDwxSCpPAsqwElZOBM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"containers-api-0.7.0" = "sha256-S6uDIjxFxHNqt1GK4Z+ZSTxjChNP1R5ASrO24/2oDi0=";
|
||||
"podman-api-0.8.0" = "sha256-Gq1xcqqQZPqQ3+VEyfbdiBxeiaYiluXIa6E0el/sUIo=";
|
||||
"podman-api-0.10.0-dev" = "sha256-6xpPdssfgXY5sDyZOzApaZPjzDLqq734UEl9FTkZyQQ=";
|
||||
"vte4-0.5.0" = "sha256-7yXIcvMNAAeyK57O5l42ndBI+Ij55KFwClhBeLM5Zlo=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -203,6 +203,10 @@ in {
|
|||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
# Needed for any nim package that uses the standard library's
|
||||
# 'std/sysrand' module.
|
||||
depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
|
||||
|
||||
patches = [
|
||||
./nim.cfg.patch
|
||||
# Remove configurations that clash with ours
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "maestro";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
|
||||
sha256 = "1ad5s5125hcqv3cf9zz0yyxcfck0jylppd1n5vpd4s2yshz0lqnj";
|
||||
sha256 = "1hq4y8qwnw6mb962g2cp7a5qp8x95p6268d34hjpx0i2h40s9vrk";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{ lib, buildDunePackage, fetchFromGitHub, ocamlPackages }:
|
||||
{ lib, buildDunePackage, fetchFromGitHub
|
||||
, menhir, menhirLib, ppx_deriving_yojson, visitors, yojson
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "morbig";
|
||||
|
|
@ -13,11 +15,11 @@ buildDunePackage rec {
|
|||
|
||||
duneVersion = "3";
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
nativeBuildInputs = [
|
||||
menhir
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with ocamlPackages; [
|
||||
propagatedBuildInputs = [
|
||||
menhirLib
|
||||
ppx_deriving_yojson
|
||||
visitors
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib
|
||||
, async-timeout
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
|
|
@ -8,17 +9,18 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx";
|
||||
version = "0.8.9";
|
||||
version = "0.8.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Ih82dNDZd3sbGHhxDTtzJQXkjn6Pgefb0S24gttiOO8=";
|
||||
hash = "sha256-NiNKFrWxpGkwbb7tFEDD5jZ6ETW20BBIqrdjCsL/DkY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
async-timeout
|
||||
bitstring
|
||||
ifaddr
|
||||
];
|
||||
|
|
@ -33,6 +35,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Module for local communication with LIFX devices over a LAN";
|
||||
homepage = "https://github.com/frawau/aiolifx";
|
||||
changelog = "https://github.com/frawau/aiolifx/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ netixx ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-homewizard-energy";
|
||||
version = "1.8.0";
|
||||
version = "2.0.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "DCSBL";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ab+Fa7Dc2mHGy5C5PfoBfXIb/eugCyGrWjTYlJmTQE0=";
|
||||
hash = "sha256-s3FNRpMZC/MG3s+ZDHgdsIT2AhvBDmGvJfutUPzY4wE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -48,6 +48,12 @@ stdenv.mkDerivation rec {
|
|||
"-DPYTHONOCC_WRAP_SMESH=TRUE"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
# `python3Packages.pythonocc-core` must be updated in tandem with
|
||||
# `opencascade-occt`, and including it in the bulk updates often breaks it.
|
||||
skipBulkUpdate = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python wrapper for the OpenCASCADE 3D modeling kernel";
|
||||
homepage = "https://github.com/tpaviot/pythonocc-core";
|
||||
|
|
|
|||
70
pkgs/development/python-modules/w1thermsensor/default.nix
Normal file
70
pkgs/development/python-modules/w1thermsensor/default.nix
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pkgs
|
||||
, setuptools
|
||||
, aiofiles
|
||||
, click
|
||||
, coverage
|
||||
, tomli
|
||||
, pytest
|
||||
, pytest-mock
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "w1thermsensor";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-EcaEr4B8icbwZu2Ty3z8AAgglf74iZ5BLpLnSOZC2cE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/3\.5\.\*/3.5/' setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiofiles
|
||||
click
|
||||
];
|
||||
|
||||
# Don't try to load the kernel module in tests.
|
||||
env.W1THERMSENSOR_NO_KERNEL_MODULE = 1;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
] ++ lib.optionals (pythonOlder "3.11") [
|
||||
tomli
|
||||
];
|
||||
|
||||
# Tests for 2.0.0 currently fail on python3.11
|
||||
# https://github.com/timofurrer/w1thermsensor/issues/116
|
||||
doCheck = pythonOlder "3.11";
|
||||
|
||||
pythonImportsCheck = [
|
||||
"w1thermsensor"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface to 1-Wire temperature sensors";
|
||||
longDescription = ''
|
||||
A Python package and CLI tool to work with w1 temperature sensors like
|
||||
DS1822, DS18S20 & DS18B20 on the Raspberry Pi, Beagle Bone and other
|
||||
devices.
|
||||
'';
|
||||
homepage = "https://github.com/timofurrer/w1thermsensor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ quentin ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +1,38 @@
|
|||
{ stdenv, lib, fetchFromBitbucket, p7zip, cmake
|
||||
, SDL2, bzip2, zlib, libjpeg
|
||||
, libsndfile, mpg123
|
||||
, SDL2_net, SDL2_mixer }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromBitbucket
|
||||
, p7zip
|
||||
, cmake
|
||||
, SDL2
|
||||
, bzip2
|
||||
, zlib
|
||||
, libjpeg
|
||||
, libsndfile
|
||||
, mpg123
|
||||
, pkg-config
|
||||
, SDL2_net
|
||||
, SDL2_mixer
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lzwolf";
|
||||
# Fix-Me: Remember to remove SDL2_mixer pin (at top-level) on next lzwolf upgrade.
|
||||
version = "unstable-2022-01-04";
|
||||
version = "unstable-2022-12-26";
|
||||
|
||||
src = fetchFromBitbucket {
|
||||
owner = "linuxwolf6";
|
||||
repo = "lzwolf";
|
||||
rev = "6e470316382b87378966f441e233760ce0ff478c";
|
||||
sha256 = "sha256-IbZleY2FPyW3ORIGO2YFXQyAf1l9nDthpJjEKTTsilM=";
|
||||
rev = "a24190604296e16941c601b57afe4350462fc659";
|
||||
sha256 = "sha256-CtBdvk6LXb/ll92Fxig/M4t4QNj8dNFJYd8F99b47kQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ p7zip cmake ];
|
||||
postPatch = ''
|
||||
# SDL2_net-2.2.0 changed CMake component name slightly.
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace 'SDL2::SDL2_net' 'SDL2_net::SDL2_net'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ p7zip pkg-config cmake ];
|
||||
buildInputs = [
|
||||
SDL2 bzip2 zlib libjpeg SDL2_mixer SDL2_net libsndfile mpg123
|
||||
];
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ let
|
|||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.2.9"; #zen
|
||||
version = "6.2.11"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "0s4s36pr1h6q0qnf0bnk6in3aah5yj0f29akf4ci9m3jndbwk7f2"; #zen
|
||||
sha256 = "0qf9fdmv0ffpq7lym4gbxlnaz8i05kxqb9b7m5k3vggc24xrwsmn"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.2.10"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "0lrpwn1s0mlh03wlx1gxqy68v84c2yaswd0fxwh28dqiy0sk8zgj"; #lqx
|
||||
version = "6.2.11"; #lqx
|
||||
suffix = "lqx3"; #lqx
|
||||
sha256 = "0lmjjpxxl31g33ynwwfj0s3q4vwgdqlyak80c67m72234w43a5xj"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2023.4.3";
|
||||
version = "2023.4.4";
|
||||
components = {
|
||||
"3_day_blinds" = ps: with ps; [
|
||||
];
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ let
|
|||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2023.4.3";
|
||||
hassVersion = "2023.4.4";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
|
|
@ -326,7 +326,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
# Primary source is the pypi sdist, because it contains translations
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L99fwGHjSHaE4ba9zA5wL0Zd7kTZsZLefjLMrvOgymw=";
|
||||
hash = "sha256-96Fjf8FOXxpdt+7QC54Q1UzyhkRFZm11xsNXUkg/D+U=";
|
||||
};
|
||||
|
||||
# Secondary source is git for tests
|
||||
|
|
@ -334,7 +334,7 @@ in python.pkgs.buildPythonApplication rec {
|
|||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-X7qZfehUSOOlW5d6pZDLnx7Qs+U+kw/6Cs6oiJle5qY=";
|
||||
hash = "sha256-ATchEqxVkzUDdRbVxW5YRS9T8WgIGPcdlsjCXXxeWoU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -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 = "20230411.0";
|
||||
version = "20230411.1";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
|
|
@ -12,7 +12,7 @@ buildPythonPackage rec {
|
|||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-OCNOIFB4BmpEviOiXz39wE8cJ/gcVOOCYF5r8ZiG6o0=";
|
||||
hash = "sha256-SV1SglO9XqkxfUD/jUyFgdJIWgKgnPNNQR94MHTYew0=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ from typing import Any, Dict, List, Optional, Set
|
|||
from urllib.request import urlopen
|
||||
|
||||
from packaging import version as Version
|
||||
from packaging.version import InvalidVersion
|
||||
from rich.console import Console
|
||||
from rich.table import Table
|
||||
|
||||
|
|
@ -197,6 +198,8 @@ def main() -> None:
|
|||
# Therefore, if there's a "#" in the line, only take the part after it
|
||||
req = req[req.find("#") + 1 :]
|
||||
name, required_version = req.split("==", maxsplit=1)
|
||||
# Strip conditions off version constraints e.g. "1.0; python<3.11"
|
||||
required_version = required_version.split(";").pop(0)
|
||||
# Split package name and extra requires
|
||||
extras = []
|
||||
if name.endswith("]"):
|
||||
|
|
@ -206,11 +209,20 @@ def main() -> None:
|
|||
if attr_path:
|
||||
if our_version := get_pkg_version(attr_path, packages):
|
||||
attr_name = attr_path.split(".")[-1]
|
||||
if Version.parse(our_version) < Version.parse(required_version):
|
||||
outdated[attr_name] = {
|
||||
'wanted': required_version,
|
||||
'current': our_version
|
||||
}
|
||||
attr_outdated = False
|
||||
try:
|
||||
Version.parse(our_version)
|
||||
except InvalidVersion:
|
||||
print(f"Attribute {attr_name} has invalid version specifier {our_version}", file=sys.stderr)
|
||||
attr_outdated = True
|
||||
else:
|
||||
attr_outdated = Version.parse(our_version) < Version.parse(required_version)
|
||||
finally:
|
||||
if attr_outdated:
|
||||
outdated[attr_name] = {
|
||||
'wanted': required_version,
|
||||
'current': our_version
|
||||
}
|
||||
if attr_path is not None:
|
||||
# Add attribute path without "python3Packages." prefix
|
||||
pname = attr_path[len(PKG_SET + "."):]
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2023.4.2";
|
||||
version = "2023.4.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-FzcgGyYtmU8owlvUfP/D+Y6m5QwOWj4njoLTZX6skLE=";
|
||||
hash = "sha256-ycyRLt8L3OnfnT1ZoO5wJAhJljnXClh1V343rPVeZHU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
}:
|
||||
buildGoModule rec {
|
||||
pname = "chatgpt";
|
||||
version = "1.1";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j178";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HhpllMpr9VvtpaFMDPPQpJLyyJhKI4uWQswsFLrMhos=";
|
||||
hash = "sha256-sGcVtppw1q05ICcYyRcF2gpFCzbBftaxAM4X4/k48as=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QsK2ghfmhqSDCPiQz0/bdGJvxijDGSi4kAG6f8hJyrg=";
|
||||
vendorHash = "sha256-lD9G8N1BpWda2FAi80qzvdiQXoJIWl529THYMfQmXtg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,16 +5,15 @@
|
|||
, installShellFiles
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "1.17.0";
|
||||
version = "1.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OaTt6pFIfPYbonl2M1NBL6ET1XOt1Xe94zOCsEtJuGI=";
|
||||
sha256 = "sha256-n9u44V1sMQJ1clc8zljuKAl6S1adHvrYHtHboRNYfWg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KNHi8lSsya/vbpsWbr7un3bKsb6GcyhkrTurRhczxns=";
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ramfetch";
|
||||
version = "1.1.0";
|
||||
version = "1.1.0a";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://codeberg.org/o69mar/ramfetch.git";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XUph+rTbw5LXWRq+OSKl0EjFac+MQAx3NBu4rWdWR3w=";
|
||||
url = "https://codeberg.org/jahway603/ramfetch.git";
|
||||
rev = version;
|
||||
hash = "sha256-sUreZ6zm+a1N77OZszjnpS4mmo5wL1dhNGVldJCGoag=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "A tool which displays memory information";
|
||||
homepage = "https://codeberg.org/o69mar/ramfetch";
|
||||
homepage = "https://codeberg.org/jahway603/ramfetch";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.markbeep ];
|
||||
|
|
|
|||
54
pkgs/tools/security/doas-sudo-shim/default.nix
Normal file
54
pkgs/tools/security/doas-sudo-shim/default.nix
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, asciidoctor
|
||||
, coreutils
|
||||
, gawk
|
||||
, glibc
|
||||
, util-linux
|
||||
, bash
|
||||
, makeBinaryWrapper
|
||||
, doas-sudo-shim
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "doas-sudo-shim";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jirutka";
|
||||
repo = "doas-sudo-shim";
|
||||
rev = "v${version}";
|
||||
sha256 = "QYVqGxeWC7Tiz8aNY/LukwG4EW0km/RunGEfkzY/A38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ asciidoctor makeBinaryWrapper ];
|
||||
buildInputs = [ bash coreutils gawk glibc util-linux ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "PREFIX=\"\"" ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/sudo \
|
||||
--prefix PATH : ${lib.makeBinPath [ bash coreutils gawk glibc util-linux ]}
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
helpTest = runCommand "${pname}-helpTest" {} ''
|
||||
${doas-sudo-shim}/bin/sudo -h > $out
|
||||
grep -q "Execute a command as another user using doas(1)" $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A shim for the sudo command that utilizes doas";
|
||||
homepage = "https://github.com/jirutka/doas-sudo-shim";
|
||||
license = licenses.isc;
|
||||
mainProgram = "sudo";
|
||||
maintainers = with maintainers; [ dsuetin ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
68
pkgs/tools/typesetting/ps2eps/default.nix
Normal file
68
pkgs/tools/typesetting/ps2eps/default.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, perlPackages
|
||||
, substituteAll
|
||||
, ghostscript
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "ps2eps";
|
||||
version = "1.70";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "roland-bless";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SPLwsGKLVhANoqSQ/GJ938cYjbjMbUOXkNn9so3aJTA=";
|
||||
};
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./hardcode-deps.patch;
|
||||
gs = "${ghostscript}/bin/gs";
|
||||
# bbox cannot be substituted here because substituteAll doesn't know what
|
||||
# will be the $out path of the main derivation
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
configurePhase = "true";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
make -C src/C bbox
|
||||
patchShebangs src/perl/ps2eps
|
||||
substituteInPlace src/perl/ps2eps \
|
||||
--replace @bbox@ $out/bin/bbox
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# Override buildPerlPackage's outputs setting
|
||||
outputs = ["out" "man"];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
installManPage \
|
||||
doc/ps2eps.1 \
|
||||
doc/bbox.1
|
||||
|
||||
install -D src/perl/ps2eps $out/bin/ps2eps
|
||||
install -D src/C/bbox $out/bin/bbox
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Calculate correct bounding boxes for PostScript and PDF files";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers.doronbehar ];
|
||||
};
|
||||
}
|
||||
26
pkgs/tools/typesetting/ps2eps/hardcode-deps.patch
Normal file
26
pkgs/tools/typesetting/ps2eps/hardcode-deps.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git i/src/perl/ps2eps w/src/perl/ps2eps
|
||||
index 1122a81..31d6a9a 100755
|
||||
--- i/src/perl/ps2eps
|
||||
+++ w/src/perl/ps2eps
|
||||
@@ -43,19 +43,13 @@ Getopt::Long::Configure("no_ignore_case");
|
||||
|
||||
$prgname= "ps2eps";
|
||||
|
||||
-if (! -d "/usr/bin")
|
||||
-{ # we assume that we are running under native windows
|
||||
- $ghostscriptname = "gswin32c";
|
||||
- $NULLDEV = "nul";
|
||||
-}
|
||||
-else
|
||||
{ # Unix or cygwin
|
||||
- $ghostscriptname = "gs";
|
||||
+ $ghostscriptname = "@gs@";
|
||||
$NULLDEV = "/dev/null 2>&1";
|
||||
}
|
||||
|
||||
$bboxver=`bbox >$NULLDEV -V`;
|
||||
-$bboxname= ($?== -1) ? "" : "bbox";
|
||||
+$bboxname= ($?== -1) ? "" : "@bbox@";
|
||||
$version= '$Id: ps2eps,v 1.70 2018-01-09 18:00:00 bless Exp $'; #'
|
||||
$insertPScode= 1; # Insert surrounding Postscript code
|
||||
$infhandle = STDIN; # Standard input is the default input file
|
||||
|
|
@ -187,9 +187,9 @@ let
|
|||
let
|
||||
# a TeX package is an attribute set { pkgs = [ ... ]; ... } where pkgs is a list of derivations
|
||||
# the derivations make up the TeX package and optionally (for backward compatibility) its dependencies
|
||||
tlPkgToSets = { pkgs, ... }: map ({ pname, tlType, version, outputName ? "", ... }@pkg: {
|
||||
tlPkgToSets = { pkgs, ... }: map ({ tlType, version ? "", outputName ? "", ... }@pkg: {
|
||||
# outputName required to distinguish among bin.core-big outputs
|
||||
key = "${pname}.${tlType}-${version}-${outputName}";
|
||||
key = "${pkg.pname or pkg.name}.${tlType}-${version}-${outputName}";
|
||||
inherit pkg;
|
||||
}) pkgs;
|
||||
pkgListToSets = lib.concatMap tlPkgToSets; in
|
||||
|
|
|
|||
|
|
@ -2371,7 +2371,7 @@ with pkgs;
|
|||
### APPLICATIONS/EMULATORS/DOLPHIN-EMU
|
||||
|
||||
dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox;
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox;
|
||||
inherit (darwin) moltenvk;
|
||||
stdenv =
|
||||
if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.stdenv
|
||||
|
|
@ -6778,6 +6778,8 @@ with pkgs;
|
|||
|
||||
doas = callPackage ../tools/security/doas { };
|
||||
|
||||
doas-sudo-shim = callPackage ../tools/security/doas-sudo-shim { };
|
||||
|
||||
docbook2x = callPackage ../tools/typesetting/docbook2x { };
|
||||
|
||||
docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
|
||||
|
|
@ -33089,6 +33091,8 @@ with pkgs;
|
|||
|
||||
ps2client = callPackage ../applications/networking/ps2client { };
|
||||
|
||||
ps2eps = callPackage ../tools/typesetting/ps2eps { };
|
||||
|
||||
psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
|
||||
|
||||
psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };
|
||||
|
|
|
|||
|
|
@ -12489,6 +12489,8 @@ self: super: with self; {
|
|||
|
||||
vyper = callPackage ../development/compilers/vyper { };
|
||||
|
||||
w1thermsensor = callPackage ../development/python-modules/w1thermsensor { };
|
||||
|
||||
w3lib = callPackage ../development/python-modules/w3lib { };
|
||||
|
||||
wadllib = callPackage ../development/python-modules/wadllib { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue