Merge staging-next into staging
This commit is contained in:
commit
34de158a5f
@ -106,6 +106,7 @@ stdenvNoCC.mkDerivation {
|
||||
--arg nixpkgsPath "./." \
|
||||
--argstr revision ${nixpkgs.rev or "master"} \
|
||||
--argstr libsetsJSON ${lib.escapeShellArg (builtins.toJSON libsets)} \
|
||||
--store $(mktemp -d) \
|
||||
> locations.json
|
||||
|
||||
function docgen {
|
||||
|
@ -6,7 +6,11 @@ let
|
||||
cfg = config.services.samba;
|
||||
|
||||
settingsFormat = pkgs.formats.ini { };
|
||||
configFile = settingsFormat.generate "smb.conf" cfg.settings;
|
||||
# Ensure the global section is always first
|
||||
globalConfigFile = settingsFormat.generate "smb-global.conf" { global = cfg.settings.global; };
|
||||
sharesConfigFile = settingsFormat.generate "smb-shares.conf" (lib.removeAttrs cfg.settings [ "global" ]);
|
||||
|
||||
configFile = pkgs.concatText "smb.conf" [ globalConfigFile sharesConfigFile ];
|
||||
|
||||
in
|
||||
|
||||
|
@ -12,7 +12,9 @@ in {
|
||||
enable = true;
|
||||
settings = {
|
||||
exporters.logging.verbosity = "detailed";
|
||||
receivers.otlp.protocols.http = {};
|
||||
receivers.otlp.protocols = {
|
||||
http.endpoint = "0.0.0.0:${toString port}";
|
||||
};
|
||||
service = {
|
||||
pipelines.logs = {
|
||||
receivers = [ "otlp" ];
|
||||
|
@ -62,13 +62,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audacity";
|
||||
version = "3.6.2";
|
||||
version = "3.6.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "audacity";
|
||||
repo = "audacity";
|
||||
rev = "Audacity-${version}";
|
||||
hash = "sha256-x3UeZM00kmZB3IG9EBx1jssyWmC3gcYTPtwMmJNSzgM=";
|
||||
hash = "sha256-fjEUo0NY/ZOujtgpWTXHLaMjzAlel3xHY+erzxLi5kQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "indicator-sound-switcher";
|
||||
version = "2.3.9";
|
||||
version = "2.3.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yktoo";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-qJ1lg9A1aCM+/v/JbQAVpYGX25qA5ULqsM8k7uH1uvQ=";
|
||||
sha256 = "sha256-Benhlhz81EgL6+pmjzyruKBOS6O7ce5PPmIIzk2Zong=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "lnd";
|
||||
version = "0.18.2-beta";
|
||||
version = "0.18.3-beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lightningnetwork";
|
||||
repo = "lnd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-qqvLnJlFGeCizm6T9iUwvYLjWpAeZwbuzQlUUopwrjc=";
|
||||
hash = "sha256-CNCMVYuLUVmNgW5YTTn3TR1+2UCLbF3/gXXZWiREj/E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BxNtZzwmKJ/kZk7ndtEUC4bMGpd8LEhFFu4Z49bKydE=";
|
||||
vendorHash = "sha256-dr8Ra8ywy+Zow8JF3K21XZ7lDIIdxvjRz+OD3E+348o=";
|
||||
|
||||
subPackages = [ "cmd/lncli" "cmd/lnd" ];
|
||||
|
||||
|
@ -313,8 +313,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-apollo";
|
||||
publisher = "apollographql";
|
||||
version = "1.19.11";
|
||||
hash = "sha256-EixefDuJiw/p5yAR/UQLK1a1RXJLXlTmOlD34qpAN+U=";
|
||||
version = "2.2.0";
|
||||
hash = "sha256-9CKm9SLotPlwkAELb7Us/blK959HVt6eXiDp0fgVLmA=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog";
|
||||
|
@ -41,11 +41,11 @@ let
|
||||
isx86Linux = stdenv.hostPlatform.system == "x86_64-linux";
|
||||
supported = {
|
||||
x86_64-linux = {
|
||||
hash = "sha256-jibImnpRtshbHu21JeS4VxL1jETm3Ein8S/M73UXc2w=";
|
||||
hash = "sha256-ek4WBr9ZJ87TXlKQowA68YNt3WNOXymLcVfz1g+Be2o=";
|
||||
arch = "linux-x64";
|
||||
};
|
||||
aarch64-linux = {
|
||||
hash = "sha256-7UagRO7qHyT1JIvvTSx9+USYrnDRXJ2wnXPLaBHRc3k=";
|
||||
hash = "sha256-2+JqosgyoMRFnl8fnCrKljkdF3eU72mXy30ZUnaIerA=";
|
||||
arch = "linux-arm64";
|
||||
};
|
||||
};
|
||||
@ -58,7 +58,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = base // {
|
||||
name = "cpptools";
|
||||
publisher = "ms-vscode";
|
||||
version = "1.21.4";
|
||||
version = "1.22.2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -186,6 +186,28 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
done
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckInputs = with python3Packages; [
|
||||
fonttools
|
||||
psutil
|
||||
];
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
ETN='--exclude-test-name'
|
||||
EXCLUDED_FLAGS=(
|
||||
$ETN 'test_7z' # we don't include 7z support
|
||||
$ETN 'test_zstd' # we don't include zstd support
|
||||
$ETN 'test_qt' # we don't include svg or webp support
|
||||
$ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused
|
||||
${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"}
|
||||
)
|
||||
|
||||
python setup.py test ''${EXCLUDED_FLAGS[@]}
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://calibre-ebook.com";
|
||||
description = "Comprehensive e-book software";
|
||||
|
@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
||||
if stdenv.isAarch64 then
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.69.162";
|
||||
version = "1.69.168";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-uG3I91XyuEn/ZFjlv84041ZTCslkC5XElag/4R7MBHc=";
|
||||
hash = "sha256-ZSFhbj/Tw+jOaFP2HHnn74DO2w4l37upS+rxLcF5P9I=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.isx86_64 then
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.69.162";
|
||||
version = "1.69.168";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-O8sf0sw6ljemNdSJwHyX2JjqQWEuKvSP9hj0H2VXQC8=";
|
||||
hash = "sha256-smLyA4eZAw62BfbPPFKjKaZd8FJ1FMSV1SUWXCFCzD4=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
@ -54,15 +54,15 @@
|
||||
|
||||
let
|
||||
version = {
|
||||
corporate = "24.4.3.1073-1";
|
||||
beta = "24.4.1.952-1";
|
||||
stable = "24.4.1.951-1";
|
||||
corporate = "24.7.1.1195-1";
|
||||
beta = "24.7.1.1124-1";
|
||||
stable = "24.7.1.1120-1";
|
||||
}.${edition};
|
||||
|
||||
hash = {
|
||||
corporate = "sha256-f2Q6q3rL+RcVYX46RHRAageF2JKPxmBaV6KHYl5XtN8=";
|
||||
beta = "sha256-WCyjgb5uj9guqyge6giP0wavndorlMG6yacG134xWjw=";
|
||||
stable = "sha256-4AsMpANtMXUS2NCPKI+Ut0tWGurRIpWCmS3PhEi1CGo=";
|
||||
corporate = "sha256-HPEUeIZl9nRhMzrMv4MzIOnbF8mJ789vCtTWf9TcCH4=";
|
||||
beta = "sha256-vcX/9MWqeUd/YlczHivcL6+TignE8Nk6rO5DaCjf2SQ=";
|
||||
stable = "sha256-wrYPQ8WrttF/tlafA0+e3eDZMq9SFmLk5NOIeHQr14U=";
|
||||
}.${edition};
|
||||
|
||||
app = {
|
||||
|
@ -1,14 +1,14 @@
|
||||
{
|
||||
rke2Version = "1.30.3+rke2r1";
|
||||
rke2RepoSha256 = "1ix7mm11j9ir9xz0yypznja5mcbizibclh314sgcsfxhg39w4a70";
|
||||
rke2Commit = "e742dc53b463d205773cfb25633309671ce6777c";
|
||||
rke2VendorHash = "sha256-6ma0t0ElZ13VTS/aK5AknJ00F45kZXn36b5sePK2wh0=";
|
||||
k8sVersion = "v1.30.3";
|
||||
k8sImageTag = "v1.30.3-rke2r1-build20240717";
|
||||
rke2Version = "1.31.0+rke2r1";
|
||||
rke2RepoSha256 = "1xf7yhpfwiydhl31dd8wc2bhq0j470ad8vazjzzsl76skcy07rbc";
|
||||
rke2Commit = "4bf1156f41631dc0e81d66a6834a53d14b48aaef";
|
||||
rke2VendorHash = "sha256-/ALzC2fYYI+DbF+2TSNBiMy57T8wfXGPpdyKtbqdrtE=";
|
||||
k8sVersion = "v1.31.0";
|
||||
k8sImageTag = "v1.31.0-rke2r1-build20240815";
|
||||
etcdVersion = "v3.5.13-k3s1";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.29.3-build20240515";
|
||||
dockerizedVersion = "v1.30.3-dev.";
|
||||
dockerizedVersion = "v1.31.0-dev.";
|
||||
golangVersion = "go1.22.5";
|
||||
eol = "2025-06-28";
|
||||
eol = "2025-10-28";
|
||||
}
|
||||
|
@ -1,14 +1,14 @@
|
||||
{
|
||||
rke2Version = "1.28.11+rke2r1";
|
||||
rke2RepoSha256 = "1mkl7mnlsq2j9n610jnr9545hq6ilr5sdg8jxjxjbk9lnmmbvrm1";
|
||||
rke2Commit = "6b12d7a783238b72da8450fa1b6ec587cebb79ed";
|
||||
rke2VendorHash = "sha256-VenNSaa86nbhrFYzXPbj0fxbDlrIu6pxqMo+HPDuUxs=";
|
||||
k8sVersion = "v1.28.11";
|
||||
k8sImageTag = "v1.28.11-rke2r1-build20240619";
|
||||
rke2Version = "1.30.4+rke2r1";
|
||||
rke2RepoSha256 = "1daxs8gxy775qn1yrf7zh77cyaj3nn3qlwj0vjqfpbv1gpkimfyi";
|
||||
rke2Commit = "9517eea519b780e154dd791c555c698e84a0e5cd";
|
||||
rke2VendorHash = "sha256-Q+Wt4Hyp6VyxfCXNsRQMyAo0QCGWhnY9tcV/NQrrSEY=";
|
||||
k8sVersion = "v1.30.4";
|
||||
k8sImageTag = "v1.30.4-rke2r1-build20240815";
|
||||
etcdVersion = "v3.5.13-k3s1";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.29.3-build20240515";
|
||||
dockerizedVersion = "v1.28.11-rke2r1";
|
||||
golangVersion = "go1.21.11";
|
||||
eol = "2024-10-28";
|
||||
dockerizedVersion = "v1.30.4-dev.877838a0-dirty";
|
||||
golangVersion = "go1.22.5";
|
||||
eol = "2025-06-28";
|
||||
}
|
||||
|
@ -1,14 +1,14 @@
|
||||
{
|
||||
rke2Version = "1.30.3-rc5+rke2r1";
|
||||
rke2RepoSha256 = "1ix7mm11j9ir9xz0yypznja5mcbizibclh314sgcsfxhg39w4a70";
|
||||
rke2Commit = "e742dc53b463d205773cfb25633309671ce6777c";
|
||||
rke2VendorHash = "sha256-6ma0t0ElZ13VTS/aK5AknJ00F45kZXn36b5sePK2wh0=";
|
||||
k8sVersion = "v1.30.3";
|
||||
k8sImageTag = "v1.30.3-rke2r1-build20240717";
|
||||
rke2Version = "1.31.0-rc1+rke2r1";
|
||||
rke2RepoSha256 = "0mfl01rv6xn2kg2739215j9hsyym16mgp92bqsz0hkpfm61dd96j";
|
||||
rke2Commit = "3acd10e9389fa930860896ca6ed925a15dff61a3";
|
||||
rke2VendorHash = "sha256-/ALzC2fYYI+DbF+2TSNBiMy57T8wfXGPpdyKtbqdrtE=";
|
||||
k8sVersion = "v1.31.0";
|
||||
k8sImageTag = "v1.31.0-rke2r1-build20240815";
|
||||
etcdVersion = "v3.5.13-k3s1";
|
||||
pauseVersion = "3.6";
|
||||
ccmVersion = "v1.29.3-build20240515";
|
||||
dockerizedVersion = "v1.30.3-dev.";
|
||||
dockerizedVersion = "v1.31.0-dev.";
|
||||
golangVersion = "go1.22.5";
|
||||
eol = "2025-06-28";
|
||||
eol = "2025-10-28";
|
||||
}
|
||||
|
@ -10,20 +10,20 @@
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armcord";
|
||||
version = "3.3.0";
|
||||
version = "3.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ArmCord";
|
||||
repo = "ArmCord";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-nVirmGgR5yssMRXFUialMjTTSEa5nVNtue207eYUJCg=";
|
||||
hash = "sha256-rCcjanmr4s9Nc5QB3Rb5ptKF/Ge8PSZt0WvgIul3RGs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pnpm.configHook nodejs makeWrapper copyDesktopItems ];
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit pname version src;
|
||||
hash = "sha256-ETnTWErdOIdcyK/v42bx+dFPPt+Lc0Lxyzo+RpxvEjU=";
|
||||
hash = "sha256-ZfErOj03NdkviNXV4bvZC8uPOk29RhgmSez/Qvw1sGo=";
|
||||
};
|
||||
|
||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
@ -37,11 +37,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "kstars";
|
||||
version = "3.7.0";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kstars/kstars-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-yvN1k0LqUi5Odb34Nk8UP5qoIbFUcvUiyESpoMKmuqg=";
|
||||
url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-fEu3BGBW5cgrY38zBB3iL0/SRrobEtJVsGNWRNtT40s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -1,24 +1,54 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, flex, bison, perl, TextFormat,
|
||||
libminc, libjpeg, nifticlib, zlib }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
makeWrapper,
|
||||
flex,
|
||||
bison,
|
||||
perl,
|
||||
TextFormat,
|
||||
libminc,
|
||||
libjpeg,
|
||||
nifticlib,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "minc-tools";
|
||||
version = "unstable-2020-07-25";
|
||||
pname = "minc-tools";
|
||||
version = "2.3.06-unstable-2023-08-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BIC-MNI";
|
||||
repo = pname;
|
||||
rev = "fb0a68a07d281e4e099c5d54df29925240de14c1";
|
||||
sha256 = "0zcv2sdj3k6k0xjqdq8j5bxq8smm48dzai90vwsmz8znmbbm6kvw";
|
||||
owner = "BIC-MNI";
|
||||
repo = pname;
|
||||
rev = "c86a767dbb63aaa05ee981306fa09f6133bde427";
|
||||
hash = "sha256-PLNcuDU0ht1PcjloDhrPzpOpE42gbhPP3rfHtP7WnM4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison makeWrapper ];
|
||||
buildInputs = [ libminc libjpeg nifticlib zlib ];
|
||||
propagatedBuildInputs = [ perl TextFormat ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
flex
|
||||
bison
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake"
|
||||
"-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti"
|
||||
"-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti" ];
|
||||
buildInputs = [
|
||||
libminc
|
||||
libjpeg
|
||||
nifticlib
|
||||
zlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
perl
|
||||
TextFormat
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLIBMINC_DIR=${libminc}/lib/cmake"
|
||||
"-DZNZ_INCLUDE_DIR=${nifticlib}/include/nifti"
|
||||
"-DNIFTI_INCLUDE_DIR=${nifticlib}/include/nifti"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
for prog in minccomplete minchistory mincpik; do
|
||||
@ -31,6 +61,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Command-line utilities for working with MINC files";
|
||||
maintainers = with maintainers; [ bcdarwin ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.free;
|
||||
license = licenses.free;
|
||||
};
|
||||
}
|
||||
|
@ -39,7 +39,7 @@
|
||||
, pcre2
|
||||
, libdeflate
|
||||
|
||||
, swig4
|
||||
, swig
|
||||
, python
|
||||
, wxPython
|
||||
, opencascade-occt_7_6
|
||||
@ -168,7 +168,7 @@ stdenv.mkDerivation rec {
|
||||
curl
|
||||
openssl
|
||||
boost
|
||||
swig4
|
||||
swig
|
||||
python
|
||||
unixODBC
|
||||
libdeflate
|
||||
|
@ -8,7 +8,7 @@
|
||||
, flex
|
||||
, git
|
||||
, python3
|
||||
, swig4
|
||||
, swig
|
||||
, boost179
|
||||
, cbc # for clp
|
||||
, cimg
|
||||
@ -51,7 +51,7 @@ mkDerivation rec {
|
||||
flex
|
||||
git
|
||||
pkg-config
|
||||
swig4
|
||||
swig
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
@ -40,8 +40,8 @@ let
|
||||
source =
|
||||
if enablePlumed then
|
||||
{
|
||||
version = "2023";
|
||||
hash = "sha256-rJLG2nL7vMpBT9io2Xnlbs8XxMHNq+0tpc+05yd7e6g=";
|
||||
version = "2024.2";
|
||||
hash = "sha256-gCp+M18uiVdw9XsVnk7DaOuw/yzm2sz3BsboAlw2hSs=";
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
|
||||
patches = [ ./pkgconfig.patch ];
|
||||
|
||||
postPatch = lib.optionalString enablePlumed ''
|
||||
plumed patch -p -e gromacs-2023
|
||||
plumed patch -p -e gromacs-${source.version}
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
@ -49,6 +49,14 @@ let
|
||||
# "-P" CPPFLAG is needed to build Python bindings and subversionClient
|
||||
CPPFLAGS = [ "-P" ];
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
|
||||
"-Wno-error=implicit-function-declaration"
|
||||
"-Wno-error=implicit-int"
|
||||
"-Wno-int-conversion"
|
||||
];
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString needsAutogen ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildLua {
|
||||
pname = "mpv-thumbfast";
|
||||
version = "0-unstable-2023-12-08";
|
||||
version = "0-unstable-2024-08-02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "po5";
|
||||
repo = "thumbfast";
|
||||
rev = "03e93feee5a85bf7c65db953ada41b4826e9f905";
|
||||
hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c=";
|
||||
rev = "f1fdf10b17f394f2d42520d0e9bf22feaa20a9f4";
|
||||
hash = "sha256-cygLf+0PMH7cVXBcY12PdcxBHmy38DNoXQubKAlerHM=";
|
||||
};
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
|
@ -29,7 +29,7 @@
|
||||
, wrapGAppsHook3
|
||||
, scriptingSupport ? true
|
||||
, luajit
|
||||
, swig4
|
||||
, swig
|
||||
, python3
|
||||
, alsaSupport ? stdenv.isLinux
|
||||
, alsa-lib
|
||||
@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
wrapGAppsHook3
|
||||
wrapQtAppsHook
|
||||
]
|
||||
++ optional scriptingSupport swig4;
|
||||
++ optional scriptingSupport swig;
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
|
@ -10,18 +10,18 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "auto-changelog";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cookpete";
|
||||
repo = "auto-changelog";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I=";
|
||||
hash = "sha256-ticQpDOQieLaWXfavDKIH0jSenRimp5QYeJy42BjpKw=";
|
||||
};
|
||||
|
||||
yarnOfflineCache = fetchYarnDeps {
|
||||
yarnLock = "${finalAttrs.src}/yarn.lock";
|
||||
hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ=";
|
||||
hash = "sha256-NGQbzogQi0XbeGd7fYNyw0i9Yo9j91CfeTdO7nhq4Yw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
elfutils,
|
||||
enablePython ? false,
|
||||
pythonPackages ? null,
|
||||
swig4,
|
||||
swig,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals enablePython [
|
||||
swig4
|
||||
swig
|
||||
pythonPackages.setuptools
|
||||
];
|
||||
buildInputs = [
|
||||
|
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "brainflow";
|
||||
version = "5.13.2";
|
||||
version = "5.13.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brainflow-dev";
|
||||
repo = "brainflow";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-1SP0X1KcnVB/HQkbYBZqSmLS3LZYvylPOP4pWm7oFu4=";
|
||||
hash = "sha256-LFiDyNuWbEAKU0Rl+n7ozxr5CM4NLphR2o9bYHw6xJY=";
|
||||
};
|
||||
|
||||
patches = [ ];
|
||||
|
@ -30,7 +30,7 @@
|
||||
#sundials,
|
||||
superscs,
|
||||
spral,
|
||||
swig4,
|
||||
swig,
|
||||
tinyxml-2,
|
||||
withUnfree ? false,
|
||||
}:
|
||||
@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
#sundials
|
||||
superscs
|
||||
spral
|
||||
swig4
|
||||
swig
|
||||
tinyxml-2
|
||||
]
|
||||
++ lib.optionals withUnfree [
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cimg";
|
||||
version = "3.4.0";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GreycLab";
|
||||
repo = "CImg";
|
||||
rev = "refs/tags/v.${finalAttrs.version}";
|
||||
hash = "sha256-BnDS1n1aIQh9HJZeZv0hR7vo2l6Kf9B/11fYFbb/cpQ=";
|
||||
hash = "sha256-lYs8V/phdyM1kpcxBDS3vAjxFgGCaaOCdNHU3//dgDs=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cirrus-cli";
|
||||
version = "0.125.1";
|
||||
version = "0.126.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cirruslabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QlQ1TaS6iUXNVF5SXyBmbcIBQfD6R7nKjPeOjRuvSds=";
|
||||
hash = "sha256-9HjZI3MQBI24Ut3CI2hMOlRtZExoJtMXfd/HmSSICx0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-BbBwia47E6EtoEzO2c2fhjg6WHGHTnzl5VyVYxIMu6E=";
|
||||
vendorHash = "sha256-PecNBlSoo8WN2FKXN/UpkqpqbsJkOPHKILy76YWgNlw=";
|
||||
|
||||
ldflags = [
|
||||
"-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
|
||||
|
@ -8,6 +8,8 @@
|
||||
wrapGAppsHook3,
|
||||
v2ray-geoip,
|
||||
v2ray-domain-list-community,
|
||||
copyDesktopItems,
|
||||
makeDesktopItem,
|
||||
}:
|
||||
let
|
||||
pname = "clash-verge-rev";
|
||||
@ -101,7 +103,22 @@ stdenv.mkDerivation {
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "clash-verge";
|
||||
exec = "clash-verge";
|
||||
comment = "Clash Verge Rev";
|
||||
type = "Application";
|
||||
icon = "clash-verge";
|
||||
desktopName = "Clash Verge Rev";
|
||||
terminal = false;
|
||||
categories = [ "Network" ];
|
||||
})
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
@ -3,18 +3,24 @@
|
||||
, fetchFromGitHub
|
||||
}: buildGoModule rec {
|
||||
pname = "cntb";
|
||||
version = "1.4.8";
|
||||
version = "1.4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "contabo";
|
||||
repo = "cntb";
|
||||
rev = version;
|
||||
hash = "sha256-Cj1PO82JeztThFAHR4/8UyqKrodgxBqVDMDsun3iGDo=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-clDIrZdvEy4oO0ZvqDNLJbr4Ij8D5dcyZPxey6zLV6Q=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorHash = "sha256-4PhLUUtlnRh2dKkeVD7rZDDVP0eTDVAohvLLftQxQyE=";
|
||||
vendorHash = "sha256-IBDVHQe6OOGQ27G7uXKRtavy4tnCvIbL07j969/E9Vg=";
|
||||
|
||||
ldflags = [
|
||||
"-X contabo.com/cli/cntb/cmd.version=${src.rev}"
|
||||
"-X contabo.com/cli/cntb/cmd.commit=${src.rev}"
|
||||
"-X contabo.com/cli/cntb/cmd.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI tool for managing your products from Contabo like VPS and VDS";
|
||||
|
@ -4,15 +4,16 @@
|
||||
, fetchFromGitHub
|
||||
, nix-update-script
|
||||
, installShellFiles
|
||||
, versionCheckHook
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
gitSrc = fetchFromGitHub {
|
||||
owner = "glasskube";
|
||||
repo = "glasskube";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0ndYFpfijuBSODdl5XJah6/avLE1Bf6OZ0p0KGRB3dw=";
|
||||
hash = "sha256-MRmT7DqD6Tlej5Y/LVr++RcMjWlGA9xFe3FNYgxIPvM=";
|
||||
};
|
||||
web-bundle = buildNpmPackage rec {
|
||||
inherit version;
|
||||
@ -20,7 +21,7 @@ let
|
||||
|
||||
src = gitSrc;
|
||||
|
||||
npmDepsHash = "sha256-BcYrZ95BLxKXQ4c1bHqNZKT9Tv4rAK72WSwrjhIsASY=";
|
||||
npmDepsHash = "sha256-246xQz1eI3WmJxSrKe6Q/oUQtZMjpa4mYwOIqSukyo8=";
|
||||
|
||||
dontNpmInstall = true;
|
||||
|
||||
@ -40,7 +41,7 @@ in buildGo123Module rec {
|
||||
|
||||
src = gitSrc;
|
||||
|
||||
vendorHash = "sha256-BTJzhKf8aGHKbG0fdWVRWy0rFob9ZSTH45ME+4rdohU=";
|
||||
vendorHash = "sha256-RUUDIPuCxV+JwPLNxLALEmRIJ68XSNPtfwchuAJJYn0=";
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
@ -54,6 +55,8 @@ in buildGo123Module rec {
|
||||
subPackages = [ "cmd/glasskube" "cmd/package-operator" ];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
doInstallCheck = true;
|
||||
|
||||
preBuild = ''
|
||||
cp -r ${web-bundle}/bundle internal/web/root/static/bundle
|
||||
|
@ -49,13 +49,13 @@ assert lib.assertMsg
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}";
|
||||
version = "3.4.0";
|
||||
version = "3.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c-koi";
|
||||
repo = "gmic-qt";
|
||||
rev = "v.${finalAttrs.version}";
|
||||
hash = "sha256-IZMvvhWQwbnyxF3CkvEjySl3o3DB6UucpjqOFR9NjQ0=";
|
||||
hash = "sha256-fM6dBxBC2b1/v+rfiP//QaAcTJmMtYPn4OUNwVqKhYk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "httping";
|
||||
version = "3.6";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "folkertvanheusden";
|
||||
repo = "HTTPing";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-lDgQC3VzfcLqMOQSaRZ/znMamAAGYq/9C9bHgI4G7B8=";
|
||||
hash = "sha256-JtsPtrj/ZineBokEytbkZdAfjVLTkiaNcGtKVJlKm38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -27,7 +27,7 @@ let
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "jellyfin-web";
|
||||
version = "10.9.10";
|
||||
version = "10.9.11";
|
||||
|
||||
src =
|
||||
assert version == jellyfin.version;
|
||||
@ -35,10 +35,10 @@ buildNpmPackage' rec {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin-web";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6t/kCuMbSug1q1EdQFAMqf/sWa+LAO46OUG0FL84UiE=";
|
||||
hash = "sha256-zt0Exx/4B5gqiN3fxvQuVh1MqRNNtJG6/G0/reqVHRc=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-R4myooMkKdvOFvyNqKIlZ2GozNOkg8YNTvomkt4aRIU=";
|
||||
npmDepsHash = "sha256-kQxfh8o8NBshKmmjQrLdxiOQK83LG+lxhZwzDkEJwEo=";
|
||||
|
||||
npmBuildScript = [ "build:production" ];
|
||||
|
||||
|
@ -13,13 +13,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "jellyfin";
|
||||
version = "10.9.10"; # ensure that jellyfin-web has matching version
|
||||
version = "10.9.11"; # ensure that jellyfin-web has matching version
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jellyfin";
|
||||
repo = "jellyfin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tkSQ7BKic/MD7xcvAPHeFb/RDz++KTLhmAzR4cv1q10=";
|
||||
sha256 = "sha256-gZJIsNKXwhUUVgJh8vXuGSu9DEyrVY8NuIeyZHHQKN4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sqlite ];
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcpuid";
|
||||
version = "0.6.5";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anrieff";
|
||||
repo = "libcpuid";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Bq16UH4IUR7dU57bGHKq8P6JsjaB4arOJ4zFeNyxXSg=";
|
||||
sha256 = "sha256-OZfsEk6sTTvwgAetjilSWbkfC1nMQnPH3oL0IeuqObA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
@ -1,20 +1,21 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, scdoc
|
||||
, systemd
|
||||
, pango
|
||||
, cairo
|
||||
, gdk-pixbuf
|
||||
, jq
|
||||
, bash
|
||||
, wayland
|
||||
, wayland-scanner
|
||||
, wayland-protocols
|
||||
, wrapGAppsHook3
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
scdoc,
|
||||
systemd,
|
||||
pango,
|
||||
cairo,
|
||||
gdk-pixbuf,
|
||||
jq,
|
||||
bash,
|
||||
wayland,
|
||||
wayland-scanner,
|
||||
wayland-protocols,
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@ -30,8 +31,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 wayland-scanner ];
|
||||
buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
scdoc
|
||||
wayland-protocols
|
||||
wrapGAppsHook3
|
||||
wayland-scanner
|
||||
];
|
||||
buildInputs = [
|
||||
systemd
|
||||
pango
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
wayland
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dzsh-completions=true"
|
||||
@ -40,15 +55,31 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix PATH : "${lib.makeBinPath [ systemd /* for busctl */ jq bash ]}"
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
systemd # for busctl
|
||||
jq
|
||||
bash
|
||||
]
|
||||
}"
|
||||
)
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/systemd/user
|
||||
substitute $src/contrib/systemd/mako.service $out/lib/systemd/user/mako.service \
|
||||
--replace-fail '/usr/bin' "$out/bin"
|
||||
chmod 0644 $out/lib/systemd/user/mako.service
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Lightweight Wayland notification daemon";
|
||||
homepage = "https://wayland.emersion.fr/mako/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dywedir synthetica ];
|
||||
maintainers = with lib.maintainers; [
|
||||
dywedir
|
||||
synthetica
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
mainProgram = "mako";
|
||||
};
|
||||
|
@ -10,6 +10,7 @@
|
||||
glib,
|
||||
glm,
|
||||
gtest,
|
||||
json_c,
|
||||
libevdev,
|
||||
libglvnd,
|
||||
libnotify,
|
||||
@ -26,13 +27,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "miracle-wm";
|
||||
version = "0.3.2";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattkae";
|
||||
repo = "miracle-wm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-T5KDnUy/+wRL74v48i3D1OQrHuIoI1WUeybx9D7y+8Y=";
|
||||
hash = "sha256-2OoMkD4ChNXzqqzdOvzYRL0UYU7Uecm5yTXCvG45jCI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
glib
|
||||
glm
|
||||
json_c
|
||||
libevdev
|
||||
libglvnd
|
||||
libnotify
|
||||
|
@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "nom";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guyfedwards";
|
||||
repo = "nom";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0CWiSDE9DbkvfKq06DwufhQucaR80vEhQU+X5Lg0HWI=";
|
||||
hash = "sha256-V4ppqHQjPkkRKHkDHzEr05vOyv3BhiLnYxEftIn08XU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xolhwdWRjYZMgwI4jq0fGzvxnNjx6EplvZC7XMvBw+M=";
|
||||
|
@ -1,18 +0,0 @@
|
||||
{ writeShellApplication
|
||||
|
||||
, monado
|
||||
, opencomposite
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "opencomposite-helper";
|
||||
text = ''
|
||||
# Tell Proton to use OpenComposite instead of OpenVR
|
||||
export VR_OVERRIDE=${opencomposite}/lib/opencomposite
|
||||
# Help OpenComposite find the OpenXR runtime
|
||||
export XR_RUNTIME_JSON=${monado}/share/openxr/1/openxr_monado.json
|
||||
# Tell Steam Pressure Vessel to allow access to Monado
|
||||
export PRESSURE_VESSEL_FILESYSTEMS_RW=$XDG_RUNTIME_DIR/monado_comp_ipc
|
||||
exec "$@"
|
||||
'';
|
||||
}
|
||||
|
15
pkgs/by-name/pi/picocom/lrzsz-path.patch
Normal file
15
pkgs/by-name/pi/picocom/lrzsz-path.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff --git a/picocom.c b/picocom.c
|
||||
index ba2f9bd666..d4df60f2d3 100644
|
||||
--- a/picocom.c
|
||||
+++ b/picocom.c
|
||||
@@ -243,8 +243,8 @@
|
||||
.send_cmd = "",
|
||||
.receive_cmd = "",
|
||||
#else
|
||||
- .send_cmd = "sz -vv",
|
||||
- .receive_cmd = "rz -vv -E",
|
||||
+ .send_cmd = "@lrzsz@/bin/sz -vv",
|
||||
+ .receive_cmd = "@lrzsz@/bin/rz -vv -E",
|
||||
#endif
|
||||
.imap = M_I_DFL,
|
||||
.omap = M_O_DFL,
|
66
pkgs/by-name/pi/picocom/package.nix
Normal file
66
pkgs/by-name/pi/picocom/package.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitLab,
|
||||
replaceVars,
|
||||
pkg-config,
|
||||
go-md2man,
|
||||
installShellFiles,
|
||||
linenoise,
|
||||
darwin,
|
||||
lrzsz,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "picocom";
|
||||
version = "2024-07";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "wsakernel";
|
||||
repo = "picocom";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-cQoEfi75iltjeAm26NvXgfrL7d1Hm+1veQ4dVe0S1q8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./use-system-linenoise.patch
|
||||
(replaceVars ./lrzsz-path.patch { inherit lrzsz; })
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
go-md2man
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
linenoise
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];
|
||||
|
||||
makeFlags = [
|
||||
"HISTFILE=.cache/picocom_history"
|
||||
"all"
|
||||
"doc"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm555 -t $out/bin picocom
|
||||
installManPage picocom.1
|
||||
installShellCompletion --bash bash_completion/picocom
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Minimal dumb-terminal emulation program";
|
||||
homepage = "https://gitlab.com/wsakernel/picocom";
|
||||
changelog = "https://gitlab.com/wsakernel/picocom/-/releases";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "picocom";
|
||||
};
|
||||
})
|
30
pkgs/by-name/pi/picocom/use-system-linenoise.patch
Normal file
30
pkgs/by-name/pi/picocom/use-system-linenoise.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8fca24ee38..33b59b5b96 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -39,9 +39,9 @@
|
||||
## Comment these out to disable "linenoise"-library support
|
||||
HISTFILE = .picocom_history
|
||||
CPPFLAGS += -DHISTFILE=\"$(HISTFILE)\" \
|
||||
- -DLINENOISE
|
||||
-OBJS += linenoise-1.0/linenoise.o
|
||||
-linenoise-1.0/linenoise.o : linenoise-1.0/linenoise.c linenoise-1.0/linenoise.h
|
||||
+ -DLINENOISE \
|
||||
+ $(shell pkg-config --cflags linenoise)
|
||||
+LDFLAGS += $(shell pkg-config --libs linenoise)
|
||||
|
||||
## Comment this in to enable (force) custom baudrate support
|
||||
## even on systems not enabled by default.
|
||||
diff --git a/picocom.c b/picocom.c
|
||||
index 775ee9c3bb..ba2f9bd666 100644
|
||||
--- a/picocom.c
|
||||
+++ b/picocom.c
|
||||
@@ -48,7 +48,7 @@
|
||||
#include "split.h"
|
||||
#include "term.h"
|
||||
#ifdef LINENOISE
|
||||
-#include "linenoise-1.0/linenoise.h"
|
||||
+#include <linenoise.h>
|
||||
#endif
|
||||
|
||||
#include "custbaud.h"
|
@ -4,7 +4,6 @@
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
chromium,
|
||||
chromedriver,
|
||||
python3,
|
||||
}:
|
||||
buildNpmPackage {
|
||||
@ -19,7 +18,7 @@ buildNpmPackage {
|
||||
};
|
||||
npmDepsHash = "sha256-wiBpWw9nb/pWVGIc4Vl/IxxR5ic0LzLMMr3WxRNvYdM=";
|
||||
|
||||
nativeCheckInputs = [chromium chromedriver];
|
||||
nativeCheckInputs = [chromium];
|
||||
doCheck = stdenv.isLinux;
|
||||
|
||||
postBuild = ''
|
||||
@ -34,8 +33,7 @@ buildNpmPackage {
|
||||
|
||||
./single-file \
|
||||
--browser-headless \
|
||||
--web-driver-executable-path=chromedriver \
|
||||
--back-end=webdriver-chromium \
|
||||
--browser-executable-path chromium-browser\
|
||||
http://127.0.0.1:8000
|
||||
|
||||
grep -F 'Page saved with SingleFile' 'Directory listing for'*.html
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "snpguest";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "virtee";
|
||||
repo = "snpguest";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qc7WooUJQa0+tzoS0z0GPV3N3WGM1WQ4ewZj8zUWHZE=";
|
||||
hash = "sha256-otsgMUdDp93J/ynquHDs6+oLh0CunyfqZwmcKXcXX0Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GYLJGkEI7AYUxuE57fGz4NM9hZ+Z73tq8wnOzANtwnM=";
|
||||
cargoHash = "sha256-n3gqw4R8NZP8l2PmHWag+cBXlLx1GQPPADBmaYRTe6Q=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
@ -17,22 +17,22 @@
|
||||
|
||||
let
|
||||
pname = "spacedrive";
|
||||
version = "0.3.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src =
|
||||
fetchurl
|
||||
{
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg";
|
||||
hash = "sha256-9E7h03zJtH8b6khDcbBsB46iVWwl48s+GJuBMOmEre4=";
|
||||
hash = "sha256-W0nFNmBgrypTj1Y6r6vstdL0UUaP9jTOH5RgAirwxsY=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg";
|
||||
hash = "sha256-h+B7tc6jXJUFNEMhG6ZNch+grtgUeAzfa37BDoZ6M8Q=";
|
||||
hash = "sha256-iX7aUs2k1fjOoDxkgXbePEYXYKFK3rGFlN9b0+gz378=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.deb";
|
||||
hash = "sha256-E1mOODG4YzBc0TPZJmKgrt/c5hp5LwzLaYPl+J5dnkg=";
|
||||
hash = "sha256-SbuL96xNEOPZ3Z5jd0gfJtNkUoEjO4W+P7K9mvyNmHA=";
|
||||
};
|
||||
}
|
||||
.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.37.7";
|
||||
version = "2.38.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Sfh2dvqCsV5rl6SmfqV6icJrTcsJy89RibCIRrf2p0k=";
|
||||
hash = "sha256-la0zNYWzsU49Z6OKTefocN3xzoyNceaPAzG+CAFKMPc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kv+bMyVOJTztn8mNNTK/kp4nvc5m1I5M041s3nPpob8=";
|
||||
vendorHash = "sha256-BT/zmeNKr2pNBSCaRtT/Dxm3uCshd1j4IW0xU7b9Yz4=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "sshesame";
|
||||
version = "0.0.38";
|
||||
version = "0.0.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jaksi";
|
||||
repo = "sshesame";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CSoDUfbYSf+V7jHVqXGhLc6Mrluy+XbZKCs6IA8reIw=";
|
||||
hash = "sha256-h0qvi90gbWm4LCL3FeipW8BKkbuUt0xGMTjaaeYadnE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tfxqr1yDXE+ACCfAtZ0xePpB/xktfwJe/xPU8qAVz54=";
|
||||
vendorHash = "sha256-1v+cNMr2jpLPfxusPsgnFN31DwuNntXuq3sDNpWL0Rg=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
@ -11,35 +11,28 @@
|
||||
xvfb-run,
|
||||
}:
|
||||
|
||||
let
|
||||
# There are breaking changes between 6 and 7
|
||||
importlib-metadata_6 = python3Packages.importlib-metadata.overrideAttrs (_: rec {
|
||||
version = "6.9.0";
|
||||
src = fetchPypi {
|
||||
pname = "importlib_metadata";
|
||||
inherit version;
|
||||
hash = "sha256-6Ky1I8M1qRgiZ04Um0bAOZ7E0yjE0fbknCc9pf8CAbk=";
|
||||
};
|
||||
});
|
||||
in
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "streamdeck-ui";
|
||||
version = "4.1.2";
|
||||
version = "4.1.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "streamdeck-linux-gui";
|
||||
owner = "streamdeck-linux-gui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CSsFPGnKVQUCND6YOA9kfO41KS85C57YL9LcrWlQRKo=";
|
||||
hash = "sha256-KpsW3EycYRYU5YOg7NNGv5eeZbS9MAikj0Ke2ybPzAU=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
pythonRelaxDeps = [
|
||||
"importlib-metadata"
|
||||
"pillow"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "pillow" ];
|
||||
build-system = [
|
||||
python3Packages.poetry-core
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3Packages.poetry-core
|
||||
copyDesktopItems
|
||||
qt6.wrapQtAppsHook
|
||||
wrapGAppsHook3
|
||||
@ -56,7 +49,7 @@ python3Packages.buildPythonApplication rec {
|
||||
pyside6
|
||||
streamdeck
|
||||
xlib
|
||||
importlib-metadata_6
|
||||
importlib-metadata
|
||||
evdev
|
||||
]
|
||||
++ lib.optionals stdenv.isLinux [ qt6.qtwayland ];
|
||||
@ -128,6 +121,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/streamdeck-linux-gui/streamdeck-linux-gui/releases/tag/v${version}";
|
||||
description = "Linux compatible UI for the Elgato Stream Deck";
|
||||
downloadPage = "https://github.com/streamdeck-linux-gui/streamdeck-linux-gui/";
|
||||
homepage = "https://streamdeck-linux-gui.github.io/streamdeck-linux-gui/";
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaylock";
|
||||
version = "1.7.2";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "swaylock";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZsOLDqmkyhel8QAezdVZ51utruJrBZWqaZ7NzimXWQ4=";
|
||||
hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -1,4 +1,13 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre2 }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
autoconf,
|
||||
automake,
|
||||
libtool,
|
||||
bison,
|
||||
pcre2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "swig";
|
||||
@ -12,7 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config";
|
||||
nativeBuildInputs = [ autoconf automake libtool bison ];
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
libtool
|
||||
bison
|
||||
];
|
||||
buildInputs = [ pcre2 ];
|
||||
|
||||
configureFlags = [ "--without-tcl" ];
|
@ -7,20 +7,21 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "vunnel";
|
||||
version = "0.23.2";
|
||||
version = "0.27.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "vunnel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-wXBfrlb4i4G3Sm0SopvDVGcQ0/hRGtUdzUQYyUj8/Ps=";
|
||||
hash = "sha256-HRwQ2IDTa3dlxTlToiwBvjxjQgD18rv/F5OIuG7FKG8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"defusedxml"
|
||||
"ijson"
|
||||
"sqlalchemy"
|
||||
"xsdata"
|
||||
];
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
themeName = "Dracula";
|
||||
version = "4.0.0-unstable-2024-08-14";
|
||||
version = "4.0.0-unstable-2024-09-07";
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "dracula-theme";
|
||||
@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dracula";
|
||||
repo = "gtk";
|
||||
rev = "be80a123f1c47a9fdb6181e60a641778e14be2f7";
|
||||
hash = "sha256-c+DOYv3Eg31Fdt8qDBNYFPS/zuGInxJu2AsZqDExjPk=";
|
||||
rev = "19e0dcb5d821df8948a96fef8be551f463fcf0d2";
|
||||
hash = "sha256-WfpoGEs2ki84HwE53Fh8CFiybJXZhaiP7m0sfx9Z1X4=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [
|
||||
|
@ -8,10 +8,10 @@ in rebar3Relx rec {
|
||||
releaseType = "escript";
|
||||
# The package name "elvis" is already taken
|
||||
pname = "elvis-erlang";
|
||||
version = "3.1.0";
|
||||
version = "3.2.5";
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "u1KDoLLFQ+HdrLqUAbAFYOZhfpO0j/DfEQ7/ZD5RBDM=";
|
||||
sha256 = "I0GgfNyozkrM1PRkIXwANr1lji4qZCtOQ/bBEgZc5gc=";
|
||||
rev = version;
|
||||
};
|
||||
beamDeps = builtins.attrValues (import ./rebar-deps.nix {
|
||||
|
@ -1,6 +1,6 @@
|
||||
# Generated by rebar3_nix
|
||||
let fetchOnly = { src, ... }: src;
|
||||
in { builder ? fetchOnly, fetchHex, fetchgit, overrides ? (x: y: { }), ... }:
|
||||
in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }:
|
||||
let
|
||||
self = packages // (overrides self packages);
|
||||
packages = with self; {
|
||||
|
@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
## for updating to swig4, see
|
||||
## for updating to SWIG 4, see
|
||||
## https://github.com/GeraldWodni/swig/pull/6
|
||||
(swig.overrideAttrs (old: {
|
||||
version = "3.0.9-forth";
|
||||
|
@ -10,6 +10,7 @@
|
||||
substituteAll,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
fetchpatch2,
|
||||
overrideCC,
|
||||
wrapCCWith,
|
||||
wrapBintoolsWith,
|
||||
@ -606,9 +607,35 @@ let
|
||||
(_: _: { name = "resource-dir.patch"; })
|
||||
) { };
|
||||
in
|
||||
lib.optional (lib.versionOlder metadata.release_version "16")
|
||||
lib.optionals (lib.versionOlder metadata.release_version "15") [
|
||||
# Fixes for SWIG 4
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI=";
|
||||
})
|
||||
]
|
||||
++ lib.optionals (lib.versionOlder metadata.release_version "16") [
|
||||
# Fixes for SWIG 4
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4=";
|
||||
})
|
||||
|
||||
# FIXME: do we need this after 15?
|
||||
(metadata.getVersionFile "lldb/procfs.patch")
|
||||
]
|
||||
++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch
|
||||
++ lib.optional (lib.versionOlder metadata.release_version "14") (
|
||||
metadata.getVersionFile "lldb/gnu-install-dirs.patch"
|
||||
|
@ -5,8 +5,7 @@
|
||||
, cmake
|
||||
, zlib
|
||||
, ncurses
|
||||
, swig3
|
||||
, swig4
|
||||
, swig
|
||||
, which
|
||||
, libedit
|
||||
, libxml2
|
||||
@ -42,7 +41,6 @@ let
|
||||
name = if lib.versionAtLeast release_version "18" then "lldb-dap" else "lldb-vscode";
|
||||
version = if lib.versionAtLeast release_version "18" then "0.2.0" else "0.1.0";
|
||||
};
|
||||
swig = if lib.versionAtLeast release_version "18" then swig4 else swig3;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (rec {
|
||||
@ -186,10 +184,7 @@ stdenv.mkDerivation (rec {
|
||||
larger LLVM Project, such as the Clang expression parser and LLVM
|
||||
disassembler.
|
||||
'';
|
||||
# llvm <10 never built on aarch64-darwin since first introduction in nixpkgs
|
||||
broken =
|
||||
(lib.versionOlder release_version "11" && stdenv.isDarwin && stdenv.isAarch64)
|
||||
|| (((lib.versions.major release_version) == "13") && stdenv.isDarwin);
|
||||
broken = lib.versionOlder release_version "14";
|
||||
mainProgram = "lldb";
|
||||
};
|
||||
} // lib.optionalAttrs enableManpages {
|
||||
|
@ -13,6 +13,7 @@
|
||||
, python3Packages
|
||||
, git
|
||||
, fetchpatch
|
||||
, fetchpatch2
|
||||
, makeWrapper
|
||||
, gnumake
|
||||
, file
|
||||
@ -302,6 +303,32 @@ in stdenv.mkDerivation {
|
||||
|
||||
patch -p1 -d llvm-project/llvm -i ${./patches/llvm-module-cache.patch}
|
||||
|
||||
for lldbPatch in ${lib.escapeShellArgs [
|
||||
# Fixes for SWIG 4
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/llvm/llvm-project/commit/81fc5f7909a4ef5a8d4b5da2a10f77f7cb01ba63.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
hash = "sha256-Znw+C0uEw7lGETQLKPBZV/Ymo2UigZS+Hv/j1mUo7p0=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/llvm/llvm-project/commit/f0a25fe0b746f56295d5c02116ba28d2f965c175.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
hash = "sha256-QzVeZzmc99xIMiO7n//b+RNAvmxghISKQD93U2zOgFI=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/llvm/llvm-project/commit/ba35c27ec9aa9807f5b4be2a0c33ca9b045accc7.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
hash = "sha256-LXl+WbpmWZww5xMDrle3BM2Tw56v8k9LO1f1Z1/wDTs=";
|
||||
})
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/llvm/llvm-project/commit/9ec115978ea2bdfc60800cd3c21264341cdc8b0a.patch?full_index=1";
|
||||
stripLen = 1;
|
||||
hash = "sha256-u0zSejEjfrH3ZoMFm1j+NVv2t5AP9cE5yhsrdTS1dG4=";
|
||||
})
|
||||
]}; do
|
||||
patch -p1 -d llvm-project/lldb -i $lldbPatch
|
||||
done
|
||||
|
||||
patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch}
|
||||
patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch}
|
||||
patch -p1 -d llvm-project/clang -i ${../../llvm/12/clang/purity.patch}
|
||||
@ -365,7 +392,7 @@ in stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
# > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0'
|
||||
hardeningDisable = lib.optional stdenv.isDarwin "zerocallusedregs";
|
||||
hardeningDisable = lib.optional stdenv.isAarch64 "zerocallusedregs";
|
||||
|
||||
configurePhase = ''
|
||||
export SWIFT_SOURCE_ROOT="$PWD"
|
||||
|
@ -13,7 +13,7 @@ diff --git a/GNUmakefile b/GNUmakefile
|
||||
# First search for a custom built copy, then move on to explicitly version-tagged binaries, then just see if the tool is in path with its normal name.
|
||||
findLLVMTool = $(call detect,$(1),$(abspath llvm-build/bin/$(1)) $(foreach ver,$(LLVM_VERSIONS),$(call toolSearchPathsVersion,$(1),$(ver))) $(1))
|
||||
CLANG ?= $(call findLLVMTool,clang)
|
||||
@@ -816,9 +811,8 @@ endif
|
||||
@@ -848,9 +843,8 @@ endif
|
||||
wasmtest:
|
||||
$(GO) test ./tests/wasm
|
||||
|
||||
@ -24,15 +24,7 @@ diff --git a/GNUmakefile b/GNUmakefile
|
||||
@mkdir -p build/release/tinygo/lib/CMSIS/CMSIS
|
||||
@mkdir -p build/release/tinygo/lib/macos-minimal-sdk
|
||||
@mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common
|
||||
@@ -832,15 +826,11 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN
|
||||
@mkdir -p build/release/tinygo/lib/wasi-libc/libc-bottom-half/headers
|
||||
@mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/arch
|
||||
@mkdir -p build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
|
||||
- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0
|
||||
- @mkdir -p build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus
|
||||
- @mkdir -p build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4
|
||||
@echo copying source files
|
||||
@cp -p build/tinygo$(EXE) build/release/tinygo/bin
|
||||
@@ -871,7 +865,6 @@ build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN
|
||||
ifneq ($(USE_SYSTEM_BINARYEN),1)
|
||||
@cp -p build/wasm-opt$(EXE) build/release/tinygo/bin
|
||||
endif
|
||||
@ -40,24 +32,16 @@ diff --git a/GNUmakefile b/GNUmakefile
|
||||
@cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS
|
||||
@cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS
|
||||
@cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk
|
||||
@@ -891,16 +881,9 @@ endif
|
||||
@cp -rp lib/wasi-libc/libc-top-half/musl/src/string build/release/tinygo/lib/wasi-libc/libc-top-half/musl/src
|
||||
@@ -927,8 +920,7 @@ endif
|
||||
@cp -rp lib/wasi-libc/libc-top-half/musl/include build/release/tinygo/lib/wasi-libc/libc-top-half/musl
|
||||
@cp -rp lib/wasi-libc/sysroot build/release/tinygo/lib/wasi-libc/sysroot
|
||||
@cp -rp lib/wasi-cli/wit build/release/tinygo/lib/wasi-cli/wit
|
||||
- @cp -rp llvm-project/compiler-rt/lib/builtins build/release/tinygo/lib/compiler-rt-builtins
|
||||
- @cp -rp llvm-project/compiler-rt/LICENSE.TXT build/release/tinygo/lib/compiler-rt-builtins
|
||||
+ @cp -rp lib/compiler-rt-builtins build/release/tinygo/lib/compiler-rt-builtins
|
||||
@cp -rp src build/release/tinygo/src
|
||||
@cp -rp targets build/release/tinygo/targets
|
||||
- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/compiler-rt compiler-rt
|
||||
- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/compiler-rt compiler-rt
|
||||
- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/compiler-rt compiler-rt
|
||||
- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0 -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0/picolibc picolibc
|
||||
- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m0plus -o build/release/tinygo/pkg/thumbv6m-unknown-unknown-eabi-cortex-m0plus/picolibc picolibc
|
||||
- ./build/release/tinygo/bin/tinygo build-library -target=cortex-m4 -o build/release/tinygo/pkg/thumbv7em-unknown-unknown-eabi-cortex-m4/picolibc picolibc
|
||||
|
||||
release:
|
||||
tar -czf build/release.tar.gz -C build/release tinygo
|
||||
--
|
||||
2.37.2
|
||||
|
||||
|
@ -28,13 +28,13 @@ in
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tinygo";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tinygo-org";
|
||||
repo = "tinygo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ehXkYOMQz6zEmofK+3ajwxLK9vIRZava/F3Ki5jTzYo=";
|
||||
hash = "sha256-YqjMk7EF/fyOhsMLcG56FGHfOZSdaFhUbiiHk+SXajY=";
|
||||
fetchSubmodules = true;
|
||||
# The public hydra server on `hydra.nixos.org` is configured with
|
||||
# `max_output_size` of 3GB. The purpose of this `postFetch` step
|
||||
@ -45,7 +45,7 @@ buildGoModule rec {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-rJ8AfJkIpxDkk+9Tf7ORnn7ueJB1kjJUBiLMDV5tias=";
|
||||
vendorHash = "sha256-cTqrvh0w3KQg3P1lCfAez0kqAMBJHQbqS3sx8uqGvEs=";
|
||||
|
||||
patches = [
|
||||
./0001-GNUmakefile.patch
|
||||
|
@ -29,8 +29,6 @@ let hb = mkCoqDerivation {
|
||||
|
||||
mlPlugin = true;
|
||||
|
||||
extraInstallFlags = [ "VFILES=structures.v" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "High level commands to declare a hierarchy based on packed classes";
|
||||
maintainers = with maintainers; [ cohencyril siraben ];
|
||||
@ -41,6 +39,8 @@ hb.overrideAttrs (o:
|
||||
lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev")
|
||||
{ buildPhase = "make build"; }
|
||||
//
|
||||
lib.optionalAttrs (lib.versions.isGe "1.1.0" o.version || o.version == "dev")
|
||||
{ installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; }
|
||||
(if lib.versions.isGe "1.1.0" o.version || o.version == "dev" then
|
||||
{ installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; }
|
||||
else
|
||||
{ installFlags = [ "VFILES=structures.v" ] ++ o.installFlags; })
|
||||
)
|
||||
|
@ -45,7 +45,7 @@ let
|
||||
|
||||
# Start by wrapping Julia so it has access to Python and any other extra libs.
|
||||
# Also, prevent various packages (CondaPkg.jl, PythonCall.jl) from trying to do network calls.
|
||||
juliaWrapped = runCommand "julia-${julia.version}-wrapped" { buildInputs = [makeWrapper]; inherit makeWrapperArgs; } ''
|
||||
juliaWrapped = runCommand "julia-${julia.version}-wrapped" { nativeBuildInputs = [makeWrapper]; inherit makeWrapperArgs; } ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${julia}/bin/julia $out/bin/julia \
|
||||
--suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath extraLibs}" \
|
||||
@ -163,7 +163,7 @@ let
|
||||
in
|
||||
|
||||
runCommand "julia-${julia.version}-env" {
|
||||
buildInputs = [makeWrapper];
|
||||
nativeBuildInputs = [makeWrapper];
|
||||
|
||||
inherit julia;
|
||||
inherit juliaWrapped;
|
||||
|
@ -10,7 +10,7 @@
|
||||
, libiconv
|
||||
, enablePython ? false
|
||||
, python ? null
|
||||
, swig4
|
||||
, swig
|
||||
, expat
|
||||
, libuuid
|
||||
, openjpeg
|
||||
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
||||
ApplicationServices
|
||||
Cocoa
|
||||
libiconv
|
||||
] ++ lib.optionals enablePython [ swig4 python ];
|
||||
] ++ lib.optionals enablePython [ swig python ];
|
||||
|
||||
disabledTests = [
|
||||
# require networking:
|
||||
|
@ -15,7 +15,7 @@
|
||||
buildPackages,
|
||||
qtbase ? null,
|
||||
pythonSupport ? false,
|
||||
swig4 ? null,
|
||||
swig ? null,
|
||||
# only for passthru.tests
|
||||
libsForQt5,
|
||||
qt6Packages,
|
||||
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||
python3.pkgs.setuptools
|
||||
python3.pkgs.wheel
|
||||
ncurses
|
||||
swig4
|
||||
swig
|
||||
which
|
||||
];
|
||||
|
||||
|
@ -2,6 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, validatePkgConfig
|
||||
, fixDarwinDylibNames
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@ -15,7 +16,8 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-GsrYg16gpjHkkmpCU3yGzqNS/buZl+JoWALLvwzmT4A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ validatePkgConfig ];
|
||||
nativeBuildInputs = [ validatePkgConfig ]
|
||||
++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mdk-sdk";
|
||||
version = "0.29.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz";
|
||||
hash = "sha256-umseIESdiiefQReycc2W8gsurxlpFHfAgV0YdXl1hZE=";
|
||||
hash = "sha256-7dkvm5kP3gcQwXOE9DrjoOTzKRiwk/PVeRr7poLdCU0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
|
||||
version = "2.5.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenImageIO";
|
||||
repo = "oiio";
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "OpenImageIO";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio=";
|
||||
};
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openxr-loader";
|
||||
version = "1.1.38";
|
||||
version = "1.1.40";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenXR-SDK-Source";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-nM/c6fvjprQ5GQO4F13cOigi4xATgRTq+ebEwyv58gg=";
|
||||
sha256 = "sha256-dKSQqiZtnxKj9arpxm9vwz8WzKBXh6y6vzZ9uHP7vX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python3 pkg-config ];
|
||||
|
@ -8,13 +8,13 @@ assert !blas.isILP64;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plumed";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plumed";
|
||||
repo = "plumed2";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-68/ajM87ApEXUs4xPIq7Vfmzl7Ms4ck6jnjlIv7woMs=";
|
||||
hash = "sha256-jNvdbfh1krNMrOFqkEHMy60mjsG/Wp6MQg0gHEjDA5U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -14,7 +14,7 @@
|
||||
, python
|
||||
, re2
|
||||
, stdenv
|
||||
, swig4
|
||||
, swig
|
||||
, unzip
|
||||
, zlib
|
||||
}:
|
||||
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
||||
ensureNewerSourcesForZipFilesHook
|
||||
pkg-config
|
||||
python.pythonOnBuildForHost
|
||||
swig4
|
||||
swig
|
||||
unzip
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
DarwinTools
|
||||
|
@ -2,7 +2,7 @@
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, swig4
|
||||
, swig
|
||||
, lua
|
||||
, elastix
|
||||
, itk
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
swig4
|
||||
swig
|
||||
];
|
||||
buildInputs = [
|
||||
elastix
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "virglrenderer";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/${version}/virglrenderer-${version}.tar.bz2";
|
||||
hash = "sha256-U8uPrdCPUmDuV4M/wkiFZUgUOLx6jjTz4RTRLMnZ25o=";
|
||||
hash = "sha256-XGgKst7ENLKCUv0jU/HiEtTYe+7b9sHnSufj0PZVsb0=";
|
||||
};
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
@ -5,7 +5,7 @@
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "3.13.1";
|
||||
version = "3.14";
|
||||
pname = "containers";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
@ -14,7 +14,7 @@ buildDunePackage rec {
|
||||
owner = "c-cube";
|
||||
repo = "ocaml-containers";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-jkXh/dBRotWXvA77M/+tm39qsCiBsH/HSs+Y9D9QCek=";
|
||||
hash = "sha256-+r1zv7tfCS/dqnTSxpWSagTKVRauqgN6Np1Xa+aQT8k=";
|
||||
};
|
||||
|
||||
buildInputs = [ dune-configurator ];
|
||||
|
@ -4,14 +4,14 @@
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
version = "2.5";
|
||||
version = "2.6";
|
||||
pname = "inotify";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "whitequark";
|
||||
repo = "ocaml-inotify";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3Ju6l6aF5eJgIZJKO0lQGXjjGDzCdX2fuwyNSAjIyAs=";
|
||||
hash = "sha256-Vg9uVIx6/OMS1WoJIHwZbSt5ZyFy+Xgw5167FJWGslg=";
|
||||
};
|
||||
|
||||
buildInputs = [ lwt ];
|
||||
|
@ -18,7 +18,7 @@
|
||||
# wrapped to be able to find aioconsole and any other packages.
|
||||
buildPythonPackage rec {
|
||||
pname = "aioconsole";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -27,21 +27,21 @@ buildPythonPackage rec {
|
||||
owner = "vxgmichel";
|
||||
repo = "aioconsole";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-c8zeKebS04bZS9pMIKAauaLPvRrWaGoDKbnF906tFzQ=";
|
||||
hash = "sha256-gexVeMlDRxZXcBi/iIYPip0DZIKvxCxKmTd+9jm0ud8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail " --cov aioconsole --strict-markers --count 2 -vv" ""
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "--cov aioconsole --count 2" ""
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
disabledTests = [
|
||||
@ -53,11 +53,11 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "aioconsole" ];
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}";
|
||||
description = "Asynchronous console and interfaces for asyncio";
|
||||
mainProgram = "apython";
|
||||
changelog = "https://github.com/vxgmichel/aioconsole/releases/tag/v${version}";
|
||||
homepage = "https://github.com/vxgmichel/aioconsole";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ catern ];
|
||||
mainProgram = "apython";
|
||||
};
|
||||
}
|
||||
|
52
pkgs/development/python-modules/aiostreammagic/default.nix
Normal file
52
pkgs/development/python-modules/aiostreammagic/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
mashumaro,
|
||||
orjson,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
websockets,
|
||||
yarl,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiostreammagic";
|
||||
version = "2.2.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "noahhusby";
|
||||
repo = "aiostreammagic";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fJiP16LvHuYlSkeq/SijWI8YEX8T4lGDJLAVvKplgHI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "websockets" ];
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
mashumaro
|
||||
orjson
|
||||
websockets
|
||||
yarl
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aiostreammagic" ];
|
||||
|
||||
meta = {
|
||||
description = "Module for interfacing with Cambridge Audio/Stream Magic compatible streamers";
|
||||
homepage = "https://github.com/noahhusby/aiostreammagic";
|
||||
changelog = "https://github.com/noahhusby/aiostreammagic/releases/tag/${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -17,7 +17,6 @@
|
||||
pytestCheckHook,
|
||||
pyyaml,
|
||||
setuptools,
|
||||
setuptools-git-versioning,
|
||||
xyzservices,
|
||||
beautifulsoup4,
|
||||
channels,
|
||||
@ -47,21 +46,21 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "bokeh";
|
||||
# update together with panel which is not straightforward
|
||||
version = "3.5.0";
|
||||
format = "pyproject";
|
||||
version = "3.5.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Zeia3b6QDDevJaIFKuF0ttO6HvCMkf1att/XEuGEw5k=";
|
||||
hash = "sha256-A6VKZ9tne4iBg0JxxiCngbODrlk69cPqIUkWR1REDQc=";
|
||||
};
|
||||
|
||||
src_test = fetchFromGitHub {
|
||||
owner = "bokeh";
|
||||
repo = pname;
|
||||
repo = "bokeh";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PK9iLOCcivr4oF9Riq73dzxGfxzWRk3bdrCCpRrTv5g=";
|
||||
hash = "sha256-MAv+6bwc5f+jZasRDsYTJ/ir0i1pYCuwqPMumsYWvws=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -72,11 +71,16 @@ buildPythonPackage rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail ', "setuptools-git-versioning"' "" \
|
||||
--replace-fail 'dynamic = ["version"]' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
colorama
|
||||
nodejs
|
||||
setuptools
|
||||
setuptools-git-versioning
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
@ -106,7 +110,7 @@ buildPythonPackage rec {
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
jinja2
|
||||
contourpy
|
||||
numpy
|
||||
|
@ -11,21 +11,25 @@
|
||||
pyarrow,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-storage";
|
||||
version = "2.25.0";
|
||||
format = "setuptools";
|
||||
version = "2.26.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-GV/9KxgOnqoivqs+QKC2Hs0UbssyZnz0Immo1xEbTUg=";
|
||||
pname = "google_cloud_bigquery_storage";
|
||||
inherit version;
|
||||
hash = "sha256-hAJ1vQpLIHwKyCG8xnQUBv+zte+UD6BQiakOtEA0U/o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
google-api-core
|
||||
protobuf
|
||||
] ++ google-api-core.optional-dependencies.grpc;
|
||||
@ -57,10 +61,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "BigQuery Storage API API client library";
|
||||
mainProgram = "fixup_bigquery_storage_v1_keywords.py";
|
||||
homepage = "https://github.com/googleapis/python-bigquery-storage";
|
||||
changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
mainProgram = "fixup_bigquery_storage_v1_keywords.py";
|
||||
};
|
||||
}
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.50.0";
|
||||
version = "2.51.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_container";
|
||||
inherit version;
|
||||
hash = "sha256-xq8m4jM6RcVAJVGdP0cZhriZQmT73AEJDLlXo9rjaQg=";
|
||||
hash = "sha256-q1F+/uzyVY10pP/XrF1sL0+6o7uKfITSuZTc+NqA/Zw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "5.10.2";
|
||||
version = "5.11.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_dataproc";
|
||||
inherit version;
|
||||
hash = "sha256-ajcy7dGltN9Yp8XPGYpmDBHPnYmuEL1/nuEkTh9iF3E=";
|
||||
hash = "sha256-6jiAOYf9eBjRMyQ9tvR3EWfnqk1MfYIUTm98Plnfkhg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-spanner";
|
||||
version = "3.48.0";
|
||||
version = "3.49.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "googleapis";
|
||||
repo = "python-spanner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QgLZQ0rgBEmYDAE16K84bSx4bFWJRviY1WqsVwKcO6w=";
|
||||
hash = "sha256-KwANiuzVyqsz+KKTqNPM1WftuoMtUXRI8xbIdAzZF+s=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -10,8 +10,8 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-i18n-address";
|
||||
version = "3.1.0";
|
||||
format = "pyproject";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -19,12 +19,12 @@ buildPythonPackage rec {
|
||||
owner = "mirumee";
|
||||
repo = "google-i18n-address";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dW/1wwnFDjYpym1ZaSZ7mOLpkHxsvuAHC8zBRekxWaw=";
|
||||
hash = "sha256-7RqS/+6zInlhWydJwp4xf2uGpfmSdiSwvJugpL8Mlpk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ hatchling ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
dependencies = [ requests ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -32,10 +32,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Google's i18n address data packaged for Python";
|
||||
mainProgram = "update-validation-files";
|
||||
homepage = "https://github.com/mirumee/google-i18n-address";
|
||||
changelog = "https://github.com/mirumee/google-i18n-address/releases/tag/${version}";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
mainProgram = "update-validation-files";
|
||||
};
|
||||
}
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "griffe";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "mkdocstrings";
|
||||
repo = "griffe";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oxZZIfzPsGs2hhVRdWEvPhIR5JwTMAmO5VgEQHzBO90=";
|
||||
hash = "sha256-s2GvtgDS3myCVwO8+jSJlo2FH7Od8d5WYjjxM1oroIo=";
|
||||
};
|
||||
|
||||
build-system = [ pdm-backend ];
|
||||
|
@ -27,14 +27,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "kombu";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rSAKjb2qorvF8m0u59cH2aH97TU6D0vXUc6MfZ9EnGA=";
|
||||
hash = "sha256-HAUXiCbauBH4yrWwoVTUKnoz2Lzd6fo9e0WC5Dw8A9s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs =
|
||||
|
@ -2,7 +2,7 @@
|
||||
toPythonModule,
|
||||
python,
|
||||
lttng-tools,
|
||||
swig4,
|
||||
swig,
|
||||
}:
|
||||
|
||||
toPythonModule (
|
||||
@ -15,7 +15,7 @@ toPythonModule (
|
||||
{
|
||||
pname = "lttng";
|
||||
|
||||
nativeBuildInputs = nativeBuildInputs ++ [ swig4 ];
|
||||
nativeBuildInputs = nativeBuildInputs ++ [ swig ];
|
||||
|
||||
configureFlags = configureFlags ++ [
|
||||
"--enable-python-bindings"
|
||||
|
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pdoc";
|
||||
version = "14.6.1";
|
||||
version = "14.7.0";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
pyproject = true;
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "mitmproxy";
|
||||
repo = "pdoc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9bnkpzHbYYrxVGPPdM1sWkk7IVvNd3GNJ/8CaYV52ko=";
|
||||
hash = "sha256-U6gLEuyKvGGP5yKXb+bWDGJqmHTdPYLLPgHLVySAJ6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
@ -15,16 +15,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pygithub";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyGithub";
|
||||
repo = "PyGithub";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ccAbn9x1r+wBIAK66ur8+2Op9ij09rQvHumq5Wh7TUU=";
|
||||
hash = "sha256-VM3xxLa4MlR3vTpeOunsq4/bxZhuKXNKFZbFVul1cMw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -4,7 +4,7 @@
|
||||
callPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
swig4,
|
||||
swig,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeBuildInputs = [ swig4 ];
|
||||
nativeBuildInputs = [ swig ];
|
||||
|
||||
pypaBuildFlags = [ "--skip-dependency-check" ];
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
libXmu,
|
||||
opencascade-occt,
|
||||
rapidjson,
|
||||
swig4,
|
||||
swig,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
swig4
|
||||
swig
|
||||
];
|
||||
buildInputs = [
|
||||
python
|
||||
|
@ -2,7 +2,7 @@
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
cmake,
|
||||
swig4,
|
||||
swig,
|
||||
elastix,
|
||||
itk,
|
||||
numpy,
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
swig4
|
||||
swig
|
||||
scikit-build
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
|
@ -2,24 +2,24 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
flit,
|
||||
flit-core,
|
||||
click,
|
||||
tomli,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "turnt";
|
||||
version = "1.11.0";
|
||||
format = "pyproject";
|
||||
version = "1.12.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XN+qzRgZMSdeBmW0OM36mQ79sRCuP8E++SqH8FOoEq0=";
|
||||
hash = "sha256-4K7cqGwKErGbZ+dxVa06v8aIfrpVLC293d29QT+vsBw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
click
|
||||
tomli
|
||||
];
|
||||
|
@ -2,29 +2,30 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
future,
|
||||
mock,
|
||||
parameterized,
|
||||
pytestCheckHook,
|
||||
python-dateutil,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
six,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vertica-python";
|
||||
version = "1.3.8";
|
||||
format = "setuptools";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5SuJT8Mu/4MnAmTWb9TL5b0f0Hug2n70X5BhZME2vrw=";
|
||||
hash = "sha256-VCB4ri/t7mlK3tsE2Bxu3Cd7h+10QDApQhB9hqC81EU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
python-dateutil
|
||||
six
|
||||
];
|
||||
|
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.249";
|
||||
version = "3.2.251";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xsb57uCPLzrqMA2T0rcbnmXlsioagFr0yc4wcRUubPI=";
|
||||
hash = "sha256-PBv6e0Y9kT6KmM12jnhF+9QC17v5A/rbR/5KBDV6Ekc=";
|
||||
};
|
||||
|
||||
patches = [ ./flake8-compat-5.x.patch ];
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-buildtools";
|
||||
version = "7.1.2";
|
||||
version = "7.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bazelbuild";
|
||||
repo = "buildtools";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Ax7UKkClYsoqxaR+tsQnTv6BFafl9SkY7MC4kYJNmwY=";
|
||||
hash = "sha256-AdwJDRw+AY3F+ZDaKqn5YzAVyAzvrV+d1WTk8OJtUdk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A=";
|
||||
vendorHash = "sha256-sYZ7ogQY0dWOwJMvLljOjaKeYGYdLrF5AnetregdlYY=";
|
||||
|
||||
preBuild = ''
|
||||
rm -r warn/docs
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ec2-metadata-mock";
|
||||
version = "1.11.2";
|
||||
version = "1.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "amazon-ec2-metadata-mock";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hYyJtkwAzweH8boUY3vrvy6Ug+Ier5f6fvR52R+Di8o=";
|
||||
sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-T45abGVoiwxAEO60aPH3hUqiH6ON3aRhkrOFcOi+Bm8=";
|
||||
vendorHash = "sha256-jRJX4hvfRuhR5TlZe7LsXaOlUCwmQGem2QKlX3vuk8c=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{cmd,ec2-metadata-mock}
|
||||
|
@ -10,14 +10,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "memray";
|
||||
version = "1.13.4";
|
||||
version = "1.14.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloomberg";
|
||||
repo = "memray";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8ztnXNdsthoMvooWoJLKrB9yGHjkYhQ2jiwF3KujAnw=";
|
||||
hash = "sha256-U9JR60rSxPYXbZaKR7vVNhGT78AXnqcoqvVC6/1OW/E=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
@ -44,8 +44,9 @@ python3Packages.buildPythonApplication rec {
|
||||
with python3Packages;
|
||||
[
|
||||
ipython
|
||||
pytestCheckHook
|
||||
pytest-cov # fix Unknown pytest.mark.no_cover
|
||||
pytest-textual-snapshot
|
||||
pytestCheckHook
|
||||
]
|
||||
++ lib.optionals (pythonOlder "3.12") [ greenlet ];
|
||||
|
||||
|
@ -102,7 +102,6 @@ lib.listToAttrs (
|
||||
"aarch64"
|
||||
"riscv"
|
||||
"ppc64"
|
||||
"nds32le"
|
||||
]
|
||||
)
|
||||
|
||||
|
@ -1,36 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swig";
|
||||
version = "3.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swig";
|
||||
repo = "swig";
|
||||
rev = "rel-${version}";
|
||||
sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
|
||||
};
|
||||
|
||||
PCRE_CONFIG = "${pcre.dev}/bin/pcre-config";
|
||||
nativeBuildInputs = [ autoconf automake libtool bison ];
|
||||
buildInputs = [ pcre ];
|
||||
|
||||
configureFlags = [ "--without-tcl" ];
|
||||
|
||||
# Disable ccache documentation as it needs yodl
|
||||
postPatch = ''
|
||||
sed -i '/man1/d' CCache/Makefile.in
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Interface compiler that connects C/C++ code to higher-level languages";
|
||||
homepage = "https://swig.org/";
|
||||
# Different types of licenses available: http://www.swig.org/Release/LICENSE .
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user