mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
7def368b6f
48 changed files with 449 additions and 361 deletions
|
|
@ -10819,6 +10819,16 @@
|
|||
githubId = 6720672;
|
||||
name = "Shane Pearlman";
|
||||
};
|
||||
shanesveller = {
|
||||
email = "shane@sveller.dev";
|
||||
github = "shanesveller";
|
||||
githubId = 831;
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0x9210C218023C15CD";
|
||||
fingerprint = "F83C 407C ADC4 5A0F 1F2F 44E8 9210 C218 023C 15CD";
|
||||
}];
|
||||
name = "Shane Sveller";
|
||||
};
|
||||
shawndellysse = {
|
||||
email = "sdellysse@gmail.com";
|
||||
github = "shawndellysse";
|
||||
|
|
|
|||
|
|
@ -310,6 +310,12 @@
|
|||
follow with upstream changes.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.docbookrx</literal> was removed since it’s
|
||||
unmaintained
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
|
|
|
|||
|
|
@ -101,6 +101,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `services.thelounge.private` was removed in favor of `services.thelounge.public`, to follow with upstream changes.
|
||||
|
||||
- `pkgs.docbookrx` was removed since it's unmaintained
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
||||
- The option [services.redis.servers](#opt-services.redis.servers) was added
|
||||
|
|
|
|||
|
|
@ -301,11 +301,16 @@ in
|
|||
# implementation
|
||||
config = mkIf (eachSite != {}) (mkMerge [{
|
||||
|
||||
assertions = mapAttrsToList (hostName: cfg:
|
||||
{ assertion = cfg.database.createLocally -> cfg.database.user == user;
|
||||
message = ''services.wordpress.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
|
||||
}
|
||||
) eachSite;
|
||||
assertions =
|
||||
(mapAttrsToList (hostName: cfg:
|
||||
{ assertion = cfg.database.createLocally -> cfg.database.user == user;
|
||||
message = ''services.wordpress.sites."${hostName}".database.user must be ${user} if the database is to be automatically provisioned'';
|
||||
}) eachSite) ++
|
||||
(mapAttrsToList (hostName: cfg:
|
||||
{ assertion = cfg.database.createLocally -> cfg.database.passwordFile == null;
|
||||
message = ''services.wordpress.sites."${hostName}".database.passwordFile cannot be specified if services.wordpress.sites."${hostName}".database.createLocally is set to true.'';
|
||||
}) eachSite);
|
||||
|
||||
|
||||
warnings = mapAttrsToList (hostName: _: ''services.wordpress."${hostName}" is deprecated use services.wordpress.sites."${hostName}"'') (oldSites cfg);
|
||||
|
||||
|
|
|
|||
|
|
@ -633,7 +633,7 @@ in
|
|||
|
||||
<itemizedlist>
|
||||
<listitem><para><literal>boot.consoleLogLevel = 0;</literal></para></listitem>
|
||||
<listitem><para><literal>boot.kernelParams = [ "quiet" "udev.log_priority=3" ];</literal></para></listitem>
|
||||
<listitem><para><literal>boot.kernelParams = [ "quiet" "udev.log_level=3" ];</literal></para></listitem>
|
||||
</itemizedlist>
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,18 +26,20 @@
|
|||
, docbook-xsl-nons
|
||||
, docbook_xml_dtd_43
|
||||
, gobject-introspection
|
||||
, gst_all_1
|
||||
, sofia_sip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "calls";
|
||||
version = "0.3.1";
|
||||
version = "41.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "source.puri.sm";
|
||||
owner = "Librem5";
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd";
|
||||
rev = version;
|
||||
sha256 = "1vbw9x5s3ww11f3lnqivc74rjlmi9fk1hzaq1idrdcck3gvif0h8";
|
||||
};
|
||||
|
||||
outputs = [ "out" "devdoc" ];
|
||||
|
|
@ -62,11 +64,17 @@ stdenv.mkDerivation rec {
|
|||
folks
|
||||
gom
|
||||
gsound
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-ugly
|
||||
feedbackd
|
||||
callaudiod
|
||||
gtk3
|
||||
libpeas
|
||||
libgdata # required by some dependency transitively
|
||||
sofia_sip
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
@ -80,7 +88,8 @@ stdenv.mkDerivation rec {
|
|||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
# Disable until tests are fixed upstream https://gitlab.gnome.org/GNOME/calls/-/issues/258
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "seaweedfs";
|
||||
version = "2.71";
|
||||
version = "2.85";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrislusf";
|
||||
repo = "seaweedfs";
|
||||
rev = version;
|
||||
sha256 = "sha256-d4Vl+HixZy7fJ8YU1fy3b2B+F/76mm0NQmFC/PDl4SY=";
|
||||
sha256 = "sha256-MsPvda+VaqO3tXH26nVukNWcJ1n+/n5Qk7BMr/DAVUk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-oxrOjiRxgcJ5yzQYQvLXFPHlOHMB88FThw4OCVxFOwQ=";
|
||||
vendorSha256 = "sha256-TYVBfjwaoEBKJmIHdwvj/5g4jYmnmJPE1mCL/yET1GQ=";
|
||||
|
||||
subPackages = [ "weed" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, fetchurl, makeWrapper
|
||||
, python2Packages
|
||||
, pypy2Packages
|
||||
, cvs, subversion, git, breezy
|
||||
}:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
pypy2Packages.buildPythonApplication rec {
|
||||
pname = "cvs2svn";
|
||||
version = "2.5.0";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec {
|
|||
|
||||
checkInputs = [ subversion git breezy ];
|
||||
|
||||
checkPhase = "python run-tests.py";
|
||||
checkPhase = "pypy2 run-tests.py";
|
||||
|
||||
doCheck = false; # Couldn't find node 'transaction...' in expected output tree
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, fetchFromGitHub, gitMinimal, makeWrapper, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gfold";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickgerace";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ss6vfrc6h3jlh5qilh82psd3vdnfawf1wl4cf64mfm4hm9dda63";
|
||||
};
|
||||
|
||||
cargoSha256 = "09ywwgxm8l1p0jypp65zpqryjnb2g4gririf1dmqb9148dsj29x2";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/gfold" --prefix PATH : "${gitMinimal}/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description =
|
||||
"A tool to help keep track of your Git repositories, written in Rust";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.shanesveller ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{ fetchurl, python2Packages }:
|
||||
{ fetchurl, pypy2Packages }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
pypy2Packages.buildPythonApplication rec {
|
||||
pname = "tailor";
|
||||
version = "0.9.35";
|
||||
|
||||
|
|
|
|||
30
pkgs/applications/video/kodi/addons/arteplussept/default.nix
Normal file
30
pkgs/applications/video/kodi/addons/arteplussept/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, xbmcswift2 }:
|
||||
|
||||
buildKodiAddon rec {
|
||||
pname = "arteplussept";
|
||||
namespace = "plugin.video.arteplussept";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
|
||||
hash = "sha256-IYodi0Uz16Qg4MHCz/K06pEXblrsBxHD25fb6LrW8To=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
xbmcswift2
|
||||
];
|
||||
|
||||
passthru = {
|
||||
updateScript = addonUpdateScript {
|
||||
attrPath = "kodi.packages.arteplussept";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/known-as-bmf/plugin.video.arteplussept";
|
||||
description = "Watch videos available on Arte+7";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
buildKodiAddon rec {
|
||||
pname = "orftvthek";
|
||||
namespace = "plugin.video.orftvthek";
|
||||
version = "0.12.3-1";
|
||||
version = "0.12.3+matrix.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "s0faking";
|
||||
repo = namespace;
|
||||
rev = version;
|
||||
sha256 = "sha256-+J1NtmjbDWtS8d4nO9P/lR5GNmvtc1YjTW+bulGaU2Q=";
|
||||
sha256 = "sha256-GB9VkC9Vbi7TJXl/vF3ViF/tAcHGH0KxYQ0zkfMLZCY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
Normal file
25
pkgs/applications/video/kodi/addons/xbmcswift2/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib, buildKodiAddon, fetchFromGitHub }:
|
||||
|
||||
buildKodiAddon rec {
|
||||
pname = "xbmcswift2";
|
||||
namespace = "script.module.xbmcswift2";
|
||||
version = "19.0.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XBMC-Addons";
|
||||
repo = namespace;
|
||||
rev = version;
|
||||
sha256 = "sha256-Z+rHz3wncoNvV1pwhRzJFB/X0H6wdfwg88otVh27wg8=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
pythonPath = "lib";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/XBMC-Addons/script.module.xbmcswift2";
|
||||
description = "Framework to ease development of Kodi addons";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = teams.kodi.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -55,11 +55,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-boxes";
|
||||
version = "41.2";
|
||||
version = "41.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "u3G2zflFOBjyblV0Tl5ZUN2TJ5PQ6Ot+n/h78Mvvwz0=";
|
||||
sha256 = "m4QGgNHnOG/d/WoVrU3Q8s2ljv6BjPVHg3tGrovw4Yk=";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rygel";
|
||||
version = "0.40.2";
|
||||
version = "0.40.3";
|
||||
|
||||
# TODO: split out lib
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "yejHNiltIsTe/pWXJ6KdMUN7vSt6oMZHDWviQBEFBpc=";
|
||||
sha256 = "zwvjUQnLVw5c8K/lltha7Lmw6TWYYVNTArt7YE2vUdc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-autoar";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "ZGvVDrrZLZHBvokJehU2QVYVdELKwUcd7X7LJ9mpFQ4=";
|
||||
sha256 = "HSBpQHkwDhL+q9t3MEqWnRzBkNHRKpSb6EXK0Bx4pdM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, stdenv, fetchurl
|
||||
, pkg-config
|
||||
, libxml2, findXMLCatalogs, gettext, python3, libgcrypt
|
||||
, libxml2, findXMLCatalogs, gettext, python, libgcrypt
|
||||
, cryptoSupport ? false
|
||||
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
|
||||
}:
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ libxml2.dev ]
|
||||
++ lib.optional stdenv.isDarwin gettext
|
||||
++ lib.optionals pythonSupport [ libxml2.py python3 ]
|
||||
++ lib.optionals pythonSupport [ libxml2.py python ]
|
||||
++ lib.optionals cryptoSupport [ libgcrypt ];
|
||||
|
||||
propagatedBuildInputs = [ findXMLCatalogs ];
|
||||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
"--without-debug"
|
||||
"--without-mem-debug"
|
||||
"--without-debugger"
|
||||
] ++ lib.optional pythonSupport "--with-python=${python3}"
|
||||
] ++ lib.optional pythonSupport "--with-python=${python}"
|
||||
++ lib.optional (!cryptoSupport) "--without-crypto";
|
||||
|
||||
postFixup = ''
|
||||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
'' + lib.optionalString pythonSupport ''
|
||||
mkdir -p $py/nix-support
|
||||
echo ${libxml2.py} >> $py/nix-support/propagated-build-inputs
|
||||
moveToOutput ${python3.libPrefix} "$py"
|
||||
moveToOutput ${python.libPrefix} "$py"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
/* Generated file. */
|
||||
args @ { fetchurl, ... }:
|
||||
rec {
|
||||
baseName = "cl-mustache";
|
||||
version = "20200325-git";
|
||||
|
||||
description = "Mustache Template Renderer";
|
||||
|
||||
deps = [ args."uiop" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz";
|
||||
sha256 = "1x1rsmgqc39imx4ay3b35dzvzccaqjayz90qv2cylqbbq9sg9arr";
|
||||
};
|
||||
|
||||
packageName = "cl-mustache";
|
||||
|
||||
asdFilesToKeep = ["cl-mustache.asd"];
|
||||
overrides = x: x;
|
||||
}
|
||||
/* (SYSTEM cl-mustache DESCRIPTION Mustache Template Renderer SHA256
|
||||
1x1rsmgqc39imx4ay3b35dzvzccaqjayz90qv2cylqbbq9sg9arr URL
|
||||
http://beta.quicklisp.org/archive/cl-mustache/2020-03-25/cl-mustache-20200325-git.tgz
|
||||
MD5 52381d17458d88d6a8b760f351bf517d NAME cl-mustache FILENAME cl-mustache
|
||||
DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop) VERSION 20200325-git
|
||||
SIBLINGS (cl-mustache-test) PARASITES NIL) */
|
||||
|
|
@ -60,6 +60,7 @@ cl-l10n
|
|||
cl-libuv
|
||||
cl-locale
|
||||
cl-markup
|
||||
cl-mustache
|
||||
cl-mysql
|
||||
cl-paths-ttf
|
||||
cl-pattern
|
||||
|
|
|
|||
|
|
@ -4312,6 +4312,15 @@ let quicklisp-to-nix-packages = rec {
|
|||
}));
|
||||
|
||||
|
||||
"cl-mustache" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."cl-mustache" or (x: {}))
|
||||
(import ./quicklisp-to-nix-output/cl-mustache.nix {
|
||||
inherit fetchurl;
|
||||
"uiop" = quicklisp-to-nix-packages."uiop";
|
||||
}));
|
||||
|
||||
|
||||
"cl-markup" = buildLispPackage
|
||||
((f: x: (x // (f x)))
|
||||
(qlOverrides."cl-markup" or (x: {}))
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, libusb1
|
||||
, mock
|
||||
, pyasn1
|
||||
, pythonAtLeast
|
||||
, pycryptodome
|
||||
, pytestCheckHook
|
||||
, rsa
|
||||
|
|
@ -15,15 +16,15 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "adb-shell";
|
||||
version = "0.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
# pypi does not contain tests, using github sources instead
|
||||
src = fetchFromGitHub {
|
||||
owner = "JeffLIrion";
|
||||
repo = "adb_shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
|
||||
hash = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -40,7 +41,16 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "adb_shell" ];
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.10") [
|
||||
# Tests are failing with Python 3.10
|
||||
# https://github.com/JeffLIrion/adb_shell/issues/198
|
||||
"TestAdbDeviceAsync"
|
||||
"TestTcpTransportAsync"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"adb_shell"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of ADB with shell and FileSync functionality";
|
||||
|
|
|
|||
|
|
@ -4,21 +4,21 @@
|
|||
, pythonOlder
|
||||
, pygments
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, uvloop
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiorun";
|
||||
version = "2021.8.1";
|
||||
version = "2021.10.1";
|
||||
format = "flit";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cjrh";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aehYPZ1+GEO+bNSsE5vVgjtVo4MRMH+vNurk+bJ1/Io=";
|
||||
hash = "sha256-9e1vUWDBv3BYWuKR/rZUvaIxFFetzBQaygXKnl4PDd8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -27,7 +27,6 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
uvloop
|
||||
];
|
||||
|
||||
|
|
@ -36,7 +35,9 @@ buildPythonPackage rec {
|
|||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "aiorun" ];
|
||||
pythonImportsCheck = [
|
||||
"aiorun"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Boilerplate for asyncio applications";
|
||||
|
|
|
|||
|
|
@ -13,12 +13,13 @@
|
|||
, colorlog
|
||||
, croniter
|
||||
, cryptography
|
||||
, dataclasses
|
||||
, dill
|
||||
, flask
|
||||
, flask-appbuilder
|
||||
, flask-caching
|
||||
, flask_login
|
||||
, flask_wtf
|
||||
, flask-appbuilder
|
||||
, flask-caching
|
||||
, GitPython
|
||||
, graphviz
|
||||
, gunicorn
|
||||
|
|
@ -47,6 +48,7 @@
|
|||
, python-nvd3
|
||||
, python-slugify
|
||||
, python3-openid
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, rich
|
||||
, setproctitle
|
||||
|
|
@ -63,7 +65,6 @@
|
|||
, mkYarnPackage
|
||||
}:
|
||||
let
|
||||
|
||||
version = "2.1.4";
|
||||
|
||||
airflow-src = fetchFromGitHub rec {
|
||||
|
|
@ -107,6 +108,8 @@ buildPythonPackage rec {
|
|||
inherit version;
|
||||
src = airflow-src;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
alembic
|
||||
argcomplete
|
||||
|
|
@ -130,7 +133,6 @@ buildPythonPackage rec {
|
|||
httpx
|
||||
iso8601
|
||||
importlib-resources
|
||||
importlib-metadata
|
||||
inflection
|
||||
itsdangerous
|
||||
jinja2
|
||||
|
|
@ -163,6 +165,10 @@ buildPythonPackage rec {
|
|||
termcolor
|
||||
unicodecsv
|
||||
werkzeug
|
||||
] ++ lib.optionals (pythonOlder "3.7") [
|
||||
dataclasses
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-metadata
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -178,24 +184,22 @@ buildPythonPackage rec {
|
|||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "importlib_resources~=1.4" "importlib_resources" \
|
||||
--replace "importlib_metadata~=1.7" "importlib_metadata" \
|
||||
--replace "tenacity~=6.2.0" "tenacity" \
|
||||
--replace "pyjwt<2" "pyjwt" \
|
||||
--replace "flask>=1.1.0, <2.0" "flask" \
|
||||
--replace "flask-login>=0.3, <0.5" "flask-login" \
|
||||
--replace "flask-wtf>=0.14.3, <0.15" "flask-wtf" \
|
||||
--replace "jinja2>=2.10.1, <2.12.0" "jinja2" \
|
||||
--replace "attrs>=20.0, <21.0" "attrs" \
|
||||
--replace "cattrs~=1.1, <1.7.0" "cattrs" \
|
||||
--replace "markupsafe>=1.1.1, <2.0" "markupsafe" \
|
||||
--replace "colorlog>=4.0.2, <6.0" "colorlog" \
|
||||
--replace "croniter>=0.3.17, <1.1" "croniter" \
|
||||
--replace "docutils<0.17" "docutils" \
|
||||
--replace "sqlalchemy>=1.3.18, <1.4" "sqlalchemy" \
|
||||
--replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \
|
||||
--replace "werkzeug~=1.0, >=1.0.1" "werkzeug" \
|
||||
--replace "flask-login>=0.3, <0.5" "flask-login" \
|
||||
--replace "flask-wtf>=0.14.3, <0.15" "flask-wtf" \
|
||||
--replace "flask>=1.1.0, <2.0" "flask" \
|
||||
--replace "importlib_resources~=1.4" "importlib_resources" \
|
||||
--replace "itsdangerous>=1.1.0, <2.0" "itsdangerous" \
|
||||
--replace "markupsafe>=1.1.1, <2.0" "markupsafe" \
|
||||
--replace "pyjwt<2" "pyjwt" \
|
||||
--replace "python-slugify>=3.0.0,<5.0" "python-slugify" \
|
||||
--replace "colorlog>=4.0.2, <6.0" "colorlog"
|
||||
--replace "sqlalchemy_jsonfield~=1.0" "sqlalchemy-jsonfield" \
|
||||
--replace "tenacity~=6.2.0" "tenacity" \
|
||||
--replace "werkzeug~=1.0, >=1.0.1" "werkzeug"
|
||||
|
||||
substituteInPlace tests/core/test_core.py \
|
||||
--replace "/bin/bash" "${stdenv.shell}"
|
||||
|
|
@ -205,19 +209,21 @@ buildPythonPackage rec {
|
|||
--replace "/tmp/sqlite_default.db" "$TMPDIR/sqlite_default.db"
|
||||
'';
|
||||
|
||||
# allow for gunicorn processes to have access to python packages
|
||||
makeWrapperArgs = [ "--prefix PYTHONPATH : $PYTHONPATH" ];
|
||||
# allow for gunicorn processes to have access to Python packages
|
||||
makeWrapperArgs = [
|
||||
"--prefix PYTHONPATH : $PYTHONPATH"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export AIRFLOW_HOME=$HOME
|
||||
export AIRFLOW__CORE__UNIT_TEST_MODE=True
|
||||
export AIRFLOW_DB="$HOME/airflow.db"
|
||||
export PATH=$PATH:$out/bin
|
||||
export HOME=$(mktemp -d)
|
||||
export AIRFLOW_HOME=$HOME
|
||||
export AIRFLOW__CORE__UNIT_TEST_MODE=True
|
||||
export AIRFLOW_DB="$HOME/airflow.db"
|
||||
export PATH=$PATH:$out/bin
|
||||
|
||||
airflow version
|
||||
airflow db init
|
||||
airflow db reset -y
|
||||
airflow version
|
||||
airflow db init
|
||||
airflow db reset -y
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
|
|
@ -225,7 +231,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = lib.optionals stdenv.isDarwin [
|
||||
"bash_operator_kill" # psutil.AccessDenied
|
||||
"bash_operator_kill" # psutil.AccessDenied
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,27 +1,51 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast
|
||||
, flask, blinker, nose, mock, semantic-version }:
|
||||
{ lib
|
||||
, blinker
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flask
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, semantic-version
|
||||
, werkzeug
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Flask-Login";
|
||||
pname = "flask-login";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "Flask-Login";
|
||||
inherit version;
|
||||
sha256 = "6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b";
|
||||
};
|
||||
|
||||
checkInputs = [ nose mock semantic-version ];
|
||||
propagatedBuildInputs = [ flask blinker ];
|
||||
propagatedBuildInputs = [
|
||||
flask
|
||||
werkzeug
|
||||
];
|
||||
|
||||
checkPhase = "nosetests -d";
|
||||
checkInputs = [
|
||||
blinker
|
||||
pytestCheckHook
|
||||
semantic-version
|
||||
];
|
||||
|
||||
doCheck = pythonAtLeast "3.3";
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.10") [
|
||||
"test_hashable"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"flask_login"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/maxcountryman/flask-login";
|
||||
description = "User session management for Flask";
|
||||
homepage = "https://github.com/maxcountryman/flask-login";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.4.2";
|
||||
version = "2.4.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "pre-commit";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6YduKmXqgqXAqlK2cd1CkdI7nzK0Dg65E+nl6vhMAow=";
|
||||
sha256 = "sha256-r7Ta/OumYdm+brM6UgAPTWvxODpex1Mg0Arq94tPdnM=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jedi-language-server";
|
||||
version = "0.34.12";
|
||||
version = "0.35.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pappasam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0v2292sn0c9bl4gsw698hpzcgm115gk4929nx726vh2139qnazqp";
|
||||
sha256 = "sha256-+bhvWWiG0cA36oc2PFvgRTIvqnjIt5BUN82DY0tvuPo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,24 +1,38 @@
|
|||
{ buildPythonPackage, fetchPypi, lib, numpy, pytest_4 }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.3.0";
|
||||
pname = "opt_einsum";
|
||||
pname = "opt-einsum";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "0jb5lia0q742d1713jk33vlj41y61sf52j6pgk7pvhxvfxglgxjr";
|
||||
pname = "opt_einsum";
|
||||
inherit version;
|
||||
hash = "sha256-WfZHX3e7w33PfNdIUZwOxgci6R5jyhFOaIIcDFSkZUk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
checkInputs = [ pytest_4 ];
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
pythonImportsCheck = [
|
||||
"opt_einsum"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Optimizing NumPy's einsum function with order optimization and GPU support.";
|
||||
description = "Optimizing NumPy's einsum function with order optimization and GPU support";
|
||||
homepage = "https://github.com/dgasmith/opt_einsum";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ teh ];
|
||||
|
|
|
|||
|
|
@ -3,16 +3,21 @@
|
|||
, fetchPypi
|
||||
, docutils
|
||||
, lockfile
|
||||
, mock
|
||||
, pytest_4
|
||||
, pytestCheckHook
|
||||
, testscenarios
|
||||
, testtools
|
||||
, twine
|
||||
, python
|
||||
, pythonOlder
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-daemon";
|
||||
version = "2.3.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
@ -29,22 +34,39 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest_4
|
||||
mock
|
||||
pytestCheckHook
|
||||
testscenarios
|
||||
testtools
|
||||
];
|
||||
|
||||
# tests disabled due to incompatibilities with testtools>=2.5.0
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
pytest -k ' \
|
||||
not detaches_process_context and \
|
||||
not standard_stream_file_descriptors and \
|
||||
not test_module_has_attribute and \
|
||||
not test_module_attribute_has_duck_type'
|
||||
runHook postCheck
|
||||
'';
|
||||
patches = [
|
||||
# Should be fixed in the next release
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/python-daemon-safe_hasattr.patch";
|
||||
sha256 = "sha256-p5epAlM/sdel01oZkSI1vahUZYX8r90WCJuvBnfMaus=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/python-daemon/raw/rawhide/f/tests-remove-duplicate-mocking.patch";
|
||||
sha256 = "sha256-5b/dFR3Z8xaPw8AZU95apDZd4ZfmMQhAmavWkVaJog8=";
|
||||
})
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"begin_with_TestCase"
|
||||
"changelog_TestCase"
|
||||
"ChangeLogEntry"
|
||||
"DaemonContext"
|
||||
"file_descriptor"
|
||||
"get_distribution_version_info_TestCase"
|
||||
"InvalidFormatError_TestCase"
|
||||
"make_year_range_TestCase"
|
||||
"ModuleExceptions_TestCase"
|
||||
"test_metaclass_not_called"
|
||||
"test_passes_specified_object"
|
||||
"test_returns_expected"
|
||||
"value_TestCase"
|
||||
"YearRange_TestCase"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"daemon"
|
||||
|
|
@ -56,10 +78,8 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library to implement a well-behaved Unix daemon process";
|
||||
homepage = "https://pagure.io/python-daemon/";
|
||||
license = with licenses; [
|
||||
gpl3Plus
|
||||
asl20
|
||||
];
|
||||
# See "Copying" section in https://pagure.io/python-daemon/blob/main/f/README
|
||||
license = with licenses; [ gpl3Plus asl20 ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -10,6 +11,8 @@ buildPythonPackage rec {
|
|||
version = "3.3.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sendgrid";
|
||||
repo = "python-http-client";
|
||||
|
|
@ -22,6 +25,12 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test is failing as the test is dynamic
|
||||
# https://github.com/sendgrid/python-http-client/issues/153
|
||||
"test__daterange"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"python_http_client"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,30 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "semver";
|
||||
version = "2.13.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-semver";
|
||||
repo = "python-semver";
|
||||
rev = version;
|
||||
sha256 = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";
|
||||
hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Confuses source vs dist imports in pytest
|
||||
preCheck = "rm -r dist";
|
||||
postPatch = ''
|
||||
sed -i "/--cov/d" setup.cfg
|
||||
sed -i "/--no-cov-on-fail/d" setup.cfg
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "semver" ];
|
||||
preCheck = ''
|
||||
# Confuses source vs dist imports in pytest
|
||||
rm -r dist
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Don't test the documentation
|
||||
"docs/*.rst"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"semver"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python package to work with Semantic Versioning (http://semver.org/)";
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.27.5";
|
||||
version = "2.27.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-pn3BqFEjErjLifO6lfmg5p7zQ2rnfJvU8yjNiPF63aI=";
|
||||
sha256 = "sha256-Xg3Ggem/rbXB0X9j0p9tE9Ke8ol9MMuceShbNKFlX9c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.168.0";
|
||||
version = "0.169.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256:0bd5xja547gwjh7zn26l52mssp6l9djd0lfc581zj30yx07aimi5";
|
||||
sha256 = "sha256-QyY0Tb6FalPkWvVGegY6VBqX0pBP15GQgIKLNLPUMYk=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloud-nuke";
|
||||
version = "0.7.1";
|
||||
version = "0.7.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-gW7uunW7gE/5umBQNjx+k2FIAryKka7yLMqnd6ewv6I=";
|
||||
sha256 = "sha256-rAyS9S7kZzc9BBciI3aK3PyMmjP2LRQz9H6mMLQt34I=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-GDXkrrE0KgFJHXCDZH83/nQAexKhmGed/QGZ1aSXnpg=";
|
||||
vendorSha256 = "sha256-ZKv68j/4X48c6ipf4Ei4UnVPn7435wI2igQ9UjM2yOM=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "conftest";
|
||||
version = "0.28.3";
|
||||
version = "0.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-policy-agent";
|
||||
repo = "conftest";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qUbrd80As5BrP67bk8aXWAq85UKL1de5sJlPQtBuxn4=";
|
||||
sha256 = "sha256-8/eZz5ejw5bahCYwz825HI+oZ6D1odeTpMIJh0TcGMY=";
|
||||
};
|
||||
vendorSha256 = "sha256-cEa2IB65CWsWXZnVRZmOOvUyOhybHBssQGt/pP7YPcg=";
|
||||
vendorSha256 = "sha256-rYWo0t6iUI6DVsjHJg2fUv2tv3jovndi12prKzLaMlI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bump";
|
||||
version = "0.2.2";
|
||||
version = "0.2.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mroth";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0092jn7nxnr64fyb2yy9amrd8gl7q9p70a2yq9jrgr1pyrlrazbq";
|
||||
sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "0w5sqg1ii4vp7iijs6ffbskkj2xqggbr40j6wxrjrbjr1qisl8r1";
|
||||
vendorSha256 = "sha256-2x5rQGEp6ARP2nggE+tvXDRY7AkKCEUXTLEPWDJMCnI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "md-tangle";
|
||||
version = "1.3.1";
|
||||
|
||||
# By some strange reason, fetchPypi fails miserably
|
||||
src = fetchFromGitHub {
|
||||
owner = "joakimmj";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cUME2AHK/Fva+1TSTE6hNu0SE/V1FOwcSxWF0+iZhS4=";
|
||||
};
|
||||
|
||||
# Pure Python application, uses only standard modules and comes without
|
||||
# testing suite
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib;{
|
||||
homepage = "https://github.com/joakimmj/md-tangle/";
|
||||
description = "Generates (\"tangles\") source code from Markdown documents";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.25.0";
|
||||
version = "0.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iOSH7eFLsp31mW5ZsTUcJVPE1OBEXPLsoVYroYjwXtk=";
|
||||
sha256 = "sha256-dFmXROqh1HYPthzmOE07oyZglaQyx7JqxqYDlLpysrM=";
|
||||
};
|
||||
vendorSha256 = "sha256-s6urF9uZ9o8kkKfbRk22JuIv+f3ZlVAFR9c1vylhhoY=";
|
||||
vendorSha256 = "sha256-5g/s8WDzxobORFY12YdDQ6rDmr9gQzViv1FFrVwrVIE=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -17,10 +17,7 @@
|
|||
, udev
|
||||
# Darwin dependencies
|
||||
, libicns
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, OpenAL
|
||||
, OpenGL
|
||||
, darwin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -54,12 +51,13 @@ stdenv.mkDerivation rec {
|
|||
libpulseaudio
|
||||
openal
|
||||
udev
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||
Carbon
|
||||
Cocoa
|
||||
OpenAL
|
||||
OpenGL
|
||||
];
|
||||
]);
|
||||
|
||||
patches = [
|
||||
# Includes cmath header
|
||||
|
|
@ -151,6 +149,7 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
# TODO: select between Qt, GTK2 and GTK3
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2021-12-27T07-23-18Z";
|
||||
version = "2022-01-08T03-11-54Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-Gkn3sl6oPozOy0FMIJ1w3EeiJocI5cGBiXRlG94K4Wg=";
|
||||
sha256 = "sha256-aOFG3/BnDJOjPiVZL1jKwYUzPX6mI9FkRDZIzTAnT+8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gwxmn/339n/avhclRj2BNLl8NTmAYBK+6R7tl4oxLcI=";
|
||||
vendorSha256 = "sha256-sQoD+Kdw3epjzDmqCfw6rXC0dQCeaEpvfLqZpxKcViw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2021-12-20T23-43-34Z";
|
||||
version = "2022-01-07T06-01-38Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-9/8h7KlvGRyxFiGLd5YAOjvzGsrkDUJDei6WQtrgY2s=";
|
||||
sha256 = "sha256-jBCYEAwiPWu6n4LtzQ05MumgsQkflbOjJbtGKfAWS04=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-vNTCw2VsXTQto8T4eSPYwoSUbwD3FQ1oj51iLHnSCC0=";
|
||||
vendorSha256 = "sha256-EAAVfelrZqxVYMyEp2wvVYhBYwiGGl9j/PYJJTVFk20=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
source 'https://rubygems.org'
|
||||
gem 'nokogiri', '~> 1.11.7'
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
docbookrx (1.0.0.dev)
|
||||
nokogiri (~> 1.11.7)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
diff-lcs (1.4.4)
|
||||
nokogiri (1.11.7-x86_64-linux)
|
||||
racc (~> 1.4)
|
||||
racc (1.6.0)
|
||||
rake (13.0.6)
|
||||
rspec (3.9.0)
|
||||
rspec-core (~> 3.9.0)
|
||||
rspec-expectations (~> 3.9.0)
|
||||
rspec-mocks (~> 3.9.0)
|
||||
rspec-core (3.9.3)
|
||||
rspec-support (~> 3.9.3)
|
||||
rspec-expectations (3.9.4)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.9.0)
|
||||
rspec-mocks (3.9.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.9.0)
|
||||
rspec-support (3.9.4)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
docbookrx!
|
||||
rake (~> 13.0.0)
|
||||
rspec (~> 3.9.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.2.24
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, ruby
|
||||
, bundlerEnv
|
||||
}:
|
||||
|
||||
let
|
||||
env = bundlerEnv {
|
||||
name = "docbookrx-env";
|
||||
gemdir = ./.;
|
||||
|
||||
inherit ruby;
|
||||
|
||||
gemfile = ./Gemfile;
|
||||
lockfile = ./Gemfile.lock;
|
||||
gemset = ./gemset.nix;
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
||||
pname = "docbookrx";
|
||||
version = "unstable-2018-05-18";
|
||||
|
||||
buildInputs = [ env.wrappedRuby ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asciidoctor";
|
||||
repo = "docbookrx";
|
||||
rev = "83d1d1235e3bb44506123eda337780a912581cd0";
|
||||
sha256 = "sha256-OdPRh7ZIhgM7hs5qPiuxLEUuMEtaXcgZ83M6i6CV6AY=";
|
||||
};
|
||||
|
||||
# TODO: I don't know ruby packaging but this does the trick for now
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp -a bin/docbookrx $out/bin
|
||||
cp -a lib $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby";
|
||||
homepage = "https://asciidoctor.org/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
{
|
||||
diff-lcs = {
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m925b8xc6kbpnif9dldna24q1szg4mk0fvszrki837pfn46afmz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.4.4";
|
||||
};
|
||||
docbookrx = {
|
||||
dependencies = ["nokogiri"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
path = ./.;
|
||||
type = "path";
|
||||
};
|
||||
version = "1.0.0.dev";
|
||||
};
|
||||
nokogiri = {
|
||||
dependencies = ["racc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "4976a9c9e796527d51dc6c311b9bd93a0233f6a7962a0f569aa5c782461836ef";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.11.7";
|
||||
};
|
||||
racc = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.6.0";
|
||||
};
|
||||
rake = {
|
||||
groups = ["development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "13.0.6";
|
||||
};
|
||||
rspec = {
|
||||
dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
|
||||
groups = ["development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1hzsig4pi9ybr0xl5540m1swiyxa74c8h09225y5sdh2rjkkg84h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.0";
|
||||
};
|
||||
rspec-core = {
|
||||
dependencies = ["rspec-support"];
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0b8891149l4rdlaz58k1dprc09rhpvq98bblk4qpd3dvcvqklkvh";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.3";
|
||||
};
|
||||
rspec-expectations = {
|
||||
dependencies = ["diff-lcs" "rspec-support"];
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gjqa3h4r8jna8dh22al4f6ks4x6l4knshx2b8jygkd1gk68n92q";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.4";
|
||||
};
|
||||
rspec-mocks = {
|
||||
dependencies = ["diff-lcs" "rspec-support"];
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "19vmdqym1v2g1zbdnq37zwmyj87y9yc9ijwc8js55igvbb9hx0mr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.1";
|
||||
};
|
||||
rspec-support = {
|
||||
groups = ["default" "development"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ig6wk1ln6wy0d6fjlbfwxibps1nidc6111fcnm0jfa1z5nkqczl";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.9.4";
|
||||
};
|
||||
}
|
||||
|
|
@ -217,6 +217,7 @@ mapAliases ({
|
|||
dmtx = dmtx-utils; # added 2018-04-25
|
||||
dnnl = oneDNN; # added 2020-04-22
|
||||
docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
|
||||
docbookrx = throw "docbookrx has been removed since it was unmaintained"; # added 2021-01-12
|
||||
docbook_xml_xslt = docbook_xsl; # added 2018-04-25
|
||||
dolphinEmu = dolphin-emu; # added 2021-11-10
|
||||
dolphinEmuMaster = dolphin-emu-beta; # added 2021-11-10
|
||||
|
|
|
|||
|
|
@ -4715,8 +4715,6 @@ with pkgs;
|
|||
|
||||
docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { };
|
||||
|
||||
docbookrx = callPackage ../tools/typesetting/docbookrx { };
|
||||
|
||||
docear = callPackage ../applications/office/docear { };
|
||||
|
||||
dockbarx = callPackage ../applications/misc/dockbarx { };
|
||||
|
|
@ -5606,6 +5604,8 @@ with pkgs;
|
|||
|
||||
gfbgraph = callPackage ../development/libraries/gfbgraph { };
|
||||
|
||||
gfold = callPackage ../applications/version-management/git-and-tools/gfold { };
|
||||
|
||||
ggobi = callPackage ../tools/graphics/ggobi { };
|
||||
|
||||
gh = callPackage ../applications/version-management/git-and-tools/gh { };
|
||||
|
|
@ -14682,6 +14682,19 @@ with pkgs;
|
|||
|
||||
eweb = callPackage ../development/tools/literate-programming/eweb { };
|
||||
|
||||
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
|
||||
|
||||
Literate = callPackage ../development/tools/literate-programming/Literate { };
|
||||
|
||||
md-tangle = callPackage ../development/tools/literate-programming/md-tangle { };
|
||||
|
||||
# NOTE: Override and set useIcon = false to use Awk instead of Icon.
|
||||
noweb = callPackage ../development/tools/literate-programming/noweb { };
|
||||
|
||||
nuweb = callPackage ../development/tools/literate-programming/nuweb {
|
||||
tex = texlive.combined.scheme-medium;
|
||||
};
|
||||
|
||||
eztrace = callPackage ../development/tools/profiling/EZTrace { };
|
||||
|
||||
faas-cli = callPackage ../development/tools/faas-cli { };
|
||||
|
|
@ -14730,8 +14743,6 @@ with pkgs;
|
|||
|
||||
fundoc = callPackage ../development/tools/fundoc { };
|
||||
|
||||
funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
|
||||
|
||||
gede = libsForQt5.callPackage ../development/tools/misc/gede { };
|
||||
|
||||
gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };
|
||||
|
|
@ -15003,8 +15014,6 @@ with pkgs;
|
|||
|
||||
laminar = callPackage ../development/tools/continuous-integration/laminar { };
|
||||
|
||||
Literate = callPackage ../development/tools/literate-programming/Literate {};
|
||||
|
||||
lcov = callPackage ../development/tools/analysis/lcov { };
|
||||
|
||||
leiningen = callPackage ../development/tools/build-managers/leiningen { };
|
||||
|
|
@ -15137,11 +15146,6 @@ with pkgs;
|
|||
gconf = gnome2.GConf;
|
||||
};
|
||||
|
||||
# NOTE: Override and set useIcon = false to use Awk instead of Icon.
|
||||
noweb = callPackage ../development/tools/literate-programming/noweb { };
|
||||
|
||||
nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; };
|
||||
|
||||
nrfutil = callPackage ../development/tools/misc/nrfutil { };
|
||||
|
||||
obelisk = callPackage ../development/tools/ocaml/obelisk { };
|
||||
|
|
@ -18697,7 +18701,9 @@ with pkgs;
|
|||
|
||||
libxmp = callPackage ../development/libraries/libxmp { };
|
||||
|
||||
libxslt = callPackage ../development/libraries/libxslt { };
|
||||
libxslt = callPackage ../development/libraries/libxslt {
|
||||
python = python3;
|
||||
};
|
||||
|
||||
libxsmm = callPackage ../development/libraries/libxsmm { };
|
||||
|
||||
|
|
@ -33958,9 +33964,7 @@ with pkgs;
|
|||
python = python3;
|
||||
};
|
||||
|
||||
higan = callPackage ../misc/emulators/higan {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL;
|
||||
};
|
||||
higan = callPackage ../misc/emulators/higan { };
|
||||
|
||||
bsnes-hd = callPackage ../misc/emulators/bsnes-hd {
|
||||
inherit (gnome2) gtksourceview;
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@ let self = rec {
|
|||
|
||||
a4ksubtitles = callPackage ../applications/video/kodi/addons/a4ksubtitles { };
|
||||
|
||||
arteplussept = callPackage ../applications/video/kodi/addons/arteplussept { };
|
||||
|
||||
controllers = {
|
||||
default = callPackage ../applications/video/kodi/addons/controllers { controller = "default"; };
|
||||
|
||||
|
|
@ -160,4 +162,6 @@ let self = rec {
|
|||
|
||||
websocket = callPackage ../applications/video/kodi/addons/websocket { };
|
||||
|
||||
xbmcswift2 = callPackage ../applications/video/kodi/addons/xbmcswift2 { };
|
||||
|
||||
}; in self
|
||||
|
|
|
|||
|
|
@ -4598,8 +4598,7 @@ in {
|
|||
|
||||
libxslt = (toPythonModule (pkgs.libxslt.override {
|
||||
pythonSupport = true;
|
||||
python3 = python;
|
||||
inherit (self) libxml2;
|
||||
inherit (self) python libxml2;
|
||||
})).py;
|
||||
|
||||
license-expression = callPackage ../development/python-modules/license-expression { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue