mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
bef20b38ef
|
|
@ -7266,6 +7266,16 @@
|
|||
githubId = 2770647;
|
||||
name = "Simon Vandel Sillesen";
|
||||
};
|
||||
siriobalmelli = {
|
||||
email = "sirio@b-ad.ch";
|
||||
github = "siriobalmelli";
|
||||
githubId = 23038812;
|
||||
name = "Sirio Balmelli";
|
||||
keys = [{
|
||||
longkeyid = "ed25519/0xF72C4A887F9A24CA";
|
||||
fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA";
|
||||
}];
|
||||
};
|
||||
sivteck = {
|
||||
email = "sivaram1992@gmail.com";
|
||||
github = "sivteck";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Download patches from debian project
|
||||
# Usage $0 debian-patches.txt debian-patches.nix
|
||||
# An example input and output files can be found in applications/graphics/xara/
|
||||
# An example input and output files can be found in tools/graphics/plotutils
|
||||
|
||||
DEB_URL=https://sources.debian.org/data/main
|
||||
declare -a deb_patches
|
||||
|
|
|
|||
|
|
@ -831,6 +831,7 @@
|
|||
./services/web-apps/atlassian/crowd.nix
|
||||
./services/web-apps/atlassian/jira.nix
|
||||
./services/web-apps/codimd.nix
|
||||
./services/web-apps/convos.nix
|
||||
./services/web-apps/cryptpad.nix
|
||||
./services/web-apps/documize.nix
|
||||
./services/web-apps/dokuwiki.nix
|
||||
|
|
|
|||
|
|
@ -15,7 +15,11 @@ let
|
|||
|
||||
listen:
|
||||
(
|
||||
{ host: "${cfg.listenAddress}"; port: "${toString cfg.port}"; }
|
||||
${
|
||||
concatMapStringsSep ",\n"
|
||||
(addr: ''{ host: "${addr}"; port: "${toString cfg.port}"; }'')
|
||||
cfg.listenAddresses
|
||||
}
|
||||
);
|
||||
|
||||
${cfg.appendConfig}
|
||||
|
|
@ -33,6 +37,10 @@ let
|
|||
'';
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
(mkRenamedOptionModule [ "services" "sslh" "listenAddress" ] [ "services" "sslh" "listenAddresses" ])
|
||||
];
|
||||
|
||||
options = {
|
||||
services.sslh = {
|
||||
enable = mkEnableOption "sslh";
|
||||
|
|
@ -55,10 +63,10 @@ in
|
|||
description = "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them";
|
||||
};
|
||||
|
||||
listenAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
description = "Listening address or hostname.";
|
||||
listenAddresses = mkOption {
|
||||
type = types.coercedTo types.str singleton (types.listOf types.str);
|
||||
default = [ "0.0.0.0" "[::]" ];
|
||||
description = "Listening addresses or hostnames.";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
|
|
|
|||
72
nixos/modules/services/web-apps/convos.nix
Normal file
72
nixos/modules/services/web-apps/convos.nix
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.convos;
|
||||
in
|
||||
{
|
||||
options.services.convos = {
|
||||
enable = mkEnableOption "Convos";
|
||||
listenPort = mkOption {
|
||||
type = types.port;
|
||||
default = 3000;
|
||||
example = 8080;
|
||||
description = "Port the web interface should listen on";
|
||||
};
|
||||
listenAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "*";
|
||||
example = "127.0.0.1";
|
||||
description = "Address or host the web interface should listen on";
|
||||
};
|
||||
reverseProxy = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enables reverse proxy support. This will allow Convos to automatically
|
||||
pick up the <literal>X-Forwarded-For</literal> and
|
||||
<literal>X-Request-Base</literal> HTTP headers set in your reverse proxy
|
||||
web server. Note that enabling this option without a reverse proxy in
|
||||
front will be a security issue.
|
||||
'';
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.convos = {
|
||||
description = "Convos Service";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "networking.target" ];
|
||||
environment = {
|
||||
CONVOS_HOME = "%S/convos";
|
||||
CONVOS_REVERSE_PROXY = if cfg.reverseProxy then "1" else "0";
|
||||
MOJO_LISTEN = "http://${toString cfg.listenAddress}:${toString cfg.listenPort}";
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.convos}/bin/convos daemon";
|
||||
Restart = "on-failure";
|
||||
StateDirectory = "convos";
|
||||
WorkingDirectory = "%S/convos";
|
||||
DynamicUser = true;
|
||||
MemoryDenyWriteExecute = true;
|
||||
ProtectHome = true;
|
||||
ProtectClock = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectControlGroups = true;
|
||||
PrivateDevices = true;
|
||||
PrivateMounts = true;
|
||||
PrivateUsers = true;
|
||||
LockPersonality = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictNamespaces = true;
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6"];
|
||||
SystemCallFilter = "@system-service";
|
||||
SystemCallArchitectures = "native";
|
||||
CapabilityBoundingSet = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -65,6 +65,7 @@ in
|
|||
containers-portforward = handleTest ./containers-portforward.nix {};
|
||||
containers-restart_networking = handleTest ./containers-restart_networking.nix {};
|
||||
containers-tmpfs = handleTest ./containers-tmpfs.nix {};
|
||||
convos = handleTest ./convos.nix {};
|
||||
corerad = handleTest ./corerad.nix {};
|
||||
couchdb = handleTest ./couchdb.nix {};
|
||||
deluge = handleTest ./deluge.nix {};
|
||||
|
|
@ -307,6 +308,7 @@ in
|
|||
spacecookie = handleTest ./spacecookie.nix {};
|
||||
spike = handleTest ./spike.nix {};
|
||||
sonarr = handleTest ./sonarr.nix {};
|
||||
sslh = handleTest ./sslh.nix {};
|
||||
strongswan-swanctl = handleTest ./strongswan-swanctl.nix {};
|
||||
sudo = handleTest ./sudo.nix {};
|
||||
switchTest = handleTest ./switch-test.nix {};
|
||||
|
|
|
|||
30
nixos/tests/convos.nix
Normal file
30
nixos/tests/convos.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
import ./make-test-python.nix ({ lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
port = 3333;
|
||||
in
|
||||
{
|
||||
name = "convos";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ sgo ];
|
||||
};
|
||||
|
||||
nodes = {
|
||||
machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
services.convos = {
|
||||
enable = true;
|
||||
listenPort = port;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("convos")
|
||||
machine.wait_for_open_port("${toString port}")
|
||||
machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'")
|
||||
machine.succeed("curl http://localhost:${toString port}/")
|
||||
'';
|
||||
})
|
||||
83
nixos/tests/sslh.nix
Normal file
83
nixos/tests/sslh.nix
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
import ./make-test-python.nix {
|
||||
name = "sslh";
|
||||
|
||||
nodes = {
|
||||
server = { pkgs, lib, ... }: {
|
||||
networking.firewall.allowedTCPPorts = [ 443 ];
|
||||
networking.interfaces.eth1.ipv6.addresses = [
|
||||
{
|
||||
address = "fe00:aa:bb:cc::2";
|
||||
prefixLength = 64;
|
||||
}
|
||||
];
|
||||
# sslh is really slow when reverse dns does not work
|
||||
networking.hosts = {
|
||||
"fe00:aa:bb:cc::2" = [ "server" ];
|
||||
"fe00:aa:bb:cc::1" = [ "client" ];
|
||||
};
|
||||
services.sslh = {
|
||||
enable = true;
|
||||
transparent = true;
|
||||
appendConfig = ''
|
||||
protocols:
|
||||
(
|
||||
{ name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; probe: "builtin"; },
|
||||
{ name: "http"; host: "localhost"; port: "80"; probe: "builtin"; },
|
||||
);
|
||||
'';
|
||||
};
|
||||
services.openssh.enable = true;
|
||||
users.users.root.openssh.authorizedKeys.keyFiles = [ ./initrd-network-ssh/id_ed25519.pub ];
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
virtualHosts."localhost" = {
|
||||
addSSL = false;
|
||||
default = true;
|
||||
root = pkgs.runCommand "testdir" {} ''
|
||||
mkdir "$out"
|
||||
echo hello world > "$out/index.html"
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
client = { ... }: {
|
||||
networking.interfaces.eth1.ipv6.addresses = [
|
||||
{
|
||||
address = "fe00:aa:bb:cc::1";
|
||||
prefixLength = 64;
|
||||
}
|
||||
];
|
||||
networking.hosts."fe00:aa:bb:cc::2" = [ "server" ];
|
||||
environment.etc.sshKey = {
|
||||
source = ./initrd-network-ssh/id_ed25519; # dont use this anywhere else
|
||||
mode = "0600";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
|
||||
server.wait_for_unit("sslh.service")
|
||||
server.wait_for_unit("nginx.service")
|
||||
server.wait_for_unit("sshd.service")
|
||||
server.wait_for_open_port(80)
|
||||
server.wait_for_open_port(443)
|
||||
server.wait_for_open_port(22)
|
||||
|
||||
for arg in ["-6", "-4"]:
|
||||
client.wait_until_succeeds(f"ping {arg} -c1 server")
|
||||
|
||||
# check that ssh through sslh works
|
||||
client.succeed(
|
||||
f"ssh {arg} -p 443 -i /etc/sshKey -o StrictHostKeyChecking=accept-new server 'echo $SSH_CONNECTION > /tmp/foo{arg}'"
|
||||
)
|
||||
|
||||
# check that 1/ the above ssh command had an effect 2/ transparent proxying really works
|
||||
ip = "fe00:aa:bb:cc::1" if arg == "-6" else "192.168.1."
|
||||
server.succeed(f"grep '{ip}' /tmp/foo{arg}")
|
||||
|
||||
# check that http through sslh works
|
||||
assert client.succeed(f"curl {arg} http://server:443").strip() == "hello world"
|
||||
'';
|
||||
}
|
||||
46
pkgs/applications/audio/tuijam/default.nix
Normal file
46
pkgs/applications/audio/tuijam/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ buildPythonApplication
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, python3Packages
|
||||
, youtube-dl
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "tuijam";
|
||||
version = "unstable-2020-06-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cfangmeier";
|
||||
repo = pname;
|
||||
rev = "7baec6f6e80ee90da0d0363b430dd7d5695ff03b";
|
||||
sha256 = "1l0s88jvj99jkxnczw5nfj78m8vihh29g815n4mg9jblad23mgx5";
|
||||
};
|
||||
|
||||
buildInputs = [ python3Packages.Babel ];
|
||||
|
||||
# the package has no tests
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
gmusicapi
|
||||
google_api_python_client
|
||||
mpv
|
||||
pydbus
|
||||
pygobject3
|
||||
pyyaml
|
||||
requests
|
||||
rsa
|
||||
urwid
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fancy TUI client for Google Play Music";
|
||||
longDescription = ''
|
||||
TUIJam seeks to make a simple, attractive, terminal-based interface to
|
||||
listening to music for Google Play Music All-Access subscribers.
|
||||
'';
|
||||
homepage = "https://github.com/cfangmeier/tuijam";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ kalbasit ];
|
||||
};
|
||||
}
|
||||
|
|
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
|
|||
icon = "monero";
|
||||
desktopName = "Monero";
|
||||
genericName = "Wallet";
|
||||
categories = "Application;Network;Utility;";
|
||||
categories = "Network;Utility;";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
desktopName = "Wasabi";
|
||||
genericName = "Bitcoin wallet";
|
||||
comment = meta.description;
|
||||
categories = "Application;Network;Utility;";
|
||||
categories = "Network;Utility;";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "Integrated Development Environment";
|
||||
desktopName = "Eclipse IDE";
|
||||
genericName = "Integrated Development Environment";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
comment = "Integrated Development Environment";
|
||||
desktopName = "Apache NetBeans IDE";
|
||||
genericName = "Integrated Development Environment";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
icon = "netbeans";
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
icon = "avocode";
|
||||
desktopName = "Avocode";
|
||||
genericName = "Design Inspector";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
comment = "The bridge between designers and developers";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "13.2.2";
|
||||
version = "13.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm";
|
||||
sha256 = "0npqw4ih047d9s1yyllcvcih2r61fgji4rvzsw88r02mj5q5rgdn";
|
||||
sha256 = "0zvxmqqbgfxad1n9pa4h99l8hys486wziw5yyndxbv1v80p55p0p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||
desktopName = "SwingSane";
|
||||
genericName = "Scan from local or remote SANE servers";
|
||||
comment = meta.description;
|
||||
categories = "Office;Application;";
|
||||
categories = "Office;";
|
||||
};
|
||||
|
||||
in ''
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
# Generated by debian-patches.sh from debian-patches.txt
|
||||
let
|
||||
prefix = "http://patch-tracker.debian.org/patch/series/dl/xaralx/0.7r1785-5";
|
||||
in
|
||||
[
|
||||
{
|
||||
url = "${prefix}/30_gtk_wxwidgets_symbol_clash";
|
||||
sha256 = "1rc9dh9mnp93mad96dkp7idyhhcw7h6w0g5s92mqgzj79hqgaziz";
|
||||
}
|
||||
{
|
||||
url = "${prefix}/40_algorithm_include";
|
||||
sha256 = "03jhl1qnxj7nl8malf6v1y24aldfz87x1p2jxp04mrr35nzvyyc0";
|
||||
}
|
||||
{
|
||||
url = "${prefix}/50_update_imagemagick_version_parser";
|
||||
sha256 = "1nilsqghlr649sc14n1aqkhdx7f66rq91gqccdpi17jwijs27497";
|
||||
}
|
||||
{
|
||||
url = "${prefix}/remove-icon-suffix";
|
||||
sha256 = "160zmkgwlsanqivnip89558yvd9zvqp8ks2wbyr2aigl2rafin22";
|
||||
}
|
||||
{
|
||||
url = "${prefix}/45_fix_gcc4";
|
||||
sha256 = "06zsj0z9v5n557gj8337v6xd26clbvm4dc0qhvpvzbisq81l9jyi";
|
||||
}
|
||||
{
|
||||
url = "${prefix}/55_fix_contstuctor_call";
|
||||
sha256 = "0b14glrcwhv0ja960h56n5jm4f9563ladap2pgaywihq485ql1c1";
|
||||
}
|
||||
]
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
xaralx/0.7r1785-5
|
||||
30_gtk_wxwidgets_symbol_clash
|
||||
40_algorithm_include
|
||||
50_update_imagemagick_version_parser
|
||||
remove-icon-suffix
|
||||
45_fix_gcc4
|
||||
55_fix_contstuctor_call
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
{stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig
|
||||
, wxGTK, gtk2, perl, zip}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "xaralx-0.7r1785";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2";
|
||||
sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
|
||||
buildInputs = [ wxGTK gtk2 libxml2 freetype pango ];
|
||||
|
||||
configureFlags = [ "--disable-svnversion" ];
|
||||
|
||||
patches = map fetchurl (import ./debian-patches.nix);
|
||||
|
||||
prePatch = "patchShebangs Scripts";
|
||||
|
||||
meta.broken = true;
|
||||
}
|
||||
|
|
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
|
|||
desktopName = "Airtame";
|
||||
icon = name;
|
||||
genericName = comment;
|
||||
categories = "Application;Network;";
|
||||
categories = "Network;";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dbeaver-ce";
|
||||
version = "7.1.0";
|
||||
version = "7.1.1";
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "dbeaver";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
desktopName = "dbeaver";
|
||||
comment = "SQL Integrated Development Environment";
|
||||
genericName = "SQL Integrated Development Environment";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "1q3f5bghm3jw5c7c62ivf32fldjqhmj1a0qlwgqjxyhmfcig0rnb";
|
||||
sha256 = "11c9jvpjg72xkwnni4clwg3inig77s7jz3ik52gk52m6f09brxhs";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
desktopName = "GanttProject";
|
||||
genericName = "Shedule and manage projects";
|
||||
comment = meta.description;
|
||||
categories = "Office;Application;";
|
||||
categories = "Office;";
|
||||
};
|
||||
|
||||
javaOptions = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
desktopName = "GoldenCheetah";
|
||||
genericName = "GoldenCheetah";
|
||||
comment = "Performance software for cyclists, runners and triathletes";
|
||||
categories = "Application;Utility;";
|
||||
categories = "Utility;";
|
||||
};
|
||||
in mkDerivation rec {
|
||||
pname = "golden-cheetah";
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ with builtins; buildDotnetPackage rec {
|
|||
icon = "keepass";
|
||||
desktopName = "Keepass";
|
||||
genericName = "Password manager";
|
||||
categories = "Application;Utility;";
|
||||
categories = "Utility;";
|
||||
mimeType = stdenv.lib.concatStringsSep ";" [
|
||||
"application/x-keepass2"
|
||||
""
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
desktopName = "PDFsam Basic";
|
||||
genericName = "PDF Split and Merge";
|
||||
mimeType = "application/pdf;";
|
||||
categories = "Office;Application;";
|
||||
categories = "Office;";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -46,4 +46,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ maintainers."1000101" ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||
exec = "pgadmin3";
|
||||
icon = "pgAdmin3";
|
||||
type = "Application";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
mimeType = "text/html";
|
||||
};
|
||||
in ''
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "G-code generator for 3D printers";
|
||||
desktopName = "PrusaSlicer";
|
||||
genericName = "3D printer tool";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "G-code generator for 3D printers";
|
||||
desktopName = "Slic3r";
|
||||
genericName = "3D printer tool";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ let
|
|||
icon = pname;
|
||||
comment = description;
|
||||
genericName = "Computer Aided (Interior) Design";
|
||||
categories = "Application;Graphics;2DGraphics;3DGraphics;";
|
||||
categories = "Graphics;2DGraphics;3DGraphics;";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ let
|
|||
name = pname;
|
||||
comment = description;
|
||||
genericName = "Computer Aided (Interior) Design";
|
||||
categories = "Application;Graphics;2DGraphics;3DGraphics;";
|
||||
categories = "Graphics;2DGraphics;3DGraphics;";
|
||||
};
|
||||
|
||||
buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings-desktop-schemas ];
|
||||
|
|
|
|||
1351
pkgs/applications/networking/browsers/asuka/cargo-lock.patch
Normal file
1351
pkgs/applications/networking/browsers/asuka/cargo-lock.patch
Normal file
File diff suppressed because it is too large
Load diff
28
pkgs/applications/networking/browsers/asuka/default.nix
Normal file
28
pkgs/applications/networking/browsers/asuka/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, rustPlatform, fetchurl, pkgconfig, ncurses, openssl, Security }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asuka";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.sr.ht/~julienxx/${pname}/archive/${version}.tar.gz";
|
||||
sha256 = "10hmsdwf2nrsmpycqa08vd31c6vhx7w5fhvv5a9f92sqp0lcavf0";
|
||||
};
|
||||
|
||||
cargoPatches = [ ./cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "0csj63x77nkdh543pzl9cbaip6xp8anw0942hc6j19y7yicd29ns";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ ncurses openssl ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin Security;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Gemini Project client written in Rust with NCurses";
|
||||
homepage = "https://git.sr.ht/~julienxx/asuka";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
||||
|
|
@ -86,11 +86,11 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "brave";
|
||||
version = "1.8.95";
|
||||
version = "1.10.97";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
sha256 = "1mlffg2v31b42gj354w5yv0yzlqc2f4f3cmdnddzkplw10jgw6f1";
|
||||
sha256 = "1qwk75k8km2sy7l3m4k5m383sl75dph4dyrp8hd65x5hnpip67yi";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "0wsqxq8xxcafmjxsjkagysrcbr6qryiyqn6m3ysp256aam7z3d88";
|
||||
sha256bin64 = "03jff1sdv05hbn37cw0ij0r4rils0q11lnnhxg52igg633jzwyc1";
|
||||
version = "84.0.4147.45";
|
||||
sha256 = "1s49qxg0gfmhm1lf5big6hprral21dbzjx0f1cp3xfvag9y61i7h";
|
||||
sha256bin64 = "1sjvi3qmpwpr51442324a853k6s0k59k4809k8j5sjv7h6arw0sm";
|
||||
version = "84.0.4147.56";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "16rmzyzjmxmhmr5yqbzqbwf5sq94iqcwlm04fkafiwcycd17nyhs";
|
||||
sha256bin64 = "0wjmc1wdmwiq9d1f5gk4c9jkj1p116kaz9nb0hvhjf01iv07xl2m";
|
||||
version = "85.0.4168.2";
|
||||
sha256 = "1gxa0jg7xff87z7wvllp84a3ii1ypgy4vfzgxs4k7kzg5x0412vi";
|
||||
sha256bin64 = "0swmn37rmvjvvdcrd002qg1wcvna06y14s3kx34bfr4zxhqk3lby";
|
||||
version = "85.0.4173.0";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "0bvy17ymlih87n4ymnzvyn0m34ghmr1yasvy7gxv02qbw6i57lfg";
|
||||
sha256bin64 = "00hjr5y0cczs6h2pxrigpmjiv24456948v32q7mr7x5ysr5kxpn6";
|
||||
version = "83.0.4103.106";
|
||||
sha256 = "1hravbi1lazmab2mih465alfzji1kzy38zya1visbwz9zs6pw35v";
|
||||
sha256bin64 = "1ggyv2b50sclnqph0r40lb8p9h3pq9aq4fj1wdszhwc4rb0cj746";
|
||||
version = "83.0.4103.116";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ let
|
|||
comment = "";
|
||||
desktopName = "${desktopName}${nameSuffix}${lib.optionalString gdkWayland " (Wayland)"}";
|
||||
genericName = "Web Browser";
|
||||
categories = "Application;Network;WebBrowser;";
|
||||
categories = "Network;WebBrowser;";
|
||||
mimeType = stdenv.lib.concatStringsSep ";" [
|
||||
"text/html"
|
||||
"text/xml"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
|
|||
icon = "palemoon";
|
||||
desktopName = "Pale Moon";
|
||||
genericName = "Web Browser";
|
||||
categories = "Application;Network;WebBrowser;";
|
||||
categories = "Network;WebBrowser;";
|
||||
mimeType = lib.concatStringsSep ";" [
|
||||
"text/html"
|
||||
"text/xml"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
|
||||
|
||||
{ lib, stdenv, python3, fetchFromGitHub }:
|
||||
{ lib, stdenv, python3, pkgs, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
# TODO: This package requires qt5Full to launch
|
||||
defaultOverrides = commonOverrides ++ [
|
||||
(mkOverride "jsonschema" "3.2.0"
|
||||
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
|
||||
|
|
@ -27,6 +26,7 @@ in python.pkgs.buildPythonPackage rec {
|
|||
raven psutil jsonschema # tox for check
|
||||
# Runtime dependencies
|
||||
sip (pyqt5.override { withWebSockets = true; }) distro setuptools
|
||||
pkgs.qt5Full
|
||||
];
|
||||
|
||||
doCheck = false; # Failing
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec {
|
|||
desktopName = "Blink";
|
||||
icon = "blink";
|
||||
genericName = "Instant Messaging";
|
||||
categories = "Application;Internet;";
|
||||
categories = "Internet;";
|
||||
};
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
|
|
|||
|
|
@ -2,19 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gomuks";
|
||||
version = "0.1.0";
|
||||
version = "0.1.2";
|
||||
|
||||
goPackagePath = "maunium.net/go/gomuks";
|
||||
patches = [ ./gomod.patch ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = pname;
|
||||
rev = "v" + version;
|
||||
sha256 = "1dcqkyxiqiyivzn85fwkjy8xs9yk89810x9mvkaiz0dx3ha57zhi";
|
||||
sha256 = "11bainw4w9fdrhv2jm0j9fw0f7r4cxlblyazbhckgr4j9q900383";
|
||||
};
|
||||
|
||||
vendorSha256 = "1mfi167mycnnlq8dwh1kkx6drhhi4ib58aad5fwc90ckdaq1rpb7";
|
||||
vendorSha256 = "11rk7pma6dr6fsyz8hpjyr7nc2c7ichh5m7ds07m89gzk6ar55gb";
|
||||
|
||||
buildInputs = [ olm ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/go.mod b/go.mod
|
||||
index a07e991..ba5ae99 100644
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -9,6 +9,7 @@ require (
|
||||
github.com/lithammer/fuzzysearch v1.1.0
|
||||
github.com/lucasb-eyer/go-colorful v1.0.3
|
||||
github.com/mattn/go-runewidth v0.0.9
|
||||
+ github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
|
||||
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
|
||||
github.com/pkg/errors v0.9.1
|
||||
github.com/rivo/uniseg v0.1.0
|
||||
|
|
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "VoIP and Instant Messaging client";
|
||||
desktopName = "Jitsi";
|
||||
genericName = "Instant Messaging";
|
||||
categories = "Application;X-Internet;";
|
||||
categories = "X-Internet;";
|
||||
};
|
||||
|
||||
libPath = lib.makeLibraryPath ([
|
||||
|
|
|
|||
|
|
@ -19,12 +19,12 @@ with lib;
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "2.1.12";
|
||||
version = "2.1.13";
|
||||
|
||||
# Telegram-Desktop with submodules
|
||||
src = fetchurl {
|
||||
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
|
||||
sha256 = "1b9kgib9dxjcfnw2zdbqd12ikcswkl35nwy9m47x5jvy3glxg6m8";
|
||||
sha256 = "0mq3f7faxn1hfkhv5n37y5iajjnm38s2in631046m0q7c4w3lrfi";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
71
pkgs/applications/networking/irc/convos/default.nix
Normal file
71
pkgs/applications/networking/irc/convos/default.nix
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, shortenPerlShebang }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "convos";
|
||||
version = "4.22";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "Nordaaker";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0a5wq88ncbn7kwcw3z4wdl1wxmx5vq5a7crb1bvbvskgwwy8zfx8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ optional stdenv.isDarwin [ shortenPerlShebang ];
|
||||
|
||||
buildInputs = with perlPackages; [
|
||||
CryptEksblowfish FileHomeDir FileReadBackwards
|
||||
IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall
|
||||
Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginWebpack
|
||||
ParseIRC TextMarkdown TimePiece UnicodeUTF8
|
||||
CpanelJSONXS EV
|
||||
];
|
||||
|
||||
checkInputs = with perlPackages; [ TestDeep TestMore ];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs script/convos
|
||||
'';
|
||||
|
||||
# A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in
|
||||
# the sandbox, we replace the this out from a substitution expression
|
||||
#
|
||||
# Module::Install is a runtime dependency not covered by the tests, so we add
|
||||
# a test for it.
|
||||
#
|
||||
preCheck = ''
|
||||
substituteInPlace t/web-register-open-to-public.t \
|
||||
--replace '!127.0.0.1!' '!localhost!'
|
||||
|
||||
echo "use Test::More tests => 1;require_ok('Module::Install')" \
|
||||
> t/00_nixpkgs_module_install.t
|
||||
'';
|
||||
|
||||
# Convos expects to find assets in both auto/share/dist/Convos, and $MOJO_HOME
|
||||
# which is set to $out
|
||||
#
|
||||
postInstall = ''
|
||||
AUTO_SHARE_PATH=$out/${perl.libPrefix}/auto/share/dist/Convos
|
||||
mkdir -p $AUTO_SHARE_PATH
|
||||
cp -vR public assets $AUTO_SHARE_PATH/
|
||||
ln -s $AUTO_SHARE_PATH/public/asset $out/asset
|
||||
cp -vR templates $out/templates
|
||||
cp cpanfile $out/cpanfile
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
shortenPerlShebang $out/bin/convos
|
||||
'' + ''
|
||||
wrapProgram $out/bin/convos --set MOJO_HOME $out
|
||||
'';
|
||||
|
||||
passthru.tests = nixosTests.convos;
|
||||
|
||||
meta = {
|
||||
homepage = "https://convos.chat";
|
||||
description = "Convos is the simplest way to use IRC in your browser";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
maintainers = with maintainers; [ sgo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -22,7 +22,7 @@ let
|
|||
icon = "anydesk";
|
||||
desktopName = "AnyDesk";
|
||||
genericName = description;
|
||||
categories = "Application;Network;";
|
||||
categories = "Network;";
|
||||
startupNotify = "false";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
|||
name = "jabref";
|
||||
desktopName = "JabRef";
|
||||
genericName = "Bibliography manager";
|
||||
categories = "Application;Office;";
|
||||
categories = "Office;";
|
||||
icon = "jabref";
|
||||
exec = "jabref";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ let
|
|||
comment = "Schematic capture and PCB layout";
|
||||
desktopName = "Eagle";
|
||||
genericName = "Schematic editor";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "Schematic capture and PCB layout";
|
||||
desktopName = "Eagle";
|
||||
genericName = "Schematic editor";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
dontAddPrefix = true;
|
||||
|
||||
installPhase = ''
|
||||
install -Dm0755 build/cadical "$out/bin/cadical"
|
||||
install -Dm0755 build/mobical "$out/bin/mobical"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ let
|
|||
comment = "IDE for TLA+";
|
||||
desktopName = name;
|
||||
genericName = comment;
|
||||
categories = "Application;Development";
|
||||
categories = "Development";
|
||||
extraEntries = ''
|
||||
StartupWMClass=TLA+ Toolbox
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "0m4qgvhd4fzl83acfbpwff0sqshyfhqiy5q4i7ly8h6rdsjysdck";
|
||||
sha256 = "0q4zpm10hcci4j0g1gx08q2qwn71ab9f7yaf4k78sfn5p89y7rm2";
|
||||
};
|
||||
|
||||
vendorSha256 = "0zkgdb69zm662p50sk1663lcbkw0vp8ip9blqfp6539mp9b87dn7";
|
||||
vendorSha256 = "0igbqnylryiq36lbb1gha8najijzxmn10asc0xayxygbxc16s1vi";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
|
|||
icon = "gitkraken";
|
||||
desktopName = "GitKraken";
|
||||
genericName = "Git Client";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
comment = "Graphical Git client from Axosoft";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "11";
|
||||
patch_version = "0+alpha2";
|
||||
sha256 = "131ixp5kkgk9y42vrprhc2x0gpxhkapmdmb26pwkyl58vrbr8xqg";
|
||||
patch_version = "0+alpha3";
|
||||
sha256 = "0c2g8ncq15nx9pdl14hnsc9342j80s7i1bsyiw98cvgic5miyw9b";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ callPackage, ... }:
|
||||
|
||||
callPackage ./generic-v3.nix {
|
||||
version = "3.12.0";
|
||||
sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a";
|
||||
version = "3.12.3";
|
||||
sha256 = "0q4sn9d6x8w0zgzydfx9f7b2zdk0kiplk8h9jxyxhw6m9qn276ax";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@ assert (!blas.isILP64) && (!lapack.isILP64);
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sundials";
|
||||
version = "5.1.0";
|
||||
version = "5.3.0";
|
||||
|
||||
buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "08cvzmbr2qc09ayq4f5j07lw97hl06q4dl26vh4kh822mm7x28pv";
|
||||
sha256 = "19xwi7pz35s2nqgldm6r0jl2k0bs36zhbpnmmzc56s1n3bhzgpw8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ stdenv
|
||||
, cmake
|
||||
, perl
|
||||
, pkg-config
|
||||
, ninja
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, zip
|
||||
|
|
@ -23,12 +22,6 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# Fix ninja parsing
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gdraheim/zziplib/commit/75e22f3c365b62acbad8d8645d5404242800dfba.patch";
|
||||
sha256 = "IB0am3K0x4+Ug1CKvowTtkS8JD6zHJJ247A7guJOw80=";
|
||||
})
|
||||
|
||||
# Install man pages
|
||||
(fetchpatch {
|
||||
url = "https://github.com/gdraheim/zziplib/commit/5583ccc7a247ee27556ede344e93d3ac1dc72e9b.patch";
|
||||
|
|
@ -44,9 +37,8 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
perl
|
||||
pkg-config
|
||||
ninja # make fails, unable to find test2.zip
|
||||
zip
|
||||
python3
|
||||
xmlto
|
||||
|
|
@ -60,10 +52,6 @@ stdenv.mkDerivation rec {
|
|||
unzip
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
|
||||
];
|
||||
|
||||
# tests are broken (https://github.com/gdraheim/zziplib/issues/20),
|
||||
# and test/zziptests.py requires network access
|
||||
# (https://github.com/gdraheim/zziplib/issues/24)
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
|
||||
|
||||
let version = "2.0.0"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ocaml-base64";
|
||||
inherit version;
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz";
|
||||
sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib ocamlbuild ];
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/mirage/ocaml-base64";
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
description = "Base64 encoding and decoding in OCaml";
|
||||
license = stdenv.lib.licenses.isc;
|
||||
maintainers = with stdenv.lib.maintainers; [ vbgl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv
|
||||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchFromGitHub
|
||||
, cmdliner
|
||||
|
|
@ -15,17 +15,15 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "torch";
|
||||
version = "0.8";
|
||||
|
||||
owner = "LaurentMazare";
|
||||
version = "0.9b";
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit owner;
|
||||
owner = "LaurentMazare";
|
||||
repo = "ocaml-${pname}";
|
||||
rev = version;
|
||||
sha256 = "19w31paj24pns2ahk9j9rgpkb5hpcd41kfaarxrlddww5dl6pxvi";
|
||||
sha256 = "1xn8zfs3viz80agckcpl9a4vjbq6j5g280i95jyy5s0zbcnajpnm";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -47,7 +45,7 @@ buildDunePackage rec {
|
|||
doCheck = true;
|
||||
checkPhase = "dune runtest";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
inherit (src.meta) homepage;
|
||||
description = "Ocaml bindings to Pytorch";
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, beancount
|
||||
, pytest, sh
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.0";
|
||||
pname = "beancount_docverif";
|
||||
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1kjc0axrxpvm828lqq5m2ikq0ls8xksbmm7312zw867gdx56x5aj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beancount
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytest
|
||||
sh
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/siriobalmelli/beancount_docverif";
|
||||
description = "Document verification plugin for Beancount";
|
||||
longDescription = ''
|
||||
Docverif is the "Document Verification" plugin for beancount, fulfilling the following functions:
|
||||
|
||||
- Require that every transaction touching an account have an accompanying document on disk.
|
||||
- Explictly declare the name of a document accompanying a transaction.
|
||||
- Explicitly declare that a transaction is expected not to have an accompanying document.
|
||||
- Look for an "implicit" PDF document matching transaction data.
|
||||
- Associate (and require) a document with any type of entry, including open entries themselves.
|
||||
- Guarantee integrity: verify that every document declared does in fact exist on disk.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siriobalmelli ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bitstruct";
|
||||
version = "8.10.0";
|
||||
version = "8.11.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm";
|
||||
sha256 = "0p9d5242pkzag7ac5b5zdjyfqwxvj2jisyjghp6yhjbbwz1z44rb";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "internetarchive";
|
||||
version = "1.9.3";
|
||||
version = "1.9.4";
|
||||
|
||||
# Can't use pypi, data files for tests missing
|
||||
src = fetchFromGitHub {
|
||||
owner = "jjjake";
|
||||
repo = "internetarchive";
|
||||
rev = "v${version}";
|
||||
sha256 = "19av6cpps2qldfl3wb9mcirs1a48a4466m1v9k9yhdznqi4zb0ji";
|
||||
sha256 = "10xlblj21hanahsmw6lfggbrbpw08pdmvdgds1p58l8xd4fazli8";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
From fd56b0d85393d684bd3bf99f33d8638da884282f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Thu, 25 Jun 2020 09:52:11 +0100
|
||||
Subject: [PATCH] disable flake8/black8/coverage from tests
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
pytest.ini | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pytest.ini b/pytest.ini
|
||||
index 5027d34..4e2a2d2 100644
|
||||
--- a/pytest.ini
|
||||
+++ b/pytest.ini
|
||||
@@ -1,5 +1,5 @@
|
||||
[pytest]
|
||||
norecursedirs=dist build .tox .eggs
|
||||
-addopts=--doctest-modules --flake8 --black --cov
|
||||
+addopts=--doctest-modules
|
||||
doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES
|
||||
filterwarnings=
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -12,6 +12,11 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
patches = [
|
||||
./0001-Don-t-run-flake8-checks-during-the-build.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ inflect more-itertools six ];
|
||||
checkInputs = [ pytest ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "lazr.uri";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
|
||||
disabled = isPy27; # namespace is broken for python2
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5c620b5993c8c6a73084176bfc51de64972b8373620476ed841931a49752dc8b";
|
||||
sha256 = "1griz2r0vhi9k91wfhlx5cx7y3slkfyzyqldaa9i0zp850iqz0q2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
|
|
|
|||
42
pkgs/development/python-modules/pycoin/default.nix
Normal file
42
pkgs/development/python-modules/pycoin/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ stdenv
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, gnupg
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycoin";
|
||||
version = "0.90.20200322";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c8af579e86c118deb64d39e0d844d53a065cdd8227ddd632112e5667370b53a3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./pycoin/cmds/tx.py --replace '"gpg"' '"${gnupg}/bin/gpg"'
|
||||
'';
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
dontUseSetuptoolsCheck = true;
|
||||
|
||||
# Disable tests depending on online services
|
||||
disabledTests = [
|
||||
"ServicesTest"
|
||||
"test_tx_pay_to_opcode_list_txt"
|
||||
"test_tx_fetch_unspent"
|
||||
"test_tx_with_gpg"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Utilities for Bitcoin and altcoin addresses and transaction manipulation";
|
||||
homepage = "https://github.com/richardkiss/pycoin";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ nyanloutre ];
|
||||
};
|
||||
}
|
||||
29
pkgs/development/python-modules/pytest-freezegun/default.nix
Normal file
29
pkgs/development/python-modules/pytest-freezegun/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, freezegun
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-freezegun";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "060cdf192848e50a4a681a5e73f8b544c4ee5ebc1fab3cb7223a0097bac2f83f";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
freezegun
|
||||
pytest
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wrap tests with fixtures in freeze_time";
|
||||
homepage = "https://github.com/ktosiek/pytest-freezegun";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,15 +3,17 @@
|
|||
, fetchPypi
|
||||
, pytest
|
||||
, virtual-display
|
||||
, isPy27
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-xvfb";
|
||||
version = "1.2.0";
|
||||
version = "2.0.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a7544ca8d0c7c40db4b40d7a417a7b071c68d6ef6bdf9700872d7a167302f979";
|
||||
sha256 = "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
|||
comment = "Scientific Python Development Environment";
|
||||
desktopName = "Spyder";
|
||||
genericName = "Python IDE";
|
||||
categories = "Application;Development;IDE;";
|
||||
categories = "Development;IDE;";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
24
pkgs/development/python-modules/srvlookup/default.nix
Normal file
24
pkgs/development/python-modules/srvlookup/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ stdenv, fetchPypi, buildPythonPackage
|
||||
, dnspython
|
||||
, mock, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "srvlookup";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1zf1v04zd5phabyqh0nhplr5a8vxskzfrzdh4akljnz1yk2n2a0b";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dnspython ];
|
||||
checkInputs = [ mock nose ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/gmr/srvlookup";
|
||||
license = [ licenses.bsd3 ];
|
||||
description = "A small wrapper for dnspython to return SRV records for a given host, protocol, and domain name as a list of namedtuples.";
|
||||
maintainers = [ maintainers.mmlb ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
From 9dfd2a8fac4a643fd007390762ccc8564588b4bf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
||||
Date: Thu, 25 Jun 2020 10:16:52 +0100
|
||||
Subject: [PATCH] pytest: remove flake8/black/coverage
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
||||
---
|
||||
pytest.ini | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pytest.ini b/pytest.ini
|
||||
index bd6998d..a464529 100644
|
||||
--- a/pytest.ini
|
||||
+++ b/pytest.ini
|
||||
@@ -1,6 +1,6 @@
|
||||
[pytest]
|
||||
norecursedirs=dist build .tox .eggs
|
||||
-addopts=--doctest-modules --flake8 --black --cov
|
||||
+addopts=--doctest-modules
|
||||
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
|
||||
filterwarnings=
|
||||
# suppress known warning
|
||||
--
|
||||
2.27.0
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, buildPythonPackage, fetchPypi
|
||||
, setuptools_scm, pytest, freezegun, backports_unittest-mock
|
||||
, pytest-black, pytestcov, pytest-flake8
|
||||
, six, pytz, jaraco_functools }:
|
||||
, setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock
|
||||
, six, pytz, jaraco_functools, pythonOlder }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tempora";
|
||||
|
|
@ -12,15 +11,22 @@ buildPythonPackage rec {
|
|||
sha256 = "e370d822cf48f5356aab0734ea45807250f5120e291c76712a1d766b49ae34f8";
|
||||
};
|
||||
|
||||
disabled = pythonOlder "3.2";
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
patches = [
|
||||
./0001-pytest-remove-flake8-black-coverage.patch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ six pytz jaraco_functools ];
|
||||
|
||||
checkInputs = [ pytest pytest-flake8 pytest-black pytestcov freezegun backports_unittest-mock ];
|
||||
checkInputs = [
|
||||
pytest-freezegun pytest freezegun backports_unittest-mock
|
||||
];
|
||||
|
||||
# missing pytest-freezegun package
|
||||
checkPhase = ''
|
||||
pytest -k 'not get_nearest_year_for_day'
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, stdenv
|
||||
, setuptools_scm
|
||||
, pytest
|
||||
, typing-extensions
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
|
|
@ -25,7 +26,7 @@ buildPythonPackage rec {
|
|||
substituteInPlace setup.cfg --replace " --cov" ""
|
||||
'';
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
checkInputs = [ pytest typing-extensions ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test .
|
||||
|
|
|
|||
|
|
@ -44,6 +44,9 @@ buildPythonPackage rec {
|
|||
"--tb=native"
|
||||
# ignore code linting tests
|
||||
"--ignore=tests/test_sourcecode.py"
|
||||
# Fails on Python 3.8
|
||||
# https://salsa.debian.org/python-team/modules/uvloop/-/commit/302a7e8f5a2869e13d0550cd37e7a8f480e79869
|
||||
"--ignore=tests/test_tcp.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "bazel-buildtools";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
goPackagePath = "github.com/bazelbuild/buildtools";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "bazelbuild";
|
||||
repo = "buildtools";
|
||||
rev = version;
|
||||
sha256 = "1f2shjskcmn3xpgvb9skli5xaf942wgyg5ps7r905n1zc0gm8izn";
|
||||
sha256 = "0g411gjbm02qd5b50iy6kk81kx2n5zw5x1m6i6g7nrmh38p3pn9k";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ let
|
|||
desktopName = "Oracle SQL Developer";
|
||||
genericName = "Oracle SQL Developer";
|
||||
comment = "Oracle's Oracle DB GUI client";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "Java Troubleshooting Tool";
|
||||
desktopName = "VisualVM";
|
||||
genericName = "Java Troubleshooting Tool";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }:
|
||||
{ fetchFromGitHub, nixStable, callPackage, nixFlakes, nixosTests }:
|
||||
|
||||
{
|
||||
# Package for phase-1 of the db migration for Hydra.
|
||||
|
|
@ -24,22 +24,15 @@
|
|||
# so when having an older version, `pkgs.hydra-migration` should be deployed first.
|
||||
|
||||
hydra-unstable = callPackage ./common.nix {
|
||||
version = "2020-06-01";
|
||||
version = "2020-06-23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "hydra";
|
||||
rev = "750e2e618ac6d3df02c57a2cf8758bc66a27c40a";
|
||||
sha256 = "1szfzf9kw5cj6yn57gfxrffbdkdf8v3xy9914924blpn5qll31g4";
|
||||
rev = "bb32aafa4a9b027c799e29b1bcf68727e3fc5f5b";
|
||||
sha256 = "0kl9h70akwxpik3xf4dbbh7cyqn06023kshfvi14mygdlb84djgx";
|
||||
};
|
||||
nix = nixFlakes;
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/hydra/commit/d4822a5f4b57dff26bdbf436723a87dd62bbcf30.patch";
|
||||
sha256 = "1n6hyjz1hzvka4wi78d4wg0sg2wanrdmizqy23vmp7pmv8s3gz8w";
|
||||
})
|
||||
];
|
||||
|
||||
tests = {
|
||||
db-migration = nixosTests.hydra-db-migration.mig;
|
||||
basic = nixosTests.hydra.hydra-unstable;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "Software for Saleae logic analyzers";
|
||||
desktopName = "Saleae Logic";
|
||||
genericName = "Logic analyzer";
|
||||
categories = "Application;Development";
|
||||
categories = "Development";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ let
|
|||
name = "stm32CubeMX";
|
||||
exec = "stm32cubemx";
|
||||
desktopName = "STM32CubeMX";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
icon = "stm32cubemx";
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
|
||||
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
|
||||
, libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb, chromium
|
||||
, libpqxx
|
||||
, libpqxx, libselinux, pciutils, libpulseaudio
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -15,6 +15,8 @@ let
|
|||
libX11 libXcursor libXdamage libXfixes libXrender libXi
|
||||
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
|
||||
libpqxx gtk3
|
||||
|
||||
libselinux pciutils libpulseaudio
|
||||
];
|
||||
libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ];
|
||||
binPath = lib.makeBinPath [ nodejs gnutar ];
|
||||
|
|
@ -56,6 +58,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
mkdir -p $out/bin
|
||||
makeWrapper $unitydir/Unity $out/bin/unity-editor \
|
||||
--prefix LD_LIBRARY_PATH : "${libPath64}" \
|
||||
--prefix LD_PRELOAD : "$unitydir/libunity-nosuid.so" \
|
||||
--prefix PATH : "${binPath}"
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -11,7 +11,10 @@ in appimageTools.wrapType2 rec {
|
|||
libpqxx gtk3 libsecret lsb-release openssl nodejs ncurses5
|
||||
|
||||
libX11 libXcursor libXdamage libXfixes libXrender libXi
|
||||
libXcomposite libXext libXrandr libXtst libSM libICE libxcb ]);
|
||||
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
|
||||
|
||||
libselinux pciutils libpulseaudio
|
||||
]);
|
||||
|
||||
profile = ''
|
||||
export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
|
|||
comment = "Platform independend Python debugger";
|
||||
desktopName = "Winpdb";
|
||||
genericName = "Python Debugger";
|
||||
categories = "Application;Development;Debugger;";
|
||||
categories = "Development;Debugger;";
|
||||
};
|
||||
|
||||
# Don't call gnome-terminal with "--disable-factory" flag, which is
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "postman";
|
||||
version = "7.24.0";
|
||||
version = "7.26.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.pstmn.io/download/version/${version}/linux64";
|
||||
sha256 = "0wriyj58icgljmghghyxi1mnjr1vh5jyp8lzwcf6lcsdvsh0ccmw";
|
||||
sha256 = "05xs389bf0127n8rdivbfxvgjvlrk9pyr74klswwlksxciv74i3j";
|
||||
name = "${pname}.tar.gz";
|
||||
};
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "API Development Environment";
|
||||
desktopName = "Postman";
|
||||
genericName = "Postman";
|
||||
categories = "Application;Development;";
|
||||
categories = "Development;";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
desktopName = "AssaultCube";
|
||||
comment = "A multiplayer, first-person shooter game, based on the CUBE engine. Fast, arcade gameplay.";
|
||||
genericName = "First-person shooter";
|
||||
categories = "Application;Game;ActionGame;Shooter";
|
||||
categories = "Game;ActionGame;Shooter";
|
||||
icon = "assaultcube.png";
|
||||
exec = pname;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
comment = "Duke Nukem 3D port";
|
||||
desktopName = "Enhanced Duke Nukem 3D";
|
||||
genericName = "Duke Nukem 3D port";
|
||||
categories = "Application;Game;";
|
||||
categories = "Game;";
|
||||
};
|
||||
|
||||
wrapper = "eduke32-wrapper";
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ let
|
|||
comment = description;
|
||||
desktopName = "Frogatto";
|
||||
genericName = "frogatto";
|
||||
categories = "Application;Game;ArcadeGame;";
|
||||
categories = "Game;ArcadeGame;";
|
||||
};
|
||||
version = "unstable-2018-12-18";
|
||||
in buildEnv {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ let
|
|||
icon = "minecraft-launcher";
|
||||
comment = "Official launcher for Minecraft, a sandbox-building game";
|
||||
desktopName = "Minecraft Launcher";
|
||||
categories = "Game;Application;";
|
||||
categories = "Game;";
|
||||
};
|
||||
|
||||
envLibPath = stdenv.lib.makeLibraryPath [
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
terminal = "false";
|
||||
desktopName = "RuneLite";
|
||||
genericName = "Oldschool Runescape";
|
||||
categories = "Application;Game";
|
||||
categories = "Game";
|
||||
startupNotify = null;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ let
|
|||
desktopName = "Unreal Tournament 2004";
|
||||
comment = "A first-person shooter video game developed by Epic Games and Digital Extreme";
|
||||
genericName = "First-person shooter";
|
||||
categories = "Application;Game;";
|
||||
categories = "Game;";
|
||||
exec = "ut2004";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ let
|
|||
comment = "A modular ComputerCraft emulator";
|
||||
desktopName = "CCEmuX";
|
||||
genericName = "ComputerCraft Emulator";
|
||||
categories = "Application;Emulator;";
|
||||
categories = "Emulator;";
|
||||
};
|
||||
in
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "x86 emulator with internal DOS";
|
||||
desktopName = "DOSBox";
|
||||
genericName = "DOS emulator";
|
||||
categories = "Application;Emulator;";
|
||||
categories = "Emulator;";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
comment = "Commodore 64 emulator";
|
||||
desktopName = "VICE";
|
||||
genericName = "Commodore 64 emulator";
|
||||
categories = "Application;Emulator;";
|
||||
categories = "Emulator;";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
|
|
|
|||
|
|
@ -109,6 +109,19 @@ in rec {
|
|||
};
|
||||
};
|
||||
|
||||
fingers = mkDerivation rec {
|
||||
pluginName = "fingers";
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Morantron";
|
||||
repo = "tmux-fingers";
|
||||
rev = version;
|
||||
sha256 = "0gp37m3d0irrsih96qv2yalvr1wmf1n64589d4qzyzq16lzyjcr0";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
dependencies = [ pkgs.gawk ];
|
||||
};
|
||||
|
||||
fpp = mkDerivation {
|
||||
pluginName = "fpp";
|
||||
version = "unstable-2016-03-08";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre }:
|
||||
{ stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sslh";
|
||||
|
|
@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) sslh;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }:
|
||||
|
||||
let version = "20.6"; in
|
||||
stdenv.mkDerivation {
|
||||
name = "cjdns-"+version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cjdns";
|
||||
version = "20.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cjdelisle";
|
||||
repo = "cjdns";
|
||||
rev = "cjdns-v${version}";
|
||||
sha256 = "1d5rrnqb5dcmm5cg2ky1cgxz6ncb23n1j797j9zzw6xxdvkf3kgi";
|
||||
sha256 = "09gpqpzc00pp3cj7lyq9876p7is4bcndpdi5knqbv824vk4bj3k0";
|
||||
};
|
||||
|
||||
buildInputs = [ which python27 nodejs ] ++
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "aws-okta";
|
||||
version = "0.26.3";
|
||||
version = "1.0.2";
|
||||
|
||||
goPackagePath = "github.com/segmentio/aws-okta";
|
||||
|
||||
|
|
@ -10,13 +10,13 @@ buildGoPackage rec {
|
|||
owner = "segmentio";
|
||||
repo = "aws-okta";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n6xm3yv0lxfapchzfrqi05hk918n4lh1hcp7gq7hybam93rld96";
|
||||
sha256 = "0rqkbhprz1j9b9bx3wvl5zi4p02q1qza905wkrvh42f9pbknajww";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
buildFlags = [ "--tags" "release" ];
|
||||
|
||||
buildFlagsArray = [ "-ldflags=-X main.Version=${version}" ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libusb1 libiconv ];
|
||||
|
||||
|
|
|
|||
29
pkgs/tools/security/aws-okta/deps.nix
generated
29
pkgs/tools/security/aws-okta/deps.nix
generated
|
|
@ -1,29 +0,0 @@
|
|||
[
|
||||
{
|
||||
goPackagePath = "github.com/sirupsen/logrus";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sirupsen/logrus.git";
|
||||
rev = "a437dfd2463eaedbec3dfe443e477d3b0a810b3f";
|
||||
sha256 = "1904s2bbc7p88anzjp6fyj3jrbm5p6wbb8j4490674dq10kkcfbj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys/unix";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/golang/sys.git";
|
||||
rev = "b699b7032584f0953262cb2788a0ca19bb494703";
|
||||
sha256 = "172sw1bm581qwal9pbf9qj1sgivr74nabbj8qq4q4fhgpzams9ix";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/marshallbrekka/go-u2fhost";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/marshallbrekka/go-u2fhost";
|
||||
rev = "72b0e7a3f583583996b3b382d2dfaa81fdc4b82c";
|
||||
sha256 = "0apzmf0bjpr58ynw55agyjsl74zyg5qjk19nyyy4zhip3s9b1d0h";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -626,6 +626,7 @@ mapAliases ({
|
|||
xfce4-14 = xfce;
|
||||
xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14
|
||||
x11 = xlibsWrapper; # added 2015-09
|
||||
xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24
|
||||
xbmc = kodi; # added 2018-04-25
|
||||
xbmcPlain = kodiPlain; # added 2018-04-25
|
||||
xbmcPlugins = kodiPlugins; # added 2018-04-25
|
||||
|
|
|
|||
|
|
@ -564,6 +564,8 @@ in
|
|||
|
||||
adlplug = callPackage ../applications/audio/adlplug { };
|
||||
|
||||
tuijam = callPackage ../applications/audio/tuijam { inherit (python3Packages) buildPythonApplication; };
|
||||
|
||||
opnplug = callPackage ../applications/audio/adlplug {
|
||||
adlplugChip = "-DADLplug_CHIP=OPN2";
|
||||
pname = "OPNplug";
|
||||
|
|
@ -18807,6 +18809,10 @@ in
|
|||
|
||||
arora = callPackage ../applications/networking/browsers/arora { };
|
||||
|
||||
asuka = callPackage ../applications/networking/browsers/asuka {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
artha = callPackage ../applications/misc/artha { };
|
||||
|
||||
atlassian-cli = callPackage ../applications/office/atlassian-cli { };
|
||||
|
|
@ -19170,6 +19176,8 @@ in
|
|||
codeblocks = callPackage ../applications/editors/codeblocks { };
|
||||
codeblocksFull = codeblocks.override { contribPlugins = true; };
|
||||
|
||||
convos = callPackage ../applications/networking/irc/convos { };
|
||||
|
||||
comical = callPackage ../applications/graphics/comical { };
|
||||
|
||||
containerd = callPackage ../applications/virtualization/containerd { };
|
||||
|
|
@ -23122,8 +23130,6 @@ in
|
|||
libpng = libpng12;
|
||||
};
|
||||
|
||||
xara = callPackage ../applications/graphics/xara { };
|
||||
|
||||
xastir = callPackage ../applications/misc/xastir {
|
||||
rastermagick = imagemagick;
|
||||
inherit (xorg) libXt;
|
||||
|
|
|
|||
|
|
@ -42,8 +42,6 @@ let
|
|||
|
||||
atdgen = callPackage ../development/ocaml-modules/atdgen { };
|
||||
|
||||
base64_2 = callPackage ../development/ocaml-modules/base64/2.0.nix { };
|
||||
|
||||
base64 = callPackage ../development/ocaml-modules/base64 { };
|
||||
|
||||
bap = callPackage ../development/ocaml-modules/bap {
|
||||
|
|
|
|||
|
|
@ -9698,6 +9698,21 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
IRCUtils = buildPerlPackage {
|
||||
pname = "IRC-Utils";
|
||||
version = "0.12";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/H/HI/HINRIK/IRC-Utils-0.12.tar.gz";
|
||||
sha256 = "c7d6311eb6c79e983833c9e6b4e8d426d07a9874d20f4bc641b313b99c9bc8a0";
|
||||
};
|
||||
meta = {
|
||||
homepage = "http://metacpan.org/release/IRC-Utils";
|
||||
description = "Common utilities for IRC-related tasks";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = with maintainers; [ sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
# TODO: use CPAN version
|
||||
ImageExifTool = buildPerlPackage {
|
||||
pname = "Image-ExifTool";
|
||||
|
|
@ -9931,10 +9946,10 @@ let
|
|||
|
||||
JSONValidator = buildPerlPackage {
|
||||
pname = "JSON-Validator";
|
||||
version = "3.23";
|
||||
version = "4.00";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-3.23.tar.gz";
|
||||
sha256 = "1fzy2z7mkg5vgcjvykh5ay8yg6q496wi14x9wp5hc9agplsq7f0s";
|
||||
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.00.tar.gz";
|
||||
sha256 = "09p6n5ahsa13fmxb01siz9hcmyswgb05ac2njbhzim6cnx9d6cwj";
|
||||
};
|
||||
buildInputs = [ TestDeep ];
|
||||
propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ];
|
||||
|
|
@ -10302,6 +10317,23 @@ let
|
|||
doCheck = false;
|
||||
};
|
||||
|
||||
LinkEmbedder = buildPerlPackage {
|
||||
pname = "LinkEmbedder";
|
||||
version = "1.12";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/LinkEmbedder-1.12.tar.gz";
|
||||
sha256 = "1fd25bd6047b45cdcb1ab71a3d3bb0b36c71ec844a8742dee0bb34f8587fbd08";
|
||||
};
|
||||
buildInputs = [ TestDeep ];
|
||||
propagatedBuildInputs = [ Mojolicious ];
|
||||
meta = {
|
||||
homepage = "https://github.com/jhthorsen/linkembedder";
|
||||
description = "Embed / expand oEmbed resources and other URL / links";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
maintainers = with maintainers; [ sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
LinuxACL = buildPerlPackage {
|
||||
pname = "Linux-ACL";
|
||||
version = "0.05";
|
||||
|
|
@ -12285,16 +12317,16 @@ let
|
|||
|
||||
Mojolicious = buildPerlPackage {
|
||||
pname = "Mojolicious";
|
||||
version = "8.32";
|
||||
version = "8.55";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.32.tar.gz";
|
||||
sha256 = "11fyz534syihisl8498655bqq4y8c73a6xhvl1wlq4axdgkm0d2h";
|
||||
url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.55.tar.gz";
|
||||
sha256 = "116f79a8jvdk0zfj34gp3idhxgk4l8qq4ka6pwhdp8pmks969w0x";
|
||||
};
|
||||
meta = {
|
||||
homepage = "https://mojolicious.org";
|
||||
description = "Real-time web framework";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
maintainers = [ maintainers.thoughtpolice ];
|
||||
maintainers = with maintainers; [ thoughtpolice sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -12316,10 +12348,10 @@ let
|
|||
|
||||
MojoliciousPluginOpenAPI = buildPerlPackage {
|
||||
pname = "Mojolicious-Plugin-OpenAPI";
|
||||
version = "2.21";
|
||||
version = "3.33";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.21.tar.gz";
|
||||
sha256 = "34b1f42d846c26d8be3a3556dc5a02dd7ab47c5612b41d3caf1ce6bc16101dc2";
|
||||
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-3.33.tar.gz";
|
||||
sha256 = "0lccvanc3cici83j6fx7gg3wdcsvgv8d7hzd06r0q1mp8329sbv4";
|
||||
};
|
||||
propagatedBuildInputs = [ JSONValidator ];
|
||||
meta = {
|
||||
|
|
@ -12362,6 +12394,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
MojoliciousPluginWebpack = buildPerlPackage {
|
||||
pname = "Mojolicious-Plugin-Webpack";
|
||||
version = "0.12";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Webpack-0.12.tar.gz";
|
||||
sha256 = "2a0856e68446fc22b46692d9a6737f78467654f31e58ad1935e708bddf806d2c";
|
||||
};
|
||||
propagatedBuildInputs = [ Mojolicious ];
|
||||
meta = {
|
||||
homepage = "https://github.com/jhthorsen/mojolicious-plugin-webpack";
|
||||
description = "Mojolicious <3 Webpack";
|
||||
license = stdenv.lib.licenses.artistic2;
|
||||
maintainers = with maintainers; [ sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
MojoRedis = buildPerlPackage {
|
||||
pname = "Mojo-Redis";
|
||||
version = "3.24";
|
||||
|
|
@ -14718,6 +14766,21 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
ParseIRC = buildPerlPackage {
|
||||
pname = "Parse-IRC";
|
||||
version = "1.22";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/B/BI/BINGOS/Parse-IRC-1.22.tar.gz";
|
||||
sha256 = "457b09897f37d38a7054f9563247365427fe24101622ed4c7f054723a45b58d5";
|
||||
};
|
||||
meta = {
|
||||
homepage = "https://github.com/bingos/parse-irc";
|
||||
description = "A parser for the IRC protocol";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = with maintainers; [ sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
ParseLocalDistribution = buildPerlPackage {
|
||||
pname = "Parse-LocalDistribution";
|
||||
version = "0.19";
|
||||
|
|
@ -20374,6 +20437,21 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
TimePiece = buildPerlPackage {
|
||||
pname = "Time-Piece";
|
||||
version = "1.3401";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/E/ES/ESAYM/Time-Piece-1.3401.tar.gz";
|
||||
sha256 = "4b55b7bb0eab45cf239a54dfead277dfa06121a43e63b3fce0853aecfdb04c27";
|
||||
};
|
||||
meta = {
|
||||
description = "Object Oriented time objects";
|
||||
homepage = "https://metacpan.org/release/Time-Piece";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = with maintainers; [ sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
Tirex = buildPerlPackage rec {
|
||||
pname = "Tirex";
|
||||
version = "0.6.1";
|
||||
|
|
@ -20635,6 +20713,22 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
UnicodeUTF8 = buildPerlPackage {
|
||||
pname = "Unicode-UTF8";
|
||||
version = "0.62";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/C/CH/CHANSEN/Unicode-UTF8-0.62.tar.gz";
|
||||
sha256 = "fa8722d0b74696e332fddd442994436ea93d3bfc7982d4babdcedfddd657d0f6";
|
||||
};
|
||||
buildInputs = [ TestFatal ];
|
||||
meta = {
|
||||
homepage = "https://github.com/chansen/p5-unicode-utf8";
|
||||
description = "Encoding and decoding of UTF-8 encoding form";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
maintainers = with maintainers; [ sgo ];
|
||||
};
|
||||
};
|
||||
|
||||
UnixGetrusage = buildPerlPackage {
|
||||
pname = "Unix-Getrusage";
|
||||
version = "0.03";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue