mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 12:38:41 +03:00
Merge branch 'staging-next' into staging
This commit is contained in:
Jan Tojnar
commit
afe22f645a
@ -182,6 +182,9 @@ let
|
||||
# fonts.conf
|
||||
ln -s ${pkg.out}/etc/fonts/fonts.conf \
|
||||
$dst/../fonts.conf
|
||||
# TODO: remove this legacy symlink once people stop using packages built before #95358 was merged
|
||||
ln -s /etc/fonts/${pkg.configVersion}/fonts.conf \
|
||||
$out/etc/fonts/fonts.conf
|
||||
|
||||
# fontconfig default config files
|
||||
ln -s ${pkg.out}/etc/fonts/conf.d/*.conf \
|
||||
|
||||
@ -43,7 +43,6 @@ in
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/ckb-next-daemon ${optionalString (cfg.gid != null) "--gid=${builtins.toString cfg.gid}"}";
|
||||
Restart = "on-failure";
|
||||
StandardOutput = "syslog";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -170,7 +170,6 @@ in {
|
||||
Restart = "always";
|
||||
RestartSec = 30;
|
||||
BusName = "com.intel.tss2.Tabrmd";
|
||||
StandardOutput = "syslog";
|
||||
ExecStart = "${cfg.abrmd.package}/bin/tpm2-abrmd";
|
||||
User = "tss";
|
||||
Group = "nogroup";
|
||||
|
||||
@ -234,7 +234,6 @@ in
|
||||
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
|
||||
NotifyAccess = "main";
|
||||
KillSignal = "SIGQUIT";
|
||||
StandardError = "syslog";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -106,7 +106,6 @@ in
|
||||
path = optional ecfg.enableNotifications pkgs.dbus;
|
||||
serviceConfig = {
|
||||
StandardOutput = "null";
|
||||
StandardError = "syslog";
|
||||
ExecStart = ''
|
||||
${pkgs.earlyoom}/bin/earlyoom \
|
||||
-m ${toString ecfg.freeMemThreshold} \
|
||||
|
||||
@ -73,8 +73,6 @@ in {
|
||||
TTYVTDisallocate = "yes";
|
||||
# Fail to start if not controlling the virtual terminal.
|
||||
StandardInput = "tty-fail";
|
||||
StandardOutput = "syslog";
|
||||
StandardError = "syslog";
|
||||
# Set up a full (custom) user session for the user, required by Cage.
|
||||
PAMName = "cage";
|
||||
};
|
||||
|
||||
@ -632,8 +632,6 @@ let
|
||||
User = "${cfg.user}";
|
||||
Group = "tt_rss";
|
||||
ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon --quiet";
|
||||
StandardOutput = "syslog";
|
||||
StandardError = "syslog";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "60";
|
||||
SyslogIdentifier = "tt-rss";
|
||||
|
||||
@ -200,7 +200,6 @@ in
|
||||
KillMode = "mixed";
|
||||
IgnoreSIGPIPE = "no";
|
||||
BusName = "org.gnome.DisplayManager";
|
||||
StandardOutput = "syslog";
|
||||
StandardError = "inherit";
|
||||
ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID";
|
||||
KeyringMode = "shared";
|
||||
|
||||
@ -253,7 +253,6 @@ in
|
||||
KeyringMode = "shared";
|
||||
KillMode = "mixed";
|
||||
StandardError = "inherit";
|
||||
StandardOutput = "syslog";
|
||||
};
|
||||
|
||||
environment.etc."lightdm/lightdm.conf".source = lightdmConf;
|
||||
|
||||
@ -374,7 +374,8 @@ let
|
||||
) config.boot.initrd.secrets)
|
||||
}
|
||||
|
||||
(cd "$tmp" && find . | cpio -H newc -o) | gzip >>"$1"
|
||||
(cd "$tmp" && find . -print0 | sort -z | cpio -o -H newc -R +0:+0 --reproducible --null) | \
|
||||
${config.boot.initrd.compressor} >> "$1"
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
@ -198,7 +198,6 @@ let
|
||||
systemd.services."vboxtestlog-${name}@" = {
|
||||
description = "VirtualBox Test Machine Log For ${name}";
|
||||
serviceConfig.StandardInput = "socket";
|
||||
serviceConfig.StandardOutput = "syslog";
|
||||
serviceConfig.SyslogIdentifier = "GUEST-${name}";
|
||||
serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat";
|
||||
};
|
||||
|
||||
@ -14,16 +14,16 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ncspot";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrkfdn";
|
||||
repo = "ncspot";
|
||||
rev = "v${version}";
|
||||
sha256 = "0b2g5bd04zh1hcrhkgd2srx9gl94da4gpy9arjcvrldschjxjza1";
|
||||
sha256 = "1yx0fc24bgh1x6fdwznc1hqvjq0j7i0zvws3bsyijzs7q48jm0z7";
|
||||
};
|
||||
|
||||
cargoSha256 = "1gbhvmg7jfmx0b694rdr3s2zs33d4s645gw1lrxvwffif4mg8fy9";
|
||||
cargoSha256 = "0bh2shg80xbs2cw10dabrdxkvhf2csk5h9wmmk5z87q6w25paz1f";
|
||||
|
||||
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
|
||||
|
||||
|
||||
@ -20,16 +20,12 @@
|
||||
|
||||
with stdenv.lib;
|
||||
let
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
majorMinorVersion = versions.majorMinor version;
|
||||
desktop = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop";
|
||||
sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha";
|
||||
};
|
||||
pixmap = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png";
|
||||
sha256 = "08p7j7dg50jlj783kkgdw037klmx0spqjikaprmbkzgcb620r25d";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "bitcoin" else "bitcoind";
|
||||
@ -40,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "ec5a2358ee868d845115dc4fc3ed631ff063c57d5e0a713562d083c5c45efb28";
|
||||
sha256 = "4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
@ -53,7 +49,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postInstall = optional withGui ''
|
||||
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
|
||||
install -Dm644 ${pixmap} $out/share/pixmaps/bitcoin128.png
|
||||
install -Dm644 share/pixmaps/bitcoin128.png $out/share/pixmaps/bitcoin128.png
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ergo";
|
||||
version = "3.2.7";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
|
||||
sha256 = "1ng2q9yp03j8p2xh7rlqad5h4p82ks1l00401pq7m0y02q90szr8";
|
||||
sha256 = "1lja4ba6bm1jk0lh2ra5v8i5g3f1gy7mk2b3yrx1w7x02ll9gr06";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,17 +2,17 @@ GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
backports (3.18.1)
|
||||
concurrent-ruby (1.1.6)
|
||||
concurrent-ruby (1.1.7)
|
||||
crass (1.0.6)
|
||||
execjs (2.7.0)
|
||||
ffi (1.13.1)
|
||||
gemojione (4.3.3)
|
||||
json
|
||||
github-markup (3.0.4)
|
||||
gollum (5.1)
|
||||
gollum (5.1.1)
|
||||
gemojione (~> 4.1)
|
||||
gollum-lib (~> 5.0)
|
||||
kramdown (~> 2.1.0)
|
||||
kramdown (~> 2.3)
|
||||
kramdown-parser-gfm (~> 1.0.0)
|
||||
mustache (>= 0.99.5, < 1.0.0)
|
||||
octicons (~> 8.5)
|
||||
@ -38,7 +38,8 @@ GEM
|
||||
mime-types (>= 1.15)
|
||||
rugged (~> 0.99)
|
||||
json (2.3.1)
|
||||
kramdown (2.1.0)
|
||||
kramdown (2.3.0)
|
||||
rexml
|
||||
kramdown-parser-gfm (1.0.1)
|
||||
kramdown (~> 2.0)
|
||||
loofah (2.6.0)
|
||||
@ -63,7 +64,7 @@ GEM
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rexml (3.2.4)
|
||||
rouge (3.21.0)
|
||||
rouge (3.22.0)
|
||||
rss (0.2.9)
|
||||
rexml
|
||||
ruby2_keywords (0.0.2)
|
||||
|
||||
@ -14,10 +14,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
|
||||
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
@ -76,10 +76,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06qc6flb2sik64ich3j4a9yky9cqsj77vdjff51wxi4lhd9ga6sk";
|
||||
sha256 = "14i6y3ilv9l7cqvkawl75js26cfj1pd8cphhmq9lic95ajvdf371";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.1";
|
||||
version = "5.1.1";
|
||||
};
|
||||
gollum-lib = {
|
||||
dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"];
|
||||
@ -114,14 +114,15 @@
|
||||
version = "2.3.1";
|
||||
};
|
||||
kramdown = {
|
||||
dependencies = ["rexml"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688";
|
||||
sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.0";
|
||||
version = "2.3.0";
|
||||
};
|
||||
kramdown-parser-gfm = {
|
||||
dependencies = ["kramdown"];
|
||||
@ -286,10 +287,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s";
|
||||
sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.21.0";
|
||||
version = "3.22.0";
|
||||
};
|
||||
rss = {
|
||||
dependencies = ["rexml"];
|
||||
|
||||
@ -10,7 +10,7 @@ GEM
|
||||
addressable (2.7.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
colorator (1.1.0)
|
||||
concurrent-ruby (1.1.6)
|
||||
concurrent-ruby (1.1.7)
|
||||
em-websocket (0.5.1)
|
||||
eventmachine (>= 0.12.9)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
@ -18,11 +18,11 @@ GEM
|
||||
ffi (1.13.1)
|
||||
forwardable-extended (2.6.0)
|
||||
gemoji (3.0.1)
|
||||
html-pipeline (2.13.0)
|
||||
html-pipeline (2.14.0)
|
||||
activesupport (>= 2)
|
||||
nokogiri (>= 1.4)
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (1.8.3)
|
||||
i18n (1.8.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (4.1.1)
|
||||
addressable (~> 2.4)
|
||||
@ -56,7 +56,7 @@ GEM
|
||||
gemoji (~> 3.0)
|
||||
html-pipeline (~> 2.2)
|
||||
jekyll (>= 3.0, < 5.0)
|
||||
kramdown (2.2.1)
|
||||
kramdown (2.3.0)
|
||||
rexml
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
@ -67,7 +67,7 @@ GEM
|
||||
mercenary (0.4.0)
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.14.1)
|
||||
nokogiri (1.10.9)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
pathutil (0.16.2)
|
||||
forwardable-extended (~> 2.6)
|
||||
@ -76,7 +76,7 @@ GEM
|
||||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rexml (3.2.4)
|
||||
rouge (3.20.0)
|
||||
rouge (3.22.0)
|
||||
safe_yaml (1.0.5)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
@ -86,7 +86,7 @@ GEM
|
||||
tzinfo (1.2.7)
|
||||
thread_safe (~> 0.1)
|
||||
unicode-display_width (1.7.0)
|
||||
zeitwerk (2.3.0)
|
||||
zeitwerk (2.4.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
@ -36,10 +36,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
|
||||
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
};
|
||||
em-websocket = {
|
||||
dependencies = ["eventmachine" "http_parser.rb"];
|
||||
@ -98,10 +98,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6";
|
||||
sha256 = "080sn9z1a64gv04p318jz10y6lv6qd3avip08rrcmq9k4ihai0f1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
};
|
||||
"http_parser.rb" = {
|
||||
groups = ["default"];
|
||||
@ -119,10 +119,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
|
||||
sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.3";
|
||||
version = "1.8.5";
|
||||
};
|
||||
jekyll = {
|
||||
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
|
||||
@ -218,10 +218,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6";
|
||||
sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
};
|
||||
kramdown-parser-gfm = {
|
||||
dependencies = ["kramdown"];
|
||||
@ -291,10 +291,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
|
||||
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.9";
|
||||
version = "1.10.10";
|
||||
};
|
||||
pathutil = {
|
||||
dependencies = ["forwardable-extended"];
|
||||
@ -353,10 +353,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
|
||||
sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.20.0";
|
||||
version = "3.22.0";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default"];
|
||||
@ -426,9 +426,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0";
|
||||
sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
};
|
||||
}
|
||||
@ -17,7 +17,7 @@ GEM
|
||||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
colorator (1.1.0)
|
||||
concurrent-ruby (1.1.6)
|
||||
concurrent-ruby (1.1.7)
|
||||
em-websocket (0.5.1)
|
||||
eventmachine (>= 0.12.9)
|
||||
http_parser.rb (~> 0.6.0)
|
||||
@ -29,11 +29,11 @@ GEM
|
||||
ffi (1.13.1)
|
||||
forwardable-extended (2.6.0)
|
||||
gemoji (3.0.1)
|
||||
html-pipeline (2.13.0)
|
||||
html-pipeline (2.14.0)
|
||||
activesupport (>= 2)
|
||||
nokogiri (>= 1.4)
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (1.8.3)
|
||||
i18n (1.8.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
jekyll (4.1.1)
|
||||
addressable (~> 2.4)
|
||||
@ -55,7 +55,7 @@ GEM
|
||||
jekyll-coffeescript (2.0.0)
|
||||
coffee-script (~> 2.2)
|
||||
coffee-script-source (~> 1.12)
|
||||
jekyll-feed (0.14.0)
|
||||
jekyll-feed (0.15.0)
|
||||
jekyll (>= 3.7, < 5.0)
|
||||
jekyll-gist (1.5.0)
|
||||
octokit (~> 4.2)
|
||||
@ -77,7 +77,7 @@ GEM
|
||||
gemoji (~> 3.0)
|
||||
html-pipeline (~> 2.2)
|
||||
jekyll (>= 3.0, < 5.0)
|
||||
kramdown (2.2.1)
|
||||
kramdown (2.3.0)
|
||||
rexml
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
@ -97,7 +97,7 @@ GEM
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.14.1)
|
||||
multipart-post (2.1.1)
|
||||
nokogiri (1.10.9)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
octokit (4.18.0)
|
||||
faraday (>= 0.9)
|
||||
@ -110,7 +110,7 @@ GEM
|
||||
ffi (~> 1.0)
|
||||
rdoc (6.2.1)
|
||||
rexml (3.2.4)
|
||||
rouge (3.20.0)
|
||||
rouge (3.22.0)
|
||||
safe_yaml (1.0.5)
|
||||
sassc (2.4.0)
|
||||
ffi (~> 1.9)
|
||||
@ -125,7 +125,7 @@ GEM
|
||||
thread_safe (~> 0.1)
|
||||
unicode-display_width (1.7.0)
|
||||
yajl-ruby (1.4.1)
|
||||
zeitwerk (2.3.0)
|
||||
zeitwerk (2.4.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
@ -90,10 +90,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
|
||||
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
};
|
||||
em-websocket = {
|
||||
dependencies = ["eventmachine" "http_parser.rb"];
|
||||
@ -195,10 +195,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01snn9z3c2p17d9wfczkdkml6mdffah6fpyzgs9mdskb14m68rq6";
|
||||
sha256 = "080sn9z1a64gv04p318jz10y6lv6qd3avip08rrcmq9k4ihai0f1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
};
|
||||
"http_parser.rb" = {
|
||||
groups = ["default"];
|
||||
@ -216,10 +216,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
|
||||
sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.3";
|
||||
version = "1.8.5";
|
||||
};
|
||||
jekyll = {
|
||||
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
|
||||
@ -260,10 +260,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fhbz5wc8cf60dwsbqcr49wygyk5qarpc7g77p6dlwq2r21nil5c";
|
||||
sha256 = "1mgc1ik2cq2g8g7z9ql2i6ydzy771m2i4qrd1q77x8cf2sprlb0z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
};
|
||||
jekyll-gist = {
|
||||
dependencies = ["octokit"];
|
||||
@ -369,10 +369,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "059mk8lmddp2a2aa6s4pp7x2yyqbqg5crx5jkn32dzlnqi2j5cn6";
|
||||
sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
};
|
||||
kramdown-parser-gfm = {
|
||||
dependencies = ["kramdown"];
|
||||
@ -519,10 +519,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
|
||||
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.9";
|
||||
version = "1.10.10";
|
||||
};
|
||||
octokit = {
|
||||
dependencies = ["faraday" "sawyer"];
|
||||
@ -602,10 +602,10 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
|
||||
sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.20.0";
|
||||
version = "3.22.0";
|
||||
};
|
||||
safe_yaml = {
|
||||
groups = ["default"];
|
||||
@ -718,9 +718,9 @@
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0";
|
||||
sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
};
|
||||
}
|
||||
@ -20,14 +20,14 @@
|
||||
with python3Packages;
|
||||
buildPythonApplication rec {
|
||||
pname = "kitty";
|
||||
version = "0.18.2";
|
||||
version = "0.18.3";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kovidgoyal";
|
||||
repo = "kitty";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x6h8g017mbpjkpkb1y8asyfdc48bgjzmj5gachsp5cf5jcqwir2";
|
||||
sha256 = "0y05bw6d1m79dyhm7b6lk6wy82pmy2s9jhf01kf8gr2p0rjjp9yl";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,33 +1,33 @@
|
||||
{ stdenv, fetchurl, unzip, runtimeShell }:
|
||||
{ stdenv, fetchurl, unzip, makeWrapper
|
||||
, coreutils, gawk, which, gnugrep, findutils
|
||||
, jdk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "openjump-1.3.1";
|
||||
pname = "openjump";
|
||||
version = "1.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip";
|
||||
sha256 = "0y4z53yx0x7rp3c8rnj028ni3gr47r35apgcpqp3jl7r2di6zgqm";
|
||||
url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.15/OpenJUMP-Portable-1.15-r6241-CORE.zip";
|
||||
sha256 = "12snzkv83w6khcdqzp6xahqapwp82af6c7j2q8n0lj62hk79rfgl";
|
||||
};
|
||||
|
||||
# ln jump.log hack: a different user will probably get a permission denied
|
||||
# error. Still this is better than getting it always.
|
||||
# TODO: build from source and patch this
|
||||
# TODO: build from source
|
||||
unpackPhase = ''
|
||||
mkdir -p $out/bin;
|
||||
cd $out; unzip $src
|
||||
s=$out/bin/OpenJump
|
||||
dir=$(echo $out/openjump-*)
|
||||
cat >> $s << EOF
|
||||
#!${runtimeShell}
|
||||
cd $dir/bin
|
||||
exec ${stdenv.shell} openjump.sh
|
||||
EOF
|
||||
chmod +x $s
|
||||
ln -s /tmp/openjump.log $dir/bin/jump.log
|
||||
'';
|
||||
|
||||
installPhase = ":";
|
||||
buildInputs = [unzip makeWrapper];
|
||||
|
||||
buildInputs = [unzip];
|
||||
installPhase = ''
|
||||
dir=$(echo $out/OpenJUMP-*)
|
||||
|
||||
chmod +x $dir/bin/oj_linux.sh
|
||||
makeWrapper $dir/bin/oj_linux.sh $out/bin/OpenJump \
|
||||
--set JAVA_HOME ${jdk.home} \
|
||||
--set PATH "${coreutils}/bin:${gawk}/bin:${which}/bin:${gnugrep}/bin:${findutils}/bin"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open source Geographic Information System (GIS) written in the Java programming language";
|
||||
|
||||
@ -15,15 +15,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "meli";
|
||||
version = "alpha-0.5.1";
|
||||
version = "alpha-0.6.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.meli.delivery/meli/meli.git";
|
||||
rev = version;
|
||||
sha256 = "1y5567hdm1s2s272drxvmp6x4y1jpyl7423iz58hgqcsjm9085zv";
|
||||
sha256 = "0fs3wccbdfxf4nmx9l5wy7qpjk4r11qg0fc59y0pdvjrrslcjsds";
|
||||
};
|
||||
|
||||
cargoSha256 = "040dfr09bg5z5pn68dy323hcppd599d3f6k7zxqw5f8n4whnlc9y";
|
||||
cargoSha256 = "sha256:19j7jrizp7yifmqwrmnv66pka7131jl7ks4zgs3nr5gbb28zvdrz";
|
||||
|
||||
cargoBuildFlags = lib.optional withNotmuch "--features=notmuch";
|
||||
|
||||
|
||||
@ -62,12 +62,16 @@
|
||||
, waylandSupport ? true
|
||||
, libxkbcommon, calendarSupport ? true
|
||||
|
||||
, # If you want the resulting program to call itself "Thunderbird" instead
|
||||
# of "Earlybird" or whatever, enable this option. However, those
|
||||
# binaries may not be distributed without permission from the
|
||||
# Mozilla Foundation, see
|
||||
# http://www.mozilla.org/foundation/trademarks/.
|
||||
enableOfficialBranding ? false
|
||||
# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
|
||||
# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
|
||||
# have permission to use the official branding.
|
||||
#
|
||||
# For purposes of documentation the statement of @sylvestre:
|
||||
# > As the person who did part of the work described in the LWN article
|
||||
# > and release manager working for Mozilla, I can confirm the statement
|
||||
# > that I made in
|
||||
# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006
|
||||
, enableOfficialBranding ? true
|
||||
}:
|
||||
|
||||
assert waylandSupport -> gtk3Support == true;
|
||||
|
||||
@ -60,12 +60,16 @@
|
||||
, waylandSupport ? true
|
||||
, libxkbcommon, calendarSupport ? true
|
||||
|
||||
, # If you want the resulting program to call itself "Thunderbird" instead
|
||||
# of "Earlybird" or whatever, enable this option. However, those
|
||||
# binaries may not be distributed without permission from the
|
||||
# Mozilla Foundation, see
|
||||
# http://www.mozilla.org/foundation/trademarks/.
|
||||
enableOfficialBranding ? false
|
||||
# As stated by Sylvestre Ledru (@sylvestre) on Nov 22, 2017 at
|
||||
# https://github.com/NixOS/nixpkgs/issues/31843#issuecomment-346372756 we
|
||||
# have permission to use the official branding.
|
||||
#
|
||||
# For purposes of documentation the statement of @sylvestre:
|
||||
# > As the person who did part of the work described in the LWN article
|
||||
# > and release manager working for Mozilla, I can confirm the statement
|
||||
# > that I made in
|
||||
# > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815006
|
||||
, enableOfficialBranding ? true
|
||||
}:
|
||||
|
||||
assert waylandSupport -> gtk3Support == true;
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation {
|
||||
pname = "aliza";
|
||||
version = "1.48.10";
|
||||
version = "1.98.32";
|
||||
src = fetchurl {
|
||||
# See https://www.aliza-dicom-viewer.com/download
|
||||
url = "https://drive.google.com/uc?export=download&id=16WEScARaSrzJpJkyGuOUxDF95eUwGyET";
|
||||
sha256 = "1ls16cwd0fmb5axxmy9lgf8cqrf7g7swm26f0gr2vqp4z9bw6qn3";
|
||||
url = "https://drive.google.com/uc?export=download&id=1nggavPhY_633T-AW9PdkcAgbWtzv3QKG";
|
||||
sha256 = "00vbgv8ca9ckgkicyyngrb01yhhcqc8hygg2bls7b44c47hcc8zz";
|
||||
name = "aliza.rpm";
|
||||
};
|
||||
|
||||
|
||||
@ -1,19 +1,27 @@
|
||||
{ stdenv, buildPythonApplication, fetchFromGitHub, fetchurl
|
||||
{ stdenv, buildPythonApplication, fetchFromGitHub, callPackage
|
||||
, mpv, python-mpv-jsonipc, jellyfin-apiclient-python
|
||||
, pillow, tkinter, pystray, jinja2, pywebview }:
|
||||
|
||||
let
|
||||
shaderPack = callPackage ./shader-pack.nix {};
|
||||
in
|
||||
buildPythonApplication rec {
|
||||
pname = "jellyfin-mpv-shim";
|
||||
version = "1.5.11";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwalton3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "14hm8yccdp7w1vdnvdzafk1byhaq1qsr33i4962s1nvm9lafxkr7";
|
||||
sha256 = "0alrh5h3f8pq9mrq09jmpqa0yslxsjqwij6kwn24ggbwc10zkq75";
|
||||
fetchSubmodules = true; # needed for display_mirror css file
|
||||
};
|
||||
|
||||
patches = [
|
||||
./disable-desktop-client.patch
|
||||
./disable-update-check.patch
|
||||
];
|
||||
|
||||
# override $HOME directory:
|
||||
# error: [Errno 13] Permission denied: '/homeless-shelter'
|
||||
#
|
||||
@ -25,10 +33,9 @@ buildPythonApplication rec {
|
||||
rm jellyfin_mpv_shim/win_utils.py
|
||||
'';
|
||||
|
||||
# disable the desktop client for now
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'jellyfin-mpv-desktop=jellyfin_mpv_shim.mpv_shim:main_desktop'," ""
|
||||
# link the default shader pack
|
||||
ln -s ${shaderPack} jellyfin_mpv_shim/default_shader_pack
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
index a831959..2206e6e 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -25,7 +25,6 @@ setup(
|
||||
entry_points={
|
||||
'console_scripts': [
|
||||
'jellyfin-mpv-shim=jellyfin_mpv_shim.mpv_shim:main',
|
||||
- 'jellyfin-mpv-desktop=jellyfin_mpv_shim.mpv_shim:main_desktop',
|
||||
]
|
||||
},
|
||||
classifiers=[
|
||||
@ -0,0 +1,15 @@
|
||||
diff --git a/jellyfin_mpv_shim/conf.py b/jellyfin_mpv_shim/conf.py
|
||||
index 0ab9326..ccedc17 100644
|
||||
--- a/jellyfin_mpv_shim/conf.py
|
||||
+++ b/jellyfin_mpv_shim/conf.py
|
||||
@@ -88,8 +88,8 @@ class Settings(object):
|
||||
"sync_revert_seek": True,
|
||||
"sync_osd_message": True,
|
||||
"screenshot_menu": True,
|
||||
- "check_updates": True,
|
||||
- "notify_updates": True,
|
||||
+ "check_updates": False,
|
||||
+ "notify_updates": False,
|
||||
"lang": None,
|
||||
"desktop_scale": 1.0,
|
||||
}
|
||||
25
pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix
Normal file
25
pkgs/applications/video/jellyfin-mpv-shim/shader-pack.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jellyfin-mpv-shim-shader-pack";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwalton3";
|
||||
repo = "default-shader-pack";
|
||||
rev = "v${version}";
|
||||
sha256 = "04y8gvjy4v3773b1kyan4dxqcf86b56x7v33m2k246jbn0rl2pgr";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -a . $out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/iwalton3/default-shader-pack";
|
||||
description = "Preconfigured set of MPV shaders and configurations for MPV Shim media clients";
|
||||
license = with licenses; [ mit lgpl3Plus unlicense ];
|
||||
maintainers = with maintainers; [ jojosch ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "theme-jade1";
|
||||
version = "1.7";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "madmaxms";
|
||||
repo = "theme-jade-1";
|
||||
rev = "v${version}";
|
||||
sha256 = "19vg95bf0ylmfhg0frs2k0k7c0wfn933h06wrklb9p5qy84hfig3";
|
||||
sha256 = "1nvn2ghkdhilrsjpvl7r92aldvbs0nx0xc82jwrfaahi87dgfs8x";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita";
|
||||
version = "2020-07-01";
|
||||
version = "7.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = "310a3e596e95005752e14e2b96f55966cbb59d67";
|
||||
sha256 = "1r0jqv3hh74965dgc7qwvvhwzf548gb27z69lbpwz060k9di6zwj";
|
||||
rev = version;
|
||||
sha256 = "0kq7d8nqp8m0kbh2k9s0yybfdkyfkhbkjsv22lplnzh1p84pnlx7";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "babl";
|
||||
version = "0.1.78";
|
||||
version = "0.1.80";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/babl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "F9VJNjO/9VhdnzdbxN9ZJRV80ccMzXwipjW+dcFyUjo=";
|
||||
sha256 = "13jgq2i1xkbqw9ijy8sy5iabf5jkviqi0wxlpjcm0n22mwwwqp7p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.6.2";
|
||||
version = "0.6.3";
|
||||
pname = "docopt.cpp";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docopt";
|
||||
repo = "docopt.cpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "1rgkc8nsc2zz2lkyai0y68vrd6i6kbq63hm3vdza7ab6ghq0n1dd";
|
||||
sha256 = "0cz3vv7g5snfbsqcf3q8bmd6kv5qp84gj3avwkn4vl00krw13bl7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake python ];
|
||||
@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace docopt.pc.in \
|
||||
--replace "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" \
|
||||
"@CMAKE_INSTALL_LIBDIR@"
|
||||
'';
|
||||
|
||||
checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
@ -27,4 +33,3 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ knedlsepp ];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -60,7 +60,21 @@ stdenv.mkDerivation {
|
||||
./opencl-install-dir.patch
|
||||
./disk_cache-include-dri-driver-path-in-cache-key.patch
|
||||
./link-radv-with-ld_args_build_id.patch
|
||||
] # do not prefix user provided dri-drivers-path
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isMusl [
|
||||
# Fix `-Werror=int-conversion` pthread warnings on musl.
|
||||
# TODO: Remove when https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6121 is merged and available
|
||||
(fetchpatch {
|
||||
name = "nine_debug-Make-tid-more-type-correct";
|
||||
# Patch adjusted for version `20.1`, before the big mesa dirs change
|
||||
# `gallium: rename 'state tracker' to 'frontend'`.
|
||||
# Patch for versions after that change is at
|
||||
# https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e3b4745ef16d0e833300ad67044.patch
|
||||
url = "https://gitlab.freedesktop.org/nh2/mesa/commit/3385c49684375f1153a52ed7ccda3f5135268a41.patch";
|
||||
sha256 = "1ci694sqjll44c9g2md4krhk6qlvq51r7ad5rnnfdnf3l8ys0i50";
|
||||
})
|
||||
]
|
||||
# do not prefix user provided dri-drivers-path
|
||||
++ lib.optional (lib.versionOlder version "19.0.0") (fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/mesa/mesa/commit/f6556ec7d126b31da37c08d7cb657250505e01a0.patch";
|
||||
sha256 = "0z6phi8hbrbb32kkp1js7ggzviq7faz1ria36wi4jbc4in2392d9";
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchgit
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
version = "asynkdev";
|
||||
pname = "caldavclientlibrary-asynk";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/skarra/CalDAVClientLibrary.git";
|
||||
rev = "06699b08190d50cc2636b921a654d67db0a967d1";
|
||||
sha256 = "157q32251ac9x3gdshgrjwsy48nq74vrzviswvph56h9wa8ksnnk";
|
||||
};
|
||||
|
||||
disabled = isPy3k;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Python library and tool for CalDAV";
|
||||
|
||||
longDescription = ''
|
||||
CalDAVCLientLibrary is a Python library and tool for CalDAV.
|
||||
|
||||
This package is the unofficial CalDAVCLientLibrary Python
|
||||
library maintained by the author of Asynk and is needed for
|
||||
that package.
|
||||
'';
|
||||
|
||||
homepage = "https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/";
|
||||
maintainers = with maintainers; [ pjones ];
|
||||
broken = true; # 2018-04-11
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,33 +1,38 @@
|
||||
{ stdenv, fetchFromGitHub, buildPythonPackage,
|
||||
lxml, tzlocal, python-dateutil, pygments, future, requests-kerberos,
|
||||
pythonOlder,
|
||||
lxml, tzlocal, python-dateutil, pygments, requests-kerberos,
|
||||
defusedxml, cached-property, isodate, requests_ntlm, dnspython,
|
||||
psutil, requests-mock, pyyaml
|
||||
psutil, requests-mock, pyyaml,
|
||||
oauthlib, requests_oauthlib,
|
||||
flake8,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "exchangelib";
|
||||
version = "1.12.2";
|
||||
version = "3.2.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
# tests are not present in the PyPI version
|
||||
src = fetchFromGitHub {
|
||||
owner = "ecederstrand";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1p24fq6f46j0qd0ccb64mncxbnm2n9w0sqpl4zk113caaaxkpjil";
|
||||
sha256 = "1sh780q2iwdm3bnlnfdacracf0n7jhbv0g39cdx65v3d510zp4jv";
|
||||
};
|
||||
|
||||
# one test is failing due to it trying to send a request to example.com
|
||||
patches = [ ./skip_failing_test.patch ];
|
||||
checkInputs = [ psutil requests-mock pyyaml ];
|
||||
checkInputs = [ psutil requests-mock pyyaml
|
||||
flake8
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
lxml tzlocal python-dateutil pygments requests-kerberos
|
||||
future defusedxml cached-property isodate requests_ntlm dnspython ];
|
||||
defusedxml cached-property isodate requests_ntlm dnspython
|
||||
oauthlib requests_oauthlib
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Client for Microsoft Exchange Web Services (EWS)";
|
||||
homepage = "https://github.com/ecederstrand/exchangelib";
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ catern ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,14 +3,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jellyfin-apiclient-python";
|
||||
version = "1.5.1";
|
||||
version = "1.6.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iwalton3";
|
||||
repo = "jellyfin-apiclient-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mzs4i9c4cf7pmymsyzs8x17hvjs8g9wr046l4f85rkzmz23v1rp";
|
||||
sha256 = "0f7czq83ic22fz1vnf0cavb7l3grcxxd5yyw9wcjz3g1j2d76735";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests websocket_client ];
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
{ lib, fetchFromGitHub, buildPythonPackage, isPyPy, isPy3k, libbfd, libopcodes }:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "pybfd";
|
||||
version = "-0.1.1.2017-12-31";
|
||||
|
||||
disabled = isPyPy || isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orivej";
|
||||
repo = "pybfd";
|
||||
rev = "a10ada53f2a79de7f62f209567806ef1e91794c7";
|
||||
sha256 = "0sxzhlqjyvvx1zr3qrkb57z6s3g6k3ksyn65fdm9lvl0k4dv2k9w";
|
||||
};
|
||||
|
||||
LIBBFD_INCLUDE_DIR = "${libbfd.dev}/include";
|
||||
LIBBFD_LIBRARY = "${libbfd}/lib/libbfd.so";
|
||||
LIBOPCODES_INCLUDE_DIR = "${libopcodes.dev}/include";
|
||||
LIBOPCODES_LIBRARY = "${libopcodes}/lib/libopcodes.so";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/Groundworkstech/pybfd";
|
||||
description = "A Python interface to the GNU Binary File Descriptor (BFD) library";
|
||||
license = lib.licenses.gpl2;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ orivej ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-kazel";
|
||||
version = "0.0.10";
|
||||
version = "0.0.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubernetes";
|
||||
repo = "repo-infra";
|
||||
rev = "v${version}";
|
||||
sha256 = "1l3dz77h58v1sr7k8cabq5bbdif5w96zdcapax69cv1frr9jbrcb";
|
||||
sha256 = "0fcm7gjsv70qxnwbgy2sgx7clyhlfnkvdxsjgcrkaf5xds8hpys7";
|
||||
};
|
||||
|
||||
vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf";
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "CastXML";
|
||||
version = "0.2.0";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1qpgr5hyb692h7l5igmq53m6a6vi4d9qp8ks893cflfx9955h3ip";
|
||||
sha256 = "0ypj67xrgj228myp7l1gsjw1ja97q68nmj98dsd33srmiayqraj4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ stdenv.lib.optionals withMan [ pythonPackages.sphinx ];
|
||||
|
||||
@ -5,11 +5,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asls";
|
||||
version = "0.4.0";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/saulecabrera/asls/releases/download/v${version}/bin.tar.gz";
|
||||
sha256 = "0zy89fvdhk2bj41fzx349gi8237ww96s21hlg6blqmfhvfxsnszg";
|
||||
sha256 = "14dcms0xl6dncwf16vixvf7rq7g15iwq8h4vja0dsiisyfm08aks";
|
||||
};
|
||||
|
||||
buildInputs = [ erlangR22 ];
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "btfs";
|
||||
version = "2.21";
|
||||
version = "2.22";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0zqkzfc49jl9kn3m0cg7q0156xyzrdl5w4v70p16sqxdly86mwb0";
|
||||
sha256 = "1z88bk1z4sns3jdn56x83mvh06snxg0lr5h4v0c24lzlf5wbdifz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
|
||||
@ -7,9 +7,10 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "rtlwifi_new";
|
||||
version = "2019-08-21";
|
||||
# When updating see https://github.com/lwfinger/rtl8723be/issues/17#issuecomment-657326751
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lwfinger";
|
||||
owner = "rtlwifi-linux";
|
||||
repo = "rtlwifi_new";
|
||||
rev = "a108e3de87c2ed30b71c3c4595b79ab7a2f9e348";
|
||||
sha256 = "15kjs9i9vvmn1cdzccd5cljf3m45r4ssm65klkj2fdkf3kljj38k";
|
||||
|
||||
@ -5,11 +5,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
version = "5.4";
|
||||
version = "5.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz";
|
||||
sha256 = "19fd9r233wkjk8gdxn6qsjgfijiw67a48xhgbm2kq46bx80yf3pg";
|
||||
sha256 = "18ksld775balh0yx2icj7fya9fvjkfgvwznvccdlmhi3zidg550h";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
@ -31,6 +31,6 @@ in stdenv.mkDerivation rec {
|
||||
homepage = "http://bftpd.sf.net/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
28
pkgs/servers/monitoring/timescale-prometheus/default.nix
Normal file
28
pkgs/servers/monitoring/timescale-prometheus/default.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ stdenv
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "timescale-prometheus";
|
||||
version = "0.1.0-beta.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = pname;
|
||||
rev = "${version}";
|
||||
sha256 = "1q6xky4h9x4j2f0f6ajxwlnqq1pgd2n0z1ldrcifyamd90qkwcm5";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256:1vp30y59w8mksqxy9ic37vj1jw4lbq24ahhb08a72rysylw94r57";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An open-source analytical platform for Prometheus metrics";
|
||||
homepage = "https://github.com/timescale/timescale-prometheus";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
maintainers = [ maintainers."0x4A6F" ];
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,12 @@
|
||||
{ stdenv, rustPlatform, fetchFromGitHub, coreutils, libiconv, Security, installShellFiles }:
|
||||
{ stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, makeWrapper
|
||||
, coreutils
|
||||
, libiconv
|
||||
, Security
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
@ -13,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
cargoSha256 = "18b4lh5x25mbhpffva8ygzm5ad00svm1c3r83vfw0l2f61m7vyjh";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
nativeBuildInputs = [ makeWrapper installShellFiles ];
|
||||
|
||||
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
|
||||
|
||||
@ -27,6 +35,23 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
# Do not nag users about installing shell integration, since
|
||||
# it is impure.
|
||||
wrapProgram $out/bin/broot \
|
||||
--set BR_INSTALL no
|
||||
|
||||
# Install shell function for bash.
|
||||
$out/bin/broot --print-shell-function bash > br.bash
|
||||
install -Dm0444 -t $out/etc/profile.d br.bash
|
||||
|
||||
# Install shell function for zsh.
|
||||
$out/bin/broot --print-shell-function zsh > br.zsh
|
||||
install -Dm0444 br.zsh $out/share/zsh/site-functions/br
|
||||
|
||||
# Install shell function for fish
|
||||
$out/bin/broot --print-shell-function fish > br.fish
|
||||
install -Dm0444 -t $out/share/fish/vendor_functions.d br.fish
|
||||
|
||||
# install shell completion files
|
||||
OUT_DIR=$releaseDir/build/broot-*/out
|
||||
|
||||
|
||||
@ -17,17 +17,7 @@ buildGoModule rec {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# TODO: Setting buildFlags probably isn't working properly. I've tried a few
|
||||
# variants, e.g.:
|
||||
# - buildFlags = [ "-ldflags" "\"-s" "-w"" ""-X 'main.gVersion=${version}'\"" ];
|
||||
# - buildFlags = [ "-ldflags" "\\\"-X" "${goPackagePath}/main.gVersion=${version}\\\"" ];
|
||||
# Override the build phase (to set buildFlags):
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
runHook renameImports
|
||||
go install -ldflags="-s -w -X main.gVersion=r${version}"
|
||||
runHook postBuild
|
||||
'';
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.gVersion=r${version}" ];
|
||||
|
||||
postInstall = ''
|
||||
install -D --mode=444 lf.desktop $out/share/applications/lf.desktop
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
{ stdenv, fetchurl, python2, python2Packages, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.0.0";
|
||||
pname = "ASynK";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${pname}-${version}.tar.gz";
|
||||
url = "https://github.com/skarra/ASynK/archive/v${version}.tar.gz";
|
||||
sha256 = "1bp30437mnls0kzm0525p3bg5nw9alpqrqhw186f6zp9i4y5znp1";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2Packages;
|
||||
[ python2 makeWrapper tornado requests dateutil
|
||||
vobject gdata caldavclientlibrary-asynk ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
cp asynk.py $out/bin/
|
||||
cp state.init.json $out/
|
||||
cp -R config $out/
|
||||
cp lib/*.py $out/lib # */
|
||||
cp -R lib/s $out/lib/
|
||||
cp -R asynk $out/
|
||||
|
||||
substituteInPlace $out/bin/asynk.py \
|
||||
--replace "ASYNK_BASE_DIR = os.path.dirname(os.path.abspath(__file__))" "ASYNK_BASE_DIR = \"$out\""
|
||||
|
||||
for file in `find $out/asynk -type f`; do
|
||||
# Oh yeah, tab characters!
|
||||
substituteInPlace $file \
|
||||
--replace 'from vobject import vobject' 'from vobject import *' \
|
||||
--replace 'from vobject import vobject' 'from vobject import *'
|
||||
done
|
||||
|
||||
wrapProgram "$out/bin/asynk.py" \
|
||||
--prefix PYTHONPATH : "$PYTHONPATH"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://asynk.io/";
|
||||
description = "Flexible contacts synchronization program";
|
||||
license = licenses.agpl3;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,53 +1,44 @@
|
||||
{ fetchFromGitHub, python3Packages, stdenv }:
|
||||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ssh-audit";
|
||||
version = "1.7.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arthepsy";
|
||||
owner = "jtesta";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "0akrychkdym9f6830ysq787c9nc0bkyqvy4h72498lyghwvwc2ms";
|
||||
rev = "v${version}";
|
||||
sha256 = "1z1h9nsgfaxdnkr9dvc0yzc23b3wz436rg2fycg2glwjhhal8az7";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
python3Packages.pytest
|
||||
python3Packages.pytestcov
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
py.test --cov-report= --cov=ssh-audit -v test
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
printf %s "$setupPy" > setup.py
|
||||
mkdir scripts
|
||||
cp ssh-audit.py scripts/ssh-audit
|
||||
mkdir ssh_audit
|
||||
cp ssh-audit.py ssh_audit/__init__.py
|
||||
cp ./README.md pypi/sshaudit/
|
||||
cp ./ssh-audit.py pypi/sshaudit/sshaudit.py
|
||||
mv pypi/* .
|
||||
ls -lah
|
||||
'';
|
||||
|
||||
setupPy = /* py */ ''
|
||||
from distutils.core import setup
|
||||
setup(
|
||||
author='arthepsy',
|
||||
description='${meta.description}',
|
||||
license='${meta.license.spdxId}',
|
||||
name='${pname}',
|
||||
packages=['ssh_audit'],
|
||||
scripts=['scripts/ssh-audit'],
|
||||
url='${meta.homepage}',
|
||||
version='${version}',
|
||||
)
|
||||
'';
|
||||
checkInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
disabledTests = [
|
||||
"test_resolve_error"
|
||||
"test_resolve_hostname_without_records"
|
||||
"test_resolve_ipv4"
|
||||
"test_resolve_ipv6"
|
||||
"test_resolve_ipv46_both"
|
||||
"test_resolve_ipv46_order"
|
||||
"test_invalid_host"
|
||||
"test_invalid_port"
|
||||
"test_not_connected_socket"
|
||||
"test_ssh2_server_simple"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool for ssh server auditing";
|
||||
homepage = "https://github.com/arthepsy/ssh-audit";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [
|
||||
stdenv.lib.maintainers.tv
|
||||
];
|
||||
homepage = "https://github.com/jtesta/ssh-audit";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ tv ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpytop";
|
||||
version = "1.0.0";
|
||||
version = "1.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aristocratos";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0cxyrk5a9j0ymll9h5b6jq48yjy9srcxh4rmsqk8w0d14prmflgg";
|
||||
sha256 = "1mrzl5ry5janifykp58gf5g7xw7522wvpp8hgq2hpfx52z6my1bj";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -22,13 +22,13 @@ let
|
||||
++ recommendedDisplayInformationPrograms;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "inxi";
|
||||
version = "3.1.05-2";
|
||||
version = "3.1.05-4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "smxi";
|
||||
repo = "inxi";
|
||||
rev = version;
|
||||
sha256 = "1a7nl2wk49yz5hcrph692xh5phv1mdg1m5cbvgv3ya12c6r32pa2";
|
||||
sha256 = "10x3rjydc9mlbfysj5mc6z9yfnhp9wllbza2cmjb1fz0x72rfrv7";
|
||||
};
|
||||
|
||||
buildInputs = [ perl makeWrapper ];
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aha";
|
||||
version = "0.5";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "0byml4rmpiaalwx69jcixl3yvpvwmwiss1jzgsqwshilb2p4qnmz";
|
||||
sha256 = "1gywad0rvvz3c5balz8cxsnx0562hj2ngzqyr8zsy2mb4pn0lpgv";
|
||||
rev = version;
|
||||
repo = "aha";
|
||||
owner = "theZiz";
|
||||
@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/theZiz/aha";
|
||||
license = with licenses; [ lgpl2Plus mpl11 ];
|
||||
maintainers = with maintainers; [ pSub ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2431,8 +2431,6 @@ in
|
||||
|
||||
assh = callPackage ../tools/networking/assh { };
|
||||
|
||||
asynk = callPackage ../tools/networking/asynk { };
|
||||
|
||||
b2sum = callPackage ../tools/security/b2sum {
|
||||
inherit (llvmPackages) openmp;
|
||||
};
|
||||
@ -16534,6 +16532,8 @@ in
|
||||
asciidoc = asciidoc-full;
|
||||
};
|
||||
|
||||
timescale-prometheus = callPackage ../servers/monitoring/timescale-prometheus { };
|
||||
|
||||
timescaledb-parallel-copy = callPackage ../development/tools/database/timescaledb-parallel-copy { };
|
||||
|
||||
timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { };
|
||||
|
||||
@ -12263,6 +12263,56 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
Minion = buildPerlPackage {
|
||||
pname = "Minion";
|
||||
version = "10.13";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.13.tar.gz";
|
||||
sha256 = "0nxk147v22lvc461923yv8fypqpbsajamvcvnlidk8bb54r33afj";
|
||||
};
|
||||
propagatedBuildInputs = [ Mojolicious ];
|
||||
meta = {
|
||||
homepage = "https://github.com/mojolicious/minion";
|
||||
description = "A high performance job queue for Perl";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
maintainers = [ maintainers.sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
MinionBackendSQLite = buildPerlModule {
|
||||
pname = "Minion-Backend-SQLite";
|
||||
version = "5.0.3";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.3.tar.gz";
|
||||
sha256 = "1ch92846cgr1s1y6nlicjxlq9r4qh1a3fig0jlr7ligzw05mxib4";
|
||||
};
|
||||
buildInputs = [ ModuleBuildTiny ];
|
||||
propagatedBuildInputs = [ Minion MojoSQLite ];
|
||||
meta = {
|
||||
homepage = "https://github.com/Grinnz/Minion-Backend-SQLite";
|
||||
description = "SQLite backend for Minion job queue";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
maintainers = [ maintainers.sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
MinionBackendmysql = buildPerlPackage {
|
||||
pname = "Minion-Backend-mysql";
|
||||
version = "0.21";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-0.21.tar.gz";
|
||||
sha256 = "0dbq0pmyjcrmdjpsrkr1pxvzvdphn6mb6lk5yyyhm380prwrjahn";
|
||||
};
|
||||
buildInputs = [ Testmysqld ];
|
||||
propagatedBuildInputs = [ Minion Mojomysql ];
|
||||
meta = {
|
||||
homepage = "https://github.com/preaction/Minion-Backend-mysql";
|
||||
description = "MySQL backend for Minion job queue";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
MixinLinewise = buildPerlPackage {
|
||||
pname = "Mixin-Linewise";
|
||||
version = "0.108";
|
||||
@ -19492,6 +19542,23 @@ let
|
||||
buildInputs = [ TestDeep TestDifferences TestException TestWarn ];
|
||||
};
|
||||
|
||||
Testmysqld = buildPerlModule {
|
||||
pname = "Test-mysqld";
|
||||
version = "1.0013";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SO/SONGMU/Test-mysqld-1.0013.tar.gz";
|
||||
sha256 = "1vrybrh3is3xfwqdhxr1mvmmdyjhz9p0f6n8hasn7japj2h43bap";
|
||||
};
|
||||
buildInputs = [ pkgs.which ModuleBuildTiny TestSharedFork ];
|
||||
propagatedBuildInputs = [ ClassAccessorLite DBDmysql FileCopyRecursive ];
|
||||
meta = {
|
||||
homepage = "https://github.com/kazuho/p5-test-mysqld";
|
||||
description = "Mysqld runner for tests";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = [ maintainers.sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
TestNeeds = buildPerlPackage {
|
||||
pname = "Test-Needs";
|
||||
version = "0.002006";
|
||||
|
||||
@ -2062,8 +2062,6 @@ in {
|
||||
|
||||
caldav = callPackage ../development/python-modules/caldav { };
|
||||
|
||||
caldavclientlibrary-asynk = callPackage ../development/python-modules/caldavclientlibrary-asynk { };
|
||||
|
||||
biopython = callPackage ../development/python-modules/biopython { };
|
||||
|
||||
bedup = callPackage ../development/python-modules/bedup { };
|
||||
@ -5483,8 +5481,6 @@ in {
|
||||
|
||||
batchspawner = callPackage ../development/python-modules/batchspawner { };
|
||||
|
||||
pybfd = callPackage ../development/python-modules/pybfd { };
|
||||
|
||||
pybigwig = callPackage ../development/python-modules/pybigwig { };
|
||||
|
||||
py2bit = callPackage ../development/python-modules/py2bit { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user