colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-10-13 00:02:00 +00:00 committed by GitHub
commit e69f5a133f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
77 changed files with 2329 additions and 557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
maintainers/maintainer-list.nix
View File

@ -896,6 +896,12 @@
githubId = 1296771;
name = "Anders Riutta";
};
arkivm = {
email = "vikram186@gmail.com";
github = "arkivm";
githubId = 1118815;
name = "Vikram Narayanan";
};
armijnhemel = {
email = "armijn@tjaldur.nl";
github = "armijnhemel";
@ -1909,6 +1915,12 @@
email = "me@philscotted.com";
name = "Phil Scott";
};
chekoopa = {
email = "chekoopa@mail.ru";
github = "chekoopa";
githubId = 1689801;
name = "Mikhail Chekan";
};
ChengCat = {
email = "yu@cheng.cat";
github = "ChengCat";

2
maintainers/team-list.nix
View File

@ -137,7 +137,7 @@ with lib.maintainers; {
cleverca22
disassembler
jonringer
maveru
manveru
nrdxp
];
scope = "Input-Output Global employees, which maintain critical software";

7
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
View File

@ -1513,6 +1513,13 @@ Superuser created successfully.
<literal>/etc/xdg/mimeapps.list</literal>.
</para>
</listitem>
<listitem>
<para>
Kopia was upgraded from 0.8.x to 0.9.x. Please read the
<link xlink:href="https://github.com/kopia/kopia/releases/tag/v0.9.0">upstream
release notes</link> for changes and upgrade instructions.
</para>
</listitem>
</itemizedlist>
</section>
</section>

2
nixos/doc/manual/release-notes/rl-2111.section.md
View File

@ -438,3 +438,5 @@ In addition to numerous new and upgraded packages, this release has the followin
directories, thus increasing the purity of the build.
- Three new options, [xdg.mime.addedAssociations](#opt-xdg.mime.addedAssociations), [xdg.mime.defaultApplications](#opt-xdg.mime.defaultApplications), and [xdg.mime.removedAssociations](#opt-xdg.mime.removedAssociations) have been added to the [xdg.mime](#opt-xdg.mime.enable) module to allow the configuration of `/etc/xdg/mimeapps.list`.
- Kopia was upgraded from 0.8.x to 0.9.x. Please read the [upstream release notes](https://github.com/kopia/kopia/releases/tag/v0.9.0) for changes and upgrade instructions.

2
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -439,7 +439,7 @@ in
mkdir -m 0755 -p /etc/ssh
${flip concatMapStrings cfg.hostKeys (k: ''
if ! [ -f "${k.path}" ]; then
if ! [ -s "${k.path}" ]; then
ssh-keygen \
-t "${k.type}" \
${if k ? bits then "-b ${toString k.bits}" else ""} \

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool
, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
, lcms2, openexr, libjxl, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, lcms2, openexr, libjxl, libpng, liblqr1, libraw, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
, ApplicationServices
, Foundation
, testVersion, imagemagick
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ zlib fontconfig freetype ghostscript
liblqr1 libpng libtiff libxml2 libheif djvulibre
liblqr1 libpng libraw libtiff libxml2 libheif djvulibre
]
# libjxl is broken on aarch64 (see meta.broken in libjxl) for now,
# let's disable it for now to unbreak the imagemagick build.

4
pkgs/applications/misc/anytype/default.nix
View File

@ -2,13 +2,13 @@
let
pname = "anytype";
version = "0.19.0";
version = "0.20.2";
name = "Anytype-${version}";
nameExecutable = pname;
src = fetchurl {
url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage";
name = "Anytype-${version}.AppImage";
sha256 = "sha256-sqCq9/QFygFcOUNCCBReD+eEk/8gvhMsuVD3g/ZPAFg=";
sha256 = "sha256-jqRxNd6lx1hnOa4F3m3YOr8ZBnSKQBz0XVC5absf9mM=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
in

7
pkgs/applications/networking/browsers/lagrange/default.nix
View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "lagrange";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "skyjake";
repo = "lagrange";
rev = "v${version}";
sha256 = "sha256-I3U2Jh+PSF+j8Kuv5RejYwiMC1JYBpkYQGsgIFi7LL0=";
sha256 = "sha256-iJ6+tc5nls8E/9/Jp5OS9gfJo8SJ5bN+Im/JzEYEAfI=";
fetchSubmodules = true;
};
@ -61,8 +61,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd2;
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
# macOS SDK 10.13 or later required
# See https://github.com/NixOS/nixpkgs/issues/101229
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

6
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.9.0",
"version": "1.9.2",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@ -57,7 +57,7 @@
"allchange": "^1.0.2",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
"electron": "13",
"electron": "13.5",
"electron-builder": "22.11.4",
"electron-builder-squirrel-windows": "22.11.4",
"electron-devtools-installer": "^3.1.1",
@ -83,7 +83,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "13.4.0",
"electronVersion": "13.5.1",
"files": [
"package.json",
{

68
pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View File

@ -729,6 +729,14 @@
sha1 = "2b9252bd4fdf0393696190cd9550901dd967c777";
};
}
{
name = "_types_node___node_14.17.21.tgz";
path = fetchurl {
name = "_types_node___node_14.17.21.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz";
sha1 = "6359d8cf73481e312a43886fa50afc70ce5592c6";
};
}
{
name = "_types_plist___plist_3.0.2.tgz";
path = fetchurl {
@ -1626,11 +1634,11 @@
};
}
{
name = "core_js___core_js_3.17.3.tgz";
name = "core_js___core_js_3.18.2.tgz";
path = fetchurl {
name = "core_js___core_js_3.17.3.tgz";
url = "https://registry.yarnpkg.com/core-js/-/core-js-3.17.3.tgz";
sha1 = "8e8bd20e91df9951e903cabe91f9af4a0895bc1e";
name = "core_js___core_js_3.18.2.tgz";
url = "https://registry.yarnpkg.com/core-js/-/core-js-3.18.2.tgz";
sha1 = "63a551e8a29f305cd4123754846e65896619ba5b";
};
}
{
@ -2002,11 +2010,11 @@
};
}
{
name = "electron___electron_13.4.0.tgz";
name = "electron___electron_13.5.1.tgz";
path = fetchurl {
name = "electron___electron_13.4.0.tgz";
url = "https://registry.yarnpkg.com/electron/-/electron-13.4.0.tgz";
sha1 = "f9f9e518d8c6bf23bfa8b69580447eea3ca0f880";
name = "electron___electron_13.5.1.tgz";
url = "https://registry.yarnpkg.com/electron/-/electron-13.5.1.tgz";
sha1 = "76c02c39be228532f886a170b472cbd3d93f0d0f";
};
}
{
@ -2154,13 +2162,21 @@
};
}
{
name = "2306b3d4da4eba908b256014b979f1d3d43d2945";
path = fetchurl {
name = "2306b3d4da4eba908b256014b979f1d3d43d2945";
url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2306b3d4da4eba908b256014b979f1d3d43d2945";
sha1 = "e82e07e6163d15ee5243d8df073947540bf0efc9";
};
}
name = "2306b3d4da4eba908b256014b979f1d3d43d2945";
path =
let
repo = fetchgit {
url = "https://github.com/matrix-org/eslint-plugin-matrix-org.git";
rev = "2306b3d4da4eba908b256014b979f1d3d43d2945";
sha256 = "0ywgrls2phviz47kzsjrxijkdbs1ky77471fbq9cnpj0fs3si81c";
};
in
runCommand "2306b3d4da4eba908b256014b979f1d3d43d2945" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} .
'';
}
{
name = "eslint_scope___eslint_scope_5.1.1.tgz";
path = fetchurl {
@ -3506,13 +3522,21 @@
};
}
{
name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8";
path = fetchurl {
name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8";
url = "https://codeload.github.com/matrix-org/matrix-web-i18n/tar.gz/e5c7071e0cdf715de87ef39dc8260e11d7add2f8";
sha1 = "efbc392e3523669d20b812a6dae2f6efb49b888d";
};
}
name = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8";
path =
let
repo = fetchgit {
url = "https://github.com/matrix-org/matrix-web-i18n.git";
rev = "e5c7071e0cdf715de87ef39dc8260e11d7add2f8";
sha256 = "0whjmf23m3204ifgx3spfnlg9pwm956fc16gjxgp9ia0d93xrpn6";
};
in
runCommand "e5c7071e0cdf715de87ef39dc8260e11d7add2f8" { buildInputs = [gnutar]; } ''
# Set u+w because tar-fs can't unpack archives with read-only dirs
# https://github.com/mafintosh/tar-fs/issues/79
tar cf $out --mode u+w -C ${repo} .
'';
}
{
name = "memoizee___memoizee_0.4.15.tgz";
path = fetchurl {

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -19,12 +19,12 @@
let
executableName = "element-desktop";
version = "1.9.0";
version = "1.9.2";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-vsLu41n3oCSyyPLgASs7jZViu6DPkWmMfSO7414VPO4=";
sha256 = "sha256-F1uyyBbs+U7tQzRtn+p923Z/BY8Nwxr/JTMYwsak8W8=";
};
electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron";
in

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.9.0";
version = "1.9.2";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-QMLa1Bgz9feAAR9PKVXAzlRDztJBZnGIG+SsPgwvYRw=";
sha256 = "sha256-Qkn0vyZGvBAeOfTzxydWzjFQJwY39INAhwZNX4xsM7U=";
};
installPhase = ''

4
pkgs/applications/networking/instant-messengers/element/update-element-desktop.sh
View File

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix
#!nix-shell -I nixpkgs=../../../../../ -i bash -p wget yarn2nix nix-prefetch-git
set -euo pipefail
@ -13,5 +13,5 @@ RIOT_WEB_SRC="https://raw.githubusercontent.com/vector-im/element-desktop/$1"
wget "$RIOT_WEB_SRC/package.json" -O element-desktop-package.json
wget "$RIOT_WEB_SRC/yarn.lock" -O element-desktop-yarndeps.lock
yarn2nix --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix
yarn2nix --no-patch --lockfile=element-desktop-yarndeps.lock > element-desktop-yarndeps.nix
rm element-desktop-yarndeps.lock

13
pkgs/applications/office/calligra/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools
{ mkDerivation, lib, fetchpatch, fetchurl, extra-cmake-modules, kdoctools
, boost, qtwebkit, qtx11extras, shared-mime-info
, breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets
, kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n
@ -21,6 +21,17 @@ mkDerivation rec {
sha256 = "0iqi6z6gkck2afgy200dacgcspq7i7887alcj0pklm08hbmsdy5i";
};
patches = [
# Fix fontconfig underlinking: https://github.com/NixOS/nixpkgs/issues/137794
# Can be dropped on next release.
(fetchpatch {
name = "fix-fontconfig-linking.patch";
url = "https://github.com/KDE/calligra/commit/62f510702ef9c34ac50f8d8601a4290ab558464c.patch";
sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma";
excludes = [ "CMakeLists.txt" ];
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [

29
pkgs/applications/science/electronics/gtkwave/default.nix
View File

@ -1,16 +1,29 @@
{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkg-config, bzip2, tcl, tk, wrapGAppsHook, judy, xz }:
{ bzip2
, fetchurl
, glib
, gperf
, gtk3
, judy
, lib
, pkg-config
, stdenv
, tcl
, tk
, wrapGAppsHook
, xz
}:
stdenv.mkDerivation rec {
pname = "gtkwave";
version = "3.3.110";
version = "3.3.111";
src = fetchurl {
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
sha256 = "sha256-Ku25IVa8ot3SWxODeMrOaxBY5X022TnvD3l2kAa3Wao=";
url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz";
sha256 = "0cv222qhgldfniz6zys52zhrynfsp5v0h8ia857lng7v33vw5qdl";
};
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ];
buildInputs = [ bzip2 glib gperf gtk3 judy tcl tk xz ];
configureFlags = [
"--with-tcl=${tcl}/lib"
@ -21,9 +34,9 @@ stdenv.mkDerivation rec {
meta = {
description = "VCD/Waveform viewer for Unix and Win32";
homepage = "http://gtkwave.sourceforge.net";
license = lib.licenses.gpl2Plus;
homepage = "http://gtkwave.sourceforge.net";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ thoughtpolice ];
platforms = lib.platforms.linux;
platforms = lib.platforms.linux;
};
}

8
pkgs/applications/science/logic/yices/default.nix
View File

@ -1,18 +1,18 @@
{ lib, stdenv, fetchFromGitHub, gmp-static, gperf, autoreconfHook, libpoly }:
{ lib, stdenv, fetchFromGitHub, cudd, gmp-static, gperf, autoreconfHook, libpoly }:
stdenv.mkDerivation rec {
pname = "yices";
version = "2.6.1";
version = "2.6.3";
src = fetchFromGitHub {
owner = "SRI-CSL";
repo = "yices2";
rev = "Yices-${version}";
sha256 = "04vf468spsh00jh7gj94cjnq8kjyfwy9l6r4z7l2pm0zgwkqgyhm";
sha256 = "01fi818lbkwilfcf1dz2dpxkcc1kh8ls0sl5aynyx9pwfn2v03zl";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ gmp-static gperf libpoly ];
buildInputs = [ cudd gmp-static gperf libpoly ];
configureFlags =
[ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
"--with-static-gmp-include-dir=${gmp-static.dev}/include"

4
pkgs/applications/version-management/git-repo/default.nix
View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.17";
version = "2.17.1";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-/6BAGZo8GwsmXXGLJ2oTxIbgOCwP5p6Vh4wABSvAGZM=";
sha256 = "sha256-ZVwMfjlKga47oXf6g/P2IAMu6Fcuj8BbRahniTZXmTg=";
};
# Fix 'NameError: name 'ssl' is not defined'

14
pkgs/applications/window-managers/i3/default.nix
View File

@ -1,7 +1,9 @@
{ fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms
, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev
, yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon
, xorgserver, xvfb-run }:
, xorgserver, xvfb-run
, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
}:
stdenv.mkDerivation rec {
pname = "i3";
@ -12,7 +14,15 @@ stdenv.mkDerivation rec {
sha256 = "sha256-im7hd2idzyKWTSC2CTAU7k+gQZNF0/1RXVUS2ZgLsnk=";
};
nativeBuildInputs = [ pkg-config makeWrapper meson ninja installShellFiles ];
nativeBuildInputs = [
pkg-config makeWrapper meson ninja installShellFiles
asciidoc xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
];
mesonFlags = [
"-Ddocs=true"
"-Dmans=true"
];
buildInputs = [
libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon

4
pkgs/data/icons/luna-icons/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "luna-icons";
version = "1.4";
version = "1.6";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "sha256-qYFyZT1mLNHBRrX/NX2pmt9P5n8urEK/msQMctSckzE=";
sha256 = "1iw9wqfs8s3l5k5ngyjmvvxbsxcsya3a6h1xwl6d603swv7h1s02";
};
nativeBuildInputs = [

15
pkgs/development/libraries/irrlicht/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }:
{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm, zlib }:
let
common = import ./common.nix { inherit fetchzip; };
@ -12,22 +12,29 @@ stdenv.mkDerivation rec {
postPatch = ''
sed -ie '/sys\/sysctl.h/d' source/Irrlicht/COSOperator.cpp
'' + lib.optionalString stdenv.isAarch64 ''
substituteInPlace source/Irrlicht/Makefile \
--replace "-DIRRLICHT_EXPORTS=1" "-DIRRLICHT_EXPORTS=1 -DPNG_ARM_NEON_OPT=0"
'';
preConfigure = ''
cd source/Irrlicht
'';
buildPhase = ''
make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm"
preBuild = ''
makeFlagsArray+=(sharedlib NDEBUG=1 LDFLAGS="-lX11 -lGL -lXxf86vm")
'';
enableParallelBuilding = true;
preInstall = ''
sed -i s,/usr/local/lib,$out/lib, Makefile
mkdir -p $out/lib
'';
buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];
buildInputs = [
libGLU libGL libXrandr libX11 libXxf86vm
] ++ lib.optional stdenv.isAarch64 zlib;
meta = {
homepage = "http://irrlicht.sourceforge.net/";

4
pkgs/development/libraries/openfst/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "openfst";
version = "1.7.9";
version = "1.8.1";
src = fetchurl {
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck";
sha256 = "sha256-JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A=";
};
configureFlags = [

4
pkgs/development/libraries/opengrm-ngram/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "opengrm-ngram";
version = "1.3.11";
version = "1.3.13";
src = fetchurl {
url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz";
sha256 = "0wwpcj8qncdr9f2pmi0vhlw277dyxr85ygdi8g57xp2ifysigm05";
sha256 = "sha256-5CXf6OXs7owny3yZQrWYA6yhIyN0dgA2B8TSDEUTF1Q=";
};
nativeBuildInputs = [ autoreconfHook ];

4
pkgs/development/python-modules/ailment/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.10072";
version = "9.0.10159";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sUyR9X/+JedJGsiQQuwgJQB5e1+S1I516P5jDCQRzAw=";
sha256 = "sha256-45wdHlAkuzLqwy3B7bEm2fhHD8iT5xSVmeRGOa2SNnI=";
};
propagatedBuildInputs = [ pyvex ];

4
pkgs/development/python-modules/aiomusiccast/default.nix
View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "aiomusiccast";
version = "0.9.2";
version = "0.10.0";
format = "pyproject";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "vigonotion";
repo = "aiomusiccast";
rev = version;
sha256 = "sha256-xZPNEynj0kbeika15ZDEIRUe519V6Asaw+CEiBu7VL4=";
sha256 = "sha256-UdWZLthpCuKLjASVwi4GTkrHY+K9c1xrNYVLezC/NGM=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/angr/default.nix
View File

@ -43,14 +43,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.10072";
version = "9.0.10159";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-mdGcEeuWXo0Qyi8+mU8RSpUoTbUkVBmduTz3B4TW2zg=";
sha256 = "sha256-j3SbKBoREeB4IJmXVm27K4C1FLcZwqFMFXQwWnMtE0g=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/angrop/default.nix
View File

@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.0.10072";
version = "9.0.10159";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-FTKvGhONDUifwZhoKBXTZQFNbC/vTcHdLIge3j6U8uo=";
sha256 = "sha256-gVYriEt0/DPB0lDK9hGSnipGLCZtSOf27gtF8KwCMDA=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/archinfo/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.10072";
version = "9.0.10159";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Nwt2QD+A67Lbgzg/HSR+yaNWk9+EsUWA5nxm4JTikS8=";
sha256 = "sha256-WkA4vSXzndd7ldNBVagEEodj+2GuYg9OURnMLhRq8W8=";
};
checkInputs = [

4
pkgs/development/python-modules/azure-mgmt-network/default.nix
View File

@ -10,14 +10,14 @@
}:
buildPythonPackage rec {
version = "19.0.0";
version = "19.1.0";
pname = "azure-mgmt-network";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8";
sha256 = "62ef7fe8ba98e56412b434c9c35dc755b3c5e469f2c01bbed2ce0d12973a044b";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-rdbms/default.nix
View File

@ -11,12 +11,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-rdbms";
version = "9.1.0";
version = "10.0.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "f738d9e6db8f6da6bb4e84e59dd0548c8adef948357a447337e78d1035ac960a";
sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-multiapi-storage/default.nix
View File

@ -7,13 +7,13 @@
}:
buildPythonPackage rec {
version = "0.6.2";
version = "0.7.0";
pname = "azure-multiapi-storage";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "74061f99730fa82c54d9b8ab3c7d6e219da3f30912740ecf0456b20cb3555ebc";
sha256 = "cd4f184be8c9ca8aca969f93ed50dc7fe556d28ca11520440fc182cf876abdf9";
};
propagatedBuildInputs = [

12
pkgs/development/python-modules/cachetools/default.nix
View File

@ -1,24 +1,26 @@
{ lib
, buildPythonPackage
, isPy27
, fetchFromGitHub
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "cachetools";
version = "4.2.2";
version = "4.2.3";
disabled = isPy27;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "tkem";
repo = pname;
rev = "v${version}";
sha256 = "sha256-JTm8ht2Ubn34uQLR0yjUjXSdDQggWfYUlS0T628OUoI=";
sha256 = "sha256-9CHXvb+Nn3N2oWHwNbqKguzDO/q+4EnMZ50+E+MWS/A=";
};
checkInputs = [ pytestCheckHook ];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "cachetools" ];

4
pkgs/development/python-modules/claripy/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.10072";
version = "9.0.10159";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bsFfp1ocgHhe0/1wWwgnXDQm37gmWQylZvy6HiyQGSw=";
sha256 = "sha256-0I3ITMCOuYm5fmmnQN+zy9lunvfsLb1qlUzSOnPGwlQ=";
};
# Use upstream z3 implementation

4
pkgs/development/python-modules/cle/default.nix
View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.10072";
version = "9.0.10159";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -35,7 +35,7 @@ buildPythonPackage rec {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uY0Pp+BssnkQvF8fsVlRW2Wj/JmMBSBudDf9AHekBtw=";
sha256 = "sha256-DkddaVmSIQToF5b7uj+96vCSZU0cJdfqIDSwDIFEEyI=";
};
propagatedBuildInputs = [

75
pkgs/development/python-modules/ihatemoney/default.nix
View File

@ -1,4 +1,10 @@
{ buildPythonPackage, lib, fetchFromGitHub, isPy27, nixosTests, fetchpatch, fetchPypi
{ buildPythonPackage
, lib
, fetchFromGitHub
, isPy27
, nixosTests
, fetchpatch
, fetchPypi
, alembic
, aniso8601
, Babel
@ -12,7 +18,6 @@
, flask_mail
, flask_migrate
, flask-restful
, flask_script
, flask_sqlalchemy
, flask_wtf
, debts
@ -25,7 +30,9 @@
, pytz
, six
, sqlalchemy
, sqlalchemy-utils
, sqlalchemy-continuum
, sqlalchemy-i18n
, werkzeug
, wtforms
, psycopg2 # optional, for postgresql support
@ -36,6 +43,7 @@
# ihatemoney is not really a library. It will only ever be imported
# by the interpreter of uwsgi. So overrides for its depencies are fine.
let
# fixed in next release, but patches don't apply
# https://github.com/spiral-project/ihatemoney/issues/567
pinned_wtforms = wtforms.overridePythonAttrs (old: rec {
pname = "WTForms";
@ -45,7 +53,19 @@ let
sha256 = "0q9vkcq6jnnn618h27lx9sas6s9qlg2mv8ja6dn0hy38gwzarnqc";
};
});
pinned_flask_wtf = flask_wtf.override { wtforms = pinned_wtforms; };
# sqlalchemy-continuum requires sqlalchemy < 1.4
pinned_sqlalchemy = sqlalchemy.overridePythonAttrs (
old: rec {
pname = "SQLAlchemy";
version = "1.3.24";
src = fetchPypi {
inherit pname version;
sha256 = "06bmxzssc66cblk1hamskyv5q3xf1nh1py3vi6dka4lkpxy7gfzb";
};
}
);
in
buildPythonPackage rec {
@ -73,6 +93,9 @@ buildPythonPackage rec {
url = "https://github.com/spiral-project/ihatemoney/commit/8d77cf5d5646e1d2d8ded13f0660638f57e98471.patch";
sha256 = "0y855sk3qsbpq7slj876k2ifa1lccc2dccag98pkyaadpz5gbabv";
})
# backported from current master
# remove dependency on flask-script, which removed support on some features ihm used to need
./remove_flask_script.patch
];
postPatch = ''
@ -81,7 +104,6 @@ buildPythonPackage rec {
'';
propagatedBuildInputs = [
alembic
aniso8601
Babel
blinker
@ -92,11 +114,18 @@ buildPythonPackage rec {
flask-babel
flask-cors
flask_mail
flask_migrate
(
flask_migrate.override {
flask_sqlalchemy = flask_sqlalchemy.override {
sqlalchemy = pinned_sqlalchemy;
};
alembic = alembic.override {
sqlalchemy = pinned_sqlalchemy;
};
}
)
flask-restful
flask_script
flask_sqlalchemy
pinned_flask_wtf
(flask_wtf.override { wtforms = pinned_wtforms; })
idna
itsdangerous
jinja2
@ -105,8 +134,29 @@ buildPythonPackage rec {
python-dateutil
pytz
six
sqlalchemy
sqlalchemy-continuum
(
(
sqlalchemy-continuum.override {
sqlalchemy = pinned_sqlalchemy;
sqlalchemy-utils = sqlalchemy-utils.override {
sqlalchemy = pinned_sqlalchemy;
};
sqlalchemy-i18n = sqlalchemy-i18n.override {
sqlalchemy = pinned_sqlalchemy;
sqlalchemy-utils = sqlalchemy-utils.override {
sqlalchemy = pinned_sqlalchemy;
};
};
flask_sqlalchemy = flask_sqlalchemy.override {
sqlalchemy = pinned_sqlalchemy;
};
}
).overridePythonAttrs (
old: {
doCheck = false;
}
)
)
werkzeug
pinned_wtforms
psycopg2
@ -114,7 +164,8 @@ buildPythonPackage rec {
];
checkInputs = [
flask_testing pytestCheckHook
flask_testing
pytestCheckHook
];
pytestFlagsArray = [ "--pyargs ihatemoney.tests.tests" ];
@ -134,5 +185,3 @@ buildPythonPackage rec {
maintainers = [ maintainers.symphorien ];
};
}

284
pkgs/development/python-modules/ihatemoney/remove_flask_script.patch Normal file
View File

@ -0,0 +1,284 @@
commit 4d831ba2316d54f4916fb9d1160ec7a3856b47d4
Author: Glandos <bugs-github@antipoul.fr>
Date: Sun Jun 6 14:30:52 2021 +0200
remove usage of Flask-Script
Use flask.cli instead with compatibility layer for existing commands,
such as "runserver".
cherry-pick from 74e222f1a1cbfc2fac102fefc1115e9d0a6586dc
diff --git a/Makefile b/Makefile
index a681709..90ab1bb 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ update: remove-install-stamp install ## Update the dependencies
.PHONY: serve
serve: install ## Run the ihatemoney server
@echo 'Running ihatemoney on http://localhost:5000'
- $(PYTHON) -m ihatemoney.manage runserver
+ $(PYTHON) -m ihatemoney.manage run
.PHONY: test
test: install-dev ## Run the tests
diff --git a/docs/installation.rst b/docs/installation.rst
index 4994499..4df70a2 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -59,7 +59,7 @@ Test it
Once installed, you can start a test server::
- ihatemoney runserver
+ ihatemoney run
And point your browser at `http://localhost:5000 <http://localhost:5000>`_.
diff --git a/ihatemoney/manage.py b/ihatemoney/manage.py
index a192844..805a07f 100755
--- a/ihatemoney/manage.py
+++ b/ihatemoney/manage.py
@@ -5,8 +5,8 @@ import os
import random
import sys
-from flask_migrate import Migrate, MigrateCommand
-from flask_script import Command, Manager, Option
+import click
+from flask.cli import FlaskGroup
from werkzeug.security import generate_password_hash
from ihatemoney.models import Project, db
@@ -14,31 +14,48 @@ from ihatemoney.run import create_app
from ihatemoney.utils import create_jinja_env
-class GeneratePasswordHash(Command):
+@click.group(cls=FlaskGroup, create_app=create_app)
+def cli():
+ """IHateMoney Management script"""
- """Get password from user and hash it without printing it in clear text."""
- def run(self):
- password = getpass.getpass(prompt="Password: ")
- print(generate_password_hash(password))
-
-
-class GenerateConfig(Command):
- def get_options(self):
- return [
- Option(
- "config_file",
- choices=[
- "ihatemoney.cfg",
- "apache-vhost.conf",
- "gunicorn.conf.py",
- "supervisord.conf",
- "nginx.conf",
- ],
- )
+@cli.command(
+ context_settings={"ignore_unknown_options": True, "allow_extra_args": True}
+)
+@click.pass_context
+def runserver(ctx):
+ """Deprecated, use the "run" command instead"""
+ click.secho(
+ '"runserver" is deprecated, please use the standard "run" flask command',
+ fg="red",
+ )
+ run = cli.get_command(ctx, "run")
+ ctx.forward(run)
+
+
+@click.command(name="generate_password_hash")
+def password_hash():
+ """Get password from user and hash it without printing it in clear text."""
+ password = getpass.getpass(prompt="Password: ")
+ print(generate_password_hash(password))
+
+
+@click.command()
+@click.argument(
+ "config_file",
+ type=click.Choice(
+ [
+ "ihatemoney.cfg",
+ "apache-vhost.conf",
+ "gunicorn.conf.py",
+ "supervisord.conf",
+ "nginx.conf",
]
+ ),
+)
+def generate_config(config_file):
+ """Generate front-end server configuration"""
- @staticmethod
def gen_secret_key():
return "".join(
[
@@ -49,59 +66,33 @@ class GenerateConfig(Command):
]
)
- def run(self, config_file):
- env = create_jinja_env("conf-templates", strict_rendering=True)
- template = env.get_template("%s.j2" % config_file)
+ env = create_jinja_env("conf-templates", strict_rendering=True)
+ template = env.get_template(f"{config_file}.j2")
- bin_path = os.path.dirname(sys.executable)
- pkg_path = os.path.abspath(os.path.dirname(__file__))
+ bin_path = os.path.dirname(sys.executable)
+ pkg_path = os.path.abspath(os.path.dirname(__file__))
- print(
- template.render(
- pkg_path=pkg_path,
- bin_path=bin_path,
- sys_prefix=sys.prefix,
- secret_key=self.gen_secret_key(),
- )
+ print(
+ template.render(
+ pkg_path=pkg_path,
+ bin_path=bin_path,
+ sys_prefix=sys.prefix,
+ secret_key=gen_secret_key(),
)
-
-
-class DeleteProject(Command):
- def run(self, project_name):
- demo_project = Project.query.get(project_name)
- db.session.delete(demo_project)
+ )
+
+
+@cli.command()
+@click.argument("project_name")
+def delete_project(project_name):
+ """Delete a project"""
+ project = Project.query.get(project_name)
+ if project is None:
+ click.secho(f'Project "{project_name}" not found', fg="red")
+ else:
+ db.session.delete(project)
db.session.commit()
-def main():
- QUIET_COMMANDS = ("generate_password_hash", "generate-config")
-
- exception = None
- backup_stderr = sys.stderr
- # Hack to divert stderr for commands generating content to stdout
- # to avoid confusing the user
- if len(sys.argv) > 1 and sys.argv[1] in QUIET_COMMANDS:
- sys.stderr = open(os.devnull, "w")
-
- try:
- app = create_app()
- Migrate(app, db)
- except Exception as e:
- exception = e
-
- # Restore stderr
- sys.stderr = backup_stderr
-
- if exception:
- raise exception
-
- manager = Manager(app)
- manager.add_command("db", MigrateCommand)
- manager.add_command("generate_password_hash", GeneratePasswordHash)
- manager.add_command("generate-config", GenerateConfig)
- manager.add_command("delete-project", DeleteProject)
- manager.run()
-
-
if __name__ == "__main__":
- main()
+ cli()
diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py
index b27fafc..23f19a6 100644
--- a/ihatemoney/tests/tests.py
+++ b/ihatemoney/tests/tests.py
@@ -15,7 +15,7 @@ from sqlalchemy import orm
from werkzeug.security import check_password_hash, generate_password_hash
from ihatemoney import history, models, utils
-from ihatemoney.manage import DeleteProject, GenerateConfig, GeneratePasswordHash
+from ihatemoney.manage import delete_project, generate_config, password_hash
from ihatemoney.run import create_app, db, load_configuration
from ihatemoney.versioning import LoggingMode
@@ -2157,28 +2157,24 @@ class CommandTestCase(BaseTestCase):
- raise no exception
- produce something non-empty
"""
- cmd = GenerateConfig()
- for config_file in cmd.get_options()[0].kwargs["choices"]:
- with patch("sys.stdout", new=io.StringIO()) as stdout:
- cmd.run(config_file)
- print(stdout.getvalue())
- self.assertNotEqual(len(stdout.getvalue().strip()), 0)
+ runner = self.app.test_cli_runner()
+ for config_file in generate_config.params[0].type.choices:
+ result = runner.invoke(generate_config, config_file)
+ self.assertNotEqual(len(result.output.strip()), 0)
def test_generate_password_hash(self):
- cmd = GeneratePasswordHash()
- with patch("sys.stdout", new=io.StringIO()) as stdout, patch(
- "getpass.getpass", new=lambda prompt: "secret"
- ): # NOQA
- cmd.run()
- print(stdout.getvalue())
- self.assertEqual(len(stdout.getvalue().strip()), 189)
+ runner = self.app.test_cli_runner()
+ with patch("getpass.getpass", new=lambda prompt: "secret"):
+ result = runner.invoke(password_hash)
+ print(result.output.strip())
+ self.assertEqual(len(result.output.strip()), 102)
def test_demo_project_deletion(self):
self.create_project("demo")
self.assertEquals(models.Project.query.get("demo").name, "demo")
- cmd = DeleteProject()
- cmd.run("demo")
+ runner = self.app.test_cli_runner()
+ runner.invoke(delete_project, "demo")
self.assertEqual(len(models.Project.query.all()), 0)
diff --git a/setup.cfg b/setup.cfg
index d493717..48e447c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,6 @@ install_requires =
Flask-Mail==0.9.1
Flask-Migrate==2.5.3
Flask-RESTful==0.3.8
- Flask-Script==2.0.6
Flask-SQLAlchemy==2.4.1
Flask-WTF==0.14.3
WTForms==2.2.1
@@ -51,8 +50,12 @@ dev =
zest.releaser==6.20.1
[options.entry_points]
+flask.commands =
+ generate_password_hash = ihatemoney.manage:password_hash
+ generate-config = ihatemoney.manage:generate_config
+
console_scripts =
- ihatemoney = ihatemoney.manage:main
+ ihatemoney = ihatemoney.manage:cli
paste.app_factory =
main = ihatemoney.run:main

4
pkgs/development/python-modules/immutabledict/default.nix
View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "immutabledict";
version = "2.2.0";
version = "2.2.1";
format = "pyproject";
src = fetchFromGitHub {
owner = "corenting";
repo = "immutabledict";
rev = "v${version}";
sha256 = "sha256-Jf7ad3ImPfEvCBrUZ1NVXMCBqwLmd0hwpKfe9rVsehc=";
sha256 = "sha256-z04xxoCw0eBtkt++y/1yUsAPaLlAGUtWBdRBM74ul1c=";
};
nativeBuildInputs = [

11
pkgs/development/python-modules/lsassy/default.nix
View File

@ -4,28 +4,33 @@
, impacket
, netaddr
, pypykatz
, rich
}:
buildPythonPackage rec {
pname = "lsassy";
version = "2.1.5";
version = "3.0.0";
src = fetchFromGitHub {
owner = "Hackndo";
repo = pname;
rev = "v${version}";
sha256 = "15w12asy797dxsz57avbxy6dbi7va9p5jx6i3gm9df9mbj0j3lcc";
sha256 = "sha256-75gs08QGjN5iUT4HQZZTSKi3vzNNKQvZR2JTObYNb7w=";
};
propagatedBuildInputs = [
impacket
netaddr
pypykatz
rich
];
# Tests require an active domain controller
doCheck = false;
pythonImportsCheck = [ "lsassy" ];
pythonImportsCheck = [
"lsassy"
];
meta = with lib; {
description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)";

4
pkgs/development/python-modules/millheater/default.nix
View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "millheater";
version = "0.6.1";
version = "0.6.2";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pymill";
rev = version;
sha256 = "sha256-cDj6lrGPeSWwuvVd00z12+EWaqDZOHpoRZSloalhni8=";
sha256 = "sha256-CG0hQN4m8EE+j5yUqODJX8/DLTVWS9tSPADSDHl6K9o=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyhaversion/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pyhaversion";
version = "21.10.1";
version = "21.10.0";
# Only 3.8.0 and beyond are supported
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-7J7zzJlevNQb7TpFYuGvsk3EWBgwhmV32xPNSLA/LS4=";
sha256 = "sha256-EvVkewFgkfYL6BjmJ/IWeuCyR+0R0ZxI35i9sxKcqxo=";
};
propagatedBuildInputs = [

52
pkgs/development/python-modules/pytautulli/default.nix Normal file
View File

@ -0,0 +1,52 @@
{ lib
, aiohttp
, aresponses
, async-timeout
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pytautulli";
version = "21.10.0";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "1gi1jalwzf1aykvdmdbvr7hvfch9wbbjra87f1vzdmkb5iiirw01";
};
postPatch = ''
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
# are not in their focus
substituteInPlace setup.py \
--replace 'version="main",' 'version="${version}",'
'';
propagatedBuildInputs = [
aiohttp
async-timeout
];
checkInputs = [
aresponses
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "pytautulli" ];
meta = with lib; {
description = "Python module to get information from Tautulli";
homepage = "https://github.com/ludeeus/pytautulli";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/development/python-modules/python-telegram-bot/default.nix
View File

@ -36,13 +36,15 @@ buildPythonPackage rec {
rm -r telegram/vendor
substituteInPlace requirements.txt \
--replace 'APScheduler==3.6.3' 'APScheduler'
--replace "APScheduler==3.6.3" "APScheduler" \
--replace "cachetools==4.2.2" "cachetools"
'';
setupPyGlobalFlags = "--with-upstream-urllib3";
# tests not included with release
doCheck = false;
pythonImportsCheck = [ "telegram" ];
meta = with lib; {

4
pkgs/development/python-modules/pytradfri/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pytradfri";
version = "7.0.6";
version = "7.0.7";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = "pytradfri";
rev = version;
sha256 = "0ckh2waz3xpz51pmigg1q336igqvvkl2pzncszvblkwv38a0rj3a";
sha256 = "sha256-gUaDPm1hq4SZm9beSbfdX0qGEGWGiq13UjchdN1+Kfc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyvex/default.nix
View File

@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.10072";
version = "9.0.10159";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-F6NUvcGYshPbfcfhkfbnzIxkXmfpAc/kfHFk5fuaICA=";
sha256 = "sha256-9I9gAPbazuPdZDyoXpjw0IrTu+97dwznoOnyBzkNNCw=";
};
postPatch = lib.optionalString stdenv.isDarwin ''

55
pkgs/development/python-modules/qualysclient/default.nix Normal file
View File

@ -0,0 +1,55 @@
{ lib
, buildPythonPackage
, certifi
, charset-normalizer
, fetchFromGitHub
, idna
, lxml
, pytest-mock
, pytestCheckHook
, pythonOlder
, requests
, responses
, urllib3
}:
buildPythonPackage rec {
pname = "qualysclient";
version = "0.0.4.8.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "woodtechie1428";
repo = pname;
rev = "v${version}";
sha256 = "1fdcmspjm1cy53x9gm7frfq175saskcwn565zqprgxzfcigip1n3";
};
propagatedBuildInputs = [
certifi
charset-normalizer
idna
lxml
requests
urllib3
];
checkInputs = [
pytest-mock
pytestCheckHook
responses
];
pythonImportsCheck = [
"qualysclient"
];
meta = with lib; {
description = "Python SDK for interacting with the Qualys API";
homepage = "https://qualysclient.readthedocs.io/";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

2
pkgs/development/python-modules/sqlalchemy-continuum/default.nix
View File

@ -41,5 +41,7 @@ buildPythonPackage rec {
homepage = "https://github.com/kvesteri/sqlalchemy-continuum/";
description = "Versioning and auditing extension for SQLAlchemy";
license = licenses.bsd3;
# https://github.com/kvesteri/sqlalchemy-continuum/issues/255
broken = lib.versionAtLeast sqlalchemy.version "1.4";
};
}

4
pkgs/development/python-modules/systembridge/default.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "systembridge";
version = "2.1.3";
version = "2.2.0";
src = fetchFromGitHub {
owner = "timmo001";
repo = "system-bridge-connector-py";
rev = "v${version}";
sha256 = "1p0w1phmlifkag7inx8395g8li13r4b7dvgkpj6fysdi42glvvxp";
sha256 = "sha256-VR5juaZdZaEo7S0XXJkspcKmH1alitNIWmI0g/dFBbM=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/types-decorator/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-decorator";
version = "0.1.7";
version = "5.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "0pmcc8xpsmij4174ky81vp811yxgic2lj1dfj2fa0ii87nlcfwhp";
sha256 = "sha256-mavQDGFOVOde4I2IeZiGrMKRjMiJBeymR0upF7Mncps=";
};
# Modules doesn't have tests

4
pkgs/development/python-modules/types-futures/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "types-futures";
version = "3.3.0";
version = "3.3.1";
src = fetchPypi {
inherit pname version;
sha256 = "1p00wb93af01b6fw9wxk9qm4kbhqwb48nszmm16slsrc1nx4px25";
sha256 = "bbdad92cec642693bac10fbbecf834776009db7782d91dc293bdd123be73186d";
};
meta = with lib; {

4
pkgs/development/python-modules/types-protobuf/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "types-protobuf";
version = "3.17.4";
version = "3.17.5";
src = fetchPypi {
inherit pname version;
sha256 = "0r42kzspqna2b2jiz9bjzagrd4gbh0sd6jp4v7i9nv09y0ifrkrn";
sha256 = "f719a3f436a09d4a13411c9df1209e61b788dca64c6478fcd68e0ae5c5671283";
};
propagatedBuildInputs = [ types-futures ];

4
pkgs/development/python-modules/types-pytz/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-pytz";
version = "2021.1.2";
version = "2021.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "448828a06f2aaa840e57364d866c661645a045e532f817e4f10c8c3ab2b66651";
sha256 = "sha256-hqYZZ4NNzuqvmLaQLtg1fv3SYruK/K9LyMzs90hZJ3g=";
};
# Modules doesn't have tests

4
pkgs/development/python-modules/types-requests/default.nix
View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "types-requests";
version = "2.25.9";
version = "2.25.10";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Tsi3Hac+U0Stub7nJadOyFmOcob5vLF1ANYn8ln+T7k=";
sha256 = "sha256-PhIZiBaM/8+mHv+vSPkOvF7gI/bMUNBMAUTt16ImW2U=";
};
# Modules doesn't have tests

4
pkgs/development/python-modules/vertica-python/default.nix
View File

@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "vertica-python";
version = "1.0.1";
version = "1.0.2";
src = fetchPypi {
inherit pname version;
sha256 = "94cff37e03f89fc4c5e4b2d4c913c7d5d7450f5a205d14f709b39e0a4202be95";
sha256 = "ce0abfc5909d06031dc612ec321d7f75df50bcb47a31e14e882a299cea2ea7a3";
};
propagatedBuildInputs = [ future python-dateutil six ];

4
pkgs/development/python-modules/zeroconf/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "zeroconf";
version = "0.36.7";
version = "0.36.8";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "jstasiak";
repo = "python-zeroconf";
rev = version;
sha256 = "sha256-jGbYd56JCXYUE4N2He5Ds8vVcgfny1kUYbd1rL7upcM=";
sha256 = "sha256-lsvrttfyUtQneUkQlWFpmQ99BSJp/YiVYUKY7AWh0rs=";
};
propagatedBuildInputs = [

29
pkgs/development/tools/rust/devserver/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ lib
, fetchCrate
, rustPlatform
, openssl
, pkg-config
}:
rustPlatform.buildRustPackage rec {
pname = "devserver";
version = "0.4.0";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-UcrLzsALwl0zqNRMS1kTTXsR6wN8XDd5Iq+yrudh6M4=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
cargoSha256 = "sha256-XlrQ6CvjeWnzvfaeNbe8FtMXMVSQNLxDVIEjyHm57Js=";
meta = with lib; {
description = "An extremely tiny tool to serve a static folder locally";
homepage = "https://github.com/kettle11/devserver";
license = licenses.zlib;
maintainers = with maintainers; [ nickhu ];
};
}

8
pkgs/misc/drivers/xboxdrv/default.nix
View File

@ -10,12 +10,9 @@
, dbus-glib
}:
let
version = "0.8.8";
in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "xboxdrv";
inherit version;
version = "0.8.8";
src = fetchFromGitHub {
owner = "xboxdrv";
@ -36,5 +33,4 @@ stdenv.mkDerivation {
maintainers = [ ];
platforms = platforms.linux;
};
}

89
pkgs/misc/emulators/zesarux/default.nix Normal file
View File

@ -0,0 +1,89 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, SDL2
, aalib
, alsa-lib
, libXext
, libXxf86vm
, libcaca
, libpulseaudio
, libsndfile
, ncurses
, openssl
, which
}:
stdenv.mkDerivation rec {
pname = "zesarux";
version = "10.0";
src = fetchFromGitHub {
owner = "chernandezba";
repo = pname;
rev = version;
hash = "sha256-cxV2dAzGnIzJiCRdq8vN/Cl4AQeJqjmiCAahijIJQ9k=";
};
nativeBuildInputs = [
which
];
buildInputs = [
SDL2
aalib
alsa-lib
libXxf86vm
libXext
libcaca
libpulseaudio
libsndfile
ncurses
openssl
];
patches = [
# Patch the shell scripts; remove it when the next version arrives
(fetchpatch {
name = "000-fix-shebangs.patch";
url = "https://github.com/chernandezba/zesarux/commit/4493439b38f565c5be7c36239ecaf0cf80045627.diff";
sha256 = "sha256-f+21naPcPXdcVvqU8ymlGfl1WkYGOeOBe9B/WFUauTI=";
})
];
postPatch = ''
cd src
patchShebangs ./configure *.sh
'';
configureFlags = [
"--prefix=${placeholder "out"}"
"--c-compiler ${stdenv.cc.targetPrefix}cc"
"--enable-cpustats"
"--enable-memptr"
"--enable-sdl2"
"--enable-ssl"
"--enable-undoc-scfccf"
"--enable-visualmem"
];
installPhase = ''
runHook preInstall
./generate_install_sh.sh
patchShebangs ./install.sh
./install.sh
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/chernandezba/zesarux";
description = " ZX Second-Emulator And Released for UniX";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
# TODO: Darwin support

6
pkgs/os-specific/linux/kernel/perf.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils-unwrapped
, libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl
, zlib
, withGtk ? false, gtk2
@ -54,7 +54,6 @@ stdenv.mkDerivation {
"-Wno-error=cpp"
"-Wno-error=bool-compare"
"-Wno-error=deprecated-declarations"
"-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
"-Wno-error=stringop-truncation"
];
@ -69,8 +68,9 @@ stdenv.mkDerivation {
installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ];
preFixup = ''
# pull in 'objdump' into PATH to make annotations work
wrapProgram $out/bin/perf \
--prefix PATH : "${binutils}/bin"
--prefix PATH : "${binutils-unwrapped}/bin"
'';
meta = {

38
pkgs/os-specific/linux/mceinject/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ lib, stdenv, fetchFromGitHub, bison, flex }:
stdenv.mkDerivation rec {
pname = "mceinject";
version = "unstable-2013-01-19";
src = fetchFromGitHub {
owner = "andikleen";
repo = "mce-inject";
rev = "4cbe46321b4a81365ff3aafafe63967264dbfec5";
sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z";
};
nativeBuildInputs = [ flex bison ];
NIX_CFLAGS_COMPILE = "-Os -g -Wall";
NIX_LDFLAGS = [ "-lpthread" ];
makeFlags = [ "prefix=" ];
enableParallelBuilding = true;
installFlags = [ "destdir=$(out)" "manprefix=/share" ];
meta = with lib; {
description = "A tool to inject machine checks into x86 kernel for testing";
longDescription = ''
mce-inject allows to inject machine check errors on the software level
into a running Linux kernel. This is intended for validation of the
kernel machine check handler.
'';
homepage = "https://github.com/andikleen/mce-inject/";
license = licenses.gpl2;
maintainers = with maintainers; [ arkivm ];
platforms = platforms.linux;
};
}

4
pkgs/servers/home-assistant/component-packages.nix
View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2021.10.2";
version = "2021.10.4";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
@ -859,7 +859,7 @@
"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
"tautulli" = ps: with ps; [ pytautulli ];
"tcp" = ps: with ps; [ ];
"ted5000" = ps: with ps; [ xmltodict ];
"telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ];

10
pkgs/servers/home-assistant/default.nix
View File

@ -114,7 +114,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2021.10.2";
hassVersion = "2021.10.4";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@ -131,7 +131,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
sha256 = "0nds4491v8wy4d8w842asjpjj7xhqghlq0h61i7z6wp8jln7m418";
sha256 = "1cl0h15285x7xba425d9anv882adi6bdqx4i3cicg3gf0nzcc8am";
};
# leave this in, so users don't have to constantly update their downstream patch handling
@ -770,9 +770,6 @@ in with py.pkgs; buildPythonApplication rec {
# wemo/test_sensor.py: KeyError for various power attributes
"--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable"
"--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable"
# tado/test_climate.py: Tries to connect to my.tado.com
"--deselect tests/components/tado/test_climate.py::test_air_con"
"--deselect tests/components/tado/test_climate.py::test_heater"
# helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container'
"--deselect tests/helpers/test_system_info.py::test_container_installationtype"
# tests are located in tests/
@ -787,7 +784,8 @@ in with py.pkgs; buildPythonApplication rec {
"tests/auth/mfa_modules/test_notify.py"
# emulated_hue/test_upnp.py: Tries to establish the public ipv4 address
"tests/components/emulated_hue/test_upnp.py"
# tado/test_climate.py: Tries to connect to my.tado.com
"tests/components/tado/test_climate.py"
];
disabledTests = [

4
pkgs/servers/home-assistant/frontend.nix
View File

@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
version = "20211007.0";
version = "20211007.1";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-GchSCqdVPk8RVe4iNEVvrsIgrV9/CHE5bQwyaT+ErvU=";
sha256 = "sha256-wsDNLwzhpwH5vwdHRWhZGlumjFM8/S+kXProbD+VpE8=";
};
# there is nothing to strip in this package

12
pkgs/servers/http/couchdb/3.nix
View File

@ -1,26 +1,26 @@
{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68
{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_78
, coreutils, bash, makeWrapper, python3 }:
stdenv.mkDerivation rec {
pname = "couchdb";
version = "3.1.1";
version = "3.2.0";
# when updating this, please consider bumping the erlang/OTP version
# in all-packages.nix
src = fetchurl {
url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz";
sha256 = "18wcqxrv2bz88xadkqpqznprrxmcmwr0g6k895xrm8rbp9mpdzlg";
sha256 = "035hy76399yy32rxl536gv7nh8ijihqxhhh5cxn95c3bm97mgslb";
};
buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))];
buildInputs = [ erlang icu openssl spidermonkey_78 (python3.withPackages(ps: with ps; [ requests ]))];
postPatch = ''
substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68"
substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-78' "${spidermonkey_78.dev}/include/mozjs-78"
patchShebangs bin/rebar
'';
dontAddPrefix= "True";
configureFlags = ["--spidermonkey-version=68"];
configureFlags = ["--spidermonkey-version=78"];
buildFlags = ["release"];
installPhase = ''

4
pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix
View File

@ -3,8 +3,8 @@ let
src = fetchFromGitHub {
owner = "matrix-org";
repo = "matrix-appservice-slack";
rev = "1.8.0";
sha256 = "sha256-FA6SMivMnloeZmnUhGx6N+ZLDTZFO3y17xJYclkp5w0=";
rev = "1.9.0";
sha256 = "tx+dul+O7HZTGYW8ZSxoOZZmzm44nz0pYGQYp8xaVCw=";
};
nodePackages = import ./node-composition.nix {

6
pkgs/servers/matrix-synapse/matrix-appservice-slack/generate-dependencies.sh
View File

@ -1,9 +1,9 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
# Download package.json and package-lock.json from the v1.8.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package-lock.json -o package-lock.json
# Download package.json and package-lock.json from the v1.9.0 release
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package.json -o package.json
curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.9.0/package-lock.json -o package-lock.json
node2nix \
--nodejs-12 \

1683
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

34
pkgs/servers/mycorrhiza/default.nix Normal file
View File

@ -0,0 +1,34 @@
{ stdenv, lib, fetchFromGitHub, buildGoModule
, makeWrapper, git
}:
buildGoModule rec {
pname = "mycorrhiza";
version = "1.5.0";
src = fetchFromGitHub {
owner = "bouncepaw";
repo = "mycorrhiza";
rev = "v${version}";
sha256 = "0manay7gfybzk28dp9a8xdfpbhxm1dbnvcyp4mjhh449n8jlp4bq";
};
vendorSha256 = "1br1p8cnyv2xpwnld3ydd87zxbdwl962f6yww8i8xbsm7881bl0d";
subPackages = [ "." ];
nativeBuildInputs = [ makeWrapper ];
postInstall = ''
wrapProgram $out/bin/mycorrhiza \
--prefix PATH : ${lib.makeBinPath [ git ]}
'';
meta = with lib; {
description = "Filesystem and git-based wiki engine written in Go using mycomarkup as its primary markup language";
homepage = "https://github.com/bouncepaw/mycorrhiza";
license = licenses.agpl3Only;
maintainers = with maintainers; [ chekoopa ];
platforms = platforms.linux;
};
}

22
pkgs/tools/admin/damon/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "damon";
version = "unstable-2021-10-06";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "damon";
rev = "542c79aecc44b1d0500f9cb9b2e13f07db1e2f35";
sha256 = "sha256-vg5PISNqk8N2nn7eABm+/7qzePDbKPkvovdZk2sZYsg=";
};
vendorSha256 = "sha256-/ZZxw6qEUJQUz3J0TxUYJECCcX276r74g0N2tV77+8I=";
meta = with lib; {
homepage = "https://github.com/hashicorp/damon";
license = licenses.mpl20;
description = "A terminal UI (TUI) for HashiCorp Nomad";
maintainers = teams.iog.members;
};
}

6
pkgs/tools/backup/kopia/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kopia";
version = "0.8.4";
version = "0.9.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-Or6RL6yT/X3rVIySqt5lWbXbI25f8HNLBpY3cOhMC0g=";
sha256 = "sha256-xfGx9rtpLmotW00pB4822dwBzB2u+QYNSLWtA+JDffU=";
};
vendorSha256 = "sha256-1FK5IIvm2iyzGqj8IPL3/qvxFj0dC37aycQQ5MO0mBI=";
vendorSha256 = "sha256-USWrI2vH0RpGJgxoEfEwqDUwXjxylOOqA9g7GltOdYQ=";
doCheck = false;

9
pkgs/tools/misc/ccze/default.nix
View File

@ -11,9 +11,14 @@ stdenv.mkDerivation rec {
hash = "sha256-LVwmbrq78mZcAEuAqjXTqLE5we83H9mcMPtxQx2Tn/c=";
};
buildInputs = [ autoconf ncurses pcre ];
nativeBuildInputs = [ autoconf ];
preConfigure = "autoheader && autoconf ";
buildInputs = [ ncurses pcre ];
preConfigure = ''
autoheader
autoconf
'';
meta = with lib; {
description = "Fast, modular log colorizer";

4
pkgs/tools/misc/contacts/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
homepage = "http://www.gnufoo.org/contacts/contacts.html";
license = licenses.gpl2;
maintainers = with maintainers; [ jwiegley ];
platforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.darwin;
platforms = platforms.darwin;
hydraPlatforms = platforms.darwin;
};
}

2
pkgs/tools/misc/profile-sync-daemon/default.nix
View File

@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
--replace "sudo " "/run/wrappers/bin/sudo "
'';
preferLocalBuild = true;
meta = with lib; {
description = "Syncs browser profile dirs to RAM";
longDescription = ''

11
pkgs/tools/misc/sdate/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
pname = "sdate";
version = "0.7";
@ -10,13 +11,13 @@ stdenv.mkDerivation rec {
hash = "sha256-jkwe+bSBa0p1Xzfetsdpw0RYw/gSRxnY2jBOzC5HtJ8=";
};
buildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook ];
meta = {
meta = with lib; {
homepage = "https://www.df7cb.de/projects/sdate";
description = "Eternal september version of the date program";
license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ edef ];
platforms = lib.platforms.all;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ edef ];
platforms = platforms.all;
};
}

30
pkgs/tools/misc/txt2man/default.nix
View File

@ -11,19 +11,19 @@ stdenv.mkDerivation rec {
hash = "sha256-Aqi5PNNaaM/tr9A/7vKeafYKYIs/kHbwHzE7+R/9r9s=";
};
preConfigure = ''
makeFlags=prefix="$out"
'';
makeFlags = [
"prefix=${placeholder "out"}"
];
patchPhase = ''
postPatch = ''
for f in bookman src2man txt2man; do
substituteInPlace $f --replace "gawk" "${gawk}/bin/gawk"
substituteInPlace $f --replace "(date" "(${coreutils}/bin/date"
substituteInPlace $f --replace "=cat" "=${coreutils}/bin/cat"
substituteInPlace $f --replace "cat <<" "${coreutils}/bin/cat <<"
substituteInPlace $f --replace "expand" "${coreutils}/bin/expand"
substituteInPlace $f --replace "(uname" "(${coreutils}/bin/uname"
substituteInPlace $f \
--replace "gawk" "${gawk}/bin/gawk" \
--replace "(date" "(${coreutils}/bin/date" \
--replace "=cat" "=${coreutils}/bin/cat" \
--replace "cat <<" "${coreutils}/bin/cat <<" \
--replace "expand" "${coreutils}/bin/expand" \
--replace "(uname" "(${coreutils}/bin/uname"
done
'';
@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
sh -c 'unset PATH; printf hello | ./txt2man'
'';
meta = {
meta = with lib; {
description = "Convert flat ASCII text to man page format";
homepage = "http://mvertes.free.fr/";
license = lib.licenses.gpl2;
platforms = with lib.platforms; linux ++ darwin;
maintainers = with lib.maintainers; [ bjornfor ];
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ bjornfor ];
};
}

12
pkgs/tools/misc/xtitle/default.nix
View File

@ -11,15 +11,17 @@ stdenv.mkDerivation rec {
hash = "sha256-SVfM2vCCacgchXj0c0sPk3VR6DUI4R0ofFnxJSY4oDg=";
};
postPatch = ''
sed -i "s|/usr/local|$out|" Makefile
'';
buildInputs = [ libxcb git xcbutil xcbutilwm ];
prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
meta = {
meta = with lib; {
description = "Outputs X window titles";
homepage = "https://github.com/baskerville/xtitle";
maintainers = [ lib.maintainers.meisternu ];
maintainers = with maintainers; [ meisternu ];
license = "Custom";
platforms = lib.platforms.linux;
platforms = platforms.linux;
};
}

26
pkgs/tools/text/mdbook-graphviz/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, graphviz }:
rustPlatform.buildRustPackage rec {
pname = "mdbook-graphviz";
version = "0.1.2";
src = fetchFromGitHub {
owner = "dylanowen";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wIgWaCjJrrajvUZbJjpx9P4urN2/eVo3+Za2NjTKWvM=";
};
cargoSha256 = "sha256-F8JuEk0ztB7jfcPNjU9vGsr3HLEJ2DmWGWxvdbLuyvQ=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
checkInputs = [ graphviz ];
meta = with lib; {
description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time.";
homepage = "https://github.com/dylanowen/mdbook-graphviz";
license = [ licenses.mpl20 ];
maintainers = with maintainers; [ lovesegfault ];
};
}

25
pkgs/top-level/all-packages.nix
View File

@ -2546,6 +2546,8 @@ with pkgs;
dale = callPackage ../development/compilers/dale { };
damon = callPackage ../tools/admin/damon { };
dante = callPackage ../servers/dante { };
dapr-cli = callPackage ../development/tools/dapr/cli {};
@ -3551,6 +3553,8 @@ with pkgs;
mslink = callPackage ../tools/misc/mslink { };
mceinject = callPackage ../os-specific/linux/mceinject { };
mcelog = callPackage ../os-specific/linux/mcelog {
util-linux = util-linuxMinimal;
};
@ -6825,6 +6829,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
mdbook-katex = callPackage ../tools/text/mdbook-katex {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
@ -12686,6 +12694,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security;
};
devserver = callPackage ../development/tools/rust/devserver { };
maturin = callPackage ../development/tools/rust/maturin {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -20597,6 +20607,8 @@ with pkgs;
mumsi = callPackage ../servers/mumsi { };
mycorrhiza = callPackage ../servers/mycorrhiza { };
myserver = callPackage ../servers/http/myserver { };
nas = callPackage ../servers/nas { };
@ -33031,7 +33043,16 @@ with pkgs;
python = python3;
};
phonetisaurus = callPackage ../development/libraries/phonetisaurus {};
phonetisaurus = callPackage ../development/libraries/phonetisaurus {
# https://github.com/AdolfVonKleist/Phonetisaurus/issues/70
openfst = openfst.overrideAttrs (_: rec {
version = "1.7.9";
src = fetchurl {
url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-${version}.tar.gz";
sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck";
};
});
};
duti = callPackage ../os-specific/darwin/duti {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
@ -33235,6 +33256,8 @@ with pkgs;
xcfun = callPackage ../development/libraries/science/chemistry/xcfun { };
zesarux = callPackage ../misc/emulators/zesarux { };
zthrottle = callPackage ../tools/misc/zthrottle { };
zktree = callPackage ../applications/misc/zktree {};

4
pkgs/top-level/python-packages.nix
View File

@ -7051,6 +7051,8 @@ in {
pytankerkoenig = callPackage ../development/python-modules/pytankerkoenig { };
pytautulli = callPackage ../development/python-modules/pytautulli { };
pyte = callPackage ../development/python-modules/pyte { };
pytenable = callPackage ../development/python-modules/pytenable { };
@ -7794,6 +7796,8 @@ in {
qtpy = callPackage ../development/python-modules/qtpy { };
qualysclient = callPackage ../development/python-modules/qualysclient { };
quamash = callPackage ../development/python-modules/quamash { };
quandl = callPackage ../development/python-modules/quandl { };