Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
71874015ba
|
|
@ -9041,6 +9041,12 @@
|
|||
fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49";
|
||||
}];
|
||||
};
|
||||
lizelive = {
|
||||
email = "nixpkgs@lize.live";
|
||||
github = "lizelive";
|
||||
githubId = 40217331;
|
||||
name = "LizeLive";
|
||||
};
|
||||
lluchs = {
|
||||
email = "lukas.werling@gmail.com";
|
||||
github = "lluchs";
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
enable = true;
|
||||
port = 18545;
|
||||
};
|
||||
authrpc = {
|
||||
enable = true;
|
||||
port = 18551;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -31,11 +35,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
machine.wait_for_open_port(18545)
|
||||
|
||||
machine.succeed(
|
||||
'geth attach --exec eth.blockNumber http://localhost:8545 | grep \'^0$\' '
|
||||
'geth attach --exec "eth.blockNumber" http://localhost:8545 | grep \'^0$\' '
|
||||
)
|
||||
|
||||
machine.succeed(
|
||||
'geth attach --exec "eth.chainId()" http://localhost:18545 | grep \'"0x5"\' '
|
||||
'geth attach --exec "eth.blockNumber" http://localhost:18545 | grep \'^0$\' '
|
||||
)
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -87,15 +87,23 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
return etag
|
||||
|
||||
|
||||
webserver.wait_for_unit("nginx")
|
||||
webserver.wait_for_open_port(80)
|
||||
def wait_for_nginx_on_port(port):
|
||||
webserver.wait_for_unit("nginx")
|
||||
webserver.wait_for_open_port(port)
|
||||
|
||||
|
||||
# nginx can be ready before multi-user.target, in which case switching to
|
||||
# a different configuration might not realize it needs to restart nginx.
|
||||
webserver.wait_for_unit("multi-user.target")
|
||||
|
||||
wait_for_nginx_on_port(80)
|
||||
|
||||
with subtest("check ETag if serving Nix store paths"):
|
||||
old_etag = check_etag()
|
||||
webserver.succeed(
|
||||
"${etagSystem}/bin/switch-to-configuration test >&2"
|
||||
)
|
||||
webserver.sleep(1)
|
||||
wait_for_nginx_on_port(80)
|
||||
new_etag = check_etag()
|
||||
assert old_etag != new_etag
|
||||
|
||||
|
|
@ -103,7 +111,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
webserver.succeed(
|
||||
"${justReloadSystem}/bin/switch-to-configuration test >&2"
|
||||
)
|
||||
webserver.wait_for_open_port(8080)
|
||||
wait_for_nginx_on_port(8080)
|
||||
webserver.fail("journalctl -u nginx | grep -q -i stopped")
|
||||
webserver.succeed("journalctl -u nginx | grep -q -i reloaded")
|
||||
|
||||
|
|
@ -111,7 +119,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
|||
webserver.succeed(
|
||||
"${reloadRestartSystem}/bin/switch-to-configuration test >&2"
|
||||
)
|
||||
webserver.wait_for_unit("nginx")
|
||||
wait_for_nginx_on_port(80)
|
||||
webserver.succeed("journalctl -u nginx | grep -q -i stopped")
|
||||
|
||||
with subtest("nixos-rebuild --switch should fail when there are configuration errors"):
|
||||
|
|
|
|||
|
|
@ -1,25 +1,23 @@
|
|||
{ rustPlatform
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, dbus
|
||||
, protobuf
|
||||
, lib
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "pbpctrl";
|
||||
|
||||
# https://github.com/qzed/pbpctrl/issues/4
|
||||
version = "unstable-2023-02-07";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qzed";
|
||||
repo = "${pname}";
|
||||
rev = "9fef4bb88046a9f00719b189f8e378c8dbdb8ee6";
|
||||
hash = "sha256-8YbsBqqITJ9bKzbGX6d/CSBb8wzr6bDzy8vsyntL1CA=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CYroQb6x2d4ay3RZUSiSrcGDF0IL3ETZtHAFt18sa5s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZxJjjaT/ZpEPxvO42UWBy3xW/V5dhXGsKn3KmuM89YA==";
|
||||
cargoHash = "sha256-+YtnPKbxZENL6/u36RFFZA6F+19qHDAVx6Q8FSB/LCU=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config protobuf ];
|
||||
buildInputs = [ dbus ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ lib
|
||||
, gcc12Stdenv
|
||||
, stdenv
|
||||
, cmake
|
||||
, llvm
|
||||
, fetchFromGitHub
|
||||
|
|
@ -32,7 +32,7 @@ let
|
|||
};
|
||||
|
||||
in
|
||||
gcc12Stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imhex";
|
||||
inherit version;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }:
|
||||
{ lib, stdenv, fetchFromGitHub, ncurses, texinfo6, texlive, perl, ghostscript }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ne";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace src/makefile --replace "-lcurses" "-lncurses"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ texlive.combined.scheme-medium texinfo perl ghostscript ];
|
||||
nativeBuildInputs = [ texlive.combined.scheme-medium texinfo6 perl ghostscript ];
|
||||
buildInputs = [ ncurses ];
|
||||
|
||||
makeFlags = [ "PREFIX=${placeholder "out"}" ];
|
||||
|
|
@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ geri1701 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
|
||||
{ lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git
|
||||
, qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
|
||||
, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
|
||||
, sdl2Support ? true, SDL2
|
||||
|
|
@ -21,7 +21,7 @@ let
|
|||
sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz";
|
||||
};
|
||||
in
|
||||
gcc12Stdenv.mkDerivation {
|
||||
stdenv.mkDerivation {
|
||||
pname = "rpcs3";
|
||||
version = rpcs3Version;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,45 +1,68 @@
|
|||
{ branch ? "mainline"
|
||||
, libsForQt5
|
||||
, qt6Packages
|
||||
, fetchFromGitHub
|
||||
, fetchgit
|
||||
, fetchurl
|
||||
, fetchzip
|
||||
, runCommand
|
||||
, gnutar
|
||||
}:
|
||||
|
||||
let
|
||||
# Mirror of https://api.yuzu-emu.org/gamedb, last updated 2022-08-13
|
||||
# Please make sure to update this when updating yuzu!
|
||||
sources = import ./sources.nix;
|
||||
|
||||
compat-list = fetchurl {
|
||||
name = "yuzu-compat-list";
|
||||
url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/d83401d2ee3fd5e1922e31baed1f3bdb1c0f036c/compatibility_list.json";
|
||||
sha256 = "sha256-anOmO7NscHDsQxT03+YbJEyBkXjhcSVGgKpDwt//GHw=";
|
||||
url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${sources.compatList.rev}/compatibility_list.json";
|
||||
hash = sources.compatList.hash;
|
||||
};
|
||||
|
||||
mainlineSrc = fetchFromGitHub {
|
||||
owner = "yuzu-emu";
|
||||
repo = "yuzu-mainline";
|
||||
rev = "mainline-0-${sources.mainline.version}";
|
||||
hash = sources.mainline.hash;
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# The mirror repo for early access builds is missing submodule info,
|
||||
# but the Windows distributions include a source tarball, which in turn
|
||||
# includes the full git metadata. So, grab that and rehydrate it.
|
||||
# This has the unfortunate side effect of requiring two FODs, one
|
||||
# for the Windows download and one for the full repo with submodules.
|
||||
eaZip = fetchzip {
|
||||
name = "yuzu-ea-windows-dist";
|
||||
url = "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${sources.ea.version}/Windows-Yuzu-EA-${sources.ea.version}.zip";
|
||||
hash = sources.ea.distHash;
|
||||
};
|
||||
|
||||
eaGitSrc = runCommand "yuzu-ea-dist-unpacked" {
|
||||
src = eaZip;
|
||||
nativeBuildInputs = [ gnutar ];
|
||||
}
|
||||
''
|
||||
mkdir $out
|
||||
tar xf $src/*.tar.xz --directory=$out --strip-components=1
|
||||
'';
|
||||
|
||||
eaSrcRehydrated = fetchgit {
|
||||
url = eaGitSrc;
|
||||
fetchSubmodules = true;
|
||||
hash = sources.ea.fullHash;
|
||||
};
|
||||
|
||||
in {
|
||||
mainline = libsForQt5.callPackage ./generic.nix rec {
|
||||
pname = "yuzu-mainline";
|
||||
version = "1245";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuzu-emu";
|
||||
repo = "yuzu-mainline";
|
||||
rev = "mainline-0-${version}";
|
||||
sha256 = "sha256-lWXlY1KQC067MvCRUFhmr0c7KDrHDuwJOhIWMKw1f+A=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
inherit branch compat-list;
|
||||
mainline = qt6Packages.callPackage ./generic.nix {
|
||||
branch = "mainline";
|
||||
version = sources.mainline.version;
|
||||
src = mainlineSrc;
|
||||
inherit compat-list;
|
||||
};
|
||||
|
||||
early-access = libsForQt5.callPackage ./generic.nix rec {
|
||||
pname = "yuzu-ea";
|
||||
version = "2945";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pineappleEA";
|
||||
repo = "pineapple-src";
|
||||
rev = "EA-${version}";
|
||||
sha256 = "sha256-/051EtQxhB5oKH/JxZZ2AjnxOBcRxCBIwd4Qr8lq7Ok=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
inherit branch compat-list;
|
||||
early-access = qt6Packages.callPackage ./generic.nix {
|
||||
branch = "early-access";
|
||||
version = sources.ea.version;
|
||||
src = eaSrcRehydrated;
|
||||
inherit compat-list;
|
||||
};
|
||||
}.${branch}
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
{ pname
|
||||
, version
|
||||
{ version
|
||||
, src
|
||||
, branch
|
||||
, compat-list
|
||||
|
||||
, lib
|
||||
, stdenv
|
||||
, runCommandLocal
|
||||
, substituteAll
|
||||
, wrapQtAppsHook
|
||||
, alsa-lib
|
||||
, boost
|
||||
, catch2
|
||||
, catch2_3
|
||||
, cmake
|
||||
, cpp-jwt
|
||||
, cubeb
|
||||
, discord-rpc
|
||||
, doxygen
|
||||
, enet
|
||||
, ffmpeg
|
||||
, fmt_8
|
||||
, fmt
|
||||
, glslang
|
||||
, httplib
|
||||
, inih
|
||||
, libjack2
|
||||
, libopus
|
||||
, libpulseaudio
|
||||
|
|
@ -29,7 +32,9 @@
|
|||
, pkg-config
|
||||
, python3
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qttools
|
||||
, qtwayland
|
||||
, qtwebengine
|
||||
, rapidjson
|
||||
, SDL2
|
||||
|
|
@ -42,8 +47,10 @@
|
|||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
inherit pname version src;
|
||||
stdenv.mkDerivation {
|
||||
pname = "yuzu-${branch}";
|
||||
|
||||
inherit version src;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
@ -57,49 +64,64 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
alsa-lib
|
||||
boost
|
||||
catch2
|
||||
catch2_3
|
||||
cpp-jwt
|
||||
cubeb
|
||||
discord-rpc
|
||||
# intentionally omitted: dynarmic - prefer vendored version for compatibility
|
||||
enet
|
||||
ffmpeg
|
||||
fmt_8
|
||||
fmt
|
||||
glslang
|
||||
httplib
|
||||
inih
|
||||
libjack2
|
||||
libopus
|
||||
libpulseaudio
|
||||
libusb1
|
||||
libva
|
||||
libzip
|
||||
# intentionally omitted: LLVM - heavy, only used for stack traces in the debugger
|
||||
lz4
|
||||
nlohmann_json
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qttools
|
||||
qtwayland
|
||||
qtwebengine
|
||||
rapidjson
|
||||
SDL2
|
||||
sndio
|
||||
speexdsp
|
||||
udev
|
||||
vulkan-headers
|
||||
# intentionally omitted: xbyak - prefer vendored version for compatibility
|
||||
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;
|
||||
|
||||
# -Werror causes build failures for deprecation warnings introduced by transitive dependency updates
|
||||
postPatch = ''
|
||||
sed -i '/-Werror/d' src/common/CMakeLists.txt
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DYUZU_USE_BUNDLED_QT=OFF"
|
||||
"-DYUZU_USE_BUNDLED_FFMPEG=OFF"
|
||||
"-DYUZU_USE_BUNDLED_OPUS=OFF"
|
||||
"-DYUZU_USE_EXTERNAL_SDL2=OFF"
|
||||
# actually has a noticeable performance impact
|
||||
"-DYUZU_ENABLE_LTO=ON"
|
||||
|
||||
# build with qt6
|
||||
"-DENABLE_QT6=ON"
|
||||
"-DENABLE_QT_TRANSLATION=ON"
|
||||
|
||||
# use system libraries
|
||||
"-DYUZU_USE_EXTERNAL_SDL2=OFF"
|
||||
"-DYUZU_USE_EXTERNAL_VULKAN_HEADERS=OFF"
|
||||
|
||||
# don't check for missing submodules
|
||||
"-DYUZU_CHECK_SUBMODULES=OFF"
|
||||
|
||||
# enable some optional features
|
||||
"-DYUZU_USE_QT_WEB_ENGINE=ON"
|
||||
"-DYUZU_USE_QT_MULTIMEDIA=ON"
|
||||
"-DUSE_DISCORD_PRESENCE=ON"
|
||||
|
||||
# We dont want to bother upstream with potentially outdated compat reports
|
||||
|
|
@ -107,21 +129,17 @@ stdenv.mkDerivation rec {
|
|||
"-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically
|
||||
];
|
||||
|
||||
# Fixes vulkan detection.
|
||||
# FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate
|
||||
qtWrapperArgs = [
|
||||
# Fixes vulkan detection
|
||||
"--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
|
||||
# Without yuzu doesnt start on wayland. See https://github.com/yuzu-emu/yuzu/issues/6088
|
||||
"--set QT_QPA_PLATFORM xcb"
|
||||
];
|
||||
|
||||
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}"
|
||||
"-DTITLE_BAR_FORMAT_IDLE=yuzu | ${branch} ${version} (nixpkgs) {}"
|
||||
"-DTITLE_BAR_FORMAT_RUNNING=yuzu | ${branch} ${version} (nixpkgs) | {}"
|
||||
)
|
||||
'';
|
||||
|
||||
|
|
@ -130,12 +148,7 @@ stdenv.mkDerivation rec {
|
|||
ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json
|
||||
'';
|
||||
|
||||
passthru.updateScript = runCommandLocal "yuzu-${branch}-updateScript" {
|
||||
script = substituteAll {
|
||||
src = ./update.sh;
|
||||
inherit branch;
|
||||
};
|
||||
} "install -Dm755 $script $out";
|
||||
passthru.updateScript = ./update.sh;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://yuzu-emu.org";
|
||||
|
|
@ -143,8 +156,8 @@ stdenv.mkDerivation rec {
|
|||
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.
|
||||
Using the mainline branch is recommended for general usage.
|
||||
Using the early-access branch is recommended if you would like to try out experimental features, with a cost of stability.
|
||||
'';
|
||||
mainProgram = "yuzu";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
@ -158,6 +171,7 @@ stdenv.mkDerivation rec {
|
|||
ivar
|
||||
joshuafern
|
||||
sbruder
|
||||
k900
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
19
pkgs/applications/emulators/yuzu/sources.nix
Normal file
19
pkgs/applications/emulators/yuzu/sources.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: 2023-05-05
|
||||
{
|
||||
compatList = {
|
||||
rev = "773d28cbc699427c8baa427452d7b229920eec59";
|
||||
hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1";
|
||||
};
|
||||
|
||||
mainline = {
|
||||
version = "1421";
|
||||
hash = "sha256:1ldxframs7a8rmna9ymyx20n89594q0d1266kr7ah8yvh1gp04r3";
|
||||
};
|
||||
|
||||
ea = {
|
||||
version = "3557";
|
||||
distHash = "sha256:0bddx5d88cfaaqbzr59w9kqjjsf9xvgvdn1g0l9w3ifr9zc2vlwr";
|
||||
fullHash = "sha256:0w1ji3a8iridh4dpyal8lscgwddf9pwz1pfigksmvbn8mm9d9xwl";
|
||||
};
|
||||
}
|
||||
|
|
@ -1,105 +1,66 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -I nixpkgs=./. -i bash -p nix nix-prefetch-git coreutils curl jq gnused
|
||||
#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Will be replaced with the actual branch when running this from passthru.updateScript
|
||||
BRANCH="@branch@"
|
||||
DEFAULT_NIX="$(dirname "${BASH_SOURCE[@]}")/default.nix"
|
||||
cd "$(dirname "$(readlink -f "$0")")"
|
||||
|
||||
if [[ "$(basename "$PWD")" = "yuzu" ]]; then
|
||||
echo "error: Script must be ran from nixpkgs's root directory for compatibility with the maintainer script"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
updateBranch() {
|
||||
local branch attribute oldVersion oldHash newVersion newHash
|
||||
branch="$1"
|
||||
attribute="yuzu-$branch"
|
||||
[[ "$branch" = "early-access" ]] && attribute="yuzu-ea" # Attribute path doesnt match the branch name
|
||||
oldVersion="$(nix eval --raw -f "./default.nix" "$attribute".version)"
|
||||
oldHash="$(nix eval --raw -f "./default.nix" "$attribute".src.drvAttrs.outputHash)"
|
||||
|
||||
if [[ "$branch" = "mainline" ]]; then
|
||||
newVersion="$(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)"
|
||||
elif [[ "$branch" = "early-access" ]]; then
|
||||
newVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" \
|
||||
| jq -r '.[].tag_name' | grep '^EA-[0-9]*' | head -n1 | cut -d"-" -f2 | cut -d" " -f1)"
|
||||
fi
|
||||
|
||||
if [[ "${oldVersion}" = "${newVersion}" ]]; then
|
||||
echo "$attribute is already up to date."
|
||||
return
|
||||
else
|
||||
echo "$attribute: ${oldVersion} -> ${newVersion}"
|
||||
fi
|
||||
|
||||
echo " fetching source code to generate hash..."
|
||||
if [[ "$branch" = "mainline" ]]; then
|
||||
newHash="$(nix-prefetch-git --quiet --fetch-submodules --rev "mainline-0-${newVersion}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')"
|
||||
elif [[ "$branch" = "early-access" ]]; then
|
||||
newHash="$(nix-prefetch-git --quiet --fetch-submodules --rev "EA-${newVersion}" "https://github.com/pineappleEA/pineapple-src" | jq -r '.sha256')"
|
||||
fi
|
||||
newHash="$(nix hash to-sri --type sha256 "${newHash}")"
|
||||
|
||||
sed -i "s,${oldVersion},${newVersion}," "$DEFAULT_NIX"
|
||||
sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX"
|
||||
echo " successfully updated $attribute. new hash: $newHash"
|
||||
log() {
|
||||
tput bold
|
||||
echo "#" "$@"
|
||||
tput sgr0
|
||||
}
|
||||
|
||||
updateCompatibilityList() {
|
||||
local latestRevision oldUrl newUrl oldHash newHash oldDate newDate
|
||||
latestRevision="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/master" | jq -r '.sha')"
|
||||
alias curl='curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"}'
|
||||
|
||||
oldUrl="$(sed -n '/yuzu-compat-list/,/url/p' "$DEFAULT_NIX" | tail -n1 | cut -d'"' -f2)"
|
||||
newUrl="https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${latestRevision}/compatibility_list.json"
|
||||
log "Updating compatibility list..."
|
||||
compatListRev="$(curl "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/master" | jq -r '.sha')"
|
||||
|
||||
oldDate="$(sed -n '/last updated.*/p' "$DEFAULT_NIX" | rev | cut -d' ' -f1 | rev)"
|
||||
newDate="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/${latestRevision}" \
|
||||
| jq -r '.commit.committer.date' | cut -d'T' -f1)"
|
||||
log "Downloading rev: ${compatListRev}"
|
||||
compatListHash="$(nix-prefetch-url "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${compatListRev}/compatibility_list.json")"
|
||||
|
||||
oldHash="$(sed -n '/yuzu-compat-list/,/sha256/p' "$DEFAULT_NIX" | tail -n1 | cut -d'"' -f2)"
|
||||
newHash="$(nix hash to-sri --type sha256 "$(nix-prefetch-url --quiet "$newUrl")")"
|
||||
log "Updating mainline..."
|
||||
mainlineVersion="$(curl "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" | jq -r '.[0].name' | cut -d" " -f2)"
|
||||
|
||||
if [[ "$oldHash" = "$newHash" ]]; then
|
||||
echo "compatibility_list is already up to date."
|
||||
return
|
||||
else
|
||||
echo "compatibility_list: $oldDate -> $newDate"
|
||||
fi
|
||||
log "Downloading version: ${mainlineVersion}"
|
||||
mainlineHash="$(nix-prefetch-git --fetch-submodules --rev "mainline-0-${mainlineVersion}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')"
|
||||
|
||||
sed -i "s,${oldUrl},${newUrl},g" "$DEFAULT_NIX"
|
||||
sed -i "s,${oldHash},${newHash},g" "$DEFAULT_NIX"
|
||||
sed -i "s,${oldDate},${newDate},g" "$DEFAULT_NIX"
|
||||
echo " successfully updated compatibility_list. new hash: $newHash"
|
||||
log "Updating early access..."
|
||||
eaVersion="$(curl "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2)"
|
||||
|
||||
log "Downloading dist version: ${eaVersion}"
|
||||
fetched="$(nix-prefetch-url --unpack --print-path "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${eaVersion}/Windows-Yuzu-EA-${eaVersion}.zip")"
|
||||
|
||||
eaDistHash="$(echo "${fetched}" | head -n1)"
|
||||
eaDist="$(echo "${fetched}" | tail -n1)"
|
||||
|
||||
eaDistUnpacked="$(mktemp -d)"
|
||||
trap 'rm -rf "$eaDistUnpacked"' EXIT
|
||||
|
||||
log "Unpacking dist..."
|
||||
tar xf "$eaDist"/*.tar.xz --directory="$eaDistUnpacked" --strip-components=1
|
||||
|
||||
log "Rehydrating..."
|
||||
eaFullHash="$(nix-prefetch-git --fetch-submodules "$eaDistUnpacked" | jq -r '.sha256')"
|
||||
|
||||
cat >sources.nix <<EOF
|
||||
# Generated by ./update.sh - do not update manually!
|
||||
# Last updated: $(date +%F)
|
||||
{
|
||||
compatList = {
|
||||
rev = "$compatListRev";
|
||||
hash = "sha256:$compatListHash";
|
||||
};
|
||||
|
||||
mainline = {
|
||||
version = "$mainlineVersion";
|
||||
hash = "sha256:$mainlineHash";
|
||||
};
|
||||
|
||||
ea = {
|
||||
version = "$eaVersion";
|
||||
distHash = "sha256:$eaDistHash";
|
||||
fullHash = "sha256:$eaFullHash";
|
||||
};
|
||||
}
|
||||
|
||||
if [[ "$BRANCH" = "mainline" ]] || [[ "$BRANCH" = "early-access" ]]; then
|
||||
updateBranch "$BRANCH"
|
||||
updateCompatibilityList
|
||||
else # Script is not ran from passthru.updateScript
|
||||
if (( $# == 0 )); then
|
||||
updateBranch "mainline"
|
||||
updateBranch "early-access"
|
||||
fi
|
||||
|
||||
while (( "$#" > 0 )); do
|
||||
case "$1" in
|
||||
mainline|yuzu-mainline)
|
||||
updateBranch "mainline"
|
||||
;;
|
||||
early-access|yuzu-early-access|ea|yuzu-ea)
|
||||
updateBranch "early-access"
|
||||
;;
|
||||
*)
|
||||
echo "error: invalid branch: $1."
|
||||
echo "usage: $(basename "$0") [mainline|early-access]"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
updateCompatibilityList
|
||||
fi
|
||||
EOF
|
||||
|
|
|
|||
79
pkgs/applications/misc/health/default.nix
Normal file
79
pkgs/applications/misc/health/default.nix
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, cargo
|
||||
, wrapGAppsHook4
|
||||
, blueprint-compiler
|
||||
, libadwaita
|
||||
, libsecret
|
||||
, tracker
|
||||
, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "health";
|
||||
version = "0.94.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-KS0sdCQg2LqQB0K1cUbAjA8VITn5rAb8XCWjOKYbPqM=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
patches = [ ./update_gtk4_cargo_deps.patch ];
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-j0I0vKoGaf2pce2C/xkz+nJYCfLvHB5F6Q9XpJtABMI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/max_size_tightending_thresh_0.94.0.patch?h=health&id=d35d89760964b00ad457eca07855143a1dcbabdf";
|
||||
hash = "sha256-ndoxyrm+SVGVxfUbc5sQItQwzK75ZtKMSGUOB9mzBmo=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/max_value_0.94.0.patch?h=health&id=d35d89760964b00ad457eca07855143a1dcbabdf";
|
||||
hash = "sha256-YKVQNtz+RWN6Ydw+kbStCVf0vu0eTrMKGd6kEijFG00=";
|
||||
})
|
||||
# patch both or it will complain Cargo.lock mismatch
|
||||
./update_gtk4_cargo_deps.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
cargo
|
||||
wrapGAppsHook4
|
||||
blueprint-compiler
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libadwaita
|
||||
libsecret
|
||||
tracker
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A health tracking app for the GNOME desktop";
|
||||
homepage = "https://apps.gnome.org/app/dev.Cogitri.Health";
|
||||
license = licenses.gpl3Plus;
|
||||
mainProgram = "dev.Cogitri.Health";
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
28
pkgs/applications/misc/health/update_gtk4_cargo_deps.patch
Normal file
28
pkgs/applications/misc/health/update_gtk4_cargo_deps.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 0331121..8d290e4 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -829,9 +829,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a"
|
||||
|
||||
[[package]]
|
||||
name = "gtk4"
|
||||
-version = "0.4.8"
|
||||
+version = "0.4.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396"
|
||||
+checksum = "4e8ae5aef2793bc3551b5e5e3fa062a5de54bb1eccf10dfa4effe9e4384fbbbc"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-rs",
|
||||
@@ -852,9 +852,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gtk4-macros"
|
||||
-version = "0.4.8"
|
||||
+version = "0.4.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7"
|
||||
+checksum = "6aba0b544e91a753068e279e99d34e9624b8cfd26282167024c8a5773b8a826c"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"proc-macro-crate",
|
||||
|
|
@ -1,40 +1,34 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, fontconfig
|
||||
, xorg
|
||||
, libGL
|
||||
, openssl
|
||||
, AppKit
|
||||
, ApplicationServices
|
||||
, CoreFoundation
|
||||
, CoreGraphics
|
||||
, CoreServices
|
||||
, CoreText
|
||||
, CoreVideo
|
||||
, Foundation
|
||||
, Metal
|
||||
, QuartzCore
|
||||
, Security
|
||||
, libobjc
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "inlyne";
|
||||
version = "0.2.1";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trimental";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-jFocERr2cW7zdLiYfAay5Dh1issKAHp6vRWYWR1Axcg=";
|
||||
hash = "sha256-B+H3G4jVysqrzWIP+1hktSGnycZLizxhmBCO/lYIr0I=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-mH8tu8koprmHo6JJ9AwYMexy2SFR2yukZmFT060cuZ4=";
|
||||
cargoHash = "sha256-LFL2DVKu/UM7effikZN/IhSD6DrlwO+CF+S60PXULa0=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [
|
||||
fontconfig
|
||||
|
|
@ -44,20 +38,16 @@ rustPlatform.buildRustPackage rec {
|
|||
xorg.libxcb
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
AppKit
|
||||
ApplicationServices
|
||||
CoreFoundation
|
||||
CoreGraphics
|
||||
CoreServices
|
||||
CoreText
|
||||
CoreVideo
|
||||
Foundation
|
||||
Metal
|
||||
QuartzCore
|
||||
Security
|
||||
libobjc
|
||||
darwin.apple_sdk_11_0.frameworks.AppKit
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd inlyne \
|
||||
--bash <($out/bin/inlyne --gen-completions bash) \
|
||||
--fish <($out/bin/inlyne --gen-completions fish) \
|
||||
--zsh <($out/bin/inlyne --gen-completions zsh)
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf $out/bin/inlyne \
|
||||
--add-rpath ${lib.makeLibraryPath [ libGL xorg.libX11 ]}
|
||||
|
|
@ -66,6 +56,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A GPU powered browserless markdown viewer";
|
||||
homepage = "https://github.com/trimental/inlyne";
|
||||
changelog = "https://github.com/trimental/inlyne/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@ let
|
|||
in
|
||||
mkDerivation rec {
|
||||
pname = "osmscout-server";
|
||||
version = "2.2.2";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rinigus";
|
||||
repo = "osmscout-server";
|
||||
rev = version;
|
||||
sha256 = "sha256-ngB3c6rUQ/+AeaJHKAFRl9lCkUobLWSnsn030brB+Bw=";
|
||||
hash = "sha256-jcg/0SKeLviEC+vszh5DployKDAI7N+a8lzvImzFTvY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,11 @@
|
|||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, pkg-config
|
||||
, cmake
|
||||
, fontconfig
|
||||
, glib
|
||||
, gtk3
|
||||
, freetype
|
||||
, openssl
|
||||
, xorg
|
||||
, libGL
|
||||
|
|
@ -26,10 +31,18 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
] ++ lib.optionals withGui [
|
||||
copyDesktopItems
|
||||
cmake
|
||||
];
|
||||
|
||||
buildInputs = if withGui then [
|
||||
buildInputs = [
|
||||
openssl
|
||||
] ++ lib.optionals withGui [
|
||||
fontconfig
|
||||
glib
|
||||
gtk3
|
||||
freetype
|
||||
openssl
|
||||
xorg.libxcb
|
||||
xorg.libX11
|
||||
|
|
@ -39,8 +52,6 @@ rustPlatform.buildRustPackage rec {
|
|||
xorg.libxcb
|
||||
libGL
|
||||
libGL.dev
|
||||
] else [
|
||||
openssl
|
||||
];
|
||||
|
||||
buildNoDefaultFeatures = true;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ let
|
|||
vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "6.0.2979.15";
|
||||
version = "6.0.2979.18";
|
||||
|
||||
suffix = {
|
||||
aarch64-linux = "arm64";
|
||||
|
|
@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
|
|||
src = fetchurl {
|
||||
url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
|
||||
hash = {
|
||||
aarch64-linux = "sha256-6rETxeExtHxWrKFO0MHzjLgnaHUeREVqsOB9264jZr8=";
|
||||
x86_64-linux = "sha256-vvN0AxrKotphYIpkyOKHBgEOQtF4LvYBV1cB591ICbc=";
|
||||
aarch64-linux = "sha256-S3b0mmWsQhWDKPz34Gzb50q+wAURAFNEt6IvCqo8CMs=";
|
||||
x86_64-linux = "sha256-uqhXL7kndmGoOOalyQ6mVxRB3k8L11UJzADCnNakj64=";
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,8 @@ let
|
|||
mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
|
||||
mv * $out/lib/${untarDir}
|
||||
|
||||
cp $out/lib/${untarDir}/conf/log4j.properties{.template,}
|
||||
cp $out/lib/${untarDir}/conf/log4j.properties{.template,} || \
|
||||
cp $out/lib/${untarDir}/conf/log4j2.properties{.template,}
|
||||
|
||||
cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF
|
||||
export JAVA_HOME="${jdk}"
|
||||
|
|
@ -70,20 +71,9 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
spark_3_2 = spark rec {
|
||||
spark_3_4 = spark rec {
|
||||
pname = "spark";
|
||||
version = "3.2.2";
|
||||
sha256 = "sha256-yKoTyD/IqvsJQs0jB67h1zqwYaLuikdoa5fYIXtvhz0=";
|
||||
};
|
||||
spark_3_1 = spark rec {
|
||||
pname = "spark";
|
||||
version = "3.1.3";
|
||||
sha256 = "sha256-RIQyN5YjxFLfNIrETR3Vv99zsHxt77rhOXHIThCI2Y8=";
|
||||
};
|
||||
spark_2_4 = spark rec {
|
||||
pname = "spark";
|
||||
version = "2.4.8";
|
||||
sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
|
||||
extraMeta.knownVulnerabilities = [ "CVE-2021-38296" ];
|
||||
version = "3.4.0";
|
||||
sha256 = "sha256-0y80dRYzb6Ceu6MlGQHtpMdzOob/TBg6kf8dtF6KyCk=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
38
pkgs/applications/window-managers/sway/osd.nix
Normal file
38
pkgs/applications/window-managers/sway/osd.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, gtk-layer-shell
|
||||
, libpulseaudio
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "swayosd";
|
||||
version = "unstable-2023-05-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ErikReider";
|
||||
repo = "SwayOSD";
|
||||
rev = "5c2176ae6a01a18fdc2b0f5d5f593737b5765914";
|
||||
hash = "sha256-rh42J6LWgNPOWYLaIwocU1JtQnA5P1jocN3ywVOfYoc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZcgrUcRQTcEYhw2mpJDuYDz3I/u/2Q+O60ajXYRMeow=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
gtk-layer-shell
|
||||
libpulseaudio
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A GTK based on screen display for keyboard shortcuts";
|
||||
homepage = "https://github.com/ErikReider/SwayOSD";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.4/ -A '*.tar.xz' )
|
||||
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.5/ -A '*.tar.xz' )
|
||||
|
|
|
|||
|
|
@ -4,475 +4,475 @@
|
|||
|
||||
{
|
||||
aura-browser = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/aura-browser-5.27.4.tar.xz";
|
||||
sha256 = "0m69p3pnb4kwpibqi8p4kg15sd47298hbhxgkj6ijpbd0422p4c9";
|
||||
name = "aura-browser-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/aura-browser-5.27.5.tar.xz";
|
||||
sha256 = "0vqw9kxskx3d6wfgrfbhrsw2vy71zr3cwhmfk7qj4vfpmilmsvy5";
|
||||
name = "aura-browser-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
bluedevil = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/bluedevil-5.27.4.tar.xz";
|
||||
sha256 = "18wnr31rdpk70g7l3ig03kw99ss6qkfjmhqysrkyd6m1dpsp260h";
|
||||
name = "bluedevil-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/bluedevil-5.27.5.tar.xz";
|
||||
sha256 = "1vadllkv4fjjwqb30jyawi56jflslw5nc391r0bixg55cpk5llv1";
|
||||
name = "bluedevil-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/breeze-5.27.4.tar.xz";
|
||||
sha256 = "008rdgyn10wdm393hgxvshfcqrxg6y5yr6xi0nzj4y0cd6yhxn32";
|
||||
name = "breeze-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/breeze-5.27.5.tar.xz";
|
||||
sha256 = "0s68zr21wniqsdkb14lzqz0hj7hb4mbvcwrq7sf8yxf0z1ds7n3h";
|
||||
name = "breeze-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-grub = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/breeze-grub-5.27.4.tar.xz";
|
||||
sha256 = "0ymivw0pwia1vbf45pr04f825r8w6gsgn450s5x35144vg6lqkqb";
|
||||
name = "breeze-grub-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/breeze-grub-5.27.5.tar.xz";
|
||||
sha256 = "0kkrsda7ml3cbvfxb0ng3np1bk61fnl1jndk3c13lyi0jj97na7f";
|
||||
name = "breeze-grub-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-gtk = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/breeze-gtk-5.27.4.tar.xz";
|
||||
sha256 = "17wr4ri1jxsfx8pcm41mp0fsszlf6wi80gxlkixghrc04p6pv5nb";
|
||||
name = "breeze-gtk-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/breeze-gtk-5.27.5.tar.xz";
|
||||
sha256 = "0s69alp490yhm2v42vkngz99ji4b10n6fd36ybf72m6nnkd6v5f4";
|
||||
name = "breeze-gtk-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
breeze-plymouth = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/breeze-plymouth-5.27.4.tar.xz";
|
||||
sha256 = "1fzidj0dqmr5baphffr5fyxww7v6bigfvbj1hndhk5silm28krkv";
|
||||
name = "breeze-plymouth-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/breeze-plymouth-5.27.5.tar.xz";
|
||||
sha256 = "0k014dvx2sw4hd63n74vjglg8dgyjjlvipxhb5cfp44x7ch52wii";
|
||||
name = "breeze-plymouth-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
discover = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/discover-5.27.4.tar.xz";
|
||||
sha256 = "0rpr0c87nlm3fanv5fxs930rp5mrw357cfar6d81mwacmp86d7yw";
|
||||
name = "discover-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/discover-5.27.5.tar.xz";
|
||||
sha256 = "06xk780a60f4a1n2052q1wxydjvvb8nlw9r2cj7x4rg02s57hpvq";
|
||||
name = "discover-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
drkonqi = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/drkonqi-5.27.4.tar.xz";
|
||||
sha256 = "1lcidwcsm216acr6ybhyma64gl37n1pn7y8ilkh2iilwm1fwwfnn";
|
||||
name = "drkonqi-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/drkonqi-5.27.5.tar.xz";
|
||||
sha256 = "0mmcp5fzlygcchv5v10mn39iqfxjxig9x8h74n3hq0rw7arax3a4";
|
||||
name = "drkonqi-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
flatpak-kcm = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/flatpak-kcm-5.27.4.tar.xz";
|
||||
sha256 = "0i917li4cm8p0qq28m4jfasy5lph58spf9bfsbp3ka1x7i25cqdd";
|
||||
name = "flatpak-kcm-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/flatpak-kcm-5.27.5.tar.xz";
|
||||
sha256 = "16ms8l7cncbmll808mb0hfjsfjpg1m3f1j38y9zh1hal0rw42xbv";
|
||||
name = "flatpak-kcm-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kactivitymanagerd = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kactivitymanagerd-5.27.4.tar.xz";
|
||||
sha256 = "0wnsj5mbzjc3bylzyhgj8bw0qsf5c9jcyxmfr0h7w4hj414zvqfr";
|
||||
name = "kactivitymanagerd-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kactivitymanagerd-5.27.5.tar.xz";
|
||||
sha256 = "06dn0cnspp2qsjxa10vz81vrhhb6przr9lcfyia4gi65gdrg82d2";
|
||||
name = "kactivitymanagerd-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-cli-tools = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kde-cli-tools-5.27.4.tar.xz";
|
||||
sha256 = "06dl811mwssjylgkn74wjhxi98q1qacf5c2m0jfyny7hbphgv565";
|
||||
name = "kde-cli-tools-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kde-cli-tools-5.27.5.tar.xz";
|
||||
sha256 = "0rzggjsly44wxpsqqxylnzw2n3sf7s1584rf1qp1040jf0vmcx7d";
|
||||
name = "kde-cli-tools-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kde-gtk-config = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kde-gtk-config-5.27.4.tar.xz";
|
||||
sha256 = "1qi0cbx9yilbxs19nbh8iplj5hi19mllk63ldyah2vn5bgwavxcq";
|
||||
name = "kde-gtk-config-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kde-gtk-config-5.27.5.tar.xz";
|
||||
sha256 = "0a0hbif6xvlfg6jm2kmzsfjr2f73c7pxbn8amam6z4h1171bfys7";
|
||||
name = "kde-gtk-config-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kdecoration = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kdecoration-5.27.4.tar.xz";
|
||||
sha256 = "0vpshfjb2m1m4lx4sh1mhfpx70wvy6laaids9q1cip3k22i24ps1";
|
||||
name = "kdecoration-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kdecoration-5.27.5.tar.xz";
|
||||
sha256 = "0hmy621b8zb8jvanw6w6y8mgrfspkl5d92sgl5zx00lqqz2zdyzg";
|
||||
name = "kdecoration-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kdeplasma-addons = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kdeplasma-addons-5.27.4.tar.xz";
|
||||
sha256 = "128zjkbvxkibh1d5d1m5xsg3f6hrkgs1f0k371bk8dpki1wsb0ka";
|
||||
name = "kdeplasma-addons-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kdeplasma-addons-5.27.5.tar.xz";
|
||||
sha256 = "1y8gaqmbqcjvzpxk6bb7bjgycrmsnw3cjk741csb0xbw66q1ldf9";
|
||||
name = "kdeplasma-addons-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kgamma5 = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kgamma5-5.27.4.tar.xz";
|
||||
sha256 = "00jq6pc40k1dd6g38bjyb52z8xf3iz9s2n0bwvqaddcngw5wb0aa";
|
||||
name = "kgamma5-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kgamma5-5.27.5.tar.xz";
|
||||
sha256 = "1nadx1fgpz1k7c2j93wk4ipzp6pydz8ak1p9p2pv9a24753jcrkv";
|
||||
name = "kgamma5-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
khotkeys = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/khotkeys-5.27.4.tar.xz";
|
||||
sha256 = "08qhj9m5dkg1vgjyzm93ns8c5yvbwfa5r6z7xgn0filvlzg284l4";
|
||||
name = "khotkeys-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/khotkeys-5.27.5.tar.xz";
|
||||
sha256 = "087cws4g8p0fzalspnizsd8fxk3745g9ar03pl746fqyvqk57s43";
|
||||
name = "khotkeys-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kinfocenter = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kinfocenter-5.27.4.tar.xz";
|
||||
sha256 = "15g4czd8pm4vliaax8kgy8zdgxqj73x1icy4gc09y4zwqhaclxb8";
|
||||
name = "kinfocenter-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kinfocenter-5.27.5.tar.xz";
|
||||
sha256 = "0j6w9b4pf353l0dfv8b8a90q4swylqxwx818271abs1bkq271s8b";
|
||||
name = "kinfocenter-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kmenuedit = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kmenuedit-5.27.4.tar.xz";
|
||||
sha256 = "1cx7ih68by4slrxrgf8yh49fxszfrzgfhrajk8xjgq9s34nvgarp";
|
||||
name = "kmenuedit-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kmenuedit-5.27.5.tar.xz";
|
||||
sha256 = "09qiydq3v4yl51cn0l2ndsr54m33n6x3ngz9q18j4nf4pk266qj4";
|
||||
name = "kmenuedit-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kpipewire = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kpipewire-5.27.4.tar.xz";
|
||||
sha256 = "0r9ii0mwv2d8nlq3p0g5hsp3m0j8my17ji1an7hzw5pajf340lx6";
|
||||
name = "kpipewire-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kpipewire-5.27.5.tar.xz";
|
||||
sha256 = "166xggr22k2ksnsx97kngc02r8fy0fagd2m7zghdbl5axvf6lcj1";
|
||||
name = "kpipewire-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreen = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kscreen-5.27.4.tar.xz";
|
||||
sha256 = "1vf5lhbm1r55l1y06sib1fdv5mbmd77ns1xmq3f0ff7mfabj8vs5";
|
||||
name = "kscreen-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kscreen-5.27.5.tar.xz";
|
||||
sha256 = "0s24halra8gnczmlj8kvbqvls1njck2abxbdsvn7gm3rkg1sm5vj";
|
||||
name = "kscreen-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kscreenlocker = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kscreenlocker-5.27.4.tar.xz";
|
||||
sha256 = "14bip40nkkj6xhmws14hqzjmw23348dpvip4vad8fdgyndcpznm9";
|
||||
name = "kscreenlocker-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kscreenlocker-5.27.5.tar.xz";
|
||||
sha256 = "14pch0w4cgsx1q18hssdnjxdbdcparyrqqr9kd5a33zdqbqhg22c";
|
||||
name = "kscreenlocker-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
ksshaskpass = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/ksshaskpass-5.27.4.tar.xz";
|
||||
sha256 = "0spl7v7narfpvx37f1fqyk9mbsqhymy7jvd3gbxyln0x31j041d9";
|
||||
name = "ksshaskpass-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/ksshaskpass-5.27.5.tar.xz";
|
||||
sha256 = "1mqckg3j5flx02fji7lcqv2iip4nblrzf2wqq23q7six7rljdvgn";
|
||||
name = "ksshaskpass-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
ksystemstats = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/ksystemstats-5.27.4.tar.xz";
|
||||
sha256 = "1knykvf6ygg75y7qj8087v8sg6m54ywsk8v9d5yc7f0g8mhqkmhz";
|
||||
name = "ksystemstats-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/ksystemstats-5.27.5.tar.xz";
|
||||
sha256 = "1y6w6v1vf2bphspk7a3lgwgmz6ahdycbbsrr6qn8mkf9z36q97fm";
|
||||
name = "ksystemstats-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kwallet-pam = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwallet-pam-5.27.4.tar.xz";
|
||||
sha256 = "0v0jzkmdbwry6k70nk4gmzv758744q4qi50gry9bcz619imkz8ff";
|
||||
name = "kwallet-pam-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kwallet-pam-5.27.5.tar.xz";
|
||||
sha256 = "144ijabyj9w2yi9j5r0m945l6ysccwyq27cc0mc21mjyqa6sm6ka";
|
||||
name = "kwallet-pam-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kwayland-integration = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwayland-integration-5.27.4.tar.xz";
|
||||
sha256 = "027y4r02g26mv5a76s2yr0fxyx7dq81md41lgjnr3gg0jdm8ajpp";
|
||||
name = "kwayland-integration-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kwayland-integration-5.27.5.tar.xz";
|
||||
sha256 = "1y8qrdyvz61zcxsp9ylz7bg6hp7wk7is5p0n3s25650dlx0grqcs";
|
||||
name = "kwayland-integration-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kwin = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwin-5.27.4.1.tar.xz";
|
||||
sha256 = "1c821szi4vvxc0aw49nb2xbdgnkc1pl5hadpvc9m4l18qly1v7xk";
|
||||
name = "kwin-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kwin-5.27.5.tar.xz";
|
||||
sha256 = "1si01jrhxa6sfqgl2ljl5czyls5mli7b4n6yy6jiws0rb6qjc4mv";
|
||||
name = "kwin-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
kwrited = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/kwrited-5.27.4.tar.xz";
|
||||
sha256 = "1z07fjw3b8q7cgy7vvlh1bmx4qm609mipgm5wjf6lb63ss04nfpd";
|
||||
name = "kwrited-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/kwrited-5.27.5.tar.xz";
|
||||
sha256 = "14fcby31017mmplcp5v2mfmfnlds5mgn35b725d06z584xcfrfpj";
|
||||
name = "kwrited-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
layer-shell-qt = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/layer-shell-qt-5.27.4.tar.xz";
|
||||
sha256 = "1znhwg86wnjrmw5lfbwarl2va90zf4b0lpafia73q0i39g0ysfiv";
|
||||
name = "layer-shell-qt-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/layer-shell-qt-5.27.5.tar.xz";
|
||||
sha256 = "088xilf31485mqxw09v2h7v3dayzd19c6yipmlxpyhzhg6jnmpyc";
|
||||
name = "layer-shell-qt-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
libkscreen = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/libkscreen-5.27.4.tar.xz";
|
||||
sha256 = "0zps0z0j4yln2yda4sj15rn3i6y3qipb5yb4q90qm5a0iiggp7d8";
|
||||
name = "libkscreen-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/libkscreen-5.27.5.tar.xz";
|
||||
sha256 = "0rgbdlchhks5bxicdc8v7388wlg5b6ms9phlp5jfh1l7iprg7br9";
|
||||
name = "libkscreen-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
libksysguard = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/libksysguard-5.27.4.tar.xz";
|
||||
sha256 = "1y7q4bkgpg1j9yw9glm0566fbx6vf9ccz9f46vg3zfjwa468s4p0";
|
||||
name = "libksysguard-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/libksysguard-5.27.5.tar.xz";
|
||||
sha256 = "052yx04sihlvf7j94y140g9hldq9fjad9ziqdgmczvszy0xbazky";
|
||||
name = "libksysguard-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
milou = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/milou-5.27.4.tar.xz";
|
||||
sha256 = "1a2p3y3zcmjigwywl7k7mgwvilpyjzjnbylx8zadp0051yw6f3sd";
|
||||
name = "milou-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/milou-5.27.5.tar.xz";
|
||||
sha256 = "1602imffywir1il1xsq3n413fjxg4s3w9c49z20yn1igcwz0l6qv";
|
||||
name = "milou-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/oxygen-5.27.4.tar.xz";
|
||||
sha256 = "1sz3rnsz8qabln3jn5bg1f5vgijgmm13242k65kiksvigfdrc3p2";
|
||||
name = "oxygen-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/oxygen-5.27.5.tar.xz";
|
||||
sha256 = "1gby4a9sf666i10nwjv4wswsbi34idcczz0cknfan08ahal4wxpv";
|
||||
name = "oxygen-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
oxygen-sounds = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/oxygen-sounds-5.27.4.tar.xz";
|
||||
sha256 = "1v44jcy0zkvpqkc6yih55j6xmb0g3pd26szk95mpjkn7jxsav8wy";
|
||||
name = "oxygen-sounds-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/oxygen-sounds-5.27.5.tar.xz";
|
||||
sha256 = "0rl55k6h34bcf5pk71942m3bf831ymh4kk89xkimczq4qki33yr1";
|
||||
name = "oxygen-sounds-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plank-player = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plank-player-5.27.4.tar.xz";
|
||||
sha256 = "0650v644nvbnl9b0caa83pbq8y7jrklqzqxdlcrml6km85avhx5n";
|
||||
name = "plank-player-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plank-player-5.27.5.tar.xz";
|
||||
sha256 = "0anws5npjdqq0p94fdrqmvyc55x3vwfx8v59l10k8qmj6habarph";
|
||||
name = "plank-player-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-bigscreen = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-bigscreen-5.27.4.tar.xz";
|
||||
sha256 = "18jdgk3aydk394r91c279fnlhyrvmklqznxjikq25mx449wa3acp";
|
||||
name = "plasma-bigscreen-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-bigscreen-5.27.5.tar.xz";
|
||||
sha256 = "1wab0l0cz5a82lgq83s9ipmjqmj5nzzfk689lbz3swxns71qx03n";
|
||||
name = "plasma-bigscreen-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-browser-integration = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-browser-integration-5.27.4.tar.xz";
|
||||
sha256 = "0rpljxnir2nbh4ww5ycgpdrj739cr1dg46mmfqj65h8yn60zfynk";
|
||||
name = "plasma-browser-integration-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-browser-integration-5.27.5.tar.xz";
|
||||
sha256 = "09frs7yxaiqi10j9f7vnr05nk53mvx0jshjk9wlz1cibcwflb45l";
|
||||
name = "plasma-browser-integration-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-desktop = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-desktop-5.27.4.tar.xz";
|
||||
sha256 = "0068wcm586gv31aqjgppj1n5a81jv10q01spsxl24c91y7aiqkxr";
|
||||
name = "plasma-desktop-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-desktop-5.27.5.tar.xz";
|
||||
sha256 = "1c8wx4al96vnz9p02ml8ax6dzna1xvm6gvnn2w3n93v56hqmfasg";
|
||||
name = "plasma-desktop-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-disks = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-disks-5.27.4.tar.xz";
|
||||
sha256 = "08w3x7hd3wkgj41g9xcaylsz8lsjv1d4pgmzq7dy436vwbiaxx4p";
|
||||
name = "plasma-disks-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-disks-5.27.5.tar.xz";
|
||||
sha256 = "02s8n7da2i2zjqi2q9k8fddqr4868dqyx9bf1lyfag3bb64y447a";
|
||||
name = "plasma-disks-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-firewall = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-firewall-5.27.4.tar.xz";
|
||||
sha256 = "1b538c9jngyj5zg6bvih2x7nskzdn8g9g04bxdjnayldj2hb979l";
|
||||
name = "plasma-firewall-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-firewall-5.27.5.tar.xz";
|
||||
sha256 = "0hav4d2pgsvzvr9lw93v3zm473gii44x012fs1gx6dgcaam90b73";
|
||||
name = "plasma-firewall-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-integration = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-integration-5.27.4.tar.xz";
|
||||
sha256 = "0bl99gr2clqs6wxlx0652gcypgxqw9s34yxvhc9df0fn53v9b84s";
|
||||
name = "plasma-integration-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-integration-5.27.5.tar.xz";
|
||||
sha256 = "0ywzz2s46kaidzg5cagx2wp4kqndynfssz6a29czpw1811iwbvcd";
|
||||
name = "plasma-integration-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-mobile = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-mobile-5.27.4.tar.xz";
|
||||
sha256 = "1a05lnhnxnizzs9fswsrlddwb0629xfl3wmm2rw635gqldd0f66m";
|
||||
name = "plasma-mobile-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-mobile-5.27.5.tar.xz";
|
||||
sha256 = "0h61q8nkwl5adrgm0353l2kada76760rqzwb94xdc7r9cjxjy6yc";
|
||||
name = "plasma-mobile-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nano = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-nano-5.27.4.tar.xz";
|
||||
sha256 = "1z70bj5s3qkx2rbrbn9xqf4vzyj7yx9vq9givcagncxnldi1x3pa";
|
||||
name = "plasma-nano-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-nano-5.27.5.tar.xz";
|
||||
sha256 = "1w6pq6wrnb3lq2jyfx9lpn11vmfka5rw4mn52cdz8997g4zyrhlj";
|
||||
name = "plasma-nano-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-nm = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-nm-5.27.4.tar.xz";
|
||||
sha256 = "0jr1a4d9qj43925abr36nvc9fhvyd58qhdg4w5i805p533wbzrif";
|
||||
name = "plasma-nm-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-nm-5.27.5.tar.xz";
|
||||
sha256 = "0bm6ihcg5cgfzz1pcj7zg2bjm8gik3rcjj4mp03ac1v29gj4hbqm";
|
||||
name = "plasma-nm-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-pa = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-pa-5.27.4.tar.xz";
|
||||
sha256 = "1rpjscmfb7i9h50m9xglxf4rgca63y0i8x341jgmf5kmpm9lad7d";
|
||||
name = "plasma-pa-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-pa-5.27.5.tar.xz";
|
||||
sha256 = "1241v4igi3d1n2x46vp9qgqvw2gngsk75gx3rnjnivfypxrkzay2";
|
||||
name = "plasma-pa-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-remotecontrollers = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-remotecontrollers-5.27.4.tar.xz";
|
||||
sha256 = "0l9n0q318720yx02whrp9qfhhwcnw261sdvyw78y9c3n4v22k31n";
|
||||
name = "plasma-remotecontrollers-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-remotecontrollers-5.27.5.tar.xz";
|
||||
sha256 = "04d0rp4jpavn999lbvfni007l98i1zglwv7byrkb494zs40gqylc";
|
||||
name = "plasma-remotecontrollers-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-sdk = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-sdk-5.27.4.tar.xz";
|
||||
sha256 = "08fv6rnb7vc3wxkwk3xrrvb3k1gac7sncjdvk0lik6y1c7ilk27r";
|
||||
name = "plasma-sdk-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-sdk-5.27.5.tar.xz";
|
||||
sha256 = "05b9n2h7qkxm5yws4mi4f929dassi6hng0p730dx5fw7fsr4a0pi";
|
||||
name = "plasma-sdk-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-systemmonitor = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-systemmonitor-5.27.4.tar.xz";
|
||||
sha256 = "1sy38lmkrvma4kkf96n68f65hdjvpyaszx13hynhrplsgn24fj19";
|
||||
name = "plasma-systemmonitor-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-systemmonitor-5.27.5.tar.xz";
|
||||
sha256 = "0d1ficiqv7zjcc1fkh7jx4f7pcpkygk1pyfm8gsp10i0iwwm3rc2";
|
||||
name = "plasma-systemmonitor-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-thunderbolt = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-thunderbolt-5.27.4.tar.xz";
|
||||
sha256 = "1zzl59qyajf8xcxxs5lijx85v8gm3y4izf3qd502smq2841hbxi8";
|
||||
name = "plasma-thunderbolt-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-thunderbolt-5.27.5.tar.xz";
|
||||
sha256 = "1mchvgh180m8anjznpwihay934c331fqc88l1wyiqqn6072n819i";
|
||||
name = "plasma-thunderbolt-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-vault = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-vault-5.27.4.1.tar.xz";
|
||||
sha256 = "1bh2662ghdq5qkvn4347yc2dh6c616qiax4k4yylkf37czqdil77";
|
||||
name = "plasma-vault-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-vault-5.27.5.tar.xz";
|
||||
sha256 = "1s176masmip1qzv5am3phkwvb7yalmiasgzbx7r2rq705bh2pwkl";
|
||||
name = "plasma-vault-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-welcome = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-welcome-5.27.4.1.tar.xz";
|
||||
sha256 = "0rg80rc07q63z0ds4q8lf9yrv3ys9cvjcfwx39ibjy9nrkismrca";
|
||||
name = "plasma-welcome-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-welcome-5.27.5.tar.xz";
|
||||
sha256 = "1ddfyi1a2ccs8ny9is0x8fjz0yh2v65sin85nrv6j483n3qqxjfb";
|
||||
name = "plasma-welcome-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-5.27.4.1.tar.xz";
|
||||
sha256 = "19b5mydi995aa634v57dlc769nmbz6mb2hs8c620gzabjnn0cffb";
|
||||
name = "plasma-workspace-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-workspace-5.27.5.tar.xz";
|
||||
sha256 = "05rayz8n3qgpnddr4wpzjwgvk3if4vnnwb1ccpm841zxxsr9a2zd";
|
||||
name = "plasma-workspace-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plasma-workspace-wallpapers = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plasma-workspace-wallpapers-5.27.4.1.tar.xz";
|
||||
sha256 = "0sv58kp088vxqd5dfs3hvc93xlydk7nyxm1ly0xy377r2v3pnkg4";
|
||||
name = "plasma-workspace-wallpapers-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plasma-workspace-wallpapers-5.27.5.tar.xz";
|
||||
sha256 = "0h6871pwn000jzilhh4w5wa3s017cgkphhj4sxxpqds7q7f5x013";
|
||||
name = "plasma-workspace-wallpapers-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
plymouth-kcm = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/plymouth-kcm-5.27.4.1.tar.xz";
|
||||
sha256 = "0x20dswpy1vg1rh01m7pbicd1fn0rbh5gfaqdlizdcpnd6gjjfh5";
|
||||
name = "plymouth-kcm-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/plymouth-kcm-5.27.5.tar.xz";
|
||||
sha256 = "0r00kmqzkzpjvp3s02h7vjiiyzfpvzn5j158jf6khvb4vywljqjr";
|
||||
name = "plymouth-kcm-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
polkit-kde-agent = {
|
||||
version = "1-5.27.4.1";
|
||||
version = "1-5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/polkit-kde-agent-1-5.27.4.1.tar.xz";
|
||||
sha256 = "1ikhrs17ffrsji6phwxhz8b6gxldksjb4625zpin8vkf07v9brr6";
|
||||
name = "polkit-kde-agent-1-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/polkit-kde-agent-1-5.27.5.tar.xz";
|
||||
sha256 = "0brab8hn2qdnxzzx0q37m40h67s00s0zpc2wx1gzbnbl1kzv9qra";
|
||||
name = "polkit-kde-agent-1-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
powerdevil = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/powerdevil-5.27.4.1.tar.xz";
|
||||
sha256 = "0s6k7kcfa717lcjdlx61h21ldk4fg67is6r2vzcq0507gp3r8jb4";
|
||||
name = "powerdevil-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/powerdevil-5.27.5.tar.xz";
|
||||
sha256 = "03jhzcwg1kjhm8ly3w12slgdxbyycqymijgnh3llrvzgawn8cy83";
|
||||
name = "powerdevil-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
qqc2-breeze-style = {
|
||||
version = "5.27.4";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/qqc2-breeze-style-5.27.4.tar.xz";
|
||||
sha256 = "0x96xa5j3726i4ci6g51hk364hhcq9xip4jrb1qssb9l0v1324n4";
|
||||
name = "qqc2-breeze-style-5.27.4.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/qqc2-breeze-style-5.27.5.tar.xz";
|
||||
sha256 = "0vcq59m074zvcivlhk0jp7k5vywmamfdq4bsacvsjzxhlvzkvjlh";
|
||||
name = "qqc2-breeze-style-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
sddm-kcm = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/sddm-kcm-5.27.4.1.tar.xz";
|
||||
sha256 = "0l85mk8mj3g5fga6z93w5k88pkpf8wrx6vaf4f1q9lgy2dkm4ylp";
|
||||
name = "sddm-kcm-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/sddm-kcm-5.27.5.tar.xz";
|
||||
sha256 = "16hrmbl413zy89if8yj9jsvnzv58rvs7w6y5isq33drkzvgz41an";
|
||||
name = "sddm-kcm-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
systemsettings = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/systemsettings-5.27.4.1.tar.xz";
|
||||
sha256 = "03kk2bangg9nixdwpyrp2k4wgv3r3d3ymklqfx37b7c25wpiv7az";
|
||||
name = "systemsettings-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/systemsettings-5.27.5.tar.xz";
|
||||
sha256 = "1nxla37vr1j1h2vklm6cdzr5h5my9d3m05nr9dr1wcxsmaq4wifm";
|
||||
name = "systemsettings-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
xdg-desktop-portal-kde = {
|
||||
version = "5.27.4.1";
|
||||
version = "5.27.5";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/stable/plasma/5.27.4/xdg-desktop-portal-kde-5.27.4.1.tar.xz";
|
||||
sha256 = "0hrxlql13yab3w778wgdsr92g65q81qk5dvlqnn0fdc9lbfw5ipg";
|
||||
name = "xdg-desktop-portal-kde-5.27.4.1.tar.xz";
|
||||
url = "${mirror}/stable/plasma/5.27.5/xdg-desktop-portal-kde-5.27.5.tar.xz";
|
||||
sha256 = "1aqsiwfhca7nimdflwnq86fai4lhjqpi4pi4xyp8pcgrrwj3zykw";
|
||||
name = "xdg-desktop-portal-kde-5.27.5.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia";
|
||||
version = "1.9.0-rc1";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz";
|
||||
hash = "sha256-BjHuS1pP8S+iZndyGS8HiNzApr7xUYPRPRkX55DEy4Y=";
|
||||
hash = "sha256-Ii61M8ncVHNJSes6QWn1Su+hvCC+OF/Bz3mMghn+ZAA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget
|
||||
{ lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages
|
||||
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
|
||||
, fetchurl, file, python3
|
||||
, darwin, cmake, rust, rustPlatform
|
||||
|
|
@ -21,7 +21,7 @@ let
|
|||
inherit (lib) optionals optional optionalString concatStringsSep;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}rustc";
|
||||
pname = "${targetPackages.stdenv.cc.targetPrefix}rustc";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@
|
|||
, fetchurl
|
||||
, pkg-config
|
||||
, hidapi
|
||||
, jimtcl
|
||||
, libjaylink
|
||||
, libusb1
|
||||
, libgpiod
|
||||
|
||||
|
|
@ -22,11 +24,13 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ hidapi libftdi1 libusb1 ]
|
||||
buildInputs = [ hidapi jimtcl libftdi1 libjaylink libusb1 ]
|
||||
++ lib.optional stdenv.isLinux libgpiod;
|
||||
|
||||
configureFlags = [
|
||||
"--disable-werror"
|
||||
"--disable-internal-jimtcl"
|
||||
"--disable-internal-libjaylink"
|
||||
"--enable-jtag_vpi"
|
||||
"--enable-buspirate"
|
||||
"--enable-remote-bitbang"
|
||||
|
|
|
|||
|
|
@ -1,57 +1,91 @@
|
|||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, python3
|
||||
, libffi
|
||||
, git
|
||||
, cmake
|
||||
, zlib
|
||||
, fetchgit
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, runCommand
|
||||
, llvmPackages_5
|
||||
, llvmPackages_9
|
||||
, glibc
|
||||
, ncurses
|
||||
}:
|
||||
|
||||
let
|
||||
# The LLVM 9 headers have a couple bugs we need to patch
|
||||
fixedLlvmDev = runCommand "llvm-dev-${llvmPackages_9.llvm.version}" { buildInputs = [git]; } ''
|
||||
mkdir $out
|
||||
cp -r ${llvmPackages_9.llvm.dev}/include $out
|
||||
cd $out
|
||||
chmod -R u+w include
|
||||
git apply ${./fix-llvm-include.patch}
|
||||
'';
|
||||
|
||||
unwrapped = stdenv.mkDerivation rec {
|
||||
pname = "cling-unwrapped";
|
||||
version = "0.7";
|
||||
version = "0.9";
|
||||
|
||||
src = fetchgit {
|
||||
url = "http://root.cern/git/clang.git";
|
||||
# This commit has the tag cling-0.7 so we use it, even though cpt.py
|
||||
# tries to use refs/tags/cling-patches-rrelease_50
|
||||
rev = "354b25b5d915ff3b1946479ad07f3f2768ea1621";
|
||||
branchName = "cling-patches";
|
||||
sha256 = "0q8q2nnvjx3v59ng0q3qqqhzmzf4pmfqqiy3rz1f3drx5w3lgyjg";
|
||||
rev = "cling-v0.9";
|
||||
sha256 = "sha256-ft1NUIclSiZ9lN3Z3DJCWA0U9q/K1M0TKkZr+PjsFYk=";
|
||||
};
|
||||
|
||||
clingSrc = fetchgit {
|
||||
url = "http://root.cern/git/cling.git";
|
||||
rev = "70163975eee5a76b45a1ca4016bfafebc9b57e07";
|
||||
sha256 = "1mv2fhk857kp5rq714bq49iv7gy9fgdwibydj5wy1kq2m3sf3ysi";
|
||||
clingSrc = fetchFromGitHub {
|
||||
owner = "root-project";
|
||||
repo = "cling";
|
||||
rev = "v0.9";
|
||||
sha256 = "0wx3fi19wfjcph5kclf8108i436y79ddwakrcf0lgxnnxhdjyd29";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
prePatch = ''
|
||||
echo "add_llvm_external_project(cling)" >> tools/CMakeLists.txt
|
||||
|
||||
cp -r $clingSrc ./tools/cling
|
||||
chmod -R a+w ./tools/cling
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ python3 git cmake llvmPackages_5.llvm.dev ];
|
||||
buildInputs = [ libffi llvmPackages_5.llvm zlib ncurses ];
|
||||
patches = [
|
||||
./no-clang-cpp.patch
|
||||
|
||||
# https://github.com/root-project/root/commit/286d96b12aad8688b9d8e4b3b5df843dcfb716a8
|
||||
./fix-llvm-dylib-usage.patch
|
||||
|
||||
./force-install-cling-targets.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ python3 git cmake ];
|
||||
buildInputs = [ libffi zlib ncurses ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLLVM_BINARY_DIR=${llvmPackages_9.llvm.out}"
|
||||
"-DLLVM_CONFIG=${llvmPackages_9.llvm.dev}/bin/llvm-config"
|
||||
"-DLLVM_LIBRARY_DIR=${llvmPackages_9.llvm.lib}/lib"
|
||||
"-DLLVM_MAIN_INCLUDE_DIR=${fixedLlvmDev}/include"
|
||||
"-DLLVM_TABLEGEN_EXE=${llvmPackages_9.llvm.out}/bin/llvm-tblgen"
|
||||
"-DLLVM_TOOLS_BINARY_DIR=${llvmPackages_9.llvm.out}/bin"
|
||||
"-DLLVM_TOOL_CLING_BUILD=ON"
|
||||
|
||||
"-DLLVM_TARGETS_TO_BUILD=host;NVPTX"
|
||||
"-DLLVM_ENABLE_RTTI=ON"
|
||||
|
||||
# Setting -DCLING_INCLUDE_TESTS=ON causes the cling/tools targets to be built;
|
||||
# see cling/tools/CMakeLists.txt
|
||||
"-DCLING_INCLUDE_TESTS=ON"
|
||||
"-DCLANG-TOOLS=OFF"
|
||||
# "--trace-expand"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString (!stdenv.isDarwin) ''
|
||||
mkdir -p $out/share/Jupyter
|
||||
cp -r /build/clang/tools/cling/tools/Jupyter/kernel $out/share/Jupyter
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Interactive C++ Interpreter";
|
||||
homepage = "https://root.cern/cling/";
|
||||
|
|
@ -77,7 +111,7 @@ let
|
|||
"-nostdinc++"
|
||||
"-isystem" "${lib.getDev stdenv.cc.libc}/include"
|
||||
"-I" "${lib.getDev unwrapped}/include"
|
||||
"-I" "${lib.getLib unwrapped}/lib/clang/5.0.2/include"
|
||||
"-I" "${lib.getLib unwrapped}/lib/clang/9.0.1/include"
|
||||
];
|
||||
|
||||
# Autodetect the include paths for the compiler used to build Cling, in the same way Cling does at
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
diff --git a/tools/cling/tools/driver/CMakeLists.txt b/tools/cling/tools/driver/CMakeLists.txt
|
||||
--- a/tools/cling/tools/driver/CMakeLists.txt
|
||||
+++ b/tools/cling/tools/driver/CMakeLists.txt
|
||||
@@ -9,10 +9,10 @@
|
||||
# Keep symbols for JIT resolution
|
||||
set(LLVM_NO_DEAD_STRIP 1)
|
||||
|
||||
+set(LLVM_LINK_COMPONENTS support)
|
||||
+
|
||||
if(BUILD_SHARED_LIBS)
|
||||
set(LIBS
|
||||
- LLVMSupport
|
||||
-
|
||||
clangFrontendTool
|
||||
|
||||
clingInterpreter
|
||||
@@ -25,8 +25,6 @@ if(BUILD_SHARED_LIBS)
|
||||
)
|
||||
else()
|
||||
set(LIBS
|
||||
- LLVMSupport
|
||||
-
|
||||
clangASTMatchers
|
||||
clangFrontendTool
|
||||
27
pkgs/development/interpreters/cling/fix-llvm-include.patch
Normal file
27
pkgs/development/interpreters/cling/fix-llvm-include.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
diff --git a/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h b/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
|
||||
index 16202d8..3afdac3 100644
|
||||
--- a/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
|
||||
+++ b/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h
|
||||
@@ -220,7 +220,7 @@ public:
|
||||
Error removeModule(VModuleKey K) {
|
||||
auto I = ModuleMap.find(K);
|
||||
assert(I != ModuleMap.end() && "VModuleKey K not valid here");
|
||||
- auto EDM = std::move(I.second);
|
||||
+ auto EDM = std::move(I->second);
|
||||
ModuleMap.erase(I);
|
||||
return EDM->removeModuleFromBaseLayer(BaseLayer);
|
||||
}
|
||||
diff --git a/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h b/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
|
||||
index d9535ce..4c688c3 100644
|
||||
--- a/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
|
||||
+++ b/include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h
|
||||
@@ -472,7 +472,9 @@ private:
|
||||
|
||||
// NB! `LinkedObjects` needs to be destroyed before `NotifyFreed` because
|
||||
// `~ConcreteLinkedObject` calls `NotifyFreed`
|
||||
+protected:
|
||||
std::map<VModuleKey, std::unique_ptr<LinkedObject>> LinkedObjects;
|
||||
+private:
|
||||
bool ProcessAllSections = false;
|
||||
};
|
||||
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/tools/cling/cmake/modules/CMakeLists.txt b/tools/cling/cmake/modules/CMakeLists.txt
|
||||
--- a/tools/cling/cmake/modules/CMakeLists.txt
|
||||
+++ b/tools/cling/cmake/modules/CMakeLists.txt
|
||||
@@ -54,10 +54,8 @@ set(CLING_CONFIG_EXPORTS_FILE)
|
||||
|
||||
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
|
||||
get_property(cling_has_exports GLOBAL PROPERTY CLING_HAS_EXPORTS)
|
||||
- if(cling_has_exports)
|
||||
- install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR}
|
||||
- COMPONENT cling-cmake-exports)
|
||||
- endif()
|
||||
+ install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR}
|
||||
+ COMPONENT cling-cmake-exports)
|
||||
|
||||
install(FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/ClingConfig.cmake
|
||||
13
pkgs/development/interpreters/cling/no-clang-cpp.patch
Normal file
13
pkgs/development/interpreters/cling/no-clang-cpp.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
|
||||
index 590d708d83..340ae529d4 100644
|
||||
--- a/tools/driver/CMakeLists.txt
|
||||
+++ b/tools/driver/CMakeLists.txt
|
||||
@@ -63,7 +63,7 @@ endif()
|
||||
add_dependencies(clang clang-resource-headers)
|
||||
|
||||
if(NOT CLANG_LINKS_TO_CREATE)
|
||||
- set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp)
|
||||
+ set(CLANG_LINKS_TO_CREATE clang++ clang-cl)
|
||||
endif()
|
||||
|
||||
foreach(link ${CLANG_LINKS_TO_CREATE})
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
{ lib
|
||||
, lua
|
||||
, wrapLua
|
||||
, luarocks
|
||||
|
||||
# Whether the derivation provides a lua module or not.
|
||||
, luarocksCheckHook
|
||||
|
|
@ -89,7 +90,7 @@ let
|
|||
|
||||
nativeBuildInputs = [
|
||||
wrapLua
|
||||
lua.pkgs.luarocks
|
||||
luarocks
|
||||
];
|
||||
|
||||
inherit doCheck extraVariables rockspecFilename knownRockspec externalDeps nativeCheckInputs;
|
||||
|
|
|
|||
|
|
@ -1,21 +1,30 @@
|
|||
{ lib, stdenv, fetchFromGitHub
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bmake
|
||||
, docbook_xsl
|
||||
, libxslt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libfsm";
|
||||
version = "0.1pre2442_${builtins.substring 0 8 src.rev}";
|
||||
version = "0.1pre2987_${builtins.substring 0 8 src.rev}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "katef";
|
||||
repo = pname;
|
||||
rev = "9c5095f7364fa464efff6c81fad9b60b19dfcc99";
|
||||
sha256 = "1bs51agvrrwqid0slq2svj2yj7kkjdsnv3xsrk8zmf1jbgza6jrm";
|
||||
rev = "087e3389ad2cd5e5c40caeb40387e632567d7258";
|
||||
hash = "sha256-XWrZxnRbMB609l+sYFf8VsXy3NxqBsBPUrHgKLIyu/I=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bmake ];
|
||||
nativeBuildInputs = [
|
||||
bmake
|
||||
docbook_xsl
|
||||
libxslt # xsltproc
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
enableParallelInstalling = false;
|
||||
|
||||
# note: build checks value of '$CC' to add some extra cflags, but we don't
|
||||
# necessarily know which 'stdenv' someone chose, so we leave it alone (e.g.
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
|
|||
description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices.";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ felixsinger ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,6 +35,11 @@ mkDerivation rec {
|
|||
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=mapbox-gl-native";
|
||||
hash = "sha256-KgJHyoIdKdnQo+gedns3C+mEXlaTH/UtyQsaYR1T3iI=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-narrowing-conversion.patch";
|
||||
url = "https://github.com/mapbox/mapbox-gl-native/commit/2955d0e479f57a39a0af4a0fa7ca7683455cca58.patch";
|
||||
hash = "sha256-Jk7OLb9/mVtc2mm0AL1h9zcSiQ54jogNI+q6ojY0HEo=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
configureFlags = [ "--with-xmltooling=${xml-tooling-c}" ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ stdenv
|
||||
, gcc12Stdenv
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, libpthreadstubs
|
||||
|
|
@ -9,7 +8,7 @@
|
|||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
gcc12Stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qcoro";
|
||||
version = "0.9.0";
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
"--with-fastcgi"
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ];
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (!stdenv.isDarwin) "-std=c++14";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
--- a/src/naming-sbcl.lisp
|
||||
+++ b/src/naming-sbcl.lisp
|
||||
@@ -108,1 +108,1 @@
|
||||
- then (sb-c::lambda-parent lambda)
|
||||
+ then (sb-c::lexenv-lambda (sb-c::lambda-lexenv lambda))
|
||||
|
|
@ -164,6 +164,9 @@ let
|
|||
cl-readline = super.cl-readline.overrideLispAttrs (o: {
|
||||
nativeLibs = [ pkgs.readline ];
|
||||
});
|
||||
log4cl = super.log4cl.overrideLispAttrs (o: {
|
||||
patches = [ ./patches/log4cl-fix-build.patch ];
|
||||
});
|
||||
md5 = super.md5.overrideLispAttrs (o: {
|
||||
lispLibs = [ super.flexi-streams ];
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildNimPackage, fetchFromGitHub }:
|
||||
{ lib, stdenv, buildNimPackage, fetchFromGitHub }:
|
||||
|
||||
buildNimPackage rec {
|
||||
pname = "vmath";
|
||||
|
|
@ -11,7 +11,7 @@ buildNimPackage rec {
|
|||
hash = "sha256-/v0lQIOMogTxFRtbssziW4W6VhMDepM6Si8igLgcx30=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib;
|
||||
src.meta // {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.2.49";
|
||||
version = "9.2.50";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pKQNaPRdsjS8RHPAsZCHEm9eiCOuAxQymDowvpeg7W0=";
|
||||
hash = "sha256-npqwIwAUUFrwg9/+rERRhqU68GCDueTZ1N5LKFWvmms=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.2.49";
|
||||
version = "9.2.50";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6SHg1topRXQlZ2kDCcOyPbNpGl7Na9vcOgOthQ44tCs=";
|
||||
hash = "sha256-lsQ0pMabd1nC9ysR38u2rlGOGY+onk3qV1V68AZBQy4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.2.49";
|
||||
version = "9.2.50";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-FbI2XX5/gc3bTW28alT8qEEQ46UEkQf5cO37jJcFVBs=";
|
||||
hash = "sha256-36BWuqK6/cPPSpL4sb97+w4re65bUU3ySiCcOUXh79M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "asyncsleepiq";
|
||||
version = "1.3.4";
|
||||
version = "1.3.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-eW6iSGuaZ/cQZKN55b6tHsBPdYglxGYt7OoxV7czB8w=";
|
||||
hash = "sha256-CLBKFDvhErnWNEs7xWLha2QgUvKRDmj0y1CYYKri3ag=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.2.49";
|
||||
version = "9.2.50";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-PTlkyu8Thm81VO9HIhNUwGxDBEQedfs3RYfZW5ZEAaY=";
|
||||
hash = "sha256-bHo1hpLLrJVZ8BxupsavreY6JTmuGboLODT8so6Fx1c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.2.49";
|
||||
version = "9.2.50";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
|
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xNYAYXKrfpvY9oYPmiR6GNaWAIUi9w1T9YznosIABSs=";
|
||||
hash = "sha256-pThCJlxx2IkLJhc+U5H6fSQy8QLFQr6cIILsdlEA8wM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -44,8 +44,11 @@ buildPythonPackage rec {
|
|||
"test_is_fqdn_resolvable"
|
||||
"test_fqdn_to_ip"
|
||||
"test_tcp_ping"
|
||||
# Skip SPhinx test
|
||||
# Skip Sphinx test
|
||||
"test_sphinx_build"
|
||||
# OSError: [Errno 22] Invalid argument
|
||||
"test_compare_type5"
|
||||
"test_encrypt_type5"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,8 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, colorlog
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, setuptools
|
||||
, hatchling
|
||||
, importlib-metadata
|
||||
, jinja2
|
||||
, packaging
|
||||
|
|
@ -17,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nox";
|
||||
version = "2022.11.21";
|
||||
version = "2023.04.22";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -26,20 +25,11 @@ buildPythonPackage rec {
|
|||
owner = "wntrblm";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-N70yBZyrtdQvgaJzkskG3goHit8eH0di9jHycuAwzfU=";
|
||||
hash = "sha256-WuyNp3jxIktI72zbk+1CK8xflTKrYE5evn/gVdMx+cQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove rogue mocking of py._path, https://github.com/wntrblm/nox/pull/677
|
||||
(fetchpatch {
|
||||
name = "remove-py-pyth.patch";
|
||||
url = "https://github.com/wntrblm/nox/commit/44d06b679761e21d76bb96b2b8ffe0ffbe3d4fd0.patch";
|
||||
hash = "sha256-KRDVwbBMBd4GdiAcGJyS7DTNUw3Pumt0JO1igx6npnc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -52,7 +42,6 @@ buildPythonPackage rec {
|
|||
importlib-metadata
|
||||
];
|
||||
|
||||
|
||||
checkInputs = [
|
||||
jinja2
|
||||
tox
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pontos";
|
||||
version = "23.5.0";
|
||||
version = "23.5.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GboOp0lsJ5nsZ6PIUqqCVLmroppKFR/xBnd9DqNw030=";
|
||||
hash = "sha256-nUVJjBebHOY0/oN/Cl2HdaLGnDVgLsUK7Yd+johP1PM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,6 +22,12 @@ buildPythonPackage rec {
|
|||
hash = "sha256-sGJwtf8DVIrE4hcU3IksnyAAt8yf67UBJIiVILDSsv8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/jarondl/pygtfs/pull/72
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytz>=2012d" "pytz"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "0.13.4";
|
||||
version = "0.15.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-gR8fp2ppVxc1ALRNQn+I8oXZWkQN5yd5vQlnATp6PoM=";
|
||||
hash = "sha256-Cyp/uCSQTDB21v+nRu73gfJgTGm3qvdkyXXMPXMsMVA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytrafikverket";
|
||||
version = "0.3.1";
|
||||
version = "0.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-foTIzWk/Y1H6OK+OAIU5VPlb/+gevc8WP9TzpYtnWvM=";
|
||||
hash = "sha256-Lq6YAYScBYRA2ltv+ohWfMasqohCH5zrnCi+sQbQWLI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.2.49";
|
||||
version = "9.2.50";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-RtTejAkyvFLOr2zA7AKJUkz3Zjhxsz8ippn64T37qXU=";
|
||||
hash = "sha256-DfC1POGV6bR3p0LqZBfmX2BkFvhdn4QjHgZkDwznSyE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvicare";
|
||||
version = "2.27.1";
|
||||
version = "2.27.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "somm15";
|
||||
repo = "PyViCare";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PlXVsDLCEBjsll9cXPJqvNSFyjtGol9jXYWzaYHWNw4=";
|
||||
hash = "sha256-BLvHZRIHj+HysdGcq51Ry3unbT2BQd7lwslAo9n9SdY=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -37,6 +37,10 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W" "ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ruyaml"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "samsungtvws";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
format = "setuptools";
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -31,7 +31,7 @@ buildPythonPackage rec {
|
|||
owner = "xchwarze";
|
||||
repo = "samsung-tv-ws-api";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AimG5tyTRBETpivC2BwCuoR4o7y98YT6u5sogJlcmoo=";
|
||||
hash = "sha256-mkjfimzu7paz+ZskartL052AfUBtL1xU0eOlrHgD1UE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -63,6 +63,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Samsung Smart TV WS API wrapper";
|
||||
homepage = "https://github.com/xchwarze/samsung-tv-ws-api";
|
||||
changelog = "https://github.com/xchwarze/samsung-tv-ws-api/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -38,5 +38,8 @@ buildPythonPackage rec {
|
|||
homepage = "https://github.com/snowflakedb/snowflake-sqlalchemy";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ ];
|
||||
|
||||
# https://github.com/snowflakedb/snowflake-sqlalchemy/issues/380
|
||||
broken = versionAtLeast sqlalchemy.version "2";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sonos-websocket";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "jjlawren";
|
||||
repo = "sonos-websocket";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Pb+L+823Clka0IjVMVEx4A0tJsI1IUhrFbx5Jy+xkgg=";
|
||||
hash = "sha256-8fHHaHvJKZOnzSaclt+TSQgcP2O6fmjU3+cF1nJpjOI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -74,5 +74,8 @@ buildPythonPackage rec {
|
|||
changelog = "https://github.com/kvesteri/sqlalchemy-continuum/blob/${version}/CHANGES.rst";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ];
|
||||
|
||||
# https://github.com/kvesteri/sqlalchemy-continuum/issues/326
|
||||
broken = versionAtLeast sqlalchemy.version "2";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlalchemy-jsonfield";
|
||||
version = "1.0.1.post0";
|
||||
version = "1.0.1.post0+2023-04-24";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,8 +22,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "penguinolog";
|
||||
repo = "sqlalchemy_jsonfield";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dSvqUXZzr+s/v8QEtqrv6slI7p1akXwAxi68D9ctyuU=";
|
||||
rev = "a1efda9755055c1d382257fb4ef78006b713d07e";
|
||||
hash = "sha256-6l4LEGpA8dKPw8M4quStd1nWyshMNiwQojBCxKwRRXA=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
|
||||
|
|
|
|||
|
|
@ -23,5 +23,11 @@ buildPythonPackage rec {
|
|||
description = "SQLAlchemy backend for Telethon session storage";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nyanloutre ];
|
||||
|
||||
# Package requires SQLAlchemy <2
|
||||
# https://github.com/tulir/telethon-session-sqlalchemy/blob/d498503ddde332e190bfa47e70f0bfa59fe6b5ef/setup.py#L17
|
||||
# Repo is archived and so this is unlikely to change unless someone forks
|
||||
# and takes over development
|
||||
broken = versionAtLeast sqlalchemy.version "2";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "upb-lib";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "upb_lib";
|
||||
inherit version;
|
||||
hash = "sha256-I1lnIr8ptDCyK8r0bvFWFPUGRwoMsQcNnSCSwzdt1Bc=";
|
||||
hash = "sha256-KEnSADj+sQtz37Xbi6fXoe2TN+F5Z9SYnlvCgXtxVnk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "benthos";
|
||||
version = "4.14.0";
|
||||
version = "4.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benthosdev";
|
||||
repo = "benthos";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-i+B5SfIfaAkZNKftD5iMObsRostwDThu+C1gEAir4Sc=";
|
||||
hash = "sha256-RqfTDE4dcVUegiaHsJMm9z9WV2dxFpgT/5LlM5105Oc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mRT/23ieJbN5EjcMH1J9E/zYaiUb0TCRkp7PGlMV4jA=";
|
||||
vendorHash = "sha256-jfRmzCrw0qZJqt9tHkr/FmLWEAc911Z1hmk+nc6Lyb4=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bmake";
|
||||
version = "20230126";
|
||||
version = "20230414";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-hk9yGFgs95Dsc7ILcQVCXLn/ozUiJUF3LwMTMGtqC8Q=";
|
||||
hash = "sha256-KcsdJqrn3p3vkr2us6rUUg6JlRzpey518LibrhuVOZ8=";
|
||||
};
|
||||
|
||||
# Make tests work with musl
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
if [[ -n "$conflict" ]]; then
|
||||
echo "Conflicting ocaml packages detected";
|
||||
echo "$conflict"
|
||||
echo "Set dontDetectOcamlConflicts to false to disable this check."
|
||||
echo "Set dontDetectOcamlConflicts to true to disable this check."
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "starsector";
|
||||
version = "0.95.1a-RC6";
|
||||
version = "0.96a-RC8";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://s3.amazonaws.com/fractalsoftworks/starsector/starsector_linux-${version}.zip";
|
||||
sha256 = "sha256-+0zGJHM+SMonx3sytCQNQA/QBgzdPMEfQvOjrCDSOs8=";
|
||||
sha256 = "sha256-RDXqFqiWpBG3kasofzbOl7Zp0a9LiMpJKsHcFaJtm2Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fuse, libuuid, lz4 }:
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, libuuid, lz4 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "erofs-utils";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchgit {
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git";
|
||||
rev = "v" + version;
|
||||
sha256 = "sha256-vMWAmGMJp0XDuc4sbo6Y7gfCQVAo4rETea0Tkdbg82U=";
|
||||
"https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz";
|
||||
sha256 = "sha256-2/Gtrv8buFMrKacsip4ZGTjJOJlGdw3HY9PFnm8yBXE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
@ -19,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Userspace utilities for linux-erofs file system";
|
||||
license = with licenses; [ gpl2 ];
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,9 @@
|
|||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, xz
|
||||
, pkg-config
|
||||
, openssl
|
||||
, dbus
|
||||
, glib
|
||||
, udev
|
||||
, cairo
|
||||
, pango
|
||||
, atk
|
||||
, gdk-pixbuf
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -314,8 +314,8 @@ let
|
|||
DRM_AMD_DC_DCN2_0 = whenBetween "5.3" "5.6" yes;
|
||||
DRM_AMD_DC_DCN2_1 = whenBetween "5.4" "5.6" yes;
|
||||
DRM_AMD_DC_DCN3_0 = whenBetween "5.9" "5.11" yes;
|
||||
DRM_AMD_DC_DCN = whenAtLeast "5.11" yes;
|
||||
DRM_AMD_DC_HDCP = whenAtLeast "5.5" yes;
|
||||
DRM_AMD_DC_DCN = whenBetween "5.11" "6.4" yes;
|
||||
DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes;
|
||||
DRM_AMD_DC_SI = whenAtLeast "5.10" yes;
|
||||
} // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
|
||||
# Intel GVT-g graphics virtualization supports 64-bit only
|
||||
|
|
|
|||
|
|
@ -62,4 +62,13 @@
|
|||
name = "fix-em-ice-bonding";
|
||||
patch = ./fix-em-ice-bonding.patch;
|
||||
};
|
||||
|
||||
CVE-2023-32233 = rec {
|
||||
name = "CVE-2023-32233";
|
||||
patch = fetchpatch {
|
||||
name = name + ".patch";
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=c1592a89942e9678f7d9c8030efa777c0d57edab";
|
||||
hash = "sha256-DYPWgraXPNeFkjtuDYkFXHnCJ4yDewrukM2CCAqC2BE=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-jena";
|
||||
version = "4.7.0";
|
||||
version = "4.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "sha256-3tJRJ9UHsOYfWvwPZHp+hkRZxb0RODchJjQMAZ3lkuY=";
|
||||
url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
hash = "sha256-kAbhH0E2C1ToxDQgFUqWxvknCeFZbtqFhOmiSJ//ciU=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-jena-fuseki";
|
||||
version = "4.3.1";
|
||||
version = "4.8.0";
|
||||
src = fetchurl {
|
||||
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
sha256 = "1r0vfa7d55lzw22yfx46mxxmz8x8pkr666vggqw2m1rzzj52z9nx";
|
||||
url = "mirror://apache/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
|
||||
hash = "sha256-rJCY8vG1vfEGGA0gsIqNFXKl75O2Zp4zUIWSDfplpVE=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -12,14 +12,16 @@ buildPythonApplication rec {
|
|||
sha256 = "d1e4e7936d0be456f70a39abeb1c97d931f66ccd60e891f4fd796ffb06dfeaf9";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'click = "^7.0"' 'click = "*"' \
|
||||
--replace 'wcwidth = "0.1.9"' 'wcwidth = "*"'
|
||||
'';
|
||||
pythonRelaxDeps = [
|
||||
"configobj"
|
||||
"wcwidth"
|
||||
"click"
|
||||
"packaging"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btrfs-progs";
|
||||
version = "6.2.2";
|
||||
version = "6.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
|
||||
sha256 = "sha256-5IiNuGN9kuZnRIOGmS0IVrlUzyUVuY05tmfaQ8SC1pM=";
|
||||
sha256 = "sha256-QKC9/3h+y0kOVTPbzv1IUhdtrxKq5aEVggPbQ9itan0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
59
pkgs/tools/misc/alarm-clock-applet/default.nix
Normal file
59
pkgs/tools/misc/alarm-clock-applet/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, pkg-config
|
||||
, wrapGAppsHook
|
||||
, gst_all_1
|
||||
, libnotify
|
||||
, libayatana-appindicator
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alarm-clock-applet";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "alarm-clock";
|
||||
rev = version;
|
||||
hash = "sha256-10hkWWEsAUJnGeu35bR5d0RFKd9CKDZI7WGMzmEM3rI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/alarm-clock-applet/alarm-clock/commit/6a11003099660dfae0e3d5800f49880d3a26f5ec.patch";
|
||||
hash = "sha256-NP1PlEw5AFWZgywvppIs2e+5EfMSPbU4Pq2tIfwODrQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/alarm-clock-applet/alarm-clock/commit/cbcf22fac5b45ab251ade2e7e993f422f33f926e.patch";
|
||||
hash = "sha256-xKaaNfXsv9Ckwy73r1n93kOWIZ01fU5GDqYSQCch1Kc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gst_all_1.gstreamer
|
||||
libnotify
|
||||
libayatana-appindicator
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# gconf is already deprecated
|
||||
"-DENABLE_GCONF_MIGRATION=OFF"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fully-featured alarm clock with an indicator";
|
||||
homepage = "https://alarm-clock-applet.github.io";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ aleksana ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -12,6 +12,9 @@
|
|||
, szip
|
||||
, javaSupport ? false
|
||||
, jdk
|
||||
, fortranSupport ? false
|
||||
, gfortran
|
||||
, netcdfSupport ? false
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hdf";
|
||||
|
|
@ -50,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
cmake
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
fixDarwinDylibNames
|
||||
];
|
||||
] ++ lib.optional fortranSupport gfortran;
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
|
|
@ -75,9 +78,8 @@ stdenv.mkDerivation rec {
|
|||
"-DHDF4_BUILD_UTILS=ON"
|
||||
"-DHDF4_BUILD_WITH_INSTALL_NAME=OFF"
|
||||
"-DHDF4_ENABLE_JPEG_LIB_SUPPORT=ON"
|
||||
"-DHDF4_ENABLE_NETCDF=OFF"
|
||||
"-DHDF4_ENABLE_NETCDF=${if netcdfSupport then "ON" else "OFF"}"
|
||||
"-DHDF4_ENABLE_Z_LIB_SUPPORT=ON"
|
||||
"-DHDF4_BUILD_FORTRAN=OFF"
|
||||
"-DJPEG_DIR=${libjpeg}"
|
||||
] ++ lib.optionals javaSupport [
|
||||
"-DHDF4_BUILD_JAVA=ON"
|
||||
|
|
@ -85,7 +87,13 @@ stdenv.mkDerivation rec {
|
|||
] ++ lib.optionals szipSupport [
|
||||
"-DHDF4_ENABLE_SZIP_ENCODING=ON"
|
||||
"-DHDF4_ENABLE_SZIP_SUPPORT=ON"
|
||||
];
|
||||
] ++ (if fortranSupport
|
||||
then [
|
||||
"-DHDF4_BUILD_FORTRAN=ON"
|
||||
"-DCMAKE_Fortran_FLAGS=-fallow-argument-mismatch"
|
||||
]
|
||||
else [ "-DHDF4_BUILD_FORTRAN=OFF" ]
|
||||
);
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,28 +1,27 @@
|
|||
{ buildGoModule
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
let
|
||||
otelcontribcol = writeScript "otelcontribcol" ''
|
||||
echo 'ERROR: otelcontribcol is now in `pkgs.opentelemetry-collector-contrib`, call the collector with `otelcorecol` or move to `pkgs.opentelemetry-collector-contrib`' >&2
|
||||
exit 1
|
||||
'';
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector";
|
||||
version = "0.76.1";
|
||||
version = "0.77.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e+IdEGrJzDRUaAViUSyXdkYv9Hfub0ytmh3pl1f/nGM=";
|
||||
hash = "sha256-koPkEOtB5KnePdx67hJ/WNBojNDqKvf9kqYb59bwh8k=";
|
||||
};
|
||||
# there is a nested go.mod
|
||||
sourceRoot = "source/cmd/otelcorecol";
|
||||
vendorHash = "sha256-8OkKPrK0xLWK5hIPaI7hgCGY0g7sWbaS/1HHqoTuqxk=";
|
||||
vendorHash = "sha256-M1fLrQFrcfCRCcunkgEzUicVfi5Mz/Or6tFpcGfWf4E=";
|
||||
|
||||
patches = [
|
||||
# remove when fixed upstream
|
||||
# https://github.com/open-telemetry/opentelemetry-collector/issues/7668
|
||||
./update_go-m1cpu_fix_aarch64-darwin.patch
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# set the build version, can't be done via ldflags
|
||||
|
|
@ -31,14 +30,10 @@ buildGoModule rec {
|
|||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
postInstall = ''
|
||||
cp ${otelcontribcol} $out/bin/otelcontribcol
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-collector";
|
||||
changelog = "https://github.com/open-telemetry/opentelemetry-collector/blob/v${version}/CHANGELOG.md";
|
||||
description = "OpenTelemetry Collector offers a vendor-agnostic implementation on how to receive, process and export telemetry data";
|
||||
description = "A vendor-agnostic implementation on how to receive, process and export telemetry data";
|
||||
longDescription = ''
|
||||
The OpenTelemetry Collector offers a vendor-agnostic implementation on how
|
||||
to receive, process and export telemetry data. In addition, it removes the
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -19,7 +19,7 @@ require (
|
||||
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.77.0
|
||||
go.opentelemetry.io/collector/receiver v0.77.0
|
||||
go.opentelemetry.io/collector/receiver/otlpreceiver v0.77.0
|
||||
- golang.org/x/sys v0.7.0
|
||||
+ golang.org/x/sys v0.8.0
|
||||
)
|
||||
|
||||
require (
|
||||
@@ -60,8 +60,8 @@ require (
|
||||
github.com/prometheus/procfs v0.9.0 // indirect
|
||||
github.com/prometheus/statsd_exporter v0.22.7 // indirect
|
||||
github.com/rs/cors v1.9.0 // indirect
|
||||
- github.com/shirou/gopsutil/v3 v3.23.3 // indirect
|
||||
- github.com/shoenig/go-m1cpu v0.1.4 // indirect
|
||||
+ github.com/shirou/gopsutil/v3 v3.23.5-0.20230505121632-e045dc75ca1c // indirect
|
||||
+ github.com/shoenig/go-m1cpu v0.1.6 // indirect
|
||||
github.com/spf13/cobra v1.7.0 // indirect
|
||||
github.com/spf13/pflag v1.0.5 // indirect
|
||||
github.com/tklauser/go-sysconf v0.3.11 // indirect
|
||||
--- a/go.sum
|
||||
+++ b/go.sum
|
||||
@@ -383,10 +383,18 @@ github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIH
|
||||
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
|
||||
github.com/shirou/gopsutil/v3 v3.23.3 h1:Syt5vVZXUDXPEXpIBt5ziWsJ4LdSAAxF4l/xZeQgSEE=
|
||||
github.com/shirou/gopsutil/v3 v3.23.3/go.mod h1:lSBNN6t3+D6W5e5nXTxc8KIMMVxAcS+6IJlffjRRlMU=
|
||||
+github.com/shirou/gopsutil/v3 v3.23.4 h1:hZwmDxZs7Ewt75DV81r4pFMqbq+di2cbt9FsQBqLD2o=
|
||||
+github.com/shirou/gopsutil/v3 v3.23.4/go.mod h1:ZcGxyfzAMRevhUR2+cfhXDH6gQdFYE/t8j1nsU4mPI8=
|
||||
+github.com/shirou/gopsutil/v3 v3.23.5-0.20230505121632-e045dc75ca1c h1:ZYIGwnQEbcRHlzQRm/ns8iJQgJU+drtg4cX39shs9lE=
|
||||
+github.com/shirou/gopsutil/v3 v3.23.5-0.20230505121632-e045dc75ca1c/go.mod h1:LIiQgnFqJnplML7ahhMDo0wRqv6xMPNGNxGRDObehQ0=
|
||||
github.com/shoenig/go-m1cpu v0.1.4 h1:SZPIgRM2sEF9NJy50mRHu9PKGwxyyTTJIWvCtgVbozs=
|
||||
github.com/shoenig/go-m1cpu v0.1.4/go.mod h1:Wwvst4LR89UxjeFtLRMrpgRiyY4xPsejnVZym39dbAQ=
|
||||
+github.com/shoenig/go-m1cpu v0.1.5/go.mod h1:Wwvst4LR89UxjeFtLRMrpgRiyY4xPsejnVZym39dbAQ=
|
||||
+github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
|
||||
+github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
|
||||
github.com/shoenig/test v0.6.3 h1:GVXWJFk9PiOjN0KoJ7VrJGH6uLPnqxR7/fe3HUPfE0c=
|
||||
github.com/shoenig/test v0.6.3/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
|
||||
+github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
|
||||
@@ -627,6 +635,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
|
||||
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
|
||||
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, cmake
|
||||
, llvmPackages
|
||||
|
|
@ -29,6 +30,14 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-RuzaRJr1n21MbHSeHBt8CjEm5AwbDbvX9Nw5PeBTl+w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build on aarch64-linux, see https://github.com/Aloxaf/silicon/pull/210
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Aloxaf/silicon/commit/f666c95d3dab85a81d60067e2f25d29ee8ab59e7.patch";
|
||||
hash = "sha256-L6tF9ndC38yVn5ZNof1TMxSImmaqZ6bJ/NYhb0Ebji4=";
|
||||
})
|
||||
];
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
|
|
|
|||
22
pkgs/tools/networking/oui/default.nix
Normal file
22
pkgs/tools/networking/oui/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "oui";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thatmattlove";
|
||||
repo = "oui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-RLm8V2fLFvOwjnnq16ZmhwVdtgXPaehan7JTX3Xz30w=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-TLVw4tnfvgK2h/Xj5LNNjDG4WQ83Bw8yBhZc16Tjmws=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "MAC Address CLI Toolkit";
|
||||
homepage = "https://github.com/thatmattlove/oui";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = [ maintainers.netali ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-05-08";
|
||||
version = "2023-05-10";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MbSPBlepTQXCnPT9Yl/mB3N7HzJj8HwV3+ENOKdfYHo=";
|
||||
hash = "sha256-09Z4RKLwJGcM11sD5gGBRRJ6ccSJuzDqoPYcr3I4Plg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "httpx";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "httpx";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-u4nftveDvwco5sZa21z4MHf/5F+M0cQUGffueeJpyL4=";
|
||||
hash = "sha256-QTD8aPpsqfMcCWT+b4V5z6dIrVW86sVi5WqShN055P0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-i/Fvuy9wzXot114BI0rIbLWDW70VEaDKGThTcTZLx1M=";
|
||||
vendorHash = "sha256-rXzAZTJtX9RhUjqo+Xllnh00fBaQH1Yne+gKqmxLXUU=";
|
||||
|
||||
subPackages = [ "cmd/httpx" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "saml2aws";
|
||||
version = "2.36.6";
|
||||
version = "2.36.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Versent";
|
||||
repo = "saml2aws";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-llEdO19TvHzvH4sV1c+1dHqowG2fVLOqMOqCrH6Urws=";
|
||||
sha256 = "sha256-Z+rudexDydpM/pExs6TvVTm03qIATf7uLRTQZKgBnLw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-MXm1V8GrjZn/x0Q6fW8zJN351zVsPGME4eFg6f8cEX8=";
|
||||
vendorHash = "sha256-h4jPaST15EsoWLsnTkO0GQDC+cTySMCyVnWFrdXeVDg=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "tessen";
|
||||
version = "2.2.0";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~ayushnix";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7hiH1il9vFkrld5wFU+jT7IuudKwigO7ggFuwVbkvYw=";
|
||||
sha256 = "sha256-8hhYOd5h55kl7ChqdyRzsaxzWLpX41aqG8LfznmbFWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles scdoc ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asciidoctorj";
|
||||
version = "2.5.7";
|
||||
version = "2.5.8";
|
||||
|
||||
src = fetchzip {
|
||||
url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
|
||||
sha256 = "sha256-LUbzS2XYSsSPyJmyvitS5or0S4o9SB2ycMkuAWyVB8w=";
|
||||
sha256 = "sha256-Xn6uIHEsyIXA9ls0bZZHdW7aKcgdub9C6g7lQ853tiQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ mapAliases ({
|
|||
ag = throw "'ag' has been renamed to/replaced by 'silver-searcher'"; # Converted to throw 2022-02-22
|
||||
aircrackng = throw "'aircrackng' has been renamed to/replaced by 'aircrack-ng'"; # Converted to throw 2022-02-22
|
||||
airtame = throw "airtame has been removed due to being unmaintained"; # Added 2022-01-19
|
||||
alarm-clock-applet = throw "'alarm-clock-applet' has been abandoned upstream and depends on deprecated GNOME2/GTK2"; # Added 2022-06-16
|
||||
aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream"; # Added 2020-11-30
|
||||
alsaLib = alsa-lib; # Added 2021-06-09
|
||||
alsaOss = alsa-oss; # Added 2021-06-10
|
||||
|
|
@ -1517,6 +1516,10 @@ mapAliases ({
|
|||
soldat-unstable = opensoldat; # Added 2022-07-02
|
||||
solr_8 = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
|
||||
solr = throw "'solr' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-03-16
|
||||
spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
spark_3_2 = throw "'spark_3_2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08
|
||||
|
||||
# Added 2020-02-10
|
||||
sourceHanSansPackages = {
|
||||
|
|
|
|||
|
|
@ -2467,14 +2467,12 @@ with pkgs;
|
|||
|
||||
### APPLICATIONS/EMULATORS/YUZU
|
||||
|
||||
yuzu-mainline = import ../applications/emulators/yuzu {
|
||||
yuzu-mainline = qt6Packages.callPackage ../applications/emulators/yuzu {
|
||||
branch = "mainline";
|
||||
inherit libsForQt5 fetchFromGitHub fetchurl;
|
||||
};
|
||||
|
||||
yuzu-early-access = import ../applications/emulators/yuzu {
|
||||
yuzu-early-access = qt6Packages.callPackage ../applications/emulators/yuzu {
|
||||
branch = "early-access";
|
||||
inherit libsForQt5 fetchFromGitHub fetchurl;
|
||||
};
|
||||
|
||||
### APPLICATIONS/EMULATORS/COMMANDERX16
|
||||
|
|
@ -5117,7 +5115,6 @@ with pkgs;
|
|||
cairo = cairo.override { xcbSupport = true; }; };
|
||||
|
||||
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
|
||||
stdenv = gcc12Stdenv;
|
||||
wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
|
||||
udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { };
|
||||
};
|
||||
|
|
@ -5126,9 +5123,7 @@ with pkgs;
|
|||
|
||||
hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { };
|
||||
|
||||
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {
|
||||
stdenv = gcc12Stdenv;
|
||||
};
|
||||
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
|
||||
|
||||
hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
|
||||
|
||||
|
|
@ -8443,6 +8438,8 @@ with pkgs;
|
|||
|
||||
headscale = callPackage ../servers/headscale { };
|
||||
|
||||
health = callPackage ../applications/misc/health { };
|
||||
|
||||
healthchecks = callPackage ../servers/web-apps/healthchecks { };
|
||||
|
||||
heisenbridge = callPackage ../servers/heisenbridge { };
|
||||
|
|
@ -10825,6 +10822,8 @@ with pkgs;
|
|||
|
||||
oscclip = callPackage ../tools/misc/oscclip { };
|
||||
|
||||
oui = callPackage ../tools/networking/oui { };
|
||||
|
||||
owncast = callPackage ../servers/owncast { };
|
||||
|
||||
update-dotdee = with python3Packages; toPythonApplication update-dotdee;
|
||||
|
|
@ -14458,6 +14457,8 @@ with pkgs;
|
|||
|
||||
alan_2 = callPackage ../development/compilers/alan/2.nix { };
|
||||
|
||||
alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { };
|
||||
|
||||
algol68g = callPackage ../development/compilers/algol68g { };
|
||||
|
||||
ante = callPackage ../development/compilers/ante { };
|
||||
|
|
@ -15515,7 +15516,7 @@ with pkgs;
|
|||
juniper = callPackage ../development/compilers/juniper { };
|
||||
|
||||
julia-lts = julia_16-bin;
|
||||
julia-stable = julia_18;
|
||||
julia-stable = julia_19;
|
||||
julia = julia-stable;
|
||||
|
||||
julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };
|
||||
|
|
@ -15747,8 +15748,10 @@ with pkgs;
|
|||
|
||||
mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { };
|
||||
|
||||
mitscheme = callPackage ../development/compilers/mit-scheme
|
||||
{ texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; }; };
|
||||
mitscheme = callPackage ../development/compilers/mit-scheme {
|
||||
texLive = texlive.combine { inherit (texlive) scheme-small epsf texinfo; };
|
||||
texinfo = texinfo6;
|
||||
};
|
||||
|
||||
mitschemeX11 = mitscheme.override {
|
||||
enableX11 = true;
|
||||
|
|
@ -17187,11 +17190,8 @@ with pkgs;
|
|||
smiley-sans = callPackage ../data/fonts/smiley-sans { };
|
||||
|
||||
inherit (callPackages ../applications/networking/cluster/spark { })
|
||||
spark_3_2
|
||||
spark_3_1
|
||||
spark_2_4;
|
||||
spark3 = spark_3_2;
|
||||
spark2 = spark_2_4;
|
||||
spark_3_4;
|
||||
spark3 = spark_3_4;
|
||||
spark = spark3;
|
||||
|
||||
sparkleshare = callPackage ../applications/version-management/sparkleshare { };
|
||||
|
|
@ -21197,9 +21197,7 @@ with pkgs;
|
|||
|
||||
lmdbxx = callPackage ../development/libraries/lmdbxx { };
|
||||
|
||||
lemon-graph = callPackage ../development/libraries/lemon-graph {
|
||||
stdenv = if stdenv.isLinux then gcc12Stdenv else stdenv;
|
||||
};
|
||||
lemon-graph = callPackage ../development/libraries/lemon-graph { };
|
||||
|
||||
levmar = callPackage ../development/libraries/levmar { };
|
||||
|
||||
|
|
@ -31201,6 +31199,7 @@ with pkgs;
|
|||
swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
|
||||
swayidle = callPackage ../applications/window-managers/sway/idle.nix { };
|
||||
swaylock = callPackage ../applications/window-managers/sway/lock.nix { };
|
||||
swayosd = callPackage ../applications/window-managers/sway/osd.nix { };
|
||||
swayws = callPackage ../applications/window-managers/sway/ws.nix { };
|
||||
swaywsr = callPackage ../applications/window-managers/sway/wsr.nix { };
|
||||
sway-contrib = recurseIntoAttrs (callPackages ../applications/window-managers/sway/contrib.nix { });
|
||||
|
|
@ -31449,10 +31448,7 @@ with pkgs;
|
|||
|
||||
inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {});
|
||||
|
||||
inlyne = callPackage ../applications/misc/inlyne {
|
||||
inherit (darwin) libobjc;
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit ApplicationServices CoreFoundation CoreGraphics CoreServices CoreText CoreVideo Foundation Metal QuartzCore Security;
|
||||
};
|
||||
inlyne = darwin.apple_sdk_11_0.callPackage ../applications/misc/inlyne { };
|
||||
|
||||
inspectrum = callPackage ../applications/radio/inspectrum { };
|
||||
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@ in {
|
|||
[ kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -123,6 +124,7 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.rtl8761b_support
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -130,6 +132,7 @@ in {
|
|||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -137,6 +140,7 @@ in {
|
|||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -145,6 +149,7 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.export-rt-sched-migrate
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -153,6 +158,7 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -169,6 +175,7 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -178,6 +185,7 @@ in {
|
|||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.export-rt-sched-migrate
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -186,6 +194,7 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
@ -194,6 +203,7 @@ in {
|
|||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.fix-em-ice-bonding
|
||||
kernelPatches.CVE-2023-32233
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue