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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2022-01-15 12:01:13 +00:00 committed by GitHub
commit 6d8719a23d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 1128 additions and 437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -2854,6 +2854,12 @@
githubId = 706758;
name = "Christian Gerbrandt";
};
derekcollison = {
email = "derek@nats.io";
github = "derekcollison";
githubId = 90097;
name = "Derek Collison";
};
DerGuteMoritz = {
email = "moritz@twoticketsplease.de";
github = "DerGuteMoritz";

8
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -150,6 +150,14 @@
<link linkend="opt-services.prosody-filer.enable">services.prosody-filer</link>.
</para>
</listitem>
<listitem>
<para>
<link xlink:href="https://timetagger.app">timetagger</link>,
an open source time-tracker with an intuitive user experience
and powerful reporting.
<link xlink:href="options.html#opt-services.timetagger.enable">services.timetagger</link>.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-22.05-incompatibilities">

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

@ -46,6 +46,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [prosody-filer](https://github.com/ThomasLeister/prosody-filer), a server for handling XMPP HTTP Upload requests. Available at [services.prosody-filer](#opt-services.prosody-filer.enable).
- [timetagger](https://timetagger.app), an open source time-tracker with an intuitive user experience and powerful reporting. [services.timetagger](options.html#opt-services.timetagger.enable).
## Backward Incompatibilities {#sec-release-22.05-incompatibilities}
- `pkgs.ghc` now refers to `pkgs.targetPackages.haskellPackages.ghc`.

80
nixos/modules/services/web-apps/timetagger.nix Normal file
View File

@ -0,0 +1,80 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkEnableOption mkIf mkOption types literalExpression;
cfg = config.services.timetagger;
in {
options = {
services.timetagger = {
enable = mkOption {
type = types.bool;
default = false;
description = ''
Tag your time, get the insight
<note><para>
This app does not do authentication.
You must setup authentication yourself or run it in an environment where
only allowed users have access.
</para></note>
'';
};
bindAddr = mkOption {
description = "Address to bind to.";
type = types.str;
default = "127.0.0.1";
};
port = mkOption {
description = "Port to bind to.";
type = types.port;
default = 8080;
};
package = mkOption {
description = ''
Use own package for starting timetagger web application.
The ${literalExpression ''pkgs.timetagger''} package only provides a
"run.py" script for the actual package
${literalExpression ''pkgs.python3Packages.timetagger''}.
If you want to provide a "run.py" script for starting timetagger
yourself, you can do so with this option.
If you do so, the 'bindAddr' and 'port' options are ignored.
'';
default = pkgs.timetagger.override { addr = cfg.bindAddr; port = cfg.port; };
defaultText = literalExpression ''
pkgs.timetagger.override {
addr = ${cfg.bindAddr};
port = ${cfg.port};
};
'';
type = types.package;
};
};
};
config = mkIf cfg.enable {
systemd.services.timetagger = {
description = "Timetagger service";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = "timetagger";
Group = "timetagger";
StateDirectory = "timetagger";
ExecStart = "${cfg.package}/bin/timetagger";
Restart = "on-failure";
RestartSec = 1;
};
};
};
}

1
nixos/tests/all-tests.nix
View File

@ -397,7 +397,6 @@ in
prometheus = handleTest ./prometheus.nix {};
prometheus-exporters = handleTest ./prometheus-exporters.nix {};
prosody = handleTest ./xmpp/prosody.nix {};
prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {};
proxy = handleTest ./proxy.nix {};
prowlarr = handleTest ./prowlarr.nix {};
pt2-clone = handleTest ./pt2-clone.nix {};

92
nixos/tests/xmpp/prosody-mysql.nix
View File

@ -1,92 +0,0 @@
import ../make-test-python.nix {
name = "prosody-mysql";
nodes = {
client = { nodes, pkgs, ... }: {
environment.systemPackages = [
(pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; })
];
networking.extraHosts = ''
${nodes.server.config.networking.primaryIPAddress} example.com
${nodes.server.config.networking.primaryIPAddress} conference.example.com
${nodes.server.config.networking.primaryIPAddress} uploads.example.com
'';
};
server = { config, pkgs, ... }: {
nixpkgs.overlays = [
(self: super: {
prosody = super.prosody.override {
withDBI = true;
withExtraLibs = [ pkgs.luaPackages.luadbi-mysql ];
};
})
];
networking.extraHosts = ''
${config.networking.primaryIPAddress} example.com
${config.networking.primaryIPAddress} conference.example.com
${config.networking.primaryIPAddress} uploads.example.com
'';
networking.firewall.enable = false;
services.prosody = {
enable = true;
# TODO: use a self-signed certificate
c2sRequireEncryption = false;
extraConfig = ''
storage = "sql"
sql = {
driver = "MySQL";
database = "prosody";
host = "mysql";
port = 3306;
username = "prosody";
password = "password123";
};
'';
virtualHosts.test = {
domain = "example.com";
enabled = true;
};
muc = [
{
domain = "conference.example.com";
}
];
uploadHttp = {
domain = "uploads.example.com";
};
};
};
mysql = { config, pkgs, ... }: {
networking.firewall.enable = false;
services.mysql = {
enable = true;
initialScript = pkgs.writeText "mysql_init.sql" ''
CREATE DATABASE prosody;
CREATE USER 'prosody'@'server' IDENTIFIED BY 'password123';
GRANT ALL PRIVILEGES ON prosody.* TO 'prosody'@'server';
FLUSH PRIVILEGES;
'';
package = pkgs.mariadb;
};
};
};
testScript = { nodes, ... }: ''
mysql.wait_for_unit("mysql.service")
server.wait_for_unit("prosody.service")
server.succeed('prosodyctl status | grep "Prosody is running"')
# set password to 'nothunter2' (it's asked twice)
server.succeed("yes nothunter2 | prosodyctl adduser cthon98@example.com")
# set password to 'y'
server.succeed("yes | prosodyctl adduser azurediamond@example.com")
# correct password to 'hunter2'
server.succeed("yes hunter2 | prosodyctl passwd azurediamond@example.com")
client.succeed("send-message")
server.succeed("prosodyctl deluser cthon98@example.com")
server.succeed("prosodyctl deluser azurediamond@example.com")
'';
}

38
pkgs/applications/misc/xiphos/0001-Add-dbus-glib-dependency-to-main.patch Normal file
View File

@ -0,0 +1,38 @@
From 0e9e686c902935c0f00afdf9d0d45f9635995988 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 15 Jan 2022 05:00:37 +0100
Subject: [PATCH] Add dbus-glib dependency to main
It is required through the ipc header and the build will fail without it on Nix:
In file included from /build/source/src/main/search_sidebar.cc:48:
/build/source/src/gui/ipc.h:26:10: fatal error: dbus/dbus-glib.h: No such file or directory
26 | #include <dbus/dbus-glib.h>
| ^~~~~~~~~~~~~~~~~~
compilation terminated.
---
src/main/CMakeLists.txt | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 49b86371..bb8e4bb6 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -74,3 +74,14 @@ target_link_libraries(main
PkgConfig::Sword
PkgConfig::Biblesync
)
+
+IF (DBUS)
+ target_include_directories (main
+ PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
+ PkgConfig::DBus
+ )
+ target_link_libraries(main
+ PRIVATE
+ PkgConfig::DBus
+ )
+ENDIF (DBUS)
--
2.34.1

105
pkgs/applications/misc/xiphos/default.nix
View File

@ -1,50 +1,29 @@
{ lib
, stdenv
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, appstream-glib
, at-spi2-core
, biblesync
, brotli
, clucene_core
, cmake
, dbus
, dbus-glib
, desktop-file-utils
, docbook2x
, docbook_xml_dtd_412
, enchant
, gconf
, enchant2
, glib
, gnome-doc-utils
, gtk2
, gtk3
, gtkhtml
, icu
, intltool
, isocodes
, itstool
, libdatrie
, libepoxy
, libglade
, libgsf
, libpsl
, libselinux
, libsepol
, libsysprof-capture
, libthai
, libuuid
, libxkbcommon
, libxslt
, minizip
, pcre
, pkg-config
, python
, scrollkeeper
, sqlite
, sword
, webkitgtk
, wrapGAppsHook
, xorg
, yelp-tools
, zip
}:
@ -60,62 +39,53 @@ stdenv.mkDerivation rec {
hash = "sha256-H5Q+azE2t3fgu77C9DxrkeUCJ7iJz3Cc91Ln4dqLvD8=";
};
patches = [
# GLIB_VERSION_MIN_REQUIRED is not defined.
# https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874
(fetchpatch {
name ="xiphos-glibc.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos&id=bb816f43ba764ffac1287ab1e2a649c2443e3ce8";
sha256 = "he3U7phU2/QCrZidHviupA7YwzudnQ9Jbb8eMZw6/ck=";
extraPrefix = "";
})
# Fix D-Bus build
# https://github.com/crosswire/xiphos/pull/1103
./0001-Add-dbus-glib-dependency-to-main.patch
];
nativeBuildInputs = [
appstream-glib
appstream-glib # for appstream-util
cmake
desktop-file-utils
desktop-file-utils # for desktop-file-validate
docbook2x
docbook_xml_dtd_412
intltool
itstool
libxslt
pkg-config
wrapGAppsHook
yelp-tools
yelp-tools # for yelp-build
zip # for building help epubs
];
buildInputs = [
at-spi2-core
biblesync
brotli
clucene_core
dbus
dbus-glib
docbook2x
docbook_xml_dtd_412
enchant
gconf
enchant2
glib
gnome-doc-utils
gtk2
gtk3
gtkhtml
icu
intltool
isocodes
libdatrie
libepoxy
libglade
libgsf
libpsl
libselinux
libsepol
libsysprof-capture
libthai
libuuid
libxkbcommon
libxslt
minizip
pcre
python
scrollkeeper
sqlite
sword
webkitgtk
zip
]
++ (with xorg; [
libXdmcp
libXtst
]);
];
cmakeFlags = [
"-DDBUS=OFF"
# WebKit-based editor does not build.
"-DGTKHTML=ON"
];
@ -123,22 +93,9 @@ stdenv.mkDerivation rec {
# The build script won't continue without the version saved locally.
echo "${version}" > cmake/source_version.txt
export CLUCENE_HOME=${clucene_core};
export SWORD_HOME=${sword};
'';
patchFlags = [ "-p0" ];
patches = [
# GLIB_VERSION_MIN_REQUIRED is not defined.
# https://github.com/crosswire/xiphos/issues/1083#issuecomment-820304874
(fetchpatch {
name ="xiphos-glibc.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/xiphos-glibc.patch?h=xiphos";
sha256 = "sha256-0WadztJKXW2adqsDP8iSAYVShbdqHoDvP+aVJC0cQB0=";
})
];
meta = with lib; {
description = "A GTK Bible study tool";
longDescription = ''

4
pkgs/applications/networking/irc/ii/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ii";
version = "1.8";
version = "1.9";
src = fetchurl {
url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr";
sha256 = "sha256-hQyzI7WD0mG1G9qZk+5zMzQ1Ko5soeLwK1fBVL9WjBc=";
};
makeFlags = [ "CC:=$(CC)" ];

4
pkgs/applications/science/math/calc/default.nix
View File

@ -3,14 +3,14 @@
stdenv.mkDerivation rec {
pname = "calc";
version = "2.14.0.13";
version = "2.14.0.14";
src = fetchurl {
urls = [
"https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2"
"http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2"
];
sha256 = "sha256-naNBismaWnzLjlUy49Rz9OfkhUcFdbnWxs917ogxTjk=";
sha256 = "sha256-93J4NaED2XEsVxlY6STpwlS9FI8I60NIAZvDT45xxV0=";
};
postPatch = ''

12
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
View File

@ -12,11 +12,6 @@ stdenv.mkDerivation rec {
rev = "master";
sha256 = "sha256-jL8YADvhW0o6I/2Uo5FNARMAnSbvtmFp+zWH1yCVvQk=";
};
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ intltool enchant isocodes autoreconfHook ];
patchFlags = [ "-p0" ];
patches = [
# Enables enchant2 support.
@ -24,7 +19,12 @@ stdenv.mkDerivation rec {
(fetchpatch {
name ="enchant-2.patch";
url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43";
sha256 = "sha256-jkA/GgIiJZmxkbcBGQ26OZ1nuI502BMPwbPhsZkbgbY=";
sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI=";
extraPrefix = "";
})
];
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ intltool enchant isocodes autoreconfHook ];
}

18
pkgs/development/interpreters/love/0.10.nix
View File

@ -1,17 +1,15 @@
{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
{ lib, stdenv, fetchFromGitHub, pkg-config
, SDL2, libGLU, libGL, openal, luajit
, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg
, libtheora, which, autoconf, automake, libtool
}:
let
stdenv.mkDerivation rec {
pname = "love";
version = "0.10.2";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromBitbucket {
owner = "rude";
src = fetchFromGitHub {
owner = "love2d";
repo = "love";
rev = version;
sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
@ -32,7 +30,7 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
meta = {
homepage = "http://love2d.org";
homepage = "https://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = lib.licenses.zlib;
platforms = lib.platforms.linux;

5
pkgs/development/interpreters/love/0.7.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
version = "0.7.2";
src = fetchurl {
url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz";
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
};
@ -48,10 +48,9 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = "http://love2d.org";
homepage = "https://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = lib.licenses.zlib;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
};

5
pkgs/development/interpreters/love/0.8.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "0.8.0";
src = fetchurl {
url = "https://bitbucket.org/rude/love/downloads/${pname}-${version}-linux-src.tar.gz";
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
};
@ -45,10 +45,9 @@ stdenv.mkDerivation rec {
];
meta = {
homepage = "http://love2d.org";
homepage = "https://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = lib.licenses.zlib;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
};

9
pkgs/development/interpreters/love/0.9.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
pname = "love";
version = "0.9.1";
version = "0.9.2";
src = fetchurl {
url = "https://bitbucket.org/rude/love/downloads/love-${version}-linux-src.tar.gz";
sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84";
url = "https://github.com/love2d/love/releases/download/${version}/love-${version}-linux-src.tar.gz";
sha256 = "0wn1npr5gal5b1idh4a5fwc3f5c36lsbjd4r4d699rqlviid15d9";
};
nativeBuildInputs = [ pkg-config ];
@ -26,10 +26,9 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
meta = {
homepage = "http://love2d.org";
homepage = "https://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = lib.licenses.zlib;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.raskin ];
broken = true;

22
pkgs/development/interpreters/love/11.1.nix → pkgs/development/interpreters/love/11.nix
View File

@ -1,20 +1,18 @@
{ lib, stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
{ lib, stdenv, fetchFromGitHub, pkg-config
, SDL2, libGLU, libGL, openal, luajit
, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg
, libtheora, which, autoconf, automake, libtool
}:
let
stdenv.mkDerivation rec {
pname = "love";
version = "11.3";
in
version = "11.4";
stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchFromBitbucket {
owner = "rude";
src = fetchFromGitHub {
owner = "love2d";
repo = "love";
rev = version;
sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7";
sha256 = "0kpdp6v8m8j0r7ppyy067shr0lfgrlh0dwb7ccws76d389vizwhb";
};
nativeBuildInputs = [ pkg-config ];
@ -32,7 +30,7 @@ stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
meta = {
homepage = "http://love2d.org";
homepage = "https://love2d.org";
description = "A Lua-based 2D game engine/scripting language";
license = lib.licenses.zlib;
platforms = lib.platforms.linux;

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

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "libplctag";
version = "2.4.8";
version = "2.4.10";
src = fetchFromGitHub {
owner = "libplctag";
repo = "libplctag";
rev = "v${version}";
sha256 = "sha256-GVYG+ioqGo0k6ClrJu2mijtuBBFc9l6dNexNDNyh5+8=";
sha256 = "sha256-NdkWG7QdsMwx605m4P4LqBJTEqlIQhI3ChOvYwERkis=";
};
nativeBuildInputs = [ cmake ];

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

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "libzim";
version = "7.0.0";
version = "7.1.0";
src = fetchFromGitHub {
owner = "openzim";
repo = pname;
rev = version;
sha256 = "sha256-OQVGopAInAI7KCEVr3BxaKD6np2QcFCaDjgNWjT202U=";
sha256 = "sha256-8mKUYvw/0aqrerNNKk0V7r5LByEaaJLg43R/0pwM4Z8=";
};
nativeBuildInputs = [

37
pkgs/development/python-modules/amqtt/default.nix
View File

@ -2,9 +2,11 @@
, buildPythonPackage
, docopt
, fetchFromGitHub
, fetchpatch
, hypothesis
, passlib
, poetry-core
, pytest-logdog
, pytest-asyncio
, pytestCheckHook
, pythonOlder
@ -15,24 +17,21 @@
buildPythonPackage rec {
pname = "amqtt";
version = "0.10.0";
version = "unstable-2022-01-11";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Yakifo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-27LmNR1KC8w3zRJ7YBlBolQ4Q70ScTPqypMCpU6fO+I=";
rev = "8961b8fff57007a5d9907b98bc555f0519974ce9";
hash = "sha256-3uwz4RSoa6KRC8mlVfeIMLPH6F2kOJjQjjXCrnVX0Jo=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'websockets = "^9.0"' 'websockets = "^10.0"' \
--replace 'PyYAML = "^5.4.0"' 'PyYAML = "*"' \
'';
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
docopt
@ -44,22 +43,30 @@ buildPythonPackage rec {
checkInputs = [
hypothesis
pytest-logdog
pytest-asyncio
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'PyYAML = "^5.4.0"' 'PyYAML = "*"'
'';
disabledTestPaths = [
# Test are not ported from hbmqtt yet
"tests/test_cli.py"
"tests/test_client.py"
];
disabledTests = [
# Requires network access
"test_connect_tcp"
];
preCheck = ''
# Some tests need amqtt
export PATH=$out/bin:$PATH
'';
pythonImportsCheck = [ "amqtt" ];
pythonImportsCheck = [
"amqtt"
];
meta = with lib; {
description = "Python MQTT client and broker implementation";

32
pkgs/development/python-modules/asgineer/default.nix Normal file
View File

@ -0,0 +1,32 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, requests
}:
buildPythonPackage rec {
pname = "asgineer";
version = "0.8.1";
# PyPI tarball doesn't include tests directory
src = fetchFromGitHub {
owner = "almarklein";
repo = pname;
rev = "v${version}";
sha256 = "0hd1i9pc8m7sc8bkn31q4ygkmnl5vklrcziq9zkdiqaqm8clyhcx";
};
checkInputs = [
pytestCheckHook
requests
];
meta = with lib; {
description = "A really thin ASGI web framework";
license = licenses.bsd2;
homepage = "https://asgineer.readthedocs.io";
maintainers = [ maintainers.matthiasbeyer ];
};
}

46
pkgs/development/python-modules/batchgenerators/default.nix
View File

@ -1,12 +1,12 @@
{ lib
, buildPythonPackage
, isPy27
, pythonOlder
, fetchFromGitHub
, pytestCheckHook
, unittest2
, future
, numpy
, pillow
, fetchpatch
, scipy
, scikit-learn
, scikitimage
@ -16,27 +16,53 @@
buildPythonPackage rec {
pname = "batchgenerators";
version = "0.21";
format = "setuptools";
disabled = isPy27;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "MIC-DKFZ";
repo = pname;
rev = "v${version}";
sha256 = "16bk4r0q3m2c9fawpmj4l7kz0x3fyv1spb92grf44gmyricq3jdb";
hash = "sha256-q8mBWcy+PkJcfiKtq8P2bnTw56FE1suVS0zUgUEmc5k=";
};
propagatedBuildInputs = [
future numpy pillow scipy scikit-learn scikitimage threadpoolctl
future
numpy
pillow
scipy
scikit-learn
scikitimage
threadpoolctl
];
checkInputs = [ pytestCheckHook unittest2 ];
checkInputs = [
pytestCheckHook
];
meta = {
patches = [
# Remove deprecated unittest2, https://github.com/MIC-DKFZ/batchgenerators/pull/78
(fetchpatch {
name = "remove-unittest2.patch";
url = "https://github.com/MIC-DKFZ/batchgenerators/commit/87a9437057df8a7550aa3b3eaf840871cc0d5cef.patch";
sha256 = "sha256-vozBK7g2dLxx9din/R2vU28Mm+LoGAO/BmQlt/ShmEo=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace '"unittest2",' ""
'';
pythonImportsCheck = [
"batchgenerators"
];
meta = with lib; {
description = "2D and 3D image data augmentation for deep learning";
homepage = "https://github.com/MIC-DKFZ/batchgenerators";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ bcdarwin ];
license = licenses.asl20;
maintainers = with maintainers; [ bcdarwin ];
};
}

44
pkgs/development/python-modules/bibtexparser/default.nix
View File

@ -1,33 +1,49 @@
{ lib
, buildPythonPackage, fetchFromGitHub
, future, pyparsing
, glibcLocales, nose, unittest2
, buildPythonPackage
, fetchFromGitHub
, future
, pyparsing
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "bibtexparser";
version = "1.1.0";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
# PyPI tarball does not ship tests
src = fetchFromGitHub {
owner = "sciunto-org";
repo = "python-${pname}";
rev = "v${version}";
sha256 = "1yj3hqnmkjh0sjjhmlm4097mmz98kna8rn0dd9g8zaw9g1a35h8c";
hash = "sha256-M9fDI28Yq0uUHPx51wiuRPmRTLkjVqj7ixapbSftnJc=";
};
propagatedBuildInputs = [ future pyparsing ];
propagatedBuildInputs = [
future
pyparsing
];
checkInputs = [ nose unittest2 glibcLocales ];
checkInputs = [
pytestCheckHook
];
checkPhase = ''
LC_ALL="en_US.UTF-8" nosetests
postPatch = ''
# https://github.com/sciunto-org/python-bibtexparser/pull/259
substituteInPlace bibtexparser/tests/test_crossref_resolving.py \
--replace "import unittest2 as unittest" "import unittest"
'';
meta = {
description = "Bibtex parser for python 2.7 and 3.3 and newer";
pythonImportsCheck = [
"bibtexparser"
];
meta = with lib; {
description = "Bibtex parser for Python";
homepage = "https://github.com/sciunto-org/python-bibtexparser";
license = with lib.licenses; [ gpl3 bsd3 ];
maintainers = with lib.maintainers; [ fridh ];
license = with licenses; [ lgpl3Only /* or */ bsd3 ];
maintainers = with maintainers; [ fridh ];
};
}

82
pkgs/development/python-modules/can/default.nix
View File

@ -1,39 +1,75 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, aenum
, wrapt
, typing ? null
, pyserial
, nose
, mock
, hypothesis
, fetchFromGitHub
, future
, pytest
}:
, hypothesis
, parameterized
, msgpack
, pyserial
, pytest-timeout
, pytestCheckHook
, pythonOlder
, typing-extensions
, wrapt
}:
buildPythonPackage rec {
pname = "python-can";
version = "3.3.4";
version = "unstable-2022-01-11";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "2d3c223b7adc4dd46ce258d4a33b7e0dbb6c339e002faa40ee4a69d5fdce9449";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "hardbyte";
repo = pname;
rev = "2e24af08326ecd69fba9f02fed7b9c26f233c92b";
hash = "sha256-ZP5qtbjDtBZ2uT9DOSvSnfHyTlirr0oCEXhiLO1ydz0=";
};
propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
checkInputs = [ nose mock pytest hypothesis future ];
propagatedBuildInputs = [
msgpack
pyserial
typing-extensions
wrapt
];
# Add the scripts to PATH
checkPhase = ''
PATH=$out/bin:$PATH pytest -c /dev/null
checkInputs = [
future
hypothesis
parameterized
pytest-timeout
pytestCheckHook
];
postPatch = ''
substituteInPlace tox.ini \
--replace " --cov=can --cov-config=tox.ini --cov-report=xml --cov-report=term" ""
'';
disabledTestPaths = [
# We don't support all interfaces
"test/test_interface_canalystii.py"
];
disabledTests = [
# Tests require access socket
"BasicTestUdpMulticastBusIPv4"
"BasicTestUdpMulticastBusIPv6"
];
preCheck = ''
export PATH="$PATH:$out/bin";
'';
pythonImportsCheck = [
"can"
];
meta = with lib; {
homepage = "https://github.com/hardbyte/python-can";
description = "CAN support for Python";
license = licenses.lgpl3;
maintainers = with maintainers; [ sorki ];
homepage = "python-can.readthedocs.io";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ fab sorki ];
};
}

46
pkgs/development/python-modules/consonance/default.nix
View File

@ -1,29 +1,51 @@
{ buildPythonPackage, lib, fetchFromGitHub, dissononce, python-axolotl-curve25519
, transitions, protobuf, nose
{ lib
, buildPythonPackage
, fetchFromGitHub
, dissononce
, python-axolotl-curve25519
, transitions
, protobuf
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "consonance";
version = "0.1.3";
version = "0.1.5";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tgalal";
repo = "consonance";
rev = version;
sha256 = "1ifs0fq6i41rdna1kszv5sf87qbqx1mn98ffyx4xhw4i9r2grrjv";
hash = "sha256-BhgxLxjKZ4dSL7DqkaoS+wBPCd1SYZomRKrtDLdGmYQ=";
};
checkInputs = [ nose ];
checkPhase = ''
# skipping online test as it requires network with uplink
nosetests tests/test_handshakes_offline.py
'';
propagatedBuildInputs = [
dissononce
python-axolotl-curve25519
transitions
protobuf
];
propagatedBuildInputs = [ dissononce python-axolotl-curve25519 transitions protobuf ];
checkInputs = [
pytestCheckHook
];
pytestFlagsArray = [
"tests/test_handshakes_offline.py"
];
pythonImportsCheck = [
"consonance"
];
meta = with lib; {
homepage = "https://pypi.org/project/consonance/";
license = licenses.gpl3;
description = "WhatsApp's handshake implementation using Noise Protocol";
homepage = "https://github.com/tgalal/consonance";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ];
};
}

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

@ -2,12 +2,15 @@
, fetchFromGitHub
, buildPythonPackage
, pythonOlder
, pythonAtLeast
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "dacite";
version = "1.6.0";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
@ -21,7 +24,14 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "dacite" ];
disabledTests = lib.optionals (pythonAtLeast "3.10") [
# https://github.com/konradhalas/dacite/issues/167
"test_from_dict_with_union_and_wrong_data"
];
pythonImportsCheck = [
"dacite"
];
meta = with lib; {
description = "Python helper to create data classes from dictionaries";

9
pkgs/development/python-modules/exchangelib/default.nix
View File

@ -1,5 +1,4 @@
{ lib
, backports-datetime-fromisoformat
, backports-zoneinfo
, buildPythonPackage
, cached-property
@ -27,16 +26,16 @@
buildPythonPackage rec {
pname = "exchangelib";
version = "4.6.2";
version = "4.7.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ecederstrand";
repo = pname;
rev = "v${version}";
sha256 = "1vax4xqjav6nr3kfkz390ism3cs69dxnbx6sc0f9ci4mn3rxjwdy";
sha256 = "sha256-APT/esskyigt6u3A+KVTAlmZDMppeyKb9Ws+95hDLcM=";
};
propagatedBuildInputs = [
@ -55,8 +54,6 @@ buildPythonPackage rec {
tzlocal
] ++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo
] ++ lib.optionals (pythonOlder "3.7") [
backports-datetime-fromisoformat
];
checkInputs = [

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

@ -7,6 +7,7 @@
, fetchFromGitHub
, fetchpatch
, pytestCheckHook
, pythonAtLeast
, pythonOlder
, pytest-aiohttp
, pytest-asyncio
@ -54,11 +55,6 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace homematicip/aio/connection.py \
--replace ", loop=self._loop" ""
'';
disabledTests = [
# Assert issues with datetime
"test_contact_interface_device"
@ -82,6 +78,11 @@ buildPythonPackage rec {
"test_home_unknown_types"
# Requires network access
"test_websocket"
] ++ lib.optionals (pythonAtLeast "3.10") [
"test_connection_lost"
"test_user_disconnect_and_reconnect"
"test_ws_message"
"test_ws_no_pong"
];
pythonImportsCheck = [

26
pkgs/development/python-modules/itemdb/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "itemdb";
version = "1.1.1";
# PyPI tarball doesn't include tests directory
src = fetchFromGitHub {
owner = "almarklein";
repo = pname;
rev = "v${version}";
sha256 = "0ksad5j91nlbsn0a11clf994qz7r9ijand5hxnjhgd66i9hl3y78";
};
meta = with lib; {
description = "Easy transactional database for Python dicts, backed by SQLite";
license = licenses.bsd2;
homepage = "https://itemdb.readthedocs.io";
maintainers = [ maintainers.matthiasbeyer ];
};
}

8
pkgs/development/python-modules/logfury/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, buildPythonPackage
, fetchPypi
, funcsigs
, setuptools-scm
, pytestCheckHook
, pythonOlder
@ -11,22 +10,19 @@
buildPythonPackage rec {
pname = "logfury";
version = "1.0.1";
format = "setuptools";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY=";
hash = "sha256-EwpdrOq5rVNJJCUt33BIKqLJZmKzo4JafTCYHQO3aiY=";
};
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
funcsigs
];
checkInputs = [
pytestCheckHook
testfixtures

39
pkgs/development/python-modules/pscript/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, nodejs
}:
buildPythonPackage rec {
pname = "pscript";
version = "0.7.6";
# PyPI tarball doesn't include tests directory
src = fetchFromGitHub {
owner = "flexxui";
repo = pname;
rev = "v${version}";
sha256 = "169px5n4jjnpdn9y86f28qwd95bwf1q1rz0a1h3lb5nn5c6ym8c4";
};
checkInputs = [
pytestCheckHook
nodejs
];
preCheck = ''
# do not execute legacy tests
rm -rf pscript_legacy
'';
meta = with lib; {
description = "Python to JavaScript compiler";
license = licenses.bsd2;
homepage = "https://pscript.readthedocs.io";
maintainers = [ maintainers.matthiasbeyer ];
};
}

49
pkgs/development/python-modules/pytest-logdog/default.nix Normal file
View File

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pytest
, pytestCheckHook
, pythonOlder
, setuptools-scm
}:
buildPythonPackage rec {
pname = "pytest-logdog";
version = "0.1.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ods";
repo = pname;
rev = version;
hash = "sha256-Tmoq+KAGzn0MMj29rukDfAc4LSIwC8DoMTuBAppV32I=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
buildInputs = [
pytest
];
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pytest_logdog"
];
meta = with lib; {
description = "Pytest plugin to test logging";
homepage = "https://github.com/ods/pytest-logdog";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

6
pkgs/development/python-modules/roombapy/default.nix
View File

@ -37,6 +37,12 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
# hbmqtt was replaced by amqtt
substituteInPlace tests/test_roomba_integration.py \
--replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker"
'';
disabledTestPaths = [
# Requires network access
"tests/test_discovery.py"

10
pkgs/development/python-modules/scrapy/default.nix
View File

@ -86,9 +86,10 @@ buildPythonPackage rec {
LC_ALL = "en_US.UTF-8";
# Disable doctest plugin because it causes pytest to hang
preCheck = ''
substituteInPlace pytest.ini --replace "--doctest-modules" ""
# Disable doctest plugin because it causes pytest to hang
substituteInPlace pytest.ini \
--replace "--doctest-modules" ""
'';
disabledTestPaths = [
@ -116,6 +117,7 @@ buildPythonPackage rec {
"test_peek_fifo"
"test_peek_one_element"
"test_peek_lifo"
"test_callback_kwargs"
] ++ lib.optionals stdenv.isDarwin [
"test_xmliter_encoding"
"test_download"
@ -127,7 +129,9 @@ buildPythonPackage rec {
install -m 644 -D extras/scrapy_zsh_completion $out/share/zsh/site-functions/_scrapy
'';
pythonImportsCheck = [ "scrapy" ];
pythonImportsCheck = [
"scrapy"
];
__darwinAllowLocalNetworking = true;

66
pkgs/development/python-modules/tifffile/default.nix
View File

@ -1,53 +1,55 @@
{ lib
, fetchPypi
, buildPythonPackage
, isPy27
, isPy3k
, dask
, fetchPypi
, fsspec
, lxml
, numpy
, imagecodecs-lite
, enum34 ? null
, futures ? null
, pathlib ? null
, pytest
, pytestCheckHook
, pythonOlder
, zarr
}:
buildPythonPackage rec {
pname = "tifffile";
version = "2021.11.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "153e31fa1d892f482fabb2ae9f2561fa429ee42d01a6f67e58cee13637d9285b";
hash = "sha256-FT4x+h2JL0gvq7KunyVh+kKe5C0BpvZ+WM7hNjfZKFs=";
};
patches = lib.optional isPy27 ./python2-regex-compat.patch;
# Missing dependencies: imagecodecs, czifile, cmapfile, oiffile, lfdfiles
# and test data missing from PyPI tarball
doCheck = false;
checkInputs = [
pytest
];
checkPhase = ''
pytest
'';
propagatedBuildInputs = [
numpy
] ++ lib.optionals isPy3k [
imagecodecs-lite
] ++ lib.optionals isPy27 [
futures
enum34
pathlib
];
checkInputs = [
dask
fsspec
lxml
pytestCheckHook
zarr
];
disabledTests = [
# Test require network access
"test_class_omexml"
"test_write_ome"
# Test file is missing
"test_write_predictor"
];
pythonImportsCheck = [
"tifffile"
];
meta = with lib; {
description = "Read and write image data from and to TIFF files.";
homepage = "https://www.lfd.uci.edu/~gohlke/";
maintainers = [ maintainers.lebastr ];
description = "Read and write image data from and to TIFF files";
homepage = "https://github.com/cgohlke/tifffile/";
license = licenses.bsd3;
maintainers = with maintainers; [ lebastr ];
};
}

47
pkgs/development/python-modules/timetagger/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ lib
, python3Packages
, fetchFromGitHub
, pytestCheckHook
, requests
}:
python3Packages.buildPythonPackage rec {
pname = "timetagger";
version = "22.1.2";
src = fetchFromGitHub {
owner = "almarklein";
repo = pname;
rev = "v${version}";
sha256 = "0xrajx0iij7r70ch17m4y6ydyh368dn6nbjsv74pn1x8frd686rw";
};
meta = with lib; {
homepage = "https://timetagger.app";
license = licenses.gpl3;
description = "Tag your time, get the insight";
maintainers = with maintainers; [ matthiasbeyer ];
};
checkInputs = [
pytestCheckHook
requests
];
preCheck = ''
# https://github.com/NixOS/nixpkgs/issues/12591
mkdir -p check-phase
export HOME=$(pwd)/check-phase
'';
propagatedBuildInputs = with python3Packages; [
asgineer
itemdb
jinja2
markdown
pscript
pyjwt
uvicorn
];
}

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

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, six
, pygraphviz
, pytestCheckHook
@ -13,6 +14,7 @@
buildPythonPackage rec {
pname = "transitions";
version = "0.8.10";
format = "setuptools";
src = fetchPypi {
inherit pname version;
@ -36,6 +38,16 @@ buildPythonPackage rec {
export HOME=$TMPDIR
'';
disabledTests = lib.optionals (pythonAtLeast "3.10") [
# https://github.com/pytransitions/transitions/issues/563
"test_multiple_models"
"test_timeout"
];
pythonImportsCheck = [
"transitions"
];
meta = with lib; {
homepage = "https://github.com/pytransitions/transitions";
description = "A lightweight, object-oriented finite state machine implementation in Python";

6
pkgs/development/tools/continuous-integration/drone-cli/default.nix
View File

@ -1,11 +1,11 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
version = "1.4.0";
version = "1.5.0";
pname = "drone-cli";
revision = "v${version}";
vendorSha256 = "sha256-v2ijRZ5xvYkL3YO7Xfgalzxzd9C5BKdaQF7VT5UoqOk=";
vendorSha256 = "sha256-bYjEVmQ7lPd+Gn5cJwlzBQkMkLAXA1iSa1DXz/IM1Ss=";
doCheck = false;
@ -17,7 +17,7 @@ buildGoModule rec {
owner = "drone";
repo = "drone-cli";
rev = revision;
sha256 = "sha256-+70PWHGd8AQP6ih0b/+VOIbJcF8tSOAO9wsGqQWX+bU=";
sha256 = "sha256-TFIGKTVrAMSOFEmu3afdDKBgyEwF2KIv3rt1fS6rCxw=";
};
meta = with lib; {

2
pkgs/development/tools/electron/generic.nix
View File

@ -28,7 +28,7 @@ let
maintainers = with maintainers; [ travisbhartwell manveru prusnak ];
platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]
++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ];
knownVulnerabilities = optional (versionOlder version "12.0.0") "Electron version ${version} is EOL";
knownVulnerabilities = optional (versionOlder version "13.0.0") "Electron version ${version} is EOL";
};
fetcher = vers: tag: hash: fetchurl {

2
pkgs/development/tools/github-changelog-generator/Gemfile
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true
source "https://rubygems.org"
gem "github_changelog_generator", "1.14.3"
gem "github_changelog_generator", "1.16.4"

110
pkgs/development/tools/github-changelog-generator/Gemfile.lock
View File

@ -1,49 +1,101 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.2)
activesupport (7.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
concurrent-ruby (1.1.4)
faraday (0.15.4)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
async (1.30.1)
console (~> 1.10)
nio4r (~> 2.3)
timers (~> 4.1)
async-http (0.56.5)
async (>= 1.25)
async-io (>= 1.28)
async-pool (>= 0.2)
protocol-http (~> 0.22.0)
protocol-http1 (~> 0.14.0)
protocol-http2 (~> 0.14.0)
async-http-faraday (0.11.0)
async-http (~> 0.42)
faraday
async-io (1.32.2)
async
async-pool (0.3.9)
async (>= 1.25)
concurrent-ruby (1.1.9)
console (1.14.0)
fiber-local
faraday (1.9.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-http-cache (2.2.0)
faraday (>= 0.8)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
faraday (~> 0.8)
github_changelog_generator (1.14.3)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
fiber-local (1.0.0)
github_changelog_generator (1.16.4)
activesupport
async (>= 1.25.0)
async-http-faraday
faraday-http-cache
multi_json
octokit (~> 4.6)
rainbow (>= 2.1)
rainbow (>= 2.2.1)
rake (>= 10.0)
retriable (~> 2.1)
i18n (1.2.0)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
minitest (5.11.3)
multi_json (1.13.1)
multipart-post (2.0.0)
octokit (4.13.0)
minitest (5.15.0)
multi_json (1.15.0)
multipart-post (2.1.1)
nio4r (2.5.8)
octokit (4.22.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
public_suffix (3.0.3)
rainbow (3.0.0)
rake (12.3.2)
retriable (2.1.0)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
protocol-hpack (1.4.2)
protocol-http (0.22.5)
protocol-http1 (0.14.2)
protocol-http (~> 0.22)
protocol-http2 (0.14.2)
protocol-hpack (~> 1.4)
protocol-http (~> 0.18)
public_suffix (4.0.6)
rainbow (3.1.1)
rake (13.0.6)
ruby2_keywords (0.0.5)
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
timers (4.3.3)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
PLATFORMS
ruby
DEPENDENCIES
github_changelog_generator (= 1.14.3)
github_changelog_generator (= 1.16.4)
BUNDLED WITH
2.1.4

355
pkgs/development/tools/github-changelog-generator/gemset.nix
View File

@ -1,155 +1,420 @@
{
activesupport = {
dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1iya7vxqwxysr74s7b4z1x19gmnx5advimzip3cbmsd5bd43wfgz";
sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6";
type = "gem";
};
version = "5.2.2";
version = "7.0.1";
};
addressable = {
dependencies = ["public_suffix"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp";
type = "gem";
};
version = "2.5.2";
version = "2.8.0";
};
async = {
dependencies = ["console" "nio4r" "timers"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mdv66xn5xjyaidyrp66mfnx7d4habkbfmx9y57k75h5q6fd2b65";
type = "gem";
};
version = "1.30.1";
};
async-http = {
dependencies = ["async" "async-io" "async-pool" "protocol-http" "protocol-http1" "protocol-http2"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0v3451bnn7rhgvl6ng0ys0dgm7cmyi3m41kmf5wyrpb83dhds13l";
type = "gem";
};
version = "0.56.5";
};
async-http-faraday = {
dependencies = ["async-http" "faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ndynkfknabv6m9wzcmdnj4r4bhlxqkg9c6rzsjc1pk8q057kslv";
type = "gem";
};
version = "0.11.0";
};
async-io = {
dependencies = ["async"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "10l9m0x2ffvsaaxc4mfalrljjx13njkyir9w6yfif8wpszc291h8";
type = "gem";
};
version = "1.32.2";
};
async-pool = {
dependencies = ["async"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "02r6cyvralcv2yn1jj0plxynwr7rvxym13vlxd2wxk1bymfq9fd9";
type = "gem";
};
version = "0.3.9";
};
concurrent-ruby = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ixcx9pfissxrga53jbdpza85qd5f6b5nq1sfqa9rnfq82qnlbp1";
sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f";
type = "gem";
};
version = "1.1.4";
version = "1.1.9";
};
console = {
dependencies = ["fiber-local"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13ylq7x9zk79r79pssnjvby14shcyamwcbap842p9gvmkf7xblmr";
type = "gem";
};
version = "1.14.0";
};
faraday = {
dependencies = ["multipart-post"];
dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
type = "gem";
};
version = "0.15.4";
version = "1.9.3";
};
faraday-em_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
type = "gem";
};
version = "1.0.0";
};
faraday-em_synchrony = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
type = "gem";
};
version = "1.0.0";
};
faraday-excon = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
type = "gem";
};
version = "1.1.0";
};
faraday-http-cache = {
dependencies = ["faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0";
sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7";
type = "gem";
};
version = "2.0.0";
version = "2.2.0";
};
github_changelog_generator = {
dependencies = ["activesupport" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake" "retriable"];
faraday-httpclient = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1ylqfmc78i6jf42ydkyng0gzvsl5w80wr3rjkhd6q4kgi96n70lr";
sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
type = "gem";
};
version = "1.14.3";
version = "1.0.1";
};
i18n = {
dependencies = ["concurrent-ruby"];
faraday-multipart = {
dependencies = ["multipart-post"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "079sqshk08mqs3d6yzvshmqf4s175lpi2pp71f1p10l09sgmrixr";
sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
type = "gem";
};
version = "1.0.3";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
type = "gem";
};
version = "1.0.1";
};
faraday-net_http_persistent = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
type = "gem";
};
version = "1.2.0";
};
minitest = {
faraday-patron = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
type = "gem";
};
version = "5.11.3";
version = "1.0.0";
};
faraday-rack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
type = "gem";
};
version = "1.0.0";
};
faraday-retry = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
type = "gem";
};
version = "1.0.3";
};
fiber-local = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vrxxb09fc7aicb9zb0pmn5akggjy21dmxkdl3w949y4q05rldr9";
type = "gem";
};
version = "1.0.0";
};
github_changelog_generator = {
dependencies = ["activesupport" "async" "async-http-faraday" "faraday-http-cache" "multi_json" "octokit" "rainbow" "rake"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "04d6z2ysq3gzvpw91lq8mxmdlqcxkmvp8rw9zrzkmksh3pjdzli1";
type = "gem";
};
version = "1.16.4";
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf";
type = "gem";
};
version = "1.8.11";
};
minitest = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd";
type = "gem";
};
version = "5.15.0";
};
multi_json = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
type = "gem";
};
version = "1.13.1";
version = "1.15.0";
};
multipart-post = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
type = "gem";
};
version = "2.0.0";
version = "2.1.1";
};
nio4r = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v";
type = "gem";
};
version = "2.5.8";
};
octokit = {
dependencies = ["sawyer"];
dependencies = ["faraday" "sawyer"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1yh0yzzqg575ix3y2l2261b9ag82gv2v4f1wczdhcmfbxcz755x6";
sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj";
type = "gem";
};
version = "4.13.0";
version = "4.22.0";
};
protocol-hpack = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sd85am1hj2w7z5hv19wy1nbisxfr1vqx3wlxjfz9xy7x7s6aczw";
type = "gem";
};
version = "1.4.2";
};
protocol-http = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lhg47b3w1d6pdwdkyha8ijzfhjrh90snwydkhwfnl5r10dd9cg5";
type = "gem";
};
version = "0.22.5";
};
protocol-http1 = {
dependencies = ["protocol-http"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0z56p7zqbyvwlrsbs19knny4v9f7ycsgblhv50ar8wgyifvsddf6";
type = "gem";
};
version = "0.14.2";
};
protocol-http2 = {
dependencies = ["protocol-hpack" "protocol-http"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1a9klpfmi7w465zq5xz8y8h1qvj42hkm0qd0nlws9d2idd767q5j";
type = "gem";
};
version = "0.14.2";
};
public_suffix = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
type = "gem";
};
version = "3.0.3";
version = "4.0.6";
};
rainbow = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
type = "gem";
};
version = "3.0.0";
version = "3.1.1";
};
rake = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn";
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
type = "gem";
};
version = "12.3.2";
version = "13.0.6";
};
retriable = {
ruby2_keywords = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1123kqmy3yk7k3vidvcwa46lknmhilv8axpaiag1wifa576hkqy1";
sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
type = "gem";
};
version = "2.1.0";
version = "0.0.5";
};
sawyer = {
dependencies = ["addressable" "faraday"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd";
sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz";
type = "gem";
};
version = "0.8.1";
version = "0.8.2";
};
thread_safe = {
timers = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
sha256 = "00xdi97gm01alfqhjgvv5sff9n1n2l6aym69s9jh8l9clg63b0jc";
type = "gem";
};
version = "0.3.6";
version = "4.3.3";
};
tzinfo = {
dependencies = ["thread_safe"];
dependencies = ["concurrent-ruby"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z";
type = "gem";
};
version = "1.2.5";
version = "2.0.4";
};
}

11
pkgs/os-specific/linux/kvmfr/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, kernel, kmod, looking-glass-client }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, kmod, looking-glass-client }:
stdenv.mkDerivation rec {
pname = "kvmfr";
@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "pic" "format" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
patches = lib.optional (kernel.kernelAtLeast "5.16") (fetchpatch {
name = "kvmfr-5.16.patch";
url = "https://github.com/gnif/LookingGlass/commit/a9b5302a517e19d7a2da114acf71ef1e69cfb497.patch";
sha256 = "017nxlk2f7kyjp6llwa74dbczdb1jk8v791qld81dxhzkm9dyqqx";
stripLen = 1;
});
makeFlags = [
"KVER=${kernel.modDirVersion}"
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
@ -28,6 +35,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ j-brn ];
platforms = [ "x86_64-linux" ];
broken = kernel.kernelOlder "5.3" || kernel.kernelAtLeast "5.16";
broken = kernel.kernelOlder "5.3";
};
}

2
pkgs/servers/nats-server/default.nix
View File

@ -18,7 +18,7 @@ buildGoPackage rec {
meta = {
description = "High-Performance server for NATS";
license = licenses.asl20;
maintainers = [ maintainers.swdunlop ];
maintainers = with maintainers; [ swdunlop derekcollison ];
homepage = "https://nats.io/";
};
}

