Merge staging-next into staging
This commit is contained in:
commit
e2137dea96
|
@ -14,6 +14,8 @@
|
|||
, pcaudiolib
|
||||
, sonicSupport ? true
|
||||
, sonic
|
||||
, alsa-plugins
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -35,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn ];
|
||||
nativeBuildInputs = [ autoconf automake which libtool pkg-config ronn makeWrapper ];
|
||||
|
||||
buildInputs = lib.optional mbrolaSupport mbrola
|
||||
++ lib.optional pcaudiolibSupport pcaudiolib
|
||||
|
@ -49,6 +51,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = lib.optionalString stdenv.isLinux ''
|
||||
patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng
|
||||
wrapProgram $out/bin/espeak-ng \
|
||||
--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
@ -1256,6 +1256,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
github.vscode-github-actions = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-github-actions";
|
||||
publisher = "github";
|
||||
version = "0.25.3";
|
||||
sha256 = "sha256-0Ag+xXVt+WBfN+7VmWILYU4RsVs+CBDBpMfUTczDCkI=";
|
||||
};
|
||||
meta = {
|
||||
description = "A Visual Studio Code extension for GitHub Actions workflows and runs for github.com hosted repositories";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=github.vscode-github-actions";
|
||||
homepage = "https://github.com/github/vscode-github-actions";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
};
|
||||
|
||||
github.vscode-pull-request-github = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-pull-request-github";
|
||||
|
@ -2122,6 +2138,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
nvarner.typst-lsp = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "typst-lsp";
|
||||
publisher = "nvarner";
|
||||
version = "0.3.0";
|
||||
sha256 = "sha256-ek5zXK4ecXwSPMJ4Ihy2l3PMxCdHwJN7dbwZfQVjNG8=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/nvarner.typst-lsp/changelog";
|
||||
description = "A VSCode extension for providing a language server for Typst";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=nvarner.typst-lsp";
|
||||
homepage = "https://github.com/nvarner/typst-lsp";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.drupol ];
|
||||
};
|
||||
};
|
||||
|
||||
ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog";
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "river-luatile";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaxVerevkin";
|
||||
repo = "river-luatile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eZgoFbat7X/jh5udlNyIuTheBUCHpaVRbsojYLATO18=";
|
||||
hash = "sha256-flh1zUBranb7w1fQuinHbVRGlVxfl2aKxSwShHFG6tI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Vqyt5bL1lVhy/Wxd+zF7Wugvb7dW1N9Kq2TTFSaodnE=";
|
||||
cargoHash = "sha256-9YQxa6folwCJNoEa75InRbK1X7cD4F5QGzeGlfsr/5s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
@ -15,13 +15,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xmrig";
|
||||
version = "6.19.0";
|
||||
version = "6.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xmrig";
|
||||
repo = "xmrig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pMI5SqAa9jauwWvc3JpyWQa+pQvntbTrta1p0qjBaoM=";
|
||||
hash = "sha256-m8ot/IbpxdzHOyJymzZ7MWt4p78GTUuTjYZ9P1oGpWI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "eks-node-viewer";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-utn0OJX3NLCyAV4F01GIkvh/KFPv7vfLQMwso7x7yCw";
|
||||
sha256 = "sha256-XRt9a//0mYKZKsMs2dlcsBt5ikC9ZBMeQ3Vas0eT8a8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A";
|
||||
vendorHash = "sha256-28TKZYZM2kddXAusxmjhrKFy+ATU7kZM4Ad7zvP/F3A=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to visualize dynamic node usage within a cluster";
|
||||
|
|
|
@ -20,15 +20,15 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "3.1.0-9572";
|
||||
version = "3.1.1-11223";
|
||||
srcs = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_amd64.deb";
|
||||
sha256 = "sha256-xqbyyU4JSlYbAkJ/tqLoVPKfQvxYnMySRx7yV1EtDhM=";
|
||||
url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_amd64.deb";
|
||||
sha256 = "sha256-TBgQ7zV+juB3KSgIIXuvxnYmvnnM/1/wU0EkiopIqvY=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_arm64.deb";
|
||||
sha256 = "sha256-ItZqhV9OmycdfRhlzP2llrzcIZvaiUC/LJiDJ/kNIkE=";
|
||||
url = "https://dldir1.qq.com/qqfile/qq/QQNT/2355235c/linuxqq_${version}_arm64.deb";
|
||||
sha256 = "sha256-1ba/IA/+X/s7jUtIhh3OsBHU7MPggGrASsBPx8euBBs=";
|
||||
};
|
||||
};
|
||||
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cri-o";
|
||||
version = "1.26.2";
|
||||
version = "1.26.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cri-o";
|
||||
repo = "cri-o";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Wo6COdbqRWuGP4qXjiCehDm8FlVjz1nZRouMOxlKocw=";
|
||||
sha256 = "sha256-mWhWL886lZggjow4xd02jbxaVl9PTEG24jiys4N19Lw=";
|
||||
};
|
||||
vendorSha256 = null;
|
||||
|
||||
|
|
|
@ -94,9 +94,8 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Color emoji font with a flat visual style, designed and used by Twitter";
|
||||
longDescription = ''
|
||||
A bitmap color emoji font built from the Twitter Emoji for
|
||||
Everyone artwork with support for ZWJ, skin tone diversity and country
|
||||
flags.
|
||||
A bitmap color emoji font built from Twitter's Twemoji emoji set
|
||||
with support for ZWJ, skin tone diversity and country flags.
|
||||
|
||||
This font uses Google’s CBDT format making it work on Android and Linux graphical stack.
|
||||
'';
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "16.2";
|
||||
version = "17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-jhcmFrTZgWChNvZofLSQzGvOj/U2UqaQ0Cq5sv4UAxE=";
|
||||
sha256 = "sha256-9yPgcWtk8w2AyOav1sfQFuH8wnX37ho836NgUnQbFRE=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
@ -14,7 +14,6 @@ assert if type == "sdk" then packages != null else true;
|
|||
, autoPatchelfHook
|
||||
, makeWrapper
|
||||
, libunwind
|
||||
, openssl_1_1
|
||||
, icu
|
||||
, libuuid
|
||||
, zlib
|
||||
|
@ -61,9 +60,6 @@ stdenv.mkDerivation (finalAttrs: rec {
|
|||
zlib
|
||||
icu
|
||||
libkrb5
|
||||
# this must be before curl for autoPatchElf to find it
|
||||
# curl brings in its own openssl
|
||||
openssl_1_1
|
||||
curl
|
||||
] ++ lib.optional stdenv.isLinux lttng-ust_2_12;
|
||||
|
||||
|
|
23
pkgs/development/coq-modules/mathcomp-apery/default.nix
Normal file
23
pkgs/development/coq-modules/mathcomp-apery/default.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ coq, mkCoqDerivation, mathcomp, coqeal, mathcomp-real-closed,
|
||||
mathcomp-bigenough, mathcomp-zify, mathcomp-algebra-tactics,
|
||||
lib, version ? null }:
|
||||
|
||||
mkCoqDerivation {
|
||||
|
||||
pname = "apery";
|
||||
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "1.0.2"; }
|
||||
] null;
|
||||
|
||||
release."1.0.2".sha256 = "sha256-llxyMKYvWUA7fyroG1S/jtpioAoArmarR1edi3cikcY=";
|
||||
|
||||
propagatedBuildInputs = [ mathcomp.field coqeal mathcomp-real-closed
|
||||
mathcomp-bigenough mathcomp-zify mathcomp-algebra-tactics ];
|
||||
|
||||
meta = {
|
||||
description = "A formally verified proof in Coq, by computer algebra, that ζ(3) is irrational";
|
||||
license = lib.licenses.cecill-c;
|
||||
};
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -209,7 +209,7 @@
|
||||
target_include_directories(CCTag
|
||||
PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
|
||||
"$<BUILD_INTERFACE:${generated_dir}>"
|
||||
- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>"
|
||||
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
|
||||
PUBLIC ${Boost_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
|
||||
|
||||
# just for testing
|
66
pkgs/development/libraries/cctag/default.nix
Normal file
66
pkgs/development/libraries/cctag/default.nix
Normal file
|
@ -0,0 +1,66 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
|
||||
, cmake
|
||||
, boost
|
||||
, eigen
|
||||
, opencv
|
||||
, tbb
|
||||
|
||||
, avx2Support ? stdenv.hostPlatform.avx2Support
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cctag";
|
||||
version = "1.0.3";
|
||||
|
||||
outputs = [ "lib" "dev" "out" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alicevision";
|
||||
repo = "CCTag";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-foB+e7BCuUucyhN8FsI6BIT3/fsNLTjY6QmjkMWZu6A=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
# Feel free to create a PR to add CUDA support
|
||||
"-DCCTAG_WITH_CUDA=OFF"
|
||||
|
||||
"-DCCTAG_ENABLE_SIMD_AVX2=${if avx2Support then "ON" else "OFF"}"
|
||||
|
||||
"-DCCTAG_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
|
||||
"-DCCTAG_BUILD_APPS=OFF"
|
||||
];
|
||||
|
||||
patches = [
|
||||
./cmake-install-include-dir.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
tbb
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
eigen
|
||||
opencv
|
||||
];
|
||||
|
||||
# Tests are broken on Darwin (linking issue)
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Detection of CCTag markers made up of concentric circles";
|
||||
homepage = "https://cctag.readthedocs.io";
|
||||
downloadPage = "https://github.com/alicevision/CCTag";
|
||||
license = licenses.mpl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ tmarkus ];
|
||||
};
|
||||
}
|
|
@ -1,11 +1,22 @@
|
|||
{ fetchzip, lib }:
|
||||
{ lib, stdenvNoCC, fetchurl }:
|
||||
|
||||
fetchzip rec {
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "psol";
|
||||
version = "1.13.35.2"; # Latest stable, 2018-02-05
|
||||
|
||||
url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
|
||||
sha256 = "0xi2srf9gx0x2sz9r45zb35k2n0iv457if1lqzvbanls3f935cmr";
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/dl/page-speed/psol/${version}-x64.tar.gz";
|
||||
hash = "sha256-3zujyPxU4ThF0KHap6bj2YMSbCORKFG7+Lo1vmRqQ08=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out
|
||||
mv include lib -t $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PageSpeed Optimization Libraries";
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocsolver";
|
||||
version = "5.4.2";
|
||||
version = "5.4.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
|
|
@ -1,24 +1,22 @@
|
|||
{ lib, buildDunePackage, ocaml, fetchurl
|
||||
, bigarray-compat, alcotest, astring, fpath, bos, findlib, pkg-config
|
||||
{ lib, buildDunePackage, fetchurl
|
||||
, alcotest, pkg-config
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bigarray-overlap";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-v${version}.tbz";
|
||||
sha256 = "1v86avafsbyxjccy0y9gny31s2jzb0kd42v3mhcalklx5f044lcy";
|
||||
url = "https://github.com/dinosaure/overlap/releases/download/v${version}/bigarray-overlap-${version}.tbz";
|
||||
hash = "sha256-L1IKxHAFTjNYg+upJUvyi2Z23bV3U8+1iyLPhK4aZuA=";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ bigarray-compat ];
|
||||
|
||||
nativeBuildInputs = [ findlib pkg-config ];
|
||||
checkInputs = [ alcotest astring fpath bos ];
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
checkInputs = [ alcotest ];
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/dinosaure/overlap";
|
||||
|
|
|
@ -1,23 +1,23 @@
|
|||
{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native }:
|
||||
{ newScope, lib, fetchFromGitHub, callPackage, buildDunePackage, atdgen, junit, qcheck-core, re, reason, reason-native, fetchpatch }:
|
||||
|
||||
let
|
||||
generic = (somePath:
|
||||
let
|
||||
prepkg = import somePath {
|
||||
inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason;
|
||||
inherit callPackage cli buildDunePackage atdgen junit qcheck-core re reason fetchpatch;
|
||||
inherit (reason-native) console file-context-printer fp pastel rely;
|
||||
};
|
||||
in
|
||||
buildDunePackage
|
||||
({
|
||||
version = "2021-16-16-aec0ac6";
|
||||
version = "2022-08-31-a0ddab6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "reasonml";
|
||||
repo = "reason-native";
|
||||
rev = "aec0ac681be7211b4d092262281689c46deb63e1";
|
||||
sha256 = "sha256-QoyI50MBY3RJBmM1y90n7oXrLmHe0CQxKojv+7YbegE=";
|
||||
rev = "a0ddab6ab25237961e32d8732b0a222ec2372d4a";
|
||||
hash = "sha256-s2N5OFTwIbKXcv05gQRaBMCHO1Mj563yhryPeo8jMh8=";
|
||||
};
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
meta = with lib; {
|
||||
description = "Libraries for building and testing native Reason programs";
|
||||
downloadPage = "https://github.com/reasonml/reason-native";
|
||||
|
@ -36,6 +36,7 @@ in
|
|||
fp = generic ./fp.nix;
|
||||
pastel = generic ./pastel.nix;
|
||||
pastel-console = generic ./pastel-console.nix;
|
||||
qcheck-rely = generic ./qcheck-rely.nix;
|
||||
refmterr = generic ./refmterr.nix;
|
||||
rely = generic ./rely.nix;
|
||||
rely-junit-reporter = generic ./rely-junit-reporter.nix;
|
||||
|
|
31
pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
Normal file
31
pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
Normal file
|
@ -0,0 +1,31 @@
|
|||
{ qcheck-core, reason, console, rely, fetchpatch, ... }:
|
||||
|
||||
{
|
||||
pname = "qcheck-rely";
|
||||
|
||||
nativeBuildInputs = [
|
||||
reason
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/reasonml/reason-native/pull/269/commits/b42d66f5929a11739c13f849939007bf8610888b.patch";
|
||||
hash = "sha256-MMLl3eqF8xQZ2T+sIEuv2WpnGF6FZtatgH5fiF5hpP4=";
|
||||
includes = [
|
||||
"src/qcheck-rely/QCheckRely.re"
|
||||
"src/qcheck-rely/QCheckRely.rei"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
qcheck-core
|
||||
console
|
||||
rely
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A library containing custom Rely matchers allowing for easily using QCheck with Rely. QCheck is a 'QuickCheck inspired property-based testing for OCaml, and combinators to generate random values to run tests on'";
|
||||
downloadPage = "https://github.com/reasonml/reason-native/tree/master/src/qcheck-rely";
|
||||
};
|
||||
}
|
|
@ -6,7 +6,7 @@ buildDunePackage rec {
|
|||
|
||||
src = ./.;
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
buildInputs = [
|
||||
reason
|
||||
|
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aliyun-python-sdk-cdn";
|
||||
version = "3.8.3";
|
||||
version = "3.8.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-LsB3u35PLI/3PcuNbdgcxRoEFZ5CpyINEJa4Nw64NPA=";
|
||||
hash = "sha256-2bFiOvwbvYy7uw7h0LTX4szSBwgafSYOOixxv+zAYDo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -58,6 +58,7 @@ buildPythonPackage rec {
|
|||
pythonRelaxDeps = [
|
||||
"gremlinpython"
|
||||
"numpy"
|
||||
"openpyxl"
|
||||
"pandas"
|
||||
"pg8000"
|
||||
"pyarrow"
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gdown";
|
||||
version = "4.6.4";
|
||||
version = "4.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0zIQsbPXsS/vBda56n8ipRNzmQnKUR1dnSNtxnZmf3k=";
|
||||
hash = "sha256-NH8jdpZ5qvfvpz5WVScPzajKVr5l64Skoh0UOYlUEEU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-trace";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-i3jUbzivzXG9bIM06ZKG9olZubBOuCWz5kk5yPZRv4k=";
|
||||
hash = "sha256-twaJlx/2W1BQCWZMTQbZOp74oFecL2vwZkAxK/XwE8E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -31,7 +31,8 @@ buildPythonPackage rec {
|
|||
|
||||
substituteInPlace setup.py \
|
||||
--replace 'aiohttp>=3.8.0,<=3.8.1' 'aiohttp' \
|
||||
--replace 'importlib-metadata<5.0.0' 'importlib-metadata'
|
||||
--replace 'importlib-metadata<5.0.0' 'importlib-metadata' \
|
||||
--replace "os.getenv('VERSION', '?').replace('-SNAPSHOT', '.dev-%d' % timestamp)" '"${version}"'
|
||||
'';
|
||||
|
||||
# setup-requires requirements
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyswitchbot";
|
||||
version = "0.37.4";
|
||||
version = "0.37.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "Danielhiversen";
|
||||
repo = "pySwitchbot";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2P7hj0kfKLPyuKk6ouHJtkWCUT3EC1spQTjBQarwpbU=";
|
||||
hash = "sha256-k4uTLiSODjAbwVZjd35RckbDb2DxFCV/Ixo3ErG9FHQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.5.7";
|
||||
version = "0.5.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-orNKPm51rOOM49+RUUjI7+gTo3GoQv5h7b/gPFFZBTE=";
|
||||
hash = "sha256-ELAytOxi2wAqt2hbVKFs4+HvJr3V+faWw2leO5bfv9A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "csvq";
|
||||
version = "1.17.11";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mithrandie";
|
||||
repo = "csvq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jhj03xpWBcLVCCk1S9nsi8O6x1/IVwNT3voGfWBg2iw=";
|
||||
sha256 = "sha256-1UK+LSMKryoUf2UWbGt8MU3zs5hH2WdpA2v/jBaIHYE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-C+KQHSp4aho+DPlkaYegjYSaoSHaLiQOa1WJXIn9FdQ=";
|
||||
vendorHash = "sha256-byBYp+iNnnsAXR+T3XmdwaeeBG8oB1EgNkDabzgUC98=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "SQL-like query language for CSV";
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-chef";
|
||||
version = "0.1.51";
|
||||
version = "0.1.52";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-K9oryItevSABbklaX5KKvKHuebFX8B0AgnizlpDhM5o=";
|
||||
sha256 = "sha256-eUFQT2zYABRtTqWxMi+AyU1ZHdt8+B1nMC0Sz6IK6+w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-KRhgYN8YMfotjkWAYP9RITbH9hudkakpWk53YZe9+Ks=";
|
||||
cargoHash = "sha256-uzuITRUvAOsuFaq+dkO8tRyozwUt4xB/3BP3mNCxr2g=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-zigbuild";
|
||||
version = "0.16.4";
|
||||
version = "0.16.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "messense";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-95cmmYHRS9BS+CtVE/sV2dwmoAk1EKJjX7NulKRuPLs=";
|
||||
sha256 = "sha256-KyfwH2zdKUUazIZoea8XVOo+vGbPrx5x00IceUuAPXM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5zdakF/6pDNWcAw8IXCe4Jl246V/Jdto1FPBFkKy6gg=";
|
||||
cargoSha256 = "sha256-z+NTfF+7zbfRt5/uvno4Z2hA6onVBWKR6Tje2KClkc0=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-run";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-HYFVdj1kASu+VKnDJA35zblPsgUeYC9YVlS84Hkx1Sk=";
|
||||
hash = "sha256-GLJrM5vIGYH5lNvwmpYKE/ISTRUwikCCj2o5h6Y9kW4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-nhs9qNFd1GK70sL5sPPeMazuPUP67epHayXnw3aXTfk=";
|
||||
cargoHash = "sha256-YevCel3HqwslwVmEA1vncsYYPMGQPUnwlkxLNQsnKG0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
@ -14,13 +14,27 @@
|
|||
, xorg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
availableBinaries = {
|
||||
x86_64-linux = {
|
||||
platform = "linux-x64";
|
||||
checksum = "sha256-26mkizwkF0qPX2+0rkjep28ZuNlLGPljCvVO73t34Lk=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
platform = "linux-arm64";
|
||||
checksum = "sha256-gcf/MJ5aNUPoH6qz0n9vjviTec1rcxB0UzF+++6bUTs=";
|
||||
};
|
||||
};
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
binary = availableBinaries.${system} or (throw "cypress: No binaries available for system ${system}");
|
||||
inherit (binary) platform checksum;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "cypress";
|
||||
version = "10.10.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip";
|
||||
sha256 = "sha256-26mkizwkF0qPX2+0rkjep28ZuNlLGPljCvVO73t34Lk=";
|
||||
url = "https://cdn.cypress.io/desktop/${version}/${platform}/cypress.zip";
|
||||
sha256 = checksum;
|
||||
};
|
||||
|
||||
# don't remove runtime deps
|
||||
|
@ -73,7 +87,7 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "Cypress";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = lib.attrNames availableBinaries;
|
||||
maintainers = with maintainers; [ tweber mmahut Crafter ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -25,11 +25,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unciv";
|
||||
version = "4.5.10";
|
||||
version = "4.5.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
|
||||
hash = "sha256-vV0Ux1TWwDlgDzQyIalMRcktP3SYP2RPacTIY9VV0W8=";
|
||||
hash = "sha256-wagguIz4g4DT5aCw6DzFHpHcDznGnkeyG588cSiTtds=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
49
pkgs/os-specific/darwin/raycast/default.nix
Normal file
49
pkgs/os-specific/darwin/raycast/default.nix
Normal file
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, undmg
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "raycast";
|
||||
version = "1.49.0";
|
||||
|
||||
src = fetchurl {
|
||||
# https://github.com/NixOS/nixpkgs/pull/223495
|
||||
# official download API: https://api.raycast.app/v2/download
|
||||
# this returns an AWS CloudFront signed URL with expiration timestamp and signature
|
||||
# the returned URL will always be the latest Raycast which might result in an impure derivation
|
||||
# the package maintainer created a repo (https://github.com/stepbrobd/raycast-overlay)
|
||||
# to host GitHub Actions to periodically check for updates
|
||||
# and re-release the `.dmg` file to Internet Archive (https://archive.org/details/raycast)
|
||||
url = "https://archive.org/download/raycast/raycast-${version}.dmg";
|
||||
sha256 = "sha256-6j5PyzJ7g3p+5gE2CQHlZrLj5b3rLdpodl+By7xxcjo=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
dontFixup = true;
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
sourceRoot = "Raycast.app";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications/Raycast.app
|
||||
cp -R . $out/Applications/Raycast.app
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Control your tools with a few keystrokes";
|
||||
homepage = "https://raycast.app/";
|
||||
license = licenses.unfree;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ lovesegfault stepbrobd ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
}
|
|
@ -966,7 +966,7 @@ let
|
|||
FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes);
|
||||
|
||||
ASHMEM = { optional = true; tristate = whenBetween "5.0" "5.18" "y";};
|
||||
ANDROID = { optional = true; tristate = whenAtLeast "5.0" "y";};
|
||||
ANDROID = { optional = true; tristate = whenBetween "5.0" "5.19" "y";};
|
||||
ANDROID_BINDER_IPC = { optional = true; tristate = whenAtLeast "5.0" "y";};
|
||||
ANDROID_BINDERFS = { optional = true; tristate = whenAtLeast "5.0" "y";};
|
||||
ANDROID_BINDER_DEVICES = { optional = true; freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";};
|
||||
|
|
|
@ -2,20 +2,32 @@
|
|||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, oniguruma
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "boxxy";
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "queer";
|
||||
repo = "boxxy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UTwaJDuIj0aZNGNbylBhIdZA6WAsqtW05IWPzh0f9cM=";
|
||||
hash = "sha256-c1AZz5WwSie0lenH0LoPOvR4VWd7pYd59WWmjFn6HiQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-CkYm/tMDCIQbUzoF2hgxFsyAl5bpeCVHcLWR9iwq7Cw=";
|
||||
cargoHash = "sha256-840W5wyOV+nTr9HzftOUlUwZ1JRe7+FWTG4Q2L+yCXM=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
oniguruma
|
||||
];
|
||||
|
||||
RUSTONIG_SYSTEM_LIBONIG = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Puts bad Linux applications in a box with only their files";
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "pritunl-client";
|
||||
version = "1.3.3474.95";
|
||||
version = "1.3.3477.58";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pritunl";
|
||||
repo = "pritunl-client-electron";
|
||||
rev = version;
|
||||
sha256 = "sha256-7V+hw/DfyRooef9gwZ5HjcfvabtA2HltJhwwSrQH0X4=";
|
||||
sha256 = "sha256-XsYdmJINzeZgvofsKTG/4dXNv4r46FLkEmNGQki1tmU=";
|
||||
};
|
||||
|
||||
modRoot = "cli";
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-03-29";
|
||||
version = "2023-03-30";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qUBD5ZOkOHGDoST/xUfp508qOA40WZwvdONgXvQqLBY=";
|
||||
hash = "sha256-uaVuWU56EC+UdVR5GbKeUMVuxhsg5tDsXBXxaLtdG+w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "wapiti";
|
||||
version = "3.1.6";
|
||||
version = "3.1.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wapiti-scanner";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-b377nPXvpxg+WDNgjxm2RoJ5jNt7MTES2Bspxsvo/wc=";
|
||||
hash = "sha256-muAugc0BgVSER2LSRv7ATbCqpXID8/WH+hfhmtoS36o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "automatic-timezoned";
|
||||
version = "1.0.75";
|
||||
version = "1.0.78";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxbrunet";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-soEVET3aVK77UJjhXq/cwK9QWAJWQu5TEjyHEKfqKeY=";
|
||||
sha256 = "sha256-dYRg2WhPpNL20IrpWK2KuzVSBd/8Mq+CHvtp/RRAQqA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-xux+8hix2FzZqxOmos1g0SAcVVajJUCO9qGl0LNtOlk=";
|
||||
cargoHash = "sha256-5x8DXojoPN4qFxGWrtD2ieSkkwmnKdw85JsnpvmFxRM=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatically update system timezone based on location";
|
||||
|
|
|
@ -19479,6 +19479,10 @@ with pkgs;
|
|||
|
||||
ccrtp = callPackage ../development/libraries/ccrtp { };
|
||||
|
||||
cctag = callPackage ../development/libraries/cctag {
|
||||
tbb = tbb_2021_8;
|
||||
};
|
||||
|
||||
cctz = callPackage ../development/libraries/cctz {
|
||||
inherit (darwin.apple_sdk.frameworks) Foundation;
|
||||
};
|
||||
|
@ -36125,6 +36129,8 @@ with pkgs;
|
|||
|
||||
raylib-games = callPackage ../games/raylib-games { };
|
||||
|
||||
raycast = callPackage ../os-specific/darwin/raycast { };
|
||||
|
||||
redeclipse = callPackage ../games/redeclipse { };
|
||||
|
||||
rftg = callPackage ../games/rftg { };
|
||||
|
|
|
@ -76,15 +76,16 @@ let
|
|||
mathcomp-field = self.mathcomp.field;
|
||||
mathcomp-character = self.mathcomp.character;
|
||||
mathcomp-abel = callPackage ../development/coq-modules/mathcomp-abel {};
|
||||
mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {};
|
||||
mathcomp-analysis = callPackage ../development/coq-modules/mathcomp-analysis {};
|
||||
mathcomp-apery = callPackage ../development/coq-modules/mathcomp-apery {};
|
||||
mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
|
||||
mathcomp-classical = self.mathcomp-analysis.classical;
|
||||
mathcomp-finmap = callPackage ../development/coq-modules/mathcomp-finmap {};
|
||||
mathcomp-bigenough = callPackage ../development/coq-modules/mathcomp-bigenough {};
|
||||
mathcomp-real-closed = callPackage ../development/coq-modules/mathcomp-real-closed {};
|
||||
mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {};
|
||||
mathcomp-word = callPackage ../development/coq-modules/mathcomp-word {};
|
||||
mathcomp-zify = callPackage ../development/coq-modules/mathcomp-zify {};
|
||||
mathcomp-algebra-tactics = callPackage ../development/coq-modules/mathcomp-algebra-tactics {};
|
||||
mathcomp-tarjan = callPackage ../development/coq-modules/mathcomp-tarjan {};
|
||||
metacoq = callPackage ../development/coq-modules/metacoq { };
|
||||
metacoq-template-coq = self.metacoq.template-coq;
|
||||
metacoq-pcuic = self.metacoq.pcuic;
|
||||
|
@ -112,10 +113,12 @@ let
|
|||
trakt = callPackage ../development/coq-modules/trakt {};
|
||||
Velisarios = callPackage ../development/coq-modules/Velisarios {};
|
||||
Verdi = callPackage ../development/coq-modules/Verdi {};
|
||||
VST = callPackage ../development/coq-modules/VST (lib.optionalAttrs
|
||||
VST = callPackage ../development/coq-modules/VST ((lib.optionalAttrs
|
||||
(lib.versionAtLeast self.coq.version "8.14") {
|
||||
compcert = self.compcert.override { version = "3.11"; };
|
||||
});
|
||||
}) // (lib.optionalAttrs (lib.versions.isEq self.coq.coq-version "8.13") {
|
||||
ITree = self.ITree.override { version = "4.0.0"; };
|
||||
}));
|
||||
zorns-lemma = callPackage ../development/coq-modules/zorns-lemma {};
|
||||
filterPackages = doesFilter: if doesFilter then filterCoqPackages self else self;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue