Merge master into haskell-updates
This commit is contained in:
commit
26bad79276
@ -41,7 +41,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c
|
||||
* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one.
|
||||
* `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build.
|
||||
* `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it.
|
||||
* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variables `DESTDIR` and `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
|
||||
* `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation.
|
||||
* `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`,
|
||||
* `useMelquiondRemake` (optional, default to `null`) is an attribute set, which, if given, overloads the `preConfigurePhases`, `configureFlags`, `buildPhase`, and `installPhase` attributes of the derivation for a specific use in libraries using `remake` as set up by Guillaume Melquiond for `flocq`, `gappalib`, `interval`, and `coquelicot` (see the corresponding derivation for concrete examples of use of this option). For backward compatibility, the attribute `useMelquiondRemake.logpath` must be set to the logical root of the library (otherwise, one can pass `useMelquiondRemake = {}` to activate this without backward compatibility).
|
||||
* `dropAttrs`, `keepAttrs`, `dropDerivationAttrs` are all optional and allow to tune which attribute is added or removed from the final call to `mkDerivation`.
|
||||
|
@ -2933,7 +2933,7 @@
|
||||
name = "David Rusu";
|
||||
};
|
||||
davidtwco = {
|
||||
email = "nix@david.davidtw.co";
|
||||
email = "david@davidtw.co";
|
||||
github = "davidtwco";
|
||||
githubId = 1295100;
|
||||
name = "David Wood";
|
||||
|
@ -86,6 +86,7 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1,
|
||||
rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,,
|
||||
readline,,,,,,
|
||||
say,https://github.com/Olivine-Labs/say.git,,,,,
|
||||
sqlite,,,,,,
|
||||
std._debug,https://github.com/lua-stdlib/_debug.git,,,,,
|
||||
std.normalize,https://github.com/lua-stdlib/normalize.git,,,,,
|
||||
stdlib,,,,41.2.2,,vyp
|
||||
|
Can't render this file because it has a wrong number of fields in line 72.
|
@ -18,7 +18,8 @@
|
||||
extraGSettingsOverrides = ''
|
||||
[org.gnome.shell]
|
||||
welcome-dialog-last-shown-version='9999999999'
|
||||
|
||||
[org.gnome.desktop.session]
|
||||
idle-delay=0
|
||||
[org.gnome.settings-daemon.plugins.power]
|
||||
sleep-inactive-ac-type='nothing'
|
||||
sleep-inactive-battery-type='nothing'
|
||||
|
@ -613,6 +613,7 @@ in {
|
||||
yabar = handleTest ./yabar.nix {};
|
||||
yggdrasil = handleTest ./yggdrasil.nix {};
|
||||
zammad = handleTest ./zammad.nix {};
|
||||
zeronet-conservancy = handleTest ./zeronet-conservancy.nix {};
|
||||
zfs = handleTest ./zfs.nix {};
|
||||
zigbee2mqtt = handleTest ./zigbee2mqtt.nix {};
|
||||
zoneminder = handleTest ./zoneminder.nix {};
|
||||
|
25
nixos/tests/zeronet-conservancy.nix
Normal file
25
nixos/tests/zeronet-conservancy.nix
Normal file
@ -0,0 +1,25 @@
|
||||
let
|
||||
port = 43110;
|
||||
in
|
||||
import ./make-test-python.nix ({ pkgs, ... }: {
|
||||
name = "zeronet-conservancy";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ fgaz ];
|
||||
};
|
||||
|
||||
nodes.machine = { config, pkgs, ... }: {
|
||||
services.zeronet = {
|
||||
enable = true;
|
||||
package = pkgs.zeronet-conservancy;
|
||||
inherit port;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("zeronet.service")
|
||||
|
||||
machine.wait_for_open_port(${toString port})
|
||||
|
||||
machine.succeed("curl --fail -H 'Accept: text/html, application/xml, */*' localhost:${toString port}/Stats")
|
||||
'';
|
||||
})
|
@ -19,20 +19,20 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "amberol";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-cBHFyPqhgcFOeYqMhF1aX3XCGAtqEZpI7Mj7b78Etmo=";
|
||||
hash = "sha256-spVZOFqnY4cNbIY1ED3Zki6yPMoFDNG5BtuD456hPs4=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-GaMJsIrTbhI1tmahEMlI1v5hmjw+tFEv9Wdne/kiYIA=";
|
||||
hash = "sha256-8PEAyQ8JW45d/Lut3hUSKCzV7JjFTpvKGra5dj3byo4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -1,50 +1,107 @@
|
||||
{ lib, stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkg-config
|
||||
, alsa-lib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
|
||||
, libzip, rtaudio, rtmidi, speex, libsamplerate }:
|
||||
{ alsa-lib
|
||||
, copyDesktopItems
|
||||
, curl
|
||||
, fetchFromBitbucket
|
||||
, fetchFromGitHub
|
||||
, fetchzip
|
||||
, ghc_filesystem
|
||||
, glew
|
||||
, glfw
|
||||
, gnome
|
||||
, gtk3-x11
|
||||
, imagemagick
|
||||
, jansson
|
||||
, jq
|
||||
, lib
|
||||
, libarchive
|
||||
, libicns
|
||||
, libjack2
|
||||
, libpulseaudio
|
||||
, libsamplerate
|
||||
, libXext
|
||||
, libXi
|
||||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, pkg-config
|
||||
, rtaudio
|
||||
, rtmidi
|
||||
, speex
|
||||
, stdenv
|
||||
, wrapGAppsHook
|
||||
, zstd
|
||||
}:
|
||||
|
||||
let
|
||||
# The package repo vendors some of the package dependencies as submodules.
|
||||
# Others are downloaded with `make deps`. Due to previous issues with the
|
||||
# `glfw` submodule (see above) and because we can not access the network when
|
||||
# building in a sandbox, we fetch the dependency source manually.
|
||||
pfft-source = fetchzip {
|
||||
url = "https://vcvrack.com/downloads/dep/pffft.zip";
|
||||
sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1";
|
||||
# Unfortunately, they are not pinned, so we have no guarantee that they
|
||||
# will be stable, and therefore, we can't use them directly. Instead
|
||||
# we'll have to fetch them separately ourselves.
|
||||
pffft-source = fetchFromBitbucket {
|
||||
owner = "jpommier";
|
||||
repo = "pffft";
|
||||
rev = "988259a41d1522047a9420e6265a6ba8289c1654";
|
||||
sha256 = "Oq5N02UNXsbhcPUfjMtD0cgqAZsGx9ke9A+ArrenzGE=";
|
||||
};
|
||||
fuzzysearchdatabase-source = fetchFromBitbucket {
|
||||
owner = "j_norberg";
|
||||
repo = "fuzzysearchdatabase";
|
||||
rev = "fe62479811e503ef3c091f5a859d27bfcf0a44da";
|
||||
sha256 = "zgeUzuuInHPeveBIjlivRGIz+NSb7cW/9hMndxm6qOA=";
|
||||
};
|
||||
nanovg-source = fetchFromGitHub {
|
||||
owner = "memononen";
|
||||
owner = "VCVRack";
|
||||
repo = "nanovg";
|
||||
rev = "1f9c8864fc556a1be4d4bf1d6bfe20cde25734b4";
|
||||
sha256 = "08r15zrr6p1kxigxzxrg5rgya7wwbdx7d078r362qbkmws83wk27";
|
||||
rev = "0bebdb314aff9cfa28fde4744bcb037a2b3fd756";
|
||||
sha256 = "HmQhCE/zIKc3f+Zld229s5i5MWzRrBMF9gYrn8JVQzg=";
|
||||
};
|
||||
nanosvg-source = fetchFromGitHub {
|
||||
owner = "memononen";
|
||||
repo = "nanosvg";
|
||||
rev = "25241c5a8f8451d41ab1b02ab2d865b01600d949";
|
||||
sha256 = "114qgfmazsdl53rm4pgqif3gv8msdmfwi91lyc2jfadgzfd83xkg";
|
||||
rev = "ccdb1995134d340a93fb20e3a3d323ccb3838dd0";
|
||||
sha256 = "ymziU0NgGqxPOKHwGm0QyEdK/8jL/QYk5UdIQ3Tn8jw=";
|
||||
};
|
||||
osdialog-source = fetchFromGitHub {
|
||||
owner = "AndrewBelt";
|
||||
repo = "osdialog";
|
||||
rev = "e5db5de6444f4b2c4e1390c67b3efd718080c3da";
|
||||
sha256 = "0iqxn1md053nl19hbjk8rqsdcmjwa5l5z0ci4fara77q43rc323i";
|
||||
rev = "21b9dcc2a1bbdacb9b46da477ffd82a4ce9204b9";
|
||||
sha256 = "+4VCBuQvfiuEUdjFu3IB2FwbHFrDJXTb4vcVg6ZFwSM=";
|
||||
};
|
||||
oui-blendish-source = fetchFromGitHub {
|
||||
owner = "AndrewBelt";
|
||||
repo = "oui-blendish";
|
||||
rev = "79ec59e6bc7201017fc13a20c6e33380adca1660";
|
||||
sha256 = "17kd0lh2x3x12bxkyhq6z8sg6vxln8m9qirf0basvcsmylr6rb64";
|
||||
rev = "2fc6405883f8451944ed080547d073c8f9f31898";
|
||||
sha256 = "/QZFZuI5kSsEvSfMJlcqB1HiZ9Vcf3vqLqWIMEgxQK8=";
|
||||
};
|
||||
fundamental-source = fetchFromGitHub {
|
||||
owner = "VCVRack";
|
||||
repo = "Fundamental";
|
||||
rev = "533397cdcad5c6401ebd3937d6c1663de2473627"; # tip of branch v2
|
||||
sha256 = "QnwOgrYxiCa/7t/u6F63Ks8C9E8k6T+hia4JZFhp1LI=";
|
||||
};
|
||||
in
|
||||
with lib; stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "VCV-Rack";
|
||||
version = "1.1.6";
|
||||
version = "2.0.6";
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
type = "Application";
|
||||
name = pname;
|
||||
desktopName = "VCV Rack";
|
||||
genericName = "Eurorack simulator";
|
||||
comment = "Create music by patching together virtual synthesizer modules";
|
||||
exec = "Rack";
|
||||
icon = "Rack";
|
||||
categories = [ "AudioVideo" "AudioVideoEditing" "Audio" ];
|
||||
keywords = [ "music" ];
|
||||
})
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VCVRack";
|
||||
repo = "Rack";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ji64prr74qzxf5bx1sw022kbslx9nzll16lmk5in78hbl137b3i";
|
||||
sha256 = "vvGx8tnE7gMiboVUTywIzBB1q/IfiJ8TPnSHvmfHUQg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -56,46 +113,101 @@ with lib; stdenv.mkDerivation rec {
|
||||
# above), we do it here manually
|
||||
mkdir -p dep/include
|
||||
|
||||
cp -r ${pfft-source} dep/jpommier-pffft-source
|
||||
cp -r ${pffft-source}/* dep/pffft
|
||||
cp -r ${fuzzysearchdatabase-source}/* dep/fuzzysearchdatabase
|
||||
cp -r ${nanovg-source}/* dep/nanovg
|
||||
cp -r ${nanosvg-source}/* dep/nanosvg
|
||||
cp -r ${osdialog-source}/* dep/osdialog
|
||||
cp -r ${oui-blendish-source}/* dep/oui-blendish
|
||||
|
||||
cp dep/jpommier-pffft-source/*.h dep/include
|
||||
cp dep/pffft/*.h dep/include
|
||||
cp dep/fuzzysearchdatabase/src/*.hpp dep/include
|
||||
cp dep/nanosvg/**/*.h dep/include
|
||||
cp dep/nanovg/src/*.h dep/include
|
||||
cp dep/osdialog/*.h dep/include
|
||||
cp dep/oui-blendish/*.h dep/include
|
||||
|
||||
substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>"
|
||||
substituteInPlace compile.mk --replace "-march=nocona" ""
|
||||
# Build and dist the Fundamental plugins
|
||||
cp -r ${fundamental-source} plugins/Fundamental/
|
||||
chmod -R +rw plugins/Fundamental # will be used as build dir
|
||||
substituteInPlace plugin.mk --replace ":= all" ":= dist"
|
||||
|
||||
# Fix reference to zenity
|
||||
substituteInPlace dep/osdialog/osdialog_zenity.c \
|
||||
--replace 'zenityBin[] = "zenity"' 'zenityBin[] = "${gnome.zenity}/bin/zenity"'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkg-config ];
|
||||
buildInputs = [ alsa-lib curl glew glfw gtk2-x11 jansson libjack2 libsamplerate libzip rtaudio rtmidi speex ];
|
||||
nativeBuildInputs = [
|
||||
copyDesktopItems
|
||||
imagemagick
|
||||
jq
|
||||
libicns
|
||||
makeWrapper
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
curl
|
||||
ghc_filesystem
|
||||
glew
|
||||
glfw
|
||||
gnome.zenity
|
||||
gtk3-x11
|
||||
jansson
|
||||
libarchive
|
||||
libjack2
|
||||
libpulseaudio
|
||||
libsamplerate
|
||||
rtaudio
|
||||
rtmidi
|
||||
speex
|
||||
zstd
|
||||
];
|
||||
|
||||
buildFlags = [ "Rack" ];
|
||||
makeFlags = [ "all" "plugins" ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D -m755 -t $out/bin Rack
|
||||
install -D -m755 -t $out/lib libRack.so
|
||||
|
||||
mkdir -p $out/share/vcv-rack
|
||||
cp -r res Core.json template.vcv LICENSE* cacert.pem $out/share/vcv-rack
|
||||
cp -r res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $out/share/vcv-rack
|
||||
cp -r plugins/Fundamental/dist/Fundamental-*.vcvplugin $out/share/vcv-rack/Fundamental.vcvplugin
|
||||
|
||||
# Override the default global resource file directory
|
||||
wrapProgram $out/bin/Rack --add-flags "-s $out/share/vcv-rack"
|
||||
# Extract pngs from the Apple icon image and create
|
||||
# the missing ones from the 1024x1024 image.
|
||||
icns2png --extract icon.icns
|
||||
for size in 16 24 32 48 64 128 256 512 1024; do
|
||||
mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
|
||||
if [ ! -e icon_"$size"x"$size"x32.png ] ; then
|
||||
convert -resize "$size"x"$size" icon_1024x1024x32.png icon_"$size"x"$size"x32.png
|
||||
fi
|
||||
install -Dm644 icon_"$size"x"$size"x32.png $out/share/icons/hicolor/"$size"x"$size"/apps/Rack.png
|
||||
done;
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontWrapGApps = true;
|
||||
postFixup = ''
|
||||
# Wrap gApp and override the default global resource file directory
|
||||
wrapProgram $out/bin/Rack \
|
||||
"''${gappsWrapperArgs[@]}" \
|
||||
--add-flags "-s $out/share/vcv-rack"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Open-source virtual modular synthesizer";
|
||||
homepage = "https://vcvrack.com/";
|
||||
# The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a
|
||||
# The source is GPL3+ licensed, some of the art is CC-BY-NC 4.0 or under a
|
||||
# no-derivatives clause
|
||||
license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ];
|
||||
maintainers = with maintainers; [ moredread nathyong ];
|
||||
license = with licenses; [ gpl3Plus cc-by-nc-40 unfreeRedistributable ];
|
||||
maintainers = with maintainers; [ nathyong jpotier ddelabru ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -1,13 +1,12 @@
|
||||
diff -ru a/Makefile b/Makefile
|
||||
--- a/Makefile 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ b/Makefile 1970-01-01 01:00:01.000000000 +0100
|
||||
@@ -21,8 +21,8 @@
|
||||
build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0)
|
||||
--- a/Makefile 1970-01-01 01:00:01.000000000 +0100
|
||||
+++ b/Makefile 1970-01-01 01:00:01.000000000 +0100
|
||||
@@ -36,7 +36,7 @@ build/dep/osdialog/osdialog_gtk3.c.o: FLAGS += $(shell pkg-config --cflags gtk+-
|
||||
|
||||
LDFLAGS += -rdynamic \
|
||||
- dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a \
|
||||
+ -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -lzip -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio \
|
||||
-lpthread -lGL -ldl -lX11 -lasound -ljack \
|
||||
$(shell pkg-config --libs gtk+-2.0)
|
||||
TARGET := Rack
|
||||
endif
|
||||
LDFLAGS += -Wl,--whole-archive
|
||||
LDFLAGS += -static-libstdc++ -static-libgcc
|
||||
- LDFLAGS += dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libarchive.a dep/lib/libzstd.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a
|
||||
+ LDFLAGS += -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -larchive -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio
|
||||
LDFLAGS += -Wl,--no-whole-archive
|
||||
LDFLAGS += -lpthread -lGL -ldl -lX11 -lasound -ljack -lpulse -lpulse-simple
|
||||
LDFLAGS += $(shell pkg-config --libs gtk+-3.0)
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "vorta";
|
||||
version = "0.8.6";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "borgbase";
|
||||
repo = "vorta";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-J/Cl+et4AS44PPG2SmOHosKVw0XtOyNL0qJk68OHwQc=";
|
||||
sha256 = "sha256-9SfHZbNM+lRtwLO/0dE9C4cHb3pSPkxBUITYNEdPMQw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
@ -103,7 +103,6 @@
|
||||
, golint
|
||||
, gomodifytags
|
||||
, gopls
|
||||
, gotags
|
||||
, gotools
|
||||
, iferr
|
||||
, impl
|
||||
@ -1042,7 +1041,6 @@ self: super: {
|
||||
gomodifytags
|
||||
gopls
|
||||
# gorename
|
||||
# gotags
|
||||
gotools # contains staticcheck
|
||||
# guru
|
||||
iferr
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
pname = "joplin-desktop";
|
||||
version = "2.7.15";
|
||||
version = "2.8.8";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
@ -16,8 +16,8 @@ let
|
||||
src = fetchurl {
|
||||
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}";
|
||||
sha256 = {
|
||||
x86_64-linux = "sha256-PtfDH2W8wolqa10BoI9hazcj+1bszlnpt+D+sbzSRts=";
|
||||
x86_64-darwin = "sha256-CPD/2x5FxHL9CsYz9EZJX5SYiFGz7/fjntOlDMKHYEA=";
|
||||
x86_64-linux = "0ivljlw6kdpg94q9syi11zmk54w06m8j3zicx9nppqg720fw4zv3";
|
||||
x86_64-darwin = "0gpr3zi6z98pkg8hsvcmpck754cph53kmgl3bhp3zmmmfj0kxjhs";
|
||||
}.${system} or throwSystem;
|
||||
};
|
||||
|
||||
|
@ -14,12 +14,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "splitter";
|
||||
version = "651";
|
||||
version = "652";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.mkgmap.org.uk/mkgmap/splitter/trunk";
|
||||
rev = version;
|
||||
sha256 = "sha256-j6U+Wvxef151NEwkpuv4VdMac/cOT9YZUgkt+YPGCuk=";
|
||||
sha256 = "sha256-yCdVOT8if3AImD4Q63gKfMep7WZsrCgV+IXfP4ZL3Qw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -8,11 +8,11 @@
|
||||
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
|
||||
let
|
||||
pname = "zettlr";
|
||||
version = "2.2.6";
|
||||
version = "2.3.0";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Zettlr/Zettlr/releases/download/v${version}/Zettlr-${version}-x86_64.appimage";
|
||||
sha256 = "sha256-f01WLxp8fe7y2EwTUhpPqcRuWBs/9lMaAAOdybmHB5M=";
|
||||
sha256 = "sha256-3p9RO6hpioYF6kdGV+/9guoqxaPCJG73OsrN69SHQHk=";
|
||||
};
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
|
@ -19,9 +19,9 @@
|
||||
}
|
||||
},
|
||||
"beta": {
|
||||
"version": "103.0.5060.42",
|
||||
"sha256": "0275n5g8j4sha98drjwlm6d2smwm3nmpmfpszi16cx59m6zylncq",
|
||||
"sha256bin64": "0pq41iv296mk508yc1snvm5a4fvgs9y85gk2w45w973g5maipzgf",
|
||||
"version": "103.0.5060.53",
|
||||
"sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf",
|
||||
"sha256bin64": "01vzhhnngr6a7mm1y25ax8vhph6dl948fvkyhdhb9m4j5l4lcqj4",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-05-11",
|
||||
|
@ -30,6 +30,7 @@
|
||||
, at-spi2-core
|
||||
, libuuid
|
||||
, systemd
|
||||
, wayland
|
||||
}:
|
||||
|
||||
let
|
||||
@ -76,7 +77,7 @@ stdenv.mkDerivation rec {
|
||||
xorg.libXcomposite xorg.libXdamage xorg.libXext
|
||||
xorg.libXfixes xorg.libXrandr libxkbcommon
|
||||
gtk3 pango cairo gdk-pixbuf mesa
|
||||
alsa-lib at-spi2-core xorg.libxshmfence systemd
|
||||
alsa-lib at-spi2-core xorg.libxshmfence systemd wayland
|
||||
];
|
||||
naclHelper = lib.makeLibraryPath [
|
||||
glib nspr atk libdrm xorg.libxcb mesa xorg.libX11
|
||||
|
@ -1,20 +1,20 @@
|
||||
{
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "101.0.1210.19";
|
||||
version = "103.0.1264.21";
|
||||
revision = "1";
|
||||
sha256 = "sha256:1kgc19ryw69xiqppz90d6sa45g99hzkh7x5yk9d3xlh1gc1xn54p";
|
||||
sha256 = "sha256:1336i0hy7xnla0pi4vahaxshhmivi1zljhaxyg63352bc7w9j64f";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "102.0.1227.0";
|
||||
version = "104.0.1287.1";
|
||||
revision = "1";
|
||||
sha256 = "sha256:0dnyandri7yg7c9812pnsxqszxyqcssxf87yskjg2vw95hawf11x";
|
||||
sha256 = "sha256:10h360vfsfql42i6mpdvf8d0219506ipbk3hdpwl0jhlsphmhw61";
|
||||
};
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "100.0.1185.44";
|
||||
version = "102.0.1245.44";
|
||||
revision = "1";
|
||||
sha256 = "sha256:0zv1zyijh620xz36a6nmhv7rbv4ln5f245hyh0w1sngynsl1rz89";
|
||||
sha256 = "sha256:10r12xlkcnag5jdmnwpqsbkjx1ih1027l573vxmcxmvpmj6y4373";
|
||||
};
|
||||
}
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.25";
|
||||
version = "0.8.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-m4vgQ4K73qmUMwPtviUQuRC2jNIDlE516WEZkFr3Upw=";
|
||||
sha256 = "sha256-Tw/FxrmBpC+FDvfvDT1xQtcQwlxUpQHDMzTs3TrugYg=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "atlantis";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runatlantis";
|
||||
repo = "atlantis";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cd2dhrqJl/VRhOYB1g9OpOnPV92EQm8f3rRGZGVN+IY=";
|
||||
sha256 = "sha256-0/LrXdksljoTvhOWAyKzR/8fNqM6ZqCjfgTNUfZNdXw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ux+Hw/TjeiY9VYhIQxaltZGk5CkxAab8R7kAsTaMUGc=";
|
||||
vendorSha256 = "sha256-HEMyJRNk7sii87cZBfuQy41n0sI+On4271bVVNVWXeg=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
@ -1253,10 +1253,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/vsphere",
|
||||
"repo": "terraform-provider-vsphere",
|
||||
"rev": "v2.1.1",
|
||||
"sha256": "sha256-Xu5BMmOHEX+ctPu8374BDGsRC5hnvzji5oI69ptIi3Y=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.1.1"
|
||||
"rev": "v2.2.0",
|
||||
"sha256": "sha256-UwhIGK1zQ++IuwAKH9i+Dlu2vvXkMYL+s1P03qKSe3E=",
|
||||
"vendorSha256": "sha256-160GDEQfymeCJpjYOoWP5sGQ0PJHw9kKPaefmbF5Ig4=",
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"vultr": {
|
||||
"owner": "vultr",
|
||||
|
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sacc";
|
||||
version = "1.05";
|
||||
version = "1.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz";
|
||||
sha512 = "080vpacipdis396lrw3fxc1z7h2d0njm2zi63kvlk0n2m1disv97c968zx8dp76kfw1s03nvvr6v3vnpfkkywiz1idjc92s5rgcbsk1";
|
||||
sha512 = "7a895e432e1d28b7d9b2bb2a5326ca32350876a2c80d39dc6c19e75347d72a4847f1aa4ff11f07e8a9adea14ea71b84d70890dcc170ff6ce0b779e1d6586b4fa";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ipfs";
|
||||
version = "0.12.2"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
version = "0.13.0"; # When updating, also check if the repo version changed and adjust repoVersion below
|
||||
rev = "v${version}";
|
||||
|
||||
repoVersion = "12"; # Also update ipfs-migrator when changing the repo version
|
||||
@ -10,7 +10,7 @@ buildGoModule rec {
|
||||
# go-ipfs makes changes to it's source tarball that don't match the git source.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz";
|
||||
sha256 = "sha256-66NNLMSfeBHQh/QlnETB/ssra9CKbD+jtaJuX+14x00=";
|
||||
sha256 = "sha256-eEIHsmtD3vF48RVFHEz28gkVv7u50pMBE8Z+oaM6pLM=";
|
||||
};
|
||||
|
||||
# tarball contains multiple files/directories
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ipget";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ipfs";
|
||||
repo = "ipget";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qRPke8/CUmGX6v+8qv9JQCUC8T9pjwRRyGmBWvatsJ0=";
|
||||
sha256 = "sha256-gtDmBy7IpZCbeDG8JeKvMoaJmXpjnmKGustaNLIlTlY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg=";
|
||||
|
@ -1,18 +1,19 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "zeronet-conservancy";
|
||||
version = "0.7.5";
|
||||
version = "0.7.6";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeronet-conservancy";
|
||||
repo = "zeronet-conservancy";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-cq0q5hXEhazHPJODNJ8iL0qAB5DJW6ANST4r/rslvXk=";
|
||||
sha256 = "sha256-tWNU7UJVWB+aRLam6WKV/HaRRTIQvlEgxe4xJYKpXJY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
@ -35,6 +36,10 @@ python3Packages.buildPythonApplication rec {
|
||||
--set PATH ${python3Packages.python}/bin
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
nixos-test = nixosTests.zeronet-conservancy;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fork/continuation of the ZeroNet project";
|
||||
longDescription = ''
|
||||
|
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "horizon-eda";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "horizon-eda";
|
||||
repo = "horizon";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lw5j1zqd2wdafgxl4ahcphaabs7vlw4kaa1c566hwfjxs46dmg9";
|
||||
sha256 = "1vvps44n9yrzdpircl98n4061lcmwksisnf3a8xkf3qbcnixnwlp";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -1,23 +1,24 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "git-appraise-unstable";
|
||||
version = "2018-02-26";
|
||||
rev = "2414523905939525559e4b2498c5597f86193b61";
|
||||
|
||||
goPackagePath = "github.com/google/git-appraise";
|
||||
buildGoModule rec {
|
||||
pname = "git-appraise";
|
||||
version = "unstable-2022-04-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "google";
|
||||
repo = "git-appraise";
|
||||
sha256 = "04xkp1jpas1dfms6i9j09bgkydih0q10nhwn75w9ds8hi2qaa3sa";
|
||||
rev = "99aeb0e71544d3e1952e208c339b1aec70968cf3";
|
||||
sha256 = "sha256-TteTI8yGP2sckoJ5xuBB5S8xzm1upXmZPlcDLvXZrpc=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
vendorSha256 = "sha256-Lzq4qpDAUjKFA2T685eW9NCfzEhDsn5UR1A1cIaZadE=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Distributed code review system for Git repos";
|
||||
homepage = "https://github.com/google/git-appraise";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.vdemeester ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ vdemeester ];
|
||||
};
|
||||
}
|
||||
|
@ -2,11 +2,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "certifi";
|
||||
namespace = "script.module.certifi";
|
||||
version = "2020.12.05+matrix.1";
|
||||
version = "2022.5.18+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy";
|
||||
sha256 = "tk4Ven35sicLxrT7SO2yx5kQORjFP6niRuS9SMocJKY=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
@ -2,11 +2,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "idna";
|
||||
namespace = "script.module.idna";
|
||||
version = "2.10.0+matrix.1";
|
||||
version = "3.3.0+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7";
|
||||
sha256 = "gXW1BvM3CLKshVPaemjmzEoZekU0QjuxJY9zGbGwK18=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
@ -2,11 +2,11 @@
|
||||
buildKodiAddon rec {
|
||||
pname = "requests";
|
||||
namespace = "script.module.requests";
|
||||
version = "2.25.1+matrix.1";
|
||||
version = "2.27.1+matrix.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "00qhykizvspzfwgl7qz9cyxrazs54jgin40g49v5nzmjq3qf62hb";
|
||||
sha256 = "QxxVT6XaEYQtAFkZde8EaTXzGO7cjG2pApQZcA32xA0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -104,7 +104,7 @@ stdenv.mkDerivation (removeAttrs ({
|
||||
// (optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; })
|
||||
// (optionalAttrs (!args?installPhase && !args?useMelquiondRemake) {
|
||||
installFlags =
|
||||
[ "DESTDIR=$(out)" ] ++ coqlib-flags ++ docdir-flags ++
|
||||
coqlib-flags ++ docdir-flags ++
|
||||
extraInstallFlags;
|
||||
})
|
||||
// (optionalAttrs useDune2 {
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
buildManPages {
|
||||
pname = "execline-man-pages";
|
||||
version = "2.8.1.0.4";
|
||||
sha256 = "1cxi09dlzvjbilmzgmr3xvwvx0l3s1874k3gr85kbjnvp1c1r6cd";
|
||||
version = "2.8.3.0.2";
|
||||
sha256 = "0fzv5as81aqgl8llbz8c5bk5n56iyh4g70r54wmj71rh2d1pihk5";
|
||||
description = "Port of the documentation for the execline suite to mdoc";
|
||||
maintainers = [ lib.maintainers.sternenseemann ];
|
||||
}
|
||||
|
@ -137,6 +137,10 @@
|
||||
"fuzzy-clock@keepawayfromfire.co.uk",
|
||||
"FuzzyClock@johngoetz"
|
||||
],
|
||||
"panel-date-format": [
|
||||
"panel-date-format@keiii.github.com",
|
||||
"panel-date-format@atareao.es"
|
||||
],
|
||||
"disable-unredirect-fullscreen-windows": [
|
||||
"unredirect@vaina.lt",
|
||||
"unredirect@aunetx"
|
||||
@ -167,6 +171,10 @@
|
||||
"lockkeys@vaina.lt",
|
||||
"lockkeys@fawtytoo"
|
||||
],
|
||||
"panel-date-format": [
|
||||
"panel-date-format@keiii.github.com",
|
||||
"panel-date-format@atareao.es"
|
||||
],
|
||||
"wireguard-indicator": [
|
||||
"wireguard-indicator@gregos.me",
|
||||
"wireguard-indicator@atareao.es"
|
||||
|
@ -12,6 +12,9 @@
|
||||
"lockkeys@vaina.lt" = "lock-keys";
|
||||
"lockkeys@fawtytoo" = "lock-keys-2";
|
||||
|
||||
"panel-date-format@keiii.github.com" = "panel-date-format";
|
||||
"panel-date-format@atareao.es" = "panel-date-format-2";
|
||||
|
||||
"volume_scroller@trflynn89.pm.me" = "volume-scroller";
|
||||
"volume_scroller@noskoski" = "volume-scroller-2";
|
||||
|
||||
@ -57,9 +60,6 @@
|
||||
"SomaFm-Radio@alireza6677.gmail.com" = "somafm-internet-radio";
|
||||
"SomaFm-Radio@cajhne.gmail.com" = "somafm-internet-radio-2";
|
||||
|
||||
"panel-date-format@keiii.github.com" = "panel-date-format";
|
||||
"panel-date-format@atareao.es" = "panel-date-format-2";
|
||||
|
||||
"extension-list@tu.berry" = "extension-list";
|
||||
"screen-lock@garciabaameiro.com" = "screen-lock"; # Don't know why they got 'extension-list' as slug
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
@ -2,23 +2,23 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fpc-binary";
|
||||
version = "3.2.0";
|
||||
version = "3.2.2";
|
||||
|
||||
src =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.i386-linux.tar";
|
||||
sha256 = "0y0510b2fbxbqz28967xx8b023k6q9fv5yclfrc1yc9mg8fyn411";
|
||||
sha256 = "f62980ac0b2861221f79fdbff67836aa6912a4256d4192cfa4dfa0ac5b419958";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar";
|
||||
sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni";
|
||||
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.x86_64-linux.tar";
|
||||
sha256 = "5adac308a5534b6a76446d8311fc340747cbb7edeaacfe6b651493ff3fe31e83";
|
||||
}
|
||||
else if stdenv.hostPlatform.system == "aarch64-linux" then
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar";
|
||||
sha256 = "1h481ngg3m8nlsg9mw7rr1bn2c4sj4wzqny9bxyq3xvcral12r71";
|
||||
sha256 = "b39470f9b6b5b82f50fc8680a5da37d2834f2129c65c24c5628a80894d565451";
|
||||
}
|
||||
else throw "Not supported on ${stdenv.hostPlatform.system}.";
|
||||
|
||||
|
@ -3,12 +3,12 @@
|
||||
let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.2.0";
|
||||
version = "3.2.2";
|
||||
pname = "fpc";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz";
|
||||
sha256 = "0f38glyn3ffmqww432snhx2b8wyrq0yj1njkp4zh56lqrvm19fgr";
|
||||
sha256 = "85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f";
|
||||
};
|
||||
|
||||
buildInputs = [ startFPC gawk ];
|
||||
|
@ -9,7 +9,7 @@
|
||||
# 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that
|
||||
|
||||
let
|
||||
version = "2.0.12";
|
||||
version = "2.2.2-0";
|
||||
|
||||
# as of 2.0.10 a suffix is being added. That may or may not disappear and then
|
||||
# come back, so just leave this here.
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz";
|
||||
sha256 = "sha256-umzvf4I6LSgWYimYLvySYDnUIxPEDiL+DGd2wT0AFbI=";
|
||||
sha256 = "a9832004cffec8aca69de87290441d54772bf95d5d04372249d5a5491fb674c4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -19,16 +19,16 @@ index a7398fb9..8e46fec0 100644
|
||||
{$else powerpc64}
|
||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true);
|
||||
{$endif powerpc64}
|
||||
@@ -164,7 +164,7 @@ begin
|
||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true);
|
||||
@@ -165,7 +165,7 @@ begin
|
||||
{$endif i386}
|
||||
{$ifdef aarch64}
|
||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true);
|
||||
- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true);
|
||||
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true);
|
||||
{$endif aarch64}
|
||||
{$ifdef powerpc}
|
||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true);
|
||||
@@ -185,53 +185,53 @@ begin
|
||||
@@ -186,53 +186,53 @@ begin
|
||||
end;
|
||||
|
||||
{$ifdef m68k}
|
||||
@ -95,7 +95,7 @@ index a7398fb9..8e46fec0 100644
|
||||
{$endif sparc64}
|
||||
|
||||
|
||||
@@ -266,9 +266,9 @@ begin
|
||||
@@ -267,9 +267,9 @@ begin
|
||||
libctype:=uclibc;
|
||||
end
|
||||
{$ifdef i386}
|
||||
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://www.juniper-lang.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ wunderbrick ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -32,4 +32,7 @@ with lib; let hb = mkCoqDerivation {
|
||||
hb.overrideAttrs (o:
|
||||
optionalAttrs (versions.isGe "1.2.0" o.version || o.version == "dev")
|
||||
{ buildPhase = "make build"; }
|
||||
//
|
||||
optionalAttrs (versions.isGe "1.1.0" o.version || o.version == "dev")
|
||||
{ installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; }
|
||||
)
|
||||
|
@ -76,7 +76,8 @@ let
|
||||
sourceFile = "source.dhall";
|
||||
|
||||
in
|
||||
runCommand name { } (''
|
||||
runCommand name { impureEnvVars = lib.fetchers.proxyImpureEnvVars; }
|
||||
(''
|
||||
set -eu
|
||||
|
||||
mkdir -p ${cacheDhall} $out/${cacheDhall}
|
||||
|
@ -4,6 +4,7 @@
|
||||
, wrapLua
|
||||
# Whether the derivation provides a lua module or not.
|
||||
, toLuaModule
|
||||
, luarocksCheckHook
|
||||
}:
|
||||
|
||||
{
|
||||
@ -42,6 +43,7 @@ pname
|
||||
|
||||
, passthru ? {}
|
||||
, doCheck ? false
|
||||
, doInstallCheck ? false
|
||||
|
||||
# Non-Lua / system (e.g. C library) dependencies. Is a list of deps, where
|
||||
# each dep is either a derivation, or an attribute set like
|
||||
@ -97,10 +99,12 @@ let
|
||||
# Filter out the lua derivation itself from the Lua module dependency
|
||||
# closure, as it doesn't have a rock tree :)
|
||||
requiredLuaRocks = lib.filter (d: d ? luaModule)
|
||||
(lua.pkgs.requiredLuaModules luarocksDrv.propagatedBuildInputs);
|
||||
(lua.pkgs.requiredLuaModules (luarocksDrv.nativeBuildInputs ++ luarocksDrv.propagatedBuildInputs));
|
||||
|
||||
# example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ]
|
||||
externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) (luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs));
|
||||
externalDepsGenerated = lib.unique (lib.filter (drv: !drv ? luaModule) (
|
||||
luarocksDrv.nativeBuildInputs ++ luarocksDrv.propagatedBuildInputs ++ luarocksDrv.buildInputs)
|
||||
);
|
||||
externalDeps' = lib.filter (dep: !lib.isDerivation dep) externalDeps;
|
||||
|
||||
luarocksDrv = toLuaModule ( lua.stdenv.mkDerivation (
|
||||
@ -108,15 +112,17 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
|
||||
|
||||
name = namePrefix + pname + "-" + version;
|
||||
|
||||
buildInputs = [ wrapLua lua.pkgs.luarocks ]
|
||||
nativeBuildInputs = [
|
||||
wrapLua
|
||||
lua.pkgs.luarocks
|
||||
]
|
||||
++ buildInputs
|
||||
++ lib.optionals doCheck checkInputs
|
||||
++ lib.optionals doCheck ([ luarocksCheckHook ] ++ checkInputs)
|
||||
++ (map (d: d.dep) externalDeps')
|
||||
;
|
||||
|
||||
# propagate lua to active setup-hook in nix-shell
|
||||
propagatedBuildInputs = propagatedBuildInputs ++ [ lua ];
|
||||
inherit doCheck;
|
||||
|
||||
# @-patterns do not capture formal argument default values, so we need to
|
||||
# explicitly inherit this for it to be available as a shell variable in the
|
||||
@ -190,6 +196,14 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps" "extraVariab
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
LUAROCKS_CONFIG="$PWD/${luarocks_config}";
|
||||
|
||||
shellHook = ''
|
||||
runHook preShell
|
||||
export LUAROCKS_CONFIG="$PWD/${luarocks_config}";
|
||||
runHook postShell
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit lua; # The lua interpreter
|
||||
inherit externalDeps;
|
||||
|
@ -24,4 +24,9 @@ in {
|
||||
mv hook.sh $out
|
||||
'';
|
||||
|
||||
luarocksCheckHook = callPackage ({ luarocks }:
|
||||
makeSetupHook {
|
||||
name = "luarocks-check-hook";
|
||||
deps = [ luarocks ];
|
||||
} ./luarocks-check-hook.sh) {};
|
||||
}
|
||||
|
@ -0,0 +1,18 @@
|
||||
# Setup hook for checking whether Python imports succeed
|
||||
echo "Sourcing luarocks-check-hook.sh"
|
||||
|
||||
luarocksCheckPhase () {
|
||||
echo "Executing luarocksCheckPhase"
|
||||
runHook preCheck
|
||||
|
||||
luarocks test
|
||||
|
||||
runHook postCheck
|
||||
echo "Finished executing luarocksCheckPhase"
|
||||
}
|
||||
|
||||
if [ -z "${dontLuarocksCheck-}" ] && [ -z "${checkPhase-}" ]; then
|
||||
echo "Using luarocksCheckPhase"
|
||||
checkPhase+=" luarocksCheckPhase"
|
||||
fi
|
||||
|
@ -42,13 +42,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvgm";
|
||||
version = "unstable-2022-05-27";
|
||||
version = "unstable-2022-06-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValleyBell";
|
||||
repo = "libvgm";
|
||||
rev = "ec6ddae3e3488b6dc9e993cb0f76d3015d2f6fff";
|
||||
sha256 = "AwIx4LuVSuCf7xgtximcB6N+rzC7g1ajeBdaBz6RSyk=";
|
||||
rev = "577ff77185aa19943e5c7a858eb2485ec75c7539";
|
||||
sha256 = "0R7qqrFs6Ap8FM5uBHX/iE+S5cQzuwWn65xxfp4/CdQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
@ -2546,6 +2546,38 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
sqlite = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, luv
|
||||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "sqlite";
|
||||
version = "v1.2.2-0";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/sqlite-v1.2.2-0.rockspec";
|
||||
sha256 = "0jxsl9lpxsbzc6s5bwmh27mglkqz1299lz68vfxayvailwl3xbxm";
|
||||
}).outPath;
|
||||
src = fetchgit ( removeAttrs (builtins.fromJSON ''{
|
||||
"url": "https://github.com/tami5/sqlite.lua.git",
|
||||
"rev": "6c00ab414dc1b69621b145908c582b747f24b46e",
|
||||
"date": "2022-06-17T15:57:13+03:00",
|
||||
"path": "/nix/store/637s46bsvsxfnzmy6ygig3y0vqmf3r8p-sqlite.lua",
|
||||
"sha256": "0ckifx6xxrannn9szacgiiqjsp4rswghxscdl3s411dhas8djj1m",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": true,
|
||||
"deepClone": false,
|
||||
"leaveDotGit": false
|
||||
}
|
||||
'') ["date" "path"]) ;
|
||||
|
||||
propagatedBuildInputs = [ luv ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/tami5/sqlite.lua";
|
||||
description = "SQLite/LuaJIT binding and a highly opinionated wrapper for storing, retrieving, caching, and persisting [SQLite] databases";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
std-_debug = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
||||
, fetchgit, lua
|
||||
}:
|
||||
|
@ -15,7 +15,7 @@ with prev;
|
||||
});
|
||||
|
||||
busted = prev.busted.overrideAttrs(oa: {
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = oa.nativeBuildInputs ++ [
|
||||
pkgs.installShellFiles
|
||||
];
|
||||
postConfigure = ''
|
||||
@ -30,9 +30,6 @@ with prev;
|
||||
});
|
||||
|
||||
cqueues = (prev.lib.overrideLuarocks prev.cqueues (drv: {
|
||||
nativeBuildInputs = [
|
||||
pkgs.gnum4
|
||||
];
|
||||
externalDeps = [
|
||||
{ name = "CRYPTO"; dep = pkgs.openssl; }
|
||||
{ name = "OPENSSL"; dep = pkgs.openssl; }
|
||||
@ -46,6 +43,11 @@ with prev;
|
||||
date = head rel;
|
||||
rev = last (splitString "-" (last rel));
|
||||
in "${date}-${rev}";
|
||||
|
||||
nativeBuildInputs = oa.nativeBuildInputs ++ [
|
||||
pkgs.gnum4
|
||||
];
|
||||
|
||||
# Upstream rockspec is pointlessly broken into separate rockspecs, per Lua
|
||||
# version, which doesn't work well for us, so modify it
|
||||
postConfigure = let inherit (prev.cqueues) pname; in ''
|
||||
@ -111,8 +113,8 @@ with prev;
|
||||
propagatedBuildInputs = with pkgs.lib; optional (!isLuaJIT) luaffi;
|
||||
});
|
||||
|
||||
lgi = prev.lib.overrideLuarocks prev.lgi (drv: {
|
||||
nativeBuildInputs = [
|
||||
lgi = prev.lgi.overrideAttrs (oa: {
|
||||
nativeBuildInputs = oa.nativeBuildInputs ++ [
|
||||
pkgs.pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
@ -415,6 +417,23 @@ with prev;
|
||||
'';
|
||||
});
|
||||
|
||||
sqlite = prev.lib.overrideLuarocks prev.sqlite (drv: {
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ final.plenary-nvim pkgs.neovim-unwrapped ];
|
||||
|
||||
# we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin
|
||||
checkPhase = ''
|
||||
export LIBSQLITE="${pkgs.sqlite.out}/lib/libsqlite3.so"
|
||||
export HOME="$TMPDIR";
|
||||
|
||||
nvim --headless -i NONE \
|
||||
-u test/minimal_init.vim --cmd "set rtp+=${pkgs.vimPlugins.plenary-nvim}" \
|
||||
-c "PlenaryBustedDirectory test/auto/ { minimal_init = './test/minimal_init.vim' }"
|
||||
'';
|
||||
|
||||
});
|
||||
|
||||
std-_debug = prev.std-_debug.overrideAttrs(oa: {
|
||||
# run make to generate lib/std/_debug/version.lua
|
||||
preConfigure = ''
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chess";
|
||||
version = "1.9.1";
|
||||
version = "1.9.2";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "niklasf";
|
||||
repo = "python-${pname}";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-sJ5mw9sQQn2IP7iDjYUGf6P3FqAbHJC1R4phnwVcNIM=";
|
||||
sha256 = "sha256-RGAEkeE6YAik//yZt9mJdrFj4z0yxlHjZPLUaHd9yUQ=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "chess" ];
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-reversion";
|
||||
version = "5.0.0";
|
||||
version = "5.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-C63jw5k4dFEIfwxng14NPRhtdn3mpcW6U6iOr8Pyccg=";
|
||||
sha256 = "sha256-orJqS4SxEzgTbKnWRXpK8wcJkseoliOzSQCaEj8o6h0=";
|
||||
};
|
||||
|
||||
# tests assume the availability of a mysql/postgresql database
|
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastcore";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "fastai";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-2lV96QOlXfQ8PjSW45u9ZyXpssDgLyiUgmIC0VLOGus=";
|
||||
sha256 = "sha256-i/Xw9lyKEW7uiNIyqeIXzwdowIugsNraQBb4fKGaX9U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gvm-tools";
|
||||
version = "21.10.0";
|
||||
version = "22.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LGdbqkIKdmtUOGSoCme6oVG1aCbtASSxi9K9f3khafA=";
|
||||
sha256 = "sha256-H97pVLhXdO56cFzNV2hzaAqax3zKyeBORPiLc7pllEo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hahomematic";
|
||||
version = "1.8.4";
|
||||
version = "1.8.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-ZoHH96BliXDTO6+yVs+GFSAxG9wx32tHrr74zTVq1FI=";
|
||||
sha256 = "sha256-hkfTFmiJAgVgbJ/0G61sq6k0+B5gCo7t51DCAESzGUQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
28
pkgs/development/python-modules/infinity/default.nix
Normal file
28
pkgs/development/python-modules/infinity/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "infinity";
|
||||
version = "1.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1npcc4adcc3c9diw4kgmd5c0ikym1iz364p2zp6gs011rqaprald";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
six
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "All-in-one infinity value for Python. Can be compared to any object.";
|
||||
homepage = "https://github.com/kvesteri/infinity";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ mupdt ];
|
||||
};
|
||||
}
|
@ -6,14 +6,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "peaqevcore";
|
||||
version = "1.0.14";
|
||||
version = "1.0.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zHVi950iUultt66amL22d/7INglJtSOHvWCPUSaw5h4=";
|
||||
hash = "sha256-c+DTawzDwrNmv9RGRa5hEw+cKLTo3BKx3hK8zHW7tWk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytenable";
|
||||
version = "1.4.6";
|
||||
version = "1.4.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -28,8 +28,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "tenable";
|
||||
repo = "pyTenable";
|
||||
rev = version;
|
||||
hash = "sha256-0isXHh0b2l8Br4XXR1y8A+zu8vkJjEsJ6faNNEx12lM=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-w6IM82nxv6rg3XbrHZfoN517usOOo/ly1GGgjnIdcEw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schwifty";
|
||||
version = "2022.6.0";
|
||||
version = "2022.6.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MekF96K8IPjop5764Oq6ZcvKJOTc1Qg/gV5Dz2iacBk=";
|
||||
sha256 = "sha256-d3V+pkq+gAWx6vAC5SDELscks+7a+fAFh31pwsCCSZU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "scmrepo";
|
||||
version = "0.0.24";
|
||||
version = "0.0.25";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-S1jeLls0do9sCqTWe8h8+8CO3oM160J97UmISUhTU/s=";
|
||||
hash = "sha256-269vJNclTBWEqM9AJbF96R1I6Ru3q8YBd5A8Rmw7Jjo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ssh-mitm";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-F7+odIWiEy7Aea+Jnx5VuDv5PdMlvxX975QmlLQ5APE=";
|
||||
hash = "sha256-zLVi+9XvNAfa3fB2GRdNnEPoDY2Wf3XkbQGOT0RNkdQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stripe";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2sYMEC+2eorJqhZWmwr9DWO5bGK+BkCIUZ4cZhs/Ofo=";
|
||||
hash = "sha256-XcN979nWXgUwItq8tlnnNisFinr3QEfuWFGKKQenYfI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "svg.path";
|
||||
version = "6.1";
|
||||
version = "6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-i0Rx37c2GwibZstC2pZBWO0A6aXKEVuKaaxPXcJHSj8=";
|
||||
hash = "sha256-GiFZ+duJjfk8RjfP08yvfaH9Bz9Z+ppZUMc+RtSqGso=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
65
pkgs/development/python-modules/threat9-test-bed/default.nix
Normal file
65
pkgs/development/python-modules/threat9-test-bed/default.nix
Normal file
@ -0,0 +1,65 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, faker
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, gunicorn
|
||||
, pyopenssl
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "threat9-test-bed";
|
||||
version = "0.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "threat9";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0YSjMf2gDdrvkDaT77iwfCkiDDXKHnZyI8d7JmBSuCg=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
faker
|
||||
flask
|
||||
gunicorn
|
||||
pyopenssl
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"threat9_test_bed"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Assertion issue with the response codes
|
||||
"test_http_service_mock"
|
||||
"tests_http_service_mock"
|
||||
"test_http_service_mock_random_port"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module for adding unittests.mock as view functions";
|
||||
homepage = "https://github.com/threat9/threat9-test-bed";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.13.2";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tPcj4QTqO03SKyZh7OQbXvjJPheUeWGhWfqpy/IBrk4=";
|
||||
hash = "sha256-qJVzeorNojWzJ6TRTFQNNOXLWbHLMTteJaDWUcrz0j0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gosec";
|
||||
version = "2.11.0";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "securego";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AYD45L1FFT/S1toLK489C2TTasTHVXIs4Tf7TLOaye0=";
|
||||
sha256 = "sha256-Y4QL6vYCTZUCh+HF86QI+ENel/pK16XpLd6CF4RWcK0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zzbINVp8EA5aIvwUiFlQRtD6YL0iytbgVzCHbo+clYI=";
|
||||
vendorSha256 = "sha256-5rA2C3nyvSUiBQ/Nk5OJ9e9tf8CKHQB+6rLUJXESK/0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gosec"
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2022-05-17";
|
||||
cargoSha256 = "sha256-H0nuS56mvo5YUAUOsEnR4Cv3iFKixoHK83BcM1PFMA8=";
|
||||
version = "2022-06-13";
|
||||
cargoSha256 = "sha256-pNYhX6Jh/NPIVf7labyDKxk8siHFABMSsJ3ZVBWowUo=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-vrVpgQYUuJPgK1NMb1nxlCdxjoYo40YkUbZpH2Z2mwM=";
|
||||
sha256 = "sha256-IArOOdvfz+864Rs7fgHolfYfcjYTlvWebeEsJgnfyqI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildFeatures = lib.optional useMimalloc "mimalloc";
|
||||
|
||||
RUST_ANALYZER_REV = version;
|
||||
CFG_RELEASE = version;
|
||||
|
||||
inherit doCheck;
|
||||
preCheck = lib.optionalString doCheck ''
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fheroes2";
|
||||
version = "0.9.15";
|
||||
version = "0.9.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ihhub";
|
||||
repo = "fheroes2";
|
||||
rev = version;
|
||||
sha256 = "sha256-bT6asrre16NuavG7X28aHdEPeHdxMBdz2o2KCB+mrbg=";
|
||||
sha256 = "sha256-avN7InwC6YOWSRjV15HOKdAU8azZiFUfT6JjwfDAdCs=";
|
||||
};
|
||||
|
||||
buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];
|
||||
|
91
pkgs/games/titanion/default.nix
Normal file
91
pkgs/games/titanion/default.nix
Normal file
@ -0,0 +1,91 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchpatch
|
||||
, fetchurl
|
||||
, unzip
|
||||
, gdc
|
||||
, SDL
|
||||
, SDL_mixer
|
||||
, bulletml
|
||||
}:
|
||||
|
||||
let
|
||||
debianPatch = patchname: hash: fetchpatch {
|
||||
name = "${patchname}.patch";
|
||||
url = "https://sources.debian.org/data/main/t/titanion/0.3.dfsg1-7/debian/patches/${patchname}";
|
||||
sha256 = hash;
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "titanion";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://abagames.sakura.ne.jp/windows/ttn${lib.replaceStrings ["."] ["_"] version}.zip";
|
||||
sha256 = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(debianPatch
|
||||
"imports.patch"
|
||||
"sha256-kSXpaTpYq6w9e0yLES2QGNQ8+vFIiOpw2P9MA8gZr8s=")
|
||||
(debianPatch
|
||||
"fix.diff"
|
||||
"sha256-0WkkfuhJaAMY46VVyc3ldMQwgOVoQJDw/8zbm6H2sHU=")
|
||||
(debianPatch
|
||||
"directories.patch"
|
||||
"sha256-fhQJuy2+r0YOQNwMqG85Gr7fJehmf00Scran+NPYQrw=")
|
||||
(debianPatch
|
||||
"windowed.patch"
|
||||
"sha256-xouXIuIKfKFGsoOEJqL9jdsdnkX4nqwPGcoB+32Wvgo=")
|
||||
(debianPatch
|
||||
"dotfile.patch"
|
||||
"sha256-sAml53Hh0ltbqN8xZDZuUJcaPfjK56jf4ymFXYD38v0=")
|
||||
(debianPatch
|
||||
"window-resize.patch"
|
||||
"sha256-WwAi1aU4CmaX+O8fw0TfLhNSXFaObExrn7nuhesVkKM=")
|
||||
(debianPatch
|
||||
"makefile.patch"
|
||||
"sha256-g0jDPmc0SWXkTLhiczeTse/WGCtgMUsbyPNZzwK3U+o=")
|
||||
(debianPatch
|
||||
"dlang_v2.patch"
|
||||
"sha256-tfTAAKlPFSjbfAK1EjeB3unj9tbMlNaajJ+VVSMMiYw=")
|
||||
(debianPatch
|
||||
"gdc-8.patch"
|
||||
"sha256-BxkPfSEymq7TDA+yjJHaYsjtGr0Tuu1/sWLwRBAMga4=")
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm *.dll ttn.exe
|
||||
rm -r lib
|
||||
for f in src/abagames/ttn/screen.d src/abagames/util/sdl/sound.d src/abagames/util/sdl/texture.d; do
|
||||
substituteInPlace $f \
|
||||
--replace "/usr/" "$out/"
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
unzip
|
||||
gdc
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
bulletml
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -Dm755 titanion $out/bin/titanion
|
||||
mkdir -p $out/share/games/titanion
|
||||
cp -r sounds images $out/share/games/titanion/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.asahi-net.or.jp/~cs8k-cyu/windows/ttn_e.html";
|
||||
description = "Strike down super high-velocity swooping insects";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ fgaz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
@ -87,6 +87,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Brother BrGenML1 LPR driver";
|
||||
homepage = "http://www.brother.com";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.unfreeRedistributable;
|
||||
maintainers = with lib.maintainers; [ jraygauthier ];
|
||||
|
@ -58,6 +58,7 @@ rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother ${model} printer driver";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_eu&os=128";
|
||||
@ -90,6 +91,7 @@ rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother ${model} printer CUPS wrapper driver";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=gb&lang=en&prod=${model}_eu&os=128";
|
||||
|
@ -48,6 +48,7 @@ in rec {
|
||||
meta = {
|
||||
description = "Brother ${lib.strings.toUpper model} driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ lib.maintainers.steveej ];
|
||||
@ -80,6 +81,7 @@ in rec {
|
||||
meta = {
|
||||
description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ lib.maintainers.steveej ];
|
||||
|
@ -209,6 +209,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "CUPS Linux drivers for Canon printers";
|
||||
homepage = "http://www.canon.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
# please consider maintaining if you are updating this package
|
||||
|
@ -103,6 +103,10 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series. (MP520 drivers also work for MX700.)";
|
||||
homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html";
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode
|
||||
];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jerith666 ];
|
||||
|
@ -145,6 +145,10 @@ in stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series";
|
||||
homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072";
|
||||
sourceProvenance = with sourceTypes; [
|
||||
fromSource
|
||||
binaryNativeCode
|
||||
];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ chpatrick ];
|
||||
|
@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
|
||||
DocuPrint 3205 d/3208 d/3505 d/3508 d/4405 d/4408 d
|
||||
'';
|
||||
homepage = "https://onlinesupport.fujixerox.com";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ delan ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -67,6 +67,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother HL1110 printer driver";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.linux;
|
||||
downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl1110_us_eu_as&os=128#SelectLanguageType-561_0_1";
|
||||
|
@ -56,6 +56,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother HL1210W printer driver";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.linux;
|
||||
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=nz&lang=en&prod=hl1210w_eu_as&os=128";
|
||||
|
@ -72,6 +72,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother hl3140cw printer driver";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.linux;
|
||||
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=eu_ot&lang=en&prod=hl3140cw_us_eu&os=128";
|
||||
|
@ -63,6 +63,7 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother hl-l2340dw printer driver";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=es&prod=hll2340dw_us_eu_as&os=128&flang=English";
|
||||
|
@ -86,6 +86,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother HL-L2350DW printer driver";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = builtins.map (arch: "${arch}-linux") arches;
|
||||
downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2350dw_us_eu_as&os=128";
|
||||
|
@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother HL-L2390DW combined print driver";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128";
|
||||
|
@ -43,6 +43,7 @@ stdenv.mkDerivation {
|
||||
meta = with lib; {
|
||||
description = "CUPS drivers for several Kyocera FS-{1020,1025,1040,1060,1120,1125} printers";
|
||||
homepage = "https://www.kyoceradocumentsolutions.ru/index/service_support/download_center.false.driver.FS1040._.EN.html#";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.vanzef ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "CUPS drivers for several Kyocera printers";
|
||||
homepage = "https://www.kyoceradocumentsolutions.com";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = [ maintainers.steveej ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Brother MFC-9140CDN CUPS wrapper driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
|
@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Brother MFC-9140CDN LPR printer driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
|
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother MFC-J470DW LPR driver";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = lib.platforms.linux;
|
||||
downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128";
|
||||
|
@ -82,6 +82,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Brother MFC-J6510DW LPR driver";
|
||||
downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = with licenses; unfree;
|
||||
maintainers = with maintainers; [ ramkromberg ];
|
||||
platforms = with platforms; linux;
|
||||
|
@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Brother MFC-L2700DN LPR driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.tv ];
|
||||
platforms = [ "i686-linux" ];
|
||||
|
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Brother MFC-L2720DW lpr driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ lib.maintainers.xeji ];
|
||||
|
@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Brother MFC-L2740DW lpr driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||
maintainers = [ lib.maintainers.Enzime ];
|
||||
|
@ -86,6 +86,7 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "http://www.brother.com/";
|
||||
description = "Brother MFC-L2750DW printer driver";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = builtins.map (arch: "${arch}-linux") arches;
|
||||
maintainers = [ maintainers.lovesegfault ];
|
||||
|
@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Brother MFC-L8690CDW LPR printer driver";
|
||||
homepage = "http://www.brother.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = [ lib.maintainers.fuzzy-id ];
|
||||
platforms = [ "i686-linux" ];
|
||||
|
@ -106,6 +106,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Unified Linux Driver for Samsung printers and scanners";
|
||||
homepage = "http://www.bchemnet.com/suldr";
|
||||
downloadPage = "http://www.bchemnet.com/suldr/driver/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
|
||||
# Tested on linux-x86_64. Might work on linux-i386.
|
||||
|
@ -89,6 +89,7 @@ in stdenv.mkDerivation rec {
|
||||
description = "Unified Linux Driver for Samsung printers and scanners";
|
||||
homepage = "http://www.bchemnet.com/suldr";
|
||||
downloadPage = "http://www.bchemnet.com/suldr/driver/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
|
||||
# Tested on linux-x86_64. Might work on linux-i386.
|
||||
|
@ -75,6 +75,7 @@ in stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Samsung's Linux printing drivers; includes binaries without source code";
|
||||
homepage = "http://www.samsung.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ joko ];
|
||||
|
@ -63,6 +63,7 @@ in
|
||||
};
|
||||
'';
|
||||
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = with licenses; [ mit eapl ];
|
||||
maintainers = [ maintainers.eperuffo ];
|
||||
platforms = platforms.linux;
|
||||
|
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "Pantum universal driver";
|
||||
homepage = "https://global.pantum.com/";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.unfree;
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
|
@ -31,6 +31,7 @@ mkDerivation rec {
|
||||
meta = with lib; {
|
||||
homepage = "https://www.xp-pen.com/download-46.html";
|
||||
description = "Driver for XP-PEN Pentablet drawing tablets";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ ivar ];
|
||||
|
@ -45,6 +45,7 @@ in
|
||||
meta = {
|
||||
description = "Sundtek MediaTV driver";
|
||||
maintainers = [ maintainers.simonvandel ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.unfree;
|
||||
homepage = "https://support.sundtek.com/index.php/topic,1573.0.html";
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-iscsi";
|
||||
version = "2.1.4";
|
||||
version = "2.1.7";
|
||||
|
||||
nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ];
|
||||
buildInputs = [ kmod open-isns.lib openssl systemd util-linux ];
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "open-iscsi";
|
||||
repo = "open-iscsi";
|
||||
rev = version;
|
||||
sha256 = "sha256-HnvLLwxOnu7Oiige6A6zk9NmAI2ImcILp9eCfbdGiyI=";
|
||||
sha256 = "sha256-R1ttHHxVSQ5TGtWVy4I9BAmEJfcRhKRD5jThoeddjUw=";
|
||||
};
|
||||
|
||||
DESTDIR = "$(out)";
|
||||
@ -23,8 +23,17 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's|/usr|/|' Makefile
|
||||
|
||||
# Remove blanket -Werror. Fails for minor error on gcc-11.
|
||||
substituteInPlace usr/Makefile --replace ' -Werror ' ' '
|
||||
'';
|
||||
|
||||
# avoid /usr/bin/install
|
||||
makeFlags = [
|
||||
"INSTALL=install"
|
||||
"SED=sed"
|
||||
];
|
||||
|
||||
installFlags = [
|
||||
"install"
|
||||
"install_systemd"
|
||||
|
37
pkgs/os-specific/linux/tinyalsa/default.nix
Normal file
37
pkgs/os-specific/linux/tinyalsa/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tinyalsa";
|
||||
version = "unstable-2022-06-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tinyalsa";
|
||||
repo = "tinyalsa";
|
||||
rev = "3d70d227e7dfd1be6f8f420a5aae164a2b4126e0";
|
||||
hash = "sha256-RHeF3VShy+LYFtJK+AEU7swIr5/rnpg2fdllnH9cFCk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DTINYALSA_USES_PLUGINS=ON"
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-Wno-error=sign-compare"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/tinyalsa/tinyalsa";
|
||||
description = "Tiny library to interface with ALSA in the Linux kernel";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
@ -2,15 +2,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tailscale";
|
||||
version = "1.26.0";
|
||||
version = "1.26.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-n8g8ciK3QZYeoGdD6SUAkATlklAzjH9QYnXLyOGB1Bw=";
|
||||
sha256 = "sha256-3WBvJI9uyzreUbk8ROYxXQgvttZ95OEepdzA4ZhdaJ0=";
|
||||
};
|
||||
vendorSha256 = "sha256-rIYDpGrUPVrDQjiT3zsNmiojNXrIM1wV5/Ci5+lQDqc=";
|
||||
vendorSha256 = "sha256-NHmMkYfGgAEFjvFvKaPoaAuzeDbTJAw+85fZcxVA2jY=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user