Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
fadee272e0
78 changed files with 2066 additions and 1290 deletions
|
|
@ -457,6 +457,7 @@
|
|||
./services/misc/domoticz.nix
|
||||
./services/misc/errbot.nix
|
||||
./services/misc/etcd.nix
|
||||
./services/misc/etebase-server.nix
|
||||
./services/misc/ethminer.nix
|
||||
./services/misc/exhibitor.nix
|
||||
./services/misc/felix.nix
|
||||
|
|
|
|||
|
|
@ -198,13 +198,14 @@ in {
|
|||
type = with types; attrsOf (submodule {
|
||||
options = {
|
||||
location = mkOption {
|
||||
type = types.path;
|
||||
type = types.oneOf [ types.path types.str ];
|
||||
description = ''
|
||||
The location of the pipe.
|
||||
The location of the pipe, file, Librespot/Airplay/process binary, or a TCP address.
|
||||
Use an empty string for alsa.
|
||||
'';
|
||||
};
|
||||
type = mkOption {
|
||||
type = types.enum [ "pipe" "file" "process" "spotify" "airplay" ];
|
||||
type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" ];
|
||||
default = "pipe";
|
||||
description = ''
|
||||
The type of input stream.
|
||||
|
|
@ -219,13 +220,21 @@ in {
|
|||
example = literalExample ''
|
||||
# for type == "pipe":
|
||||
{
|
||||
mode = "listen";
|
||||
mode = "create";
|
||||
};
|
||||
# for type == "process":
|
||||
{
|
||||
params = "--param1 --param2";
|
||||
logStderr = "true";
|
||||
};
|
||||
# for type == "tcp":
|
||||
{
|
||||
mode = "client";
|
||||
}
|
||||
# for type == "alsa":
|
||||
{
|
||||
device = "hw:0,0";
|
||||
}
|
||||
'';
|
||||
};
|
||||
inherit sampleFormat;
|
||||
|
|
@ -255,6 +264,11 @@ in {
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
# https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85
|
||||
warnings = filter (w: w != "") (mapAttrsToList (k: v: if v.type == "spotify" then ''
|
||||
services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead.
|
||||
'' else "") cfg.streams);
|
||||
|
||||
systemd.services.snapserver = {
|
||||
after = [ "network.target" ];
|
||||
description = "Snapserver";
|
||||
|
|
@ -272,7 +286,7 @@ in {
|
|||
ProtectKernelTunables = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectKernelModules = true;
|
||||
RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX";
|
||||
RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
|
||||
RestrictNamespaces = true;
|
||||
RuntimeDirectory = name;
|
||||
StateDirectory = name;
|
||||
|
|
|
|||
205
nixos/modules/services/misc/etebase-server.nix
Normal file
205
nixos/modules/services/misc/etebase-server.nix
Normal file
|
|
@ -0,0 +1,205 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.etebase-server;
|
||||
|
||||
pythonEnv = pkgs.python3.withPackages (ps: with ps;
|
||||
[ etebase-server daphne ]);
|
||||
|
||||
dbConfig = {
|
||||
sqlite3 = ''
|
||||
engine = django.db.backends.sqlite3
|
||||
name = ${cfg.dataDir}/db.sqlite3
|
||||
'';
|
||||
};
|
||||
|
||||
defaultConfigIni = toString (pkgs.writeText "etebase-server.ini" ''
|
||||
[global]
|
||||
debug = false
|
||||
secret_file = ${if cfg.secretFile != null then cfg.secretFile else ""}
|
||||
media_root = ${cfg.dataDir}/media
|
||||
|
||||
[allowed_hosts]
|
||||
allowed_host1 = ${cfg.host}
|
||||
|
||||
[database]
|
||||
${dbConfig."${cfg.database.type}"}
|
||||
'');
|
||||
|
||||
configIni = if cfg.customIni != null then cfg.customIni else defaultConfigIni;
|
||||
|
||||
defaultUser = "etebase-server";
|
||||
in
|
||||
{
|
||||
options = {
|
||||
services.etebase-server = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
example = true;
|
||||
description = ''
|
||||
Whether to enable the Etebase server.
|
||||
|
||||
Once enabled you need to create an admin user using the
|
||||
shell command <literal>etebase-server createsuperuser</literal>.
|
||||
Then you can login and create accounts on your-etebase-server.com/admin
|
||||
'';
|
||||
};
|
||||
|
||||
secretFile = mkOption {
|
||||
default = null;
|
||||
type = with types; nullOr str;
|
||||
description = ''
|
||||
The path to a file containing the secret
|
||||
used as django's SECRET_KEY.
|
||||
'';
|
||||
};
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/etebase-server";
|
||||
description = "Directory to store the Etebase server data.";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = with types; nullOr port;
|
||||
default = 8001;
|
||||
description = "Port to listen on.";
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to open ports in the firewall for the server.
|
||||
'';
|
||||
};
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
default = "0.0.0.0";
|
||||
example = "localhost";
|
||||
description = ''
|
||||
Host to listen on.
|
||||
'';
|
||||
};
|
||||
|
||||
unixSocket = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = "The path to the socket to bind to.";
|
||||
example = "/run/etebase-server/etebase-server.sock";
|
||||
};
|
||||
|
||||
database = {
|
||||
type = mkOption {
|
||||
type = types.enum [ "sqlite3" ];
|
||||
default = "sqlite3";
|
||||
description = ''
|
||||
Database engine to use.
|
||||
Currently only sqlite3 is supported.
|
||||
Other options can be configured using <literal>extraConfig</literal>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
customIni = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Custom etebase-server.ini.
|
||||
|
||||
See <literal>etebase-src/etebase-server.ini.example</literal> for available options.
|
||||
|
||||
Setting this option overrides the default config which is generated from the options
|
||||
<literal>secretFile</literal>, <literal>host</literal> and <literal>database</literal>.
|
||||
'';
|
||||
example = literalExample ''
|
||||
[global]
|
||||
debug = false
|
||||
secret_file = /path/to/secret
|
||||
media_root = /path/to/media
|
||||
|
||||
[allowed_hosts]
|
||||
allowed_host1 = example.com
|
||||
|
||||
[database]
|
||||
engine = django.db.backends.sqlite3
|
||||
name = db.sqlite3
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = defaultUser;
|
||||
description = "User under which Etebase server runs.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
(runCommand "etebase-server" {
|
||||
buildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
makeWrapper ${pythonEnv}/bin/etebase-server \
|
||||
$out/bin/etebase-server \
|
||||
--run "cd ${cfg.dataDir}" \
|
||||
--prefix ETEBASE_EASY_CONFIG_PATH : "${configIni}"
|
||||
'')
|
||||
];
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d '${cfg.dataDir}' - ${cfg.user} ${config.users.users.${cfg.user}.group} - -"
|
||||
];
|
||||
|
||||
systemd.services.etebase-server = {
|
||||
description = "An Etebase (EteSync 2.0) server";
|
||||
after = [ "network.target" "systemd-tmpfiles-setup.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
User = cfg.user;
|
||||
Restart = "always";
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
};
|
||||
environment = {
|
||||
PYTHONPATH="${pythonEnv}/${pkgs.python3.sitePackages}";
|
||||
ETEBASE_EASY_CONFIG_PATH="${configIni}";
|
||||
};
|
||||
preStart = ''
|
||||
# Auto-migrate on first run or if the package has changed
|
||||
versionFile="${cfg.dataDir}/src-version"
|
||||
if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then
|
||||
${pythonEnv}/bin/etebase-server migrate
|
||||
echo ${pkgs.etebase-server} > "$versionFile"
|
||||
fi
|
||||
'';
|
||||
script =
|
||||
let
|
||||
networking = if cfg.unixSocket != null
|
||||
then "-u ${cfg.unixSocket}"
|
||||
else "-b 0.0.0.0 -p ${toString cfg.port}";
|
||||
in ''
|
||||
cd "${pythonEnv}/lib/etebase-server";
|
||||
${pythonEnv}/bin/daphne ${networking} \
|
||||
etebase_server.asgi:application
|
||||
'';
|
||||
};
|
||||
|
||||
users = optionalAttrs (cfg.user == defaultUser) {
|
||||
users.${defaultUser} = {
|
||||
group = defaultUser;
|
||||
home = cfg.dataDir;
|
||||
};
|
||||
|
||||
groups.${defaultUser} = {};
|
||||
};
|
||||
|
||||
networking.firewall = mkIf cfg.openFirewall {
|
||||
allowedTCPPorts = [ cfg.port ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ let
|
|||
port = 10004;
|
||||
tcpPort = 10005;
|
||||
httpPort = 10080;
|
||||
tcpStreamPort = 10006;
|
||||
in {
|
||||
name = "snapcast";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
|
|
@ -21,11 +22,16 @@ in {
|
|||
mpd = {
|
||||
type = "pipe";
|
||||
location = "/run/snapserver/mpd";
|
||||
query.mode = "create";
|
||||
};
|
||||
bluetooth = {
|
||||
type = "pipe";
|
||||
location = "/run/snapserver/bluetooth";
|
||||
};
|
||||
tcp = {
|
||||
type = "tcp";
|
||||
location = "127.0.0.1:${toString tcpStreamPort}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -42,6 +48,7 @@ in {
|
|||
server.wait_until_succeeds("ss -ntl | grep -q ${toString port}")
|
||||
server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpPort}")
|
||||
server.wait_until_succeeds("ss -ntl | grep -q ${toString httpPort}")
|
||||
server.wait_until_succeeds("ss -ntl | grep -q ${toString tcpStreamPort}")
|
||||
|
||||
with subtest("check that pipes are created"):
|
||||
server.succeed("test -p /run/snapserver/mpd")
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ let
|
|||
|
||||
aixlog = dependency {
|
||||
name = "aixlog";
|
||||
version = "1.2.1";
|
||||
sha256 = "1rh4jib5g41b85bqrxkl5g74hk5ryf187y9fw0am76g59xlymfpr";
|
||||
version = "1.4.0";
|
||||
sha256 = "0f2bs5j1jjajcpa251dslnwkgglaam3b0cm6wdx5l7mbwvnmib2g";
|
||||
};
|
||||
|
||||
popl = dependency {
|
||||
|
|
@ -34,13 +34,13 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "snapcast";
|
||||
version = "0.20.0";
|
||||
version = "0.23.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badaix";
|
||||
repo = "snapcast";
|
||||
rev = "v${version}";
|
||||
sha256 = "152ic8hlyawcmj9pykb33xc6yx7il6yb9ilmsy6m9nlh40m8yxls";
|
||||
sha256 = "0183hhghzn0fhw2qzc1s009q7miabpcf0pxaqjdscsl8iivxqknd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config boost170.dev ];
|
||||
|
|
|
|||
|
|
@ -67,6 +67,6 @@ mkDerivation rec {
|
|||
# 0.5.7 segfaults when opening the main panel with qt 5.7 and fails to compile with qt 5.8
|
||||
# but qt > 5.6 works when only using the native browser
|
||||
# https://github.com/sieren/QSyncthingTray/issues/223
|
||||
broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative);
|
||||
broken = (builtins.compareVersions qtbase.version "5.7.0" >= 0 && !preferNative) || stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,11 +96,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appgate-sdp";
|
||||
version = "5.3.2";
|
||||
version = "5.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb";
|
||||
sha256 = "123d4mx2nsh8q3ckm4g2chdcdwgg0cz9cvhiwjggxzvy7j6bqgy4";
|
||||
sha256 = "1854m93mr2crg68zhh1pgwwis0dqdv0778wqrb8dz9sdz940rza8";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"stable": {
|
||||
"version": "88.0.4324.146",
|
||||
"sha256": "0zc2gx5wjv00n2xmlagjd2xv4plg128d1kkhy7j8kpxvx3xiic9q",
|
||||
"sha256bin64": "109wz6w1c8v32b7fvcbks1wj8ycdyb9y88alksmr3h42z3s0b4id",
|
||||
"version": "88.0.4324.150",
|
||||
"sha256": "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf",
|
||||
"sha256bin64": "0xyhvhppxk95clk6vycg2yca1yyzpi13rs3lhs4j9a482api6ks0",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2020-11-05",
|
||||
|
|
@ -31,15 +31,15 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "90.0.4400.8",
|
||||
"sha256": "0z7695r8k1xm5kx7cc42kmcr11dbagcwjak32sglj0sw3hsr2yqz",
|
||||
"sha256bin64": "11gp2sxaly66qfb2gfxnikq1xad520r32pgshkm2jsb7a7vj7mmf",
|
||||
"version": "90.0.4408.0",
|
||||
"sha256": "0bg16nz65j13a8sdzrzkmbidlglh7bz7y8s4bi68il9ppbffw3k4",
|
||||
"sha256bin64": "0ad2xif8ng71ian07vb8h3jsd5wh95xndja43vwswc3072zk5h05",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2021-01-14",
|
||||
"version": "2021-01-25",
|
||||
"url": "https://gn.googlesource.com/gn",
|
||||
"rev": "d62642c920e6a0d1756316d225a90fd6faa9e21e",
|
||||
"sha256": "0f1i079asiznn092vm6lyad96wcs8pxh95fjmjbnaqjaalivsic0"
|
||||
"rev": "55ad154c961d8326315b1c8147f4e504cd95e9e6",
|
||||
"sha256": "0x5i1axkg44z412357sdb6kgs1h9ykzy8p5c7s40bybs4hg33lkc"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ let
|
|||
# with generated bindata yet.
|
||||
k3sBuildStage1 = buildGoPackage rec {
|
||||
name = "k3s-build-1";
|
||||
version = "${k3sVersion}";
|
||||
version = k3sVersion;
|
||||
|
||||
goPackagePath = "github.com/rancher/k3s";
|
||||
|
||||
|
|
@ -160,7 +160,7 @@ let
|
|||
};
|
||||
k3sBin = buildGoPackage rec {
|
||||
name = "k3s-bin";
|
||||
version = "${k3sVersion}";
|
||||
version = k3sVersion;
|
||||
|
||||
goPackagePath = "github.com/rancher/k3s";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kube3d";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
excludedPackages = "tools";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = "rancher";
|
||||
repo = "k3d";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sHtPW9EaTycHh9d/vp28BvzhmbLUQYsu6yMfJlJYH+k=";
|
||||
sha256 = "sha256-hhgZpX6nM5viGW37gxejO1SRRlN9+m8F6j9EV9/6ApM=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
|
|
|||
|
|
@ -34,10 +34,8 @@ in python.pkgs.buildPythonPackage {
|
|||
};
|
||||
|
||||
postPatch = ''
|
||||
# yarl 1.4+ only requires Python 3.6+
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
|
||||
--replace "yarl==1.3.0" ""
|
||||
--replace "aiohttp==3.6.2" "aiohttp>=3.6.2"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sacc";
|
||||
version = "1.02";
|
||||
version = "1.03";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tgz";
|
||||
sha512 = "18ja95cscgjaj1xqn70dj0482f76d0561bdcc47flqfsjh4mqckjqr65qv7awnw6rzm03i5cp45j1qx12y0y83skgsar4pplmy8q014";
|
||||
sha512 = "sha512-vOjAGBM2+080JZv4C4b5dNRTTX45evWFEJfK1DRaWCYrHRCAe07QdEIrHhbaIxhSYfrBd3D1y75rmDnuPC4THA==";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
|
|
|
|||
|
|
@ -76,6 +76,9 @@ in python3Packages.buildPythonApplication rec {
|
|||
done
|
||||
'';
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Linux GUI for ProtonVPN, written in Python";
|
||||
homepage = "https://github.com/ProtonVPN/linux-gui";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, gettext
|
||||
{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext
|
||||
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
|
||||
, libxml2, db, curl, fontconfig, libsndfile, neon
|
||||
, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
|
||||
|
|
@ -58,18 +58,13 @@ in (mkDrv rec {
|
|||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
# For some reason librdf_redland sometimes refers to rasqal.h instead
|
||||
# of rasqal/rasqal.h
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-I${librdf_rasqal}/include/rasqal"
|
||||
] ++ lib.optionals stdenv.isx86_64 [ "-mno-fma" "-mno-avx" ]
|
||||
# https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10
|
||||
++ [ "-fno-visibility-inlines-hidden" ];
|
||||
|
||||
patches = [
|
||||
./xdg-open-brief.patch
|
||||
"-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h
|
||||
"-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10
|
||||
];
|
||||
|
||||
patches = [ ./xdg-open-brief.patch ];
|
||||
|
||||
tarballPath = "external/tarballs";
|
||||
|
||||
postUnpack = ''
|
||||
|
|
@ -378,7 +373,7 @@ in (mkDrv rec {
|
|||
"--enable-kf5"
|
||||
"--enable-qt5"
|
||||
"--enable-gtk3-kde5"
|
||||
] ++ lib.optional (lib.versionOlder version "6.4") "--disable-gtk"; # disables GTK2, GTK3 is still there
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
make unitcheck
|
||||
|
|
@ -391,7 +386,7 @@ in (mkDrv rec {
|
|||
++ lib.optional kdeIntegration wrapQtAppsHook;
|
||||
|
||||
buildInputs = with xorg;
|
||||
[ ant ArchiveZip boost cairo clucene_core
|
||||
[ ant ArchiveZip boost box2d cairo clucene_core
|
||||
IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig
|
||||
freetype getopt gperf gtk3
|
||||
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
|
||||
|
|
|
|||
|
|
@ -34,6 +34,13 @@
|
|||
md5 = "";
|
||||
md5name = "35e06a3bd7cd8f66be822c7d64e80c2b6051a181e9e897006917cb8e7988a543-boost_1_71_0.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "box2d-2.3.1.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/box2d-2.3.1.tar.gz";
|
||||
sha256 = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c";
|
||||
md5 = "";
|
||||
md5name = "58ffc8475a8650aadc351345aef696937747b40501ab78d72c197c5ff5b3035c-box2d-2.3.1.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "breakpad.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/breakpad.zip";
|
||||
|
|
@ -329,11 +336,11 @@
|
|||
md5name = "c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95-glm-0.9.9.7.zip";
|
||||
}
|
||||
{
|
||||
name = "gpgme-1.9.0.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2";
|
||||
sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb";
|
||||
name = "gpgme-1.13.1.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2";
|
||||
sha256 = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46";
|
||||
md5 = "";
|
||||
md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2";
|
||||
md5name = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46-gpgme-1.13.1.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "graphite2-minimal-1.3.14.tgz";
|
||||
|
|
@ -371,18 +378,18 @@
|
|||
md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "icu4c-67_1-src.tgz";
|
||||
url = "https://dev-www.libreoffice.org/src/icu4c-67_1-src.tgz";
|
||||
sha256 = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc";
|
||||
name = "icu4c-68_1-src.tgz";
|
||||
url = "https://dev-www.libreoffice.org/src/icu4c-68_1-src.tgz";
|
||||
sha256 = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d";
|
||||
md5 = "";
|
||||
md5name = "94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc-icu4c-67_1-src.tgz";
|
||||
md5name = "a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d-icu4c-68_1-src.tgz";
|
||||
}
|
||||
{
|
||||
name = "icu4c-67_1-data.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/icu4c-67_1-data.zip";
|
||||
sha256 = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e";
|
||||
name = "icu4c-68_1-data.zip";
|
||||
url = "https://dev-www.libreoffice.org/src/icu4c-68_1-data.zip";
|
||||
sha256 = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510";
|
||||
md5 = "";
|
||||
md5name = "7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e-icu4c-67_1-data.zip";
|
||||
md5name = "03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510-icu4c-68_1-data.zip";
|
||||
}
|
||||
{
|
||||
name = "flow-engine-0.9.4.zip";
|
||||
|
|
@ -483,18 +490,18 @@
|
|||
md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "lcms2-2.9.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz";
|
||||
sha256 = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20";
|
||||
name = "lcms2-2.11.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz";
|
||||
sha256 = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e";
|
||||
md5 = "";
|
||||
md5name = "48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20-lcms2-2.9.tar.gz";
|
||||
md5name = "dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e-lcms2-2.11.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libassuan-2.5.1.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2";
|
||||
sha256 = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449";
|
||||
name = "libassuan-2.5.3.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/libassuan-2.5.3.tar.bz2";
|
||||
sha256 = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702";
|
||||
md5 = "";
|
||||
md5name = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449-libassuan-2.5.1.tar.bz2";
|
||||
md5name = "91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702-libassuan-2.5.3.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "libatomic_ops-7.6.8.tar.gz";
|
||||
|
|
@ -525,11 +532,11 @@
|
|||
md5name = "72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056-libffi-3.3.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "libgpg-error-1.27.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2";
|
||||
sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2";
|
||||
name = "libgpg-error-1.37.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/libgpg-error-1.37.tar.bz2";
|
||||
sha256 = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763";
|
||||
md5 = "";
|
||||
md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2";
|
||||
md5name = "b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763-libgpg-error-1.37.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "liblangtag-0.6.2.tar.bz2";
|
||||
|
|
@ -595,11 +602,11 @@
|
|||
md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "mdds-1.6.0.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2";
|
||||
sha256 = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d";
|
||||
name = "mdds-1.7.0.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/mdds-1.7.0.tar.bz2";
|
||||
sha256 = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf";
|
||||
md5 = "";
|
||||
md5name = "f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d-mdds-1.6.0.tar.bz2";
|
||||
md5name = "a66a2a8293a3abc6cd9baff7c236156e2666935cbfb69a15d64d38141638fecf-mdds-1.7.0.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "mDNSResponder-878.200.35.tar.gz";
|
||||
|
|
@ -616,11 +623,11 @@
|
|||
md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "libmwaw-0.3.16.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz";
|
||||
sha256 = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868";
|
||||
name = "libmwaw-0.3.17.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/libmwaw-0.3.17.tar.xz";
|
||||
sha256 = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c";
|
||||
md5 = "";
|
||||
md5name = "0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868-libmwaw-0.3.16.tar.xz";
|
||||
md5name = "8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c-libmwaw-0.3.17.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "mythes-1.2.4.tar.gz";
|
||||
|
|
@ -630,11 +637,11 @@
|
|||
md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "neon-0.30.2.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz";
|
||||
sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca";
|
||||
name = "neon-0.31.1.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/neon-0.31.1.tar.gz";
|
||||
sha256 = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d";
|
||||
md5 = "";
|
||||
md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz";
|
||||
md5name = "c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d-neon-0.31.1.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "nss-3.55-with-nspr-4.27.tar.gz";
|
||||
|
|
@ -672,18 +679,18 @@
|
|||
md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz";
|
||||
}
|
||||
{
|
||||
name = "openssl-1.0.2t.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz";
|
||||
sha256 = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc";
|
||||
name = "openssl-1.1.1i.tar.gz";
|
||||
url = "https://dev-www.libreoffice.org/src/openssl-1.1.1i.tar.gz";
|
||||
sha256 = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242";
|
||||
md5 = "";
|
||||
md5name = "14cb464efe7ac6b54799b34456bd69558a749a4931ecfd9cf9f71d7881cac7bc-openssl-1.0.2t.tar.gz";
|
||||
md5name = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242-openssl-1.1.1i.tar.gz";
|
||||
}
|
||||
{
|
||||
name = "liborcus-0.15.4.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/liborcus-0.15.4.tar.bz2";
|
||||
sha256 = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61";
|
||||
name = "liborcus-0.16.1.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/liborcus-0.16.1.tar.bz2";
|
||||
sha256 = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4";
|
||||
md5 = "";
|
||||
md5name = "cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61-liborcus-0.15.4.tar.bz2";
|
||||
md5name = "c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4-liborcus-0.16.1.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
|
||||
|
|
@ -721,11 +728,11 @@
|
|||
md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "poppler-0.82.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
|
||||
sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";
|
||||
name = "poppler-21.01.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz";
|
||||
sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3";
|
||||
md5 = "";
|
||||
md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";
|
||||
md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "postgresql-9.2.24.tar.bz2";
|
||||
|
|
@ -735,11 +742,11 @@
|
|||
md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "Python-3.7.7.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz";
|
||||
sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136";
|
||||
name = "Python-3.8.4.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/Python-3.8.4.tar.xz";
|
||||
sha256 = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37";
|
||||
md5 = "";
|
||||
md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz";
|
||||
md5name = "5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37-Python-3.8.4.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "QR-Code-generator-1.4.0.tar.gz";
|
||||
|
|
@ -798,11 +805,11 @@
|
|||
md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
|
||||
sha256 = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760";
|
||||
name = "skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
|
||||
sha256 = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301";
|
||||
md5 = "";
|
||||
md5name = "3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760-skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz";
|
||||
md5name = "f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301-skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "libstaroffice-0.0.7.tar.xz";
|
||||
|
|
@ -854,11 +861,11 @@
|
|||
md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "libwps-0.4.11.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz";
|
||||
sha256 = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1";
|
||||
name = "libwps-0.4.12.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz";
|
||||
sha256 = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb";
|
||||
md5 = "";
|
||||
md5name = "a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1-libwps-0.4.11.tar.xz";
|
||||
md5name = "e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb-libwps-0.4.12.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "xsltml_2.1.2.zip";
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ rec {
|
|||
};
|
||||
|
||||
major = "7";
|
||||
minor = "0";
|
||||
patch = "4";
|
||||
tweak = "2";
|
||||
minor = "1";
|
||||
patch = "0";
|
||||
tweak = "3";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
|
||||
|
|
@ -17,13 +17,13 @@ rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz";
|
||||
sha256 = "1rpk90g1g8m70nrj4lwkg50aiild73d29yjlgyrgg8wx6hzq7l4y";
|
||||
};
|
||||
|
||||
# FIXME rename
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl";
|
||||
sha256 = "0m6cxyrxig8akv9183xdn6ialmjddicn676149nm506yc5y0szmi";
|
||||
};
|
||||
|
||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||
|
|
@ -31,6 +31,6 @@ rec {
|
|||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb";
|
||||
sha256 = "1kvsi28n8x3gxpiszxh84x05aw23i3z4id63pgw2s7mfclby52k9";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,19 +1,10 @@
|
|||
{ lib, kdeIntegration, fetchpatch, ... }:
|
||||
{ lib, kdeIntegration, ... }:
|
||||
attrs:
|
||||
{
|
||||
patches = attrs.patches or [ ] ++ [
|
||||
(fetchpatch {
|
||||
url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008";
|
||||
name = "poppler-0.86.patch";
|
||||
sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j";
|
||||
})
|
||||
];
|
||||
postConfigure = attrs.postConfigure + ''
|
||||
sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/extras/inc/swmodeltestbase.hxx'
|
||||
sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx'
|
||||
'';
|
||||
configureFlags = lib.remove "--without-system-qrcodegen"
|
||||
(attrs.configureFlags ++ [
|
||||
(lib.enableFeature kdeIntegration "kde5")
|
||||
]);
|
||||
meta = attrs.meta // { description = "Comprehensive, professional-quality productivity suite (Still/Stable release)"; };
|
||||
configureFlags = attrs.configureFlags ++ [
|
||||
(lib.enableFeature kdeIntegration "kf5")
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ rec {
|
|||
inherit sha256;
|
||||
};
|
||||
|
||||
major = "6";
|
||||
minor = "3";
|
||||
patch = "5";
|
||||
major = "7";
|
||||
minor = "0";
|
||||
patch = "4";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
|
|
@ -17,13 +17,13 @@ rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "0jnayv1i0iq1gpf3q3z9nfq6jid77d0c76675lkqb3gi07f63nzz";
|
||||
sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz";
|
||||
};
|
||||
|
||||
# FIXME rename
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv";
|
||||
sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl";
|
||||
};
|
||||
|
||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||
|
|
@ -31,6 +31,6 @@ rec {
|
|||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "1p38wlclv6cbjpkkq7n2mjpxy84pxi4vxc9s5kjp4dm63zzxafd6";
|
||||
sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "Native cross platform full feature terminal based sequence editor for git interactive rebase";
|
||||
changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ masaeedu zowoq ];
|
||||
maintainers = with maintainers; [ masaeedu SuperSandro2000 zowoq ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
57
pkgs/applications/window-managers/labwc/default.nix
Normal file
57
pkgs/applications/window-managers/labwc/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, cairo
|
||||
, glib
|
||||
, libinput
|
||||
, libxml2
|
||||
, pandoc
|
||||
, pango
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wlroots
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, xwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "labwc";
|
||||
version = "unstable-2021-01-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "johanmalm";
|
||||
repo = pname;
|
||||
rev = "2a7086d9f7367d4a81bce58a6f7fc6614bbfbdb3";
|
||||
sha256 = "ECwEbWkCjktNNtbLSCflOVlEyxkg4XTfRevq7+qQ2IA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config meson ninja pandoc ];
|
||||
buildInputs = [
|
||||
cairo
|
||||
glib
|
||||
libinput
|
||||
libxml2
|
||||
pango
|
||||
wayland
|
||||
wayland-protocols
|
||||
wlroots
|
||||
libxcb
|
||||
libxkbcommon
|
||||
xwayland
|
||||
];
|
||||
|
||||
mesonFlags = [ "-Dxwayland=enabled" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/johanmalm/labwc";
|
||||
description = "Openbox alternative for Wayland";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
# TODO: report a SIGSEGV when labwc starts inside a started Wayland window
|
||||
|
|
@ -45,18 +45,13 @@
|
|||
'' else ''
|
||||
mv "$unpackDir" "$out"
|
||||
'')
|
||||
+ extraPostFetch
|
||||
# Remove write permissions for files unpacked with write bits set
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/38649
|
||||
#
|
||||
# However, we should (for the moment) retain write permission on the directory
|
||||
# itself, to avoid tickling https://github.com/NixOS/nix/issues/4295 in
|
||||
# single-user Nix installations. This is because in sandbox mode we'll try to
|
||||
# move the path, and if we don't have write permissions on the directory,
|
||||
# then we can't update the ".." entry.
|
||||
+ ''
|
||||
chmod -R a-w "$out"
|
||||
chmod u+w "$out"
|
||||
${extraPostFetch}
|
||||
''
|
||||
# Remove non-owner write permissions
|
||||
# Fixes https://github.com/NixOS/nixpkgs/issues/38649
|
||||
+ ''
|
||||
chmod 755 "$out"
|
||||
'';
|
||||
} // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: {
|
||||
# Hackety-hack: we actually need unzip hooks, too
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "osinfo-db";
|
||||
version = "20201218";
|
||||
version = "20210202";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-APKuXWtnpF1r/q2MXddaDeBnBigx4hwMevPwx5uNq3k=";
|
||||
sha256 = "sha256-C7Vq7d+Uos9IhTwOgsrK64c9mMGVkNgfvOrbBqORsRs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ];
|
||||
|
|
|
|||
|
|
@ -116,6 +116,16 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
patches = [
|
||||
# See upstream patch at
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
|
||||
# from source distributions, the auto-generated configure script needs to be
|
||||
# patched as well, therefore we use an in-tree patch instead of pulling the
|
||||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
# GHC is a bit confused on its cross terminology.
|
||||
|
|
|
|||
|
|
@ -107,8 +107,16 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/18549
|
||||
patches = [
|
||||
# See upstream patch at
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
|
||||
# from source distributions, the auto-generated configure script needs to be
|
||||
# patched as well, therefore we use an in-tree patch instead of pulling the
|
||||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/issues/18549
|
||||
./issue-18549.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Make Block.h compile with c++ compilers. Remove with the next release
|
||||
|
|
|
|||
|
|
@ -107,7 +107,15 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
patches = lib.optionals stdenv.isDarwin [
|
||||
patches = [
|
||||
# See upstream patch at
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
|
||||
# from source distributions, the auto-generated configure script needs to be
|
||||
# patched as well, therefore we use an in-tree patch instead of pulling the
|
||||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Make Block.h compile with c++ compilers. Remove with the next release
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
|
||||
|
|
|
|||
|
|
@ -110,6 +110,14 @@ stdenv.mkDerivation (rec {
|
|||
outputs = [ "out" "doc" ];
|
||||
|
||||
patches = [
|
||||
# See upstream patch at
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
|
||||
# from source distributions, the auto-generated configure script needs to be
|
||||
# patched as well, therefore we use an in-tree patch instead of pulling the
|
||||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
|
||||
(fetchpatch { # https://phabricator.haskell.org/D5123
|
||||
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/13ff0b7ced097286e0d7b054f050871effe07f86.diff";
|
||||
name = "D5123.diff";
|
||||
|
|
|
|||
|
|
@ -111,6 +111,16 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
patches = [
|
||||
# See upstream patch at
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
|
||||
# from source distributions, the auto-generated configure script needs to be
|
||||
# patched as well, therefore we use an in-tree patch instead of pulling the
|
||||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
# GHC is a bit confused on its cross terminology.
|
||||
|
|
|
|||
|
|
@ -116,6 +116,16 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
patches = [
|
||||
# See upstream patch at
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
|
||||
# from source distributions, the auto-generated configure script needs to be
|
||||
# patched as well, therefore we use an in-tree patch instead of pulling the
|
||||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
# GHC is a bit confused on its cross terminology.
|
||||
|
|
|
|||
|
|
@ -116,6 +116,16 @@ stdenv.mkDerivation (rec {
|
|||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
patches = [
|
||||
# See upstream patch at
|
||||
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
|
||||
# from source distributions, the auto-generated configure script needs to be
|
||||
# patched as well, therefore we use an in-tree patch instead of pulling the
|
||||
# upstream patch. Don't forget to check backport status of the upstream patch
|
||||
# when adding new GHC releases in nixpkgs.
|
||||
./respect-ar-path.patch
|
||||
];
|
||||
|
||||
postPatch = "patchShebangs .";
|
||||
|
||||
# GHC is a bit confused on its cross terminology.
|
||||
|
|
|
|||
|
|
@ -96,12 +96,12 @@ let
|
|||
|
||||
in
|
||||
stdenv.mkDerivation (rec {
|
||||
version = "9.0.0.20201227";
|
||||
version = "9.0.1";
|
||||
name = "${targetPrefix}ghc-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.haskell.org/ghc/9.0.1-rc1/ghc-${version}-src.tar.xz";
|
||||
sha256 = "1kg227fzg9qq2p7r8xqr99vvnx7ind4clxkydikyzf3vqvaacjfy";
|
||||
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
|
||||
sha256 = "1y9mi9bq76z04hmggavrn8jwi1gx92bm3zhx6z69ypq6wha068x5";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
25
pkgs/development/compilers/ghc/respect-ar-path.patch
Normal file
25
pkgs/development/compilers/ghc/respect-ar-path.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
diff -urd a/aclocal.m4 b/aclocal.m4
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -1199,7 +1199,8 @@
|
||||
# thinks that target == host so it never checks the unqualified
|
||||
# tools for Windows. See #14274.
|
||||
AC_DEFUN([FP_PROG_AR],
|
||||
-[if test -z "$fp_prog_ar"; then
|
||||
+[AC_SUBST(fp_prog_ar,$AR)
|
||||
+if test -z "$fp_prog_ar"; then
|
||||
if test "$HostOS" = "mingw32"
|
||||
then
|
||||
AC_PATH_PROG([fp_prog_ar], [ar])
|
||||
diff -urd a/configure b/configure
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -10744,6 +10744,8 @@
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
|
||||
+fp_prog_ar=$AR
|
||||
+
|
||||
if test -z "$fp_prog_ar"; then
|
||||
if test "$HostOS" = "mingw32"
|
||||
then
|
||||
|
|
@ -1405,28 +1405,20 @@ self: super: {
|
|||
# quickcheck-instances is only used in the tests of binary-instances.
|
||||
binary-instances = dontCheck super.binary-instances;
|
||||
|
||||
# tons of overrides for bleeding edge versions for ghcide and hls
|
||||
# overriding aeson on all of them to prevent double compilations
|
||||
# this shouldn‘t break anything because nearly all their reverse deps are
|
||||
# in this list or marked as broken anyways
|
||||
# 2020-11-19: Checks nearly fixed, but still disabled because of flaky tests:
|
||||
# https://github.com/haskell/haskell-language-server/issues/610
|
||||
# https://github.com/haskell/haskell-language-server/issues/611
|
||||
haskell-language-server = dontCheck (super.haskell-language-server.override {
|
||||
lsp-test = dontCheck self.lsp-test;
|
||||
fourmolu = self.fourmolu_0_3_0_0;
|
||||
});
|
||||
haskell-language-server = dontCheck super.haskell-language-server;
|
||||
|
||||
# 2021-01-20
|
||||
# apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0
|
||||
# https://github.com/haskell/haskell-language-server/issues/1240
|
||||
apply-refact = super.apply-refact_0_8_2_1;
|
||||
|
||||
fourmolu = dontCheck super.fourmolu;
|
||||
|
||||
# 1. test requires internet
|
||||
# 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
|
||||
ghcide = doDistribute (unmarkBroken (dontCheck (super.ghcide_0_7_0_0.override { lsp-test = dontCheck self.lsp-test; })));
|
||||
refinery = doDistribute super.refinery_0_3_0_0;
|
||||
ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide));
|
||||
|
||||
data-tree-print = doJailbreak super.data-tree-print;
|
||||
|
||||
# 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing
|
||||
|
|
@ -1527,7 +1519,7 @@ self: super: {
|
|||
|
||||
# 2020-12-05: http-client is fixed on too old version
|
||||
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override {
|
||||
http-client = self.http-client_0_7_4;
|
||||
http-client = self.http-client_0_7_5;
|
||||
};
|
||||
|
||||
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
|
||||
|
|
|
|||
|
|
@ -88,5 +88,6 @@ self: super: {
|
|||
|
||||
# ghc versions prior to 8.8.x needs additional dependency to compile successfully.
|
||||
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
|
||||
hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,4 +94,9 @@ self: super: {
|
|||
|
||||
# This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.
|
||||
exceptions = super.exceptions_0_10_4;
|
||||
|
||||
# Older compilers need the latest ghc-lib to build this package.
|
||||
hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
|
||||
|
||||
mmorph = super.mmorph_1_1_3;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -123,4 +123,8 @@ self: super: {
|
|||
# ghc versions which don‘t match the ghc-lib-parser-ex version need the
|
||||
# additional dependency to compile successfully.
|
||||
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;
|
||||
|
||||
# Older compilers need the latest ghc-lib to build this package.
|
||||
hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,10 +100,6 @@ self: super: {
|
|||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/regex-base-0.94.0.0.patch";
|
||||
sha256 = "0k5fglbl7nnhn8400c4cpnflxcbj9p3xi5prl9jfmszr31jwdy5d";
|
||||
});
|
||||
syb = appendPatch (dontCheck super.syb) (pkgs.fetchpatch {
|
||||
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/syb-0.7.1.patch";
|
||||
sha256 = "1407r8xv6bfnmpbw7glfh4smi76a2fc9pkq300c3d9f575708zqr";
|
||||
});
|
||||
|
||||
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -659,7 +659,9 @@ self: super: builtins.intersectAttrs super {
|
|||
let
|
||||
# spago requires an older version of megaparsec, but it appears to work
|
||||
# fine with newer versions.
|
||||
spagoWithOverrides = doJailbreak super.spago;
|
||||
spagoWithOverrides = doJailbreak (super.spago.override {
|
||||
dhall = self.dhall_1_37_1;
|
||||
});
|
||||
|
||||
# This defines the version of the purescript-docs-search release we are using.
|
||||
# This is defined in the src/Spago/Prelude.hs file in the spago source.
|
||||
|
|
@ -785,7 +787,7 @@ self: super: builtins.intersectAttrs super {
|
|||
testTarget = "unit-tests";
|
||||
};
|
||||
|
||||
haskell-language-server = overrideCabal super.haskell-language-server (drv: {
|
||||
haskell-language-server = enableCabalFlag (enableCabalFlag (overrideCabal super.haskell-language-server (drv: {
|
||||
postInstall = let
|
||||
inherit (pkgs.lib) concatStringsSep take splitString;
|
||||
ghc_version = self.ghc.version;
|
||||
|
|
@ -800,7 +802,7 @@ self: super: builtins.intersectAttrs super {
|
|||
export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
});
|
||||
})) "all-plugins") "all-formatters";
|
||||
|
||||
# tests depend on a specific version of solc
|
||||
hevm = dontCheck (doJailbreak super.hevm);
|
||||
|
|
|
|||
1299
pkgs/development/haskell-modules/hackage-packages.nix
generated
1299
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -18,16 +18,6 @@ self: super: {
|
|||
# https://github.com/spacchetti/spago/issues/512
|
||||
spago = self.callPackage ../tools/purescript/spago/spago.nix { };
|
||||
|
||||
# HLS and its fork of ghcide that it uses
|
||||
# both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh
|
||||
haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { };
|
||||
hls-hlint-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-hlint-plugin.nix { };
|
||||
hls-tactics-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-tactics-plugin.nix { };
|
||||
hls-explicit-imports-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-explicit-imports-plugin.nix { };
|
||||
hls-retrie-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-retrie-plugin.nix { };
|
||||
hls-class-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-class-plugin.nix { };
|
||||
hls-eval-plugin = self.callPackage ../tools/haskell/haskell-language-server/hls-eval-plugin.nix { };
|
||||
|
||||
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
|
||||
|
||||
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, libxml2, pkg-config, perl
|
||||
{ lib, stdenv, fetchurl, libxml2, pkg-config
|
||||
, compressionSupport ? true, zlib ? null
|
||||
, sslSupport ? true, openssl ? null
|
||||
, static ? stdenv.hostPlatform.isStatic
|
||||
|
|
@ -14,12 +14,12 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.31.0";
|
||||
version = "0.31.2";
|
||||
pname = "neon";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz";
|
||||
sha256 = "19dx4rsqrck9jl59y4ad9jf115hzh6pz1hcl2dnlfc84hc86ymc0";
|
||||
url = "https://notroj.github.io/${pname}/${pname}-${version}.tar.gz";
|
||||
sha256 = "0y46dbhiblcvg8k41bdydr3fivghwk73z040ki5825d24ynf67ng";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
|
||||
|
|
@ -37,12 +37,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
passthru = {inherit compressionSupport sslSupport;};
|
||||
|
||||
checkInputs = [ perl ];
|
||||
doCheck = false; # fails, needs the net
|
||||
|
||||
meta = with lib; {
|
||||
description = "An HTTP and WebDAV client library";
|
||||
homepage = "http://www.webdav.org/neon/";
|
||||
homepage = "https://notroj.github.io/neon/";
|
||||
changelog = "https://github.com/notroj/${pname}/blob/${version}/NEWS";
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl2;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,21 +2,33 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wolfssl";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfSSL";
|
||||
repo = "wolfssl";
|
||||
rev = "v${version}-stable";
|
||||
sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v";
|
||||
sha256 = "0hk3bnzznxj047gwxdxw2v3w6jqq47996m7g72iwj6c2ai9g6h4m";
|
||||
};
|
||||
|
||||
configureFlags = [ "--enable-all" ];
|
||||
# almost same as Debian but for now using --enable-all instead of --enable-distro to ensure options.h gets installed
|
||||
configureFlags = [ "--enable-all --enable-pkcs11 --enable-tls13 --enable-base64encode" ];
|
||||
|
||||
outputs = [ "out" "dev" "doc" "lib" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
postPatch = ''
|
||||
# fix recursive cycle:
|
||||
# build flags (including location of header files) are exposed in the
|
||||
# public API of wolfssl, causing lib to depend on dev
|
||||
substituteInPlace configure.ac \
|
||||
--replace '#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"' ' '
|
||||
substituteInPlace configure.ac \
|
||||
--replace '#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"' ' '
|
||||
'';
|
||||
|
||||
|
||||
postInstall = ''
|
||||
# fix recursive cycle:
|
||||
# wolfssl-config points to dev, dev propagates bin
|
||||
|
|
|
|||
|
|
@ -1,27 +1,36 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, isPy3k, slixmpp, async-timeout, aiohttp }:
|
||||
{ lib
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy3k
|
||||
, slixmpp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioharmony";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
disabled = !isPy3k;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "90f4d1220d44b48b21a57e0273aa3c4a51599d0097af88e8be26df151e599344";
|
||||
sha256 = "sha256-aej8xC0Bsy6ip7IwO6onp55p6afkz8yZnz14cCExSPA=";
|
||||
};
|
||||
|
||||
disabled = !isPy3k;
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
slixmpp
|
||||
];
|
||||
|
||||
#aioharmony does not seem to include tests
|
||||
# aioharmony does not seem to include tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "aioharmony.harmonyapi" "aioharmony.harmonyclient" ];
|
||||
|
||||
propagatedBuildInputs = [ slixmpp async-timeout aiohttp ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ehendrix23/aioharmony";
|
||||
description =
|
||||
"Asyncio Python library for connecting to and controlling the Logitech Harmony";
|
||||
description = "Python library for interacting the Logitech Harmony devices";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ oro ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,6 +6,10 @@ buildPythonPackage rec {
|
|||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace setup.py --replace 'version="0.1.11",' 'version="${version}",'
|
||||
'';
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crytic";
|
||||
repo = "crytic-compile";
|
||||
|
|
@ -21,7 +25,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Abstraction layer for smart contract build systems";
|
||||
homepage = "https://github.com/crytic/crytic-compile";
|
||||
license = licenses.agpl3;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ SuperSandro2000 arturcygan ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash_core_components";
|
||||
version = "1.13.0";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f92025b12931539cdda2173f2b4cd077119cbabbf3ddf62333f6302fd0d8a3ac";
|
||||
sha256 = "b61cb37322de91b4feb0d4d823694cbba8686f6459db774b53d553135350c71e";
|
||||
};
|
||||
|
||||
# No tests in archive
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash_html_components";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2c662e640528c890aaa0fa23d48e51c4d13ce69a97841d856ddcaaf2c6a47be3";
|
||||
sha256 = "83eaa39667b7c3e6cbefa360743e6e536d913269ea15db14308ad022c78bc301";
|
||||
};
|
||||
|
||||
# No tests in archive
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash_renderer";
|
||||
version = "1.8.3";
|
||||
version = "1.9.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f7ab2b922f4f0850bae0e9793cec99f8a1a241e5f7f5786e367ddd9e41d2b170";
|
||||
sha256 = "3c5519a781beb2261ee73b2d193bef6f212697636f204acd7d58cd986ba88e30";
|
||||
};
|
||||
|
||||
# No tests in archive
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash_table";
|
||||
version = "4.11.0";
|
||||
version = "4.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "3170504a8626a9676b016c5ab456ab8c1fb1ea0206dcc2eddb8c4c6589216304";
|
||||
sha256 = "90fbdd12eaaf657aa80d429263de4bbeef982649eb5981ebeb2410d67c1d20eb";
|
||||
};
|
||||
|
||||
# No tests in archive
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dash";
|
||||
version = "1.17.0";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "plotly";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1fbnhpmkxavv6yirmhx7659q1y9bqynwjd1g6cscv1mfv9m59l60";
|
||||
sha256 = "067ipkp186h26j7whfid8hjf6cwjmw2b5jp6fvvg280j7q9bjsa9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -43,7 +43,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests/unit/test_{configs,fingerprint,import,resources}.py \
|
||||
pytest tests/unit/test_{configs,fingerprint,resources}.py \
|
||||
tests/unit/dash/
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -76,11 +76,6 @@ buildPythonPackage rec {
|
|||
nbconvert
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'numba >=0.37.0,<0.49'" "'numba'"
|
||||
'';
|
||||
|
||||
# dask doesn't do well with large core counts
|
||||
checkPhase = ''
|
||||
pytest -n $NIX_BUILD_CORES datashader -k 'not dask.array'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, django
|
||||
, djangorestframework
|
||||
, pytest
|
||||
, pytest-cov
|
||||
, pytest-django
|
||||
, ipdb
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-nested-routers";
|
||||
version = "0.92.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alanjds";
|
||||
repo = "drf-nested-routers";
|
||||
rev = "v${version}";
|
||||
sha256 = "1l1jza8xz6xcm3gwxh1k6pc8fs95cq3v751gxj497y1a83d26j8i";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ django djangorestframework setuptools ];
|
||||
checkInputs = [ pytest pytest-cov pytest-django ipdb ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} runtests.py --nolint
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/alanjds/drf-nested-routers";
|
||||
description = "Provides routers and fields to create nested resources in the Django Rest Framework";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ felschr ];
|
||||
};
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
J2Cli is a command-line tool for templating in shell-scripts,
|
||||
leveraging the Jinja2 library.
|
||||
'';
|
||||
maintainers = with maintainers; [ rushmorem ];
|
||||
maintainers = with maintainers; [ rushmorem SuperSandro2000 ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@ buildPythonPackage rec {
|
|||
--replace "/bin/bash" "${bash}/bin/bash"
|
||||
'';
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "JupyterHub Spawner using systemd for resource isolation";
|
||||
homepage = "https://github.com/jupyterhub/systemdspawner";
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ buildPythonPackage rec {
|
|||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
"--ignore=tests/native"
|
||||
"--ignore=tests/other/test_locking.py"
|
||||
"--ignore=tests/other/test_state_introspection.py"
|
||||
];
|
||||
disabledTests = [
|
||||
# failing tests
|
||||
|
|
|
|||
|
|
@ -1,13 +1,18 @@
|
|||
{ lib, buildPythonPackage, pythonOlder, fetchPypi, pydsdl }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, pydsdl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nunavut";
|
||||
version = "0.6.2";
|
||||
version = "1.0.1";
|
||||
disabled = pythonOlder "3.5"; # only python>=3.5 is supported
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "48b6802722d78542ca5d7bbc0d6aa9b0a31e1be0070c47b41527f227eb6a1443";
|
||||
sha256 = "1gvs3fx2l15y5ffqsxxjfa4p1ydaqbq7qp5nsgb8jbz871358jxm";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -19,7 +24,10 @@
|
|||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
# repo doesn't contain tests, ensure imports aren't broken
|
||||
# No tests in pypy package and no git tags yet for release versions, see
|
||||
# https://github.com/UAVCAN/nunavut/issues/182
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nunavut"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "praw";
|
||||
version = "7.1.2";
|
||||
version = "7.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praw-dev";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-aEx0swjfyBrSu1fgIiAwdwWmk9v5o7sbT5HTVp7L3R4=";
|
||||
sha256 = "sha256-Ndj7JNRQVLlWyOkS7zSi3B07mZyulyIL0Ju3owNoAsw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,25 +2,24 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydsdl";
|
||||
version = "1.4.2";
|
||||
version = "1.9.4";
|
||||
disabled = pythonOlder "3.5"; # only python>=3.5 is supported
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "UAVCAN";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "03kbpzdrjzj5vpgz5rhc110pm1axdn3ynv88b42zq6iyab4k8k1x";
|
||||
sha256 = "1hmmc4sg6dckbx2ghcjpi74yprapa6lkxxzy0h446mvyngp0kwfv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
];
|
||||
|
||||
# allow for writable directory for darwin
|
||||
preBuild = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
# repo doesn't contain tests, ensure imports aren't broken
|
||||
# repo doesn't contain tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pydsdl"
|
||||
];
|
||||
|
|
|
|||
36
pkgs/development/python-modules/pysma/default.nix
Normal file
36
pkgs/development/python-modules/pysma/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jmespath
|
||||
, async-timeout
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysma";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1awcsbk14i2aw01f7b7hrmpn9q6vr9v6la0i9n7ldv1h8rzq6j16";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
attrs
|
||||
jmespath
|
||||
];
|
||||
|
||||
# pypi does not contain tests and GitHub archive not available
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pysma" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for interacting with SMA Solar's WebConnect";
|
||||
homepage = "https://github.com/kellerza/pysma";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -49,6 +49,8 @@ buildPythonPackage rec {
|
|||
responses
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "slack" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API";
|
||||
homepage = "https://github.com/slackapi/python-slackclient";
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder
|
||||
, crytic-compile, prettytable, setuptools, solc
|
||||
{ lib, stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder
|
||||
, crytic-compile, prettytable, setuptools
|
||||
# solc is currently broken on Darwin, default to false
|
||||
, solc, withSolc ? !stdenv.isDarwin
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -19,7 +21,7 @@ buildPythonPackage rec {
|
|||
nativeBuildInputs = [ makeWrapper ];
|
||||
propagatedBuildInputs = [ crytic-compile prettytable setuptools ];
|
||||
|
||||
postFixup = ''
|
||||
postFixup = lib.optionalString withSolc ''
|
||||
wrapProgram $out/bin/slither \
|
||||
--prefix PATH : "${lib.makeBinPath [ solc ]}"
|
||||
'';
|
||||
|
|
@ -32,7 +34,7 @@ buildPythonPackage rec {
|
|||
contract details, and provides an API to easily write custom analyses.
|
||||
'';
|
||||
homepage = "https://github.com/trailofbits/slither";
|
||||
license = licenses.agpl3;
|
||||
maintainers = [ maintainers.asymmetric ];
|
||||
license = licenses.agpl3Plus;
|
||||
maintainers = with maintainers; [ asymmetric arturcygan ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
{ mkDerivation, aeson, base, binary, blaze-markup, brittany
|
||||
, bytestring, containers, data-default, deepseq, directory, extra
|
||||
, fetchgit, filepath, floskell, fourmolu, ghc, ghc-boot-th
|
||||
, ghc-paths, ghcide, gitrev, hashable, haskell-lsp, hie-bios
|
||||
, hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin
|
||||
, hls-hlint-plugin, hls-plugin-api, hls-retrie-plugin
|
||||
, hls-tactics-plugin, hslogger, hspec, hspec-core
|
||||
, hspec-expectations, lens, lsp-test, mtl, optparse-applicative
|
||||
, optparse-simple, ormolu, process, regex-tdfa, safe-exceptions
|
||||
, shake, lib, stm, stylish-haskell, tasty, tasty-ant-xml
|
||||
, tasty-expected-failure, tasty-golden, tasty-hunit, tasty-rerun
|
||||
, temporary, text, transformers, unordered-containers, with-utf8
|
||||
, yaml
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "haskell-language-server";
|
||||
version = "0.8.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/haskell/haskell-language-server.git";
|
||||
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
|
||||
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
base containers data-default directory extra filepath ghc ghcide
|
||||
gitrev haskell-lsp hls-plugin-api hslogger optparse-applicative
|
||||
optparse-simple process shake text unordered-containers
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson base binary brittany bytestring containers deepseq directory
|
||||
extra filepath floskell fourmolu ghc ghc-boot-th ghc-paths ghcide
|
||||
gitrev hashable haskell-lsp hie-bios hls-class-plugin
|
||||
hls-eval-plugin hls-explicit-imports-plugin hls-hlint-plugin
|
||||
hls-plugin-api hls-retrie-plugin hls-tactics-plugin hslogger lens
|
||||
mtl optparse-applicative optparse-simple ormolu process regex-tdfa
|
||||
safe-exceptions shake stylish-haskell temporary text transformers
|
||||
unordered-containers with-utf8
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson base blaze-markup bytestring containers data-default
|
||||
directory extra filepath haskell-lsp hie-bios hls-plugin-api
|
||||
hslogger hspec hspec-core hspec-expectations lens lsp-test process
|
||||
stm tasty tasty-ant-xml tasty-expected-failure tasty-golden
|
||||
tasty-hunit tasty-rerun temporary text transformers
|
||||
unordered-containers yaml
|
||||
];
|
||||
testToolDepends = [ ghcide ];
|
||||
homepage = "https://github.com/haskell/haskell-language-server#readme";
|
||||
description = "LSP server for GHC";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
{ mkDerivation, aeson, base, containers, fetchgit, ghc
|
||||
, ghc-exactprint, ghcide, haskell-lsp, hls-plugin-api, lens, shake
|
||||
, lib, text, transformers, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hls-class-plugin";
|
||||
version = "0.1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/haskell/haskell-language-server.git";
|
||||
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
|
||||
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/plugins/hls-class-plugin; echo source root reset to $sourceRoot";
|
||||
libraryHaskellDepends = [
|
||||
aeson base containers ghc ghc-exactprint ghcide haskell-lsp
|
||||
hls-plugin-api lens shake text transformers unordered-containers
|
||||
];
|
||||
description = "Explicit imports plugin for Haskell Language Server";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
{ mkDerivation, aeson, base, containers, deepseq, Diff, directory
|
||||
, extra, fetchgit, filepath, ghc, ghc-boot-th, ghc-paths, ghcide
|
||||
, hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api
|
||||
, parser-combinators, pretty-simple, QuickCheck, safe-exceptions
|
||||
, shake, lib, temporary, text, time, transformers
|
||||
, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hls-eval-plugin";
|
||||
version = "0.1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/haskell/haskell-language-server.git";
|
||||
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
|
||||
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/plugins/hls-eval-plugin; echo source root reset to $sourceRoot";
|
||||
libraryHaskellDepends = [
|
||||
aeson base containers deepseq Diff directory extra filepath ghc
|
||||
ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types
|
||||
hls-plugin-api parser-combinators pretty-simple QuickCheck
|
||||
safe-exceptions shake temporary text time transformers
|
||||
unordered-containers
|
||||
];
|
||||
description = "Eval plugin for Haskell Language Server";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
{ mkDerivation, aeson, base, containers, deepseq, fetchgit, ghc
|
||||
, ghcide, haskell-lsp-types, hls-plugin-api, shake, lib, text
|
||||
, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hls-explicit-imports-plugin";
|
||||
version = "0.1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/haskell/haskell-language-server.git";
|
||||
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
|
||||
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/plugins/hls-explicit-imports-plugin; echo source root reset to $sourceRoot";
|
||||
libraryHaskellDepends = [
|
||||
aeson base containers deepseq ghc ghcide haskell-lsp-types
|
||||
hls-plugin-api shake text unordered-containers
|
||||
];
|
||||
description = "Explicit imports plugin for Haskell Language Server";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
{ mkDerivation, aeson, apply-refact, base, binary, bytestring
|
||||
, containers, data-default, deepseq, Diff, directory, extra
|
||||
, fetchgit, filepath, ghc, ghc-lib, ghc-lib-parser-ex, ghcide
|
||||
, hashable, haskell-lsp, hlint, hls-plugin-api, hslogger, lens
|
||||
, regex-tdfa, shake, lib, temporary, text, transformers
|
||||
, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hls-hlint-plugin";
|
||||
version = "0.1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/haskell/haskell-language-server.git";
|
||||
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
|
||||
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/plugins/hls-hlint-plugin; echo source root reset to $sourceRoot";
|
||||
libraryHaskellDepends = [
|
||||
aeson apply-refact base binary bytestring containers data-default
|
||||
deepseq Diff directory extra filepath ghc ghc-lib ghc-lib-parser-ex
|
||||
ghcide hashable haskell-lsp hlint hls-plugin-api hslogger lens
|
||||
regex-tdfa shake temporary text transformers unordered-containers
|
||||
];
|
||||
description = "Hlint integration plugin with Haskell Language Server";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
{ mkDerivation, aeson, base, containers, deepseq, directory, extra
|
||||
, fetchgit, ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
|
||||
, hls-plugin-api, retrie, safe-exceptions, shake, lib, text
|
||||
, transformers, unordered-containers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hls-retrie-plugin";
|
||||
version = "0.1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/haskell/haskell-language-server.git";
|
||||
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
|
||||
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/plugins/hls-retrie-plugin; echo source root reset to $sourceRoot";
|
||||
libraryHaskellDepends = [
|
||||
aeson base containers deepseq directory extra ghc ghcide hashable
|
||||
haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions
|
||||
shake text transformers unordered-containers
|
||||
];
|
||||
description = "Retrie integration plugin for Haskell Language Server";
|
||||
license = lib.licenses.asl20;
|
||||
}
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
{ mkDerivation, aeson, base, checkers, containers, deepseq
|
||||
, directory, extra, fetchgit, filepath, fingertree, generic-lens
|
||||
, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide
|
||||
, haskell-lsp, hie-bios, hls-plugin-api, hspec, hspec-discover
|
||||
, lens, mtl, QuickCheck, refinery, retrie, shake, lib, syb, text
|
||||
, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "hls-tactics-plugin";
|
||||
version = "0.5.1.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/haskell/haskell-language-server.git";
|
||||
sha256 = "0p6fqs07lajbi2g1wf4w3j5lvwknnk58n12vlg48cs4iz25gp588";
|
||||
rev = "eb58f13f7b8e4f9bc771af30ff9fd82dc4309ff5";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
postUnpack = "sourceRoot+=/plugins/tactics; echo source root reset to $sourceRoot";
|
||||
libraryHaskellDepends = [
|
||||
aeson base containers deepseq directory extra filepath fingertree
|
||||
generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
|
||||
haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text
|
||||
transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base checkers containers ghc hie-bios hls-plugin-api hspec mtl
|
||||
QuickCheck
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
description = "Tactics plugin for Haskell Language Server";
|
||||
license = "unknown";
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p cabal2nix jq curl
|
||||
#
|
||||
# This script will update the haskell-language-server derivation to the latest version using
|
||||
# cabal2nix.
|
||||
#
|
||||
# Note that you should always try building haskell-language-server after updating it here, since
|
||||
# some of the overrides in pkgs/development/haskell/configuration-nix.nix may
|
||||
# need to be updated/changed.
|
||||
#
|
||||
# Remember to split out different updates into multiple commits
|
||||
|
||||
set -eo pipefail
|
||||
|
||||
# This is the directory of this update.sh script.
|
||||
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
|
||||
|
||||
# ===========================
|
||||
# HLS
|
||||
# ===========================
|
||||
|
||||
# hls derivation created with cabal2nix.
|
||||
hls_derivation_file="${script_dir}/default.nix"
|
||||
|
||||
# This is the current revision of hls in Nixpkgs.
|
||||
hls_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$hls_derivation_file")"
|
||||
|
||||
# This is the latest release version of hls on GitHub.
|
||||
# Get all tag names, filter to the hls ones (no prefix like 'hls-plugin-api-'),
|
||||
# sort for the latest one and select just that
|
||||
hls_latest_release=$(curl -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/haskell/haskell-language-server/tags |
|
||||
jq --raw-output 'map(.name) | .[]' |
|
||||
grep '^[0-9]' |
|
||||
sort --version-sort |
|
||||
tail -n1)
|
||||
|
||||
# Use this value instead for the very latest revision
|
||||
# hls_head=(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/commits/master" | jq '.sha' --raw-output)
|
||||
|
||||
hls_new_version=$hls_latest_release
|
||||
|
||||
echo "Updating haskell-language-server from old version $hls_old_version to new version $hls_new_version."
|
||||
echo "Running cabal2nix and outputting to ${hls_derivation_file}..."
|
||||
cabal2nix --revision "$hls_new_version" "https://github.com/haskell/haskell-language-server.git" > "$hls_derivation_file"
|
||||
cabal2nix --revision "$hls_new_version" --subpath plugins/tactics "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/hls-tactics-plugin.nix"
|
||||
for plugin in "hls-hlint-plugin" "hls-explicit-imports-plugin" "hls-retrie-plugin" "hls-class-plugin" "hls-eval-plugin"; do
|
||||
cabal2nix --revision "$hls_new_version" --subpath plugins/$plugin "https://github.com/haskell/haskell-language-server.git" > "${script_dir}/$plugin.nix"
|
||||
done
|
||||
|
||||
echo "Finished."
|
||||
57
pkgs/servers/etebase/default.nix
Normal file
57
pkgs/servers/etebase/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ lib, stdenv, python3, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
py = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
django = super.django_3;
|
||||
};
|
||||
};
|
||||
in
|
||||
with py.pkgs;
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "etebase-server";
|
||||
version = "0.7.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etesync";
|
||||
repo = "server";
|
||||
rev = "v${version}";
|
||||
sha256 = "1r2a7ki9w2h3l6rwqa3fzxjlqfj2lbgfrm8lynjhvcdv02s5abbi";
|
||||
};
|
||||
|
||||
patches = [ ./secret.patch ];
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
asgiref
|
||||
cffi
|
||||
django
|
||||
django-cors-headers
|
||||
djangorestframework
|
||||
drf-nested-routers
|
||||
msgpack
|
||||
psycopg2
|
||||
pycparser
|
||||
pynacl
|
||||
pytz
|
||||
six
|
||||
sqlparse
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/lib
|
||||
cp -r . $out/lib/etebase-server
|
||||
ln -s $out/lib/etebase-server/manage.py $out/bin/etebase-server
|
||||
wrapProgram $out/bin/etebase-server --prefix PYTHONPATH : "$PYTHONPATH"
|
||||
chmod +x $out/bin/etebase-server
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/etesync/server";
|
||||
description = "An Etebase (EteSync 2.0) server so you can run your own.";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ felschr ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
26
pkgs/servers/etebase/secret.patch
Normal file
26
pkgs/servers/etebase/secret.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/etebase_server/settings.py b/etebase_server/settings.py
|
||||
index 9baf8d3..501d9f6 100644
|
||||
--- a/etebase_server/settings.py
|
||||
+++ b/etebase_server/settings.py
|
||||
@@ -23,11 +22,6 @@
|
||||
# Quick-start development settings - unsuitable for production
|
||||
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
|
||||
|
||||
-# SECURITY WARNING: keep the secret key used in production secret!
|
||||
-# See secret.py for how this is generated; uses a file 'secret.txt' in the root
|
||||
-# directory
|
||||
-SECRET_FILE = os.path.join(BASE_DIR, "secret.txt")
|
||||
-
|
||||
# SECURITY WARNING: don't run with debug turned on in production!
|
||||
DEBUG = True
|
||||
|
||||
@@ -143,7 +137,7 @@
|
||||
|
||||
section = config["global"]
|
||||
|
||||
- SECRET_FILE = section.get("secret_file", SECRET_FILE)
|
||||
+ SECRET_FILE = section.get("secret_file", None)
|
||||
STATIC_ROOT = section.get("static_root", STATIC_ROOT)
|
||||
STATIC_URL = section.get("static_url", STATIC_URL)
|
||||
MEDIA_ROOT = section.get("media_root", MEDIA_ROOT)
|
||||
|
||||
|
|
@ -744,7 +744,7 @@
|
|||
"slack" = ps: with ps; [ ]; # missing inputs: slackclient
|
||||
"sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq
|
||||
"slide" = ps: with ps; [ ]; # missing inputs: goslide-api
|
||||
"sma" = ps: with ps; [ ]; # missing inputs: pysma
|
||||
"sma" = ps: with ps; [ pysma ];
|
||||
"smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee
|
||||
"smart_meter_texas" = ps: with ps; [ ]; # missing inputs: smart-meter-texas
|
||||
"smarthab" = ps: with ps; [ ]; # missing inputs: smarthab
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "procs";
|
||||
version = "0.11.1";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dalance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-e9fdqsv/P3zZdjsdAkwO21txPS1aWd0DuqRQUdr1vX4=";
|
||||
sha256 = "sha256-OaHsNxrOrPlAwtFDY3Tnx+nOabax98xcGQeNds32iOA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-ilSDLbPQnmhQcNbtKCpUNmyZY0JUY/Ksg0sj/t7veT0=";
|
||||
cargoSha256 = "sha256-miOfm1Sw6tIICkT9T2V82cdGG2STo9vuLPWsAN/8wuM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, stdenv, fetchurl, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pngcheck-2.3.0";
|
||||
name = "pngcheck-3.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/png-mng/${name}.tar.gz";
|
||||
sha256 = "0pzkj1bb4kdybk6vbfq9s0wzdm5szmrgixkas3xmbpv4mhws1w3p";
|
||||
sha256 = "sha256-DX4mLyQRb93yhHqM61yS2fXybvtC6f/2PsK7dnYTHKc=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -2,26 +2,24 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "duf";
|
||||
version = "0.5.0";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muesli";
|
||||
repo = "duf";
|
||||
rev = "v${version}";
|
||||
sha256 = "0n0nvrqrlr75dmf2j6ja615ighzs35cfixn7z9cwdz3vhj1xhc5f";
|
||||
sha256 = "sha256-Wm3gfir6blQFLLi+2bT5Y/5tf7qUxEddJQ7tCYfBGgM=";
|
||||
};
|
||||
|
||||
dontStrip = true;
|
||||
vendorSha256 = "0icxy6wbqjqawr6i5skwp1z37fq303p8f95crd8lwn6pjjiqzk4i";
|
||||
|
||||
vendorSha256 = "1jqilfsirj7bkhzywimzf98w2b4s777phb06nsw6lr3bi6nnwzr1";
|
||||
|
||||
buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ];
|
||||
buildFlagsArray = [ "-ldflags=" "-s -w -X=main.Version=${version}" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/muesli/duf/";
|
||||
description = "Disk Usage/Free Utility";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ petabyteboy penguwin ];
|
||||
maintainers = with maintainers; [ petabyteboy penguwin SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcb2gcode";
|
||||
version = "2.1.0";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pcb2gcode";
|
||||
repo = "pcb2gcode";
|
||||
rev = "v${version}";
|
||||
sha256 = "0nzglcyh6ban27cc73j4l7w7r9k38qivq0jz8iwnci02pfalw4ry";
|
||||
sha256 = "sha256-GSLWpLp/InAxVolKmBIjljpe3ZzmS/87TWKwzax5SkY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
|
|
|||
|
|
@ -21823,6 +21823,8 @@ in
|
|||
|
||||
eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { };
|
||||
|
||||
etebase-server = with python3Packages; toPythonApplication etebase-server;
|
||||
|
||||
etesync-dav = callPackage ../applications/misc/etesync-dav {};
|
||||
|
||||
etherape = callPackage ../applications/networking/sniffers/etherape { };
|
||||
|
|
@ -23179,6 +23181,8 @@ in
|
|||
|
||||
lame = callPackage ../development/libraries/lame { };
|
||||
|
||||
labwc = callPackage ../applications/window-managers/labwc { };
|
||||
|
||||
larswm = callPackage ../applications/window-managers/larswm { };
|
||||
|
||||
lash = callPackage ../applications/audio/lash { };
|
||||
|
|
@ -23239,11 +23243,10 @@ in
|
|||
};
|
||||
|
||||
libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
||||
libreoffice = libsForQt514.callPackage ../applications/office/libreoffice
|
||||
libreoffice = libsForQt5.callPackage ../applications/office/libreoffice
|
||||
(libreoffice-args // {
|
||||
kdeIntegration = true;
|
||||
variant = "fresh";
|
||||
jdk = jdk11;
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -23251,7 +23254,6 @@ in
|
|||
libreoffice = callPackage ../applications/office/libreoffice
|
||||
(libreoffice-args // {
|
||||
variant = "fresh";
|
||||
jdk = jdk11;
|
||||
});
|
||||
});
|
||||
libreoffice-fresh-unwrapped = libreoffice-fresh.libreoffice;
|
||||
|
|
@ -23259,10 +23261,7 @@ in
|
|||
libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
|
||||
libreoffice = callPackage ../applications/office/libreoffice
|
||||
(libreoffice-args // {
|
||||
stdenv = gcc9Stdenv; # Fails in multiple ways with gcc10
|
||||
icu = icu64;
|
||||
variant = "still";
|
||||
jdk = jdk8;
|
||||
});
|
||||
});
|
||||
libreoffice-still-unwrapped = libreoffice-still.libreoffice;
|
||||
|
|
|
|||
|
|
@ -1960,6 +1960,8 @@ in {
|
|||
|
||||
dpkt = callPackage ../development/python-modules/dpkt { };
|
||||
|
||||
drf-nested-routers = callPackage ../development/python-modules/drf-nested-routers { };
|
||||
|
||||
drf-yasg = callPackage ../development/python-modules/drf-yasg { };
|
||||
|
||||
drms = callPackage ../development/python-modules/drms { };
|
||||
|
|
@ -2087,6 +2089,8 @@ in {
|
|||
inherit (pkgs.darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
etebase-server = callPackage ../servers/etebase { };
|
||||
|
||||
etesync = callPackage ../development/python-modules/etesync { };
|
||||
|
||||
eth-hash = callPackage ../development/python-modules/eth-hash { };
|
||||
|
|
@ -5930,6 +5934,8 @@ in {
|
|||
|
||||
pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; };
|
||||
|
||||
pysma = callPackage ../development/python-modules/pysma { };
|
||||
|
||||
pysmb = callPackage ../development/python-modules/pysmb { };
|
||||
|
||||
pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkg-config; };
|
||||
|
|
|
|||
Loading…
Reference in a new issue