Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
46f11e0147
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
x86_64-linux = "/nix/store/0n2wfvi1i3fg97cjc54wslvk0804y0sn-nix-2.7.0";
|
||||
i686-linux = "/nix/store/4p27c1k9z99pli6x8cxfph20yfyzn9nh-nix-2.7.0";
|
||||
aarch64-linux = "/nix/store/r9yr8ijsb0gi9r7y92y3yzyld59yp0kj-nix-2.7.0";
|
||||
x86_64-darwin = "/nix/store/hyfj5imsd0c4amlcjpf8l6w4q2draaj3-nix-2.7.0";
|
||||
aarch64-darwin = "/nix/store/9l96qllhbb6xrsjaai76dn74ap7rq92n-nix-2.7.0";
|
||||
x86_64-linux = "/nix/store/yx36yzxpw1hn4fz8iyf1rfyd56jg3yf4-nix-2.8.0";
|
||||
i686-linux = "/nix/store/c0hg806zvwg800qbszzj8ff4a224kjgf-nix-2.8.0";
|
||||
aarch64-linux = "/nix/store/wic2832ll53q392r2wks4xr2nrk7p8p5-nix-2.8.0";
|
||||
x86_64-darwin = "/nix/store/5yqdvnkmkrhl36xh0qy31pymdphjimdd-nix-2.8.0";
|
||||
aarch64-darwin = "/nix/store/izc9592szrnpv8n86hr88bhpyc9g6b4s-nix-2.8.0";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@ let
|
|||
favorite-apps=[ 'org.gnome.Epiphany.desktop', 'org.gnome.Geary.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop' ]
|
||||
'';
|
||||
|
||||
nixos-background-ligtht = pkgs.nixos-artwork.wallpapers.simple-blue;
|
||||
nixos-background-dark = pkgs.nixos-artwork.wallpapers.simple-dark-gray;
|
||||
|
||||
nixos-gsettings-desktop-schemas = let
|
||||
defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome.gnome-shell ];
|
||||
in
|
||||
|
|
@ -42,11 +45,11 @@ let
|
|||
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
|
||||
cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
|
||||
[org.gnome.desktop.background]
|
||||
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-blue.gnomeFilePath}'
|
||||
picture-uri-dark='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}'
|
||||
picture-uri='file://${nixos-background-ligtht.gnomeFilePath}'
|
||||
picture-uri-dark='file://${nixos-background-dark.gnomeFilePath}'
|
||||
|
||||
[org.gnome.desktop.screensaver]
|
||||
picture-uri='file://${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}'
|
||||
picture-uri='file://${nixos-background-dark.gnomeFilePath}'
|
||||
|
||||
${cfg.favoriteAppsOverride}
|
||||
|
||||
|
|
@ -56,6 +59,26 @@ let
|
|||
${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
|
||||
'';
|
||||
|
||||
nixos-background-info = pkgs.writeTextFile rec {
|
||||
name = "nixos-background-info";
|
||||
text = ''
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
|
||||
<wallpapers>
|
||||
<wallpaper deleted="false">
|
||||
<name>Blobs</name>
|
||||
<filename>${nixos-background-ligtht.gnomeFilePath}</filename>
|
||||
<filename-dark>${nixos-background-dark.gnomeFilePath}</filename-dark>
|
||||
<options>zoom</options>
|
||||
<shade_type>solid</shade_type>
|
||||
<pcolor>#3a4ba0</pcolor>
|
||||
<scolor>#2f302f</scolor>
|
||||
</wallpaper>
|
||||
</wallpapers>
|
||||
'';
|
||||
destination = "/share/gnome-background-properties/nixos.xml";
|
||||
};
|
||||
|
||||
flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;
|
||||
flashbackWms = optional cfg.flashback.enableMetacity {
|
||||
wmName = "metacity";
|
||||
|
|
@ -431,6 +454,7 @@ in
|
|||
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
|
||||
environment.systemPackages = with pkgs.gnome; [
|
||||
adwaita-icon-theme
|
||||
nixos-background-info
|
||||
gnome-backgrounds
|
||||
gnome-bluetooth
|
||||
gnome-color-manager
|
||||
|
|
@ -439,8 +463,6 @@ in
|
|||
gnome-shell-extensions
|
||||
gnome-themes-extra
|
||||
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
|
||||
pkgs.nixos-artwork.wallpapers.simple-dark-gray
|
||||
pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom
|
||||
pkgs.gnome-user-docs
|
||||
pkgs.orca
|
||||
pkgs.glib # for gsettings
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
{ pname, version, src, branchName
|
||||
, stdenv, lib, wrapQtAppsHook
|
||||
, cmake, pkg-config
|
||||
, libpulseaudio, libjack2, alsa-lib, sndio
|
||||
, vulkan-loader, vulkan-headers
|
||||
, qtbase, qtwebengine, qttools
|
||||
, nlohmann_json, rapidjson
|
||||
, zlib, zstd, libzip, lz4
|
||||
, glslang
|
||||
, boost173
|
||||
, catch2
|
||||
, fmt_8
|
||||
, SDL2
|
||||
, udev
|
||||
, libusb1
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
buildInputs = [
|
||||
libpulseaudio libjack2 alsa-lib sndio
|
||||
vulkan-loader vulkan-headers
|
||||
qtbase qtwebengine qttools
|
||||
nlohmann_json rapidjson
|
||||
zlib zstd libzip lz4
|
||||
glslang
|
||||
boost173
|
||||
catch2
|
||||
fmt_8
|
||||
SDL2
|
||||
udev
|
||||
libusb1
|
||||
ffmpeg
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DYUZU_USE_BUNDLED_QT=OFF"
|
||||
"-DYUZU_USE_BUNDLED_SDL2=OFF"
|
||||
"-DYUZU_USE_BUNDLED_FFMPEG=OFF"
|
||||
"-DENABLE_QT_TRANSLATION=ON"
|
||||
"-DYUZU_USE_QT_WEB_ENGINE=ON"
|
||||
"-DUSE_DISCORD_PRESENCE=ON"
|
||||
];
|
||||
|
||||
# This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
|
||||
# making the build fail, as that path does not exist
|
||||
dontFixCmake = true;
|
||||
|
||||
preConfigure = ''
|
||||
# Trick the configure system. This prevents a check for submodule directories.
|
||||
rm -f .gitmodules
|
||||
|
||||
# see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
|
||||
cmakeFlagsArray+=(
|
||||
"-DTITLE_BAR_FORMAT_IDLE=yuzu ${branchName} ${version}"
|
||||
"-DTITLE_BAR_FORMAT_RUNNING=yuzu ${branchName} ${version} | {3}"
|
||||
)
|
||||
'';
|
||||
|
||||
# Fix vulkan detection
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/yuzu --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
wrapProgram $out/bin/yuzu-cmd --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://yuzu-emu.org";
|
||||
description = "The ${branchName} branch of an experimental Nintendo Switch emulator written in C++";
|
||||
longDescription = ''
|
||||
An experimental Nintendo Switch emulator written in C++.
|
||||
Using the mainline branch is recommanded for general usage.
|
||||
Using the early-access branch is recommanded if you would like to try out experimental features, with a cost of stability.
|
||||
'';
|
||||
license = with licenses; [
|
||||
gpl2Plus
|
||||
# Icons
|
||||
cc-by-nd-30 cc0
|
||||
];
|
||||
maintainers = with maintainers; [ ivar joshuafern sbruder ];
|
||||
platforms = platforms.linux;
|
||||
broken = stdenv.isAarch64; # Currently aarch64 is not supported.
|
||||
};
|
||||
}
|
||||
1
pkgs/applications/emulators/yuzu/compatibility-list.json
Normal file
1
pkgs/applications/emulators/yuzu/compatibility-list.json
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -1,28 +1,40 @@
|
|||
{ branch ? "mainline", libsForQt5, fetchFromGitHub }:
|
||||
{ branch ? "mainline"
|
||||
, libsForQt5
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
let
|
||||
inherit libsForQt5 fetchFromGitHub;
|
||||
# Fetched from https://api.yuzu-emu.org/gamedb, last updated 2022-03-23.
|
||||
# Please make sure to update this when updating yuzu!
|
||||
compat-list = ./compatibility-list.json;
|
||||
in {
|
||||
mainline = libsForQt5.callPackage ./base.nix rec {
|
||||
mainline = libsForQt5.callPackage ./generic.nix rec {
|
||||
pname = "yuzu-mainline";
|
||||
version = "953";
|
||||
branchName = branch;
|
||||
version = "992";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuzu-emu";
|
||||
repo = "yuzu-mainline";
|
||||
rev = "mainline-0-${version}";
|
||||
sha256 = "0p07gybyhr6flzmhz92qlrwcq7l37c2wmcxw8sbrvhj2pgaaw9ic";
|
||||
sha256 = "1x3fwwdw86jvygbzy9k99j6avfsd867ywm2x25izw10jznpsaixs";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
inherit branch compat-list;
|
||||
};
|
||||
early-access = libsForQt5.callPackage ./base.nix rec {
|
||||
|
||||
early-access = libsForQt5.callPackage ./generic.nix rec {
|
||||
pname = "yuzu-ea";
|
||||
version = "2557";
|
||||
branchName = branch;
|
||||
version = "2690";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pineappleEA";
|
||||
repo = "pineapple-src";
|
||||
rev = "EA-${version}";
|
||||
sha256 = "013xxgyn8y5fv0xbrm0zfl9xmi0gx4hpflrbjskg1hcvb2bjqyvj";
|
||||
sha256 = "0zm06clbdh9cccq9932q9v976q7sjknynkdvvp04h1wcskmrxi3c";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
inherit branch compat-list;
|
||||
};
|
||||
}.${branch}
|
||||
|
|
|
|||
157
pkgs/applications/emulators/yuzu/generic.nix
Normal file
157
pkgs/applications/emulators/yuzu/generic.nix
Normal file
|
|
@ -0,0 +1,157 @@
|
|||
{ pname
|
||||
, version
|
||||
, src
|
||||
, branch
|
||||
, compat-list
|
||||
|
||||
, lib
|
||||
, stdenv
|
||||
, runCommandLocal
|
||||
, substituteAll
|
||||
, wrapQtAppsHook
|
||||
, alsa-lib
|
||||
, boost
|
||||
, catch2
|
||||
, cmake
|
||||
, doxygen
|
||||
, ffmpeg
|
||||
, fmt_8
|
||||
, glslang
|
||||
, libjack2
|
||||
, libopus
|
||||
, libpulseaudio
|
||||
, libusb1
|
||||
, libva
|
||||
, libzip
|
||||
, lz4
|
||||
, nlohmann_json
|
||||
, perl
|
||||
, pkg-config
|
||||
, python3
|
||||
, qtbase
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, rapidjson
|
||||
, SDL2
|
||||
, sndio
|
||||
, speexdsp
|
||||
, udev
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, zlib
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
perl
|
||||
pkg-config
|
||||
python3
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
boost
|
||||
catch2
|
||||
ffmpeg
|
||||
fmt_8
|
||||
glslang
|
||||
libjack2
|
||||
libopus
|
||||
libpulseaudio
|
||||
libusb1
|
||||
libva
|
||||
libzip
|
||||
lz4
|
||||
nlohmann_json
|
||||
qtbase
|
||||
qttools
|
||||
qtwebengine
|
||||
rapidjson
|
||||
SDL2
|
||||
sndio
|
||||
speexdsp
|
||||
udev
|
||||
zlib
|
||||
zstd
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
|
||||
# making the build fail, as that path does not exist
|
||||
dontFixCmake = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DYUZU_USE_BUNDLED_QT=OFF"
|
||||
"-DYUZU_USE_BUNDLED_FFMPEG=OFF"
|
||||
"-DYUZU_USE_BUNDLED_OPUS=OFF"
|
||||
"-DYUZU_USE_EXTERNAL_SDL2=OFF"
|
||||
|
||||
"-DENABLE_QT_TRANSLATION=ON"
|
||||
"-DYUZU_USE_QT_WEB_ENGINE=ON"
|
||||
"-DUSE_DISCORD_PRESENCE=ON"
|
||||
|
||||
# We dont want to bother upstream with potentially outdated compat reports
|
||||
"-DYUZU_ENABLE_COMPATIBILITY_REPORTING=OFF"
|
||||
"-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
# This prevents a check for submodule directories.
|
||||
rm -f .gitmodules
|
||||
|
||||
# see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
|
||||
cmakeFlagsArray+=(
|
||||
"-DTITLE_BAR_FORMAT_IDLE=yuzu ${branch} ${version}"
|
||||
"-DTITLE_BAR_FORMAT_RUNNING=yuzu ${branch} ${version} | {3}"
|
||||
)
|
||||
'';
|
||||
|
||||
# This must be done after cmake finishes as it overwrites the file
|
||||
postConfigure = ''
|
||||
ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json
|
||||
'';
|
||||
|
||||
# Fix vulkan detection
|
||||
postFixup = ''
|
||||
for bin in $out/bin/yuzu $out/bin/yuzu-cmd; do
|
||||
wrapProgram $bin --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib
|
||||
done
|
||||
'';
|
||||
|
||||
passthru.updateScript = runCommandLocal "yuzu-${branch}-updateScript" {
|
||||
script = substituteAll {
|
||||
src = ./update.sh;
|
||||
inherit branch;
|
||||
};
|
||||
} "install -Dm755 $script $out";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://yuzu-emu.org";
|
||||
changelog = "https://yuzu-emu.org/entry";
|
||||
description = "The ${branch} branch of an experimental Nintendo Switch emulator written in C++";
|
||||
longDescription = ''
|
||||
An experimental Nintendo Switch emulator written in C++.
|
||||
Using the mainline branch is recommanded for general usage.
|
||||
Using the early-access branch is recommanded if you would like to try out experimental features, with a cost of stability.
|
||||
'';
|
||||
mainProgram = "yuzu";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = with licenses; [
|
||||
gpl3Plus
|
||||
# Icons
|
||||
cc-by-nd-30 cc0
|
||||
];
|
||||
maintainers = with maintainers; [
|
||||
ivar
|
||||
joshuafern
|
||||
sbruder
|
||||
];
|
||||
};
|
||||
}
|
||||
102
pkgs/applications/emulators/yuzu/update.sh
Executable file
102
pkgs/applications/emulators/yuzu/update.sh
Executable file
|
|
@ -0,0 +1,102 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nix nix-prefetch-git coreutils curl jq gnused
|
||||
|
||||
set -e
|
||||
|
||||
# Will be replaced with the actual branch when running this from passthru.updateScript
|
||||
BRANCH="@branch@"
|
||||
|
||||
if [[ ! "$(basename $PWD)" = "yuzu" ]]; then
|
||||
echo "error: Script must be ran from yuzu's directory!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
getLocalVersion() {
|
||||
pushd ../../../.. >/dev/null
|
||||
nix eval --raw -f default.nix "$1".version
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
getLocalHash() {
|
||||
pushd ../../../.. >/dev/null
|
||||
nix eval --raw -f default.nix "$1".src.drvAttrs.outputHash
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
updateCompatList() {
|
||||
NEW_COMPAT_LIST="$(curl -s "https://api.yuzu-emu.org/gamedb")"
|
||||
|
||||
if [[ "$(cat ./compatibility-list.json)" = "${NEW_COMPAT_LIST}" ]]; then
|
||||
echo "Compatibility list is already up to date!"
|
||||
else
|
||||
local TODAY="$(date +"%Y-%m-%d")"
|
||||
|
||||
echo "Compatibility list: updated to $TODAY"
|
||||
echo "${NEW_COMPAT_LIST}" > ./compatibility-list.json
|
||||
|
||||
sed -i -e "s/last updated .*/last updated $TODAY./" ./default.nix
|
||||
fi
|
||||
}
|
||||
|
||||
updateMainline() {
|
||||
OLD_MAINLINE_VERSION="$(getLocalVersion "yuzu-mainline")"
|
||||
OLD_MAINLINE_HASH="$(getLocalHash "yuzu-mainline")"
|
||||
|
||||
NEW_MAINLINE_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
|
||||
"https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" | jq -r '.[0].name' | cut -d" " -f2)"
|
||||
|
||||
if [[ "${OLD_MAINLINE_VERSION}" = "${NEW_MAINLINE_VERSION}" ]]; then
|
||||
echo "yuzu-mainline is already up to date!"
|
||||
|
||||
[ "$KEEP_GOING" ] && return || exit
|
||||
else
|
||||
echo "yuzu-mainline: ${OLD_MAINLINE_VERSION} -> ${NEW_MAINLINE_VERSION}"
|
||||
fi
|
||||
|
||||
echo " Fetching source code..."
|
||||
|
||||
NEW_MAINLINE_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "mainline-0-${NEW_MAINLINE_VERSION}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')"
|
||||
|
||||
echo " Succesfully fetched. hash: ${NEW_MAINLINE_HASH}"
|
||||
|
||||
sed -i "s/${OLD_MAINLINE_VERSION}/${NEW_MAINLINE_VERSION}/" ./default.nix
|
||||
sed -i "s/${OLD_MAINLINE_HASH}/${NEW_MAINLINE_HASH}/" ./default.nix
|
||||
}
|
||||
|
||||
updateEarlyAccess() {
|
||||
OLD_EA_VERSION="$(getLocalVersion "yuzu-ea")"
|
||||
OLD_EA_HASH="$(getLocalHash "yuzu-ea")"
|
||||
|
||||
NEW_EA_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
|
||||
"https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].name' | cut -d"-" -f2 | cut -d" " -f1)"
|
||||
|
||||
if [[ "${OLD_EA_VERSION}" = "${NEW_EA_VERSION}" ]]; then
|
||||
echo "yuzu-ea is already up to date!"
|
||||
|
||||
[ "$KEEP_GOING" ] && return || exit
|
||||
else
|
||||
echo "yuzu-ea: ${OLD_EA_VERSION} -> ${NEW_EA_VERSION}"
|
||||
fi
|
||||
|
||||
echo " Fetching source code..."
|
||||
|
||||
NEW_EA_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "EA-${NEW_EA_VERSION}" "https://github.com/pineappleEA/pineapple-src" | jq -r '.sha256')"
|
||||
|
||||
echo " Succesfully fetched. hash: ${NEW_EA_HASH}"
|
||||
|
||||
sed -i "s/${OLD_EA_VERSION}/${NEW_EA_VERSION}/" ./default.nix
|
||||
sed -i "s/${OLD_EA_HASH}/${NEW_EA_HASH}/" ./default.nix
|
||||
}
|
||||
|
||||
if [[ "$BRANCH" = "mainline" ]]; then
|
||||
updateMainline
|
||||
updateCompatList
|
||||
elif [[ "$BRANCH" = "early-access" ]]; then
|
||||
updateEarlyAccess
|
||||
updateCompatList
|
||||
else
|
||||
KEEP_GOING=1
|
||||
updateMainline
|
||||
updateEarlyAccess
|
||||
updateCompatList
|
||||
fi
|
||||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "hydrus";
|
||||
version = "481";
|
||||
version = "482";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hydrusnetwork";
|
||||
repo = "hydrus";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-6I4vLJj5WzC2bCtQYnoLGOL6N6pKFU+PZQqaOqhZhWU=";
|
||||
sha256 = "sha256-b7zMHwsyZv4dCn4Gd/2a+MHhT3IHISJup/zm95pEcQ4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ with lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "veracrypt";
|
||||
version = "1.24-Update7";
|
||||
version = "1.25.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2";
|
||||
sha256 = "0i7h44zn2mjzgh416l7kfs0dk6qc7b1bxsaxqqqcvgrpl453n7bc";
|
||||
sha256 = "sha256-drbhgYS8IaQdKUn/Y9ch1JBUpxbO/zpL13tcNRC3lK8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
34
pkgs/applications/networking/alpnpass/default.nix
Normal file
34
pkgs/applications/networking/alpnpass/default.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "alpnpass";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VerSprite";
|
||||
repo = "alpnpass";
|
||||
rev = version;
|
||||
hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Inspect the plaintext payload inside of proxied TLS connections";
|
||||
longDescription = ''
|
||||
This tool will listen on a given port, strip SSL encryption,
|
||||
forward traffic through a plain TCP proxy,
|
||||
then encrypt the returning traffic again
|
||||
and send it to the target of your choice.
|
||||
|
||||
Unlike most SSL stripping solutions this tool will negotiate ALPN and
|
||||
preserve the negotiated protocol all the way to the target.
|
||||
'';
|
||||
homepage = "https://github.com/VerSprite/alpnpass";
|
||||
license = licenses.unlicense;
|
||||
maintainers = [ maintainers.raboof ];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,12 +16,12 @@ with lib;
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "gitea";
|
||||
version = "1.16.5";
|
||||
version = "1.16.6";
|
||||
|
||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||
src = fetchurl {
|
||||
url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
|
||||
sha256 = "sha256-2aqy6DV8oaIur/syg1bk41Wo+FGk3m+05+tUyoDwGHs=";
|
||||
sha256 = "sha256-LlAnTTFuqbMa7QPf51D6+RalWuYqTKlSlxGXyt4h0aE=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
|
|||
|
|
@ -14,6 +14,22 @@ let
|
|||
mkdir -p $out/share/backgrounds/nixos
|
||||
ln -s $src $out/share/backgrounds/nixos/${src.name}
|
||||
|
||||
mkdir -p $out/share/gnome-background-properties/
|
||||
cat <<EOF > $out/share/gnome-background-properties/${name}.xml
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
|
||||
<wallpapers>
|
||||
<wallpaper deleted="false">
|
||||
<name>${name}</name>
|
||||
<filename>${src}</filename>
|
||||
<options>zoom</options>
|
||||
<shade_type>solid</shade_type>
|
||||
<pcolor>#ffffff</pcolor>
|
||||
<scolor>#000000</scolor>
|
||||
</wallpaper>
|
||||
</wallpapers>
|
||||
EOF
|
||||
|
||||
# TODO: is this path still needed?
|
||||
mkdir -p $out/share/artwork/gnome
|
||||
ln -s $src $out/share/artwork/gnome/${src.name}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libraspberrypi";
|
||||
version = "unstable-2021-10-25";
|
||||
version = "unstable-2022-03-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "userland";
|
||||
rev = "0093675e4aa6e152a3ffc318b51a124e96eb287b";
|
||||
sha256 = "qpooQy9k2UZ94KaqlFwurV+tt0GrBSRffGdlvMcn1XU=";
|
||||
rev = "c4fd1b8986c6d6d4ae5cd51e65a8bbeb495dfa4e";
|
||||
hash = "sha256-sAfpfq7C9HXVS7ym3UFIO6bpEIWFCOfVCSN2n5q1RNg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dropbox";
|
||||
version = "11.29.0";
|
||||
version = "11.30.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "dropbox";
|
||||
repo = "dropbox-sdk-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-TKJb34hJYzZtQcqgopLpN8c1utWCNjmev9epY+hYU7M=";
|
||||
sha256 = "sha256-pq/LkyOCS0PnujfN9aIx42aeZ8tw4XvRQ4Vid/nXgWE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,21 +2,26 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gomplate";
|
||||
version = "3.9.0";
|
||||
version = "3.10.0";
|
||||
owner = "hairyhenderson";
|
||||
rev = "v${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner rev;
|
||||
repo = pname;
|
||||
sha256 = "sha256-liy8cqn+hWoTOHchCY1LLu23tNvz7eGA+AN0d0APjC4=";
|
||||
sha256 = "0dbi9saxbwcvypxc0s656ln9zq2vysx8dhrcz488nmy6rcpqiiah";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Ph9z/Tom7O7V7yZ/On+etty+Bl653HiY/J3d3yfweeQ=";
|
||||
vendorSha256 = "0rvki8ghlbbaqgnjfsbs1jswj08jfzmnz9ilynv2c6kfkx9zs108";
|
||||
|
||||
# some tests require network access
|
||||
postPatch = ''
|
||||
rm net/net_test.go
|
||||
# some tests require network access
|
||||
rm net/net_test.go \
|
||||
internal/tests/integration/datasources_blob_test.go \
|
||||
internal/tests/integration/datasources_git_test.go
|
||||
# some tests rely on external tools we'd rather not depend on
|
||||
rm internal/tests/integration/datasources_consul_test.go \
|
||||
internal/tests/integration/datasources_vault*_test.go
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -2,56 +2,96 @@
|
|||
, lib
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, autoPatchelfHook
|
||||
, writeShellScript
|
||||
, curl
|
||||
, jq
|
||||
, common-updater-scripts
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.8.0";
|
||||
|
||||
sources = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "0bgd4hnpaxrqw0s0y2qiak8lbskfi2cqp147vj1kbhvm8834hwhg";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
|
||||
sha256 = "06lf642m4imz8xvwipflmvjy1ih7k8bx8jpay0xawvilh14pqz8f";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
|
||||
sha256 = "0rddafjgdnj3na96x83paq5z14grj46v4iv38qbkvmdllrj26a0a";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
|
||||
sha256 = "YWiZnYdsW7dyQ0IeKeC1U00ZIdJRnzs9keeQTEU2ozA=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
|
||||
sha256 = "391b0d239b11095bb8515cb60ee95f02d5862fcb509724081f314819967206b6";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "blackfire";
|
||||
version = "2.5.2";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
|
||||
sha256 = "1RO5yabSNpIz5lWXngMOZ1S2vtnLEkXIj1ZoIinRrQ0=";
|
||||
};
|
||||
src = sources.${stdenv.hostPlatform.system};
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
autoPatchelfHook
|
||||
];
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ dpkg ];
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
dpkg-deb -x $src $out
|
||||
mv $out/usr/* $out
|
||||
rmdir $out/usr
|
||||
if ${ lib.boolToString stdenv.isLinux }
|
||||
then
|
||||
dpkg-deb -x $src $out
|
||||
mv $out/usr/* $out
|
||||
rmdir $out/usr
|
||||
|
||||
# Fix ExecStart path and replace deprecated directory creation method,
|
||||
# use dynamic user.
|
||||
substituteInPlace "$out/lib/systemd/system/blackfire-agent.service" \
|
||||
--replace '/usr/' "$out/" \
|
||||
--replace 'ExecStartPre=/bin/mkdir -p /var/run/blackfire' 'RuntimeDirectory=blackfire' \
|
||||
--replace 'ExecStartPre=/bin/chown blackfire: /var/run/blackfire' "" \
|
||||
--replace 'User=blackfire' 'DynamicUser=yes' \
|
||||
--replace 'PermissionsStartOnly=true' ""
|
||||
# Fix ExecStart path and replace deprecated directory creation method,
|
||||
# use dynamic user.
|
||||
substituteInPlace "$out/lib/systemd/system/blackfire-agent.service" \
|
||||
--replace '/usr/' "$out/" \
|
||||
--replace 'ExecStartPre=/bin/mkdir -p /var/run/blackfire' 'RuntimeDirectory=blackfire' \
|
||||
--replace 'ExecStartPre=/bin/chown blackfire: /var/run/blackfire' "" \
|
||||
--replace 'User=blackfire' 'DynamicUser=yes' \
|
||||
--replace 'PermissionsStartOnly=true' ""
|
||||
|
||||
# Modernize socket path.
|
||||
substituteInPlace "$out/etc/blackfire/agent" \
|
||||
--replace '/var/run' '/run'
|
||||
# Modernize socket path.
|
||||
substituteInPlace "$out/etc/blackfire/agent" \
|
||||
--replace '/var/run' '/run'
|
||||
else
|
||||
mkdir $out
|
||||
|
||||
tar -zxvf $src
|
||||
|
||||
mv etc $out
|
||||
mv usr/* $out
|
||||
fi
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = writeShellScript "update-${pname}" ''
|
||||
set -o errexit
|
||||
export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}"
|
||||
update-source-version "$UPDATE_NIX_ATTR_PATH" "$(curl https://blackfire.io/api/v1/releases | jq .cli --raw-output)"
|
||||
NEW_VERSION=$(curl -s https://blackfire.io/api/v1/releases | jq .cli --raw-output)
|
||||
|
||||
if [[ "${version}" = "$NEW_VERSION" ]]; then
|
||||
echo "The new version same as the old version."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
for platform in ${lib.concatStringsSep " " meta.platforms}; do
|
||||
update-source-version "blackfire" "0" "${lib.fakeSha256}" "--system=$platform"
|
||||
update-source-version "blackfire" "$NEW_VERSION" "--system=$platform" --ignore-same-hash
|
||||
done
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -59,7 +99,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Blackfire Profiler agent and client";
|
||||
homepage = "https://blackfire.io/";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ jtojnar shyim ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzflag";
|
||||
version = "2.4.22";
|
||||
version = "2.4.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0=";
|
||||
sha256 = "sha256-X4Exvrf8i6UeMjoG7NfY6rkVN8NCzoehE+XrbqmM48Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Current as of 10.9
|
||||
# Current as of 10.12
|
||||
# Epic weird knot-tying happening here.
|
||||
# TODO: clean up the process for generating this and include it
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation {
|
||||
pname = "raspberrypi-wireless-firmware";
|
||||
version = "2021-11-02";
|
||||
version = "2021-12-06";
|
||||
|
||||
srcs = [
|
||||
(fetchFromGitHub {
|
||||
|
|
@ -10,14 +10,14 @@ stdenv.mkDerivation {
|
|||
owner = "RPi-Distro";
|
||||
repo = "bluez-firmware";
|
||||
rev = "e7fd166981ab4bb9a36c2d1500205a078a35714d";
|
||||
sha256 = "1dkg8mzn7n4afi50ibrda2s33nw2qj52jjjdv9w560q601gms47b";
|
||||
hash = "sha256-6xBdXwAGA1N42k1KKYrEgtsxtFAtrwhKdIrYY39Fb7Y=";
|
||||
})
|
||||
(fetchFromGitHub {
|
||||
name = "firmware-nonfree";
|
||||
owner = "RPi-Distro";
|
||||
repo = "firmware-nonfree";
|
||||
rev = "54ffdd6e2ea6055d46656b78e148fe7def3ec9d8";
|
||||
sha256 = "4WTrs/tUyOugufRrrh0qsEmhPclQD64ypYysxsnOyS8=";
|
||||
rev = "99d5c588e95ec9c9b86d7e88d3cf85b4f729d2bc";
|
||||
hash = "sha256-xg6fYQvg7t2ikyLI8/XfpiNaNTf7CNFQlAzpTldTz10=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
|||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "l+7VOq7CV5QA8/FWjMBGDcxq8Qe7NFf6E2Y42htZEgE=";
|
||||
outputHash = "sha256-Fw8EC1jzszWg9rNH01oaOIHnSYDuF6ov6ulmIAPuNz4=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3+ and Zero W";
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ lib, stdenvNoCC, fetchurl, unzip }:
|
||||
{ lib, stdenvNoCC, fetchFromGitHub }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
# NOTE: this should be updated with linux_rpi
|
||||
pname = "raspberrypi-firmware";
|
||||
version = "1.20220118";
|
||||
version = "1.20220331";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/raspberrypi/firmware/archive/${version}.zip";
|
||||
sha256 = "sha256-98rbwKIuB7vb4MWbFCr7TYsvJB0HzPdH8Tw0+bktK/M=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "firmware";
|
||||
rev = version;
|
||||
hash = "sha256-TxlpHPEJAtVJTtDghuJpx2mLjEPiKkcAr7S9Cd/cocE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/raspberrypi/
|
||||
mv boot "$out/share/raspberrypi/"
|
||||
|
|
@ -26,5 +26,6 @@ stdenvNoCC.mkDerivation rec {
|
|||
homepage = "https://github.com/raspberrypi/firmware";
|
||||
license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom
|
||||
maintainers = with maintainers; [ dezgeg ];
|
||||
broken = stdenvNoCC.isDarwin; # Hash mismatch on source, mystery.
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@
|
|||
|
||||
let
|
||||
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
|
||||
modDirVersion = "5.10.92";
|
||||
tag = "1.20220118";
|
||||
rev = "650082a559a570d6c9d2739ecc62843d6f951059";
|
||||
modDirVersion = "5.15.32";
|
||||
tag = "1.20220331";
|
||||
in
|
||||
lib.overrideDerivation (buildLinux (args // {
|
||||
version = "${modDirVersion}-${tag}";
|
||||
|
|
@ -13,8 +12,8 @@ lib.overrideDerivation (buildLinux (args // {
|
|||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "linux";
|
||||
inherit rev;
|
||||
sha256 = "sha256-OSDx9dzqm8JnLUvdiv1aKqhRz80uWqfjXLd7m6ycXME=";
|
||||
rev = tag;
|
||||
hash = "sha256-dJtOXe4yvZz/iu0Ly5F9/E/2GbpTJF/9ZMU3rC1nKMw=";
|
||||
};
|
||||
|
||||
defconfig = {
|
||||
|
|
|
|||
|
|
@ -3,18 +3,13 @@
|
|||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "raspberrypi-eeprom";
|
||||
version = "2021.12.02";
|
||||
# From 3fdf703f3f7bbe57eacceada3b558031229a34b0 Mon Sep 17 00:00:00 2001
|
||||
# From: Peter Harper <peter.harper@raspberrypi.com>
|
||||
# Date: Mon, 13 Dec 2021 11:56:11 +0000
|
||||
# Subject: [PATCH] 2021-12-02: Promote the 2021-12-02 beta release to LATEST/STABLE
|
||||
commit = "3fdf703f3f7bbe57eacceada3b558031229a34b0";
|
||||
version = "unstable-2022-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "raspberrypi";
|
||||
repo = "rpi-eeprom";
|
||||
rev = commit;
|
||||
sha256 = "sha256-JTL2ziOkT0tnOrOS08ttNtxj3qegsacP73xZBVur7xM=";
|
||||
rev = "e8927007e3800db3a72100ee6cd38b0d9b687c16";
|
||||
hash = "sha256-/hn6l5gheh6E3zoANwU1SXYgdry2IjOT9Muw2jkrtCU=";
|
||||
};
|
||||
|
||||
buildInputs = [ python3 ];
|
||||
|
|
|
|||
|
|
@ -78,10 +78,14 @@ in lib.makeExtensible (self: {
|
|||
sha256 = "sha256-xz7QnWVCI12lX1+K/Zr9UpB93b10t1HS9y/5n5FYf8Q=";
|
||||
})
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
stable = self.nix_2_7;
|
||||
nix_2_8 = common {
|
||||
version = "2.8.0";
|
||||
sha256 = "sha256-gWYNlEyleqkPfxtGXeq6ggjzJwcXJVdieJxA1Obly9s=";
|
||||
};
|
||||
|
||||
stable = self.nix_2_8;
|
||||
|
||||
unstable = lib.lowPrio (common rec {
|
||||
version = "2.8";
|
||||
|
|
|
|||
|
|
@ -1436,13 +1436,12 @@ with pkgs;
|
|||
|
||||
### APPLICATIONS/EMULATORS/YUZU
|
||||
|
||||
yuzu-mainline = import ../applications/emulators/yuzu {
|
||||
yuzu-mainline = callPackage ../applications/emulators/yuzu {
|
||||
branch = "mainline";
|
||||
inherit libsForQt5 fetchFromGitHub;
|
||||
};
|
||||
yuzu-ea = import ../applications/emulators/yuzu {
|
||||
|
||||
yuzu-ea = callPackage ../applications/emulators/yuzu {
|
||||
branch = "early-access";
|
||||
inherit libsForQt5 fetchFromGitHub;
|
||||
};
|
||||
|
||||
### APPLICATIONS/EMULATORS/COMMANDERX16
|
||||
|
|
@ -33499,6 +33498,8 @@ with pkgs;
|
|||
|
||||
acpilight = callPackage ../misc/acpilight { };
|
||||
|
||||
alpnpass = callPackage ../applications/networking/alpnpass { };
|
||||
|
||||
android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { };
|
||||
|
||||
antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue