Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
db4a84c993
nixos
doc/manual
modules
services/monitoring/prometheus/exporters
tasks
virtualisation
pkgs
applications
audio
backup/urbackup-client
editors/jetbrains
emulators
misc
flamerobin
glava
lenmus
lutris
opentrack
pwsafe
xchm
yubioath-desktop
networking
science
biology
math/giac
misc
version-management/git-and-tools/git-cinnabar
video/mlv-app
window-managers/hyprwm
development
libraries
ocaml-modules/ptime
python-modules/safety
tools
web/netlify-cli
games
misc
os-specific/linux/nvidia-x11
servers/filtron
tools
admin/winbox
misc
package-management/comma
security
top-level
@ -1402,6 +1402,14 @@ services.github-runner.serviceOverrides.SupplementaryGroups = [
|
||||
for more details.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>netlify-cli</literal> package has been updated
|
||||
from 6.13.2 to 12.2.4, see the
|
||||
<link xlink:href="https://github.com/netlify/cli/releases">changelog</link>
|
||||
for more details.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>dockerTools.buildImage</literal> deprecates the
|
||||
|
||||
@ -452,6 +452,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
|
||||
|
||||
- The `guake` package has been updated from 3.6.3 to 3.9.0, see the [changelog](https://github.com/Guake/guake/releases) for more details.
|
||||
|
||||
- The `netlify-cli` package has been updated from 6.13.2 to 12.2.4, see the [changelog](https://github.com/netlify/cli/releases) for more details.
|
||||
|
||||
- `dockerTools.buildImage` deprecates the misunderstood `contents` parameter, in favor of `copyToRoot`.
|
||||
Use `copyToRoot = buildEnv { ... };` or similar if you intend to add packages to `/bin`.
|
||||
|
||||
|
||||
@ -9,6 +9,7 @@ let
|
||||
poller = { inherit (cfg.log) debug quiet; };
|
||||
unifi = { inherit (cfg) controllers; };
|
||||
influxdb.disable = true;
|
||||
datadog.disable = true; # workaround for https://github.com/unpoller/unpoller/issues/442
|
||||
prometheus = {
|
||||
http_listen = "${cfg.listenAddress}:${toString cfg.port}";
|
||||
report_errors = cfg.log.prometheusErrors;
|
||||
@ -30,7 +31,7 @@ in {
|
||||
};
|
||||
|
||||
serviceOpts.serviceConfig = {
|
||||
ExecStart = "${pkgs.unifi-poller}/bin/unifi-poller --config ${configFile}";
|
||||
ExecStart = "${pkgs.unifi-poller}/bin/unpoller --config ${configFile}";
|
||||
DynamicUser = false;
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,6 +5,10 @@ let
|
||||
cfg = config.services.lvm;
|
||||
in {
|
||||
options.services.lvm = {
|
||||
enable = mkEnableOption (lib.mdDoc "lvm2") // {
|
||||
default = true;
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.lvm2;
|
||||
@ -30,7 +34,7 @@ in {
|
||||
# minimal configuration file to make lvmconfig/lvm2-activation-generator happy
|
||||
environment.etc."lvm/lvm.conf".text = "config {}";
|
||||
})
|
||||
(mkIf (!config.boot.isContainer) {
|
||||
(mkIf cfg.enable {
|
||||
systemd.tmpfiles.packages = [ cfg.package.out ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
systemd.packages = [ cfg.package ];
|
||||
|
||||
@ -24,6 +24,9 @@ with lib;
|
||||
# containers do not need to setup devices
|
||||
services.udev.enable = false;
|
||||
|
||||
# containers normally do not need to manage logical volumes
|
||||
services.lvm.enable = lib.mkDefault false;
|
||||
|
||||
# Shut up warnings about not having a boot loader.
|
||||
system.build.installBootLoader = lib.mkDefault "${pkgs.coreutils}/bin/true";
|
||||
|
||||
|
||||
@ -19,24 +19,15 @@ let
|
||||
in
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "picard";
|
||||
version = "2.8.3";
|
||||
version = "2.8.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "metabrainz";
|
||||
repo = pname;
|
||||
rev = "refs/tags/release-${version}";
|
||||
sha256 = "sha256-KUHciIlwaKXvyCCkAzdh1vpe9cunDizrMUl0SoCpxgY=";
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-ygZkj7hZNm7XyqDEI7l49d36ZgCTwFiAuYZjlF9d5+8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix for tests failing with newer mutagen, remove after >2.8.3
|
||||
# https://tickets.metabrainz.org/browse/PICARD-2583
|
||||
(fetchpatch {
|
||||
url = "https://github.com/metabrainz/picard/commit/76c2dff6b61140bbc7675c9e9f62a086b885e539.patch";
|
||||
hash = "sha256-V1/oq1tEcb1mtqbYAA9o7mJcw16vRO0IK3GGmJkwO1Q=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]
|
||||
++ lib.optionals (pyqt5.multimediaEnabled) [
|
||||
qt5.qtmultimedia.bin
|
||||
@ -71,6 +62,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://picard.musicbrainz.org/";
|
||||
changelog = "https://picard.musicbrainz.org/changelog/";
|
||||
description = "The official MusicBrainz tagger";
|
||||
maintainers = with maintainers; [ ehmry ];
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
@ -8,7 +9,7 @@
|
||||
, libxml2
|
||||
, libjack2
|
||||
, libsndfile
|
||||
, wxGTK30
|
||||
, wxGTK30-gtk3
|
||||
, libsigcxx
|
||||
, libsamplerate
|
||||
, rubberband
|
||||
@ -34,14 +35,19 @@ stdenv.mkDerivation rec {
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config which libtool ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
which
|
||||
libtool
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
liblo
|
||||
libxml2
|
||||
libjack2
|
||||
libsndfile
|
||||
wxGTK30
|
||||
wxGTK30-gtk3
|
||||
libsigcxx
|
||||
libsamplerate
|
||||
rubberband
|
||||
|
||||
@ -1,16 +1,29 @@
|
||||
{ stdenv, lib, fetchzip, wxGTK30, zlib, zstd }:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchzip
|
||||
, wxGTK32
|
||||
, zlib
|
||||
, zstd
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "urbackup-client";
|
||||
version = "2.4.11";
|
||||
version = "2.5.20";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz";
|
||||
sha256 = "0cciy9v1pxj9qaklpbhp2d5rdbkmfm74vhpqx6b4phww0f10wvzh";
|
||||
sha256 = "sha256-i1g3xUhspqQRfIUhy6STOWNuncK3tMFocJw652r1X9g=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-embedded-cryptopp" ];
|
||||
buildInputs = [ wxGTK30 zlib zstd ];
|
||||
buildInputs = [
|
||||
wxGTK32
|
||||
zlib
|
||||
zstd
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-embedded-cryptopp"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An easy to setup Open Source client/server backup system";
|
||||
|
||||
@ -63,7 +63,8 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
|
||||
|
||||
mkdir -p $out/{bin,$pname,share/pixmaps,libexec/${pname}}
|
||||
cp -a . $out/$pname
|
||||
ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png
|
||||
[[ -f $out/$pname/bin/${loName}.png ]] && ln -s $out/$pname/bin/${loName}.png $out/share/pixmaps/${pname}.png
|
||||
[[ -f $out/$pname/bin/${loName}.svg ]] && ln -s $out/$pname/bin/${loName}.svg $out/share/pixmaps/${pname}.svg
|
||||
mv bin/fsnotifier* $out/libexec/${pname}/.
|
||||
|
||||
jdk=${jdk.home}
|
||||
|
||||
@ -57,11 +57,11 @@
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
|
||||
"version": "2021.3.1",
|
||||
"sha256": "b7d41c4362e71f30adeaed9f0ec30afd5ac0e6eea9650ee4a19d70a5783db3e6",
|
||||
"url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1.tar.gz",
|
||||
"version-major-minor": "2021.3",
|
||||
"build_number": "213.7172.958"
|
||||
"version": "2022.2",
|
||||
"sha256": "aaee4d2bb9bc34d0b4bc62c7ef08139cc6144b433ba1675ef306e6d3d95e37a1",
|
||||
"url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2.tar.gz",
|
||||
"version-major-minor": "2022.2",
|
||||
"build_number": "222.3345.1295"
|
||||
},
|
||||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
@ -176,11 +176,11 @@
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
|
||||
"version": "2021.3.1",
|
||||
"sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd",
|
||||
"url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos.dmg",
|
||||
"version-major-minor": "2021.3",
|
||||
"build_number": "213.7172.958"
|
||||
"version": "2022.2",
|
||||
"sha256": "4e36c60d281596c220287ab2191165be37ef01c3c54ab5f5e4e535c8b81bc754",
|
||||
"url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos.dmg",
|
||||
"version-major-minor": "2022.2",
|
||||
"build_number": "222.3345.1295"
|
||||
},
|
||||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
@ -295,11 +295,11 @@
|
||||
"mps": {
|
||||
"update-channel": "MPS RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
|
||||
"version": "2021.3.1",
|
||||
"url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos-aarch64.dmg",
|
||||
"sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70",
|
||||
"version-major-minor": "2021.3",
|
||||
"build_number": "213.7172.958"
|
||||
"version": "2022.2",
|
||||
"url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos-aarch64.dmg",
|
||||
"sha256": "bdc83d9c7a3430cc2b0b0361a9e4eab82e951bfe87f0e4754106d09850947077",
|
||||
"version-major-minor": "2022.2",
|
||||
"build_number": "222.3345.1295"
|
||||
},
|
||||
"phpstorm": {
|
||||
"update-channel": "PhpStorm RELEASE",
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
, bluez
|
||||
, ffmpeg
|
||||
, libao
|
||||
, gtk2
|
||||
, gtk3
|
||||
, glib
|
||||
, libGLU
|
||||
, libGL
|
||||
@ -21,7 +21,7 @@
|
||||
, fetchFromGitHub
|
||||
, libusb1
|
||||
, libevdev
|
||||
, wxGTK30
|
||||
, wxGTK30-gtk3
|
||||
, soundtouch
|
||||
, miniupnpc
|
||||
, mbedtls
|
||||
@ -43,29 +43,33 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with soundtouch 2.1.2
|
||||
# Fix FTBFS with glibc 2.26
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch";
|
||||
name = "dolphin-emu-5.0-soundtouch-exception-fix.patch";
|
||||
sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw";
|
||||
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/02_glibc-2.26.patch";
|
||||
name = "02_glibc-2.26.patch";
|
||||
sha256 = "sha256-LBXT3rf5klwmX9YQXt4/iv06GghsWZprNhLGYlKiDqk=";
|
||||
})
|
||||
# Fix build with gcc 8
|
||||
# Fix FTBFS with GCC 8
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/9b7b4aeac1b60dcf28bdcafbed6bc498b2aeb0ad/debian/patches/03_gcc8.patch";
|
||||
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch";
|
||||
name = "03_gcc8.patch";
|
||||
sha256 = "1da95gb8c95kd5cjhdvg19cv2z863lj3va5gx3bqc7g8r36glqxr";
|
||||
sha256 = "sha256-uWP6zMjoHYbX6K+oPSQdBn2xWQpvNyhZabMkhtYrSbU=";
|
||||
})
|
||||
# Fix FTBFS with SoundTouch 2.1.2
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/05_soundtouch-2.1.2.patch";
|
||||
name = "05_soundtouch-2.1.2.patch";
|
||||
sha256 = "sha256-Y7CNM6GQC9GRhlOBLZlxkIpj1CFhIwA5L8lGXur/bwY=";
|
||||
})
|
||||
# Use GTK+3 wxWidgets backend
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/06_gtk3.patch";
|
||||
name = "06_gtk3.patch";
|
||||
sha256 = "sha256-pu5Q0+8kNwmpf2DoXCXHFqxF0EGTnFXJipkBz1Vh2cs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \
|
||||
--replace " CHAR_WIDTH " " CHARWIDTH "
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
|
||||
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
|
||||
"-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0"
|
||||
"-DENABLE_LTO=True"
|
||||
];
|
||||
|
||||
@ -80,7 +84,7 @@ stdenv.mkDerivation rec {
|
||||
libao
|
||||
libGLU
|
||||
libGL
|
||||
gtk2
|
||||
gtk3
|
||||
glib
|
||||
gettext
|
||||
libpthreadstubs
|
||||
@ -97,7 +101,7 @@ stdenv.mkDerivation rec {
|
||||
portaudio
|
||||
libusb1
|
||||
libpulseaudio
|
||||
wxGTK30
|
||||
wxGTK30-gtk3
|
||||
soundtouch
|
||||
miniupnpc
|
||||
mbedtls
|
||||
@ -117,6 +121,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ MP2E ashkitten ];
|
||||
# x86_32 is an unsupported platform.
|
||||
# Enable generic build if you really want a JIT-less binary.
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, cmake
|
||||
, curl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ffmpeg
|
||||
, fluidsynth
|
||||
, gettext
|
||||
@ -50,7 +49,7 @@ let
|
||||
mkLibretroCore =
|
||||
{ core
|
||||
, src ? (getCoreSrc core)
|
||||
, version ? "unstable-2022-10-18"
|
||||
, version ? "unstable-2022-11-21"
|
||||
, ...
|
||||
}@args:
|
||||
import ./mkLibretroCore.nix ({
|
||||
@ -796,11 +795,6 @@ in
|
||||
puae = mkLibretroCore {
|
||||
core = "puae";
|
||||
makefile = "Makefile";
|
||||
# https://github.com/libretro/libretro-uae/pull/529
|
||||
patches = fetchpatch {
|
||||
url = "https://github.com/libretro/libretro-uae/commit/90ba4c9bb940e566781c3590553270ad69cf212e.patch";
|
||||
sha256 = "sha256-9xkRravvyFZc0xsIj0OSm2ux5BqYogfQ1TDnH9l6jKw=";
|
||||
};
|
||||
meta = {
|
||||
description = "Amiga emulator based on WinUAE";
|
||||
license = lib.licenses.gpl2Only;
|
||||
|
||||
@ -45,12 +45,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "retroarch-bare";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "RetroArch";
|
||||
hash = "sha256-doLWNA8aTAllxx3zABtvZaegBQEPIi8276zbytPSdBU=";
|
||||
hash = "sha256-eEe0mM9gUWgEzoRH1Iuet20US9eXNtCVSBi2kX1njVw=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
"beetle-psx": {
|
||||
"owner": "libretro",
|
||||
"repo": "beetle-psx-libretro",
|
||||
"rev": "bd6b9ef3049fe3f70a18ee6f752a935ae83c2f2b",
|
||||
"sha256": "CXcLMOF6IXUrp14nyTQ5KK2LR+FyWcF0UcvHTxEVSo0="
|
||||
"rev": "798fab9d5bc82dde26442d9b4861d377d4689e31",
|
||||
"sha256": "wHCUSMdPbIudmNm4XXW/zH6TDz7x9DrMNV/L8H3aO/w="
|
||||
},
|
||||
"beetle-saturn": {
|
||||
"owner": "libretro",
|
||||
@ -129,8 +129,8 @@
|
||||
"dolphin": {
|
||||
"owner": "libretro",
|
||||
"repo": "dolphin",
|
||||
"rev": "9810e29a1f3633d32b6643b97a1147d83311d73a",
|
||||
"sha256": "iIaVSJSC3mD1k751vQvWI6x0C/HhfjEaMwfX53FpZv4="
|
||||
"rev": "a8188dbc4e63d6c0867ed2196f5125130955f012",
|
||||
"sha256": "gf9OjeDazDPDnQ9S2+hV4CNxPAkCCaEhJDZF97a1//U="
|
||||
},
|
||||
"dosbox": {
|
||||
"owner": "libretro",
|
||||
@ -141,8 +141,8 @@
|
||||
"eightyone": {
|
||||
"owner": "libretro",
|
||||
"repo": "81-libretro",
|
||||
"rev": "73f6cca62dabc84df946aea71cf457ce5ae5ea9d",
|
||||
"sha256": "oovIKMZXxtLc+zmbguagTVoMPngokdN3xTBnb/+KUjY="
|
||||
"rev": "340a51b250fb8fbf1a9e5d3ad3924044250064e0",
|
||||
"sha256": "Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA="
|
||||
},
|
||||
"fbalpha2012": {
|
||||
"owner": "libretro",
|
||||
@ -153,14 +153,14 @@
|
||||
"fbneo": {
|
||||
"owner": "libretro",
|
||||
"repo": "fbneo",
|
||||
"rev": "758f24740d81ff833c1868befd98ccd11909255f",
|
||||
"sha256": "VhfsvohRWICWqKWry0fgUS76kiXBsnjY9DytxEvulKA="
|
||||
"rev": "a12455af75e60765da134b83051700e0fbe3803a",
|
||||
"sha256": "ujO9KVn7o6xueeEr5GHfOy7NimwNIvYxgMM9xJvtjvo="
|
||||
},
|
||||
"fceumm": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-fceumm",
|
||||
"rev": "3d3cc53c0177e296af2427c29bbb31902b26f3b8",
|
||||
"sha256": "Z5LqP6IBq0H6uM0027PSkW6JLvVDA/4CrO6bI478Z1o="
|
||||
"rev": "8c3f690e61a1d65dfb25510426ae88eeae93e1ae",
|
||||
"sha256": "vzPrAEII8SWj3Ki2OaZb0/9gbQDz04rp2dXf2LE1sXg="
|
||||
},
|
||||
"flycast": {
|
||||
"owner": "libretro",
|
||||
@ -189,8 +189,8 @@
|
||||
"genesis-plus-gx": {
|
||||
"owner": "libretro",
|
||||
"repo": "Genesis-Plus-GX",
|
||||
"rev": "5cdb31854074de1662266a0a675866ea7b787b42",
|
||||
"sha256": "vMswSKM5aYlPZu5y4Z1L/+eaPBdQaLPPMKoC7B/xzqc="
|
||||
"rev": "3abf975785fe77267a399cc583ccf1469e081b86",
|
||||
"sha256": "QdiWKS7j80Sw0L+hf6efmQ40lQi/f95pFLQfoohoUKg="
|
||||
},
|
||||
"gpsp": {
|
||||
"owner": "libretro",
|
||||
@ -219,8 +219,8 @@
|
||||
"mame": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame",
|
||||
"rev": "0d935696dce53a13eaf0705f4a108ee348f3c613",
|
||||
"sha256": "HnJ3eHzTpR7Lsi1ATn3B314y0KNKJ0+qNGcDbFvmZEA="
|
||||
"rev": "57622367cb780013690d6ef23b2066b500f6ce92",
|
||||
"sha256": "0iR1JGAhwYXXLnv8BDW1bsxfFywEI82aov2+MHw5w6Q="
|
||||
},
|
||||
"mame2000": {
|
||||
"owner": "libretro",
|
||||
@ -231,14 +231,14 @@
|
||||
"mame2003": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-libretro",
|
||||
"rev": "cb0c89304b2cd584cda7105c6be4e69fa304f0e0",
|
||||
"sha256": "ob/aUh5NZCfQvpA+nEs2QhVXeNBBVZesX/xQfatY9wU="
|
||||
"rev": "dbdda8e7189d63061ac42f502c0cd2dc7f1f8651",
|
||||
"sha256": "XED/gunYOc+NnQ8YORw/ALP2eCTyvRdIxPiFpNf5nuA="
|
||||
},
|
||||
"mame2003-plus": {
|
||||
"owner": "libretro",
|
||||
"repo": "mame2003-plus-libretro",
|
||||
"rev": "d88d5c118e8d7075ec0a4e6deebb4cd3f18a8dd1",
|
||||
"sha256": "9offucQMCpMqo4StYscS6kivXCYHy4Sn+Cs/3MoNwsw="
|
||||
"rev": "5dd4a30500edc0b00c712750093aa287c9bb4ce2",
|
||||
"sha256": "Nvm5U6rpsDZdUJONtvZ6YmztuupLaXz2QT0SBJtzO/4="
|
||||
},
|
||||
"mame2010": {
|
||||
"owner": "libretro",
|
||||
@ -285,14 +285,14 @@
|
||||
"mgba": {
|
||||
"owner": "libretro",
|
||||
"repo": "mgba",
|
||||
"rev": "199a03e719436018779fe9299706c597fb2e9231",
|
||||
"sha256": "3Q3MBzezCvl1Er45AeUM/QI0a+JiGn/PfYpqMaaiuds="
|
||||
"rev": "ec5ecb26deba8d7ac830fc66ade9fac0eeaeb4ae",
|
||||
"sha256": "kDDs+M7TPu6UhFnj9+XGI9whQFQ5/+7fSb0YUN7oMsg="
|
||||
},
|
||||
"mupen64plus": {
|
||||
"owner": "libretro",
|
||||
"repo": "mupen64plus-libretro-nx",
|
||||
"rev": "c10546e333d57eb2e5a6ccef1e84cb6f9274c526",
|
||||
"sha256": "dbS32slJBfz8DHeIQy20lAYw0+ig0LRgIaGfqW082xs="
|
||||
"rev": "1b67122ff6a923c93a56ff94273e3768a6da5dff",
|
||||
"sha256": "qORxhy7hXVdGUkQumOmGVXnF1kW0BShMNBVlaRu3a1w="
|
||||
},
|
||||
"neocd": {
|
||||
"owner": "libretro",
|
||||
@ -303,8 +303,8 @@
|
||||
"nestopia": {
|
||||
"owner": "libretro",
|
||||
"repo": "nestopia",
|
||||
"rev": "a9ee6ca84f04990e209880fe47144e62b14253db",
|
||||
"sha256": "q3pD2Cm/a62x3xW8JymU9w82zHlT0BoPlaSfzjZzh/c="
|
||||
"rev": "5c360e55d5437ecd3520568ee44cf1af63d4696a",
|
||||
"sha256": "+1QQc4gVZ5ZHt/I0bjRkW+kbPaeGUNrjbrzUoVz4drM="
|
||||
},
|
||||
"np2kai": {
|
||||
"owner": "AZO234",
|
||||
@ -316,8 +316,8 @@
|
||||
"nxengine": {
|
||||
"owner": "libretro",
|
||||
"repo": "nxengine-libretro",
|
||||
"rev": "aa32afb8df8461920037bdbbddbff00bf465c6de",
|
||||
"sha256": "Ic5YsNLoEZJ/vkjthwypwLN3ntB/5EX8bU92V80S7R4="
|
||||
"rev": "e271c6262d73f07e5d92d285503f1c049801c51a",
|
||||
"sha256": "PfzHV6/nGUdbnfZ8+aHuoIQhvKcxdbuKnjIMWIIFt7Q="
|
||||
},
|
||||
"o2em": {
|
||||
"owner": "libretro",
|
||||
@ -346,8 +346,8 @@
|
||||
"pcsx_rearmed": {
|
||||
"owner": "libretro",
|
||||
"repo": "pcsx_rearmed",
|
||||
"rev": "5ced3945423cda0010597b27b7da6bce77b12baa",
|
||||
"sha256": "8O2XyEr40HqQf8mHxmvB6/UT837HZw8SrKBy/JH66p4="
|
||||
"rev": "a4e249a1373cf6269e1e4e0d60105e72210e67d3",
|
||||
"sha256": "NOz2NQonVWEhEhAgSFHSWv6bmuTPcw0R9ihISlGwkb0="
|
||||
},
|
||||
"picodrive": {
|
||||
"owner": "libretro",
|
||||
@ -359,15 +359,15 @@
|
||||
"play": {
|
||||
"owner": "jpd002",
|
||||
"repo": "Play-",
|
||||
"rev": "1126c39cd8ebf56af347c475139d4db97fc7cc19",
|
||||
"sha256": "H/cYFWl8rA/ZdoygEjr7h1y6Z0n29Z+OCzzVMvIuVyo=",
|
||||
"rev": "ad3b855c6d8cc62c85e2a5d2f659159fdfaa8d80",
|
||||
"sha256": "+uTf/xv2JHuNGx0bxFNXf0akRzonzRMT7gSvT2n12+o=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"ppsspp": {
|
||||
"owner": "hrydgard",
|
||||
"repo": "ppsspp",
|
||||
"rev": "4af4b0dddc638b00205d9943f17a2806e438fe83",
|
||||
"sha256": "5n+Mg2ZDTJd5fk1OZAiYnCT13G3LAWahXPA+MwaOF08=",
|
||||
"rev": "e654f6937a02f4a2ac8cce3574ab4f2db99f77d4",
|
||||
"sha256": "LTqRA3KMV/VuQH0eTWjpOqy0U944c4ofPNEsexf93Kc=",
|
||||
"fetchSubmodules": true
|
||||
},
|
||||
"prboom": {
|
||||
@ -385,8 +385,8 @@
|
||||
"puae": {
|
||||
"owner": "libretro",
|
||||
"repo": "libretro-uae",
|
||||
"rev": "4d8ebafe3f91c4998e8d73940e9558d863ecf93b",
|
||||
"sha256": "dzfZFm7L+Qe3WwSYiMLp3cQm8zk0pWVB68nBe/H1Hvc="
|
||||
"rev": "d9a8dfbde7f6967fea3cffe09cd87e1d79a1a3fd",
|
||||
"sha256": "uMn9ejknjwGmbc0JOu/xl30z3ff7vpxtA3qr2sv0glI="
|
||||
},
|
||||
"quicknes": {
|
||||
"owner": "libretro",
|
||||
@ -415,8 +415,8 @@
|
||||
"snes9x": {
|
||||
"owner": "snes9xgit",
|
||||
"repo": "snes9x",
|
||||
"rev": "28be1a196d2c59ed4b6489d487187569a7370aff",
|
||||
"sha256": "FW4ynSS+R1ygQaCS0UrWGktfHGtcy0P/Mp/BXKfmII0="
|
||||
"rev": "3c4982edddfdba482204ed48cf0b1d41ccae5493",
|
||||
"sha256": "d4luyBSU/4PdsDd2jLwWSyckBPAqXMJ3C1sNmLO+E6U="
|
||||
},
|
||||
"snes9x2002": {
|
||||
"owner": "libretro",
|
||||
@ -439,8 +439,8 @@
|
||||
"stella": {
|
||||
"owner": "stella-emu",
|
||||
"repo": "stella",
|
||||
"rev": "7193c405327e0f2156d24d53836162f4b44af079",
|
||||
"sha256": "A9icQON+0WrknjGp/0wiFNSWs2ot2s0X5lucCdk4O/s="
|
||||
"rev": "fa49e034101a22344c7bd01648d514b6cc61ac7f",
|
||||
"sha256": "Svv+j7/9PvZ6djk2kfpbr9iUC8xqX8B4Plnf43Hj62A="
|
||||
},
|
||||
"stella2014": {
|
||||
"owner": "libretro",
|
||||
@ -451,8 +451,8 @@
|
||||
"swanstation": {
|
||||
"owner": "libretro",
|
||||
"repo": "swanstation",
|
||||
"rev": "ff0b451a573885a5b3a4f291f7b22f3ffc667a17",
|
||||
"sha256": "jz8tkvgonc4icRt12tt1BBCCiwec0ucix7Hp7PNPl8E="
|
||||
"rev": "27a224fc9e86e0f061504878d1c0cbf3fd6891af",
|
||||
"sha256": "5kW9/4gMfyvo3ExlJVivx8LhW5as3Mq5fhlNrIFDUVM="
|
||||
},
|
||||
"tgbdual": {
|
||||
"owner": "libretro",
|
||||
@ -494,8 +494,8 @@
|
||||
"virtualjaguar": {
|
||||
"owner": "libretro",
|
||||
"repo": "virtualjaguar-libretro",
|
||||
"rev": "263c979be4ca757c43fb525bd6f0887998e57041",
|
||||
"sha256": "6Q6Y0IFUWS9ZPhnAK3EUo4hMGPdBn8eNEYCK/zLgAKU="
|
||||
"rev": "2cc06899b839639397b8b30384a191424b6f529d",
|
||||
"sha256": "7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ="
|
||||
},
|
||||
"yabause": {
|
||||
"owner": "libretro",
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "libretro-core-info";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "libretro-core-info";
|
||||
hash = "sha256-ByATDM0V40UJxigqVLyTWkHY5tiCC2dvZebksl8GsUI=";
|
||||
hash = "sha256-rTq2h+IGJduBkP4qCACmm3T2PvbZ0mOmwD1jLkJ2j/Q=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
|
||||
@ -1,26 +1,40 @@
|
||||
{ lib, stdenv, fetchFromGitHub, wxGTK30, boost, firebird }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, wxGTK32
|
||||
, boost
|
||||
, firebird
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.3.1";
|
||||
version = "0.9.3.12";
|
||||
pname = "flamerobin";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mariuz";
|
||||
repo = "flamerobin";
|
||||
rev = version;
|
||||
sha256 = "1wwcsca01hpgi9z5flvbdhs9zv7jvahnbn97j6ymy0hdyb8lv6si";
|
||||
sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# rely on compiler command line for __int128 and std::decimal::decimal128
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch";
|
||||
sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM=";
|
||||
})
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ wxGTK30 boost firebird ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
preBuild = ''
|
||||
sed -i 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -nostartfiles/' Makefile
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--disable-debug"
|
||||
buildInputs = [
|
||||
wxGTK32
|
||||
boost
|
||||
firebird
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -55,8 +55,6 @@ in
|
||||
|
||||
substituteInPlace Makefile \
|
||||
--replace 'unknown' 'v${version}'
|
||||
|
||||
export CFLAGS="-march=native"
|
||||
'';
|
||||
|
||||
makeFlags = optional (!enableGlfw) "DISABLE_GLFW=1";
|
||||
|
||||
@ -1,8 +1,18 @@
|
||||
{ lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch
|
||||
, cmake, boost
|
||||
, portmidi, sqlite
|
||||
, freetype, libpng, pngpp, zlib
|
||||
, wxGTK30, wxsqlite3
|
||||
{ lib
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, boost
|
||||
, portmidi
|
||||
, sqlite
|
||||
, freetype
|
||||
, libpng
|
||||
, pngpp
|
||||
, zlib
|
||||
, wxGTK30-gtk3
|
||||
, wxsqlite3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -25,14 +35,28 @@ stdenv.mkDerivation rec {
|
||||
url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch";
|
||||
sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lenmus/lenmus/commit/37ee8ac9c8faff65a14e8f7ed2bc22e6dc48d91f.patch";
|
||||
includes = [ "src/app/lenmus_midi_wizard.cpp" ];
|
||||
sha256 = "sha256-nlT6ZbSCIXUk2Ufv/SDn2A0Rt+s/7m+7l9HOoQmaIhc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
boost
|
||||
portmidi sqlite
|
||||
freetype libpng pngpp zlib
|
||||
wxGTK30 wxsqlite3
|
||||
portmidi
|
||||
sqlite
|
||||
freetype
|
||||
libpng
|
||||
pngpp
|
||||
zlib
|
||||
wxGTK30-gtk3
|
||||
wxsqlite3
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
@ -46,6 +70,5 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ ramkromberg ];
|
||||
platforms = with platforms; linux;
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ in buildFHSUserEnv {
|
||||
# DGen // TODO: libarchive is broken
|
||||
|
||||
# Dolphin
|
||||
bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm
|
||||
bluez ffmpeg gettext portaudio wxGTK30-gtk3 miniupnpc mbedtls lzo sfml gsm
|
||||
wavpack orc nettle gmp pcre vulkan-loader
|
||||
|
||||
# DOSBox
|
||||
|
||||
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [ opencv4 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/include/aruco
|
||||
|
||||
@ -42,7 +42,7 @@ in
|
||||
nativeBuildInputs = [cmake pkg-config ninja copyDesktopItems];
|
||||
buildInputs = [qtbase qttools opencv4 procps eigen libXdmcp libevdev aruco];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -march=native -O3";
|
||||
NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
|
||||
dontWrapQtApps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -1,8 +1,25 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, pkg-config, zip, gettext, perl
|
||||
, wxGTK30, libXext, libXi, libXt, libXtst, xercesc
|
||||
, qrencode, libuuid, libyubikey, yubikey-personalization
|
||||
, curl, openssl, file, gitUpdater
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, zip
|
||||
, gettext
|
||||
, perl
|
||||
, wxGTK30-gtk3
|
||||
, libXext
|
||||
, libXi
|
||||
, libXt
|
||||
, libXtst
|
||||
, xercesc
|
||||
, qrencode
|
||||
, libuuid
|
||||
, libyubikey
|
||||
, yubikey-personalization
|
||||
, curl
|
||||
, openssl
|
||||
, file
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -17,12 +34,26 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake gettext perl pkg-config zip
|
||||
cmake
|
||||
gettext
|
||||
perl
|
||||
pkg-config
|
||||
zip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libXext libXi libXt libXtst wxGTK30
|
||||
curl qrencode libuuid openssl xercesc
|
||||
libyubikey yubikey-personalization
|
||||
libXext
|
||||
libXi
|
||||
libXt
|
||||
libXtst
|
||||
wxGTK30-gtk3
|
||||
curl
|
||||
qrencode
|
||||
libuuid
|
||||
openssl
|
||||
xercesc
|
||||
libyubikey
|
||||
yubikey-personalization
|
||||
file
|
||||
];
|
||||
|
||||
|
||||
@ -1,4 +1,10 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, wxGTK32
|
||||
, chmlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xchm";
|
||||
@ -11,13 +17,19 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ wxGTK30 chmlib ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-wx-prefix=${wxGTK30}" ];
|
||||
buildInputs = [
|
||||
wxGTK32
|
||||
chmlib
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-wx-prefix=${wxGTK32}" ];
|
||||
|
||||
preConfigure = ''
|
||||
export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0"
|
||||
export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk3u_aui-3.2"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, mkDerivation
|
||||
, qmake
|
||||
, qtbase
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
, qtmultimedia
|
||||
, python3
|
||||
, pyotherside
|
||||
, pcsclite
|
||||
, yubikey-personalization
|
||||
, yubikey-manager
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "yubioath-desktop";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz";
|
||||
hash = "sha256-Lm9F4eaG9T5brAV7XDAkoj0WClmXEYIhuUzh2rk0oc0=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects qtmultimedia python3 ];
|
||||
|
||||
nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace QZXing/QZXing-components.pri \
|
||||
--replace 'target.path = $$PREFIX/lib' 'target.path = $$PREFIX/bin'
|
||||
'';
|
||||
|
||||
pythonPath = [ yubikey-manager ];
|
||||
|
||||
# Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary
|
||||
# support that the yubicommon library uses to load libykpers
|
||||
|
||||
postInstall = ''
|
||||
buildPythonPath "$out $pythonPath"
|
||||
wrapProgram $out/bin/yubioath-desktop \
|
||||
--prefix PYTHONPATH : "$program_PYTHONPATH" \
|
||||
--prefix QML2_IMPORT_PATH : "${pyotherside}/${qtbase.qtQmlPrefix}" \
|
||||
--prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so" \
|
||||
--prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib:${yubikey-personalization}/lib"
|
||||
|
||||
mkdir -p $out/share/applications
|
||||
cp resources/com.yubico.yubioath.desktop \
|
||||
$out/share/applications/com.yubico.yubioath.desktop
|
||||
mkdir -p $out/share/yubioath/icons
|
||||
cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons
|
||||
substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \
|
||||
--replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \
|
||||
--replace 'Icon=com.yubico.yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Yubico Authenticator";
|
||||
longDescription = ''
|
||||
Application for generating Open Authentication (OATH) time-based TOTP and
|
||||
event-based HOTP one-time password codes, with the help of a YubiKey that
|
||||
protects the shared secrets.
|
||||
'';
|
||||
|
||||
homepage = "https://developers.yubico.com/yubioath-desktop";
|
||||
downloadPage = "https://developers.yubico.com/yubioath-desktop/Releases/";
|
||||
changelog = "https://developers.yubico.com/yubioath-desktop/Release_Notes.html";
|
||||
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with maintainers; [ mic92 risson ];
|
||||
};
|
||||
}
|
||||
@ -87,7 +87,7 @@ let
|
||||
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
|
||||
|
||||
# Upstream source
|
||||
version = "11.5.7";
|
||||
version = "11.5.8";
|
||||
|
||||
lang = "en-US";
|
||||
|
||||
@ -99,7 +99,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "sha256-K50T9Fe6tMuP1J5gfwK9f/25ZeakQ9vsJi4IOPa6fMk=";
|
||||
sha256 = "sha256-/KK9oTijk5dEziAwp5966NaM2V4k1mtBjTJq88Ct7N0=";
|
||||
};
|
||||
|
||||
i686-linux = fetchurl {
|
||||
@ -109,7 +109,7 @@ let
|
||||
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
|
||||
];
|
||||
sha256 = "sha256-tbL/iTI3vR0gdMcLwOoWlfIDZNefIKA2hfvWKNNM9vE=";
|
||||
sha256 = "sha256-TGdJ5yIeo0YQ4XSsb9lv3vuW6qEjhFe7KBmkjYO6fAc=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20221025";
|
||||
version = "20221122";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-icUyuohJ+nUrmFx/q5+hvjY1My25TwIqh6W6hq1pG4k=";
|
||||
sha256 = "sha256-Bq1m/p1RFfyOmyEdIuHcYruwZ8ol2Bl0pmd/yft6iXA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -17,15 +17,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ openssl sqlite ];
|
||||
|
||||
# Manually define `CXXFLAGS` and `LDFLAGS` on Darwin since the build scripts includes flags
|
||||
# that don't work on Darwin.
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
export CXXFLAGS="-Wall -Wextra -Wshadow -Wold-style-cast -Woverloaded-virtual -pedantic -O3"
|
||||
export LDFLAGS="-Wall -Wextra -O3"
|
||||
'' + ''
|
||||
./BUILDSCRIPT_MULTIPROC.bash44
|
||||
./BUILDSCRIPT_MULTIPROC.bash44${lib.optionalString stdenv.isDarwin " --config nixpkgs-darwin"}
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
|
||||
@ -1,36 +1,27 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
_name = "muscle";
|
||||
name = "${_name}-${version}";
|
||||
version = "3.8.31";
|
||||
name = "muscle";
|
||||
version = "5.1.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.drive5.com/muscle/downloads${version}/${_name}${version}_src.tar.gz";
|
||||
sha256 = "1b89z0x7h098g99g00nqadgjnb2r5wpi9s11b7ddffqkh9m9dia3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rcedgar";
|
||||
repo = "${name}";
|
||||
rev = "${version}";
|
||||
hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./muscle-3.8.31-no-static.patch
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
cd ./src/
|
||||
patchShebangs mk
|
||||
'';
|
||||
sourceRoot = "source/src";
|
||||
|
||||
installPhase = ''
|
||||
install -vD muscle $out/bin/muscle
|
||||
install -m755 -D Linux/muscle $out/bin/muscle
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = (stdenv.isLinux && stdenv.isAarch64);
|
||||
description = "A multiple sequence alignment method with reduced time and space complexity";
|
||||
license = licenses.publicDomain;
|
||||
description = "Multiple sequence alignment with top benchmark scores scalable to thousands of sequences";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://www.drive5.com/muscle/";
|
||||
maintainers = [ maintainers.unode ];
|
||||
# NOTE: Supposed to be compatible with darwin/intel & PPC but currently fails.
|
||||
# Anyone with access to these platforms is welcome to give it a try
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with maintainers; [ unode thyol ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
--- a/src/mk 2010-05-02 01:15:42.000000000 +0200
|
||||
+++ b/src/mk 2018-01-27 17:07:23.539092748 +0100
|
||||
@@ -5,14 +5,14 @@
|
||||
rm -f *.o muscle.make.stdout.txt muscle.make.stderr.txt
|
||||
for CPPName in $CPPNames
|
||||
do
|
||||
- echo $CPPName >> /dev/tty
|
||||
+ echo $CPPName
|
||||
g++ $ENV_GCC_OPTS -c -O3 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -DNDEBUG=1 $CPPName.cpp -o $CPPName.o >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
|
||||
done
|
||||
|
||||
LINK_OPTS=
|
||||
-if [ `uname -s` == Linux ] ; then
|
||||
- LINK_OPTS=-static
|
||||
-fi
|
||||
+#if [ `uname -s` == Linux ] ; then
|
||||
+# LINK_OPTS=-static
|
||||
+#fi
|
||||
g++ $LINK_OPTS $ENV_LINK_OPTS -g -o muscle $ObjNames >> muscle.make.stdout.txt 2>> muscle.make.stderr.txt
|
||||
tail muscle.make.stderr.txt
|
||||
|
||||
26
pkgs/applications/science/biology/veryfasttree/default.nix
Normal file
26
pkgs/applications/science/biology/veryfasttree/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "veryfasttree";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "citiususc";
|
||||
repo = "${name}";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
installPhase = ''
|
||||
install -m755 -D VeryFastTree $out/bin/VeryFastTree
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Speeding up the estimation of phylogenetic trees for large alignments through parallelization and vectorization strategies";
|
||||
license = licenses.gpl3Plus;
|
||||
homepage = "https://github.com/citiususc/veryfasttree";
|
||||
maintainers = with maintainers; [ thyol ];
|
||||
};
|
||||
}
|
||||
@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "giac${lib.optionalString enableGUI "-with-xcas"}";
|
||||
version = "1.9.0-5"; # TODO try to remove preCheck phase on upgrade
|
||||
version = "1.9.0-29"; # TODO try to remove preCheck phase on upgrade
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz";
|
||||
sha256 = "sha256-EP8wRi8QZPrr1lfKN6da87s1FCy8AuDYbzcvsJCWyLE=";
|
||||
sha256 = "sha256-9jUVcsrV8jMfqrmnymZ4vIaWlabF9ppCuq7VDlZ5Cw4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -22,13 +22,28 @@ stdenv.mkDerivation rec {
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0";
|
||||
sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k=";
|
||||
})
|
||||
|
||||
# giac calls scanf/printf with non-constant first arguments, which
|
||||
# the compiler rightfully warns about (with an error nowadays).
|
||||
(fetchpatch {
|
||||
name = "fix-string-compiler-error.patch";
|
||||
url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/fix-string-compiler-error.patch";
|
||||
sha256 = "sha256-K4KAJY1F9Y4DTZFmVEOCXTnxBmHo4//3A10UR3Wlliw=";
|
||||
})
|
||||
|
||||
# increase pari stack size for test chk_fhan4
|
||||
(fetchpatch {
|
||||
name = "increase-pari-stack-size.patch";
|
||||
url = "https://salsa.debian.org/science-team/giac/-/raw/08cb807ef41f5216b712928886ebf74f69d5ddf6/debian/patches/increase-pari-size.patch";
|
||||
sha256 = "sha256-764P0IJ7ndURap7hotOmYJK0wAhYdqMbQNOnhJxVNt0=";
|
||||
})
|
||||
] ++ lib.optionals (!enableGUI) [
|
||||
# when enableGui is false, giac is compiled without fltk. That
|
||||
# means some outputs differ in the make check. Patch around this:
|
||||
(fetchpatch {
|
||||
name = "nofltk-check.patch";
|
||||
url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
|
||||
sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw";
|
||||
sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY=";
|
||||
})
|
||||
];
|
||||
|
||||
@ -85,7 +100,11 @@ stdenv.mkDerivation rec {
|
||||
"--enable-ao" "--enable-ecm" "--enable-glpk"
|
||||
] ++ lib.optionals enableGUI [
|
||||
"--enable-gui" "--with-x"
|
||||
] ++ lib.optional (!enableMicroPy) "--disable-micropy";
|
||||
] ++ lib.optionals (!enableGUI) [
|
||||
"--disable-fltk"
|
||||
] ++ lib.optionals (!enableMicroPy) [
|
||||
"--disable-micropy"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# example Makefiles contain the full path to some commands
|
||||
|
||||
@ -1,6 +1,28 @@
|
||||
{ fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl,
|
||||
libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil,
|
||||
sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
|
||||
{ fetchFromGitHub
|
||||
, lib
|
||||
, stdenv
|
||||
, autoconf
|
||||
, automake
|
||||
, pkg-config
|
||||
, m4
|
||||
, curl
|
||||
, libGLU
|
||||
, libGL
|
||||
, libXmu
|
||||
, libXi
|
||||
, freeglut
|
||||
, libjpeg
|
||||
, libtool
|
||||
, wxGTK32
|
||||
, xcbutil
|
||||
, sqlite
|
||||
, gtk3
|
||||
, patchelf
|
||||
, libXScrnSaver
|
||||
, libnotify
|
||||
, libX11
|
||||
, libxcb
|
||||
}:
|
||||
|
||||
let
|
||||
majorVersion = "7.20";
|
||||
@ -22,8 +44,22 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver
|
||||
libnotify patchelf libX11 libxcb xcbutil
|
||||
curl
|
||||
libGLU
|
||||
libGL
|
||||
libXmu
|
||||
libXi
|
||||
freeglut
|
||||
libjpeg
|
||||
wxGTK32
|
||||
sqlite
|
||||
gtk3
|
||||
libXScrnSaver
|
||||
libnotify
|
||||
patchelf
|
||||
libX11
|
||||
libxcb
|
||||
xcbutil
|
||||
];
|
||||
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
@ -45,11 +81,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Free software for distributed and grid computing";
|
||||
homepage = "https://boinc.berkeley.edu/";
|
||||
license = licenses.lgpl2Plus;
|
||||
platforms = platforms.linux; # arbitrary choice
|
||||
# checking for gcc options needed to detect all undeclared functions... cannot detect
|
||||
# configure: error: in `/build/boinc-7.18.1-src':
|
||||
# configure: error: cannot make gcc report undeclared builtins
|
||||
broken = stdenv.isAarch64;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,17 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2
|
||||
, xylib, readline, gnuplot, swig3 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, wxGTK32
|
||||
, boost
|
||||
, lua
|
||||
, zlib
|
||||
, bzip2
|
||||
, xylib
|
||||
, readline
|
||||
, gnuplot
|
||||
, swig3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fityk";
|
||||
@ -13,8 +25,17 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline
|
||||
gnuplot swig3 ];
|
||||
buildInputs = [
|
||||
wxGTK32
|
||||
boost
|
||||
lua
|
||||
zlib
|
||||
bzip2
|
||||
xylib
|
||||
readline
|
||||
gnuplot
|
||||
swig3
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-std=c++11"
|
||||
|
||||
@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
|
||||
for pythonBin in git-cinnabar git-remote-hg; do
|
||||
makeWrapper $out/libexec/$pythonBin $out/bin/$pythonBin \
|
||||
--prefix PATH : ${lib.getBin python3}/bin \
|
||||
--prefix GIT_CINNABAR_EXPERIMENTS , python3 \
|
||||
--set PYTHONPATH ${mercurial}/${python3.sitePackages}
|
||||
done
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ index ebdc552..3e37573 100644
|
||||
# Linux
|
||||
linux-g++*{
|
||||
- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99
|
||||
+ QMAKE_CFLAGS += -O3 -fopenmp -march=native -std=c99
|
||||
+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99
|
||||
QMAKE_CXXFLAGS += -fopenmp
|
||||
LIBS += -lgomp
|
||||
}
|
||||
|
||||
@ -90,7 +90,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
maintainers = with maintainers; [ wozeparrot ];
|
||||
inherit (wayland.meta) platforms;
|
||||
mainProgram = "Hyprland";
|
||||
# ofborg failure: g++ does not recognize '-std=c++23'
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
})
|
||||
|
||||
@ -59,7 +59,5 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ wozeparrot ];
|
||||
inherit (wayland.meta) platforms;
|
||||
# ofborg failure: g++ does not recognize '-std=c++23'
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
})
|
||||
|
||||
38
pkgs/development/libraries/asmjit/default.nix
Normal file
38
pkgs/development/libraries/asmjit/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, lib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "asmjit";
|
||||
version = "unstable-2022-11-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asmjit";
|
||||
repo = "asmjit";
|
||||
rev = "0c03ed2f7497441ac0de232bda2e6b8cc041b2dc";
|
||||
hash = "sha256-CfTtdgb+ZCLHwCRa+t2O4CG9rhHgqPLcfHDqLBvI9Tg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Machine code generation for C++";
|
||||
longDescription = ''
|
||||
AsmJit is a lightweight library for machine code generation written in
|
||||
C++ language. It can generate machine code for X86, X86_64, and AArch64
|
||||
architectures and supports baseline instructions and all recent
|
||||
extensions.
|
||||
'';
|
||||
homepage = "https://asmjit.com/";
|
||||
license = licenses.zlib;
|
||||
maintainers = with maintainers; [ nikstur ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, boost
|
||||
, zlib
|
||||
, bzip2
|
||||
, wxGTK32
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xylib";
|
||||
@ -9,7 +16,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1iqfrfrk78mki5csxysw86zm35ag71w0jvim0f12nwq1z8rwnhdn";
|
||||
};
|
||||
|
||||
buildInputs = [ boost zlib bzip2 wxGTK30 ];
|
||||
buildInputs = [
|
||||
boost
|
||||
zlib
|
||||
bzip2
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods";
|
||||
|
||||
@ -1,26 +1,24 @@
|
||||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, js_of_ocaml
|
||||
, jsooSupport ? true
|
||||
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.8.6";
|
||||
pname = "ocaml${ocaml.version}-ptime";
|
||||
lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
|
||||
"ptime is not available for OCaml ${ocaml.version}"
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.0";
|
||||
pname = "ocaml${ocaml.version}-ptime";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://erratique.ch/software/ptime/releases/ptime-${version}.tbz";
|
||||
sha256 = "sha256-gy/fUsfUHUZx1A/2sQMQIFMHl1V+QO3zHAsEnZT/lkI=";
|
||||
sha256 = "sha256-RByDjAFiyDdR8G663/MxabuSHTTuwVn7urtw7Z3iEQs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
|
||||
buildInputs = [ topkg ] ++ lib.optional jsooSupport js_of_ocaml;
|
||||
buildInputs = [ topkg ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
buildPhase = "${topkg.run} build --with-js_of_ocaml ${lib.boolToString jsooSupport}";
|
||||
|
||||
inherit (topkg) installPhase;
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = {
|
||||
homepage = "https://erratique.ch/software/ptime";
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safety";
|
||||
version = "2.3.1";
|
||||
version = "2.3.2";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-bm/LfU6DIQmM8on1m2UFHK/TRn8InG5XyfiUrjLCO3E=";
|
||||
hash = "sha256-ftjXH1unWQ0cmr+iLHKmTeOJri4HxnMrHJCVWhaMVb8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,28 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "esbuild";
|
||||
version = "0.13.6";
|
||||
version = "0.14.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netlify";
|
||||
repo = "esbuild";
|
||||
rev = "v${version}";
|
||||
sha256 = "0asjmqfzdrpfx2hd5hkac1swp52qknyqavsm59j8xr4c1ixhc6n9";
|
||||
rev = "5faa7ad54c99a953d05c06819298d2b6f8c82d80";
|
||||
sha256 = "pYiwGjgFMclPYTW0Qml7Pr/knT1gywUAGANra5aojYM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
|
||||
|
||||
patches = [
|
||||
# Both upstream patches update the same dependency "x/sys". It's required for darwin compatibility.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/evanw/esbuild/commit/2567e099fcc6959e630f100b2c737ca80e88ba82.patch";
|
||||
hash = "sha256-KdX/Ru9TBX0mSDaS1ijxgzDI+2AoCvt6Wilhpca3VC0=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/evanw/esbuild/commit/fd13718c6195afb9e63682476a774fa6d4483be0.patch";
|
||||
hash = "sha256-va/bXRBQf9qgE9LZXcKKAa0ZpMt/QG7BFClJ8bPWG1Y=";
|
||||
})
|
||||
];
|
||||
vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs=";
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
|
||||
@ -5,18 +5,22 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opcr-policy";
|
||||
version = "0.1.42";
|
||||
version = "0.1.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opcr-io";
|
||||
repo = "policy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-taC/VZBalJMFi8kVw7R03ibmHTwbKTxj3mcYbXms26M=";
|
||||
sha256 = "sha256-6j3PEdSI8pLyTaYVUGmnPXV8P3arr3BukAI8R9eikCI=";
|
||||
};
|
||||
vendorSha256 = "sha256-r2eKRJC8/fDY38u924ViLCf7kT54Tc+zIBD2YV9Qn6c=";
|
||||
vendorSha256 = "sha256-wPtChLsIWX1YckA9p6YMxGMvqGqO0ohXYsOdkuCHbd4=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ];
|
||||
|
||||
subPackages = [ "cmd/policy" ];
|
||||
# disable go workspaces
|
||||
GOWORK = "off";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.43";
|
||||
version = "0.9.44";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
sha256 = "sha256-7Ujm5xqgyw4/P/XBZKh9yE9sWz9n+WmZbGdmif9oK+w=";
|
||||
sha256 = "sha256-hEBRwezymduUlPZTAHAmK5Xkc/6nGr/JDL5TDWUiZO0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-S46W+6+FyjI8BrdedDCzHHK+j3EyofQ9u8Ut1yr1/TI=";
|
||||
cargoSha256 = "sha256-i7XYDy9NVOszanCGDaoPkc6z5DV8vm6TsekqBkV5eRA=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
# This file has been generated by node2nix 1.9.0. Do not edit!
|
||||
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
|
||||
@ -1,12 +1,15 @@
|
||||
{ callPackage, fetchFromGitHub, lib, pkgs }:
|
||||
let
|
||||
nodePackages = import ./composition.nix { inherit pkgs; };
|
||||
sourceInfo = (lib.importJSON ./netlify-cli.json);
|
||||
in
|
||||
nodePackages.package.override {
|
||||
preRebuild = ''
|
||||
export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild"
|
||||
'';
|
||||
src = fetchFromGitHub (lib.importJSON ./netlify-cli.json);
|
||||
src = fetchFromGitHub {
|
||||
inherit (sourceInfo) owner repo rev sha256;
|
||||
};
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
passthru.tests.test = callPackage ./test.nix { };
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
set -eu -o pipefail
|
||||
cd "$( dirname "${BASH_SOURCE[0]}" )"
|
||||
rm -f ./node-env.nix
|
||||
src="$(nix-build --expr '(import ../../../.. {}).fetchFromGitHub (lib.importJSON ./netlify-cli.json)')"
|
||||
src="$(nix-build --expr 'let pkgs = import ../../../.. {}; meta = (pkgs.lib.importJSON ./netlify-cli.json); in pkgs.fetchFromGitHub { inherit (meta) owner repo rev sha256; }')"
|
||||
echo $src
|
||||
node2nix \
|
||||
--input $src/package.json \
|
||||
@ -10,5 +10,5 @@ node2nix \
|
||||
--output node-packages.nix \
|
||||
--composition composition.nix \
|
||||
--node-env node-env.nix \
|
||||
--nodejs-14 \
|
||||
--nodejs-16 \
|
||||
;
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
{
|
||||
"owner": "netlify",
|
||||
"repo": "cli",
|
||||
"rev": "a50e410fddda92d3f3f256321eddefb8cb8ba6e1",
|
||||
"sha256": "sisX58I5UxxEPGCh5JGtQHw72A4+pLuENpBB9WKRTZc=",
|
||||
"fetchSubmodules": false
|
||||
"rev": "6c7e8c9a4db4e2e408f65e6098a194497944e306",
|
||||
"sha256": "YMnQrurZDJtfeHBCIzy6vToGHnqtdRGvWFPX5RcWyPg=",
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"deepClone": false
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# This file originates from node2nix
|
||||
|
||||
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}:
|
||||
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
|
||||
|
||||
let
|
||||
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
|
||||
@ -40,36 +40,22 @@ let
|
||||
'';
|
||||
};
|
||||
|
||||
includeDependencies = {dependencies}:
|
||||
lib.optionalString (dependencies != [])
|
||||
(lib.concatMapStrings (dependency:
|
||||
''
|
||||
# Bundle the dependencies of the package
|
||||
mkdir -p node_modules
|
||||
cd node_modules
|
||||
# Common shell logic
|
||||
installPackage = writeShellScript "install-package" ''
|
||||
installPackage() {
|
||||
local packageName=$1 src=$2
|
||||
|
||||
# Only include dependencies if they don't exist. They may also be bundled in the package.
|
||||
if [ ! -e "${dependency.name}" ]
|
||||
then
|
||||
${composePackage dependency}
|
||||
fi
|
||||
local strippedName
|
||||
|
||||
cd ..
|
||||
''
|
||||
) dependencies);
|
||||
|
||||
# Recursively composes the dependencies of a package
|
||||
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
||||
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
|
||||
DIR=$(pwd)
|
||||
local DIR=$PWD
|
||||
cd $TMPDIR
|
||||
|
||||
unpackFile ${src}
|
||||
unpackFile $src
|
||||
|
||||
# Make the base dir in which the target dependency resides first
|
||||
mkdir -p "$(dirname "$DIR/${packageName}")"
|
||||
mkdir -p "$(dirname "$DIR/$packageName")"
|
||||
|
||||
if [ -f "${src}" ]
|
||||
if [ -f "$src" ]
|
||||
then
|
||||
# Figure out what directory has been unpacked
|
||||
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
|
||||
@ -79,28 +65,53 @@ let
|
||||
chmod -R u+w "$packageDir"
|
||||
|
||||
# Move the extracted tarball into the output folder
|
||||
mv "$packageDir" "$DIR/${packageName}"
|
||||
elif [ -d "${src}" ]
|
||||
mv "$packageDir" "$DIR/$packageName"
|
||||
elif [ -d "$src" ]
|
||||
then
|
||||
# Get a stripped name (without hash) of the source directory.
|
||||
# On old nixpkgs it's already set internally.
|
||||
if [ -z "$strippedName" ]
|
||||
then
|
||||
strippedName="$(stripHash ${src})"
|
||||
strippedName="$(stripHash $src)"
|
||||
fi
|
||||
|
||||
# Restore write permissions to make building work
|
||||
chmod -R u+w "$strippedName"
|
||||
|
||||
# Move the extracted directory into the output folder
|
||||
mv "$strippedName" "$DIR/${packageName}"
|
||||
mv "$strippedName" "$DIR/$packageName"
|
||||
fi
|
||||
|
||||
# Unset the stripped name to not confuse the next unpack step
|
||||
unset strippedName
|
||||
# Change to the package directory to install dependencies
|
||||
cd "$DIR/$packageName"
|
||||
}
|
||||
'';
|
||||
|
||||
# Include the dependencies of the package
|
||||
cd "$DIR/${packageName}"
|
||||
# Bundle the dependencies of the package
|
||||
#
|
||||
# Only include dependencies if they don't exist. They may also be bundled in the package.
|
||||
includeDependencies = {dependencies}:
|
||||
lib.optionalString (dependencies != []) (
|
||||
''
|
||||
mkdir -p node_modules
|
||||
cd node_modules
|
||||
''
|
||||
+ (lib.concatMapStrings (dependency:
|
||||
''
|
||||
if [ ! -e "${dependency.packageName}" ]; then
|
||||
${composePackage dependency}
|
||||
fi
|
||||
''
|
||||
) dependencies)
|
||||
+ ''
|
||||
cd ..
|
||||
''
|
||||
);
|
||||
|
||||
# Recursively composes the dependencies of a package
|
||||
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
||||
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
|
||||
installPackage "${packageName}" "${src}"
|
||||
${includeDependencies { inherit dependencies; }}
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
@ -154,7 +165,11 @@ let
|
||||
if(process.argv[2] == "development") {
|
||||
replaceDependencies(packageObj.devDependencies);
|
||||
}
|
||||
else {
|
||||
packageObj.devDependencies = {};
|
||||
}
|
||||
replaceDependencies(packageObj.optionalDependencies);
|
||||
replaceDependencies(packageObj.peerDependencies);
|
||||
|
||||
/* Write the fixed package.json file */
|
||||
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
|
||||
@ -246,8 +261,8 @@ let
|
||||
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
|
||||
|
||||
if(![1, 2].includes(packageLock.lockfileVersion)) {
|
||||
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
||||
process.exit(1);
|
||||
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if(packageLock.dependencies !== undefined) {
|
||||
@ -259,7 +274,7 @@ let
|
||||
|
||||
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
|
||||
reconstructPackageLock = writeTextFile {
|
||||
name = "addintegrityfields.js";
|
||||
name = "reconstructpackagelock.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
@ -269,25 +284,43 @@ let
|
||||
var lockObj = {
|
||||
name: packageObj.name,
|
||||
version: packageObj.version,
|
||||
lockfileVersion: 1,
|
||||
lockfileVersion: 2,
|
||||
requires: true,
|
||||
packages: {
|
||||
"": {
|
||||
name: packageObj.name,
|
||||
version: packageObj.version,
|
||||
license: packageObj.license,
|
||||
bin: packageObj.bin,
|
||||
dependencies: packageObj.dependencies,
|
||||
engines: packageObj.engines,
|
||||
optionalDependencies: packageObj.optionalDependencies
|
||||
}
|
||||
},
|
||||
dependencies: {}
|
||||
};
|
||||
|
||||
function augmentPackageJSON(filePath, dependencies) {
|
||||
function augmentPackageJSON(filePath, packages, dependencies) {
|
||||
var packageJSON = path.join(filePath, "package.json");
|
||||
if(fs.existsSync(packageJSON)) {
|
||||
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
|
||||
packages[filePath] = {
|
||||
version: packageObj.version,
|
||||
integrity: "sha1-000000000000000000000000000=",
|
||||
dependencies: packageObj.dependencies,
|
||||
engines: packageObj.engines,
|
||||
optionalDependencies: packageObj.optionalDependencies
|
||||
};
|
||||
dependencies[packageObj.name] = {
|
||||
version: packageObj.version,
|
||||
integrity: "sha1-000000000000000000000000000=",
|
||||
dependencies: {}
|
||||
};
|
||||
processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
|
||||
processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
|
||||
}
|
||||
}
|
||||
|
||||
function processDependencies(dir, dependencies) {
|
||||
function processDependencies(dir, packages, dependencies) {
|
||||
if(fs.existsSync(dir)) {
|
||||
var files = fs.readdirSync(dir);
|
||||
|
||||
@ -303,23 +336,84 @@ let
|
||||
pkgFiles.forEach(function(entry) {
|
||||
if(stats.isDirectory()) {
|
||||
var pkgFilePath = path.join(filePath, entry);
|
||||
augmentPackageJSON(pkgFilePath, dependencies);
|
||||
augmentPackageJSON(pkgFilePath, packages, dependencies);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
augmentPackageJSON(filePath, dependencies);
|
||||
augmentPackageJSON(filePath, packages, dependencies);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
processDependencies("node_modules", lockObj.dependencies);
|
||||
processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
|
||||
|
||||
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
|
||||
'';
|
||||
};
|
||||
|
||||
# Script that links bins defined in package.json to the node_modules bin directory
|
||||
# NPM does not do this for top-level packages itself anymore as of v7
|
||||
linkBinsScript = writeTextFile {
|
||||
name = "linkbins.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
var packageObj = JSON.parse(fs.readFileSync("package.json"));
|
||||
|
||||
var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
|
||||
|
||||
if(packageObj.bin !== undefined) {
|
||||
fs.mkdirSync(path.join(nodeModules, ".bin"))
|
||||
|
||||
if(typeof packageObj.bin == "object") {
|
||||
Object.keys(packageObj.bin).forEach(function(exe) {
|
||||
if(fs.existsSync(packageObj.bin[exe])) {
|
||||
console.log("linking bin '" + exe + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.bin[exe]),
|
||||
path.join(nodeModules, ".bin", exe)
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + exe + "'");
|
||||
}
|
||||
})
|
||||
}
|
||||
else {
|
||||
if(fs.existsSync(packageObj.bin)) {
|
||||
console.log("linking bin '" + packageObj.bin + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.bin),
|
||||
path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + packageObj.bin + "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
|
||||
fs.mkdirSync(path.join(nodeModules, ".bin"))
|
||||
|
||||
fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
|
||||
if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
|
||||
console.log("linking bin '" + exe + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.directories.bin, exe),
|
||||
path.join(nodeModules, ".bin", exe)
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + exe + "'");
|
||||
}
|
||||
})
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
|
||||
let
|
||||
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
|
||||
@ -366,20 +460,25 @@ let
|
||||
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
|
||||
|
||||
runHook postRebuild
|
||||
|
||||
if [ "''${dontNpmInstall-}" != "1" ]
|
||||
then
|
||||
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
||||
rm -f npm-shrinkwrap.json
|
||||
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
|
||||
fi
|
||||
|
||||
# Link executables defined in package.json
|
||||
node ${linkBinsScript}
|
||||
'';
|
||||
|
||||
# Builds and composes an NPM package including all its dependencies
|
||||
buildNodePackage =
|
||||
{ name
|
||||
, packageName
|
||||
, version
|
||||
, version ? null
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
@ -398,7 +497,7 @@ let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "${name}-${version}";
|
||||
name = "${name}${if version == null then "" else "-${version}"}";
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.isLinux) utillinux
|
||||
++ lib.optional (stdenv.isDarwin) libtool
|
||||
@ -415,6 +514,8 @@ let
|
||||
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
# Create and enter a root node_modules/ folder
|
||||
mkdir -p $out/lib/node_modules
|
||||
cd $out/lib/node_modules
|
||||
@ -428,6 +529,14 @@ let
|
||||
if [ -d "$out/lib/node_modules/.bin" ]
|
||||
then
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
|
||||
# Patch the shebang lines of all the executables
|
||||
ls $out/bin/* | while read i
|
||||
do
|
||||
file="$(readlink -f "$i")"
|
||||
chmod u+rwx "$file"
|
||||
patchShebangs "$file"
|
||||
done
|
||||
fi
|
||||
|
||||
# Create symlinks to the deployed manual page folders, if applicable
|
||||
@ -458,7 +567,7 @@ let
|
||||
buildNodeDependencies =
|
||||
{ name
|
||||
, packageName
|
||||
, version
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
@ -476,7 +585,7 @@ let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-dependencies-${name}-${version}";
|
||||
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.isLinux) utillinux
|
||||
@ -492,6 +601,8 @@ let
|
||||
passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
mkdir -p $out/${packageName}
|
||||
cd $out/${packageName}
|
||||
|
||||
@ -504,6 +615,7 @@ let
|
||||
if [ -f ${src}/package-lock.json ]
|
||||
then
|
||||
cp ${src}/package-lock.json .
|
||||
chmod 644 package-lock.json
|
||||
fi
|
||||
''}
|
||||
|
||||
@ -526,7 +638,7 @@ let
|
||||
buildNodeShell =
|
||||
{ name
|
||||
, packageName
|
||||
, version
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
@ -542,9 +654,10 @@ let
|
||||
|
||||
let
|
||||
nodeDependencies = buildNodeDependencies args;
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "node-shell-${name}-${version}";
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
|
||||
buildCommand = ''
|
||||
@ -563,7 +676,7 @@ let
|
||||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||
export PATH="${nodeDependencies}/bin:$PATH"
|
||||
'';
|
||||
};
|
||||
} // extraArgs);
|
||||
in
|
||||
{
|
||||
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||
|
||||
7223
pkgs/development/web/netlify-cli/node-packages.nix
generated
7223
pkgs/development/web/netlify-cli/node-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -1,13 +1,18 @@
|
||||
{
|
||||
curl,
|
||||
darwin,
|
||||
lib,
|
||||
netlify-cli,
|
||||
runCommand,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
runCommand "netlify-cli-test" {
|
||||
nativeBuildInputs = [
|
||||
netlify-cli
|
||||
curl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.ps
|
||||
];
|
||||
meta.timeout = 600;
|
||||
} ''
|
||||
|
||||
@ -2,20 +2,20 @@
|
||||
"x86_64-linux": {
|
||||
"alpha": {
|
||||
"experimental": {
|
||||
"name": "factorio_alpha_x64-1.1.70.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.72.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "1d0ahy34xmj9k79kd8imnzi576ivhcvf0qqvl6r9qdc8cmbmip18",
|
||||
"sha256": "0hphx3jpmwwpyxyw4v4s7awy6vmcxi067sfl5j1ym5rdgsvr6n63",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.70/alpha/linux64",
|
||||
"version": "1.1.70"
|
||||
"url": "https://factorio.com/get-download/1.1.72/alpha/linux64",
|
||||
"version": "1.1.72"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_alpha_x64-1.1.70.tar.xz",
|
||||
"name": "factorio_alpha_x64-1.1.72.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "1d0ahy34xmj9k79kd8imnzi576ivhcvf0qqvl6r9qdc8cmbmip18",
|
||||
"sha256": "0hphx3jpmwwpyxyw4v4s7awy6vmcxi067sfl5j1ym5rdgsvr6n63",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.70/alpha/linux64",
|
||||
"version": "1.1.70"
|
||||
"url": "https://factorio.com/get-download/1.1.72/alpha/linux64",
|
||||
"version": "1.1.72"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
@ -38,20 +38,20 @@
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"name": "factorio_headless_x64-1.1.70.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.72.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "05bkawn394jb5d9if8xbf2xff3gnmd591axy41h7x1yg8sz94zw4",
|
||||
"sha256": "1jbckp2d1zp6kxsqax367vxc1970kbs9apm8sdv9bfn8majial6a",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.70/headless/linux64",
|
||||
"version": "1.1.70"
|
||||
"url": "https://factorio.com/get-download/1.1.72/headless/linux64",
|
||||
"version": "1.1.72"
|
||||
},
|
||||
"stable": {
|
||||
"name": "factorio_headless_x64-1.1.70.tar.xz",
|
||||
"name": "factorio_headless_x64-1.1.72.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "05bkawn394jb5d9if8xbf2xff3gnmd591axy41h7x1yg8sz94zw4",
|
||||
"sha256": "1jbckp2d1zp6kxsqax367vxc1970kbs9apm8sdv9bfn8majial6a",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/1.1.70/headless/linux64",
|
||||
"version": "1.1.70"
|
||||
"url": "https://factorio.com/get-download/1.1.72/headless/linux64",
|
||||
"version": "1.1.72"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,14 @@
|
||||
{ lib, stdenv, cmake, fetchurl, pkg-config, SDL, SDL_mixer, SDL_net, wxGTK30 }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, SDL
|
||||
, SDL_mixer
|
||||
, SDL_net
|
||||
, wxGTK32
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "odamex";
|
||||
@ -9,14 +19,36 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-WBqO5fWzemw1kYlY192v0nnZkbIEVuWmjWYMy+1ODPQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
SDL_net
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
'' + (if stdenv.isDarwin then ''
|
||||
mkdir -p $out/{Applications,bin}
|
||||
mv odalaunch/odalaunch.app $out/Applications
|
||||
makeWrapper $out/{Applications/odalaunch.app/Contents/MacOS,bin}/odalaunch
|
||||
'' else ''
|
||||
make install
|
||||
'') + ''
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://odamex.net/";
|
||||
description = "A client/server port for playing old-school Doom online";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ MP2E ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,31 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, xz, boost, libdevil, zlib, p7zip
|
||||
, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL
|
||||
, asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
|
||||
, jdk ? null, python ? null, systemd, libunwind, which, minizip
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, xz
|
||||
, boost
|
||||
, libdevil
|
||||
, zlib
|
||||
, p7zip
|
||||
, openal
|
||||
, libvorbis
|
||||
, glew
|
||||
, freetype
|
||||
, xorg
|
||||
, SDL2
|
||||
, libGLU
|
||||
, libGL
|
||||
, asciidoc
|
||||
, docbook_xsl
|
||||
, docbook_xsl_ns
|
||||
, curl
|
||||
, makeWrapper
|
||||
, jdk
|
||||
, python
|
||||
, systemd
|
||||
, libunwind
|
||||
, which
|
||||
, minizip
|
||||
, withAI ? true # support for AI Interfaces and Skirmish AIs
|
||||
}:
|
||||
|
||||
@ -36,16 +60,36 @@ stdenv.mkDerivation rec {
|
||||
echo "${version} maintenance" > VERSION
|
||||
'';
|
||||
|
||||
cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
|
||||
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
|
||||
"-DPREFER_STATIC_LIBS:BOOL=OFF"];
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON"
|
||||
"-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
|
||||
"-DPREFER_STATIC_LIBS:BOOL=OFF"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ];
|
||||
buildInputs = [ xz boost libdevil zlib p7zip openal libvorbis freetype SDL2
|
||||
xorg.libX11 xorg.libXcursor libGLU libGL glew curl
|
||||
systemd libunwind which minizip ]
|
||||
++ lib.optional withAI jdk
|
||||
++ lib.optional withAI python;
|
||||
buildInputs = [
|
||||
xz
|
||||
boost
|
||||
libdevil
|
||||
zlib
|
||||
p7zip
|
||||
openal
|
||||
libvorbis
|
||||
freetype
|
||||
SDL2
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
libGLU
|
||||
libGL
|
||||
glew
|
||||
curl
|
||||
systemd
|
||||
libunwind
|
||||
which
|
||||
minizip
|
||||
]
|
||||
++ lib.optional withAI jdk
|
||||
++ lib.optional withAI python;
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility
|
||||
|
||||
@ -57,8 +101,8 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://springrts.com/";
|
||||
description = "A powerful real-time strategy (RTS) game engine";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ qknight domenkozar sorki ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,28 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkg-config, curl, libtorrent-rasterbar
|
||||
, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
|
||||
, makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, wxGTK30
|
||||
, openal
|
||||
, pkg-config
|
||||
, curl
|
||||
, libtorrent-rasterbar
|
||||
, libpng
|
||||
, libX11
|
||||
, gettext
|
||||
, boost
|
||||
, libnotify
|
||||
, gtk2
|
||||
, doxygen
|
||||
, spring
|
||||
, makeWrapper
|
||||
, glib
|
||||
, minizip
|
||||
, alure
|
||||
, pcre
|
||||
, jsoncpp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "springlobby";
|
||||
@ -13,8 +35,20 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ];
|
||||
buildInputs = [
|
||||
wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp
|
||||
boost libpng libX11 libnotify gtk2 glib minizip alure
|
||||
wxGTK30
|
||||
openal
|
||||
curl
|
||||
libtorrent-rasterbar
|
||||
pcre
|
||||
jsoncpp
|
||||
boost
|
||||
libpng
|
||||
libX11
|
||||
libnotify
|
||||
gtk2
|
||||
glib
|
||||
minizip
|
||||
alure
|
||||
];
|
||||
|
||||
patches = [
|
||||
@ -33,10 +67,10 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://springlobby.info/";
|
||||
homepage = "https://springlobby.springrts.com";
|
||||
description = "Cross-platform lobby client for the Spring RTS project";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ qknight domenkozar ];
|
||||
platforms = platforms.linux;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,27 +1,28 @@
|
||||
{ lib
|
||||
, gcc11Stdenv
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, makeWrapper
|
||||
, cmake
|
||||
, pkg-config
|
||||
, spdlog
|
||||
, nlohmann_json
|
||||
, systemd
|
||||
}:
|
||||
|
||||
gcc11Stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ananicy-cpp";
|
||||
version = "unstable-2021-10-13";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "ananicy-cpp";
|
||||
repo = "ananicy-cpp";
|
||||
rev = "6a14fe7353221c89347eddbbcafb35cf5fee4758";
|
||||
sha256 = "sha256-V0QPXC17ZD2c4MK3DAkzoPgKOU5V5BjfQKUk7I6f8WM=";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-07LWIC2y6b1iiPCVa8mlBYAnSmahm0oJ2d3/uW4rC94=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -31,11 +32,17 @@ gcc11Stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_JSON=yON"
|
||||
"-DUSE_EXTERNAL_JSON=ON"
|
||||
"-DUSE_EXTERNAL_SPDLOG=ON"
|
||||
"-DUSE_EXTERNAL_FMTLIB=ON"
|
||||
"-DVERSION=${version}"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
rm -rf "$out"/include
|
||||
rm -rf "$out"/lib/cmake
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp";
|
||||
description = "Rewrite of ananicy in c++ for lower cpu and memory usage";
|
||||
|
||||
@ -1,6 +1,23 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, ffmpeg, lua5_1, curl
|
||||
, libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL
|
||||
, glee }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, wxGTK32
|
||||
, ffmpeg
|
||||
, lua5_1
|
||||
, curl
|
||||
, libpng
|
||||
, xorg
|
||||
, pkg-config
|
||||
, flam3
|
||||
, libgtop
|
||||
, boost
|
||||
, tinyxml
|
||||
, freeglut
|
||||
, libGLU
|
||||
, libGL
|
||||
, glee
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "electricsheep";
|
||||
@ -16,8 +33,20 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
wxGTK30 ffmpeg lua5_1 curl libpng xorg.libXrender
|
||||
flam3 libgtop boost tinyxml freeglut libGLU libGL glee
|
||||
wxGTK32
|
||||
ffmpeg
|
||||
lua5_1
|
||||
curl
|
||||
libpng
|
||||
xorg.libXrender
|
||||
flam3
|
||||
libgtop
|
||||
boost
|
||||
tinyxml
|
||||
freeglut
|
||||
libGLU
|
||||
libGL
|
||||
glee
|
||||
];
|
||||
|
||||
preAutoreconf = ''
|
||||
|
||||
@ -27,13 +27,11 @@ rec {
|
||||
stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
|
||||
|
||||
production = generic {
|
||||
version = "515.76";
|
||||
sha256_64bit = "sha256-xqKhjOuWX0mAvOTlzqNv1iLNwaXzGg6xu9NZqen2v0Q=";
|
||||
openSha256 = "sha256-843l42atzaTm4pX5UC/JZjXAvhwmBpE8k3SQFEFdcdY=";
|
||||
settingsSha256 = "sha256-2GdqmuvROLa8xFfyFY/F4YzEBq+SlVIYM4CVEARh9MI=";
|
||||
persistencedSha256 = "sha256-nIfP7xBIVy+BUa9VBCNQ9v5RT4l4S9X0GHLpNiN/WRg=";
|
||||
|
||||
brokenOpen = kernelModVersion == "5.4" && kernel.isHardened;
|
||||
version = "515.86.01";
|
||||
sha256_64bit = "sha256-FBd34covEel9jTMmAhPxvjJ+tzkiriL03atAS7LvRmQ=";
|
||||
openSha256 = "sha256-9QVq6eN+usbzMb0hYvAFPlyr6MDYHvgWPz2orm+5QFc=";
|
||||
settingsSha256 = "sha256-I8CE4EywZrsqzEy7plEG3bNfzTiT+vZJ1sqEQBrtLUQ=";
|
||||
persistencedSha256 = "sha256-vjn315k7i16U1NjY3EB0pw6sLddEcnKaT9CrHOCY268=";
|
||||
};
|
||||
|
||||
latest = selectHighestVersion production (generic {
|
||||
@ -55,16 +53,14 @@ rec {
|
||||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "515.49.24";
|
||||
version = "515.49.25";
|
||||
persistencedVersion = "515.48.07";
|
||||
settingsVersion = "515.48.07";
|
||||
sha256_64bit = "sha256-hiTG1gZr02hyetOGvHzY8Be9jaWklhteqe24BRvpw+c=";
|
||||
openSha256 = "sha256-4NFR4oY728E/yE3FoD3vph8NvSHGD0f0iK2FHqlgK94=";
|
||||
sha256_64bit = "sha256-5j+YtKaPhDxd9bcPX10ViugLMCTXEYJfod+ecn3SHWc=";
|
||||
openSha256 = "sha256-EnZXEvic9GdcNbcvpmbDkq6YPYqypBKyEXxFJJJJpKk=";
|
||||
settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
|
||||
persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
|
||||
url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
|
||||
|
||||
broken = kernelModVersion == "5.4" && kernel.isHardened;
|
||||
};
|
||||
|
||||
# Update note:
|
||||
@ -73,37 +69,19 @@ rec {
|
||||
|
||||
# Last one supporting Kepler architecture
|
||||
legacy_470 = generic {
|
||||
version = "470.141.03";
|
||||
sha256_64bit = "sha256-vpjSR6Q9dJGmW/3Jl/tlMeFZQ0brEqD6qgRGcs21cJ8=";
|
||||
settingsSha256 = "sha256-OWSUmUBqAxsR3e6EPzcIotpd6nm4Le8hIj4pzJ5WnhE=";
|
||||
persistencedSha256 = "sha256-XsGYGgucDhvPpqtM9IBLfo3tbn7sIobpo5JW/XqOkTo=";
|
||||
|
||||
broken = kernel.kernelAtLeast "6.0";
|
||||
version = "470.161.03";
|
||||
sha256_64bit = "sha256-Xagqf4x254Hn1/C+e3mNtNNE8mvU+s+avPPHHHH+dkA=";
|
||||
settingsSha256 = "sha256-ryUSiI8PsY3knkJLg0k1EmyYW5OWkhuZma/hmXNuojw=";
|
||||
persistencedSha256 = "sha256-/2h90Gq9NQd9Q+9eLVE6vrxXmINXxlLcSNOHxKToOEE=";
|
||||
};
|
||||
|
||||
# Last one supporting x86
|
||||
legacy_390 = generic {
|
||||
version = "390.154";
|
||||
sha256_32bit = "sha256-XuhxuEvZ8o4iW3o+Xxvh+eLQBn83uNa40MJRcC8G0+c=";
|
||||
sha256_64bit = "sha256-9EICgMVSEJZMAI1bck8mFYRdR61MnAXY7SamL8YzH3w=";
|
||||
settingsSha256 = "sha256-iNT6//EvtasivDfXPY6j6OrpymbslO/q45uKd5smFUw=";
|
||||
persistencedSha256 = "sha256-y+MkudjQBkuVzHrY/rh7IGRN8VjLsJQ3a+fYDXdrzzk=";
|
||||
|
||||
broken = kernel.kernelAtLeast "5.18";
|
||||
|
||||
patches =
|
||||
let patch390 = o:
|
||||
(lib.optional (kernelModVersion == o.version) (fetchpatch {
|
||||
inherit (o) sha256;
|
||||
url = "https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/kernel-${o.version}.patch";
|
||||
}));
|
||||
in
|
||||
[]
|
||||
++ (patch390 {
|
||||
version = "5.18";
|
||||
sha256 = "sha256-A6itoozgDWmXKQAU0D8bT2vUaZqh5G5Tg3d3E+CLOTs=";
|
||||
})
|
||||
;
|
||||
version = "390.157";
|
||||
sha256_32bit = "sha256-VdZeCkU5qct5YgDF8Qgv4mP7CVHeqvlqnP/rioD3B5k=";
|
||||
sha256_64bit = "sha256-W+u8puj+1da52BBw+541HxjtxTSVJVPL3HHo/QubMoo=";
|
||||
settingsSha256 = "sha256-uJZO4ak/w/yeTQ9QdXJSiaURDLkevlI81de0q4PpFpw=";
|
||||
persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns=";
|
||||
};
|
||||
|
||||
legacy_340 = generic {
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
buildGoPackage rec {
|
||||
pname = "filtron";
|
||||
version = "0.2.0";
|
||||
|
||||
goPackagePath = "github.com/asciimoo/filtron";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciimoo";
|
||||
repo = "filtron";
|
||||
@ -11,7 +13,7 @@ buildGoModule rec {
|
||||
sha256 = "18d3h0i2sfqbc0bjx26jm2n9f37zwp8z9z4wd17sw7nvkfa72a26";
|
||||
};
|
||||
|
||||
vendorSha256 = null; #vendorSha256 = "";
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
# The upstream test checks are obsolete/unmaintained.
|
||||
doCheck = false;
|
||||
@ -22,6 +24,5 @@ buildGoModule rec {
|
||||
license = licenses.agpl3;
|
||||
maintainers = [ maintainers.dasj19 ];
|
||||
platforms = platforms.linux;
|
||||
broken = true; # vendor isn't reproducible with go > 1.17: nix-build -A $name.go-modules --check
|
||||
};
|
||||
}
|
||||
|
||||
41
pkgs/servers/filtron/deps.nix
generated
Normal file
41
pkgs/servers/filtron/deps.nix
generated
Normal file
@ -0,0 +1,41 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/valyala/fasthttp";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/valyala/fasthttp";
|
||||
rev = "v1.41.0";
|
||||
sha256 = "sha256-lV9FP7GjnQk/kJACE9l5CZ/8kzORdNpYS5lPokEYrZM=";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/klauspost/compress";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/klauspost/compress";
|
||||
rev = "v1.15.12";
|
||||
sha256 = "sha256-D41sCSbaqX9tXIRcTU9TYyjPyZpuKLDeQMXETE2ulbM=";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/valyala/bytebufferpool";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/valyala/bytebufferpool";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "sha256-I9FPZ3kCNRB+o0dpMwBnwZ35Fj9+ThvITn8a3Jr8mAY=";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
goPackagePath = "github.com/andybalholm/brotli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/andybalholm/brotli";
|
||||
rev = "v1.0.4";
|
||||
sha256 = "sha256-gAnPRdGP4yna4hiRIEDyBtDOVJqd7RU27wlPu96Rdf8=";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -5,9 +5,7 @@
|
||||
, makeWrapper
|
||||
, symlinkJoin
|
||||
, writeShellScriptBin
|
||||
|
||||
, wine
|
||||
, use64 ? false
|
||||
}:
|
||||
|
||||
let
|
||||
@ -17,18 +15,18 @@ let
|
||||
version = "3.37";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
executable = fetchurl (if use64 then {
|
||||
executable = fetchurl (if (wine.meta.mainProgram == "wine64") then {
|
||||
url = "https://download.mikrotik.com/winbox/${version}/winbox64.exe";
|
||||
sha256 = "0fbl0i5ga9afg8mklm9xqidcr388sca00slj401npwh9b3j9drmb";
|
||||
} else {
|
||||
url = "https://download.mikrotik.com/winbox/${version}/winbox.exe";
|
||||
sha256 = "1zla30bc755x5gfv9ff1bgjvpsjmg2d7jsjxnwwy679fry4n4cwl";
|
||||
});
|
||||
|
||||
# This is from the winbox AUR package:
|
||||
# https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e
|
||||
wrapper = writeShellScriptBin pname ''
|
||||
export WINEPREFIX="''${WINBOX_HOME:-"''${XDG_DATA_HOME:-"''${HOME}/.local/share"}/winbox"}/wine"
|
||||
export WINEARCH=${if use64 then "win64" else "win32"}
|
||||
export WINEDLLOVERRIDES="mscoree=" # disable mono
|
||||
export WINEDEBUG=-all
|
||||
if [ ! -d "$WINEPREFIX" ] ; then
|
||||
@ -36,7 +34,7 @@ let
|
||||
${wine}/bin/wineboot -u
|
||||
fi
|
||||
|
||||
${wine}/bin/wine ${executable} "$@"
|
||||
${wine}/bin/${wine.meta.mainProgram} ${executable} "$@"
|
||||
'';
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
||||
@ -6,17 +6,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opentelemetry-collector-contrib";
|
||||
version = "0.64.0";
|
||||
version = "0.65.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector-contrib";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yrm9tLK9no1H4bh2ghQO1ybohYeEo1EzVa+5dgawlxk=";
|
||||
sha256 = "sha256-c5N/3HAkragpR/vgh909VYu4vpUFe1An+B20SY0C1Rs=";
|
||||
};
|
||||
# proxy vendor to avoid hash missmatches between linux and macOS
|
||||
proxyVendor = true;
|
||||
vendorSha256 = "sha256-Tartb4Qh10UPdVQG2mGbqXW/Mg9XbD28JRrn128d/4k=";
|
||||
vendorSha256 = "sha256-aXbrm3iKmc+03BZWkRDt47LJP6JT92uH3EyEVQHByj8=";
|
||||
|
||||
subPackages = [ "cmd/otelcontribcol" ];
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
version = "1.2022.12";
|
||||
version = "1.2022.13";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "plantuml-server";
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
|
||||
sha256 = "sha256-H05/1Em9aTRLhI5vo119JLnuKJlK6/ZLu0v/wU0fPLQ=";
|
||||
sha256 = "sha256-XQXG4/wrpFZ3Z7b7K5hWuZQXcvaYvV3igjtNPtOQ7FE=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@ -2,11 +2,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "scdl";
|
||||
version = "2.7.2";
|
||||
version = "2.7.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7d6212591a5bccf017424f732535475fb9ae3bab26a4fb5bc36064962d33f8e0";
|
||||
sha256 = "60284b7b058040d4847f2e4b0ab906b10e959d51f976a0188641e8e10685474f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@ -2,31 +2,30 @@
|
||||
, fetchFromGitHub
|
||||
, fzy
|
||||
, lib
|
||||
, makeWrapper
|
||||
, nix
|
||||
, nix-index
|
||||
, makeBinaryWrapper
|
||||
, nix-index-unwrapped
|
||||
, rustPlatform
|
||||
, testers
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "comma";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "comma";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rXAX14yB8v9BOG4ZsdGEedpZAnNqhQ4DtjQwzFX/TLY=";
|
||||
hash = "sha256-EPrXIDi0yO+AVriQgi3t91CLtmYtgmyEfWtFD+wH8As=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-9PVbiWmaTDx4iob5g9tXC+FV5Jmy6Id9tQxm05fJLkM=";
|
||||
cargoHash = "sha256-/1b3GF0flhvejZ3C/yOzRGl50sWR4IxprwRoMUYEvm8=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/comma \
|
||||
--prefix PATH : ${lib.makeBinPath [ nix fzy nix-index ]}
|
||||
--prefix PATH : ${lib.makeBinPath [ fzy nix-index-unwrapped ]}
|
||||
ln -s $out/bin/comma $out/bin/,
|
||||
'';
|
||||
|
||||
@ -38,7 +37,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/nix-community/comma";
|
||||
description = "Runs programs without installing them";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ Enzime artturin ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ Enzime artturin marsam ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "chain-bench";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UpUKt6R5Yr/L0n7DFqIO6s8Y8WT5UYDjMO/QmhcsOxE=";
|
||||
sha256 = "sha256-UWP/S15s9k92RhH6xr0V544BHF4n9g+inN6Sdpja6uM=";
|
||||
};
|
||||
vendorSha256 = "sha256-R6V4dE2cNKcsBweSaUWjZHKnUQP/kADAbW2aTQc7TAg=";
|
||||
|
||||
|
||||
69
pkgs/tools/security/vexctl/default.nix
Normal file
69
pkgs/tools/security/vexctl/default.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vexctl";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chainguard-dev";
|
||||
repo = "vex";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rDq62vkrZ8/76LERchxijmQCgo58KXlAIfv4SwI7egY=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
git rev-parse HEAD > $out/COMMIT
|
||||
# '0000-00-00T00:00:00Z'
|
||||
date -u -d "@$(git log -1 --pretty=%ct)" "+'%Y-%m-%dT%H:%M:%SZ'" > $out/SOURCE_DATE_EPOCH
|
||||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorSha256 = "sha256-7hhiJowtQv4JPqvpMiukL2JVgNeB5gi5X4p+AVGp4S0=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X sigs.k8s.io/release-utils/version.gitVersion=v${version}"
|
||||
"-X sigs.k8s.io/release-utils/version.gitTreeState=clean"
|
||||
];
|
||||
|
||||
# ldflags based on metadata from git and source
|
||||
preBuild = ''
|
||||
ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)"
|
||||
ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)"
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
mv $GOPATH/bin/vex{,ctl}
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd vexctl \
|
||||
--bash <($out/bin/vexctl completion bash) \
|
||||
--fish <($out/bin/vexctl completion fish) \
|
||||
--zsh <($out/bin/vexctl completion zsh)
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/vexctl --help
|
||||
$out/bin/vexctl version 2>&1 | grep "v${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/chainguard-dev/vex/";
|
||||
description = "A tool to attest VEX impact statements";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jk ];
|
||||
};
|
||||
}
|
||||
@ -1630,6 +1630,7 @@ mapAliases ({
|
||||
youtubeDL = throw "'youtubeDL' has been renamed to/replaced by 'youtube-dl'"; # Converted to throw 2022-02-22
|
||||
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
|
||||
yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead"; # Added 2021-03-08
|
||||
yubioath-desktop = throw "yubioath-desktop has been deprecated by upstream in favor of https://github.com/Yubico/yubioath-flutter"; # Added 2022-11-22
|
||||
yuzu-ea = yuzu-early-access; # Added 2022-08-18
|
||||
yuzu = yuzu-mainline; # Added 2021-01-25
|
||||
|
||||
|
||||
@ -1478,7 +1478,6 @@ with pkgs;
|
||||
|
||||
winbox = callPackage ../tools/admin/winbox {
|
||||
wine = wineWowPackages.staging;
|
||||
use64 = true;
|
||||
};
|
||||
|
||||
wwcd = callPackage ../tools/misc/wwcd { };
|
||||
@ -4342,9 +4341,13 @@ with pkgs;
|
||||
|
||||
hypr = callPackage ../applications/window-managers/hyprwm/hypr { };
|
||||
|
||||
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { };
|
||||
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
|
||||
stdenv = gcc11Stdenv;
|
||||
};
|
||||
|
||||
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
|
||||
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper {
|
||||
stdenv = gcc11Stdenv;
|
||||
};
|
||||
|
||||
hysteria = callPackage ../tools/networking/hysteria { };
|
||||
|
||||
@ -12478,6 +12481,8 @@ with pkgs;
|
||||
|
||||
versus = callPackage ../applications/networking/versus { };
|
||||
|
||||
vexctl = callPackage ../tools/security/vexctl { };
|
||||
|
||||
vgrep = callPackage ../tools/text/vgrep { };
|
||||
|
||||
vhd2vl = callPackage ../applications/science/electronics/vhd2vl { };
|
||||
@ -12898,6 +12903,8 @@ with pkgs;
|
||||
wxGTK = wxGTK32;
|
||||
};
|
||||
|
||||
veryfasttree = callPackage ../applications/science/biology/veryfasttree { };
|
||||
|
||||
vlan = callPackage ../tools/networking/vlan { };
|
||||
|
||||
vmtouch = callPackage ../tools/misc/vmtouch { };
|
||||
@ -18205,6 +18212,8 @@ with pkgs;
|
||||
asio_1_10 = callPackage ../development/libraries/asio/1.10.nix { };
|
||||
asio = callPackage ../development/libraries/asio { };
|
||||
|
||||
asmjit = callPackage ../development/libraries/asmjit { };
|
||||
|
||||
aspell = callPackage ../development/libraries/aspell { };
|
||||
|
||||
aspellDicts = recurseIntoAttrs (callPackages ../development/libraries/aspell/dictionaries.nix {});
|
||||
@ -23115,8 +23124,6 @@ with pkgs;
|
||||
|
||||
yojimbo = callPackage ../development/libraries/yojimbo { };
|
||||
|
||||
yubioath-desktop = libsForQt5.callPackage ../applications/misc/yubioath-desktop { };
|
||||
|
||||
yubico-pam = callPackage ../development/libraries/yubico-pam { };
|
||||
|
||||
yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user