39
pkgs/servers/timetagger/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ lib
, pkgs
, python3Packages
, fetchFromGitHub
, addr ? "127.0.0.1"
, port ? 8082
}:
#
# Timetagger itself is a library that a user must write a "run.py" script for
# We provide a basic "run.py" script with this package, which simply starts
# timetagger.
#
let
tt = python3Packages.timetagger;
in
python3Packages.buildPythonPackage rec {
pname = tt.name;
version = tt.version;
src = tt.src;
meta = tt.meta;
propagatedBuildInputs = [ tt ]
++ (with python3Packages; [
setuptools
]);
format = "custom";
installPhase = ''
mkdir -p $out/bin
echo "#!${pkgs.python3}/bin/python3" >> $out/bin/timetagger
cat run.py >> $out/bin/timetagger
sed -Ei 's,0\.0\.0\.0:80,${addr}:${toString port},' $out/bin/timetagger
chmod +x $out/bin/timetagger
'';
}

8
pkgs/servers/xmpp/prosody/default.nix
View File

@ -20,7 +20,7 @@ let
);
in
stdenv.mkDerivation rec {
version = "0.11.10"; # also update communityModules
version = "0.11.12"; # also update communityModules
pname = "prosody";
# The following community modules are necessary for the nixos module
# prosody module to comply with XEP-0423 and provide a working
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz";
sha256 = "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6";
sha256 = "03an206bl3h2lqcgv1wfvc2bqjq6m9vjb2idw0vyvczm43c55kan";
};
# A note to all those merging automated updates: Please also update this
@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
# version.
communityModules = fetchhg {
url = "https://hg.prosody.im/prosody-modules";
rev = "64fafbeba14d";
sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1";
rev = "bd0a1f917d98";
sha256 = "0figx0b0y5zfk5anf16h20y4crjmpb6bkg30vl7p0m594qnyqjcx";
};
nativeBuildInputs = [ makeWrapper ];

