mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-02 13:00:23 +00:00
Merge staging-next-24.05 into staging-24.05
This commit is contained in:
github-actions[bot]
@@ -15,6 +15,8 @@ in {
|
||||
options = {
|
||||
services.flatpak = {
|
||||
enable = mkEnableOption "flatpak";
|
||||
|
||||
package = mkPackageOption pkgs "flatpak" { };
|
||||
};
|
||||
};
|
||||
|
||||
@@ -28,16 +30,16 @@ in {
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ pkgs.flatpak ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
security.polkit.enable = true;
|
||||
|
||||
fonts.fontDir.enable = true;
|
||||
|
||||
services.dbus.packages = [ pkgs.flatpak ];
|
||||
services.dbus.packages = [ cfg.package ];
|
||||
|
||||
systemd.packages = [ pkgs.flatpak ];
|
||||
systemd.tmpfiles.packages = [ pkgs.flatpak ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
systemd.tmpfiles.packages = [ cfg.package ];
|
||||
|
||||
environment.profiles = [
|
||||
"$HOME/.local/share/flatpak/exports"
|
||||
|
||||
@@ -14,14 +14,14 @@ let
|
||||
# If an update breaks things, one of those might have valuable info:
|
||||
# https://aur.archlinux.org/packages/spotify/
|
||||
# https://community.spotify.com/t5/Desktop-Linux
|
||||
version = "1.2.40.599.g606b7f29";
|
||||
version = "1.2.42.290.g242057a2";
|
||||
# To get the latest stable revision:
|
||||
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
|
||||
# To get general information:
|
||||
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
|
||||
# More examples of api usage:
|
||||
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
|
||||
rev = "77";
|
||||
rev = "78";
|
||||
|
||||
deps = [
|
||||
alsa-lib
|
||||
@@ -88,7 +88,7 @@ stdenv.mkDerivation {
|
||||
src = fetchurl {
|
||||
name = "spotify-${version}-${rev}.snap";
|
||||
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
|
||||
hash = "sha512-XQyZbU6dJh87jEdEvks2D0EpMkjPSKROl8kurSaiPs2z4FZ2SxM2DUvHwtKemKKScdTISm3jh6wyHXwPhB8eNQ==";
|
||||
hash = "sha512-3kT7SA2Q1OxgDa5duivIiHaxcROBAFjDnTx6rw2ya6o5yOVygseS02zBgWg2Qd8jq0721KbYC83u9M+MWtWhhA==";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook3 makeShellWrapper squashfsTools ];
|
||||
|
||||
@@ -30,21 +30,21 @@ let
|
||||
archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "0bzf0mx1rgndpdd4a97kr01xsgsgp86gyscg8js2cvaad4265bmv";
|
||||
x86_64-darwin = "1m7f91cqbbv00difvfqld8fqkj9kvyddihmzi3zyzn4gfkv8gvf0";
|
||||
aarch64-linux = "09mxsk4qkq34yg1sd67cdasfxwdhdzcfij50fv1nl3kdjzp2i0iz";
|
||||
aarch64-darwin = "1jxjzfz6gr0pcp2anwjqwm38ma2i8fnzf5zpscfdklrlbhf438k2";
|
||||
armv7l-linux = "1yp4npgw4dkx8halsr1vm5ll1w4phx67dwd4krz1914mddx7x2kr";
|
||||
x86_64-linux = "1q8krqhwlqj3a76hp830nhz27sqwz9i0klh2q2b3n5l29x9cvd34";
|
||||
x86_64-darwin = "1d0sp42g582ykzdpzmr1wqkc0ivg09l9zxm201fxd6irr6i6lvqz";
|
||||
aarch64-linux = "0z48qlz8b7mvznr4d4vi47mibkffbsmbr2bp712h1z9s4jhx40h4";
|
||||
aarch64-darwin = "01hmcnhpfdckaslz7133692n1haiq4ifbv72vbsdnzsrdxs7wd3m";
|
||||
armv7l-linux = "1ifd7z1mvimckb26l1nzv6qd3vjamfrzm0h655367d93fqz4iph4";
|
||||
}.${system} or throwSystem;
|
||||
in
|
||||
callPackage ./generic.nix rec {
|
||||
# Please backport all compatible updates to the stable release.
|
||||
# This is important for the extension ecosystem.
|
||||
version = "1.91.0";
|
||||
version = "1.92.0";
|
||||
pname = "vscode" + lib.optionalString isInsiders "-insiders";
|
||||
|
||||
# This is used for VS Code - Remote SSH test
|
||||
rev = "ea1445cc7016315d0f5728f8e8b12a45dc0a7286";
|
||||
rev = "b1c0a14de1414fcdaa400695b4db1c0799bc3124";
|
||||
|
||||
executableName = "code" + lib.optionalString isInsiders "-insiders";
|
||||
longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
|
||||
@@ -68,7 +68,7 @@ in
|
||||
src = fetchurl {
|
||||
name = "vscode-server-${rev}.tar.gz";
|
||||
url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
|
||||
sha256 = "08mgfrwiji16q8x8kwmw3pdmb0325hfr9pd2fa5g5kmy9gnfw38v";
|
||||
sha256 = "03skx6cla4k5clncxx8wlp0j40gkqggqcs9wl0dqkrv18cljy5zz";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "goxel";
|
||||
version = "0.15.0";
|
||||
version = "0.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guillaumechereau";
|
||||
repo = "goxel";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-bJnIZwTmvHNHXYq3zsMwu0EORtX2o9lLi6LFNrolwe4=";
|
||||
hash = "sha256-mNSkQisWL3wXb+IsClWFTMbpeiRC4xteePXNP+GkUnU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ scons pkg-config wrapGAppsHook3 ];
|
||||
|
||||
@@ -4,19 +4,19 @@
|
||||
callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
||||
(
|
||||
if stdenv.isAarch64 then
|
||||
{
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.67.134";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_arm64.deb";
|
||||
hash = "sha256-5wa4y+3PlcrT+U7xiPjkXqhpFz1rC+wyH6q9blmjaCI=";
|
||||
version = "1.68.134";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-FP+Afk62/aiKd6ZPX0zy76bzO3pJjm4pqauxluFYEl8=";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.isx86_64 then
|
||||
{
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "1.67.134";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_amd64.deb";
|
||||
hash = "sha256-OJYPV3yJkqGh4OdX4lFZNrOxv33ysFQSTwYmlToXOq8=";
|
||||
version = "1.68.134";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-l07sbkM5gDMcXeMoWiWH/8nU+Y0ShyB2jIHsqEFaoew=";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
else
|
||||
|
||||
@@ -24,18 +24,18 @@ cat > $SCRIPT_DIR/default.nix << EOF
|
||||
callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ])
|
||||
(
|
||||
if stdenv.isAarch64 then
|
||||
{
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "${latestVersionAarch64}";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAarch64}/brave-browser_${latestVersionAmd64}_arm64.deb";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb";
|
||||
hash = "${hashAarch64}";
|
||||
platform = "aarch64-linux";
|
||||
}
|
||||
else if stdenv.isx86_64 then
|
||||
{
|
||||
rec {
|
||||
pname = "brave";
|
||||
version = "${latestVersionAmd64}";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${latestVersionAmd64}/brave-browser_${latestVersionAmd64}_amd64.deb";
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb";
|
||||
hash = "${hashAmd64}";
|
||||
platform = "x86_64-linux";
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "7.18.0-beta.1";
|
||||
version = "7.19.0-beta.1";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-ZNFssB0SiNAAW7SupxNqdbEtEpemrv+IoyfdWVKu8CI=";
|
||||
hash = "sha256-kD08xke+HYhwAZG7jmU1ILo013556vNcvAFc/+9BTjg=";
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "7.17.0";
|
||||
version = "7.18.0";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-4Yp81aBY01cVZ/KDSqPO3R3HglLup/+sczQ5XNtQn84=";
|
||||
hash = "sha256-xI3GCs9ZekENktuSf9NNxoOOGuYtKrOV8Ng3eFy493M=";
|
||||
}
|
||||
|
||||
@@ -1,94 +1,247 @@
|
||||
{ alsa-lib
|
||||
, autoPatchelfHook
|
||||
, fetchurl
|
||||
, gtk3
|
||||
, gtk4
|
||||
, libnotify
|
||||
, copyDesktopItems
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, nss
|
||||
, lib
|
||||
, libdrm
|
||||
, qt5
|
||||
, stdenv
|
||||
, udev
|
||||
, xdg-utils
|
||||
, xorg
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
patchelf,
|
||||
makeWrapper,
|
||||
fetchurl,
|
||||
writeScript,
|
||||
|
||||
# Libraries
|
||||
glib,
|
||||
fontconfig,
|
||||
freetype,
|
||||
pango,
|
||||
cairo,
|
||||
libX11,
|
||||
libXi,
|
||||
atk,
|
||||
nss,
|
||||
nspr,
|
||||
libXcursor,
|
||||
libXext,
|
||||
libXfixes,
|
||||
libXrender,
|
||||
libXScrnSaver,
|
||||
libXcomposite,
|
||||
libxcb,
|
||||
alsa-lib,
|
||||
libXdamage,
|
||||
libXtst,
|
||||
libXrandr,
|
||||
libxshmfence,
|
||||
expat,
|
||||
cups,
|
||||
dbus,
|
||||
gtk3,
|
||||
gtk4,
|
||||
gdk-pixbuf,
|
||||
gcc-unwrapped,
|
||||
at-spi2-atk,
|
||||
at-spi2-core,
|
||||
libkrb5,
|
||||
libdrm,
|
||||
libglvnd,
|
||||
mesa,
|
||||
libxkbcommon,
|
||||
pipewire,
|
||||
wayland,
|
||||
|
||||
coreutils,
|
||||
|
||||
# command line arguments which are always set e.g "--disable-gpu"
|
||||
commandLineArgs ? "",
|
||||
|
||||
systemd,
|
||||
|
||||
# Loaded at runtime.
|
||||
libexif,
|
||||
pciutils,
|
||||
|
||||
liberation_ttf,
|
||||
curl,
|
||||
util-linux,
|
||||
xdg-utils,
|
||||
wget,
|
||||
flac,
|
||||
harfbuzz,
|
||||
icu,
|
||||
libpng,
|
||||
libopus,
|
||||
snappy,
|
||||
speechd,
|
||||
bzip2,
|
||||
libcap,
|
||||
|
||||
# Necessary for USB audio devices.
|
||||
pulseSupport ? true,
|
||||
libpulseaudio,
|
||||
|
||||
gsettings-desktop-schemas,
|
||||
|
||||
# Allow video acceleration via VA-API to be disabled on systems where is doesn't
|
||||
# work reliably (--enable-features=VaapiVideoDecoder)
|
||||
libvaSupport ? true,
|
||||
libva,
|
||||
|
||||
# For Vulkan support (--enable-features=Vulkan)
|
||||
addDriverRunpath,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
opusWithCustomModes = libopus.override { withCustomModes = true; };
|
||||
|
||||
deps =
|
||||
[
|
||||
glib
|
||||
fontconfig
|
||||
freetype
|
||||
pango
|
||||
cairo
|
||||
libX11
|
||||
libXi
|
||||
atk
|
||||
nss
|
||||
nspr
|
||||
libXcursor
|
||||
libXext
|
||||
libXfixes
|
||||
libXrender
|
||||
libXScrnSaver
|
||||
libXcomposite
|
||||
libxcb
|
||||
alsa-lib
|
||||
libXdamage
|
||||
libXtst
|
||||
libXrandr
|
||||
libxshmfence
|
||||
expat
|
||||
cups
|
||||
dbus
|
||||
gdk-pixbuf
|
||||
gcc-unwrapped.lib
|
||||
systemd
|
||||
libexif
|
||||
pciutils
|
||||
liberation_ttf
|
||||
curl
|
||||
util-linux
|
||||
wget
|
||||
flac
|
||||
harfbuzz
|
||||
icu
|
||||
libpng
|
||||
opusWithCustomModes
|
||||
snappy
|
||||
speechd
|
||||
bzip2
|
||||
libcap
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
libkrb5
|
||||
libdrm
|
||||
libglvnd
|
||||
mesa
|
||||
coreutils
|
||||
libxkbcommon
|
||||
pipewire
|
||||
wayland
|
||||
]
|
||||
++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optional libvaSupport libva
|
||||
++ [
|
||||
gtk3
|
||||
gtk4
|
||||
];
|
||||
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wavebox";
|
||||
version = "10.124.17-2";
|
||||
version = "10.127.10-2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.wavebox.app/stable/linux/tar/Wavebox_${version}.tar.gz";
|
||||
sha256 = "sha256-RS1/zs/rFWsj29BrT8Mb2IXgy9brBsQypxfvnd7pKl0=";
|
||||
url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
|
||||
hash = "sha256-x095V2UhRJfPmmG+4/i7I9AnCU4WVrw0b71nEu73uew=";
|
||||
};
|
||||
|
||||
# don't remove runtime deps
|
||||
dontPatchELF = true;
|
||||
# ignore optional Qt 6 shim
|
||||
autoPatchelfIgnoreMissingDeps = [ "libQt6Widgets.so.6" "libQt6Gui.so.6" "libQt6Core.so.6" ];
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper qt5.wrapQtAppsHook copyDesktopItems ];
|
||||
|
||||
buildInputs = with xorg; [
|
||||
libXdmcp
|
||||
libXScrnSaver
|
||||
libXtst
|
||||
libxshmfence
|
||||
libXdamage
|
||||
] ++ [
|
||||
alsa-lib
|
||||
nativeBuildInputs = [
|
||||
patchelf
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
gsettings-desktop-schemas # needed for GSETTINGS_SCHEMAS_PATH
|
||||
glib
|
||||
gtk3
|
||||
nss
|
||||
libdrm
|
||||
mesa
|
||||
gtk4
|
||||
qt5.qtbase
|
||||
];
|
||||
|
||||
runtimeDependencies = [ (lib.getLib udev) libnotify gtk4 ];
|
||||
unpackPhase = ''
|
||||
ar x $src
|
||||
tar xf data.tar.xz
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem rec {
|
||||
name = "Wavebox";
|
||||
exec = "wavebox";
|
||||
icon = "wavebox";
|
||||
desktopName = name;
|
||||
genericName = name;
|
||||
categories = [ "Network" "WebBrowser" ];
|
||||
})
|
||||
];
|
||||
rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin $out/opt/wavebox
|
||||
cp -r * $out/opt/wavebox
|
||||
exe=$out/bin/wavebox
|
||||
|
||||
# provide icon for desktop item
|
||||
mkdir -p $out/share/icons/hicolor/128x128/apps
|
||||
ln -s $out/opt/wavebox/product_logo_128.png $out/share/icons/hicolor/128x128/apps/wavebox.png
|
||||
mkdir -p $out/bin $out/share
|
||||
|
||||
cp -a opt/* $out/share
|
||||
cp -a usr/share/* $out/share
|
||||
|
||||
|
||||
substituteInPlace $out/share/wavebox.io/wavebox/wavebox-launcher \
|
||||
--replace-fail 'CHROME_WRAPPER' 'WRAPPER'
|
||||
substituteInPlace $out/share/applications/wavebox.desktop \
|
||||
--replace-fail /opt/wavebox.io/wavebox/wavebox-launcher $exe
|
||||
substituteInPlace $out/share/menu/wavebox.menu \
|
||||
--replace-fail /opt $out/share \
|
||||
--replace-fail $out/share/wavebox.io/wavebox/wavebox $exe
|
||||
|
||||
for icon_file in $out/share/wavebox.io/wavebox/product_logo_[0-9]*.png; do
|
||||
num_and_suffix="''${icon_file##*logo_}"
|
||||
icon_size="''${num_and_suffix%.*}"
|
||||
logo_output_prefix="$out/share/icons/hicolor"
|
||||
logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
|
||||
mkdir -p "$logo_output_path"
|
||||
mv "$icon_file" "$logo_output_path/wavebox.png"
|
||||
done
|
||||
|
||||
makeWrapper "$out/share/wavebox.io/wavebox/wavebox" "$exe" \
|
||||
--prefix LD_LIBRARY_PATH : "$rpath" \
|
||||
--prefix PATH : "${lib.makeBinPath deps}" \
|
||||
--suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \
|
||||
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
|
||||
--set CHROME_WRAPPER "wavebox" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--add-flags ${lib.escapeShellArg commandLineArgs}
|
||||
|
||||
for elf in $out/share/wavebox.io/wavebox/{wavebox,chrome-sandbox,chrome_crashpad_handler}; do
|
||||
patchelf --set-rpath $rpath $elf
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapper $out/opt/wavebox/wavebox-launcher $out/bin/wavebox \
|
||||
--prefix PATH : ${xdg-utils}/bin
|
||||
'';
|
||||
passthru = {
|
||||
updateScript = writeScript "update-wavebox.sh" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update curl jq
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wavebox messaging application";
|
||||
homepage = "https://wavebox.io";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rawkode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
hydraPlatforms = [ ];
|
||||
version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["deb"] | match("https://download.wavebox.app/stable/linux/deb/amd64/wavebox_(.+)_amd64.deb").captures[0]["string"]')
|
||||
nix-update wavebox --version "$version"
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
meta = {
|
||||
description = "Wavebox Productivity Browser";
|
||||
homepage = "https://wavebox.io";
|
||||
license = lib.licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ flexiondotorg ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "wavebox";
|
||||
};
|
||||
})
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update curl jq
|
||||
|
||||
version=$(curl "https://download.wavebox.app/stable/linux/latest.json" | jq --raw-output '.["urls"]["tar"] | match("https://download.wavebox.app/stable/linux/tar/Wavebox_(.+).tar.gz").captures[0]["string"]')
|
||||
nix-update wavebox --version "$version"
|
||||
@@ -1,12 +1,20 @@
|
||||
{ stdenv, lib, fetchurl, appimageTools, makeWrapper, electron, nixosTests }:
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchurl,
|
||||
appimageTools,
|
||||
makeWrapper,
|
||||
electron,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freetube";
|
||||
version = "0.20.0";
|
||||
version = "0.21.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage";
|
||||
sha256 = "sha256-7k5hyiK3m+117AxmsoecGsgXSxs8xhyTf8+rl4oBbB8=";
|
||||
hash = "sha256-sg/ycFo4roOJ2sW4naRCE6dwGXVQFzF8uwAZQkS2EY4=";
|
||||
};
|
||||
|
||||
passthru.tests = nixosTests.freetube;
|
||||
@@ -43,11 +51,14 @@ stdenv.mkDerivation rec {
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An Open Source YouTube app for privacy";
|
||||
meta = {
|
||||
description = "Open Source YouTube app for privacy";
|
||||
homepage = "https://freetubeapp.io/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ ryneeverett alyaeanyx ];
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
ryneeverett
|
||||
alyaeanyx
|
||||
];
|
||||
inherit (electron.meta) platforms;
|
||||
mainProgram = "freetube";
|
||||
};
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yggdrasil";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yggdrasil-network";
|
||||
repo = "yggdrasil-go";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ZInSgHjur2C+G6h/VcYtlCt0YLWwMIrz84UkDBbR73s=";
|
||||
sha256 = "sha256-LiQKAkFN9JRdl7P3TMIzEeRxKBysidFWMWGGW8jEm/E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Ar0mWVFgLP1eYeKalaazZLKaLMXoe2bOGYkruzaKW88=";
|
||||
vendorHash = "sha256-Bfq8AjOljSg/mWHUwTSKwslukW3aZXOFi4KigUsIogc=";
|
||||
|
||||
subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ];
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
"hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19"
|
||||
},
|
||||
"6.1": {
|
||||
"version": "6.1.102",
|
||||
"hash": "sha256:1v4p4i8pfg4i6v90dr7m65npkxjnqv3fxcj8zs3pbb8y84xzk98v"
|
||||
"version": "6.1.103",
|
||||
"hash": "sha256:0ws59jjd71vhwbzkn0wqaby3yb8kjbc4clgza8aqhl4gi5pp1d2y"
|
||||
},
|
||||
"5.15": {
|
||||
"version": "5.15.164",
|
||||
@@ -24,8 +24,8 @@
|
||||
"hash": "sha256:0c7bhb31hpbbw1is1ykppk9lm0x025yyd4hrmlg1s6yg75rxqkal"
|
||||
},
|
||||
"6.6": {
|
||||
"version": "6.6.43",
|
||||
"hash": "sha256:0pha226h5011kl5r2iiddxi0rib3xraslmcdjjnil2kq38d3pn0a"
|
||||
"version": "6.6.44",
|
||||
"hash": "sha256:1n6ckxx0i4dbq018b56q1wkwq944jhjy225swrpn65a9jfb848ck"
|
||||
},
|
||||
"6.8": {
|
||||
"version": "6.8.12",
|
||||
@@ -36,7 +36,7 @@
|
||||
"hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
|
||||
},
|
||||
"6.10": {
|
||||
"version": "6.10.2",
|
||||
"hash": "sha256:0w4vsb0c8bp34j90l89qms50nx6r6mmyf23jbvyar9fbv46m5n3k"
|
||||
"version": "6.10.3",
|
||||
"hash": "sha256:1666dypfg193l5460maadki4hc291hr7k9fw74nq21fxczyj4pzs"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
, ... } @ args:
|
||||
|
||||
let
|
||||
version = "5.10.221-rt113"; # updated by ./update-rt.sh
|
||||
version = "5.10.222-rt114"; # updated by ./update-rt.sh
|
||||
branch = lib.versions.majorMinor version;
|
||||
kversion = builtins.elemAt (lib.splitString "-" version) 0;
|
||||
in buildLinux (args // {
|
||||
@@ -17,14 +17,14 @@ in buildLinux (args // {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
|
||||
sha256 = "09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs";
|
||||
sha256 = "1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv";
|
||||
};
|
||||
|
||||
kernelPatches = let rt-patch = {
|
||||
name = "rt";
|
||||
patch = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
|
||||
sha256 = "1aaamfnlhzhi4lj1sk2m082fpgr3qxs3b3a1ikh8zwmy89kw9i9x";
|
||||
sha256 = "0ylq8ffl9ivd1rh1fidmviyhzvknfh46my8iiqyfyg7y5z0cl1pg";
|
||||
};
|
||||
}; in [ rt-patch ] ++ kernelPatches;
|
||||
|
||||
|
||||
@@ -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.6.42";
|
||||
hash = "sha256-0YqvOObUHP2S8Jf1H+fzAZ+wOMoFt1BLxWilqt6ohVg=";
|
||||
version = "6.6.43";
|
||||
hash = "sha256-4o8qdAkqFjlRFS2k2zW9weSB1JQ5BFuDdcv26v9qYoA=";
|
||||
variant = "lts";
|
||||
};
|
||||
|
||||
mainVariant = {
|
||||
version = "6.9.11";
|
||||
hash = "sha256-c6Mkk37SFoC9hJfh/iQqyNzGJJjN0W28VLta/nayCgc=";
|
||||
version = "6.9.12";
|
||||
hash = "sha256-ysnu/6q2Zc0b+MNRdjQDLNmmjU+nWKpb/CcPOSSmotM=";
|
||||
variant = "main";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"asterisk_18": {
|
||||
"sha256": "a46a85f676ea820f9c3c550c7caa8d9515e7754512740768a1336a82e8cf6162",
|
||||
"version": "18.23.1"
|
||||
"sha256": "ddbaf55c222503fa393f3ff3e3d3d193c644e8eddcfba3e6d1d3c597869d9fed",
|
||||
"version": "18.24.0"
|
||||
},
|
||||
"asterisk_20": {
|
||||
"sha256": "fa498b6224e8c262de6840a67e00e3747e178fcefd9fb2595885d402ca3248f5",
|
||||
"version": "20.8.1"
|
||||
"sha256": "1a783adbd7c3d96439ee1ca0ca5b1421ee809be5948ac6960021c0ad8c19679c",
|
||||
"version": "20.9.0"
|
||||
},
|
||||
"asterisk_21": {
|
||||
"sha256": "cf59196b94851fbfdbcc63d1d6a8d2b83a4ae093c89c3d37b5d460b3a3d20f15",
|
||||
"version": "21.3.1"
|
||||
"sha256": "dfa4f8262461d40480cbd6cc4f7abf5f61fcfdf358f360fed18bcd1f61a16880",
|
||||
"version": "21.4.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,14 +19,14 @@ let
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "borgbackup";
|
||||
version = "1.2.8";
|
||||
version = "1.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "borgbackup";
|
||||
repo = "borg";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+FHqOVuHlY9QUjCrYVnrMBZPMFH9Z2U7eZ6eUSINSrw=";
|
||||
hash = "sha256-n1hCM7Sp0t2bOJEzErEd1PS/Xc7c+KDmJ4PjQuuF140=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -82,7 +82,6 @@ python.pkgs.buildPythonApplication rec {
|
||||
nativeCheckInputs = with python.pkgs; [
|
||||
e2fsprogs
|
||||
py
|
||||
python-dateutil
|
||||
pytest-benchmark
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
@@ -121,6 +120,8 @@ python.pkgs.buildPythonApplication rec {
|
||||
|
||||
outputs = [ "out" "doc" "man" ];
|
||||
|
||||
disabled = python.pythonOlder "3.9";
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/borgbackup/borg/blob/${src.rev}/docs/changes.rst";
|
||||
description = "Deduplicating archiver with compression and encryption";
|
||||
|
||||
@@ -26,13 +26,13 @@ buildPythonPackage rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2024.7.25";
|
||||
version = "2024.8.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "yt_dlp";
|
||||
hash = "sha256-dYeqJeI2z3sUvbk3i7//9RIC2QGwQgK+DPYsu1bTtSw=";
|
||||
hash = "sha256-QxiqUjaUYRVi8BQZyNUmtmKnLfNO+LpFQBazTINmwVg=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -34295,7 +34295,7 @@ with pkgs;
|
||||
|
||||
viber = callPackage ../applications/networking/instant-messengers/viber { };
|
||||
|
||||
wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { };
|
||||
wavebox = callPackage ../applications/networking/instant-messengers/wavebox { };
|
||||
|
||||
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user