Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
8d01406a44
@ -51,9 +51,10 @@ in
|
||||
(isYes "KALLSYMS_ALL")
|
||||
];
|
||||
|
||||
boot.initrd.extraUdevRulesCommands = ''
|
||||
boot.initrd.extraUdevRulesCommands = mkIf (!config.boot.initrd.systemd.enable) ''
|
||||
cp -v ${package}/etc/udev/rules.d/*.rules $out/
|
||||
'';
|
||||
boot.initrd.services.udev.packages = [ package ];
|
||||
|
||||
environment.systemPackages =
|
||||
[ package.vulkan ] ++
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
with haskellPackages; mkDerivation {
|
||||
pname = "Naproche-SAD";
|
||||
version = "0.1.0.0";
|
||||
version = "2022-04-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "naproche";
|
||||
repo = "naproche";
|
||||
rev = "d39cea85ace04d5b3775fde9972a33886799bfe6";
|
||||
sha256 = "1zqrldmxkzbyg9bssrbwb00zic29904igcipaz1m9al0456yjnkf";
|
||||
rev = "2514c04e715395b7a839e11b63046eafb9c6a1da";
|
||||
sha256 = "1bdgyk4fk65xi7n778rbgddpg4zhggj8wjslxbizrzi81my9a3vm";
|
||||
};
|
||||
|
||||
isExecutable = true;
|
||||
|
||||
@ -144,6 +144,7 @@ runCommand
|
||||
find $pkg -name "*-autoloads.el" \
|
||||
-exec echo \(load \"{}\" \'noerror \'nomessage\) \; >> $siteAutoloads
|
||||
done
|
||||
echo "(provide 'nix-generated-autoload)" >> $siteAutoloads
|
||||
|
||||
siteStart="$out/share/emacs/site-lisp/site-start.el"
|
||||
siteStartByteCompiled="$siteStart"c
|
||||
@ -196,12 +197,18 @@ runCommand
|
||||
# Wrap emacs and friends so they find our site-start.el before the original.
|
||||
for prog in $emacs/bin/*; do # */
|
||||
local progname=$(basename "$prog")
|
||||
local autoloadExpression=""
|
||||
rm -f "$out/bin/$progname"
|
||||
if [[ $progname == emacs ]]; then
|
||||
# progs other than "emacs" do not understand the `-l` switches
|
||||
autoloadExpression="-l cl-loaddefs -l nix-generated-autoload"
|
||||
fi
|
||||
|
||||
substitute ${./wrapper.sh} $out/bin/$progname \
|
||||
--subst-var-by bash ${emacs.stdenv.shell} \
|
||||
--subst-var-by wrapperSiteLisp "$deps/share/emacs/site-lisp" \
|
||||
--subst-var-by wrapperSiteLispNative "$deps/share/emacs/native-lisp:" \
|
||||
--subst-var autoloadExpression \
|
||||
--subst-var prog
|
||||
chmod +x $out/bin/$progname
|
||||
done
|
||||
|
||||
@ -44,4 +44,4 @@ export emacsWithPackages_siteLisp=@wrapperSiteLisp@
|
||||
export EMACSNATIVELOADPATH="${newNativeLoadPath[*]}"
|
||||
export emacsWithPackages_siteLispNative=@wrapperSiteLispNative@
|
||||
|
||||
exec @prog@ -l cl-loaddefs -l nix-generated-autoload "$@"
|
||||
exec @prog@ @autoloadExpression@ "$@"
|
||||
|
||||
@ -163,7 +163,7 @@ convertIconTheme() {
|
||||
}
|
||||
|
||||
iconsdir=$(getIcons "$sharePath" "apps/${iconName}" "$theme")
|
||||
if [[ -n "$(ls -1 "$iconsdir/"*)" ]]; then
|
||||
if [[ -n "$(ls -A1 "$iconsdir")" ]]; then
|
||||
icnsutil compose --toc "$out/${iconName}.icns" "$iconsdir/"*
|
||||
else
|
||||
echo "Warning: no icons were found. Creating an empty icon for ${iconName}.icns."
|
||||
@ -171,12 +171,32 @@ convertIconTheme() {
|
||||
fi
|
||||
}
|
||||
|
||||
processExecFieldCodes() {
|
||||
local -r file=$1
|
||||
local -r execRaw=$(getDesktopParam "${file}" "Exec")
|
||||
local -r execNoK="${execRaw/\%k/${file}}"
|
||||
local -r execNoKC="${execNoK/\%c/$(getDesktopParam "${file}" "Name")}"
|
||||
local -r icon=$(getDesktopParam "${file}" "Icon")
|
||||
local -r execNoKCI="${execNoKC/\%i/${icon:+--icon }${icon}}"
|
||||
local -r execNoKCIfu="${execNoKCI/\%[fu]/\$1}"
|
||||
local -r exec="${execNoKCIfu/\%[FU]/\$@}"
|
||||
if [[ "$exec" != "$execRaw" ]]; then
|
||||
echo 1>&2 "desktopToDarwinBundle: Application bundles do not understand desktop entry field codes. Changed '$execRaw' to '$exec'."
|
||||
fi
|
||||
echo "$exec"
|
||||
}
|
||||
|
||||
# For a given .desktop file, generate a darwin '.app' bundle for it.
|
||||
convertDesktopFile() {
|
||||
local -r file=$1
|
||||
local -r sharePath=$(dirname "$(dirname "$file")")
|
||||
local -r name=$(getDesktopParam "${file}" "^Name")
|
||||
local -r exec=$(getDesktopParam "${file}" "Exec")
|
||||
local -r macOSExec=$(getDesktopParam "${file}" "X-macOS-Exec")
|
||||
if [[ "$macOSExec" ]]; then
|
||||
local -r exec="$macOSExec"
|
||||
else
|
||||
local -r exec=$(processExecFieldCodes "${file}")
|
||||
fi
|
||||
local -r iconName=$(getDesktopParam "${file}" "^Icon")
|
||||
local -r squircle=$(getDesktopParam "${file}" "X-macOS-SquircleIcon")
|
||||
|
||||
|
||||
@ -4,18 +4,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unifont";
|
||||
version = "14.0.02";
|
||||
version = "14.0.03";
|
||||
|
||||
ttf = fetchurl {
|
||||
# Unfortunately the 14.0.02 TTF file is not available on the GNU mirror.
|
||||
# Restore this for next version: "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
|
||||
url = "https://unifoundry.com/pub/unifont/${pname}-${version}/font-builds/${pname}-${version}.ttf";
|
||||
sha256 = "1c8rdk3xg6j8lrzxddd73jppfgpk253jdkch63rr7n2d7ljp9gc3";
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
|
||||
sha256 = "1qyc7nqyhjnarwgpkah52qv7hr0yfzak7084ilrj7z0nii4f5y57";
|
||||
};
|
||||
|
||||
pcf = fetchurl {
|
||||
url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
|
||||
sha256 = "0hcl1zihm91xwvh5ds01sybgs0j8zsrrhn4wlz5j6ji99rh797jr";
|
||||
sha256 = "1sgvxpr4ydjnbk70j0lpgxz5x851lmrmxjb5x8lsz0i2hm32jdbc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, fetchzip }:
|
||||
|
||||
let
|
||||
version = "14.0.02";
|
||||
version = "14.0.03";
|
||||
in fetchzip rec {
|
||||
name = "unifont_upper-${version}";
|
||||
|
||||
@ -9,7 +9,7 @@ in fetchzip rec {
|
||||
|
||||
postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf";
|
||||
|
||||
sha256 = "0p1c2kkg20jqddy828yj6sxfwgv8k5gxwmg0cybalrjb0s09kcs8";
|
||||
sha256 = "1lwx7syb9ij4dlqiiybp6xgvar2sszxphvaqh64vivzj9gp0g0ai";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane";
|
||||
|
||||
@ -6,10 +6,13 @@ with lib; mkCoqDerivation {
|
||||
owner = "uwplse";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.7" "8.15"; out = "20211026"; }
|
||||
{ case = range "8.7" "8.14"; out = "20210524"; }
|
||||
{ case = range "8.7" "8.13"; out = "20200131"; }
|
||||
{ case = "8.6"; out = "20181102"; }
|
||||
] null;
|
||||
release."20211026".rev = "064cc4fb2347453bf695776ed820ffb5fbc1d804";
|
||||
release."20211026".sha256 = "sha256:13xrcyzay5sjszf5lg4s44wl9nrcz22n6gi4h95pkpj0ni5clinx";
|
||||
release."20210524".rev = "54597d8ac7ab7dd4dae683f651237644bf77701e";
|
||||
release."20210524".sha256 = "sha256:05wb0km2jkhvi8807glxk9fi1kll4lwisiyzkxhqvymz4x6v8xqv";
|
||||
release."20200131".rev = "fdb4ede19d2150c254f0ebcfbed4fb9547a734b0";
|
||||
|
||||
@ -13,6 +13,10 @@
|
||||
version = "2.15.1";
|
||||
in
|
||||
{
|
||||
"${version}-aarch64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";
|
||||
sha256 = "sha256-DDE4DpA2m8wKkUZuQDn4NpXVvtaJ6sIHeKNjk3RbpYE=";
|
||||
};
|
||||
"${version}-x86_64-darwin" = fetchurl {
|
||||
url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${x86_64}-release.zip";
|
||||
sha256 = "sha256-s6bkwh2m5KdRr/WxWXwItO9YaDpp/HI3xjnS2UHmN+I=";
|
||||
@ -47,6 +51,7 @@ stdenv.mkDerivation {
|
||||
mkdir -p $out
|
||||
cp -R * $out/
|
||||
echo $libPath
|
||||
'' + lib.optionalString(stdenv.isLinux) ''
|
||||
find $out/bin -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
|
||||
'';
|
||||
|
||||
@ -63,7 +68,7 @@ stdenv.mkDerivation {
|
||||
with C-style syntax. It offers compilation to JavaScript, interfaces,
|
||||
mixins, abstract classes, reified generics, and optional typing.
|
||||
'';
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ self, callPackage, lib }:
|
||||
callPackage ./default.nix {
|
||||
inherit self;
|
||||
version = "2.0.5-2021-10-02";
|
||||
rev = "d3294fa63b344173db68dd612c6d3801631e28d4";
|
||||
version = "2.0.5-2022-03-13";
|
||||
rev = "93a65d3cc263aef2d2feb3d7ff2206aca3bee17e";
|
||||
isStable = true;
|
||||
sha256 = "0ja6x7bv3iqnf6m8xk6qp1dgan2b7mys0ff86dw671fqqrfw28fn";
|
||||
hash = "sha256-Gp7OdfxBGkW59zxWUml2ugPABLUv2SezMiDblA/FZ7g=";
|
||||
extraMeta = { # this isn't precise but it at least stops the useless Hydra build
|
||||
platforms = with lib; filter (p: !hasPrefix "aarch64-" p)
|
||||
(platforms.linux ++ platforms.darwin);
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ self, callPackage }:
|
||||
callPackage ./default.nix {
|
||||
inherit self;
|
||||
version = "2.1.0-2021-10-27";
|
||||
rev = "b4b2dce9fc3ffaaaede39b36d06415311e2aa516";
|
||||
version = "2.1.0-2022-04-05";
|
||||
rev = "5e3c45c43bb0e0f1f2917d432e9d2dba12c42a6e";
|
||||
isStable = false;
|
||||
sha256 = "185s071aa0yffz8npgdxj7l98cs987vddb2l5pzfcdqfj41gn55q";
|
||||
hash = "sha256-Q+34hJDgyCqmtThHbxR16Nn7zhq4Ql142No2rO57HL0=";
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
, buildPackages
|
||||
, name ? "luajit-${version}"
|
||||
, isStable
|
||||
, sha256
|
||||
, hash
|
||||
, rev
|
||||
, version
|
||||
, extraMeta ? { }
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "LuaJIT";
|
||||
repo = "LuaJIT";
|
||||
inherit sha256 rev;
|
||||
inherit hash rev;
|
||||
};
|
||||
|
||||
luaversion = "5.1";
|
||||
|
||||
@ -1,7 +1,19 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, curl, openssl, s2n-tls, zlib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, curl
|
||||
, openssl
|
||||
, s2n-tls
|
||||
, zlib
|
||||
, aws-crt-cpp
|
||||
, aws-c-cal, aws-c-common, aws-c-event-stream, aws-c-io, aws-checksums
|
||||
, CoreAudio, AudioToolbox
|
||||
, aws-c-cal
|
||||
, aws-c-common
|
||||
, aws-c-event-stream
|
||||
, aws-c-io
|
||||
, aws-checksums
|
||||
, CoreAudio
|
||||
, AudioToolbox
|
||||
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
|
||||
apis ? ["*"]
|
||||
, # Whether to enable AWS' custom memory management.
|
||||
@ -18,16 +30,31 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aws-sdk-cpp";
|
||||
version = "1.9.150";
|
||||
version = "1.9.238";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "sha256-fgLdXWQKHaCwulrw9KV3vpQ71DjnQAL4heIRW7Rk7UY=";
|
||||
sha256 = "sha256-pEmsTfZXsvJMV79dGkjDNbUVajwyoYgzE5DCsC53pGY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Missing includes for GCC11
|
||||
sed '5i#include <thread>' -i \
|
||||
aws-cpp-sdk-cloudfront-integration-tests/CloudfrontOperationTest.cpp \
|
||||
aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp \
|
||||
aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp \
|
||||
aws-cpp-sdk-elasticfilesystem-integration-tests/ElasticFileSystemTest.cpp \
|
||||
aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp \
|
||||
aws-cpp-sdk-mediastore-data-integration-tests/MediaStoreDataTest.cpp \
|
||||
aws-cpp-sdk-queues/source/sqs/SQSQueue.cpp \
|
||||
aws-cpp-sdk-redshift-integration-tests/RedshiftClientTest.cpp \
|
||||
aws-cpp-sdk-s3-crt-integration-tests/BucketAndObjectOperationTest.cpp \
|
||||
aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp \
|
||||
aws-cpp-sdk-s3control-integration-tests/S3ControlTest.cpp \
|
||||
aws-cpp-sdk-sqs-integration-tests/QueueOperationTest.cpp \
|
||||
aws-cpp-sdk-transfer-tests/TransferTests.cpp
|
||||
# Flaky on Hydra
|
||||
rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
|
||||
# Includes aws-c-auth private headers, so only works with submodule build
|
||||
@ -82,12 +109,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./cmake-dirs.patch
|
||||
|
||||
# fix cmake config
|
||||
(fetchpatch {
|
||||
url = "https://github.com/aws/aws-sdk-cpp/commit/b102aaf5693c4165c84b616ab9ffb9edfb705239.diff";
|
||||
sha256 = "sha256-38QBo3MEFpyHPb8jZEURRPkoeu4DqWhVeErJayiHKF0=";
|
||||
})
|
||||
];
|
||||
|
||||
# Builds in 2+h with 2 cores, and ~10m with a big-parallel builder.
|
||||
|
||||
@ -15,8 +15,9 @@ qtModule {
|
||||
pname = "qtmultimedia";
|
||||
qtInputs = [ qtbase qtdeclarative ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gstreamer gst-plugins-base libpulseaudio ]
|
||||
++ lib.optional (stdenv.isLinux) alsa-lib
|
||||
buildInputs = [ gstreamer gst-plugins-base ]
|
||||
# https://github.com/NixOS/nixpkgs/pull/169336 regarding libpulseaudio
|
||||
++ lib.optionals stdenv.isLinux [ libpulseaudio alsa-lib ]
|
||||
++ lib.optional (lib.versionAtLeast qtbase.version "5.14.0" && stdenv.isLinux) wayland;
|
||||
outputs = [ "bin" "dev" "out" ];
|
||||
qmakeFlags = [ "GST_VERSION=1.0" ];
|
||||
|
||||
@ -59,6 +59,19 @@ stdenv.mkDerivation rec {
|
||||
)]
|
||||
;
|
||||
|
||||
# disable stackprotector on aarch64-darwin for now
|
||||
# https://github.com/NixOS/nixpkgs/issues/127608
|
||||
#
|
||||
# build error:
|
||||
#
|
||||
# /private/tmp/nix-build-sundials-5.7.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255].
|
||||
# ldr x0, [x0, ___stack_chk_guard];momd
|
||||
# ^
|
||||
# /private/tmp/nix-build-sundials-5.7.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255].
|
||||
# ldr x0, [x0, ___stack_chk_guard];momd
|
||||
|
||||
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
|
||||
22
pkgs/development/ocaml-modules/flex/default.nix
Normal file
22
pkgs/development/ocaml-modules/flex/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ buildDunePackage, fetchFromGitHub, lib, reason }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "flex";
|
||||
version = "unstable-2020-09-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jordwalke";
|
||||
repo = "flex";
|
||||
rev = "6ff12fe4f96749ffd3c0ea3d9962742767937b4a";
|
||||
sha256 = "sha256-GomTOdlU5ZwElKK8CM4DEMr51YDIrFKmTxUCGMLL3c4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ reason ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Native Reason implementation of CSS Flexbox layout. An Yoga project port";
|
||||
homepage = "https://github.com/jordwalke/flex";
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
# strictoverflow is disabled because it breaks aarch64-darwin
|
||||
hardeningDisable = [ "strictoverflow" ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./
|
||||
'';
|
||||
|
||||
22
pkgs/development/ocaml-modules/pure-splitmix/default.nix
Normal file
22
pkgs/development/ocaml-modules/pure-splitmix/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ lib, fetchFromGitHub, buildDunePackage }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "pure-splitmix";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lysxia";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "RUnsAB4hMV87ItCyGhc47bHGY1iOwVv9kco2HxnzqbU=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Lysxia/pure-splitmix";
|
||||
description = "Purely functional splittable PRNG";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pex";
|
||||
version = "2.1.80";
|
||||
version = "2.1.81";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-m9HMvLoFpg5aUoNknLdF7X++XEk9j70+qaid627uYvs=";
|
||||
hash = "sha256-EW7kOUTzLjmBVKcdRrcdx+AAMSp1hw2LJ/mHMuKViLE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycfmodel";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u1XuUW5OFl5NDP11nd6HK17NBXjqvzLFp2jUmecWP8E=";
|
||||
hash = "sha256-k059AfI3dTPMLAOColmTG4kz0z2bLO1oi8Bg0QeLork=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvesync";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7eGsRy8S6IZQ+UVNN8SoS7tBIYLlujSFr2qFldaxtJE=";
|
||||
sha256 = "sha256-SsSzwuJvDbQ1AzF+q5bjOnFaR6M2UFixtlmk6sgjKOg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -36,6 +37,7 @@ buildPythonPackage rec {
|
||||
mock
|
||||
pep440
|
||||
pytestCheckHook
|
||||
six
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
@ -45,6 +47,7 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# Tests want to scan site-packages
|
||||
"test_check_dependencies"
|
||||
"test_clean"
|
||||
"test_scenario"
|
||||
"test_git_versioning"
|
||||
];
|
||||
|
||||
@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ smakarov ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "xbacklight";
|
||||
};
|
||||
}
|
||||
|
||||
@ -828,14 +828,14 @@ self: super:
|
||||
|
||||
xf86videointel = super.xf86videointel.overrideAttrs (attrs: {
|
||||
# the update script only works with released tarballs :-/
|
||||
name = "xf86-video-intel-2019-12-09";
|
||||
name = "xf86-video-intel-2021-01-15";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
group = "xorg";
|
||||
owner = "driver";
|
||||
repo = "xf86-video-intel";
|
||||
rev = "f66d39544bb8339130c96d282a80f87ca1606caf";
|
||||
sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl";
|
||||
rev = "31486f40f8e8f8923ca0799aea84b58799754564";
|
||||
sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM=";
|
||||
};
|
||||
buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ];
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros];
|
||||
|
||||
@ -19,20 +19,20 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-MvzJ6bFEt8sdtMhuEEyngoPNwiXhP+grJzZgWGrv4yM=";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
preBuild = lib.optionalString (!stdenv.isDarwin) ''
|
||||
substituteInPlace programs/mkwinpeimg.in \
|
||||
--replace '/usr/lib/syslinux' "${syslinux}/share/syslinux"
|
||||
'';
|
||||
|
||||
postInstall = let
|
||||
path = lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ];
|
||||
path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ cdrkit syslinux ]);
|
||||
in ''
|
||||
for prog in $out/bin/*; do
|
||||
wrapProgram $prog --prefix PATH : ${path}
|
||||
done
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
doCheck = (!stdenv.isDarwin);
|
||||
|
||||
preCheck = ''
|
||||
patchShebangs tests
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "trash-cli";
|
||||
version = "0.21.10.24";
|
||||
version = "0.22.4.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "andreafrancia";
|
||||
repo = "trash-cli";
|
||||
rev = version;
|
||||
sha256 = "01is32lk6prwhajvlmgn3xs4fcpmiqivizcqkj9k80jx6mqjifzs";
|
||||
sha256 = "0j8iwr6cdc24gp5raxrq5483d7sfsyi8sy947w4hr2sc4j738dg5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ python3Packages.psutil ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cfripper";
|
||||
version = "1.8.0";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-x6QfS3DdJMpVKOLrz3EvYzIU72GzLdEePfpE9siEmCo=";
|
||||
hash = "sha256-wep1hGYq0UUHeEL674N6cvGg9u9FqGqS0XCUZYUZGzs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@ -427,6 +427,8 @@ let
|
||||
inherit (pkgs) flac;
|
||||
};
|
||||
|
||||
flex = callPackage ../development/ocaml-modules/flex { };
|
||||
|
||||
fmt = callPackage ../development/ocaml-modules/fmt { };
|
||||
|
||||
fontconfig = callPackage ../development/ocaml-modules/fontconfig {
|
||||
@ -1110,6 +1112,8 @@ let
|
||||
|
||||
ptime = callPackage ../development/ocaml-modules/ptime { };
|
||||
|
||||
pure-splitmix = callPackage ../development/ocaml-modules/pure-splitmix { };
|
||||
|
||||
resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { };
|
||||
|
||||
repr = callPackage ../development/ocaml-modules/repr { };
|
||||
|
||||
@ -195,6 +195,7 @@ let
|
||||
madlang
|
||||
matterhorn
|
||||
mueval
|
||||
naproche
|
||||
neuron-notes
|
||||
niv
|
||||
nix-delegate
|
||||
|
||||
Loading…
Reference in New Issue
Block a user