1
pkgs/tools/misc/hidrd/default.nix
View File

@ -19,5 +19,6 @@ stdenv.mkDerivation {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ pacien ];
platforms = platforms.all;
broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/hidrd.x86_64-darwin
};
}

4
pkgs/tools/security/exploitdb/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-01-11";
version = "2022-01-14";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-uvjn/n+w5Zv/RwvQmE7bl4PFXdN2OO6FrrEVKdGNsgo=";
sha256 = "sha256-/Id3cAz+upJPHzNcTnbO02AehS6R9YTz9Ff+1fc7NJs=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/tools/security/jwt-cli/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "jwt-cli";
version = "5.0.0";
version = "5.0.1";
src = fetchFromGitHub {
owner = "mike-engel";
repo = pname;
rev = version;
sha256 = "0za4mpzry6i5gki524kp4by0n74pbc96cvzrkq286v8w033wj01i";
sha256 = "08yynwmn1kzanabiqzysyk9jbn0zyjjlilj4b4j5m29hfykq1jvf";
};
cargoSha256 = "1l5fhr5c2ygdlnpwsx62fm8di8li0wf15nvvcnnivjcic7f9b5j0";
cargoSha256 = "19rbmiy71hgybzfwpz4msqqgl98qv9c3x06mjcpmixq4qhgxz616";
buildInputs = lib.optional stdenv.isDarwin Security;

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

