nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-24.05 into staging-next-24.05

Browse Source
This commit is contained in:
github-actions[bot]
2024-08-29 00:15:27 +00:00
committed by GitHub
parent edd33e4bb3 66b58d0e1d
commit 02c6148ef7
19 changed files with 22275 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/modules/services/web-servers/varnish/default.nix
View File

@@ -34,10 +34,10 @@ in
stateDir = mkOption {
type = types.path;
default = "/var/spool/varnish/${config.networking.hostName}";
defaultText = literalExpression ''"/var/spool/varnish/''${config.networking.hostName}"'';
default = "/run/varnish/${config.networking.hostName}";
defaultText = literalExpression ''"/run/varnish/''${config.networking.hostName}"'';
description = ''
Directory holding all state for Varnish to run.
Directory holding all state for Varnish to run. Note that this should be a tmpfs in order to avoid performance issues and crashes.
'';
};
@@ -68,11 +68,11 @@ in
description = "Varnish";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
preStart = ''
preStart = mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
mkdir -p ${cfg.stateDir}
chown -R varnish:varnish ${cfg.stateDir}
'';
postStop = ''
postStop = mkIf (!(lib.hasPrefix "/run/" cfg.stateDir)) ''
rm -rf ${cfg.stateDir}
'';
serviceConfig = {
@@ -83,6 +83,7 @@ in
RestartSec = "5s";
User = "varnish";
Group = "varnish";
RuntimeDirectory = mkIf (lib.hasPrefix "/run/" cfg.stateDir) (lib.removePrefix "/run/" cfg.stateDir);
AmbientCapabilities = "cap_net_bind_service";
NoNewPrivileges = true;
LimitNOFILE = 131072;

12
pkgs/applications/misc/obsidian/default.nix
View File

@@ -8,24 +8,25 @@
, writeScript
, undmg
, unzip
, commandLineArgs ? ""
}:
let
inherit (stdenv.hostPlatform) system;
pname = "obsidian";
version = "1.5.12";
version = "1.6.7";
appname = "Obsidian";
meta = with lib; {
description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files";
homepage = "https://obsidian.md";
downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases";
mainProgram = "obsidian";
license = licenses.obsidian;
maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 w-lfchen ];
};
filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz";
filename = if stdenv.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
src = fetchurl {
url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
hash = if stdenv.isDarwin then "sha256-MSJmF5WddxbC/S7w2nWjlDxt5HPUDCoRFwJ2MZMH9Ks=" else "sha256-UQLljP7eZELTuHwX+OylXY+Wy2YK1ZEJX1IQfIvBLe8=";
hash = if stdenv.isDarwin then "sha256-rFXmhlxXlVz5nCrXMmfYGaxe4/wnBRdFxsfiwiIDHgw=" else "sha256-ok1fedN8+OXBisFpVXbKRW2OhE4o9MC9lJmtMMST6V8=";
};
icon = fetchurl {
@@ -52,7 +53,8 @@ let
mkdir -p $out/bin
makeWrapper ${electron}/bin/electron $out/bin/obsidian \
--add-flags $out/share/obsidian/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
--add-flags ${lib.escapeShellArg commandLineArgs}
install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
install -m 444 -D "${desktopItem}/share/applications/"* \

12
pkgs/applications/networking/browsers/microsoft-edge/default.nix
View File

@@ -1,20 +1,20 @@
{
beta = import ./browser.nix {
channel = "beta";
version = "127.0.2651.49";
version = "128.0.2739.5";
revision = "1";
hash = "sha256-fMB7CuC5u8RNbbtFEZWFIIBwZTPkTP9LVs7DCXltGEA=";
hash = "sha256-y+587iVWgPk2a1P/F2iwSW1NEnAJaigL6rlVmqaIDJk=";
};
dev = import ./browser.nix {
channel = "dev";
version = "128.0.2677.1";
version = "128.0.2739.5";
revision = "1";
hash = "sha256-aKrNs44FZNhC/fGT1UvyE2Fx8Q53ahAu91Bu86E49o8=";
hash = "sha256-zY3iGbeYlOoArNNdF1qNwdtp25P0uWJmVMEK7kJIiqQ=";
};
stable = import ./browser.nix {
channel = "stable";
version = "126.0.2592.102";
version = "127.0.2651.86";
revision = "1";
hash = "sha256-xCjtsZoetxlOV77VSbt09cGbpfHUYhTA6WXuZAvD/a4=";
hash = "sha256-1Dh+OoTrghn9ArvEnBZCkLnUf0m0qnkEtCoWjA8QId4=";
};
}

22108
pkgs/by-name/an/antares/npm-lock.patch Normal file
View File

File diff suppressed because it is too large Load Diff

32
pkgs/by-name/an/antares/package.nix
View File

@@ -1,30 +1,34 @@
{ fetchFromGitHub
, lib
, buildNpmPackage
, electron
, nodejs
{
fetchFromGitHub,
lib,
buildNpmPackage,
electron,
nodejs,
fetchpatch,
}:
buildNpmPackage rec {
pname = "antares";
version = "0.7.24";
version = "0.7.28";
src = fetchFromGitHub {
owner = "antares-sql";
repo = "antares";
rev = "v${version}";
hash = "sha256-jMtUDqxWwfXl9x61ycohTaacNAhWawL3Z4+OPW5nbOI=";
hash = "sha256-nEI1G0A1c+xjALbIcItzh4CFxAeQPOD8h+Bs0aYnEfU=";
};
npmDepsHash = "sha256-GC1hdRO8rrM97AMYCxWeNtJhyVdbKgitKLkWX7kGCwg=";
npmDepsHash = "sha256-lSkZTa2zt8BeucOih8XjQ7QW/tg34umIRe4a4DDBW34=";
patches = [
# In version 0.7.28, package-lock is not updated properly so this patch update it to be able to build the package
# This patch will probably be removed in the next version
./npm-lock.patch
];
buildInputs = [ nodejs ];
buildPhase = ''
runHook preBuild
npm run compile
runHook postBuild
'';
npmBuildScript = "compile";
installPhase = ''
runHook preInstall
@@ -36,7 +40,7 @@ buildNpmPackage rec {
runHook postInstall
'';
dontNpmBuild = true;
npmFlags = [ "--legacy-peer-deps" ];
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";

3
pkgs/by-name/bl/blockbench/package.nix
View File

@@ -7,11 +7,10 @@
imagemagick,
copyDesktopItems,
makeDesktopItem,
electron_28,
electron
}:
let
electron = electron_28;
electronDist = "${electron}/${if stdenv.isDarwin then "Applications" else "libexec/electron"}";
in
buildNpmPackage rec {

34
pkgs/by-name/de/departure-mono/package.nix Normal file
View File

@@ -0,0 +1,34 @@
{
lib,
stdenvNoCC,
fetchzip,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "departure-mono";
version = "1.346";
src = fetchzip {
url = "https://departuremono.com/assets/DepartureMono-${finalAttrs.version}.zip";
stripRoot = false;
hash = "sha256-xJVVtLnukcWQKVC3QiHvrfIA3W9EYt/iiphbLYT1iMg=";
};
installPhase = ''
runHook preInstall
install -D -m 444 *.otf -t $out/share/fonts/otf
install -D -m 444 *.woff -t $out/share/fonts/woff
install -D -m 444 *.woff2 -t $out/share/fonts/woff2
runHook postInstall
'';
meta = {
description = "Departure Mono is a monospaced pixel font with a lo-fi technical vibe";
homepage = "https://departuremono.com/";
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ drupol ];
};
})

8
pkgs/applications/audio/feishin/default.nix → pkgs/by-name/fe/feishin/package.nix
View File

@@ -11,13 +11,13 @@
}:
let
pname = "feishin";
version = "0.7.1";
version = "0.7.3";
src = fetchFromGitHub {
owner = "jeffvli";
repo = pname;
rev = "v${version}";
hash = "sha256-eNGHrSF/MgRHh0CVc0l8denZIbAnPXwFCZJZcvF+Xtc=";
hash = "sha256-UOY0wjWGK7sal/qQbbkHjFUIA49QtbO+Ei6hSTOyHWk=";
};
electron = electron_27;
@@ -26,7 +26,7 @@ buildNpmPackage {
inherit pname version;
inherit src;
npmDepsHash = "sha256-7oh5bl5APAvzb/TxHMUP/saRWLwuP9xqGvn7/RDhFk8=";
npmDepsHash = "sha256-FLo8FCpxvh2Iqd3pkpgwRZ4f2viX4iET64VAuXN362g=";
npmFlags = [ "--legacy-peer-deps" ];
makeCacheWritable = true;
@@ -60,7 +60,7 @@ buildNpmPackage {
inherit version;
src = "${src}/release/app";
npmDepsHash = "sha256-NgWPr3mctn7f6X2JFsbdNNHkN84RRlLAywqfbyahCQw=";
npmDepsHash = "sha256-fQV2yqyNZCjeNUekBaXUsND2lIZYYz07YQ6TGoFxT9Q=";
npmFlags = [ "--ignore-scripts" ];
dontNpmBuild = true;

9
pkgs/by-name/ko/koboldcpp/package.nix
View File

@@ -53,13 +53,13 @@ let
in
effectiveStdenv.mkDerivation (finalAttrs: {
pname = "koboldcpp";
version = "1.72";
version = "1.73.1";
src = fetchFromGitHub {
owner = "LostRuins";
repo = "koboldcpp";
rev = "refs/tags/v${finalAttrs.version}";
hash = "sha256-DePcBVNXIWIlOXyNeNMUFFIQxQuwqG8KBUh2/X7R6X8=";
hash = "sha256-LRXtmQ5u+/vgcU6YC9IN2CazfDtg5+jZnJV2o9jEAaY=";
};
enableParallelBuilding = true;
@@ -164,13 +164,14 @@ effectiveStdenv.mkDerivation (finalAttrs: {
passthru.updateScript = gitUpdater { rev-prefix = "v"; };
meta = {
description = "A way to run various GGML and GGUF models";
changelog = "https://github.com/LostRuins/koboldcpp/releases/tag/v${finalAttrs.version}";
description = "Way to run various GGML and GGUF models";
license = lib.licenses.agpl3Only;
mainProgram = "koboldcpp";
maintainers = with lib.maintainers; [
maxstrid
donteatoreo
];
mainProgram = "koboldcpp";
platforms = lib.platforms.unix;
};
})

8
pkgs/by-name/lx/lx-music-desktop/package.nix
View File

@@ -13,24 +13,24 @@
let
pname = "lx-music-desktop";
version = "2.7.0";
version = "2.8.0";
buildUrl = version: arch: "https://github.com/lyswhut/lx-music-desktop/releases/download/v${version}/lx-music-desktop_${version}_${arch}.deb";
srcs = {
x86_64-linux = fetchurl {
url = buildUrl version "amd64";
hash = "sha256-+mCAFfiJwa+RQ/9vnSPDrC1LoLIoZyFUEJAF6sXdqRM=";
hash = "sha256-Kt/foI7NrXV+Ex2DxLRyP3bVFw0Bx4TLuMyBMZD0bDw=";
};
aarch64-linux = fetchurl {
url = buildUrl version "arm64";
hash = "sha256-fDlgHJqoZLGnUuZeZGdocYLbsE02QBrWPKS31fbGThk=";
hash = "sha256-4X4fXb2V/FigArcIgpgkNBa2+mOemPOx/HkxPlx//gw=";
};
armv7l-linux = fetchurl {
url = buildUrl version "armv7l";
hash = "sha256-X6EXsBvTbPGXCJ+ektMCMGDG2zqGKBvWT/TwjGFL3ug=";
hash = "sha256-uWEQYOT4wxg6HWoL18mEpWF8pONl5Bwf/bnoN4X+A7c=";
};
};

6
pkgs/by-name/po/powerpipe/package.nix
View File

@@ -11,16 +11,16 @@
buildGoModule rec {
pname = "powerpipe";
version = "0.4.2";
version = "0.4.3";
src = fetchFromGitHub {
owner = "turbot";
repo = "powerpipe";
rev = "refs/tags/v${version}";
hash = "sha256-wZav0MKnXEcIaO4WttCRJ+0sTabJeHHxL0vyb8qi4w8=";
hash = "sha256-WrjdxLlDvC+rq3bJ0U8pqSJvfqH9Y54BOoWUfb5pMho=";
};
vendorHash = "sha256-2n1fImOLk1KIr2rqvbiw/Ze2LPeNlqaQ7mAdUuS/KQM=";
vendorHash = "sha256-zBwk03aEjWs+CfbIZh0g7absKc5+SNLTVhrctuTpjMk=";
proxyVendor = true;
nativeBuildInputs = [

14
pkgs/by-name/ri/ride/package.nix
View File

@@ -3,6 +3,7 @@
stdenv,
buildNpmPackage,
fetchFromGitHub,
fetchpatch,
substituteAll,
jq,
moreutils,
@@ -10,7 +11,7 @@
makeWrapper,
copyDesktopItems,
makeDesktopItem,
electron_27,
electron,
}:
let
@@ -30,9 +31,6 @@ let
};
platformInfo = platformInfos.${stdenv.system};
# Electron 27 is the latest version that works as of RIDE version 4.5.4097
electron = electron_27;
in
buildNpmPackage rec {
pname = "ride";
@@ -45,9 +43,15 @@ buildNpmPackage rec {
hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc=";
};
npmDepsHash = "sha256-EG3pZkjDGBI2dDaQZ6351+oU4xfHd6HNB8eD7ErpYIg=";
npmDepsHash = "sha256-h+48/9h7/cD8woyA0UCLtzKuE9jCrfpDk6IeoDWnYik=";
patches = [
# Adds support for electron versions >=28
(fetchpatch {
name = "bump-electron-version.patch";
url = "https://github.com/Dyalog/ride/commit/de42ebbd5036cfe0c7e6604296e87cc57ac9d365.patch";
hash = "sha256-5iKSNcxOOo2fKNvy3Rv+AlH3psYhLWLWUY0l8M6mAD4=";
})
# Fix info in the "about" page, set electron version, set local-cache as zipdir
(substituteAll {
src = ./mk.patch;

23
pkgs/development/python-modules/lib4sbom/default.nix
View File

@@ -1,29 +1,35 @@
{
lib,
buildPythonPackage,
defusedxml,
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
pyyaml,
semantic-version,
defusedxml,
pytestCheckHook,
setuptools,
}:
buildPythonPackage rec {
pname = "lib4sbom";
version = "0.7.2";
format = "setuptools";
version = "0.7.3";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "anthonyharrison";
repo = pname;
rev = "v${version}";
hash = "sha256-sjfOCG1E5Of+HPcfRsBwEKmGkhUOIkAARWja81FL2PY=";
repo = "lib4sbom";
rev = "refs/tags/v${version}";
hash = "sha256-RuIvhlLnWf/ayU6tjpHYKvBFqU8ojPwJK/pDIdLrD2s=";
};
build-system = [ setuptools ];
dependencies = [
defusedxml
pyyaml
semantic-version
defusedxml
];
nativeCheckInputs = [ pytestCheckHook ];
@@ -54,6 +60,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Library to ingest and generate SBOMs";
homepage = "https://github.com/anthonyharrison/lib4sbom";
changelog = "https://github.com/anthonyharrison/lib4sbom/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ teatwig ];
};

6
pkgs/development/web/flyctl/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "flyctl";
version = "0.2.114";
version = "0.2.120";
src = fetchFromGitHub {
owner = "superfly";
repo = "flyctl";
rev = "v${version}";
hash = "sha256-NzF+AAZQxQeM+x8tTyiBl0VVYphMKKj3o2koV8JmQtQ";
hash = "sha256-n+EWwjz4+zmwqDGzBRi2rtnxe+mxd906JcqtrbGiz4w=";
};
vendorHash = "sha256-Mujrsgoabx0/+g+IFwNNpI6C532iu/BWHk6xtIPsE+M=";
vendorHash = "sha256-RtHTAigoPlmop9XURD1nw1nCkGJCdYwFUnp5AWp3x3M=";
subPackages = [ "." ];

96
pkgs/games/heroic/default.nix
View File

@@ -1,48 +1,40 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchYarnDeps
, yarn
, fixup-yarn-lock
, pnpm
, nodejs
, python3
, makeWrapper
, electron
, vulkan-helper
, gogdl
, legendary-gl
, nile
, comet-gog
}:
let appName = "heroic";
in stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "heroic-unwrapped";
version = "2.14.1";
version = "2.15.1";
src = fetchFromGitHub {
owner = "Heroic-Games-Launcher";
repo = "HeroicGamesLauncher";
rev = "v${version}";
hash = "sha256-AnyltqNP+XyVzgCobM3g6DIXntD3spKecYtCRx+8oic=";
rev = "v${finalAttrs.version}";
hash = "sha256-+OQRcBOf9Y34DD7FOp/3SO05mREG6or/HPiOkasHWPM=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-3CYSw1Qy363eyhy3UyFgihSau+miNHwvKjhlq/kWxWQ=";
pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src;
hash = "sha256-3PiB8CT7wxGmvRuQQ5FIAmBqBm9+R55ry+N/qUYWzuk=";
};
nativeBuildInputs = [
yarn
fixup-yarn-lock
nodejs
python3
pnpm.configHook
makeWrapper
];
patches = [
# Reverts part of upstream PR 2761 so that we don't have to use a non-free Electron fork.
# https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/2761
./remove-drm-support.patch
# Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic.
./fix-non-steam-shortcuts.patch
];
@@ -51,64 +43,52 @@ in stdenv.mkDerivation rec {
# We are not packaging this as an Electron application bundle, so Electron
# reports to the application that is is not "packaged", which causes Heroic
# to take some incorrect codepaths meant for development environments.
substituteInPlace src/**/*.ts --replace 'app.isPackaged' 'true'
'';
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
yarn config --offline set yarn-offline-mirror $offlineCache
fixup-yarn-lock yarn.lock
yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
patchShebangs node_modules/
runHook postConfigure
substituteInPlace src/**/*.ts --replace-quiet 'app.isPackaged' 'true'
'';
buildPhase = ''
runHook preBuild
yarn --offline vite build
pnpm --offline electron-vite build
# Remove dev dependencies.
yarn install --production --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
pnpm --ignore-scripts prune --prod
# Clean up broken symlinks left behind by `pnpm prune`
find node_modules/.bin -xtype l -delete
runHook postBuild
'';
# --disable-gpu-compositing is to work around upstream bug
# https://github.com/electron/electron/issues/32317
installPhase = let
binPlatform = if stdenv.isDarwin then "darwin" else "linux";
in ''
installPhase = ''
runHook preInstall
mkdir -p $out/share/{applications,${appName}}
cp -r . $out/share/${appName}
rm -rf $out/share/${appName}/{.devcontainer,.vscode,.husky,.idea,.github}
mkdir -p $out/share/{applications,heroic}
cp -r . $out/share/heroic
rm -rf $out/share/heroic/{.devcontainer,.vscode,.husky,.idea,.github}
chmod -R u+w "$out/share/${appName}/public/bin" "$out/share/${appName}/build/bin"
rm -rf "$out/share/${appName}/public/bin" "$out/share/${appName}/build/bin"
mkdir -p "$out/share/${appName}/build/bin/${binPlatform}"
chmod -R u+w "$out/share/heroic/public/bin" "$out/share/heroic/build/bin"
rm -rf "$out/share/heroic/public/bin" "$out/share/heroic/build/bin"
mkdir -p "$out/share/heroic/build/bin/x64/linux"
ln -s \
"${gogdl}/bin/gogdl" \
"${legendary-gl}/bin/legendary" \
"${nile}/bin/nile" \
"${lib.optionalString stdenv.isLinux "${vulkan-helper}/bin/vulkan-helper"}" \
"$out/share/${appName}/build/bin/${binPlatform}"
"${lib.getExe gogdl}" \
"${lib.getExe legendary-gl}" \
"${lib.getExe nile}" \
"${lib.getExe comet-gog}" \
"${lib.getExe vulkan-helper}" \
"$out/share/heroic/build/bin/x64/linux/"
makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \
--inherit-argv0 \
--add-flags --disable-gpu-compositing \
--add-flags $out/share/${appName} \
--add-flags $out/share/heroic \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
substituteInPlace "$out/share/${appName}/flatpak/com.heroicgameslauncher.hgl.desktop" \
--replace "Exec=heroic-run" "Exec=heroic"
substituteInPlace "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" \
--replace-fail "Exec=heroic-run" "Exec=heroic"
mkdir -p "$out/share/applications" "$out/share/icons/hicolor/512x512/apps"
ln -s "$out/share/${appName}/flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications"
ln -s "$out/share/${appName}/flatpak/com.heroicgameslauncher.hgl.png" "$out/share/icons/hicolor/512x512/apps"
ln -s "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.desktop" "$out/share/applications"
ln -s "$out/share/heroic/flatpak/com.heroicgameslauncher.hgl.png" "$out/share/icons/hicolor/512x512/apps"
runHook postInstall
'';
@@ -119,7 +99,11 @@ in stdenv.mkDerivation rec {
changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases";
license = licenses.gpl3Only;
maintainers = with maintainers; [ aidalgol ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
mainProgram = appName;
# Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
# It may also work on other Linux targets, but all the game stores only
# support x86 Linux, so it would require extra hacking to run games via QEMU
# user emulation. Upstream provide Linux builds only for x86_64.
platforms = [ "x86_64-linux" ];
mainProgram = "heroic";
};
}
})

1
pkgs/games/heroic/fhsenv.nix
View File

@@ -78,6 +78,7 @@ buildFHSEnv {
glib
gnutls
gtk3
icu
lcms2
libevdev
libgcrypt

28
pkgs/games/heroic/remove-drm-support.patch
View File

@@ -1,28 +0,0 @@
diff --git a/src/backend/main.ts b/src/backend/main.ts
index 83b58bb2..f61656fa 100644
--- a/src/backend/main.ts
+++ b/src/backend/main.ts
@@ -19,7 +19,6 @@ import {
protocol,
screen,
clipboard,
- components,
session
} from 'electron'
import 'backend/updater'
@@ -310,14 +309,7 @@ if (!gotTheLock) {
}
if (!process.env.CI) {
- await components.whenReady().catch((e) => {
- logError([
- 'Failed to download / update DRM components.',
- 'Make sure you do not block update.googleapis.com domain if you want to use WideVine in Browser sideloaded apps',
- e
- ])
- })
- logInfo(['DRM module staus', components.status()])
+ logInfo('DRM modules disabled for nixpkgs')
}
// try to fix notification app name on windows

10
pkgs/servers/monitoring/grafana/default.nix
View File

@@ -21,7 +21,7 @@ let
in
buildGoModule rec {
pname = "grafana";
version = "10.4.7";
version = "10.4.8";
subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];
@@ -29,7 +29,7 @@ buildGoModule rec {
owner = "grafana";
repo = "grafana";
rev = "v${version}";
hash = "sha256-77biSeoLPesSy/GpPGnyZrBWJuJbrlFa79Cyc1IQH0c=";
hash = "sha256-mvPSQp/y0jyNgJ41A4AyY5pOsy+VLs1dcgcgfwlJg6U=";
};
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -65,16 +65,16 @@ buildGoModule rec {
dontFixup = true;
outputHashMode = "recursive";
outputHash = rec {
x86_64-linux = "sha256-mgRHCeqI0KmDETFhNMRwAk8XYep6mxSDLD/J/SZ8kxU=";
x86_64-linux = "sha256-BKvYnXgk7JNkjnka7Co/AfI3d+j/OapXLjS47yoSVPI=";
aarch64-linux = x86_64-linux;
aarch64-darwin = "sha256-fUCgsxgSFoMgKLUGJW2G516o4Nwi1HZ65EHdmByx4mQ=";
aarch64-darwin = "sha256-Rr3NSHrb8aYt1gEfv2huexA2O/6zVIzdM56pTWSob6s=";
x86_64-darwin = aarch64-darwin;
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
disallowedRequisites = [ offlineCache ];
vendorHash = "sha256-ntfRKUKsZEtqDykZloIddG39AbCt5tzWUKI0kpARMUo=";
vendorHash = "sha256-gP/lW6CXQpBv9dPRTOV5+vmaqTcq+91X2jls9gDrnm0=";
proxyVendor = true;

12
pkgs/top-level/all-packages.nix
View File

@@ -17907,6 +17907,10 @@ with pkgs;
ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
antares = callPackage ../by-name/an/antares/package.nix {
electron = electron_30;
};
antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };
@@ -30961,8 +30965,6 @@ with pkgs;
imlib2 = imlib2Full;
};
feishin = callPackage ../applications/audio/feishin { };
feishu = callPackage ../applications/networking/instant-messengers/feishu { };
filezilla = darwin.apple_sdk_11_0.callPackage ../applications/networking/ftp/filezilla {
@@ -33398,9 +33400,7 @@ with pkgs;
obs-studio-plugins = recurseIntoAttrs (callPackage ../applications/video/obs-studio/plugins {});
wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { };
obsidian = callPackage ../applications/misc/obsidian {
electron = electron_28;
};
obsidian = callPackage ../applications/misc/obsidian { };
octoprint = callPackage ../applications/misc/octoprint { };
@@ -36250,7 +36250,7 @@ with pkgs;
heroic-unwrapped = callPackage ../games/heroic {
# Match the version used by the upstream package.
electron = electron_29;
electron = electron_31;
};
heroic = callPackage ../games/heroic/fhsenv.nix { };