Merge branch 'master' into staging-next

This commit is contained in:
Vladimír Čunát 2019-09-24 08:14:34 +02:00
commit eab41878ac
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
185 changed files with 5276 additions and 3825 deletions

View File

@ -218,9 +218,9 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "Common Public License 1.0";
};
curl = {
fullName = "MIT/X11 derivate";
url = "https://curl.haxx.se/docs/copyright.html";
curl = spdx {
spdxId = "curl";
fullName = "curl License";
};
doc = spdx {
@ -613,6 +613,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
url = https://enterprise.dejacode.com/licenses/public/purdue-bsd;
};
qhull = spdx {
spdxId = "Qhull";
fullName = "Qhull License";
};
qpl = spdx {
spdxId = "QPL-1.0";
fullName = "Q Public License 1.0";

View File

@ -1,7 +1,7 @@
# Common configuration for virtual machines running under QEMU (using
# virtio).
{ ... }:
{ lib, ... }:
{
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
@ -15,5 +15,5 @@
hwclock -s
'';
security.rngd.enable = false;
security.rngd.enable = lib.mkDefault false;
}

View File

@ -54,8 +54,8 @@ in
type = types.attrsOf types.str;
default = {};
example = {
h = "noaction 5\e(";
l = "noaction 5\e)";
h = "noaction 5\\e(";
l = "noaction 5\\e)";
};
description = "Defines new command keys.";
};

View File

@ -351,7 +351,7 @@ let
${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
"auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth
"auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so id=${toString yubi.id} ${optionalString yubi.debug "debug"}"}
"auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"}
'' +
# Modules in this block require having the password set in PAM_AUTHTOK.
# pam_unix is marked as 'sufficient' on NixOS which means nothing will run
@ -696,6 +696,23 @@ in
Debug output to stderr.
'';
};
mode = mkOption {
default = "client";
type = types.enum [ "client" "challenge-response" ];
description = ''
Mode of operation.
Use "client" for online validation with a YubiKey validation service such as
the YubiCloud.
Use "challenge-response" for offline validation using YubiKeys with HMAC-SHA-1
Challenge-Response configurations. See the man-page ykpamcfg(1) for further
details on how to configure offline Challenge-Response validation.
More information can be found <link
xlink:href="https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html">here</link>.
'';
};
};
security.pam.enableEcryptfs = mkOption {
@ -742,13 +759,6 @@ in
environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
systemd.tmpfiles.rules = optionals
(any (s: s.updateWtmp) (attrValues config.security.pam.services))
[
"f /var/log/wtmp"
"f /var/log/lastlog"
];
security.pam.services =
{ other.text =
''

View File

@ -169,13 +169,14 @@ in {
systemd.services = with attrsets; mapAttrs' (name: config: nameValuePair "postgresql-wal-receiver-${name}" {
description = "PostgreSQL WAL receiver (${name})";
wantedBy = [ "multi-user.target" ];
startLimitIntervalSec = 0; # retry forever, useful in case of network disruption
serviceConfig = {
User = "postgres";
Group = "postgres";
KillSignal = "SIGINT";
Restart = "always";
RestartSec = 30;
RestartSec = 60;
};
inherit (config) environment;

View File

@ -3,7 +3,7 @@
let
cfg = config.services.mailcatcher;
inherit (lib) mkEnableOption mkIf mkOption types;
inherit (lib) mkEnableOption mkIf mkOption types optionalString;
in
{
# interface
@ -54,6 +54,7 @@ in
DynamicUser = true;
Restart = "always";
ExecStart = "${pkgs.mailcatcher}/bin/mailcatcher --foreground --no-quit --http-ip ${cfg.http.ip} --http-port ${toString cfg.http.port} --smtp-ip ${cfg.smtp.ip} --smtp-port ${toString cfg.smtp.port}";
AmbientCapabilities = optionalString (cfg.http.port < 1024 || cfg.smtp.port < 1024) "cap_net_bind_service";
};
};
};

View File

@ -68,7 +68,7 @@ let
replaced with <literal>rspamd_proxy</literal>.
'';
apply = let
from = "services.rspamd.workers.\${name}\".type";
from = "services.rspamd.workers.\"${name}\".type";
files = options.type.files;
warning = "The option `${from}` defined in ${showFiles files} has enum value `proxy` which has been renamed to `rspamd_proxy`";
in x: if x == "proxy" then traceWarning warning "rspamd_proxy" else x;

View File

@ -673,6 +673,10 @@ in {
openssh
nodejs
gnupg
# Needed for GitLab project imports
gnutar
gzip
];
serviceConfig = {
Type = "simple";

View File

@ -239,7 +239,7 @@ in {
description = "Any metrics received which match one of the experssions will be dropped.";
default = null;
type = types.nullOr types.str;
example = "^some\.noisy\.metric\.prefix\..*";
example = "^some\\.noisy\\.metric\\.prefix\\..*";
};
whitelist = mkOption {

View File

@ -27,6 +27,7 @@ let
[logging]
level=${cfg.logLevel}
audit=${lib.boolToString config.security.audit.enable}
[connection]
ipv6.ip6-privacy=2
@ -513,8 +514,9 @@ in {
security.polkit.extraConfig = polkitConf;
services.dbus.packages =
optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
services.dbus.packages = cfg.packages
++ optional cfg.enableStrongSwan pkgs.strongswanNM
++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq;
services.udev.packages = cfg.packages;
};

View File

@ -465,7 +465,7 @@ in
modules_enabled = {
${ lib.concatStringsSep "\n\ \ " (lib.mapAttrsToList
${ lib.concatStringsSep "\n " (lib.mapAttrsToList
(name: val: optionalString val "${toLua name};")
cfg.modules) }
${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.package.communityModules)}

View File

@ -105,8 +105,8 @@ in {
default = null;
example = {
serverAliases = [
"matomo.$\{config.networking.domain\}"
"stats.$\{config.networking.domain\}"
"matomo.\${config.networking.domain}"
"stats.\${config.networking.domain}"
];
enableACME = false;
};
@ -115,7 +115,7 @@ in {
Either this option or the webServerUser option is mandatory.
Set this to {} to just enable the virtualHost if you don't need any customization.
If enabled, then by default, the <option>serverName</option> is
<literal>${user}.$\{config.networking.hostName\}.$\{config.networking.domain\}</literal>,
<literal>''${user}.''${config.networking.hostName}.''${config.networking.domain}</literal>,
SSL is active, and certificates are acquired via ACME.
If this is set to null (the default), no nginx virtualHost will be configured.
'';
@ -275,7 +275,7 @@ in {
fastcgi_pass unix:${phpSocket};
'';
# Any other attempt to access any php files is forbidden
locations."~* ^.+\.php$".extraConfig = ''
locations."~* ^.+\\.php$".extraConfig = ''
return 403;
'';
# Disallow access to unneeded directories
@ -284,7 +284,7 @@ in {
return 403;
'';
# Disallow access to several helper files
locations."~* \.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
locations."~* \\.(?:bat|git|ini|sh|txt|tpl|xml|md)$".extraConfig = ''
return 403;
'';
# No crawling of this site for bots that obey robots.txt - no useful information here.

View File

@ -235,7 +235,7 @@ in
locations."/".root = "${runDir}/client";
locations."~ \.php$" = {
locations."~ \\.php$" = {
tryFiles = "$uri =404";
extraConfig = ''
include ${pkgs.nginx}/conf/fastcgi_params;
@ -246,7 +246,7 @@ in
'';
};
locations."~* \.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
locations."~* \\.(css|js|less|html|ttf|woff|jpg|jpeg|gif|png|bmp|ico)" = {
root = "${runDir}/client";
extraConfig = ''
if (-f $request_filename) {

View File

@ -548,7 +548,7 @@ let
index = "index.php";
};
locations."~ \.php$" = {
locations."~ \\.php$" = {
extraConfig = ''
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:${config.services.phpfpm.pools.${cfg.pool}.socket};

View File

@ -858,7 +858,12 @@ in
"sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf";
"sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf";
"tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf";
"tmpfiles.d/static-nodes-permissions.conf".source = "${systemd}/example/tmpfiles.d/static-nodes-permissions.conf";
"tmpfiles.d/systemd.conf".source = "${systemd}/example/tmpfiles.d/systemd.conf";
"tmpfiles.d/systemd-nspawn.conf".source = "${systemd}/example/tmpfiles.d/system-nspawn.conf";
"tmpfiles.d/systemd-tmp.conf".source = "${systemd}/example/tmpfiles.d/system-tmp.conf";
"tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf";
"tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf";
"tmpfiles.d/nixos.conf".text = ''

View File

@ -4,15 +4,13 @@
stdenv.mkDerivation rec {
pname = "gigedit";
version = "1.1.0";
version = "1.1.1";
src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb";
};
patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
preConfigure = "make -f Makefile.svn";
nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];

View File

@ -1,15 +0,0 @@
--- a/src/gigedit/wrapLabel.cc
+++ b/src/gigedit/wrapLabel.cc
@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
: mWrapWidth(0),
mWrapHeight(0)
{
- // pangomm >= 2.35.1
-#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
-#else
get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
-#endif
set_alignment(0.0, 0.0);
set_text(text);
}

View File

@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec {
];
propagatedBuildInputs = with pythonPackages; [
gst-python pygobject3 pykka tornado_4 requests
gst-python pygobject3 pykka tornado_4 requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
# There are no tests

View File

@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
pname = "Mopidy-Iris";
version = "3.39.0";
version = "3.40.0";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag";
sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v";
};
propagatedBuildInputs = [

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "jormungandr";
version = "0.3.9999";
version = "0.5.0";
src = fetchgit {
url = "https://github.com/input-output-hk/${pname}";
rev = "v${version}";
sha256 = "11lr533fpispwbk4vsq9bnv40gkpybvpa7ajwczv9ky6afh8np5b";
sha256 = "19jqnja4mxyfgg79m4ak4815wjxvkg6qn04gk21c15xl3i8b4zf6";
fetchSubmodules = true;
};
cargoSha256 = "0b5phmvwv5cyjawlxd9rmlc403lxzm4gnw0mclq70g5g0msqzd9m";
cargoSha256 = "1grrxmczdmkf2sd0f0b2iblzzcp8qlrsad5dkm0r5vxch22rcx7d";
nativeBuildInputs = [ pkgconfig protobuf ];
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

View File

@ -636,16 +636,16 @@
license = lib.licenses.free;
};
}) {};
csv-mode = callPackage ({ elpaBuild, fetchurl, lib }:
csv-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
version = "1.7";
version = "1.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/csv-mode-1.7.el";
sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6";
url = "https://elpa.gnu.org/packages/csv-mode-1.8.el";
sha256 = "1ywgc61pnawiwfpjgxavfpfxqd3dm9niq6srbc70pd54ca6yqby6";
};
packageRequires = [];
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/csv-mode.html";
license = lib.licenses.free;
@ -975,10 +975,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20190517";
version = "20190902";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20190517.tar";
sha256 = "0hgjdax0kg2w7bf3idl6mw6m8j2wkh1253px42v2lbaxp6897m07";
url = "https://elpa.gnu.org/packages/eev-20190902.tar";
sha256 = "09rk01ykvvmmzadkz8y064iil2sm6ql6qz0rj0jjlnyymi58lj69";
};
packageRequires = [ emacs ];
meta = {
@ -1132,10 +1132,10 @@
elpaBuild {
pname = "exwm";
ename = "exwm";
version = "0.22.1";
version = "0.23";
src = fetchurl {
url = "https://elpa.gnu.org/packages/exwm-0.22.1.tar";
sha256 = "1ggb8vgxxml8c5bvamv9jgz80gs6h9xirjgphq8gwkywwd5xyiq4";
url = "https://elpa.gnu.org/packages/exwm-0.23.tar";
sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5";
};
packageRequires = [ xelb ];
meta = {
@ -1282,10 +1282,10 @@
elpaBuild {
pname = "gited";
ename = "gited";
version = "0.5.4";
version = "0.6.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gited-0.5.4.tar";
sha256 = "07ckknggkqd733bnps21r46bacgyhd0v9wc0spid22hn0dnrfp12";
url = "https://elpa.gnu.org/packages/gited-0.6.0.tar";
sha256 = "187asqrxfpxv53hhnrcid1sy46vcy07qx5yqgnrczi54jpcc57j5";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1327,10 +1327,10 @@
elpaBuild {
pname = "gnorb";
ename = "gnorb";
version = "1.6.1";
version = "1.6.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.6.1.tar";
sha256 = "0n4460hsmcc3l0y3nb3fysvh33cjwgv0a3mkc26xcx8v85zl7m63";
url = "https://elpa.gnu.org/packages/gnorb-1.6.3.tar";
sha256 = "14cdldlvq2fx0j9g1bbzb6dq7yp9rw6bv39sls67i2p35h3gc2gd";
};
packageRequires = [ cl-lib ];
meta = {
@ -2220,10 +2220,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.2.5";
version = "9.2.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.2.5.tar";
sha256 = "1pid1sykgz83i4ry5n8f270finag6sm7ckqxn5lkikyya43wlzx1";
url = "https://elpa.gnu.org/packages/org-9.2.6.tar";
sha256 = "0ikd78k4yw4sm5x7l3dsbvfcmvnv5qna2mxirr560gvcnzhr0zg4";
};
packageRequires = [];
meta = {
@ -2385,10 +2385,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.2.8";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.2.8.tar";
sha256 = "16sdqh93d2i9dxjibbhx4afakn150qc6xy2ifd83kx85c67y95kl";
url = "https://elpa.gnu.org/packages/phps-mode-0.3.1.tar";
sha256 = "1h6s5k156mbbkaysb07vcb13k3izs91pwigzcfh6jvv3lak4azg5";
};
packageRequires = [ emacs ];
meta = {
@ -3001,10 +3001,10 @@
elpaBuild {
pname = "ssh-deploy";
ename = "ssh-deploy";
version = "3.1";
version = "3.1.10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.tar";
sha256 = "09m1ljp68rribypls5mzffmdv86jkg9wq4bdb7d1qkdjyr3f2hgn";
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.10.tar";
sha256 = "0gckc6yhgi8pn3s8vdyzz8x1s2d4wmsw6yjwsaqcr5nra50glbpg";
};
packageRequires = [ emacs ];
meta = {
@ -3590,10 +3590,10 @@
elpaBuild {
pname = "xelb";
ename = "xelb";
version = "0.17";
version = "0.18";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xelb-0.17.tar";
sha256 = "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml";
url = "https://elpa.gnu.org/packages/xelb-0.18.tar";
sha256 = "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7";
};
packageRequires = [ cl-generic emacs ];
meta = {

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
}:
@ -28,7 +28,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ];
patchPhase = ''
patchPhase = lib.optionalString (!stdenv.isDarwin) ''
get_file_size() {
local fname="$1"
echo $(ls -l $fname | cut -d ' ' -f5)
@ -63,7 +63,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
item=${desktopItem}
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
--prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
# Some internals want libstdc++.so.6
stdenv.cc.cc.lib libsecret

View File

@ -134,7 +134,7 @@ let
as IntelliJ.
'';
maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
});

View File

@ -13,7 +13,7 @@ with stdenv.lib;
let
neovimLuaEnv = lua.withPackages(ps:
(with ps; [ mpack lpeg luabitop ]
(with ps; [ lpeg luabitop mpack ]
++ optionals doCheck [
nvim-client luv coxpcall busted luafilesystem penlight inspect
]
@ -21,13 +21,13 @@ let
in
stdenv.mkDerivation rec {
pname = "neovim-unwrapped";
version = "0.3.8";
version = "0.4.2";
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = "v${version}";
sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb";
sha256 = "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss";
};
patches = [
@ -41,14 +41,15 @@ in
enableParallelBuilding = true;
buildInputs = [
gperf
libtermkey
libuv
libvterm-neovim
lua.pkgs.luv.libluv
msgpack
ncurses
libvterm-neovim
unibilium
gperf
neovimLuaEnv
unibilium
] ++ optional withJemalloc jemalloc
++ optional stdenv.isDarwin libiconv
++ optionals doCheck [ glibcLocales procps ]
@ -77,8 +78,9 @@ in
disallowedReferences = [ stdenv.cc ];
cmakeFlags = [
"-DLUA_PRG=${neovimLuaEnv.interpreter}"
"-DGPERF_PRG=${gperf}/bin/gperf"
"-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so"
"-DLUA_PRG=${neovimLuaEnv.interpreter}"
]
++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted"
++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON"

View File

@ -10,11 +10,11 @@ with stdenv.lib;
perlPackages.buildPerlPackage rec {
pname = "gscan2pdf";
version = "2.5.5";
version = "2.5.6";
src = fetchurl {
url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz";
sha256 = "0gfhjmv768hx2l3jk2mjhh1snkgkaddgw70s14jq8kxhhzvhlmv8";
sha256 = "0wp81nsi5jfypabwmjqiamxr739jq5ij79n5fzn5pbw1hg5gcmfz";
};
nativeBuildInputs = [ wrapGAppsHook ];

View File

@ -15,6 +15,7 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedUserEnvPkgs = [ baloo ];
propagatedBuildInputs = [
baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes

View File

@ -1,6 +1,6 @@
{ lib, buildGoModule, fetchFromGitHub }:
{ lib, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "cointop";
version = "1.3.4";
@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "0nw6vzp0c5r8bwnlvgzj4hzdah44p5pp03d2bcr1lkw8np8fy65n";
};
modSha256 = "1fg5h689s6r79qa9qsmd8hcvyihfyzlvqrhhk0qyfl528ipi1zwg";
goPackagePath = "github.com/miguelmota/cointop";
meta = with lib; {
description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies";

View File

@ -1,42 +1,64 @@
{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }:
{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell
, qtbase, qtsvg, qttools, qmake
, boost, muparser }:
stdenv.mkDerivation rec {
version = "2.1.3";
mkDerivation rec {
pname = "librecad";
version = "2.2.0-rc1";
src = fetchurl {
url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
name = "${pname}-${version}" + ".tar.gz";
sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx";
src = fetchFromGitHub {
owner = "LibreCAD";
repo = "LibreCAD";
rev = version;
sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3";
};
patchPhase = ''
sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
patches = [ ./fix_qt_5_11_build.patch ];
postPatch = ''
substituteInPlace scripts/postprocess-unix.sh \
--replace /bin/sh ${runtimeShell}
substituteInPlace librecad/src/lib/engine/rs_system.cpp \
--replace /usr/share $out/share
substituteInPlace librecad/src/main/qc_applicationwindow.cpp \
--replace __DATE__ 0
'';
qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ];
qmakeFlags = [
"MUPARSER_DIR=${muparser}"
"BOOST_DIR=${boost.dev}"
];
installPhase = ''
install -m 555 -D unix/librecad $out/bin/librecad
install -m 444 -D desktop/librecad.desktop $out/share/applications/librecad.desktop
install -m 444 -D desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
install -m 444 -D desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
runHook preInstall
install -Dm555 -t $out/bin unix/{librecad,ttf2lff}
install -Dm444 -t $out/share/applications desktop/librecad.desktop
install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png
install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml
install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \
$out/share/icons/hicolor/scalable/apps/librecad.svg
installManPage desktop/librecad.?
cp -R unix/resources $out/share/librecad
runHook postInstall
'';
buildInputs = [ qt4 muparser which boost ];
nativeBuildInputs = [ pkgconfig qmake4Hook ];
buildInputs = [ boost muparser qtbase qtsvg ];
nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ];
enableParallelBuilding = true;
meta = {
description = "A 2D CAD package based upon Qt";
homepage = https://librecad.org;
repositories.git = git://github.com/LibreCAD/LibreCAD.git;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
meta = with lib; {
description = "2D CAD package based on Qt";
homepage = "https://librecad.org";
license = licenses.gpl2;
maintainers = with maintainers; [ viric ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,36 @@
diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp
index 835e47d..2c878e8 100644
--- a/librecad/src/ui/forms/qg_commandwidget.cpp
+++ b/librecad/src/ui/forms/qg_commandwidget.cpp
@@ -27,6 +27,7 @@
#include <algorithm>
+#include <QAction>
#include <QKeyEvent>
#include <QFileDialog>
#include <QSettings>
diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp
index 2beaceb..84068ad 100644
--- a/librecad/src/ui/generic/colorwizard.cpp
+++ b/librecad/src/ui/generic/colorwizard.cpp
@@ -27,6 +27,7 @@
#include "colorwizard.h"
#include "ui_colorwizard.h"
+#include <QAction>
#include <QColorDialog>
#include <QLineEdit>
#include <QListWidget>
diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp
index 7c35144..0e394f2 100644
--- a/librecad/src/ui/generic/widgetcreator.cpp
+++ b/librecad/src/ui/generic/widgetcreator.cpp
@@ -27,6 +27,7 @@
#include "widgetcreator.h"
#include "ui_widgetcreator.h"
+#include <QActionGroup>
#include <QSettings>
#include <QLineEdit>
#include <QPushButton>

View File

@ -1,21 +1,23 @@
{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }:
{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }:
let
version = "0.9.2";
version = "0.9.3-3";
name = "mucommander-${version}";
src = fetchFromGitHub {
owner = "mucommander";
repo = "mucommander";
rev = version;
sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8";
sha256 = "1zhglsx3b5k6np3ppfkkrqz9wg0j7ip598xxfgn75gjl020w0can";
};
postPatch = ''
# there is no .git anyway
substituteInPlace build.gradle \
--replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))" "" \
--replace "revision = git.head().id" "revision = 'abcdefgh'"
--replace "revision = git.head().id" "revision = 'abcdefgh'" \
--replace "proguard.enabled =" "// proguard.enabled =" \
--replace "version = '0.9.4'" "version = '${version}'"
# disable gradle plugins with native code and their targets
perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle
@ -34,7 +36,7 @@ let
deps = stdenv.mkDerivation {
name = "${name}-deps";
inherit src postPatch;
nativeBuildInputs = [ gradle_3_5 perl ];
nativeBuildInputs = [ gradle_4_10 perl ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
gradle --no-daemon build
@ -47,12 +49,12 @@ let
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7";
outputHash = "1v5a76pvk7llbyv2rg50wlxc2wf468l2cslz1vi20aihycbyky7j";
};
in stdenv.mkDerivation {
inherit name src postPatch;
nativeBuildInputs = [ gradle_3_5 perl makeWrapper ];
nativeBuildInputs = [ gradle_4_10 perl makeWrapper ];
buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d)
@ -63,7 +65,7 @@ in stdenv.mkDerivation {
repositories { mavenLocal(); maven { url '${deps}' } }
#" {} \;
gradle --offline --no-daemon build
gradle --offline --no-daemon distTar
'';
installPhase = ''

View File

@ -1,64 +1,75 @@
{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper
, stdenv, udev, wrapGAppsHook }:
stdenv.mkDerivation rec {
let
inherit (stdenv.hostPlatform) system;
name = "simplenote-${pkgver}";
pkgver = "1.1.3";
pname = "simplenote";
src = fetchurl {
url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz";
sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf";
};
version = "1.8.0";
buildCommand = let
packages = [
stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf
xorg.libxcb
];
libPathNative = lib.makeLibraryPath packages;
libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
libPath = "${libPathNative}:${libPath64}";
in ''
mkdir -p $out/share/
mkdir -p $out/bin
tar xvzf $src -C $out/share/
mv $out/share/Simplenote-linux-x64 $out/share/simplenote
mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote
mkdir -p $out/share/applications
cat > $out/share/applications/simplenote.desktop << EOF
[Desktop Entry]
Name=Simplenote
Comment=Simplenote for Linux
Exec=$out/bin/simplenote
Icon=$out/share/simplenote/Simplenote.png
Type=Application
StartupNotify=true
Categories=Development;
EOF
fixupPhase
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}:$out/share/simplenote" \
$out/share/simplenote/simplenote
ln -s $out/share/simplenote/simplenote $out/bin/simplenote
'';
sha256 = {
x86_64-linux = "066gr1awdj5nwdr1z57mmvx7dd1z19g0wzsgbnrrb89bqfj67ykl";
}.${system};
meta = with stdenv.lib; {
description = "The simplest way to keep notes";
homepage = https://github.com/Automattic/simplenote-electron;
license = licenses.lgpl2;
homepage = "https://github.com/Automattic/simplenote-electron";
license = licenses.gpl2;
maintainers = with maintainers; [ kiwi ];
platforms = [ "x86_64-linux" ];
};
}
linux = stdenv.mkDerivation rec {
inherit pname version meta;
src = fetchurl {
url =
"https://github.com/Automattic/simplenote-electron/releases/download/"
+ "v${version}/Simplenote-linux-${version}-amd64.deb";
inherit sha256;
};
desktopItem = makeDesktopItem {
name = "simplenote";
comment = "Simplenote for Linux";
exec = "simplenote %U";
icon = "simplenote";
type = "Application";
startupNotify = "true";
desktopName = "Simplenote";
categories = "Development";
};
dontBuild = true;
dontConfigure = true;
dontPatchELF = true;
dontWrapGApps = true;
buildInputs = atomEnv.packages;
nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ];
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p "$out/bin"
cp -R "opt" "$out"
cp -R "usr/share" "$out/share"
chmod -R g-w "$out"
mkdir -p "$out/share/applications"
cp "${desktopItem}/share/applications/"* "$out/share/applications"
'';
runtimeDependencies = [ udev.lib ];
postFixup = ''
ls -ahl $out
makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \
"''${gappsWrapperArgs[@]}"
'';
};
in
linux

View File

@ -82,11 +82,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "0.68.131";
version = "0.69.128";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l";
sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r";
};
dontConfigure = true;

View File

@ -266,17 +266,17 @@ in rec {
gtk3Support = false;
};
tor-browser-8-5 = tbcommon {
ffversion = "60.8.0esr";
tbversion = "8.5.4";
tor-browser-8-5 = tbcommon rec {
ffversion = "60.9.0esr";
tbversion = "8.5.6";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
# branch "tor-browser-60.8.0esr-8.5-1-slnos"
rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d";
sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9";
# branch "tor-browser-60.9.0esr-8.5-2-slnos"
rev = "0489ae3158cd8c0e16c2e78b94083d8cbf0209dc";
sha256 = "0y5s7d8pg8ak990dp8d801j9823igaibfhv9hsa79nib5yllifzs";
};
patches = [

View File

@ -0,0 +1,25 @@
{ stdenv, gcc7, pkg-config
, next
, webkitgtk, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
pname = "next-gtk-webkit";
inherit (next) src version;
makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ];
installTargets = "install-gtk-webkit";
nativeBuildInputs = [ gcc7 pkg-config ];
buildInputs = [
webkitgtk
gsettings-desktop-schemas
];
meta = with stdenv.lib; {
description = "Infinitely extensible web-browser (user interface only)";
homepage = https://next.atlas.engineer;
license = licenses.bsd3;
maintainers = [ maintainers.lewo ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -0,0 +1,80 @@
{ pkgs, stdenv, fetchFromGitHub
, gcc7, pkg-config, makeWrapper
, glib-networking
, next-gtk-webkit
, lispPackages
, sbcl
}:
stdenv.mkDerivation rec {
pname = "next";
version = "1.3.1";
src = fetchFromGitHub {
owner = "atlas-engineer";
repo = "next";
rev = version;
sha256 = "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj";
};
# Stripping destroys the generated SBCL image
dontStrip = true;
prePatch = ''
substituteInPlace source/ports/gtk-webkit.lisp \
--replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit"
'';
nativeBuildInputs = [ sbcl makeWrapper ];
buildInputs = with lispPackages; [
trivial-features
trivial-garbage
alexandria
bordeaux-threads
cl-json
cl-markup
cl-ppcre
cl-ppcre-unicode
closer-mop
dexador
ironclad
lparallel
parenscript
quri
cl-css
log4cl
mk-string-metrics
sqlite
str
swank
trivia
trivial-clipboard
unix-opts
dbus
];
propagatedBuildInputs = [ next-gtk-webkit ];
buildPhase = ''
common-lisp.sh --eval "(require :asdf)" \
--eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \
--eval '(asdf:make :next)' \
--quit
'';
installPhase = ''
install -D -m0755 next $out/bin/next
'';
preFixup = ''
wrapProgram $out/bin/next \
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules"
'';
meta = with stdenv.lib; {
description = "Infinitely extensible web-browser (with Lisp development files)";
homepage = https://next.atlas.engineer;
license = licenses.bsd3;
maintainers = [ maintainers.lewo ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -0,0 +1,210 @@
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
[
{
goPackagePath = "github.com/Microsoft/go-winio";
fetch = {
type = "git";
url = "https://github.com/Microsoft/go-winio";
rev = "v0.4.11";
sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn";
};
}
{
goPackagePath = "github.com/Microsoft/hcsshim";
fetch = {
type = "git";
url = "https://github.com/Microsoft/hcsshim";
rev = "v0.7.4";
sha256 = "0hky9p6xvkkx2jfkd4fy2d6iaikvlzalyw67gypyqyxygf2hsshg";
};
}
{
goPackagePath = "github.com/alexflint/go-filemutex";
fetch = {
type = "git";
url = "https://github.com/alexflint/go-filemutex";
rev = "72bdc8eae2ae";
sha256 = "082y6y9zv40q3kaqvsv6fyaw2fc42j0sn9z0dl9rbiz4szixj3c4";
};
}
{
goPackagePath = "github.com/buger/jsonparser";
fetch = {
type = "git";
url = "https://github.com/buger/jsonparser";
rev = "f4dd9f5a6b44";
sha256 = "12qa2n33s7yz88ywpr3k9kg3b4gm6rqgnv28iyikyxw8h5jascz5";
};
}
{
goPackagePath = "github.com/containernetworking/cni";
fetch = {
type = "git";
url = "https://github.com/containernetworking/cni";
rev = "v0.7.0";
sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8";
};
}
{
goPackagePath = "github.com/coreos/go-iptables";
fetch = {
type = "git";
url = "https://github.com/coreos/go-iptables";
rev = "v0.4.1";
sha256 = "0id1npqw3rd5rrkslf6i9yy6lpmd7l5qcglln38g85ylq7inysyi";
};
}
{
goPackagePath = "github.com/coreos/go-systemd";
fetch = {
type = "git";
url = "https://github.com/coreos/go-systemd";
rev = "39ca1b05acc7";
sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1";
};
}
{
goPackagePath = "github.com/d2g/dhcp4";
fetch = {
type = "git";
url = "https://github.com/d2g/dhcp4";
rev = "f0e4d29ff023";
sha256 = "07gn9bjvnlfz2jv9wdq3gxxxm9lpwgrwk8z65072jdrz9rs9izpr";
};
}
{
goPackagePath = "github.com/d2g/dhcp4client";
fetch = {
type = "git";
url = "https://github.com/d2g/dhcp4client";
rev = "bed07e1bc5b8";
sha256 = "0kyjalv1kah7sk3i96abg71cgy5s9kzpff2zc7mwj69vicbj7mi3";
};
}
{
goPackagePath = "github.com/d2g/dhcp4server";
fetch = {
type = "git";
url = "https://github.com/d2g/dhcp4server";
rev = "477b11cea4dc";
sha256 = "010dpw6cxrsm6dm49w1q6qpz5xz3lbi5viz6wywxk49fxvnzmx9l";
};
}
{
goPackagePath = "github.com/godbus/dbus";
fetch = {
type = "git";
url = "https://github.com/godbus/dbus";
rev = "885f9cc04c9c";
sha256 = "0wjpaj4vr5lvpnwc5faf3qizd7zd2v9yq0fm0558wap1hiyqb8x8";
};
}
{
goPackagePath = "github.com/j-keck/arping";
fetch = {
type = "git";
url = "https://github.com/j-keck/arping";
rev = "2cf9dc699c56";
sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c";
};
}
{
goPackagePath = "github.com/juju/errors";
fetch = {
type = "git";
url = "https://github.com/juju/errors";
rev = "22422dad46e1";
sha256 = "1766ys24y9qgngaqbx0g84lmh54b3369v8hk5fa1k8si2d34fxas";
};
}
{
goPackagePath = "github.com/mattn/go-shellwords";
fetch = {
type = "git";
url = "https://github.com/mattn/go-shellwords";
rev = "v1.0.3";
sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
};
}
{
goPackagePath = "github.com/onsi/ginkgo";
fetch = {
type = "git";
url = "https://github.com/onsi/ginkgo";
rev = "7f8ab55aaf3b";
sha256 = "0nas6wqdym4jx42kw9wj80b58r69k9qhnvglz009lj34g5gba7rw";
};
}
{
goPackagePath = "github.com/onsi/gomega";
fetch = {
type = "git";
url = "https://github.com/onsi/gomega";
rev = "2152b45fa28a";
sha256 = "0amjlkawp84mmdqjgdamf93p1546cla6h4wwrx7hf5r862r2qcw2";
};
}
{
goPackagePath = "github.com/safchain/ethtool";
fetch = {
type = "git";
url = "https://github.com/safchain/ethtool";
rev = "42ed695e3de8";
sha256 = "0n5hkrzc1bh46nidcssx4539kvcmgj501v3kzh2pljpg27509daj";
};
}
{
goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "v1.0.6";
sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c";
};
}
{
goPackagePath = "github.com/vishvananda/netlink";
fetch = {
type = "git";
url = "https://github.com/vishvananda/netlink";
rev = "023a6dafdcdf";
sha256 = "1i5q8r8rg7lxzvq2vhbf25lrkzdlgficfv0bxg9rf7cgg6z819sn";
};
}
{
goPackagePath = "github.com/vishvananda/netns";
fetch = {
type = "git";
url = "https://github.com/vishvananda/netns";
rev = "13995c7128cc";
sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "7c1a557ab941";
sha256 = "1f1q9mby8m7ws3gbj90v0prhnf4g2sgf74azmw31kzwd6azlar3m";
};
}
{
goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "49bb7cea24b1";
sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "66b7b1311ac8";
sha256 = "00ny4r2bbj6rz939iy9g699acqydq7rfi6r6awn25w9i2dld9m13";
};
}
]

View File

@ -1,6 +1,5 @@
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }:
stdenv.mkDerivation rec {
{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }:
buildGoPackage rec {
pname = "cni-plugins";
version = "0.8.2";
@ -11,28 +10,31 @@ stdenv.mkDerivation rec {
sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia";
};
buildInputs = [ removeReferencesTo go ];
buildPhase = ''
patchShebangs build_linux.sh
export "GOCACHE=$TMPDIR/go-cache"
./build_linux.sh
'';
installPhase = ''
mkdir -p $out/bin
mv bin/* $out/bin
'';
preFixup = ''
find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
'';
goDeps = ./plugins-deps.nix;
goPackagePath = "github.com/containernetworking/plugins";
subPackages = [
"plugins/meta/bandwidth"
"plugins/meta/firewall"
"plugins/meta/flannel"
"plugins/meta/portmap"
"plugins/meta/sbr"
"plugins/meta/tuning"
"plugins/main/bridge"
"plugins/main/host-device"
"plugins/main/ipvlan"
"plugins/main/loopback"
"plugins/main/macvlan"
"plugins/main/ptp"
"plugins/main/vlan"
"plugins/ipam/dhcp"
"plugins/ipam/host-local"
"plugins/ipam/static"
];
meta = with lib; {
description = "Some standard networking plugins, maintained by the CNI team";
homepage = https://github.com/containernetworking/plugins;
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
};
}

View File

@ -2,18 +2,17 @@
buildGoModule rec {
pname = "k9s";
version = "0.7.13";
version = "0.8.4";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = version;
owner = "derailed";
repo = "k9s";
rev = version;
sha256 = "0wsj6wc2qi5708cg47l2qblq1cg8fcwxdygpkayib9hapx6lc6f8";
};
modSha256 = "1ia9wx6yd9mdr981lcw58xv39iqzz25r03bmn1c6byxmq2xpcjq8";
meta = with stdenv.lib; {
description = "Kubernetes CLI To Manage Your Clusters In Style.";
homepage = https://github.com/derailed/k9s;

View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "kubeless";
version = "1.0.4";
@ -10,7 +10,8 @@ buildGoModule rec {
rev = "v${version}";
sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040";
};
modSha256 = "1pw4pwb8z2kq474jjipjdivlrin5zvw8d2if4317b0w0wyp6isgd";
goPackagePath = "github.com/kubeless/kubeless";
subPackages = [ "cmd/kubeless" ];

View File

@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub
{ lib, mkDerivation, fetchFromGitHub
, qtbase, qtmultimedia, qtsvg, qtx11extras
, pkgconfig, cmake, gettext
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "kvirc";
version = "5.0.0";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
pkgconfig cmake gettext
];
meta = with stdenv.lib; {
meta = with lib; {
description = "Advanced IRC Client";
homepage = "http://www.kvirc.net/";
license = licenses.gpl2;

View File

@ -1,5 +1,5 @@
{ monolithic ? true # build monolithic Quassel
, daemon ? false # build Quassel daemon
, enableDaemon ? false # build Quassel daemon
, client ? false # build Quassel client
, tag ? "-kf5" # tag added to the package name
, static ? false # link statically
@ -21,11 +21,11 @@
let
buildClient = monolithic || client;
buildCore = monolithic || daemon;
buildCore = monolithic || enableDaemon;
in
assert monolithic -> !client && !daemon;
assert client || daemon -> !monolithic;
assert monolithic -> !client && !enableDaemon;
assert client || enableDaemon -> !monolithic;
assert !buildClient -> !withKDE; # KDE is used by the client only
let
@ -63,12 +63,12 @@ in with stdenv; mkDerivation rec {
]
++ edf static "STATIC"
++ edf monolithic "WANT_MONO"
++ edf daemon "WANT_CORE"
++ edf enableDaemon "WANT_CORE"
++ edf client "WANT_QTCLIENT"
++ edf withKDE "WITH_KDE";
preFixup =
lib.optionalString daemon ''
lib.optionalString enableDaemon ''
wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
'' +
lib.optionalString buildClient ''

View File

@ -1,21 +1,23 @@
{ lib, python3Packages, fetchFromGitHub
{ stdenv, lib, python3Packages, fetchFromGitHub
, withGui ? false, wrapQtAppsHook ? null }:
python3Packages.buildPythonApplication rec {
pname = "maestral${lib.optionalString withGui "-gui"}";
version = "0.2.6";
version = "0.4.0";
src = fetchFromGitHub {
owner = "SamSchott";
repo = "maestral-dropbox";
rev = "v${version}";
sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf";
sha256 = "1jjn9cz43850xvs52gvx16qc5z4l91y4kpn6fpl05iwgaisbi1ws";
};
disabled = python3Packages.pythonOlder "3.6";
propagatedBuildInputs = (with python3Packages; [
blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog
blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog
] ++ lib.optionals stdenv.isLinux [
sdnotify systemd
] ++ lib.optional withGui pyqt5);
nativeBuildInputs = lib.optional withGui wrapQtAppsHook;

View File

@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ];
propagatedBuildInputs = with pythonPackages; [
pythonPackages.notmuch chardet dkimpy
pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
makeWrapperArgs = [

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "imapfilter";
version = "2.6.12";
version = "2.6.13";
src = fetchFromGitHub {
owner = "lefcha";
repo = "imapfilter";
rev = "v${version}";
sha256 = "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab";
sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi";
};
makeFlagsArray = "PREFIX=$(out)";

View File

@ -27,11 +27,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "mutt";
version = "1.12.1";
version = "1.12.2";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz";
sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81";
sha256 = "10k8352s0z7yan6d4z2am80qd3bsaky4h89g72wl4xr3x067ahmw";
};
patches = optional smimeSupport (fetchpatch {

View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "rclone";
version = "1.49.3";
@ -11,11 +11,11 @@ buildGoModule rec {
sha256 = "0dd5xrbf62n4y77zzaai1rc069ism1ikvcw43hzja3mzwfa0sqqa";
};
modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03";
goPackagePath = "github.com/rclone/rclone";
subPackages = [ "." ];
outputs = [ "out" "man" ];
outputs = [ "bin" "out" "man" ];
postInstall = ''
install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1

View File

@ -9,14 +9,14 @@
}:
stdenv.mkDerivation rec {
version = "0.7.25";
version = "0.7.26";
pname = "pynac";
src = fetchFromGitHub {
owner = "pynac";
repo = "pynac";
rev = "pynac-${version}";
sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3";
sha256 = "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d";
};
buildInputs = [

View File

@ -44,6 +44,7 @@
, gsl
, ntl
, jdk
, less
}:
# This generates a `sage-env` shell file that will be sourced by sage on startup.
@ -92,6 +93,7 @@ let
rubiks
flintqs
jdk # only needed for `jmol` which may be replaced in the future
less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved
]
));
in

View File

@ -147,6 +147,8 @@ let
lab = callPackage ./lab { };
lefthook = callPackage ./lefthook { };
pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit;
pass-git-helper = python3Packages.callPackage ./pass-git-helper { };

View File

@ -0,0 +1,22 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "lefthook";
version = "0.6.3";
src = fetchFromGitHub {
rev = "v${version}";
owner = "Arkweid";
repo = "lefthook";
sha256 = "01zvlw2yyxjg92d1qag1b42kc2kd68h4fmrv9y6ar7z0rw3p9a5d";
};
modSha256 = "0mjhw778x40c2plmjlkiry4rwvr9xkz65b88a61j86liv2plbmq2";
meta = with stdenv.lib; {
description = "Fast and powerful Git hooks manager for any type of projects";
homepage = "https://github.com/Arkweid/lefthook";
license = licenses.mit;
maintainers = with maintainers; [ rencire ];
};
}

View File

@ -1,6 +1,6 @@
{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoModule rec {
buildGoPackage rec {
pname = "git-lfs";
version = "2.8.0";
@ -11,21 +11,12 @@ buildGoModule rec {
sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x";
};
modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7";
patches = [
(fetchpatch {
# Build fails on v2.8.0 with go 1.13 due to invalid dependency version:
# go: github.com/git-lfs/go-ntlm@v0.0.0-20190307203151-c5056e7fa066: invalid pseudo-version: does not match version-control timestamp (2019-04-01T17:57:52Z)
# TODO: Remove once https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01 lands in a release.
url = "https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01.patch";
sha256 = "17nmnlkknglqhzrky5caskbscrjp7kp9b5mfqznh1jx2hbxzlpbj";
})
];
goPackagePath = "github.com/git-lfs/git-lfs";
subPackages = [ "." ];
preBuild = ''
cd go/src/${goPackagePath}
go generate ./commands
'';

View File

@ -80,7 +80,7 @@ stdenv.mkDerivation {
postInstall = "
rpath=`patchelf --print-rpath \$out/bin/kino`;
for i in $\buildInputs; do
for i in $buildInputs; do
echo adding \$i/lib
rpath=\$rpath\${rpath:+:}\$i/lib
done

View File

@ -9,19 +9,19 @@ in
rustPlatform.buildRustPackage rec {
pname = "dwm-status";
version = "1.6.2";
version = "1.6.3";
src = fetchFromGitHub {
owner = "Gerschtli";
repo = "dwm-status";
rev = version;
sha256 = "16vf7val1isc4227amng2ap9af34xa2va23dxv43px006xhrar78";
sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n";
};
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss";
cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz";
postInstall = lib.optionalString (bins != []) ''
wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}"

View File

@ -185,6 +185,7 @@ rec {
keyutils.lib
libjack2
fribidi
p11_kit
# libraries not on the upstream include list, but nevertheless expected
# by at least one appimage

View File

@ -1,693 +0,0 @@
# Generated by carnix 0.10.0: carnix generate-nix --src .
{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }:
with buildRustCrateHelpers;
let inherit (lib.lists) fold;
inherit (lib.attrsets) recursiveUpdate;
in
rec {
crates = cratesIO // rec {
# cargo-vendor-0.1.23
crates.cargo_vendor."0.1.23" = deps: { features?(features_.cargo_vendor."0.1.23" deps {}) }: buildRustCrate {
crateName = "cargo-vendor";
version = "0.1.23";
description = "A Cargo subcommand to vendor all crates.io dependencies onto the local\nfilesystem.\n";
authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
edition = "2018";
src = exclude [ ".git" "target" ] ./.;
dependencies = mapFeatures features ([
(cratesIO.crates."cargo"."${deps."cargo_vendor"."0.1.23"."cargo"}" deps)
(cratesIO.crates."docopt"."${deps."cargo_vendor"."0.1.23"."docopt"}" deps)
(cratesIO.crates."env_logger"."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps)
(cratesIO.crates."failure"."${deps."cargo_vendor"."0.1.23"."failure"}" deps)
(cratesIO.crates."serde"."${deps."cargo_vendor"."0.1.23"."serde"}" deps)
(cratesIO.crates."serde_json"."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps)
(cratesIO.crates."toml"."${deps."cargo_vendor"."0.1.23"."toml"}" deps)
]
++ (if features.cargo_vendor."0.1.23".openssl or false then [ (cratesIO.crates.openssl."${deps."cargo_vendor"."0.1.23".openssl}" deps) ] else []));
features = mkFeatures (features."cargo_vendor"."0.1.23" or {});
};
features_.cargo_vendor."0.1.23" = deps: f: updateFeatures f (rec {
cargo."${deps.cargo_vendor."0.1.23".cargo}".default = true;
cargo_vendor."0.1.23".default = (f.cargo_vendor."0.1.23".default or true);
docopt."${deps.cargo_vendor."0.1.23".docopt}".default = true;
env_logger."${deps.cargo_vendor."0.1.23".env_logger}".default = true;
failure."${deps.cargo_vendor."0.1.23".failure}".default = true;
openssl = fold recursiveUpdate {} [
{ "${deps.cargo_vendor."0.1.23".openssl}"."vendored" =
(f.openssl."${deps.cargo_vendor."0.1.23".openssl}"."vendored" or false) ||
(cargo_vendor."0.1.23"."vendored-openssl" or false) ||
(f."cargo_vendor"."0.1.23"."vendored-openssl" or false); }
{ "${deps.cargo_vendor."0.1.23".openssl}".default = true; }
];
serde = fold recursiveUpdate {} [
{ "${deps.cargo_vendor."0.1.23".serde}"."derive" = true; }
{ "${deps.cargo_vendor."0.1.23".serde}".default = true; }
];
serde_json."${deps.cargo_vendor."0.1.23".serde_json}".default = true;
toml."${deps.cargo_vendor."0.1.23".toml}".default = true;
}) [
(cratesIO.features_.cargo."${deps."cargo_vendor"."0.1.23"."cargo"}" deps)
(cratesIO.features_.docopt."${deps."cargo_vendor"."0.1.23"."docopt"}" deps)
(cratesIO.features_.env_logger."${deps."cargo_vendor"."0.1.23"."env_logger"}" deps)
(cratesIO.features_.failure."${deps."cargo_vendor"."0.1.23"."failure"}" deps)
(cratesIO.features_.openssl."${deps."cargo_vendor"."0.1.23"."openssl"}" deps)
(cratesIO.features_.serde."${deps."cargo_vendor"."0.1.23"."serde"}" deps)
(cratesIO.features_.serde_json."${deps."cargo_vendor"."0.1.23"."serde_json"}" deps)
(cratesIO.features_.toml."${deps."cargo_vendor"."0.1.23"."toml"}" deps)
];
# end
};
cargo_vendor = crates.crates.cargo_vendor."0.1.23" deps;
__all = [ (cargo_vendor {}) ];
deps.adler32."1.0.3" = {};
deps.aho_corasick."0.7.3" = {
memchr = "2.2.0";
};
deps.ansi_term."0.11.0" = {
winapi = "0.3.7";
};
deps.atty."0.2.11" = {
termion = "1.5.1";
libc = "0.2.51";
winapi = "0.3.7";
};
deps.autocfg."0.1.2" = {};
deps.backtrace."0.3.15" = {
cfg_if = "0.1.7";
rustc_demangle = "0.1.14";
autocfg = "0.1.2";
backtrace_sys = "0.1.28";
libc = "0.2.51";
winapi = "0.3.7";
};
deps.backtrace_sys."0.1.28" = {
libc = "0.2.51";
cc = "1.0.35";
};
deps.bitflags."1.0.4" = {};
deps.bstr."0.1.2" = {
memchr = "2.2.0";
};
deps.build_const."0.2.1" = {};
deps.byteorder."1.3.1" = {};
deps.bytes."0.4.12" = {
byteorder = "1.3.1";
iovec = "0.1.2";
};
deps.bytesize."1.0.0" = {};
deps.cargo."0.35.0" = {
atty = "0.2.11";
byteorder = "1.3.1";
bytesize = "1.0.0";
clap = "2.33.0";
crates_io = "0.23.0";
crossbeam_utils = "0.6.5";
crypto_hash = "0.3.3";
curl = "0.4.21";
curl_sys = "0.4.18";
env_logger = "0.6.1";
failure = "0.1.5";
filetime = "0.2.4";
flate2 = "1.0.7";
fs2 = "0.4.3";
git2 = "0.8.0";
git2_curl = "0.9.0";
glob = "0.2.11";
hex = "0.3.2";
home = "0.3.4";
ignore = "0.4.7";
im_rc = "12.3.4";
jobserver = "0.1.13";
lazy_static = "1.3.0";
lazycell = "1.2.1";
libc = "0.2.51";
libgit2_sys = "0.7.11";
log = "0.4.6";
num_cpus = "1.10.0";
opener = "0.3.2";
rustc_workspace_hack = "1.0.0";
rustfix = "0.4.5";
same_file = "1.0.4";
semver = "0.9.0";
serde = "1.0.90";
serde_ignored = "0.0.4";
serde_json = "1.0.39";
shell_escape = "0.1.4";
tar = "0.4.22";
tempfile = "3.0.7";
termcolor = "1.0.4";
toml = "0.4.10";
unicode_width = "0.1.5";
url = "1.7.2";
url_serde = "0.2.0";
core_foundation = "0.6.4";
fwdansi = "1.0.1";
miow = "0.3.3";
winapi = "0.3.7";
};
deps.cargo_vendor."0.1.23" = {
cargo = "0.35.0";
docopt = "1.1.0";
env_logger = "0.6.1";
failure = "0.1.5";
openssl = "0.10.20";
serde = "1.0.90";
serde_json = "1.0.39";
toml = "0.5.0";
};
deps.cc."1.0.35" = {};
deps.cfg_if."0.1.7" = {};
deps.clap."2.33.0" = {
atty = "0.2.11";
bitflags = "1.0.4";
strsim = "0.8.0";
textwrap = "0.11.0";
unicode_width = "0.1.5";
vec_map = "0.8.1";
ansi_term = "0.11.0";
};
deps.cloudabi."0.0.3" = {
bitflags = "1.0.4";
};
deps.commoncrypto."0.2.0" = {
commoncrypto_sys = "0.2.0";
};
deps.commoncrypto_sys."0.2.0" = {
libc = "0.2.51";
};
deps.core_foundation."0.6.4" = {
core_foundation_sys = "0.6.2";
libc = "0.2.51";
};
deps.core_foundation_sys."0.6.2" = {};
deps.crates_io."0.23.0" = {
curl = "0.4.21";
failure = "0.1.5";
http = "0.1.17";
serde = "1.0.90";
serde_derive = "1.0.90";
serde_json = "1.0.39";
url = "1.7.2";
};
deps.crc."1.8.1" = {
build_const = "0.2.1";
};
deps.crc32fast."1.2.0" = {
cfg_if = "0.1.7";
};
deps.crossbeam_channel."0.3.8" = {
crossbeam_utils = "0.6.5";
smallvec = "0.6.9";
};
deps.crossbeam_utils."0.6.5" = {
cfg_if = "0.1.7";
lazy_static = "1.3.0";
};
deps.crypto_hash."0.3.3" = {
hex = "0.3.2";
commoncrypto = "0.2.0";
openssl = "0.10.20";
winapi = "0.3.7";
};
deps.curl."0.4.21" = {
curl_sys = "0.4.18";
libc = "0.2.51";
socket2 = "0.3.8";
openssl_probe = "0.1.2";
openssl_sys = "0.9.43";
kernel32_sys = "0.2.2";
schannel = "0.1.15";
winapi = "0.2.8";
};
deps.curl_sys."0.4.18" = {
libc = "0.2.51";
libnghttp2_sys = "0.1.1";
libz_sys = "1.0.25";
cc = "1.0.35";
pkg_config = "0.3.14";
openssl_sys = "0.9.43";
winapi = "0.3.7";
};
deps.docopt."1.1.0" = {
lazy_static = "1.3.0";
regex = "1.1.6";
serde = "1.0.90";
strsim = "0.9.1";
};
deps.either."1.5.2" = {};
deps.env_logger."0.6.1" = {
atty = "0.2.11";
humantime = "1.2.0";
log = "0.4.6";
regex = "1.1.6";
termcolor = "1.0.4";
};
deps.failure."0.1.5" = {
backtrace = "0.3.15";
failure_derive = "0.1.5";
};
deps.failure_derive."0.1.5" = {
proc_macro2 = "0.4.27";
quote = "0.6.12";
syn = "0.15.32";
synstructure = "0.10.1";
};
deps.filetime."0.2.4" = {
cfg_if = "0.1.7";
redox_syscall = "0.1.54";
libc = "0.2.51";
};
deps.flate2."1.0.7" = {
crc32fast = "1.2.0";
libc = "0.2.51";
libz_sys = "1.0.25";
miniz_sys = "0.1.11";
miniz_oxide_c_api = "0.2.1";
};
deps.fnv."1.0.6" = {};
deps.foreign_types."0.3.2" = {
foreign_types_shared = "0.1.1";
};
deps.foreign_types_shared."0.1.1" = {};
deps.fs2."0.4.3" = {
libc = "0.2.51";
winapi = "0.3.7";
};
deps.fuchsia_cprng."0.1.1" = {};
deps.fwdansi."1.0.1" = {
memchr = "2.2.0";
termcolor = "1.0.4";
};
deps.git2."0.8.0" = {
bitflags = "1.0.4";
libc = "0.2.51";
libgit2_sys = "0.7.11";
log = "0.4.6";
url = "1.7.2";
openssl_probe = "0.1.2";
openssl_sys = "0.9.43";
};
deps.git2_curl."0.9.0" = {
curl = "0.4.21";
git2 = "0.8.0";
log = "0.4.6";
url = "1.7.2";
};
deps.glob."0.2.11" = {};
deps.globset."0.4.3" = {
aho_corasick = "0.7.3";
bstr = "0.1.2";
fnv = "1.0.6";
log = "0.4.6";
regex = "1.1.6";
};
deps.hashbrown."0.1.8" = {
byteorder = "1.3.1";
scopeguard = "0.3.3";
};
deps.hex."0.3.2" = {};
deps.home."0.3.4" = {
scopeguard = "0.3.3";
winapi = "0.3.7";
};
deps.http."0.1.17" = {
bytes = "0.4.12";
fnv = "1.0.6";
itoa = "0.4.3";
};
deps.humantime."1.2.0" = {
quick_error = "1.2.2";
};
deps.idna."0.1.5" = {
matches = "0.1.8";
unicode_bidi = "0.3.4";
unicode_normalization = "0.1.8";
};
deps.ignore."0.4.7" = {
crossbeam_channel = "0.3.8";
globset = "0.4.3";
lazy_static = "1.3.0";
log = "0.4.6";
memchr = "2.2.0";
regex = "1.1.6";
same_file = "1.0.4";
thread_local = "0.3.6";
walkdir = "2.2.7";
winapi_util = "0.1.2";
};
deps.im_rc."12.3.4" = {
sized_chunks = "0.1.3";
typenum = "1.10.0";
rustc_version = "0.2.3";
};
deps.iovec."0.1.2" = {
libc = "0.2.51";
winapi = "0.2.8";
};
deps.itertools."0.7.11" = {
either = "1.5.2";
};
deps.itoa."0.4.3" = {};
deps.jobserver."0.1.13" = {
log = "0.4.6";
libc = "0.2.51";
rand = "0.6.5";
};
deps.kernel32_sys."0.2.2" = {
winapi = "0.2.8";
winapi_build = "0.1.1";
};
deps.lazy_static."1.3.0" = {};
deps.lazycell."1.2.1" = {};
deps.libc."0.2.51" = {};
deps.libgit2_sys."0.7.11" = {
curl_sys = "0.4.18";
libc = "0.2.51";
libssh2_sys = "0.2.11";
libz_sys = "1.0.25";
cc = "1.0.35";
pkg_config = "0.3.14";
openssl_sys = "0.9.43";
};
deps.libnghttp2_sys."0.1.1" = {
libc = "0.2.51";
cc = "1.0.35";
};
deps.libssh2_sys."0.2.11" = {
libc = "0.2.51";
libz_sys = "1.0.25";
cc = "1.0.35";
pkg_config = "0.3.14";
openssl_sys = "0.9.43";
};
deps.libz_sys."1.0.25" = {
libc = "0.2.51";
cc = "1.0.35";
pkg_config = "0.3.14";
};
deps.lock_api."0.1.5" = {
scopeguard = "0.3.3";
};
deps.log."0.4.6" = {
cfg_if = "0.1.7";
};
deps.matches."0.1.8" = {};
deps.matrixmultiply."0.1.15" = {
rawpointer = "0.1.0";
};
deps.memchr."2.2.0" = {};
deps.miniz_sys."0.1.11" = {
libc = "0.2.51";
cc = "1.0.35";
};
deps.miniz_oxide."0.2.1" = {
adler32 = "1.0.3";
};
deps.miniz_oxide_c_api."0.2.1" = {
crc = "1.8.1";
libc = "0.2.51";
miniz_oxide = "0.2.1";
cc = "1.0.35";
};
deps.miow."0.3.3" = {
socket2 = "0.3.8";
winapi = "0.3.7";
};
deps.ndarray."0.12.1" = {
itertools = "0.7.11";
matrixmultiply = "0.1.15";
num_complex = "0.2.1";
num_traits = "0.2.6";
};
deps.num_complex."0.2.1" = {
num_traits = "0.2.6";
};
deps.num_traits."0.2.6" = {};
deps.num_cpus."1.10.0" = {
libc = "0.2.51";
};
deps.once_cell."0.1.8" = {
parking_lot = "0.7.1";
};
deps.opener."0.3.2" = {
failure = "0.1.5";
failure_derive = "0.1.5";
winapi = "0.3.7";
};
deps.openssl."0.10.20" = {
bitflags = "1.0.4";
cfg_if = "0.1.7";
foreign_types = "0.3.2";
lazy_static = "1.3.0";
libc = "0.2.51";
openssl_sys = "0.9.43";
};
deps.openssl_probe."0.1.2" = {};
deps.openssl_src."111.2.1+1.1.1b" = {
cc = "1.0.35";
};
deps.openssl_sys."0.9.43" = {
libc = "0.2.51";
cc = "1.0.35";
openssl_src = "111.2.1+1.1.1b";
pkg_config = "0.3.14";
rustc_version = "0.2.3";
};
deps.parking_lot."0.7.1" = {
lock_api = "0.1.5";
parking_lot_core = "0.4.0";
};
deps.parking_lot_core."0.4.0" = {
rand = "0.6.5";
smallvec = "0.6.9";
rustc_version = "0.2.3";
libc = "0.2.51";
winapi = "0.3.7";
};
deps.percent_encoding."1.0.1" = {};
deps.pkg_config."0.3.14" = {};
deps.proc_macro2."0.4.27" = {
unicode_xid = "0.1.0";
};
deps.quick_error."1.2.2" = {};
deps.quote."0.6.12" = {
proc_macro2 = "0.4.27";
};
deps.rand."0.6.5" = {
rand_chacha = "0.1.1";
rand_core = "0.4.0";
rand_hc = "0.1.0";
rand_isaac = "0.1.1";
rand_jitter = "0.1.3";
rand_os = "0.1.3";
rand_pcg = "0.1.2";
rand_xorshift = "0.1.1";
autocfg = "0.1.2";
libc = "0.2.51";
winapi = "0.3.7";
};
deps.rand_chacha."0.1.1" = {
rand_core = "0.3.1";
autocfg = "0.1.2";
};
deps.rand_core."0.3.1" = {
rand_core = "0.4.0";
};
deps.rand_core."0.4.0" = {};
deps.rand_hc."0.1.0" = {
rand_core = "0.3.1";
};
deps.rand_isaac."0.1.1" = {
rand_core = "0.3.1";
};
deps.rand_jitter."0.1.3" = {
rand_core = "0.4.0";
libc = "0.2.51";
winapi = "0.3.7";
};
deps.rand_os."0.1.3" = {
rand_core = "0.4.0";
rdrand = "0.4.0";
cloudabi = "0.0.3";
fuchsia_cprng = "0.1.1";
libc = "0.2.51";
winapi = "0.3.7";
};
deps.rand_pcg."0.1.2" = {
rand_core = "0.4.0";
autocfg = "0.1.2";
};
deps.rand_xorshift."0.1.1" = {
rand_core = "0.3.1";
};
deps.rawpointer."0.1.0" = {};
deps.rdrand."0.4.0" = {
rand_core = "0.3.1";
};
deps.redox_syscall."0.1.54" = {};
deps.redox_termios."0.1.1" = {
redox_syscall = "0.1.54";
};
deps.regex."1.1.6" = {
aho_corasick = "0.7.3";
memchr = "2.2.0";
regex_syntax = "0.6.6";
thread_local = "0.3.6";
utf8_ranges = "1.0.2";
};
deps.regex_syntax."0.6.6" = {
ucd_util = "0.1.3";
};
deps.remove_dir_all."0.5.1" = {
winapi = "0.3.7";
};
deps.rustc_demangle."0.1.14" = {};
deps.rustc_workspace_hack."1.0.0" = {};
deps.rustc_version."0.2.3" = {
semver = "0.9.0";
};
deps.rustfix."0.4.5" = {
failure = "0.1.5";
log = "0.4.6";
serde = "1.0.90";
serde_derive = "1.0.90";
serde_json = "1.0.39";
};
deps.ryu."0.2.7" = {};
deps.same_file."1.0.4" = {
winapi_util = "0.1.2";
};
deps.schannel."0.1.15" = {
lazy_static = "1.3.0";
winapi = "0.3.7";
};
deps.scopeguard."0.3.3" = {};
deps.semver."0.9.0" = {
semver_parser = "0.7.0";
serde = "1.0.90";
};
deps.semver_parser."0.7.0" = {};
deps.serde."1.0.90" = {
serde_derive = "1.0.90";
};
deps.serde_derive."1.0.90" = {
proc_macro2 = "0.4.27";
quote = "0.6.12";
syn = "0.15.32";
};
deps.serde_ignored."0.0.4" = {
serde = "1.0.90";
};
deps.serde_json."1.0.39" = {
itoa = "0.4.3";
ryu = "0.2.7";
serde = "1.0.90";
};
deps.shell_escape."0.1.4" = {};
deps.sized_chunks."0.1.3" = {
typenum = "1.10.0";
};
deps.smallvec."0.6.9" = {};
deps.socket2."0.3.8" = {
cfg_if = "0.1.7";
libc = "0.2.51";
redox_syscall = "0.1.54";
winapi = "0.3.7";
};
deps.strsim."0.8.0" = {};
deps.strsim."0.9.1" = {
hashbrown = "0.1.8";
ndarray = "0.12.1";
};
deps.syn."0.15.32" = {
proc_macro2 = "0.4.27";
quote = "0.6.12";
unicode_xid = "0.1.0";
};
deps.synstructure."0.10.1" = {
proc_macro2 = "0.4.27";
quote = "0.6.12";
syn = "0.15.32";
unicode_xid = "0.1.0";
};
deps.tar."0.4.22" = {
filetime = "0.2.4";
redox_syscall = "0.1.54";
libc = "0.2.51";
};
deps.tempfile."3.0.7" = {
cfg_if = "0.1.7";
rand = "0.6.5";
remove_dir_all = "0.5.1";
redox_syscall = "0.1.54";
libc = "0.2.51";
winapi = "0.3.7";
};
deps.termcolor."1.0.4" = {
wincolor = "1.0.1";
};
deps.termion."1.5.1" = {
libc = "0.2.51";
redox_syscall = "0.1.54";
redox_termios = "0.1.1";
};
deps.textwrap."0.11.0" = {
unicode_width = "0.1.5";
};
deps.thread_local."0.3.6" = {
lazy_static = "1.3.0";
};
deps.toml."0.4.10" = {
serde = "1.0.90";
};
deps.toml."0.5.0" = {
serde = "1.0.90";
};
deps.typenum."1.10.0" = {};
deps.ucd_util."0.1.3" = {};
deps.unicode_bidi."0.3.4" = {
matches = "0.1.8";
};
deps.unicode_normalization."0.1.8" = {
smallvec = "0.6.9";
};
deps.unicode_width."0.1.5" = {};
deps.unicode_xid."0.1.0" = {};
deps.url."1.7.2" = {
idna = "0.1.5";
matches = "0.1.8";
percent_encoding = "1.0.1";
};
deps.url_serde."0.2.0" = {
serde = "1.0.90";
url = "1.7.2";
};
deps.utf8_ranges."1.0.2" = {};
deps.vcpkg."0.2.6" = {};
deps.vec_map."0.8.1" = {};
deps.walkdir."2.2.7" = {
same_file = "1.0.4";
winapi = "0.3.7";
winapi_util = "0.1.2";
};
deps.winapi."0.2.8" = {};
deps.winapi."0.3.7" = {
winapi_i686_pc_windows_gnu = "0.4.0";
winapi_x86_64_pc_windows_gnu = "0.4.0";
};
deps.winapi_build."0.1.1" = {};
deps.winapi_i686_pc_windows_gnu."0.4.0" = {};
deps.winapi_util."0.1.2" = {
winapi = "0.3.7";
};
deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {};
deps.wincolor."1.0.1" = {
winapi = "0.3.7";
winapi_util = "0.1.2";
};
}

View File

@ -1,10 +0,0 @@
{ callPackage, fetchFromGitHub }:
((callPackage ./cargo-vendor.nix {}).cargo_vendor {}).overrideAttrs (attrs: {
src = fetchFromGitHub {
owner = "alexcrichton";
repo = "cargo-vendor";
rev = "9355661303ce2870d68a69d99953fce22581e31e";
sha256 = "0d4j3r09am3ynwhczimzv39264f5xz37jxa9js123y46w5by3wd2";
};
})

View File

@ -15,11 +15,6 @@ in
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
};
cargo-vendor = attrs: {
buildInputs = [ openssl zlib curl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
};
libz-sys = attrs: {
buildInputs = [ pkgconfig zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];

View File

@ -1,4 +1,4 @@
{ stdenv, cacert, git, cargo, cargo-vendor, python3 }:
{ stdenv, cacert, git, cargo, python3 }:
let cargo-vendor-normalise = stdenv.mkDerivation {
name = "cargo-vendor-normalise";
src = ./cargo-vendor-normalise.py;
@ -20,7 +20,7 @@ in
{ name ? "cargo-deps", src, srcs, patches, sourceRoot, sha256, cargoUpdateHook ? "" }:
stdenv.mkDerivation {
name = "${name}-vendor";
nativeBuildInputs = [ cacert cargo-vendor git cargo-vendor-normalise cargo ];
nativeBuildInputs = [ cacert git cargo-vendor-normalise cargo ];
inherit src srcs patches sourceRoot;
phases = "unpackPhase patchPhase installPhase";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "matcha";
version = "2019-07";
version = "2019-09-23";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = "v${version}";
sha256 = "1jv7qq4lsjpz40wchrqlzc8w4ggrmwjavy4ipzz11jal99skpv7i";
sha256 = "0fx6ksv9yb16drhx1sn4nq6jha36gha3cxnr1fjhj8dgarjqrg9k";
};
buildInputs = [ gdk-pixbuf librsvg ];

View File

@ -14,6 +14,11 @@ let drv = stdenv.mkDerivation rec {
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-linux-x64-b${version}.tar.gz";
sha256 = "121yzgvkfx7lq0k9s8wjnhz09a564br5y7zlkxgh191sbm2i7zdi";
}
else if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl {
url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrsdk-11_0_2-osx-x64-b${version}.tar.gz";
sha256 = "1ly6kf59knvzbr2pjkc9fqyzfs28pdvnqg5pfffr8zp14xm44zmd";
}
else
throw "unsupported system: ${stdenv.hostPlatform.system}";
@ -28,20 +33,20 @@ let drv = stdenv.mkDerivation rec {
jrePath=$out/jre
'';
postFixup = ''
postFixup = lib.optionalString (!stdenv.isDarwin) ''
find $out -type f -perm -0100 \
-exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$rpath" {} \;
find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \;
'';
rpath = lib.makeLibraryPath ([
rpath = lib.optionalString (!stdenv.isDarwin) (lib.makeLibraryPath ([
stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib
(placeholder "out")
] ++ (with xorg; [
libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
])) + ":${placeholder "out"}/lib/jli";
])) + ":${placeholder "out"}/lib/jli");
passthru.home = drv;
@ -61,6 +66,6 @@ let drv = stdenv.mkDerivation rec {
homepage = "https://bintray.com/jetbrains/intellij-jdk/";
license = licenses.gpl2;
maintainers = with maintainers; [ edwtjo ];
platforms = with platforms; [ "x86_64-linux" ];
platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ];
};
}; in drv

View File

@ -0,0 +1,89 @@
{ lib
, fetchFromGitHub
, fetchurl
, cmake
, unzip
, makeWrapper
, boost
, llvmPackages
, llvmPackages_4
, gmp
, emacs
, emacs25-nox
, jre_headless
, tcl
, tk
}:
let stdenv = llvmPackages.stdenv;
in stdenv.mkDerivation rec {
pname = "mozart2";
version = "2.0.1";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/mozart/mozart2/releases/download/v${version}/${name}-Source.zip";
sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll";
};
# This is a workaround to avoid using sbt.
# I guess it is acceptable to fetch the bootstrapping compiler in binary form.
bootcompiler = fetchurl {
url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar";
sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz";
};
postConfigure = ''
cp ${bootcompiler} bootcompiler/bootcompiler.jar
'';
nativeBuildInputs = [ cmake makeWrapper unzip ];
# We cannot compile with both gcc and clang, but we need clang during the
# process, so we compile everything with clang.
# BUT, we need clang4 for parsing, and a more recent clang for compiling.
cmakeFlags = [
"-DCMAKE_CXX_COMPILER=${llvmPackages.clang}/bin/clang++"
"-DCMAKE_C_COMPILER=${llvmPackages.clang}/bin/clang"
"-DBoost_USE_STATIC_LIBS=OFF"
"-DMOZART_BOOST_USE_STATIC_LIBS=OFF"
"-DCMAKE_PROGRAM_PATH=${llvmPackages_4.clang}/bin"
# Rationale: Nix's cc-wrapper needs to see a compile flag (like -c) to
# infer that it is not a linking call, and stop trashing the command line
# with linker flags.
# As it does not recognise -emit-ast, we pass -c immediately overridden
# by -emit-ast.
# The remaining is just the default flags that we cannot reuse and need
# to repeat here.
"-DMOZART_GENERATOR_FLAGS='-c;-emit-ast;--std=c++0x;-Wno-invalid-noreturn;-Wno-return-type;-Wno-braced-scalar-init'"
# We are building with clang, as nix does not support having clang and
# gcc together as compilers and we need clang for the sources generation.
# However, clang emits tons of warnings about gcc's atomic-base library.
"-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"
] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";
fixupPhase = ''
wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs
'';
buildInputs = [
boost
llvmPackages_4.llvm
llvmPackages_4.clang
llvmPackages_4.clang-unwrapped
gmp
emacs25-nox
jre_headless
tcl
tk
];
meta = {
description = "An open source implementation of Oz 3.";
maintainers = [ lib.maintainers.layus ];
license = lib.licenses.bsd2;
homepage = "https://mozart.github.io";
};
}

View File

@ -1,29 +1,40 @@
{ stdenv, fetchFromGitHub, fetchurl, llvmPackages, ncurses, lua }:
{ stdenv, fetchurl, fetchFromGitHub
, llvmPackages, ncurses, lua
}:
let
luajitArchive = "LuaJIT-2.0.5.tar.gz";
luajitSrc = fetchurl {
url = "http://luajit.org/download/${luajitArchive}";
url = "http://luajit.org/download/${luajitArchive}";
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
};
in
stdenv.mkDerivation rec {
pname = "terra-git";
version = "1.0.0-beta1";
pname = "terra";
version = "1.0.0pre1175_${builtins.substring 0 7 src.rev}";
src = fetchFromGitHub {
owner = "zdevito";
repo = "terra";
rev = "release-${version}";
sha256 = "1blv3mbmlwb6fxkck6487ck4qq67cbwq6s1zlp86hy2wckgf8q2c";
owner = "zdevito";
repo = "terra";
rev = "ef6a75ffee15a30f3c74f4e6943851cfbc0fec3d";
sha256 = "0aky17vbv3d9zng34hp17p9zb00dbzwhvzsdjzrrqvk9lmyvix0s";
};
nativeBuildInputs = [ lua ];
buildInputs = with llvmPackages; [ llvm clang-unwrapped ncurses ];
doCheck = true;
enableParallelBuilding = true;
hardeningDisable = [ "fortify" ];
outputs = [ "bin" "dev" "out" "static" ];
patches = [ ./nix-cflags.patch ];
postPatch = ''
substituteInPlace Makefile --replace \
'-lcurses' '-lncurses'
substituteInPlace Makefile \
--replace '-lcurses' '-lncurses'
substituteInPlace src/terralib.lua \
--subst-var-by NIX_LIBC_INCLUDE ${stdenv.cc.libc.dev}/include
'';
preBuild = ''
@ -36,6 +47,8 @@ stdenv.mkDerivation rec {
cp ${luajitSrc} build/${luajitArchive}
'';
checkPhase = "(cd tests && ../terra run)";
installPhase = ''
install -Dm755 -t $bin/bin release/bin/terra
install -Dm755 -t $out/lib release/lib/terra${stdenv.hostPlatform.extensions.sharedLibrary}
@ -45,13 +58,11 @@ stdenv.mkDerivation rec {
cp -rv release/include/terra $dev/include
'';
buildInputs = with llvmPackages; [ lua llvm clang-unwrapped ncurses ];
meta = with stdenv.lib; {
description = "A low-level counterpart to Lua";
homepage = http://terralang.org/;
platforms = platforms.x86_64;
maintainers = with maintainers; [ jb55 ];
license = licenses.mit;
homepage = http://terralang.org/;
platforms = platforms.x86_64;
maintainers = with maintainers; [ jb55 thoughtpolice ];
license = licenses.mit;
};
}

View File

@ -0,0 +1,22 @@
diff --git a/src/terralib.lua b/src/terralib.lua
index 351238d..e638c90 100644
--- a/src/terralib.lua
+++ b/src/terralib.lua
@@ -3395,6 +3395,17 @@ function terra.includecstring(code,cargs,target)
args:insert("-internal-isystem")
args:insert(path)
end
+
+ -- NOTE(aseipp): include relevant Nix header files
+ args:insert("-isystem")
+ args:insert("@NIX_LIBC_INCLUDE@")
+
+ local nix_cflags = os.getenv('NIX_CFLAGS_COMPILE')
+ if nix_cflags ~= nil then
+ for w in nix_cflags:gmatch("%S+") do
+ args:insert(w)
+ end
+ end
if cargs then
args:insertall(cargs)

View File

@ -57676,7 +57676,7 @@ self: {
version = "0.1.0.1";
sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
libraryHaskellDepends = [ base ];
description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";
description = "Haskell operator `g ... f = \\x1 .. xn -> g (f x1 .. xn)`.";
license = stdenv.lib.licenses.bsd3;
}) {};
@ -253088,7 +253088,7 @@ self: {
base containers exceptions free spiros split text transformers
];
executableHaskellDepends = [ base ];
description = "Automate keyboard\/mouse\/clipboard\/application interaction";
description = "Automate keyboard/mouse/clipboard/application interaction";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib
{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib, fetchpatch
, aws-c-common, aws-c-event-stream, aws-checksums
, CoreAudio, AudioToolbox
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
@ -50,6 +50,13 @@ stdenv.mkDerivation rec {
__darwinAllowLocalNetworking = true;
patches = [
(fetchpatch {
url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch";
sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr";
})
];
meta = with lib; {
description = "A C++ interface for Amazon Web Services";
homepage = https://github.com/awslabs/aws-sdk-cpp;

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkgconfig, meson, ninja, libpthreadstubs, libpciaccess
, withValgrind ? valgrind-light.meta.available, valgrind-light
, withValgrind ? valgrind-light.meta.available, valgrind-light, fetchpatch
}:
stdenv.mkDerivation rec {
@ -17,7 +17,15 @@ stdenv.mkDerivation rec {
buildInputs = [ libpthreadstubs libpciaccess ]
++ lib.optional withValgrind valgrind-light;
patches = [ ./cross-build-nm-path.patch ];
patches = [ ./cross-build-nm-path.patch ] ++
lib.optionals stdenv.hostPlatform.isMusl [
# Fix tests not building on musl because they use the glibc-specific
# (non-POSIX) `ioctl()` type signature. See #66441.
(fetchpatch {
url = "https://raw.githubusercontent.com/openembedded/openembedded-core/30a2af80f5f8c8ddf0f619e4f50451b02baa22dd/meta/recipes-graphics/drm/libdrm/musl-ioctl.patch";
sha256 = "0rdmh4k5kb80hhk1sdhlil30yf0s8d8w0fnq0hzyvw3ir1mki3by";
})
];
postPatch = ''
for a in */*-symbol-check ; do

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
description = "Intel Processor Trace decoder library";
homepage = https://github.com/intel/libipt;
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ orivej ];
};
}

View File

@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb";
};
outputs = [ "bin" "out" "dev" ];
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ ];
propagatedBuildInputs = [ libgcrypt ];
meta = with stdenv.lib; {

View File

@ -6,13 +6,13 @@
stdenv.mkDerivation {
pname = "libvterm-neovim";
version = "2018-11-26";
version = "2019-08-28";
src = fetchFromGitHub {
owner = "neovim";
repo = "libvterm";
rev = "f600f523545b7d4018ebf320e3273795dbe43c8a";
sha256 = "08lxd8xs9cg4axgq6bkb7afjxg3s29s1a3niqqm4wjb7iyi2jx5b";
rev = "1aa95e24d8f07a396aa80b7cd52f93e2b5bcca79";
sha256 = "0vjd397lqrfv4kc79i5izva4bynbymx3gllkg281fnk0b15vxfif";
};
buildInputs = [ perl ];
@ -27,7 +27,7 @@ stdenv.mkDerivation {
description = "VT220/xterm/ECMA-48 terminal emulator library";
homepage = http://www.leonerd.org.uk/code/libvterm/;
license = licenses.mit;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ rvolosatovs ];
platforms = platforms.unix;
};
}

View File

@ -0,0 +1,46 @@
{ stdenv, fetchFromGitHub, cmake
, secureBuild ? true
}:
let
soext = stdenv.hostPlatform.extensions.sharedLibrary;
in
stdenv.mkDerivation rec {
name = "mimalloc-${version}";
version = "1.0.8";
src = fetchFromGitHub {
owner = "microsoft";
repo = "mimalloc";
rev = "refs/tags/v${version}";
sha256 = "04k2d3x84q2jfqdjxngy98hlw6czmigsqlf7gi3mhs6682n127r5";
};
nativeBuildInputs = [ cmake ];
enableParallelBuilding = true;
cmakeFlags = stdenv.lib.optional secureBuild [ "-DMI_SECURE=ON" ];
postInstall = ''
mkdir -p $dev
mv $out/lib/*/include $dev/include
rm -f $out/lib/libmimalloc*${soext} # weird duplicate
mv $out/lib/*/libmimalloc*${soext} $out/lib/libmimalloc${soext}
mv $out/lib/*/libmimalloc*.a $out/lib/libmimalloc.a
mv $out/lib/*/mimalloc*.o $out/lib/mimalloc.o
rm -rf $out/lib/mimalloc-*
'';
outputs = [ "out" "dev" ];
meta = with stdenv.lib; {
description = "Compact, fast, general-purpose memory allocator";
homepage = "https://github.com/microsoft/mimalloc";
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice ];
};
}

View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
homepage = http://www.qhull.org/;
description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more";
license = licenses.free;
license = licenses.qhull;
platforms = platforms.unix;
maintainers = with maintainers; [ orivej ];
};

View File

@ -1,5 +1,5 @@
{ stdenv
, fetchFromGitHub
, fetchFromGitLab
, python
, wafHook
@ -22,75 +22,89 @@
, dia, tetex ? null, ghostscript ? null, texlive ? null
# generates python bindings
, generateBindings ? false, ncurses ? null
, pythonSupport ? false, ncurses ? null
# All modules can be enabled by choosing 'all_modules'.
# we include here the DCE mandatory ones
, modules ? [ "core" "network" "internet" "point-to-point" "fd-net-device" "netanim"]
, gcc6
, lib
}:
let
pythonEnv = python.withPackages(ps:
stdenv.lib.optional withManual ps.sphinx
++ stdenv.lib.optionals generateBindings (with ps;[ pybindgen pygccxml ])
++ stdenv.lib.optionals pythonSupport (with ps;[ pybindgen pygccxml ])
);
in
stdenv.mkDerivation rec {
pname = "ns-3";
version = "30";
name = "ns-3.${version}";
version = "28";
# the all in one https://www.nsnam.org/release/ns-allinone-3.27.tar.bz2;
# fetches everything (netanim, etc), this package focuses on ns3-core
src = fetchFromGitHub {
owner = "nsnam";
repo = "ns-3-dev-git";
rev = name;
sha256 = "17kzfjpgw2mvyx1c9bxccnvw67jpk09fxmcnlkqx9xisk10qnhng";
src = fetchFromGitLab {
owner = "nsnam";
repo = "ns-3-dev";
rev = "ns-3.${version}";
sha256 = "0smdi3gglmafpc7a20hj2lbmwks3d5fpsicpn39lmm3svazw0bvp";
};
nativeBuildInputs = [ wafHook ];
# ncurses is a hidden dependency of waf when checking python
buildInputs = lib.optionals generateBindings [ castxml ncurses ]
++ stdenv.lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
++ stdenv.lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
propagatedBuildInputs = [ gcc6 pythonEnv ];
outputs = [ "out" ] ++ lib.optional pythonSupport "py";
# ncurses is a hidden dependency of waf when checking python
buildInputs = lib.optionals pythonSupport [ castxml ncurses ]
++ lib.optional enableDoxygen [ doxygen graphviz imagemagick ]
++ lib.optional withManual [ dia tetex ghostscript texlive.combined.scheme-medium ];
propagatedBuildInputs = [ pythonEnv ];
postPatch = ''
patchShebangs doc/ns3_html_theme/get_version.sh
'';
wafConfigureFlags = with stdenv.lib; [
"--enable-modules=${stdenv.lib.concatStringsSep "," modules}"
"--enable-modules=${concatStringsSep "," modules}"
"--with-python=${pythonEnv.interpreter}"
]
++ optional (build_profile != null) "--build-profile=${build_profile}"
++ optional generateBindings [ ]
++ optional withExamples " --enable-examples "
++ optional doCheck " --enable-tests "
;
doCheck = true;
buildTargets = "build"
+ lib.optionalString enableDoxygen " doxygen"
+ lib.optionalString withManual "sphinx";
doCheck = true;
# to prevent fatal error: 'backward_warning.h' file not found
CXXFLAGS = "-D_GLIBCXX_PERMIT_BACKWARD_HASH";
# we need to specify the proper interpreter else ns3 can check against a
# different version even though we
checkPhase = ''
${pythonEnv.interpreter} ./test.py
postBuild = with stdenv.lib; let flags = concatStringsSep ";" (
optional enableDoxygen "./waf doxygen"
++ optional withManual "./waf sphinx"
);
in "${flags}"
;
postInstall = ''
moveToOutput "${pythonEnv.libPrefix}" "$py"
'';
hardeningDisable = [ "fortify" ];
# we need to specify the proper interpreter else ns3 can check against a
# different version
checkPhase = ''
${pythonEnv.interpreter} ./test.py --nowaf
'';
meta = {
homepage = http://www.nsnam.org;
license = stdenv.lib.licenses.gpl3;
# strictoverflow prevents clang from discovering pyembed when bindings
hardeningDisable = [ "fortify" "strictoverflow"];
meta = with stdenv.lib; {
homepage = "http://www.nsnam.org";
license = licenses.gpl3;
description = "A discrete time event network simulator";
platforms = with stdenv.lib.platforms; unix;
platforms = with platforms; unix;
maintainers = with maintainers; [ teto ];
};
}

View File

@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
pname = "yubico-pam";
version = "unstable-2019-03-19";
version = "unstable-2019-07-01";
src = fetchFromGitHub {
owner = "Yubico";
repo = pname;
rev = "1c6fa66825e77b3ad8df46513d0125bed9bde704";
sha256 = "1g41wdwa1wbp391w1crbis4hwz60m3y06rd6j59m003zx40sk9s4";
rev = "b5bd00db81e0e0e0ecced65c684080bb56ddc35b";
sha256 = "10dq8dqi3jldllj6p8r9hldx9sank9n82c44w8akxrs1vli6nj3m";
};
nativeBuildInputs = [ autoreconfHook pkgconfig asciidoc libxslt docbook_xsl ];

View File

@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
{
baseName = ''alexandria'';
version = ''20181210-git'';
version = ''20190710-git'';
description = ''Alexandria is a collection of portable public domain utilities.'';
deps = [ ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz'';
sha256 = ''0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588'';
url = ''http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz'';
sha256 = ''0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70'';
};
packageName = "alexandria";
@ -19,8 +19,8 @@ args @ { fetchurl, ... }:
}
/* (SYSTEM alexandria DESCRIPTION
Alexandria is a collection of portable public domain utilities. SHA256
0dg0gr7cgrrl70sq0sbz8i1zcli54bqg4x532wscz3156xrl2588 URL
http://beta.quicklisp.org/archive/alexandria/2018-12-10/alexandria-20181210-git.tgz
MD5 2a7530a412cd94a56b6d4e5864fb8819 NAME alexandria FILENAME alexandria
DEPS NIL DEPENDENCIES NIL VERSION 20181210-git SIBLINGS (alexandria-tests)
0127d5yyq46dpffvr4hla6d3ryiml48mxd2r6cgbg3mgz3b2nr70 URL
http://beta.quicklisp.org/archive/alexandria/2019-07-10/alexandria-20190710-git.tgz
MD5 2b5abc0a266aeafe9029bf26db90b292 NAME alexandria FILENAME alexandria
DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (alexandria-tests)
PARASITES NIL) */

View File

@ -1,15 +1,15 @@
args @ { fetchurl, ... }:
{
baseName = ''array-utils'';
version = ''20181018-git'';
version = ''20190710-git'';
description = ''A few utilities for working with arrays.'';
deps = [ ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz'';
sha256 = ''1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn'';
url = ''http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz'';
sha256 = ''1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh'';
};
packageName = "array-utils";
@ -18,8 +18,8 @@ args @ { fetchurl, ... }:
overrides = x: x;
}
/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays.
SHA256 1w13zwdhms4xbsnp9p6j71a4ppzglhxm81savyq0spf3zlm2l5yn URL
http://beta.quicklisp.org/archive/array-utils/2018-10-18/array-utils-20181018-git.tgz
MD5 e32cc0474cf299ad1f5666e2864aa3d8 NAME array-utils FILENAME array-utils
DEPS NIL DEPENDENCIES NIL VERSION 20181018-git SIBLINGS (array-utils-test)
SHA256 1fzsg3lqa79yrkad6fx924vai7i6m92i2rq8lyq37wrbwkhm7grh URL
http://beta.quicklisp.org/archive/array-utils/2019-07-10/array-utils-20190710-git.tgz
MD5 58c39c2ba3d2c8cd8a695fb867b72c33 NAME array-utils FILENAME array-utils
DEPS NIL DEPENDENCIES NIL VERSION 20190710-git SIBLINGS (array-utils-test)
PARASITES NIL) */

View File

@ -0,0 +1,25 @@
args @ { fetchurl, ... }:
rec {
baseName = ''asdf-package-system'';
version = ''20150608-git'';
description = ''System lacks description'';
deps = [ ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz'';
sha256 = ''17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29'';
};
packageName = "asdf-package-system";
asdFilesToKeep = ["asdf-package-system.asd"];
overrides = x: x;
}
/* (SYSTEM asdf-package-system DESCRIPTION System lacks description SHA256
17lfwfc15hcag8a2jsaxkx42wmz2mwkvxf6vb2h9cim7dwsnyy29 URL
http://beta.quicklisp.org/archive/asdf-package-system/2015-06-08/asdf-package-system-20150608-git.tgz
MD5 9eee9d811aec4894843ac1d8ae6cbccd NAME asdf-package-system FILENAME
asdf-package-system DEPS NIL DEPENDENCIES NIL VERSION 20150608-git SIBLINGS
NIL PARASITES NIL) */

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''chunga'';
version = ''20180131-git'';
description = '''';
description = ''System lacks description'';
deps = [ args."trivial-gray-streams" ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["chunga.asd"];
overrides = x: x;
}
/* (SYSTEM chunga DESCRIPTION NIL SHA256
/* (SYSTEM chunga DESCRIPTION System lacks description SHA256
0crlv6n6al7j9b40dpfjd13870ih5hzwra29xxfg3zg2zy2kdnrq URL
http://beta.quicklisp.org/archive/chunga/2018-01-31/chunga-20180131-git.tgz
MD5 044b684535b11b1eee1cf939bec6e14a NAME chunga FILENAME chunga DEPS

View File

@ -0,0 +1,24 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-css'';
version = ''20140914-git'';
description = ''Simple inline CSS generator'';
deps = [ ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz'';
sha256 = ''16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n'';
};
packageName = "cl-css";
asdFilesToKeep = ["cl-css.asd"];
overrides = x: x;
}
/* (SYSTEM cl-css DESCRIPTION Simple inline CSS generator SHA256
16zjm10qqyv5v0ysvicbiscplrwlfr0assbf01gp73j1m108rn7n URL
http://beta.quicklisp.org/archive/cl-css/2014-09-14/cl-css-20140914-git.tgz
MD5 a91f5a5d6a751af31d5c4fd8170f6ece NAME cl-css FILENAME cl-css DEPS NIL
DEPENDENCIES NIL VERSION 20140914-git SIBLINGS NIL PARASITES NIL) */

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-dbi'';
version = ''20190521-git'';
description = '''';
description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-dbi.asd"];
overrides = x: x;
}
/* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
/* (SYSTEM cl-dbi DESCRIPTION System lacks description SHA256
1q0hhgxnd91v020zh9ivlmzhzz5ald6q1bm5i5cawzh0xfyfhhvg URL
http://beta.quicklisp.org/archive/cl-dbi/2019-05-21/cl-dbi-20190521-git.tgz
MD5 ba77d3a955991b406f56cc1a09e71dc2 NAME cl-dbi FILENAME cl-dbi DEPS

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-test-more'';
version = ''prove-20171130-git'';
description = '''';
description = ''System lacks description'';
deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."prove" ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-test-more.asd"];
overrides = x: x;
}
/* (SYSTEM cl-test-more DESCRIPTION NIL SHA256
/* (SYSTEM cl-test-more DESCRIPTION System lacks description SHA256
13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
MD5 630df4367537f799570be40242f8ed52 NAME cl-test-more FILENAME

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''cl-utilities'';
version = ''1.2.4'';
description = '''';
description = ''System lacks description'';
deps = [ ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["cl-utilities.asd"];
overrides = x: x;
}
/* (SYSTEM cl-utilities DESCRIPTION NIL SHA256
/* (SYSTEM cl-utilities DESCRIPTION System lacks description SHA256
1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87 URL
http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz
MD5 c3a4ba38b627448d3ed40ce888048940 NAME cl-utilities FILENAME

View File

@ -0,0 +1,34 @@
args @ { fetchurl, ... }:
rec {
baseName = ''cl-xmlspam'';
version = ''20101006-http'';
description = ''Streaming pattern matching for XML'';
deps = [ args."alexandria" args."babel" args."cl-ppcre" args."closure-common" args."cxml" args."puri" args."trivial-features" args."trivial-gray-streams" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz'';
sha256 = ''1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h'';
};
packageName = "cl-xmlspam";
asdFilesToKeep = ["cl-xmlspam.asd"];
overrides = x: x;
}
/* (SYSTEM cl-xmlspam DESCRIPTION Streaming pattern matching for XML SHA256
1mx1a6ab4irncrx5pamh7zng35m4c5wh0pw68avaz7fbz81s953h URL
http://beta.quicklisp.org/archive/cl-xmlspam/2010-10-06/cl-xmlspam-20101006-http.tgz
MD5 6e3a0944e96e17916b1445f4207babb8 NAME cl-xmlspam FILENAME cl-xmlspam
DEPS
((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
(NAME cl-ppcre FILENAME cl-ppcre)
(NAME closure-common FILENAME closure-common) (NAME cxml FILENAME cxml)
(NAME puri FILENAME puri)
(NAME trivial-features FILENAME trivial-features)
(NAME trivial-gray-streams FILENAME trivial-gray-streams))
DEPENDENCIES
(alexandria babel cl-ppcre closure-common cxml puri trivial-features
trivial-gray-streams)
VERSION 20101006-http SIBLINGS NIL PARASITES NIL) */

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''clack-socket'';
version = ''clack-20190710-git'';
description = '''';
description = ''System lacks description'';
deps = [ ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["clack-socket.asd"];
overrides = x: x;
}
/* (SYSTEM clack-socket DESCRIPTION NIL SHA256
/* (SYSTEM clack-socket DESCRIPTION System lacks description SHA256
1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-socket FILENAME

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''clack-v1-compat'';
version = ''clack-20190710-git'';
description = '''';
description = ''System lacks description'';
deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-handler-hunchentoot" args."clack-socket" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."hunchentoot" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."md5" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."rfc2388" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["clack-v1-compat.asd"];
overrides = x: x;
}
/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
/* (SYSTEM clack-v1-compat DESCRIPTION System lacks description SHA256
1642myknfaajcyqllnhn9s17yb6dbj1yh9wmg1kbplwq9c3yjs7k URL
http://beta.quicklisp.org/archive/clack/2019-07-10/clack-20190710-git.tgz
MD5 9d8869ca599652d68dd759c8a6adcd3d NAME clack-v1-compat FILENAME

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''closure-html'';
version = ''20180711-git'';
description = '''';
description = ''System lacks description'';
deps = [ args."alexandria" args."babel" args."closure-common" args."flexi-streams" args."trivial-features" args."trivial-gray-streams" ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["closure-html.asd"];
overrides = x: x;
}
/* (SYSTEM closure-html DESCRIPTION NIL SHA256
/* (SYSTEM closure-html DESCRIPTION System lacks description SHA256
0ljcrz1wix77h1ywp0bixm3pb5ncmr1vdiwh8m1qzkygwpfjr8aq URL
http://beta.quicklisp.org/archive/closure-html/2018-07-11/closure-html-20180711-git.tgz
MD5 461dc8caa65385da5f2d1cd8dd4f965f NAME closure-html FILENAME

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''css-lite'';
version = ''20120407-git'';
description = '''';
description = ''System lacks description'';
deps = [ ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["css-lite.asd"];
overrides = x: x;
}
/* (SYSTEM css-lite DESCRIPTION NIL SHA256
/* (SYSTEM css-lite DESCRIPTION System lacks description SHA256
1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg URL
http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz
MD5 9b25afb0d2c3f0c32d2303ab1d3f570d NAME css-lite FILENAME css-lite DEPS

View File

@ -0,0 +1,34 @@
args @ { fetchurl, ... }:
rec {
baseName = ''dbus'';
version = ''20190521-git'';
description = ''A D-BUS client library for Common Lisp'';
deps = [ args."alexandria" args."asdf-package-system" args."babel" args."cl-xmlspam" args."flexi-streams" args."ieee-floats" args."iolib" args."ironclad" args."trivial-garbage" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz'';
sha256 = ''0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq'';
};
packageName = "dbus";
asdFilesToKeep = ["dbus.asd"];
overrides = x: x;
}
/* (SYSTEM dbus DESCRIPTION A D-BUS client library for Common Lisp SHA256
0g4hsygy52rylhi19kxxhv9dbbirl6hdisgqw89whdxb9py6ifqq URL
http://beta.quicklisp.org/archive/dbus/2019-05-21/dbus-20190521-git.tgz MD5
59e7ab92086503e4185273ec3f3ba3fc NAME dbus FILENAME dbus DEPS
((NAME alexandria FILENAME alexandria)
(NAME asdf-package-system FILENAME asdf-package-system)
(NAME babel FILENAME babel) (NAME cl-xmlspam FILENAME cl-xmlspam)
(NAME flexi-streams FILENAME flexi-streams)
(NAME ieee-floats FILENAME ieee-floats) (NAME iolib FILENAME iolib)
(NAME ironclad FILENAME ironclad)
(NAME trivial-garbage FILENAME trivial-garbage))
DEPENDENCIES
(alexandria asdf-package-system babel cl-xmlspam flexi-streams ieee-floats
iolib ironclad trivial-garbage)
VERSION 20190521-git SIBLINGS NIL PARASITES NIL) */

View File

@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
parasites = [ "external-program-test" ];
description = '''';
description = ''System lacks description'';
deps = [ args."fiveam" args."trivial-features" ];
@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["external-program.asd"];
overrides = x: x;
}
/* (SYSTEM external-program DESCRIPTION NIL SHA256
/* (SYSTEM external-program DESCRIPTION System lacks description SHA256
1nl3mngh7vp2l9mfbdhni4nc164zznafnl74p1kv9j07n5fcpnyz URL
http://beta.quicklisp.org/archive/external-program/2019-03-07/external-program-20190307-git.tgz
MD5 b30fe104c34059506fd4c493fa79fe1a NAME external-program FILENAME

View File

@ -0,0 +1,26 @@
args @ { fetchurl, ... }:
rec {
baseName = ''introspect-environment'';
version = ''20151031-git'';
description = ''Small interface to portable but nonstandard introspection of CL environments.'';
deps = [ ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz'';
sha256 = ''0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30'';
};
packageName = "introspect-environment";
asdFilesToKeep = ["introspect-environment.asd"];
overrides = x: x;
}
/* (SYSTEM introspect-environment DESCRIPTION
Small interface to portable but nonstandard introspection of CL environments.
SHA256 0npydsmksbm3nisy9whnivmmhgdira74plmncmaklp7yhqsvwc30 URL
http://beta.quicklisp.org/archive/introspect-environment/2015-10-31/introspect-environment-20151031-git.tgz
MD5 3c61088583f11791530edb2e18f5d6f0 NAME introspect-environment FILENAME
introspect-environment DEPS NIL DEPENDENCIES NIL VERSION 20151031-git
SIBLINGS (introspect-environment-test) PARASITES NIL) */

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''lack-component'';
version = ''lack-20190521-git'';
description = '''';
description = ''System lacks description'';
deps = [ ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["lack-component.asd"];
overrides = x: x;
}
/* (SYSTEM lack-component DESCRIPTION NIL SHA256
/* (SYSTEM lack-component DESCRIPTION System lacks description SHA256
0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
7d7321550f0795e998c7afe4498e7a40 NAME lack-component FILENAME

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''lack-middleware-backtrace'';
version = ''lack-20190521-git'';
description = '''';
description = ''System lacks description'';
deps = [ args."uiop" ];
@ -17,8 +17,8 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["lack-middleware-backtrace.asd"];
overrides = x: x;
}
/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
/* (SYSTEM lack-middleware-backtrace DESCRIPTION System lacks description
SHA256 0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
7d7321550f0795e998c7afe4498e7a40 NAME lack-middleware-backtrace FILENAME
lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''lack-util'';
version = ''lack-20190521-git'';
description = '''';
description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."nibbles" ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["lack-util.asd"];
overrides = x: x;
}
/* (SYSTEM lack-util DESCRIPTION NIL SHA256
/* (SYSTEM lack-util DESCRIPTION System lacks description SHA256
0ng1k5jq7icfi8c8r3wqj3qrqkh2lyav5ab6mf3l5y4bfwbil593 URL
http://beta.quicklisp.org/archive/lack/2019-05-21/lack-20190521-git.tgz MD5
7d7321550f0795e998c7afe4498e7a40 NAME lack-util FILENAME lack-util DEPS

View File

@ -0,0 +1,30 @@
args @ { fetchurl, ... }:
rec {
baseName = ''log4cl'';
version = ''20190107-git'';
parasites = [ "log4cl/syslog" "log4cl/test" ];
description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."stefil" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz'';
sha256 = ''0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p'';
};
packageName = "log4cl";
asdFilesToKeep = ["log4cl.asd"];
overrides = x: x;
}
/* (SYSTEM log4cl DESCRIPTION System lacks description SHA256
0c5gsmz69jby5hmcl4igf1sh6xkwh8bx2jz6kd2gcnqjwq37h46p URL
http://beta.quicklisp.org/archive/log4cl/2019-01-07/log4cl-20190107-git.tgz
MD5 ecfa1f67902c776f46d192acd55f628c NAME log4cl FILENAME log4cl DEPS
((NAME alexandria FILENAME alexandria)
(NAME bordeaux-threads FILENAME bordeaux-threads)
(NAME stefil FILENAME stefil))
DEPENDENCIES (alexandria bordeaux-threads stefil) VERSION 20190107-git
SIBLINGS (log4cl-examples log4slime) PARASITES (log4cl/syslog log4cl/test)) */

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''misc-extensions'';
version = ''20150608-git'';
description = '''';
description = ''System lacks description'';
deps = [ ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["misc-extensions.asd"];
overrides = x: x;
}
/* (SYSTEM misc-extensions DESCRIPTION NIL SHA256
/* (SYSTEM misc-extensions DESCRIPTION System lacks description SHA256
0pkvi1l5djwpvm0p8m0bcdjm61gxvzy0vgn415gngdixvbbchdqj URL
http://beta.quicklisp.org/archive/misc-extensions/2015-06-08/misc-extensions-20150608-git.tgz
MD5 ef8a05dd4382bb9d1e3960aeb77e332e NAME misc-extensions FILENAME

View File

@ -0,0 +1,26 @@
args @ { fetchurl, ... }:
rec {
baseName = ''mk-string-metrics'';
version = ''20180131-git'';
description = ''efficient implementations of various string metric algorithms'';
deps = [ ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz'';
sha256 = ''10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4'';
};
packageName = "mk-string-metrics";
asdFilesToKeep = ["mk-string-metrics.asd"];
overrides = x: x;
}
/* (SYSTEM mk-string-metrics DESCRIPTION
efficient implementations of various string metric algorithms SHA256
10xb9n6568nh019nq3phijbc7l6hkv69yllfiqvc1zzsprxpkwc4 URL
http://beta.quicklisp.org/archive/mk-string-metrics/2018-01-31/mk-string-metrics-20180131-git.tgz
MD5 40f23794a7d841cb178f5951d3992886 NAME mk-string-metrics FILENAME
mk-string-metrics DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS
(mk-string-metrics-tests) PARASITES NIL) */

View File

@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
parasites = [ "pcall-tests" ];
description = '''';
description = ''System lacks description'';
deps = [ args."alexandria" args."bordeaux-threads" args."fiveam" args."pcall-queue" ];
@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["pcall.asd"];
overrides = x: x;
}
/* (SYSTEM pcall DESCRIPTION NIL SHA256
/* (SYSTEM pcall DESCRIPTION System lacks description SHA256
02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5
019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall FILENAME pcall DEPS

View File

@ -0,0 +1,25 @@
args @ { fetchurl, ... }:
rec {
baseName = ''prove-asdf'';
version = ''prove-20171130-git'';
description = ''System lacks description'';
deps = [ ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz'';
sha256 = ''13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar'';
};
packageName = "prove-asdf";
asdFilesToKeep = ["prove-asdf.asd"];
overrides = x: x;
}
/* (SYSTEM prove-asdf DESCRIPTION System lacks description SHA256
13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
MD5 630df4367537f799570be40242f8ed52 NAME prove-asdf FILENAME prove-asdf
DEPS NIL DEPENDENCIES NIL VERSION prove-20171130-git SIBLINGS
(cl-test-more prove-test prove) PARASITES NIL) */

View File

@ -3,7 +3,7 @@ args @ { fetchurl, ... }:
baseName = ''prove'';
version = ''20171130-git'';
description = '''';
description = ''System lacks description'';
deps = [ args."alexandria" args."anaphora" args."cl-ansi-text" args."cl-colors" args."cl-ppcre" args."let-plus" args."uiop" ];
@ -17,7 +17,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["prove.asd"];
overrides = x: x;
}
/* (SYSTEM prove DESCRIPTION NIL SHA256
/* (SYSTEM prove DESCRIPTION System lacks description SHA256
13dmnnlk3r9fxxcvk6sqq8m0ifv9y80zgp1wg63nv1ykwdi7kyar URL
http://beta.quicklisp.org/archive/prove/2017-11-30/prove-20171130-git.tgz
MD5 630df4367537f799570be40242f8ed52 NAME prove FILENAME prove DEPS

View File

@ -5,7 +5,7 @@ args @ { fetchurl, ... }:
parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
description = '''';
description = ''System lacks description'';
deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
@ -19,7 +19,7 @@ args @ { fetchurl, ... }:
asdFilesToKeep = ["simple-date.asd"];
overrides = x: x;
}
/* (SYSTEM simple-date DESCRIPTION NIL SHA256
/* (SYSTEM simple-date DESCRIPTION System lacks description SHA256
1vphrizbhbs3r5rq4b8dh4149bz11h5xxilragwf4l2i619k3cp5 URL
http://beta.quicklisp.org/archive/postmodern/2019-05-21/postmodern-20190521-git.tgz
MD5 102567f386757cd52aca500c0c348d90 NAME simple-date FILENAME simple-date

Some files were not shown because too many files have changed in this diff Show More