@ -10214,6 +10214,8 @@ with pkgs;
timetrap = callPackage ../applications/office/timetrap { };
timetagger = callPackage ../servers/timetagger { };
timekeeper = callPackage ../applications/office/timekeeper { };
timezonemap = callPackage ../development/libraries/timezonemap { };
@ -13546,7 +13548,7 @@ with pkgs;
love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; };
love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
love_11 = callPackage ../development/interpreters/love/11.1.nix { };
love_11 = callPackage ../development/interpreters/love/11.nix { };
love = love_0_10;
wabt = callPackage ../development/tools/wabt { };
@ -29766,11 +29768,7 @@ with pkgs;
};
xiphos = callPackage ../applications/misc/xiphos {
gconf = gnome2.GConf;
inherit (gnome2) libglade scrollkeeper;
gtkhtml = gnome2.gtkhtml4;
python = python27;
enchant = enchant2;
};
xournal = callPackage ../applications/graphics/xournal {

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

@ -634,6 +634,8 @@ in {
asgi-csrf = callPackage ../development/python-modules/asgi-csrf { };
asgineer = callPackage ../development/python-modules/asgineer { };
asgiref = callPackage ../development/python-modules/asgiref { };
asmog = callPackage ../development/python-modules/asmog { };
@ -4055,6 +4057,8 @@ in {
itemadapter = callPackage ../development/python-modules/itemadapter { };
itemdb = callPackage ../development/python-modules/itemdb { };
itemloaders = callPackage ../development/python-modules/itemloaders { };
iterm2 = callPackage ../development/python-modules/iterm2 { };
@ -6332,6 +6336,8 @@ in {
psautohint = callPackage ../development/python-modules/psautohint { };
pscript = callPackage ../development/python-modules/pscript { };
psd-tools = callPackage ../development/python-modules/psd-tools { };
psutil = callPackage ../development/python-modules/psutil { };
@ -7694,6 +7700,8 @@ in {
pytest-localserver = callPackage ../development/python-modules/pytest-localserver { };
pytest-logdog = callPackage ../development/python-modules/pytest-logdog{ };
pytest-metadata = callPackage ../development/python-modules/pytest-metadata { };
pytest-mock = callPackage ../development/python-modules/pytest-mock { };
@ -9713,6 +9721,8 @@ in {
timeout-decorator = callPackage ../development/python-modules/timeout-decorator { };
timetagger = callPackage ../development/python-modules/timetagger { };
timezonefinder = callPackage ../development/python-modules/timezonefinder { };
tinycss2 = callPackage ../development/python-modules/tinycss2 { };