Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
3aaf0938c0
@ -22845,6 +22845,12 @@
|
||||
githubId = 36407913;
|
||||
name = "Uli Baum";
|
||||
};
|
||||
xelden = {
|
||||
email = "anpiz@protonmail.com";
|
||||
github = "Xelden";
|
||||
githubId = 117323435;
|
||||
name = "Andrés Pico";
|
||||
};
|
||||
xfnw = {
|
||||
email = "xfnw+nixos@riseup.net";
|
||||
github = "xfnw";
|
||||
|
||||
@ -96,7 +96,7 @@ in
|
||||
imports = [
|
||||
./assertions.nix
|
||||
./meta.nix
|
||||
(lib.mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect lib.anymore.")
|
||||
(lib.mkRemovedOptionModule [ "nixpkgs" "initialSystem" ] "The NixOS options `nesting.clone` and `nesting.children` have been deleted, and replaced with named specialisation. Therefore `nixpgks.initialSystem` has no effect anymore.")
|
||||
];
|
||||
|
||||
options.nixpkgs = {
|
||||
|
||||
@ -128,8 +128,8 @@ in
|
||||
lib.concatStringsSep "\n"
|
||||
(map prependData
|
||||
((lib.mapAttrsToList (name: value: name + " " + value)) dataDisks)
|
||||
++ zipListsWith (a: b: a + b)
|
||||
([ "parity " ] ++ map (i: toString i + "-parity ") (range 2 6))
|
||||
++ lib.zipListsWith (a: b: a + b)
|
||||
([ "parity " ] ++ map (i: toString i + "-parity ") (lib.range 2 6))
|
||||
parityFiles ++ map prependContent contentFiles
|
||||
++ map prependExclude exclude) + "\n" + extraConfig;
|
||||
};
|
||||
@ -222,7 +222,7 @@ in
|
||||
# Multiple "split" parity files can be specified in a single
|
||||
# "parityFile", separated by a comma.
|
||||
# https://www.snapraid.it/manual#7.1
|
||||
splitParityFiles = map (s: splitString "," s) parityFiles;
|
||||
splitParityFiles = map (s: lib.splitString "," s) parityFiles;
|
||||
in
|
||||
lib.unique (
|
||||
lib.attrValues dataDisks ++ splitParityFiles ++ contentDirs
|
||||
|
||||
@ -273,11 +273,11 @@ in
|
||||
ingressesSet = filterIngressSet tunnel.ingress;
|
||||
ingressesStr = filterIngressStr tunnel.ingress;
|
||||
|
||||
fullConfig = lib.filterConfig {
|
||||
fullConfig = filterConfig {
|
||||
tunnel = name;
|
||||
"credentials-file" = tunnel.credentialsFile;
|
||||
warp-routing = lib.filterConfig tunnel.warp-routing;
|
||||
originRequest = lib.filterConfig tunnel.originRequest;
|
||||
warp-routing = filterConfig tunnel.warp-routing;
|
||||
originRequest = filterConfig tunnel.originRequest;
|
||||
ingress =
|
||||
(map
|
||||
(key: {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, wrapGAppsNoGuiHook
|
||||
, wrapGAppsHook3
|
||||
, wrapQtAppsHook
|
||||
, pkg-config
|
||||
, ninja
|
||||
@ -65,6 +65,11 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/musescore/MuseScore/pull/24326/commits/b274f13311ad0b2bce339634a006ba22fbd3379e.patch";
|
||||
hash = "sha256-ZGmjRa01CBEIxJdJYQMhdg4A9yjWdlgn0pCPmENBTq0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-crash-accessing-uninitialized-properties.patch";
|
||||
url = "https://github.com/musescore/MuseScore/pull/24714.patch";
|
||||
hash = "sha256-ErrCU/U+wyfD7R8kiZTifGIeuCAdKi1q7uxYsoE/OLA=";
|
||||
})
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@ -83,6 +88,8 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
# Don't bundle qt qml files, relevant really only for darwin, but we set
|
||||
# this for all platforms anyway.
|
||||
"-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF"
|
||||
# Don't build unit tests unless we are going to run them.
|
||||
(lib.cmakeBool "MUSE_ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
@ -103,14 +110,15 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
dontWrapGApps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
# Just to make it not crash when looking up Gschemas when opening external
|
||||
# files
|
||||
wrapGAppsNoGuiHook
|
||||
wrapQtAppsHook
|
||||
cmake
|
||||
qttools
|
||||
pkg-config
|
||||
ninja
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
# Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998
|
||||
# GTK3 is needed for file dialogs. Fixes crash with No GSettings schemas error.
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -150,6 +158,29 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
ln -s $out/Applications/mscore.app/Contents/MacOS/mscore $out/bin/mscore
|
||||
'';
|
||||
|
||||
# muse-sounds-manager installs Muse Sounds sampler libMuseSamplerCoreLib.so.
|
||||
# It requires that argv0 of the calling process ends with "/mscore" or "/MuseScore-4".
|
||||
# We need to ensure this in two cases:
|
||||
#
|
||||
# 1) when the user invokes MuseScore as "mscore" on the command line or from
|
||||
# the .desktop file, and the normal argv0 is "mscore" (no "/");
|
||||
# 2) when MuseScore invokes itself via File -> New, and the normal argv0 is
|
||||
# the target of /proc/self/exe, which in Nixpkgs was "{...}/.mscore-wrapped"
|
||||
#
|
||||
# In order to achieve (2) we install the final binary as $out/libexec/mscore, and
|
||||
# in order to achieve (1) we use makeWrapper without --inherit-argv0.
|
||||
#
|
||||
# wrapQtAppsHook uses wrapQtApp -> wrapProgram -> makeBinaryWrapper --inherit-argv0
|
||||
# so we disable it and explicitly use makeQtWrapper.
|
||||
#
|
||||
# TODO: check if something like this is also needed for macOS.
|
||||
dontWrapQtApps = stdenv.isLinux;
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
mkdir -p $out/libexec
|
||||
mv $out/bin/mscore $out/libexec
|
||||
makeQtWrapper $out/libexec/mscore $out/bin/mscore
|
||||
'';
|
||||
|
||||
# Don't run bundled upstreams tests, as they require a running X window system.
|
||||
doCheck = false;
|
||||
|
||||
@ -159,7 +190,7 @@ in stdenv'.mkDerivation (finalAttrs: {
|
||||
description = "Music notation and composition software";
|
||||
homepage = "https://musescore.org/";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ vandenoever doronbehar ];
|
||||
maintainers = with maintainers; [ vandenoever doronbehar orivej ];
|
||||
mainProgram = "mscore";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
@ -1,46 +1,62 @@
|
||||
{ stdenv, lib, mkDerivation, fetchFromGitHub, qmake, pkg-config, alsa-lib, libjack2, portaudio, libogg, flac, libvorbis, rtmidi, qtsvg, qttools }:
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
qmake,
|
||||
qttools,
|
||||
wrapQtAppsHook,
|
||||
alsa-lib,
|
||||
flac,
|
||||
libjack2,
|
||||
libogg,
|
||||
libvorbis,
|
||||
qtsvg,
|
||||
qtwayland,
|
||||
rtmidi,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "2.3.0";
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.0";
|
||||
pname = "polyphone";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "davy7125";
|
||||
repo = "polyphone";
|
||||
rev = version;
|
||||
sha256 = "09habv51pw71wrb39shqi80i2w39dx5a39klzswsald5j9sia0ir";
|
||||
hash = "sha256-cPHLmqsS4ReqOCcsgOf77V/ShIkk7chGoJ6bU4W5ejs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qmake
|
||||
qttools
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
libjack2
|
||||
portaudio
|
||||
libogg
|
||||
flac
|
||||
libjack2
|
||||
libogg
|
||||
libvorbis
|
||||
rtmidi
|
||||
qtsvg
|
||||
qtwayland
|
||||
rtmidi
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qmake qttools pkg-config ];
|
||||
|
||||
preConfigure = ''
|
||||
cd ./sources/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -d $out/bin
|
||||
install -m755 bin/polyphone $out/bin/
|
||||
|
||||
install -Dm444 ./contrib/com.polyphone_soundfonts.polyphone.desktop -t $out/share/applications/
|
||||
install -Dm444 ./contrib/polyphone.svg -t $out/share/icons/hicolor/scalable/apps/
|
||||
runHook postInstall
|
||||
postConfigure = ''
|
||||
# Work around https://github.com/NixOS/nixpkgs/issues/214765
|
||||
substituteInPlace Makefile \
|
||||
--replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin qttools}/bin/lrelease"
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"DEFINES+=USE_LOCAL_STK"
|
||||
"DEFINES+=USE_LOCAL_QCUSTOMPLOT"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
@ -49,7 +65,10 @@ mkDerivation rec {
|
||||
mainProgram = "polyphone";
|
||||
homepage = "https://www.polyphone-soundfonts.com/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.maxdamantus ];
|
||||
maintainers = with maintainers; [
|
||||
maxdamantus
|
||||
orivej
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -78,14 +78,14 @@ let
|
||||
urllib3
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.34.10";
|
||||
version = "3.34.11";
|
||||
pname = "qgis-ltr-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-E2Ak14h1kWdGq+JNbCeh5YJkr/S9g/0HD834MtgACSA=";
|
||||
hash = "sha256-VNgUMEA7VKZXsLG1ZYUIlYvjwRrH8LsliGiVRMnXOM0=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@ -151,7 +151,6 @@ in mkDerivation rec {
|
||||
env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DWITH_3D=True"
|
||||
"-DWITH_PDAL=True"
|
||||
"-DENABLE_TESTS=False"
|
||||
|
||||
@ -79,14 +79,14 @@ let
|
||||
urllib3
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.38.2";
|
||||
version = "3.38.3";
|
||||
pname = "qgis-unwrapped";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
hash = "sha256-lArwRtHR/KAsgjpjid6YnPA9BkcG1Mg/KeIIOWN75Kg=";
|
||||
hash = "sha256-yJFYq4t0LzBr+O2bmtBSeehQ2vfUaZIQfOY68WZcHG4=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
@ -152,7 +152,6 @@ in mkDerivation rec {
|
||||
env.QT_QPA_PLATFORM_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}/platforms";
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DWITH_3D=True"
|
||||
"-DWITH_PDAL=True"
|
||||
"-DENABLE_TESTS=False"
|
||||
|
||||
@ -1,45 +1,44 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, python3Packages
|
||||
, blueprint-compiler
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, librsvg
|
||||
, gtk4
|
||||
, gtksourceview5
|
||||
, libadwaita
|
||||
, cabextract
|
||||
, p7zip
|
||||
, xdpyinfo
|
||||
, imagemagick
|
||||
, lsb-release
|
||||
, pciutils
|
||||
, procps
|
||||
, gamescope
|
||||
, mangohud
|
||||
, vkbasalt-cli
|
||||
, vmtouch
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
python3Packages,
|
||||
blueprint-compiler,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapGAppsHook4,
|
||||
appstream-glib,
|
||||
desktop-file-utils,
|
||||
librsvg,
|
||||
gtk4,
|
||||
gtksourceview5,
|
||||
libadwaita,
|
||||
cabextract,
|
||||
p7zip,
|
||||
xdpyinfo,
|
||||
imagemagick,
|
||||
lsb-release,
|
||||
pciutils,
|
||||
procps,
|
||||
gamescope,
|
||||
mangohud,
|
||||
vkbasalt-cli,
|
||||
vmtouch,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "bottles-unwrapped";
|
||||
version = "51.11";
|
||||
version = "51.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bottlesdevs";
|
||||
repo = "bottles";
|
||||
rev = version;
|
||||
sha256 = "sha256-uS3xmTu+LrVFX93bYcJvYjl6179d3IjpxLKrOXn8Z8Y=";
|
||||
hash = "sha256-ZcUevGY81H3ATTk390ojBp/4zBE2Lui7Qa+Qe8B0XL4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./vulkan_icd.patch
|
||||
];
|
||||
patches = [ ./vulkan_icd.patch ];
|
||||
|
||||
# https://github.com/bottlesdevs/Bottles/wiki/Packaging
|
||||
nativeBuildInputs = [
|
||||
@ -60,38 +59,41 @@ python3Packages.buildPythonApplication rec {
|
||||
libadwaita
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pathvalidate
|
||||
pycurl
|
||||
pyyaml
|
||||
requests
|
||||
pygobject3
|
||||
patool
|
||||
markdown
|
||||
fvs
|
||||
pefile
|
||||
urllib3
|
||||
chardet
|
||||
certifi
|
||||
idna
|
||||
orjson
|
||||
icoextract
|
||||
] ++ [
|
||||
cabextract
|
||||
p7zip
|
||||
xdpyinfo
|
||||
imagemagick
|
||||
vkbasalt-cli
|
||||
propagatedBuildInputs =
|
||||
with python3Packages;
|
||||
[
|
||||
pathvalidate
|
||||
pycurl
|
||||
pyyaml
|
||||
requests
|
||||
pygobject3
|
||||
patool
|
||||
markdown
|
||||
fvs
|
||||
pefile
|
||||
urllib3
|
||||
chardet
|
||||
certifi
|
||||
idna
|
||||
orjson
|
||||
icoextract
|
||||
]
|
||||
++ [
|
||||
cabextract
|
||||
p7zip
|
||||
xdpyinfo
|
||||
imagemagick
|
||||
vkbasalt-cli
|
||||
|
||||
gamescope
|
||||
mangohud
|
||||
vmtouch
|
||||
gamescope
|
||||
mangohud
|
||||
vmtouch
|
||||
|
||||
# Undocumented (subprocess.Popen())
|
||||
lsb-release
|
||||
pciutils
|
||||
procps
|
||||
];
|
||||
# Undocumented (subprocess.Popen())
|
||||
lsb-release
|
||||
pciutils
|
||||
procps
|
||||
];
|
||||
|
||||
format = "other";
|
||||
dontWrapGApps = true; # prevent double wrapping
|
||||
@ -107,7 +109,10 @@ python3Packages.buildPythonApplication rec {
|
||||
homepage = "https://usebottles.com/";
|
||||
downloadPage = "https://github.com/bottlesdevs/Bottles/releases";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ psydvl shamilton ];
|
||||
maintainers = with maintainers; [
|
||||
psydvl
|
||||
shamilton
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "bottles";
|
||||
};
|
||||
|
||||
@ -1,106 +1,129 @@
|
||||
{ buildFHSEnv
|
||||
, symlinkJoin
|
||||
, bottles-unwrapped
|
||||
, extraPkgs ? pkgs: [ ]
|
||||
, extraLibraries ? pkgs: [ ]
|
||||
{
|
||||
buildFHSEnv,
|
||||
symlinkJoin,
|
||||
bottles-unwrapped,
|
||||
extraPkgs ? pkgs: [ ],
|
||||
extraLibraries ? pkgs: [ ],
|
||||
}:
|
||||
|
||||
let fhsEnv = {
|
||||
# Many WINE games need 32bit
|
||||
multiArch = true;
|
||||
let
|
||||
fhsEnv = {
|
||||
# Many WINE games need 32bit
|
||||
multiArch = true;
|
||||
|
||||
targetPkgs = pkgs: with pkgs; [
|
||||
bottles-unwrapped
|
||||
# This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env)
|
||||
# See https://github.com/bottlesdevs/Bottles/issues/2401
|
||||
vkbasalt
|
||||
] ++ extraPkgs pkgs;
|
||||
targetPkgs =
|
||||
pkgs:
|
||||
with pkgs;
|
||||
[
|
||||
bottles-unwrapped
|
||||
# This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env)
|
||||
# See https://github.com/bottlesdevs/Bottles/issues/2401
|
||||
vkbasalt
|
||||
]
|
||||
++ extraPkgs pkgs;
|
||||
|
||||
multiPkgs =
|
||||
let
|
||||
xorgDeps = pkgs: with pkgs.xorg; [
|
||||
libpthreadstubs
|
||||
libSM
|
||||
libX11
|
||||
libXaw
|
||||
libxcb
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXdmcp
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libXmu
|
||||
libXrandr
|
||||
libXrender
|
||||
libXv
|
||||
libXxf86vm
|
||||
];
|
||||
gstreamerDeps = pkgs: with pkgs.gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
gst-plugins-bad
|
||||
gst-libav
|
||||
];
|
||||
in
|
||||
pkgs: with pkgs; [
|
||||
# https://wiki.winehq.org/Building_Wine
|
||||
alsa-lib
|
||||
cups
|
||||
dbus
|
||||
fontconfig
|
||||
freetype
|
||||
glib
|
||||
gnutls
|
||||
libglvnd
|
||||
gsm
|
||||
libgphoto2
|
||||
libjpeg_turbo
|
||||
libkrb5
|
||||
libpcap
|
||||
libpng
|
||||
libpulseaudio
|
||||
libtiff
|
||||
libunwind
|
||||
libusb1
|
||||
libv4l
|
||||
libxml2
|
||||
mpg123
|
||||
ocl-icd
|
||||
openldap
|
||||
samba4
|
||||
sane-backends
|
||||
SDL2
|
||||
udev
|
||||
vulkan-loader
|
||||
multiPkgs =
|
||||
let
|
||||
xorgDeps =
|
||||
pkgs: with pkgs.xorg; [
|
||||
libpthreadstubs
|
||||
libSM
|
||||
libX11
|
||||
libXaw
|
||||
libxcb
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXdmcp
|
||||
libXext
|
||||
libXi
|
||||
libXinerama
|
||||
libXmu
|
||||
libXrandr
|
||||
libXrender
|
||||
libXv
|
||||
libXxf86vm
|
||||
];
|
||||
gstreamerDeps =
|
||||
pkgs: with pkgs.gst_all_1; [
|
||||
gstreamer
|
||||
gst-plugins-base
|
||||
gst-plugins-good
|
||||
gst-plugins-ugly
|
||||
gst-plugins-bad
|
||||
gst-libav
|
||||
];
|
||||
in
|
||||
pkgs:
|
||||
with pkgs;
|
||||
[
|
||||
# https://wiki.winehq.org/Building_Wine
|
||||
alsa-lib
|
||||
cups
|
||||
dbus
|
||||
fontconfig
|
||||
freetype
|
||||
glib
|
||||
gnutls
|
||||
libglvnd
|
||||
gsm
|
||||
libgphoto2
|
||||
libjpeg_turbo
|
||||
libkrb5
|
||||
libpcap
|
||||
libpng
|
||||
libpulseaudio
|
||||
libtiff
|
||||
libunwind
|
||||
libusb1
|
||||
libv4l
|
||||
libxml2
|
||||
mpg123
|
||||
ocl-icd
|
||||
openldap
|
||||
samba4
|
||||
sane-backends
|
||||
SDL2
|
||||
udev
|
||||
vulkan-loader
|
||||
|
||||
# https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/
|
||||
alsa-plugins
|
||||
dosbox
|
||||
giflib
|
||||
gtk3
|
||||
libva
|
||||
libxslt
|
||||
ncurses
|
||||
openal
|
||||
# https://www.gloriouseggroll.tv/how-to-get-out-of-wine-dependency-hell/
|
||||
alsa-plugins
|
||||
dosbox
|
||||
giflib
|
||||
gtk3
|
||||
libva
|
||||
libxslt
|
||||
ncurses
|
||||
openal
|
||||
|
||||
# Steam runtime
|
||||
libgcrypt
|
||||
libgpg-error
|
||||
p11-kit
|
||||
zlib # Freetype
|
||||
] ++ xorgDeps pkgs
|
||||
++ gstreamerDeps pkgs
|
||||
++ extraLibraries pkgs;
|
||||
};
|
||||
# Steam runtime
|
||||
libgcrypt
|
||||
libgpg-error
|
||||
p11-kit
|
||||
zlib # Freetype
|
||||
]
|
||||
++ xorgDeps pkgs
|
||||
++ gstreamerDeps pkgs
|
||||
++ extraLibraries pkgs;
|
||||
};
|
||||
in
|
||||
symlinkJoin {
|
||||
name = "bottles";
|
||||
paths = [
|
||||
(buildFHSEnv (fhsEnv // { name = "bottles"; runScript = "bottles"; }))
|
||||
(buildFHSEnv (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; }))
|
||||
(buildFHSEnv (
|
||||
fhsEnv
|
||||
// {
|
||||
name = "bottles";
|
||||
runScript = "bottles";
|
||||
}
|
||||
))
|
||||
(buildFHSEnv (
|
||||
fhsEnv
|
||||
// {
|
||||
name = "bottles-cli";
|
||||
runScript = "bottles-cli";
|
||||
}
|
||||
))
|
||||
];
|
||||
postBuild = ''
|
||||
mkdir -p $out/share
|
||||
|
||||
@ -6,7 +6,7 @@ index 6673493..9191004 100644
|
||||
"/usr/share/vulkan",
|
||||
"/etc/vulkan",
|
||||
"/usr/local/share/vulkan",
|
||||
- "/usr/local/etc/vulkan"
|
||||
- "/usr/local/etc/vulkan",
|
||||
+ "/usr/local/etc/vulkan",
|
||||
+ "/run/opengl-driver/share/vulkan",
|
||||
+ "/run/opengl-driver-32/share/vulkan",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (7.1.3.2)
|
||||
activesupport (7.1.3.4)
|
||||
base64
|
||||
bigdecimal
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
@ -11,28 +11,29 @@ GEM
|
||||
minitest (>= 5.1)
|
||||
mutex_m
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.6)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
base64 (0.2.0)
|
||||
bigdecimal (3.1.7)
|
||||
bigdecimal (3.1.8)
|
||||
colorator (1.1.0)
|
||||
concurrent-ruby (1.2.3)
|
||||
concurrent-ruby (1.3.3)
|
||||
connection_pool (2.4.1)
|
||||
drb (2.2.1)
|
||||
em-websocket (0.5.3)
|
||||
eventmachine (>= 0.12.9)
|
||||
http_parser.rb (~> 0)
|
||||
eventmachine (1.2.7)
|
||||
ffi (1.16.3)
|
||||
ffi (1.17.0)
|
||||
forwardable-extended (2.6.0)
|
||||
gemoji (4.1.0)
|
||||
google-protobuf (4.26.1)
|
||||
google-protobuf (4.27.2)
|
||||
bigdecimal
|
||||
rake (>= 13)
|
||||
html-pipeline (2.14.3)
|
||||
activesupport (>= 2)
|
||||
nokogiri (>= 1.4)
|
||||
http_parser.rb (0.8.0)
|
||||
i18n (1.14.4)
|
||||
i18n (1.14.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (4.3.3)
|
||||
addressable (~> 2.4)
|
||||
@ -76,26 +77,28 @@ GEM
|
||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||
rb-inotify (~> 0.9, >= 0.9.10)
|
||||
mercenary (0.4.0)
|
||||
mini_portile2 (2.8.5)
|
||||
minitest (5.22.3)
|
||||
mini_portile2 (2.8.7)
|
||||
minitest (5.24.0)
|
||||
mutex_m (0.2.0)
|
||||
nokogiri (1.16.3)
|
||||
nokogiri (1.16.6)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
pathutil (0.16.2)
|
||||
forwardable-extended (~> 2.6)
|
||||
public_suffix (5.0.4)
|
||||
racc (1.7.3)
|
||||
rake (13.1.0)
|
||||
public_suffix (6.0.0)
|
||||
racc (1.8.0)
|
||||
rake (13.2.1)
|
||||
rb-fsevent (0.11.2)
|
||||
rb-inotify (0.10.1)
|
||||
rb-inotify (0.11.1)
|
||||
ffi (~> 1.0)
|
||||
rexml (3.2.6)
|
||||
rouge (4.2.1)
|
||||
rexml (3.3.1)
|
||||
strscan
|
||||
rouge (4.3.0)
|
||||
safe_yaml (1.0.5)
|
||||
sass-embedded (1.72.0)
|
||||
sass-embedded (1.77.5)
|
||||
google-protobuf (>= 3.25, < 5.0)
|
||||
rake (>= 13.0.0)
|
||||
rake (>= 13)
|
||||
strscan (3.1.0)
|
||||
terminal-table (3.0.2)
|
||||
unicode-display_width (>= 1.1.1, < 3)
|
||||
tzinfo (2.0.6)
|
||||
@ -115,4 +118,4 @@ DEPENDENCIES
|
||||
jemoji
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.6
|
||||
2.5.11
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d";
|
||||
sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.1.3.2";
|
||||
version = "7.1.3.4";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -16,10 +16,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
|
||||
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.6";
|
||||
version = "2.8.7";
|
||||
};
|
||||
base64 = {
|
||||
groups = ["default"];
|
||||
@ -36,10 +36,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
|
||||
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.7";
|
||||
version = "3.1.8";
|
||||
};
|
||||
colorator = {
|
||||
groups = ["default"];
|
||||
@ -56,10 +56,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
|
||||
sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.3";
|
||||
version = "1.3.3";
|
||||
};
|
||||
connection_pool = {
|
||||
groups = ["default"];
|
||||
@ -107,10 +107,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
|
||||
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.3";
|
||||
version = "1.17.0";
|
||||
};
|
||||
forwardable-extended = {
|
||||
groups = ["default"];
|
||||
@ -133,15 +133,15 @@
|
||||
version = "4.1.0";
|
||||
};
|
||||
google-protobuf = {
|
||||
dependencies = ["rake"];
|
||||
dependencies = ["bigdecimal" "rake"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj";
|
||||
sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.26.1";
|
||||
version = "4.27.2";
|
||||
};
|
||||
html-pipeline = {
|
||||
dependencies = ["activesupport" "nokogiri"];
|
||||
@ -170,10 +170,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
|
||||
sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.4";
|
||||
version = "1.14.5";
|
||||
};
|
||||
jekyll = {
|
||||
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
|
||||
@ -321,20 +321,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
|
||||
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.5";
|
||||
version = "2.8.7";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a";
|
||||
sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.22.3";
|
||||
version = "5.24.0";
|
||||
};
|
||||
mutex_m = {
|
||||
groups = ["default"];
|
||||
@ -352,10 +352,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9";
|
||||
sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.3";
|
||||
version = "1.16.6";
|
||||
};
|
||||
pathutil = {
|
||||
dependencies = ["forwardable-extended"];
|
||||
@ -373,30 +373,30 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
|
||||
sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.4";
|
||||
version = "6.0.0";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
|
||||
sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.3";
|
||||
version = "1.8.0";
|
||||
};
|
||||
rake = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
|
||||
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.1.0";
|
||||
version = "13.2.1";
|
||||
};
|
||||
rb-fsevent = {
|
||||
groups = ["default"];
|
||||
@ -414,30 +414,31 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
|
||||
sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.1";
|
||||
version = "0.11.1";
|
||||
};
|
||||
rexml = {
|
||||
dependencies = ["strscan"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
|
||||
sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.6";
|
||||
version = "3.3.1";
|
||||
};
|
||||
rouge = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk";
|
||||
sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default"];
|
||||
@ -455,10 +456,20 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5";
|
||||
sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.72.0";
|
||||
version = "1.77.5";
|
||||
};
|
||||
strscan = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.0";
|
||||
};
|
||||
terminal-table = {
|
||||
dependencies = ["unicode-display_width"];
|
||||
|
||||
@ -10,6 +10,7 @@ gem "jemoji"
|
||||
|
||||
# Optional dependencies:
|
||||
gem "jekyll-coffeescript"
|
||||
gem "jekyll-compose"
|
||||
#gem "jekyll-docs"
|
||||
gem "jekyll-favicon"
|
||||
gem "jekyll-feed", "~> 0.9"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (7.1.3.2)
|
||||
activesupport (7.1.3.4)
|
||||
base64
|
||||
bigdecimal
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
@ -11,10 +11,10 @@ GEM
|
||||
minitest (>= 5.1)
|
||||
mutex_m
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.6)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
addressable (2.8.7)
|
||||
public_suffix (>= 2.0.2, < 7.0)
|
||||
base64 (0.2.0)
|
||||
bigdecimal (3.1.7)
|
||||
bigdecimal (3.1.8)
|
||||
classifier-reborn (2.3.0)
|
||||
fast-stemmer (~> 1.0)
|
||||
matrix (~> 0.4)
|
||||
@ -24,7 +24,7 @@ GEM
|
||||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
colorator (1.1.0)
|
||||
concurrent-ruby (1.2.3)
|
||||
concurrent-ruby (1.3.3)
|
||||
connection_pool (2.4.1)
|
||||
drb (2.2.1)
|
||||
em-websocket (0.5.3)
|
||||
@ -32,21 +32,22 @@ GEM
|
||||
http_parser.rb (~> 0)
|
||||
eventmachine (1.2.7)
|
||||
execjs (2.9.1)
|
||||
faraday (2.9.0)
|
||||
faraday (2.9.2)
|
||||
faraday-net_http (>= 2.0, < 3.2)
|
||||
faraday-net_http (3.1.0)
|
||||
net-http
|
||||
fast-stemmer (1.0.2)
|
||||
ffi (1.16.3)
|
||||
ffi (1.17.0)
|
||||
forwardable-extended (2.6.0)
|
||||
gemoji (4.1.0)
|
||||
google-protobuf (4.26.1)
|
||||
google-protobuf (4.27.2)
|
||||
bigdecimal
|
||||
rake (>= 13)
|
||||
html-pipeline (2.14.3)
|
||||
activesupport (>= 2)
|
||||
nokogiri (>= 1.4)
|
||||
http_parser.rb (0.8.0)
|
||||
i18n (1.14.4)
|
||||
i18n (1.14.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (4.3.3)
|
||||
addressable (~> 2.4)
|
||||
@ -69,6 +70,8 @@ GEM
|
||||
jekyll-coffeescript (2.0.0)
|
||||
coffee-script (~> 2.2)
|
||||
coffee-script-source (~> 1.12)
|
||||
jekyll-compose (0.12.0)
|
||||
jekyll (>= 3.7, < 5.0)
|
||||
jekyll-favicon (1.1.0)
|
||||
jekyll (>= 3.0, < 5.0)
|
||||
mini_magick (~> 4.11)
|
||||
@ -114,14 +117,14 @@ GEM
|
||||
mercenary (0.4.0)
|
||||
mime-types (3.5.2)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2024.0305)
|
||||
mini_magick (4.12.0)
|
||||
mini_portile2 (2.8.5)
|
||||
minitest (5.22.3)
|
||||
mime-types-data (3.2024.0604)
|
||||
mini_magick (4.13.1)
|
||||
mini_portile2 (2.8.7)
|
||||
minitest (5.24.0)
|
||||
mutex_m (0.2.0)
|
||||
net-http (0.4.1)
|
||||
uri
|
||||
nokogiri (1.16.3)
|
||||
nokogiri (1.16.6)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
octokit (4.25.1)
|
||||
@ -131,24 +134,26 @@ GEM
|
||||
forwardable-extended (~> 2.6)
|
||||
psych (5.1.2)
|
||||
stringio
|
||||
public_suffix (5.0.4)
|
||||
racc (1.7.3)
|
||||
rake (13.1.0)
|
||||
public_suffix (6.0.0)
|
||||
racc (1.8.0)
|
||||
rake (13.2.1)
|
||||
rb-fsevent (0.11.2)
|
||||
rb-inotify (0.10.1)
|
||||
rb-inotify (0.11.1)
|
||||
ffi (~> 1.0)
|
||||
rdoc (6.6.3.1)
|
||||
rdoc (6.7.0)
|
||||
psych (>= 4.0.0)
|
||||
rexml (3.2.6)
|
||||
rouge (4.2.1)
|
||||
rexml (3.3.1)
|
||||
strscan
|
||||
rouge (4.3.0)
|
||||
safe_yaml (1.0.5)
|
||||
sass-embedded (1.72.0)
|
||||
sass-embedded (1.77.5)
|
||||
google-protobuf (>= 3.25, < 5.0)
|
||||
rake (>= 13.0.0)
|
||||
rake (>= 13)
|
||||
sawyer (0.9.2)
|
||||
addressable (>= 2.3.5)
|
||||
faraday (>= 0.17.3, < 3)
|
||||
stringio (3.1.0)
|
||||
stringio (3.1.1)
|
||||
strscan (3.1.0)
|
||||
terminal-table (3.0.2)
|
||||
unicode-display_width (>= 1.1.1, < 3)
|
||||
tomlrb (1.3.0)
|
||||
@ -167,6 +172,7 @@ DEPENDENCIES
|
||||
jekyll
|
||||
jekyll-avatar
|
||||
jekyll-coffeescript
|
||||
jekyll-compose
|
||||
jekyll-favicon
|
||||
jekyll-feed (~> 0.9)
|
||||
jekyll-gist
|
||||
@ -185,4 +191,4 @@ DEPENDENCIES
|
||||
yajl-ruby (~> 1.4)
|
||||
|
||||
BUNDLED WITH
|
||||
2.5.6
|
||||
2.5.11
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d";
|
||||
sha256 = "0283wk1zxb76lg79dk501kcf5xy9h25qiw15m86s4nrfv11vqns5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.1.3.2";
|
||||
version = "7.1.3.4";
|
||||
};
|
||||
addressable = {
|
||||
dependencies = ["public_suffix"];
|
||||
@ -16,10 +16,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
|
||||
sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.6";
|
||||
version = "2.8.7";
|
||||
};
|
||||
base64 = {
|
||||
groups = ["default"];
|
||||
@ -36,10 +36,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
|
||||
sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.7";
|
||||
version = "3.1.8";
|
||||
};
|
||||
classifier-reborn = {
|
||||
dependencies = ["fast-stemmer" "matrix"];
|
||||
@ -110,10 +110,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
|
||||
sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.2.3";
|
||||
version = "1.3.3";
|
||||
};
|
||||
connection_pool = {
|
||||
groups = ["default"];
|
||||
@ -172,10 +172,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s";
|
||||
sha256 = "1913fk7szy3bj8mf1dxs4waym5ya5fzzc5d3a8z24qs67fzfv5b5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.9.0";
|
||||
version = "2.9.2";
|
||||
};
|
||||
faraday-net_http = {
|
||||
dependencies = ["net-http"];
|
||||
@ -215,10 +215,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
|
||||
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.3";
|
||||
version = "1.17.0";
|
||||
};
|
||||
forwardable-extended = {
|
||||
groups = ["default"];
|
||||
@ -241,15 +241,15 @@
|
||||
version = "4.1.0";
|
||||
};
|
||||
google-protobuf = {
|
||||
dependencies = ["rake"];
|
||||
dependencies = ["bigdecimal" "rake"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14s40yxj35vixx9pvpnbrkz9z7ga3m7vcy72yll1flnn3cirl1aj";
|
||||
sha256 = "0vwnr6fmxig4pkag86yzbznpxk8ii7rhjz0rrprkqvnymhhfnscz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.26.1";
|
||||
version = "4.27.2";
|
||||
};
|
||||
html-pipeline = {
|
||||
dependencies = ["activesupport" "nokogiri"];
|
||||
@ -278,10 +278,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
|
||||
sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.4";
|
||||
version = "1.14.5";
|
||||
};
|
||||
jekyll = {
|
||||
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"];
|
||||
@ -316,6 +316,17 @@
|
||||
};
|
||||
version = "2.0.0";
|
||||
};
|
||||
jekyll-compose = {
|
||||
dependencies = ["jekyll"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ny8xps0mrmx2w0xxc9rwa15ch1wkxvdrzxiwnqramqwja566y04";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.12.0";
|
||||
};
|
||||
jekyll-favicon = {
|
||||
dependencies = ["jekyll" "mini_magick" "rexml"];
|
||||
groups = ["default"];
|
||||
@ -584,40 +595,40 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "00x7w5xqsj9m33v3vkmy23wipkkysafksib53ypzn27p5g81w455";
|
||||
sha256 = "0rri45lldyk3bsg4yqpxcl1xrnxnqasnw94x03w5arq3yy7kff65";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2024.0305";
|
||||
version = "3.2024.0604";
|
||||
};
|
||||
mini_magick = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
|
||||
sha256 = "1zbfldqc3dp9fiyz9d4hkkabkvsmx5649bs78j5008i5gzr0x6zg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.12.0";
|
||||
version = "4.13.1";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs";
|
||||
sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.5";
|
||||
version = "2.8.7";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "07lq26b86giy3ha3fhrywk9r1ajhc2pm2mzj657jnpnbj1i6g17a";
|
||||
sha256 = "0zgq31wa0ygqnmpqh3plsig32xc8k4l99r49ncmidfg91kfagymg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.22.3";
|
||||
version = "5.24.0";
|
||||
};
|
||||
mutex_m = {
|
||||
groups = ["default"];
|
||||
@ -646,10 +657,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9";
|
||||
sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.16.3";
|
||||
version = "1.16.6";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
@ -689,30 +700,30 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m";
|
||||
sha256 = "17m8q2dzm7a74amnab5rf3f3m466i300awihl3ygh4v80wpf3j6j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.4";
|
||||
version = "6.0.0";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp";
|
||||
sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.3";
|
||||
version = "1.8.0";
|
||||
};
|
||||
rake = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
|
||||
sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.1.0";
|
||||
version = "13.2.1";
|
||||
};
|
||||
rb-fsevent = {
|
||||
groups = ["default"];
|
||||
@ -730,10 +741,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
|
||||
sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.1";
|
||||
version = "0.11.1";
|
||||
};
|
||||
rdoc = {
|
||||
dependencies = ["psych"];
|
||||
@ -741,30 +752,31 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr";
|
||||
sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.6.3.1";
|
||||
version = "6.7.0";
|
||||
};
|
||||
rexml = {
|
||||
dependencies = ["strscan"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
|
||||
sha256 = "09f3sw7f846fpcpwdm362ylqldwqxpym6z0qpld4av7zisrrzbrl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.6";
|
||||
version = "3.3.1";
|
||||
};
|
||||
rouge = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zd1pdldi6h8x27dqim7cy8m69xr01aw5c8k1zhkz497n4np6wgk";
|
||||
sha256 = "072qvvrcqj0yfr3b0j932mlhvn41i38bq37z7z07i3ikagndkqwy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.2.1";
|
||||
version = "4.3.0";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default"];
|
||||
@ -782,10 +794,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bixk8c02dhflvhi4s5hxzjg8akzgicvjxjvxx74nah2j8qfblq5";
|
||||
sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.72.0";
|
||||
version = "1.77.5";
|
||||
};
|
||||
sawyer = {
|
||||
dependencies = ["addressable" "faraday"];
|
||||
@ -803,7 +815,17 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1";
|
||||
sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.1";
|
||||
};
|
||||
strscan = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.0";
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p bundix zlib libyaml
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o errexit -o nounset
|
||||
|
||||
readonly BASEDIR="$(dirname $(readlink -f $0))"
|
||||
script_dir=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
|
||||
|
||||
for directory in "basic" "full"; do
|
||||
pushd "$BASEDIR/$directory"
|
||||
pushd "$script_dir/$directory"
|
||||
rm -f Gemfile.lock gemset.nix
|
||||
BUNDLE_FORCE_RUBY_PLATFORM=true bundix --magic
|
||||
rm -rf .bundle vendor
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5,10 +5,10 @@
|
||||
{
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "130.0";
|
||||
version = "130.0.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40";
|
||||
sha512 = "163d1ce9f671a4716686955c43ff23d9f200f6c52dfdabcbb93af6a326c24aa5096404f42447b02b5a3ad02e2f60d17271783638fe027d24865aebb3e70e97fe";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
|
||||
@ -9,15 +9,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubernetes-helm";
|
||||
version = "3.15.4";
|
||||
version = "3.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helm";
|
||||
repo = "helm";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hFQX9v37cXJ4wv1aQnBOBlmVWUiZuKrjCJ/R4dzUa/4=";
|
||||
sha256 = "sha256-OTG4xPgK1WT/HUWjQZ1a7X126+PUo02yFnEAnd6MTU8=";
|
||||
};
|
||||
vendorHash = "sha256-lR/6n+EH4Nhs1Q/BqEkMlugM74NtEtT+SKQQHc6+Zjk=";
|
||||
vendorHash = "sha256-rNp2aah6lAMZd07HXF2w0h7wfPc+TuRHl/jQpgqY5Sk=";
|
||||
|
||||
subPackages = [ "cmd/helm" ];
|
||||
ldflags = [
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helmfile";
|
||||
version = "0.167.1";
|
||||
version = "0.168.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helmfile";
|
||||
repo = "helmfile";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-v5H5CQtLUmWCAh1Fhnf63gObxz3Wchpczi4gsPOh2ps=";
|
||||
hash = "sha256-qpYTYOzQWhjuVANOPpLDsYZyhvRl6FnNQz5ssDZHohw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QVFCPTGhYcCya9MGtj0vVZ3BJCcJeaxENrrJVef0H4Y=";
|
||||
vendorHash = "sha256-pCP5PxxOLlqQBmqufpo6G69v4M+NxMpTlIUY6TnclVA=";
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
|
||||
|
||||
@ -1,38 +1,38 @@
|
||||
{ callPackage
|
||||
, libsForQt5
|
||||
, python311
|
||||
, python311Packages
|
||||
}:
|
||||
|
||||
let
|
||||
mkGui = args: callPackage (import ./gui.nix (args)) {
|
||||
inherit (libsForQt5) wrapQtAppsHook;
|
||||
python3 = python311;
|
||||
python3Packages = python311Packages;
|
||||
};
|
||||
|
||||
mkServer = args: callPackage (import ./server.nix (args)) { };
|
||||
in {
|
||||
|
||||
in
|
||||
{
|
||||
guiStable = mkGui {
|
||||
channel = "stable";
|
||||
version = "2.2.47";
|
||||
hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA=";
|
||||
version = "2.2.49";
|
||||
hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU=";
|
||||
};
|
||||
|
||||
guiPreview = mkGui {
|
||||
channel = "stable";
|
||||
version = "2.2.47";
|
||||
hash = "sha256-6UXQTPkRHbtNX6RzWMakCsO9YpkFlWliNnm+mZ4wuZA=";
|
||||
version = "2.2.49";
|
||||
hash = "sha256-hvLJ4VilcgtpxHeboeSUuGAco9LEnUB8J6vy/ZPajbU=";
|
||||
};
|
||||
|
||||
serverStable = mkServer {
|
||||
channel = "stable";
|
||||
version = "2.2.47";
|
||||
hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0=";
|
||||
version = "2.2.49";
|
||||
hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So=";
|
||||
};
|
||||
|
||||
serverPreview = mkServer {
|
||||
channel = "stable";
|
||||
version = "2.2.47";
|
||||
hash = "sha256-iZ/1qACPLe7r1cZMhJbFRjVt/FlVgadBgp9tJwvYSi0=";
|
||||
version = "2.2.49";
|
||||
hash = "sha256-fI49MxA6b2kPkUihLl32a6jo8oHcEwDEjmvSVDj8/So=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,33 +1,37 @@
|
||||
{ channel
|
||||
, version
|
||||
, hash
|
||||
{
|
||||
channel,
|
||||
version,
|
||||
hash,
|
||||
}:
|
||||
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, qt5
|
||||
, wrapQtAppsHook
|
||||
, testers
|
||||
, gns3-gui
|
||||
{
|
||||
fetchFromGitHub,
|
||||
gns3-gui,
|
||||
lib,
|
||||
python3Packages,
|
||||
qt5,
|
||||
testers,
|
||||
wrapQtAppsHook,
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gns3-gui";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit hash;
|
||||
owner = "GNS3";
|
||||
repo = pname;
|
||||
repo = "gns3-gui";
|
||||
rev = "refs/tags/v${version}";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
nativeBuildInputs = with python3Packages; [ wrapQtAppsHook ];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [ qt5.qtwayland ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
distro
|
||||
jsonschema
|
||||
psutil
|
||||
@ -36,7 +40,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sip
|
||||
(pyqt5.override { withWebSockets = true; })
|
||||
truststore
|
||||
qt5.qtwayland
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
];
|
||||
@ -49,9 +52,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
checkInputs = with python3Packages; [ pytestCheckHook ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
@ -65,7 +66,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
command = "${lib.getExe gns3-gui} --version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Graphical Network Simulator 3 GUI (${channel} release)";
|
||||
longDescription = ''
|
||||
Graphical user interface for controlling the GNS3 network simulator. This
|
||||
@ -74,9 +75,9 @@ python3.pkgs.buildPythonApplication rec {
|
||||
'';
|
||||
homepage = "https://www.gns3.com/";
|
||||
changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ anthonyroussel ];
|
||||
mainProgram = "gns3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,17 +1,19 @@
|
||||
{ channel
|
||||
, version
|
||||
, hash
|
||||
{
|
||||
channel,
|
||||
version,
|
||||
hash,
|
||||
}:
|
||||
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchFromGitHub
|
||||
, pkgsStatic
|
||||
, stdenv
|
||||
, nixosTests
|
||||
, testers
|
||||
, util-linux
|
||||
, gns3-server
|
||||
{
|
||||
fetchFromGitHub,
|
||||
gns3-server,
|
||||
lib,
|
||||
nixosTests,
|
||||
pkgsStatic,
|
||||
python3Packages,
|
||||
stdenv,
|
||||
testers,
|
||||
util-linux,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
@ -30,7 +32,9 @@ python3Packages.buildPythonApplication {
|
||||
cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
aiofiles
|
||||
aiohttp
|
||||
aiohttp-cors
|
||||
@ -44,7 +48,6 @@ python3Packages.buildPythonApplication {
|
||||
psutil
|
||||
py-cpuinfo
|
||||
sentry-sdk
|
||||
setuptools
|
||||
truststore
|
||||
yarl
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
@ -69,7 +72,7 @@ python3Packages.buildPythonApplication {
|
||||
checkInputs = with python3Packages; [
|
||||
pytest-aiohttp
|
||||
pytest-rerunfailures
|
||||
(pytestCheckHook.override { pytest = pytest_7; })
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
@ -87,7 +90,7 @@ python3Packages.buildPythonApplication {
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Graphical Network Simulator 3 server (${channel} release)";
|
||||
longDescription = ''
|
||||
The GNS3 server manages emulators such as Dynamips, VirtualBox or
|
||||
@ -96,9 +99,9 @@ python3Packages.buildPythonApplication {
|
||||
'';
|
||||
homepage = "https://www.gns3.com/";
|
||||
changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ anthonyroussel ];
|
||||
mainProgram = "gns3server";
|
||||
};
|
||||
}
|
||||
|
||||
@ -128,6 +128,8 @@ stdenv.mkDerivation rec {
|
||||
# zerocallusedregs interferes during BPF compilation; TODO: perhaps improve
|
||||
hardeningDisable = [ "stackprotector" "zerocallusedregs" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
installFlags = [
|
||||
"e_datadir=\${TMPDIR}"
|
||||
"e_localstatedir=\${TMPDIR}"
|
||||
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20240910";
|
||||
version = "20240913";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
rev = version;
|
||||
hash = "sha256-VOC13xXWRGHq7K5ju1U/+SNj+qgkJCSYN11l01hwYhI=";
|
||||
hash = "sha256-Rtoxa0LYL2ElBtt6KxRmKAkRDc8PNvRCoP0s51h+sIM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -16,7 +16,7 @@ index 887213f09..c66468306 100644
|
||||
<< QLatin1String("Name=") << guiName << QLatin1Char('\n')
|
||||
<< QLatin1String("GenericName=") << QLatin1String("File Synchronizer\n")
|
||||
- << QLatin1String("Exec=\"") << executablePath << "\" --background\n"
|
||||
+ << QLatin1String("Exec=") << "nextcloud --background" << endl
|
||||
+ << QLatin1String("Exec=") << "nextcloud --background\n"
|
||||
<< QLatin1String("Terminal=") << "false\n"
|
||||
<< QLatin1String("Icon=") << APPLICATION_ICON_NAME << QLatin1Char('\n')
|
||||
<< QLatin1String("Categories=") << QLatin1String("Network\n")
|
||||
|
||||
@ -4,20 +4,20 @@
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, inotify-tools
|
||||
, kdePackages
|
||||
, libcloudproviders
|
||||
, librsvg
|
||||
, libsecret
|
||||
, openssl
|
||||
, pcre
|
||||
, pkg-config
|
||||
, qt5compat
|
||||
, qtbase
|
||||
, qtkeychain
|
||||
, qtsvg
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, qtwebsockets
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
, plasma5Packages
|
||||
, sphinx
|
||||
, sqlite
|
||||
, xdg-utils
|
||||
@ -26,15 +26,15 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.13.4";
|
||||
version = "3.14.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextcloud-releases";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-anQwIqWtHdKFfUuCekiyrdg9xzxcs5bVJ0VDMtyVfw8=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/jRD0swNs59xugsXLbesGcTtyGdc/y/iwiDVoErW+d4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||
postPatch = ''
|
||||
for file in src/libsync/vfs/*/CMakeLists.txt; do
|
||||
substituteInPlace $file \
|
||||
--replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR"
|
||||
--replace-fail "PLUGINDIR" "KDE_INSTALL_PLUGINDIR"
|
||||
done
|
||||
'';
|
||||
|
||||
@ -61,17 +61,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
inotify-tools
|
||||
kdePackages.kio
|
||||
libcloudproviders
|
||||
libsecret
|
||||
openssl
|
||||
pcre
|
||||
plasma5Packages.kio
|
||||
qt5compat
|
||||
qtbase
|
||||
qtkeychain
|
||||
qtsvg
|
||||
qttools
|
||||
qtwebengine
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
qtwebsockets
|
||||
sqlite
|
||||
];
|
||||
@ -93,6 +93,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/nextcloud/desktop/releases/tag/v${version}";
|
||||
description = "Nextcloud themed desktop client";
|
||||
homepage = "https://nextcloud.com";
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
@ -38,13 +38,13 @@
|
||||
|
||||
let
|
||||
pname = "pcloud";
|
||||
version = "1.14.6";
|
||||
code = "XZQDbs0Z4ET1VL0SIUuzr5ewR9LYuf6ssLRk";
|
||||
version = "1.14.7";
|
||||
code = "XZhPkU0Zh5gulxHfMn4j1dYBS4dh45iDQHby";
|
||||
|
||||
# Archive link's codes: https://www.pcloud.com/release-notes/linux.html
|
||||
src = fetchzip {
|
||||
url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
|
||||
hash = "sha256-3HUVIDxeq7svzeWyZrxlE4TjZ8lOwT8bYgyRFRzGnmU=";
|
||||
hash = "sha256-fzQVuCI3mK93Y3Fwzc0WM5rti0fTZhRm+Qj1CHC8CJ4=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
wrapQtAppsHook,
|
||||
pkg-config,
|
||||
qtbase,
|
||||
qwt,
|
||||
qwt6_1,
|
||||
fftwFloat,
|
||||
libsamplerate,
|
||||
portaudio,
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qwt
|
||||
qwt6_1
|
||||
fftwFloat
|
||||
libsamplerate
|
||||
portaudio
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
{ lib, gccStdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "muscle";
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "muscle";
|
||||
version = "5.1.0";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcedgar";
|
||||
repo = pname;
|
||||
@ -14,15 +13,26 @@ stdenv.mkDerivation rec {
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
||||
installPhase = ''
|
||||
install -m755 -D Linux/muscle $out/bin/muscle
|
||||
'';
|
||||
patches = [
|
||||
./muscle-darwin-g++.patch
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
target =
|
||||
if gccStdenv.isDarwin
|
||||
then "Darwin"
|
||||
else "Linux";
|
||||
in
|
||||
''
|
||||
install -m755 -D ${target}/muscle $out/bin/muscle
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multiple sequence alignment with top benchmark scores scalable to thousands of sequences";
|
||||
mainProgram = "muscle";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://www.drive5.com/muscle/";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://www.drive5.com/muscle/";
|
||||
maintainers = with maintainers; [ unode thyol ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index df16673..be3bd0d 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -20,9 +20,6 @@ OS := $(shell uname)
|
||||
CPPFLAGS := $(CPPFLAGS) -DNDEBUG -pthread
|
||||
|
||||
CXX := g++
|
||||
-ifeq ($(OS),Darwin)
|
||||
- CXX := g++-11
|
||||
-endif
|
||||
|
||||
CXXFLAGS := $(CXXFLAGS) -O3 -fopenmp -ffast-math
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, doxygen
|
||||
, graphviz
|
||||
@ -42,6 +43,14 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-3fEwm5EKK9RcRbnyUejgwfjdsXaujjZjoMbq/BbVMeM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "qwt-6.3-compile-error-fix.patch";
|
||||
url = "https://github.com/GPlates/GPlates/commit/c4680ebe54f4535909085feacecd66410a91ff98.patch";
|
||||
hash = "sha256-mw5+GLayMrmcSDd1ai+0JTuY3iedHT9u2kx5Dd2wMjg=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
doxygen
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obs-text-pthread";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "norihiro";
|
||||
repo = "obs-text-pthread";
|
||||
rev = version;
|
||||
sha256 = "sha256-3Y++zpy5TEp8AtyRw+1fZDEFY9AuN7JpUNqUhM7h04U=";
|
||||
sha256 = "sha256-zrgxKs3jmrwQJiEgKfZz1BOVToTLauQXtFYcuFlV71o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
32
pkgs/by-name/ab/abctl/package.nix
Normal file
32
pkgs/by-name/ab/abctl/package.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
pname = "abctl";
|
||||
version = "0.13.1";
|
||||
in
|
||||
buildGoModule {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airbytehq";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZZP5wXsPtqkZd/sdj/LU8M/DYv0gjIWRspAFrp3ETH8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-uvOKH/MLIoIwYClpTIj010os9dGkkZPAVV0RYBjjzVk=";
|
||||
|
||||
meta = {
|
||||
description = "Airbyte's CLI for managing local Airbyte installations";
|
||||
homepage = "https://airbyte.com/";
|
||||
changelog = "https://github.com/airbytehq/abctl/releases/tag/v${version}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ xelden ];
|
||||
mainProgram = "abctl";
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
@ -95,6 +95,8 @@ python3.pkgs.buildPythonApplication {
|
||||
"test_browser_flag_imports_streamlit"
|
||||
# AttributeError
|
||||
"test_simple_send_with_retries"
|
||||
# Expected 'check_version' to have been called once
|
||||
"test_main_exit_calls_version_check"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Tests fails on darwin
|
||||
@ -104,6 +106,7 @@ python3.pkgs.buildPythonApplication {
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export AIDER_CHECK_UPDATE=false
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -10,16 +10,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "aiken";
|
||||
version = "1.0.29-alpha"; # all releases are 'alpha'
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aiken-lang";
|
||||
repo = "aiken";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fikXypc9HKil4Ut4jdgQtTTy/CHEogEpDprwdTgd9b4=";
|
||||
hash = "sha256-os8OqLX6vxHQvrn+X8/BeYnfZJSKG7GDScz7ikJ4sl8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-UWDPXnq2k/PoogrfuW93ieRW8AfuNIEfri9Jo6gHkdg=";
|
||||
cargoHash = "sha256-7VoTL9W9KboBhhxB9nkzPag6IR/RsXZUDVXjdzOITVM=";
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
|
||||
@ -1,14 +1,21 @@
|
||||
{ lib, stdenv, fetchzip, mono, sqlite, makeWrapper }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
mono,
|
||||
sqlite,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duplicati";
|
||||
version = "2.0.7.1";
|
||||
version = "2.0.8.1";
|
||||
channel = "beta";
|
||||
build_date = "2023-05-25";
|
||||
build_date = "2024-05-07";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/duplicati/duplicati/releases/download/v${version}-${version}_${channel}_${build_date}/duplicati-${version}_${channel}_${build_date}.zip";
|
||||
hash = "sha256-isPmRC6N+gEZgvJ0bgeFf5kOQJsicZOsGnT+CAGgg+U=";
|
||||
hash = "sha256-LmW6yGutxP33ghFqyOLKrGDNCQdr8DDFn/IHigsLpzA=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
@ -19,19 +26,26 @@ stdenv.mkDerivation rec {
|
||||
cp -r * $out/share/${pname}-${version}
|
||||
makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
|
||||
--add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
||||
sqlite ]}
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
sqlite
|
||||
]
|
||||
}
|
||||
makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
|
||||
--add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
|
||||
sqlite ]}
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
sqlite
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers";
|
||||
homepage = "https://www.duplicati.com/";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ nyanloutre ];
|
||||
maintainers = with maintainers; [ nyanloutre bot-wxt1221 ];
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -47,13 +47,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "easyeffects";
|
||||
version = "7.1.8";
|
||||
version = "7.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wwmm";
|
||||
repo = "easyeffects";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eDjtmr100WOCd0k0p3rUEtu6O9LlSGs43oaIXT07ikI=";
|
||||
hash = "sha256-It+kldlhThWF9y/rTgKt9QlIouH1cQcCtSHQTsaGjfo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
poco,
|
||||
ocl-icd,
|
||||
opencl-clhpp,
|
||||
callPackage,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -37,6 +38,10 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
run-on-nixos-artwork = callPackage ./tests/run-on-nixos-artwork.nix { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/MCJack123/sanjuuni";
|
||||
description = "Command-line tool that converts images and videos into a format that can be displayed in ComputerCraft";
|
||||
|
||||
34
pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix
Normal file
34
pkgs/by-name/sa/sanjuuni/tests/run-on-nixos-artwork.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{
|
||||
runCommand,
|
||||
sanjuuni,
|
||||
nixos-artwork,
|
||||
lua5_2,
|
||||
}:
|
||||
let
|
||||
makeCommand = derivation: baseFilename: ''
|
||||
echo "sanjuuni-test-run-on-nixos-artwork: Running Sanjuuni on ${derivation}/share/backgrounds/nixos/${baseFilename}.png"
|
||||
sanjuuni --lua --disable-opencl \
|
||||
--input ${derivation}/share/backgrounds/nixos/${baseFilename}.png \
|
||||
--output $out/${baseFilename}.lua
|
||||
echo "sanjuuni-test-run-on-nixos-artwork: Checking syntax on $out/${baseFilename}.lua"
|
||||
lua -e "loadfile(\"$out/${baseFilename}.lua\")"
|
||||
'';
|
||||
in
|
||||
runCommand "sanjuuni-test-run-on-nixos-artwork"
|
||||
{
|
||||
nativeBuildInputs = [
|
||||
sanjuuni
|
||||
lua5_2
|
||||
nixos-artwork.wallpapers.simple-blue
|
||||
nixos-artwork.wallpapers.simple-red
|
||||
nixos-artwork.wallpapers.simple-dark-gray
|
||||
nixos-artwork.wallpapers.stripes
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir -p $out
|
||||
${makeCommand nixos-artwork.wallpapers.simple-blue "nix-wallpaper-simple-blue"}
|
||||
${makeCommand nixos-artwork.wallpapers.simple-red "nix-wallpaper-simple-red"}
|
||||
${makeCommand nixos-artwork.wallpapers.simple-dark-gray "nix-wallpaper-simple-dark-gray"}
|
||||
${makeCommand nixos-artwork.wallpapers.stripes "nix-wallpaper-stripes"}
|
||||
''
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shpool";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shell-pool";
|
||||
repo = "shpool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4d194y9scjXi5wpTRP66apApXl2R9N3ACAVXkXHfQDM=";
|
||||
hash = "sha256-0ykGGzYL29SxxT0etTaBHooIE8NEUJeTIr/6vTBgY0Q=";
|
||||
};
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||
--replace-fail '/usr/bin/shpool' "$out/bin/shpool"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-lkwgjrEaLuTY0sDSxa+wbT9LX09aCDp1wDUqNQE07Xw=";
|
||||
cargoHash = "sha256-cuLscDki8Y68qtEZh7xDaLp5B6MyTkPWTQX5gHNtULQ=";
|
||||
|
||||
buildInputs = [
|
||||
linux-pam
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
...
|
||||
@ -8,20 +7,20 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "SpoofDPI";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xvzc";
|
||||
repo = "SpoofDPI";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GdGOnaIDy7XWWo0MOu+HfQcLrW/PDlRxf0y1jjJrZNQ=";
|
||||
hash = "sha256-m4fhFhZLuWT1diDlDTmTsNrckKTjhEZbhciv44FZcro=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-47Gt5SI6VXq4+1T0LxFvQoYNk+JqTt3DonDXLfmFBzw=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/xvzc/SpoofDPI";
|
||||
description = "A simple and fast anti-censorship tool written in Go";
|
||||
description = "Simple and fast anti-censorship tool written in Go";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ s0me1newithhand7s ];
|
||||
};
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sqlite-vec";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asg017";
|
||||
repo = "sqlite-vec";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-h5gCKyeEAgmXCpOpXVDzoZEtv7Yiq7GtgImuoF9uBm0=";
|
||||
hash = "sha256-8vof4gfESfWHAW+MBYdhyte2bKnVk+VEiowDK42/G/0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
@ -33,6 +33,9 @@
|
||||
, libesmtp
|
||||
, rdkafka
|
||||
, gperf
|
||||
, withGrpc ? true
|
||||
, grpc
|
||||
, protobuf
|
||||
}:
|
||||
let
|
||||
python-deps = ps: with ps; [
|
||||
@ -94,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
paho-mqtt-c
|
||||
hiredis
|
||||
rdkafka
|
||||
];
|
||||
] ++ (lib.optionals withGrpc [ protobuf grpc ]);
|
||||
|
||||
configureFlags = [
|
||||
"--enable-manpages"
|
||||
@ -111,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"--with-systemd-journal=system"
|
||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||
"--without-compile-date"
|
||||
];
|
||||
] ++ (lib.optionals withGrpc [ "--enable-grpc" ]);
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "trexio";
|
||||
version = "2.4.2";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TREX-CoE";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SE5cylLThpwDWyAcQZgawcdYGc/8iiIwL6EyQ+hOIYY=";
|
||||
hash = "sha256-KP8tpwBr/ymjcXmCssdn+Xti0UKgazJSGTgVpvE+CiM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "podofo";
|
||||
version = "0.10.3";
|
||||
version = "0.10.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "podofo";
|
||||
repo = "podofo";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-B+YNTo2rZAL4PqDo+lFOQiWM9bl/TIn8xrJyefrIAYE=";
|
||||
hash = "sha256-ZY+kyimLzAeEgvDaflXM7MbyzsGgivOnG1aBD9/ozbk=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qwt";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2";
|
||||
sha256 = "sha256-kZT2UTlV0P1zAPZxWBdQZEYBl6urGpL6EnpnpLC3FTA=";
|
||||
sha256 = "sha256-3LCFiWwoquxVGMvAjA7itOYK2nrJKdgmOfYYmFGmEpo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ qtbase qtsvg qttools ];
|
||||
|
||||
@ -19,16 +19,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudsplaining";
|
||||
version = "0.6.3";
|
||||
version = "0.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "salesforce";
|
||||
repo = "cloudsplaining";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-mRWfb14zKS141cYzShXY+OoHWfs9PB1oJu3spsvv6mI=";
|
||||
hash = "sha256-ZraWGOiJNqVSmxnllaTvpk9+rUQRFcxFIdp91gpAQW0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-cloud";
|
||||
version = "0.0.15";
|
||||
version = "0.0.17";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_cloud";
|
||||
inherit version;
|
||||
hash = "sha256-vgb9iI6IliN5a5wqoPwNCe8DntUUX/Jn2ECMy+pwwEg=";
|
||||
hash = "sha256-f9aFe7u5GTdTVXLMtI2qOBifVc3XQRGF2Ag9qym6Epk=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-cli";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_cli";
|
||||
inherit version;
|
||||
hash = "sha256-pC4B/ioCqg/TtkXrFAP5BY+n9i++6ioGpVt/uMB9XQI=";
|
||||
hash = "sha256-GJDdaHz0QPNlE2WlSeMDNjFiwWe4772Ho6oQBY1tXHc=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -47,7 +47,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.11.7";
|
||||
version = "0.11.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -56,7 +56,7 @@ buildPythonPackage rec {
|
||||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-48cx+hquZCjAEIp40cO1jM5wMwKQ1PNQftuwmJBnHVQ=";
|
||||
hash = "sha256-IebrdKC73Rwj4AgN26Ga3qqMEAeuVDMmFhDqQ9VIWIw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-ollama";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-Q5pc0R473lBPrWqICF6UIX0mp4akY2SBqXBS7MIkB7Y=";
|
||||
hash = "sha256-Wj51+hS+fisagpN0FsiAIE3JbhsdJibcW96T8CHntUA=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-openai";
|
||||
version = "0.2.4";
|
||||
version = "0.2.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_openai";
|
||||
inherit version;
|
||||
hash = "sha256-CeJf+5Rt0fld8VAXI23kV4GoONzmVJhVnQdTxy7/5hc=";
|
||||
hash = "sha256-AEfdcddHBoZF7XKMKTEqqRtlu+TGFCGAA0xk38XG9ug=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-graph-stores-neo4j";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_graph_stores_neo4j";
|
||||
inherit version;
|
||||
hash = "sha256-v4rtGi47qyV6cDXfQcKuGrES9IjG/Se5zpnhktuoNHc=";
|
||||
hash = "sha256-O/iTlpbREmN1tbojbaqZ7gLAN2JdKmKEzhKCnpth6S0=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-indices-managed-llama-cloud";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_indices_managed_llama_cloud";
|
||||
inherit version;
|
||||
hash = "sha256-AqHQtBP/+1UCLn6E4FeIzLGMvc9Uz+wEZthMVlUJ+uY=";
|
||||
hash = "sha256-9ifxAtFZBfFWGFIrbsKJWM2G17mzebmXLa7YkQU0LR0=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-ollama";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-8fHR/p6H0LN5BZno0lEz6et+hgRVGYJ9wIHfNLXvcDQ=";
|
||||
hash = "sha256-t0W9a3vZAEI9IttLIcza/WwjvjG/0C8jdwahejCPipw=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-openai";
|
||||
version = "0.2.3";
|
||||
version = "0.2.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-6Rc7QwMxeRxqWp3xZ5ZDeuSjriR/1ODygffL5ZJYsHo=";
|
||||
hash = "sha256-pwmiazL4JwzoYhMZQTcqv3ZMwPgbBxMTOEjH7/x9MPs=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-multi-modal-llms-openai";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_multi_modal_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-gRlrcwN0zIjSg/h5Q1fQvWZka5pNqlwJz1dhkDC0aWw=";
|
||||
hash = "sha256-G1vmkdX6KGH9S1oHGIPclNgts+HH/2hthN2EBIo1THs=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-postgres";
|
||||
version = "0.2.1";
|
||||
version = "0.2.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_postgres";
|
||||
inherit version;
|
||||
hash = "sha256-xjlFAa3HTJRP/34HaN4fN5BE1VvfAWSLDZnj2s/ES/U=";
|
||||
hash = "sha256-JLJygIsklBM9B3mOeQP8fu6YuHo104rvJKNj83eAQc4=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [ "psycopg2-binary" ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-parse";
|
||||
version = "0.5.2";
|
||||
version = "0.5.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_parse";
|
||||
inherit version;
|
||||
hash = "sha256-7ER3jp+KOKG4gZp82tIKtEJi1QZD2l2K2zi5VUfzMEc=";
|
||||
hash = "sha256-ILAOCbFNG1ehsEDkvWFDbVH0Nza3tRADBypNBbA170Q=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "nodriver";
|
||||
version = "0.36";
|
||||
version = "0.37";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ultrafunkamsterdam";
|
||||
repo = "nodriver";
|
||||
rev = "e630abfc5dce2023966a61cec739348b18bd465d";
|
||||
hash = "sha256-pUWvHcsEPbRob5DDXBFOzqonSWigNPnPUHIu9omzYII=";
|
||||
rev = "1bb6003c7f0db4d3ec05fdf3fc8c8e0804260103";
|
||||
hash = "sha256-8q+9RX9ugrT6/fjlTSIecVcR6lPdZwg7nF+cSTSLlEc=";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
@ -21,7 +21,7 @@ in
|
||||
buildPythonPackage rec {
|
||||
pname = "playwright";
|
||||
# run ./pkgs/development/python-modules/playwright/update.sh to update
|
||||
version = "1.46.0";
|
||||
version = "1.47.0";
|
||||
pyproject = true;
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "microsoft";
|
||||
repo = "playwright-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-88ZFhP8Bd10czoW71ltelWStypX4z4g18LT3Zo5ACMg=";
|
||||
hash = "sha256-C/spH54hhLI0Egs2jjTjQ5BH1pIw1syrfSyUvVQRoKM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
buildPythonPackage,
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
orjson,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
@ -14,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "policy-sentry";
|
||||
version = "0.12.12";
|
||||
version = "0.13.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "salesforce";
|
||||
repo = "policy_sentry";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1LYcUlGoSalbdo4tiNIYbdA04IHRTImhdWScpiCZk50=";
|
||||
hash = "sha256-OUe6NAz4w9/OXWQg4W+TmEI5qiSdEp+/tspQnIISTnc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@ -31,8 +32,9 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
beautifulsoup4
|
||||
click
|
||||
requests
|
||||
orjson
|
||||
pyyaml
|
||||
requests
|
||||
schema
|
||||
];
|
||||
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
tkinter,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysimplegui";
|
||||
version = "5.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PySimpleGUI";
|
||||
inherit version;
|
||||
hash = "sha256-4B2LgWmdXAU9ACSR0F26Q9+eP3izRI+p6QS/o9m6Hfk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ tkinter ];
|
||||
|
||||
pythonImportsCheck = [ "PySimpleGUI" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python GUIs for Humans";
|
||||
homepage = "https://github.com/PySimpleGUI/PySimpleGUI";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ lucasew ];
|
||||
broken = true; # update to v5 broke the package, it now needs rsa and is trying to access an X11 socket?
|
||||
};
|
||||
}
|
||||
@ -6,6 +6,7 @@
|
||||
pyte,
|
||||
pexpect,
|
||||
ptyprocess,
|
||||
pythonOlder,
|
||||
jedi,
|
||||
git,
|
||||
lineedit,
|
||||
@ -14,21 +15,22 @@
|
||||
rchitect,
|
||||
R,
|
||||
rPackages,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "radian";
|
||||
version = "0.6.12";
|
||||
format = "setuptools";
|
||||
version = "0.6.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "randy3k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cojKbDNqcUay5RxvWszQ96eC4jVI4G7iRv/ZYWgidCQ=";
|
||||
hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -36,6 +38,11 @@ buildPythonPackage rec {
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
R # needed at setup time to detect R_HOME
|
||||
];
|
||||
|
||||
@ -3,27 +3,29 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
cffi,
|
||||
packaging,
|
||||
pytestCheckHook,
|
||||
pytest-mock,
|
||||
pythonOlder,
|
||||
R,
|
||||
rPackages,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
six,
|
||||
packaging,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "rchitect";
|
||||
version = "0.4.6";
|
||||
format = "setuptools";
|
||||
version = "0.4.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "randy3k";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-IVyYzf433m03RRfL5SmUOdaXFy0NHf/QuAdtUeUjIz0=";
|
||||
hash = "sha256-M7OWDo3mEEOYtjIpzPIpzPMBtv2TZJKJkSfHczZYS8Y=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -31,6 +33,11 @@ buildPythonPackage rec {
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
six
|
||||
|
||||
@ -23,6 +23,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"bc-python-hcl2"
|
||||
"boto3"
|
||||
"botocore"
|
||||
"cloudsplaining"
|
||||
"cyclonedx-python-lib"
|
||||
"dpath"
|
||||
"igraph"
|
||||
|
||||
@ -4,26 +4,28 @@
|
||||
}:
|
||||
|
||||
let
|
||||
python = python3.withPackages (ps: with ps; [
|
||||
inherit (python3.pkgs)
|
||||
setuptools
|
||||
wheel
|
||||
build
|
||||
installer
|
||||
wrapPython
|
||||
pygments
|
||||
]);
|
||||
;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ikos";
|
||||
version = "3.1";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NASA-SW-VnV";
|
||||
repo = "ikos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-scaFkUhCkIi41iR6CGPbEndzXkgqTKMb3PDNvhgVbCE=";
|
||||
hash = "sha256-zWWfmjYgqhAztGivAJwZ4+yRrAHxgU1CF1Y7vVr95UA=";
|
||||
};
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://github.com/NASA-SW-VnV/ikos/commit/2e647432427b3f0dbb639e0371d976ab6406f290.patch";
|
||||
hash = "sha256-ffzjlqEp4qp76Kwl5zpyQlg/xUMt8aLDSSP4XA4ndS8=";
|
||||
})
|
||||
patches = [
|
||||
# Fix build with GCC 13
|
||||
# https://github.com/NASA-SW-VnV/ikos/pull/262
|
||||
(fetchpatch {
|
||||
@ -31,15 +33,35 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/NASA-SW-VnV/ikos/commit/73c816641fb9780f0d3b5e448510363a3cf21ce2.patch";
|
||||
hash = "sha256-bkeSAtxrL+z+6QNiGOWSg7kN8XiZqMxlJiu5Dquhca0=";
|
||||
})
|
||||
# Fix an error in ikos-view; Pygments>=2.12 no longer passes outfile to wrap.
|
||||
./formatter-wrap.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ boost tbb gmp clang llvm sqlite python
|
||||
nativeBuildInputs = [ cmake setuptools wheel build installer wrapPython ];
|
||||
buildInputs = [ boost tbb gmp clang llvm sqlite python3
|
||||
ocamlPackages.apron mpfr ppl doxygen graphviz ];
|
||||
propagatedBuildInputs = [
|
||||
pygments
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DAPRON_ROOT=${ocamlPackages.apron}" ];
|
||||
cmakeFlags = [
|
||||
"-DAPRON_ROOT=${ocamlPackages.apron}"
|
||||
"-DINSTALL_PYTHON_VIRTUALENV=off"
|
||||
"-DPYTHON_VENV_EXECUTABLE=${python3}/bin/python"
|
||||
];
|
||||
|
||||
postBuild = "make doc";
|
||||
postBuild = ''
|
||||
make doc
|
||||
${python3}/bin/python -m build --no-isolation --outdir dist/ --wheel analyzer/python
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
${python3}/bin/python -m installer --prefix "$out" dist/*.whl
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonPrograms
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/NASA-SW-VnV/ikos";
|
||||
|
||||
13
pkgs/development/tools/analysis/ikos/formatter-wrap.patch
Normal file
13
pkgs/development/tools/analysis/ikos/formatter-wrap.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/analyzer/python/ikos/view.py b/analyzer/python/ikos/view.py
|
||||
index 4e9ed5d..6643db8 100644
|
||||
--- a/analyzer/python/ikos/view.py
|
||||
+++ b/analyzer/python/ikos/view.py
|
||||
@@ -422,7 +422,7 @@ class Formatter(HtmlFormatter):
|
||||
self.call_contexts = {}
|
||||
self.checks = {}
|
||||
|
||||
- def wrap(self, source, outfile):
|
||||
+ def wrap(self, source):
|
||||
return self._wrap_code(source)
|
||||
|
||||
def _wrap_code(self, source):
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buildkit";
|
||||
version = "0.15.2";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "buildkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-N//XCiWWFjpJ6OncN7OT/C7+ziYr49T+0cOpH61mjg4=";
|
||||
hash = "sha256-rAl2lPcm4JSRO9xVrZctGpWoi/JNZ5uUHDIZKd70+M8=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -72,8 +72,7 @@ let
|
||||
{ tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } //
|
||||
{ tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; } //
|
||||
{ tree-sitter-php = grammars'.tree-sitter-php // { location = "php"; }; } //
|
||||
{ tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; } //
|
||||
{ tree-sitter-wing = grammars'.tree-sitter-wing // { location = "libs/tree-sitter-wing"; generate = true; }; };
|
||||
{ tree-sitter-sql = grammars'.tree-sitter-sql // { generate = true; }; };
|
||||
in
|
||||
lib.mapAttrs build (grammars);
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
"url": "https://github.com/winglang/wing",
|
||||
"rev": "ae30eb63ed5dba548d8935e0d3c74bfb28f0d690",
|
||||
"date": "2024-09-16T08:46:38Z",
|
||||
"path": "/nix/store/zczqrkbqiw0k8qd7an1bk93cksyd05nr-wing",
|
||||
"sha256": "032j48xy59z9d80xhy14jb1vca2pxk3cv5a5myqmfnlik2c8frj2",
|
||||
"hash": "sha256-QmaHmJiRWlexr0WVzcbsVyi2w5IkeNgBaumn4jsiUgw=",
|
||||
"url": "https://github.com/winglang/tree-sitter-wing",
|
||||
"rev": "27b595f5ea1aa45b5f777f194c0bd121a7b0c8e3",
|
||||
"date": "2024-09-03T18:25:03-04:00",
|
||||
"path": "/nix/store/az77v8z742hkqm830lvhgnqi1zpx9v8d-tree-sitter-wing",
|
||||
"sha256": "09h79hvi35riwypskhh97qz8wis2kkz27xj777fg8lldvfh5kgdh",
|
||||
"hash": "sha256-sL1ZoNuNUvTcOUf2I/6cQkeOPj4Jwqmv5zGXETdMByY=",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
||||
@ -423,7 +423,7 @@ let
|
||||
};
|
||||
"tree-sitter-wing" = {
|
||||
orga = "winglang";
|
||||
repo = "wing";
|
||||
repo = "tree-sitter-wing";
|
||||
};
|
||||
"tree-sitter-wgsl" = {
|
||||
orga = "szebniok";
|
||||
|
||||
@ -17,13 +17,13 @@ let
|
||||
|
||||
throwSystem = throw "Unsupported system: ${system}";
|
||||
|
||||
version = "1.46.0";
|
||||
version = "1.47.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Microsoft";
|
||||
repo = "playwright";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-pNvjWyedKsac7WffOXZjsxGVlUSkmXqSGHvivF9ek4g=";
|
||||
hash = "sha256-cKjVDy1wFo8NlF8v+8YBuQUF2OUYjCmv27uhEoVUrno=";
|
||||
};
|
||||
|
||||
babel-bundle = buildNpmPackage {
|
||||
@ -40,7 +40,7 @@ let
|
||||
pname = "expect-bundle";
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/packages/playwright/bundles/expect";
|
||||
npmDepsHash = "sha256-jNrFQ6BcMsVdEyB2ATFH4wRNb12v4w1kXo6rVv6rzAw=";
|
||||
npmDepsHash = "sha256-qnFx/AQZtmxNFrrabfOpsWy6I64DFJf3sWrJzL1wfU4=";
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
cp -r . "$out"
|
||||
@ -60,7 +60,7 @@ let
|
||||
pname = "utils-bundle-core";
|
||||
inherit version src;
|
||||
sourceRoot = "${src.name}/packages/playwright-core/bundles/utils";
|
||||
npmDepsHash = "sha256-lh57Xvrqt0YDenBvahoUuQNW6GdRUiBBkA3TLmnz9WE=";
|
||||
npmDepsHash = "sha256-aktxEDQKxsDcInyjDKDuIu4zwtrAH0lRda/mP1IayPA=";
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
cp -r . "$out"
|
||||
@ -82,7 +82,7 @@ let
|
||||
inherit version src;
|
||||
|
||||
sourceRoot = "${src.name}"; # update.sh depends on sourceRoot presence
|
||||
npmDepsHash = "sha256-8wc/QfABTIVrzQxM9aCyXGkLaothOBVLteH8SiPanZU=";
|
||||
npmDepsHash = "sha256-FaDTJmIiaaOCvq6tARfiWX5IBTTNOJ/iVkRsO4D8aqc=";
|
||||
|
||||
nativeBuildInputs = [ cacert ];
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ listToAttrs (map
|
||||
meta = {
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.matthewbauer maintainers.shazow ];
|
||||
license = licenses.free;
|
||||
license = licenses.unfree;
|
||||
};
|
||||
};
|
||||
})
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, nodejs
|
||||
, electron
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, nix-update-script
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "r2modman";
|
||||
version = "3.1.49";
|
||||
version = "3.1.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ebkr";
|
||||
repo = "r2modmanPlus";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Br+VkBHgwM/Zu1aypzlVYHB/v8T/KV+B6XUNJn/EbYM=";
|
||||
hash = "sha256-WmF7tH5PiaggyvP/klWwNgaLKVhIoApxDtwwLpug52A=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
@ -103,9 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/ebkr/r2modmanPlus/releases/tag/v${finalAttrs.version}";
|
||||
|
||||
@ -59,12 +59,12 @@ let
|
||||
in
|
||||
{
|
||||
tomcat9 = common {
|
||||
version = "9.0.93";
|
||||
hash = "sha256-aeDzU+p9hQBPneN5wepo5XdSh/4uCFnFYIHghcGykiY=";
|
||||
version = "9.0.94";
|
||||
hash = "sha256-KMjFSxBc6/qw196lxkwLJPV7N5efrB9p0C9Q0gPSPfA=";
|
||||
};
|
||||
|
||||
tomcat10 = common {
|
||||
version = "10.1.28";
|
||||
hash = "sha256-89N3d9Pqv4TwQ9ljTQj6Qzfw2B75ADzo/H4c8Uc7hdo=";
|
||||
version = "10.1.29";
|
||||
hash = "sha256-k9klJ9Rn//CU1F2xyrvhos77kpeXeaRPKlDQU7QVXOM=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "granted";
|
||||
version = "0.32.0";
|
||||
version = "0.33.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "common-fate";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CagRgAStanLD7JnH1L4zAhxD56dpgqUR31DICaklWRE=";
|
||||
sha256 = "sha256-prvdxWdv580BmhjhP6h4FHyjCDlgr5/Z1kg2wOS+pR0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-iGYAjbWQ8w60NZeMCVydltQLuwxOI74VxLltYIJ37K8=";
|
||||
vendorHash = "sha256-g7GKABv7SunVhRUd4y3ZSqD5lnFxM5nuaHJhxFuF/FE=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
, libnotify
|
||||
, libmpdclient
|
||||
, discount
|
||||
, systemd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
|
||||
ffmpeg
|
||||
libmpdclient
|
||||
discount
|
||||
systemd
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "osv-scanner";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "osv-scanner";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-e1a21zBxMa89PuNXPbeTpY3mHeO0TvxcoHcWRPUYwsM=";
|
||||
hash = "sha256-bwCY1LK2Ig/VcJJHu88cyrZ5ImOOEUYdGMBkZTmpG+g=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZmWgupPHZhv+MmNfFmuU1Cjin5liNcgkzdxw3Sf614c=";
|
||||
vendorHash = "sha256-uZ0FDQaYaCMYu92e5i2YqS31NP1whaiDE8s+0KLh7k4=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/osv-scanner"
|
||||
|
||||
@ -33,7 +33,7 @@ buildGoModule rec {
|
||||
description = "Tool to detect when your YubiKey is waiting for a touch";
|
||||
homepage = "https://github.com/maximbaz/yubikey-touch-detector";
|
||||
maintainers = with maintainers; [ sumnerevans ];
|
||||
license = with licenses; [ bsd2 isc ];
|
||||
license = licenses.isc;
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "yubikey-touch-detector";
|
||||
};
|
||||
|
||||
@ -1,9 +1,15 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
kramdown (1.17.0)
|
||||
kramdown-asciidoc (1.0.1)
|
||||
kramdown (~> 1.17.0)
|
||||
kramdown (2.4.0)
|
||||
rexml
|
||||
kramdown-asciidoc (2.1.0)
|
||||
kramdown (~> 2.4.0)
|
||||
kramdown-parser-gfm (~> 1.1.0)
|
||||
rexml (~> 3.2.0)
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
rexml (3.2.6)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@ -12,4 +18,4 @@ DEPENDENCIES
|
||||
kramdown-asciidoc
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
2.4.22
|
||||
|
||||
@ -1,23 +1,45 @@
|
||||
{
|
||||
kramdown = {
|
||||
dependencies = ["rexml"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
|
||||
sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.17.0";
|
||||
version = "2.4.0";
|
||||
};
|
||||
kramdown-asciidoc = {
|
||||
dependencies = ["kramdown" "kramdown-parser-gfm" "rexml"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1j7qbpq6zhgcf9ykhz5r1wlr3r8fls6hvhdisxzz4v35rni5kwp9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
};
|
||||
kramdown-parser-gfm = {
|
||||
dependencies = ["kramdown"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1nr4hss1byhchwkqy2w0dgc7s83n0s5xm0pjms2cmckc4sbrryxi";
|
||||
sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
};
|
||||
rexml = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.6";
|
||||
};
|
||||
}
|
||||
|
||||
@ -7208,8 +7208,6 @@ with pkgs;
|
||||
|
||||
duplicacy = callPackage ../tools/backup/duplicacy { };
|
||||
|
||||
duplicati = callPackage ../tools/backup/duplicati { };
|
||||
|
||||
duplicity = callPackage ../tools/backup/duplicity { };
|
||||
|
||||
duply = callPackage ../tools/backup/duply { };
|
||||
@ -10552,7 +10550,7 @@ with pkgs;
|
||||
};
|
||||
|
||||
|
||||
nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { };
|
||||
nextcloud-client = qt6Packages.callPackage ../applications/networking/nextcloud-client { };
|
||||
|
||||
nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { };
|
||||
|
||||
@ -20968,7 +20966,10 @@ with pkgs;
|
||||
|
||||
libantlr3c = callPackage ../development/libraries/libantlr3c { };
|
||||
|
||||
libaom = callPackage ../development/libraries/libaom { };
|
||||
libaom = callPackage ../development/libraries/libaom {
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116737
|
||||
stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
|
||||
};
|
||||
|
||||
libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
|
||||
libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
|
||||
@ -22186,7 +22187,10 @@ with pkgs;
|
||||
|
||||
libvisual = callPackage ../development/libraries/libvisual { };
|
||||
|
||||
libvmaf = callPackage ../development/libraries/libvmaf { };
|
||||
libvmaf = callPackage ../development/libraries/libvmaf {
|
||||
# See libaom
|
||||
stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
|
||||
};
|
||||
|
||||
libvncserver = callPackage ../development/libraries/libvncserver {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon;
|
||||
@ -32025,7 +32029,7 @@ with pkgs;
|
||||
|
||||
yambar-hyprland-wses = callPackage ../applications/misc/yambar-hyprland-wses { };
|
||||
|
||||
polyphone = libsForQt5.callPackage ../applications/audio/polyphone { };
|
||||
polyphone = qt6.callPackage ../applications/audio/polyphone { };
|
||||
|
||||
psi-notify = callPackage ../applications/misc/psi-notify { };
|
||||
|
||||
|
||||
@ -468,6 +468,7 @@ mapAliases ({
|
||||
pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07
|
||||
py_scrypt = py-scrypt; # added 2024-01-07
|
||||
pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20
|
||||
pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16
|
||||
pysmart-smartx = pysmart; # added 2021-10-22
|
||||
pySmartDL = pysmartdl; # added 2023-10-11
|
||||
pysmi-lextudio = pysmi; # added 2024-07-18
|
||||
|
||||
@ -12109,8 +12109,6 @@ self: super: with self; {
|
||||
|
||||
pysim = callPackage ../development/python-modules/pysim { };
|
||||
|
||||
pysimplegui = callPackage ../development/python-modules/pysimplegui { };
|
||||
|
||||
pysingleton = callPackage ../development/python-modules/pysingleton { };
|
||||
|
||||
pyslim = callPackage ../development/python-modules/pyslim { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user