Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
0d421066dd
22 changed files with 216 additions and 90 deletions
|
|
@ -115,4 +115,6 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ erictapen ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
concurrent-ruby (1.1.7)
|
||||
concurrent-ruby (1.1.8)
|
||||
crass (1.0.6)
|
||||
execjs (2.7.0)
|
||||
ffi (1.13.1)
|
||||
ffi (1.14.2)
|
||||
gemojione (4.3.3)
|
||||
json
|
||||
github-markup (3.0.5)
|
||||
gollum (5.1.2)
|
||||
gollum (5.2.1)
|
||||
gemojione (~> 4.1)
|
||||
gollum-lib (~> 5.0)
|
||||
gollum-lib (~> 5.1)
|
||||
kramdown (~> 2.3)
|
||||
kramdown-parser-gfm (~> 1.1.0)
|
||||
mustache (>= 0.99.5, < 1.0.0)
|
||||
octicons (~> 8.5)
|
||||
mustache-sinatra (~> 1.0)
|
||||
octicons (~> 12.0)
|
||||
rss (~> 0.2.9)
|
||||
sass (~> 3.5)
|
||||
sinatra (~> 2.0)
|
||||
|
|
@ -22,40 +22,44 @@ GEM
|
|||
sprockets (~> 3.7)
|
||||
sprockets-helpers (~> 1.2)
|
||||
therubyrhino (~> 2.1.0)
|
||||
uglifier (~> 3.2)
|
||||
uglifier (~> 4.2)
|
||||
useragent (~> 0.16.2)
|
||||
gollum-lib (5.0.6)
|
||||
gollum-lib (5.1)
|
||||
gemojione (~> 4.1)
|
||||
github-markup (~> 3.0)
|
||||
gollum-rugged_adapter (~> 1.0)
|
||||
loofah (~> 2.3)
|
||||
nokogiri (~> 1.8)
|
||||
octicons (~> 8.5)
|
||||
octicons (~> 12.0)
|
||||
rouge (~> 3.1)
|
||||
twitter-text (= 1.14.7)
|
||||
gollum-rugged_adapter (1.0)
|
||||
mime-types (>= 1.15)
|
||||
rugged (~> 0.99)
|
||||
json (2.3.1)
|
||||
json (2.5.1)
|
||||
kramdown (2.3.0)
|
||||
rexml
|
||||
kramdown-parser-gfm (1.1.0)
|
||||
kramdown (~> 2.0)
|
||||
loofah (2.8.0)
|
||||
loofah (2.9.0)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
mime-types (3.3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2020.1104)
|
||||
mini_portile2 (2.4.0)
|
||||
mime-types-data (3.2021.0225)
|
||||
mini_portile2 (2.5.0)
|
||||
multi_json (1.15.0)
|
||||
mustache (0.99.8)
|
||||
mustache-sinatra (1.0.1)
|
||||
mustache (<= 0.99.8)
|
||||
mustermann (1.1.1)
|
||||
ruby2_keywords (~> 0.0.1)
|
||||
nokogiri (1.10.10)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
octicons (8.5.0)
|
||||
nokogiri (1.11.1)
|
||||
mini_portile2 (~> 2.5.0)
|
||||
racc (~> 1.4)
|
||||
octicons (12.1.0)
|
||||
nokogiri (>= 1.6.3.1)
|
||||
racc (1.5.2)
|
||||
rack (2.2.3)
|
||||
rack-protection (2.1.0)
|
||||
rack
|
||||
|
|
@ -63,10 +67,10 @@ GEM
|
|||
rb-inotify (0.10.1)
|
||||
ffi (~> 1.0)
|
||||
rexml (3.2.4)
|
||||
rouge (3.25.0)
|
||||
rouge (3.26.0)
|
||||
rss (0.2.9)
|
||||
rexml
|
||||
ruby2_keywords (0.0.2)
|
||||
ruby2_keywords (0.0.4)
|
||||
rugged (0.99.0)
|
||||
sass (3.7.4)
|
||||
sass-listen (~> 4.0.0)
|
||||
|
|
@ -95,7 +99,7 @@ GEM
|
|||
tilt (2.0.10)
|
||||
twitter-text (1.14.7)
|
||||
unf (~> 0.1.0)
|
||||
uglifier (3.2.0)
|
||||
uglifier (4.2.0)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/gollum/gollum";
|
||||
changelog = "https://github.com/gollum/gollum/blob/v${version}/HISTORY.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jgillich primeos nicknovitski ];
|
||||
maintainers = with maintainers; [ erictapen jgillich nicknovitski ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
|
||||
sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.7";
|
||||
version = "1.1.8";
|
||||
};
|
||||
crass = {
|
||||
groups = ["default"];
|
||||
|
|
@ -34,10 +34,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
|
||||
sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.13.1";
|
||||
version = "1.14.2";
|
||||
};
|
||||
gemojione = {
|
||||
dependencies = ["json"];
|
||||
|
|
@ -61,15 +61,15 @@
|
|||
version = "3.0.5";
|
||||
};
|
||||
gollum = {
|
||||
dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"];
|
||||
dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache-sinatra" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0pmvxj7pka7pjpw060a9pfxsci1hmx45hk9hbp5m49xkkiiqf1gx";
|
||||
sha256 = "0n89c77amabvv4aq8jq5r6581hqzw79w8khr13w6kvv6iabq1vaz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.1.2";
|
||||
version = "5.2.1";
|
||||
};
|
||||
gollum-lib = {
|
||||
dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"];
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02mc1w4hn9kjrgvg0r46x1bd0h8hq7lqs432dgjfn2dw36kchja4";
|
||||
sha256 = "0p721ymkf2xcskjgr9308b6g581cbxgvhprj9srqskssxvsfdsln";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.0.6";
|
||||
version = "5.1";
|
||||
};
|
||||
gollum-rugged_adapter = {
|
||||
dependencies = ["mime-types" "rugged"];
|
||||
|
|
@ -98,10 +98,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz";
|
||||
sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.3.1";
|
||||
version = "2.5.1";
|
||||
};
|
||||
kramdown = {
|
||||
dependencies = ["rexml"];
|
||||
|
|
@ -131,10 +131,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh";
|
||||
sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.9.0";
|
||||
};
|
||||
mime-types = {
|
||||
dependencies = ["mime-types-data"];
|
||||
|
|
@ -152,20 +152,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag";
|
||||
sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2020.1104";
|
||||
version = "3.2021.0225";
|
||||
};
|
||||
mini_portile2 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy";
|
||||
sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
};
|
||||
multi_json = {
|
||||
groups = ["default"];
|
||||
|
|
@ -187,6 +187,17 @@
|
|||
};
|
||||
version = "0.99.8";
|
||||
};
|
||||
mustache-sinatra = {
|
||||
dependencies = ["mustache"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1rvdwg1zk3sybpi9hzn6jj0k8rndkq19y7cl0jmqr0g2xx21z7mr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.0.1";
|
||||
};
|
||||
mustermann = {
|
||||
dependencies = ["ruby2_keywords"];
|
||||
groups = ["default"];
|
||||
|
|
@ -199,15 +210,15 @@
|
|||
version = "1.1.1";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["mini_portile2"];
|
||||
dependencies = ["mini_portile2" "racc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
|
||||
sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.10.10";
|
||||
version = "1.11.1";
|
||||
};
|
||||
octicons = {
|
||||
dependencies = ["nokogiri"];
|
||||
|
|
@ -215,10 +226,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0fy6shpfmla58dxx3kb2zi1hs7vmdw6pqrksaa8yrva05s4l3y75";
|
||||
sha256 = "0kpy7h7pffjqb2xbmld7nwnb2x6rll3yz5ccr7nrqnrk2d3cmpmn";
|
||||
type = "gem";
|
||||
};
|
||||
version = "8.5.0";
|
||||
version = "12.1.0";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.2";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default"];
|
||||
|
|
@ -277,10 +298,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn";
|
||||
sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.25.0";
|
||||
version = "3.26.0";
|
||||
};
|
||||
rss = {
|
||||
dependencies = ["rexml"];
|
||||
|
|
@ -298,10 +319,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l";
|
||||
sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.2";
|
||||
version = "0.0.4";
|
||||
};
|
||||
rugged = {
|
||||
groups = ["default"];
|
||||
|
|
@ -427,10 +448,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wmqvn4xncw6h3d5gp2a44170zwxfyj3iq4rsjp16zarvzbdmgnz";
|
||||
sha256 = "0wgh7bzy68vhv9v68061519dd8samcy8sazzz0w3k8kqpy3g4s5f";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.0";
|
||||
version = "4.2.0";
|
||||
};
|
||||
unf = {
|
||||
dependencies = ["unf_ext"];
|
||||
|
|
|
|||
|
|
@ -1071,9 +1071,9 @@
|
|||
"vultr": {
|
||||
"owner": "vultr",
|
||||
"repo": "terraform-provider-vultr",
|
||||
"rev": "v1.5.0",
|
||||
"sha256": "04qy366ignn53bbdj9s3032qr1x7h84q36qzl5ywydlw2va0qbsd",
|
||||
"version": "1.5.0"
|
||||
"rev": "v2.1.3",
|
||||
"sha256": "sha256-fvqkzg3j2TYAMbPc8Ifh35sBe0D76LYH6Ut5Ugdyexg=",
|
||||
"version": "2.1.3"
|
||||
},
|
||||
"wavefront": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
|
|||
|
|
@ -1,44 +1,42 @@
|
|||
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, asciidoc
|
||||
{ lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, freetype, asciidoc-full
|
||||
, xdotool, xorgserver, xsetroot, xterm, runtimeShell
|
||||
, nixosTests }:
|
||||
|
||||
# Doc generation is disabled by default when cross compiling because asciidoc
|
||||
# dependency is broken when cross compiling for now
|
||||
|
||||
let
|
||||
cross = stdenv.buildPlatform != stdenv.targetPlatform;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "herbstluftwm";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz";
|
||||
sha256 = "0r4qaklv97qcq8p0pnz4f2zqg69vfai6c2qi1ydi2kz24xqjf5hy";
|
||||
sha256 = "0avfhr68f6fjnafjdcyxcx7dkg38f2nadmhpj971qyqzfq2f6i38";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"doc" # share/doc exists with examples even without generated html documentation
|
||||
] ++ lib.optionals (!cross) [
|
||||
"doc"
|
||||
"man"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc"
|
||||
] ++ lib.optional cross "-DWITH_DOCUMENTATION=OFF";
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optional (!cross) asciidoc;
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
asciidoc-full
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libX11
|
||||
libXext
|
||||
libXinerama
|
||||
libXrandr
|
||||
libXft
|
||||
freetype
|
||||
];
|
||||
|
||||
patches = [
|
||||
|
|
@ -75,6 +73,9 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
pytestFlagsArray = [ "../tests" ];
|
||||
disabledTests = [
|
||||
"test_title_different_letters_are_drawn"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests.herbstluftwm = nixosTests.herbstluftwm;
|
||||
|
|
|
|||
|
|
@ -144,6 +144,10 @@ let
|
|||
(lib.enableFeature enablePlugin "plugin")
|
||||
]
|
||||
|
||||
# Support -m32 on powerpc64le
|
||||
++ lib.optional (targetPlatform.system == "powerpc64le-linux")
|
||||
"--enable-targets=powerpcle-linux"
|
||||
|
||||
# Optional features
|
||||
++ lib.optional (isl != null) "--with-isl=${isl}"
|
||||
++ lib.optionals (cloog != null) [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, alsaLib }:
|
||||
{ lib, stdenv, fetchFromGitHub, alsaLib, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flite";
|
||||
|
|
@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ alsaLib ];
|
||||
|
||||
# https://github.com/festvox/flite/pull/60.
|
||||
# Replaces `ar` with `$(AR)` in config/common_make_rules.
|
||||
# Improves cross-compilation compatibility.
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/festvox/flite/commit/54c65164840777326bbb83517568e38a128122ef.patch";
|
||||
sha256 = "sha256-hvKzdX7adiqd9D+9DbnfNdqEULg1Hhqe1xElYxNM1B8=";
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-shared"
|
||||
] ++ lib.optionals stdenv.isLinux [ "--with-audio=alsa" ];
|
||||
|
|
|
|||
|
|
@ -62,7 +62,8 @@ stdenv.mkDerivation rec {
|
|||
Both GLX and EGL are supported, in any combination with OpenGL and OpenGL ES.
|
||||
'';
|
||||
inherit (src.meta) homepage;
|
||||
license = licenses.bsd2;
|
||||
# https://gitlab.freedesktop.org/glvnd/libglvnd#libglvnd:
|
||||
license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ primeos ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ buildDunePackage rec {
|
|||
pname = "camomile";
|
||||
version = "1.0.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yoriyuki";
|
||||
repo = pname;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,32 @@
|
|||
{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, nose, six, importlib-metadata, toml }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, setuptools_scm
|
||||
, toml
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "inflect";
|
||||
version = "5.0.2";
|
||||
version = "5.2.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d284c905414fe37c050734c8600fe170adfb98ba40f72fc66fed393f5b8d5ea0";
|
||||
sha256 = "30e9d9d372e693739beaae1345dc53c48871ca70c5c7060edd3e7e77802bf945";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm toml ];
|
||||
propagatedBuildInputs = [ six importlib-metadata ];
|
||||
checkInputs = [ nose ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "inflect" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Correctly generate plurals, singular nouns, ordinals, indefinite articles";
|
||||
homepage = "https://github.com/jaraco/inflect";
|
||||
changelog = "https://github.com/jaraco/inflect/blob/v${version}/CHANGES.rst";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "msldap";
|
||||
version = "0.3.25";
|
||||
version = "0.3.26";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b5ef61c4f05493cfe78b3f955878a3d0a71950eead5ebb484282f07456a47bea";
|
||||
sha256 = "sha256-cW1757NImdi5tz98qrspzEdI5Q/26ap2jVxyah44qR8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/development/python-modules/pytankerkoenig/default.nix
Normal file
25
pkgs/development/python-modules/pytankerkoenig/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytankerkoenig";
|
||||
version = "0.0.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "021fg1a4n3527fz86zxfbsi0jrk0dnai1y92q6hwh5za68lrs710";
|
||||
};
|
||||
|
||||
# Tests require an API key and network access
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pytankerkoenig" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to get fuel data from tankerkoenig.de";
|
||||
homepage = "https://github.com/ultrara1n/pytankerkoenig";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
38
pkgs/development/python-modules/python-gammu/default.nix
Normal file
38
pkgs/development/python-modules/python-gammu/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
#, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pkg-config
|
||||
, gammu
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-gammu";
|
||||
version = "3.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gammu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1hw2mfrps6wqfyi40p5mp9r59n1ick6pj4hw5njz0k822pbb33p0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ gammu ];
|
||||
|
||||
# Check with the next release if tests could be run with pytest
|
||||
# checkInputs = [ pytestCheckHook ];
|
||||
# Don't run tests for now
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "gammu" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for Gammu";
|
||||
homepage = "https://github.com/gammu/python-gammu/";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "winacl";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "05xhdhbvzs1hcd8lxmdr9mpr6ifx5flhlvk6jr0qi6h25imhqclp";
|
||||
sha256 = "sha256-V+W0WRtL4rJD1LeYgr0PtiKdWTDQYv2ulB1divaqKe4=";
|
||||
};
|
||||
|
||||
# Project doesn't have tests
|
||||
|
|
|
|||
|
|
@ -365,8 +365,8 @@ let
|
|||
mktplcRef = {
|
||||
name = "todo-tree";
|
||||
publisher = "Gruntfuggly";
|
||||
version = "0.0.196";
|
||||
sha256 = "1l4f290018f2p76q6hn2b2injps6wz65as7dm537wrsvsivyg2qz";
|
||||
version = "0.0.198";
|
||||
sha256 = "0riy2k8dbsnpk8vkv814fr8zh87y425s24nklcx4b7mfrszv7xbn";
|
||||
};
|
||||
meta = with lib; {
|
||||
license = licenses.mit;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [
|
||||
"prefix=${placeholder "out"}"
|
||||
];
|
||||
] ++ lib.optional stdenv.hostPlatform.isStatic "ENABLE_SHARED=0";
|
||||
|
||||
hardeningDisable = lib.optional (stdenv.isi686) "stackprotector";
|
||||
|
||||
|
|
|
|||
|
|
@ -751,7 +751,7 @@
|
|||
"smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings
|
||||
"smarty" = ps: with ps; [ ]; # missing inputs: pysmarty
|
||||
"smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg
|
||||
"sms" = ps: with ps; [ ]; # missing inputs: python-gammu
|
||||
"sms" = ps: with ps; [ python-gammu ];
|
||||
"smtp" = ps: with ps; [ ];
|
||||
"snapcast" = ps: with ps; [ snapcast ];
|
||||
"snips" = ps: with ps; [ aiohttp-cors paho-mqtt ];
|
||||
|
|
@ -817,7 +817,7 @@
|
|||
"tag" = ps: with ps; [ ];
|
||||
"tahoma" = ps: with ps; [ tahoma-api ];
|
||||
"tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility
|
||||
"tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig
|
||||
"tankerkoenig" = ps: with ps; [ pytankerkoenig ];
|
||||
"tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff
|
||||
"tasmota" = ps: with ps; [ aiohttp-cors hatasmota paho-mqtt ];
|
||||
"tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vsh";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fishi0x01";
|
||||
repo = "vsh";
|
||||
rev = "v${version}";
|
||||
sha256 = "16q0pkmdzhq0bqy4lnnlxrc29gszca6vwajj2bg6sylcvi94x80d";
|
||||
sha256 = "0dhn2aqd52fgasy4j3ar67fzwzcxfi1vl09kni8jwcna8rjgg3fj";
|
||||
};
|
||||
|
||||
# vendor directory is part of repository
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
let
|
||||
pname = "rst2html5";
|
||||
version = "1.10.6";
|
||||
in python3Packages.buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "wheel";
|
||||
in python3Packages.buildPythonPackage {
|
||||
inherit pname version format;
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
inherit pname version format;
|
||||
sha256 = "sha256-jmToDFLQODqgTycBp2J8LyoJ1Zxho9w1VdhFMzvDFkg=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -22824,9 +22824,7 @@ in
|
|||
|
||||
herbe = callPackage ../applications/misc/herbe { };
|
||||
|
||||
herbstluftwm = callPackage ../applications/window-managers/herbstluftwm {
|
||||
asciidoc = asciidoc-full;
|
||||
};
|
||||
herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
|
||||
|
||||
hercules = callPackage ../applications/virtualization/hercules { };
|
||||
|
||||
|
|
|
|||
|
|
@ -6113,6 +6113,8 @@ in {
|
|||
|
||||
pytaglib = callPackage ../development/python-modules/pytaglib { };
|
||||
|
||||
pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { };
|
||||
|
||||
pyte = callPackage ../development/python-modules/pyte { };
|
||||
|
||||
pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { };
|
||||
|
|
@ -6375,6 +6377,8 @@ in {
|
|||
|
||||
python-frontmatter = callPackage ../development/python-modules/python-frontmatter { };
|
||||
|
||||
python-gammu = callPackage ../development/python-modules/python-gammu { };
|
||||
|
||||
python-gitlab = callPackage ../development/python-modules/python-gitlab { };
|
||||
|
||||
python-gnupg = callPackage ../development/python-modules/python-gnupg { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue