Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ce14b50f1c
43
nixos/modules/hardware/i2c.nix
Normal file
43
nixos/modules/hardware/i2c.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.hardware.i2c;
|
||||
in
|
||||
|
||||
{
|
||||
options.hardware.i2c = {
|
||||
enable = mkEnableOption ''
|
||||
i2c devices support. By default access is granted to users in the "i2c"
|
||||
group (will be created if non-existent) and any user with a seat, meaning
|
||||
logged on the computer locally.
|
||||
'';
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "i2c";
|
||||
description = ''
|
||||
Grant access to i2c devices (/dev/i2c-*) to users in this group.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
boot.kernelModules = [ "i2c-dev" ];
|
||||
|
||||
users.groups = mkIf (cfg.group == "i2c") {
|
||||
i2c = { };
|
||||
};
|
||||
|
||||
services.udev.extraRules = ''
|
||||
# allow group ${cfg.group} and users with a seat use of i2c devices
|
||||
ACTION=="add", KERNEL=="i2c-[0-9]*", TAG+="uaccess", GROUP="${cfg.group}", MODE="660"
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = [ maintainers.rnhmjoj ];
|
||||
|
||||
}
|
||||
|
|
@ -46,6 +46,7 @@
|
|||
./hardware/cpu/intel-microcode.nix
|
||||
./hardware/digitalbitbox.nix
|
||||
./hardware/device-tree.nix
|
||||
./hardware/i2c.nix
|
||||
./hardware/sensor/hddtemp.nix
|
||||
./hardware/sensor/iio.nix
|
||||
./hardware/keyboard/zsa.nix
|
||||
|
|
|
|||
|
|
@ -1,26 +1,17 @@
|
|||
{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl
|
||||
, speex, flac }:
|
||||
{ lib, stdenv, fetchurl, libogg, libvorbis, libao, pkg-config, curl
|
||||
, speex, flac
|
||||
, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vorbis-tools";
|
||||
version = "1.4.2";
|
||||
|
||||
let
|
||||
debPatch = fetchzip {
|
||||
url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz";
|
||||
sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "vorbis-tools-1.4.0";
|
||||
src = fetchurl {
|
||||
url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz";
|
||||
sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3";
|
||||
url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz";
|
||||
sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir)
|
||||
do patch -p1 < "$patch"
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ libogg libvorbis libao curl speex flac ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -110,5 +110,6 @@ python36Packages.buildPythonApplication rec {
|
|||
homepage = "http://multibootusb.org/";
|
||||
license = licenses.gpl2;
|
||||
maintainers = []; # Looking for a maintainer!
|
||||
broken = true; # "name 'config' is not defined", added 2021-02-06
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,17 +16,18 @@
|
|||
, json-glib
|
||||
, glib
|
||||
, glib-networking
|
||||
, libhandy
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tootle";
|
||||
version = "0.2.0";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bleakgrey";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi";
|
||||
sha256 = "NRM7GiJA8c5z9AvXpGXtMl4ZaYN2GauEIbjBmoY4pdo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -47,15 +48,7 @@ stdenv.mkDerivation rec {
|
|||
json-glib
|
||||
libgee
|
||||
pantheon.granite
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix build with Vala 0.46
|
||||
# https://github.com/bleakgrey/tootle/pull/164
|
||||
(fetchpatch {
|
||||
url = "https://github.com/worldofpeace/tootle/commit/0a88bdad6d969ead1e4058b1a19675c9d6857b16.patch";
|
||||
sha256 = "0xyx00pgswnhxxbsxngsm6khvlbfcl6ic5wv5n64x7klk8rzh6cm";
|
||||
})
|
||||
libhandy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "databricks-connect";
|
||||
version = "7.3.7";
|
||||
version = "7.3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "35ead50a0550e65a7d6fd78e2c8e54095b53514fba85180768a2dbcdd3f2cf0b";
|
||||
sha256 = "0c0f036cf30e00fdc47c983875c72d16a3073ae9be9bcf39371514280f00a82d";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "rx";
|
||||
version = "3.1.0";
|
||||
version = "3.1.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
# There are no tests on the pypi source
|
||||
|
|
@ -10,7 +10,7 @@ buildPythonPackage rec {
|
|||
owner = "ReactiveX";
|
||||
repo = "rxpy";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rcwa8001il9p7s096b9gc5yld8cyxvrsmwh1gpc9b87j172z6ax";
|
||||
sha256 = "0p0cs67l40npkvwgn5sb18l1b6df1b9fg6rzlqkwk2aa0v3cpvhf";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.143.1";
|
||||
version = "0.144.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-x7+hLbfccyJLc84246R8xay0FJlK/3JgNc6pqeowl9Q=";
|
||||
sha256 = "sha256-Qr/fizCV+t6SbETEqns72Xv24ucLcqi1JRXF8SAtQRU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-generate";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashleygwilliams";
|
||||
repo = "cargo-generate";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rq0anz0cawrgsinqyjh8wb3dgha09wx3ydrd3m9nfxs5dd3ij3k";
|
||||
sha256 = "sha256-/tZUYJaNvJ7H3xAc9ygcJD6meK1Em87VYqqYqY1l4zE=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld";
|
||||
cargoSha256 = "sha256-/6nr+UNQPa8+cEnAMgyjuCV1JjfqXcNLfuqi4/kgmk0=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pg_tileserv";
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CrunchyData";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-62cJ0j/UfPW/ujKr0iA7Be8wZYlZ68mpJX8v1tAVREc=";
|
||||
sha256 = "sha256-6KFYTZq126uvxQ5IOrMN+hpnAk/WtmS1Dam7w6Oif1M=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E=";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gifski";
|
||||
version = "1.3.1";
|
||||
version = "1.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageOptim";
|
||||
repo = "gifski";
|
||||
rev = version;
|
||||
sha256 = "sha256-sB8W5n3FvRAB9ygFg63NecSZgUw8FGk4pzviIbRF2vk=";
|
||||
sha256 = "sha256-dBgDIS6U2iKzyo5nO0NOD488zfEbaZJH7luJN6khrnc=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-0cFk1GnEJxMfY9GvQTdI5tkgtxGkH3ZQFTloo4/C+sY=";
|
||||
cargoSha256 = "sha256-/i5ZBCWFlhoheHsCI5f9yJ7sa6l/DB4AJckq5orinwI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,64 +1,58 @@
|
|||
{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, python36
|
||||
, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase
|
||||
, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core
|
||||
, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre
|
||||
, bison, flex, libpthreadstubs, libX11
|
||||
, embree2, makeWrapper, gsettings-desktop-schemas, glib
|
||||
, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp, rocm-opencl-runtime
|
||||
}:
|
||||
{ lib, config, stdenv, fetchFromGitHub, symlinkJoin, wrapGAppsHook, cmake, boost172
|
||||
, pkg-config, flex, bison, libpng, libtiff, zlib, python3, embree, openexr
|
||||
, openimagedenoise, openimageio, tbb, c-blosc, gtk3, pcre, doxygen
|
||||
# OpenCL Support
|
||||
, withOpenCL ? true, ocl-icd
|
||||
# Cuda Support
|
||||
, withCuda ? config.cudaSupport or false, cudatoolkit }:
|
||||
|
||||
let
|
||||
python = python36;
|
||||
boostWithPython = boost172.override {
|
||||
enablePython = true;
|
||||
enableNumpy = true;
|
||||
python = python3;
|
||||
};
|
||||
|
||||
boost_static = boost165.override {
|
||||
inherit python;
|
||||
enableStatic = true;
|
||||
enablePython = true;
|
||||
};
|
||||
# Requires a version number like "<MAJOR><MINOR>"
|
||||
pythonVersion = (lib.versions.major python3.version)
|
||||
+ (lib.versions.minor python3.version);
|
||||
|
||||
version = "2.0";
|
||||
sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "luxcorerender";
|
||||
inherit version;
|
||||
version = "2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LuxCoreRender";
|
||||
repo = "LuxCore";
|
||||
rev = "luxcorerender_v${version}";
|
||||
inherit sha256;
|
||||
sha256 = "0xvivw79719fa1q762b76nyvzawfd3hmp8y5j04bax8a7f8mfa9k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison doxygen makeWrapper pkg-config ];
|
||||
buildInputs = [
|
||||
embree2 zlib boost_static libjpeg
|
||||
libtiff libpng ilmbase freetype openexr openimageio
|
||||
tbb qt5.full c-blosc libGLU pcre
|
||||
libX11 libpthreadstubs python libXdmcp libxkbcommon
|
||||
epoxy at-spi2-core dbus
|
||||
# needed for GSETTINGS_SCHEMAS_PATH
|
||||
gsettings-desktop-schemas glib gtk3
|
||||
# needed for XDG_ICON_DIRS
|
||||
gnome3.adwaita-icon-theme
|
||||
(lib.getLib dconf)
|
||||
] ++ lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ];
|
||||
nativeBuildInputs = [ pkg-config cmake flex bison doxygen wrapGAppsHook ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
|
||||
"-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR"
|
||||
"-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR"
|
||||
"-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include"
|
||||
"-DPYTHON_LIBRARY=${python}/lib/libpython3.so"
|
||||
"-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}"
|
||||
"-DEMBREE_INCLUDE_PATH=${embree2}/include"
|
||||
"-DEMBREE_LIBRARY=${embree2}/lib/libembree.so"
|
||||
"-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so"
|
||||
] ++ lib.optional withOpenCL
|
||||
"-DOPENCL_INCLUDE_DIR=${opencl-headers}/include";
|
||||
buildInputs = [
|
||||
libpng
|
||||
libtiff
|
||||
zlib
|
||||
boostWithPython.dev
|
||||
python3
|
||||
embree
|
||||
openexr
|
||||
openimagedenoise
|
||||
tbb
|
||||
c-blosc
|
||||
gtk3
|
||||
pcre
|
||||
openimageio.dev
|
||||
openimageio.out
|
||||
] ++ lib.optionals withOpenCL [ ocl-icd ]
|
||||
++ lib.optionals withCuda [ cudatoolkit ];
|
||||
|
||||
cmakeFlags = [ "-DPYTHON_V=${pythonVersion}" ]
|
||||
++ lib.optional (!withOpenCL) "-DLUXRAYS_DISABLE_OPENCL=1"
|
||||
++ lib.optional (!withCuda) "-DLUXRAYS_DISABLE_CUDA=1";
|
||||
|
||||
preConfigure = ''
|
||||
NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}"
|
||||
NIX_LDFLAGS+=" -lpython3"
|
||||
'';
|
||||
|
||||
|
|
@ -69,13 +63,6 @@ in stdenv.mkDerivation {
|
|||
cp -va lib/* $out/lib
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/luxcoreui" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \
|
||||
--prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open source, physically based, unbiased rendering engine";
|
||||
homepage = "https://luxcorerender.org/";
|
||||
|
|
@ -85,7 +72,6 @@ in stdenv.mkDerivation {
|
|||
};
|
||||
}
|
||||
|
||||
|
||||
# TODO (might not be necessary):
|
||||
#
|
||||
# luxcoreui still gives warnings like: "failed to commit changes to
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "phoronix-test-suite";
|
||||
version = "10.2.0";
|
||||
version = "10.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-eoKHgbSyOEkwzki5wWuZlOAmZljxOMXcztA/g8TtutQ=";
|
||||
sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg=";
|
||||
};
|
||||
|
||||
buildInputs = [ php ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gotop";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xxxserxxx";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "09cs97fjjxcjxzsl2kh8j607cs5zy2hnrh1pb21pggzhg7dzsz0w";
|
||||
sha256 = "sha256-3t6I4ah9gUmPlIBRL86BdgiUaMNiKNEeoUSRMASz1Yc=";
|
||||
};
|
||||
|
||||
runVend = true;
|
||||
vendorSha256 = "1mbjl7b49naaqkr2j658j17z9ryf5g3x6q34gvmrm7n9y082ggnz";
|
||||
vendorSha256 = "sha256-GcIaUIuTiSY1aKxRtclfl7hMNaZZx4uoVG7ahjF/4Hs=";
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
|
|
|
|||
|
|
@ -6052,7 +6052,7 @@ in
|
|||
|
||||
lzip = callPackage ../tools/compression/lzip { };
|
||||
|
||||
luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; };
|
||||
luxcorerender = callPackage ../tools/graphics/luxcorerender { };
|
||||
|
||||
xz = callPackage ../tools/compression/xz { };
|
||||
lzma = xz; # TODO: move to aliases.nix
|
||||
|
|
@ -25529,7 +25529,9 @@ in
|
|||
|
||||
volnoti = callPackage ../applications/misc/volnoti { };
|
||||
|
||||
vorbis-tools = callPackage ../applications/audio/vorbis-tools { };
|
||||
vorbis-tools = callPackage ../applications/audio/vorbis-tools {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
vscode = callPackage ../applications/editors/vscode/vscode.nix { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue