mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 22:21:26 +00:00
Merge staging-next into staging
This commit is contained in:
commit
0b0b544416
@ -169,6 +169,13 @@
|
||||
<link linkend="opt-services.prosody-filer.enable">services.prosody-filer</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://github.com/audreyt/ethercalc">ethercalc</link>,
|
||||
an online collaborative spreadsheet. Available as
|
||||
<link xlink:href="options.html#opt-services.ethercalc.enable">services.ethercalc</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://timetagger.app">timetagger</link>,
|
||||
|
@ -51,6 +51,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable).
|
||||
|
||||
- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative
|
||||
spreadsheet. Available as [services.ethercalc](options.html#opt-services.ethercalc.enable).
|
||||
|
||||
- [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable).
|
||||
|
||||
- [rstudio-server](https://www.rstudio.com/products/rstudio/#rstudio-server), a browser-based version of the RStudio IDE for the R programming language. Available as [services.rstudio-server](options.html#opt-services.rstudio-server.enable).
|
||||
|
@ -1005,6 +1005,7 @@
|
||||
./services/web-apps/documize.nix
|
||||
./services/web-apps/dokuwiki.nix
|
||||
./services/web-apps/engelsystem.nix
|
||||
./services/web-apps/ethercalc.nix
|
||||
./services/web-apps/fluidd.nix
|
||||
./services/web-apps/galene.nix
|
||||
./services/web-apps/gerrit.nix
|
||||
|
@ -69,7 +69,8 @@ let
|
||||
set -e
|
||||
set +o pipefail
|
||||
NIX_CONF_DIR=$PWD \
|
||||
${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net --option experimental-features nix-command"} \
|
||||
${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"} \
|
||||
${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"} \
|
||||
|& sed -e 's/^warning:/error:/' \
|
||||
| (! grep '${if cfg.checkConfig then "^error:" else "^error: unknown setting"}')
|
||||
set -o pipefail
|
||||
|
62
nixos/modules/services/web-apps/ethercalc.nix
Normal file
62
nixos/modules/services/web-apps/ethercalc.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.ethercalc;
|
||||
in {
|
||||
options = {
|
||||
services.ethercalc = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
ethercalc, an online collaborative spreadsheet server.
|
||||
|
||||
Persistent state will be maintained under
|
||||
<filename>/var/lib/ethercalc</filename>. Upstream supports using a
|
||||
redis server for storage and recommends the redis backend for
|
||||
intensive use; however, the Nix module doesn't currently support
|
||||
redis.
|
||||
|
||||
Note that while ethercalc is a good and robust project with an active
|
||||
issue tracker, there haven't been new commits since the end of 2020.
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
default = pkgs.ethercalc;
|
||||
defaultText = literalExpression "pkgs.ethercalc";
|
||||
type = types.package;
|
||||
description = "Ethercalc package to use.";
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
description = "Address to listen on (use 0.0.0.0 to allow access from any address).";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8000;
|
||||
description = "Port to bind to.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.ethercalc = {
|
||||
description = "Ethercalc service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = "${cfg.package}/bin/ethercalc --host ${cfg.host} --port ${toString cfg.port}";
|
||||
Restart = "always";
|
||||
StateDirectory = "ethercalc";
|
||||
WorkingDirectory = "/var/lib/ethercalc";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@ -10,8 +10,7 @@ in {
|
||||
enable = mkEnableOption "plausible";
|
||||
|
||||
releaseCookiePath = mkOption {
|
||||
default = null;
|
||||
type = with types; nullOr (either str path);
|
||||
type = with types; either str path;
|
||||
description = ''
|
||||
The path to the file with release cookie. (used for remote connection to the running node).
|
||||
'';
|
||||
@ -235,6 +234,8 @@ in {
|
||||
script = ''
|
||||
export CONFIG_DIR=$CREDENTIALS_DIRECTORY
|
||||
|
||||
export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )"
|
||||
|
||||
# setup
|
||||
${pkgs.plausible}/createdb.sh
|
||||
${pkgs.plausible}/migrate.sh
|
||||
@ -243,10 +244,8 @@ in {
|
||||
psql -d plausible <<< "UPDATE users SET email_verified=true;"
|
||||
fi
|
||||
''}
|
||||
${optionalString (cfg.releaseCookiePath != null) ''
|
||||
export RELEASE_COOKIE="$(< $CREDENTIALS_DIRECTORY/RELEASE_COOKIE )"
|
||||
''}
|
||||
plausible start
|
||||
|
||||
exec plausible start
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
@ -257,8 +256,8 @@ in {
|
||||
LoadCredential = [
|
||||
"ADMIN_USER_PWD:${cfg.adminUser.passwordFile}"
|
||||
"SECRET_KEY_BASE:${cfg.server.secretKeybaseFile}"
|
||||
] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"]
|
||||
++ lib.optionals (cfg.releaseCookiePath != null) [ "RELEASE_COOKIE:${cfg.releaseCookiePath}"];
|
||||
"RELEASE_COOKIE:${cfg.releaseCookiePath}"
|
||||
] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -8,6 +8,9 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||
virtualisation.memorySize = 4096;
|
||||
services.plausible = {
|
||||
enable = true;
|
||||
releaseCookiePath = "${pkgs.runCommand "cookie" { } ''
|
||||
${pkgs.openssl}/bin/openssl rand -base64 64 >"$out"
|
||||
''}";
|
||||
adminUser = {
|
||||
email = "admin@example.org";
|
||||
passwordFile = "${pkgs.writeText "pwd" "foobar"}";
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "schismtracker";
|
||||
version = "20211116";
|
||||
version = "20220125";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1kcw4rwphyqh0hwwjsydzwg484xj17rb5lc8pfsixsg77z50ayzz";
|
||||
sha256 = "sha256-Hqbm5+YyCde/6QuyIy4NE/jG4xNDzeNjEefMr60GEZM=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-dependency-tracking" ]
|
||||
|
@ -229,5 +229,6 @@ in stdenv.mkDerivation {
|
||||
homepage = "https://www.virtualbox.org/";
|
||||
maintainers = with maintainers; [ sander ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "VirtualBox";
|
||||
};
|
||||
}
|
||||
|
@ -2,25 +2,25 @@
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, git
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "garble";
|
||||
version = "20200107";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "burrowers";
|
||||
repo = pname;
|
||||
rev = "835f4aadf321521acf06aac4d5068473dc4b2ac1";
|
||||
sha256 = "sha256-NodsVHRll2YZoxrhmniJvelQOStG82u3kJyc0t8OXD8=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F8O/33o//yGnum9sZo1dzcvf3ifRalva6SDC36iPbDA==";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-x2fk2QmZDK2yjyfYdK7x+sQjvt7tuggmm8ieVjsNKek=";
|
||||
vendorSha256 = "sha256-iNH/iBEOTkIhVlDGfI66ZYyVjyH6WrLbUSMyONPjUc4=";
|
||||
|
||||
preBuild = ''
|
||||
# https://github.com/burrowers/garble/issues/184
|
||||
substituteInPlace testdata/scripts/tiny.txt \
|
||||
--replace "{6,8}" "{4,8}"
|
||||
'' + lib.optionalString (!stdenv.isx86_64) ''
|
||||
# Used for some of the tests.
|
||||
checkInputs = [git];
|
||||
|
||||
preBuild = lib.optionalString (!stdenv.isx86_64) ''
|
||||
# The test assumex amd64 assembly
|
||||
rm testdata/scripts/asm.txt
|
||||
'';
|
||||
|
@ -31,7 +31,7 @@ storePaths=$(perl $pathsFromGraph closure-*)
|
||||
|
||||
# Paths in cpio archives *must* be relative, otherwise the kernel
|
||||
# won't unpack 'em.
|
||||
(cd root && cp -prd --parents $storePaths .)
|
||||
(cd root && cp -prP --parents $storePaths .)
|
||||
|
||||
|
||||
# Put the closure in a gzipped cpio archive.
|
||||
|
@ -20,10 +20,6 @@ rustPlatform.buildRustPackage {
|
||||
# (/private/tmp/nix-build-clippy-1.36.0.drv-0/rustc-1.36.0-src/src/librustc_llvm)
|
||||
doCheck = false;
|
||||
|
||||
preBuild = ''
|
||||
export CARGO_TARGET_DIR="$(pwd)/target"
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -add_rpath "${rustc}/lib" $out/bin/clippy-driver
|
||||
'';
|
||||
|
22
pkgs/development/libraries/judy/cross.patch
Normal file
22
pkgs/development/libraries/judy/cross.patch
Normal file
@ -0,0 +1,22 @@
|
||||
--- a/src/Judy1/Makefile.am
|
||||
+++ b/src/Judy1/Makefile.am
|
||||
@@ -18,7 +18,7 @@
|
||||
libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE
|
||||
|
||||
Judy1Tables.c: Judy1TablesGen.c
|
||||
- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen
|
||||
+ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o Judy1TablesGen Judy1TablesGen.c; ./Judy1TablesGen
|
||||
|
||||
Judy1ByCount.c:../JudyCommon/JudyByCount.c
|
||||
cp -f ../JudyCommon/JudyByCount.c Judy1ByCount.c
|
||||
--- a/src/JudyL/Makefile.am
|
||||
+++ b/src/JudyL/Makefile.am
|
||||
@@ -18,7 +18,7 @@
|
||||
libinline_la_CFLAGS = $(AM_CFLAGS) -DJUDYGETINLINE
|
||||
|
||||
JudyLTables.c: JudyLTablesGen.c
|
||||
- $(CC) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen
|
||||
+ $(CC_FOR_BUILD) $(INCLUDES) $(AM_CFLAGS) @CFLAGS@ -o JudyLTablesGen JudyLTablesGen.c; ./JudyLTablesGen
|
||||
|
||||
JudyLByCount.c: ../JudyCommon/JudyByCount.c
|
||||
cp -f ../JudyCommon/JudyByCount.c JudyLByCount.c
|
@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchurl}:
|
||||
{ lib, stdenv, fetchurl, pkgsBuildBuild, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "judy";
|
||||
@ -9,11 +9,9 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j";
|
||||
};
|
||||
|
||||
# gcc 4.8 optimisations break judy.
|
||||
# https://sourceforge.net/p/judy/mailman/message/31995144/
|
||||
preConfigure = lib.optionalString stdenv.cc.isGNU ''
|
||||
configureFlagsArray+=("CFLAGS=-fno-strict-aliasing -fno-aggressive-loop-optimizations")
|
||||
'';
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ];
|
||||
patches = [ ./cross.patch ];
|
||||
|
||||
# Disable parallel builds as manpages lack some dependencies:
|
||||
# ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs
|
||||
|
@ -0,0 +1,30 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "float-features";
|
||||
version = "20210228-git";
|
||||
|
||||
description = "A portability library for IEEE float features not covered by the CL standard.";
|
||||
|
||||
deps = [ args."documentation-utils" args."trivial-indent" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz";
|
||||
sha256 = "1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd";
|
||||
};
|
||||
|
||||
packageName = "float-features";
|
||||
|
||||
asdFilesToKeep = ["float-features.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM float-features DESCRIPTION
|
||||
A portability library for IEEE float features not covered by the CL standard.
|
||||
SHA256 1giy9qm9bgdfp1mm4d36fcj544kfq68qckmijlrhwbvkpk18hgrd URL
|
||||
http://beta.quicklisp.org/archive/float-features/2021-02-28/float-features-20210228-git.tgz
|
||||
MD5 77223b9c85dca49d0f599e51ba95953a NAME float-features FILENAME
|
||||
float-features DEPS
|
||||
((NAME documentation-utils FILENAME documentation-utils)
|
||||
(NAME trivial-indent FILENAME trivial-indent))
|
||||
DEPENDENCIES (documentation-utils trivial-indent) VERSION 20210228-git
|
||||
SIBLINGS (float-features-tests) PARASITES NIL) */
|
@ -0,0 +1,37 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "lisp-binary";
|
||||
version = "20210411-git";
|
||||
|
||||
description = "Declare binary formats as structs and then read and write them.";
|
||||
|
||||
deps = [ args."alexandria" args."babel" args."cffi" args."closer-mop" args."flexi-streams" args."iterate" args."moptilities" args."quasiquote-2_dot_0" args."trivial-features" args."trivial-gray-streams" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz";
|
||||
sha256 = "1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb";
|
||||
};
|
||||
|
||||
packageName = "lisp-binary";
|
||||
|
||||
asdFilesToKeep = ["lisp-binary.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM lisp-binary DESCRIPTION
|
||||
Declare binary formats as structs and then read and write them. SHA256
|
||||
1sbapl8qla4xb8wcix9yxpijkbk1bpybhay7ncb3z2im7r2kzsnb URL
|
||||
http://beta.quicklisp.org/archive/lisp-binary/2021-04-11/lisp-binary-20210411-git.tgz
|
||||
MD5 29d85f01a1cb17742164bacae940d29c NAME lisp-binary FILENAME lisp-binary
|
||||
DEPS
|
||||
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
|
||||
(NAME cffi FILENAME cffi) (NAME closer-mop FILENAME closer-mop)
|
||||
(NAME flexi-streams FILENAME flexi-streams)
|
||||
(NAME iterate FILENAME iterate) (NAME moptilities FILENAME moptilities)
|
||||
(NAME quasiquote-2.0 FILENAME quasiquote-2_dot_0)
|
||||
(NAME trivial-features FILENAME trivial-features)
|
||||
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
|
||||
DEPENDENCIES
|
||||
(alexandria babel cffi closer-mop flexi-streams iterate moptilities
|
||||
quasiquote-2.0 trivial-features trivial-gray-streams)
|
||||
VERSION 20210411-git SIBLINGS (lisp-binary-test) PARASITES NIL) */
|
@ -0,0 +1,31 @@
|
||||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "quasiquote-2_dot_0";
|
||||
version = "20150505-git";
|
||||
|
||||
parasites = [ "quasiquote-2.0-tests" ];
|
||||
|
||||
description = "Writing macros that write macros. Effortless.";
|
||||
|
||||
deps = [ args."fiveam" args."iterate" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz";
|
||||
sha256 = "0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974";
|
||||
};
|
||||
|
||||
packageName = "quasiquote-2.0";
|
||||
|
||||
asdFilesToKeep = ["quasiquote-2.0.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM quasiquote-2.0 DESCRIPTION
|
||||
Writing macros that write macros. Effortless. SHA256
|
||||
0bgcqk7wp7qblw7avsawkg24zjiq9vgsbfa0yhk64avhxwjw6974 URL
|
||||
http://beta.quicklisp.org/archive/quasiquote-2.0/2015-05-05/quasiquote-2.0-20150505-git.tgz
|
||||
MD5 7c557e0c10cf7608afa5a20e4a83c778 NAME quasiquote-2.0 FILENAME
|
||||
quasiquote-2_dot_0 DEPS
|
||||
((NAME fiveam FILENAME fiveam) (NAME iterate FILENAME iterate))
|
||||
DEPENDENCIES (fiveam iterate) VERSION 20150505-git SIBLINGS NIL PARASITES
|
||||
(quasiquote-2.0-tests)) */
|
@ -137,6 +137,7 @@ fast-io
|
||||
file-attributes
|
||||
fiveam
|
||||
flexi-streams
|
||||
float-features
|
||||
form-fiddle
|
||||
fset
|
||||
generic-cl
|
||||
@ -162,6 +163,7 @@ lfarm-client
|
||||
lfarm-server
|
||||
lfarm-ssl
|
||||
lift
|
||||
lisp-binary
|
||||
lisp-namespace
|
||||
lla
|
||||
local-time
|
||||
|
@ -345,6 +345,16 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"quasiquote-2_dot_0" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."quasiquote-2_dot_0" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/quasiquote-2_dot_0.nix {
|
||||
inherit fetchurl;
|
||||
"fiveam" = quicklisp-to-nix-packages."fiveam";
|
||||
"iterate" = quicklisp-to-nix-packages."iterate";
|
||||
}));
|
||||
|
||||
|
||||
"lfarm-common" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."lfarm-common" or (x: {}))
|
||||
@ -2836,6 +2846,24 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"lisp-binary" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."lisp-binary" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/lisp-binary.nix {
|
||||
inherit fetchurl;
|
||||
"alexandria" = quicklisp-to-nix-packages."alexandria";
|
||||
"babel" = quicklisp-to-nix-packages."babel";
|
||||
"cffi" = quicklisp-to-nix-packages."cffi";
|
||||
"closer-mop" = quicklisp-to-nix-packages."closer-mop";
|
||||
"flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
|
||||
"iterate" = quicklisp-to-nix-packages."iterate";
|
||||
"moptilities" = quicklisp-to-nix-packages."moptilities";
|
||||
"quasiquote-2_dot_0" = quicklisp-to-nix-packages."quasiquote-2_dot_0";
|
||||
"trivial-features" = quicklisp-to-nix-packages."trivial-features";
|
||||
"trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
|
||||
}));
|
||||
|
||||
|
||||
"lift" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."lift" or (x: {}))
|
||||
@ -3257,6 +3285,16 @@ let quicklisp-to-nix-packages = rec {
|
||||
}));
|
||||
|
||||
|
||||
"float-features" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."float-features" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/float-features.nix {
|
||||
inherit fetchurl;
|
||||
"documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
|
||||
"trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
|
||||
}));
|
||||
|
||||
|
||||
"flexi-streams" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."flexi-streams" or (x: {}))
|
||||
|
@ -9,11 +9,14 @@
|
||||
, numpy
|
||||
, pandas
|
||||
, pytest
|
||||
, cloudpickle
|
||||
, scipy
|
||||
, setuptools
|
||||
, tensorflow-probability
|
||||
, typing-extensions
|
||||
# , tensorflow-probability (incompatible version)
|
||||
, xarray
|
||||
#, h5py (used by disabled tests)
|
||||
, zarr
|
||||
, h5py
|
||||
#, pymc3 (broken)
|
||||
#, pyro-ppl (broken)
|
||||
#, pystan (not packaged)
|
||||
@ -45,28 +48,36 @@ buildPythonPackage rec {
|
||||
scipy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "typing_extensions>=3.7.4.3,<4" "typing_extensions>=3.7.4.3"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
bokeh
|
||||
emcee
|
||||
numba
|
||||
pytest
|
||||
tensorflow-probability
|
||||
#h5py (used by disabled tests)
|
||||
#pymc3 (broken)
|
||||
#pyro-ppl (broken)
|
||||
cloudpickle
|
||||
zarr
|
||||
#tensorflow-probability (used by disabled tests)
|
||||
h5py
|
||||
#pymc3 (broken, used by disabled tests)
|
||||
#pyro-ppl (broken, used by disabled tests)
|
||||
#pystan (not packaged)
|
||||
#numpyro (not packaged)
|
||||
#numpyro (not packaged, used by disabled tests)
|
||||
];
|
||||
|
||||
# check requires pymc3 and pyro-ppl, which are currently broken, and pystan
|
||||
# and numpyro, which are not yet packaged, some checks also need to make
|
||||
# and numpyro, which are not yet packaged, and an incompatible (old) version
|
||||
# of tensorflow-probability. some checks also need to make
|
||||
# directories and do not have permission to do so. So we can only check part
|
||||
# of the package
|
||||
# Additionally, there are some failures with the plots test, which revolve
|
||||
# around attempting to output .mp4 files through an interface that only wants
|
||||
# to output .html files.
|
||||
# The following test have been disabled as a result: data_cmdstanpy,
|
||||
# data_numpyro, data_pyro, data_pystan, and plots.
|
||||
# data_numpyro, data_pyro, data_pystan, data_tfp, data_pymc3 and plots.
|
||||
checkPhase = ''
|
||||
cd arviz/tests/
|
||||
export HOME=$TMPDIR
|
||||
@ -76,11 +87,13 @@ buildPythonPackage rec {
|
||||
base_tests/test_plot_utils.py \
|
||||
base_tests/test_rcparams.py \
|
||||
base_tests/test_stats.py \
|
||||
base_tests/test_stats_numba.py \
|
||||
base_tests/test_stats_utils.py \
|
||||
base_tests/test_utils.py \
|
||||
base_tests/test_utils_numba.py \
|
||||
base_tests/test_data_zarr.py \
|
||||
external_tests/test_data_cmdstan.py \
|
||||
external_tests/test_data_emcee.py \
|
||||
external_tests/test_data_tfp.py
|
||||
external_tests/test_data_emcee.py
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -1,20 +1,32 @@
|
||||
{ lib
|
||||
, asn1crypto
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asysocks";
|
||||
version = "0.1.2";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1hi9hzih265qlh7x32r5pbaqm9wkhm52yrdiksnd4gl5nrdgwcwv";
|
||||
sha256 = "sha256-uXrJBc1Moeeo58KV+csiztXf0/F+iI5xy/BaHWek05M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asn1crypto
|
||||
];
|
||||
|
||||
# Upstream hasn't release the tests yet
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "asysocks" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"asysocks"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Socks4/5 client and server library";
|
||||
|
@ -86,5 +86,6 @@ in buildPythonPackage {
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ timokau ];
|
||||
platforms = platforms.linux;
|
||||
broken = true; # depends on older TensorFlow version than is currently packaged
|
||||
};
|
||||
}
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "policy-sentry";
|
||||
version = "0.11.19";
|
||||
version = "0.12.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "salesforce";
|
||||
repo = "policy_sentry";
|
||||
rev = version;
|
||||
sha256 = "sha256-zYX2MMFIgts5brFb/hsgLHZbY5mncqnCmk7nGdxj/BM=";
|
||||
sha256 = "sha256-zXvZpX8yKPJpmhKdPhlxYUWUadGlr4WsmfJMgE3kzyQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -68,5 +68,8 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/pymc-devs/pymc3";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ ilya-kolpakov ];
|
||||
# several dependencies are not declared and in the end it requires theano-pymc3
|
||||
# instead of Theano. The former is currently not packaged.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "skodaconnect";
|
||||
version = "1.1.12";
|
||||
version = "1.1.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "lendy007";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OKNw+t8S6rRQDKNRBN/CU36OwWojuOH6mMQ5QItkkb8=";
|
||||
sha256 = "sha256-aMyowz5+4Iu7bb8FSnHzx6QGp1WzzMXQZI23OZcr/kM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
@ -1,7 +1,5 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, bazel_0_26
|
||||
, buildBazelPackage
|
||||
, buildPythonPackage
|
||||
, python
|
||||
@ -11,47 +9,33 @@
|
||||
, tensorflow
|
||||
, six
|
||||
, numpy
|
||||
, dm-tree
|
||||
, keras
|
||||
, decorator
|
||||
, cloudpickle
|
||||
, gast
|
||||
, hypothesis
|
||||
, scipy
|
||||
, pandas
|
||||
, mpmath
|
||||
, matplotlib
|
||||
, mock
|
||||
, pytest
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.8.0";
|
||||
version = "0.15.0";
|
||||
pname = "tensorflow_probability";
|
||||
|
||||
# first build all binaries and generate setup.py using bazel
|
||||
bazel-wheel = buildBazelPackage {
|
||||
bazel = bazel_0_26;
|
||||
|
||||
name = "${pname}-${version}-py2.py3-none-any.whl";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "probability";
|
||||
rev = version;
|
||||
sha256 = "07cm8zba8n0ihzdm3k4a4rsg5v62xxsfvcw4h0niz91c0parqjqy";
|
||||
rev = "v" + version;
|
||||
sha256 = "155fgmra90s08vjnp61qxdrpzq74xa3kdzhgdkavwgc25pvxn3mi";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "gast-0.3.patch";
|
||||
url = "https://github.com/tensorflow/probability/commit/ae7a9d9771771ec1e7755a3588b9325f050a84cc.patch";
|
||||
sha256 = "0kfhx30gshm8f3945na9yjjik71r20qmjzifbigaj4l8dwd9dz1a";
|
||||
excludes = ["testing/*"];
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "cloudpickle-1.2.patch";
|
||||
url = "https://github.com/tensorflow/probability/commit/78ef12b5afe3f567d16c70b74015ed1ddff1b0c8.patch";
|
||||
sha256 = "12ms2xcljvvrnig0j78s3wfv4yf3bm5ps4rgfgv5lg2a8mzpc1ga";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
# needed to create the output wheel in installPhase
|
||||
python
|
||||
@ -64,7 +48,7 @@ let
|
||||
bazelTarget = ":pip_pkg";
|
||||
|
||||
fetchAttrs = {
|
||||
sha256 = "1qw7vkwnxy45z4vm94isq5m96xiz35sigag7vjg1xb2sklbymxh8";
|
||||
sha256 = "0sgxdlw5x3dydy53l10vbrj8smh78b7r1wff8jxcgp4w69mk8zfm";
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
@ -98,34 +82,31 @@ in buildPythonPackage {
|
||||
decorator
|
||||
cloudpickle
|
||||
gast
|
||||
dm-tree
|
||||
keras
|
||||
];
|
||||
|
||||
# Listed here:
|
||||
# https://github.com/tensorflow/probability/blob/f01d27a6f256430f03b14beb14d37def726cb257/testing/run_tests.sh#L58
|
||||
# https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83
|
||||
checkInputs = [
|
||||
hypothesis
|
||||
pytest
|
||||
scipy
|
||||
pandas
|
||||
mpmath
|
||||
matplotlib
|
||||
mock
|
||||
];
|
||||
|
||||
# actual checks currently fail because for some reason
|
||||
# tf.enable_eager_execution is called too late. Probably because upstream
|
||||
# intents these tests to be run by bazel, not plain pytest.
|
||||
# checkPhase = ''
|
||||
# # tests need to import from other test files
|
||||
# export PYTHONPATH="$PWD/tensorflow-probability:$PYTHONPATH"
|
||||
# py.test
|
||||
# '';
|
||||
# Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available.
|
||||
# But it seems not guaranteed that running the tests with pytest will even work, see
|
||||
# https://github.com/tensorflow/probability/blob/c2a10877feb2c4c06a4dc58281e69c37a11315b9/CONTRIBUTING.md?plain=1#L69
|
||||
# Ideally, tests would be run using Bazel. For now, lets's do a...
|
||||
|
||||
# sanity check
|
||||
checkPhase = ''
|
||||
python -c 'import tensorflow_probability'
|
||||
'';
|
||||
pythonImportsCheck = [ "tensorflow_probability" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = true; # tf-probability 0.8.0 is not compatible with tensorflow 2.3.2
|
||||
description = "Library for probabilistic reasoning and statistical analysis";
|
||||
homepage = "https://www.tensorflow.org/probability/";
|
||||
license = licenses.asl20;
|
||||
|
@ -2,6 +2,7 @@
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
, numpy
|
||||
, wheel
|
||||
, werkzeug
|
||||
@ -24,7 +25,7 @@ buildPythonPackage rec {
|
||||
pname = "tensorflow-tensorboard";
|
||||
version = "2.6.0";
|
||||
format = "wheel";
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "tensorboard";
|
||||
|
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mold";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-G+mVZS3ZRuBd00xfBqrTvmHOykFk63nJlucxv01nr3k=";
|
||||
sha256 = "sha256-0TXk+6hS6TJHwhowYzL8ABw3iyfVwPttJWKQ9RfzMSI=";
|
||||
};
|
||||
|
||||
buildInputs = [ zlib openssl ];
|
||||
|
@ -11,19 +11,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-deny";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmbarkStudios";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-LYXwdOopQkgq7i4l8dqQFkNLB3r+CVRor4BVeoj0DPs=";
|
||||
sha256 = "sha256-LsRky7hc7mgx1iRpJZICmP/ofdfD9r3D5LURTqfI9Fo=";
|
||||
};
|
||||
|
||||
# enable pkg-config feature of zstd
|
||||
cargoPatches = [ ./zstd-pkg-config.patch ];
|
||||
|
||||
cargoSha256 = "sha256-SdbDWw4GOvCTKN7vBjhLU5rhdVIpyO+AWaFbo06HXfU=";
|
||||
cargoSha256 = "sha256-7WGNaad00MqEM/OdUaLJ3McXlUQyQwPezbMbL+4se5A=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/EmbarkStudios/cargo-deny";
|
||||
changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ figsoda matthiasbeyer ];
|
||||
maintainers = with maintainers; [ figsoda matthiasbeyer jk ];
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, nixosTests
|
||||
{ lib, stdenv, fetchurl, nixosTests, buildPackages
|
||||
# Native buildInputs components
|
||||
, bison, boost, cmake, fixDarwinDylibNames, flex, makeWrapper, pkg-config
|
||||
# Common components
|
||||
@ -18,7 +18,7 @@ let # in mariadb # spans the whole file
|
||||
|
||||
libExt = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
mytopEnv = perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);
|
||||
mytopEnv = buildPackages.perl.withPackages (p: with p; [ DBDmysql DBI TermReadKey ]);
|
||||
|
||||
mariadbPackage = packageSettings: (server packageSettings) // {
|
||||
client = client packageSettings; # MariaDB Client
|
||||
@ -208,6 +208,10 @@ in stdenv.mkDerivation (common // {
|
||||
"-DPLUGIN_AUTH_PAM=OFF"
|
||||
"-DWITHOUT_OQGRAPH=1"
|
||||
"-DWITHOUT_PLUGIN_S3=1"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
|
||||
# revisit this if nixpkgs supports any architecture whose stack grows upwards
|
||||
"-DSTACK_DIRECTION=-1"
|
||||
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
|
@ -2,17 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "t-rex";
|
||||
version = "0.14.3-beta4";
|
||||
version = "0.14.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t-rex-tileserver";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-EG/nnHxnBwlxreJ+RWHvKqLpaVtlU95+YTJynEnypOE=";
|
||||
|
||||
hash = "sha256-LUVk5li2cl/LKbhKOh6Bbwav0GEuI/vUbDPLn7NSRIs=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-noDZNFZlfX6lZ4czsSrHXe7xbBLTD0Gz8i5EyfEp8lc=";
|
||||
cargoHash = "sha256-I4QmjTTKUp9iugEwzM0xCcNLvF5ozeBdYmbi8sytY88=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@ -21,6 +20,7 @@ rustPlatform.buildRustPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Vector tile server specialized on publishing MVT tiles";
|
||||
homepage = "https://t-rex.tileserver.ch/";
|
||||
changelog = "https://github.com/t-rex-tileserver/t-rex/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
platforms = platforms.unix;
|
||||
|
27
pkgs/servers/web-apps/ethercalc/default.nix
Normal file
27
pkgs/servers/web-apps/ethercalc/default.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ stdenv
|
||||
, pkgs
|
||||
, lib
|
||||
, nodejs-14_x
|
||||
}:
|
||||
|
||||
let
|
||||
nodejs = nodejs-14_x;
|
||||
|
||||
nodePackages = import ./node-packages.nix {
|
||||
inherit pkgs nodejs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
};
|
||||
|
||||
ethercalc = lib.head (lib.attrValues nodePackages);
|
||||
|
||||
combined = ethercalc.override {
|
||||
meta = with lib; {
|
||||
description = "Online collaborative spreadsheet";
|
||||
license = with licenses; [ cpal10 artistic2 mit asl20 cc0 mpl20 ];
|
||||
homepage = "https://github.com/audreyt/ethercalc";
|
||||
maintainers = with maintainers; [ iblech ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
in
|
||||
combined
|
15
pkgs/servers/web-apps/ethercalc/generate.sh
Executable file
15
pkgs/servers/web-apps/ethercalc/generate.sh
Executable file
@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nodePackages.node2nix
|
||||
|
||||
# Run this script not via `./generate.sh`, but via `$PWD/generate.sh`.
|
||||
# Else `nix-shell` will not find this script.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd -- "$(dirname -- "$BASH_SOURCE[0]")"
|
||||
|
||||
node2nix \
|
||||
--input node-packages.json \
|
||||
--output node-packages-generated.nix \
|
||||
--composition node-packages.nix \
|
||||
--node-env ../../../development/node-packages/node-env.nix
|
2086
pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
Normal file
2086
pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
Normal file
File diff suppressed because it is too large
Load Diff
3
pkgs/servers/web-apps/ethercalc/node-packages.json
Normal file
3
pkgs/servers/web-apps/ethercalc/node-packages.json
Normal file
@ -0,0 +1,3 @@
|
||||
[
|
||||
{ "whitebophir": "git+https://github.com/audreyt/ethercalc.git#b196277081d677be991d104e454a52d242ef0189" }
|
||||
]
|
17
pkgs/servers/web-apps/ethercalc/node-packages.nix
generated
Normal file
17
pkgs/servers/web-apps/ethercalc/node-packages.nix
generated
Normal file
@ -0,0 +1,17 @@
|
||||
# This file has been generated by node2nix 1.9.0. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
|
||||
};
|
||||
in
|
||||
import ./node-packages-generated.nix {
|
||||
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||
inherit nodeEnv;
|
||||
}
|
@ -12,13 +12,13 @@
|
||||
|
||||
let
|
||||
pname = "plausible";
|
||||
version = "1.4.0";
|
||||
version = "1.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plausible";
|
||||
repo = "analytics";
|
||||
rev = "v${version}";
|
||||
sha256 = "1d31y7mwvml17w97dm5c4312n0ciq39kf4hz3g80hdzbbn72mi4q";
|
||||
sha256 = "1aa5nkwb4qz599zb77dhwrvn5gwcdiyji4vbxmayn2zhv2vhj36d";
|
||||
};
|
||||
|
||||
# TODO consider using `mix2nix` as soon as it supports git dependencies.
|
||||
|
@ -64,5 +64,5 @@
|
||||
"webpack-bundle-analyzer": "^4.4.2"
|
||||
},
|
||||
"name": "plausible",
|
||||
"version": "v1.4.0"
|
||||
"version": "v1.4.3"
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -34,28 +34,28 @@ let
|
||||
tomlplusplus = fetchFromGitHub {
|
||||
owner = "marzer";
|
||||
repo = "tomlplusplus";
|
||||
rev = "47216c8a73d77e7431ec536fb3e251aed06cc420";
|
||||
sha256 = "sha256-cwAzWu5j3ch/56a6JmEoKCsxVNTk6tiZswNdNT6qzX0=";
|
||||
rev = "8e669aa6990e0ed219c169d491472d749f54c393";
|
||||
sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4=";
|
||||
};
|
||||
|
||||
# Derived from vst3.wrap
|
||||
vst3 = fetchFromGitHub {
|
||||
owner = "robbert-vdh";
|
||||
repo = "vst3sdk";
|
||||
rev = "v3.7.3_build_20-patched";
|
||||
rev = "v3.7.4_build_25-patched";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-m2y7No7BNbIjLNgdAqIAEr6UuAZZ/wwM2+iPWKK17gQ=";
|
||||
sha256 = "sha256-oHRJZItw+he5M+beVZkUrhJir6rgFZ80ORzA73mJT2A=";
|
||||
};
|
||||
in multiStdenv.mkDerivation rec {
|
||||
pname = "yabridge";
|
||||
version = "3.7.0";
|
||||
version = "3.8.0";
|
||||
|
||||
# NOTE: Also update yabridgectl's cargoHash when this is updated
|
||||
src = fetchFromGitHub {
|
||||
owner = "robbert-vdh";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-dz7kScNrVUsjokJntzUCJzDIboqi3vQI+RpXl0UFmUQ=";
|
||||
sha256 = "sha256-XacJjHxsp60/l36pFPGonUyOsyFF2lmqplAaisHXZDY=";
|
||||
};
|
||||
|
||||
# Unpack subproject sources
|
||||
|
@ -1,8 +1,8 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8eae0442..ec0649da 100644
|
||||
index 95ecb728..cb30f3af 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -196,6 +196,7 @@ if with_32bit_libraries or with_bitbridge
|
||||
@@ -201,6 +201,7 @@ if with_32bit_libraries or with_bitbridge
|
||||
'boost_filesystem',
|
||||
static : with_static_boost,
|
||||
dirs : [
|
||||
@ -10,7 +10,7 @@ index 8eae0442..ec0649da 100644
|
||||
# Used by Arch based distros
|
||||
'/usr/local/lib32',
|
||||
'/usr/lib32',
|
||||
@@ -219,7 +220,7 @@ if is_64bit_system
|
||||
@@ -224,7 +225,7 @@ if is_64bit_system
|
||||
xcb_64bit_dep = dependency('xcb')
|
||||
endif
|
||||
if with_32bit_libraries or with_bitbridge
|
||||
@ -20,7 +20,7 @@ index 8eae0442..ec0649da 100644
|
||||
|
||||
# These are all headers-only libraries, and thus won't require separate 32-bit
|
||||
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
||||
index 6e32b4c9..f6eb09eb 100644
|
||||
index 1a457f03..20ca1e63 100644
|
||||
--- a/src/plugin/utils.cpp
|
||||
+++ b/src/plugin/utils.cpp
|
||||
@@ -107,7 +107,7 @@ std::string PluginInfo::wine_version() const {
|
||||
|
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
src = yabridge.src;
|
||||
sourceRoot = "source/tools/yabridgectl";
|
||||
cargoSha256 = "sha256-/VREh/f4bAt2DXCqK0noEjn+4hcK5VZUn+gdbYbeAmk=";
|
||||
cargoSha256 = "sha256-pwy2Q2HUCihr7W81hGvDm9EiZHk9G8knSy0yxPy6hl8=";
|
||||
|
||||
patches = [
|
||||
# By default, yabridgectl locates libyabridge.so by using
|
||||
|
@ -1,5 +1,5 @@
|
||||
diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs
|
||||
index bc5ccfc4..c6d119bc 100644
|
||||
index bc5f6a81..0fcd38d3 100644
|
||||
--- a/tools/yabridgectl/src/config.rs
|
||||
+++ b/tools/yabridgectl/src/config.rs
|
||||
@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet};
|
||||
@ -10,7 +10,7 @@ index bc5ccfc4..c6d119bc 100644
|
||||
use std::path::{Path, PathBuf};
|
||||
use which::which;
|
||||
use xdg::BaseDirectories;
|
||||
@@ -233,34 +234,24 @@ impl Config {
|
||||
@@ -235,34 +236,27 @@ impl Config {
|
||||
}
|
||||
}
|
||||
None => {
|
||||
@ -20,6 +20,8 @@ index bc5ccfc4..c6d119bc 100644
|
||||
- // in the error message when `libyabridge-vst2.so` can't be found.
|
||||
- let system_path = Path::new("/usr/lib");
|
||||
+ // Search through NIX_PROFILES & data home directory if no path was set explicitly.
|
||||
+ // NIX_PROFILES is iterated in reverse from the most specific (the user profile) to
|
||||
+ // the least specific (the system profile).
|
||||
+ let nix_profiles = env::var("NIX_PROFILES");
|
||||
let user_path = xdg_dirs.get_data_home();
|
||||
- let lib_directories = [
|
||||
@ -35,6 +37,7 @@ index bc5ccfc4..c6d119bc 100644
|
||||
- ];
|
||||
+ let lib_directories = nix_profiles.iter()
|
||||
+ .flat_map(|profiles| profiles.split(' ')
|
||||
+ .rev()
|
||||
+ .map(|profile| Path::new(profile).join("lib")))
|
||||
+ .chain(iter::once(user_path.clone()));
|
||||
+
|
||||
@ -56,12 +59,12 @@ index bc5ccfc4..c6d119bc 100644
|
||||
));
|
||||
}
|
||||
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
|
||||
index 8c273f92..432619ec 100644
|
||||
index 48cce4fa..209e40e4 100644
|
||||
--- a/tools/yabridgectl/src/main.rs
|
||||
+++ b/tools/yabridgectl/src/main.rs
|
||||
@@ -148,7 +148,7 @@ fn main() -> Result<()> {
|
||||
.about("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
|
||||
.long_about(
|
||||
@@ -151,7 +151,7 @@ fn main() -> Result<()> {
|
||||
.help("Path to the directory containing 'libyabridge-{vst2,vst3}.so'")
|
||||
.long_help(
|
||||
"Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \
|
||||
- is not set, then yabridgectl will look in both '/usr/lib' and \
|
||||
+ is not set, then yabridgectl will look through 'NIX_PROFILES' and \
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fd";
|
||||
version = "8.3.1";
|
||||
version = "8.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = "fd";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-1Fxkd37KoFkUYYeFTaCAtndCa00lZB2KptsKIwpIt2o=";
|
||||
sha256 = "sha256-aNAV0FVZEqtTdgvnLiS1ixtsPU48rUOZdmj07MiMVKg=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qymlTuFnYMbldNDGVDpkLCC0QQK1il/LAXcIil5koCo=";
|
||||
cargoSha256 = "sha256-A8MAgV7/6Vf+PaND+gaZz8IEq4Cw9ETEY+lF8R77lA4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "vivid";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sharkdp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2rdNjpJrBuj6toLFzFJScNh6od5qUhkSaZF+NbPBlQA=";
|
||||
sha256 = "sha256-83ff0T2P5aRQ6cM9z7IEuoi7syvJldIuzzdiTrygckA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-1aox1eiF3hu5guBjRcM3qb6mHJOutI+yargW7X4cFfg=";
|
||||
cargoSha256 = "sha256-W1tLQTTMOKB/BR9P3y3goPIdOe12Qdkf4wYPlhbQjzY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A generator for LS_COLORS with support for multiple color themes";
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "kube-hunter";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "066pivd9mdhy24n40m9917zr5f9gh4fva4zmxk9vyppgk1b3mpwc";
|
||||
sha256 = "sha256-2pmViizQLwyTdP6J92ynvdIdqkfgc6SIhsll85g9pHA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
|
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gdu";
|
||||
version = "5.12.1";
|
||||
version = "5.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dundee";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-pXHMNyebUkHEZvUWtDkyp5Fqk07GA5sd+254fls8PjU=";
|
||||
sha256 = "sha256-yOYwPr/Yz/PGpCZtv/dWVFgll6VM7wQEtU/jEVpMjlE=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac";
|
||||
vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
@ -4253,7 +4253,7 @@ with pkgs;
|
||||
anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
|
||||
|
||||
bamboo = callPackage ../tools/inputmethods/ibus-engines/ibus-bamboo {
|
||||
go = go_1_15;
|
||||
go = go_1_17;
|
||||
};
|
||||
|
||||
hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
|
||||
@ -5131,6 +5131,8 @@ with pkgs;
|
||||
electron = electron_14;
|
||||
};
|
||||
|
||||
ethercalc = callPackage ../servers/web-apps/ethercalc { };
|
||||
|
||||
ethtool = callPackage ../tools/misc/ethtool { };
|
||||
|
||||
ettercap = callPackage ../applications/networking/sniffers/ettercap { };
|
||||
@ -16568,8 +16570,7 @@ with pkgs;
|
||||
ganv = callPackage ../development/libraries/ganv { };
|
||||
|
||||
garble = callPackage ../build-support/go/garble.nix {
|
||||
# https://github.com/burrowers/garble/issues/124
|
||||
buildGoModule = buildGo115Module;
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
|
||||
gcab = callPackage ../development/libraries/gcab { };
|
||||
|
@ -4043,12 +4043,12 @@ let
|
||||
|
||||
CPAN = buildPerlPackage {
|
||||
pname = "CPAN";
|
||||
version = "2.28";
|
||||
version = "2.29";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.28.tar.gz";
|
||||
sha256 = "39d357489283d479695027640d7fc25b42ec3c52003071d1ec94496e34af5974";
|
||||
url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.29.tar.gz";
|
||||
sha256 = "1f55672efd505a9baacfa1924d115362120aa6bf8efab7a17c7cb090b17ccc41";
|
||||
};
|
||||
propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ];
|
||||
propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases CompressBzip2 Expect FileHomeDir FileWhich LWP LogLog4perl ModuleSignature TermReadKey TextGlob YAML YAMLLibYAML YAMLSyck IOSocketSSL ];
|
||||
meta = {
|
||||
description = "Query, download and build perl modules from CPAN sites";
|
||||
license = with lib.licenses; [ artistic1 gpl1Plus ];
|
||||
@ -11417,11 +11417,11 @@ let
|
||||
|
||||
ImageExifTool = buildPerlPackage rec {
|
||||
pname = "Image-ExifTool";
|
||||
version = "12.29";
|
||||
version = "12.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
|
||||
sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95";
|
||||
sha256 = "sha256-QDq1KTpEcl8EWj9a/bxF0TwghUulH30O5yDV0wsxy6I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
|
||||
|
Loading…
Reference in New Issue
Block a user