Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
43f4575008
@ -2477,6 +2477,12 @@
|
||||
githubId = 984691;
|
||||
name = "Evan Danaher";
|
||||
};
|
||||
edbentley = {
|
||||
email = "hello@edbentley.dev";
|
||||
github = "edbentley";
|
||||
githubId = 15923595;
|
||||
name = "Ed Bentley";
|
||||
};
|
||||
edcragg = {
|
||||
email = "ed.cragg@eipi.xyz";
|
||||
github = "nuxeh";
|
||||
|
||||
@ -860,7 +860,6 @@
|
||||
./services/web-apps/documize.nix
|
||||
./services/web-apps/dokuwiki.nix
|
||||
./services/web-apps/engelsystem.nix
|
||||
./services/web-apps/frab.nix
|
||||
./services/web-apps/gerrit.nix
|
||||
./services/web-apps/gotify-server.nix
|
||||
./services/web-apps/grocy.nix
|
||||
|
||||
@ -32,6 +32,7 @@ with lib;
|
||||
(mkRemovedOptionModule ["services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.")
|
||||
(mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed")
|
||||
(mkRemovedOptionModule [ "services" "fourStore" ] "The fourStore module has been removed")
|
||||
(mkRemovedOptionModule [ "services" "frab" ] "The frab module has been removed")
|
||||
(mkRemovedOptionModule [ "services" "fourStoreEndpoint" ] "The fourStoreEndpoint module has been removed")
|
||||
(mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed")
|
||||
(mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " +
|
||||
|
||||
@ -1,222 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.frab;
|
||||
|
||||
package = pkgs.frab;
|
||||
|
||||
databaseConfig = builtins.toJSON { production = cfg.database; };
|
||||
|
||||
frabEnv = {
|
||||
RAILS_ENV = "production";
|
||||
RACK_ENV = "production";
|
||||
SECRET_KEY_BASE = cfg.secretKeyBase;
|
||||
FRAB_HOST = cfg.host;
|
||||
FRAB_PROTOCOL = cfg.protocol;
|
||||
FROM_EMAIL = cfg.fromEmail;
|
||||
RAILS_SERVE_STATIC_FILES = "1";
|
||||
} // cfg.extraEnvironment;
|
||||
|
||||
frab-rake = pkgs.stdenv.mkDerivation {
|
||||
name = "frab-rake";
|
||||
buildInputs = [ package.env pkgs.makeWrapper ];
|
||||
phases = "installPhase fixupPhase";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
makeWrapper ${package.env}/bin/bundle $out/bin/frab-bundle \
|
||||
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") frabEnv)} \
|
||||
--set PATH '${lib.makeBinPath (with pkgs; [ nodejs file imagemagick ])}:$PATH' \
|
||||
--set RAKEOPT '-f ${package}/share/frab/Rakefile' \
|
||||
--run 'cd ${package}/share/frab'
|
||||
makeWrapper $out/bin/frab-bundle $out/bin/frab-rake \
|
||||
--add-flags "exec rake"
|
||||
'';
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.frab = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable the frab service.
|
||||
'';
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
example = "frab.example.com";
|
||||
description = ''
|
||||
Hostname under which this frab instance can be reached.
|
||||
'';
|
||||
};
|
||||
|
||||
protocol = mkOption {
|
||||
type = types.str;
|
||||
default = "https";
|
||||
example = "http";
|
||||
description = ''
|
||||
Either http or https, depending on how your Frab instance
|
||||
will be exposed to the public.
|
||||
'';
|
||||
};
|
||||
|
||||
fromEmail = mkOption {
|
||||
type = types.str;
|
||||
default = "frab@localhost";
|
||||
description = ''
|
||||
Email address used by frab.
|
||||
'';
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost";
|
||||
description = ''
|
||||
Address or hostname frab should listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
listenPort = mkOption {
|
||||
type = types.int;
|
||||
default = 3000;
|
||||
description = ''
|
||||
Port frab should listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
statePath = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/frab";
|
||||
description = ''
|
||||
Directory where frab keeps its state.
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "frab";
|
||||
description = ''
|
||||
User to run frab.
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "frab";
|
||||
description = ''
|
||||
Group to run frab.
|
||||
'';
|
||||
};
|
||||
|
||||
secretKeyBase = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
Your secret key is used for verifying the integrity of signed cookies.
|
||||
If you change this key, all old signed cookies will become invalid!
|
||||
|
||||
Make sure the secret is at least 30 characters and all random,
|
||||
no regular words or you'll be exposed to dictionary attacks.
|
||||
'';
|
||||
};
|
||||
|
||||
database = mkOption {
|
||||
type = types.attrs;
|
||||
default = {
|
||||
adapter = "sqlite3";
|
||||
database = "/var/lib/frab/db.sqlite3";
|
||||
pool = 5;
|
||||
timeout = 5000;
|
||||
};
|
||||
example = {
|
||||
adapter = "postgresql";
|
||||
database = "frab";
|
||||
host = "localhost";
|
||||
username = "frabuser";
|
||||
password = "supersecret";
|
||||
encoding = "utf8";
|
||||
pool = 5;
|
||||
};
|
||||
description = ''
|
||||
Rails database configuration for Frab as Nix attribute set.
|
||||
'';
|
||||
};
|
||||
|
||||
extraEnvironment = mkOption {
|
||||
type = types.attrs;
|
||||
default = {};
|
||||
example = {
|
||||
FRAB_CURRENCY_UNIT = "€";
|
||||
FRAB_CURRENCY_FORMAT = "%n%u";
|
||||
EXCEPTION_EMAIL = "frab-owner@example.com";
|
||||
SMTP_ADDRESS = "localhost";
|
||||
SMTP_PORT = "587";
|
||||
SMTP_DOMAIN = "localdomain";
|
||||
SMTP_USER_NAME = "root";
|
||||
SMTP_PASSWORD = "toor";
|
||||
SMTP_AUTHENTICATION = "1";
|
||||
SMTP_NOTLS = "1";
|
||||
};
|
||||
description = ''
|
||||
Additional environment variables to set for frab for further
|
||||
configuration. See the frab documentation for more information.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ frab-rake ];
|
||||
|
||||
users.users.${cfg.user} =
|
||||
{ group = cfg.group;
|
||||
home = "${cfg.statePath}";
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
users.groups.${cfg.group} = { };
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.statePath}/system/attachments' - ${cfg.user} ${cfg.group} - -"
|
||||
];
|
||||
|
||||
systemd.services.frab = {
|
||||
after = [ "network.target" "gitlab.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment = frabEnv;
|
||||
|
||||
preStart = ''
|
||||
ln -sf ${pkgs.writeText "frab-database.yml" databaseConfig} /run/frab/database.yml
|
||||
ln -sf ${cfg.statePath}/system /run/frab/system
|
||||
|
||||
if ! test -e "${cfg.statePath}/db-setup-done"; then
|
||||
${frab-rake}/bin/frab-rake db:setup
|
||||
touch ${cfg.statePath}/db-setup-done
|
||||
else
|
||||
${frab-rake}/bin/frab-rake db:migrate
|
||||
fi
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
PrivateTmp = true;
|
||||
PrivateDevices = true;
|
||||
Type = "simple";
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
TimeoutSec = "300s";
|
||||
Restart = "on-failure";
|
||||
RestartSec = "10s";
|
||||
RuntimeDirectory = "frab";
|
||||
WorkingDirectory = "${package}/share/frab";
|
||||
ExecStart = "${frab-rake}/bin/frab-bundle exec rails server " +
|
||||
"--binding=${cfg.listenAddress} --port=${toString cfg.listenPort}";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
46
pkgs/applications/editors/rehex/default.nix
Normal file
46
pkgs/applications/editors/rehex/default.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, capstone
|
||||
, jansson
|
||||
, wxGTK30
|
||||
, darwin
|
||||
, libicns
|
||||
, wxmac
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rehex";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solemnwarning";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1yj9a63j7534mmz8cl1ifg2wmgkxmk6z75jd8lkmc2sfrjbick32";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace Makefile.osx --replace 'iconutil -c icns -o $@ $(ICONSET)' \
|
||||
'png2icns $@ $(ICONSET)/icon_16x16.png $(ICONSET)/icon_32x32.png $(ICONSET)/icon_128x128.png $(ICONSET)/icon_256x256.png $(ICONSET)/icon_512x512.png'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals (stdenv.isDarwin) [ libicns ];
|
||||
|
||||
buildInputs = [ capstone jansson ]
|
||||
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ wxGTK30 ])
|
||||
++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Carbon Cocoa IOKit wxmac ]));
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ] ++ (stdenv.lib.optionals stdenv.isDarwin [ "-f Makefile.osx" ]);
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Reverse Engineers' Hex Editor";
|
||||
longDescription = ''
|
||||
A cross-platform (Windows, Linux, Mac) hex editor for reverse
|
||||
engineering, and everything else.
|
||||
'';
|
||||
homepage = "https://github.com/solemnwarning/rehex";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ markus1189 SuperSandro2000 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -1,15 +1,15 @@
|
||||
{ fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }:
|
||||
{ fetchurl, stdenv, glib, libgee, pkg-config, ncurses, boehmgc, perl, help2man, vala }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zile-2.4.14";
|
||||
name = "zile-2.6.0.90";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/zile/${name}.tar.gz";
|
||||
sha256 = "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s";
|
||||
sha256 = "1bhdwnasmqhy0hi3fqmpzr8xkw5zlqjpmf1cj42h4cg3fnamp6r3";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses boehmgc ];
|
||||
nativeBuildInputs = [ perl pkgconfig ]
|
||||
buildInputs = [ glib libgee ncurses boehmgc vala ];
|
||||
nativeBuildInputs = [ perl pkg-config ]
|
||||
# `help2man' wants to run Zile, which won't work when the
|
||||
# newly-produced binary can't be run at build-time.
|
||||
++ stdenv.lib.optional
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, wrapGAppsHook
|
||||
, installShellFiles
|
||||
, python3
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, gdk-pixbuf
|
||||
|
||||
# Recommended Dependencies:
|
||||
, unrarSupport ? false
|
||||
, unrarSupport ? false # unfree software
|
||||
, unrar
|
||||
, p7zip
|
||||
, lhasa
|
||||
@ -18,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mcomix3";
|
||||
version = "unstable-2020-11-23";
|
||||
|
||||
# fetch from github because no official release on pypi/github and no build system
|
||||
# no official release on pypi/github and no build system
|
||||
src = fetchFromGitHub {
|
||||
repo = "${pname}";
|
||||
owner = "multiSnow";
|
||||
@ -27,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ];
|
||||
nativeBuildInputs = [ wrapGAppsHook ];
|
||||
nativeBuildInputs = [ wrapGAppsHook installShellFiles ];
|
||||
propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]);
|
||||
|
||||
format = "other";
|
||||
@ -55,7 +57,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
|
||||
postInstall = ''
|
||||
rmdir $libdir/mcomix/mcomix
|
||||
cp man/* $out/share/man/man1/
|
||||
mv man/mcomix.1 man/${pname}.1
|
||||
installManPage man/*
|
||||
cp -r mime/icons/* $out/share/icons/hicolor/
|
||||
cp mime/*.desktop $out/share/applications/
|
||||
cp mime/*.appdata.xml $out/share/metainfo/
|
||||
@ -63,12 +66,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
for folder in $out/share/icons/hicolor/*; do
|
||||
mkdir $folder/{apps,mimetypes}
|
||||
mv $folder/*.png $folder/mimetypes
|
||||
cp $libdir/mcomix/images/$(basename $folder)/mcomix.png $folder/apps/${pname}.png
|
||||
cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png
|
||||
cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png
|
||||
done
|
||||
'';
|
||||
|
||||
# to prevent double wrapping
|
||||
# prevent double wrapping
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
@ -77,7 +81,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
)
|
||||
'';
|
||||
|
||||
# real pytests seem to be broken upstream
|
||||
# real pytests broken upstream
|
||||
checkPhase = ''
|
||||
$out/bin/comicthumb --help > /dev/null
|
||||
$out/bin/${pname} --help > /dev/null
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "FlexGet";
|
||||
version = "3.1.71";
|
||||
version = "3.1.91";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4c25d8733c8eb54c7d3ce60a17d8020049fb137b796e5ada9d15f41cdd0e1655";
|
||||
sha256 = "5d6668dd9721b60738ea44c616fcdee6210f7ef52b461eb13b77091caef4a832";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -26,6 +26,7 @@ python3Packages.buildPythonApplication rec {
|
||||
APScheduler
|
||||
beautifulsoup4
|
||||
cherrypy
|
||||
colorama
|
||||
colorclass
|
||||
feedparser
|
||||
flask-compress
|
||||
@ -49,6 +50,7 @@ python3Packages.buildPythonApplication rec {
|
||||
rebulk
|
||||
requests
|
||||
rpyc
|
||||
sgmllib3k
|
||||
sqlalchemy
|
||||
terminaltables
|
||||
zxcvbn
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "maestral-qt";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
disabled = python3.pkgs.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SamSchott";
|
||||
repo = "maestral-qt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-7qpVyQUbT+GChJl1TnKOONSyRDvzQ0M2z9RdN7PNl9U=";
|
||||
sha256 = "sha256-2S2sa2/HVt3IRsE98PT2XwpONjaYENBzYW+ezBFrJYI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
@ -24,6 +24,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
maestral
|
||||
packaging
|
||||
pyqt5
|
||||
] ++ stdenv.lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook ];
|
||||
|
||||
@ -31,12 +31,12 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "claws-mail-gtk3";
|
||||
version = "3.17.5";
|
||||
version = "3.99.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.claws-mail.org/claws.git";
|
||||
rev = "c1e1902323c2b5dfe82144328b7933dc857ef343"; # this commit is "for release 3.17.5"
|
||||
sha256 = "0cqzlzcms6alvsdsbcc06bsdi1h349b16qngn2z1p8fz16x6s6cy";
|
||||
rev = version;
|
||||
sha256 = "176h1swh1zx6dqyzfz470x4a1xicnv0zhy8ir47k7p23g6y17i2k";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-chromecast";
|
||||
version = "0.2.5";
|
||||
version = "0.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vishen";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0y1zwy1bxnjz409vdhqwykvfjhrsyy4j503v3rjrrhkcca6vfbyg";
|
||||
sha256 = "0frvj1van1qn7hi96m0l7pzm4jf0v49xl4r4fi2lh1yqzgsgzy9f";
|
||||
};
|
||||
|
||||
vendorSha256 = "04mgm3afgczq0an6ys8bilxv1hgzfwvgjx21fyl82yxd573rsf5r";
|
||||
vendorSha256 = "0vgbmgk07kqmhhmcssy1ibr2hzk07hf32kkdyj2b9jqj9sb49p49";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dumb-init";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Yelp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1ws944y8gch6h7iqvznfwlh9hnmdn36aqh9w6cbc7am8vbyq0ffa";
|
||||
sha256 = "0v6ggfjl3q5p4hf002ygs8rryyzrg0fqy836p403fq2fgm30k0xx";
|
||||
};
|
||||
|
||||
buildInputs = [ glibc.static ];
|
||||
|
||||
@ -3,20 +3,22 @@
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, python
|
||||
, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, watchdog
|
||||
, alembic, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, packaging, pathspec, Pyro5, requests, setuptools, sdnotify, sqlalchemy, survey, watchdog
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, dbus-next
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "maestral";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SamSchott";
|
||||
repo = "maestral";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kh3FYBSVOU4ywrYl6ONEIbLbkSuZmexNJC9dB+JtUjM=";
|
||||
sha256 = "sha256-SspyTdmAbbmWN3AqVp9bj/QfAKLVgU2bLiiHjZO0aCM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -34,7 +36,12 @@ buildPythonPackage rec {
|
||||
setuptools
|
||||
sdnotify
|
||||
sqlalchemy
|
||||
survey
|
||||
watchdog
|
||||
] ++ stdenv.lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ stdenv.lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
] ++ stdenv.lib.optionals stdenv.isLinux [
|
||||
dbus-next
|
||||
];
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cairocffi
|
||||
, cairosvg
|
||||
, cffi
|
||||
, qiskit
|
||||
, svgwrite
|
||||
, colorama
|
||||
, python
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
pname = "qasm2image";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nelimee";
|
||||
repo = "qasm2image";
|
||||
rev = "2c01756946ba9782973359dbd7bbf6651af6bee5";
|
||||
sha256 = "1bnkzv7wrdvrq71dmsqanb3v2hcsxh5zaglfcxm2d9zzpmvb4a2n";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cairocffi
|
||||
cairosvg
|
||||
cffi
|
||||
qiskit
|
||||
svgwrite
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
colorama
|
||||
];
|
||||
checkPhase = ''
|
||||
${python.interpreter} tests/launch_tests.py
|
||||
'';
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
meta = {
|
||||
description = "A Python module to visualise quantum circuit";
|
||||
homepage = "https://github.com/nelimeee/qasm2image";
|
||||
license = lib.licenses.cecill-b;
|
||||
maintainers = with lib.maintainers; [
|
||||
pandaman
|
||||
];
|
||||
broken = true; # last update Oct 2018, failed tests don't error the build, and out-of-date with latest python3Packages.qiskit
|
||||
};
|
||||
}
|
||||
@ -1,7 +1,8 @@
|
||||
{ stdenv
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, installShellFiles
|
||||
, pytestCheckHook
|
||||
, isPy3k
|
||||
}:
|
||||
|
||||
@ -9,20 +10,22 @@ buildPythonPackage rec {
|
||||
pname = "sqlparse";
|
||||
version = "0.4.1";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8";
|
||||
};
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkPhase = ''
|
||||
py.test
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/sqlformat.1
|
||||
'';
|
||||
|
||||
# Package supports 3.x, but tests are clearly 2.x only.
|
||||
doCheck = !isPy3k;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Non-validating SQL parser for Python";
|
||||
longDescription = ''
|
||||
Provides support for parsing, splitting and formatting SQL statements.
|
||||
@ -30,5 +33,4 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/andialbrecht/sqlparse";
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
29
pkgs/development/python-modules/survey/default.nix
Normal file
29
pkgs/development/python-modules/survey/default.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, wrapio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "survey";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-R/PfXW/CnqYiOWbCxPAYwneg6j6CLvdIpITZ2eIXn+M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
wrapio
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "survey" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/Exahilosys/survey";
|
||||
description = "A simple library for creating beautiful interactive prompts";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
}
|
||||
24
pkgs/development/python-modules/wrapio/default.nix
Normal file
24
pkgs/development/python-modules/wrapio/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "wrapio";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-jGupLh+xzwil+VBtAjIG+ZYT+dy+QaZOTIfipTQeyWo";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "wrapio" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/Exahilosys/wrapio";
|
||||
description = "Handling event-based streams";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ sfrijters ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.138.0";
|
||||
version = "0.139.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "08f7rihk663bwfxccl6fh6p5qn31025lhr5fmcxi3hl3jirwzb6n";
|
||||
sha256 = "0ix98dq7g13jdfxgq0d8v2cvfnl2l2gz04j8h05sqzahbpxqv97w";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, python3Packages }:
|
||||
{ lib, python3Packages, fetchpatch }:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "litecli";
|
||||
@ -13,6 +13,14 @@ python3Packages.buildPythonApplication rec {
|
||||
sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compatibility with sqlparse >= 0.4.0. Remove with the next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dbcli/litecli/commit/37957e401d22f88800bbdec2c690e731f2cc13bd.patch";
|
||||
sha256 = "1x82s2h1rzflyiahyd8pfya30rzs6yx6ij4a4s16f8iix5x35zv9";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
cli-helpers
|
||||
click
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nxpmicro-mfgtools";
|
||||
version = "1.3.191";
|
||||
version = "1.4.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NXPmicro";
|
||||
repo = "mfgtools";
|
||||
rev = "uuu_${version}";
|
||||
sha256 = "196blmd7nf5kamvay22rvnkds2v6h7ab8lyl10dknxgy8i8siqq9";
|
||||
sha256 = "1i1mvr6j0mc33axf6cmmsi83apr5rgq0z0sn23qav9r0izpnnh0w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -23,8 +23,7 @@ in stdenv.mkDerivation rec {
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
ln -s $src $out/bin/TabNine
|
||||
install -Dm755 $src $out/bin/TabNine
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
31
pkgs/os-specific/darwin/osx-cpu-temp/default.nix
Normal file
31
pkgs/os-specific/darwin/osx-cpu-temp/default.nix
Normal file
@ -0,0 +1,31 @@
|
||||
{ stdenv, fetchFromGitHub
|
||||
, IOKit
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osx-cpu-temp";
|
||||
version = "unstable-2020-12-04";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
name = "osx-cpu-temp-source";
|
||||
owner = "lavoiesl";
|
||||
repo = pname;
|
||||
rev = "6ec951be449badcb7fb84676bbc2c521e600e844";
|
||||
sha256 = "1nlibgr55bpln6jbdf8vqcp0fj9zv9343vflb7s9w0yh33fsbg9d";
|
||||
};
|
||||
|
||||
buildInputs = [ IOKit ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp osx-cpu-temp $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Outputs current CPU temperature for OSX.";
|
||||
homepage = "https://github.com/lavoiesl/osx-cpu-temp";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ virusdave ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jackett";
|
||||
version = "0.16.2347";
|
||||
version = "0.17.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
|
||||
sha256 = "0xqmkcwlgic38frf1myybj34fp9qpabagxcbmbxvmjb1knw19lrm";
|
||||
sha256 = "1pp5pnnmy8m0jvpxrldshcx71dl5g16dqvnnzaqhvs4cjhpgq8fw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "promscale";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timescale";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Yl61hX4YBddw0euTwheMIOy08jgS47rAU0cKyXiz9s4=";
|
||||
sha256 = "sha256-xkVT7Kn7mW23p8oGU4AsmB66lNd4QLnhEW7J66ldFHM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256:1ilciwf08678sciwwrjalwvcs5bp7x254nxc3nhdf88cf0bp2nxi";
|
||||
vendorSha256 = "sha256:1wfyawbdbabyp9nyhzfp632hg9rvwdyagsdqvvq6gv8bn5xfcjvh";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ];
|
||||
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
{ stdenv, bundlerEnv, fetchFromGitHub, ruby, nodejs }:
|
||||
|
||||
let
|
||||
env = bundlerEnv {
|
||||
name = "frab";
|
||||
inherit ruby;
|
||||
gemfile = ./Gemfile;
|
||||
lockfile = ./Gemfile.lock;
|
||||
gemset = ./gemset.nix;
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "frab-2016-12-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "frab";
|
||||
repo = "frab";
|
||||
rev = "e4bbcfd1a9db7f89f53a8702c236d9628bafb72c";
|
||||
sha256 = "04pzmif8jxjww3fdf2zbg3k7cm49vxc9hhf4xhmvdmvywgin6fqp";
|
||||
};
|
||||
|
||||
buildInputs = [ env nodejs ];
|
||||
|
||||
buildPhase = ''
|
||||
cp config/database.yml.template config/database.yml
|
||||
cp .env.development .env.production
|
||||
bundler exec rake assets:precompile RAILS_ENV=production
|
||||
rm .env.production
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share
|
||||
cp -r . $out/share/frab
|
||||
|
||||
ln -sf /run/frab/database.yml $out/share/frab/config/database.yml
|
||||
rm -rf $out/share/frab/tmp $out/share/frab/public/system
|
||||
ln -sf /run/frab/system $out/share/frab/public/system
|
||||
ln -sf /tmp $out/share/frab/tmp
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit env ruby;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Web-based conference planning and management system";
|
||||
homepage = "https://github.com/frab/frab";
|
||||
license = licenses.mit;
|
||||
broken = true; # 2018-09-08; no successful hydra build since 2018-02-14
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.21.0";
|
||||
version = "1.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "12z5mbw7yzhyhzl6499xlhzpgysarjql4qlrpmwfpb8ij1hk8q6i";
|
||||
sha256 = "1hxr5w8cd6f967cvhgqd3pvl8dlx2hb0pvjslzzbrs65djf8zh3k";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
||||
38
pkgs/tools/audio/audiowaveform/default.nix
Normal file
38
pkgs/tools/audio/audiowaveform/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, gtest, boost, gd, libsndfile, libmad, libid3tag }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audiowaveform";
|
||||
version = "1.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbc";
|
||||
repo = "audiowaveform";
|
||||
rev = version;
|
||||
sha256 = "0k2s2f2hgq4pnjzfkgvjwgsflihmzdq7shicfjn0z2mzw4d1bvp2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gtest ];
|
||||
|
||||
buildInputs = [ boost gd libsndfile libmad libid3tag ];
|
||||
|
||||
preConfigure = ''
|
||||
ln -s ${gtest.src}/googletest googletest
|
||||
ln -s ${gtest.src}/googlemock googlemock
|
||||
'';
|
||||
|
||||
# One test is failing, see PR #101947
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "C++ program to generate waveform data and render waveform images from audio files";
|
||||
longDescription = ''
|
||||
audiowaveform is a C++ command-line application that generates waveform data from either MP3, WAV, FLAC, or Ogg Vorbis format audio files.
|
||||
Waveform data can be used to produce a visual rendering of the audio, similar in appearance to audio editing applications.
|
||||
'';
|
||||
homepage = "https://github.com/bbc/audiowaveform";
|
||||
changelog = "https://github.com/bbc/audiowaveform/blob/${version}/ChangeLog";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edbentley ];
|
||||
};
|
||||
}
|
||||
@ -1,26 +1,32 @@
|
||||
{ stdenvNoCC, fetchFromGitHub, python2 }:
|
||||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "q-text-as-data";
|
||||
version = "1.7.4";
|
||||
version = "2.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "harelba";
|
||||
repo = "q";
|
||||
rev = version;
|
||||
sha256 = "0p8rbfwwcqjyrix51v52zp9b03z4xg1fv2raf2ygqp9a4l27dca8";
|
||||
sha256 = "18cwyfjgxxavclyd08bmb943c8bvzp1gnqp4klkq5xlgqwivr4sv";
|
||||
};
|
||||
|
||||
buildInputs = [ python2 ];
|
||||
dontBuild = true;
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
setuptools
|
||||
six
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp bin/q $out/bin
|
||||
chmod +x $out/bin/q
|
||||
doCheck = false;
|
||||
|
||||
patchPhase = ''
|
||||
# remove broken symlink
|
||||
rm bin/qtextasdata.py
|
||||
|
||||
# not considered good practice pinning in install_requires
|
||||
substituteInPlace setup.py --replace 'six==' 'six>='
|
||||
'';
|
||||
|
||||
meta = with stdenvNoCC.lib; {
|
||||
meta = with lib; {
|
||||
description = "Run SQL directly on CSV or TSV files";
|
||||
longDescription = ''
|
||||
q is a command line tool that allows direct execution of SQL-like queries on CSVs/TSVs (and any other tabular text files).
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnsproxy";
|
||||
version = "0.33.2";
|
||||
version = "0.33.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AdguardTeam";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0x005lgncaf1fzs27fpcpf6dcncb7wia6fka64pmjxdsq7nmh1hh";
|
||||
sha256 = "0c7hqsb53711032svicr069gh7faacnsj2v36pj7srng266vk78p";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
@ -44,6 +44,7 @@ mapAliases ({
|
||||
aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30
|
||||
amazon-glacier-cmd-interface = throw "amazon-glacier-cmd-interface has been removed due to it being unmaintained."; # added 2020-10-30
|
||||
ammonite-repl = ammonite; # added 2017-05-02
|
||||
amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
|
||||
antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
|
||||
arduino_core = arduino-core; # added 2015-02-04
|
||||
arora = throw "arora has been removed."; # added 2020-09-09
|
||||
|
||||
@ -930,6 +930,8 @@ in
|
||||
inherit (darwin.apple_sdk.frameworks) Cocoa;
|
||||
};
|
||||
|
||||
audiowaveform = callPackage ../tools/audio/audiowaveform { };
|
||||
|
||||
autoflake = callPackage ../development/tools/analysis/autoflake { };
|
||||
|
||||
autospotting = callPackage ../applications/misc/autospotting { };
|
||||
@ -6762,6 +6764,8 @@ in
|
||||
|
||||
remarshal = callPackage ../development/tools/remarshal { };
|
||||
|
||||
rehex = callPackage ../applications/editors/rehex { };
|
||||
|
||||
rig = callPackage ../tools/misc/rig {
|
||||
stdenv = gccStdenv;
|
||||
};
|
||||
@ -17026,8 +17030,6 @@ in
|
||||
firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ };
|
||||
firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ };
|
||||
|
||||
frab = callPackage ../servers/web-apps/frab { };
|
||||
|
||||
freeradius = callPackage ../servers/freeradius { };
|
||||
|
||||
freeswitch = callPackage ../servers/sip/freeswitch {
|
||||
@ -18209,6 +18211,10 @@ in
|
||||
|
||||
openisns = callPackage ../os-specific/linux/open-isns { };
|
||||
|
||||
osx-cpu-temp = callPackage ../os-specific/darwin/osx-cpu-temp {
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
|
||||
};
|
||||
|
||||
osxfuse = callPackage ../os-specific/darwin/osxfuse { };
|
||||
|
||||
osxsnarf = callPackage ../os-specific/darwin/osxsnarf { };
|
||||
|
||||
@ -3649,7 +3649,24 @@ in {
|
||||
|
||||
macropy = callPackage ../development/python-modules/macropy { };
|
||||
|
||||
maestral = callPackage ../development/python-modules/maestral { };
|
||||
maestral = callPackage ../development/python-modules/maestral {
|
||||
|
||||
# https://github.com/SamSchott/maestral/issues/250#issuecomment-739510048
|
||||
survey = self.survey.overridePythonAttrs (old: rec {
|
||||
version = "2.2.1";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "sha256-7ubWkqk1vyaJDLMOuKwUx2Bjziyi3HqpaQq4pKp4Z+0=";
|
||||
};
|
||||
});
|
||||
watchdog = self.watchdog.overridePythonAttrs (old: rec {
|
||||
version = "0.10.3";
|
||||
src = old.src.override {
|
||||
inherit version;
|
||||
sha256 = "4214e1379d128b0588021880ccaf40317ee156d4603ac388b9adcf29165e0c04";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
magic = callPackage ../development/python-modules/magic { };
|
||||
|
||||
@ -6198,7 +6215,7 @@ in {
|
||||
|
||||
pyzufall = callPackage ../development/python-modules/pyzufall { };
|
||||
|
||||
qasm2image = callPackage ../development/python-modules/qasm2image { };
|
||||
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
|
||||
|
||||
qdarkstyle = callPackage ../development/python-modules/qdarkstyle { };
|
||||
|
||||
@ -7123,6 +7140,8 @@ in {
|
||||
|
||||
sure = callPackage ../development/python-modules/sure { };
|
||||
|
||||
survey = callPackage ../development/python-modules/survey { };
|
||||
|
||||
suseapi = callPackage ../development/python-modules/suseapi { };
|
||||
|
||||
svg2tikz = callPackage ../development/python-modules/svg2tikz { };
|
||||
@ -7813,6 +7832,8 @@ in {
|
||||
|
||||
wptserve = callPackage ../development/python-modules/wptserve { };
|
||||
|
||||
wrapio = callPackage ../development/python-modules/wrapio { };
|
||||
|
||||
wrapt = callPackage ../development/python-modules/wrapt { };
|
||||
|
||||
wrf-python = callPackage ../development/python-modules/wrf-python { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user