Merge master into staging
This commit is contained in:
Frederik Rietdijk
commit
595a72589f
|
|
@ -5,9 +5,11 @@
|
|||
*/
|
||||
let
|
||||
|
||||
callLibs = file: import file { inherit lib; };
|
||||
inherit (import ./fixed-points.nix {}) makeExtensible;
|
||||
|
||||
lib = rec {
|
||||
lib = makeExtensible (self: let
|
||||
callLibs = file: import file { lib = self; };
|
||||
in with self; {
|
||||
|
||||
# often used, or depending on very little
|
||||
trivial = callLibs ./trivial.nix;
|
||||
|
|
@ -128,5 +130,5 @@ let
|
|||
mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults
|
||||
mergeAttrsByFuncDefaultsClean mergeAttrBy
|
||||
prepareDerivationArgs nixType imap overridableDelayableArgs;
|
||||
};
|
||||
});
|
||||
in lib
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ rec {
|
|||
};
|
||||
};
|
||||
|
||||
closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs);
|
||||
closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options lib; } // specialArgs);
|
||||
|
||||
options = mergeModules prefix (reverseList (filterModules (specialArgs.modulesPath or "") closed));
|
||||
|
||||
|
|
|
|||
|
|
@ -72,6 +72,11 @@
|
|||
github = "FireyFly";
|
||||
name = "Jonas Höglund";
|
||||
};
|
||||
Fresheyeball = {
|
||||
email = "fresheyeball@gmail.com";
|
||||
github = "fresheyeball";
|
||||
name = "Isaac Shapira";
|
||||
};
|
||||
Gonzih = {
|
||||
email = "gonzih@gmail.com";
|
||||
github = "Gonzih";
|
||||
|
|
@ -512,6 +517,11 @@
|
|||
email = "sivaraman.balaji@gmail.com";
|
||||
name = "Balaji Sivaraman";
|
||||
};
|
||||
bandresen = {
|
||||
email = "bandresen@gmail.com";
|
||||
github = "bandresen";
|
||||
name = "Benjamin Andresen";
|
||||
};
|
||||
barrucadu = {
|
||||
email = "mike@barrucadu.co.uk";
|
||||
github = "barrucadu";
|
||||
|
|
@ -1181,6 +1191,11 @@
|
|||
github = "ellis";
|
||||
name = "Ellis Whitehead";
|
||||
};
|
||||
elvishjerricco = {
|
||||
email = "elvishjerricco@gmail.com";
|
||||
github = "ElvishJerricco";
|
||||
name = "Will Fancher";
|
||||
};
|
||||
enzime = {
|
||||
email = "enzime@users.noreply.github.com";
|
||||
github = "enzime";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
set -euo pipefail
|
||||
|
||||
BUCKET_NAME="${BUCKET_NAME:-nixos-images}"
|
||||
BUCKET_NAME="${BUCKET_NAME:-nixos-cloud-images}"
|
||||
TIMESTAMP="$(date +%Y%m%d%H%M)"
|
||||
export TIMESTAMP
|
||||
|
||||
|
|
@ -19,5 +19,5 @@ img_name=$(basename "$img_path")
|
|||
img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g')
|
||||
if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then
|
||||
gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name"
|
||||
gsutil acl ch -u AllUsers:R "gs://${BUCKET_NAME}/$img_name"
|
||||
fi
|
||||
gcloud compute images create "$img_id" --source-uri "gs://${BUCKET_NAME}/$img_name"
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ in
|
|||
example = ''
|
||||
$feature{'highlight'}{'default'} = [1];
|
||||
$feature{'ctags'}{'default'} = [1];
|
||||
$feature{'avatar'}{'default'} = ['gravatar'];
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,19 @@ let
|
|||
|
||||
# for users in group "transmission" to have access to torrents
|
||||
fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings;
|
||||
|
||||
# Directories transmission expects to exist and be ug+rwx.
|
||||
directoriesToManage = [ homeDir settingsDir fullSettings.download-dir fullSettings.incomplete-dir ];
|
||||
|
||||
preStart = pkgs.writeScript "transmission-pre-start" ''
|
||||
#!${pkgs.runtimeShell}
|
||||
set -ex
|
||||
for DIR in ${escapeShellArgs directoriesToManage}; do
|
||||
mkdir -p "$DIR"
|
||||
chmod 770 "$DIR"
|
||||
done
|
||||
cp -f ${settingsFile} ${settingsDir}/settings.json
|
||||
'';
|
||||
in
|
||||
{
|
||||
options = {
|
||||
|
|
@ -89,9 +102,7 @@ in
|
|||
|
||||
# 1) Only the "transmission" user and group have access to torrents.
|
||||
# 2) Optionally update/force specific fields into the configuration file.
|
||||
serviceConfig.ExecStartPre = ''
|
||||
${pkgs.runtimeShell} -c "mkdir -p ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && chmod 770 ${homeDir} ${settingsDir} ${fullSettings.download-dir} ${fullSettings.incomplete-dir} && rm -f ${settingsDir}/settings.json && cp -f ${settingsFile} ${settingsDir}/settings.json"
|
||||
'';
|
||||
serviceConfig.ExecStartPre = preStart;
|
||||
serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port}";
|
||||
serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
|
||||
serviceConfig.User = "transmission";
|
||||
|
|
|
|||
|
|
@ -22,36 +22,31 @@ in
|
|||
|
||||
config = mkIf config.services.nginx.gitweb.enable {
|
||||
|
||||
systemd.sockets.gitweb = {
|
||||
description = "GitWeb Listen Socket";
|
||||
listenStreams = [ "/run/gitweb.sock" ];
|
||||
socketConfig = {
|
||||
Accept = "false";
|
||||
SocketUser = "nginx";
|
||||
SocketGroup = "nginx";
|
||||
SocketMode = "0600";
|
||||
};
|
||||
wantedBy = [ "sockets.target" ];
|
||||
};
|
||||
systemd.services.gitweb = {
|
||||
description = "GitWeb service";
|
||||
script = "${git}/share/gitweb/gitweb.cgi --fcgi";
|
||||
script = "${pkgs.git}/share/gitweb/gitweb.cgi --fastcgi --nproc=1";
|
||||
environment = {
|
||||
FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock";
|
||||
};
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
StandardInput = "socket";
|
||||
User = "nginx";
|
||||
Group = "nginx";
|
||||
RuntimeDirectory = [ "gitweb" ];
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts.default = {
|
||||
locations."/gitweb" = {
|
||||
root = "${pkgs.git}/share/gitweb";
|
||||
locations."/gitweb/" = {
|
||||
root = "${pkgs.git}/share";
|
||||
tryFiles = "$uri @gitweb";
|
||||
};
|
||||
locations."@gitweb" = {
|
||||
extraConfig = ''
|
||||
include ${pkgs.nginx}/conf/fastcgi_params;
|
||||
fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile};
|
||||
fastcgi_pass unix:/run/gitweb.sock;
|
||||
fastcgi_pass unix:/run/gitweb/gitweb.sock;
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -61,6 +61,8 @@ in
|
|||
|
||||
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
|
||||
|
||||
services.upower.enable = config.powerManagement.enable;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -108,6 +108,8 @@ in
|
|||
services.gnome3.gnome-keyring.enable = true;
|
||||
services.upower.enable = config.powerManagement.enable;
|
||||
|
||||
security.pam.services."mate-screensaver".unixAuth = true;
|
||||
|
||||
environment.pathsToLink = [ "/share" ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -57,6 +57,12 @@ in
|
|||
# Always include cryptsetup so that NixOps can use it.
|
||||
environment.systemPackages = [ pkgs.cryptsetup ];
|
||||
|
||||
# Make sure GCE image does not replace host key that NixOps sets
|
||||
environment.etc."default/instance_configs.cfg".text = lib.mkDefault ''
|
||||
[InstanceSetup]
|
||||
set_host_keys = false
|
||||
'';
|
||||
|
||||
# Rely on GCP's firewall instead
|
||||
networking.firewall.enable = mkDefault false;
|
||||
|
||||
|
|
@ -69,6 +75,9 @@ in
|
|||
|
||||
networking.usePredictableInterfaceNames = false;
|
||||
|
||||
# GC has 1460 MTU
|
||||
networking.interfaces.eth0.mtu = 1460;
|
||||
|
||||
# allow the google-accounts-daemon to manage users
|
||||
users.mutableUsers = true;
|
||||
# and allow users to sudo without password
|
||||
|
|
|
|||
|
|
@ -383,6 +383,7 @@ in rec {
|
|||
tests.switchTest = callTest tests/switch-test.nix {};
|
||||
tests.taskserver = callTest tests/taskserver.nix {};
|
||||
tests.tomcat = callTest tests/tomcat.nix {};
|
||||
tests.transmission = callTest tests/transmission.nix {};
|
||||
tests.udisks2 = callTest tests/udisks2.nix {};
|
||||
tests.vault = callTest tests/vault.nix {};
|
||||
tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
import ./make-test.nix ({ pkgs, ...} : {
|
||||
name = "transmission";
|
||||
meta = with pkgs.stdenv.lib.maintainers; {
|
||||
maintainers = [ coconnor ];
|
||||
};
|
||||
|
||||
machine = { config, pkgs, ... }: {
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 9091 ];
|
||||
|
||||
services.transmission.enable = true;
|
||||
};
|
||||
|
||||
testScript =
|
||||
''
|
||||
startAll;
|
||||
$machine->waitForUnit("transmission");
|
||||
$machine->shutdown;
|
||||
'';
|
||||
})
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib
|
||||
, libvorbis, libogg, flac, itstool, libxml2, gsettings-desktop-schemas
|
||||
, libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas
|
||||
, gnome3, wrapGAppsHook
|
||||
}:
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
|
||||
buildInputs = [
|
||||
gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
|
||||
gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac
|
||||
gsettings-desktop-schemas gnome3.defaultIconTheme
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,14 +7,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
name = "elisa-${version}";
|
||||
# 0.1 is expected in early/mid 2018-04
|
||||
version = "0.0.20180320";
|
||||
version = "0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KDE";
|
||||
repo = "elisa";
|
||||
rev = "9dd35d7244a8a3553275152f5b50fbe6d272ce64";
|
||||
sha256 = "0mjqvcpk2y4jlwkka8gzl50wgqjjx9bzpbrj79cr0ib3jyviss4k";
|
||||
rev = version;
|
||||
sha256 = "13i0fkpwrskric3gfalh7mcpp4l2knwnq7jpq391lgh6krq04r4w";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "atom-${version}";
|
||||
version = "1.25.0";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
|
||||
sha256 = "04iiw0qzl9025l4lasz42w5nfnvsmc7vwcf4a9c2hvl9xsyckajh";
|
||||
sha256 = "0h0kr4w26c6i89rb9y4aw4l8f63al42i2cy3ddk16m1irzij9fk4";
|
||||
name = "${name}.deb";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Simple, distraction-free writing environment";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ madjar ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
homepage = https://gottcode.org/focuswriter/;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +1,39 @@
|
|||
{buildVersion, x32sha256, x64sha256}:
|
||||
|
||||
{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
|
||||
pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
|
||||
gksuSupport ? false, gksu, unzip, zip, bash }:
|
||||
gksuSupport ? false, gksu, unzip, zip, bash}:
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
assert gksuSupport -> gksu != null;
|
||||
|
||||
let
|
||||
build = "3143";
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango];
|
||||
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
|
||||
++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
|
||||
in let
|
||||
archSha256 =
|
||||
if stdenv.system == "i686-linux" then
|
||||
x32sha256
|
||||
else
|
||||
x64sha256;
|
||||
|
||||
arch =
|
||||
if stdenv.system == "i686-linux" then
|
||||
"x32"
|
||||
else
|
||||
"x64";
|
||||
|
||||
# package with just the binaries
|
||||
sublime = stdenv.mkDerivation {
|
||||
name = "sublimetext3-${build}-bin";
|
||||
|
||||
name = "sublimetext3-${buildVersion}-bin";
|
||||
src =
|
||||
if stdenv.system == "i686-linux" then
|
||||
fetchurl {
|
||||
name = "sublimetext-${build}.tar.bz2";
|
||||
url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2";
|
||||
sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
name = "sublimetext-${build}.tar.bz2";
|
||||
url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2";
|
||||
sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw";
|
||||
};
|
||||
fetchurl {
|
||||
name = "sublimetext-${buildVersion}.tar.bz2";
|
||||
url = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2";
|
||||
sha256 = archSha256;
|
||||
};
|
||||
|
||||
dontStrip = true;
|
||||
dontPatchELF = true;
|
||||
|
|
@ -80,8 +86,8 @@ in let
|
|||
wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
|
||||
'';
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
name = "sublimetext3-${build}";
|
||||
in stdenv.mkDerivation (rec {
|
||||
name = "sublimetext3-${buildVersion}";
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
|
|
@ -110,4 +116,4 @@ in stdenv.mkDerivation {
|
|||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
{ callPackage }:
|
||||
|
||||
let
|
||||
common = opts: callPackage (import ./common.nix opts);
|
||||
in
|
||||
rec {
|
||||
sublime3-dev = common {
|
||||
buildVersion = "3161";
|
||||
x32sha256 = "0qrm2qmfsj71lr83c8zas2n3xk8hk9k4w8ygnasjhggmyjm3wy0q";
|
||||
x64sha256 = "0cgadylm68s2jly10r038q1fvmbzmpc2nvqy86vlyq9avgqbm5pc";
|
||||
} {};
|
||||
|
||||
sublime3 = common {
|
||||
buildVersion = "3143";
|
||||
x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i";
|
||||
x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw";
|
||||
} {};
|
||||
}
|
||||
|
|
@ -52,7 +52,7 @@ with python3.pkgs; buildPythonApplication rec {
|
|||
homepage = https://github.com/jarun/Buku;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ matthiasbeyer infinisil ];
|
||||
maintainers = with maintainers; [ infinisil ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.20.0";
|
||||
version = "3.21.0";
|
||||
name = "calibre-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
|
||||
sha256 = "1rnmh24d9hqnncg6p6zwkb3y3m4k9n7pzma69haxnm7iaps84gmy";
|
||||
sha256 = "0nd9lv7armmkjwxjhs5mhsksvig5n435kww1dy9fq5hxg7nkq5ip";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://cgg.bzatek.net/;
|
||||
description = "a simple static web photo gallery, designed to be clean and easily usable";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ with python3Packages;
|
|||
buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "cheat";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
|
||||
propagatedBuildInputs = [ docopt pygments ];
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ buildPythonApplication rec {
|
|||
owner = "chrisallenlane";
|
||||
repo = "cheat";
|
||||
rev = version;
|
||||
sha256 = "1da4m4n6nivjakpll6jj0aszrv24g2zax74034lzpv3pbh84fvas";
|
||||
sha256 = "1p9a54fax3b1ilqcwdlccy08ww3igwsyzcyikqivaxj5p6mqq6wl";
|
||||
};
|
||||
# no tests available
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://github.com/dpayne/cli-visualizer;
|
||||
description = "CLI based audio visualizer";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://ctodo.apakoh.dk/;
|
||||
description = "A simple ncurses-based task list manager";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://gkrellm.srcbox.net;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ buildPythonApplication rec {
|
|||
homepage = https://github.com/donnemartin/haxor-news;
|
||||
description = "Browse Hacker News like a haxor";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://github.com/LuRsT/hr;
|
||||
description = "A horizontal bar for your terminal";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://github.com/dvorka/hstr;
|
||||
description = "Shell history suggest box - easily view, navigate, search and use your command history";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; linux; # Cannot test others
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://github.com/johanmalm/jgmenu;
|
||||
description = "Small X11 menu intended to be used with openbox and tint2";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "josm-${version}";
|
||||
version = "13500";
|
||||
version = "13576";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
sha256 = "1dyys4y859dazjqpn3f7vd0cpyglk82y3igrdca293y0n0hrmi7v";
|
||||
sha256 = "0pw7srvds8zs53ibvj779vj505h2gfrn7xqx13hkbacdg441jkd4";
|
||||
};
|
||||
|
||||
buildInputs = [ jre8 makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -40,6 +40,6 @@ buildPythonApplication rec {
|
|||
homepage = http://lostpackets.de/khal/;
|
||||
description = "CLI calendar application";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthiasbeyer jgeerds ];
|
||||
maintainers = with maintainers; [ jgeerds ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@ python3Packages.buildPythonApplication rec {
|
|||
homepage = https://github.com/scheibler/khard;
|
||||
description = "Console carddav client";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/visit1985/mdp;
|
||||
description = "A command-line based markdown presentation tool";
|
||||
maintainers = with maintainers; [ matthiasbeyer vrthra ];
|
||||
maintainers = with maintainers; [ vrthra ];
|
||||
license = licenses.gpl3;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://jwilk.net/software/mwic;
|
||||
description = "spell-checker that groups possible misspellings and shows them in their contexts";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://posterazor.sourceforge.net/;
|
||||
description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
|
||||
maintainers = [ stdenv.lib.maintainers.madjar ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,6 @@ buildPythonApplication rec {
|
|||
homepage = https://github.com/michael-lazar/rtv;
|
||||
description = "Browse Reddit from your Terminal";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ];
|
||||
maintainers = with maintainers; [ jgeerds wedens ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://github.com/andmarti1424/sc-im;
|
||||
description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux; # Cannot test others
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ buildPythonApplication rec {
|
|||
description = "Yet another simple static gallery generator";
|
||||
homepage = http://sigal.saimon.org/en/latest/index.html;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ domenkozar matthiasbeyer ];
|
||||
maintainers = with maintainers; [ domenkozar ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
homepage = https://github.com/seenaburns/stag;
|
||||
description = "Terminal streaming bar graph passed through stdin";
|
||||
license = stdenv.lib.licenses.bsdOriginal;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/lharding/tasknc;
|
||||
description = "A ncurses wrapper around taskwarrior";
|
||||
maintainers = with maintainers; [ matthiasbeyer infinisil ];
|
||||
maintainers = with maintainers; [ infinisil ];
|
||||
platforms = platforms.linux; # Cannot test others
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
description = "REPL for taskwarrior";
|
||||
homepage = http://tasktools.org;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
|
||||
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
|
||||
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
|
||||
, libxcb, makeWrapper, nodejs
|
||||
, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
|
||||
|
||||
let
|
||||
libPath = stdenv.lib.makeLibraryPath [
|
||||
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
|
||||
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
|
||||
libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.0.0-alpha.42";
|
||||
name = "terminus-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Eugeny/terminus/releases/download/v${version}/terminus_${version}_amd64.deb";
|
||||
sha256 = "1r5n75n71zwahg4rxlnf9qzrb0651gxv0987m6bykqmfpnw91nmb";
|
||||
};
|
||||
buildInputs = [ dpkg makeWrapper ];
|
||||
unpackPhase = ''
|
||||
mkdir pkg
|
||||
dpkg-deb -x $src pkg
|
||||
sourceRoot=pkg
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
mv opt "$out/"
|
||||
ln -s "$out/opt/Terminus/terminus" "$out/bin/terminus"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Terminus/terminus"
|
||||
mv usr/* "$out/"
|
||||
wrapProgram $out/bin/terminus --prefix PATH : ${lib.makeBinPath [ nodejs ]}
|
||||
'';
|
||||
dontPatchELF = true;
|
||||
meta = with lib; {
|
||||
description = "A terminal for a more modern age";
|
||||
homepage = https://eugeny.github.io/terminus/;
|
||||
maintainers = with maintainers; [ jlesquembre ];
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||
description = "A command-line time tracker";
|
||||
homepage = https://tasktools.org/projects/timewarrior.html;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthiasbeyer mrVanDalo ];
|
||||
maintainers = with maintainers; [ mrVanDalo ];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
|
|||
description = "Mastodon CLI interface";
|
||||
homepage = "https://github.com/ihabunek/toot";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = {
|
||||
description = "Visual Interactive Taskwarrior";
|
||||
maintainers = with pkgs.lib.maintainers; [ matthiasbeyer ];
|
||||
maintainers = with pkgs.lib.maintainers; [ ];
|
||||
platforms = pkgs.lib.platforms.linux;
|
||||
license = pkgs.lib.licenses.gpl3;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://fungi.yuggoth.org/weather;
|
||||
description = "Quick access to current weather conditions and forecasts";
|
||||
license = stdenv.lib.licenses.isc;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; linux; # my only platform
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://github.com/uobikiemukot/yaft;
|
||||
description = "Yet another framebuffer terminal";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, cmake, openssl, gst_all_1, fetchFromGitHub
|
||||
, qtbase, qtmultimedia, qtwebengine
|
||||
, version ? "0.9.94"
|
||||
, sourceSha ? "19mfm0f6qqkd78aa6q4nq1y9gnlasqiyk68zgqjp1i03g70h08k5"
|
||||
, version ? "0.9.96"
|
||||
, sourceSha ? "1xzfy3jjx9sskwwbk7l8hnwnjf8af62p4kjkydp0ld0j50apc39p"
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "otter-browser-${version}";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
|
||||
, ethtool, coreutils, which, iptables, maven
|
||||
, bash, autoreconfHook
|
||||
, withJava ? !stdenv.isDarwin
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -46,11 +47,13 @@ in stdenv.mkDerivation rec {
|
|||
autoreconfHook
|
||||
];
|
||||
buildInputs = [
|
||||
makeWrapper curl sasl jdk
|
||||
makeWrapper curl sasl
|
||||
python wrapPython boto setuptools leveldb
|
||||
subversion apr glog openssl libevent maven
|
||||
subversion apr glog openssl libevent
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libnl
|
||||
] ++ lib.optionals withJava [
|
||||
jdk maven
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -181,6 +184,7 @@ in stdenv.mkDerivation rec {
|
|||
"--with-libevent=${libevent.dev}"
|
||||
"--with-protobuf=${pythonProtobuf.protobuf}"
|
||||
"PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar"
|
||||
(if withJava then "--enable-java" else "--disable-java")
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
"--with-network-isolator"
|
||||
"--with-nl=${libnl.dev}"
|
||||
|
|
@ -190,16 +194,6 @@ in stdenv.mkDerivation rec {
|
|||
rm -rf $out/var
|
||||
rm $out/bin/*.sh
|
||||
|
||||
mkdir -p $out/share/java
|
||||
cp src/java/target/mesos-*.jar $out/share/java
|
||||
|
||||
MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
|
||||
mkdir -p $out/nix-support
|
||||
touch $out/nix-support/setup-hook
|
||||
echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
|
||||
echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
|
||||
|
||||
# Inspired by: pkgs/development/python-modules/generic/default.nix
|
||||
pushd src/python
|
||||
mkdir -p $out/lib/${python.libPrefix}/site-packages
|
||||
|
|
@ -218,6 +212,16 @@ in stdenv.mkDerivation rec {
|
|||
--old-and-unmanageable \
|
||||
--prefix="$out"
|
||||
popd
|
||||
'' + stdenv.lib.optionalString withJava ''
|
||||
mkdir -p $out/share/java
|
||||
cp src/java/target/mesos-*.jar $out/share/java
|
||||
|
||||
MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary}
|
||||
|
||||
mkdir -p $out/nix-support
|
||||
touch $out/nix-support/setup-hook
|
||||
echo "export MESOS_NATIVE_JAVA_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
|
||||
echo "export MESOS_NATIVE_LIBRARY=$MESOS_NATIVE_JAVA_LIBRARY" >> $out/nix-support/setup-hook
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
|
@ -248,6 +252,6 @@ in stdenv.mkDerivation rec {
|
|||
license = licenses.asl20;
|
||||
description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
|
||||
maintainers = with maintainers; [ cstrahan kevincox offline ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
|
||||
buildGoPackage rec {
|
||||
name = "terraform-provider-nixos-${version}";
|
||||
version = "0.0.1";
|
||||
goPackagePath = "github.com/tweag/terraform-provider-nixos";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tweag";
|
||||
repo = "terraform-provider-nixos";
|
||||
sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
# Terraform allow checking the provider versions, but this breaks
|
||||
# if the versions are not provided via file paths.
|
||||
postBuild = "mv go/bin/terraform-provider-nixos{,_v${version}}";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Terraform plugin for outputting NixOS configuration files from Terraform resources.";
|
||||
homepage = "https://github.com/tweag/terraform-provider-nixos";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ grahamc ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,83 @@
|
|||
{ stdenv, fetchFromGitHub, fetchurl, cmake, doxygen, lmdb, qt5 }:
|
||||
|
||||
let
|
||||
json_hpp = fetchurl {
|
||||
url = https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp;
|
||||
sha256 = "fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733";
|
||||
};
|
||||
|
||||
variant_hpp = fetchurl {
|
||||
url = https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp;
|
||||
sha256 = "1vjiz1x5l8ynqqyb5l9mlrzgps526v45hbmwjilv4brgyi5445fq";
|
||||
};
|
||||
|
||||
matrix-structs = stdenv.mkDerivation rec {
|
||||
name = "matrix-structs-git";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mujx";
|
||||
repo = "matrix-structs";
|
||||
rev = "91bb2b85a75d664007ef81aeb500d35268425922";
|
||||
sha256 = "1v544pv18sd91gdrhbk0nm54fggprsvwwrkjmxa59jrvhwdk7rsx";
|
||||
};
|
||||
|
||||
postUnpack = ''
|
||||
cp ${json_hpp} "$sourceRoot/include/json.hpp"
|
||||
cp ${variant_hpp} "$sourceRoot/include/variant.hpp"
|
||||
'';
|
||||
|
||||
patches = [ ./fetchurls.patch ];
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
};
|
||||
|
||||
tweeny = fetchFromGitHub {
|
||||
owner = "mobius3";
|
||||
repo = "tweeny";
|
||||
rev = "b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf";
|
||||
sha256 = "1wyyq0j7dhjd6qgvnh3knr70li47hmf5394yznkv9b1indqjx4mi";
|
||||
};
|
||||
|
||||
lmdbxx = fetchFromGitHub {
|
||||
owner = "bendiken";
|
||||
repo = "lmdbxx";
|
||||
rev = "0b43ca87d8cfabba392dfe884eb1edb83874de02";
|
||||
sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nheko-${version}";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mujx";
|
||||
repo = "nheko";
|
||||
rev = "v${version}";
|
||||
sha256 = "178z64vkl7nmr1amgsgvdcwipj8czp7vbvidxllxiwal21yvqpky";
|
||||
};
|
||||
|
||||
# This patch is likely not strictly speaking needed, but will help detect when
|
||||
# a dependency is updated, so that the fetches up there can be updated too
|
||||
patches = [ ./external-deps.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a"
|
||||
"-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs"
|
||||
"-DTWEENY_INCLUDE_DIR=${tweeny}/include"
|
||||
"-DLMDBXX_INCLUDE_DIR=${lmdbxx}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Desktop client for the Matrix protocol";
|
||||
maintainers = with maintainers; [ ekleog ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
diff --git a/cmake/LMDBXX.cmake b/cmake/LMDBXX.cmake
|
||||
index 3b9817d..e69de29 100644
|
||||
--- a/cmake/LMDBXX.cmake
|
||||
+++ b/cmake/LMDBXX.cmake
|
||||
@@ -1,23 +0,0 @@
|
||||
-include(ExternalProject)
|
||||
-
|
||||
-#
|
||||
-# Build lmdbxx.
|
||||
-#
|
||||
-
|
||||
-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
|
||||
-set(LMDBXX_ROOT ${THIRD_PARTY_ROOT}/lmdbxx)
|
||||
-
|
||||
-set(LMDBXX_INCLUDE_DIR ${LMDBXX_ROOT})
|
||||
-
|
||||
-ExternalProject_Add(
|
||||
- lmdbxx
|
||||
-
|
||||
- GIT_REPOSITORY https://github.com/bendiken/lmdbxx
|
||||
- GIT_TAG 0b43ca87d8cfabba392dfe884eb1edb83874de02
|
||||
-
|
||||
- BUILD_IN_SOURCE 1
|
||||
- SOURCE_DIR ${LMDBXX_ROOT}
|
||||
- CONFIGURE_COMMAND ""
|
||||
- BUILD_COMMAND ""
|
||||
- INSTALL_COMMAND ""
|
||||
-)
|
||||
diff --git a/cmake/MatrixStructs.cmake b/cmake/MatrixStructs.cmake
|
||||
index cef00f6..e69de29 100644
|
||||
--- a/cmake/MatrixStructs.cmake
|
||||
+++ b/cmake/MatrixStructs.cmake
|
||||
@@ -1,33 +0,0 @@
|
||||
-include(ExternalProject)
|
||||
-
|
||||
-#
|
||||
-# Build matrix-structs.
|
||||
-#
|
||||
-
|
||||
-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
|
||||
-set(MATRIX_STRUCTS_ROOT ${THIRD_PARTY_ROOT}/matrix_structs)
|
||||
-set(MATRIX_STRUCTS_INCLUDE_DIR ${MATRIX_STRUCTS_ROOT}/include)
|
||||
-set(MATRIX_STRUCTS_LIBRARY matrix_structs)
|
||||
-
|
||||
-link_directories(${MATRIX_STRUCTS_ROOT})
|
||||
-
|
||||
-set(WINDOWS_FLAGS "")
|
||||
-
|
||||
-if(MSVC)
|
||||
- set(WINDOWS_FLAGS "-DCMAKE_GENERATOR_PLATFORM=x64")
|
||||
-endif()
|
||||
-
|
||||
-ExternalProject_Add(
|
||||
- MatrixStructs
|
||||
-
|
||||
- GIT_REPOSITORY https://github.com/mujx/matrix-structs
|
||||
- GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922
|
||||
-
|
||||
- BUILD_IN_SOURCE 1
|
||||
- SOURCE_DIR ${MATRIX_STRUCTS_ROOT}
|
||||
- CONFIGURE_COMMAND ${CMAKE_COMMAND}
|
||||
- -DCMAKE_BUILD_TYPE=Release ${MATRIX_STRUCTS_ROOT}
|
||||
- ${WINDOWS_FLAGS}
|
||||
- BUILD_COMMAND ${CMAKE_COMMAND} --build ${MATRIX_STRUCTS_ROOT} --config Release
|
||||
- INSTALL_COMMAND ""
|
||||
-)
|
||||
diff --git a/cmake/Tweeny.cmake b/cmake/Tweeny.cmake
|
||||
index 537ac92..e69de29 100644
|
||||
--- a/cmake/Tweeny.cmake
|
||||
+++ b/cmake/Tweeny.cmake
|
||||
@@ -1,23 +0,0 @@
|
||||
-include(ExternalProject)
|
||||
-
|
||||
-#
|
||||
-# Build tweeny
|
||||
-#
|
||||
-
|
||||
-set(THIRD_PARTY_ROOT ${CMAKE_SOURCE_DIR}/.third-party)
|
||||
-set(TWEENY_ROOT ${THIRD_PARTY_ROOT}/tweeny)
|
||||
-
|
||||
-set(TWEENY_INCLUDE_DIR ${TWEENY_ROOT}/include)
|
||||
-
|
||||
-ExternalProject_Add(
|
||||
- Tweeny
|
||||
-
|
||||
- GIT_REPOSITORY https://github.com/mobius3/tweeny
|
||||
- GIT_TAG b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf
|
||||
-
|
||||
- BUILD_IN_SOURCE 1
|
||||
- SOURCE_DIR ${TWEENY_ROOT}
|
||||
- CONFIGURE_COMMAND ""
|
||||
- BUILD_COMMAND ""
|
||||
- INSTALL_COMMAND ""
|
||||
-)
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 077ac37..c639d71 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -18,16 +18,6 @@ include(Doxygen)
|
||||
#
|
||||
include(CompilerFlags)
|
||||
|
||||
-file(DOWNLOAD
|
||||
- "https://github.com/nlohmann/json/releases/download/v3.1.2/json.hpp"
|
||||
- ${PROJECT_SOURCE_DIR}/include/json.hpp
|
||||
- EXPECTED_HASH SHA256=fbdfec4b4cf63b3b565d09f87e6c3c183bdd45c5be1864d3fcb338f6f02c1733)
|
||||
-
|
||||
-file(DOWNLOAD
|
||||
- "https://github.com/mpark/variant/releases/download/v1.3.0/variant.hpp"
|
||||
- ${PROJECT_SOURCE_DIR}/include/variant.hpp
|
||||
- EXPECTED_MD5 "be0ce322cdd408e1b347b9f1d59ea67a")
|
||||
-
|
||||
include_directories(include)
|
||||
|
||||
set(SRC
|
||||
|
|
@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
postInstall = ''
|
||||
cp ${muttWrapper} $out/bin/mutt
|
||||
wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/lib/neomutt"
|
||||
wrapProgram "$out/bin/neomutt" --prefix PATH : "$out/libexec/neomutt"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.26";
|
||||
version = "0.26.1";
|
||||
name = "notmuch-${version}";
|
||||
|
||||
passthru = {
|
||||
|
|
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://notmuchmail.org/releases/${name}.tar.gz";
|
||||
sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k";
|
||||
sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ stdenv.mkDerivation {
|
|||
description = "Offline RSS/Atom reader";
|
||||
license="AGPLv3+";
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; all;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
# The (only) source file states:
|
||||
# License: "Do what you feel is right, but don't be a jerk" public license.
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication rec {
|
|||
generate a variety of reports from them, and provides a web interface.
|
||||
'';
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
stdenv.mkDerivation rec {
|
||||
name = pname + "-" + version;
|
||||
pname = "cb2bib";
|
||||
version = "1.9.2";
|
||||
version = "1.9.7";
|
||||
src = fetchurl {
|
||||
url = "http://www.molspaces.com/dl/progs/${name}.tar.gz";
|
||||
sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin";
|
||||
sha256 = "0gr8vmlz1ikw0jiwwac2ays20z26cdv3bjdx9m1nc450hl6m5s7s";
|
||||
};
|
||||
buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ buildPythonApplication rec {
|
|||
homepage = https://beancount.github.io/fava;
|
||||
description = "Web interface for beancount";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
|
||||
maintainers = with stdenv.lib.maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Text-based word processor";
|
||||
homepage = https://cowlark.com/wordgrinder;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,16 @@
|
|||
{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, bash }:
|
||||
{ stdenv, fetchurl, htslib, zlib, bzip2, lzma, curl, perl, python, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "bcftools";
|
||||
version = "1.7";
|
||||
version = "1.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/bcftools/releases/download/${version}/${name}.tar.bz2";
|
||||
sha256 = "1l82sgw86l1626b7kxv3h0696lbj7317bb48rvqb1zqd3gcn6kyx";
|
||||
sha256 = "1vgw2mwngq20c530zim52zvgmw1lci8rzl33pvh44xqk3xlzvjsa";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
buildInputs = [ htslib zlib bzip2 lzma curl ];
|
||||
buildInputs = [ htslib zlib bzip2 lzma curl perl python ];
|
||||
|
||||
makeFlags = [
|
||||
"HSTDIR=${htslib}"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
{ stdenv, fetchFromGitHub, ocamlPackages, omake }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "beluga-20180403";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Beluga-lang";
|
||||
repo = "Beluga";
|
||||
rev = "046aa59f008be70a7c4700b723bed0214ea8b687";
|
||||
sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ];
|
||||
buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r bin $out/
|
||||
|
||||
mkdir -p $out/share/beluga
|
||||
cp -r tools/ examples/ $out/share/beluga
|
||||
|
||||
mkdir -p $out/share/emacs/site-lisp/beluga/
|
||||
cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A functional language for reasoning about formal systems";
|
||||
homepage = http://complogic.cs.mcgill.ca/beluga/;
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.bcdarwin ];
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }:
|
||||
|
||||
let
|
||||
python = python2;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "z3-${version}";
|
||||
version = "4.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Z3Prover";
|
||||
repo = "z3";
|
||||
rev = "z3-4.5.0";
|
||||
sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp";
|
||||
};
|
||||
|
||||
buildInputs = [ python fixDarwinDylibNames ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configurePhase = ''
|
||||
${python.interpreter} scripts/mk_make.py --prefix=$out --python --pypkgdir=$out/${python.sitePackages}
|
||||
cd build
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A high-performance theorem prover and SMT solver";
|
||||
homepage = "https://github.com/Z3Prover/z3";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,28 +1,24 @@
|
|||
{ stdenv, fetchurl, jre, unzip }:
|
||||
{ stdenv, fetchurl, jre, unzip, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "weka-${version}";
|
||||
version = "3.8.2";
|
||||
version = "3.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/weka/${stdenv.lib.replaceChars ["."]["-"] name}.zip";
|
||||
sha256 = "0p353lhhcv3swwn1bl64vkyjk480vv9ghhlyqjxiar4p3xifjayb";
|
||||
sha256 = "0zwmhspmqb0a7cm6k6i0s6q3w19ws1g9dx3cp2v3g3vsif6cdh31";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
buildInputs = [ unzip makeWrapper ];
|
||||
|
||||
# The -Xmx1000M comes suggested from their download page:
|
||||
# http://www.cs.waikato.ac.nz/ml/weka/downloading.html
|
||||
installPhase = ''
|
||||
mkdir -pv $out/share/weka $out/bin
|
||||
mkdir -pv $out/share/weka
|
||||
cp -Rv * $out/share/weka
|
||||
|
||||
cat > $out/bin/weka << EOF
|
||||
#!${stdenv.shell}
|
||||
${jre}/bin/java -Xmx1000M -jar $out/share/weka/weka.jar
|
||||
EOF
|
||||
|
||||
chmod +x $out/bin/weka
|
||||
makeWrapper ${jre}/bin/java $out/bin/weka \
|
||||
--add-flags "-Xmx1000M -jar $out/share/weka/weka.jar"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ pythonPackages.buildPythonApplication rec {
|
|||
options.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
|
|||
homepage = http://www.bugseverywhere.org/;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,6 @@ buildRustPackage rec {
|
|||
inherit (src.meta) homepage;
|
||||
description = "Decentralized Issue Tracking for git";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ Profpatsch matthiasbeyer ];
|
||||
maintainers = with maintainers; [ Profpatsch ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,13 +29,13 @@ let
|
|||
optional = stdenv.lib.optional;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "obs-studio-${version}";
|
||||
version = "21.0.3";
|
||||
version = "21.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jp9000";
|
||||
repo = "obs-studio";
|
||||
rev = "${version}";
|
||||
sha256 = "1mrihhzlsc66w5lr1lcm8c8jg6z0iwmmckr3pk3gk92z4s55969q";
|
||||
sha256 = "11gr4szjypihp0562r23pvkmaln6vjz1z4y4ls34bmc8n9ixrdcv";
|
||||
};
|
||||
|
||||
patches = [ ./find-xcb.patch ];
|
||||
|
|
|
|||
|
|
@ -1,98 +0,0 @@
|
|||
From 44b0f612499764dad425d467aadacb01fbd4a920 Mon Sep 17 00:00:00 2001
|
||||
From: Shea Levy <shea@shealevy.com>
|
||||
Date: Tue, 20 Feb 2018 07:59:43 -0500
|
||||
Subject: [PATCH] riscv: Respect the -initrd flag.
|
||||
|
||||
Logic for initrd start address borrowed from arm/boot.c
|
||||
---
|
||||
hw/riscv/virt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
|
||||
1 file changed, 46 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
|
||||
index 46d95b2b79..5c7d191a3f 100644
|
||||
--- a/hw/riscv/virt.c
|
||||
+++ b/hw/riscv/virt.c
|
||||
@@ -77,7 +77,35 @@ static uint64_t load_kernel(const char *kernel_filename)
|
||||
return kernel_entry;
|
||||
}
|
||||
|
||||
-static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,
|
||||
+static hwaddr load_initrd(const char *filename, uint64_t mem_size,
|
||||
+ uint64_t kernel_entry, hwaddr *start)
|
||||
+{
|
||||
+ int size;
|
||||
+
|
||||
+ /* We want to put the initrd far enough into RAM that when the
|
||||
+ * kernel is uncompressed it will not clobber the initrd. However
|
||||
+ * on boards without much RAM we must ensure that we still leave
|
||||
+ * enough room for a decent sized initrd, and on boards with large
|
||||
+ * amounts of RAM we must avoid the initrd being so far up in RAM
|
||||
+ * that it is outside lowmem and inaccessible to the kernel.
|
||||
+ * So for boards with less than 256MB of RAM we put the initrd
|
||||
+ * halfway into RAM, and for boards with 256MB of RAM or more we put
|
||||
+ * the initrd at 128MB.
|
||||
+ */
|
||||
+ *start = kernel_entry + MIN(mem_size / 2, 128 * 1024 * 1024);
|
||||
+
|
||||
+ size = load_ramdisk(filename, *start, mem_size - *start);
|
||||
+ if (size == -1) {
|
||||
+ size = load_image_targphys(filename, *start, mem_size - *start);
|
||||
+ if (size == -1) {
|
||||
+ error_report("qemu: could not load ramdisk '%s'", filename);
|
||||
+ exit(1);
|
||||
+ }
|
||||
+ }
|
||||
+ return *start + size;
|
||||
+}
|
||||
+
|
||||
+static void *create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,
|
||||
uint64_t mem_size, const char *cmdline)
|
||||
{
|
||||
void *fdt;
|
||||
@@ -233,6 +261,8 @@ static void create_fdt(RISCVVirtState *s, const struct MemmapEntry *memmap,
|
||||
qemu_fdt_setprop_string(fdt, "/chosen", "stdout-path", nodename);
|
||||
qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", cmdline);
|
||||
g_free(nodename);
|
||||
+
|
||||
+ return fdt;
|
||||
}
|
||||
|
||||
static void riscv_virt_board_init(MachineState *machine)
|
||||
@@ -246,6 +276,7 @@ static void riscv_virt_board_init(MachineState *machine)
|
||||
char *plic_hart_config;
|
||||
size_t plic_hart_config_len;
|
||||
int i;
|
||||
+ void *fdt;
|
||||
|
||||
/* Initialize SOC */
|
||||
object_initialize(&s->soc, sizeof(s->soc), TYPE_RISCV_HART_ARRAY);
|
||||
@@ -265,7 +296,8 @@ static void riscv_virt_board_init(MachineState *machine)
|
||||
main_mem);
|
||||
|
||||
/* create device tree */
|
||||
- create_fdt(s, memmap, machine->ram_size, machine->kernel_cmdline);
|
||||
+ fdt = create_fdt(s, memmap, machine->ram_size,
|
||||
+ machine->kernel_cmdline);
|
||||
|
||||
/* boot rom */
|
||||
memory_region_init_ram(boot_rom, NULL, "riscv_virt_board.bootrom",
|
||||
@@ -273,7 +305,18 @@ static void riscv_virt_board_init(MachineState *machine)
|
||||
memory_region_add_subregion(system_memory, 0x0, boot_rom);
|
||||
|
||||
if (machine->kernel_filename) {
|
||||
- load_kernel(machine->kernel_filename);
|
||||
+ uint64_t kernel_entry = load_kernel(machine->kernel_filename);
|
||||
+
|
||||
+ if (machine->initrd_filename) {
|
||||
+ hwaddr start;
|
||||
+ hwaddr end = load_initrd(machine->initrd_filename,
|
||||
+ machine->ram_size, kernel_entry,
|
||||
+ &start);
|
||||
+ qemu_fdt_setprop_cell(fdt, "/chosen",
|
||||
+ "linux,initrd-start", start);
|
||||
+ qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
|
||||
+ end);
|
||||
+ }
|
||||
}
|
||||
|
||||
/* reset vector */
|
||||
|
|
@ -1,22 +1,30 @@
|
|||
{ qemu, fetchFromGitHub, lib }: let
|
||||
src = fetchFromGitHub {
|
||||
owner = "riscv";
|
||||
repo = "riscv-qemu";
|
||||
rev = "af435b709d4a5de3ec2e59ff4dcd05b0b295a730";
|
||||
sha256 = "1kqcsn8yfdg3zyd991i4v5dxznd1l4a4hjry9304lvsm3sz2wllw";
|
||||
owner = "riscv";
|
||||
repo = "riscv-qemu";
|
||||
rev = "f733c7b5f86147216e14aff90c03ccdd76056bef";
|
||||
sha256 = "1ppr9qqwi7qqh8m6dgk1hrzg8zri240il27l67vfayd8ijagb9zq";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
version = "2.11.50";
|
||||
revCount = "58771";
|
||||
shortRev = "af435b709d";
|
||||
version = "2.11.92";
|
||||
revCount = "60378";
|
||||
shortRev = builtins.substring 0 9 src.rev;
|
||||
targets = [ "riscv32-linux-user" "riscv32-softmmu"
|
||||
"riscv64-linux-user" "riscv64-softmmu"
|
||||
];
|
||||
in lib.overrideDerivation qemu (orig: {
|
||||
name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}";
|
||||
inherit src;
|
||||
# https://github.com/riscv/riscv-qemu/pull/109
|
||||
patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ];
|
||||
# <<<<<<< HEAD
|
||||
# # https://github.com/riscv/riscv-qemu/pull/109
|
||||
# patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ];
|
||||
# =======
|
||||
# The pulseaudio and statfs patches are in 2.12.0+, which this is based on
|
||||
patches = [
|
||||
./force-uid0-on-9p.patch
|
||||
./no-etc-install.patch
|
||||
];
|
||||
|
||||
configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ];
|
||||
postInstall = null;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.icewm.org/;
|
||||
license = licenses.lgpl2;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ let
|
|||
inherit stdenv cacert git rust cargo-vendor;
|
||||
};
|
||||
in
|
||||
{ name, cargoSha256 ? null
|
||||
{ name, cargoSha256 ? "unset"
|
||||
, src ? null
|
||||
, srcs ? null
|
||||
, sourceRoot ? null
|
||||
|
|
@ -17,7 +17,7 @@ in
|
|||
, cargoVendorDir ? null
|
||||
, ... } @ args:
|
||||
|
||||
assert cargoVendorDir == null -> cargoSha256 != null;
|
||||
assert cargoVendorDir == null -> cargoSha256 != "unset";
|
||||
|
||||
let
|
||||
lib = stdenv.lib;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Open source emoji set";
|
||||
homepage = http://emojione.com/;
|
||||
license = licenses.cc-by-40;
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Calculator for the MATE desktop";
|
||||
homepage = http://mate-desktop.org;
|
||||
license = [ licenses.gpl2Plus ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,18 +12,18 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];
|
||||
|
||||
buildInputs = [ librsvg hicolor-icon-theme ];
|
||||
|
||||
|
||||
postInstall = ''
|
||||
for theme in "$out"/share/icons/*; do
|
||||
"${gtk3.out}/bin/gtk-update-icon-cache" "$theme"
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
description = "Icon themes from MATE";
|
||||
homepage = http://mate-desktop.org;
|
||||
license = stdenv.lib.licenses.lgpl3;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||
description = "Mailwatch plugin for Xfce panel";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
|
||||
description = "MPD plugin for Xfce panel";
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Battery plugin for Xfce panel";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.matthiasbeyer ];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ in mkDerivation (rec {
|
|||
description = "A Haskell to JavaScript compiler that uses the GHC API";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = ghc.meta.platforms;
|
||||
maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio ];
|
||||
maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan dmjio elvishjerricco ];
|
||||
hydraPlatforms = if broken then [] else ghc.meta.platforms;
|
||||
inherit broken;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -172,10 +172,14 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
|
||||
wrapProgram "$prog" \
|
||||
--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:$out/lib/julia" \
|
||||
--prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}"
|
||||
# Symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
|
||||
# as using a wrapper with LD_LIBRARY_PATH causes segmentation
|
||||
# faults when program returns an error:
|
||||
# $ julia -e 'throw(Error())'
|
||||
find $(echo $LD_LIBRARY_PATH | sed 's|:| |g') -maxdepth 1 -name '*.${if stdenv.isDarwin then "dylib" else "so"}*' | while read lib; do
|
||||
if [[ ! -e $out/lib/julia/$(basename $lib) ]]; then
|
||||
ln -sv $lib $out/lib/julia/$(basename $lib)
|
||||
fi
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@ in stdenv.mkDerivation {
|
|||
homepage = https://github.com/wingo/fibers;
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ vyp ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1024,3 +1024,20 @@ self: super: {
|
|||
});
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
(let
|
||||
amazonkaOverrides = self: super: {
|
||||
conduit = self.conduit_1_2_13_1;
|
||||
conduit-extra = self.conduit-extra_1_2_3_2;
|
||||
resourcet = self.resourcet_1_1_11;
|
||||
xml-conduit = self.xml-conduit_1_7_1_2;
|
||||
http-conduit = self.http-conduit_2_2_4;
|
||||
};
|
||||
amazonka-core = super.amazonka-core.overrideScope amazonkaOverrides;
|
||||
amazonka = super.amazonka.overrideScope amazonkaOverrides;
|
||||
amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides;
|
||||
in {
|
||||
inherit amazonka amazonka-core amazonka-test;
|
||||
})
|
||||
|
|
@ -143,6 +143,7 @@ self: super: builtins.intersectAttrs super {
|
|||
gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"];
|
||||
gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
|
||||
gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
|
||||
gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
|
||||
|
||||
# Need WebkitGTK, not just webkit.
|
||||
webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; };
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,9 +3,7 @@
|
|||
stdenv.mkDerivation {
|
||||
name = "Xaw3d-1.6.2";
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.2.tar.bz2
|
||||
];
|
||||
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.2.tar.bz2;
|
||||
sha256 = "0awplv1nf53ywv01yxphga3v6dcniwqnxgnb0cn4khb121l12kxp";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "accountsservice-${version}";
|
||||
version = "0.6.45";
|
||||
version = "0.6.46";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
|
||||
sha256 = "09pg25ir7kjigvp2cxd9fkfw8c8ql8vrswfvymg9zmbmma9w43zv";
|
||||
sha256 = "09ddndbha2wh22a0k5150d2wy0v8k8zj3vmbdijyirqwhf5vjr8q";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = http://www.dlib.net;
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ christopherpoole ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://sourceforge.net/p/globalplatform/wiki/Home/;
|
||||
description = "Library for interacting with smart card devices";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
description = "C++ interface for GStreamer";
|
||||
homepage = https://gstreamer.freedesktop.org/bindings/cplusplus.html;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1w674rbwbhpirq70gp9rk6p068j36rwn112fx3nz613wgw63x84m";
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://herqq.org;
|
||||
description = "A software library for building UPnP devices and control points";
|
||||
inherit (qt5.qtbase.meta) platforms;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,12 @@ stdenv.mkDerivation rec {
|
|||
make all leveldbutil libmemenv.a
|
||||
'';
|
||||
|
||||
installPhase = "
|
||||
installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
for file in *.dylib*; do
|
||||
install_name_tool -id $out/lib/$file $file
|
||||
done
|
||||
'') + # XXX consider removing above after transition to cmake in the next release
|
||||
"
|
||||
mkdir -p $out/{bin,lib,include}
|
||||
|
||||
cp -r include $out
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libESMTP-${version}";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2";
|
||||
sha256 = "02zbniyz7qys1jmx3ghx21kxmns1wc3hmv80gp7ag7yra9f1m9nh";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://brianstafford.info/libesmtp/index.html;
|
||||
description = "A Library for Posting Electronic Mail";
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, findutils
|
||||
{ stdenv, fetchurl, findutils, fixDarwinDylibNames
|
||||
, sslSupport? true, openssl
|
||||
}:
|
||||
|
||||
|
|
@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = []
|
||||
++ stdenv.lib.optional sslSupport openssl
|
||||
++ stdenv.lib.optional stdenv.isCygwin findutils
|
||||
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames
|
||||
;
|
||||
|
||||
postInstall = stdenv.lib.optionalString sslSupport ''
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec
|
|||
LOG4CPLUS_LIB=
|
||||
BLOSC_INCLUDE_DIR=${c-blosc}/include/
|
||||
BLOSC_LIB_DIR=${c-blosc}/lib/
|
||||
'';
|
||||
'';
|
||||
|
||||
installFlags = ''DESTDIR=$(out)'';
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ stdenv.mkDerivation rec
|
|||
description = "An open framework for voxel";
|
||||
homepage = "http://www.openvdb.org";
|
||||
maintainers = [ maintainers.guibou ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mpl20;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pugixml-${version}";
|
||||
version = "1.8.1";
|
||||
version = "1.9";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0fcgggry5x5bn0zhb09ij9hb0p45nb0sv0d9fw3cm1cf62hp9n80";
|
||||
sha256 = "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rdkafka-${version}";
|
||||
version = "0.11.3";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "edenhill";
|
||||
repo = "librdkafka";
|
||||
rev = "v${version}";
|
||||
sha256 = "17ghq0kzk2fdpxhr40xgg3s0p0n0gkvd0d85c6jsww3mj8v5xd14";
|
||||
sha256 = "11ps8sy4v8yvj4sha7d1q3rmhfw7l1rd52rnl01xam9862yasahs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@ stdenv.mkDerivation {
|
|||
homepage = http://diracvideo.org/;
|
||||
maintainers = [ maintainers.spwhitt ];
|
||||
license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ];
|
||||
platforms = platforms.unix;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
|
|||
algorithms. You can bring your creations to scale using the power of GPUs in the
|
||||
cloud or to the masses on mobile with Caffe2's cross-platform libraries.
|
||||
'';
|
||||
platforms = with stdenv.lib.platforms; linux ++ darwin;
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
|
||||
};
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue