Merge master into staging-next
This commit is contained in:
github-actions[bot]
@@ -90,8 +90,6 @@ let
|
||||
inherit (cfg) packages package;
|
||||
};
|
||||
|
||||
fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;
|
||||
|
||||
kernel-name = config.boot.kernelPackages.kernel.name or "kernel";
|
||||
modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; };
|
||||
firmware = config.hardware.firmware;
|
||||
|
||||
@@ -955,6 +955,10 @@
|
||||
dependencies = with self; [ nui-nvim ];
|
||||
};
|
||||
|
||||
none-ls-nvim = super.none-ls-nvim.overrideAttrs {
|
||||
dependencies = [ self.plenary-nvim ];
|
||||
};
|
||||
|
||||
null-ls-nvim = super.null-ls-nvim.overrideAttrs {
|
||||
dependencies = with self; [ plenary-nvim ];
|
||||
};
|
||||
|
||||
@@ -7,10 +7,14 @@
|
||||
, cmake
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ffmpeg
|
||||
, ffmpeg_4
|
||||
, fluidsynth
|
||||
, fmt
|
||||
, freetype
|
||||
, gettext
|
||||
, harfbuzz
|
||||
, hexdump
|
||||
, hidapi
|
||||
, icu
|
||||
@@ -19,21 +23,28 @@
|
||||
, libGL
|
||||
, libGLU
|
||||
, libjpeg
|
||||
, liblcf
|
||||
, libpcap
|
||||
, libpng
|
||||
, libsndfile
|
||||
, libvorbis
|
||||
, libxml2
|
||||
, libxmp
|
||||
, libzip
|
||||
, makeWrapper
|
||||
, mpg123
|
||||
, nasm
|
||||
, openssl
|
||||
, opusfile
|
||||
, pcre
|
||||
, pixman
|
||||
, pkg-config
|
||||
, portaudio
|
||||
, python3
|
||||
, retroarch
|
||||
, sfml
|
||||
, snappy
|
||||
, speexdsp
|
||||
, udev
|
||||
, which
|
||||
, xorg
|
||||
@@ -400,6 +411,32 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
easyrpg = mkLibretroCore {
|
||||
core = "easyrpg";
|
||||
extraNativeBuildInputs = [ cmake pkg-config ];
|
||||
extraBuildInputs = [ fmt freetype harfbuzz liblcf libpng libsndfile libvorbis libxmp mpg123 opusfile pcre pixman speexdsp ];
|
||||
patches = [
|
||||
# The following patch is shared with easyrpg-player.
|
||||
# Update when new versions of liblcf and easyrpg-player are released.
|
||||
# See pkgs/games/easyrpg-player/default.nix for details.
|
||||
(fetchpatch {
|
||||
name = "0001-Fix-building-with-fmtlib-10.patch";
|
||||
url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch";
|
||||
hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54=";
|
||||
})
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DPLAYER_TARGET_PLATFORM=libretro"
|
||||
"-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
|
||||
];
|
||||
makefile = "Makefile";
|
||||
meta = {
|
||||
description = "EasyRPG Player libretro port";
|
||||
license = lib.licenses.gpl3Only;
|
||||
};
|
||||
};
|
||||
|
||||
eightyone = mkLibretroCore {
|
||||
core = "81";
|
||||
repo = "eightyone";
|
||||
|
||||
@@ -251,6 +251,17 @@
|
||||
},
|
||||
"version": "unstable-2023-12-29"
|
||||
},
|
||||
"easyrpg": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
"owner": "EasyRPG",
|
||||
"repo": "Player",
|
||||
"rev": "f8e41f43b619413f95847536412b56f85307d378",
|
||||
"hash": "sha256-nvWM4czTv/GxY9raomBEn7dmKBeLtSA9nvjMJxc3Q8s=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"version": "unstable-2023-04-29"
|
||||
},
|
||||
"eightyone": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"src": {
|
||||
|
||||
@@ -50,6 +50,11 @@ CORES = {
|
||||
"dolphin": {"repo": "dolphin"},
|
||||
"dosbox": {"repo": "dosbox-libretro"},
|
||||
"dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"},
|
||||
# The EasyRPG core is pinned to 0.8 since it depends on version 0.8 of liblcf, which
|
||||
# was released in April 2023.
|
||||
# Update the version when a compatible liblcf is available.
|
||||
# See pkgs/games/easyrpg-player/default.nix for details.
|
||||
"easyrpg": {"repo": "Player", "owner": "EasyRPG", "fetch_submodules": True, "rev": "0.8"},
|
||||
"eightyone": {"repo": "81-libretro"},
|
||||
"fbalpha2012": {"repo": "fbalpha2012"},
|
||||
"fbneo": {"repo": "fbneo"},
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "6.44.0";
|
||||
version = "6.46.0";
|
||||
url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb";
|
||||
hash = "sha256-M4Xiy8cDQciMzgGl1/eeKZjEaelVtkk6JXJYBP4ua2s=";
|
||||
hash = "sha256-rHmG2brzlQtYd3l5EFhjndPF5T7nQWzUhEe7LsEFVpc=";
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix {} rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "6.46.0";
|
||||
version = "6.47.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-6s6wFg2mJRaxEyWkZrCefspAdlcDwbjxXpx5CMNGW94=";
|
||||
hash = "sha256-WRdn3T18xhWvlELtwlOs/ZoPuEt/yQgs7JP/1MGN5Ps=";
|
||||
}
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.4.11";
|
||||
version = "1.4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = "teams-for-linux";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-vjxbWOaUanYXalGVDgX+sjsrz5Cn1yGBkBs9B8VGrDQ=";
|
||||
hash = "sha256-LrFF61D2b9+FWnVkb9MYxBJQxMtejuOmGTEtfSj1No4=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
||||
@@ -227,6 +227,10 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
cp mpv_identify.sh umpv $out/bin/
|
||||
popd
|
||||
pushd $out/share/applications
|
||||
|
||||
# patch out smb protocol reference, since our ffmpeg can't handle it
|
||||
substituteInPlace mpv.desktop --replace-fail "smb," ""
|
||||
|
||||
sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \
|
||||
mpv.desktop > umpv.desktop
|
||||
printf "NoDisplay=true\n" >> umpv.desktop
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-ho4o7Ryp6IwBZ66Sag9IC67EfC/opfkicksouHKPURc=";
|
||||
hash = "sha256-uRAWcEG4+8tkfHe9bmVSWsRp3A35+5PRPdGuXuDm210=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EDgtXZhAOd8I9TwzpXsVpUpi8uoxyBBIxWyF7wSazwo=";
|
||||
cargoHash = "sha256-U7W3Ila75XQDwtcVDEzooLxdbcGZCrUU/Ijcx/xhRaM=";
|
||||
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/166205.
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
, testers, dunst
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dunst";
|
||||
version = "1.9.2";
|
||||
version = "1.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dunst-project";
|
||||
repo = "dunst";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8IH0WTPSaAundhYh4l7gQR66nyT38H4DstRTm+Xh+Z8=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-6smFUdWqOuYB0btsDgHtIpDBfHhkpIQfjyZ8wtRg1bQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
|
||||
@@ -59,4 +59,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
mainProgram = "dunst";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,67 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, gobject-introspection
|
||||
, libadwaita
|
||||
, wrapGAppsHook
|
||||
, meson
|
||||
, ninja
|
||||
, desktop-file-utils
|
||||
, pkg-config
|
||||
, appstream
|
||||
, libsecret
|
||||
, gtk4
|
||||
, gtksourceview5
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "errands";
|
||||
version = "45.1.9";
|
||||
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrvladus";
|
||||
repo = "Errands";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-q8vmT7XUx3XJjPfbEd/c3HrTENfopl1MqwT0x5OuG0c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
wrapGAppsHook
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
appstream
|
||||
gtk4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
libsecret
|
||||
gtksourceview5
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
lxml
|
||||
caldav
|
||||
pycryptodomex
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manage your tasks";
|
||||
homepage = "https://github.com/mrvladus/Errands";
|
||||
license = licenses.mit;
|
||||
mainProgram = "errands";
|
||||
maintainers = with maintainers; [ sund3RRR ];
|
||||
};
|
||||
}
|
||||
Generated
+11
-11
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "c3efe6b6543d5e592e77a809fb1bb84e",
|
||||
"content-hash": "11632300688e9bcc111cc0e38617b43f",
|
||||
"packages": [
|
||||
{
|
||||
"name": "fidry/cpu-core-counter",
|
||||
@@ -2628,16 +2628,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan",
|
||||
"version": "1.10.57",
|
||||
"version": "1.10.58",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpstan/phpstan.git",
|
||||
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
|
||||
"reference": "a23518379ec4defd9e47cbf81019526861623ec2"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
|
||||
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2",
|
||||
"reference": "a23518379ec4defd9e47cbf81019526861623ec2",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2686,7 +2686,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-01-24T11:51:34+00:00"
|
||||
"time": "2024-02-12T20:02:57+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan-deprecation-rules",
|
||||
@@ -2904,16 +2904,16 @@
|
||||
},
|
||||
{
|
||||
"name": "squizlabs/php_codesniffer",
|
||||
"version": "3.8.1",
|
||||
"version": "3.9.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
|
||||
"reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
|
||||
"reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
|
||||
"reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
|
||||
"url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
|
||||
"reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -2980,7 +2980,7 @@
|
||||
"type": "open_collective"
|
||||
}
|
||||
],
|
||||
"time": "2024-01-11T20:47:48+00:00"
|
||||
"time": "2024-02-16T15:06:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/filesystem",
|
||||
|
||||
@@ -5,17 +5,17 @@
|
||||
|
||||
(php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject (finalAttrs: {
|
||||
pname = "paratest";
|
||||
version = "7.4.1";
|
||||
version = "7.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paratestphp";
|
||||
repo = "paratest";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0cyv2WSiGjyp9vv2J8hxFnuvxAwrig1DmSxKSdBzNGI=";
|
||||
hash = "sha256-Sd7S51SjI8g2Qz/NAeKKpxpSyBhvlrtJFbazbPJf2N0=";
|
||||
};
|
||||
|
||||
composerLock = ./composer.lock;
|
||||
vendorHash = "sha256-vYcfmVEMGhAvPYTsVAJl7njxgVkL1b8QBr/3/DCxmCE=";
|
||||
vendorHash = "sha256-O8iEkvXIkkaQxcKfhm0Z4EZOtLolNsTPaPkXekpxkqs=";
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/paratestphp/paratest/releases/tag/v${finalAttrs.version}";
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
node_modules/
|
||||
@@ -0,0 +1,19 @@
|
||||
========================================================================
|
||||
purescm
|
||||
========================================================================
|
||||
|
||||
|
||||
Suggested additional ``buildInputs``
|
||||
====================================
|
||||
|
||||
``chez-racket``
|
||||
Upstream is using the Racket fork of Chez Scheme to execute the
|
||||
generated Scheme output.
|
||||
|
||||
|
||||
To update this package
|
||||
======================
|
||||
|
||||
#. Bump the ``./package.json`` version pin
|
||||
#. Run ``nix-shell -p nodejs --command "npm i --package-lock-only"``
|
||||
#. Update ``npmDeps.hash`` in the ``package.nix``
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
{
|
||||
"name": "purescm",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"purescm": "1.8.2"
|
||||
}
|
||||
},
|
||||
"node_modules/purescm": {
|
||||
"version": "1.8.2",
|
||||
"resolved": "https://registry.npmjs.org/purescm/-/purescm-1.8.2.tgz",
|
||||
"integrity": "sha512-r+iaiRagOO2rHxGIke391l+pMlpE85vOVpQA32pdftJTdKeUVGIYy0UAs1nOkQSNxdHMXsNIkrskAwOSiyX3PA==",
|
||||
"bin": {
|
||||
"purescm": "index.js"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"purescm": "1.8.2"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchNpmDeps
|
||||
, testers
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (lib) fileset;
|
||||
|
||||
packageLock = builtins.fromJSON (builtins.readFile ./package-lock.json);
|
||||
|
||||
pname = "purescm";
|
||||
version = packageLock.packages."node_modules/${pname}".version;
|
||||
|
||||
package = buildNpmPackage {
|
||||
inherit pname version;
|
||||
|
||||
src = ./.;
|
||||
dontNpmBuild = true;
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = ./.;
|
||||
hash = "sha256-ljeFcLvIET77Q0OR6O5Ok1fGnaxaKaoywpcy2aHq/6o=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/${pname}
|
||||
cp -r node_modules/ $out/share/${pname}
|
||||
ln -s $out/share/${pname}/node_modules/.bin $out/bin
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
version = testers.testVersion { inherit package; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Chez Scheme back-end for PureScript";
|
||||
homepage = "https://github.com/purescm/purescm";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ toastal ];
|
||||
mainProgram = "purescm";
|
||||
};
|
||||
};
|
||||
in
|
||||
package
|
||||
@@ -16,17 +16,17 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Disable -Werror to avoid biuld failure on fresh toolchains like
|
||||
# gcc-13.
|
||||
substituteInPlace code/gc.gmk --replace-fail '-Werror ' ' '
|
||||
substituteInPlace code/gp.gmk --replace-fail '-Werror ' ' '
|
||||
substituteInPlace code/ll.gmk --replace-fail '-Werror ' ' '
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
# needed for 1.116.0 to build with gcc7
|
||||
env.NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-implicit-fallthrough"
|
||||
"-Wno-error=clobbered"
|
||||
"-Wno-error=cast-function-type"
|
||||
];
|
||||
|
||||
|
||||
meta = {
|
||||
description = "A flexible memory management and garbage collection library";
|
||||
homepage = "https://www.ravenbrook.com/project/mps";
|
||||
|
||||
@@ -32,7 +32,7 @@ let
|
||||
callPackage = self.newScope ({
|
||||
inherit (self) qtModule;
|
||||
inherit srcs python3;
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
});
|
||||
in
|
||||
{
|
||||
@@ -109,7 +109,7 @@ let
|
||||
qtwebengine
|
||||
qtwebsockets
|
||||
qtwebview
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) { };
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwayland libglvnd ])) { };
|
||||
|
||||
qt3d = callPackage ./modules/qt3d.nix { };
|
||||
qt5compat = callPackage ./modules/qt5compat.nix { };
|
||||
@@ -163,7 +163,7 @@ let
|
||||
MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz
|
||||
ReplayKit SecurityInterface Vision;
|
||||
qtModule = callPackage ({ qtModule }: qtModule.override {
|
||||
stdenv = if stdenv.isDarwin
|
||||
stdenv = if stdenv.hostPlatform.isDarwin
|
||||
then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; }
|
||||
else stdenv;
|
||||
}) { };
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
, double-conversion
|
||||
, util-linux
|
||||
, systemd
|
||||
, systemdSupport ? stdenv.isLinux
|
||||
, systemdSupport ? stdenv.hostPlatform.isLinux
|
||||
, libb2
|
||||
, md4c
|
||||
, mtdev
|
||||
@@ -87,7 +87,7 @@
|
||||
, dconf
|
||||
, gtk3
|
||||
# options
|
||||
, libGLSupported ? stdenv.isLinux
|
||||
, libGLSupported ? stdenv.hostPlatform.isLinux
|
||||
, libGL
|
||||
, debug ? false
|
||||
, developerBuild ? false
|
||||
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
|
||||
unixODBCDrivers.mariadb
|
||||
] ++ lib.optionals systemdSupport [
|
||||
systemd
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
util-linux
|
||||
mtdev
|
||||
lksctp-tools
|
||||
@@ -165,7 +165,7 @@ stdenv.mkDerivation rec {
|
||||
xorg.libXtst
|
||||
xorg.xcbutilcursor
|
||||
libepoxy
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
AGL
|
||||
AVFoundation
|
||||
AppKit
|
||||
@@ -178,9 +178,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
at-spi2-core
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
libinput
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
AppKit
|
||||
CoreBluetooth
|
||||
]
|
||||
@@ -191,7 +191,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (postgresql != null) postgresql;
|
||||
|
||||
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ]
|
||||
++ lib.optionals stdenv.isDarwin [ moveBuildTree ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
|
||||
|
||||
propagatedNativeBuildInputs = [ lndir ];
|
||||
|
||||
@@ -204,7 +204,7 @@ stdenv.mkDerivation rec {
|
||||
# https://bugreports.qt.io/browse/QTBUG-97568
|
||||
postPatch = ''
|
||||
substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${coreutils}/bin/ls"
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
|
||||
'';
|
||||
|
||||
@@ -225,16 +225,16 @@ stdenv.mkDerivation rec {
|
||||
"-DQT_FEATURE_libproxy=ON"
|
||||
"-DQT_FEATURE_system_sqlite=ON"
|
||||
"-DQT_FEATURE_openssl_linked=ON"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
"-DQT_FEATURE_sctp=ON"
|
||||
"-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}"
|
||||
"-DQT_FEATURE_vulkan=ON"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# error: 'path' is unavailable: introduced in macOS 10.15
|
||||
"-DQT_FEATURE_cxx17_filesystem=OFF"
|
||||
] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations";
|
||||
|
||||
env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [
|
||||
env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc"
|
||||
"-framework GSS"
|
||||
]);
|
||||
|
||||
@@ -12,11 +12,11 @@
|
||||
qtModule {
|
||||
pname = "qtconnectivity";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ bluez ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
|
||||
propagatedBuildInputs = [
|
||||
qtbase
|
||||
qtdeclarative
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
IOBluetooth
|
||||
PCSC
|
||||
];
|
||||
|
||||
@@ -28,15 +28,15 @@ qtModule {
|
||||
pname = "qtmultimedia";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libunwind orc ffmpeg_6 ]
|
||||
++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ];
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ]
|
||||
++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]
|
||||
++ lib.optionals stdenv.isDarwin [ VideoToolbox ];
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ];
|
||||
|
||||
cmakeFlags = [ "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin
|
||||
"-include AudioToolbox/AudioToolbox.h";
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin
|
||||
NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin
|
||||
"-framework AudioToolbox";
|
||||
}
|
||||
|
||||
@@ -8,6 +8,6 @@
|
||||
qtModule {
|
||||
pname = "qtquick3dphysics";
|
||||
propagatedBuildInputs = [ qtbase qtquick3d ];
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64)
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64)
|
||||
"-faligned-allocation";
|
||||
}
|
||||
|
||||
@@ -9,5 +9,5 @@
|
||||
qtModule {
|
||||
pname = "qtserialport";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ udev ];
|
||||
propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ];
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
qtModule {
|
||||
pname = "qtspeech";
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd ];
|
||||
propagatedBuildInputs = [ qtbase qtmultimedia ]
|
||||
++ lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ qtModule {
|
||||
llvmPackages.llvm
|
||||
];
|
||||
propagatedBuildInputs = [ qtbase qtdeclarative ]
|
||||
++ lib.optionals stdenv.isDarwin [ cups ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ];
|
||||
patches = [
|
||||
../patches/qttools-paths.patch
|
||||
];
|
||||
|
||||
@@ -105,9 +105,9 @@ qtModule {
|
||||
which
|
||||
gn
|
||||
nodejs
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
|
||||
autoSignDarwinBinariesHook
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
bootstrap_cmds
|
||||
cctools
|
||||
xcbuild
|
||||
@@ -158,14 +158,14 @@ qtModule {
|
||||
--replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
|
||||
--replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""
|
||||
''
|
||||
+ lib.optionalString stdenv.isLinux ''
|
||||
+ lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
|
||||
src/3rdparty/chromium/device/udev_linux/udev?_loader.cc
|
||||
|
||||
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
|
||||
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
|
||||
''
|
||||
+ lib.optionalString stdenv.isDarwin ''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
substituteInPlace configure.cmake src/gn/CMakeLists.txt \
|
||||
--replace "AppleClang" "Clang"
|
||||
substituteInPlace cmake/Functions.cmake \
|
||||
@@ -190,7 +190,7 @@ qtModule {
|
||||
# "-DQT_FEATURE_webengine_native_spellchecker=ON"
|
||||
"-DQT_FEATURE_webengine_sanitizer=ON"
|
||||
"-DQT_FEATURE_webengine_kerberos=ON"
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"-DQT_FEATURE_webengine_system_libxml=ON"
|
||||
"-DQT_FEATURE_webengine_webrtc_pipewire=ON"
|
||||
|
||||
@@ -199,7 +199,7 @@ qtModule {
|
||||
"-DQT_FEATURE_webengine_system_icu=ON"
|
||||
] ++ lib.optionals enableProprietaryCodecs [
|
||||
"-DQT_FEATURE_webengine_proprietary_codecs=ON"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}"
|
||||
];
|
||||
|
||||
@@ -232,7 +232,7 @@ qtModule {
|
||||
|
||||
libevent
|
||||
ffmpeg_4
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
dbus
|
||||
zlib
|
||||
minizip
|
||||
@@ -275,7 +275,7 @@ qtModule {
|
||||
|
||||
libkrb5
|
||||
mesa
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
AGL
|
||||
AVFoundation
|
||||
Accelerate
|
||||
@@ -302,7 +302,7 @@ qtModule {
|
||||
|
||||
buildInputs = [
|
||||
cups
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
libpm
|
||||
sandbox
|
||||
];
|
||||
|
||||
@@ -9,6 +9,6 @@
|
||||
qtModule {
|
||||
pname = "qtwebview";
|
||||
propagatedBuildInputs = [ qtdeclarative ]
|
||||
++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ]
|
||||
++ lib.optionals stdenv.isDarwin [ WebKit ];
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit ];
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (args // {
|
||||
|
||||
buildInputs = args.buildInputs or [ ];
|
||||
nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ]
|
||||
++ lib.optionals stdenv.isDarwin [ moveBuildTree ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ];
|
||||
propagatedBuildInputs =
|
||||
(lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++
|
||||
(args.propagatedBuildInputs or []);
|
||||
|
||||
@@ -2,15 +2,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "magic-mime";
|
||||
version = "1.2.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-v${version}.tbz";
|
||||
sha256 = "sha256-8SG2dQD43Zfi/J/V0BxzJeTIS8XAI3RCd5+9b6IGlPU=";
|
||||
url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-${version}.tbz";
|
||||
hash = "sha256-4CNNA2Jduh76xY5X44dnLXWl6aYh/0ms/g9gnADxOwg=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
useDune2 = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Convert file extensions to MIME types";
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.5.34";
|
||||
version = "2.5.35";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "pre-commit";
|
||||
repo = "identify";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-q1RVFdDFUkKGaKpcbasXHks+OZhVRZUy3ufuruBZiPA=";
|
||||
hash = "sha256-kUBAq9ttIdTLApJ0yW8Yk/NIXpmllApQGpR24wm0PHA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slackclient";
|
||||
version = "3.26.2";
|
||||
version = "3.27.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pvD86kbNOnuNT6+WTAKziJDUTx3ebJUq029UbSVuxdw=";
|
||||
hash = "sha256-MA3pn6NQxzXYu/BBpOgfZWnS51dl7oXrAi43jenHhxI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wyoming";
|
||||
version = "1.5.2";
|
||||
version = "1.5.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "wyoming";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2bc5coKL5KlTeL9fdghPmRF66NXfimHOKGtE2yPXgrA=";
|
||||
hash = "sha256-SOPkvFMjoDQiWVP39+1Cx4fFmPH8wcBhZhaKapdZaeA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -358,6 +358,7 @@ let
|
||||
jqr = [ pkgs.jq.dev ];
|
||||
KFKSDS = [ pkgs.gsl ];
|
||||
kza = [ pkgs.fftw.dev ];
|
||||
LOMAR = [ pkgs.gmp.dev ];
|
||||
lpsymphony = with pkgs; [ pkg-config gfortran gettext ];
|
||||
lwgeom = with pkgs; [ proj geos gdal ];
|
||||
rvg = [ pkgs.libpng.dev ];
|
||||
@@ -986,6 +987,10 @@ let
|
||||
preConfigure = "patchShebangs configure";
|
||||
});
|
||||
|
||||
Cyclops = old.Cyclops.overrideAttrs (attrs: {
|
||||
preConfigure = "patchShebangs configure";
|
||||
});
|
||||
|
||||
RcppParallel = old.RcppParallel.overrideAttrs (attrs: {
|
||||
preConfigure = "patchShebangs configure";
|
||||
});
|
||||
|
||||
@@ -7,22 +7,22 @@
|
||||
|
||||
let
|
||||
pname = "osu-lazer-bin";
|
||||
version = "2024.131.0";
|
||||
version = "2024.219.0";
|
||||
|
||||
src = {
|
||||
aarch64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
|
||||
hash = "sha256-R25TAXU3gUcVKQMo8P+0/vTRzSoFrUdFz11inpch+7A=";
|
||||
hash = "sha256-U7i3rO7NVbBdOFMYpGrjI7LC//TEon3vdAHzjKeGsuk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-darwin = fetchzip {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
|
||||
hash = "sha256-w7BK3pm0XrlzOv0oz+ZUfVRufzUCCfevlRL+RDLtoLU=";
|
||||
hash = "sha256-HEx1ZxxXnsHUD8Cqzld3RQoPZOfiXEmInlUMZVdDt6E=";
|
||||
stripRoot = false;
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
|
||||
hash = "sha256-aNG6s942iTKyvM1XolMqmMs8XxoRYC/ZddCCJl0OtTE=";
|
||||
hash = "sha256-EqQJolzai0LrVpYE6yjbEUURNiUgi9Lw+otdmKIyoXo=";
|
||||
};
|
||||
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
, stdenvNoCC
|
||||
, buildDotnetModule
|
||||
, fetchFromGitHub
|
||||
, dotnetCorePackages
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, ffmpeg
|
||||
@@ -16,18 +17,21 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "osu-lazer";
|
||||
version = "2024.131.0";
|
||||
version = "2024.219.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ppy";
|
||||
repo = "osu";
|
||||
rev = version;
|
||||
hash = "sha256-fsXs/AzvEQ141y/DPRvg7a7b0K30IfjigbRj0qh88rs=";
|
||||
hash = "sha256-xL/dTBcbrxTX1C4E5kfveHzzBNagnEvlAcPPcyYRsQk=";
|
||||
};
|
||||
|
||||
projectFile = "osu.Desktop/osu.Desktop.csproj";
|
||||
nugetDeps = ./deps.nix;
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
dotnet-runtime = dotnetCorePackages.runtime_8_0;
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems ];
|
||||
|
||||
runtimeDeps = [
|
||||
|
||||
Generated
+7
-9
@@ -62,7 +62,7 @@
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; })
|
||||
(fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
|
||||
(fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; })
|
||||
(fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2022.2.3"; sha256 = "0ck4nkk8wlj2gcgs7j4j6z4yqrnf2f5rs2pgwa8kar026sc29xsl"; })
|
||||
(fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2023.3.3"; sha256 = "1cq7lj88r0nwypr157nd99g3wzk00wjinx84vasbga77kfcf4z9n"; })
|
||||
(fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; })
|
||||
(fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; })
|
||||
(fetchNuGet { pname = "MessagePack"; version = "2.5.140"; sha256 = "04iqlvcacbb37yf83xryd24n14dw780xx8dmc1zywi3x2nrqpjm9"; })
|
||||
@@ -125,7 +125,7 @@
|
||||
(fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; })
|
||||
(fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; })
|
||||
(fetchNuGet { pname = "NUnit"; version = "3.14.0"; sha256 = "19p8911lrfds1k9rv47jk1bbn665s0pvghkd06gzbg78j6mzzqqa"; })
|
||||
(fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; })
|
||||
(fetchNuGet { pname = "NVika"; version = "3.0.0"; sha256 = "1v0n9li6lgfb2w4kbgxrs89h6k4s0zkcp73lch20w5c89dlkq26f"; })
|
||||
(fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; sha256 = "14wc2rgnbi2ili6sx9iqnmcbn1zlmbsk49zbiz5cycib6rxkqfdm"; })
|
||||
(fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.4"; sha256 = "0l7vf607i54y1xilr7bmjy9zlxacm00wz42mfbvzjf9rr54sy2pm"; })
|
||||
(fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.4"; sha256 = "1jsw2kwxxskwppk65i52yrxjjgbfbhicpmz30iaxlm68d5m6gwz2"; })
|
||||
@@ -137,15 +137,15 @@
|
||||
(fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; })
|
||||
(fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; })
|
||||
(fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.131.0"; sha256 = "0pa80w67nnfp3y25l5a6f6p9x48lj8bw3b24vzi3l8ndgcmnpyxz"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.217.0"; sha256 = "1rq6jpkkqf7wic2z4dp1l8ig7wf9jl9z80yl0dnm15d6prnkasgk"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.129.0"; sha256 = "032jpqv86z4sc835063gzbshkdzx3qhnzxlyaggidmbwn6i9fja6"; })
|
||||
(fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.207.0"; sha256 = "0960jg0a860f545phscimv5qw6bzijpc4pyplx126zcm1w1cpmfi"; })
|
||||
(fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; })
|
||||
(fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.693-alpha"; sha256 = "15fgd3j9cs3adldiscqm0ffixf68h06wqdz1xy1286z4gczhi954"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g91ce5a6cda"; sha256 = "0m96jkagz1ab3jgmz61d4z7jrxz058nzsamvqz93c90rlw802cvm"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "14qcrvhpvj3w9nr8fcki0j53qxc8bfgflivr989salh0srnlv764"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "1gdwk7s9sdvzrqr2rs9j87nvyl7b47b7m6kkhk1mpz6ryq403nsx"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0w0mimfwdgbywmvq2yv04p65wgi1plhlk1ya012yyxp13vvhfgi8"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0i6bb79kprrmsfphjq26rgxqfvvf12pxr7dfwcq448dw2xgq6rpy"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "06a4kkfidr7yj60xl3k4yfawz4wzwkkjpaki8fmsanif1yhz69l8"; })
|
||||
(fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; sha256 = "09pi4c91ljavilw9kx7kzhcax7ar4zk7zy1qwvqfrqsgxznvyxa1"; })
|
||||
(fetchNuGet { pname = "Realm"; version = "11.5.0"; sha256 = "0r7j5si3n4ncq8xnnjk1q5jjqbj0s1w3ps124y8pgqd14dzvch6a"; })
|
||||
(fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; sha256 = "1ggbmlsf04pxnh1k86hs0wxnvcw0ja2xnn6358qmrp826km0w1g9"; })
|
||||
@@ -307,8 +307,6 @@
|
||||
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; })
|
||||
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "7.0.4"; sha256 = "1khcg2r7i29rpbg4mqxncs6r88s9hbbjzxpj29d13zvd31wypyv9"; })
|
||||
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
|
||||
(fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
|
||||
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{
|
||||
"runtimeOptions": {
|
||||
"tfm": "net6.0",
|
||||
"tfm": "net8.0",
|
||||
"framework": {
|
||||
"name": "Microsoft.NETCore.App",
|
||||
"version": "6.0.0"
|
||||
"version": "8.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,14 +6,14 @@ let
|
||||
# NOTE: When updating these, please also take a look at the changes done to
|
||||
# kernel config in the xanmod version commit
|
||||
ltsVariant = {
|
||||
version = "6.1.76";
|
||||
hash = "sha256-0nBdUFRGMWM3IL/q8CYiDEUA/sIrYPMkzsBQen30o2E=";
|
||||
version = "6.6.17";
|
||||
hash = "sha256-WSWI3UByuD2SrcFC6El3ao0DINeG0IgtrvazDiHaIR0=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.6.15";
|
||||
hash = "sha256-KHn4Ntm1QStgJRWzwmPYXEbEcuZcF4pWJ964wc6J2Wk=";
|
||||
version = "6.7.5";
|
||||
hash = "sha256-achx+rElMOdPUD0qU2TStrlJXZU71E89HVlM4tKf7WE=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
@@ -26,6 +26,11 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"wyoming"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "wyoming-openwakeword";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhasspy";
|
||||
repo = "wyoming-openwakeword";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NceUFsIKZO6DOXae3QJ7JJGc7QdDHkMh20eLvl12p4U=";
|
||||
hash = "sha256-5suYJ+Z6ofVAysoCdHi5b5K0JTYaqeFZ32Cm76wC5LU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{ lib, appimageTools, fetchurl, asar }: let
|
||||
pname = "flexoptix-app";
|
||||
version = "5.16.0-latest";
|
||||
version = "5.20.0-latest";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.AppImage";
|
||||
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
|
||||
hash = "sha256-A10r8IUB3zWKWmjen90vLXPF7V/Cgo+DhFn/Hsc1Nhg=";
|
||||
hash = "sha256-/4vZaVLpSiufjNwwofPi+YBtTJ4aq7eYgFnYFv89LFY=";
|
||||
};
|
||||
|
||||
udevRules = fetchurl {
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
# Get rid of the autoupdater
|
||||
${asar}/bin/asar extract $out/resources/app.asar app
|
||||
sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js
|
||||
patch -p0 < ${./disable-autoupdate.patch}
|
||||
${asar}/bin/asar pack app $out/resources/app.asar
|
||||
'';
|
||||
});
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
--- app/electron/jsComponents/mainWindowEvents.js 2024-02-18 12:53:41.115773007 -0500
|
||||
+++ app/electron/jsComponents/mainWindowEvents.js2 2024-02-18 23:22:20.003280203 -0500
|
||||
@@ -128,7 +128,12 @@
|
||||
|
||||
if (app.isPackaged) {
|
||||
global.mainWindow.webContents.once("did-finish-load", function () {
|
||||
- autoUpdater.checkForUpdates();
|
||||
+ global.mainWindow.loadURL(
|
||||
+ url.format({
|
||||
+ ...global.APPLICATION_URL_OBJECT,
|
||||
+ slashes: true,
|
||||
+ }),
|
||||
+ );
|
||||
});
|
||||
} else {
|
||||
global.mainWindow.webContents.openDevTools();
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "croc";
|
||||
version = "9.6.10";
|
||||
version = "9.6.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schollz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SRSFbqwcMvzXVwwCxjIGnk/TisL3zGP2lQzy14HQrlU=";
|
||||
sha256 = "sha256-iePSDd/CR+YRRbUUszAU8v1oaf7s4kgX1cjTU+WVmOs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mxEDatG1VIPhnk7RUuobGGbUUi7HmeJvyBJFEEx4NMg=";
|
||||
vendorHash = "sha256-pUWUYV1Ts/dFXUzufIWt5ETRQVpxIGzxRFq9jviG0Fs=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jwx";
|
||||
version = "2.0.19";
|
||||
version = "2.0.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lestrrat-go";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JR2Z1XOcTfocaXHA+q6INcIZFeuMjB+G16fRmYjOhzU=";
|
||||
hash = "sha256-+of0eYBwdGC9vb0DDqxMIuhXNTCRRv9iGOIVJGobMxc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-g97cSHGo0nw7Ker+S/qG0awUf1/UdcSkF55BjMyTfAY=";
|
||||
vendorHash = "sha256-HHq4B0MYP2gUtV9ywrXVmWN7OpV6NVb49rVMFblOgPc=";
|
||||
|
||||
sourceRoot = "${src.name}/cmd/jwx";
|
||||
|
||||
|
||||
@@ -31029,8 +31029,6 @@ with pkgs;
|
||||
|
||||
dsf2flac = callPackage ../applications/audio/dsf2flac { };
|
||||
|
||||
dunst = callPackage ../applications/misc/dunst { };
|
||||
|
||||
dust = callPackage ../by-name/du/dust/package.nix {
|
||||
inherit (darwin.apple_sdk_11_0.frameworks) AppKit;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user