Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -51,13 +51,14 @@ rec {
|
||||
|
||||
src = octave.src;
|
||||
|
||||
buildInputs = [ imagemagick ];
|
||||
nativeBuildInputs = [ imagemagick ];
|
||||
strictDeps = true;
|
||||
|
||||
dontConfigure = true;
|
||||
dontInstall = true;
|
||||
|
||||
buildPhase = ''
|
||||
convert ./libgui/src/icons/octave/128x128/logo.png -resize ${size}x${size} $out
|
||||
magick ./libgui/src/icons/octave/128x128/logo.png -resize ${size}x${size} $out
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
}:
|
||||
vimUtils.buildVimPlugin rec {
|
||||
pname = "codediff.nvim";
|
||||
version = "2.9.3";
|
||||
version = "2.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "esmuellert";
|
||||
repo = "codediff.nvim";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-hHBAGDWtw56gk1kWUtU9QEP2QqIATmPNeJ2lPD8dWIc=";
|
||||
hash = "sha256-9pzEO5RzDTX0BVg06XA0AiD9gCmpp1eEqH3Adqptrrs=";
|
||||
};
|
||||
|
||||
dependencies = [ vimPlugins.nui-nvim ];
|
||||
|
||||
@@ -43,14 +43,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gajim";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "dev.gajim.org";
|
||||
owner = "gajim";
|
||||
repo = "gajim";
|
||||
tag = version;
|
||||
hash = "sha256-VBo0+8lOXWbi3a9FT0qcEkyoxzVAm+QLrBtHmRjUHbg=";
|
||||
hash = "sha256-3Z6ADcq+E83xD3GMd19zm0n7+w1SuCYP4KcNL9M/DM4=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
mkHyprlandPlugin (finalAttrs: {
|
||||
pluginName = "hy3";
|
||||
version = "0.53.0";
|
||||
version = "0.53.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outfoxxed";
|
||||
repo = "hy3";
|
||||
tag = "hl${finalAttrs.version}";
|
||||
hash = "sha256-N0kFdc6tSE0yFeQ/Iit3KNrz4nf2K5xvP3juL7SUyhc=";
|
||||
hash = "sha256-0gUgUk8XFtu8HWZySFgb4bzvn+MHK9ZEZ1trVU8YfPw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
{
|
||||
"version": "1.3.9-stable",
|
||||
"version": "1.3.11-stable",
|
||||
"sources": {
|
||||
"aarch64-darwin": {
|
||||
"url": "https://acli.atlassian.com/darwin/1.3.9-stable/acli_1.3.9-stable_darwin_arm64.tar.gz",
|
||||
"sha256": "4cc82582a74e75ef290af17d1ec157ed69f5120d58cbde188b85273bdf8c66ef"
|
||||
"url": "https://acli.atlassian.com/darwin/1.3.11-stable/acli_1.3.11-stable_darwin_arm64.tar.gz",
|
||||
"sha256": "39f80d387324923f0093b455ee4d3d4bd2af44ffd52be33c1d69e8418376d0e4"
|
||||
},
|
||||
"aarch64-linux": {
|
||||
"url": "https://acli.atlassian.com/linux/1.3.9-stable/acli_1.3.9-stable_linux_arm64.tar.gz",
|
||||
"sha256": "9fb2841ad16034f5086f04387a6209c70f2edc26153a44aef91691e5cdc78164"
|
||||
"url": "https://acli.atlassian.com/linux/1.3.11-stable/acli_1.3.11-stable_linux_arm64.tar.gz",
|
||||
"sha256": "43cc72aca128605f0580fc404f14efef6659bb754c9bd3343fb5f43d1f2bbf4b"
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://acli.atlassian.com/darwin/1.3.9-stable/acli_1.3.9-stable_darwin_amd64.tar.gz",
|
||||
"sha256": "2a0703c5940db30587f63c8fffa0de143fee92d4618f9356badcb62bdb088efe"
|
||||
"url": "https://acli.atlassian.com/darwin/1.3.11-stable/acli_1.3.11-stable_darwin_amd64.tar.gz",
|
||||
"sha256": "84a56f7197bcdc5358a035c79bb706dbd80405255fc90f260973a268831ffe18"
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"url": "https://acli.atlassian.com/linux/1.3.9-stable/acli_1.3.9-stable_linux_amd64.tar.gz",
|
||||
"sha256": "3cfc9fa3bbcb1ebf9c2a14574874a9f3f9dec8d2db561415f914c9bd70656de7"
|
||||
"url": "https://acli.atlassian.com/linux/1.3.11-stable/acli_1.3.11-stable_linux_amd64.tar.gz",
|
||||
"sha256": "50bb48e965e48531e008923be763a7b1f74fe9e2e33cc02cd2aaf5e2f00c6dc4"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,25 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchgit,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
pkg-config,
|
||||
pandoc,
|
||||
wrapQtAppsHook,
|
||||
qtbase,
|
||||
qtmultimedia,
|
||||
qttools,
|
||||
qt6,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bino";
|
||||
version = "2.5";
|
||||
pname = "bino3d";
|
||||
version = "2.6";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.marlam.de/git/bino.git";
|
||||
rev = "bino-${finalAttrs.version}";
|
||||
hash = "sha256-vGPbSYTfRy414xVcLIvOnN4Te36HWVz7DQegNhYb3u4=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "marlam";
|
||||
repo = "bino";
|
||||
tag = "bino-${finalAttrs.version}";
|
||||
hash = "sha256-izgiAmMou/EW5KOzC8HuPaH4uVFLajoDhVwkJkzXdP0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -27,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ninja
|
||||
pkg-config
|
||||
pandoc
|
||||
wrapQtAppsHook
|
||||
qt6.wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qttools
|
||||
qt6.qtbase
|
||||
qt6.qtmultimedia
|
||||
qt6.qttools
|
||||
# The optional QVR dependency is not currently packaged.
|
||||
];
|
||||
|
||||
@@ -71,11 +71,11 @@ in
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "copyparty${nameSuffix}";
|
||||
version = "1.20.1";
|
||||
version = "1.20.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz";
|
||||
hash = "sha256-T1E8qePRwRp7tOGoqSXdokSblWXpH273y+EDZ/pOKTU=";
|
||||
hash = "sha256-JdrB7ckcUijSTvTQfDHAczHPaXlRr+MYg/unTi0QLMI=";
|
||||
};
|
||||
|
||||
pyproject = true;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ mkDprintPlugin }:
|
||||
mkDprintPlugin {
|
||||
description = "Biome (JS/TS/JSON) wrapper plugin";
|
||||
hash = "sha256-P5mAFdr+vw6ogju0Qg6E9sbuTASaZD1Wr4BHt70lCy8=";
|
||||
hash = "sha256-RQAApULPcEGBUeEUZsJic1yEkmP5XMzbzazfSc5e1uw=";
|
||||
initConfig = {
|
||||
configExcludes = [ "**/node_modules" ];
|
||||
configKey = "biome";
|
||||
@@ -17,6 +17,6 @@ mkDprintPlugin {
|
||||
};
|
||||
pname = "dprint-plugin-biome";
|
||||
updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
|
||||
url = "https://plugins.dprint.dev/biome-0.11.10.wasm";
|
||||
version = "0.11.10";
|
||||
url = "https://plugins.dprint.dev/biome-0.11.11.wasm";
|
||||
version = "0.11.11";
|
||||
}
|
||||
|
||||
@@ -22,12 +22,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "filezilla";
|
||||
version = "3.69.3";
|
||||
version = "3.69.5";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk";
|
||||
rev = "11309";
|
||||
hash = "sha256-+wvdQnsYUsLS4pHoa3JVzkgTVxbeck/c7IaDt0VqU+8=";
|
||||
rev = "11338";
|
||||
hash = "sha256-OQZFwowkmiOcIjWoHkIFwsm6nuyMGSaBSn8zwVpCMAs=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@@ -70,6 +70,9 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ pSub ];
|
||||
maintainers = with lib.maintainers; [
|
||||
iedame
|
||||
pSub
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -23,19 +23,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "flare";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.com";
|
||||
owner = "schmiddi-on-mobile";
|
||||
repo = "flare";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-YXUXUaFAsqeFtnvAxkSeBGAq8Oll/dMJlb3A0yKus94=";
|
||||
hash = "sha256-BJAmIdkJhyfZRQLUZp34c5reuBleXWpmFJhNMFYTEXw=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-3n1UyrlfGlJxe6TE5rex0XXA/P7ItycuZWIrKH14t3A=";
|
||||
hash = "sha256-MD7YPO3q2WlFgAacvPHtj6UTnFogbC6T62mNic5955w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "ghostfolio";
|
||||
version = "2.229.0";
|
||||
version = "2.233.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ghostfolio";
|
||||
repo = "ghostfolio";
|
||||
tag = version;
|
||||
hash = "sha256-hzweYMIn4BUuEv2fH9AofeE1GTc1J4Yrnzs8zN2nr0o=";
|
||||
hash = "sha256-if6mx/pjRqx9++ufkTHWVnqGScr+e3uZ0a6P6Ai9zWE=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -27,7 +27,7 @@ buildNpmPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-9HdYw/OKGmqrVPFUqd0f4jW7aHBNAW2S5f2rDRbPR4c=";
|
||||
npmDepsHash = "sha256-wMA8Q/cCTXwVnlpAEdEaA4iyfQOnYwwGRq+/k1Py+zg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
prisma_6
|
||||
|
||||
@@ -94,8 +94,10 @@
|
||||
addDriverRunpath,
|
||||
undmg,
|
||||
|
||||
# For QT support
|
||||
# Enables Chrome's "Use QT" appearance to introspect the user's Plasma theme
|
||||
plasmaSupport ? false,
|
||||
qt6,
|
||||
kdePackages,
|
||||
|
||||
# Create a symlink at $out/bin/google-chrome
|
||||
withSymlink ? true,
|
||||
@@ -167,8 +169,12 @@ let
|
||||
++ [
|
||||
gtk3
|
||||
gtk4
|
||||
]
|
||||
++ lib.optionals plasmaSupport [
|
||||
qt6.qtbase
|
||||
qt6.qtwayland
|
||||
kdePackages.plasma-integration
|
||||
kdePackages.breeze
|
||||
];
|
||||
|
||||
linux = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
@@ -249,9 +255,13 @@ let
|
||||
|
||||
# "--simulate-outdated-no-au" disables auto updates and browser outdated popup
|
||||
makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \
|
||||
--prefix QT_PLUGIN_PATH : "${qt6.qtbase}/lib/qt-6/plugins" \
|
||||
--prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/lib/qt-6/plugins" \
|
||||
--prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \
|
||||
${lib.optionalString plasmaSupport ''
|
||||
--prefix QT_PLUGIN_PATH : "${qt6.qtbase}/lib/qt-6/plugins" \
|
||||
--prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/lib/qt-6/plugins" \
|
||||
--prefix QT_PLUGIN_PATH : "${kdePackages.plasma-integration}/lib/qt-6/plugins" \
|
||||
--prefix QT_PLUGIN_PATH : "${kdePackages.breeze}/lib/qt-6/plugins" \
|
||||
--prefix NIXPKGS_QT6_QML_IMPORT_PATH : "${qt6.qtwayland}/lib/qt-6/qml" \
|
||||
''} \
|
||||
--prefix LD_LIBRARY_PATH : "$rpath" \
|
||||
--prefix PATH : "$binpath" \
|
||||
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
|
||||
|
||||
@@ -20,14 +20,14 @@
|
||||
|
||||
python313Packages.buildPythonApplication rec {
|
||||
pname = "high-tide";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Nokse22";
|
||||
repo = "high-tide";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-AHdv2eazUnxgw5D4SlIzWm/wnC26zedwiAGT0OzjdZs=";
|
||||
hash = "sha256-KaUI0Sa2sYrwv6v8kVbBwaTLaeY/B6tnDMJNNGazn9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"branch": "v0.53.2-b",
|
||||
"commit_hash": "39f3feddbee4a66be9608ed1eb7e73878d596b50",
|
||||
"commit_message": "[gha] Nix: update inputs",
|
||||
"date": "2026-01-23",
|
||||
"tag": "v0.53.2"
|
||||
"branch": "v0.53.3-b",
|
||||
"commit_hash": "dd220efe7b1e292415bd0ea7161f63df9c95bfd3",
|
||||
"commit_message": "version: bump to 0.53.3",
|
||||
"date": "2026-01-24",
|
||||
"tag": "v0.53.3"
|
||||
}
|
||||
|
||||
@@ -91,14 +91,14 @@ assert assertMsg (
|
||||
|
||||
customStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + optionalString debug "-debug";
|
||||
version = "0.53.2";
|
||||
version = "0.53.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland";
|
||||
fetchSubmodules = true;
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-aDecEI6KQ4FIvD4CRST6HTikXe0aYXeopB1HnV1tQJM=";
|
||||
hash = "sha256-as2crdrJUVOawO8XkWJEZBUNaFdPS8QuQiccTkM1la0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libfilezilla";
|
||||
version = "0.51.1";
|
||||
version = "0.52.0";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.filezilla-project.org/svn/libfilezilla/trunk";
|
||||
rev = "11305";
|
||||
hash = "sha256-s+KeMlKJMz88lQ6d3dpcgZhCkcPW0cHNHALteMWLhpk=";
|
||||
rev = "11335";
|
||||
hash = "sha256-BjHqPC43UtwlYeKbgIaGU8jmWbg5UUiTN8vl1m2mZpo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -42,7 +42,10 @@ stdenv.mkDerivation {
|
||||
homepage = "https://lib.filezilla-project.org/";
|
||||
description = "Modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ pSub ];
|
||||
maintainers = with lib.maintainers; [
|
||||
iedame
|
||||
pSub
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
broken = stdenv.hostPlatform.isDarwin;
|
||||
};
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "neowall";
|
||||
version = "0.4.5";
|
||||
version = "0.4.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "1ay1";
|
||||
repo = "neowall";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-dgego9hcYCqnky7hvCubOZWHA1HxKDY9E9F/7YIwj+I=";
|
||||
hash = "sha256-esI7m5V6ISpoXllLNjb52TdVMKel4FKOKPa40n3rofo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "slipshow";
|
||||
version = "0.7.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "panglesd";
|
||||
repo = "slipshow";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-HV4qUp/da0GjZ/KSaE4L/qxdosnOTRcC83zIRigxFSY=";
|
||||
hash = "sha256-13LoIvmSYGycuJpAqylyVmVnyttuyaQF1Dk/3BgikkE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -2,18 +2,19 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildDunePackage,
|
||||
stdenv,
|
||||
flex,
|
||||
bison,
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
(buildDunePackage.override { inherit stdenv; }) (finalAttrs: {
|
||||
pname = "teyjus";
|
||||
version = "2.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "teyjus";
|
||||
repo = "teyjus";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N4XKDd0NFr501PYUdb7PM2sWh0uD1/SUFXoMr10f064=";
|
||||
};
|
||||
|
||||
@@ -31,9 +32,9 @@ buildDunePackage rec {
|
||||
meta = {
|
||||
description = "Efficient implementation of the Lambda Prolog language";
|
||||
homepage = "https://github.com/teyjus/teyjus";
|
||||
changelog = "https://github.com/teyjus/teyjus/releases/tag/v${version}";
|
||||
changelog = "https://github.com/teyjus/teyjus/releases/tag/v${finalAttrs.version}";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.bcdarwin ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
rec {
|
||||
version = "1.2.5";
|
||||
version = "1.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-ffmpeg";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-MWO8B/L/KHLuq/BIIIidsLbFwGIwt/xj+/M1zEp8Z/8=";
|
||||
hash = "sha256-wQvpbvAAg4tybAFdGq0O9vfCc0v2iPFk04Q3zgTwa7Y=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -18,6 +18,7 @@ rec {
|
||||
maintainers = with lib.maintainers; [
|
||||
dandellion
|
||||
momeemt
|
||||
juaningan
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
buildDunePackage {
|
||||
pname = "ffmpeg";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
inherit (ffmpeg-base) version src;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
buildDunePackage {
|
||||
pname = "ffmpeg-av";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
inherit (ffmpeg-base) version src;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildDunePackage {
|
||||
pname = "ffmpeg-avcodec";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
inherit (ffmpeg-base) version src;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildDunePackage {
|
||||
pname = "ffmpeg-avdevice";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
inherit (ffmpeg-base) version src;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildDunePackage {
|
||||
pname = "ffmpeg-avfilter";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
inherit (ffmpeg-base) version src;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildDunePackage {
|
||||
pname = "ffmpeg-avutil";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
inherit (ffmpeg-base) version src;
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
buildDunePackage {
|
||||
pname = "ffmpeg-swresample";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
inherit (ffmpeg-base) version src;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
buildDunePackage {
|
||||
pname = "ffmpeg-swscale";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.12";
|
||||
|
||||
inherit (ffmpeg-base) version src;
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "sel";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
minimalOCamlVersion = "4.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/gares/sel/releases/download/v${version}/sel-${version}.tbz";
|
||||
hash = "sha256-1EJW9QogROoi0704v8/Wf8gIws/uEm05E0adv3eRDzI=";
|
||||
hash = "sha256-jTAjWdaoioR5+G96qoOY+JXrJY00eF7y7WhGSiFwfqg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -49,14 +49,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymobiledevice3";
|
||||
version = "7.0.7";
|
||||
version = "7.3.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doronz88";
|
||||
repo = "pymobiledevice3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-akJjxGj8kSvp9cRzEZrndW9il1zCabneZfKx8ACOmLk=";
|
||||
hash = "sha256-xvtO+BWtXZxrg1VMoqKhSWJ7edkkZ+myAXtyPD4DXFg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,33 +2,47 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildPythonPackage,
|
||||
cargo,
|
||||
rustPlatform,
|
||||
|
||||
# nativeBuildInputs
|
||||
cargo,
|
||||
rustc,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
setuptools-rust,
|
||||
|
||||
# dependencies
|
||||
numpy,
|
||||
|
||||
# tests
|
||||
fixtures,
|
||||
networkx,
|
||||
testtools,
|
||||
pytestCheckHook,
|
||||
testtools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "rustworkx";
|
||||
version = "0.16.0";
|
||||
version = "0.17.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Qiskit";
|
||||
repo = "rustworkx";
|
||||
rev = version;
|
||||
hash = "sha256-hzB99ReL1bTmj1mYne9rJp2rBeMnmIR17VQFVl7rzr0=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-aBKGJwm9EmGwLOhIx6qTuDco5uNcnwUlZf3ztFzmIGs=";
|
||||
};
|
||||
|
||||
# Otherwise, `rust-src` is required
|
||||
# https://github.com/Qiskit/rustworkx/pull/1447
|
||||
postPatch = ''
|
||||
rm -rf .cargo/config.toml
|
||||
'';
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit src;
|
||||
hash = "sha256-9NMTGq8KzIvnOXrsUpFHrtM9K/E7RMrE/Aa9mtO7pTI=";
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-2jqyXk6xWpSGdpaVGu7YW9643MBYDfl3A6InFw/cCUM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -60,7 +74,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "High performance Python graph library implemented in Rust";
|
||||
homepage = "https://github.com/Qiskit/rustworkx";
|
||||
changelog = "https://github.com/Qiskit/rustworkx/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ raitobezarius ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -369,8 +369,8 @@ rec {
|
||||
defaultJava = jdk21;
|
||||
};
|
||||
gradle_8 = mkGradle {
|
||||
version = "8.14.3";
|
||||
hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
|
||||
version = "8.14.4";
|
||||
hash = "sha256-8XcSmKcPbbWina9iN4xOGKF/wzybprFDYuDN9AYQOA0=";
|
||||
defaultJava = jdk21;
|
||||
# Only enable this on *one* version to avoid duplicate PRs.
|
||||
enableUpdateScript = true;
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
fetchFromGitHub,
|
||||
kernel,
|
||||
kernelModuleMakeFlags,
|
||||
bluez,
|
||||
nixosTests,
|
||||
nix-update-script,
|
||||
}:
|
||||
@@ -25,7 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
buildInputs = [ bluez ];
|
||||
|
||||
makeFlags = kernelModuleMakeFlags ++ [
|
||||
"-C"
|
||||
|
||||
@@ -21,26 +21,22 @@
|
||||
yt-dlp
|
||||
],
|
||||
}:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "liquidsoap";
|
||||
version = "2.3.3";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "liquidsoap";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-EQFWFtgWvwsV+ZhO36Sd7mpxYOnd4Vv6Z+6xsgi335k=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ViJlG+AUncL37mltlFFXVho98Up11qZI3wwSnrd9C8g=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/lang/dune \
|
||||
substituteInPlace src/lang/base/dune \
|
||||
--replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)"
|
||||
# Compatibility with camlimages 5.0.5
|
||||
substituteInPlace src/core/dune \
|
||||
substituteInPlace src/core/optionals/camlimages/dune \
|
||||
--replace-warn camlimages.all_formats camlimages.core
|
||||
'';
|
||||
|
||||
@@ -141,6 +137,7 @@ stdenv.mkDerivation {
|
||||
ocamlPackages.shine
|
||||
ocamlPackages.soundtouch
|
||||
ocamlPackages.speex
|
||||
ocamlPackages.ocaml_sqlite3
|
||||
ocamlPackages.srt
|
||||
ocamlPackages.ssl
|
||||
ocamlPackages.taglib
|
||||
@@ -160,8 +157,9 @@ stdenv.mkDerivation {
|
||||
changelog = "https://raw.githubusercontent.com/savonet/liquidsoap/main/CHANGES.md";
|
||||
maintainers = with lib.maintainers; [
|
||||
dandellion
|
||||
juaningan
|
||||
];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = ocamlPackages.ocaml.meta.platforms or [ ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -5015,6 +5015,7 @@ with pkgs;
|
||||
|
||||
teyjus = callPackage ../development/compilers/teyjus {
|
||||
inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage;
|
||||
stdenv = gcc14Stdenv;
|
||||
};
|
||||
|
||||
urweb = callPackage ../development/compilers/urweb {
|
||||
@@ -9983,8 +9984,6 @@ with pkgs;
|
||||
|
||||
bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };
|
||||
|
||||
bino3d = qt6Packages.callPackage ../applications/video/bino3d { };
|
||||
|
||||
bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };
|
||||
bitlbee-plugins = callPackage ../applications/networking/instant-messengers/bitlbee/plugins.nix { };
|
||||
|
||||
|
||||
@@ -626,25 +626,25 @@ let
|
||||
|
||||
ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { };
|
||||
ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix {
|
||||
ffmpeg = pkgs.ffmpeg_6;
|
||||
ffmpeg = pkgs.ffmpeg_8;
|
||||
};
|
||||
ffmpeg-avcodec = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix {
|
||||
ffmpeg = pkgs.ffmpeg_6;
|
||||
ffmpeg = pkgs.ffmpeg_8;
|
||||
};
|
||||
ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix {
|
||||
ffmpeg = pkgs.ffmpeg_6;
|
||||
ffmpeg = pkgs.ffmpeg_8;
|
||||
};
|
||||
ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix {
|
||||
ffmpeg = pkgs.ffmpeg_6;
|
||||
ffmpeg = pkgs.ffmpeg_8;
|
||||
};
|
||||
ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix {
|
||||
ffmpeg = pkgs.ffmpeg_6;
|
||||
ffmpeg = pkgs.ffmpeg_8;
|
||||
};
|
||||
ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix {
|
||||
ffmpeg = pkgs.ffmpeg_6;
|
||||
ffmpeg = pkgs.ffmpeg_8;
|
||||
};
|
||||
ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix {
|
||||
ffmpeg = pkgs.ffmpeg_6;
|
||||
ffmpeg = pkgs.ffmpeg_8;
|
||||
};
|
||||
|
||||
fiber = callPackage ../development/ocaml-modules/fiber { };
|
||||
|
||||
Reference in New Issue
Block a user