Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
1cfb9e706e
@ -14,17 +14,17 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "10iai5k0hvyvishp4gbamvsn9ff8dfm6kvql08h3plr8zrvmaian";
|
||||
x86_64-darwin = "1cspla4cxw0l5cg44qywv3jgwyk2g7sx5lk1s4xhbrqz76knzcr7";
|
||||
aarch64-linux = "1dc4gfaxlrsd637d8w2c5h4l8c96phv14pmkhmyc1jp1a0q6d5ja";
|
||||
aarch64-darwin = "06d8ng6k62mh1qhba0c6nj2lag4vi7i50d2sx3nk8r2v8azwyrmk";
|
||||
armv7l-linux = "030c8az831n73w35xfbjpympwvfprf1h4lxy8j5sysm4fbpzi03m";
|
||||
x86_64-linux = "0ma8pysww4r3p73rf94wddxk2ar091yw8mk1gi9jawiqvb9ksx0m";
|
||||
x86_64-darwin = "008v7hxv71bvfp52wfx3sg97s54bn2klvy5xfjh48wcaka10vsj0";
|
||||
aarch64-linux = "1wi5bmjdjfy1la3lwb3c389cjbn4q12j1214vna9214d8if37dyv";
|
||||
aarch64-darwin = "14v0gq4kj0lxa6pwi7nbdpw0l25yfcqydigfzhmwrp8ipbnma62k";
|
||||
armv7l-linux = "0h94gzwxknlvfy9gcd0zq4qsjmr9zr22adbfrqm1gvv1aksmgm4b";
|
||||
}.${system};
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.60.1";
|
||||
version = "1.60.2";
|
||||
pname = "vscode";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null;
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "mandelbulber";
|
||||
version = "2.24";
|
||||
version = "2.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buddhi1980";
|
||||
repo = "mandelbulber2";
|
||||
rev = version;
|
||||
sha256 = "sha256-JgpYGzD2FsqcCWnOKBiVCxUKqLfT4S++uUBZekhGWmA=";
|
||||
sha256 = "sha256-RKpg7LBsrBFOlFozoDcALwGeZ9whPiCpFMZF5ljsp7Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,8 +19,7 @@ mkChromiumDerivation (base: rec {
|
||||
cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
|
||||
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
|
||||
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
|
||||
${lib.optionalString (!chromiumVersionAtLeast "94") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''}
|
||||
${lib.optionalString (chromiumVersionAtLeast "94") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''}
|
||||
cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"
|
||||
cp -v "$buildPath/chrome" "$libExecPath/$packageName"
|
||||
|
||||
# Swiftshader
|
||||
|
||||
@ -160,21 +160,6 @@ let
|
||||
./patches/no-build-timestamps.patch
|
||||
# For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags:
|
||||
./patches/widevine-79.patch
|
||||
] ++ lib.optionals (versionRange "91" "94") [
|
||||
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
|
||||
./patches/fix-missing-atspi2-dependency.patch
|
||||
# Required as dependency for the next patch:
|
||||
(githubPatch {
|
||||
# Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat""
|
||||
commit = "4b438323d68840453b5ef826c3997568e2e0e8c7";
|
||||
sha256 = "1lf6yilx2ffd3r0840ilihp4px35w7jvr19ll56bncqmz4r5fd82";
|
||||
})
|
||||
# To fix the text rendering, see #131074:
|
||||
(githubPatch {
|
||||
# Linux sandbox: fix fstatat() crash
|
||||
commit = "60d5e803ef2a4874d29799b638754152285e0ed9";
|
||||
sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -196,7 +181,7 @@ let
|
||||
substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \
|
||||
--replace "/usr/bin/env -S make -f" "/usr/bin/make -f"
|
||||
fi
|
||||
chmod -x third_party/webgpu-cts/src/tools/deno
|
||||
chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno
|
||||
|
||||
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
|
||||
substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \
|
||||
@ -253,6 +238,7 @@ let
|
||||
# e.g. unsafe developer builds have developer-friendly features that may
|
||||
# weaken or disable security measures like sandboxing or ASLR):
|
||||
is_official_build = true;
|
||||
disable_fieldtrial_testing_config = true;
|
||||
# Build Chromium using the system toolchain (for Linux distributions):
|
||||
custom_toolchain = "//build/toolchain/linux/unbundle:default";
|
||||
host_toolchain = "//build/toolchain/linux/unbundle:default";
|
||||
@ -289,10 +275,6 @@ let
|
||||
enable_widevine = true;
|
||||
# Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture:
|
||||
rtc_use_pipewire = true;
|
||||
} // optionalAttrs (!chromiumVersionAtLeast "94") {
|
||||
fieldtrial_testing_like_official_build = true;
|
||||
} // optionalAttrs (chromiumVersionAtLeast "94") {
|
||||
disable_fieldtrial_testing_config = true;
|
||||
} // optionalAttrs proprietaryCodecs {
|
||||
# enable support for the H.264 codec
|
||||
proprietary_codecs = true;
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Weiss <dev.primeos@gmail.com>
|
||||
Date: Sat, 10 Apr 2021 13:53:50 +0200
|
||||
Subject: [PATCH] Fix a missing atspi2 dependency
|
||||
|
||||
See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for
|
||||
more details.
|
||||
---
|
||||
content/public/browser/BUILD.gn | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
|
||||
index 7e7c436d90c7..20ef832f1d8c 100644
|
||||
--- a/content/public/browser/BUILD.gn
|
||||
+++ b/content/public/browser/BUILD.gn
|
||||
@@ -535,6 +535,7 @@ source_set("browser_sources") {
|
||||
|
||||
if (use_atk) {
|
||||
sources += [ "ax_inspect_factory_auralinux.cc" ]
|
||||
+ configs += [ "//build/config/linux/atspi2" ]
|
||||
}
|
||||
|
||||
if (is_linux || is_chromeos) {
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -31,9 +31,9 @@
|
||||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "95.0.4638.17",
|
||||
"sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz",
|
||||
"sha256bin64": "1azn9216jhcdg4yjr6frz8vp98qbcnnhifp9jn9bwvyg69lr0dwb",
|
||||
"version": "96.0.4651.0",
|
||||
"sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6",
|
||||
"sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-08-11",
|
||||
@ -44,19 +44,19 @@
|
||||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "93.0.4577.82",
|
||||
"sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx",
|
||||
"sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify",
|
||||
"version": "94.0.4606.54",
|
||||
"sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83",
|
||||
"sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-07-08",
|
||||
"version": "2021-08-11",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "24e2f7df92641de0351a96096fb2c490b2436bb8",
|
||||
"sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl"
|
||||
"rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263",
|
||||
"sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "93.0.4577.82-1",
|
||||
"sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66"
|
||||
"rev": "94.0.4606.54-1",
|
||||
"sha256": "0phy87fiqdgikgl60yap7n1mvyvsidgznqp06j86287iihml3z2m"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,12 +26,20 @@ let
|
||||
# https://github.com/Koed00/django-q/issues/526
|
||||
django-q = super.django-q.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.3.4";
|
||||
src = super.fetchPypi {
|
||||
inherit (oldAttrs) pname;
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "Uj1U3PG2YVLBtlj5FPAO07UYo0MqnezUiYc4yo274Q8=";
|
||||
};
|
||||
});
|
||||
|
||||
# Incompatible with aioredis 2
|
||||
aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.3.1";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -30,6 +30,7 @@ in with python.pkgs; buildPythonApplication rec {
|
||||
postInstall = ''
|
||||
installShellCompletion --bash --name watson watson.completion
|
||||
installShellCompletion --zsh --name _watson watson.zsh-completion
|
||||
installShellCompletion --fish watson.fish
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ];
|
||||
|
||||
41
pkgs/data/fonts/chonburi/default.nix
Normal file
41
pkgs/data/fonts/chonburi/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chonburi";
|
||||
version = "unstable-2021-09-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cadsondemak";
|
||||
repo = pname;
|
||||
rev = "daf26bf77d82fba50eaa3aa3fad905cb9f6b5e28";
|
||||
sha256 = "sha256-oC7ZCfNOyvGtqT9+Ap/CfCHzdWNzeCuac2dJ9fctgB8=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/doc/chonburi $out/share/fonts/{opentype,truetype}
|
||||
|
||||
cp $src/OFL.txt $src/BRIEF.md $out/share/doc/chonburi
|
||||
cp $src/fonts/*.otf $out/share/fonts/opentype
|
||||
cp $src/fonts/*.ttf $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://cadsondemak.github.io/chonburi/";
|
||||
description = "A Didonic Thai and Latin display typeface";
|
||||
longDescription = ''
|
||||
The objective of this project is to create a Thai and Latin Display
|
||||
typeface. Chonburi is a display typeface with high contrast in a Didone
|
||||
style. This single-weight typeface provides advance typographical support
|
||||
with features such as discretionary ligature. This font can be extended
|
||||
the family to other weights including both narrow and extended version. It
|
||||
is also ready to be matched with other non-Latin script.
|
||||
'';
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.toastal ];
|
||||
};
|
||||
}
|
||||
@ -12,12 +12,16 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/doc/${pname}/css/ $out/share/fonts/{opentype,truetype}
|
||||
runHook preInstall
|
||||
|
||||
cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/${pname}
|
||||
cp $src/documentation/css/fonts.css $out/share/doc/${pname}/css
|
||||
mkdir -p $out/share/doc/kanit/css/ $out/share/fonts/{opentype,truetype}
|
||||
|
||||
cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/kanit
|
||||
cp $src/documentation/css/fonts.css $out/share/doc/kanit/css
|
||||
cp $src/fonts/otf/*.otf $out/share/fonts/opentype
|
||||
cp $src/fonts/ttf/*.ttf $out/share/fonts/truetype
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
{ lib
|
||||
, callPackage
|
||||
{ callPackage
|
||||
, fetchurl
|
||||
, gcc7
|
||||
, gcc9
|
||||
, gcc10
|
||||
, lib
|
||||
}:
|
||||
|
||||
let
|
||||
common = callPackage ./common.nix;
|
||||
in rec {
|
||||
in
|
||||
rec {
|
||||
cudatoolkit_10_0 = common {
|
||||
version = "10.0.130";
|
||||
url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux";
|
||||
@ -56,5 +58,19 @@ in rec {
|
||||
gcc = gcc9;
|
||||
};
|
||||
|
||||
cudatoolkit_11_3 = common {
|
||||
version = "11.3.1";
|
||||
url = "https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run";
|
||||
sha256 = "0d19pwcqin76scbw1s5kgj8n0z1p4v1hyfldqmamilyfxycfm4xd";
|
||||
gcc = gcc9;
|
||||
};
|
||||
|
||||
cudatoolkit_11_4 = common {
|
||||
version = "11.4.1";
|
||||
url = "https://developer.download.nvidia.com/compute/cuda/11.4.1/local_installers/cuda_11.4.1_470.57.02_linux.run";
|
||||
sha256 = "0180pb1zfajb9l6blr467xkx01yp3snfwm2xix8x52crf6d36v6x";
|
||||
gcc = gcc10; # can bump to 11 along with stdenv.cc
|
||||
};
|
||||
|
||||
cudatoolkit_11 = cudatoolkit_11_2;
|
||||
}
|
||||
|
||||
@ -7,9 +7,10 @@ with lib; mkCoqDerivation {
|
||||
domain = "gitlab.inria.fr";
|
||||
inherit version;
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = isGe "8.7"; out = "3.3.1"; }
|
||||
{ case = range "8.7" "8.14"; out = "3.4.2"; }
|
||||
{ case = range "8.5" "8.8"; out = "2.6.1"; }
|
||||
] null;
|
||||
release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw";
|
||||
release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz";
|
||||
release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj";
|
||||
releaseRev = v: "flocq-${v}";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage
|
||||
, cudatoolkit_10_1, cudatoolkit_10_2
|
||||
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
|
||||
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4
|
||||
}:
|
||||
|
||||
rec {
|
||||
@ -33,5 +33,13 @@ rec {
|
||||
cudatoolkit = cudatoolkit_11_2;
|
||||
};
|
||||
|
||||
cutensor_cudatoolkit_11_3 = cutensor_cudatoolkit_11_0.override {
|
||||
cudatoolkit = cudatoolkit_11_3;
|
||||
};
|
||||
|
||||
cutensor_cudatoolkit_11_4 = cutensor_cudatoolkit_11_0.override {
|
||||
cudatoolkit = cudatoolkit_11_4;
|
||||
};
|
||||
|
||||
cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2;
|
||||
}
|
||||
|
||||
35
pkgs/development/python-modules/aioapns/default.nix
Normal file
35
pkgs/development/python-modules/aioapns/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ buildPythonPackage
|
||||
, fetchPypi
|
||||
, h2
|
||||
, lib
|
||||
, pyjwt
|
||||
, pyopenssl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioapns";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ea58ce685aa6d0ffbdc3be4a6999c7268b9c765f806d3e4da7677c098fb72cbc";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
h2
|
||||
pyopenssl
|
||||
pyjwt
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aioapns" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An efficient APNs Client Library for Python/asyncio";
|
||||
homepage = "https://github.com/Fatal1ty/aioapns";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ superherointj ];
|
||||
};
|
||||
}
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tlsh";
|
||||
version = "4.9.3";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trendmicro";
|
||||
repo = "tlsh";
|
||||
rev = version;
|
||||
sha256 = "sha256-12bhxJTJJWzoiWt4YwhcdwHDvJNoBenWl3l26SFuIGU=";
|
||||
sha256 = "sha256-9Vkj7a5xU/coFyM/8i8JB0DdnbgDAEMOjmmMF8ckKuE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "frugal";
|
||||
version = "3.14.8";
|
||||
version = "3.14.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Workiva";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-oCqN9iG4+vBvIJoW1v4ww9SALlhcX5bEgqSjTArPQ2g=";
|
||||
sha256 = "sha256-LyPa6x72dz59TYWYqTrpnqUpXz9Ruf+worLvIfFJRHY=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gokart";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praetorian-inc";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wfv33yi83klnnyfas7wnsnx34cf28k1yvq06lkii96fvnzcar36";
|
||||
sha256 = "sha256-iXdPQkKTRE2BE2yG2KKThpj7HrxXWwBFv2TobEwGLQQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd";
|
||||
|
||||
@ -5,11 +5,11 @@ with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "vcstool";
|
||||
version = "0.2.15";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b1fce6fcef7b117b245a72dc8658a128635749d01dc7e9d1316490f89f9c2fde";
|
||||
sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyyaml setuptools ];
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cypress";
|
||||
version = "8.3.0";
|
||||
version = "8.3.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
|
||||
sha256 = "sha256-MmdAi/AZ4CI/dPWbJxAXYTg/h0Dr/eEVYcZLMHaDQQ0=";
|
||||
sha256 = "sha256-aBnF3Ij7oTws+0qOHwIIioxy1sJslb02wn8eGyKFt/c=";
|
||||
};
|
||||
|
||||
# don't remove runtime deps
|
||||
|
||||
@ -4,13 +4,13 @@ with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pure-prompt";
|
||||
version = "1.17.2";
|
||||
version = "1.17.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sindresorhus";
|
||||
repo = "pure";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sk7uAYVw/9OLKi3ClBXwEEnfaiprM/gQcNJMDFGqhE0=";
|
||||
sha256 = "sha256-WNixw2vVn1mBEDSeIFrWZHHUcX4TNgr+motBemBQfr0=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ callPackage
|
||||
, cudatoolkit_10_1, cudatoolkit_10_2
|
||||
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
|
||||
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4
|
||||
, cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2
|
||||
, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2
|
||||
, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2, cutensor_cudatoolkit_11_3, cutensor_cudatoolkit_11_4
|
||||
}:
|
||||
|
||||
rec {
|
||||
@ -37,6 +37,16 @@ rec {
|
||||
cutensor_cudatoolkit = cutensor_cudatoolkit_11_2;
|
||||
};
|
||||
|
||||
cuda-library-samples_cudatoolkit_11_3 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_11_3;
|
||||
cutensor_cudatoolkit = cutensor_cudatoolkit_11_3;
|
||||
};
|
||||
|
||||
cuda-library-samples_cudatoolkit_11_4 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_11_4;
|
||||
cutensor_cudatoolkit = cutensor_cudatoolkit_11_4;
|
||||
};
|
||||
|
||||
cuda-library-samples_cudatoolkit_11 =
|
||||
cuda-library-samples_cudatoolkit_11_2;
|
||||
cuda-library-samples_cudatoolkit_11_4;
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ callPackage
|
||||
, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2
|
||||
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2
|
||||
, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4
|
||||
}:
|
||||
|
||||
rec {
|
||||
@ -40,5 +40,15 @@ rec {
|
||||
sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1";
|
||||
};
|
||||
|
||||
cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2;
|
||||
cuda-samples_cudatoolkit_11_3 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_11_3;
|
||||
sha256 = "0kbibb6pgz8j5iq6284axcnmycaha9bw8qlmdp6yfwmnahq1v0yz";
|
||||
};
|
||||
|
||||
cuda-samples_cudatoolkit_11_4 = callPackage ./generic.nix {
|
||||
cudatoolkit = cudatoolkit_11_4;
|
||||
sha256 = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk";
|
||||
};
|
||||
|
||||
cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_4;
|
||||
}
|
||||
|
||||
@ -1,6 +1,11 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, pkg-config, addOpenGLRunpath
|
||||
, sha256, cudatoolkit
|
||||
{ addOpenGLRunpath
|
||||
, cudatoolkit
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, lib
|
||||
, pkg-config
|
||||
, sha256
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
@ -22,6 +27,14 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ cudatoolkit ];
|
||||
|
||||
# See https://github.com/NVIDIA/cuda-samples/issues/75.
|
||||
patches = lib.optionals (version == "11.3") [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch";
|
||||
sha256 = "sha256:15bydf59scmfnldz5yawbjacdxafi50ahgpzq93zlc5xsac5sz6i";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -10,7 +10,9 @@ rec {
|
||||
cuda-samples_cudatoolkit_11
|
||||
cuda-samples_cudatoolkit_11_0
|
||||
cuda-samples_cudatoolkit_11_1
|
||||
cuda-samples_cudatoolkit_11_2;
|
||||
cuda-samples_cudatoolkit_11_2
|
||||
cuda-samples_cudatoolkit_11_3
|
||||
cuda-samples_cudatoolkit_11_4;
|
||||
|
||||
cuda-library-samplesPackages = callPackage ./cuda-library-samples { };
|
||||
inherit (cuda-library-samplesPackages)
|
||||
@ -20,5 +22,7 @@ rec {
|
||||
cuda-library-samples_cudatoolkit_11
|
||||
cuda-library-samples_cudatoolkit_11_0
|
||||
cuda-library-samples_cudatoolkit_11_1
|
||||
cuda-library-samples_cudatoolkit_11_2;
|
||||
cuda-library-samples_cudatoolkit_11_2
|
||||
cuda-library-samples_cudatoolkit_11_3
|
||||
cuda-library-samples_cudatoolkit_11_4;
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "playerctl";
|
||||
version = "2.3.1";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "acrisci";
|
||||
repo = "playerctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn";
|
||||
sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config gtk-doc docbook_xsl gobject-introspection ];
|
||||
|
||||
@ -4140,7 +4140,9 @@ with pkgs;
|
||||
cudatoolkit_11
|
||||
cudatoolkit_11_0
|
||||
cudatoolkit_11_1
|
||||
cudatoolkit_11_2;
|
||||
cudatoolkit_11_2
|
||||
cudatoolkit_11_3
|
||||
cudatoolkit_11_4;
|
||||
|
||||
cudatoolkit = cudatoolkit_10;
|
||||
|
||||
@ -4165,7 +4167,9 @@ with pkgs;
|
||||
cutensor_cudatoolkit_11
|
||||
cutensor_cudatoolkit_11_0
|
||||
cutensor_cudatoolkit_11_1
|
||||
cutensor_cudatoolkit_11_2;
|
||||
cutensor_cudatoolkit_11_2
|
||||
cutensor_cudatoolkit_11_3
|
||||
cutensor_cudatoolkit_11_4;
|
||||
|
||||
cutensor = cutensor_cudatoolkit_10;
|
||||
|
||||
@ -22321,6 +22325,8 @@ with pkgs;
|
||||
|
||||
cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; };
|
||||
|
||||
chonburi-font = callPackage ../data/fonts/chonburi { };
|
||||
|
||||
cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { };
|
||||
|
||||
clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };
|
||||
|
||||
@ -245,6 +245,8 @@ in {
|
||||
|
||||
aioambient = callPackage ../development/python-modules/aioambient { };
|
||||
|
||||
aioapns = callPackage ../development/python-modules/aioapns { };
|
||||
|
||||
ailment = callPackage ../development/python-modules/ailment { };
|
||||
|
||||
aioamqp = callPackage ../development/python-modules/aioamqp { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user