Merge staging-next into staging
This commit is contained in:
nixpkgs-ci[bot]
@@ -64,8 +64,6 @@
|
||||
|
||||
obs-noise = callPackage ./obs-noise.nix { };
|
||||
|
||||
obs-nvfbc = callPackage ./obs-nvfbc.nix { };
|
||||
|
||||
obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { };
|
||||
|
||||
obs-recursion-effect = callPackage ./obs-recursion-effect.nix { };
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
ninja,
|
||||
obs-studio,
|
||||
libuiohook,
|
||||
qtbase,
|
||||
@@ -13,14 +14,14 @@
|
||||
SDL2,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "obs-input-overlay";
|
||||
version = "5.0.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "univrsal";
|
||||
repo = "input-overlay";
|
||||
rev = "refs/tags/${version}";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ju4u7hhx+hTuq7Oh0DBPV8RRM8zqyyvYV74KymU0+2c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
ninja
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
libxkbfile
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isx86 [
|
||||
"-DCMAKE_CXX_FLAGS=-msse4.1"
|
||||
];
|
||||
|
||||
@@ -62,8 +64,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/univrsal/input-overlay";
|
||||
maintainers = with lib.maintainers; [ glittershark ];
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
# never built on aarch64-linux since first introduction in nixpkgs
|
||||
broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -37,6 +37,7 @@ stdenv.mkDerivation {
|
||||
homepage = "https://looking-glass.io/docs/stable/obs/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ babbaj ];
|
||||
# Hard coded x86_64 support
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,9 +33,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/exeldro/obs-3d-effect";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -46,9 +46,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/Aitum/obs-aitum-multistream";
|
||||
maintainers = with lib.maintainers; [ flexiondotorg ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/royshil/obs-backgroundremoval";
|
||||
maintainers = with maintainers; [ zahrun ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/norihiro/command-source";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/exeldro/obs-dir-watch-media";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -33,9 +33,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/exeldro/obs-gradient-source";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/hyperion-project/hyperion-obs-plugin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ algram ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
|
||||
mit
|
||||
];
|
||||
maintainers = [ maintainers.Bauke ];
|
||||
platforms = obs-studio.meta.platforms;
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/exeldro/obs-markdown";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/exeldro/obs-move-transition";
|
||||
maintainers = with maintainers; [ starcraft66 ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -56,9 +56,6 @@ stdenv.mkDerivation rec {
|
||||
description = "Multi-site simultaneous broadcast plugin for OBS Studio";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ jk ];
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/norihiro/obs-mute-filter";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,9 +30,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/FiniteSingularity/obs-noise";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
obs-studio,
|
||||
libGL,
|
||||
libX11,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-nvfbc";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "fzwoch";
|
||||
repo = "obs-nvfbc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
ninja
|
||||
];
|
||||
buildInputs = [
|
||||
obs-studio
|
||||
libGL
|
||||
libX11
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "OBS Studio source plugin for NVIDIA FBC API";
|
||||
homepage = "https://gitlab.com/fzwoch/obs-nvfbc";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ babbaj ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@@ -42,9 +42,6 @@ stdenv.mkDerivation rec {
|
||||
fazzi
|
||||
];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,9 +31,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/FiniteSingularity/obs-retro-effects";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -25,9 +25,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/wimpysworld/obs-rgb-levels";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,9 +30,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/dimtpap/obs-scale-to-sound";
|
||||
maintainers = with lib.maintainers; [ flexiondotorg ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/andilippi/obs-scene-as-transition";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/exeldro/obs-shaderfilter";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
|
||||
shackra
|
||||
];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,9 +32,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/exeldro/obs-source-switcher";
|
||||
maintainers = with lib.maintainers; [ flexiondotorg ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -30,9 +30,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/FiniteSingularity/obs-stroke-glow-shadow";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,9 +42,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/norihiro/obs-text-pthread";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,9 +35,6 @@ stdenv.mkDerivation {
|
||||
homepage = "https://github.com/exeldro/obs-transition-table";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -90,9 +90,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/locaal-ai/obs-urlsource";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -66,9 +66,6 @@ stdenv.mkDerivation rec {
|
||||
pedrohlc
|
||||
];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -47,9 +47,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/Aitum/obs-vertical-canvas";
|
||||
maintainers = with lib.maintainers; [ flexiondotorg ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/cg2121/obs-vintage-filter";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,9 +42,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/obsproject/obs-websocket";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -25,9 +25,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/dspstanky/pixel-art";
|
||||
maintainers = with maintainers; [ flexiondotorg ];
|
||||
license = licenses.gpl2Only;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
inherit (obs-studio.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/phandasm/waveform";
|
||||
maintainers = with lib.maintainers; [ matthewcroughan ];
|
||||
license = lib.licenses.gpl3;
|
||||
# Hard coded x86_64 support
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,25 +3,37 @@
|
||||
lib,
|
||||
callPackage,
|
||||
pkg-config,
|
||||
}:
|
||||
hyprland,
|
||||
}@topLevelArgs:
|
||||
let
|
||||
mkHyprlandPlugin =
|
||||
hyprland:
|
||||
args@{ pluginName, ... }:
|
||||
hyprland.stdenv.mkDerivation (
|
||||
args
|
||||
// {
|
||||
|
||||
mkHyprlandPlugin = lib.extendMkDerivation {
|
||||
constructDrv = topLevelArgs.hyprland.stdenv.mkDerivation;
|
||||
|
||||
extendDrvArgs =
|
||||
finalAttrs:
|
||||
{
|
||||
pluginName ? "",
|
||||
nativeBuildInputs ? [ ],
|
||||
buildInputs ? [ ],
|
||||
hyprland ? topLevelArgs.hyprland,
|
||||
...
|
||||
}@args:
|
||||
|
||||
{
|
||||
pname = "${pluginName}";
|
||||
nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ];
|
||||
buildInputs = [ hyprland ] ++ hyprland.buildInputs ++ (args.buildInputs or [ ]);
|
||||
nativeBuildInputs = [ pkg-config ] ++ nativeBuildInputs;
|
||||
buildInputs = [ hyprland ] ++ hyprland.buildInputs ++ buildInputs;
|
||||
meta = args.meta // {
|
||||
description = args.meta.description or "";
|
||||
longDescription =
|
||||
(args.meta.longDescription or "")
|
||||
+ "\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options.";
|
||||
|
||||
platforms = args.meta.platforms or hyprland.meta.platforms or [ ];
|
||||
};
|
||||
}
|
||||
);
|
||||
};
|
||||
};
|
||||
|
||||
plugins = lib.mergeAttrsList [
|
||||
{ hy3 = import ./hy3.nix; }
|
||||
|
||||
@@ -6,22 +6,27 @@
|
||||
mkHyprlandPlugin,
|
||||
nix-update-script,
|
||||
}:
|
||||
mkHyprlandPlugin hyprland rec {
|
||||
mkHyprlandPlugin (finalAttrs: {
|
||||
pluginName = "hy3";
|
||||
version = "hl0.50.0";
|
||||
version = "0.51.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "outfoxxed";
|
||||
repo = "hy3";
|
||||
tag = version;
|
||||
hash = "sha256-1BTJSqkj+lkIry27HuqA5UB7uRqAUvGT7LAUDQhKjU0=";
|
||||
tag = "hl${finalAttrs.version}";
|
||||
hash = "sha256-HjbofK4rSLkkUvOZHdoAY6kn7Ok2bXo14eOKr8hKRHE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
passthru.updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"hl(.*)"
|
||||
];
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/outfoxxed/hy3";
|
||||
@@ -33,4 +38,4 @@ mkHyprlandPlugin hyprland rec {
|
||||
johnrtitor
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,20 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
mkHyprlandPlugin,
|
||||
hyprland,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
mkHyprlandPlugin hyprland rec {
|
||||
mkHyprlandPlugin (finalAttrs: {
|
||||
pluginName = "hycov";
|
||||
version = "0.41.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DreamMaoMao";
|
||||
repo = "hycov";
|
||||
rev = version;
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ=";
|
||||
};
|
||||
|
||||
@@ -30,4 +29,4 @@ mkHyprlandPlugin hyprland rec {
|
||||
platforms = lib.platforms.linux;
|
||||
broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,11 +2,10 @@
|
||||
lib,
|
||||
mkHyprlandPlugin,
|
||||
fetchFromGitHub,
|
||||
hyprland,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
mkHyprlandPlugin hyprland {
|
||||
mkHyprlandPlugin {
|
||||
pluginName = "hypr-dynamic-cursors";
|
||||
version = "0-unstable-2025-09-01";
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
mkHyprlandPlugin,
|
||||
hyprland,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
doctest,
|
||||
@@ -11,7 +10,7 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
mkHyprlandPlugin hyprland {
|
||||
mkHyprlandPlugin {
|
||||
pluginName = "hyprgrass";
|
||||
version = "0.8.2-unstable-2025-05-08";
|
||||
|
||||
|
||||
@@ -10,20 +10,19 @@ let
|
||||
lib,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
hyprland,
|
||||
mkHyprlandPlugin,
|
||||
}:
|
||||
let
|
||||
version = "0.50.0";
|
||||
version = "0.51.0";
|
||||
|
||||
hyprland-plugins-src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland-plugins";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XJJ+frO4NOxVkoSGc1Mag8ESumzx2FmVRspOgFlMqF8=";
|
||||
hash = "sha256-6jAtMjnWq8kty/dpPbIKxIupUG+WAE2AKMIKhxdLYNo=";
|
||||
};
|
||||
in
|
||||
mkHyprlandPlugin hyprland {
|
||||
mkHyprlandPlugin {
|
||||
pluginName = name;
|
||||
inherit version;
|
||||
|
||||
@@ -34,7 +33,6 @@ let
|
||||
description = "Hyprland ${description} plugin";
|
||||
license = lib.licenses.bsd3;
|
||||
teams = [ lib.teams.hyprland ];
|
||||
inherit (hyprland.meta) platforms;
|
||||
};
|
||||
}
|
||||
)
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
hyprland,
|
||||
mkHyprlandPlugin,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
mkHyprlandPlugin hyprland {
|
||||
mkHyprlandPlugin {
|
||||
pluginName = "hyprspace";
|
||||
version = "0-unstable-2025-07-16";
|
||||
|
||||
|
||||
@@ -2,19 +2,18 @@
|
||||
lib,
|
||||
meson,
|
||||
fetchFromGitHub,
|
||||
hyprland,
|
||||
ninja,
|
||||
mkHyprlandPlugin,
|
||||
nix-update-script,
|
||||
}:
|
||||
mkHyprlandPlugin hyprland rec {
|
||||
mkHyprlandPlugin (finalAttrs: {
|
||||
pluginName = "hyprsplit";
|
||||
version = "0.50.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shezdy";
|
||||
repo = "hyprsplit";
|
||||
tag = "v${version}";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-D0zfdUJXBRnNMmv/5qW+X4FJJ3/+t7yQmwJFkBuEgck=";
|
||||
};
|
||||
|
||||
@@ -29,9 +28,8 @@ mkHyprlandPlugin hyprland rec {
|
||||
homepage = "https://github.com/shezdy/hyprsplit";
|
||||
description = "Hyprland plugin for awesome / dwm like workspaces";
|
||||
license = lib.licenses.bsd3;
|
||||
inherit (hyprland.meta) platforms;
|
||||
maintainers = with lib.maintainers; [
|
||||
aacebedo
|
||||
];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
withLame ? false,
|
||||
lame,
|
||||
withMusicbrainz ? false,
|
||||
libmusicbrainz5,
|
||||
libmusicbrainz,
|
||||
|
||||
withTaglib ? true,
|
||||
taglib_1,
|
||||
@@ -129,7 +129,7 @@ let
|
||||
{
|
||||
names = [ "MUSICBRAINZ" ];
|
||||
enable = withMusicbrainz;
|
||||
pkgs = [ libmusicbrainz5 ];
|
||||
pkgs = [ libmusicbrainz ];
|
||||
}
|
||||
{
|
||||
names = [ "ONLINE_SERVICES" ];
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "codeberg-cli";
|
||||
version = "0.4.11";
|
||||
version = "0.5.0";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "Aviac";
|
||||
repo = "codeberg-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wf9Ve7focNBo6fGsjBQpTIx+DtxOo73AIQ9uoV8Q88Q=";
|
||||
hash = "sha256-eTr+vkHHbUnUIli7PDEb/1abr2z2m0AZK8sTrkADaqM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-LmLMTnNwxih5HcrMUmQpVdIVz4KeHxcOFtOrNqgGPkA=";
|
||||
cargoHash = "sha256-/cPso8VGG7a1ODHLFMQ1Pyr6NA+7umY+Z2iCBJfIGdE=";
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
installShellFiles
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
ffmpeg-headless,
|
||||
libcdio,
|
||||
libcdio-paranoia,
|
||||
libmusicbrainz5,
|
||||
libmusicbrainz,
|
||||
curl,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
ffmpeg-headless
|
||||
libcdio
|
||||
libcdio-paranoia
|
||||
libmusicbrainz5
|
||||
libmusicbrainz
|
||||
curl
|
||||
];
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
cmocka,
|
||||
gmp,
|
||||
gperf,
|
||||
libtap,
|
||||
ninja,
|
||||
perl,
|
||||
pkg-config,
|
||||
@@ -65,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
gmp
|
||||
libtap
|
||||
rinutils
|
||||
];
|
||||
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
neon,
|
||||
libdiscid,
|
||||
libxml2,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libmusicbrainz";
|
||||
version = "5.1.0-unstable-2025-07-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = "libmusicbrainz";
|
||||
rev = "4efbed3afae11ef68281816088d7cf3d0f704dfe";
|
||||
hash = "sha256-2nMm+vm/uOT7AzTQIvfpmBsNYApZF0mekDEgt7tC6fw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
neon
|
||||
libdiscid
|
||||
libxml2
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "http://musicbrainz.org/doc/libmusicbrainz";
|
||||
description = "MusicBrainz Client Library";
|
||||
longDescription = ''
|
||||
The libmusicbrainz (also known as mb_client or MusicBrainz Client
|
||||
Library) is a development library geared towards developers who wish to
|
||||
add MusicBrainz lookup capabilities to their applications.
|
||||
'';
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
};
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
pkg-config,
|
||||
cmake,
|
||||
perl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "libtap";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.xz";
|
||||
sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = [
|
||||
cmake
|
||||
perl
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to implement a test protocol";
|
||||
longDescription = ''
|
||||
libtap is a library to implement the Test Anything Protocol for
|
||||
C originally created by Nik Clayton. This is a maintenance
|
||||
branch by Shlomi Fish.
|
||||
'';
|
||||
homepage = "https://www.shlomifish.org/open-source/projects/libtap/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@@ -75,13 +75,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "6442";
|
||||
version = "6479";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-YNH7gvFtkHaZDnABg9pxJjnsASQfrRU4iqKqVa79MO8=";
|
||||
hash = "sha256-wgfYjG9m/ainCI85FlCb12Dz01R+pZfFeDX613M4xpQ=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
|
||||
patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i"
|
||||
done
|
||||
rm $out/bin/libndi.so.${majorVersion}
|
||||
ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.${majorVersion}
|
||||
ln -s $out/lib/libndi.so $out/bin/libndi.so.${majorVersion}
|
||||
# Fake ndi version 5 for compatibility with DistroAV (obs plugin using NDI)
|
||||
ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.5
|
||||
ln -s $out/lib/libndi.so $out/bin/libndi.so.5
|
||||
mv include examples $out/
|
||||
mkdir -p $out/share/doc/ndi-6
|
||||
mv licenses $out/share/doc/ndi-6/licenses
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"hash": "sha256-10pxvHLYbQ1p3NKSTC1I3YAFkPbYSCenXTEWukqy5TY=", "version": "6.2.0"}
|
||||
{"hash": "sha256-C99mJkUn+L43+iLt3SuFFLmGilik2D+AoH2+tHnuFNQ=", "version": "6.2.0"}
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
cjs,
|
||||
gtksourceview4,
|
||||
gobject-introspection,
|
||||
libmusicbrainz5,
|
||||
libmusicbrainz,
|
||||
webkitgtk_4_1,
|
||||
clutter-gtk,
|
||||
clutter-gst,
|
||||
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gtk3
|
||||
cjs
|
||||
gtksourceview4
|
||||
libmusicbrainz5
|
||||
libmusicbrainz
|
||||
webkitgtk_4_1
|
||||
clutter-gtk
|
||||
clutter-gst
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
libroxml,
|
||||
proj_7,
|
||||
yaml-cpp_0_3,
|
||||
boost,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osm2xmap";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w";
|
||||
repo = "osm2xmap";
|
||||
owner = "sembruk";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"GIT_VERSION=${version}"
|
||||
"GIT_TIMESTAMP="
|
||||
"SHAREDIR=${placeholder "out"}/share/osm2xmap/"
|
||||
"INSTALL_BINDIR=${placeholder "out"}/bin"
|
||||
"INSTALL_MANDIR=${placeholder "out"}/share/man/man1"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
|
||||
|
||||
buildInputs = [
|
||||
libroxml
|
||||
proj_7
|
||||
yaml-cpp_0_3
|
||||
boost
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sembruk/osm2xmap";
|
||||
description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.mpickering ];
|
||||
platforms = with lib.platforms; linux;
|
||||
mainProgram = "osm2xmap";
|
||||
};
|
||||
}
|
||||
@@ -14,7 +14,7 @@
|
||||
gnome,
|
||||
adwaita-icon-theme,
|
||||
gst_all_1,
|
||||
libmusicbrainz5,
|
||||
libmusicbrainz,
|
||||
libdiscid,
|
||||
isocodes,
|
||||
gsettings-desktop-schemas,
|
||||
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
libcanberra-gtk3
|
||||
adwaita-icon-theme
|
||||
gsettings-desktop-schemas
|
||||
libmusicbrainz5
|
||||
libmusicbrainz
|
||||
libdiscid
|
||||
isocodes
|
||||
gst_all_1.gstreamer
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
gitUpdater,
|
||||
cmake,
|
||||
static ? stdenv.hostPlatform.isStatic,
|
||||
@@ -18,6 +19,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "yaml-cpp-fix-cmake-4.patch";
|
||||
url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
|
||||
hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -1,58 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
neon,
|
||||
libdiscid,
|
||||
libxml2,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.1.0";
|
||||
pname = "libmusicbrainz";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
neon
|
||||
libdiscid
|
||||
libxml2
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = "libmusicbrainz";
|
||||
sha256 = "0ah9kaf3g3iv1cps2vs1hs33nfbjfx1xscpjgxr1cg28p4ri6jhq";
|
||||
rev = "release-${version}";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with libxml2 2.12
|
||||
(fetchpatch {
|
||||
url = "https://github.com/metabrainz/libmusicbrainz/commit/9ba00067a15479a52262a5126bcb6889da5884b7.patch";
|
||||
hash = "sha256-4VxTohLpjUNnNZGIoRpBjUz71mLP3blg4oFL7itnJnY=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/metabrainz/libmusicbrainz/commit/558c9ba0e6d702d5c877f75be98176f57abf1b02.patch";
|
||||
hash = "sha256-hKYY4BJLh/Real3NugLwzc4gPBQ3NB/F63iI/aV8Wh8=";
|
||||
})
|
||||
];
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://musicbrainz.org/doc/libmusicbrainz";
|
||||
description = "MusicBrainz Client Library (5.x version)";
|
||||
longDescription = ''
|
||||
The libmusicbrainz (also known as mb_client or MusicBrainz Client
|
||||
Library) is a development library geared towards developers who wish to
|
||||
add MusicBrainz lookup capabilities to their applications.'';
|
||||
platforms = platforms.all;
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
cmake,
|
||||
neon,
|
||||
libdiscid,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmusicbrainz";
|
||||
version = "3.0.3";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
neon
|
||||
libdiscid
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${pname}-${version}.tar.gz";
|
||||
sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix spacing around string literal for modern clang
|
||||
./v3-darwin.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://musicbrainz.org/doc/libmusicbrainz";
|
||||
description = "MusicBrainz Client Library (3.x version)";
|
||||
longDescription = ''
|
||||
The libmusicbrainz (also known as mb_client or MusicBrainz Client
|
||||
Library) is a development library geared towards developers who wish to
|
||||
add MusicBrainz lookup capabilities to their applications.'';
|
||||
platforms = platforms.all;
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
diff --git a/src/webservice.cpp b/src/webservice.cpp
|
||||
index 3a36167..df14812 100644
|
||||
--- a/src/webservice.cpp
|
||||
+++ b/src/webservice.cpp
|
||||
@@ -184,7 +184,7 @@ WebService::get(const std::string &entity,
|
||||
if (!sess)
|
||||
throw WebServiceError("ne_session_create() failed.");
|
||||
ne_set_server_auth(sess, httpAuth, this);
|
||||
- ne_set_useragent(sess, PACKAGE"/"VERSION);
|
||||
+ ne_set_useragent(sess, PACKAGE "/" VERSION);
|
||||
|
||||
// Use proxy server
|
||||
if (!d->proxyHost.empty()) {
|
||||
@@ -269,7 +269,7 @@ WebService::post(const std::string &entity,
|
||||
if (!sess)
|
||||
throw WebServiceError("ne_session_create() failed.");
|
||||
ne_set_server_auth(sess, httpAuth, this);
|
||||
- ne_set_useragent(sess, PACKAGE"/"VERSION);
|
||||
+ ne_set_useragent(sess, PACKAGE "/" VERSION);
|
||||
|
||||
// Use proxy server
|
||||
if (!d->proxyHost.empty()) {
|
||||
@@ -1,76 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
sqlite,
|
||||
libtiff,
|
||||
curl,
|
||||
gtest,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proj";
|
||||
version = "7.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OSGeo";
|
||||
repo = "PROJ";
|
||||
rev = version;
|
||||
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/OSGeo/PROJ/issues/2557
|
||||
name = "gie_self_tests-fail.diff"; # included in >= 8.0.1
|
||||
url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
|
||||
sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
|
||||
})
|
||||
./tests-sqlite-3.39.patch
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString (version == "7.2.1") ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
sqlite
|
||||
libtiff
|
||||
curl
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ gtest ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_GTEST=ON"
|
||||
];
|
||||
CXXFLAGS = [
|
||||
# GCC 13: error: 'int64_t' in namespace 'std' does not name a type
|
||||
"-include cstdint"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # undefined reference to `TIFFReadEncodedStrip'
|
||||
description = "Cartographic Projections Library";
|
||||
homepage = "https://proj4.org";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -1,13 +0,0 @@
|
||||
Drop tests that time out with newest sqlite.
|
||||
https://github.com/OSGeo/PROJ/issues/3254
|
||||
|
||||
--- a/test/cli/CMakeLists.txt
|
||||
+++ b/test/cli/CMakeLists.txt
|
||||
@@ -16 +15,0 @@
|
||||
-proj_add_test_script_sh("testprojinfo" PROJINFO_BIN)
|
||||
--- a/test/unit/CMakeLists.txt
|
||||
+++ b/test/unit/CMakeLists.txt
|
||||
@@ -144,3 +143,0 @@
|
||||
-add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api)
|
||||
-set_property(TEST proj_test_cpp_api
|
||||
- PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT})
|
||||
@@ -1,39 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "yaml-cpp";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jbeder";
|
||||
repo = "yaml-cpp";
|
||||
rev = "release-${version}";
|
||||
hash = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DYAML_CPP_BUILD_TOOLS=${lib.boolToString doCheck}"
|
||||
"-DBUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
|
||||
];
|
||||
|
||||
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
|
||||
|
||||
meta = with lib; {
|
||||
description = "YAML parser and emitter for C++";
|
||||
homepage = "https://github.com/jbeder/yaml-cpp";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ OPNA2608 ];
|
||||
};
|
||||
}
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
let
|
||||
pname = "uucp";
|
||||
version = "16.0.0";
|
||||
version = "17.0.0";
|
||||
webpage = "https://erratique.ch/software/${pname}";
|
||||
minimalOCamlVersion = "4.03";
|
||||
doCheck = true;
|
||||
@@ -30,7 +30,7 @@ else
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
hash = "sha256-5//UGI4u3OROYdxtwz9K2vCTzYiN16mOyEFhUQWtgEQ=";
|
||||
hash = "sha256-mSQtTn4DYa15pYWFt0J+/BEpJRaa+6uIKnifMV4Euhs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
mkKdeDerivation,
|
||||
libmusicbrainz5,
|
||||
libmusicbrainz,
|
||||
}:
|
||||
mkKdeDerivation {
|
||||
pname = "libkcddb";
|
||||
|
||||
extraBuildInputs = [ libmusicbrainz5 ];
|
||||
extraBuildInputs = [ libmusicbrainz ];
|
||||
}
|
||||
|
||||
@@ -1318,6 +1318,8 @@ mapAliases {
|
||||
libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
|
||||
liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
|
||||
libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
|
||||
libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16
|
||||
libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16
|
||||
libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
|
||||
liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
|
||||
libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
|
||||
@@ -1346,6 +1348,7 @@ mapAliases {
|
||||
libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
|
||||
libsoup = lib.warnOnInstantiate "'libsoup' has been renamed to 'libsoup_2_4'" libsoup_2_4; # Added 2024-12-02
|
||||
libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
|
||||
libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
|
||||
libtensorflow-bin = libtensorflow; # Added 2022-09-25
|
||||
libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
|
||||
libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17
|
||||
@@ -1356,8 +1359,6 @@ mapAliases {
|
||||
libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26
|
||||
libwnck3 = libwnck; # Added 2021-06-23
|
||||
libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27
|
||||
libyamlcpp = yaml-cpp; # Added 2023-01-29
|
||||
libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29
|
||||
libzapojit = throw "'libzapojit' has been removed due to lack of upstream maintenance and archival"; # Added 2025-04-16
|
||||
licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
|
||||
lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
|
||||
@@ -1914,6 +1915,7 @@ mapAliases {
|
||||
oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
|
||||
oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
|
||||
OSCAR = oscar; # Added 2024-06-12
|
||||
osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16
|
||||
osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
|
||||
overrideLibcxx = "overrideLibcxx has beeen removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
|
||||
overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
|
||||
@@ -2073,6 +2075,7 @@ mapAliases {
|
||||
private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
|
||||
probe-rs = probe-rs-tools; # Added 2024-05-23
|
||||
probe-run = throw "probe-run is deprecated upstream. Use probe-rs instead."; # Added 2024-05-23
|
||||
proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16
|
||||
prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
|
||||
prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10
|
||||
prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
|
||||
@@ -2663,6 +2666,7 @@ mapAliases {
|
||||
### Y ###
|
||||
|
||||
yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
|
||||
yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
|
||||
yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
|
||||
yafaray-core = libyafaray; # Added 2022-09-23
|
||||
yandex-browser = throw "'yandex-browser' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
|
||||
|
||||
@@ -8166,12 +8166,6 @@ with pkgs;
|
||||
|
||||
libmicrohttpd = libmicrohttpd_1_0;
|
||||
|
||||
libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
|
||||
|
||||
libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
|
||||
|
||||
libmusicbrainz = libmusicbrainz3;
|
||||
|
||||
libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
|
||||
|
||||
libpeas = callPackage ../development/libraries/libpeas { };
|
||||
@@ -8308,10 +8302,6 @@ with pkgs;
|
||||
|
||||
libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };
|
||||
|
||||
yaml-cpp = callPackage ../development/libraries/yaml-cpp { };
|
||||
|
||||
yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { };
|
||||
|
||||
liquid-dsp = callPackage ../development/libraries/liquid-dsp {
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
@@ -8624,10 +8614,6 @@ with pkgs;
|
||||
utils = true;
|
||||
};
|
||||
|
||||
proj = callPackage ../development/libraries/proj { };
|
||||
|
||||
proj_7 = callPackage ../development/libraries/proj/7.nix { };
|
||||
|
||||
prospector = callPackage ../development/tools/prospector { };
|
||||
|
||||
protobuf = protobuf_32;
|
||||
|
||||
Reference in New Issue
Block a user