Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
03ecebd53a
32 changed files with 141 additions and 96 deletions
|
|
@ -12762,6 +12762,13 @@
|
|||
githubId = 90456;
|
||||
name = "Rebecca (Bex) Kelly";
|
||||
};
|
||||
tpw_rules = {
|
||||
name = "Thomas Watson";
|
||||
email = "twatson52@icloud.com";
|
||||
matrix = "@tpw_rules:matrix.org";
|
||||
github = "tpwrules";
|
||||
githubId = 208010;
|
||||
};
|
||||
travisbhartwell = {
|
||||
email = "nafai@travishartwell.net";
|
||||
github = "travisbhartwell";
|
||||
|
|
|
|||
|
|
@ -17,6 +17,9 @@ rustPlatform.buildRustPackage rec {
|
|||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
# not needed at runtime
|
||||
rm -r runtime/grammars/sources
|
||||
|
||||
mkdir -p $out/lib
|
||||
cp -r runtime $out/lib
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -61,13 +61,6 @@ let
|
|||
url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT";
|
||||
sha256 = "0ic3hn65dimgfhakli1cyf9j3cxcqsf1qib706ihfhmlzxf7256l";
|
||||
};
|
||||
# https://webrtc-review.googlesource.com/c/src/+/255601
|
||||
webrtcWaylandScreenshareCoredumpFix = fetchurl {
|
||||
# PipeWire capturer: check existence of cursor metadata
|
||||
name = "webrtc-wayland-screenshare-coredump-fix.patch";
|
||||
url = "https://webrtc-review.googlesource.com/changes/src~255601/revisions/2/patch?download";
|
||||
hash = "sha256-PHGwEoYhMa+ZL2ner10FwdGUWUxsVr+HWuZOAEugYDY=";
|
||||
};
|
||||
|
||||
# The additional attributes for creating derivations based on the chromium
|
||||
# source tree.
|
||||
|
|
@ -169,9 +162,7 @@ let
|
|||
./patches/widevine-79.patch
|
||||
];
|
||||
|
||||
postPatch = optionalString (versionRange "100" "101") ''
|
||||
base64 --decode ${webrtcWaylandScreenshareCoredumpFix} | patch -p1 -d third_party/webrtc
|
||||
'' + ''
|
||||
postPatch = ''
|
||||
# remove unused third-party
|
||||
for lib in ${toString gnSystemLibraries}; do
|
||||
if [ -d "third_party/$lib" ]; then
|
||||
|
|
@ -289,7 +280,6 @@ let
|
|||
enable_widevine = true;
|
||||
# Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture:
|
||||
rtc_use_pipewire = true;
|
||||
} // optionalAttrs (chromiumVersionAtLeast "101") {
|
||||
# Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient):
|
||||
chrome_pgo_phase = 0;
|
||||
} // optionalAttrs proprietaryCodecs {
|
||||
|
|
|
|||
|
|
@ -45,19 +45,19 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "100.0.4896.127",
|
||||
"sha256": "0kgq38dy9mjyc44556i9gxhlsgd7dfvv1xi1ibk92b4p7i2y6427",
|
||||
"sha256bin64": "0mm6lix14bf4ca440dyccnq54z0qvn5c886ghfyzy2q0bqzbq4nh",
|
||||
"version": "101.0.4951.41",
|
||||
"sha256": "0dzsbr309n70jg7fpq2qfnrgcm4553akvdmnzhss1fc85s467609",
|
||||
"sha256bin64": "12nzzsp4040mwc7jah5w0p58ckv8s16wv6ylf6vlmfby06a4xlkq",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-01-21",
|
||||
"version": "2022-03-14",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "0725d7827575b239594fbc8fd5192873a1d62f44",
|
||||
"sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr"
|
||||
"rev": "bd99dbf98cbdefe18a4128189665c5761263bcfb",
|
||||
"sha256": "0nql15ckjqkm001xajq3qyn4h4q80i7x6dm9zinxxr1a8q5lppx3"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "100.0.4896.127-1",
|
||||
"sha256": "192kyhr0fa97csciv5kp496y9zwcsknwlrmdr4jic3rvv8ig1q9y"
|
||||
"rev": "101.0.4951.41-1",
|
||||
"sha256": "19m31bd04yvba3w5iymkxfjnmilas3cfp383m9fl6pd4wwhy9md0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "distrobox";
|
||||
version = "1.2.14";
|
||||
version = "1.2.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "89luca89";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-gHKyuIL4K/SLBJw8xNuPdNifDcHI91AFTiHaiv38gus=";
|
||||
sha256 = "sha256-9rivXnHyEE1MoGY+CwUeDStLGPVq+4FvwPjV7Nblk60=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ in
|
|||
};
|
||||
|
||||
security-framework-sys = attr: {
|
||||
propagatedBuildInputs = [ Security ];
|
||||
propagatedBuildInputs = lib.optional stdenv.isDarwin Security;
|
||||
};
|
||||
|
||||
sequoia-openpgp = attrs: {
|
||||
|
|
|
|||
|
|
@ -6,10 +6,12 @@ with lib; (mkCoqDerivation {
|
|||
inherit version;
|
||||
displayVersion = { tlc = false; };
|
||||
defaultVersion = with versions; switch coq.coq-version [
|
||||
{ case = range "8.13" "8.15"; out = "20211215"; }
|
||||
{ case = range "8.12" "8.13"; out = "20210316"; }
|
||||
{ case = range "8.10" "8.12"; out = "20200328"; }
|
||||
{ case = range "8.6" "8.12"; out = "20181116"; }
|
||||
] null;
|
||||
release."20211215".sha256 = "sha256:0m4d4jhdcyq8p2gpz9j3nd6jqzmz2bjmbpc0q06b38b8i550mamp";
|
||||
release."20210316".sha256 = "1hlavnx20lxpf2iydbbxqmim9p8wdwv4phzp9ypij93yivih0g4a";
|
||||
release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx";
|
||||
release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl";
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocclr";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ROCm-Developer-Tools";
|
||||
repo = "ROCclr";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-x6XwYxgiCoy6Q7gIevSTEWgUQ0aEjPFhKSqMqQahHig=";
|
||||
hash = "sha256-SFWEGKffhuiTE7ICbkElVV5cldXu4Xbwvjb6LiNmijA=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-comgr";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-CompilerSupport";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-EIBH7TXelo6mr+/vJ+iT+VLUVoQqWmNsgeN3Nwwr+tM=";
|
||||
hash = "sha256-zlCM3Zue7MEhL1c0gUPwRNgdjzyyF9BEP3UxE8RYkKk=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/lib/comgr";
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-device-libs";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCm-Device-Libs";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-eZdy9+BfuUVzPO6huvqcwCog96qMVTYoY3l6J0YMUZQ=";
|
||||
hash = "sha256-kmCk+BpM1QCJzEAkru2LK3CGwVXNUEZBFicmwnrPcx8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-runtime";
|
||||
version = "5.0.1";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCR-Runtime";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-KOzVZNHtpwEOn7lZ36c4BGrImrq8dkUWRiHqGm+UTDk=";
|
||||
hash = "sha256-MGm7YmnoFNk7VsxsbsUgSD9Y5r1OBm6Ycg3wXNme8EI=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-thunk";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "ROCT-Thunk-Interface";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-hhDLy92jS/akp1Ozun45OEjVbVcjufkRIfC8bqqFjp4=";
|
||||
hash = "sha256-Qvbvfe1fhoLTkDnzG0WzfAxbyDoEJwkzVvlBGTBkq0w=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -99,6 +99,6 @@ in buildPythonPackage rec {
|
|||
homepage = "https://github.com/Theano/Theano";
|
||||
description = "A Python library for large-scale array computation";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ maintainers.bcdarwin ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
39
pkgs/development/python-modules/exceptiongroup/default.nix
Normal file
39
pkgs/development/python-modules/exceptiongroup/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flit-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "exceptiongroup";
|
||||
version = "1.0.0rc2";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TSVLBSMb7R1DB5vc/g8dZsCrR4Pmd3oyk1X5t43jrYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
# Tests are only in the source available but tagged releases
|
||||
# are incomplete as files are generated during the release process
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"exceptiongroup"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Backport of PEP 654 (exception groups)";
|
||||
homepage = "https://github.com/agronholm/exceptiongroup";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.14.10";
|
||||
version = "0.16.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-mO0bKUepIjb50UKEOvFIaepHAskehkBajevsTRST8e4=";
|
||||
sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
lxml
|
||||
];
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
# no tests available
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
cudaArchList ? null,
|
||||
|
||||
# Native build inputs
|
||||
cmake, util-linux, linkFarm, symlinkJoin, which, pybind11,
|
||||
cmake, util-linux, linkFarm, symlinkJoin, which, pybind11, removeReferencesTo,
|
||||
|
||||
# Build inputs
|
||||
numactl,
|
||||
|
|
@ -220,6 +220,7 @@ in buildPythonPackage rec {
|
|||
which
|
||||
ninja
|
||||
pybind11
|
||||
removeReferencesTo
|
||||
] ++ lib.optionals cudaSupport [ cudatoolkit_joined ];
|
||||
|
||||
buildInputs = [ blas blas.provider ]
|
||||
|
|
@ -259,6 +260,8 @@ in buildPythonPackage rec {
|
|||
])
|
||||
];
|
||||
postInstall = ''
|
||||
find "$out/${python.sitePackages}/torch/include" "$out/${python.sitePackages}/torch/lib" -type f -exec remove-references-to -t ${stdenv.cc} '{}' +
|
||||
|
||||
mkdir $dev
|
||||
cp -r $out/${python.sitePackages}/torch/include $dev/include
|
||||
cp -r $out/${python.sitePackages}/torch/share $dev/share
|
||||
|
|
@ -273,7 +276,8 @@ in buildPythonPackage rec {
|
|||
--replace \''${_IMPORT_PREFIX}/lib "$lib/lib"
|
||||
|
||||
mkdir $lib
|
||||
cp -r $out/${python.sitePackages}/torch/lib $lib/lib
|
||||
mv $out/${python.sitePackages}/torch/lib $lib/lib
|
||||
ln -s $lib/lib $out/${python.sitePackages}/torch/lib
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk11, curl, autoPatchelfHook }:
|
||||
{ lib, stdenv, fetchzip, zlib, xorg, freetype, jdk11, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Semantic code analysis engine";
|
||||
homepage = "https://codeql.github.com";
|
||||
maintainers = [ maintainers.dump_stack ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
license = licenses.unfree;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-cmake";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "rocm-cmake";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-4PtLe864MQ9wUn+l1fshiiTQvP06ewD39TDYZl70Hgg=";
|
||||
hash = "sha256-7jLn0FIjsww1lu1J9MB0s/Ksnw66BL1U0jQwiwmgw64=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
22
pkgs/development/tools/fx/default.nix
Normal file
22
pkgs/development/tools/fx/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fx";
|
||||
version = "22.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "antonmedv";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-BoWb27sRqcYHSLhUvjRIRIkcj90FitpbrH2R3VHsRyI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZDPRKrum2tnhscZxLzslezYs/hOOtHwAORrAWoQhXbs=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Terminal JSON viewer";
|
||||
homepage = "https://github.com/antonmedv/fx";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,28 +9,28 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "0bgd4hnpaxrqw0s0y2qiak8lbskfi2cqp147vj1kbhvm8834hwhg";
|
||||
sha256 = "znaM00jM6yrpb+bGTxzJUxViCUzv4G+CYK2EB5dxhfY=";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
|
||||
sha256 = "06lf642m4imz8xvwipflmvjy1ih7k8bx8jpay0xawvilh14pqz8f";
|
||||
sha256 = "QIY4qGm333H5MWhe3CIfEieqTEk8st5A7SJHkwGnnxw=";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
|
||||
sha256 = "0rddafjgdnj3na96x83paq5z14grj46v4iv38qbkvmdllrj26a0a";
|
||||
sha256 = "eZbKoKYC2tt4Rxn5OJr7iA1aJlYFC0tpRmbLq7qSrIU=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
|
||||
sha256 = "YWiZnYdsW7dyQ0IeKeC1U00ZIdJRnzs9keeQTEU2ozA=";
|
||||
sha256 = "tn2vF3v7KfF7CfWqyydL5Iyh5tP9Tez87PJH+URgSIw=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
|
||||
sha256 = "391b0d239b11095bb8515cb60ee95f02d5862fcb509724081f314819967206b6";
|
||||
sha256 = "CRFlnqpX4j2CMGzS+UvXwNty2mHpONOjym6UJPE2Yg4=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
# compilers to determine the desired target.
|
||||
, defaultTargets ? []}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.0.1";
|
||||
version = "5.1.1";
|
||||
pname = "rocminfo";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "rocminfo";
|
||||
rev = "rocm-${version}";
|
||||
sha256 = "sha256-H9JdrDS/pbvYMKkayu/1rrXusHeXBH1CO9jYArsbCNI=";
|
||||
sha256 = "sha256-x+QJJtUvgtNS4116tJFWdJOUS8yV4o10mbTAUuxerkE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
let
|
||||
pname = "platformsh";
|
||||
version = "v3.78.0";
|
||||
version = "v3.79.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/platformsh/platformsh-cli/releases/download/${version}/platform.phar";
|
||||
sha256 = "sha256-2EasMsZIwplkl1S5PH0Y3gRymAIdpiFgVc3pNPiFg1o=";
|
||||
sha256 = "sha256-gTh1VS/b+D8E67w6Q4u9h0EhpFZiA2gBGe4mo49+9KY=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,17 @@
|
|||
{ lib, fetchFromGitHub, fetchpatch, python3 }:
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "heisenbridge";
|
||||
version = "1.10.1";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hifi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-c+YP4pEGvLi7wZsDXrkoqR/isuYfXQmTwQp9gN5jHkQ=";
|
||||
sha256 = "sha256-10y0sWpOLbjbGBpOjr1/tJrhcOsCwcm2sSO5kHfmJZA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
echo "${version}" > heisenbridge/version.txt
|
||||
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "irc >=19.0.0, <20.0" "irc"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-facebook";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "facebook";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-lIUGuc6ZL+GW7jw5OhPE3/mU5pg8Y09dd+p5kiy14io=";
|
||||
hash = "sha256-Yc8W8A11dnXrJdLtu/rJHTVlu2pEawXn5xuT8Ez+h9U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "0.2.3";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "signal";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P5a/JoL6PBkYDDitlkMj2QClvcXMgXcnup5EAatGcSs=";
|
||||
sha256 = "sha256-khtvfZbqBRQyHteil+H/b3EktjRet6DRcKMHmCClNq0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ let
|
|||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.25.0a5";
|
||||
version = "1.25.0a7";
|
||||
pname = "tulir-telethon";
|
||||
src = oldAttrs.src.override {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-WFiWczuw6eVVid2Z1LsnGE6BCEhqeCuiQ/p0d2Ahbi8=";
|
||||
sha256 = "sha256-+wHRrBluM0ejdHjIvSk28wOIfCfIyibBcmwG/ksbiac=";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
|
@ -25,14 +25,14 @@ let
|
|||
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-telegram";
|
||||
version = "0.11.2";
|
||||
disabled = python.pythonOlder "3.7";
|
||||
version = "0.11.3";
|
||||
disabled = python.pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "telegram";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZECTHAP5l9tAk9Ies8XuPpH9jqYDJSRSHVKz1lA6Sjg=";
|
||||
sha256 = "sha256-PfER/wqJ607w0xVrFZadzmxYyj72O10c2lIvCW7LT8Y=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-Re-add-entrypoint.patch ];
|
||||
|
|
|
|||
|
|
@ -14,16 +14,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dsq";
|
||||
version = "0.15.1";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "multiprocessio";
|
||||
repo = "dsq";
|
||||
rev = version;
|
||||
hash = "sha256-AT5M3o1cvRIZyyA28uX+AI4p9I3SzX3OCdBcIFGKspw=";
|
||||
hash = "sha256-emBLYiNOHYp3XsaY172DDtIdquj3U3U/Q6bogC3rvFQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-yfhLQBmWkG0ZLjI/ArLZkEGvClmZXkl0o7fEu5JqHM8=";
|
||||
vendorSha256 = "sha256-ZZDZ3FWgOpRJB+X1hrlP8Hh1n3l7jUd39H5MDz88wOs=";
|
||||
|
||||
ldflags = [ "-X" "main.Version=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/src/ui.zig b/src/ui.zig
|
||||
index 8401910..50171a7 100644
|
||||
--- a/src/ui.zig
|
||||
+++ b/src/ui.zig
|
||||
@@ -8,11 +8,11 @@ const main = @import("main.zig");
|
||||
const util = @import("util.zig");
|
||||
|
||||
pub const c = @cImport({
|
||||
+ @cDefine("_XOPEN_SOURCE", "1");
|
||||
@cInclude("stdio.h");
|
||||
@cInclude("string.h");
|
||||
@cInclude("curses.h");
|
||||
@cInclude("time.h");
|
||||
- @cDefine("_X_OPEN_SOURCE", "1");
|
||||
@cInclude("wchar.h");
|
||||
@cInclude("locale.h");
|
||||
});
|
||||
|
|
@ -1,18 +1,14 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, zig, ncurses }:
|
||||
{ lib, stdenv, fetchurl, zig, ncurses }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ncdu";
|
||||
version = "2.0";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-Zs2mgEdnsukbeM/cqCX5/a9qCkxuQAYloBrVWVQYR8w=";
|
||||
sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./c-import-order.patch # https://code.blicky.net/yorhel/ncdu/issues/183
|
||||
];
|
||||
|
||||
XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rocm-smi";
|
||||
version = "5.0.2";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RadeonOpenCompute";
|
||||
repo = "rocm_smi_lib";
|
||||
rev = "rocm-${version}";
|
||||
hash = "sha256-SQ6eBQzZ8CBD9RlIjt25FrOuWUSybBzx6ZzCOzHbxdI=";
|
||||
hash = "sha256-11o4xUyeQ3W/RPY62r8ahwcljKh/rkVSyTk5ruTU66U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake wrapPython ];
|
||||
|
|
|
|||
|
|
@ -3476,7 +3476,7 @@ with pkgs;
|
|||
|
||||
futhark = haskell.lib.compose.justStaticExecutables haskellPackages.futhark;
|
||||
|
||||
inherit (nodePackages) fx;
|
||||
fx = callPackage ../development/tools/fx { };
|
||||
|
||||
tllist = callPackage ../development/libraries/tllist { };
|
||||
|
||||
|
|
|
|||
|
|
@ -2751,6 +2751,8 @@ in {
|
|||
|
||||
exdown = callPackage ../development/python-modules/exdown { };
|
||||
|
||||
exceptiongroup = callPackage ../development/python-modules/exceptiongroup { };
|
||||
|
||||
exchangelib = callPackage ../development/python-modules/exchangelib { };
|
||||
|
||||
execnet = callPackage ../development/python-modules/execnet { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue