Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2024-12-08 12:06:07 +00:00
committed by GitHub
95 changed files with 3194 additions and 891 deletions
+1 -1
View File
@@ -71,7 +71,7 @@ let
# these are the only ones that are currently not
inherit (builtins) addErrorContext isPath trace typeOf unsafeGetAttrPos;
inherit (self.trivial) id const pipe concat or and xor bitAnd bitOr bitXor
bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
bitNot boolToString mergeAttrs flip defaultTo mapNullable inNixShell isFloat min max
importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum
info showWarnings nixpkgsVersion version isInOldestRelease oldestSupportedReleaseIsAtLeast
mod compare splitByAndCompare seq deepSeq lessThan add sub
+34
View File
@@ -316,6 +316,40 @@ in {
*/
flip = f: a: b: f b a;
/**
Return `maybeValue` if not null, otherwise return `default`.
# Inputs
`default`
: 1\. Function argument
`maybeValue`
: 2\. Function argument
# Examples
:::{.example}
## `lib.trivial.defaultTo` usage example
```nix
defaultTo "default" null
=> "default"
defaultTo "default" "foo"
=> "foo"
defaultTo "default" false
=> false
```
:::
*/
defaultTo = default: maybeValue:
if maybeValue != null then maybeValue
else default;
/**
Apply function if the supplied argument is non-null.
+12
View File
@@ -15452,6 +15452,12 @@
githubId = 93013864;
name = "nat-418";
};
nateeag = {
github = "NateEag";
githubId = 837719;
name = "Nate Eagleson";
email = "nate@nateeag.com";
};
nathan-gs = {
email = "nathan@nathan.gs";
github = "nathan-gs";
@@ -15712,6 +15718,12 @@
githubId = 7845120;
name = "Alex Martens";
};
nezia = {
email = "anthony@nezia.dev";
github = "nezia1";
githubId = 43719748;
name = "Anthony Rodriguez";
};
ngerstle = {
name = "Nicholas Gerstle";
email = "ngerstle@gmail.com";
@@ -1,6 +1,12 @@
# rygel service.
{ config, lib, pkgs, ... }:
let
cfg = config.services.gnome.rygel;
in
{
meta = {
maintainers = lib.teams.gnome.members;
@@ -18,17 +24,19 @@
'';
type = lib.types.bool;
};
package = lib.options.mkPackageOption pkgs "rygel" { };
};
};
###### implementation
config = lib.mkIf config.services.gnome.rygel.enable {
environment.systemPackages = [ pkgs.rygel ];
config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
services.dbus.packages = [ pkgs.rygel ];
services.dbus.packages = [ cfg.package ];
systemd.packages = [ pkgs.rygel ];
systemd.packages = [ cfg.package ];
environment.etc."rygel.conf".source = "${pkgs.rygel}/etc/rygel.conf";
environment.etc."rygel.conf".source = "${cfg.package}/etc/rygel.conf";
};
}
+63 -33
View File
@@ -24,36 +24,66 @@ let
# For the application option to work with systemd PATH, we find the store binary path of
# the package, concat all of the following strings, and then update the application attribute.
# Application can either be a package or a list that has a package as the first element.
applicationExists = builtins.hasAttr "application" cfg.config.json;
# Since the json config attribute type "configFormat.type" doesn't allow specifying types for
# individual attributes, we have to type check manually.
# The application option must be either a package or a list with package as the first element.
# Checking if an application is provided
applicationAttrExists = builtins.hasAttr "application" cfg.config.json;
applicationListNotEmpty = (
if builtins.isList cfg.config.json.application then
(builtins.length cfg.config.json.application) != 0
else
true
);
applicationCheck = applicationExists && applicationListNotEmpty;
applicationCheck = applicationAttrExists && applicationListNotEmpty;
applicationBinary = (
# Manage packages and their exe paths
applicationAttr = (
if builtins.isList cfg.config.json.application then
builtins.head cfg.config.json.application
else
cfg.config.json.application
);
applicationPackage = mkIf applicationCheck applicationAttr;
applicationPackageExe = getExe applicationAttr;
serverPackageExe = getExe cfg.package;
# Managing strings
applicationStrings = builtins.tail cfg.config.json.application;
applicationPath = mkIf applicationCheck applicationBinary;
applicationConcat = (
if builtins.isList cfg.config.json.application then
builtins.concatStringsSep " " ([ (getExe applicationBinary) ] ++ applicationStrings)
builtins.concatStringsSep " " ([ applicationPackageExe ] ++ applicationStrings)
else
(getExe applicationBinary)
applicationPackageExe
);
# Manage config file
applicationUpdate = recursiveUpdate cfg.config.json (
optionalAttrs applicationCheck { application = applicationConcat; }
);
configFile = configFormat.generate "config.json" applicationUpdate;
enabledConfig = optionalString cfg.config.enable "-f ${configFile}";
# Manage server executables and flags
serverExec = builtins.concatStringsSep " " (
[
serverPackageExe
"--systemd"
enabledConfig
]
++ cfg.extraServerFlags
);
applicationExec = builtins.concatStringsSep " " (
[
serverPackageExe
"--application"
enabledConfig
]
++ cfg.extraApplicationFlags
);
in
{
options = {
@@ -84,6 +114,19 @@ in
};
};
extraServerFlags = mkOption {
type = types.listOf types.str;
description = "Flags to add to the wivrn service.";
default = [ ];
example = ''[ "--no-publish-service" ]'';
};
extraApplicationFlags = mkOption {
type = types.listOf types.str;
description = "Flags to add to the wivrn-application service. This is NOT the WiVRn startup application.";
default = [ ];
};
extraPackages = mkOption {
type = types.listOf types.package;
description = "Packages to add to the wivrn-application service $PATH.";
@@ -96,17 +139,17 @@ in
json = mkOption {
type = configFormat.type;
description = ''
Configuration for WiVRn. The attributes are serialized to JSON in config.json.
Configuration for WiVRn. The attributes are serialized to JSON in config.json. If a config or certain attributes are not provided, the server will default to stock values.
Note that the application option must be either a package or a
list with package as the first element.
See https://github.com/Meumeu/WiVRn/blob/master/docs/configuration.md
See https://github.com/WiVRn/WiVRn/blob/master/docs/configuration.md
'';
default = { };
example = literalExpression ''
{
scale = 0.8;
scale = 0.5;
bitrate = 100000000;
encoders = [
{
@@ -119,7 +162,6 @@ in
}
];
application = [ pkgs.wlx-overlay-s ];
tcp_only = true;
}
'';
};
@@ -130,14 +172,14 @@ in
config = mkIf cfg.enable {
assertions = [
{
assertion = !applicationCheck || isDerivation applicationBinary;
assertion = !applicationCheck || isDerivation applicationAttr;
message = "The application in WiVRn configuration is not a package. Please ensure that the application is a package or that a package is the first element in the list.";
}
];
systemd.user = {
services = {
# The WiVRn server runs in a hardened service and starts the applications in a different service
# The WiVRn server runs in a hardened service and starts the application in a different service
wivrn = {
description = "WiVRn XR runtime service";
environment = {
@@ -148,9 +190,7 @@ in
IPC_EXIT_ON_DISCONNECT = "off";
} // cfg.monadoEnvironment;
serviceConfig = {
ExecStart = (
(getExe cfg.package) + " --systemd" + optionalString cfg.config.enable " -f ${configFile}"
);
ExecStart = serverExec;
# Hardening options
CapabilityBoundingSet = [ "CAP_SYS_NICE" ];
AmbientCapabilities = [ "CAP_SYS_NICE" ];
@@ -169,34 +209,24 @@ in
RestrictSUIDSGID = true;
};
wantedBy = mkIf cfg.autoStart [ "default.target" ];
restartTriggers = [
cfg.package
configFile
];
restartTriggers = [ cfg.package ];
};
wivrn-application = mkIf applicationCheck {
description = "WiVRn application service";
requires = [ "wivrn.service" ];
serviceConfig = {
ExecStart = (
(getExe cfg.package) + " --application" + optionalString cfg.config.enable " -f ${configFile}"
);
ExecStart = applicationExec;
Restart = "on-failure";
RestartSec = 0;
PrivateTmp = true;
};
# We need to add the application to PATH so WiVRn can find it
path = [ applicationPath ] ++ cfg.extraPackages;
path = [ applicationPackage ] ++ cfg.extraPackages;
};
};
};
services = {
# WiVRn can be used with some wired headsets so we include xr-hardware
udev.packages = with pkgs; [
android-udev-rules
xr-hardware
];
udev.packages = with pkgs; [ android-udev-rules ];
avahi = {
enable = true;
publish = {
@@ -214,7 +244,7 @@ in
environment = {
systemPackages = [
cfg.package
applicationPath
applicationPackage
];
pathsToLink = [ "/share/openxr" ];
etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime {
+1 -1
View File
@@ -53,7 +53,7 @@ import ../make-test-python.nix (
res = machine.succeed("""
curl -f -H 'Cookie: immich_access_token=%s' http://localhost:2283/api/jobs
""" % token)
assert json.loads(res)["backupDatabase"]["jobCounts"]["active"] == 1
assert sum(json.loads(res)["backupDatabase"]["jobCounts"].values()) >= 1
machine.wait_until_succeeds("ls /var/lib/immich/backups/*.sql.gz")
'';
}
@@ -1,86 +0,0 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, gitUpdater
, alsa-lib
, cmake
, Cocoa
, CoreAudio
, Foundation
, libjack2
, lhasa
, makeWrapper
, perl
, pkg-config
, rtmidi
, SDL2
, zlib
, zziplib
}:
stdenv.mkDerivation (finalAttrs: {
pname = "milkytracker";
version = "1.04.00";
src = fetchFromGitHub {
owner = "milkytracker";
repo = "MilkyTracker";
rev = "v${finalAttrs.version}";
hash = "sha256-ta4eV/FGBfgTppJwDam0OKQ7udtlinbWly/FPCE+Qss=";
};
patches = [
# Fix crash after querying midi ports
# Remove when version > 1.04.00
(fetchpatch {
url = "https://github.com/milkytracker/MilkyTracker/commit/7e9171488fc47ad2de646a4536794fda21e7303d.patch";
hash = "sha256-CmnIwmGGnsnlRrvVAXe2zaQf1CFMB5BJPKmiwGOHgGY=";
})
];
strictDeps = true;
nativeBuildInputs = [
cmake
makeWrapper
pkg-config
];
buildInputs = [
lhasa
libjack2
perl
rtmidi
SDL2
zlib
zziplib
] ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Cocoa
CoreAudio
Foundation
];
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png
install -Dm644 $src/resources/milkytracker.appdata $out/share/appdata/milkytracker.appdata.xml
'';
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = with lib; {
description = "Music tracker application, similar to Fasttracker II";
homepage = "https://milkytracker.org/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
# ibtool -> real Xcode -> I can't get that, and Ofborg can't test that
broken = stdenv.hostPlatform.isDarwin;
maintainers = with maintainers; [ OPNA2608 ];
mainProgram = "milkytracker";
};
})
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "mongodb-vscode";
publisher = "mongodb";
version = "1.9.3";
hash = "sha256-3+KIO2d/0egvc4awStYgPvpWa9fmYH0V7QHUavzFn8A=";
version = "1.10.0";
hash = "sha256-5U1wHrcDqN5gJEFGvRDlBm7fu4LoP0/u0ykcqYhD1nQ=";
};
meta = {
@@ -17,29 +17,41 @@
, gstreamer
, gst-plugins-base
, gst-plugins-bad
, gst-plugins-good
, gst-plugins-rs
, wrapGAppsHook4
, appstream-glib
, desktop-file-utils
, glycin-loaders
}:
clangStdenv.mkDerivation rec {
pname = "gnome-decoder";
version = "0.4.1";
version = "0.6.1";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "decoder";
rev = version;
hash = "sha256-ZEt4QaT2w7PgsnwBCYeDbhcYX0yd0boes/LoejQx0XU=";
hash = "sha256-qSPuEVW+FwC9OJa+dseIy4/2bhVdTryJSJNSpes9tpY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-acYOSPSUgm0Kg/bo2WF4sRWfCt03AZdTyNNt3Qv7Zjg=";
hash = "sha256-MbfukvqlzZPnWNtWCwYn7lABqBxtZWvPDba9Deah+w8=";
};
preFixup = ''
gappsWrapperArgs+=(
# vp8enc preset
--prefix GST_PRESET_PATH : "${gst-plugins-good}/share/gstreamer-1.0/presets"
# See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44
--prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
)
'';
nativeBuildInputs = [
meson
ninja
@@ -64,6 +76,8 @@ clangStdenv.mkDerivation rec {
gstreamer
gst-plugins-base
gst-plugins-bad
gst-plugins-good
gst-plugins-rs # for gtk4paintablesink
];
meta = with lib; {
+2 -2
View File
@@ -5,13 +5,13 @@
xmrig.overrideAttrs (oldAttrs: rec {
pname = "xmrig-mo";
version = "6.22.1-mo1";
version = "6.22.2-mo1";
src = fetchFromGitHub {
owner = "MoneroOcean";
repo = "xmrig";
rev = "v${version}";
hash = "sha256-CwGHSrnxzKCLKJC7MmqWATqTUNehhRECcX4g/e9oGSI=";
hash = "sha256-pJ4NTdpWCt7C98k1EqGoiU0Lup25Frdm1kFJuwTfXgY=";
};
meta = with lib; {
@@ -64,6 +64,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ matthuszagh ];
platforms = platforms.linux;
badPlatforms = platforms.aarch64;
};
}
@@ -95,6 +95,13 @@ stdenv.mkDerivation (finalAttrs: {
stripLen = 1;
hash = "sha256-7SDBRr9G40b9DfbgdaYJxTeiDSLUfVixtMtM3cLTVZs=";
})
# Fix lossless audio, ffmpeg 7,1 compatibility issue
(fetchpatch {
name = "fix-lossless-audio.patch";
url = "https://github.com/obsproject/obs-studio/commit/dfc3a69c5276edf84c933035ff2a7e278fa13c9a.patch";
hash = "sha256-wiF3nolBpZKp7LR7NloNfJ+v4Uq/nBgwCVoKZX+VEMA=";
})
];
nativeBuildInputs = [
+19 -13
View File
@@ -1,17 +1,23 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }:
{
lib,
stdenv,
fetchurl,
makeWrapper,
jre,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "alda";
version = "2.2.3";
version = "2.3.1";
src_alda = fetchurl {
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/client/linux-amd64/alda";
hash = "sha256-cyOAXQ3ITIgy4QusjdYBNmNIzB6BzfbQEypvJbkbvWo=";
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${finalAttrs.version}/client/linux-amd64/alda";
hash = "sha256-m4d3cLgqWmGMw0SM4J+7nvV/ytSoB7obMDiJCh3yboQ=";
};
src_player = fetchurl {
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${version}/player/non-windows/alda-player";
hash = "sha256-HsX0mNWrusL2FaK2oK8xhmr/ai+3ZiMmrJk7oS3b93g=";
url = "https://alda-releases.nyc3.digitaloceanspaces.com/${finalAttrs.version}/player/non-windows/alda-player";
hash = "sha256-XwgOidQjnMClXPIS1JPzsVJ6c7vXwBHBAfUPX3WL8uU=";
};
dontUnpack = true;
@@ -23,18 +29,18 @@ stdenv.mkDerivation rec {
binPath = lib.makeBinPath [ jre ];
in
''
install -D $src_alda $out/bin/alda
install -D $src_player $out/bin/alda-player
install -D ${finalAttrs.src_alda} $out/bin/alda
install -D ${finalAttrs.src_player} $out/bin/alda-player
wrapProgram $out/bin/alda --prefix PATH : $out/bin:${binPath}
wrapProgram $out/bin/alda-player --prefix PATH : $out/bin:${binPath}
'';
meta = with lib; {
meta = {
description = "Music programming language for musicians";
homepage = "https://alda.io";
license = licenses.epl10;
maintainers = [ maintainers.ericdallo ];
license = lib.licenses.epl10;
maintainers = [ lib.maintainers.ericdallo ];
platforms = jre.meta.platforms;
};
}
})
+4 -4
View File
@@ -19,15 +19,15 @@ let
hash =
{
x86_64-linux = "sha256-Tp354ecJAZfTRrg1Rmot7nFGYfcp0ZBEn/ygTRkCBCM=";
x86_64-darwin = "sha256-1tgFHdbrGGVofhSxJIw1oXkI6q5SJvN8L9bqRyj75j8=";
aarch64-darwin = "sha256-UB0SoUwg9C8F8F2/CTKVNcqAofHkU7Rop04mMwBSIyY=";
x86_64-linux = "sha256-Y9vWtuv1eyrPmJn/XpAw4uDHxhLUdhKszwJZmMIOCqI=";
x86_64-darwin = "sha256-p8Y6XKHb/CmRcnQ7po3s3oUZh0f+1iIHk38sAu2qym8=";
aarch64-darwin = "sha256-Qfqeo5syprwtLoNdi/EwsI+EYdpKkkVlFVja8uIFDsM=";
}
."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}");
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "bleep";
version = "0.0.9";
version = "0.0.11";
src = fetchzip {
url = "https://github.com/oyvindberg/bleep/releases/download/v${finalAttrs.version}/bleep-${platform}.tar.gz";
+214
View File
@@ -0,0 +1,214 @@
{
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
cmake,
ninja,
libarchive,
libz,
libcef,
luajit,
xorg,
mesa,
glib,
nss,
nspr,
atk,
at-spi2-atk,
libdrm,
expat,
libxkbcommon,
gtk3,
jdk17,
pango,
cairo,
alsa-lib,
dbus,
at-spi2-core,
cups,
systemd,
buildFHSEnv,
makeDesktopItem,
copyDesktopItems,
enableRS3 ? false,
}:
let
cef = libcef.overrideAttrs (oldAttrs: {
installPhase =
let
gl_rpath = lib.makeLibraryPath [
stdenv.cc.cc.lib
];
rpath = lib.makeLibraryPath [
glib
nss
nspr
atk
at-spi2-atk
libdrm
expat
xorg.libxcb
libxkbcommon
xorg.libX11
xorg.libXcomposite
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXrandr
mesa
gtk3
pango
cairo
alsa-lib
dbus
at-spi2-core
cups
xorg.libxshmfence
systemd
];
in
''
mkdir -p $out/lib/ $out/share/cef/
cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
cp -r ../Resources/* $out/lib/
cp -r ../Release/* $out/lib/
patchelf --set-rpath "${rpath}" $out/lib/libcef.so
patchelf --set-rpath "${gl_rpath}" $out/lib/libEGL.so
patchelf --set-rpath "${gl_rpath}" $out/lib/libGLESv2.so
cp ../Release/*.bin $out/share/cef/
cp -r ../Resources/* $out/share/cef/
cp -r ../include $out
cp -r ../libcef_dll $out
cp -r ../cmake $out
'';
});
in
let
bolt = stdenv.mkDerivation (finalAttrs: {
pname = "bolt-launcher";
version = "0.9.0";
src = fetchFromGitHub {
owner = "AdamCake";
repo = "bolt";
rev = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-LIlRDcUWbQwIhFjtqYF+oVpTOPZ7IT0vMgysEVyJ1k8=";
};
nativeBuildInputs = [
cmake
ninja
luajit
makeWrapper
copyDesktopItems
];
buildInputs = [
mesa
xorg.libX11
xorg.libxcb
libarchive
libz
cef
jdk17
];
cmakeFlags = [
"-D CMAKE_BUILD_TYPE=Release"
"-D BOLT_LUAJIT_INCLUDE_DIR=${luajit}/include"
"-G Ninja"
];
preConfigure = ''
mkdir -p cef/dist/Release cef/dist/Resources cef/dist/include
ln -s ${cef}/lib/* cef/dist/Release
ln -s ${cef}/share/cef/*.pak cef/dist/Resources
ln -s ${cef}/share/cef/icudtl.dat cef/dist/Resources
ln -s ${cef}/share/cef/locales cef/dist/Resources
ln -s ${cef}/include/* cef/dist/include
ln -s ${cef}/libcef_dll cef/dist/libcef_dll
ln -s ${cef}/cmake cef/dist/cmake
ln -s ${cef}/CMakeLists.txt cef/dist
'';
postFixup = ''
makeWrapper "$out/opt/bolt-launcher/bolt" "$out/bin/${finalAttrs.pname}-${finalAttrs.version}" \
--set JAVA_HOME ${jdk17}
mkdir -p $out/lib
cp $out/usr/local/lib/libbolt-plugin.so $out/lib
mkdir -p $out/share/icons/hicolor/256x256/apps
cp ../icon/256.png $out/share/icons/hicolor/256x256/apps/${finalAttrs.pname}.png
'';
desktopItems = [
(makeDesktopItem {
type = "Application";
terminal = false;
name = "Bolt";
desktopName = "Bolt Launcher";
genericName = finalAttrs.pname;
comment = "An alternative launcher for RuneScape";
exec = "${finalAttrs.pname}-${finalAttrs.version}";
icon = finalAttrs.pname;
categories = [ "Game" ];
})
];
});
in
buildFHSEnv {
inherit (bolt) name version;
targetPkgs =
pkgs:
[ bolt ]
++ (with pkgs; [
xorg.libSM
xorg.libXxf86vm
xorg.libX11
glib
pango
cairo
gdk-pixbuf
libz
libcap
libsecret
SDL2
libGL
])
++ lib.optionals enableRS3 (
with pkgs;
[
gtk2-x11
openssl_1_1
]
);
extraInstallCommands = ''
mkdir -p $out/share/applications
mkdir -p $out/share/icons/hicolor/256x256/apps
ln -s ${bolt}/share/applications/*.desktop $out/share/applications/
ln -s ${bolt}/share/icons/hicolor/256x256/apps/*.png $out/share/icons/hicolor/256x256/apps/
'';
runScript = "${bolt.name}";
meta = {
homepage = "https://github.com/Adamcake/Bolt";
description = "An alternative launcher for RuneScape.";
longDescription = ''
Bolt Launcher supports HDOS/RuneLite by default with an optional feature flag for RS3 (enableRS3).
'';
license = lib.licenses.agpl3Plus;
maintainers = with lib.maintainers; [ nezia ];
platforms = lib.platforms.linux;
mainProgram = "${bolt.name}";
};
}
+3 -3
View File
@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec {
pname = "boxbuddy";
version = "2.3.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "Dvlv";
repo = "BoxBuddyRS";
rev = version;
hash = "sha256-s0StSMpLNRwiI+T78ySfW2DQ3s5A9kuclC9f32UDkiI=";
hash = "sha256-SI/Yxk3bJayXPIWlJLG/je7NBG0I+49cIIlfBeMhTBk=";
};
cargoHash = "sha256-WJ35lxo4h91xtcfUuevLsWNBvulxq5ZaAVE3u9BbtzI=";
cargoHash = "sha256-5R+PWV34Ob9y/EtO+46kI/fzqYw6QI86bRVpvMznw9Y=";
# The software assumes it is installed either in flatpak or in the home directory
# so the xdg data path needs to be patched here
+16 -5
View File
@@ -1,6 +1,8 @@
{ lib
, buildGoModule
, fetchFromGitHub
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
@@ -16,10 +18,19 @@ buildGoModule rec {
vendorHash = "sha256-c5J2cTzyb7CiBlS4vS3PdRhr6DhIvXE2lt40u0s6G0k=";
subPackages = [
"cmd/chaos/"
subPackages = [ "cmd/chaos/" ];
ldflags = [
"-s"
"-w"
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
versionCheckProgramArg = [ "--version" ];
meta = with lib; {
description = "Tool to communicate with Chaos DNS API";
homepage = "https://github.com/projectdiscovery/chaos-client";
+64
View File
@@ -0,0 +1,64 @@
{
lib,
stdenv,
fetchFromGitHub,
bison,
diffutils,
flex,
python3,
nix-update-script,
}:
stdenv.mkDerivation rec {
pname = "check-sieve";
version = "0.10";
src = fetchFromGitHub {
owner = "dburkart";
repo = "check-sieve";
tag = "check-sieve-${version}";
hash = "sha256-UMtkiyRGX+/lL7a+c+iZHUJhg0nb4+puSPzM5W71F9o=";
};
nativeBuildInputs = [
bison
flex
];
nativeCheckInputs = [
(python3.withPackages (p: [ p.setuptools ]))
];
# https://github.com/dburkart/check-sieve/issues/67
# Remove after the next (>0.10) release
env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
installPhase = ''
runHook preInstall
install -Dm755 check-sieve -t $out/bin
runHook postInstall
'';
preCheck = ''
substituteInPlace test/AST/util.py \
--replace-fail "/usr/bin/diff" "${diffutils}/bin/diff"
# Disable flaky tests: https://github.com/dburkart/check-sieve/issues/68
# Remove after the next (>0.10) release
rm -rf test/{6785,7352}
'';
doCheck = true;
passthru.updateScript = nix-update-script {
extraArgs = [ "--version-regex=check-sieve-(.*)" ];
};
meta = {
description = "Syntax checker for mail sieves";
mainProgram = "check-sieve";
homepage = "https://github.com/dburkart/check-sieve";
changelog = "https://github.com/dburkart/check-sieve/blob/master/ChangeLog";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ eilvelia ];
};
}
+2 -2
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "cirrus-cli";
version = "0.132.0";
version = "0.133.0";
src = fetchFromGitHub {
owner = "cirruslabs";
repo = "cirrus-cli";
rev = "v${version}";
hash = "sha256-juDe/Dw8tdVoz5F1bGGQMwZYz9HbQaQ0xZo8LqD03RA=";
hash = "sha256-uID2rHHsYYfGBDi4bg19G3Em0ztWGe5goBj1hIdAMkE=";
};
vendorHash = "sha256-+OMhaAGA+pmiDUyXDo9UfQ0SFEAN9zuNZjnLkgr7a+0=";
+3 -3
View File
@@ -8,7 +8,7 @@
, committed
}:
let
version = "1.0.20";
version = "1.1.2";
in
rustPlatform.buildRustPackage {
pname = "committed";
@@ -18,9 +18,9 @@ rustPlatform.buildRustPackage {
owner = "crate-ci";
repo = "committed";
rev = "refs/tags/v${version}";
hash = "sha256-HqZYxV2YjnK7Q3A7B6yVFXME0oc3DZ4RfMkDGa2IQxA=";
hash = "sha256-dBNtzKqaaqJrKMNwamUY0DO9VCVqDyf45lT82nOn8UM=";
};
cargoHash = "sha256-AmAEGVWq6KxLtiHDGIFVcoP1Wck8z+P9mnDy0SSSJNM=";
cargoHash = "sha256-F+6pTxgr/I3DcDGZsfDjLe0+5wj9Mu7nqghyOzSWlvc=";
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+4 -4
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "conkeyscan";
version = "1.0.0";
version = "1.1.0";
pyproject = true;
src = fetchFromGitHub {
owner = "CompassSecurity";
repo = "conkeyscan";
rev = "refs/tags/${version}";
hash = "sha256-F5lYpETzv03O9I4vi4qnLgQLvBlv8bLtJQArxliO8JI=";
tag = "v${version}";
hash = "sha256-xYCms+Su7FmaG7KVHZpzfD/wx9Gepz11t8dEK/YDfvI=";
};
postPatch = ''
@@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Tool to scan Confluence for keywords";
homepage = "https://github.com/CompassSecurity/conkeyscan";
changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/${version}";
changelog = "https://github.com/CompassSecurity/conkeyscan/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "conkeyscan";
+2 -2
View File
@@ -13,11 +13,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "crowdin-cli";
version = "4.3.0";
version = "4.4.1";
src = fetchurl {
url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
hash = "sha256-Bzh8srMKTHTaA396sPAbICXKGJ/zM+IYMD91zfPLc7I=";
hash = "sha256-u1drLK/eLvNijCL3BupXyAO7yb+FD9EQwD0+9hQJsgQ=";
};
nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
+6 -8
View File
@@ -1,24 +1,24 @@
{
lib,
stdenv,
diesel-cli,
fetchCrate,
rustPlatform,
installShellFiles,
darwin,
libiconv,
libmysqlclient,
nix-update-script,
openssl,
pkg-config,
postgresql,
rustPlatform,
sqlite,
testers,
zlib,
diesel-cli,
sqliteSupport ? true,
postgresqlSupport ? true,
mysqlSupport ? true,
}:
assert lib.assertMsg (lib.elem true [
postgresqlSupport
mysqlSupport
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
rustPlatform.buildRustPackage rec {
pname = "diesel-cli";
version = "2.2.5";
version = "2.2.6";
src = fetchCrate {
inherit version;
crateName = "diesel_cli";
hash = "sha256-cMGSBZ2UexIvSWRI2LIXR7thKciM9+HTB4V8FWpP3ZU=";
hash = "sha256-jKTQxlmpTlb0eITwNbnYfONknGhHsO/nzdup04ikEB0=";
};
cargoHash = "sha256-Qdi9zdBiaAWS0Ao/8Z1jrb07FLE92ETd7RCMd/7J+mI=";
cargoHash = "sha256-+QbCPHczxCkDOFo/PDFTK0xReCWoz8AiLNwXA3aG9N0=";
nativeBuildInputs = [
installShellFiles
@@ -44,8 +44,6 @@ rustPlatform.buildRustPackage rec {
buildInputs =
[ openssl ]
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security
++ lib.optional (stdenv.hostPlatform.isDarwin && mysqlSupport) libiconv
++ lib.optional sqliteSupport sqlite
++ lib.optional postgresqlSupport postgresql
++ lib.optionals mysqlSupport [
+2 -2
View File
@@ -32,7 +32,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "dnf5";
version = "5.2.7.0";
version = "5.2.8.1";
outputs = [
"out"
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "rpm-software-management";
repo = "dnf5";
rev = finalAttrs.version;
hash = "sha256-gKPC8nrEoayOGGrO+pk164w1xRuhrx74JcxJ1JDhOug=";
hash = "sha256-R9woS84vZkF7yatbJr7KNhaUsLZcGaiS+XnYXG3i1jA=";
};
nativeBuildInputs =
+48
View File
@@ -0,0 +1,48 @@
{
lib,
python3,
fetchFromGitHub,
}:
python3.pkgs.buildPythonApplication rec {
pname = "dnsvalidator";
version = "0.1-unstable-2023-01-17";
pyproject = true;
src = fetchFromGitHub {
owner = "vortexau";
repo = "dnsvalidator";
# https://github.com/vortexau/dnsvalidator/issues/21
rev = "146c9b0e24d806b25697fbb541bf9f19a3086d41";
hash = "sha256-8pbBEtkiaGYp5ekkA1UUZ+5DX/iarxKdpQn5hM3cmvA=";
};
postPatch = ''
substituteInPlace setup.py \
--replace-fail "'pytest-runner'" ""
'';
pythonRemoveDeps = [ "ipaddress" ];
build-system = with python3.pkgs; [ setuptools ];
dependencies = with python3.pkgs; [
colorclass
dnspython
netaddr
requests
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "dnsvalidator" ];
meta = {
description = "Tool to maintain a list of IPv4 DNS servers";
homepage = "https://github.com/vortexau/dnsvalidator";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "dnsvalidator";
};
}
+22 -10
View File
@@ -1,7 +1,7 @@
{
lib,
stdenv,
fetchCrate,
fetchFromGitHub,
rustPlatform,
installShellFiles,
testers,
@@ -13,21 +13,30 @@ rustPlatform.buildRustPackage rec {
pname = "dprint";
version = "0.47.6";
src = fetchCrate {
inherit pname version;
hash = "sha256-7tGzSFp7Dnu27L65mqFd7hzeFFDfe1xJ6cMul3hGyJs=";
# Prefer repository rather than crate here
# - They have Cargo.lock in the repository
# - They have WASM files in the repository which will be used in checkPhase
src = fetchFromGitHub {
owner = "dprint";
repo = "dprint";
rev = "refs/tags/${version}";
hash = "sha256-zyiBFZbetKx0H47MAU4JGauAmthcuEdJMl93M6MobD8=";
};
cargoHash = "sha256-y3tV3X7YMOUGBn2hCmxsUUc9QQleKEioTIw7SGoBvSQ=";
# Tests fail because they expect a test WASM plugin. Tests already run for
# every commit upstream on GitHub Actions
doCheck = false;
cargoHash = "sha256-XuzxoJgJJl4Blw1lDnCG3faEqL9U40MhZEb9LYjiaSs=";
nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
installShellFiles
];
checkFlags = [
# Require creating directory and network access
"--skip=plugins::cache_fs_locks::test"
"--skip=utils::lax_single_process_fs_flag::test"
# Require cargo is running
"--skip=utils::process::test"
];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export DPRINT_CACHE_DIR="$(mktemp -d)"
installShellCompletion --cmd dprint \
@@ -59,7 +68,10 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/dprint/dprint/releases/tag/${version}";
homepage = "https://dprint.dev";
license = licenses.mit;
maintainers = with maintainers; [ khushraj ];
maintainers = with maintainers; [
khushraj
kachick
];
mainProgram = "dprint";
};
}
+2 -2
View File
@@ -17,7 +17,7 @@
}:
python3Packages.buildPythonApplication rec {
pname = "errands";
version = "46.2.6";
version = "46.2.7";
pyproject = false;
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
owner = "mrvladus";
repo = "Errands";
rev = "refs/tags/${version}";
hash = "sha256-NIhDMsKPxxPJfDHXOpPl7NPUCO/M5wA2T72ej/+w+Z0=";
hash = "sha256-kPF6BS7qDFstCGadSB8MSvBy+T4PkG/wRisYAaIU6rY=";
};
nativeBuildInputs = [
+36 -29
View File
@@ -1,22 +1,25 @@
{
lib,
fetchFromGitHub,
flutter,
flutter324,
keybinder3,
libayatana-appindicator,
buildGoModule,
makeDesktopItem,
copyDesktopItems,
zenity,
wrapGAppsHook3,
autoPatchelfHook,
}:
let
pname = "flclash";
version = "0.8.68";
version = "0.8.69";
src =
(fetchFromGitHub {
owner = "chen08209";
repo = "FlClash";
rev = "v${version}";
hash = "sha256-0S3sNmOxM5SpRLpYzi4br5/PJnxDklFHsEAKiHd0vOM=";
tag = "v${version}";
hash = "sha256-T9sqHzqnOvZG95EJegqT6TqOOrAuqzjNvVQWLyeQwng=";
fetchSubmodules = true;
}).overrideAttrs
(_: {
@@ -26,13 +29,18 @@ let
});
libclash = buildGoModule {
inherit pname version src;
modRoot = "./core";
vendorHash = "sha256-BpZB+0r7x7Ntldimo/nHXIu98jwhcA53l3kMav9lHkA=";
vendorHash = "sha256-yam3DgY/dfwIRc7OvFltwX29x6xGlrrsK4Oj6oaGYRw=";
CGO_ENABLED = 0;
buildPhase = ''
runHook preBuild
mkdir -p $out/lib
go build -ldflags="-w -s" -tags=with_gvisor -buildmode=c-shared -o $out/lib/libclash.so
mkdir -p $out/bin
go build -ldflags="-w -s" -tags=with_gvisor -o $out/bin/FlClashCore
runHook postBuild
'';
@@ -42,18 +50,30 @@ let
homepage = "https://github.com/chen08209/FlClash";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = lib.platforms.linux;
};
};
in
flutter.buildFlutterApplication {
flutter324.buildFlutterApplication {
inherit pname version src;
pubspecLock = lib.importJSON ./pubspec.lock.json;
nativeBuildInputs = [
copyDesktopItems
wrapGAppsHook3
autoPatchelfHook
];
buildInputs = [
keybinder3
libayatana-appindicator
];
desktopItems = [
(makeDesktopItem {
name = "FlClash";
name = "flclash";
exec = "FlClash %U";
icon = "FlClash";
icon = "flclash";
genericName = "FlClash";
desktopName = "FlClash";
categories = [
@@ -68,31 +88,18 @@ flutter.buildFlutterApplication {
})
];
postPatch = ''
substituteInPlace lib/clash/core.dart \
--replace-fail 'DynamicLibrary.open("libclash.so")' 'DynamicLibrary.open("${libclash}/lib/libclash.so")'
'';
preBuild = ''
mkdir -p ./libclash/linux/
cp ${libclash}/lib/libclash.so ./libclash/linux/libclash.so
cp ${libclash}/bin/FlClashCore ./libclash/linux/FlClashCore
'';
postInstall = ''
mkdir -p $out/share/pixmaps/
cp ./assets/images/icon.png $out/share/pixmaps/FlClash.png
install -Dm644 ./assets/images/icon.png $out/share/pixmaps/flclash.png
'';
pubspecLock = lib.importJSON ./pubspec.lock.json;
nativeBuildInputs = [
copyDesktopItems
];
buildInputs = [
keybinder3
libayatana-appindicator
];
extraWrapProgramArgs = ''
--prefix PATH : ${lib.makeBinPath [ zenity ]}
'';
meta = {
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
@@ -17,7 +17,7 @@
perlPackages.buildPerlPackage rec {
pname = "foomatic-db-engine";
version = "unstable-2024-02-10";
version = "0-unstable-2024-02-10";
src = fetchFromGitHub {
# there is also a daily snapshot at the `downloadPage`,
@@ -8,7 +8,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "foomatic-db-nonfree";
version = "unstable-2015-06-05";
version = "0-unstable-2015-06-05";
src = fetchFromGitHub {
# there is also a daily snapshot at the `downloadPage`,
+3 -3
View File
@@ -13,15 +13,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "foomatic-db";
version = "unstable-2024-08-13";
version = "0-unstable-2024-12-05";
src = fetchFromGitHub {
# there is also a daily snapshot at the `downloadPage`,
# but it gets deleted quickly and would provoke 404 errors
owner = "OpenPrinting";
repo = "foomatic-db";
rev = "359508733741039b65c86e7a1318a89862e03b13";
hash = "sha256-DSduuSC9XX2+fS2XOQ4/FrmBzOu7rgfNDeLzpcBplsY=";
rev = "9a7a08318598fea569cf073489709899c9af6143";
hash = "sha256-7vvJPhUa4oDe101Iv897LoChNIcdTa4LviLUndHxWtw=";
};
buildInputs = [ cups cups-filters ghostscript gnused perl ];
+13 -13
View File
@@ -1,37 +1,37 @@
{ stdenv
, lib
, buildGoModule
, fetchFromGitHub
, libpcap
{
lib,
stdenv,
buildGoModule,
fetchFromGitHub,
libpcap,
}:
buildGoModule rec {
pname = "godspeed";
version = "unstable-2021-08-27";
version = "1.0";
src = fetchFromGitHub {
owner = "redcode-labs";
repo = "GodSpeed";
rev = "c02b184ab0fd304d1bd8cbe1566a3d3de727975e";
sha256 = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI=";
rev = "refs/tags/${version}";
hash = "sha256-y/mCfNWe5ShdxEz8IUQ8zUzgVkUy/+5lX6rcJ3r6KoI=";
};
vendorHash = "sha256-DCDAuKvov4tkf77nJNo9mQU/bAeQasp4VBQRtLX+U6c=";
buildInputs = [
libpcap
];
buildInputs = [ libpcap ];
postFixup = ''
mv $out/bin/GodSpeed $out/bin/${pname}
'';
meta = with lib; {
broken = stdenv.hostPlatform.isDarwin;
description = "Manager for reverse shells";
homepage = "https://github.com/redcode-labs/GodSpeed";
license = with licenses; [ mit ];
changelog = "https://github.com/redcode-labs/GodSpeed/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members;
mainProgram = "godspeed";
broken = stdenv.hostPlatform.isDarwin;
};
}
+3 -3
View File
@@ -9,13 +9,13 @@
buildGoModule rec {
pname = "gotify-server";
version = "2.5.0";
version = "2.6.1";
src = fetchFromGitHub {
owner = "gotify";
repo = "server";
rev = "v${version}";
hash = "sha256-Na/bxETIgVm1mxMOXWTgYIFFuB6XG1jGvbW6q/n5LRw=";
hash = "sha256-6PmJnRBovyufrSB+uMbU+bqhZb1bEs39MxBVMnnE6f8=";
};
# With `allowGoReference = true;`, `buildGoModule` adds the `-trimpath`
@@ -24,7 +24,7 @@ buildGoModule rec {
# server[780]: stat /var/lib/private/ui/build/index.html: no such file or directory
allowGoReference = true;
vendorHash = "sha256-Vnk/c2dzxIXDChobFSP++9uyiFD+SKyxJC9ZwaQ2pVw=";
vendorHash = "sha256-aru1Q3esLtyxV6CVup4qjsuaJlM5DuLuP8El4RYoVVE=";
doCheck = false;
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "haguichi";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "ztefn";
repo = "haguichi";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-Rhag2P4GAO9qhcajwDHIkgzKZqNii/SgvFwCI6Kc8XE=";
hash = "sha256-hSQsKG86QUzv/dfqz2amSXyAaA1ZAk9dTvel9KVgeFs=";
};
postPatch = ''
@@ -59,7 +59,9 @@ stdenv.mkDerivation (finalAttrs: {
description = "Graphical frontend for Hamachi on Linux";
mainProgram = "haguichi";
homepage = "https://haguichi.net/";
changelog = "https://haguichi.net/news/release${lib.strings.replaceStrings ["."] [""] finalAttrs.version}";
changelog = "https://haguichi.net/news/release${
lib.strings.replaceStrings [ "." ] [ "" ] finalAttrs.version
}";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ OPNA2608 ];
+10 -4
View File
@@ -10,16 +10,18 @@
buildGoModule rec {
pname = "harbor-cli";
version = "0.0.1";
version = "0.0.2";
src = fetchFromGitHub {
owner = "goharbor";
repo = "harbor-cli";
rev = "v${version}";
hash = "sha256-WSADuhr6p8N0Oh1xIG7yItM6t0EWUiAkzNbdKsSc4WA=";
hash = "sha256-baS4UHjmE2eURFMDBhXbx9lcKPArb2RH2NVDt3MPE4s=";
};
vendorHash = "sha256-UUD9/5+McR1t5oO4/6TSScT7hhSKM0OpBf94LVQG1Pw=";
vendorHash = "sha256-rw2VPRi0VTm7/zVnQ8zL5f4mbzYKnmuxgCbgrpcukaU=";
excludedPackages = [ "dagger" ];
nativeBuildInputs = [ installShellFiles ];
@@ -29,7 +31,11 @@ buildGoModule rec {
"-X github.com/goharbor/harbor-cli/cmd/harbor/internal/version.Version=${version}"
];
doCheck = false; # Network required
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
export HOME="$(mktemp -d)"
installShellCompletion --cmd harbor \
--bash <($out/bin/harbor completion bash) \
--fish <($out/bin/harbor completion fish) \
@@ -38,7 +44,7 @@ buildGoModule rec {
passthru.tests.version = testers.testVersion {
package = harbor-cli;
command = "harbor version";
command = "HOME=\"$(mktemp -d)\" harbor version";
};
meta = {
+3 -3
View File
@@ -12,16 +12,16 @@
buildGoModule rec {
pname = "hugo";
version = "0.139.0";
version = "0.139.3";
src = fetchFromGitHub {
owner = "gohugoio";
repo = "hugo";
rev = "refs/tags/v${version}";
hash = "sha256-UXOZCiwYpMnJsNSO7y3CsB8nmPxtBErYYl8YwWO3Hts=";
hash = "sha256-bUqLVM1jQ6LVsnDIP2NanmmEFe3mDUt446kH9I0aZQI=";
};
vendorHash = "sha256-qhiCZMSLRnLbyHplcaPn/BGJ3Lv8O8eEvCuIHwA4sMs=";
vendorHash = "sha256-LwXrCYGlWe6dOdPTh3YKhJDUID6e+OUOfDYtYxYnx/Y=";
checkFlags = [
# Workaround for "failed to load modules"
+2 -2
View File
@@ -5,13 +5,13 @@
}:
buildGoModule rec {
pname = "hyprls";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "hyprland-community";
repo = "hyprls";
rev = "v${version}";
hash = "sha256-boA2kWlHm9bEM/o0xi/1FlH6WGU4wL1RRvbGGXdzHYQ=";
hash = "sha256-uNT3sC81pnFqDzmhL20q5YDLBSVJwv0frNGB9wzkRkg=";
};
vendorHash = "sha256-rG+oGJOABA9ee5nIpC5/U0mMsPhwvVtQvJBlQWfxi5Y=";
+1 -1
View File
@@ -160,7 +160,7 @@ buildNpmPackage' {
python3
makeWrapper
glib
node-gyp
node-gyp # for building node_modules/sharp from source
];
buildInputs = [
+10 -10
View File
@@ -1,22 +1,22 @@
{
"version": "1.121.0",
"hash": "sha256-3Rk/0LtbRIrtnPBhG6TzYFcPlZqlkZoyO01jIL4gzC8=",
"version": "1.122.1",
"hash": "sha256-wpqmaMT2yIlwihUB3q8TKCrhhikf09pNJQJ9HsloHR4=",
"components": {
"cli": {
"npmDepsHash": "sha256-LsStgf6iJMpqCYZoZoP7cNnHbuzawTQ02wvJ5q/2RyU=",
"version": "2.2.32"
"npmDepsHash": "sha256-a6BK3A9Qlm0ygTRXSgqwzLv/KGyKFdeDfvSraayRC2U=",
"version": "2.2.34"
},
"server": {
"npmDepsHash": "sha256-9xyl+8YItzHSHcgUi1X9MwNtmZpdDGtg4DUa2YZv08I=",
"version": "1.121.0"
"npmDepsHash": "sha256-dTKtuMhO1K/inQZFLCGxg6VlBDPC35x+AEMFLR3kH9w=",
"version": "1.122.1"
},
"web": {
"npmDepsHash": "sha256-vHmiNWVLl4len6SnJ/NmiRVLLc4uUUWF/25LiOMnvf0=",
"version": "1.121.0"
"npmDepsHash": "sha256-YKEbylbrsrjnUKDBSOZLz8iZWpcKfQtyRxrKG0TR4y0=",
"version": "1.122.1"
},
"open-api/typescript-sdk": {
"npmDepsHash": "sha256-jiwUoWrMH/mDO+GPi13Q+Z87NAtDx95h6igI0NuPhnc=",
"version": "1.121.0"
"npmDepsHash": "sha256-ou/o1NNpA3rOZTBwxXDmegUelC6praXB1muiu391BzM=",
"version": "1.122.1"
}
}
}
+71 -14
View File
@@ -1,28 +1,28 @@
{
lib,
fetchFromGitHub,
flutter,
flutter324,
webkitgtk_4_1,
alsa-lib,
libayatana-appindicator,
libepoxy,
autoPatchelfHook,
wrapGAppsHook3,
gst_all_1,
at-spi2-atk,
stdenv,
mimalloc,
mpv,
mpv-unwrapped,
xdg-user-dirs,
}:
let
version = "1.4.4";
in
flutter.buildFlutterApplication {
flutter324.buildFlutterApplication rec {
pname = "kazumi";
inherit version;
version = "1.4.5";
src = fetchFromGitHub {
owner = "Predidit";
repo = "Kazumi";
rev = "refs/tags/${version}";
hash = "sha256-p5eFabIa04io180tBNCMRs2pX7HU8b+PdyBwZohmKR8=";
tag = version;
hash = "sha256-CbfNvLJrGjJAWSeHejtHG0foSGmjpJtvbWvK994q4uQ=";
};
pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -35,9 +35,8 @@ flutter.buildFlutterApplication {
buildInputs = [
webkitgtk_4_1
alsa-lib
at-spi2-atk
libayatana-appindicator
libepoxy
mpv
gst_all_1.gstreamer
gst_all_1.gst-vaapi
gst_all_1.gst-libav
@@ -46,23 +45,81 @@ flutter.buildFlutterApplication {
gst_all_1.gst-plugins-base
];
customSourceBuilders = {
# unofficial media_kit_libs_linux
media_kit_libs_linux =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "media_kit_libs_linux";
inherit version src;
inherit (src) passthru;
postPatch = ''
sed -i '/set(MIMALLOC "mimalloc-/,/add_custom_target/d' libs/linux/media_kit_libs_linux/linux/CMakeLists.txt
sed -i '/set(PLUGIN_NAME "media_kit_libs_linux_plugin")/i add_custom_target("MIMALLOC_TARGET" ALL DEPENDS ${mimalloc}/lib/mimalloc.o)' libs/linux/media_kit_libs_linux/linux/CMakeLists.txt
'';
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
};
# unofficial media_kit_video
media_kit_video =
{ version, src, ... }:
stdenv.mkDerivation rec {
pname = "media_kit_video";
inherit version src;
inherit (src) passthru;
postPatch = ''
sed -i '/set(LIBMPV_ZIP_URL/,/if(MEDIA_KIT_LIBS_AVAILABLE)/{//!d; /set(LIBMPV_ZIP_URL/d}' media_kit_video/linux/CMakeLists.txt
sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_HEADER_UNZIP_DIR "${mpv-unwrapped.dev}/include/mpv")' media_kit_video/linux/CMakeLists.txt
sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_PATH "${mpv}/lib")' media_kit_video/linux/CMakeLists.txt
sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_UNZIP_DIR "${mpv}/lib")' media_kit_video/linux/CMakeLists.txt
'';
installPhase = ''
runHook preInstall
cp -r . $out
runHook postInstall
'';
};
};
gitHashes = {
desktop_webview_window = "sha256-Z9ehzDKe1W3wGa2AcZoP73hlSwydggO6DaXd9mop+cM=";
webview_windows = "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE=";
media_kit = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
media_kit_libs_android_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
media_kit_libs_ios_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
media_kit_libs_linux = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
media_kit_libs_macos_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
media_kit_libs_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
media_kit_libs_windows_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
media_kit_video = "sha256-bWS3j4mUdMYfPhzS16z3NZxLTQDrEpDm3dtkzxcdKpQ=";
};
postInstall = ''
mkdir -p $out/share/applications/ $out/share/icons/hicolor/512x512/apps/
install -Dm0644 ./assets/linux/io.github.Predidit.Kazumi.desktop $out/share/applications/io.github.Predidit.Kazumi.desktop
install -Dm0644 ./assets/images/logo/logo_linux.png $out/share/icons/hicolor/512x512/apps/io.github.Predidit.Kazumi.png
'';
extraWrapProgramArgs = ''
--prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]}
'';
meta = {
description = "Watch Animes online with danmaku support";
homepage = "https://github.com/Predidit/Kazumi";
mainProgram = "kazumi";
license = with lib.licenses; [ gpl3Plus ];
maintainers = with lib.maintainers; [ aucub ];
platforms = [ "x86_64-linux" ];
platforms = lib.platforms.linux;
};
}
+142 -104
View File
@@ -210,11 +210,11 @@
"dependency": "direct main",
"description": {
"name": "canvas_danmaku",
"sha256": "539beee7dab73b0d01980194885730de11527ec0f96d9c4fa26ae4eac6699b7f",
"sha256": "8e9971dab1ebc4b29bbda95b95cc19966fef5f1e313bc3bedbcc6ce697ebc523",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.2.3"
"version": "0.2.4"
},
"characters": {
"dependency": "transitive",
@@ -621,16 +621,6 @@
"source": "hosted",
"version": "4.0.0"
},
"fvp": {
"dependency": "direct main",
"description": {
"name": "fvp",
"sha256": "3dd245cac5dfba36311cbf5834d8f275ba1f3e49a5cdcb4a98e01cb41e9a21d8",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.28.0"
},
"glob": {
"dependency": "transitive",
"description": {
@@ -815,11 +805,11 @@
"dependency": "direct main",
"description": {
"name": "logger",
"sha256": "697d067c60c20999686a0add96cf6aba723b3aa1f83ecf806a8097231529ec32",
"sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.4.0"
"version": "2.5.0"
},
"logging": {
"dependency": "transitive",
@@ -861,6 +851,94 @@
"source": "hosted",
"version": "0.11.1"
},
"media_kit": {
"dependency": "direct main",
"description": {
"path": "media_kit",
"ref": "main",
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
"version": "1.1.11"
},
"media_kit_libs_android_video": {
"dependency": "direct overridden",
"description": {
"path": "libs/android/media_kit_libs_android_video",
"ref": "main",
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
"version": "1.3.6"
},
"media_kit_libs_ios_video": {
"dependency": "direct overridden",
"description": {
"path": "libs/ios/media_kit_libs_ios_video",
"ref": "main",
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
"version": "1.1.4"
},
"media_kit_libs_linux": {
"dependency": "direct overridden",
"description": {
"path": "libs/linux/media_kit_libs_linux",
"ref": "main",
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
"version": "1.1.3"
},
"media_kit_libs_macos_video": {
"dependency": "direct overridden",
"description": {
"path": "libs/macos/media_kit_libs_macos_video",
"ref": "main",
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
"version": "1.1.4"
},
"media_kit_libs_video": {
"dependency": "direct main",
"description": {
"path": "libs/universal/media_kit_libs_video",
"ref": "main",
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
"version": "1.0.5"
},
"media_kit_libs_windows_video": {
"dependency": "direct overridden",
"description": {
"path": "libs/windows/media_kit_libs_windows_video",
"ref": "main",
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
"version": "1.0.10"
},
"media_kit_video": {
"dependency": "direct main",
"description": {
"path": "media_kit_video",
"ref": "main",
"resolved-ref": "eefa578ea41f594b8392653edff6fe8da05cc95b",
"url": "https://github.com/Predidit/media-kit.git"
},
"source": "git",
"version": "1.2.5"
},
"menu_base": {
"dependency": "transitive",
"description": {
@@ -1151,65 +1229,45 @@
"source": "hosted",
"version": "0.28.0"
},
"screen_brightness": {
"dependency": "direct main",
"safe_local_storage": {
"dependency": "transitive",
"description": {
"name": "screen_brightness",
"sha256": "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8",
"name": "safe_local_storage",
"sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
"version": "2.0.1"
},
"screen_brightness_android": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_android",
"sha256": "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6",
"sha256": "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
"version": "2.0.0"
},
"screen_brightness_ios": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_ios",
"sha256": "f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1",
"sha256": "caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
},
"screen_brightness_macos": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_macos",
"sha256": "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
"version": "2.0.0"
},
"screen_brightness_platform_interface": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_platform_interface",
"sha256": "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16",
"sha256": "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
},
"screen_brightness_windows": {
"dependency": "transitive",
"description": {
"name": "screen_brightness_windows",
"sha256": "c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.0.1"
"version": "2.0.0"
},
"screen_pixel": {
"dependency": "direct main",
@@ -1365,11 +1423,11 @@
"dependency": "transitive",
"description": {
"name": "shelf_web_socket",
"sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
"sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.0"
"version": "2.0.1"
},
"shortid": {
"dependency": "transitive",
@@ -1451,11 +1509,11 @@
"dependency": "transitive",
"description": {
"name": "sqflite_common",
"sha256": "4468b24876d673418a7b7147e5a08a715b4998a7ae69227acafaab762e0e5490",
"sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.5.4+5"
"version": "2.5.4+6"
},
"sqflite_darwin": {
"dependency": "transitive",
@@ -1597,6 +1655,26 @@
"source": "hosted",
"version": "2.2.2"
},
"universal_platform": {
"dependency": "transitive",
"description": {
"name": "universal_platform",
"sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.1.0"
},
"uri_parser": {
"dependency": "transitive",
"description": {
"name": "uri_parser",
"sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.0.0"
},
"url_launcher": {
"dependency": "direct main",
"description": {
@@ -1697,56 +1775,6 @@
"source": "hosted",
"version": "2.1.4"
},
"video_player": {
"dependency": "direct main",
"description": {
"name": "video_player",
"sha256": "4a8c3492d734f7c39c2588a3206707a05ee80cef52e8c7f3b2078d430c84bc17",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.9.2"
},
"video_player_android": {
"dependency": "transitive",
"description": {
"name": "video_player_android",
"sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.7.16"
},
"video_player_avfoundation": {
"dependency": "transitive",
"description": {
"name": "video_player_avfoundation",
"sha256": "cd5ab8a8bc0eab65ab0cea40304097edc46da574c8c1ecdee96f28cd8ef3792f",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.6.2"
},
"video_player_platform_interface": {
"dependency": "transitive",
"description": {
"name": "video_player_platform_interface",
"sha256": "229d7642ccd9f3dc4aba169609dd6b5f3f443bb4cc15b82f7785fcada5af9bbb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "6.2.3"
},
"video_player_web": {
"dependency": "transitive",
"description": {
"name": "video_player_web",
"sha256": "881b375a934d8ebf868c7fb1423b2bfaa393a0a265fa3f733079a86536064a10",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.3.3"
},
"vm_service": {
"dependency": "transitive",
"description": {
@@ -1757,8 +1785,18 @@
"source": "hosted",
"version": "14.2.5"
},
"volume_controller": {
"dependency": "transitive",
"description": {
"name": "volume_controller",
"sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "2.0.8"
},
"wakelock_plus": {
"dependency": "direct main",
"dependency": "transitive",
"description": {
"name": "wakelock_plus",
"sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484",
@@ -1841,11 +1879,11 @@
"dependency": "transitive",
"description": {
"name": "webview_flutter_android",
"sha256": "86c2d01c37c4578ee46560109cf2e18fb271f0d080a796f09188d0952352e057",
"sha256": "285cedfd9441267f6cca8843458620b5fda1af75b04f5818d0441acda5d7df19",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "4.0.2"
"version": "4.1.0"
},
"webview_flutter_platform_interface": {
"dependency": "transitive",
@@ -1861,11 +1899,11 @@
"dependency": "transitive",
"description": {
"name": "webview_flutter_wkwebview",
"sha256": "3be297aa4ca78205abdd284cf55f168c35246c75b3079990ad8ba9d257681a30",
"sha256": "b7e92f129482460951d96ef9a46b49db34bd2e1621685de26e9eaafd9674e7eb",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "3.16.2"
"version": "3.16.3"
},
"webview_windows": {
"dependency": "direct main",
+3 -3
View File
@@ -7,14 +7,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "keepwn";
version = "0.4";
version = "0.5";
pyproject = true;
src = fetchFromGitHub {
owner = "Orange-Cyberdefense";
repo = "KeePwn";
rev = "refs/tags/${version}";
hash = "sha256-AkqBC65XrMt4V5KgzLepnQoqpdvbrtWLY3DmVuy8Zck=";
tag = version;
hash = "sha256-z2+l7zOexcqbwkrdmB3EcYIjnGlproINF51Pcpp7Nz4=";
};
build-system = with python3.pkgs; [ setuptools ];
+3 -3
View File
@@ -7,15 +7,15 @@
rustPlatform.buildRustPackage rec {
pname = "klog-rs";
version = "0.2.0";
version = "0.3.1";
src = fetchFromGitHub {
owner = "tobifroe";
repo = "klog";
rev = version;
hash = "sha256-GbYkTCo+MUKBz0AtfDSjOOe8j+v6gxRkbq1Dj1E2jl0=";
hash = "sha256-E3oL6XAp9N0ptDTpGBd6pmg4DJx9GDJv3ZSbkc6at60=";
};
cargoHash = "sha256-h68NEAPLlgzDTSerL+0DrvSSfB85RHtBvuoUhrxLDWU=";
cargoHash = "sha256-S2F9oVPZH52luSsFUlQCLANPJudjJvecv8S6BBUnC78=";
checkFlags = [
# this integration test depends on a running kubernetes cluster
"--skip=k8s::tests::test_get_pod_list"
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "libmediainfo";
version = "24.06";
version = "24.11";
src = fetchurl {
url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
hash = "sha256-BoPyiiR13CQXIFulKN68zEB9pNn6ZRbrS3Wz/3JE6W4=";
hash = "sha256-luRKYX+QyLY7toWtU75nFrffQiF5PDKXgPAq6m5weqE=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
+2 -2
View File
@@ -19,14 +19,14 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libsidplayfp";
version = "2.11.0";
version = "2.12.0";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "libsidplayfp";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-O6VzHjJT3k1uLI0bjBDRntLqAZdMurs8onLZ6L6NlIU=";
hash = "sha256-VBzobT/UT1YFLYWfJ5XFND+p6fClf/qZVb4eEVpdTqg=";
};
outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "mediainfo";
version = "24.06";
version = "24.11.1";
src = fetchurl {
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
hash = "sha256-MvSoKjHjhuF3/fbkwjcFPkdbUBCJJpqyxylFKgkxNSA=";
hash = "sha256-FRBD/o1xmfEjBv3bwwtYoSlueaATrDgaKlfmO9YLy9E=";
};
nativeBuildInputs = [ autoreconfHook pkg-config ];
+63
View File
@@ -0,0 +1,63 @@
{
lib,
stdenv,
fetchFromGitHub,
SDL2,
cmake,
makeWrapper,
unstableGitUpdater,
}:
stdenv.mkDerivation {
pname = "mighty-mike";
version = "3.0.2-unstable-2024-04-01";
src = fetchFromGitHub {
owner = "jorio";
repo = "MightyMike";
rev = "0a1d6c4c80a90ed6e333651cd0a438ec003cfbe5";
hash = "sha256-c7o0Q9KTbJhYOZ2c/V1EdV4ibdR3AnHTCZBManJQzrw=";
fetchSubmodules = true;
};
nativeBuildInputs = [
SDL2
cmake
makeWrapper
];
buildInputs = [ SDL2 ];
strictDeps = true;
installPhase = ''
runHook preInstall
mkdir -p "$out/share/MightyMike"
mv Data ReadMe.txt "$out/share/MightyMike/"
install -Dm755 {.,$out/bin}/MightyMike
wrapProgram $out/bin/MightyMike --chdir "$out/share/MightyMike"
install -Dm644 $src/packaging/io.jor.mightymike.desktop $out/share/applications/mightymike.desktop
install -Dm644 $src/packaging/io.jor.mightymike.png $out/share/pixmaps/mightymike-desktopicon.png
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "Port of Mighty Mike, a 1995 Macintosh game by Pangea Software, for modern operating systems";
longDescription = ''
This is Pangea Software's Mighty Mike updated to run on modern systems.
Set in a toy store, this top-down action game is a staple of 90's Macintosh games.
It was initially published in 1995 under the name Power Pete.
'';
homepage = "https://jorio.itch.io/mightymike";
license = lib.licenses.cc-by-nc-sa-40;
mainProgram = "MightyMike";
maintainers = with lib.maintainers; [ nateeag ];
platforms = lib.platforms.linux;
};
}
+27 -9
View File
@@ -15,15 +15,31 @@
libGL,
}:
let
pname = "mihomo-party";
version = "1.4.5";
src = fetchurl {
url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-amd64.deb";
hash = "sha256-O332nt2kgpDGY84S78Tx2PGUw1Pyj80ab2ZE3woYm4Y=";
};
version = "1.5.12";
src =
let
inherit (stdenv.hostPlatform) system;
selectSystem = attrs: attrs.${system};
suffix = selectSystem {
x86_64-linux = "amd64";
aarch64-linux = "arm64";
};
hash = selectSystem {
x86_64-linux = "sha256-1vJ2FcJOcpNyfSm5HyLkexsULBBPlI0AW2jXuhK8khA=";
aarch64-linux = "sha256-P+zCO6HxcQJAGIVxOSRga+1Bqtn31mw2v+/EyEDpgF8=";
};
in
fetchurl {
url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${suffix}.deb";
inherit hash;
};
in
stdenv.mkDerivation {
inherit pname version src;
inherit version src;
pname = "mihomo-party";
passthru.updateScript = ./update.sh;
nativeBuildInputs = [
dpkg
@@ -70,8 +86,10 @@ stdenv.mkDerivation {
description = "Another Mihomo GUI";
homepage = "https://github.com/mihomo-party-org/mihomo-party";
mainProgram = "mihomo-party";
platforms = with lib.platforms; linux ++ darwin;
broken = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64);
platforms = [
"aarch64-linux"
"x86_64-linux"
];
license = lib.licenses.gpl3Plus;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [ aucub ];
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts
latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/mihomo-party-org/mihomo-party/releases/latest | jq -r ".tag_name")
latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
currentVersion=$(nix-instantiate --eval -E "with import ./. {}; mihomo-party.version" | tr -d '"')
echo "latest version: $latestVersion"
echo "current version: $currentVersion"
if [[ "$latestVersion" == "$currentVersion" ]]; then
echo "package is up-to-date"
exit 0
fi
for i in \
"x86_64-linux amd64" \
"aarch64-linux arm64"; do
set -- $i
prefetch=$(nix-prefetch-url "https://github.com/mihomo-party-org/mihomo-party/releases/download/v$latestVersion/mihomo-party-linux-$latestVersion-$2.deb")
hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch)
update-source-version mihomo-party $latestVersion $hash --system=$1 --ignore-same-version
done
+70
View File
@@ -0,0 +1,70 @@
{
lib,
stdenv,
fetchFromGitHub,
gitUpdater,
alsa-lib,
cmake,
libjack2,
lhasa,
makeWrapper,
pkg-config,
rtmidi,
SDL2,
zlib,
zziplib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "milkytracker";
version = "1.05.01";
src = fetchFromGitHub {
owner = "milkytracker";
repo = "MilkyTracker";
rev = "v${finalAttrs.version}";
hash = "sha256-31Jy93bQj9wZ9vWJe5DVnBqFXfPSH1qmk8kcT/t+FY0=";
};
strictDeps = true;
nativeBuildInputs = [
cmake
makeWrapper
pkg-config
];
buildInputs =
[
lhasa
libjack2
rtmidi
SDL2
zlib
zziplib
]
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib
];
postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png
install -Dm644 $src/resources/org.milkytracker.MilkyTracker.metainfo.xml $out/share/appdata/org.milkytracker.MilkyTracker.metainfo.xml
'';
passthru.updateScript = gitUpdater {
rev-prefix = "v";
};
meta = {
description = "Music tracker application, similar to Fasttracker II";
homepage = "https://milkytracker.org/";
license = lib.licenses.gpl3Plus;
platforms = lib.platforms.unix;
# ibtool -> real Xcode -> I can't get that, and Ofborg can't test that
broken = stdenv.hostPlatform.isDarwin;
maintainers = with lib.maintainers; [ OPNA2608 ];
mainProgram = "milkytracker";
};
})
+6
View File
@@ -20,6 +20,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/wbhart/mpir/commit/bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb.patch";
hash = "sha256-vW+cDK5Hq2hKEyprOJaNbj0bT2FJmMcyZHPE8GUNUWc=";
})
# https://github.com/wbhart/mpir/pull/299
(fetchpatch {
name = "gcc-14-fixes.patch";
url = "https://github.com/wbhart/mpir/commit/4ff3b770cbf86e29b75d12c13e8b854c74bccc5a.patch";
hash = "sha256-dCB2+1IYTGzHUQkDUF4gqvR1xoMPEYVPLGE+EP2wLL4=";
})
];
configureFlags = [ "--enable-cxx" ]
+2 -2
View File
@@ -17,13 +17,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "mympd";
version = "18.1.2";
version = "18.2.2";
src = fetchFromGitHub {
owner = "jcorporation";
repo = "myMPD";
rev = "v${finalAttrs.version}";
sha256 = "sha256-4BGW7jDeqwhbAi1LODeiFrmBIzv0qAMKT3IVRgYn87E=";
sha256 = "sha256-ztZ4AdVRQ5KCmxAIT6SSexIle6IfREGqNZLhAplPtrQ=";
};
nativeBuildInputs = [
@@ -0,0 +1,63 @@
From 9f82b88e17f5e04929eff96c673dac5810006c87 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Thu, 5 Dec 2024 09:49:40 +0000
Subject: [PATCH] configure fixes for gcc-14
---
Configure | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Configure b/Configure
index fbc57a8..e8cea16 100755
--- a/Configure
+++ b/Configure
@@ -76,7 +76,7 @@ done
CFLAGS="$COPT $CEXTRA"
echo "Checking for libraries"
-echo 'main(){}' > test.c
+echo 'int main(void){ return 0; }' > test.c
LFLAGS=""
for lib in -lcurses -lncurses; do
if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then
@@ -91,8 +91,9 @@ done
echo "Checking for on_exit()"
cat << END > test.c
+#include <stdlib.h>
void handler(void) {}
-main() { on_exit(handler, (void *)0); }
+int main(void) { on_exit(handler, (void *)0); return 0; }
END
if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then
HAS_ON_EXIT=true
@@ -103,7 +104,7 @@ fi
echo "Checking for sigprocmask()"
cat << END > test.c
#include <signal.h>
-main() { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); }
+int main(void) { sigset_t set; sigprocmask(SIG_BLOCK, &set, &set); return 0; }
END
if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then
HAS_SIGPROCMASK=true
@@ -114,7 +115,7 @@ fi
echo "Checking for getopt.h"
cat << END > test.c
#include <getopt.h>
-main(){}
+int main(void){ return 0; }
END
if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then
@@ -126,7 +127,7 @@ fi
echo "Checking for memory.h"
cat << END > test.c
#include <memory.h>
-main(){}
+int main(void){ return 0; }
END
if $CC $CFLAGS $LEXTRA test.c > /dev/null 2>&1; then
--
2.47.0
+11 -1
View File
@@ -11,6 +11,11 @@ stdenv.mkDerivation {
sha256 = "0gmxbpn50pnffidwjchkzph9rh2jm4wfq7hj8msp5vhdq5h0z9hm";
};
patches = [
# https://github.com/naclander/netris/pull/1
./configure-fixes-for-gcc-14.patch
];
buildInputs = [
ncurses
];
@@ -18,6 +23,11 @@ stdenv.mkDerivation {
configureScript = "./Configure";
dontAddPrefix = true;
configureFlags = [
"--cc" "${stdenv.cc.targetPrefix}cc"
"-O2"
];
installPhase = ''
mkdir -p $out/bin
cp ./netris $out/bin
@@ -28,6 +38,6 @@ stdenv.mkDerivation {
mainProgram = "netris";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ patryk27 ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
+3 -3
View File
@@ -6,13 +6,13 @@
buildGoModule rec {
pname = "nhost-cli";
version = "1.27.1";
version = "1.28.1";
src = fetchFromGitHub {
owner = "nhost";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-31YkO0zvAp470pQQKapkwXnk6uDmzIZlLMQVsPhGaZ4=";
tag = "v${version}";
hash = "sha256-bktz8ummBML8y//KnAQsOzwX+OO3ntiUkw8RG3PnGXg=";
};
vendorHash = null;
+135
View File
@@ -0,0 +1,135 @@
{
stdenv,
nodejs,
buildNpmPackage,
lib,
fetchFromGitHub,
meson,
ninja,
talloc,
pkg-config,
mongoc,
cmake,
libyaml,
libmicrohttpd,
flex,
bison,
libgcrypt,
libidn,
lksctp-tools,
gnutls,
libnghttp2,
openssl,
curl,
libtins,
mongosh,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "open5gs";
version = "2.7.2";
diameter = fetchFromGitHub {
owner = "open5gs";
repo = "freeDiameter";
rev = "20196a265aecb7b1573ceb526bb619e092c1fd3f"; # r1.5.0
hash = "sha256-0sxzQtKBx313+x3TRsmeswAq90Vk5jNA//rOJcEZJTQ=";
};
libtins = fetchFromGitHub {
owner = "open5gs";
repo = "libtins";
rev = "fb152ba63bd8d7d024d5f86e5fbd24a4cb3dd93d"; # r4.3
hash = "sha256-q++F1bvf739P82VpUf4TUygHjhYwOsaQzStJv8PN2Hc=";
};
mesonFlags = [
"-Dwerror=false"
"--buildtype=release"
];
promc = fetchFromGitHub {
owner = "open5gs";
repo = "prometheus-client-c";
rev = "a58ba25bf87a9b1b7c6be4e6f4c62047d620f402"; # open5gs branch
hash = "sha256-COZV4UeB7YRfpLwloIfc/WdlTP9huwVfXrJWH4jmvB8=";
};
src = fetchFromGitHub {
owner = "open5gs";
repo = "open5gs";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-XSDjVW+5l2trrilKMcSfX6QIfh/ijWxjoJg33Bn1DBU=";
};
webui = buildNpmPackage {
pname = finalAttrs.pname + "-webui";
inherit (finalAttrs) src version meta;
sourceRoot = "${finalAttrs.src.name}/webui";
npmDepsHash = "sha256-IpqineYa15GBqoPDJ7RpaDsq+MQIIDcdq7yhwmH4Lzo=";
installPhase = ''
rm -rf node_modules
mkdir $out
cp -r * $out
'';
};
nativeBuildInputs = [
meson
ninja
pkg-config
cmake
flex
bison
];
buildInputs = [
talloc
mongoc
libyaml
libmicrohttpd
libgcrypt
lksctp-tools
libidn
openssl
curl
libtins
gnutls
libnghttp2.dev
];
# For subproject
env = {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=array-bounds"
"-Wno-error=stringop-overflow"
];
};
preConfigure = ''
cp -R --no-preserve=mode,ownership ${finalAttrs.diameter} subprojects/freeDiameter
cp -R --no-preserve=mode,ownership ${finalAttrs.libtins} subprojects/libtins
cp -R --no-preserve=mode,ownership ${finalAttrs.promc} subprojects/prometheus-client-c
rm -rf webui/*
cp -r ${finalAttrs.webui}/* webui/
'';
postInstall = ''
cp misc/db/open5gs-dbctl $out/bin
substituteInPlace $out/bin/open5gs-dbctl \
--replace "mongosh" "${lib.getExe mongosh}"
'';
meta = {
homepage = "https://open5gs.org/";
description = "4G/5G core network components";
license = lib.licenses.agpl3Only;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ bot-wxt1221 ];
changelog = "https://github.com/open5gs/open5gs/releases/tag/v${finalAttrs.version}";
};
})
+16 -5
View File
@@ -1,6 +1,8 @@
{ lib
, buildGoModule
, fetchFromGitHub
{
lib,
buildGoModule,
fetchFromGitHub,
versionCheckHook,
}:
buildGoModule rec {
@@ -9,19 +11,28 @@ buildGoModule rec {
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
repo = "openrisk";
rev = "refs/tags/v${version}";
hash = "sha256-8DGwNoucLpdazf9r4PZrN4DEOMpTr5U7tal2Rab92pA=";
};
vendorHash = "sha256-BLowqqlMLDtsthS4uKeycmtG7vASG25CARGpUcuibcw=";
ldflags = [
"-w"
"-s"
];
nativeInstallCheckInputs = [ versionCheckHook ];
doInstallCheck = true;
meta = with lib; {
description = "Tool that generates an AI-based risk score";
mainProgram = "openrisk";
homepage = "https://github.com/projectdiscovery/openrisk";
changelog = "https://github.com/projectdiscovery/openrisk/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "openrisk";
};
}
+3 -3
View File
@@ -7,16 +7,16 @@
rustPlatform.buildRustPackage rec {
pname = "passepartui";
version = "0.1.4";
version = "0.1.5";
src = fetchFromGitHub {
owner = "kardwen";
repo = "passepartui";
rev = "refs/tags/v${version}";
hash = "sha256-ydX+Rjpfhi0K6f8pzjqWGF0O22gBco6Iot8fXSFNG5c=";
hash = "sha256-/rYdOurPlpGKCMAXTAhoWRn4NU3usPpJmef3f8V8EQA=";
};
cargoHash = "sha256-/lgEQ6PmHagt8TlGUV2A95MbV8IQzUwyQ/UkoaGIVHE=";
cargoHash = "sha256-8TmrsRbFC1TyoiUNVVTEdvDLj0BIJmqM00OoPLpaoFQ=";
passthru = {
updateScript = nix-update-script { };
+14 -5
View File
@@ -1,6 +1,8 @@
{ lib
, fetchFromGitHub
, rustPlatform
{
lib,
fetchFromGitHub,
rustPlatform,
nix-update-script,
}:
rustPlatform.buildRustPackage rec {
@@ -16,14 +18,21 @@ rustPlatform.buildRustPackage rec {
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = { "codespan-0.11.1" = "sha256-Wq99v77bqSGIOK/iyv+x/EG1563XSeaTDW5K2X3kSXU="; };
outputHashes = {
"codespan-0.11.1" = "sha256-Wq99v77bqSGIOK/iyv+x/EG1563XSeaTDW5K2X3kSXU=";
};
};
passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
meta = {
description = "A Language with Dependent Data and Codata Types";
homepage = "https://polarity-lang.github.io/";
changelog = "https://github.com/polarity-lang/polarity/blob/${src.rev}/CHANGELOG.md";
license = with lib.licenses; [ mit asl20 ];
license = with lib.licenses; [
mit
asl20
];
maintainers = [ lib.maintainers.mangoiv ];
mainProgram = "pol";
platforms = lib.platforms.all;
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "quarkus-cli";
version = "3.15.1";
version = "3.17.3";
src = fetchurl {
url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
hash = "sha256-cvZ1jEIeEQOgmAiQba6AYob+84ozM0AQcnVpgRLSIIc=";
hash = "sha256-Nm0tu4YYjD1NH4n0qV1YZl7ZXfN5jccFV6EPn5mPu+8=";
};
nativeBuildInputs = [ makeWrapper ];
+61
View File
@@ -0,0 +1,61 @@
{
buildGoModule,
fetchFromGitHub,
ffmpeg,
lib,
makeBinaryWrapper,
nix-update-script,
pulseaudio,
testers,
}:
let
self = buildGoModule rec {
pname = "sblast";
version = "0.7.0";
src = fetchFromGitHub {
owner = "ugjka";
repo = "sblast";
rev = "v${version}";
hash = "sha256-+ZeZ2lohAngfljCa/z9yjCKvQwCMEiwzzPFrpAU8lWA=";
};
vendorHash = "sha256-yPwLilMiDR1aSeuk8AEmuYPsHPRWqiByGLwgkdI5t+s=";
nativeBuildInputs = [
makeBinaryWrapper
];
postInstall = ''
wrapProgram $out/bin/sblast \
--suffix PATH : ${
lib.makeBinPath [
ffmpeg
pulseaudio
]
}
'';
# build only the toplevel package, and not `makerel`
subPackages = ".";
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion {
package = self;
version = "v${version}";
};
};
meta = {
description = "Blast your Linux audio to DLNA receivers";
homepage = "https://github.com/ugjka/sblast";
# license is "MIT+NoAI": <https://github.com/ugjka/sblast/blob/main/LICENSE>
license = lib.licenses.unfree;
mainProgram = "sblast";
maintainers = with lib.maintainers; [ colinsane ];
platforms = lib.platforms.linux;
};
};
in
self
+1317 -273
View File
File diff suppressed because it is too large Load Diff
+2 -13
View File
@@ -11,13 +11,13 @@
buildDotnetModule rec {
pname = "scarab";
version = "2.5.0.0";
version = "2.6.0.0";
src = fetchFromGitHub {
owner = "fifty-six";
repo = "scarab";
rev = "refs/tags/v${version}";
hash = "sha256-z1hmMrfeoYyjVEPPjWvUfKUKsOS7UsocSWMYrFY+/kI=";
hash = "sha256-xnvS3FDY4hi3yauwoSzO1fO6tJJAwFCkAc0Wzfs/puQ=";
};
dotnet-sdk = dotnetCorePackages.sdk_8_0;
@@ -26,17 +26,6 @@ buildDotnetModule rec {
testProjectFile = "Scarab.Tests/Scarab.Tests.csproj";
executables = [ "Scarab" ];
postPatch = ''
substituteInPlace Scarab/Scarab.csproj Scarab.Tests/Scarab.Tests.csproj \
--replace-fail 'net6.0' 'net8.0'
'';
preConfigureNuGet = ''
# This should really be in the upstream nuget.config
dotnet nuget add source https://api.nuget.org/v3/index.json \
-n nuget.org --configfile NuGet.Config
'';
runtimeDeps = [
bc
];
+2 -2
View File
@@ -5,13 +5,13 @@
buildGoModule rec {
pname = "scip-go";
version = "0.1.21";
version = "0.1.22";
src = fetchFromGitHub {
owner = "sourcegraph";
repo = "scip-go";
rev = "v${version}";
hash = "sha256-CUmivqMFAjtSS06tEs8xuXh5nyLD3MYdI2j0EAyWpY0=";
hash = "sha256-1vu6+0CMQwju+Ym0iYXqVktwfJtZFWbn7aOK/w5pVq4=";
};
vendorHash = "sha256-E/1ubWGIx+sGC+owqw4nOkrwUFJfgTeqDNpH8HCwNhA=";
+39 -30
View File
@@ -1,28 +1,29 @@
{ stdenv
, lib
, fetchFromGitHub
, nix-update-script
, alsaSupport ? stdenv.hostPlatform.isLinux
, alsa-lib
, autoreconfHook
, pulseSupport ? stdenv.hostPlatform.isLinux
, libpulseaudio
, libsidplayfp
, out123Support ? stdenv.hostPlatform.isDarwin
, mpg123
, perl
, pkg-config
{
stdenv,
lib,
fetchFromGitHub,
gitUpdater,
alsaSupport ? stdenv.hostPlatform.isLinux,
alsa-lib,
autoreconfHook,
pulseSupport ? stdenv.hostPlatform.isLinux,
libpulseaudio,
libsidplayfp,
out123Support ? stdenv.hostPlatform.isDarwin,
mpg123,
perl,
pkg-config,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "sidplayfp";
version = "2.11.0";
version = "2.12.0";
src = fetchFromGitHub {
owner = "libsidplayfp";
repo = "sidplayfp";
rev = "v${finalAttrs.version}";
hash = "sha256-X2ds7pYglxvwLOHXfCULwSeWAS9l2Y3PUdSxcuugwHs=";
hash = "sha256-78NlRBZ2GlZWhnZiefNIgRNv6bnJaHH94WsxEhP9rAk=";
};
strictDeps = true;
@@ -33,15 +34,19 @@ stdenv.mkDerivation (finalAttrs: {
pkg-config
];
buildInputs = [
libsidplayfp
] ++ lib.optionals alsaSupport [
alsa-lib
] ++ lib.optionals pulseSupport [
libpulseaudio
] ++ lib.optionals out123Support [
mpg123
];
buildInputs =
[
libsidplayfp
]
++ lib.optionals alsaSupport [
alsa-lib
]
++ lib.optionals pulseSupport [
libpulseaudio
]
++ lib.optionals out123Support [
mpg123
];
configureFlags = [
(lib.strings.withFeature out123Support "out123")
@@ -50,15 +55,19 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
passthru = {
updateScript = nix-update-script { };
updateScript = gitUpdater { rev-prefix = "v"; };
};
meta = with lib; {
meta = {
description = "SID player using libsidplayfp";
homepage = "https://github.com/libsidplayfp/sidplayfp";
license = with licenses; [ gpl2Plus ];
changelog = "https://github.com/libsidplayfp/sidplayfp/releases/tag/v${finalAttrs.version}";
license = with lib.licenses; [ gpl2Plus ];
mainProgram = "sidplayfp";
maintainers = with maintainers; [ dezgeg OPNA2608 ];
platforms = platforms.all;
maintainers = with lib.maintainers; [
dezgeg
OPNA2608
];
platforms = lib.platforms.all;
};
})
+6 -6
View File
@@ -40,13 +40,13 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "surrealist";
version = "2.1.6";
version = "3.0.8";
src = fetchFromGitHub {
owner = "surrealdb";
repo = "surrealist";
rev = "surrealist-v${finalAttrs.version}";
hash = "sha256-jOjOdrVOcGPenFW5mkkXKA64C6c+/f9KzlvtUmw6vXc=";
hash = "sha256-46CXldjhWc7H6wdKfMK2IlmBqfe0QHi/J1uFhbV42HY=";
};
# HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls
@@ -61,14 +61,14 @@ in stdenv.mkDerivation (finalAttrs: {
cargoDeps = rustPlatform.fetchCargoTarball {
inherit (finalAttrs) patches src;
sourceRoot = finalAttrs.cargoRoot;
name = "${finalAttrs.pname}-${finalAttrs.version}";
hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs=";
sourceRoot = "${finalAttrs.src.name}/${finalAttrs.cargoRoot}";
hash = "sha256-HmdEcjgxPyRsQqhU0P/C3KVgwZsSvfHjyzj0OHKe5jY";
patchFlags = [ "-p2" ];
};
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-Y14wBYiAsctMf4Ljt7G/twGEQP2nCSDQZVG8otImnIE=";
hash = "sha256-uBDbBfWC9HxxzY1x4+rNo87D5C1zZa2beFLa5NkLs80=";
};
nativeBuildInputs = [
+1 -1
View File
@@ -101,7 +101,7 @@ let
in
symlinkJoin rec {
pname = "temporal-cli";
inherit (tctl) version;
inherit (tctl-next) version;
name = "${pname}-${version}";
paths = [
+3 -3
View File
@@ -14,16 +14,16 @@
rustPlatform.buildRustPackage rec {
pname = "tpnote";
version = "1.24.9";
version = "1.24.10";
src = fetchFromGitHub {
owner = "getreu";
repo = "tp-note";
rev = "v${version}";
hash = "sha256-KXkriFFn1GapoVimcK7Hqv1mUTZ2EbnnZPyX2izI2oo=";
hash = "sha256-K0GwSt0TucclJRp30ZwVfBk5BJBUaIKplzXRbRNtPtU=";
};
cargoHash = "sha256-MCnQJ1cJeWUJ8L+u09px4COG7XUAVOOgBg8nUi37J90=";
cargoHash = "sha256-l7MfErGXrxiNjGYZ7r9LAdUqynOp/FbUIEM0Wq9Vbxs=";
nativeBuildInputs = [
cmake
+7 -10
View File
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchzip
, autoreconfHook
, makeWrapper
, nixosTests
, pkg-config
@@ -10,7 +11,6 @@
, pcre
, perlPackages
, python3
, catch2
# recommended dependencies
, withHwloc ? true
, hwloc
@@ -47,11 +47,11 @@
stdenv.mkDerivation rec {
pname = "trafficserver";
version = "9.2.5";
version = "9.2.7";
src = fetchzip {
url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2";
hash = "sha256-RwhTI31LyupkAbXHsNrjcJqUjVoVpX3/2Ofxl2NdasU=";
hash = "sha256-i3UTqOO3gQezL2HmQllJa+hwy03tJViyOOflW2iXBAM=";
};
# NOTE: The upstream README indicates that flex is needed for some features,
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
#
# [1]: https://github.com/apache/trafficserver/pull/5617
# [2]: https://github.com/apache/trafficserver/blob/3fd2c60/configure.ac#L742-L788
nativeBuildInputs = [ makeWrapper pkg-config file python3 ]
nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config file python3 ]
++ (with perlPackages; [ perl ExtUtilsMakeMaker ])
++ lib.optionals stdenv.hostPlatform.isLinux [ linuxHeaders ];
@@ -93,15 +93,13 @@ stdenv.mkDerivation rec {
src/traffic_via/test_traffic_via \
src/traffic_logstats/tests \
tools/check-unused-dependencies
substituteInPlace configure --replace '/usr/bin/file' '${file}/bin/file'
'' + lib.optionalString stdenv.hostPlatform.isLinux ''
substituteInPlace configure \
--replace '/usr/include/linux' '${linuxHeaders}/include/linux'
substituteInPlace configure.ac \
--replace-fail '/usr/include/linux' '${linuxHeaders}/include/linux'
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
# 'xcrun leaks' probably requires non-free XCode
substituteInPlace iocore/net/test_certlookup.cc \
--replace 'xcrun leaks' 'true'
--replace-fail 'xcrun leaks' 'true'
'';
configureFlags = [
@@ -123,7 +121,6 @@ stdenv.mkDerivation rec {
];
postInstall = ''
substituteInPlace rc/trafficserver.service --replace "syslog.target" ""
install -Dm644 rc/trafficserver.service $out/lib/systemd/system/trafficserver.service
wrapProgram $out/bin/tspush \
+3 -3
View File
@@ -25,13 +25,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "wipeout-rewrite";
version = "0-unstable-2024-07-07";
version = "0-unstable-2024-11-09";
src = fetchFromGitHub {
owner = "phoboslab";
repo = "wipeout-rewrite";
rev = "a372b51f59217da4a5208352123a4acca800783c";
hash = "sha256-RJrWOTb5cZ2rSgO/J8qW5ifMJryBaK6MDtYwQZfghS0=";
rev = "05e9c2d3a1272e631e256a76b89aca235b92e4a9";
hash = "sha256-rzwh4JZNea5Wu/BEWGWpfxyPjY0GLrUPynPTbUC9Mak=";
};
enableParallelBuilding = true;
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c7956b4c..633fb6f72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,6 +205,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON)
if(EXISTS "$ENV{HOME}/.steam/root")
set(XRT_HAVE_STEAM YES)
endif()
+set(XRT_HAVE_STEAM YES)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(XRT_HAVE_INTERNAL_HID ON)
+148 -55
View File
@@ -1,4 +1,5 @@
{
# Commented packages are not currently in nixpkgs. They don't appear to cause a problem when not present.
config,
lib,
stdenv,
@@ -7,49 +8,81 @@
applyPatches,
autoAddDriverRunpath,
avahi,
bluez,
boost,
cjson,
cli11,
cmake,
cudaPackages ? { },
cudaSupport ? config.cudaSupport,
dbus,
# depthai
doxygen,
eigen,
elfutils,
ffmpeg,
freetype,
git,
glib,
glm,
glslang,
gst_all_1,
harfbuzz,
libdrm,
hidapi,
# leapsdk
# leapv2
libGL,
libva,
libpulseaudio,
libX11,
libXrandr,
libbsd,
libdrm,
libdwg,
libjpeg,
libmd,
libnotify,
libpulseaudio,
librealsense,
librsvg,
libsurvive,
libunwind,
libusb1,
libuvc,
libva,
makeDesktopItem,
nix-update-script,
nlohmann_json,
onnxruntime,
opencv4,
openhmd,
openvr,
openxr-loader,
orc,
# percetto
pipewire,
pkg-config,
python3,
qt6,
SDL2,
shaderc,
spdlog,
systemd,
udev,
vulkan-headers,
vulkan-loader,
vulkan-tools,
wayland,
wayland-protocols,
wayland-scanner,
x264,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "wivrn";
version = "0.19";
version = "0.22";
src = fetchFromGitHub {
owner = "wivrn";
repo = "wivrn";
rev = "v${finalAttrs.version}";
hash = "sha256-DYV+JUWjjhLZLq+4Hv7jxOyxDqQut/mU1X0ZFMoNkDI=";
hash = "sha256-i/CG+zD64cwnu0z1BRkRn7Wm67KszE+wZ5geeAvrvMY=";
};
monado = applyPatches {
@@ -57,18 +90,17 @@ stdenv.mkDerivation (finalAttrs: {
domain = "gitlab.freedesktop.org";
owner = "monado";
repo = "monado";
rev = "bcbe19ddd795f182df42051e5495e9727db36c1c";
hash = "sha256-sh5slHROcuC3Dgenu1+hm8U5lUOW48JUbiluYvc3NiQ=";
rev = "aa2b0f9f1d638becd6bb9ca3c357ac2561a36b07";
hash = "sha256-yfHtkMvX/gyVG0UgpSB6KjSDdCym6Reb9LRb3OortaI=";
};
patches = [
"${finalAttrs.src}/patches/monado/0001-c-multi-disable-dropping-of-old-frames.patch"
"${finalAttrs.src}/patches/monado/0002-ipc-server-Always-listen-to-stdin.patch"
"${finalAttrs.src}/patches/monado/0003-c-multi-Don-t-log-frame-time-diff.patch"
"${finalAttrs.src}/patches/monado/0005-distortion-images.patch"
"${finalAttrs.src}/patches/monado/0008-Use-mipmaps-for-distortion-shader.patch"
"${finalAttrs.src}/patches/monado/0009-convert-to-YCbCr-in-monado.patch"
./force-enable-steamvr_lh.patch
];
postPatch = ''
${finalAttrs.src}/patches/apply.sh ${finalAttrs.src}/patches/monado/*
'';
};
strictDeps = true;
@@ -85,65 +117,126 @@ stdenv.mkDerivation (finalAttrs: {
fi
'';
nativeBuildInputs = [
cmake
git
glslang
pkg-config
python3
] ++ lib.optionals cudaSupport [ autoAddDriverRunpath ];
nativeBuildInputs =
[
cmake
doxygen
git
glib
glslang
librsvg
pkg-config
python3
qt6.wrapQtAppsHook
]
++ lib.optionals cudaSupport [
autoAddDriverRunpath
];
buildInputs = [
avahi
boost
cli11
eigen
ffmpeg
freetype
glm
harfbuzz
libdrm
libGL
libva
libX11
libXrandr
libpulseaudio
nlohmann_json
onnxruntime
openxr-loader
pipewire
shaderc
spdlog
systemd
udev
vulkan-headers
vulkan-loader
vulkan-tools
x264
] ++ lib.optionals cudaSupport [ cudaPackages.cudatoolkit ];
buildInputs =
[
avahi
boost
bluez
cjson
cli11
dbus
eigen
elfutils
ffmpeg
freetype
glib
glm
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
harfbuzz
hidapi
libbsd
libdrm
libdwg
libGL
libjpeg
libmd
libnotify
librealsense
libsurvive
libunwind
libusb1
libuvc
libva
libX11
libXrandr
libpulseaudio
nlohmann_json
opencv4
openhmd
openvr
openxr-loader
onnxruntime
orc
pipewire
qt6.qtbase
qt6.qttools
SDL2
shaderc
spdlog
systemd
udev
vulkan-headers
vulkan-loader
wayland
wayland-protocols
wayland-scanner
x264
]
++ lib.optionals cudaSupport [
cudaPackages.cudatoolkit
];
cmakeFlags = [
(lib.cmakeBool "WIVRN_USE_VAAPI" true)
(lib.cmakeBool "WIVRN_USE_X264" true)
(lib.cmakeBool "WIVRN_USE_NVENC" cudaSupport)
(lib.cmakeBool "WIVRN_USE_SYSTEMD" true)
(lib.cmakeBool "WIVRN_USE_VAAPI" true)
(lib.cmakeBool "WIVRN_USE_VULKAN" true)
(lib.cmakeBool "WIVRN_USE_X264" true)
(lib.cmakeBool "WIVRN_USE_PIPEWIRE" true)
(lib.cmakeBool "WIVRN_USE_PULSEAUDIO" true)
(lib.cmakeBool "WIVRN_FEATURE_STEAMVR_LIGHTHOUSE" true)
(lib.cmakeBool "WIVRN_BUILD_CLIENT" false)
(lib.cmakeBool "WIVRN_OPENXR_INSTALL_ABSOLUTE_RUNTIME_PATH" true)
(lib.cmakeBool "WIVRN_BUILD_DASHBOARD" true)
(lib.cmakeBool "WIVRN_CHECK_CAPSYSNICE" false)
(lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
(lib.cmakeFeature "WIVRN_OPENXR_MANIFEST_TYPE" "absolute")
(lib.cmakeFeature "GIT_DESC" "${finalAttrs.version}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MONADO" "${finalAttrs.monado}")
(lib.cmakeFeature "CUDA_TOOLKIT_ROOT_DIR" "${cudaPackages.cudatoolkit}")
];
desktopItems = [
(makeDesktopItem {
name = "WiVRn Server";
desktopName = "WiVRn Server";
genericName = "WiVRn Server";
comment = "Play your PC VR games on a standalone headset";
icon = "io.github.wivrn.wivrn";
exec = "wivrn-dashboard";
type = "Application";
categories = [
"Network"
"Game"
];
})
];
passthru.updateScript = nix-update-script { };
meta = with lib; {
description = "An OpenXR streaming application to a standalone headset";
homepage = "https://github.com/Meumeu/WiVRn/";
changelog = "https://github.com/Meumeu/WiVRn/releases/";
homepage = "https://github.com/WiVRn/WiVRn/";
changelog = "https://github.com/WiVRn/WiVRn/releases/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ passivelemon ];
platforms = platforms.linux;
mainProgram = "wivrn-server";
sourceProvenance = with sourceTypes; [ fromSource ];
};
})
+10 -1
View File
@@ -1,4 +1,4 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:
buildGoModule rec {
pname = "wormhole-william";
@@ -22,6 +22,15 @@ buildGoModule rec {
"SkipWormholeDirectoryTransportSendRecvDirect"
'';
nativeBuildInputs = [ installShellFiles ];
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd wormhole-william \
--bash <($out/bin/wormhole-william shell-completion bash) \
--fish <($out/bin/wormhole-william shell-completion fish) \
--zsh <($out/bin/wormhole-william shell-completion zsh)
'';
meta = with lib; {
homepage = "https://github.com/psanford/wormhole-william";
description = "End-to-end encrypted file transfers";
+3 -3
View File
@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "yara-x";
version = "0.11.0";
version = "0.11.1";
src = fetchFromGitHub {
owner = "VirusTotal";
repo = "yara-x";
rev = "refs/tags/v${version}";
hash = "sha256-14YHaaZpqB8448MGdKsYqxZ4N/+p92khQWRov3cO/eU=";
hash = "sha256-eRA1Vov+K7nLOkvcC8KS0S2eNSSDn++UcQqDFVJOhME=";
};
cargoHash = "sha256-gcRLnPlNVzA5nxdviWz8dDzblFujytYPrt7eyFgm5Lc=";
cargoHash = "sha256-iWgfI5jiEbBHkew82Ej7Ku17JDVI4O0iiOxs9lxEJS4=";
nativeBuildInputs = [ cmake installShellFiles ];
@@ -121,5 +121,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = teams.deepin.members;
broken = true; # Crash when playing any video
};
}
@@ -120,16 +120,34 @@
asds
'vector))))))
;; Skip known broken systems and their dependents
(dolist (system *broken-systems*)
(sql-query
"with recursive broken(name) as (
select ?
union
select s.name from quicklisp_system s, broken b
where b.name in (select value from json_each(deps))
) delete from quicklisp_system where name in (select name from broken)"
system))
;; Weed out circular dependencies from the package graph.
(sqlite:with-transaction db
(sql-query "create temp table will_delete (root,name)")
(loop for (system) in (sql-query "select name from quicklisp_system") do
(when (sql-query
"with recursive dep(root, name) as (
select s.name, d.value
from quicklisp_system s
cross join json_each(s.deps) d
where s.name = ?
union
select dep.root, d.value
from quicklisp_system s, dep
cross join json_each(s.deps) d
where s.name = dep.name
) select 1 from dep where name = root"
system)
(sql-query
"with recursive broken(name) as (
select ?
union
select s.name from quicklisp_system s, broken b
where b.name in (select value from json_each(s.deps))
) insert into will_delete select ?, name from broken"
system system)))
(loop for (root name) in (sql-query "select root, name from will_delete") do
(warn "Circular dependency in '~a': Omitting '~a'" root name)
(sql-query "delete from quicklisp_system where name = ?" name)))
(sqlite:with-transaction db
;; Should these be temp tables, that then get queried by
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "llama-parse";
version = "0.5.14";
version = "0.5.17";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_parse";
inherit version;
hash = "sha256-uQUQ9Yd01u5ztidf5PGqD/OjBgJt8plZYG5WBzOEJIw=";
hash = "sha256-K6JwDKOxXoTvBy/ty7/q4vwTzntj/uIPzVJJ5vzb04E=";
};
build-system = [ poetry-core ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "meilisearch";
version = "0.32.0";
version = "0.33.0";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "meilisearch";
repo = "meilisearch-python";
rev = "refs/tags/v${version}";
hash = "sha256-hgIgsimO2BIYyA7Wsosp1aY0JbA7u/ccuBLQnA8IMlo=";
hash = "sha256-Eo1KBpSek1FnSp21vpsJEwISvUYEqOaodwrbarVcu7c=";
};
build-system = [ setuptools ];
@@ -22,7 +22,7 @@
buildPythonPackage rec {
pname = "minio";
version = "7.2.10";
version = "7.2.12";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
owner = "minio";
repo = "minio-py";
rev = "refs/tags/${version}";
hash = "sha256-vPIMYaCt2f1OXPUtaw0OXMEADHNCv4DxpueZSyJiYqA=";
hash = "sha256-8CthbR62TZ7MFC3OCwtbHtGwmlQeFLgBtkyRX1P5SYU=";
};
postPatch = ''
@@ -21,7 +21,7 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "YannickJadoul";
repo = "Parselmouth";
rev = "v${version}";
tag = "v${version}";
fetchSubmodules = true;
hash = "sha256-/Hde/DpSbmHs8WF3PAk4esYuMgOX6SxMaYJrrHYr/ZU=";
};
@@ -47,6 +47,11 @@ buildPythonPackage rec {
pytestCheckHook
];
pytestFlagsArray = [
"--run-praat-tests"
"-v"
];
pythonImportsCheck = [ "parselmouth" ];
meta = {
@@ -19,7 +19,7 @@
buildPythonPackage rec {
pname = "psd-tools";
version = "1.10.2";
version = "1.10.4";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -27,8 +27,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "psd-tools";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-vBDFKWNksF8/h5Jp1VOxVWgAzPdOLhv0iDrNDVXzm54=";
tag = "v${version}";
hash = "sha256-62Q8eMPPW12HnoBDwAM3+48BEarEqLzEnHcG3TR5XDc=";
};
build-system = [
@@ -1,7 +1,7 @@
{
lib,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
setuptools,
formulaic,
click,
@@ -19,14 +19,21 @@
buildPythonPackage rec {
pname = "pybids";
version = "0.17.2";
version = "0.18.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-4MpFXGh2uOHCjMa213CF6QzKCyEQNiN1moyNolEcySQ=";
src = fetchFromGitHub {
owner = "bids-standard";
repo = "pybids";
rev = version;
hash = "sha256-nSBc4vhkCdRo7CNBwvJreCiwoxJK6ztyI5gvcpzYZ/Y=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail 'dynamic = ["version"]' 'version = "${version}"'
'';
pythonRelaxDeps = [
"formulaic"
"sqlalchemy"
@@ -54,16 +61,15 @@ buildPythonPackage rec {
nativeCheckInputs = [ pytestCheckHook ];
disabledTestPaths = [
# Could not connect to the endpoint URL
"src/bids/layout/tests/test_remote_bids.py"
];
disabledTests = [
# Test looks for missing data
"test_config_filename"
# Regression associated with formulaic >= 0.6.0
# (see https://github.com/bids-standard/pybids/issues/1000)
"test_split"
# AssertionError, TypeError
"test_run_variable_collection_bad_length_to_df_all_dense_var"
"test_extension_initial_dot"
"test_to_df"
];
meta = {
@@ -0,0 +1,34 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
setuptools,
}:
buildPythonPackage rec {
pname = "pycolorecho";
version = "0.1.1";
pyproject = true;
src = fetchFromGitHub {
owner = "coldsofttech";
repo = "pycolorecho";
rev = version;
hash = "sha256-h/7Wi0x8iLMZpPYekK6W9LTM+2nYJTaKClNtRTzbmdg=";
};
build-system = [ setuptools ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pycolorecho" ];
meta = {
description = "Simple Python package for colorized terminal output";
homepage = "https://github.com/coldsofttech/pycolorecho";
changelog = "https://github.com/coldsofttech/pycolorecho/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ShamrockLee ];
};
}
@@ -0,0 +1,37 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
setuptools,
pycolorecho,
}:
buildPythonPackage rec {
pname = "pyloggermanager";
version = "0.1.4";
pyproject = true;
src = fetchFromGitHub {
owner = "coldsofttech";
repo = "pyloggermanager";
rev = version;
hash = "sha256-1hfcmMLH2d71EV71ExKqjZ7TMcqVd1AQrEwJhmEWOVU=";
};
build-system = [ setuptools ];
dependencies = [ pycolorecho ];
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pyloggermanager" ];
meta = {
description = "Logging framework for Python applications";
homepage = "https://github.com/coldsofttech/pyloggermanager";
changelog = "https://github.com/coldsofttech/pyloggermanager/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ShamrockLee ];
};
}
@@ -0,0 +1,88 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
pytestCheckHook,
setuptools,
pyloggermanager,
requests,
pym3u8downloader, # For package tests
}:
buildPythonPackage rec {
pname = "pym3u8downloader";
version = "0.1.5";
pyproject = true;
src = fetchFromGitHub {
owner = "coldsofttech";
repo = "pym3u8downloader";
rev = version;
hash = "sha256-Kcvtl4jP2pSiETTKUmuiBsysxaFfd4K/E2/nXY8Vlw8=";
};
build-system = [ setuptools ];
dependencies = [
pyloggermanager
requests
];
pythonImportsCheck = [ "pym3u8downloader" ];
doCheck = false;
passthru = {
tests = {
pytest = pym3u8downloader.overridePythonAttrs (previousPythonAttrs: {
TEST_SERVER_PORT = "8000";
postPatch =
previousPythonAttrs.postPatch or ""
+ ''
# Patch test data location
substituteInPlace tests/commonclass.py \
--replace-fail \
"f'https://raw.githubusercontent.com/coldsofttech/pym3u8downloader/{branch_name}/tests/files'" \
"'http://localhost:$TEST_SERVER_PORT/tests/files'"
# Patch the `is_internet_connected()` method
substituteInPlace pym3u8downloader/__main__.py \
--replace-fail "'http://www.github.com'" "'http://localhost:$TEST_SERVER_PORT'"
'';
doCheck = true;
nativeCheckInputs = [ pytestCheckHook ];
preCheck =
previousPythonAttrs.preCheck or ""
+ ''
python3 -m http.server "$TEST_SERVER_PORT" &
TEST_SERVER_PID="$!"
'';
postCheck =
previousPythonAttrs.postCheck or ""
+ ''
kill -s TERM "$TEST_SERVER_PID"
'';
});
};
};
meta = {
description = "Python class to download and concatenate video files from M3U8 playlists";
longDescription = ''
M3U8 Downloader is a Python class designed to
download and concatenate video files from M3U8 playlists.
This class provides functionality to handle M3U8 playlist files,
download video segments,
concatenate them into a single video file,
and manage various error conditions.
'';
homepage = "https://github.com/coldsofttech/pym3u8downloader";
changelog = "https://github.com/coldsofttech/pym3u8downloader/blob/${src.rev}/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ ShamrockLee ];
};
}
@@ -13,6 +13,7 @@
attrs,
binaryornot,
boolean-py,
click,
debian,
jinja2,
license-expression,
@@ -25,14 +26,14 @@
buildPythonPackage rec {
pname = "reuse";
version = "4.0.3";
version = "5.0.2";
pyproject = true;
src = fetchFromGitHub {
owner = "fsfe";
repo = "reuse-tool";
rev = "refs/tags/v${version}";
hash = "sha256-oKtQBT8tuAk4S/Sygp4qxLk4ADWDTG0MbVaL5O2qsuA=";
hash = "sha256-MzI3AY5WLNyCLJZM7Q5wUH3ttx+FHPlSgAfngzOgzec=";
};
outputs = [
@@ -54,6 +55,7 @@ buildPythonPackage rec {
attrs
binaryornot
boolean-py
click
debian
jinja2
license-expression
@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "roadrecon";
version = "1.5.0";
version = "1.6.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-hDIMDNmvGQAcpPMet31MbuJtOU2JCrbLlpAu19skNVg=";
hash = "sha256-0Rv88lbqvTJD183nLhvi2Ue1ZD1eoRW1sytJ+t85bcg=";
};
pythonRelaxDeps = [ "flask" ];
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "twentemilieu";
version = "2.1.0";
version = "2.2.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "frenck";
repo = "python-twentemilieu";
rev = "refs/tags/v${version}";
hash = "sha256-R2zCDDSS6vpdD0TGSuYs6Xl8Ij2lU2UWqkOE4aFyxto=";
hash = "sha256-8tYa/fnc8km0Tl0N/OMP8GUUlIjzB8XP1Ivy9jDmY3s=";
};
postPatch = ''
+13 -5
View File
@@ -2,18 +2,22 @@
lib,
stdenv,
fetchFromGitHub,
gitUpdater,
kernel,
}:
stdenv.mkDerivation rec {
version = "2.13.0";
let
rev-prefix = "ena_linux_";
version = "2.13.1";
in
stdenv.mkDerivation {
inherit version;
name = "ena-${version}-${kernel.version}";
src = fetchFromGitHub {
owner = "amzn";
repo = "amzn-drivers";
rev = "ena_linux_${version}";
hash = "sha256-uYWKu9M/5PcHV4WdMSi0f29S7KnQft67dgjdN0AS1d8=";
rev = "${rev-prefix}${version}";
hash = "sha256-oFeTaulcnp9U7Zxhf08yNxpEtyxjI5QJmfITHVHDES0=";
};
hardeningDisable = [ "pic" ];
@@ -40,6 +44,10 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
passthru.updateScript = gitUpdater {
inherit rev-prefix;
};
meta = with lib; {
description = "Amazon Elastic Network Adapter (ENA) driver for Linux";
homepage = "https://github.com/amzn/amzn-drivers";
+2 -2
View File
@@ -43,13 +43,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "vulkan-cts";
version = "1.3.9.0";
version = "1.3.10.0";
src = fetchFromGitHub {
owner = "KhronosGroup";
repo = "VK-GL-CTS";
rev = "vulkan-cts-${finalAttrs.version}";
hash = "sha256-JCepNBVHaN4KXRcLOZ2z7toBMri90tV7kjNWHRXRESE=";
hash = "sha256-owa4Z/gu9+plPxeSfduS3gUk9WTOHSDoXLTBju6tTGc=";
};
prePatch = ''
+12 -12
View File
@@ -4,15 +4,15 @@ rec {
amber = fetchFromGitHub {
owner = "google";
repo = "amber";
rev = "0f003c2785489f59cd01bb2440fcf303149100f2";
hash = "sha256-Q3LP8hQrKeM8J0qmJyTeC8Hq949Fe0wOjnkiia+UDag=";
rev = "67fea651b886460d7b72295e680528c059bbbe40";
hash = "sha256-oDN7UdyfNMG4r36nnRJmYdbd0wyd1titGQQNa9e/3tU=";
};
glslang = fetchFromGitHub {
owner = "KhronosGroup";
repo = "glslang";
rev = "b9b8fd917b195f680a1ce3f3f663c03e1c82579d";
hash = "sha256-85kHk1KqhhOqLodRVVpQMhE44IQnzLoFXf/YPNY8aUI=";
rev = "c5b76b78c9dec95251e9c1840a671e19bf61abe3";
hash = "sha256-N7vGPqQieWnr+mbrmdbvzz7n9q3bbRKLxkYt6OiaJvU=";
};
jsoncpp = fetchFromGitHub {
@@ -32,29 +32,29 @@ rec {
spirv-headers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Headers";
rev = "4f7b471f1a66b6d06462cd4ba57628cc0cd087d7";
hash = "sha256-CAmDDqeMVKNdV/91VQYAKyCc+e+H99PRYZzt5WjswBI=";
rev = "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801";
hash = "sha256-o1yRTvP7a+XVwendTKBJKNnelVGWLD0gH258GGeUDhQ=";
};
spirv-tools = fetchFromGitHub {
owner = "KhronosGroup";
repo = "SPIRV-Tools";
rev = "dd4b663e13c07fea4fbb3f70c1c91c86731099f7";
hash = "sha256-at3krE0torhjg7G+NkX0/ewc26Sg/1t2xW7wghAAuZo=";
rev = "44936c4a9d42f1c67e34babb5792adf5bce7f76b";
hash = "sha256-kSiP94hMlblFod2mQhlAQDAENGOvBh7v8bCxxaiYWq4=";
};
vulkan-docs = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-Docs";
rev = "dedb71a7edc6d5af3f9bfd5e2ef53814de999ef7";
hash = "sha256-A61qx7sdcRipX4mHpGJVhd9Qlcv1xcjeGGnfyblMxUg=";
rev = "486e4b289053a7d64784e7ce791711843c60c235";
hash = "sha256-LGAHUeWF9X6Li1HcdD14pgnBUquWxA+bQpAL09JmwLQ=";
};
vulkan-validationlayers = fetchFromGitHub {
owner = "KhronosGroup";
repo = "Vulkan-ValidationLayers";
rev = "f589bc456545fbab97caf49380b102b8aafe1f40";
hash = "sha256-ZNJGGrUwTw3I0MQl9nKqGhb2bdPZZl+AR3YH3T+cn+c=";
rev = "9a46ae006fa5c92e2d2af7944187f7794210844b";
hash = "sha256-qVQy3kKkZRWHjtj2YxJTZqKg1kwnmLa3bgVathisfOc=";
};
+3 -3
View File
@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.84.2";
version = "3.85.0";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
rev = "refs/tags/v${version}";
hash = "sha256-NpWXjZstFpl0oZhzMnCFt7IFyWfpJybGaeyOSxjVPWY=";
hash = "sha256-WvGD4iYYryB9A8a3+6/WQBf1tHLKjyCgYDbpE1bHz7g=";
};
vendorHash = "sha256-s4oks1OP9qN/2JMN6TI36mBWvGXE2HnDHFAMCRFVB1w=";
vendorHash = "sha256-QFcA/m41l0QCmKSGN5SB7KPdRja+7bGfcqqqHg//OXU=";
proxyVendor = true;
+1 -7
View File
@@ -3510,7 +3510,7 @@ with pkgs;
};
gnome-decoder = callPackage ../applications/graphics/gnome-decoder {
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-rs;
gst-plugins-bad = gst_all_1.gst-plugins-bad.override { enableZbar = true; };
};
@@ -3705,8 +3705,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Cocoa;
};
haguichi = callPackage ../tools/networking/haguichi { };
hashcat = callPackage ../tools/security/hashcat {
inherit (darwin.apple_sdk.frameworks) Foundation IOKit Metal OpenCL;
};
@@ -13220,10 +13218,6 @@ with pkgs;
stdenv;
};
milkytracker = callPackage ../applications/audio/milkytracker {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation;
};
ptcollab = callPackage ../by-name/pt/ptcollab/package.nix {
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
};
+6
View File
@@ -10431,6 +10431,8 @@ self: super: with self; {
pycketcasts = callPackage ../development/python-modules/pycketcasts { };
pycolorecho = callPackage ../development/python-modules/pycolorecho { };
pycomm3 = callPackage ../development/python-modules/pycomm3 { };
pycompliance = callPackage ../development/python-modules/pycompliance { };
@@ -11896,6 +11898,8 @@ self: super: with self; {
py-libzfs = callPackage ../development/python-modules/py-libzfs { };
pyloggermanager = callPackage ../development/python-modules/pyloggermanager { };
py-lru-cache = callPackage ../development/python-modules/py-lru-cache { };
pylnk3 = callPackage ../development/python-modules/pylnk3 { };
@@ -11928,6 +11932,8 @@ self: super: with self; {
pylzma = callPackage ../development/python-modules/pylzma { };
pym3u8downloader = callPackage ../development/python-modules/pym3u8downloader { };
pymacaroons = callPackage ../development/python-modules/pymacaroons { };
pymailgunner = callPackage ../development/python-modules/pymailgunner { };