Merge master into staging-next

This commit is contained in:
github-actions[bot]
2025-01-03 18:04:51 +00:00
committed by GitHub
38 changed files with 407 additions and 452 deletions
-34
View File
@@ -1,34 +0,0 @@
name: "Set pending OfBorg status"
on:
pull_request_target:
# Sets the ofborg-eval status to "pending" to signal that we are waiting for
# OfBorg even if it is running late. The status will be overwritten by OfBorg
# once it starts evaluation.
# WARNING:
# When extending this action, be aware that $GITHUB_TOKEN allows (restricted) write access to
# the GitHub repository. This means that it should not evaluate user input in a
# way that allows code injection.
permissions:
contents: read
jobs:
action:
name: set-ofborg-pending
if: github.repository_owner == 'NixOS'
permissions:
statuses: write
runs-on: ubuntu-latest
steps:
- name: "Set pending OfBorg status"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
curl \
-X POST \
-H "Accept: application/vnd.github.v3+json" \
-H "Authorization: Bearer $GITHUB_TOKEN" \
-d '{"context": "ofborg-eval", "state": "pending", "description": "Waiting for OfBorg..."}' \
"https://api.github.com/repos/NixOS/nixpkgs/commits/${{ github.event.pull_request.head.sha }}/statuses"
+1 -1
View File
@@ -419,7 +419,7 @@ in
${optionalString (containsGutenprint cfg.drivers) ''
if [ -d /var/lib/cups/ppd ]; then
${getGutenprint cfg.drivers}/bin/cups-genppdupdate -p /var/lib/cups/ppd
${getGutenprint cfg.drivers}/bin/cups-genppdupdate -x -p /var/lib/cups/ppd
fi
''}
'';
+1 -4
View File
@@ -27,9 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
# Disable hardening which adds incompatible flags like -fPIC
hardeningDisable = [ "all" ];
buildPhase = ''
make -j$NIX_BUILD_CORES
'';
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
@@ -57,6 +55,5 @@ stdenv.mkDerivation (finalAttrs: {
"aarch64-linux"
];
maintainers = with lib.maintainers; [ liberodark ];
mainProgram = "dtbloader.efi";
};
})
+9 -16
View File
@@ -15,8 +15,6 @@
wangle,
fbthrift,
gtest,
apple-sdk_11,
darwinMinVersionHook,
nix-update-script,
}:
@@ -48,20 +46,15 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
glog
gflags
folly
fb303
wangle
fbthrift
gtest
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
glog
gflags
folly
fb303
wangle
fbthrift
gtest
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+8 -15
View File
@@ -13,8 +13,6 @@
fbthrift,
fizz,
wangle,
apple-sdk_11,
darwinMinVersionHook,
nix-update-script,
}:
@@ -40,19 +38,14 @@ stdenv.mkDerivation (finalAttrs: {
ninja
];
buildInputs =
[
gflags
glog
folly
fbthrift
fizz
wangle
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
gflags
glog
folly
fbthrift
fizz
wangle
];
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+11 -18
View File
@@ -17,8 +17,6 @@
zlib,
zstd,
xxHash,
apple-sdk_11,
darwinMinVersionHook,
mvfst,
@@ -56,22 +54,17 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
openssl
gflags
glog
folly
fizz
wangle
zlib
zstd
xxHash
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
openssl
gflags
glog
folly
fizz
wangle
zlib
zstd
xxHash
];
propagatedBuildInputs = [
mvfst
+8 -15
View File
@@ -14,8 +14,6 @@
zstd,
gflags,
libevent,
apple-sdk_11,
darwinMinVersionHook,
folly,
libsodium,
@@ -49,19 +47,14 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
openssl
glog
double-conversion
zstd
gflags
libevent
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
openssl
glog
double-conversion
zstd
gflags
libevent
];
propagatedBuildInputs = [
folly
+15 -22
View File
@@ -21,8 +21,6 @@
zstd,
libiberty,
libunwind,
apple-sdk_11,
darwinMinVersionHook,
boost,
fmt_11,
@@ -64,26 +62,21 @@ stdenv.mkDerivation (finalAttrs: {
];
# See CMake/folly-deps.cmake in the Folly source tree.
buildInputs =
[
boost
double-conversion
fast-float
gflags
glog
libevent
zlib
openssl
xz
lz4
zstd
libiberty
libunwind
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
boost
double-conversion
fast-float
gflags
glog
libevent
zlib
openssl
xz
lz4
zstd
libiberty
libunwind
];
propagatedBuildInputs =
[
@@ -1,20 +0,0 @@
--- a/src/libfishsound/flac.c
+++ b/src/libfishsound/flac.c
@@ -106,7 +106,7 @@ fs_flac_command (FishSound * fsound, int command, void * data, int datasize)
#if FS_DECODE
static FLAC__StreamDecoderReadStatus
fs_flac_read_callback(const FLAC__StreamDecoder *decoder,
- FLAC__byte buffer[], unsigned int *bytes,
+ FLAC__byte buffer[], size_t *bytes,
void *client_data)
{
FishSound* fsound = (FishSound*)client_data;
@@ -346,7 +346,7 @@ dec_err:
#if FS_ENCODE
static FLAC__StreamEncoderWriteStatus
fs_flac_enc_write_callback(const FLAC__StreamEncoder *encoder,
- const FLAC__byte buffer[], unsigned bytes,
+ const FLAC__byte buffer[], size_t bytes,
unsigned samples, unsigned current_frame,
void *client_data)
{
+29 -4
View File
@@ -2,6 +2,8 @@
lib,
stdenv,
fetchurl,
fetchpatch,
autoreconfHook,
libvorbis,
speex,
flac,
@@ -17,9 +19,29 @@ stdenv.mkDerivation rec {
sha256 = "1iz7mn6hw2wg8ljaw74f4g2zdj68ib88x4vjxxg3gjgc5z75f2rf";
};
patches = [
./fix-callbacks.patch
];
patches =
let
fetchDebPatch =
{ name, hash }:
fetchpatch {
inherit name hash;
url = "https://salsa.debian.org/multimedia-team/libfishsound/-/raw/f25f31a13dd2ce008614427889b08e6f2222898f/debian/patches/${name}";
};
in
map fetchDebPatch [
{
name = "0001-Patch-configure.ac-to-specify-config-macro-dir.patch";
hash = "sha256-3cijMhgxqwFisc5nt8826QUwOqPI7H425QkDcjnD4iM=";
}
{
name = "0002-flac-set-vendor_string.length-0.patch";
hash = "sha256-8195rU9IAhFL3MgB4jLwtJv6BWgz22A38+RmIymIQoo=";
}
{
name = "0003-Fix-incompatible-flac-callback-types.patch";
hash = "sha256-BxG1hlThzhJ6VeGcsNpDEtVyKSJTLGFKeHFpFoXW54A=";
}
];
propagatedBuildInputs = [
libvorbis
@@ -27,7 +49,10 @@ stdenv.mkDerivation rec {
flac
];
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
pkg-config
autoreconfHook
];
meta = with lib; {
homepage = "https://xiph.org/fishsound/";
+3 -3
View File
@@ -15,16 +15,16 @@ in
buildGoModule rec {
pname = "mediamtx";
# check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
version = "1.10.0";
version = "1.11.0";
src = fetchFromGitHub {
owner = "bluenviron";
repo = pname;
rev = "v${version}";
hash = "sha256-nz+8soxZ6lyc0saB4U3tDsTtqA0kV886M95cA3Gn3R0=";
hash = "sha256-WpMFP88MLpftfPn6DP2QM7oSRNwDAIC35/imrznLVA8=";
};
vendorHash = "sha256-Csa8G+ji/OoTItu3XbGOySqmNMVdr7QqE8SNCba8cbI=";
vendorHash = "sha256-yOeenOYV2MztEfhwxIkmbxn40XhYNZMMTm+kcR7TAtc=";
postPatch = ''
cp ${hlsJs} internal/servers/hls/hls.min.js
+3 -3
View File
@@ -44,13 +44,13 @@ let
in
php.buildComposerProject (finalAttrs: {
pname = "movim";
version = "0.28";
version = "0.29";
src = fetchFromGitHub {
owner = "movim";
repo = "movim";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-mjBeBu1seH5XMls+e4ON13ayVeugKogbNTzbjp1pUjE=";
hash = "sha256-hAOT3n0i9t3uWMjqWJlOs4Vakq3y4+GhiFZ4n3jVqtw=";
};
php = php.buildEnv (
@@ -98,7 +98,7 @@ php.buildComposerProject (finalAttrs: {
# pinned commonmark
composerStrictValidation = false;
vendorHash = "sha256-ZfMUpkIRCAsiQf6PEVPrMpljZWjP9JXf+nEFA/LunsQ=";
vendorHash = "sha256-uma3evj/81qz/+1+poIl0FJqWe1e2Ay0Jm446CKOGP0=";
postPatch = ''
# Our modules are already wrapped, removes missing *.so warnings;
+5 -12
View File
@@ -11,8 +11,6 @@
folly,
gflags,
glog,
apple-sdk_11,
darwinMinVersionHook,
fizz,
@@ -44,16 +42,11 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
folly
gflags
glog
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
folly
gflags
glog
];
propagatedBuildInputs = [
fizz
-3
View File
@@ -3,7 +3,6 @@
stdenv,
rustPlatform,
fetchFromGitHub,
apple-sdk_11,
uutils-coreutils,
}:
@@ -25,8 +24,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];
cargoBuildFlags = [
# Only build the binary we want
"--bin"
+3 -3
View File
@@ -21,13 +21,13 @@ let
in
stdenv'.mkDerivation (finalAttrs: {
pname = "renovate";
version = "39.82.6";
version = "39.90.2";
src = fetchFromGitHub {
owner = "renovatebot";
repo = "renovate";
tag = finalAttrs.version;
hash = "sha256-RV3rOzs0dPQK0rYGU6URqTcvqGMXCrke5wSSVo/Wd5s=";
hash = "sha256-D0VoBkP+zMsJK5ZgoU4USF0qhrmLi2V1BU6k6czSr+o=";
};
postPatch = ''
@@ -45,7 +45,7 @@ stdenv'.mkDerivation (finalAttrs: {
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-c8bnNBkWyJspRvwoQTlExChM1PXi6Hw466xqT11s7Ys=";
hash = "sha256-JkdfI7P4zWf0hYgurDrETAGic5nz38zQsAuBoFi9C8w=";
};
env.COREPACK_ENABLE_STRICT = 0;
+141 -150
View File
@@ -1,20 +1,20 @@
{
"name": "@vue/language-server",
"version": "2.1.10",
"version": "2.2.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@vue/language-server",
"version": "2.1.10",
"version": "2.2.0",
"license": "MIT",
"dependencies": {
"@volar/language-core": "~2.4.8",
"@volar/language-server": "~2.4.8",
"@volar/test-utils": "~2.4.8",
"@vue/language-core": "2.1.10",
"@vue/language-service": "2.1.10",
"@vue/typescript-plugin": "2.1.10",
"@volar/language-core": "~2.4.11",
"@volar/language-server": "~2.4.11",
"@volar/test-utils": "~2.4.11",
"@vue/language-core": "2.2.0",
"@vue/language-service": "2.2.0",
"@vue/typescript-plugin": "2.2.0",
"vscode-languageserver-protocol": "^3.17.5",
"vscode-uri": "^3.0.8"
},
@@ -41,12 +41,12 @@
}
},
"node_modules/@babel/parser": {
"version": "7.26.2",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
"integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
"version": "7.26.3",
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
"integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
"license": "MIT",
"dependencies": {
"@babel/types": "^7.26.0"
"@babel/types": "^7.26.3"
},
"bin": {
"parser": "bin/babel-parser.js"
@@ -56,9 +56,9 @@
}
},
"node_modules/@babel/types": {
"version": "7.26.0",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
"integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
"version": "7.26.3",
"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
"integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
"license": "MIT",
"dependencies": {
"@babel/helper-string-parser": "^7.25.9",
@@ -130,23 +130,23 @@
"license": "MIT"
},
"node_modules/@volar/language-core": {
"version": "2.4.10",
"resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.10.tgz",
"integrity": "sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==",
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.11.tgz",
"integrity": "sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==",
"license": "MIT",
"dependencies": {
"@volar/source-map": "2.4.10"
"@volar/source-map": "2.4.11"
}
},
"node_modules/@volar/language-server": {
"version": "2.4.10",
"resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.10.tgz",
"integrity": "sha512-odQsgrJh8hOXfxkSj/BSnpjThb2/KDhbxZnG/XAEx6E3QGDQv4hAOz9GWuKoNs0tkjgwphQGIwDMT1JYaTgRJw==",
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.11.tgz",
"integrity": "sha512-W9P8glH1M8LGREJ7yHRCANI5vOvTrRO15EMLdmh5WNF9sZYSEbQxiHKckZhvGIkbeR1WAlTl3ORTrJXUghjk7g==",
"license": "MIT",
"dependencies": {
"@volar/language-core": "2.4.10",
"@volar/language-service": "2.4.10",
"@volar/typescript": "2.4.10",
"@volar/language-core": "2.4.11",
"@volar/language-service": "2.4.11",
"@volar/typescript": "2.4.11",
"path-browserify": "^1.0.1",
"request-light": "^0.7.0",
"vscode-languageserver": "^9.0.1",
@@ -156,42 +156,42 @@
}
},
"node_modules/@volar/language-service": {
"version": "2.4.10",
"resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.10.tgz",
"integrity": "sha512-VxUiWS11rnRzakkqw5x1LPhsz+RBfD0CrrFarLGW2/voliYXEdCuSOM3r8JyNRvMvP4uwhD38ccAdTcULQEAIQ==",
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.11.tgz",
"integrity": "sha512-KIb6g8gjUkS2LzAJ9bJCLIjfsJjeRtmXlu7b2pDFGD3fNqdbC53cCAKzgWDs64xtQVKYBU13DLWbtSNFtGuMLQ==",
"license": "MIT",
"dependencies": {
"@volar/language-core": "2.4.10",
"@volar/language-core": "2.4.11",
"vscode-languageserver-protocol": "^3.17.5",
"vscode-languageserver-textdocument": "^1.0.11",
"vscode-uri": "^3.0.8"
}
},
"node_modules/@volar/source-map": {
"version": "2.4.10",
"resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.10.tgz",
"integrity": "sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==",
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.11.tgz",
"integrity": "sha512-ZQpmafIGvaZMn/8iuvCFGrW3smeqkq/IIh9F1SdSx9aUl0J4Iurzd6/FhmjNO5g2ejF3rT45dKskgXWiofqlZQ==",
"license": "MIT"
},
"node_modules/@volar/test-utils": {
"version": "2.4.10",
"resolved": "https://registry.npmjs.org/@volar/test-utils/-/test-utils-2.4.10.tgz",
"integrity": "sha512-YkjqH9FfkewtS7MKdLo74C9QVpk4ab+0NdBOOnWXd77EtkaxLpEvIgZ2IX7LIi+RvlW8ucXpsYNNSORnzhR6AA==",
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/@volar/test-utils/-/test-utils-2.4.11.tgz",
"integrity": "sha512-ogkLldPqFa/j9302Ns+nWeyTCQv8d4c7iN4t8ziq7j0XeMKWYsTAjLsx/9z0MTNrecBAcocgzEvCricASSq+Hw==",
"license": "MIT",
"dependencies": {
"@volar/language-core": "2.4.10",
"@volar/language-server": "2.4.10",
"@volar/language-core": "2.4.11",
"@volar/language-server": "2.4.11",
"vscode-languageserver-textdocument": "^1.0.11",
"vscode-uri": "^3.0.8"
}
},
"node_modules/@volar/typescript": {
"version": "2.4.10",
"resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.10.tgz",
"integrity": "sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==",
"version": "2.4.11",
"resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.11.tgz",
"integrity": "sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==",
"license": "MIT",
"dependencies": {
"@volar/language-core": "2.4.10",
"@volar/language-core": "2.4.11",
"path-browserify": "^1.0.1",
"vscode-uri": "^3.0.8"
}
@@ -249,16 +249,16 @@
}
},
"node_modules/@vue/language-core": {
"version": "2.1.10",
"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.1.10.tgz",
"integrity": "sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==",
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.2.0.tgz",
"integrity": "sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==",
"license": "MIT",
"dependencies": {
"@volar/language-core": "~2.4.8",
"@volar/language-core": "~2.4.11",
"@vue/compiler-dom": "^3.5.0",
"@vue/compiler-vue2": "^2.7.16",
"@vue/shared": "^3.5.0",
"alien-signals": "^0.2.0",
"alien-signals": "^0.4.9",
"minimatch": "^9.0.3",
"muggle-string": "^0.4.1",
"path-browserify": "^1.0.1"
@@ -273,19 +273,19 @@
}
},
"node_modules/@vue/language-service": {
"version": "2.1.10",
"resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.1.10.tgz",
"integrity": "sha512-voNteQNU+mHUmyUEdHUpWZW5/kfLQxh1zHs98c5hw6XK6pNxJTghG/k4maka6y5WmfmMCKAsddBpD9kZ7lyAlg==",
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-2.2.0.tgz",
"integrity": "sha512-2SioOuCyocrVYSMOosHS2Lc4MeV1kwzEgPnd7A8lFUDNby8sjDd7UL1FCgiolygeletZh5Us7o8gvG9khiPygQ==",
"license": "MIT",
"dependencies": {
"@volar/language-core": "~2.4.8",
"@volar/language-service": "~2.4.8",
"@volar/typescript": "~2.4.8",
"@volar/language-core": "~2.4.11",
"@volar/language-service": "~2.4.11",
"@volar/typescript": "~2.4.11",
"@vue/compiler-dom": "^3.5.0",
"@vue/language-core": "2.1.10",
"@vue/language-core": "2.2.0",
"@vue/shared": "^3.5.0",
"@vue/typescript-plugin": "2.1.10",
"alien-signals": "^0.2.0",
"@vue/typescript-plugin": "2.2.0",
"alien-signals": "^0.4.9",
"path-browserify": "^1.0.1",
"volar-service-css": "0.0.62",
"volar-service-emmet": "0.0.62",
@@ -307,13 +307,13 @@
"license": "MIT"
},
"node_modules/@vue/typescript-plugin": {
"version": "2.1.10",
"resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.1.10.tgz",
"integrity": "sha512-NrS3BB3l5vuZHU4Vp8l9TbT5pC7VjBfwZKqc24dAXF3Z+dJyGs4mcC3zo59gUggLMQSah8mdXj8xqEfMkrps8w==",
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-2.2.0.tgz",
"integrity": "sha512-7okpTvJ8blQApgUtfPvkO1tOkxxWt8oScXwsjQRB46QAgZ/0LwWpWG0yB8mvBLkw4mZpSXsp6e3ntnUwRagURA==",
"license": "MIT",
"dependencies": {
"@volar/typescript": "~2.4.8",
"@vue/language-core": "2.1.10",
"@volar/typescript": "~2.4.11",
"@vue/language-core": "2.2.0",
"@vue/shared": "^3.5.0"
}
},
@@ -330,9 +330,9 @@
}
},
"node_modules/alien-signals": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.2.2.tgz",
"integrity": "sha512-cZIRkbERILsBOXTQmMrxc9hgpxglstn69zm+F1ARf4aPAzdAFYd6sBq87ErO0Fj3DV94tglcyHG5kQz9nDC/8A==",
"version": "0.4.12",
"resolved": "https://registry.npmjs.org/alien-signals/-/alien-signals-0.4.12.tgz",
"integrity": "sha512-Og0PgAihxlp1R22bsoBsyhhMG4+qhU+fkkLPoGBQkYVc3qt9rYnrwYTf+M6kqUqUZpf3rXDnpL90iKa0QcSVVg==",
"license": "MIT"
},
"node_modules/balanced-match": {
@@ -350,17 +350,27 @@
"balanced-match": "^1.0.0"
}
},
"node_modules/call-bind": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
"integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
"node_modules/call-bind-apply-helpers": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
"integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
"license": "MIT",
"dependencies": {
"es-define-property": "^1.0.0",
"es-errors": "^1.3.0",
"function-bind": "^1.1.2",
"get-intrinsic": "^1.2.4",
"set-function-length": "^1.2.1"
"function-bind": "^1.1.2"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/call-bound": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
"integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
"license": "MIT",
"dependencies": {
"call-bind-apply-helpers": "^1.0.1",
"get-intrinsic": "^1.2.6"
},
"engines": {
"node": ">= 0.4"
@@ -384,21 +394,18 @@
"integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
"license": "MIT"
},
"node_modules/define-data-property": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
"node_modules/dunder-proto": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
"license": "MIT",
"dependencies": {
"es-define-property": "^1.0.0",
"call-bind-apply-helpers": "^1.0.1",
"es-errors": "^1.3.0",
"gopd": "^1.0.1"
"gopd": "^1.2.0"
},
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/emmet": {
@@ -430,13 +437,10 @@
}
},
"node_modules/es-define-property": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
"integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
"license": "MIT",
"dependencies": {
"get-intrinsic": "^1.2.4"
},
"engines": {
"node": ">= 0.4"
}
@@ -450,6 +454,18 @@
"node": ">= 0.4"
}
},
"node_modules/es-object-atoms": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
"integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
"license": "MIT",
"dependencies": {
"es-errors": "^1.3.0"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/estree-walker": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
@@ -466,16 +482,21 @@
}
},
"node_modules/get-intrinsic": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
"integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz",
"integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==",
"license": "MIT",
"dependencies": {
"call-bind-apply-helpers": "^1.0.1",
"dunder-proto": "^1.0.0",
"es-define-property": "^1.0.1",
"es-errors": "^1.3.0",
"es-object-atoms": "^1.0.0",
"function-bind": "^1.1.2",
"has-proto": "^1.0.1",
"has-symbols": "^1.0.3",
"hasown": "^2.0.0"
"gopd": "^1.2.0",
"has-symbols": "^1.1.0",
"hasown": "^2.0.2",
"math-intrinsics": "^1.0.0"
},
"engines": {
"node": ">= 0.4"
@@ -485,33 +506,9 @@
}
},
"node_modules/gopd": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
"license": "MIT",
"dependencies": {
"get-intrinsic": "^1.1.3"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/has-property-descriptors": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
"license": "MIT",
"dependencies": {
"es-define-property": "^1.0.0"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/has-proto": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
"integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
@@ -521,9 +518,9 @@
}
},
"node_modules/has-symbols": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
@@ -579,13 +576,15 @@
}
},
"node_modules/is-regex": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
"integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
"license": "MIT",
"dependencies": {
"call-bind": "^1.0.2",
"has-tostringtag": "^1.0.0"
"call-bound": "^1.0.2",
"gopd": "^1.2.0",
"has-tostringtag": "^1.0.2",
"hasown": "^2.0.2"
},
"engines": {
"node": ">= 0.4"
@@ -600,6 +599,15 @@
"integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==",
"license": "MIT"
},
"node_modules/math-intrinsics": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
"license": "MIT",
"engines": {
"node": ">= 0.4"
}
},
"node_modules/minimatch": {
"version": "9.0.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -681,23 +689,6 @@
"node": ">=10"
}
},
"node_modules/set-function-length": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
"license": "MIT",
"dependencies": {
"define-data-property": "^1.1.4",
"es-errors": "^1.3.0",
"function-bind": "^1.1.2",
"get-intrinsic": "^1.2.4",
"gopd": "^1.0.1",
"has-property-descriptors": "^1.0.2"
},
"engines": {
"node": ">= 0.4"
}
},
"node_modules/source-map-js": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
@@ -870,9 +861,9 @@
}
},
"node_modules/vscode-css-languageservice": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.1.tgz",
"integrity": "sha512-1BzTBuJfwMc3A0uX4JBdJgoxp74cjj4q2mDJdp49yD/GuAq4X0k5WtK6fNcMYr+FfJ9nqgR6lpfCSZDkARJ5qQ==",
"version": "6.3.2",
"resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.2.tgz",
"integrity": "sha512-GEpPxrUTAeXWdZWHev1OJU9lz2Q2/PPBxQ2TIRmLGvQiH3WZbqaNoute0n0ewxlgtjzTW3AKZT+NHySk5Rf4Eg==",
"license": "MIT",
"dependencies": {
"@vscode/l10n": "^0.0.18",
@@ -894,9 +885,9 @@
}
},
"node_modules/vscode-json-languageservice": {
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.1.tgz",
"integrity": "sha512-5czFGNyVPxz3ZJYl8R3a3SuIj5gjhmGF4Wv05MRPvD4DEnHK6b8km4VbNMJNHBlTCh7A0aHzUbPVzo+0C18mCA==",
"version": "5.4.2",
"resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.4.2.tgz",
"integrity": "sha512-2qujUseKRbLEwLXvEOFAxaz3y1ssdNCXXi95LRdG8AFchJHSnmI2qCg9ixoYxbJtSehIrXOmkhV87Y9lIivOgQ==",
"license": "MIT",
"dependencies": {
"@vscode/l10n": "^0.0.18",
@@ -6,14 +6,14 @@
buildNpmPackage rec {
pname = "vue-language-server";
version = "2.1.10";
version = "2.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/@vue/language-server/-/language-server-${version}.tgz";
hash = "sha256-xf8EzFGNelC0ebW2jYUBWBZ/tYUHMenv1WlGbpvIVhY=";
hash = "sha256-foWKEhK8YE4ZsbejJUKKPNR+G7ZrJWIPEk/1PVe6YRo=";
};
npmDepsHash = "sha256-mbHNdTe2OUu64rZ9/8MWmiSG8RxNcjduT2Wm6znS830=";
npmDepsHash = "sha256-4wpVJt6C4Yt53NWWq3MZLtzX+Spf3by4bM6hjmF2y6A=";
postPatch = ''
ln -s ${./package-lock.json} package-lock.json
+9 -16
View File
@@ -15,8 +15,6 @@
gflags,
libevent,
double-conversion,
apple-sdk_11,
darwinMinVersionHook,
gtest,
@@ -45,20 +43,15 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
folly
fizz
openssl
glog
gflags
libevent
double-conversion
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
folly
fizz
openssl
glog
gflags
libevent
double-conversion
];
checkInputs = [
gtest
+14 -21
View File
@@ -26,8 +26,6 @@
fbthrift,
fb303,
cpptoml,
apple-sdk_11,
darwinMinVersionHook,
gtest,
@@ -58,25 +56,20 @@ stdenv.mkDerivation (finalAttrs: {
removeReferencesTo
];
buildInputs =
[
pcre2
openssl
gflags
glog
libevent
edencommon
folly
fizz
wangle
fbthrift
fb303
cpptoml
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
pcre2
openssl
gflags
glog
libevent
edencommon
folly
fizz
wangle
fbthrift
fb303
cpptoml
];
checkInputs = [
gtest
@@ -11,12 +11,12 @@
let
pname = "elixir-ls";
version = "0.26.1";
version = "0.26.2";
src = fetchFromGitHub {
owner = "elixir-lsp";
repo = "elixir-ls";
rev = "v${version}";
hash = "sha256-fGjHDzQUBROFlv+AIzArRv+Q7RWPTizMFyYXQJGQzjA=";
hash = "sha256-ELjZFGzUQ14iUj2/WD55a6Yf8EMOEjb7MnCx0Nyg/vQ=";
};
in
mixRelease {
@@ -32,7 +32,7 @@ mixRelease {
mixFodDeps = fetchMixDeps {
pname = "mix-deps-${pname}";
inherit src version elixir;
hash = "sha256-EUWySBI082cNXbHZKQKEisXffe0/UpupNcHj1GT7Mek=";
hash = "sha256-I0u3eovTYNm0ncBCTEztg5fhLiLk+WNqcKfj3Za12zc=";
};
# elixir-ls is an umbrella app
-2
View File
@@ -5,7 +5,6 @@
tzdata,
substituteAll,
iana-etc,
apple-sdk_11,
xcbuild,
mailcap,
buildPackages,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
apple-sdk_11
xcbuild
];
-2
View File
@@ -5,7 +5,6 @@
tzdata,
substituteAll,
iana-etc,
apple-sdk_11,
xcbuild,
mailcap,
buildPackages,
@@ -64,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
apple-sdk_11
xcbuild
];
@@ -2,11 +2,9 @@
lib,
stdenv,
alsa-lib,
apple-sdk_11,
autoPatchelfHook,
cairo,
cups,
darwinMinVersionHook,
fontconfig,
glib,
glibc,
@@ -31,7 +29,6 @@ let
"lib"
"stdenv"
"alsa-lib"
"apple-sdk_11"
"autoPatchelfHook"
"cairo"
"cups"
@@ -127,21 +124,16 @@ let
zlib
];
buildInputs =
lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib # libasound.so wanted by lib/libjsound.so
fontconfig
(lib.getLib stdenv.cc.cc) # libstdc++.so.6
xorg.libX11
xorg.libXext
xorg.libXi
xorg.libXrender
xorg.libXtst
]
++ (lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
]);
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib # libasound.so wanted by lib/libjsound.so
fontconfig
(lib.getLib stdenv.cc.cc) # libstdc++.so.6
xorg.libX11
xorg.libXext
xorg.libXi
xorg.libXrender
xorg.libXtst
];
postInstall =
let
@@ -1,7 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, cmake
, brotli, libev, nghttp3, quictls
, apple-sdk_11
, withJemalloc ? false, jemalloc
, curlHTTP3
}:
@@ -26,8 +25,6 @@ stdenv.mkDerivation rec {
libev
nghttp3
quictls
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
] ++ lib.optional withJemalloc jemalloc;
cmakeFlags = [
@@ -0,0 +1,36 @@
{
aiohttp,
buildPythonPackage,
fetchFromGitHub,
lib,
setuptools,
}:
buildPythonPackage rec {
pname = "goslide-api";
version = "0.7.3";
pyproject = true;
src = fetchFromGitHub {
owner = "ualex73";
repo = "goslide-api";
tag = version;
hash = "sha256-s8MtOBNieg0o8U6pkf0e/EF8GtVkb7BgQBP6n/xmKJk=";
};
build-system = [ setuptools ];
dependencies = [ aiohttp ];
pythonImportsCheck = [ "goslideapi" ];
# upstream has no tests
doCheck = false;
meta = {
description = "Python API to utilise the Slide Open Cloud and Local API";
homepage = "https://github.com/ualex73/goslide-api";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
@@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "hahomematic";
version = "2024.12.13";
version = "2025.1.0";
pyproject = true;
disabled = pythonOlder "3.12";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "SukramJ";
repo = "hahomematic";
tag = version;
hash = "sha256-qHB47S5bU+353deoq4B8XwPYfUoU940Y3hl8u3gGrNs=";
hash = "sha256-xsMSTZDqfAQFhxJZNPs45Niv700dJDGdT0feTZyIn08=";
};
__darwinAllowLocalNetworking = true;
@@ -0,0 +1,42 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
pytestCheckHook,
pythonOlder,
}:
buildPythonPackage rec {
pname = "json-api-doc";
version = "0.15.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "julien-duponchelle";
repo = "json-api-doc";
tag = "v${version}";
hash = "sha256-r6XduJ2GIr2hGen6hoNIdE3yqPzHJ9xAFOSbMgErsNA=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail "'pytest-runner'," ""
'';
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "json_api_doc" ];
meta = {
description = "JSON API parser returning a simple Python dictionary";
homepage = "https://github.com/julien-duponchelle/json-api-doc";
changelog = "https://github.com/julien-duponchelle/json-api-doc/releases/tag/v${version}";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ fab ];
};
}
@@ -1,4 +1,5 @@
{
stdenv,
lib,
buildPythonPackage,
fetchFromGitLab,
@@ -21,6 +22,11 @@ buildPythonPackage rec {
hash = "sha256-zOjTGXwxjd6QT01AaIln0FdP/8UZS0W3yPltUhlocpk=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail 'pkg-config' "${stdenv.cc.targetPrefix}pkg-config"
'';
build-system = [ setuptools ];
nativeBuildInputs = [ pkg-config ];
@@ -13,9 +13,6 @@
pyproject-metadata,
scikit-build-core,
# buildInputs
apple-sdk_11,
# dependencies
diskcache,
jinja2,
@@ -70,18 +67,14 @@ buildPythonPackage rec {
scikit-build-core
];
buildInputs =
lib.optionals cudaSupport (
with cudaPackages;
[
cuda_cudart # cuda_runtime.h
cuda_cccl # <thrust/*>
libcublas # cublas_v2.h
]
)
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
];
buildInputs = lib.optionals cudaSupport (
with cudaPackages;
[
cuda_cudart # cuda_runtime.h
cuda_cccl # <thrust/*>
libcublas # cublas_v2.h
]
);
dependencies = [
diskcache
@@ -1,9 +1,7 @@
{
lib,
stdenv,
apple-sdk_11,
buildPythonPackage,
darwinMinVersionHook,
fetchFromGitHub,
pythonOlder,
@@ -49,13 +47,6 @@ buildPythonPackage rec {
dependencies = [ eigen ];
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
# error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
(darwinMinVersionHook "10.13")
apple-sdk_11
];
dontUseCmakeBuildDir = true;
preCheck = ''
@@ -1,27 +1,36 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchPypi,
aiohttp,
buildPythonPackage,
fetchFromGitHub,
json-api-doc,
python-dateutil,
setuptools-scm,
setuptools,
}:
buildPythonPackage rec {
pname = "pyflick";
version = "0.0.2";
format = "setuptools";
pname = "py-flick";
version = "1.1.2";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi {
pname = "PyFlick";
inherit version;
sha256 = "705c82d8caedfff19117c8859cc1b4f56e15ab8dbc0d64d63b79d8634007897f";
src = fetchFromGitHub {
owner = "ZephireNZ";
repo = "PyFlick";
tag = "v${version}";
hash = "sha256-Csm5gXMIGEhHgzN/7sO/1iM/wZklI2Jc0C69tgYWxnQ=";
};
propagatedBuildInputs = [
pythonRelaxDeps = [ "aiohttp" ];
build-system = [
setuptools
setuptools-scm
];
dependencies = [
aiohttp
json-api-doc
python-dateutil
];
@@ -33,10 +42,11 @@ buildPythonPackage rec {
"pyflick.authentication"
];
meta = with lib; {
meta = {
description = "Python API For Flick Electric in New Zealand";
homepage = "https://github.com/ZephireNZ/PyFlick";
license = licenses.mit;
maintainers = with maintainers; [ dotlambda ];
changelog = "https://github.com/ZephireNZ/PyFlick/releases/tag/v${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ dotlambda ];
};
}
@@ -1,8 +1,6 @@
{
lib,
apple-sdk_11,
buildPythonPackage,
darwinMinVersionHook,
fetchFromGitHub,
pythonOlder,
stdenv,
@@ -63,13 +61,7 @@ buildPythonPackage rec {
typing-extensions
];
buildInputs =
[ libsoxr ]
++ lib.optionals stdenv.hostPlatform.isDarwin [
# error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer
(darwinMinVersionHook "10.13")
apple-sdk_11
];
buildInputs = [ libsoxr ];
dependencies = [ numpy ];
@@ -1,7 +1,6 @@
{
lib,
stdenv,
apple-sdk_11,
fetchFromGitHub,
## wandb-core
@@ -179,8 +178,6 @@ buildPythonPackage rec {
hatchling
];
buildInputs = lib.optional stdenv.hostPlatform.isDarwin apple-sdk_11;
dependencies =
[
click
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
version = "1.18.2";
version = "1.18.3";
src = fetchFromGitHub {
rev = version;
owner = "wesnoth";
repo = "wesnoth";
hash = "sha256-nr+WUFzHeaPxCzwc+8JZRL86X8XEsnsGM1HXnNqOIF0=";
hash = "sha256-Uk8omtXYZaneyBr4TASRtIKEyJLGwfKWu9vRQNVpdVA=";
};
nativeBuildInputs = [ cmake pkg-config ];
@@ -5037,7 +5037,8 @@
];
"slide" =
ps: with ps; [
]; # missing inputs: goslide-api
goslide-api
];
"slimproto" =
ps: with ps; [
aioslimproto
@@ -9,13 +9,13 @@
buildHomeAssistantComponent rec {
owner = "SukramJ";
domain = "homematicip_local";
version = "1.76.1";
version = "1.77.0";
src = fetchFromGitHub {
owner = "SukramJ";
repo = "custom_homematic";
tag = version;
hash = "sha256-dBNZFYoi6tA9waV/yPCkgLu+ADxq09UKsOBHWOOBRJY=";
hash = "sha256-l5SK3qB+fst7DQuAykVNXcVpZAaRU5NfWUqRFG/1DMg=";
};
postPatch = ''
-2
View File
@@ -16907,8 +16907,6 @@ with pkgs;
wesnoth = callPackage ../games/wesnoth {
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
# fails to build against latest boost
boost = boost183;
# wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
lua = lua5_4.override {
postConfigure = ''
+4
View File
@@ -5483,6 +5483,8 @@ self: super: with self; {
gorilla = callPackage ../development/python-modules/gorilla { };
goslide-api = callPackage ../development/python-modules/goslide-api { };
govee-ble = callPackage ../development/python-modules/govee-ble { };
govee-led-wez = callPackage ../development/python-modules/govee-led-wez { };
@@ -6695,6 +6697,8 @@ self: super: with self; {
jsonlines = callPackage ../development/python-modules/jsonlines { };
json-api-doc = callPackage ../development/python-modules/json-api-doc { };
json-logging = callPackage ../development/python-modules/json-logging { };
jsonmerge = callPackage ../development/python-modules/jsonmerge { };