gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2024-07-20 12:01:17 +00:00
committed by GitHub
parent e705f497b6 e7279da473
commit 68c9084975
116 changed files with 796 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/languages-frameworks/coq.section.md
+1 -1
View File
@@ -84,7 +84,7 @@ mkCoqDerivation {
[ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ];
meta = {
description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
description = "Coq/SSReflect Library for Monoidal Rings and Multinomials";
license = lib.licenses.cecill-c;
};
}
doc/languages-frameworks/javascript.section.md
+1 -1
View File
@@ -206,7 +206,7 @@ buildNpmPackage rec {
NODE_OPTIONS = "--openssl-legacy-provider";
meta = {
description = "A modern web UI for various torrent clients with a Node.js backend and React frontend";
description = "Modern web UI for various torrent clients with a Node.js backend and React frontend";
homepage = "https://flood.js.org";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ winter ];
doc/languages-frameworks/ocaml.section.md
+1 -1
View File
@@ -113,7 +113,7 @@ buildDunePackage rec {
meta = {
homepage = "https://github.com/flowtype/ocaml-wtf8";
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.eqyiel ];
};
doc/languages-frameworks/perl.section.md
+1 -1
View File
@@ -158,7 +158,7 @@ $ nix-generate-from-cpan XML::Simple
};
propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ];
meta = {
description = "An API for simple XML files";
description = "API for simple XML files";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
doc/languages-frameworks/python.section.md
+2 -2
View File
@@ -993,7 +993,7 @@ buildPythonPackage rec {
meta = {
changelog = "https://github.com/blaze/datashape/releases/tag/${version}";
homepage = "https://github.com/ContinuumIO/datashape";
description = "A data description language";
description = "Data description language";
license = lib.licenses.bsd2;
};
}
@@ -1118,7 +1118,7 @@ buildPythonPackage rec {
meta = {
changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}";
description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
homepage = "http://hgomersall.github.com/pyFFTW";
license = with lib.licenses; [ bsd2 bsd3 ];
};
doc/languages-frameworks/rust.section.md
+2 -2
View File
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts=";
meta = {
description = "A fast line-oriented regex search tool, similar to ag and ack";
description = "Fast line-oriented regex search tool, similar to ag and ack";
homepage = "https://github.com/BurntSushi/ripgrep";
license = lib.licenses.unlicense;
maintainers = [];
@@ -1000,7 +1000,7 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
meta = {
description = "A fast line-oriented regex search tool, similar to ag and ack";
description = "Fast line-oriented regex search tool, similar to ag and ack";
homepage = "https://github.com/BurntSushi/ripgrep";
license = with lib.licenses; [ mit unlicense ];
maintainers = with lib.maintainers; [];
doc/languages-frameworks/texlive.section.md
+1 -1
View File
@@ -183,7 +183,7 @@ let
'';
meta = {
description = "A LaTeX2e class for overhead transparencies";
description = "LaTeX2e class for overhead transparencies";
license = lib.licenses.unfreeRedistributable;
maintainers = with lib.maintainers; [ veprbl ];
platforms = lib.platforms.all;
doc/stdenv/meta.chapter.md
+1 -1
View File
@@ -5,7 +5,7 @@ Nix packages can declare *meta-attributes* that contain information about a pack
```nix
{
meta = {
description = "A program that produces a familiar, friendly greeting";
description = "Program that produces a familiar, friendly greeting";
longDescription = ''
GNU Hello is a program that prints "Hello, world!" when you run it.
It is fully customizable.
nixos/doc/manual/release-notes/rl-2411.section.md
+2
View File
@@ -18,6 +18,8 @@
## New Services {#sec-release-24.11-new-services}
- [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service.
- [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI
for LLMs. Available as [services.open-webui](#opt-services.open-webui.enable)
service.
nixos/modules/module-list.nix
+1
View File
@@ -732,6 +732,7 @@
./services/misc/etesync-dav.nix
./services/misc/evdevremapkeys.nix
./services/misc/felix.nix
./services/misc/flaresolverr.nix
./services/misc/forgejo.nix
./services/misc/freeswitch.nix
./services/misc/fstrim.nix
nixos/modules/services/misc/flaresolverr.nix
+58
View File
@@ -0,0 +1,58 @@
{
config,
pkgs,
lib,
...
}:
let
cfg = config.services.flaresolverr;
in
{
options = {
services.flaresolverr = {
enable = lib.mkEnableOption "FlareSolverr, a proxy server to bypass Cloudflare protection";
package = lib.mkPackageOption pkgs "flaresolverr" { };
openFirewall = lib.mkOption {
type = lib.types.bool;
default = false;
description = "Open the port in the firewall for FlareSolverr.";
};
port = lib.mkOption {
type = lib.types.port;
default = 8191;
description = "The port on which FlareSolverr will listen for incoming HTTP traffic.";
};
};
};
config = lib.mkIf cfg.enable {
systemd.services.flaresolverr = {
description = "FlareSolverr";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
environment = {
HOME = "/run/flaresolverr";
PORT = toString cfg.port;
};
serviceConfig = {
SyslogIdentifier = "flaresolverr";
Restart = "always";
RestartSec = 5;
Type = "simple";
DynamicUser = true;
RuntimeDirectory = "flaresolverr";
WorkingDirectory = "/run/flaresolverr";
ExecStart = lib.getExe cfg.package;
TimeoutStopSec = 30;
};
};
networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
};
}
nixos/tests/all-tests.nix
+1
View File
@@ -332,6 +332,7 @@ in {
firewall-nftables = handleTest ./firewall.nix { nftables = true; };
fish = handleTest ./fish.nix {};
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
flaresolverr = handleTest ./flaresolverr.nix {};
flood = handleTest ./flood.nix {};
floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; };
fluentd = handleTest ./fluentd.nix {};
nixos/tests/flaresolverr.nix
+22
View File
@@ -0,0 +1,22 @@
import ./make-test-python.nix (
{ lib, ... }:
{
name = "flaresolverr";
meta.maintainers = with lib.maintainers; [ paveloom ];
nodes.machine =
{ pkgs, ... }:
{
services.flaresolverr = {
enable = true;
port = 8888;
};
};
testScript = ''
machine.wait_for_unit("flaresolverr.service")
machine.wait_for_open_port(8888)
machine.succeed("curl --fail http://localhost:8888/")
'';
}
)
pkgs/applications/audio/non/default.nix
+7
View File
@@ -17,6 +17,13 @@ stdenv.mkDerivation {
ladspaH liblo libsigcxx lrdf
];
# NOTE: non provides its own waf script that is incompatible with new
# python versions. If the script is not present, wafHook will install
# a compatible version from nixpkgs.
prePatch = ''
rm waf
'';
env.CXXFLAGS = "-std=c++14";
meta = {
pkgs/applications/audio/radiotray-ng/default.nix
+1 -1
View File
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
description = "Internet radio player for linux";
homepage = "https://github.com/ebruck/radiotray-ng";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/editors/android-studio/default.nix
+6 -6
View File
@@ -9,16 +9,16 @@ let
inherit tiling_wm;
};
stableVersion = {
version = "2024.1.1.11"; # "Android Studio Koala | 2024.1.1"
sha256Hash = "sha256-2PqOz+QVtEUTNQkBUB4qD0KcoDPPGAUFSxyBbEpwRWU=";
version = "2024.1.1.12"; # "Android Studio Koala | 2024.1.1 Patch 1"
sha256Hash = "sha256-Qvi/Mc4NEk3dERlfZiowBk2Pmqsgbl5mg56HamvG7aI=";
};
betaVersion = {
version = "2024.1.1.10"; # "Android Studio Koala | 2024.1.1 RC 2"
sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8=";
version = "2024.1.2.9"; # "Android Studio Koala Feature Drop | 2024.1.2 Beta 1"
sha256Hash = "sha256-eTnpU9KrquW4nMRqde9PUmVQ05kf6kFy1yr+Ima9M50=";
};
latestVersion = {
version = "2024.1.2.8"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 8"
sha256Hash = "sha256-2wqZV0UqZHprfUFvhWh0IdA9TQcwlZtWECZVwZ47ICc=";
version = "2024.1.3.1"; # "Android Studio Ladybug | 2024.1.3 Canary 1"
sha256Hash = "sha256-BSrcPdkK4dU5/bV29NGKcCR10XYMJrPvC91fcJs5Vq8=";
};
in {
# Attributes are named by their corresponding release channels
pkgs/applications/misc/heimer/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ mkDerivation rec {
homepage = "https://github.com/juzzlin/Heimer";
changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/misc/minder/default.nix
+1 -1
View File
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/phase1geo/Minder";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
mainProgram = "com.github.phase1geo.minder";
};
}
pkgs/applications/misc/notable/default.nix
+1 -1
View File
@@ -40,6 +40,6 @@ appimageTools.wrapType2 rec {
homepage = "https://github.com/notable/notable";
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/applications/misc/vit/default.nix
+1 -1
View File
@@ -34,7 +34,7 @@ buildPythonApplication rec {
homepage = "https://github.com/scottkosty/vit";
description = "Visual Interactive Taskwarrior";
mainProgram = "vit";
maintainers = with maintainers; [ dtzWill arcnmx ];
maintainers = with maintainers; [ arcnmx ];
platforms = platforms.all;
license = licenses.mit;
};
pkgs/applications/networking/instant-messengers/fractal/default.nix
+1 -1
View File
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
homepage = "https://gitlab.gnome.org/GNOME/fractal";
changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}";
license = licenses.gpl3Plus;
maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler dtzWill ]);
maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]);
platforms = platforms.linux;
mainProgram = "fractal";
};
pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
+1 -1
View File
@@ -22,6 +22,6 @@ stdenv.mkDerivation {
description = "Native Google Chat support for pidgin";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/applications/networking/instant-messengers/slack-term/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ buildGoModule rec {
description = "Slack client for your terminal";
homepage = "https://github.com/erroneousboat/slack-term";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
mainProgram = "slack-term";
};
}
pkgs/applications/networking/pjsip/default.nix
+92 -73
View File
@@ -1,17 +1,18 @@
{ lib
, testers
, stdenv
, fetchFromGitHub
, openssl
, libsamplerate
, swig
, alsa-lib
, AppKit
, CoreFoundation
, Security
, python3
, pythonSupport ? true
, runCommand
{
lib,
testers,
stdenv,
fetchFromGitHub,
openssl,
libsamplerate,
swig,
alsa-lib,
AppKit,
CoreFoundation,
Security,
python3,
pythonSupport ? true,
runCommand,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pjsip";
@@ -24,22 +25,41 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY=";
};
patches = [
./fix-aarch64.patch
patches = [ ./fix-aarch64.patch ];
postPatch = ''
substituteInPlace \
pjsip-apps/src/py_pjsua/setup.py \
pjsip-apps/src/swig/python/setup.py \
pjsip-apps/src/python/setup.py \
pjsip-apps/src/python/setup-vc.py \
--replace-fail "distutils.core" "setuptools"
'';
nativeBuildInputs = lib.optionals pythonSupport [
swig
python3
python3.pkgs.build
python3.pkgs.installer
python3.pkgs.setuptools
python3.pkgs.wheel
];
nativeBuildInputs =
lib.optionals pythonSupport [ swig python3 ];
buildInputs = [ openssl libsamplerate ]
buildInputs =
[
openssl
libsamplerate
]
++ lib.optional stdenv.isLinux alsa-lib
++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ];
++ lib.optionals stdenv.isDarwin [
AppKit
CoreFoundation
Security
];
env = lib.optionalAttrs stdenv.cc.isClang {
CXXFLAGS = "-std=c++11";
} // lib.optionalAttrs stdenv.isDarwin {
NIX_CFLAGS_LINK = "-headerpad_max_install_names";
};
env =
lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }
// lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; };
preConfigure = ''
export LD=$CC
@@ -51,52 +71,55 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = [ "--enable-shared" ];
outputs = [ "out" ]
++ lib.optional pythonSupport "py";
outputs = [ "out" ] ++ lib.optional pythonSupport "py";
postInstall = ''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
'' + lib.optionalString pythonSupport ''
(cd pjsip-apps/src/swig/python && \
python setup.py install --prefix=$py
)
'' + lib.optionalString stdenv.isDarwin ''
# On MacOS relative paths are used to refer to libraries. All libraries use
# a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to
# rewrite these to use absolute ones.
postInstall =
''
mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua
mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples
''
+ lib.optionalString pythonSupport ''
(cd pjsip-apps/src/swig/python && \
python -m build --no-isolation --outdir dist/ --wheel
python -m installer --prefix $py dist/*.whl
)
''
+ lib.optionalString stdenv.isDarwin ''
# On MacOS relative paths are used to refer to libraries. All libraries use
# a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to
# rewrite these to use absolute ones.
# First, find all libraries (and their symlinks) in our outputs to define
# the install_name_tool -change arguments we should pass.
readarray -t libraries < <(
for outputName in $(getAllOutputNames); do
find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \)
# First, find all libraries (and their symlinks) in our outputs to define
# the install_name_tool -change arguments we should pass.
readarray -t libraries < <(
for outputName in $(getAllOutputNames); do
find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \)
done
)
# Determine the install_name_tool -change arguments that are going to be
# applied to all libraries.
change_args=()
for lib in "''${libraries[@]}"; do
lib_name="$(basename $lib)"
change_args+=(-change ../lib/$lib_name $lib)
change_args+=(-change ../../lib/$lib_name $lib)
done
)
# Determine the install_name_tool -change arguments that are going to be
# applied to all libraries.
change_args=()
for lib in "''${libraries[@]}"; do
lib_name="$(basename $lib)"
change_args+=(-change ../lib/$lib_name $lib)
change_args+=(-change ../../lib/$lib_name $lib)
done
# Rewrite id and library refences for all non-symlinked libraries.
for lib in "''${libraries[@]}"; do
if [ -f "$lib" ]; then
install_name_tool -id $lib "''${change_args[@]}" $lib
fi
done
# Rewrite id and library refences for all non-symlinked libraries.
for lib in "''${libraries[@]}"; do
if [ -f "$lib" ]; then
install_name_tool -id $lib "''${change_args[@]}" $lib
fi
done
# Rewrite library references for all executables.
find "$out" -executable -type f | while read executable; do
install_name_tool "''${change_args[@]}" "$executable"
done
'';
# Rewrite library references for all executables.
find "$out" -executable -type f | while read executable; do
install_name_tool "''${change_args[@]}" "$executable"
done
'';
# We need the libgcc_s.so.1 loadable (for pthread_cancel to work)
dontPatchELF = true;
@@ -106,9 +129,7 @@ stdenv.mkDerivation (finalAttrs: {
command = "pjsua --version";
};
passthru.tests.pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
};
passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } ''
${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out
@@ -121,8 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ olynch ];
mainProgram = "pjsua";
platforms = platforms.linux ++ platforms.darwin;
pkgConfigModules = [
"libpjproject"
];
pkgConfigModules = [ "libpjproject" ];
};
})
pkgs/applications/office/ktimetracker/default.nix
+1 -1
View File
@@ -28,6 +28,6 @@ kio knotifications kwindowsystem kxmlgui ktextwidgets
mainProgram = "ktimetracker";
license = licenses.gpl2;
homepage = "https://userbase.kde.org/KTimeTracker";
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/applications/office/mendeley/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ in appimageTools.wrapType2 {
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ dtzWill atila ];
maintainers = with maintainers; [ atila ];
mainProgram = "mendeley-reference-manager";
};
pkgs/applications/office/planify/default.nix
+1 -1
View File
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
description = "Task manager with Todoist support designed for GNU/Linux";
homepage = "https://github.com/alainm23/planify";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members;
maintainers = with maintainers; [ ] ++ teams.pantheon.members;
platforms = platforms.linux;
mainProgram = "io.github.alainm23.planify";
};
pkgs/applications/science/math/nota/default.nix
+1 -1
View File
@@ -36,6 +36,6 @@ mkDerivation rec {
description = "Most beautiful command line calculator";
homepage = "https://kary.us/nota";
license = lib.licenses.mpl20;
maintainers = with lib.maintainers; [ dtzWill ];
maintainers = with lib.maintainers; [ ];
mainProgram = "nota";
}
pkgs/applications/system/qjournalctl/default.nix
+1 -1
View File
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/pentix/qjournalctl";
license = licenses.gpl3Only;
platforms = platforms.all;
maintainers = with maintainers; [ dtzWill srgom romildo ];
maintainers = with maintainers; [ srgom romildo ];
};
}
pkgs/applications/version-management/lab/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ buildGoModule rec {
description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab";
homepage = "https://zaquestion.github.io/lab";
license = licenses.cc0;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
mainProgram = "lab";
};
}
pkgs/applications/video/catt/default.nix
+1 -1
View File
@@ -63,7 +63,7 @@ python.pkgs.buildPythonApplication rec {
description = "Tool to send media from online sources to Chromecast devices";
homepage = "https://github.com/skorokithakis/catt";
license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
mainProgram = "catt";
};
}
pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch
+4 -7
View File
@@ -12,12 +12,12 @@ security model.
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp
index ab1181e..c775283 100644
index 09b3017..1094340 100644
--- a/plugins/obs-browser/obs-browser-source.cpp
+++ b/plugins/obs-browser/obs-browser-source.cpp
@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser()
@@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser()
#if ENABLE_LOCAL_FILE_URL_SCHEME
#if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430
if (is_local) {
- /* Disable web security for file:// URLs to allow
- * local content access to remote APIs */
@@ -30,7 +30,4 @@ index ab1181e..c775283 100644
+ STATE_ENABLED;
}
#endif
--
2.31.1
auto browser = CefBrowserHost::CreateBrowserSync(
pkgs/applications/video/obs-studio/default.nix
+7 -4
View File
@@ -1,6 +1,8 @@
{ config
, uthash
, lib
, stdenv
, nv-codec-headers-12
, fetchFromGitHub
, fetchpatch
, addOpenGLRunpath
@@ -39,7 +41,6 @@
, withFdk ? true
, pipewire
, libdrm
, libajantv2
, librist
, libva
, srt
@@ -62,13 +63,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "obs-studio";
version = "30.1.2";
version = "30.2.0";
src = fetchFromGitHub {
owner = "obsproject";
repo = "obs-studio";
rev = finalAttrs.version;
hash = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo=";
hash = "sha256-mwh2KLSz+I/8f3i/wST/2vKL/hWTCTaq53sinIEX75M=";
fetchSubmodules = true;
};
@@ -113,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
libvlc
mbedtls
pciutils
libajantv2
librist
libva
srt
@@ -124,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
libdatachannel
libvpl
qrcodegencpp
uthash
nv-codec-headers-12
]
++ optionals scriptingSupport [ luajit python3 ]
++ optional alsaSupport alsa-lib
@@ -155,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "ENABLE_ALSA" alsaSupport)
(lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport)
(lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport)
(lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2
];
env.NIX_CFLAGS_COMPILE = toString [
pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch
+6 -6
View File
@@ -1,9 +1,9 @@
diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake
index d1e58a083..a03c6b98e 100644
index fe8d72364..1c590fcdb 100644
--- a/cmake/Modules/ObsDefaults_Linux.cmake
+++ b/cmake/Modules/ObsDefaults_Linux.cmake
@@ -76,7 +76,7 @@ macro(setup_obs_project)
set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}")
- set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}")
@@ -12,15 +12,15 @@ index d1e58a083..a03c6b98e 100644
else()
set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit")
diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c
index b006a5598..531655eb3 100644
index 77c36be5e..fe8a04813 100644
--- a/libobs/obs-nix.c
+++ b/libobs/obs-nix.c
@@ -56,7 +56,7 @@ const char *get_module_extension(void)
#define FLATPAK_PLUGIN_PATH "/app/plugins"
@@ -51,7 +51,7 @@ const char *get_module_extension(void)
static const char *module_bin[] = {
"../../obs-plugins/64bit",
- OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION,
+ OBS_PLUGIN_DESTINATION,
"../../obs-plugins/" BIT_STRING,
FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION,
};
pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/src/alpaca.in b/src/alpaca.in
index cb883c8..a9822cc 100755
--- a/src/alpaca.in
+++ b/src/alpaca.in
@@ -35,7 +35,21 @@ locale.bindtextdomain('alpaca', localedir)
locale.textdomain('alpaca')
gettext.install('alpaca', localedir)
+# Use the right XDG paths outside flatpak
+def set_xdg_path(env, default):
+ app_id = "com.jeffser.Alpaca"
+ base = os.getenv(env) or os.path.expanduser(default)
+ path = os.path.join(base, app_id)
+ if not os.path.exists(path):
+ os.makedirs(path)
+ os.environ[env] = path
+ return
+
if __name__ == '__main__':
+ set_xdg_path("XDG_CONFIG_HOME", "~/.config")
+ set_xdg_path("XDG_DATA_HOME", "~/.local/share")
+ set_xdg_path("XDG_CACHE_HOME", "~/.cache")
+
import gi
from gi.repository import Gio
pkgs/by-name/al/alpaca/package.nix
+95
View File
@@ -0,0 +1,95 @@
{
lib,
python3Packages,
fetchFromGitHub,
fetchpatch,
appstream,
meson,
ninja,
pkg-config,
gobject-introspection,
wrapGAppsHook4,
desktop-file-utils,
libadwaita,
gtksourceview5,
xdg-utils,
ollama,
}:
python3Packages.buildPythonApplication rec {
pname = "alpaca";
version = "0.9.6.1";
pyproject = false; # Built with meson
src = fetchFromGitHub {
owner = "Jeffser";
repo = "Alpaca";
rev = version;
hash = "sha256-EbaEjKqfotJBceaYEyz3LHilK3GnnwEpfMR7Teq96hI=";
};
patches = [
# Change the way XDG paths are handled so it makes sense outside of flatpak
./fix_xdg_path_flatpak.patch
# Let ollama instance stop gracefully so we don't have model instance left behind
(fetchpatch {
url = "https://github.com/Jeffser/Alpaca/commit/e81d918675896c1670cf5aa5a55e1b706be5ed51.patch";
hash = "sha256-gYYFvaoBI/Qn0g2qgS1cB0B4F08swznrSd5KCb51vh0=";
})
];
postPatch = ''
substituteInPlace src/local_instance.py \
--replace-fail '/app/bin/ollama' 'ollama'
'';
nativeBuildInputs = [
appstream
meson
ninja
pkg-config
gobject-introspection
wrapGAppsHook4
desktop-file-utils
];
buildInputs = [
libadwaita
gtksourceview5
];
dependencies = with python3Packages; [
pygobject3
requests
pillow
pypdf
];
dontWrapGApps = true;
makeWrapperArgs = [
"\${gappsWrapperArgs[@]}"
"--prefix PATH : ${lib.makeBinPath [ xdg-utils ollama ]}"
# Declared but not used in src/window.py, for later reference
# https://github.com/flatpak/flatpak/issues/3229
"--set FLATPAK_DEST ${placeholder "out"}"
];
meta = {
description = "Ollama client made with GTK4 and Adwaita";
longDescription = ''
To run Alpaca with GPU acceleration enabled, simply override it:
```nix
pkgs.alpaca.override {
ollama = pkgs.ollama-cuda;
}
```
'';
homepage = "https://jeffser.com/alpaca";
license = lib.licenses.gpl3Plus;
mainProgram = "alpaca";
maintainers = with lib.maintainers; [ aleksana ];
platforms = lib.platforms.linux;
};
}
pkgs/by-name/fa/fac/package.nix
+1 -1
View File
@@ -38,6 +38,6 @@ buildGoModule rec {
homepage = "https://github.com/mkchoi212/fac";
license = lib.licenses.mit;
mainProgram = "fac";
maintainers = with lib.maintainers; [ dtzWill ];
maintainers = with lib.maintainers; [ ];
};
}
pkgs/by-name/fl/flaresolverr/package.nix
+82
View File
@@ -0,0 +1,82 @@
{
lib,
stdenv,
fetchFromGitHub,
makeWrapper,
chromium,
python3,
undetected-chromedriver,
xorg,
nixosTests,
}:
let
python = python3.withPackages (
ps: with ps; [
bottle
func-timeout
prometheus-client
selenium
waitress
xvfbwrapper
# For `undetected_chromedriver`
looseversion
requests
websockets
]
);
in
stdenv.mkDerivation (finalAttrs: {
pname = "flaresolverr";
version = "3.3.21";
src = fetchFromGitHub {
owner = "FlareSolverr";
repo = "FlareSolverr";
rev = "v${finalAttrs.version}";
hash = "sha256-M/snpYKZK3pgzlhYjRYEiAPlK9DUKYRiiu43KcrAy9g=";
};
nativeBuildInputs = [ makeWrapper ];
postPatch = ''
substituteInPlace src/undetected_chromedriver/patcher.py \
--replace-fail \
"from distutils.version import LooseVersion" \
"from looseversion import LooseVersion"
substituteInPlace src/utils.py \
--replace-fail \
'CHROME_EXE_PATH = None' \
'CHROME_EXE_PATH = "${lib.getExe chromium}"' \
--replace-fail \
'PATCHED_DRIVER_PATH = None' \
'PATCHED_DRIVER_PATH = "${lib.getExe undetected-chromedriver}"'
'';
installPhase = ''
mkdir -p $out/{bin,share/${finalAttrs.pname}-${finalAttrs.version}}
cp -r * $out/share/${finalAttrs.pname}-${finalAttrs.version}/.
makeWrapper ${python}/bin/python $out/bin/flaresolverr \
--add-flags "$out/share/${finalAttrs.pname}-${finalAttrs.version}/src/flaresolverr.py" \
--prefix PATH : "${lib.makeBinPath [ xorg.xvfb ]}"
'';
passthru = {
tests.smoke-test = nixosTests.flaresolverr;
};
meta = with lib; {
description = "Proxy server to bypass Cloudflare protection";
homepage = "https://github.com/FlareSolverr/FlareSolverr";
license = licenses.mit;
mainProgram = "flaresolverr";
maintainers = with maintainers; [ paveloom ];
inherit (undetected-chromedriver.meta) platforms;
};
})
pkgs/by-name/nh/nh/package.nix
+3 -3
View File
@@ -10,7 +10,7 @@
, nix-output-monitor
}:
let
version = "3.5.18";
version = "3.5.19";
runtimeDeps = [ nvd nix-output-monitor ];
in
rustPlatform.buildRustPackage {
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
owner = "viperML";
repo = "nh";
rev = "refs/tags/v${version}";
hash = "sha256-G5iteuo2gobI0Y5jHNEBc6UN9ixjwj6zopPKi7bJBE4=";
hash = "sha256-m6LmfrUMpt1ZUX3eqB7Gp+ZV6sAWPqkATwZNvA7Bj9U=";
};
strictDeps = true;
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
--prefix PATH : ${lib.makeBinPath runtimeDeps}
'';
cargoHash = "sha256-jd8GOuI5E+l3u8klAKdwUdEP9N0Nao6MfTdHkSjym0M=";
cargoHash = "sha256-fyHyuZGjTsKynihlD3H3tSZeo8s9Trbe4NZ3Zv2MHmQ=";
passthru.updateScript = nix-update-script { };
pkgs/tools/networking/ntpd-rs/default.nix → pkgs/by-name/nt/ntpd-rs/package.nix
+11 -5
View File
@@ -5,26 +5,27 @@
fetchFromGitHub,
ntpd-rs,
installShellFiles,
darwin,
pandoc,
Security,
nixosTests,
nix-update-script,
testers,
}:
rustPlatform.buildRustPackage rec {
pname = "ntpd-rs";
version = "1.2.0";
version = "1.2.2";
src = fetchFromGitHub {
owner = "pendulum-project";
repo = "ntpd-rs";
rev = "v${version}";
hash = "sha256-yIX9RD1xqkFoxDt82wnKfQR3z/vLA0I5/cptaIgSNjw=";
hash = "sha256-td+op7nVmznIcj3JYafEy7HgbBPLuRv25Hu2N5A5qOQ=";
};
cargoHash = "sha256-NRFmb9rZVbd0qYKIkslT4TcbC/aD4QhAjm2GA4BvReY=";
cargoHash = "sha256-guim3IC2uIA7NKMXDCil/UK8Yj+rt2KUSwtJTcBcZoU=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ];
nativeBuildInputs = [
pandoc
installShellFiles
@@ -39,6 +40,9 @@ rustPlatform.buildRustPackage rec {
source utils/generate-man.sh
'';
# lots of flaky tests
doCheck = false;
checkFlags = [
# doesn't find the testca
"--skip=daemon::keyexchange::tests"
@@ -62,6 +66,8 @@ rustPlatform.buildRustPackage rec {
inherit version;
};
};
updateScript = nix-update-script { };
};
meta = {
pkgs/by-name/op/open-scq30/package.nix
+1
View File
@@ -44,6 +44,7 @@ rustPlatform.buildRustPackage rec {
pango
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.CoreBluetooth
darwin.apple_sdk.frameworks.CoreGraphics
darwin.apple_sdk.frameworks.Foundation
];
pkgs/by-name/st/steampipe/package.nix
+3 -3
View File
@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "steampipe";
version = "0.23.2";
version = "0.23.3";
src = fetchFromGitHub {
owner = "turbot";
repo = "steampipe";
rev = "refs/tags/v${version}";
hash = "sha256-hMEFIPhtvYkBG+HBtigOzFe8iAKmywWWl1da6sksX7k=";
hash = "sha256-V8wy9Q3FU4Ts7cer3tkv3gQbHebje3XRgm+IOg3Xs+c=";
};
vendorHash = "sha256-KY5mVs+YsyHHtV6DvfwwxcF8K9IQWxlxIJeSyFsKkpc=";
vendorHash = "sha256-OVWgDVF2d+OYYCSn+UlSMTfIS+5nFeI2qY41DyX7y/A=";
proxyVendor = true;
postPatch = ''
pkgs/by-name/un/undetected-chromedriver/package.nix
+44
View File
@@ -0,0 +1,44 @@
{
lib,
stdenv,
chromedriver,
python3,
testers,
undetected-chromedriver,
}:
stdenv.mkDerivation {
pname = "undetected-chromedriver";
inherit (chromedriver) version;
nativeBuildInputs = [ (python3.withPackages (ps: [ ps.undetected-chromedriver ])) ];
buildCommand = ''
export HOME=$(mktemp -d)
cp ${chromedriver}/bin/chromedriver .
chmod +w chromedriver
python <<EOF
import logging
from undetected_chromedriver.patcher import Patcher
logging.basicConfig(level=logging.DEBUG)
success = Patcher(executable_path="chromedriver").patch()
assert success, "Failed to patch ChromeDriver"
EOF
install -D -m 0555 chromedriver $out/bin/undetected-chromedriver
'';
passthru.tests.version = testers.testVersion { package = undetected-chromedriver; };
meta = chromedriver.meta // {
description = "Custom Selenium ChromeDriver that passes all bot mitigation systems";
mainProgram = "undetected-chromedriver";
maintainers = with lib.maintainers; [ paveloom ];
};
}
pkgs/data/fonts/agave/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
description = "truetype monospaced typeface designed for X environments";
homepage = "https://b.agaric.net/page/agave";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/data/fonts/ankacoder/condensed.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
description = "Anka/Coder Condensed font";
homepage = "https://code.google.com/archive/p/anka-coder-fonts";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/data/fonts/ankacoder/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
description = "Anka/Coder fonts";
homepage = "https://code.google.com/archive/p/anka-coder-fonts";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/data/fonts/cherry/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "cherry font";
homepage = "https://github.com/turquoise-hexagon/cherry";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/data/fonts/d2coding/default.nix
+1 -1
View File
@@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/naver/d2codingfont";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/data/fonts/hermit/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
description = "monospace font designed to be clear, pragmatic and very readable";
homepage = "https://pcaro.es/p/hermit";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/data/fonts/inter/default.nix
+1 -1
View File
@@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec {
description = "Typeface specially designed for user interfaces";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ demize dtzWill ];
maintainers = with maintainers; [ demize ];
};
}
pkgs/data/fonts/luculent/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
description = "luculent font";
homepage = "http://www.eastfarthing.com/luculent/";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/data/fonts/manrope/default.nix
+1 -1
View File
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://www.gent.media/manrope";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/data/fonts/national-park/default.nix
+1 -1
View File
@@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec {
signs that are carved using a router bit'';
homepage = "https://nationalparktypeface.com/";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/data/fonts/public-sans/default.nix
+1 -1
View File
@@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://public-sans.digital.gov/";
changelog = "https://github.com/uswds/public-sans/raw/v${version}/FONTLOG.txt";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/data/fonts/redhat-official/default.nix
+1 -1
View File
@@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec {
description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text";
license = licenses.ofl;
platforms = platforms.all;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/data/fonts/spleen/default.nix
+1 -1
View File
@@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec {
description = "Monospaced bitmap fonts";
homepage = "https://www.cambus.net/spleen-monospaced-bitmap-fonts";
license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/data/fonts/sudo/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://www.kutilek.de/sudo-font/";
changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt";
license = licenses.ofl;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/data/fonts/victor-mono/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation rec {
description = "Free programming font with cursive italics and ligatures";
homepage = "https://rubjo.github.io/victor-mono";
license = licenses.ofl;
maintainers = with maintainers; [ jpotier dtzWill ];
maintainers = with maintainers; [ jpotier ];
platforms = platforms.all;
};
}
pkgs/data/icons/bibata-cursors/translucent.nix
+1 -1
View File
@@ -21,6 +21,6 @@ stdenvNoCC.mkDerivation rec {
homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ dtzWill AdsonCicilioti ];
maintainers = with maintainers; [ AdsonCicilioti ];
};
}
pkgs/data/icons/numix-icon-theme-circle/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "24.04.22";
version = "24.07.19";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-FRE3zb/81IEHFFvX+rIDFPVe5vw/hToLqVLkXssMgoA=";
sha256 = "sha256-tCqsFcKGUV4sLkoyc3beHmnJxVwRxEGo+G5PJfBuHbI=";
};
nativeBuildInputs = [ gtk3 ];
pkgs/data/themes/adementary/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme";
homepage = "https://github.com/hrdwrrsk/adementary-theme";
license = licenses.gpl3;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/development/compilers/firrtl/default.nix
+1 -1
View File
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.chisel-lang.org/firrtl/";
license = licenses.asl20;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/compilers/llvm/common/llvm/default.nix
+4 -2
View File
@@ -417,9 +417,11 @@ stdenv.mkDerivation (rec {
+ optionalString (stdenv.isDarwin && enableSharedLibraries) ''
ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+ optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then ''
ln -s $dev/bin/llvm-config $dev/bin/llvm-config-native
'' else ''
cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native
'';
'');
inherit doCheck;
pkgs/development/libraries/editline/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
homepage = "https://troglobit.com/projects/editline/";
description = "Readline() replacement for UNIX without termcap (ncurses)";
license = licenses.bsdOriginal;
maintainers = with maintainers; [ dtzWill oxalica ];
maintainers = with maintainers; [ oxalica ];
platforms = platforms.all;
};
}
pkgs/development/libraries/egl-wayland/default.nix
+2 -2
View File
@@ -15,7 +15,7 @@
stdenv.mkDerivation rec {
pname = "egl-wayland";
version = "1.1.13";
version = "1.1.14";
outputs = [ "out" "dev" ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "Nvidia";
repo = pname;
rev = version;
hash = "sha256-NA+jr27aYu0XPG9sxnBtjeBTFHmV7TENRsFy8dDdNUc=";
hash = "sha256-MD+D/dRem3ONWGPoZ77j2UKcOCUuQ0nrahEQkNVEUnI=";
};
postPatch = ''
pkgs/development/libraries/libcbor/default.nix
+1 -1
View File
@@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
description = "CBOR protocol implementation for C and others";
homepage = "https://github.com/PJK/libcbor";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
})
pkgs/development/libraries/libexecinfo/default.nix
+1 -1
View File
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility";
license = licenses.bsd2;
homepage = "https://www.freshports.org/devel/libexecinfo";
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/libraries/libfido2/default.nix
+1 -1
View File
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
'';
homepage = "https://github.com/Yubico/libfido2";
license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill prusnak ];
maintainers = with maintainers; [ prusnak ];
platforms = platforms.unix;
};
}
pkgs/development/libraries/libykclient/default.nix
+1 -1
View File
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
mainProgram = "ykclient";
homepage = "https://developers.yubico.com/yubico-c-client";
license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/libraries/yubico-pam/default.nix
+1 -1
View File
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
mainProgram = "ykpamcfg";
homepage = "https://developers.yubico.com/yubico-pam";
license = licenses.bsd2;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/mobile/webos/cmake-modules.nix
+1 -1
View File
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "CMake modules needed to build Open WebOS components";
license = licenses.asl20;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/mobile/webos/novacom.nix
+1 -1
View File
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Utility for communicating with WebOS devices";
license = licenses.asl20;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/development/mobile/webos/novacomd.nix
+1 -1
View File
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
description = "Daemon for communicating with WebOS devices";
mainProgram = "novacomd";
license = licenses.asl20;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/development/python-modules/distributed/default.nix
+2 -2
View File
@@ -25,7 +25,7 @@
buildPythonPackage rec {
pname = "distributed";
version = "2024.7.0";
version = "2024.7.1";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "dask";
repo = "distributed";
rev = "refs/tags/${version}";
hash = "sha256-Nf/TOLqBaYhezXcBJPMvBwkP+cH5BnN5rxGqLMAb/8U=";
hash = "sha256-1VLYOUPo2esFltcoI6B/HMGyuyRq4vvkE55C8acdbG8=";
};
postPatch = ''
pkgs/development/python-modules/fabulous/default.nix
+17 -6
View File
@@ -2,14 +2,16 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch2,
pillow,
setuptools,
python,
}:
buildPythonPackage rec {
pname = "fabulous";
version = "0.4.0";
format = "setuptools";
pyproject = true;
src = fetchFromGitHub {
owner = "jart";
@@ -18,9 +20,18 @@ buildPythonPackage rec {
hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4=";
};
patches = [ ./relative_import.patch ];
patches = [
./relative_import.patch
# https://github.com/jart/fabulous/pull/22
(fetchpatch2 {
url = "https://github.com/jart/fabulous/commit/5779f2dfbc88fd81b5b5865247913d4775e67959.patch?full_index=1";
hash = "sha256-miWFt4vDpwWhSUgnWDjWUXoibijcDa1c1dDOSkfWoUg=";
})
];
propagatedBuildInputs = [ pillow ];
build-system = [ setuptools ];
dependencies = [ pillow ];
checkPhase = ''
for i in tests/*.py; do
@@ -28,10 +39,10 @@ buildPythonPackage rec {
done
'';
meta = with lib; {
meta = {
description = "Make the output of terminal applications look fabulous";
homepage = "https://jart.github.io/fabulous";
license = licenses.asl20;
maintainers = [ maintainers.symphorien ];
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.symphorien ];
};
}
pkgs/development/python-modules/lit/default.nix
+1 -1
View File
@@ -33,6 +33,6 @@ buildPythonPackage rec {
mainProgram = "lit";
homepage = "http://llvm.org/docs/CommandGuide/lit.html";
license = lib.licenses.ncsa;
maintainers = with lib.maintainers; [ dtzWill ];
maintainers = with lib.maintainers; [ ];
};
}
pkgs/development/python-modules/pypillowfight/default.nix
+13 -18
View File
@@ -2,44 +2,39 @@
lib,
buildPythonPackage,
fetchFromGitLab,
nose,
pillow,
isPy3k,
isPyPy,
pytestCheckHook,
setuptools,
}:
buildPythonPackage rec {
pname = "pypillowfight";
version = "0.3.0";
format = "setuptools";
version = "0.3.0-unstable-2024-07-07";
pyproject = true;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
group = "World";
owner = "OpenPaperwork";
repo = "libpillowfight";
rev = version;
sha256 = "096242v425mlqqj5g1giy59p7grxp05g78w6bk37vzph98jrgv3w";
# Currently no tagged release past 0.3.0 and we need these patches to fix Python 3.12 compat
rev = "4d5f739b725530cd61e709071d31e9f707c64bd6";
hash = "sha256-o5FzUSDq0lwkXGXRMsS5NB/Mp4Ie833wkxKPziR23f4=";
};
prePatch = ''
echo '#define INTERNAL_PILLOWFIGHT_VERSION "${version}"' > src/pillowfight/_version.h
'';
# Disable tests because they're designed to only work on Debian:
# https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174
doCheck = false;
build-system = [ setuptools ];
# Python 2.x is not supported, see:
# https://github.com/jflesch/libpillowfight/issues/1
disabled = !isPy3k && !isPyPy;
dependencies = [ pillow ];
# This is needed by setup.py regardless of whether tests are enabled.
buildInputs = [ nose ];
propagatedBuildInputs = [ pillow ];
nativeCheckInputs = [ pytestCheckHook ];
meta = with lib; {
meta = {
description = "Library containing various image processing algorithms";
inherit (src.meta) homepage;
license = licenses.gpl3Plus;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ pyrox0 ];
};
}
pkgs/development/python-modules/rotary-embedding-torch/default.nix
+2 -2
View File
@@ -15,14 +15,14 @@
buildPythonPackage rec {
pname = "rotary-embedding-torch";
version = "0.6.2";
version = "0.6.4";
pyproject = true;
src = fetchFromGitHub {
owner = "lucidrains";
repo = "rotary-embedding-torch";
rev = "refs/tags/${version}";
hash = "sha256-AR/zQFH0uvPrCp61XLiRBiAO3ZnD4jVaDXN00hXDlnI=";
hash = "sha256-dP7QFUNIGFFQcR98po+LYg3MU7P+GUunO7zz/y8vZmY=";
};
nativeBuildInputs = [
pkgs/development/python-modules/undetected-chromedriver/default.nix
+54
View File
@@ -0,0 +1,54 @@
{
lib,
buildPythonPackage,
fetchFromGitHub,
setuptools,
looseversion,
requests,
selenium,
websockets,
}:
buildPythonPackage {
pname = "undetected-chromedriver";
version = "3.5.5";
pyproject = true;
src = fetchFromGitHub {
owner = "ultrafunkamsterdam";
repo = "undetected-chromedriver";
# Upstream uses the summaries of commits for specifying versions
rev = "0aa5fbe252370b4cb2b95526add445392cad27ba";
hash = "sha256-Qe+GrsUPnhjJMDgjdUCloapjj0ggFlm/Dr42WLcmb1o=";
};
build-system = [ setuptools ];
dependencies = [
looseversion
requests
selenium
websockets
];
# No tests
doCheck = false;
pythonImportsCheck = [ "undetected_chromedriver" ];
postPatch = ''
substituteInPlace undetected_chromedriver/patcher.py \
--replace-fail \
"from distutils.version import LooseVersion" \
"from looseversion import LooseVersion"
'';
meta = with lib; {
description = "Python library for the custom Selenium ChromeDriver that passes all bot mitigation systems";
homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver";
license = licenses.gpl3Only;
maintainers = with lib.maintainers; [ paveloom ];
};
}
pkgs/development/python-modules/yfinance/default.nix
+2 -2
View File
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "yfinance";
version = "0.2.40";
version = "0.2.41";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "ranaroussi";
repo = "yfinance";
rev = "refs/tags/${version}";
hash = "sha256-y3vcgPhksW8g0WpqVgJej7s+aIj9zaAjBjSm8d7yrjs=";
hash = "sha256-9Vp/z0u/Mfil1xWHvHPRFa62sLvEJMjHLBYweLfz42o=";
};
build-system = [ setuptools ];
pkgs/development/tools/analysis/retdec/default.nix
+1 -1
View File
@@ -230,7 +230,7 @@ stdenv.mkDerivation (self: {
description = "Retargetable machine-code decompiler based on LLVM";
homepage = "https://retdec.com";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill katrinafyi ];
maintainers = with maintainers; [ katrinafyi ];
platforms = [ "x86_64-linux" ];
};
})
pkgs/development/tools/analysis/snowman/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ mkDerivation rec {
# https://github.com/yegord/snowman/blob/master/doc/licenses.asciidoc
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/development/tools/bloaty/default.nix
+1 -1
View File
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/google/bloaty";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/tools/boomerang/default.nix
+1 -1
View File
@@ -33,6 +33,6 @@ mkDerivation rec {
homepage = "https://github.com/BoomerangDecompiler/boomerang";
license = licenses.bsd3;
description = "General, open source, retargetable decompiler";
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/tools/gllvm/default.nix
+1 -1
View File
@@ -22,6 +22,6 @@ buildGoModule rec {
homepage = "https://github.com/SRI-CSL/gllvm";
description = "Whole Program LLVM: wllvm ported to go";
license = licenses.bsd3;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/tools/misc/creduce/default.nix
+1 -1
View File
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
property. It is intended for use by people who discover and report
bugs in compilers and other tools that process C/C++ code.
'';
maintainers = [ maintainers.dtzWill ];
maintainers = [ ];
platforms = platforms.all;
};
}
pkgs/development/tools/misc/csmith/default.nix
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
Csmith has found bugs in every tool that it has tested, and has been used
to find and report more than 400 previously unknown compiler bugs.
'';
maintainers = [ maintainers.dtzWill ];
maintainers = [ ];
platforms = platforms.all;
};
}
pkgs/development/tools/misc/elfinfo/default.nix
+1 -1
View File
@@ -22,6 +22,6 @@ buildGoModule rec {
homepage = "https://elfinfo.roboticoverlords.org/";
changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/tools/misc/elfkickers/default.nix
+1 -1
View File
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
description = "Collection of programs that access and manipulate ELF files";
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = [ maintainers.dtzWill ];
maintainers = [ ];
};
}
pkgs/development/tools/misc/go-license-detector/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ buildGoModule rec {
description = "Reliable project licenses detector";
homepage = "https://github.com/go-enry/go-license-detector";
license = licenses.asl20;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
mainProgram = "license-detector";
};
}
pkgs/development/tools/misc/gtkperf/default.nix
+1 -1
View File
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
mainProgram = "gtkperf";
homepage = "https://gtkperf.sourceforge.net/";
license = with licenses; [ gpl2 ];
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/tools/misc/libwhich/default.nix
+1 -1
View File
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
mainProgram = "libwhich";
homepage = "https://github.com/vtjnash/libwhich";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/development/tools/misc/whatstyle/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
mainProgram = "whatstyle";
homepage = "https://github.com/mikr/whatstyle";
license = licenses.mit;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
platforms = platforms.all;
};
}
pkgs/development/tools/selenium/chromedriver/binary.nix
+64
View File
@@ -0,0 +1,64 @@
{ lib, stdenv, fetchurl, autoPatchelfHook
, glib, nspr, nss, libxcb
, testers, chromedriver
}:
let
upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver;
allSpecs = {
x86_64-linux = {
system = "linux64";
hash = upstream-info.hash_linux;
};
x86_64-darwin = {
system = "mac-x64";
hash = upstream-info.hash_darwin;
};
aarch64-darwin = {
system = "mac-arm64";
hash = upstream-info.hash_darwin_aarch64;
};
};
spec = allSpecs.${stdenv.hostPlatform.system}
or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
in stdenv.mkDerivation rec {
pname = "chromedriver";
version = upstream-info.version;
src = fetchurl {
url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip";
hash = spec.hash;
};
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = lib.optionals (!stdenv.isDarwin) [
glib nspr nss libxcb
];
installPhase = ''
install -m555 -D "chromedriver" $out/bin/chromedriver
'';
passthru.tests.version = testers.testVersion { package = chromedriver; };
meta = with lib; {
homepage = "https://chromedriver.chromium.org/";
description = "WebDriver server for running Selenium tests on Chrome";
longDescription = ''
WebDriver is an open source tool for automated testing of webapps across
many browsers. It provides capabilities for navigating to web pages, user
input, JavaScript execution, and more. ChromeDriver is a standalone
server that implements the W3C WebDriver standard.
'';
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.bsd3;
maintainers = with maintainers; [ goibhniu primeos ];
# Note from primeos: By updating Chromium I also update Google Chrome and
# ChromeDriver.
platforms = attrNames allSpecs;
mainProgram = "chromedriver";
};
}
pkgs/development/tools/selenium/chromedriver/default.nix
+4 -78
View File
@@ -1,78 +1,4 @@
{ lib, stdenv, fetchurl, unzip, makeWrapper
, cairo, fontconfig, freetype, gdk-pixbuf, glib
, glibc, gtk2, libX11, nspr, nss, pango
, libxcb, libXi, libXrender, libXext, dbus
, testers, chromedriver
}:
let
upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver;
allSpecs = {
x86_64-linux = {
system = "linux64";
hash = upstream-info.hash_linux;
};
x86_64-darwin = {
system = "mac-x64";
hash = upstream-info.hash_darwin;
};
aarch64-darwin = {
system = "mac-arm64";
hash = upstream-info.hash_darwin_aarch64;
};
};
spec = allSpecs.${stdenv.hostPlatform.system}
or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}");
libs = lib.makeLibraryPath [
stdenv.cc.cc.lib
cairo fontconfig freetype
gdk-pixbuf glib gtk2
libX11 nspr nss pango libXrender
libxcb libXext libXi
dbus
];
in stdenv.mkDerivation rec {
pname = "chromedriver";
version = upstream-info.version;
src = fetchurl {
url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip";
hash = spec.hash;
};
nativeBuildInputs = [ unzip makeWrapper ];
unpackPhase = "unzip $src";
installPhase = ''
install -m755 -D "chromedriver-${spec.system}/chromedriver" $out/bin/chromedriver
'' + lib.optionalString (!stdenv.isDarwin) ''
patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}"
'';
passthru.tests.version = testers.testVersion { package = chromedriver; };
meta = with lib; {
homepage = "https://chromedriver.chromium.org/";
description = "WebDriver server for running Selenium tests on Chrome";
longDescription = ''
WebDriver is an open source tool for automated testing of webapps across
many browsers. It provides capabilities for navigating to web pages, user
input, JavaScript execution, and more. ChromeDriver is a standalone
server that implements the W3C WebDriver standard.
'';
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
license = licenses.bsd3;
maintainers = with maintainers; [ goibhniu primeos ];
# Note from primeos: By updating Chromium I also update Google Chrome and
# ChromeDriver.
platforms = attrNames allSpecs;
mainProgram = "chromedriver";
};
}
{ lib, stdenv, chromium, callPackage }:
if lib.meta.availableOn stdenv.hostPlatform chromium
then callPackage ./source.nix {}
else callPackage ./binary.nix {}
pkgs/development/tools/selenium/chromedriver/source.nix
+30
View File
@@ -0,0 +1,30 @@
{ chromium, testers, chromedriver }:
chromium.mkDerivation (_: {
name = "chromedriver";
packageName = "chromedriver";
# Build the unstripped target, because stripping in Chromium relies on a prebuilt strip binary
# that doesn't run on NixOS, and we will strip everything ourselves later anyway.
buildTargets = [ "chromedriver.unstripped" ];
installPhase = ''
install -Dm555 $buildPath/chromedriver.unstripped $out/bin/chromedriver
'';
# Kill existing postFixup that tries to patchelf things
postFixup = null;
passthru.tests.version = testers.testVersion { package = chromedriver; };
meta = chromium.meta // {
homepage = "https://chromedriver.chromium.org/";
description = "WebDriver server for running Selenium tests on Chrome";
longDescription = ''
WebDriver is an open source tool for automated testing of webapps across
many browsers. It provides capabilities for navigating to web pages, user
input, JavaScript execution, and more. ChromeDriver is a standalone
server that implements the W3C WebDriver standard.
'';
mainProgram = "chromedriver";
};
})
pkgs/development/tools/wllvm/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
homepage = "https://github.com/travitch/whole-program-llvm";
description = "Wrapper script to build whole-program LLVM bitcode files";
license = licenses.mit;
maintainers = with maintainers; [ mic92 dtzWill ];
maintainers = with maintainers; [ mic92 ];
platforms = platforms.all;
};
}
pkgs/games/nudoku/default.nix
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = "http://jubalh.github.io/nudoku/";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ dtzWill ];
maintainers = with maintainers; [ ];
};
}
pkgs/games/osu-lazer/bin.nix
+4 -4
View File
@@ -7,22 +7,22 @@
let
pname = "osu-lazer-bin";
version = "2024.718.0";
version = "2024.718.1";
src = {
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-XYsfNFnBUzAfiW8WdJvJcd5ufP7a60Fsi8rU9Ul3ax4=";
hash = "sha256-23ZS2lkVDNpaWKkRMrkMwPhCaudoMxehV+k/7wXHnJ0=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-rs91+IbYlmtU3NY2EGqqlS/35oU4wFbWJmvyObYF32M=";
hash = "sha256-1ZYPnxyknm7cxPW4CmzE1G652CSC0jKI2g4+yHg7HsE=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-K8YeiHuEfwK/DG+e9VSj9arJ5x5XvwIwEiAi/JFdqMM=";
hash = "sha256-+udJYFOTAUNaQnOTzqwvSm2ryDJ+AfJfQ4hths6aEYs=";
};
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
pkgs/games/osu-lazer/default.nix
+2 -2
View File
@@ -17,13 +17,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2024.718.0";
version = "2024.718.1";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
rev = version;
hash = "sha256-/JO/kGFhqzDBnkqLqoj1fM+0WRI1ipUaMKZQBtZPFLU=";
hash = "sha256-A3zBYdsOf/Ht15saRQtdNi1ZTnDRcAPWeSelXg6EeaI=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";

Some files were not shown because too many files have changed in this diff Show More