Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
bf793f213d
@ -31,7 +31,23 @@ let
|
||||
default = true;
|
||||
description = ''
|
||||
Whether the config should be checked at build time.
|
||||
Disabling this might become necessary if the config includes files not present during build time.
|
||||
When the config can't be checked during build time, for example when it includes
|
||||
other files, either disable this option or use <code>preCheckConfig</code> to create
|
||||
the included files before checking.
|
||||
'';
|
||||
};
|
||||
preCheckConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
example = ''
|
||||
echo "cost 100;" > include.conf
|
||||
'';
|
||||
description = ''
|
||||
Commands to execute before the config file check. The file to be checked will be
|
||||
available as <code>${variant}.conf</code> in the current directory.
|
||||
|
||||
Files created with this option will not be available at service runtime, only during
|
||||
build time checking.
|
||||
'';
|
||||
};
|
||||
};
|
||||
@ -45,7 +61,9 @@ let
|
||||
name = "${variant}.conf";
|
||||
text = cfg.config;
|
||||
checkPhase = optionalString cfg.checkConfig ''
|
||||
${pkg}/bin/${birdBin} -d -p -c $out
|
||||
ln -s $out ${variant}.conf
|
||||
${cfg.preCheckConfig}
|
||||
${pkg}/bin/${birdBin} -d -p -c ${variant}.conf
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -794,6 +794,11 @@ in
|
||||
};
|
||||
}));
|
||||
};
|
||||
options.ShutdownWaitLength = mkOption {
|
||||
type = types.int;
|
||||
default = 30;
|
||||
description = descriptionGeneric "ShutdownWaitLength";
|
||||
};
|
||||
options.SocksPolicy = optionStrings "SocksPolicy" // {
|
||||
example = ["accept *:*"];
|
||||
};
|
||||
@ -977,7 +982,7 @@ in
|
||||
ExecStart = "${cfg.package}/bin/tor -f ${torrc}";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
KillSignal = "SIGINT";
|
||||
TimeoutSec = 30;
|
||||
TimeoutSec = cfg.settings.ShutdownWaitLength + 30; # Wait a bit longer than ShutdownWaitLength before actually timing out
|
||||
Restart = "on-failure";
|
||||
LimitNOFILE = 32768;
|
||||
RuntimeDirectory = [
|
||||
|
||||
@ -46,6 +46,7 @@ in
|
||||
beanstalkd = handleTest ./beanstalkd.nix {};
|
||||
bees = handleTest ./bees.nix {};
|
||||
bind = handleTest ./bind.nix {};
|
||||
bird = handleTest ./bird.nix {};
|
||||
bitcoind = handleTest ./bitcoind.nix {};
|
||||
bittorrent = handleTest ./bittorrent.nix {};
|
||||
blockbook-frontend = handleTest ./blockbook-frontend.nix {};
|
||||
|
||||
205
nixos/tests/bird.nix
Normal file
205
nixos/tests/bird.nix
Normal file
@ -0,0 +1,205 @@
|
||||
# This test does a basic functionality check for all bird variants and demonstrates a use
|
||||
# of the preCheckConfig option.
|
||||
|
||||
{ system ? builtins.currentSystem
|
||||
, pkgs ? import ../.. { inherit system; config = { }; }
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
|
||||
inherit (pkgs.lib) optionalString;
|
||||
|
||||
hostShared = hostId: { pkgs, ... }: {
|
||||
virtualisation.vlans = [ 1 ];
|
||||
|
||||
environment.systemPackages = with pkgs; [ jq ];
|
||||
|
||||
networking = {
|
||||
useNetworkd = true;
|
||||
useDHCP = false;
|
||||
firewall.enable = false;
|
||||
};
|
||||
|
||||
systemd.network.networks."01-eth1" = {
|
||||
name = "eth1";
|
||||
networkConfig.Address = "10.0.0.${hostId}/24";
|
||||
};
|
||||
};
|
||||
|
||||
birdTest = v4:
|
||||
let variant = "bird${optionalString (!v4) "6"}"; in
|
||||
makeTest {
|
||||
name = variant;
|
||||
|
||||
nodes.host1 = makeBirdHost variant "1";
|
||||
nodes.host2 = makeBirdHost variant "2";
|
||||
|
||||
testScript = makeTestScript variant v4 (!v4);
|
||||
};
|
||||
|
||||
bird2Test = makeTest {
|
||||
name = "bird2";
|
||||
|
||||
nodes.host1 = makeBird2Host "1";
|
||||
nodes.host2 = makeBird2Host "2";
|
||||
|
||||
testScript = makeTestScript "bird2" true true;
|
||||
};
|
||||
|
||||
makeTestScript = variant: v4: v6: ''
|
||||
start_all()
|
||||
|
||||
host1.wait_for_unit("${variant}.service")
|
||||
host2.wait_for_unit("${variant}.service")
|
||||
|
||||
${optionalString v4 ''
|
||||
with subtest("Waiting for advertised IPv4 routes"):
|
||||
host1.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.2\")) | any'")
|
||||
host2.wait_until_succeeds("ip --json r | jq -e 'map(select(.dst == \"10.10.0.1\")) | any'")
|
||||
''}
|
||||
${optionalString v6 ''
|
||||
with subtest("Waiting for advertised IPv6 routes"):
|
||||
host1.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::2\")) | any'")
|
||||
host2.wait_until_succeeds("ip --json -6 r | jq -e 'map(select(.dst == \"fdff::1\")) | any'")
|
||||
''}
|
||||
|
||||
with subtest("Check fake routes in preCheckConfig do not exists"):
|
||||
${optionalString v4 ''host1.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''}
|
||||
${optionalString v4 ''host2.fail("ip --json r | jq -e 'map(select(.dst == \"1.2.3.4\")) | any'")''}
|
||||
|
||||
${optionalString v6 ''host1.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''}
|
||||
${optionalString v6 ''host2.fail("ip --json -6 r | jq -e 'map(select(.dst == \"fd00::\")) | any'")''}
|
||||
'';
|
||||
|
||||
makeBirdHost = variant: hostId: { pkgs, ... }: {
|
||||
imports = [ (hostShared hostId) ];
|
||||
|
||||
services.${variant} = {
|
||||
enable = true;
|
||||
|
||||
config = ''
|
||||
log syslog all;
|
||||
|
||||
debug protocols all;
|
||||
|
||||
router id 10.0.0.${hostId};
|
||||
|
||||
protocol device {
|
||||
}
|
||||
|
||||
protocol kernel {
|
||||
import none;
|
||||
export all;
|
||||
}
|
||||
|
||||
protocol static {
|
||||
include "static.conf";
|
||||
}
|
||||
|
||||
protocol ospf {
|
||||
export all;
|
||||
area 0 {
|
||||
interface "eth1" {
|
||||
hello 5;
|
||||
wait 5;
|
||||
};
|
||||
};
|
||||
}
|
||||
'';
|
||||
|
||||
preCheckConfig =
|
||||
let
|
||||
route = { bird = "1.2.3.4/32"; bird6 = "fd00::/128"; }.${variant};
|
||||
in
|
||||
''echo "route ${route} blackhole;" > static.conf'';
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
let
|
||||
route = { bird = "10.10.0.${hostId}/32"; bird6 = "fdff::${hostId}/128"; }.${variant};
|
||||
in
|
||||
[ "f /etc/bird/static.conf - - - - route ${route} blackhole;" ];
|
||||
};
|
||||
|
||||
makeBird2Host = hostId: { pkgs, ... }: {
|
||||
imports = [ (hostShared hostId) ];
|
||||
|
||||
services.bird2 = {
|
||||
enable = true;
|
||||
|
||||
config = ''
|
||||
log syslog all;
|
||||
|
||||
debug protocols all;
|
||||
|
||||
router id 10.0.0.${hostId};
|
||||
|
||||
protocol device {
|
||||
}
|
||||
|
||||
protocol kernel kernel4 {
|
||||
ipv4 {
|
||||
import none;
|
||||
export all;
|
||||
};
|
||||
}
|
||||
|
||||
protocol static static4 {
|
||||
ipv4;
|
||||
include "static4.conf";
|
||||
}
|
||||
|
||||
protocol ospf v2 ospf4 {
|
||||
ipv4 {
|
||||
export all;
|
||||
};
|
||||
area 0 {
|
||||
interface "eth1" {
|
||||
hello 5;
|
||||
wait 5;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
protocol kernel kernel6 {
|
||||
ipv6 {
|
||||
import none;
|
||||
export all;
|
||||
};
|
||||
}
|
||||
|
||||
protocol static static6 {
|
||||
ipv6;
|
||||
include "static6.conf";
|
||||
}
|
||||
|
||||
protocol ospf v3 ospf6 {
|
||||
ipv6 {
|
||||
export all;
|
||||
};
|
||||
area 0 {
|
||||
interface "eth1" {
|
||||
hello 5;
|
||||
wait 5;
|
||||
};
|
||||
};
|
||||
}
|
||||
'';
|
||||
|
||||
preCheckConfig = ''
|
||||
echo "route 1.2.3.4/32 blackhole;" > static4.conf
|
||||
echo "route fd00::/128 blackhole;" > static6.conf
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"f /etc/bird/static4.conf - - - - route 10.10.0.${hostId}/32 blackhole;"
|
||||
"f /etc/bird/static6.conf - - - - route fdff::${hostId}/128 blackhole;"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
bird = birdTest true;
|
||||
bird6 = birdTest false;
|
||||
bird2 = bird2Test;
|
||||
}
|
||||
30
pkgs/applications/networking/blocky/default.nix
Normal file
30
pkgs/applications/networking/blocky/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "blocky";
|
||||
version = "0.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xERR0R";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vG6QAI8gBI2nLRQ0nOFWQHihyzgmJu69rgkWlg3iW3E=";
|
||||
};
|
||||
|
||||
# needs network connection and fails at
|
||||
# https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go
|
||||
doCheck = false;
|
||||
|
||||
vendorSha256 = "sha256-+mpNPDejK9Trhw41SUXJPL/OX5wQR0QfA2+BXSlE0Jk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features.";
|
||||
homepage = "https://0xerr0r.github.io/blocky";
|
||||
changelog = "https://github.com/0xERR0R/blocky/releases";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ ratsclub ];
|
||||
};
|
||||
}
|
||||
@ -1,16 +1,29 @@
|
||||
{ lib, python3, fetchFromGitHub, file, gnupg, gawk, notmuch, procps, withManpage ? false
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, file
|
||||
, gnupg
|
||||
, gawk
|
||||
, notmuch
|
||||
, procps
|
||||
, withManpage ? false
|
||||
}:
|
||||
|
||||
with python3.pkgs;
|
||||
|
||||
let
|
||||
notmuch2 = callPackage ./notmuch.nix {
|
||||
inherit notmuch;
|
||||
};
|
||||
in buildPythonApplication rec {
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "alot";
|
||||
version = "0.10";
|
||||
outputs = [ "out" ] ++ lib.optional withManpage "man";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
] ++ lib.optional withManpage [
|
||||
"man"
|
||||
];
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
@ -22,48 +35,63 @@ in buildPythonApplication rec {
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace alot/settings/manager.py --replace /usr/share "$out/share"
|
||||
substituteInPlace alot/settings/manager.py \
|
||||
--replace /usr/share "$out/share"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optional withManpage sphinx;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
notmuch2
|
||||
urwid
|
||||
urwidtrees
|
||||
twisted
|
||||
python_magic
|
||||
configobj
|
||||
service-identity
|
||||
file
|
||||
gpgme
|
||||
notmuch2
|
||||
python_magic
|
||||
service-identity
|
||||
twisted
|
||||
urwid
|
||||
urwidtrees
|
||||
];
|
||||
|
||||
postBuild = lib.optionalString withManpage "make -C docs man";
|
||||
checkInputs = [
|
||||
future
|
||||
gawk
|
||||
gnupg
|
||||
mock
|
||||
procps
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postBuild = lib.optionalString withManpage [
|
||||
"make -C docs man"
|
||||
];
|
||||
|
||||
checkInputs = [ gawk future mock gnupg procps pytestCheckHook ];
|
||||
# some twisted tests need internet access
|
||||
disabledTests = [
|
||||
# Some twisted tests need internet access
|
||||
"test_env_set"
|
||||
"test_no_spawn_no_stdin_attached"
|
||||
# DatabaseLockedError
|
||||
"test_save_named_query"
|
||||
];
|
||||
|
||||
postInstall = let
|
||||
completionPython = python.withPackages (ps: [ ps.configobj ]);
|
||||
in lib.optionalString withManpage ''
|
||||
mkdir -p $out/man
|
||||
cp -r docs/build/man $out/man
|
||||
''
|
||||
+ ''
|
||||
mkdir -p $out/share/{applications,alot}
|
||||
cp -r extra/themes $out/share/alot
|
||||
postInstall =
|
||||
let
|
||||
completionPython = python.withPackages (ps: [ ps.configobj ]);
|
||||
in
|
||||
lib.optionalString withManpage ''
|
||||
mkdir -p $out/man
|
||||
cp -r docs/build/man $out/man
|
||||
''
|
||||
+ ''
|
||||
mkdir -p $out/share/{applications,alot}
|
||||
cp -r extra/themes $out/share/alot
|
||||
|
||||
substituteInPlace extra/completion/alot-completion.zsh \
|
||||
--replace "python3" "${completionPython.interpreter}"
|
||||
install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot
|
||||
substituteInPlace extra/completion/alot-completion.zsh \
|
||||
--replace "python3" "${completionPython.interpreter}"
|
||||
install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot
|
||||
|
||||
sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
|
||||
'';
|
||||
sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pazz/alot";
|
||||
|
||||
@ -79,6 +79,8 @@ mkDerivation (common "tamarin-prover" src // {
|
||||
# so that the package can be used as a vim plugin to install syntax coloration
|
||||
install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/syntax/spthy.vim
|
||||
install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim
|
||||
# Emacs SPTHY major mode
|
||||
install -Dt $out/share/emacs/site-lisp etc/spthy-mode.el
|
||||
'';
|
||||
|
||||
checkPhase = "./dist/build/tamarin-prover/tamarin-prover test";
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, srt, ffmpeg }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "srtrelay-unstable";
|
||||
version = "2021-07-28";
|
||||
pname = "srtrelay";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "voc";
|
||||
repo = "srtrelay";
|
||||
rev = "c4f02ff2e9637b01a0679b29e5a76f4521eeeef3";
|
||||
sha256 = "06zbl97bjjyv51zp27qk37ffpbh1ylm9bsr0s5qlyd73pyavcj1g";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CA+UuFOWjZjSBDWM62rda3IKO1fwC3X52mP4tg1uoO4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1pdpb0my7gdvjjkka6jhj19b9nx575k6117hg536b106ij2n4zd2";
|
||||
vendorSha256 = "sha256-xTYlfdijSo99ei+ZMX6N9gl+yw0DrPQ2wOhn6SS9S/E=";
|
||||
|
||||
buildInputs = [ srt ];
|
||||
checkInputs = [ ffmpeg ];
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micropython";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "micropython";
|
||||
repo = "micropython";
|
||||
rev = "v${version}";
|
||||
sha256 = "0aqij36iykmfdsv5dqrifvghmjx7qid8hmbxcpx3xpk3nizh7w84";
|
||||
sha256 = "sha256-roskIDyY3ehasOm8Yn4braLNZtaeuItb9ZOUgF4CXww=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
|
||||
skippedTests = ""
|
||||
+ lib.optionalString (stdenv.isDarwin) " -e uasyncio_basic -e uasyncio_wait_task"
|
||||
+ lib.optionalString (stdenv.isDarwin) " -e uasyncio_basic -e uasyncio_heaplock -e uasyncio_wait_task"
|
||||
+ lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback"
|
||||
+ lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse"
|
||||
;
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.1";
|
||||
sha256 = "sha256-j4vJytbNEk7cER99sKEJdF4vY4dwoQGzwiopU/eptA4=";
|
||||
version = "8.1.2";
|
||||
sha256 = "1aakbfgjffha4v7fl6229wwzavw59s1qkb547sipyhl88gfwfgci";
|
||||
});
|
||||
|
||||
in
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libzim";
|
||||
version = "7.1.0";
|
||||
version = "7.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openzim";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8mKUYvw/0aqrerNNKk0V7r5LByEaaJLg43R/0pwM4Z8=";
|
||||
sha256 = "sha256-H4YUAbH4X6oJIZyhI23LemngtOtKNrHHl3KSU1ilAmo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,11 +3,14 @@
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, sgmllib3k
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "feedparser";
|
||||
version = "6.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -15,13 +18,20 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-XOBBCgWrJIyMfPyjoOoiA5aO6f9EhgZzea9IJ6WflmE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sgmllib3k ];
|
||||
propagatedBuildInputs = [
|
||||
sgmllib3k
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
python -Wd tests/runtests.py
|
||||
# Tests are failing
|
||||
# AssertionError: unexpected '~' char in declaration
|
||||
rm tests/wellformed/sanitize/xml_declaration_unexpected_character.xml
|
||||
${python.interpreter} -Wd tests/runtests.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "feedparser" ];
|
||||
pythonImportsCheck = [
|
||||
"feedparser"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/kurtmckee/feedparser";
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nmapthon2";
|
||||
version = "0.1.3";
|
||||
version = "0.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "cblopez";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-t4gAcDwHHejfipQmJvMLhKmdz8D6UN/Mmsrhpq0cygY=";
|
||||
hash = "sha256-4Na75TdKDywUomJF4tDWUWwCCtcOSxBUMOF7+FDhbpY=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -2,14 +2,17 @@
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy27
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sgmllib3k";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
# fetchFromGitHub instead of fetchPypi to run tests.
|
||||
src = fetchFromGitHub {
|
||||
owner = "hsoft";
|
||||
repo = "sgmllib";
|
||||
@ -17,6 +20,18 @@ buildPythonPackage rec {
|
||||
sha256 = "0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.10") [
|
||||
"test_declaration_junk_chars"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sgmllib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://pypi.org/project/sgmllib3k/";
|
||||
description = "Python 3 port of sgmllib";
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "sphinxcontrib-htmlhelp is a sphinx extension which ...";
|
||||
description = "Sphinx extension which renders HTML help files";
|
||||
homepage = "http://sphinx-doc.org/";
|
||||
license = licenses.bsd0;
|
||||
};
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
, pythonOlder
|
||||
, click
|
||||
, click-default-group
|
||||
, dateutils
|
||||
, python-dateutil
|
||||
, sqlite-fts4
|
||||
, tabulate
|
||||
, pytestCheckHook
|
||||
@ -14,32 +14,18 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlite-utils";
|
||||
version = "3.19";
|
||||
version = "3.22";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "509099fce5f25faada6e76b6fb90e8ef5ba0f1715177933a816718be0c8e7244";
|
||||
sha256 = "24803ea4d63e2123d2040db2da43fea95fabada80e1af1fe1da69643ae376689";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/simonw/sqlite-utils/pull/347
|
||||
(fetchpatch {
|
||||
name = "sqlite-utils-better-test_rebuild_fts.patch";
|
||||
url = "https://github.com/simonw/sqlite-utils/pull/347/commits/1a7ef2fe2064ace01d5535fb771f941296fb642a.diff";
|
||||
sha256 = "sha256-WKCQGMqr8WYjG7cmAH5pYBhgikowbt3r6hObwtMDDUY=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace '"pytest-runner"' ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
click
|
||||
click-default-group
|
||||
dateutils
|
||||
python-dateutil
|
||||
sqlite-fts4
|
||||
tabulate
|
||||
];
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy27
|
||||
{ lib
|
||||
, Babel
|
||||
, buildPythonPackage
|
||||
, cssselect
|
||||
, python-dateutil
|
||||
, feedparser
|
||||
, futures ? null
|
||||
, fetchPypi
|
||||
, gdata
|
||||
, gnupg
|
||||
, google-api-python-client
|
||||
@ -16,6 +16,9 @@
|
||||
, pillow
|
||||
, prettytable
|
||||
, pyqt5
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, requests
|
||||
, simplejson
|
||||
@ -26,28 +29,18 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "weboob";
|
||||
version = "2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1c69vzf8sg8471lcaafpz9iw2q3rfj5hmcpqrs2k59fkgbvy32zw";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Disable doctests that require networking:
|
||||
sed -i -n -e '/^ *def \+pagination *(.*: *$/ {
|
||||
p; n; p; /"""\|'\'\'\'''/!b
|
||||
|
||||
:loop
|
||||
n; /^ *\(>>>\|\.\.\.\)/ { h; bloop }
|
||||
x; /^ *\(>>>\|\.\.\.\)/bloop; x
|
||||
p; /"""\|'\'\'\'''/b
|
||||
bloop
|
||||
}; p' weboob/browser/browsers.py weboob/browser/pages.py
|
||||
'';
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
nativeBuildInputs = [ pyqt5 ];
|
||||
nativeBuildInputs = [
|
||||
pyqt5
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
Babel
|
||||
@ -70,15 +63,35 @@ buildPythonPackage rec {
|
||||
simplejson
|
||||
termcolor
|
||||
unidecode
|
||||
] ++ lib.optionals isPy27 [ futures ];
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "with-doctest = 1" "" \
|
||||
--replace "with-coverage = 1" "" \
|
||||
--replace "weboob.browser.filters.standard," "" \
|
||||
--replace "weboob.browser.tests.filters," "" \
|
||||
--replace "weboob.tools.application.formatters.json," "" \
|
||||
--replace "weboob.tools.application.formatters.table," "" \
|
||||
--replace "weboob.tools.capabilities.bank.transactions," ""
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
pythonImportsCheck = [
|
||||
"weboob"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of applications and APIs to interact with websites";
|
||||
homepage = "http://weboob.org";
|
||||
description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
|
||||
license = lib.licenses.agpl3;
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "whodap";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "pogzyb";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1map5m9i1hi4wb9mpp7hq89n8x9bgsi7gclqfixgqhpi5v5gybqc";
|
||||
sha256 = "1pcn2jwqfvp67wz19lcpwnw0dkbc61bnbkzxlmac1yf2pz9ndn6l";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, Babel
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, cssselect
|
||||
, python-dateutil
|
||||
, feedparser
|
||||
, fetchFromGitLab
|
||||
, gdata
|
||||
, gnupg
|
||||
, google-api-python-client
|
||||
@ -19,6 +17,8 @@
|
||||
, pillow
|
||||
, prettytable
|
||||
, pyqt5
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, requests
|
||||
, simplejson
|
||||
@ -29,22 +29,21 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "woob";
|
||||
version = "3.0";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09hpxy5zhn2b8li0xjf3zd7s46lawb0315p5mdcsci3bj3s4v1j7";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "woob";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-XLcHNidclORbxVXgcsHY6Ja/dak+EVSKTaVQmg1f/rw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Disable doctests that require networking:
|
||||
./no-test-requiring-network.patch
|
||||
nativeBuildInputs = [
|
||||
pyqt5
|
||||
];
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
||||
nativeBuildInputs = [ pyqt5 ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
Babel
|
||||
colorama
|
||||
@ -69,14 +68,28 @@ buildPythonPackage rec {
|
||||
unidecode
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "with-doctest = 1" "" \
|
||||
--replace "with-coverage = 1" ""
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
nose
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
nosetests
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"woob"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of applications and APIs to interact with websites";
|
||||
homepage = "https://woob.tech";
|
||||
description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = [ maintainers.DamienCassou ];
|
||||
};
|
||||
maintainers = with maintainers; [ DamienCassou ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
--- a/woob/browser/browsers.py
|
||||
+++ b/woob/browser/browsers.py
|
||||
@@ -930,23 +930,6 @@
|
||||
|
||||
:class:`NextPage` constructor can take an url or a Request object.
|
||||
|
||||
- >>> from .pages import HTMLPage
|
||||
- >>> class Page(HTMLPage):
|
||||
- ... def iter_values(self):
|
||||
- ... for el in self.doc.xpath('//li'):
|
||||
- ... yield el.text
|
||||
- ... for next in self.doc.xpath('//a'):
|
||||
- ... raise NextPage(next.attrib['href'])
|
||||
- ...
|
||||
- >>> class Browser(PagesBrowser):
|
||||
- ... BASEURL = 'https://woob.tech'
|
||||
- ... list = URL('/tests/list-(?P<pagenum>\d+).html', Page)
|
||||
- ...
|
||||
- >>> b = Browser()
|
||||
- >>> b.list.go(pagenum=1) # doctest: +ELLIPSIS
|
||||
- <woob.browser.browsers.Page object at 0x...>
|
||||
- >>> list(b.pagination(lambda: b.page.iter_values()))
|
||||
- ['One', 'Two', 'Three', 'Four']
|
||||
"""
|
||||
while True:
|
||||
try:
|
||||
--- a/woob/browser/pages.py
|
||||
+++ b/woob/browser/pages.py
|
||||
@@ -49,25 +49,6 @@
|
||||
|
||||
:class:`NextPage` constructor can take an url or a Request object.
|
||||
|
||||
- >>> class Page(HTMLPage):
|
||||
- ... @pagination
|
||||
- ... def iter_values(self):
|
||||
- ... for el in self.doc.xpath('//li'):
|
||||
- ... yield el.text
|
||||
- ... for next in self.doc.xpath('//a'):
|
||||
- ... raise NextPage(next.attrib['href'])
|
||||
- ...
|
||||
- >>> from .browsers import PagesBrowser
|
||||
- >>> from .url import URL
|
||||
- >>> class Browser(PagesBrowser):
|
||||
- ... BASEURL = 'https://woob.tech'
|
||||
- ... list = URL('/tests/list-(?P<pagenum>\d+).html', Page)
|
||||
- ...
|
||||
- >>> b = Browser()
|
||||
- >>> b.list.go(pagenum=1) # doctest: +ELLIPSIS
|
||||
- <woob.browser.pages.Page object at 0x...>
|
||||
- >>> list(b.page.iter_values())
|
||||
- ['One', 'Two', 'Three', 'Four']
|
||||
"""
|
||||
|
||||
@wraps(func)
|
||||
@ -22,13 +22,13 @@ with py.pkgs;
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.727";
|
||||
version = "2.0.753";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-hegbkmM8ZN6zO2iANGRr2QRW3ErdtwYaTo618uELev0=";
|
||||
hash = "sha256-6CBe4BuztW3EoLWqGmuRmWfVfb1gP5cPEzYnyBtPEsE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
@ -60,6 +60,7 @@ buildPythonApplication rec {
|
||||
networkx
|
||||
packaging
|
||||
policyuniverse
|
||||
prettytable
|
||||
pyyaml
|
||||
semantic-version
|
||||
tabulate
|
||||
@ -71,7 +72,6 @@ buildPythonApplication rec {
|
||||
|
||||
checkInputs = with py.pkgs; [
|
||||
aioresponses
|
||||
jsonschema
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
@ -81,8 +81,11 @@ buildPythonApplication rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0" \
|
||||
--replace "jsonschema==3.0.2" "jsonschema>=3.0.2"
|
||||
--replace "cyclonedx-python-lib>=0.11.0,<1.0.0" "cyclonedx-python-lib>=0.11.0"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
@ -92,6 +95,9 @@ buildPythonApplication rec {
|
||||
"TestSarifReport"
|
||||
# Will probably be fixed in one of the next releases
|
||||
"test_valid_cyclonedx_bom"
|
||||
# Requires prettytable release which is only available in staging
|
||||
"test_skipped_check_exists"
|
||||
"test_record_relative_path_with_relative_dir"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
@ -101,6 +107,9 @@ buildPythonApplication rec {
|
||||
"tests/terraform/"
|
||||
# Performance tests have no value for us
|
||||
"performance_tests/test_checkov_performance.py"
|
||||
# Requires prettytable release which is only available in staging
|
||||
"tests/sca_package/"
|
||||
"tests/test_runner_filter.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.43.0";
|
||||
version = "1.44.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8aIKFLP1x9B5IMuyQ12LLIq79of4XwCdmDwae4T5MPg=";
|
||||
sha256 = "sha256-2hEru7fnc8v7F/RrOB3jFdfLPYLpm0OupzJP6iORs+U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Mxy9VFBwcxyQtnhwuOFWK+0y0pQQDdqtoj0e2UXEo5k=";
|
||||
vendorSha256 = "sha256-DLvhkTYCaXfNfehEgCNKSKlKaGHo623wBnEhNeTJbmQ=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ let
|
||||
in
|
||||
{
|
||||
name =
|
||||
(lib.strings.replaceStrings ["-"] ["_"]
|
||||
(lib.strings.replaceStrings [ "-" ] [ "_" ]
|
||||
(lib.strings.removePrefix "tree-sitter-"
|
||||
(lib.strings.removeSuffix "-grammar" name)))
|
||||
+ stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"url": "https://github.com/ikatyang/tree-sitter-markdown",
|
||||
"rev": "8b8b77af0493e26d378135a3e7f5ae25b555b375",
|
||||
"date": "2021-04-18T20:49:21+08:00",
|
||||
"path": "/nix/store/4z2k0q6rwqmb7vbqr4vgc26w28szlan3-tree-sitter-markdown",
|
||||
"sha256": "1a2899x7i6dgbsrf13qzmh133hgfrlvmjsr3bbpffi1ixw1h7azk",
|
||||
"url": "https://github.com/MDeiml/tree-sitter-markdown",
|
||||
"rev": "8bee14c30ecadd55c2d65633973b4e81f93525e0",
|
||||
"date": "2022-01-16T14:47:09+01:00",
|
||||
"path": "/nix/store/cv7xqvcj4bjifzddkx5n2jd723dc6vlf-tree-sitter-markdown",
|
||||
"sha256": "0vibmpp86pkqllfhb0kg6zhaz09sh8m6a2d1xa8p2qdi7ryy7wqa",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
||||
@ -117,7 +117,7 @@ let
|
||||
repo = "tree-sitter-make";
|
||||
};
|
||||
"tree-sitter-markdown" = {
|
||||
orga = "ikatyang";
|
||||
orga = "MDeiml";
|
||||
repo = "tree-sitter-markdown";
|
||||
};
|
||||
"tree-sitter-rst" = {
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
"x86_64-darwin" = fetchzip {
|
||||
sha256 = "sha256-vRfKVjFFy4cO/TrA+wEFYp6jcJSB/QDU3if0FDdYu+M=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.0/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-hB3TL1FocAtLpBe+Rv2Pyon4f1ld+Fqapz6TUQ0O1jU=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
"i686-linux" = fetchurl {
|
||||
sha256 = "sha256-gWylZgCk+bGf1h2lTX2gRnW39P7C2ks0LH7anJW6JKw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.0/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-ZPHmFxKLJ1oxT18P6FDv74/leCzlESTrhNYuC8T6u+I=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
"x86_64-linux" = fetchurl {
|
||||
sha256 = "sha256-g2DIeXwaqTTfshYyyDNHbOU57YUbuxXDKJHFqKFrqzw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.0/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-yOvkEimDp646BCCFV2fnmVGe6R8geFlxtWLfPMVQ9Uk=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
"aarch64-linux" = fetchurl {
|
||||
sha256 = "sha256-PovduGRcfSUbhqX1cxRgMknN8mWJekjjpB0b1TE1//g=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.0/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-ayNv2O0Ge3dT6YAN4SW/gsyoErCB3BJYsx/daMbGHjs=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.3/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.0";
|
||||
version = "0.107.3";
|
||||
|
||||
src = (import ./bins.nix { inherit fetchurl fetchzip; }).${stdenv.hostPlatform.system};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh }:
|
||||
{ lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh, nixosTests }:
|
||||
|
||||
with lib;
|
||||
|
||||
@ -34,6 +34,8 @@ let
|
||||
"--localstatedir=/var"
|
||||
] ++ optional enableIPv6 "--enable-ipv6";
|
||||
|
||||
passthru.tests = nixosTests.bird;
|
||||
|
||||
meta = {
|
||||
description = "BIRD Internet Routing Daemon";
|
||||
homepage = "http://bird.network.cz";
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
}@args:
|
||||
|
||||
let
|
||||
version = "2.8.0.beta10";
|
||||
version = "2.8.0.beta11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-mlTOsHR8p0mTdhZHBESyDAa1XtMJ4uIht0VUcGD6Ses=";
|
||||
sha256 = "sha256-dTem4or0SunXCJFpNkeM0CSXY+58AeQAuMaLzhfGMY0=";
|
||||
};
|
||||
|
||||
runtimeDeps = [
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-assign";
|
||||
rev = "920503f5fc2cbec1b3ba4d431cffda2281e12509";
|
||||
sha256 = "sha256-qMUlJwETu99Qmbh4sn/1Vn7Xgaj3Jhi+/E8ecIbnVH8=";
|
||||
rev = "a52da2396c5787a07c2746890bb44a0921a149e9";
|
||||
sha256 = "sha256-UzpDesqxC20teyKYwqizYvjvR47zApyLporCU71RNvk=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (7.0.0)
|
||||
activesupport (7.0.1)
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
|
||||
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-calendar";
|
||||
rev = "9c5516ff039225be04b1302c5c67837ce64fba9c";
|
||||
sha256 = "sha256-tfQWhkQvHrIUl0+tIv8X65MvoUhUnKD7KHwQbBm3p7U=";
|
||||
rev = "f3b64f7b8c009f18bdc16def7c7299f747ea08ab";
|
||||
sha256 = "sha256-ACbPMfqyFj9877r56qr+wxHEln+L1sAuQg/YUDGpuds=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-calendar";
|
||||
|
||||
@ -5,10 +5,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04bsr3420wb8y5pagg3s0rkx44fix47wrjvfby2d205l9bq6azyk";
|
||||
sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "7.0.0";
|
||||
version = "7.0.1";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default"];
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-canned-replies";
|
||||
rev = "dbbb8740287e44b5e9f0d8c968e3d237154e1f3c";
|
||||
sha256 = "sha256-o4yZaXiQpt7Bb29kVKJOiIdNgcSEOnSiFAIhZtiX6ys=";
|
||||
rev = "598946bc92171426792f120f0a68ad4ecaae1c91";
|
||||
sha256 = "sha256-HLrmj/dHj6wWUEqsFAh8gIPaZCIaXN1kZo17UHJwP70=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-canned-replies";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-chat-integration";
|
||||
rev = "46b2c05cbd00dbc49bff87d78f8e1ec4fdd43735";
|
||||
sha256 = "sha256-G17obAc03FR3Qzn/IR++Y5Z1TkpP6lY5UDJsm4Lmj0M=";
|
||||
rev = "45a16e2c40f9b79a351e52b905c7816ddbd29bb3";
|
||||
sha256 = "sha256-cu9JhBB4ggsVzKlxe9x2WQVgwzwAA5U6OEKhbiRQACU=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-chat-integration";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-checklist";
|
||||
rev = "b4e14bdac40131bd70a698015b35a111a18c9f88";
|
||||
sha256 = "sha256-okxcLu6gXvEY37ylnhit5B+LwCdV5gMKBpC/m/PaGtc=";
|
||||
rev = "80d448b92173398530643ee07a40d6c60e4a3a5e";
|
||||
sha256 = "sha256-FJtb7s4UQ6A4SEezB/58pmvpN+f1gVBY/G4GUzE20ME=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-checklist";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-data-explorer";
|
||||
rev = "f77f5999069dbe98c49302566c82e5f77bb72db2";
|
||||
sha256 = "sha256-N9LmFnza1pA3JRBE9bT9b/NhdYMKoF5GOUpq9XYdokY=";
|
||||
rev = "58cfe737f7eb3d401a059edc8d24ed0ec22fa2f7";
|
||||
sha256 = "sha256-pwzW+HCby2HD5SsnFCi8kUqN/dQuZiVkdmqQ2P2XQ2c=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-data-explorer";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-docs";
|
||||
rev = "e56816eb502b5ea37606f65a8df188e233f77240";
|
||||
sha256 = "sha256-qvuoFsVXKa2IZgjVeqCca7X9jfohEBaoieZRsSFJCto=";
|
||||
rev = "f8ac536160c662f29c49111beb5b18b70dbe8cd9";
|
||||
sha256 = "sha256-pU5Dl+G2HRKfWi+W+P4ZP6A8EMqi9xaIYXx1xUg9I54=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-docs";
|
||||
|
||||
@ -3,25 +3,29 @@ GEM
|
||||
specs:
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
faraday (1.8.0)
|
||||
faraday (1.9.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.1)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.3)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
multipart-post (2.1.1)
|
||||
octokit (4.21.0)
|
||||
faraday (>= 0.9)
|
||||
|
||||
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-github";
|
||||
rev = "9fae5e365c1330bc25265e3bb2a06d29adb38266";
|
||||
sha256 = "sha256-0HUrhO78XbTr6ygNFT+Uh70n2z9dFpimawh4u8fpNjg=";
|
||||
rev = "f4635f94f8c1eaf38f7b025d1fc236e404a39414";
|
||||
sha256 = "sha256-kd8iCgLuFxFbu8HR9ttzmVFF4AK0P7cbo1q15kD9Dp4=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-github";
|
||||
|
||||
@ -11,15 +11,15 @@
|
||||
version = "2.8.0";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
|
||||
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
|
||||
sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
version = "1.9.3";
|
||||
};
|
||||
faraday-em_http = {
|
||||
groups = ["default"];
|
||||
@ -61,6 +61,17 @@
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
faraday-multipart = {
|
||||
dependencies = ["multipart-post"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -101,6 +112,16 @@
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
faraday-retry = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
multipart-post = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
||||
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonmbake";
|
||||
repo = "discourse-ldap-auth";
|
||||
rev = "1c10221836393c3cfac470a7b08de6f31150c802";
|
||||
sha256 = "sha256-IiAl3OTADXSUnL+OKKHJY9Xqd4zCNJ2wOrgTN3nm5Yw=";
|
||||
rev = "fe014176bd635e7df24ee2978d356e1f87d8daed";
|
||||
sha256 = "sha256-1Cx+65rJx292sTfPUfbzSfJAU71V1pKWvWdLNCq8M8A=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jonmbake/discourse-ldap-auth";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-math";
|
||||
rev = "3de98fc75b7d06d06651edc48449b1bb71d2171b";
|
||||
sha256 = "sha256-HDhy6uvfmBxJq9UobLhAUdFcYULFvPZbb5vT1Sg7ung=";
|
||||
rev = "33662c4b1d8a3faa6138261bd6a6043b4d9ac037";
|
||||
sha256 = "sha256-UMGj2KqYHs7MtVHBGLUgUKA7wzhX32160b4OihiwgCI=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-math";
|
||||
|
||||
@ -6,8 +6,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-openid-connect";
|
||||
rev = "aa6a628687edc041bd6f46eb2a38e9a71644bdda";
|
||||
sha256 = "sha256-VdaeueESr7X4gB1pW9e//nDLz62GTaZEPyFIvvCfg18=";
|
||||
rev = "bba36d68a44b1e1d19729d14fd04ad280fc32c58";
|
||||
sha256 = "sha256-9CV5A3gQzYvokTLNOwoX1jQhGaZQBn4tn5jn7bfhLS4=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-openid-connect";
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-prometheus";
|
||||
rev = "aaaf3eda30e5fc03c880c056c1f2388739569fb0";
|
||||
sha256 = "sha256-8bfjPCcwDjEC7Tu0Jr9VZRpaDlP2nlIOWBH8pUQakxo=";
|
||||
rev = "d71565f7ee4d3fe5cef8c8831a20cec5e52a1367";
|
||||
sha256 = "sha256-Zn/ZzbMyHImQ9vc7KJI2gtVKYyqbWOZWK3qg7BK0xxQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-saved-searches";
|
||||
rev = "0c14b9080306c2e35abf32f8211076286fdfbd2f";
|
||||
sha256 = "sha256-ahNw2WL5J4qAyUBgpYWTiS4G+QmQa+gloG2Vu67qXR8=";
|
||||
rev = "a10f2eb7ccbf3be037144978d0aa36d8fa44115b";
|
||||
sha256 = "sha256-WIqju9JUy3bij2iHHjWv/+TfODev5icYNYS5kRruLcc=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-saved-searches";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-solved";
|
||||
rev = "6f50e2633545e160c01188bdfa9e57adf1d18adc";
|
||||
sha256 = "sha256-+L4GzJrt15vYY29iYxVpPZFYhLygZJK4I5fqvhdI/HI=";
|
||||
rev = "d7c8c95f2dbc7fa94b09d2590d70558346f6e81e";
|
||||
sha256 = "sha256-utuv7JL/WJU48TE0+RIRoUpIFrcUpQGvPzfIXA2ZCL8=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-solved";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-spoiler-alert";
|
||||
rev = "f9545afaa557829f8f0c17a856e028a5be7407cf";
|
||||
sha256 = "sha256-VhA7tK+uE2r6E66yn5FbT+Mdp9Ckj92xCF3Q9Wp60T8=";
|
||||
rev = "0cbbaa20f5bf097a0d4ec1361534f97e4b7e1604";
|
||||
sha256 = "sha256-FpA1+ZC5rInUkCrWMU3HU9Hmi/58f/OrfmeXd5nowvU=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-spoiler-alert";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-voting";
|
||||
rev = "c2d8b9456834796e90f2e13e7d11a08f389531e1";
|
||||
sha256 = "sha256-z6JBsuq4nj1eqfU/xoU4xWcVNphuyr3C3iKO0chcSz4=";
|
||||
rev = "5011df324caaa89433f089bb9d9cfdf919457b11";
|
||||
sha256 = "sha256-2iPbC/nvTmJ8heqX1C8sfNnkTeO6jHn+gzEraAdJvMg=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-voting";
|
||||
|
||||
@ -5,8 +5,8 @@ mkDiscoursePlugin {
|
||||
src = fetchFromGitHub {
|
||||
owner = "discourse";
|
||||
repo = "discourse-yearly-review";
|
||||
rev = "e42f48a576b753cb1e042e9693af35214333bb0f";
|
||||
sha256 = "sha256-8+pwiQE0Ytva0t80bRDs+7mTZ82fPpmwb7Nk9boPFt8=";
|
||||
rev = "69a6c2ca39a41d88ff07ebd7c38c082082415dc9";
|
||||
sha256 = "sha256-jrpKjINnAxfkMdK89b0OyKkgivIC4L/aL5qU4XZdgnk=";
|
||||
};
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/discourse/discourse-yearly-review";
|
||||
|
||||
@ -80,7 +80,7 @@ GEM
|
||||
rack (>= 0.9.0)
|
||||
binding_of_caller (1.0.0)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bootsnap (1.9.3)
|
||||
bootsnap (1.9.4)
|
||||
msgpack (~> 1.0)
|
||||
builder (3.2.4)
|
||||
bullet (7.0.0)
|
||||
@ -104,7 +104,7 @@ GEM
|
||||
css_parser (1.11.0)
|
||||
addressable
|
||||
debug_inspector (1.1.0)
|
||||
diff-lcs (1.4.4)
|
||||
diff-lcs (1.5.0)
|
||||
diffy (3.4.0)
|
||||
discourse-ember-rails (0.18.6)
|
||||
active_model_serializers
|
||||
@ -119,8 +119,8 @@ GEM
|
||||
faker (~> 2.16)
|
||||
literate_randomizer
|
||||
docile (1.4.0)
|
||||
ecma-re-validator (0.3.0)
|
||||
regexp_parser (~> 2.0)
|
||||
ecma-re-validator (0.4.0)
|
||||
regexp_parser (~> 2.2)
|
||||
email_reply_trimmer (0.1.13)
|
||||
ember-data-source (3.0.2)
|
||||
ember-source (>= 2, < 3.0)
|
||||
@ -136,29 +136,33 @@ GEM
|
||||
faker (2.19.0)
|
||||
i18n (>= 1.6, < 2)
|
||||
fakeweb (1.3.0)
|
||||
faraday (1.8.0)
|
||||
faraday (1.9.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.1)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.3)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
fast_blank (1.0.1)
|
||||
fast_xs (0.8.0)
|
||||
fastimage (2.2.6)
|
||||
ffi (1.15.4)
|
||||
ffi (1.15.5)
|
||||
fspath (3.1.2)
|
||||
gc_tracer (1.5.1)
|
||||
globalid (1.0.0)
|
||||
@ -166,7 +170,7 @@ GEM
|
||||
guess_html_encoding (0.0.11)
|
||||
hana (1.3.7)
|
||||
hashdiff (1.0.1)
|
||||
hashie (4.1.0)
|
||||
hashie (5.0.0)
|
||||
highline (2.0.3)
|
||||
hkdf (0.3.0)
|
||||
htmlentities (4.3.4)
|
||||
@ -182,7 +186,7 @@ GEM
|
||||
image_size (3.0.1)
|
||||
in_threads (1.5.4)
|
||||
ipaddr (1.2.3)
|
||||
jmespath (1.4.0)
|
||||
jmespath (1.5.0)
|
||||
jquery-rails (4.4.0)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
@ -218,12 +222,12 @@ GEM
|
||||
lz4-ruby (0.3.3)
|
||||
maxminddb (0.1.22)
|
||||
memory_profiler (1.0.0)
|
||||
message_bus (3.3.8)
|
||||
message_bus (4.0.0)
|
||||
rack (>= 1.1.3)
|
||||
method_source (1.0.0)
|
||||
mini_mime (1.1.2)
|
||||
mini_portile2 (2.6.1)
|
||||
mini_racer (0.5.0)
|
||||
mini_racer (0.6.1)
|
||||
libv8-node (~> 16.10.0.0)
|
||||
mini_scheduler (0.13.0)
|
||||
sidekiq (>= 4.2.3)
|
||||
@ -281,7 +285,7 @@ GEM
|
||||
parallel (1.21.0)
|
||||
parallel_tests (3.7.3)
|
||||
parallel
|
||||
parser (3.0.3.2)
|
||||
parser (3.1.0.0)
|
||||
ast (~> 2.4.1)
|
||||
pg (1.2.3)
|
||||
progress (3.6.0)
|
||||
@ -323,7 +327,7 @@ GEM
|
||||
method_source
|
||||
rake (>= 0.13)
|
||||
thor (~> 1.0)
|
||||
rainbow (3.0.0)
|
||||
rainbow (3.1.1)
|
||||
raindrops (0.20.0)
|
||||
rake (13.0.6)
|
||||
rb-fsevent (0.11.0)
|
||||
@ -378,21 +382,21 @@ GEM
|
||||
json-schema (~> 2.2)
|
||||
railties (>= 3.1, < 7.0)
|
||||
rtlit (0.0.5)
|
||||
rubocop (1.23.0)
|
||||
rubocop (1.24.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.0.0.0)
|
||||
rainbow (>= 2.2.2, < 4.0)
|
||||
regexp_parser (>= 1.8, < 3.0)
|
||||
rexml
|
||||
rubocop-ast (>= 1.12.0, < 2.0)
|
||||
rubocop-ast (>= 1.15.1, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.15.0)
|
||||
rubocop-ast (1.15.1)
|
||||
parser (>= 3.0.1.1)
|
||||
rubocop-discourse (2.5.0)
|
||||
rubocop (>= 1.1.0)
|
||||
rubocop-rspec (>= 2.0.0)
|
||||
rubocop-rspec (2.6.0)
|
||||
rubocop-rspec (2.7.0)
|
||||
rubocop (~> 1.19)
|
||||
ruby-prof (1.4.3)
|
||||
ruby-progressbar (1.11.0)
|
||||
@ -416,7 +420,7 @@ GEM
|
||||
seed-fu (2.3.9)
|
||||
activerecord (>= 3.1)
|
||||
activesupport (>= 3.1)
|
||||
shoulda-matchers (5.0.0)
|
||||
shoulda-matchers (5.1.0)
|
||||
activesupport (>= 5.2.0)
|
||||
sidekiq (6.3.1)
|
||||
connection_pool (>= 2.2.2)
|
||||
@ -438,7 +442,7 @@ GEM
|
||||
sshkey (2.0.0)
|
||||
stackprof (0.2.17)
|
||||
test-prof (1.0.7)
|
||||
thor (1.1.0)
|
||||
thor (1.2.1)
|
||||
tilt (2.0.10)
|
||||
tzinfo (2.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
@ -448,7 +452,7 @@ GEM
|
||||
unf_ext
|
||||
unf_ext (0.0.8)
|
||||
unicode-display_width (2.1.0)
|
||||
unicorn (6.0.0)
|
||||
unicorn (6.1.0)
|
||||
kgio (~> 2.6)
|
||||
raindrops (~> 0.7)
|
||||
uniform_notifier (1.14.2)
|
||||
@ -462,7 +466,7 @@ GEM
|
||||
jwt (~> 2.0)
|
||||
xorcist (1.1.2)
|
||||
yaml-lint (0.0.10)
|
||||
zeitwerk (2.5.1)
|
||||
zeitwerk (2.5.3)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
@ -597,4 +601,4 @@ DEPENDENCIES
|
||||
yaml-lint
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.26
|
||||
2.3.4
|
||||
|
||||
@ -252,10 +252,10 @@
|
||||
}];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18prmylz53gsw651f0sibb2mvdxgd2zzdzh6a9a1idpqhyxcnbg7";
|
||||
sha256 = "19i4x2nascd74ahcvmrsnf03cygh1y4c9yf8rcv91fv0mcxpvb9n";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
};
|
||||
builder = {
|
||||
groups = ["default" "development" "test"];
|
||||
@ -434,10 +434,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
|
||||
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.4";
|
||||
version = "1.5.0";
|
||||
};
|
||||
diffy = {
|
||||
groups = ["default"];
|
||||
@ -507,10 +507,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1mz0nsl2093jd94nygw8qs13rwfwl1ax76xz3ypinr5hqbc5pab6";
|
||||
sha256 = "1kqci9ixr1jfp2aaq5lsyz5lkn37z2k94ww9d2hyrd8ncrhrhx8f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
};
|
||||
email_reply_trimmer = {
|
||||
groups = ["default"];
|
||||
@ -630,15 +630,15 @@
|
||||
version = "1.3.0";
|
||||
};
|
||||
faraday = {
|
||||
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"];
|
||||
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
|
||||
sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.0";
|
||||
version = "1.9.3";
|
||||
};
|
||||
faraday-em_http = {
|
||||
groups = ["default"];
|
||||
@ -680,6 +680,17 @@
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
faraday-multipart = {
|
||||
dependencies = ["multipart-post"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
@ -720,6 +731,16 @@
|
||||
};
|
||||
version = "1.0.0";
|
||||
};
|
||||
faraday-retry = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.3";
|
||||
};
|
||||
fast_blank = {
|
||||
groups = ["default"];
|
||||
platforms = [{
|
||||
@ -771,10 +792,10 @@
|
||||
}];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn";
|
||||
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.4";
|
||||
version = "1.15.5";
|
||||
};
|
||||
fspath = {
|
||||
groups = ["default"];
|
||||
@ -846,10 +867,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q";
|
||||
sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.0";
|
||||
version = "5.0.0";
|
||||
};
|
||||
highline = {
|
||||
groups = ["default"];
|
||||
@ -948,10 +969,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf";
|
||||
sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
};
|
||||
jquery-rails = {
|
||||
dependencies = ["rails-dom-testing" "railties" "thor"];
|
||||
@ -1175,10 +1196,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xf3r47qpigg661krwa8z7k4f0z0rx9r5g2mgahrrwgjn67d332l";
|
||||
sha256 = "0589k3ggj6s970mr2jaz8zfcnl5b926birwi6s3b6j3ijf2nh3s3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.3.8";
|
||||
version = "4.0.0";
|
||||
};
|
||||
method_source = {
|
||||
groups = ["default" "development" "test"];
|
||||
@ -1216,10 +1237,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1b6lahs31m3ky4maq8s83w35lkariq0g1f6bjhnaxvwzjhhar5cf";
|
||||
sha256 = "1j45mg8fs7i0g6ndbzd9qqs3fhq6wpvlp5s95k6mjn1as71l5l55";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.5.0";
|
||||
version = "0.6.1";
|
||||
};
|
||||
mini_scheduler = {
|
||||
dependencies = ["sidekiq"];
|
||||
@ -1530,10 +1551,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sszdl9mpzqzn9kxrp28sqmg47mjxcwypr4d60vbajqba4v885di";
|
||||
sha256 = "08q20ckhn58m49lccf93p0yv7pkc7hymmcz3di762kb658d5fd38";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.3.2";
|
||||
version = "3.1.0.0";
|
||||
};
|
||||
pg = {
|
||||
groups = ["default"];
|
||||
@ -1736,10 +1757,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
|
||||
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.0";
|
||||
version = "3.1.1";
|
||||
};
|
||||
raindrops = {
|
||||
groups = ["default"];
|
||||
@ -2020,10 +2041,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "03ivbqd5blsb7v5mhrzxvn23779rqpyrsm7l086pb6ihp47122qb";
|
||||
sha256 = "1sn7ag295blmhpwv6x472m3fd0n25swz9imqwpk0hg21rdcdw7p0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.23.0";
|
||||
version = "1.24.1";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
@ -2031,10 +2052,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0bj8ppl4143f7pkcwm4l5wcahid6yzracdlzh1w2fpss89pic2rf";
|
||||
sha256 = "1xrij42166a71ixfpfr1pildqdrcmc0cb4906h2s8sk4kqdyngih";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
};
|
||||
rubocop-discourse = {
|
||||
dependencies = ["rubocop" "rubocop-rspec"];
|
||||
@ -2053,10 +2074,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0g7kwmb1ilmc8pfyvfh87yjp26qzij2ib7h3lqcl42cp33cg2zzk";
|
||||
sha256 = "1d76haw5gjpxlfanfzicn7sb5gziyizaksm7i999p7p5dmy5vf9q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
};
|
||||
ruby-prof = {
|
||||
groups = ["development"];
|
||||
@ -2163,10 +2184,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0z6v2acldnvqrnvfk70f9xq39ppw5j03kbz2hpz7s17lgnn21vx8";
|
||||
sha256 = "01svmyma958sbqfz0v29lbqbr0ibvgcng352nhx6bsc9k5c207d0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.0";
|
||||
version = "5.1.0";
|
||||
};
|
||||
sidekiq = {
|
||||
dependencies = ["connection_pool" "rack" "redis"];
|
||||
@ -2271,10 +2292,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
|
||||
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.0";
|
||||
version = "1.2.1";
|
||||
};
|
||||
tilt = {
|
||||
groups = ["default"];
|
||||
@ -2351,10 +2372,10 @@
|
||||
}];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1jcm85d7j7njfgims712svlgml32zjim6qwabm99645aj5laayln";
|
||||
sha256 = "1h0gma14jjxiz6piyi6p99q7lya2mxrq79l03160hascvmx9ipa5";
|
||||
type = "gem";
|
||||
};
|
||||
version = "6.0.0";
|
||||
version = "6.1.0";
|
||||
};
|
||||
uniform_notifier = {
|
||||
groups = ["default" "development"];
|
||||
@ -2423,9 +2444,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";
|
||||
sha256 = "0lmg9x683gr9mkrbq9df2m0zb0650mdfxqna0bs10js44inv7znx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.5.1";
|
||||
version = "2.5.3";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
|
||||
index ffcafcb618..31ba691983 100644
|
||||
index e69979adfe..68cb04a036 100644
|
||||
--- a/config/unicorn.conf.rb
|
||||
+++ b/config/unicorn.conf.rb
|
||||
@@ -27,18 +27,10 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
|
||||
@@ -27,17 +27,9 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
|
||||
|
||||
if ENV["RAILS_ENV"] != "production"
|
||||
logger Logger.new($stdout)
|
||||
logger Logger.new(STDOUT)
|
||||
- # we want a longer timeout in dev cause first request can be really slow
|
||||
- timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
|
||||
-else
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fits-cloudctl";
|
||||
version = "0.10.5";
|
||||
version = "0.10.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fi-ts";
|
||||
repo = "cloudctl";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-l01c1tjS0L+T/kHreYx3A5/N/oRDuDywXS/GAvUCxSk=";
|
||||
sha256 = "sha256-GSdVwpYmJ3VnZaMQ8SjzcHpeefFjSaZXRcUAXEI9PKo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-iJlNNovsIgTOPfAzwqkumrmCQu2xI/neqH+Z4tvSXeY=";
|
||||
vendorSha256 = "sha256-RZ4cy9XHpWRP85G4A1/qYPjt/4CZ7pgECf+rsViPjGE=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command-line client for FI-TS Finance Cloud Native services";
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd, openssl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fluent-bit";
|
||||
version = "1.8.9";
|
||||
version = "1.8.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fluent";
|
||||
repo = "fluent-bit";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b+MZuZQB/sl0HcioU1KCxH3TNiXYSPBfC9dBKqCVeXk=";
|
||||
sha256 = "sha256-DULXfkddBdCvTWkuWXjSTEujRZ3mVVzy//qeB3j0Vz8=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake flex bison ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ systemd ];
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.isLinux [ systemd ];
|
||||
|
||||
cmakeFlags = [ "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-01-20";
|
||||
version = "2022-01-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-tcoohr9ENRG+WFRJ3KG5NBpwatksV0TQ4HoEypqMjVo=";
|
||||
sha256 = "sha256-kqb5MhdKA6qvIdnTzPNUscksyz2GWaiPJg2JxA1C3p0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gomapenum";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nodauf";
|
||||
repo = "GoMapEnum";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6AwbG3rs3ZjCGpCDeesddXW63OOxsoWdRtueNx35K38=";
|
||||
sha256 = "sha256-AjHqD9r4ZU5NCqXEovvQuV4eeMLBy2jO/uqZQiCTyNI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Z/uLZIPKd75P9nI7kTFOwzWFkRTVwUojYEQms4OJ6Bk=";
|
||||
vendorSha256 = "sha256-65NF814w1IUgSDuLLIqfbsf22va4AUC2E05ZgmuOHGY=";
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/src $out/bin/$pname
|
||||
|
||||
@ -24465,6 +24465,10 @@ with pkgs;
|
||||
|
||||
bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { };
|
||||
|
||||
blocky = callPackage ../applications/networking/blocky {
|
||||
buildGoModule = buildGo117Module;
|
||||
};
|
||||
|
||||
cadence = libsForQt5.callPackage ../applications/audio/cadence { };
|
||||
|
||||
cheesecutter = callPackage ../applications/audio/cheesecutter { };
|
||||
|
||||
@ -540,7 +540,15 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ];
|
||||
doCheck = false;
|
||||
}
|
||||
{ name = "sockets"; doCheck = false; }
|
||||
{
|
||||
name = "sockets";
|
||||
doCheck = false;
|
||||
patches = lib.optional (php.version == "8.1.2")
|
||||
(fetchpatch {
|
||||
url = "https://github.com/php/php-src/commit/07aaa34cd418c44f7bc653fafbf49f07fc71b2bf.patch";
|
||||
sha256 = "sha256-EwVb09/zV2vJ8PuyLpKFCovxe6yKct0UBvishZaordM=";
|
||||
});
|
||||
}
|
||||
{ name = "sodium"; buildInputs = [ libsodium ]; }
|
||||
{ name = "sqlite3"; buildInputs = [ sqlite ]; }
|
||||
{ name = "sysvmsg"; }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user