Merge branch 'master' into staging
This commit is contained in:
Franz Pletz
commit
b116fa5ff2
@ -75,6 +75,7 @@
|
||||
berdario = "Dario Bertini <berdario@gmail.com>";
|
||||
bergey = "Daniel Bergey <bergey@teallabs.org>";
|
||||
bhipple = "Benjamin Hipple <bhipple@protonmail.com>";
|
||||
binarin = "Alexey Lebedeff <binarin@binarin.ru>";
|
||||
bjg = "Brian Gough <bjg@gnu.org>";
|
||||
bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
|
||||
bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
|
||||
@ -248,7 +249,7 @@
|
||||
jammerful = "jammerful <jammerful@gmail.com>";
|
||||
jansol = "Jan Solanti <jan.solanti@paivola.fi>";
|
||||
javaguirre = "Javier Aguirre <contacto@javaguirre.net>";
|
||||
jb55 = "William Casarin <bill@casarin.me>";
|
||||
jb55 = "William Casarin <jb55@jb55.com>";
|
||||
jbedo = "Justin Bedő <cu@cua0.org>";
|
||||
jcumming = "Jack Cummings <jack@mudshark.org>";
|
||||
jdagilliland = "Jason Gilliland <jdagilliland@gmail.com>";
|
||||
@ -291,6 +292,7 @@
|
||||
kierdavis = "Kier Davis <kierdavis@gmail.com>";
|
||||
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
|
||||
knedlsepp = "Josef Kemetmüller <josef.kemetmueller@gmail.com>";
|
||||
konimex = "Muhammad Herdiansyah <herdiansyah@openmailbox.org>";
|
||||
koral = "Koral <koral@mailoo.org>";
|
||||
kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
|
||||
kragniz = "Louis Taylor <louis@kragniz.eu>";
|
||||
|
||||
@ -157,6 +157,12 @@ rmdir /var/lib/ipfs/.ipfs
|
||||
module where user Fontconfig settings are available.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal>
|
||||
have therefore been removed.
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
</itemizedlist>
|
||||
|
||||
|
||||
@ -5,6 +5,52 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
randomEncryptionCoerce = enable: { inherit enable; };
|
||||
|
||||
randomEncryptionOpts = { ... }: {
|
||||
|
||||
options = {
|
||||
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = ''
|
||||
Encrypt swap device with a random key. This way you won't have a persistent swap device.
|
||||
|
||||
WARNING: Don't try to hibernate when you have at least one swap partition with
|
||||
this option enabled! We have no way to set the partition into which hibernation image
|
||||
is saved, so if your image ends up on an encrypted one you would lose it!
|
||||
|
||||
WARNING #2: Do not use /dev/disk/by-uuid/… or /dev/disk/by-label/… as your swap device
|
||||
when using randomEncryption as the UUIDs and labels will get erased on every boot when
|
||||
the partition is encrypted. Best to use /dev/disk/by-partuuid/…
|
||||
'';
|
||||
};
|
||||
|
||||
cipher = mkOption {
|
||||
default = "aes-xts-plain64";
|
||||
example = "serpent-xts-plain64";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Use specified cipher for randomEncryption.
|
||||
|
||||
Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine.
|
||||
'';
|
||||
};
|
||||
|
||||
source = mkOption {
|
||||
default = "/dev/urandom";
|
||||
example = "/dev/random";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Define the source of randomness to obtain a random key for encryption.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
swapCfg = {config, options, ...}: {
|
||||
|
||||
options = {
|
||||
@ -47,10 +93,17 @@ let
|
||||
|
||||
randomEncryption = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
example = {
|
||||
enable = true;
|
||||
cipher = "serpent-xts-plain64";
|
||||
source = "/dev/random";
|
||||
};
|
||||
type = types.coercedTo types.bool randomEncryptionCoerce (types.submodule randomEncryptionOpts);
|
||||
description = ''
|
||||
Encrypt swap device with a random key. This way you won't have a persistent swap device.
|
||||
|
||||
HINT: run "cryptsetup benchmark" to test cipher performance on your machine.
|
||||
|
||||
WARNING: Don't try to hibernate when you have at least one swap partition with
|
||||
this option enabled! We have no way to set the partition into which hibernation image
|
||||
is saved, so if your image ends up on an encrypted one you would lose it!
|
||||
@ -77,7 +130,7 @@ let
|
||||
device = mkIf options.label.isDefined
|
||||
"/dev/disk/by-label/${config.label}";
|
||||
deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device);
|
||||
realDevice = if config.randomEncryption then "/dev/mapper/${deviceName}" else config.device;
|
||||
realDevice = if config.randomEncryption.enable then "/dev/mapper/${deviceName}" else config.device;
|
||||
};
|
||||
|
||||
};
|
||||
@ -125,14 +178,14 @@ in
|
||||
|
||||
createSwapDevice = sw:
|
||||
assert sw.device != "";
|
||||
assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-uuid" sw.device);
|
||||
assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-label" sw.device);
|
||||
assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-uuid" sw.device);
|
||||
assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-label" sw.device);
|
||||
let realDevice' = escapeSystemdPath sw.realDevice;
|
||||
in nameValuePair "mkswap-${sw.deviceName}"
|
||||
{ description = "Initialisation of swap device ${sw.device}";
|
||||
wantedBy = [ "${realDevice'}.swap" ];
|
||||
before = [ "${realDevice'}.swap" ];
|
||||
path = [ pkgs.utillinux ] ++ optional sw.randomEncryption pkgs.cryptsetup;
|
||||
path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
|
||||
|
||||
script =
|
||||
''
|
||||
@ -145,11 +198,11 @@ in
|
||||
truncate --size "${toString sw.size}M" "${sw.device}"
|
||||
fi
|
||||
chmod 0600 ${sw.device}
|
||||
${optionalString (!sw.randomEncryption) "mkswap ${sw.realDevice}"}
|
||||
${optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"}
|
||||
fi
|
||||
''}
|
||||
${optionalString sw.randomEncryption ''
|
||||
cryptsetup open ${sw.device} ${sw.deviceName} --type plain --key-file /dev/urandom
|
||||
${optionalString sw.randomEncryption.enable ''
|
||||
cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName}
|
||||
mkswap ${sw.realDevice}
|
||||
''}
|
||||
'';
|
||||
@ -157,12 +210,12 @@ in
|
||||
unitConfig.RequiresMountsFor = [ "${dirOf sw.device}" ];
|
||||
unitConfig.DefaultDependencies = false; # needed to prevent a cycle
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.RemainAfterExit = sw.randomEncryption;
|
||||
serviceConfig.ExecStop = optionalString sw.randomEncryption "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
|
||||
serviceConfig.RemainAfterExit = sw.randomEncryption.enable;
|
||||
serviceConfig.ExecStop = optionalString sw.randomEncryption.enable "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
|
||||
restartIfChanged = false;
|
||||
};
|
||||
|
||||
in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption) config.swapDevices));
|
||||
in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption.enable) config.swapDevices));
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
with lib;
|
||||
|
||||
{
|
||||
meta.maintainers = [ maintainers.grahamc ];
|
||||
meta.maintainers = with maintainers; [ grahamc ];
|
||||
options = {
|
||||
|
||||
hardware.mcelog = {
|
||||
@ -19,19 +19,17 @@ with lib;
|
||||
};
|
||||
|
||||
config = mkIf config.hardware.mcelog.enable {
|
||||
systemd.services.mcelog = {
|
||||
description = "Machine Check Exception Logging Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
systemd = {
|
||||
packages = [ pkgs.mcelog ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.mcelog}/bin/mcelog --daemon --foreground";
|
||||
SuccessExitStatus = [ 0 15 ];
|
||||
|
||||
ProtectHome = true;
|
||||
PrivateNetwork = true;
|
||||
PrivateTmp = true;
|
||||
services.mcelog = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig = {
|
||||
ProtectHome = true;
|
||||
PrivateNetwork = true;
|
||||
PrivateTmp = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -204,6 +204,7 @@ with lib;
|
||||
"Set the option `services.xserver.displayManager.sddm.package' instead.")
|
||||
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
|
||||
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
|
||||
(mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default")
|
||||
|
||||
# ZSH
|
||||
(mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
|
||||
|
||||
@ -108,7 +108,7 @@ in
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}";
|
||||
ExecStart = "${mongodb}/bin/mongod --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}";
|
||||
User = cfg.user;
|
||||
PIDFile = cfg.pidFile;
|
||||
Type = "forking";
|
||||
|
||||
@ -243,7 +243,7 @@ in
|
||||
preStart = ''
|
||||
if [ ! -d ${lib.escapeShellArg nodedir} ]; then
|
||||
mkdir -p /var/db/tahoe-lafs
|
||||
tahoe create-introducer "${lib.escapeShellArg nodedir}
|
||||
tahoe create-introducer ${lib.escapeShellArg nodedir}
|
||||
fi
|
||||
|
||||
# Tahoe has created a predefined tahoe.cfg which we must now
|
||||
|
||||
@ -169,7 +169,8 @@ in
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
PIDFile = "/run/tinc.${network}.pid";
|
||||
Restart = "on-failure";
|
||||
Restart = "always";
|
||||
RestartSec = "3";
|
||||
};
|
||||
preStart = ''
|
||||
mkdir -p /etc/tinc/${network}/hosts
|
||||
|
||||
@ -648,51 +648,11 @@ in
|
||||
|
||||
services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
|
||||
|
||||
system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" {
|
||||
inherit (cfg) layout xkbDir;
|
||||
system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" {
|
||||
inherit (cfg) xkbModel layout xkbVariant xkbOptions;
|
||||
nativeBuildInputs = [ pkgs.xkbvalidate ];
|
||||
} ''
|
||||
# We can use the default IFS here, because the layouts won't contain
|
||||
# spaces or tabs and are ruled out by the sed expression below.
|
||||
availableLayouts="$(
|
||||
sed -n -e ':i /^! \(layout\|variant\) *$/ {
|
||||
# Loop through all of the layouts/variants until we hit another ! at
|
||||
# the start of the line or the line is empty ('t' branches only if
|
||||
# the last substitution was successful, so if the line is empty the
|
||||
# substition will fail).
|
||||
:l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl
|
||||
}' "$xkbDir/rules/base.lst" | sort -u
|
||||
)"
|
||||
|
||||
layoutNotFound() {
|
||||
echo >&2
|
||||
echo "The following layouts and variants are available:" >&2
|
||||
echo >&2
|
||||
|
||||
# While an output width of 80 is more desirable for small terminals, we
|
||||
# really don't know the amount of columns of the terminal from within
|
||||
# the builder. The content in $availableLayouts however is pretty
|
||||
# large, so let's opt for a larger width here, because it will print a
|
||||
# smaller amount of lines on modern KMS/framebuffer terminals and won't
|
||||
# lose information even in smaller terminals (it only will look a bit
|
||||
# ugly).
|
||||
echo "$availableLayouts" | ${pkgs.utillinux}/bin/column -c 150 >&2
|
||||
|
||||
echo >&2
|
||||
echo "However, the keyboard layout definition in" \
|
||||
"\`services.xserver.layout' contains the layout \`$1', which" \
|
||||
"isn't a valid layout or variant." >&2
|
||||
echo >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Again, we don't need to take care of IFS, see the comment for
|
||||
# $availableLayouts.
|
||||
for l in ''${layout//,/ }; do
|
||||
if ! echo "$availableLayouts" | grep -qxF "$l"; then
|
||||
layoutNotFound "$l"
|
||||
fi
|
||||
done
|
||||
|
||||
validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
|
||||
touch "$out"
|
||||
'');
|
||||
|
||||
|
||||
@ -207,7 +207,7 @@ let
|
||||
preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules;
|
||||
|
||||
resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
|
||||
(filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption
|
||||
(filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable
|
||||
# Don't include zram devices
|
||||
&& !(hasPrefix "/dev/zram" sd.device)
|
||||
) config.swapDevices);
|
||||
|
||||
@ -24,11 +24,7 @@ let
|
||||
|
||||
kernel = config.boot.kernelPackages;
|
||||
|
||||
packages = if config.boot.zfs.enableUnstable then {
|
||||
spl = kernel.splUnstable;
|
||||
zfs = kernel.zfsUnstable;
|
||||
zfsUser = pkgs.zfsUnstable;
|
||||
} else {
|
||||
packages = {
|
||||
spl = kernel.spl;
|
||||
zfs = kernel.zfs;
|
||||
zfsUser = pkgs.zfs;
|
||||
@ -62,19 +58,6 @@ in
|
||||
|
||||
options = {
|
||||
boot.zfs = {
|
||||
enableUnstable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Use the unstable zfs package. This might be an option, if the latest
|
||||
kernel is not yet supported by a published release of ZFS. Enabling
|
||||
this option will install a development version of ZFS on Linux. The
|
||||
version will have already passed an extensive test suite, but it is
|
||||
more likely to hit an undiscovered bug compared to running a released
|
||||
version of ZFS on Linux.
|
||||
'';
|
||||
};
|
||||
|
||||
extraPools = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "svox-${version}";
|
||||
version = "2016-10-20";
|
||||
version = "2017-07-18";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://android.googlesource.com/platform/external/svox";
|
||||
rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d";
|
||||
sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g";
|
||||
rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb";
|
||||
sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -27,12 +27,12 @@ in rec {
|
||||
|
||||
preview = mkStudio rec {
|
||||
pname = "android-studio-preview";
|
||||
version = "3.0.0.6";
|
||||
build = "171.4182969";
|
||||
version = "3.0.0.7"; # This is actually "Android Studio 3.0 Canary 8"
|
||||
build = "171.4195411";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
|
||||
sha256 = "0s26k5qr0qg6az77yw2mvnhavwi4aza4ifvd45ljank8aqr6sp5i";
|
||||
sha256 = "1yzhr845shjq2cd5hcanppxmnj34ky9ry755y4ywf5f1w5ha5xzj";
|
||||
};
|
||||
|
||||
meta = stable.meta // {
|
||||
|
||||
@ -106,16 +106,16 @@ rec {
|
||||
|
||||
anyedittools = buildEclipsePlugin rec {
|
||||
name = "anyedit-${version}";
|
||||
version = "2.6.0.201511291145";
|
||||
version = "2.7.0.201705171641";
|
||||
|
||||
srcFeature = fetchurl {
|
||||
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
|
||||
sha256 = "1vllci75qcd28b6hn2jz29l6cabxx9ql5i6l9cwq9rxp49dhc96b";
|
||||
sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
|
||||
};
|
||||
|
||||
srcPlugin = fetchurl {
|
||||
url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.6.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
|
||||
sha256 = "0mgq0ylfa7srjf7azyx0kbahlsjf0sdpazqphzx4f0bfn1l328s4";
|
||||
url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
|
||||
sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -175,10 +175,10 @@
|
||||
}) {};
|
||||
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "auctex";
|
||||
version = "11.90.2";
|
||||
version = "11.91.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar";
|
||||
sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6";
|
||||
url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar";
|
||||
sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -930,10 +930,10 @@
|
||||
hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "hydra";
|
||||
version = "0.13.5";
|
||||
version = "0.14.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/hydra-0.13.5.tar";
|
||||
sha256 = "0vq1pjyq6ddbikbh0vzdigbs0zlldgwad0192s7v9npg8qlwi668";
|
||||
url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar";
|
||||
sha256 = "1r2vl2cpzqzayfzc0bijigxc7c0mkgcv96g4p65gnw99jk8d78kb";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -1023,10 +1023,10 @@
|
||||
js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "js2-mode";
|
||||
version = "20170116";
|
||||
version = "20170721";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar";
|
||||
sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk";
|
||||
url = "https://elpa.gnu.org/packages/js2-mode-20170721.tar";
|
||||
sha256 = "02w2hgk8qbmwkksqf1dmslpr3xn9zjp3srl3qh8730w8r8s8czni";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1446,10 +1446,10 @@
|
||||
}) {};
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20170717";
|
||||
version = "20170724";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-20170717.tar";
|
||||
sha256 = "0jrkfclwlbfcdkf56awnmvyw5vb9qwbfyyf2z4ilwx29zps9mxnh";
|
||||
url = "https://elpa.gnu.org/packages/org-20170724.tar";
|
||||
sha256 = "1f1szds6642427hrzagxgkr05z66sf57n5l2acvmpgw4z358ms0n";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1785,10 +1785,10 @@
|
||||
}) {};
|
||||
sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "sokoban";
|
||||
version = "1.4.2";
|
||||
version = "1.4.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/sokoban-1.4.2.tar";
|
||||
sha256 = "0sciv7rl1p1ar1jris1py2slrd8kr4q6a4plmb0jq6lv9dlqyvc6";
|
||||
url = "https://elpa.gnu.org/packages/sokoban-1.4.4.tar";
|
||||
sha256 = "0lz0qxgs71yh23iayv50rb6qgqvgbz2bg2sgfxcps8wag643ns20";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2198,10 +2198,10 @@
|
||||
yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "yasnippet";
|
||||
version = "0.11.0";
|
||||
version = "0.12.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar";
|
||||
sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y";
|
||||
url = "https://elpa.gnu.org/packages/yasnippet-0.12.1.tar";
|
||||
sha256 = "01q1hn3w8w63s7cvr9bq6l5n4nyirnk8qfba60ajp3j6ndi2964n";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -20,6 +20,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "a";
|
||||
version = "0.1.0alpha4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "plexus";
|
||||
repo = "a.el";
|
||||
rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
|
||||
sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
|
||||
sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
|
||||
name = "a";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/a";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
|
||||
melpaBuild {
|
||||
pname = "aa-edit-mode";
|
||||
@ -590,12 +611,12 @@
|
||||
ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
|
||||
melpaBuild {
|
||||
pname = "ac-rtags";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Andersbakken";
|
||||
repo = "rtags";
|
||||
rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
|
||||
sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
|
||||
rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
|
||||
sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
|
||||
@ -2809,12 +2830,12 @@
|
||||
binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "binclock";
|
||||
version = "1.10";
|
||||
version = "1.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "davep";
|
||||
repo = "binclock.el";
|
||||
rev = "2e529ace67a04e6872a2328769782ef33b0e463a";
|
||||
sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns";
|
||||
rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876";
|
||||
sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
|
||||
@ -4132,12 +4153,12 @@
|
||||
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
|
||||
melpaBuild {
|
||||
pname = "cider";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "clojure-emacs";
|
||||
repo = "cider";
|
||||
rev = "f3c396ff8cf4baf331b0e19e18e33b795b66ee3e";
|
||||
sha256 = "1np4bh7fxv6xkvdg1nyd596p2yjkrh5msw2wsfyidl0xb1jdnj9c";
|
||||
rev = "e503f5628ef98bd768f08c698863e8e33a7af3b4";
|
||||
sha256 = "1bb0l06af7k7zzsig8kmn71krbm9mwdj7dc0s17rbhnm84cdfc8b";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
|
||||
@ -4606,12 +4627,12 @@
|
||||
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "cmake-mode";
|
||||
version = "3.9.0pre6";
|
||||
version = "3.9.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kitware";
|
||||
repo = "CMake";
|
||||
rev = "25b72e9097260d1faf254155a1199886c808a58f";
|
||||
sha256 = "0rzy8fpagsqfln1x27mq89dh819jc8h2dlf7axmxq63g830c029q";
|
||||
rev = "f15cfd891d1e01247ed285320ae32b6c3182ac8f";
|
||||
sha256 = "0asp6kijrmf9bayg8jvhgkd1z2falzhyippkwgih9ygpa65qvqpq";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
|
||||
@ -5305,12 +5326,12 @@
|
||||
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
|
||||
melpaBuild {
|
||||
pname = "company-rtags";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Andersbakken";
|
||||
repo = "rtags";
|
||||
rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
|
||||
sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
|
||||
rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
|
||||
sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
|
||||
@ -5872,12 +5893,12 @@
|
||||
cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "cricbuzz";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lepisma";
|
||||
repo = "cricbuzz.el";
|
||||
rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
|
||||
sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
|
||||
rev = "05087b0f6d5a941b5ec18acc8bcf20efd6d71568";
|
||||
sha256 = "1zin191dcr6qli2cwgf6jjz2dvlxiaranglpc5365bkkvwb5f250";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
|
||||
@ -5977,16 +5998,16 @@
|
||||
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
|
||||
melpaBuild {
|
||||
pname = "csound-mode";
|
||||
version = "0.1";
|
||||
version = "0.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hlolli";
|
||||
repo = "csound-mode";
|
||||
rev = "b0e74f149a15118e8d85bf073b2ff5e0dd3cba7f";
|
||||
sha256 = "0c73xjhqgp1f7bplm47cgpssm8kpj3vda9n0fqcyq5i38ncfqwva";
|
||||
rev = "e3fbb1fecd730fd66893cadf41c2cb8c2d9c1685";
|
||||
sha256 = "105hhn5f5ml32i3iwrm2d2ikx9lb96m3lsg9v9i72713mayvkqan";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
|
||||
sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/95ccfae76a2c0f627f6d218ca68072e79fcfd088/recipes/csound-mode";
|
||||
sha256 = "15zmgsh1071cyd9a0d7cljq8k7d8l2gkjjpv8z22gnm0wfbb0yys";
|
||||
name = "csound-mode";
|
||||
};
|
||||
packageRequires = [ emacs multi shut-up ];
|
||||
@ -6166,12 +6187,12 @@
|
||||
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "cython-mode";
|
||||
version = "0.26pre1";
|
||||
version = "0.26";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cython";
|
||||
repo = "cython";
|
||||
rev = "85a2dfe76a2bc28d4c8c1a760ef04e614f61be73";
|
||||
sha256 = "0gcdwzw952kddvxxgzsj93rqlvh2gs8bghz605zgm97baadvrizy";
|
||||
rev = "62f04f6766386893f5da6bee23d4de1e92a4148d";
|
||||
sha256 = "0rw22qa67ifrw7kd58wjs2bnrjzkpr75k1rbhdgba526mm4s0q0x";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
|
||||
@ -7302,6 +7323,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "docker-compose-mode";
|
||||
version = "0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "meqif";
|
||||
repo = "docker-compose-mode";
|
||||
rev = "85cf81d2964c7b721a7f1317cf9efd5bf3a7f671";
|
||||
sha256 = "1l0pcmjhvayfx1hn4125ilhr3lb4rzhrqrf91lnkh7m1rv3npcik";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
|
||||
sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
|
||||
name = "docker-compose-mode";
|
||||
};
|
||||
packageRequires = [ dash emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/docker-compose-mode";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "docker-tramp";
|
||||
@ -7808,12 +7850,12 @@
|
||||
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "easy-hugo";
|
||||
version = "1.0.0";
|
||||
version = "1.3.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "masasam";
|
||||
repo = "emacs-easy-hugo";
|
||||
rev = "226fa5c661391c7f8317a24c9f757396e1900371";
|
||||
sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
|
||||
rev = "468352a0a813c5ce8edba71c82f00e24b516d74c";
|
||||
sha256 = "0sryibflylwy8pqp80xyxmdndk2idcgpgk9zxixwpim3mcwn78yl";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
|
||||
@ -8457,12 +8499,12 @@
|
||||
el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "el-patch";
|
||||
version = "1.1.2";
|
||||
version = "1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "raxod502";
|
||||
repo = "el-patch";
|
||||
rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c";
|
||||
sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp";
|
||||
rev = "cc26f37e19ebc60ca75067115d3794cda88003c5";
|
||||
sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
|
||||
@ -10599,12 +10641,12 @@
|
||||
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "evil-matchit";
|
||||
version = "2.2.2";
|
||||
version = "2.2.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redguardtoo";
|
||||
repo = "evil-matchit";
|
||||
rev = "0b0e6d61a6462fc6fff7000b739ce5b31acd0d4c";
|
||||
sha256 = "13qxsbvmi0dkzmf59j0xyjwwcspyhymm6swsagqy4b57ypis5hxh";
|
||||
rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
|
||||
sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
|
||||
@ -11522,12 +11564,12 @@
|
||||
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "find-file-in-project";
|
||||
version = "5.3.2";
|
||||
version = "5.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "technomancy";
|
||||
repo = "find-file-in-project";
|
||||
rev = "99801cd730d579ed3b05d084ad254b6a73b259aa";
|
||||
sha256 = "0pqg6iib5ns6k5is0bv8riwficadi64dinzdjibk94h8i7cmp54h";
|
||||
rev = "2d3e8d095e0c36f927142e80c4330977be698568";
|
||||
sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
|
||||
@ -11781,12 +11823,12 @@
|
||||
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "floobits";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Floobits";
|
||||
repo = "floobits-emacs";
|
||||
rev = "fdac635ecc57ac7743f74678147aca2e956561de";
|
||||
sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
|
||||
rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0";
|
||||
sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
|
||||
@ -12348,12 +12390,12 @@
|
||||
flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
|
||||
melpaBuild {
|
||||
pname = "flycheck-rtags";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Andersbakken";
|
||||
repo = "rtags";
|
||||
rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
|
||||
sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
|
||||
rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
|
||||
sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
|
||||
@ -13782,12 +13824,12 @@
|
||||
ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ghc";
|
||||
version = "5.7.0.0";
|
||||
version = "5.8.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielG";
|
||||
repo = "ghc-mod";
|
||||
rev = "c3d0a681a19261817cf928685f7b96878fe51e91";
|
||||
sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3";
|
||||
rev = "35690941aadbe44d9401102ab44a39753e0bb2b5";
|
||||
sha256 = "0fcaxj2lhkhkm2h91d9fdqas2b99wblwl74l2y6ckpf05hrc4w1q";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
|
||||
@ -16394,12 +16436,12 @@
|
||||
helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-dash";
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "areina";
|
||||
repo = "helm-dash";
|
||||
rev = "a0f5d6539da873cd0c51d8ef714930c970a66aa0";
|
||||
sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
|
||||
rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
|
||||
sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
|
||||
@ -17339,12 +17381,12 @@
|
||||
helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
|
||||
melpaBuild {
|
||||
pname = "helm-rtags";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Andersbakken";
|
||||
repo = "rtags";
|
||||
rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
|
||||
sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
|
||||
rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
|
||||
sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
|
||||
@ -18305,12 +18347,12 @@
|
||||
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "hydra";
|
||||
version = "0.13.6";
|
||||
version = "0.14.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "abo-abo";
|
||||
repo = "hydra";
|
||||
rev = "91f8e7c13bcd9629ad1678588e58576ca6806b58";
|
||||
sha256 = "1czdar4yv5c9996wvj887d0c1knlrpcjj0aq2dily2x074gdzh4j";
|
||||
rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
|
||||
sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
|
||||
@ -19522,12 +19564,12 @@
|
||||
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ivy-erlang-complete";
|
||||
version = "0.2.4";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "s-kostyaev";
|
||||
repo = "ivy-erlang-complete";
|
||||
rev = "117369f882f81fb9cc88459a4072a2789138c136";
|
||||
sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f";
|
||||
rev = "acd6322571cb0820868a6febdc5326782a29b729";
|
||||
sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
|
||||
@ -19627,12 +19669,12 @@
|
||||
ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
|
||||
melpaBuild {
|
||||
pname = "ivy-rtags";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Andersbakken";
|
||||
repo = "rtags";
|
||||
rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
|
||||
sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
|
||||
rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
|
||||
sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
|
||||
@ -20045,12 +20087,12 @@
|
||||
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "js2-mode";
|
||||
version = "20170116";
|
||||
version = "20170721";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mooz";
|
||||
repo = "js2-mode";
|
||||
rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236";
|
||||
sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g";
|
||||
rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc";
|
||||
sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
|
||||
@ -20738,12 +20780,12 @@
|
||||
ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ksp-cfg-mode";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "lashtear";
|
||||
repo = "ksp-cfg-mode";
|
||||
rev = "07a957512e66030e1b9f8ac0f259051386acb5b5";
|
||||
sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
|
||||
rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
|
||||
sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
|
||||
@ -21603,6 +21645,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "mac-pseudo-daemon";
|
||||
version = "2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarwinAwardWinner";
|
||||
repo = "osx-pseudo-daemon";
|
||||
rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
|
||||
sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
|
||||
sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6";
|
||||
name = "mac-pseudo-daemon";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/mac-pseudo-daemon";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "macro-math";
|
||||
@ -22481,12 +22544,12 @@
|
||||
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
|
||||
melpaBuild {
|
||||
pname = "meghanada";
|
||||
version = "0.8.2";
|
||||
version = "0.8.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopemope";
|
||||
repo = "meghanada-emacs";
|
||||
rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
|
||||
sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
|
||||
rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
|
||||
sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
|
||||
@ -22520,6 +22583,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "memoize";
|
||||
version = "1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "emacs-memoize";
|
||||
rev = "636defefa9168f90bce6fc27431352ac7d01a890";
|
||||
sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
|
||||
sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
|
||||
name = "memoize";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/memoize";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
|
||||
melpaBuild {
|
||||
pname = "mentor";
|
||||
@ -22544,7 +22628,7 @@
|
||||
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "merlin";
|
||||
version = "2.5.5";
|
||||
version = "3.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-lambda-church";
|
||||
repo = "merlin";
|
||||
@ -23971,12 +24055,12 @@
|
||||
nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "nix-mode";
|
||||
version = "1.11.12";
|
||||
version = "1.11.13";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "04e071a5e4cdf7f5396a0e36874e0a023b7af232";
|
||||
sha256 = "1hzp70sm4bwlbqnd7mmzan10wsgb03a1zfiqmwxnc61jgjxd5jva";
|
||||
rev = "0ec723375bc6008a8a88024962b052c3fbbaf4b8";
|
||||
sha256 = "1wg622s0qvgdzry4mb6a7jjpql7la58kwhzpif0akyd689xf9d9s";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
|
||||
@ -24055,12 +24139,12 @@
|
||||
nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "nodejs-repl";
|
||||
version = "0.1.1";
|
||||
version = "0.1.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "abicky";
|
||||
repo = "nodejs-repl.el";
|
||||
rev = "d821ef49a8eae0e405fd2a000246f0475542a575";
|
||||
sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy";
|
||||
rev = "16770656a4072f8fbbd29d0cace4893a3d5541b1";
|
||||
sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
|
||||
@ -24769,8 +24853,8 @@
|
||||
src = fetchFromGitHub {
|
||||
owner = "OmniSharp";
|
||||
repo = "omnisharp-emacs";
|
||||
rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
|
||||
sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
|
||||
rev = "ad147956b936fd528d26ca88158a8af96ff5827a";
|
||||
sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
|
||||
@ -26147,6 +26231,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "osx-pseudo-daemon";
|
||||
version = "2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarwinAwardWinner";
|
||||
repo = "osx-pseudo-daemon";
|
||||
rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
|
||||
sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
|
||||
sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw";
|
||||
name = "osx-pseudo-daemon";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/osx-pseudo-daemon";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "osx-trash";
|
||||
@ -26570,12 +26675,12 @@
|
||||
pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "pandoc-mode";
|
||||
version = "2.22";
|
||||
version = "2.23";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joostkremers";
|
||||
repo = "pandoc-mode";
|
||||
rev = "b4e03ab345043fa7447dd59e59234dd33395e3cc";
|
||||
sha256 = "08yxi878l1hibcsq0bb93g2rjwlc0xw415rgn1rzs3zib2hqj1qc";
|
||||
rev = "58f893d54c0916ad832097a579288ef8ce405da5";
|
||||
sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
|
||||
@ -29878,6 +29983,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "rib-mode";
|
||||
version = "1.0.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "blezek";
|
||||
repo = "rib-mode";
|
||||
rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866";
|
||||
sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
|
||||
sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
|
||||
name = "rib-mode";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/rib-mode";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "rich-minority";
|
||||
@ -30112,12 +30238,12 @@
|
||||
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "rtags";
|
||||
version = "2.10";
|
||||
version = "2.11";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Andersbakken";
|
||||
repo = "rtags";
|
||||
rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
|
||||
sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
|
||||
rev = "942ae6faa64ab6de73d093e628bc5b036f1a967c";
|
||||
sha256 = "19ljfz95jwbgw35d3y0m0p3l4as5llwvc6q3v2jlv3xl3ihpd923";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
|
||||
@ -30172,6 +30298,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ruby-electric";
|
||||
version = "2.2.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "knu";
|
||||
repo = "ruby-electric.el";
|
||||
rev = "dfb4b448a63ae749c74edf6415ad569d52cab904";
|
||||
sha256 = "0z3whvjmxbyk7lrxl3z2lj1skacwd050b5jvpnw6gcdm2hr8mfbs";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
|
||||
sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
|
||||
name = "ruby-electric";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/ruby-electric";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ruby-end";
|
||||
@ -30698,12 +30845,12 @@
|
||||
sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
|
||||
melpaBuild {
|
||||
pname = "sekka";
|
||||
version = "1.6.6";
|
||||
version = "1.7.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiyoka";
|
||||
repo = "sekka";
|
||||
rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916";
|
||||
sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7";
|
||||
rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937";
|
||||
sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
|
||||
@ -32039,6 +32186,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "solaire-mode";
|
||||
version = "1.0.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hlissner";
|
||||
repo = "emacs-solaire-mode";
|
||||
rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358";
|
||||
sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
|
||||
sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5";
|
||||
name = "solaire-mode";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/solaire-mode";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "solarized-theme";
|
||||
@ -32567,12 +32735,12 @@
|
||||
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ssh-deploy";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cjohansson";
|
||||
repo = "emacs-ssh-deploy";
|
||||
rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114";
|
||||
sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
|
||||
rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
|
||||
sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
|
||||
@ -36057,8 +36225,8 @@
|
||||
version = "0.9.1";
|
||||
src = fetchhg {
|
||||
url = "https://bitbucket.com/ArneBab/wisp";
|
||||
rev = "f94ec5fed665";
|
||||
sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n";
|
||||
rev = "1ab8f296baeb";
|
||||
sha256 = "02g34b7kp3lkv4sfgf1762vlmmsnxib37v8385lmv90ww24lwggg";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
|
||||
@ -36113,6 +36281,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
|
||||
melpaBuild {
|
||||
pname = "with-simulated-input";
|
||||
version = "2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DarwinAwardWinner";
|
||||
repo = "with-simulated-input";
|
||||
rev = "568bfb8e1d59a19cb309fd72a7ab0e9e51229e31";
|
||||
sha256 = "1aa8ya5yzsijra7cf9rm80ffddv520kzm9rggw3nr3dj2sk03p8c";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
|
||||
sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
|
||||
name = "with-simulated-input";
|
||||
};
|
||||
packageRequires = [ emacs s seq ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/with-simulated-input";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "wn-mode";
|
||||
@ -36683,12 +36872,12 @@
|
||||
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "yasnippet";
|
||||
version = "0.11.0";
|
||||
version = "0.12.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joaotavora";
|
||||
repo = "yasnippet";
|
||||
rev = "e6b865127783f498b61fa99ad0f5413200ac09d0";
|
||||
sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9";
|
||||
rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5";
|
||||
sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
|
||||
@ -36727,8 +36916,8 @@
|
||||
version = "1.78";
|
||||
src = fetchhg {
|
||||
url = "https://www.yatex.org/hgrepos/yatex/";
|
||||
rev = "e9299b77df1f";
|
||||
sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
|
||||
rev = "4f8551386af2";
|
||||
sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ callPackage }: {
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20170717";
|
||||
version = "20170724";
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/elpa/org-20170717.tar";
|
||||
sha256 = "1cbk01awnyan1jap184v2bxsk97k0p2qn19z7gnid6wiblybgs89";
|
||||
url = "http://orgmode.org/elpa/org-20170724.tar";
|
||||
sha256 = "07rpr8zf12c62sfbk9c9lvvfphs3ws136d3vlnq6j7gypdzyb32m";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -14,10 +14,10 @@
|
||||
}) {};
|
||||
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
version = "20170717";
|
||||
version = "20170724";
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/elpa/org-plus-contrib-20170717.tar";
|
||||
sha256 = "0710ba6gq04cg8d87b5wi7bz9gq9yqvqmkmgscawfm2ynfw2q8sa";
|
||||
url = "http://orgmode.org/elpa/org-plus-contrib-20170724.tar";
|
||||
sha256 = "12xgvdmpz6wnylcvfngh7lqvgs9wv1bdrm7l7fivakx8y3dyq7k7";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
@ -2,20 +2,20 @@
|
||||
|
||||
mkDerivation rec {
|
||||
name = "cura-${version}";
|
||||
version = "2.4.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "Cura";
|
||||
rev = version;
|
||||
sha256 = "04iglmjg9rzmlfrll6g7bcckkla327938xh8qmbdfrh215aivdlp";
|
||||
sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
|
||||
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
|
||||
|
||||
cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ];
|
||||
cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "curaengine-${version}";
|
||||
version = "2.4.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "CuraEngine";
|
||||
rev = version;
|
||||
sha256 = "1n587cqm310kzb2zbc31199x7ybgxzjq91hslb1zcb8qg8qqmixm";
|
||||
sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
15
pkgs/applications/misc/ephemeralpg/default.nix
Normal file
15
pkgs/applications/misc/ephemeralpg/default.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{ stdenv, fetchurl, postgresql, makeWrapper }:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ephemeralpg-${version}";
|
||||
version = "2.2";
|
||||
src = fetchurl {
|
||||
url = "http://ephemeralpg.org/code/${name}.tar.gz";
|
||||
sha256 = "1v48bcmc23zzqbha80p3spxd5l347qnjzs4z44wl80i2s8fdzlyz";
|
||||
};
|
||||
buildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
PREFIX=$out make install
|
||||
wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin
|
||||
'';
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "josm-${version}";
|
||||
version = "12275";
|
||||
version = "12450";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
|
||||
sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a";
|
||||
sha256 = "1l817mclbzyin9yh16q9jcqi31cz0qy6yi31hc8jp5ablknk979j";
|
||||
};
|
||||
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
@ -54,13 +54,13 @@ let
|
||||
|
||||
in pythonPackages.buildPythonApplication rec {
|
||||
name = "OctoPrint-${version}";
|
||||
version = "1.3.2";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "foosel";
|
||||
repo = "OctoPrint";
|
||||
rev = version;
|
||||
sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk";
|
||||
sha256 = "06l8khbq3waaaa4cqpv6056w1ziylkfgzlb28v30i1h234rlkknq";
|
||||
};
|
||||
|
||||
# We need old Tornado
|
||||
@ -69,7 +69,7 @@ in pythonPackages.buildPythonApplication rec {
|
||||
semantic-version flask_principal werkzeug flaskbabel tornado
|
||||
psutil pyserial flask_login netaddr markdown sockjs-tornado
|
||||
pylru pyyaml sarge feedparser netifaces click websocket_client
|
||||
scandir chainmap future
|
||||
scandir chainmap future dateutil
|
||||
];
|
||||
|
||||
buildInputs = with pythonPackages; [ nose mock ddt ];
|
||||
@ -90,6 +90,7 @@ in pythonPackages.buildPythonApplication rec {
|
||||
-e 's,werkzeug>=[^"]*,werkzeug,g' \
|
||||
-e 's,psutil>=[^"]*,psutil,g' \
|
||||
-e 's,requests>=[^"]*,requests,g' \
|
||||
-e 's,future>=[^"]*,future,g' \
|
||||
setup.py
|
||||
'';
|
||||
|
||||
|
||||
@ -12,22 +12,17 @@ let
|
||||
|
||||
m33-fio = buildPlugin rec {
|
||||
name = "M33-Fio-${version}";
|
||||
version = "1.17";
|
||||
version = "1.20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "donovan6000";
|
||||
repo = "M33-Fio";
|
||||
rev = "V${version}";
|
||||
sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh";
|
||||
sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./m33-fio-one-library.patch
|
||||
# Fix incompatibility with new OctoPrint
|
||||
(fetchpatch {
|
||||
url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch";
|
||||
sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -69,13 +64,13 @@ let
|
||||
|
||||
stlviewer = buildPlugin rec {
|
||||
name = "OctoPrint-STLViewer-${version}";
|
||||
version = "0.3.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jneilliii";
|
||||
repo = "OctoPrint-STLViewer";
|
||||
rev = "v${version}";
|
||||
sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi";
|
||||
sha256 = "1f64s37g2d79g76v0vjnjrc2jp2gwrsnfgx7w3n0hkf1lz1pjkm0";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sakura-${version}";
|
||||
version = "3.3.4";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
|
||||
sha256 = "1fnkrkzf2ysav1ljgi4y4w8kvbwiwgmg1462xhizlla8jqa749r7";
|
||||
sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkgconfig ];
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
{ stdenv, fetchurl, libXv, libXi, libXrender, libXrandr, zlib, glib
|
||||
, libXext, libX11, libXScrnSaver, libSM, qt4, libICE, freetype, fontconfig
|
||||
, libpulseaudio, lib, ... }:
|
||||
|
||||
assert stdenv.system == "i686-linux";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "skype-4.3.0.37";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.skype.com/linux/${name}.tar.bz2";
|
||||
sha256 = "0bc9kck99rcsqzxzw3j6vnw5byvr8c9wixrx609zp255g0wxr6cc";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
stdenv.glibc
|
||||
stdenv.cc.cc
|
||||
libXv
|
||||
libXext
|
||||
libX11
|
||||
qt4
|
||||
libXScrnSaver
|
||||
libSM
|
||||
libICE
|
||||
libXi
|
||||
libXrender
|
||||
libXrandr
|
||||
libpulseaudio
|
||||
freetype
|
||||
fontconfig
|
||||
zlib
|
||||
glib
|
||||
];
|
||||
|
||||
phases = "unpackPhase installPhase";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{libexec/skype/,bin}
|
||||
cp -r * $out/libexec/skype/
|
||||
|
||||
# Fix execution on PaX-enabled kernels
|
||||
paxmark m $out/libexec/skype/skype
|
||||
|
||||
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype
|
||||
|
||||
cat > $out/bin/skype << EOF
|
||||
#!${stdenv.shell}
|
||||
export PULSE_LATENCY_MSEC=60 # workaround for pulseaudio glitches
|
||||
exec $out/libexec/skype/skype --resources=$out/libexec/skype "\$@"
|
||||
EOF
|
||||
|
||||
chmod +x $out/bin/skype
|
||||
|
||||
# Fixup desktop file
|
||||
substituteInPlace skype.desktop --replace \
|
||||
"Icon=skype.png" "Icon=$out/libexec/skype/icons/SkypeBlue_128x128.png"
|
||||
substituteInPlace skype.desktop --replace \
|
||||
"Terminal=0" "Terminal=false"
|
||||
mkdir -p $out/share/applications
|
||||
mv skype.desktop $out/share/applications
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A proprietary voice-over-IP (VoIP) client";
|
||||
homepage = http://www.skype.com/;
|
||||
license = stdenv.lib.licenses.unfree;
|
||||
platforms = [ "i686-linux" ];
|
||||
};
|
||||
}
|
||||
59
pkgs/applications/networking/remote/anydesk/default.nix
Normal file
59
pkgs/applications/networking/remote/anydesk/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ stdenv, fetchurl, makeWrapper
|
||||
, cairo, gdk_pixbuf, glib, gnome2, gtk2, pango, xorg
|
||||
, lsb-release }:
|
||||
|
||||
let
|
||||
sha256 = {
|
||||
"x86_64-linux" = "0g19sac4j3m1nf400vn6qcww7prqg2p4k4zsj74i109kk1396aa2";
|
||||
"i686-linux" = "1dd4ai2pclav9g872xil3x67bxy32gvz9pb3w76383pcsdh5zh45";
|
||||
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
|
||||
|
||||
arch = {
|
||||
"x86_64-linux" = "amd64";
|
||||
"i686-linux" = "i686";
|
||||
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "anydesk-${version}";
|
||||
version = "2.9.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.anydesk.com/linux/${name}-${arch}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
libPath = stdenv.lib.makeLibraryPath ([
|
||||
cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
|
||||
gnome2.gtkglext
|
||||
] ++ (with xorg; [
|
||||
libxcb libX11 libXdamage libXext libXfixes libXi
|
||||
libXrandr libXtst
|
||||
]));
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/{bin,share/icons/hicolor,share/doc/anydesk}
|
||||
install -m755 anydesk $out/bin/anydesk
|
||||
cp changelog copyright README $out/share/doc/anydesk
|
||||
cp -r icons/* $out/share/icons/hicolor/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
patchelf \
|
||||
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
--set-rpath "${libPath}" \
|
||||
$out/bin/anydesk
|
||||
|
||||
wrapProgram $out/bin/anydesk \
|
||||
--prefix PATH : ${stdenv.lib.makeBinPath [ lsb-release ]}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Desktop sharing application, providing remote support and online meetings";
|
||||
homepage = http://www.anydesk.com;
|
||||
license = licenses.unfree;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geogebra-${version}";
|
||||
version = "5-0-369-0";
|
||||
version = "5-0-377-0";
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
|
||||
sha256 = "0b5015z1ff3ksnkmyn2hbfwvhqp1572pdn8llpws32k7w1lb0jnk";
|
||||
sha256 = "0rvsjpf7pyz8z5yrqmc5ixzq7mnf1pyp00i914qd6wn5bx0apkxv";
|
||||
};
|
||||
|
||||
srcIcon = fetchurl {
|
||||
|
||||
@ -14,11 +14,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.6.18";
|
||||
version = "2.6.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz";
|
||||
sha256 = "1zmacx8wdhbjc8hpf8hmdmbh2pbkdkcyb23cl3j1mx7vkw06c31l";
|
||||
sha256 = "17zgqz6i0bcan04wqwksf7y4z73vxmabcpnd9y5nhx7br5zwpih3";
|
||||
};
|
||||
|
||||
common = {
|
||||
@ -88,6 +88,8 @@ let
|
||||
|
||||
fixupPhase
|
||||
'';
|
||||
|
||||
meta = common.meta // args.meta or {};
|
||||
});
|
||||
|
||||
in {
|
||||
@ -114,6 +116,8 @@ in {
|
||||
pluginUi = "GTK";
|
||||
isUi = true;
|
||||
buildDirs = [ "avidemux/gtk" ];
|
||||
# Code seems unmaintained.
|
||||
meta.broken = true;
|
||||
};
|
||||
|
||||
avidemux_common = buildPlugin {
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
, vdpauSupport ? false, libvdpau ? null
|
||||
, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null
|
||||
, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null
|
||||
, dvdreadSupport ? true, libdvdread ? null
|
||||
, bluraySupport ? true, libbluray ? null
|
||||
, amrSupport ? false, amrnb ? null, amrwb ? null
|
||||
, cacaSupport ? true, libcaca ? null
|
||||
@ -39,6 +40,7 @@ assert screenSaverSupport -> libXScrnSaver != null;
|
||||
assert vdpauSupport -> libvdpau != null;
|
||||
assert cddaSupport -> cdparanoia != null;
|
||||
assert dvdnavSupport -> libdvdnav != null;
|
||||
assert dvdreadSupport -> libdvdread != null;
|
||||
assert bluraySupport -> libbluray != null;
|
||||
assert amrSupport -> (amrnb != null && amrwb != null);
|
||||
assert cacaSupport -> libcaca != null;
|
||||
@ -110,6 +112,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional cacaSupport libcaca
|
||||
++ optional xineramaSupport libXinerama
|
||||
++ optional dvdnavSupport libdvdnav
|
||||
++ optional dvdreadSupport libdvdread
|
||||
++ optional bluraySupport libbluray
|
||||
++ optional cddaSupport cdparanoia
|
||||
++ optional jackaudioSupport libjack2
|
||||
|
||||
@ -18,10 +18,11 @@ with stdenv.lib;
|
||||
let
|
||||
python = python2;
|
||||
buildType = "release";
|
||||
extpack = "1952ikz4xsjgdd0pzdx1riwaingyhkxp0ind31yzqc4d0hp8l6b5";
|
||||
extpackRev = "117012";
|
||||
main = "0q5vjsih4ndn1b0s9l1ppxng6dljld5bin5nqfrhvgr2ldlv2bgf";
|
||||
version = "5.1.24";
|
||||
# Manually sha256sum the extensionPack file, must be hex!
|
||||
extpack = "14f152228495a715f526eb74134d43c960919cc534d2bc67cfe34a63e6cf7721";
|
||||
extpackRev = "117224";
|
||||
main = "1af8h3d3sdpcxcp5g75qfq10z81l7m8gk0sz8zqix8c1wqsm0wdm";
|
||||
version = "5.1.26";
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/672 for details
|
||||
extensionPack = requireFile rec {
|
||||
|
||||
@ -1,30 +1,27 @@
|
||||
{ stdenv, fetchurl, libxcb, libXinerama, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm }:
|
||||
{ stdenv, fetchFromGitHub, libxcb, libXinerama
|
||||
, sxhkd, xcbutil, xcbutilkeysyms, xcbutilwm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bspwm-${version}";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/baskerville/bspwm/archive/${version}.tar.gz";
|
||||
sha256 = "1w6wxwgyb14w664xafp3b2ps6zzf9yw7cfhbh9229x2hil9rss1k";
|
||||
src = fetchFromGitHub {
|
||||
owner = "baskerville";
|
||||
repo = "bspwm";
|
||||
rev = version;
|
||||
sha256 = "144g0vg0jsy0lja2jv1qbdps8k05nk70pc7vslj3im61a21vnbis";
|
||||
};
|
||||
|
||||
buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];
|
||||
|
||||
buildPhase = ''
|
||||
make PREFIX=$out
|
||||
'';
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
installPhase = ''
|
||||
make PREFIX=$out install
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A tiling window manager based on binary space partitioning";
|
||||
homepage = http://github.com/baskerville/bspwm;
|
||||
maintainers = [ stdenv.lib.maintainers.meisternu stdenv.lib.maintainers.epitrochoid ];
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = with maintainers; [ meisternu epitrochoid ];
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
findutils,
|
||||
go,
|
||||
jshon,
|
||||
jq,
|
||||
lib,
|
||||
pkgs,
|
||||
pigz,
|
||||
@ -408,7 +409,7 @@ rec {
|
||||
contents runAsRoot diskSize extraCommands;
|
||||
};
|
||||
result = runCommand "docker-image-${baseName}.tar.gz" {
|
||||
buildInputs = [ jshon pigz coreutils findutils ];
|
||||
buildInputs = [ jshon pigz coreutils findutils jq ];
|
||||
# Image name and tag must be lowercase
|
||||
imageName = lib.toLower name;
|
||||
imageTag = lib.toLower tag;
|
||||
@ -435,6 +436,9 @@ rec {
|
||||
if [[ -n "$fromImage" ]]; then
|
||||
echo "Unpacking base image..."
|
||||
tar -C image -xpf "$fromImage"
|
||||
# Do not import the base image configuration and manifest
|
||||
rm -f image/*.json
|
||||
rm -f image/manifest.json
|
||||
|
||||
if [[ -z "$fromImageName" ]]; then
|
||||
fromImageName=$(jshon -k < image/repositories|head -n1)
|
||||
@ -493,6 +497,17 @@ rec {
|
||||
# Use the temp folder we've been working on to create a new image.
|
||||
mv temp image/$layerID
|
||||
|
||||
# Create image configuration file (used by registry v2) by using
|
||||
# the configuration of the last layer
|
||||
SHA_ARRAY=$(find ./ -name layer.tar | xargs sha256sum | cut -d" " -f1 | xargs -I{} echo -n '"sha256:{}" ' | sed 's/" "/","/g' | awk '{ print "["$1"]" }')
|
||||
jq ". + {\"rootfs\": {\"diff_ids\": $SHA_ARRAY, \"type\": \"layers\"}}" image/$layerID/json > config.json
|
||||
CONFIG_SHA=$(sha256sum config.json | cut -d ' ' -f1)
|
||||
mv config.json image/$CONFIG_SHA.json
|
||||
|
||||
# Create image manifest
|
||||
LAYER_PATHS=$(find image/ -name layer.tar -printf '"%P" ' | sed 's/" "/","/g')
|
||||
jq -n "[{\"Config\":\"$CONFIG_SHA.json\",\"RepoTags\":[\"$imageName:$imageTag\"],\"Layers\":[$LAYER_PATHS]}]" > image/manifest.json
|
||||
|
||||
# Store the json under the name image/repositories.
|
||||
jshon -n object \
|
||||
-n object -s "$layerID" -i "$imageTag" \
|
||||
@ -502,7 +517,7 @@ rec {
|
||||
chmod -R a-w image
|
||||
|
||||
echo "Cooking the image..."
|
||||
tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 -c . | pigz -nT > $out
|
||||
tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
|
||||
|
||||
echo "Finished."
|
||||
'';
|
||||
|
||||
@ -750,6 +750,7 @@ rec {
|
||||
{ name, fullName, size ? 4096, urlPrefix
|
||||
, packagesList ? "", packagesLists ? [packagesList]
|
||||
, packages, extraPackages ? [], postInstall ? ""
|
||||
, extraDebs ? []
|
||||
, QEMU_OPTS ? "", memSize ? 512 }:
|
||||
|
||||
let
|
||||
@ -760,7 +761,7 @@ rec {
|
||||
in
|
||||
(fillDiskWithDebs {
|
||||
inherit name fullName size postInstall QEMU_OPTS memSize;
|
||||
debs = import expr {inherit fetchurl;};
|
||||
debs = import expr {inherit fetchurl;} ++ extraDebs;
|
||||
}) // {inherit expr;};
|
||||
|
||||
|
||||
@ -1954,22 +1955,22 @@ rec {
|
||||
};
|
||||
|
||||
debian8i386 = {
|
||||
name = "debian-8.8-jessie-i386";
|
||||
fullName = "Debian 8.8 Jessie (i386)";
|
||||
name = "debian-8.9-jessie-i386";
|
||||
fullName = "Debian 8.9 Jessie (i386)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
|
||||
sha256 = "79dbf81e9698913c577333f47f5a56be78529fba265ec492880e8c369c478b58";
|
||||
sha256 = "3c78bdf3b693f2f37737c52d6a7718b3a545956f2a853da79f04a2d15541e811";
|
||||
};
|
||||
urlPrefix = mirror://debian;
|
||||
packages = commonDebianPackages;
|
||||
};
|
||||
|
||||
debian8x86_64 = {
|
||||
name = "debian-8.8-jessie-amd64";
|
||||
fullName = "Debian 8.8 Jessie (amd64)";
|
||||
name = "debian-8.9-jessie-amd64";
|
||||
fullName = "Debian 8.9 Jessie (amd64)";
|
||||
packagesList = fetchurl {
|
||||
url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
|
||||
sha256 = "845fc80c9934d8c0f78ada6455c81c331a3359ef15c4c036b47e742fb1bb99c6";
|
||||
sha256 = "0605589ae7a63c690f37bd2567dc12e02a2eb279d9dc200a7310072ad3593e53";
|
||||
};
|
||||
urlPrefix = mirror://debian;
|
||||
packages = commonDebianPackages;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
import ./jdk-linux-base.nix {
|
||||
productVersion = "8";
|
||||
patchVersion = "141";
|
||||
patchVersion = "144";
|
||||
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5";
|
||||
sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784";
|
||||
sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
|
||||
sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
|
||||
sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
|
||||
sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
import ./jdk-linux-base.nix {
|
||||
productVersion = "8";
|
||||
patchVersion = "141";
|
||||
patchVersion = "144";
|
||||
downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
|
||||
sha256_i686 = "0jq8zq7hgjqbza1wmc1s8r4iz1r1s631snacn29wdsb5i2yg4qk5";
|
||||
sha256_x86_64 = "0kxs765dra47cw39xmifmxrib49j1lfya5cc3kldfv7azcc54784";
|
||||
sha256_armv7l = "0ja97nqn4x0ji16c7r6i9nnnj3745br7qlbj97jg1s8m2wk7f9jd";
|
||||
sha256_i686 = "1i5pginc65xl5vxzwid21ykakmfkqn59v3g01vpr94v28w30jk32";
|
||||
sha256_x86_64 = "1r5axvr8dg2qmr4zjanj73sk9x50m7p0w3vddz8c6ckgav7438z8";
|
||||
sha256_armv7l = "10r3nyssx8piyjaspravwgj2bnq4537041pn0lz4fk5b3473kgfb";
|
||||
jceName = "jce_policy-8.zip";
|
||||
jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
|
||||
sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
src = fetchgit {
|
||||
url = git://github.com/uds-psl/autosubst.git;
|
||||
rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034";
|
||||
sha256 = "1wqfzc9az85fvx71xxfii502jgc3mp0r3xwfb8vnb03vkk625ln0";
|
||||
sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mathcomp ];
|
||||
|
||||
@ -594,10 +594,10 @@ self: super: {
|
||||
doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335
|
||||
executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs];
|
||||
postInstall = ''
|
||||
local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" )
|
||||
local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" )
|
||||
make -C $lispdir
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
ln -s "$lispdir/"*.el{,c} $out/share/emacs/site-lisp/
|
||||
mkdir -p $data/share/emacs/site-lisp
|
||||
ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/
|
||||
'';
|
||||
});
|
||||
|
||||
@ -728,7 +728,7 @@ self: super: {
|
||||
};
|
||||
in overrideCabal super.servant (old: {
|
||||
postInstall = old.postInstall or "" + ''
|
||||
ln -s ${docs} $out/share/doc/servant
|
||||
ln -s ${docs} $doc/share/doc/servant
|
||||
'';
|
||||
});
|
||||
|
||||
@ -874,4 +874,7 @@ self: super: {
|
||||
# https://github.com/diagrams/diagrams-solve/issues/4
|
||||
diagrams-solve = dontCheck super.diagrams-solve;
|
||||
|
||||
# Needs a newer version of ghc-events.
|
||||
threadscope = super.threadscope.override { ghc-events = self.ghc-events_0_6_0; };
|
||||
|
||||
}
|
||||
|
||||
@ -47,8 +47,6 @@ self: super: {
|
||||
sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
|
||||
});
|
||||
|
||||
## GHC 8.0.2
|
||||
|
||||
# http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
|
||||
vector-algorithms = dontCheck super.vector-algorithms;
|
||||
|
||||
@ -60,4 +58,8 @@ self: super: {
|
||||
|
||||
# Newer versions require ghc>=8.2
|
||||
apply-refact = super.apply-refact_0_3_0_1;
|
||||
|
||||
# This builds needs the latest Cabal version.
|
||||
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_0_0_2; });
|
||||
|
||||
}
|
||||
|
||||
@ -40,7 +40,7 @@ self: super: {
|
||||
cabal-install = super.cabal-install.override { Cabal = null; };
|
||||
|
||||
# jailbreak-cabal doesn't seem to work right with the native Cabal version.
|
||||
jailbreak-cabal = pkgs.haskellPackages.jailbreak-cabal;
|
||||
jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
|
||||
|
||||
# https://github.com/bmillwood/applicative-quoters/issues/6
|
||||
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
|
||||
, jailbreak-cabal, hscolour, cpphs, nodejs, lib
|
||||
, jailbreak-cabal, hscolour, cpphs, nodejs, lib, removeReferencesTo
|
||||
}: let isCross = (ghc.cross or null) != null; in
|
||||
|
||||
{ pname
|
||||
@ -53,6 +53,8 @@
|
||||
, coreSetup ? false # Use only core packages to build Setup.hs.
|
||||
, useCpphs ? false
|
||||
, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
|
||||
, enableSeparateDataOutput ? false
|
||||
, enableSeparateDocOutput ? doHaddock
|
||||
} @ args:
|
||||
|
||||
assert editedCabalFile != null -> revision != null;
|
||||
@ -108,6 +110,8 @@ let
|
||||
|
||||
defaultConfigureFlags = [
|
||||
"--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
|
||||
(optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
|
||||
(optionalString enableSeparateDocOutput "--docdir=$doc/share/doc")
|
||||
"--with-gcc=$CC" # Clang won't work without that extra information.
|
||||
"--package-db=$packageConfDir"
|
||||
(optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
|
||||
@ -144,7 +148,7 @@ let
|
||||
allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
|
||||
optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
|
||||
|
||||
nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends;
|
||||
nativeBuildInputs = buildTools ++ libraryToolDepends ++ executableToolDepends ++ [ removeReferencesTo ];
|
||||
propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
|
||||
otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
|
||||
optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
|
||||
@ -173,6 +177,9 @@ assert allPkgconfigDepends != [] -> pkgconfig != null;
|
||||
stdenv.mkDerivation ({
|
||||
name = "${pname}-${version}";
|
||||
|
||||
outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"));
|
||||
setOutputFlags = false;
|
||||
|
||||
pos = builtins.unsafeGetAttrPos "pname" args;
|
||||
|
||||
prePhases = ["setupCompilerEnvironmentPhase"];
|
||||
@ -323,6 +330,14 @@ stdenv.mkDerivation ({
|
||||
done
|
||||
''}
|
||||
|
||||
${optionalString enableSeparateDocOutput ''
|
||||
for x in $doc/share/doc/html/src/*.html; do
|
||||
remove-references-to -t $out $x
|
||||
done
|
||||
mkdir -p $doc
|
||||
''}
|
||||
${optionalString enableSeparateDataOutput "mkdir -p $data"}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -111,4 +111,6 @@ rec {
|
||||
overrideSrc = drv: { src, version ? drv.version }:
|
||||
overrideCabal drv (_: { inherit src version; editedCabalFile = null; });
|
||||
|
||||
hasNoDataOutput = drv: overrideCabal drv (drv: { hasDataDir = false; });
|
||||
hasNoDocOutput = drv: overrideCabal drv (drv: { hasDocDir = false; });
|
||||
}
|
||||
|
||||
@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "beignet-${version}";
|
||||
version = "1.2.1";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://01.org/sites/default/files/${name}-source.tar.gz";
|
||||
sha256 = "07y8ga545654jdbijmplga7a7j3jn04q5gfdjsl8cax16hsv0kmp";
|
||||
sha256 = "07snrgjlhwl5fxz82dyqp632cnf5hp0gfqrjd2930jv79p37p6rr";
|
||||
};
|
||||
|
||||
patches = [ ./clang_llvm.patch ];
|
||||
|
||||
@ -1,19 +1,18 @@
|
||||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchFromGitHub, cmake, zeromq }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cppzmq-${version}";
|
||||
version = "2016-11-16";
|
||||
version = "4.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeromq";
|
||||
repo = "cppzmq";
|
||||
rev = "8b52a6ffacce27bac9b81c852b81539a77b0a6e5";
|
||||
sha256 = "12accjyjzfw1wqzbj1qn6q99bj5ba05flsvbanyzflr3b4971s4p";
|
||||
rev = "v${version}";
|
||||
sha256 = "0hy8yxb22siimq0pf6jq6kdp9lvi5f6al1xd12c9i1jyajhp1lhk";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
install -Dm644 zmq.hpp $out/include/zmq.hpp
|
||||
'';
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zeromq ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/zeromq/cppzmq";
|
||||
|
||||
@ -3,15 +3,23 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "folly-${version}";
|
||||
version = "2016.12.19.00";
|
||||
version = "2017.07.24.00";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "folly";
|
||||
rev = "v${version}";
|
||||
sha256 = "1q5nh84sxkdi4x0gwr0x7bgk33pq6071vxz5vnjkznwywhgw2hnn";
|
||||
sha256 = "1cmqrm9yjxrw4xr1kcgzl0s7vcvp125wcgb0cz7whssgj11mf169";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compilation
|
||||
(fetchpatch {
|
||||
url = "https://github.com/facebook/folly/commit/9fc87c83d93f092859823ec32289ed1b6abeb683.patch";
|
||||
sha256 = "0ix0grqlzm16hwa4rjbajjck8kr9lksh6c3gn7p3ihbbchsmlhvl";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook python pkgconfig ];
|
||||
buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gbenchmark-${version}";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "benchmark";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y7k73kyxx1jlph23csnhdac76px6ghhwwxbcf0133m4rg0wmpn5";
|
||||
sha256 = "1gld3zdxgc0c0466qvnsi70h2ksx8qprjrx008rypdhzp6660m48";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libaacs-${version}";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://get.videolan.org/libaacs/${version}/${name}.tar.bz2";
|
||||
sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
|
||||
sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27";
|
||||
};
|
||||
|
||||
buildInputs = [ libgcrypt libgpgerror ];
|
||||
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.videolan.org/developers/libbluray.html;
|
||||
homepage = "http://www.videolan.org/developers/libbluray.html";
|
||||
description = "Library to access Blu-Ray disks for video playback";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libfprint-0.6.0";
|
||||
name = "libfprint-0.7.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
|
||||
sha256 = "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5";
|
||||
url = "https://people.freedesktop.org/~anarsoul/${name}.tar.xz";
|
||||
sha256 = "1wzi12zvdp8sw3w5pfbd9cwz6c71627bkr88rxv6gifbyj6fwgl6";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ipopt-${version}";
|
||||
version = "3.12.6";
|
||||
version = "3.12.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
|
||||
sha256 = "0lx09h1757s5jppwnxwblcjk0biqjxy7yaf3z4vfqbl4rl93avs0";
|
||||
sha256 = "1lyhgashyk2wswv0z2qnkxng32pim80kzf9jfgxi07wl09x753w1";
|
||||
};
|
||||
|
||||
CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ fetchurl, stdenv, autoreconfHook, libkrb5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libtirpc-1.0.1";
|
||||
name = "libtirpc-1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
|
||||
sha256 = "17mqrdgsgp9m92pmq7bvr119svdg753prqqxmg4cnz5y657rfmji";
|
||||
sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "Vc-${version}";
|
||||
version = "1.3.0";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VcDevel";
|
||||
repo = "Vc";
|
||||
rev = version;
|
||||
sha256 = "18vi92xxg0ly0fw4v06fwls11rahmg5z8xf65jxxrbgf37vc1wxi";
|
||||
sha256 = "119sm0kldr5j163ff04fra35420cvpj040hs7n0mnfbcgyx4nxq9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
|
||||
{ stdenv, fetchFromGitHub, cmake, asciidoc }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "zeromq-${version}";
|
||||
version = "4.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz";
|
||||
sha256 = "0syzwsiqblimfjb32fr6hswhdvp3cmbk0pgm7ayxaigmkv5g88sv";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zeromq";
|
||||
repo = "libzmq";
|
||||
rev = "v${version}";
|
||||
sha256 = "09317g4zkalp3k11x6vbidcm4qf02ciml1wxgp3742lrlgcblgxy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ libuuid libsodium ];
|
||||
nativeBuildInputs = [ cmake asciidoc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
branch = "4";
|
||||
|
||||
20
pkgs/development/python-modules/amqplib/default.nix
Normal file
20
pkgs/development/python-modules/amqplib/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "amqplib";
|
||||
version = "0.6.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0f2618b74d95cd360a6d46a309a3fb1c37d881a237e269ac195a69a34e0e2f62";
|
||||
};
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://code.google.com/p/py-amqplib/;
|
||||
description = "Python client for the Advanced Message Queuing Procotol (AMQP)";
|
||||
};
|
||||
}
|
||||
25
pkgs/development/python-modules/apipkg/default.nix
Normal file
25
pkgs/development/python-modules/apipkg/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, pytest }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apipkg";
|
||||
version = "1.4";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6";
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Namespace control and lazy-import mechanism";
|
||||
homepage = "http://bitbucket.org/hpk42/apipkg";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
25
pkgs/development/python-modules/apsw/default.nix
Normal file
25
pkgs/development/python-modules/apsw/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ stdenv, buildPythonPackage, fetchurl
|
||||
, sqlite, isPyPy }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "apsw";
|
||||
version = "3.7.6.2-r1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
disabled = isPyPy;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://apsw.googlecode.com/files/${name}.zip";
|
||||
sha256 = "cb121b2bce052609570a2f6def914c0aa526ede07b7096dddb78624d77f013eb";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
# python: double free or corruption (fasttop): 0x0000000002fd4660 ***
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Python wrapper for the SQLite embedded relational database engine";
|
||||
homepage = http://code.google.com/p/apsw/;
|
||||
};
|
||||
}
|
||||
18
pkgs/development/python-modules/area53/default.nix
Normal file
18
pkgs/development/python-modules/area53/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, boto }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Area53";
|
||||
version = "0.94";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0v9b7f8b6v21y410anx5sr52k2ac8jrzdf19q6m6p0zsdsf9vr42";
|
||||
};
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
|
||||
propagatedBuildInputs = [ boto ];
|
||||
}
|
||||
17
pkgs/development/python-modules/args/default.nix
Normal file
17
pkgs/development/python-modules/args/default.nix
Normal file
@ -0,0 +1,17 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "args";
|
||||
version = "0.1.0";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a785b8d837625e9b61c39108532d95b85274acd679693b71ebb5156848fcf814";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Command Arguments for Humans";
|
||||
homepage = "https://github.com/kennethreitz/args";
|
||||
};
|
||||
}
|
||||
24
pkgs/development/python-modules/asn1ate/default.nix
Normal file
24
pkgs/development/python-modules/asn1ate/default.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ stdenv, buildPythonPackage, fetchFromGitHub
|
||||
, pyparsing }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asn1ate";
|
||||
date = "20160810";
|
||||
name = "${pname}-unstable-${date}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";
|
||||
rev = "c56104e8912400135509b584d84423ee05a5af6b";
|
||||
owner = "kimgr";
|
||||
repo = pname;
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyparsing ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python library for translating ASN.1 into other forms";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ leenaars ];
|
||||
};
|
||||
}
|
||||
19
pkgs/development/python-modules/astor/default.nix
Normal file
19
pkgs/development/python-modules/astor/default.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "astor";
|
||||
version = "0.5";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1fdafq5hkis1fxqlmhw0sn44zp2ar46nxhbc22cvwg7hsd8z5gsa";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Library for reading, writing and rewriting python AST";
|
||||
homepage = https://github.com/berkerpeksag/astor;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ nixy ];
|
||||
};
|
||||
}
|
||||
16
pkgs/development/python-modules/chai/default.nix
Normal file
16
pkgs/development/python-modules/chai/default.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chai";
|
||||
version = "1.1.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Mocking, stubbing and spying framework for python";
|
||||
};
|
||||
}
|
||||
22
pkgs/development/python-modules/chainmap/default.nix
Normal file
22
pkgs/development/python-modules/chainmap/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chainmap";
|
||||
version = "1.0.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "09h5gq43w516fqswlca0nhmd2q3v8hxq15z4wqrznfwix6ya6pa0";
|
||||
};
|
||||
|
||||
# Requires tox
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Backport/clone of ChainMap";
|
||||
homepage = "https://bitbucket.org/jeunice/chainmap";
|
||||
license = licenses.psfl;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
{ stdenv, buildPythonPackage, fetchurl, substituteAll,
|
||||
pythonOlder,
|
||||
geos, gdal
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
name = "${pname}-${version}";
|
||||
version = "1.10.7";
|
||||
disabled = pythonOlder "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";
|
||||
sha256 = "1f5hnn2dzfr5szk4yc47bs4kk2nmrayjcvgpqi2s4l13pjfpfgar";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./1.10-gis-libs.template.patch;
|
||||
geos = geos;
|
||||
gdal = gdal;
|
||||
})
|
||||
];
|
||||
|
||||
# patch only $out/bin to avoid problems with starter templates (see #3134)
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn $out/bin "$out $pythonPath"
|
||||
'';
|
||||
|
||||
# too complicated to setup
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A high-level Python Web framework";
|
||||
homepage = https://www.djangoproject.com/;
|
||||
};
|
||||
}
|
||||
22
pkgs/development/python-modules/funcsigs/default.nix
Normal file
22
pkgs/development/python-modules/funcsigs/default.nix
Normal file
@ -0,0 +1,22 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi
|
||||
, unittest2 }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "funcsigs";
|
||||
version = "1.0.2";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0l4g5818ffyfmfs1a924811azhjj8ax9xd1cffr1mzd3ycn0zfx7";
|
||||
};
|
||||
|
||||
buildInputs = [ unittest2 ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+";
|
||||
homepage = "https://github.com/aliles/funcsigs";
|
||||
maintainers = with maintainers; [ garbas ];
|
||||
license = licenses.asl20;
|
||||
};
|
||||
}
|
||||
23
pkgs/development/python-modules/hmmlearn/default.nix
Normal file
23
pkgs/development/python-modules/hmmlearn/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, fetchurl, buildPythonPackage, numpy }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "hmmlearn-${version}";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/h/hmmlearn/${name}.tar.gz";
|
||||
sha256 = "0qc3fkdyrgfg31y1a8jzs83dxkjw78pqkdm44lll1iib63w4cik9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hidden Markov Models in Python with scikit-learn like API";
|
||||
homepage = "https://github.com/hmmlearn/hmmlearn";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -7,13 +7,13 @@ else
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libarcus";
|
||||
name = "${pname}-${version}";
|
||||
version = "2.4.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ultimaker";
|
||||
repo = "libArcus";
|
||||
rev = version;
|
||||
sha256 = "07lf5d42pnx0h9lgldplfdj142rbcsxx23njdblnq04di7a4937h";
|
||||
sha256 = "1arh0gkwcjv0j3arh1w04gbwkn5glrs7gbli0b1ak7dalnicmn7c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sip protobuf ];
|
||||
|
||||
21
pkgs/development/python-modules/pychromecast/default.nix
Normal file
21
pkgs/development/python-modules/pychromecast/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "PyChromecast-${version}";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/p/pychromecast/${name}.tar.gz";
|
||||
sha256 = "05rlr2hjng0xg2a9k9vwmrlvd7vy9sjhxxfl96kx25xynlkq6yq6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests six zeroconf protobuf ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
|
||||
homepage = "https://github.com/balloob/pychromecast";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
23
pkgs/development/python-modules/sphfile/default.nix
Normal file
23
pkgs/development/python-modules/sphfile/default.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ lib, fetchurl, buildPythonPackage, numpy }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "sphfile-${version}";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/s/sphfile/${name}.tar.gz";
|
||||
sha256 = "1ly9746xrzbiax9cxr5sxlg0wvf6fdxcrgwsqqxckk3wnqfypfrd";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy ];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Numpy-based NIST SPH audio-file reader";
|
||||
homepage = "https://github.com/mcfletch/sphfile";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus }:
|
||||
{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus, doxygen, gettext }:
|
||||
|
||||
if lib.versionOlder python.version "3.5.0"
|
||||
then throw "Uranium not supported for interpreter ${python.executable}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.4.0";
|
||||
version = "2.6.1";
|
||||
pname = "uranium";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
|
||||
owner = "Ultimaker";
|
||||
repo = "Uranium";
|
||||
rev = version;
|
||||
sha256 = "1jpl0ryk8xdppillk5wzr2415n50cpa09shn1xqj6y96fg22l2il";
|
||||
sha256 = "1682xwxf6xs1d1cfv1s7xnabqv58jjdb6szz8624b3k9rsj5l2yq";
|
||||
};
|
||||
|
||||
buildInputs = [ python ];
|
||||
buildInputs = [ python gettext ];
|
||||
propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
|
||||
|
||||
@ -3,12 +3,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zeroconf";
|
||||
version = "0.18.0";
|
||||
version = "0.19.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2";
|
||||
sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ netifaces six enum-compat ];
|
||||
|
||||
@ -52,12 +52,12 @@ rec {
|
||||
};
|
||||
|
||||
gradle_latest = gradleGen rec {
|
||||
name = "gradle-4.0.1";
|
||||
name = "gradle-4.0.2";
|
||||
nativeVersion = "0.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "1m2gnh1vs3f5acdqcxmc8d0pi65bzm3v1nliz29rhdfi01if85yp";
|
||||
sha256 = "08ns3p1w258cbfk6yg3yy2mmy7wwma5riq04yjjgc4dx889l5b3r";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jenkins-${version}";
|
||||
version = "2.66";
|
||||
version = "2.71";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
|
||||
sha256 = "05n03rm5vjzcz1f36829hwviw7i8l8d728nvr4cnf6mcl3rxciyl";
|
||||
sha256 = "0b3mxbcv7afj8ksr2y33rvprj7003679j545igf5dsal82i7swhl";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
||||
@ -2,21 +2,21 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "racer-${version}";
|
||||
version = "2.0.6";
|
||||
version = "2.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phildawes";
|
||||
owner = "racer-rust";
|
||||
repo = "racer";
|
||||
rev = version;
|
||||
sha256 = "09wgfrb0z2d2icfk11f1jal5p93sqjv3jzmzcgw0pgw3zvffhni3";
|
||||
sha256 = "06k50f2vj2w08afh3nrlhs0amcvw2i45bhfwr70sgs395xicjswp";
|
||||
};
|
||||
|
||||
depsSha256 = "0mnq7dk9wz2k9jhzciknybwc471sy8f71cd15m752b5ng6v1f5kn";
|
||||
depsSha256 = "1gywnjbjl9jalbq6wkfmbczav4qbhgw2h8lyxkyppnhw9y4j0nc1";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
preCheck = ''
|
||||
export RUST_SRC_PATH="${rustPlatform.rust.rustc.src}/src"
|
||||
export RUST_SRC_PATH="${rustPlatform.rustcSrc}"
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A utility intended to provide Rust code completion for editors and IDEs";
|
||||
homepage = https://github.com/phildawes/racer;
|
||||
homepage = https://github.com/racer-rust/racer;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jagajaga globin ];
|
||||
platforms = platforms.all;
|
||||
|
||||
@ -1,18 +1,24 @@
|
||||
diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile
|
||||
--- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
|
||||
+++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile 2016-11-23 15:37:15.303077886 +0300
|
||||
@@ -285,7 +285,7 @@
|
||||
diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile
|
||||
--- crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
|
||||
+++ crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300
|
||||
@@ -286,13 +286,7 @@
|
||||
LIBZ := contrib/install/$(ARCH)/lib/libz.a
|
||||
|
||||
ifndef CROSSHOST
|
||||
- SQLITE_INCLUDE_DIR := /usr/include
|
||||
- # FreeBSD keeps all of its userland includes in /usr/local so
|
||||
- # look there
|
||||
- ifeq ($(uname_S),FreeBSD)
|
||||
- SQLITE_INCLUDE_DIR := /usr/local/include
|
||||
- else
|
||||
- SQLITE_INCLUDE_DIR := /usr/include
|
||||
- endif
|
||||
+ SQLITE_INCLUDE_DIR := ${sqlite}/include
|
||||
else
|
||||
# This is totally wrong, works only with some old-style setups, and
|
||||
# on some architectures of Debian/new FHS multiarch -- excluding, for
|
||||
diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font
|
||||
--- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300
|
||||
+++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font 2016-11-23 15:39:04.044031141 +0300
|
||||
diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font
|
||||
--- crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300
|
||||
+++ crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
|
||||
version = "0.19.3";
|
||||
version = "0.20.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crawl-ref";
|
||||
repo = "crawl-ref";
|
||||
rev = version;
|
||||
sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7";
|
||||
sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26";
|
||||
};
|
||||
|
||||
patches = [ ./crawl_purify.patch ];
|
||||
|
||||
@ -5,14 +5,12 @@
|
||||
|
||||
let
|
||||
dfVersion = "0.43.05";
|
||||
# version = "${dfVersion}-r1";
|
||||
# rev = "refs/tags/${version}";
|
||||
version = "${dfVersion}-r1";
|
||||
version = "${dfVersion}-r2";
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w";
|
||||
sha256 = "18zbxri5rch750m431pdmlk4xi7nc14iif3i7glxrgy2h5nfaw5c";
|
||||
|
||||
# revision of library/xml submodule
|
||||
xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da";
|
||||
xmlRev = "3322beb2e7f4b28ff8e573e9bec738c77026b8e9";
|
||||
|
||||
arch =
|
||||
if stdenv.system == "x86_64-linux" then "64"
|
||||
@ -51,6 +49,12 @@ in stdenv.mkDerivation rec {
|
||||
# We don't use system libraries because dfhack needs old C++ ABI.
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
preConfigure = ''
|
||||
# Trick build system into believing we have .git
|
||||
mkdir -p .git/modules/library/xml
|
||||
touch .git/index .git/modules/library/xml/index
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH"
|
||||
'';
|
||||
|
||||
@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de
|
||||
|
||||
with stdenv.lib;
|
||||
let
|
||||
version = if releaseType != "demo" then "0.15.30" else "0.15.25";
|
||||
version = if releaseType != "demo" then "0.15.31" else "0.15.31";
|
||||
|
||||
arch = if stdenv.system == "x86_64-linux" then {
|
||||
inUrl = "linux64";
|
||||
@ -26,9 +26,9 @@ let
|
||||
url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
|
||||
name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.xz";
|
||||
x64 = {
|
||||
headless = fetchurl { inherit name url; sha256 = "0nmr73i9acnqgphfmsps7f8jlw0f2gyal9l8pldlp4rk0cjgvszy"; };
|
||||
alpha = authenticatedFetch { inherit name url; sha256 = "1ydh44na2lbvdv4anrblym7d6wxwapfbwap40n3722llrsad0zsz"; };
|
||||
demo = fetchurl { inherit name url; sha256 = "1qz6g8mf221ic663zk92l6rs77ggfydaw2d8g2s7wy0j9097qbsl"; };
|
||||
headless = fetchurl { inherit name url; sha256 = "1kbf6pj0rdiydx7g3xaqhnvvjr01g1afys2flw8x5myanffhql9x"; };
|
||||
alpha = authenticatedFetch { inherit name url; sha256 = "0mz7x0hc3kvs6l1isnryld08sfy8gkgq81vvmmssa3ayp5y67rh4"; };
|
||||
demo = fetchurl { inherit name url; sha256 = "0zsjlgys96qlqs79m634wh36vx5d7faq4749i9lsxm88b6fylfaf"; };
|
||||
};
|
||||
i386 = {
|
||||
headless = abort "Factorio 32-bit headless binaries are not available for download.";
|
||||
|
||||
@ -3,10 +3,10 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="gnuchess";
|
||||
version="6.2.4";
|
||||
version="6.2.5";
|
||||
name="${baseName}-${version}";
|
||||
url="mirror://gnu/chess/${name}.tar.gz";
|
||||
sha256="1vw2w3jwnmn44d5vsw47f8y70xvxcsz9m5msq9fgqlzjch15qhiw";
|
||||
sha256="00j8s0npgfdi41a0mr5w9qbdxagdk2v41lcr42rwl1jp6miyk6cs";
|
||||
};
|
||||
buildInputs = [
|
||||
flex
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ioquake3-git-${version}";
|
||||
version = "2017-01-27";
|
||||
version = "2017-07-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ioquake";
|
||||
repo = "ioq3";
|
||||
rev = "468da0fabca2f21b811a501c184b986e270c5113";
|
||||
sha256 = "14mhkqn6h2mbmz90j4ns1wp72ca5w9481sbyw2ving8xpw376i58";
|
||||
rev = "356ae10ef65d4401958d50f03288dcb22d957c96";
|
||||
sha256 = "0dz4zqlb9n3skaicj0vfvq4nr3ig80s8nwj9m87b39wc9wq34c5j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ which pkgconfig ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "the-powder-toy-${version}";
|
||||
version = "91.5.330";
|
||||
version = "92.0.331";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "simtr";
|
||||
repo = "The-Powder-Toy";
|
||||
rev = "v${version}";
|
||||
sha256 = "19m7jyg3pnppymvr6lz454mjiw18hvldpdhi33596m9ji3nrq8x7";
|
||||
sha256 = "185zlg20qk6ic9llyf4xka923snqrpdazg568raz0jiafzzsirax";
|
||||
};
|
||||
|
||||
patches = [ ./fix-env.patch ];
|
||||
|
||||
@ -9,11 +9,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "cups-filters-${version}";
|
||||
version = "1.15.0";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
|
||||
sha256 = "0g6jmbzgvsq4dq6jaczr6fslpv3692v8yvvmqgw08sb3aly7kgd3";
|
||||
sha256 = "1kcndzpbbcaxafnz1wa6acy3p3r5likfqmf057i5q0q6i176lz5k";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig makeWrapper ];
|
||||
|
||||
33
pkgs/misc/emulators/citra/default.nix
Normal file
33
pkgs/misc/emulators/citra/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ stdenv, fetchgit, cmake, SDL2, qtbase, boost, curl, gtest }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "citra-2017-07-26";
|
||||
|
||||
# Submodules
|
||||
src = fetchgit {
|
||||
url = "https://github.com/citra-emu/citra";
|
||||
rev = "a724fb365787718f9e44adedc14e59d0854905a6";
|
||||
sha256 = "0lkrwhxvq85c0smix27xvj8m463bxa67qhy8m8r43g39n0h8d5sf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ SDL2 qtbase boost curl gtest ];
|
||||
cmakeFlags = [ "-DUSE_SYSTEM_CURL=ON" "-DUSE_SYSTEM_GTEST=ON" ];
|
||||
|
||||
preConfigure = ''
|
||||
# Trick configure system.
|
||||
sed -n 's,^ *path = \(.*\),\1,p' .gitmodules | while read path; do
|
||||
mkdir "$path/.git"
|
||||
done
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://citra-emu.org/";
|
||||
description = "An open-source emulator for the Nintendo 3DS capable of playing many of your favorite games.";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
39
pkgs/misc/emulators/dosbox/unstable.nix
Normal file
39
pkgs/misc/emulators/dosbox/unstable.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }:
|
||||
|
||||
let revision = "4025";
|
||||
revisionDate = "2017-07-02";
|
||||
revisionSha = "0hbghdlvm6qibp0df35qxq35km4nza3sm301x380ghamxq2vgy6a";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "dosbox-unstable-${revisionDate}";
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
|
||||
rev = revision;
|
||||
sha256 = revisionSha;
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ];
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "dosbox";
|
||||
exec = "dosbox";
|
||||
comment = "x86 emulator with internal DOS";
|
||||
desktopName = "DOSBox (SVN)";
|
||||
genericName = "DOS emulator";
|
||||
categories = "Application;Emulator;";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/applications
|
||||
cp ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.dosbox.com/;
|
||||
description = "A DOS emulator";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ binarin ];
|
||||
};
|
||||
}
|
||||
@ -32,15 +32,15 @@ in rec {
|
||||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "2.12";
|
||||
version = "2.13";
|
||||
url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
|
||||
sha256 = "19qk880fk7xxzx9jcl6sjzilhzssn0csqlqr9vnfd1qlhjpi2v29";
|
||||
sha256 = "1y3yb01lg90pi8a9qjmymg7kikwkmvpkjxi6bbk1q1lvs7fs7g3g";
|
||||
inherit (stable) mono gecko32 gecko64;
|
||||
};
|
||||
|
||||
staging = fetchFromGitHub rec {
|
||||
inherit (unstable) version;
|
||||
sha256 = "00qqpw5fmpwg4589q2dwlv3jrcyj0yzv4mk63w5ydhvmy5gq48wy";
|
||||
sha256 = "1ivjx5pf0xqqmdc1k5skg9saxgqzh3x01vjgypls7czmnpp3aylb";
|
||||
owner = "wine-compholio";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
||||
@ -1173,6 +1173,20 @@ rec {
|
||||
|
||||
};
|
||||
|
||||
vim-yapf = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "vim-yapf-2017-03-21";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mindriot101/vim-yapf";
|
||||
rev = "324380d77c9cf8e46e22b2e4391702273a53f563";
|
||||
sha256 = "0vsd53k5k8absc60qka8nlj2ij6k4zgff2a65ixc7vqcmawxr3nw";
|
||||
};
|
||||
dependencies = [];
|
||||
buildPhase = ''
|
||||
substituteInPlace ftplugin/python_yapf.vim \
|
||||
--replace '"yapf"' '"${pythonPackages.yapf}/bin/yapf"'
|
||||
'';
|
||||
};
|
||||
|
||||
lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
|
||||
name = "lushtags-2017-04-19";
|
||||
src = fetchgit {
|
||||
|
||||
@ -92,6 +92,7 @@
|
||||
"github:mhinz/vim-startify"
|
||||
"github:michaeljsmith/vim-indent-object"
|
||||
"github:mileszs/ack.vim"
|
||||
"github:mindriot101/vim-yapf"
|
||||
"github:mkasa/lushtags"
|
||||
"github:mpickering/hlint-refactor-vim"
|
||||
"github:nathanaelkane/vim-indent-guides"
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
buildPhase = ''
|
||||
substituteInPlace ftplugin/python_yapf.vim \
|
||||
--replace '"yapf"' '"${pkgs.yapf}/bin/yapf"'
|
||||
'';
|
||||
@ -49,7 +49,7 @@ stdenv.mkDerivation {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A module for powering off hybrid GPUs";
|
||||
platforms = platforms.linux;
|
||||
homepage = https://github.com/Bumblebee-Project/bbswitch;
|
||||
homepage = "https://github.com/Bumblebee-Project/bbswitch";
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,21 +1,18 @@
|
||||
{ stdenv, lib, fetchFromGitHub, kernel }:
|
||||
|
||||
# Upstream build for kernel > 4.10 is currently broken
|
||||
# Reference: https://github.com/dorimanx/exfat-nofuse/issues/103
|
||||
assert lib.versionOlder kernel.version "4.10";
|
||||
|
||||
# Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working
|
||||
assert lib.versionAtLeast kernel.version "4.2" || lib.versionOlder kernel.version "4.0";
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "exfat-nofuse-${version}-${kernel.version}";
|
||||
version = "2017-01-03";
|
||||
version = "2017-06-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dorimanx";
|
||||
repo = "exfat-nofuse";
|
||||
rev = "8d291f5";
|
||||
sha256 = "0lg1mykglayswli2aliw8chsbr4g629v9chki5975avh43jn47w9";
|
||||
rev = "de4c760bc9a05ead83bc3ec6eec6cf1fb106f523";
|
||||
sha256 = "0v979d8sbcb70lakm4jal2ck3gspkdgq9108k127f7ph08vf8djm";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
@ -3,11 +3,11 @@ let
|
||||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="firejail";
|
||||
version="0.9.44.10";
|
||||
version="0.9.48";
|
||||
name="${baseName}-${version}";
|
||||
hash="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj";
|
||||
url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.10.tar.xz";
|
||||
sha256="19wln3h54wcscqgcmkm8sprdh7vrn5k91rr0hagv055y1i52c7mj";
|
||||
hash="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
|
||||
url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.48.tar.xz";
|
||||
sha256="02a74nx8p2gbpd6ffnr52p02pxxllw3yy5fy4083a77r3wia8zb3";
|
||||
};
|
||||
buildInputs = [
|
||||
which
|
||||
@ -21,6 +21,13 @@ stdenv.mkDerivation {
|
||||
name = "${s.name}.tar.bz2";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
# Allow whitelisting ~/.nix-profile
|
||||
substituteInPlace etc/firejail.config --replace \
|
||||
'# follow-symlink-as-user yes' \
|
||||
'follow-symlink-as-user no'
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .)
|
||||
sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .)
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "keyutils-${version}";
|
||||
version = "1.5.9";
|
||||
version = "1.5.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://people.redhat.com/dhowells/keyutils/${name}.tar.bz2";
|
||||
sha256 = "1bl3w03ygxhc0hz69klfdlwqn33jvzxl1zfl2jmnb2v85iawb8jd";
|
||||
sha256 = "1dmgjcf7mnwc6h72xkvpaqpzxw8vmlnsmzz0s27pg0giwzm3sp0i";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mcelog-${version}";
|
||||
version = "148";
|
||||
version = "153";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "04mzscvr38r2q9da9wmv3cxb99vrkxks1mzgvwsxk753xan3p42c";
|
||||
rev = "v${version}";
|
||||
repo = "mcelog";
|
||||
owner = "andikleen";
|
||||
owner = "andikleen";
|
||||
repo = "mcelog";
|
||||
rev = "v${version}";
|
||||
sha256 = "1wz55dzqdiam511d6p1958al6vzlhrhs73s7gly0mzm6kpji0gxa";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
|
||||
|
||||
installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/lib/systemd/system
|
||||
substitute mcelog.service $out/lib/systemd/system/mcelog.service \
|
||||
--replace /usr/sbin $out/bin
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Log x86 machine checks: memory, IO, and CPU hardware errors";
|
||||
longDescription = ''
|
||||
|
||||
@ -6,67 +6,57 @@
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
|
||||
buildUser = any (n: n == configFile) [ "user" "all" ];
|
||||
|
||||
common = { version, sha256 } @ args : stdenv.mkDerivation rec {
|
||||
name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zfsonlinux";
|
||||
repo = "spl";
|
||||
rev = "spl-${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
patches = [ ./const.patch ./install_prefix.patch ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
|
||||
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
|
||||
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
|
||||
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-config=${configFile}"
|
||||
] ++ optionals buildKernel [
|
||||
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
|
||||
|
||||
longDescription = ''
|
||||
This kernel module is a porting layer for ZFS to work inside the linux
|
||||
kernel.
|
||||
'';
|
||||
|
||||
homepage = http://zfsonlinux.org/;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
|
||||
};
|
||||
};
|
||||
|
||||
in
|
||||
assert any (n: n == configFile) [ "kernel" "user" "all" ];
|
||||
assert buildKernel -> kernel != null;
|
||||
{
|
||||
splStable = common {
|
||||
version = "0.6.5.11";
|
||||
sha256 = "192val8035pj2rryi3fwb134avzirhv5ifaj5021vh8bbjx75pd5";
|
||||
};
|
||||
splUnstable = common {
|
||||
version = "0.7.0-rc5";
|
||||
sha256 = "17y25g02c9swi3n90lhjvazcnsr69nh50dz3b8g1c08zlz9n2akp";
|
||||
};
|
||||
}
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zfsonlinux";
|
||||
repo = "spl";
|
||||
rev = "spl-${version}";
|
||||
sha256 = "05qqwhxc9nj94y28c97iwfz8gkjwicrhnkj425yb47gqa8rafazk";
|
||||
};
|
||||
|
||||
patches = [ ./const.patch ./install_prefix.patch ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./module/spl/spl-generic.c --replace /usr/bin/hostid hostid
|
||||
substituteInPlace ./module/spl/spl-generic.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:${gawk}:/bin"
|
||||
substituteInPlace ./module/splat/splat-vnode.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
|
||||
substituteInPlace ./module/splat/splat-linux.c --replace "PATH=/sbin:/usr/sbin:/bin:/usr/bin" "PATH=${coreutils}:/bin"
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-config=${configFile}"
|
||||
] ++ optionals buildKernel [
|
||||
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
|
||||
|
||||
longDescription = ''
|
||||
This kernel module is a porting layer for ZFS to work inside the linux
|
||||
kernel.
|
||||
'';
|
||||
|
||||
homepage = http://zfsonlinux.org/;
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -3,23 +3,15 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sysdig-${version}";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "draios";
|
||||
repo = "sysdig";
|
||||
rev = version;
|
||||
sha256 = "1h3f9nkc5fkvks6va0maq377m9qxnsf4q3f2dc14rdzfvnzidy06";
|
||||
sha256 = "0xw4in2yb3ynpc8jwl95j92kbyr7fzda3mab8nyxcyld7gshrlvd";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Sysdig fails to run on linux kernels with unified cgroups enabled
|
||||
url = https://github.com/draios/sysdig/files/909689/0001-Fix-for-linux-kernels-with-cgroup-v2-API-enabled.patch.txt;
|
||||
sha256 = "10nmisifa500hzpa3899rs837bcal72pnqidxmrnr1js187z8j84";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl jq gcc
|
||||
];
|
||||
|
||||
@ -13,149 +13,105 @@ let
|
||||
buildKernel = any (n: n == configFile) [ "kernel" "all" ];
|
||||
buildUser = any (n: n == configFile) [ "user" "all" ];
|
||||
|
||||
common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args:
|
||||
if buildKernel &&
|
||||
(incompatibleKernelVersion != null) &&
|
||||
versionAtLeast kernel.version incompatibleKernelVersion then
|
||||
throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."
|
||||
else stdenv.mkDerivation rec {
|
||||
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zfsonlinux";
|
||||
repo = "zfs";
|
||||
rev = "zfs-${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "zfsonlinux";
|
||||
repo = "zfs";
|
||||
rev = "zfs-${version}";
|
||||
sha256 = "16z0fl282rsmvgk608ii7n410swivkrisp112n2fhhjc1fs0zall";
|
||||
};
|
||||
|
||||
patches = extraPatches;
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
|
||||
sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ autoreconfHook nukeReferences ]
|
||||
++ optionals buildKernel [ spl ]
|
||||
++ optionals buildUser [ zlib libuuid python attr ];
|
||||
buildInputs = [ autoreconfHook nukeReferences ]
|
||||
++ optionals buildKernel [ spl ]
|
||||
++ optionals buildUser [ zlib libuuid python attr ];
|
||||
|
||||
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
|
||||
NIX_CFLAGS_LINK = "-lgcc_s";
|
||||
# for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work
|
||||
NIX_CFLAGS_LINK = "-lgcc_s";
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs"
|
||||
substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs"
|
||||
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount"
|
||||
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount"
|
||||
substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest"
|
||||
substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb"
|
||||
substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
|
||||
substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d"
|
||||
substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
|
||||
substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
|
||||
substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp"
|
||||
substituteInPlace ./etc/systemd/system/zfs-share.service.in \
|
||||
--replace "@bindir@/rm " "${coreutils}/bin/rm "
|
||||
preConfigure = ''
|
||||
substituteInPlace ./module/zfs/zfs_ctldir.c --replace "umount -t zfs" "${utillinux}/bin/umount -t zfs"
|
||||
substituteInPlace ./module/zfs/zfs_ctldir.c --replace "mount -t zfs" "${utillinux}/bin/mount -t zfs"
|
||||
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount"
|
||||
substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/mount" "${utillinux}/bin/mount"
|
||||
substituteInPlace ./udev/rules.d/* --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
|
||||
substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/ztest" "$out/sbin/ztest"
|
||||
substituteInPlace ./cmd/ztest/ztest.c --replace "/usr/sbin/zdb" "$out/sbin/zdb"
|
||||
substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"
|
||||
substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d"
|
||||
substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
|
||||
substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc"
|
||||
substituteInPlace ./module/Makefile.in --replace "/bin/cp" "cp"
|
||||
substituteInPlace ./etc/systemd/system/zfs-share.service.in \
|
||||
--replace "@bindir@/rm " "${coreutils}/bin/rm "
|
||||
./autogen.sh
|
||||
'';
|
||||
|
||||
for f in ./udev/rules.d/*
|
||||
do
|
||||
substituteInPlace "$f" --replace "/lib/udev/vdev_id" "$out/lib/udev/vdev_id"
|
||||
done
|
||||
configureFlags = [
|
||||
"--with-config=${configFile}"
|
||||
] ++ optionals buildUser [
|
||||
"--with-dracutdir=$(out)/lib/dracut"
|
||||
"--with-udevdir=$(out)/lib/udev"
|
||||
"--with-systemdunitdir=$(out)/etc/systemd/system"
|
||||
"--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
|
||||
"--with-mounthelperdir=$(out)/bin"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--enable-systemd"
|
||||
] ++ optionals buildKernel [
|
||||
"--with-spl=${spl}/libexec/spl"
|
||||
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
./autogen.sh
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
configureFlags = [
|
||||
"--with-config=${configFile}"
|
||||
] ++ optionals buildUser [
|
||||
"--with-dracutdir=$(out)/lib/dracut"
|
||||
"--with-udevdir=$(out)/lib/udev"
|
||||
"--with-systemdunitdir=$(out)/etc/systemd/system"
|
||||
"--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
|
||||
"--with-mounthelperdir=$(out)/bin"
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
"--enable-systemd"
|
||||
] ++ optionals buildKernel [
|
||||
"--with-spl=${spl}/libexec/spl"
|
||||
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
|
||||
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
installFlags = [
|
||||
"sysconfdir=\${out}/etc"
|
||||
"DEFAULT_INITCONF_DIR=\${out}/default"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
postInstall = ''
|
||||
# Prevent kernel modules from depending on the Linux -dev output.
|
||||
nuke-refs $(find $out -name "*.ko")
|
||||
'' + optionalString buildUser ''
|
||||
# Remove provided services as they are buggy
|
||||
rm $out/etc/systemd/system/zfs-import-*.service
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=\${out}/etc"
|
||||
"DEFAULT_INITCONF_DIR=\${out}/default"
|
||||
];
|
||||
sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
|
||||
|
||||
postInstall = ''
|
||||
# Prevent kernel modules from depending on the Linux -dev output.
|
||||
nuke-refs $(find $out -name "*.ko")
|
||||
'' + optionalString buildUser ''
|
||||
# Remove provided services as they are buggy
|
||||
rm $out/etc/systemd/system/zfs-import-*.service
|
||||
for i in $out/etc/systemd/system/*; do
|
||||
substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
|
||||
done
|
||||
|
||||
sed -i '/zfs-import-scan.service/d' $out/etc/systemd/system/*
|
||||
# Fix pkgconfig.
|
||||
ln -s ../share/pkgconfig $out/lib/pkgconfig
|
||||
|
||||
for i in $out/etc/systemd/system/*; do
|
||||
substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
|
||||
done
|
||||
# Remove tests because they add a runtime dependency on gcc
|
||||
rm -rf $out/share/zfs/zfs-tests
|
||||
'';
|
||||
|
||||
# Fix pkgconfig.
|
||||
ln -s ../share/pkgconfig $out/lib/pkgconfig
|
||||
|
||||
# Remove tests because they add a runtime dependency on gcc
|
||||
rm -rf $out/share/zfs/zfs-tests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "ZFS Filesystem Linux Kernel module";
|
||||
longDescription = ''
|
||||
ZFS is a filesystem that combines a logical volume manager with a
|
||||
Copy-On-Write filesystem with data integrity detection and repair,
|
||||
snapshotting, cloning, block devices, deduplication, and more.
|
||||
'';
|
||||
homepage = http://zfsonlinux.org/;
|
||||
license = licenses.cddl;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
|
||||
};
|
||||
};
|
||||
in
|
||||
assert any (n: n == configFile) [ "kernel" "user" "all" ];
|
||||
assert buildKernel -> kernel != null && spl != null;
|
||||
{
|
||||
# also check if kernel version constraints in
|
||||
# ./nixos/modules/tasks/filesystems/zfs.nix needs
|
||||
# to be adapted
|
||||
zfsStable = common {
|
||||
# comment/uncomment if breaking kernel versions are known
|
||||
incompatibleKernelVersion = "4.12";
|
||||
|
||||
version = "0.6.5.11";
|
||||
|
||||
# this package should point to the latest release.
|
||||
sha256 = "1wqz43cjr21m3f52ahcikl2798pbzj5sfy16zqxwiqpv7iy09kr3";
|
||||
extraPatches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Mic92/zfs/compare/zfs-0.6.5.8...nixos-zfs-0.6.5.8.patch";
|
||||
sha256 = "14kqqphzg02m9a7qncdhff8958cfzdrvsid3vsrm9k75lqv1w08z";
|
||||
})
|
||||
];
|
||||
inherit spl;
|
||||
};
|
||||
zfsUnstable = common {
|
||||
# comment/uncomment if breaking kernel versions are known
|
||||
incompatibleKernelVersion = null;
|
||||
|
||||
version = "0.7.0-rc5";
|
||||
|
||||
# this package should point to a version / git revision compatible with the latest kernel release
|
||||
sha256 = "1k0fl6lbi5winri58v26k7gngd560hbj0247rnwcbc6j01ixsr5n";
|
||||
extraPatches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
|
||||
sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
|
||||
})
|
||||
];
|
||||
spl = splUnstable;
|
||||
};
|
||||
}
|
||||
meta = {
|
||||
description = "ZFS Filesystem Linux Kernel module";
|
||||
longDescription = ''
|
||||
ZFS is a filesystem that combines a logical volume manager with a
|
||||
Copy-On-Write filesystem with data integrity detection and repair,
|
||||
snapshotting, cloning, block devices, deduplication, and more.
|
||||
'';
|
||||
homepage = http://zfsonlinux.org/;
|
||||
license = licenses.cddl;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
|
||||
# Note: ATM only the libraries have been tested in nixpkgs.
|
||||
stdenv.mkDerivation rec {
|
||||
name = "knot-dns-${version}";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "286671a4ee35a5207b2e45fd0812962b481b1b543bf3d5df3a8c319c26e2f5e9";
|
||||
sha256 = "d78ae231a68ace264f5738c8e57481923bcad7413f3f440c06fa6cc0aded9d8e";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, pkgconfig, utillinux, hexdump, which
|
||||
{ stdenv, fetchurl, pkgconfig, hexdump, which
|
||||
, knot-dns, luajit, libuv, lmdb
|
||||
, cmocka, systemd, hiredis, libmemcached
|
||||
, gnutls, nettle
|
||||
@ -10,11 +10,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "knot-resolver-${version}";
|
||||
version = "1.3.1";
|
||||
version = "1.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
|
||||
sha256 = "cc9631fe1a92628e81e74b324a7f70c0b29840d426de05d7d045fdf85ab01117";
|
||||
sha256 = "846b7496cb6273b831fd52eca09078c0454b06a8a6b792e2125c7b6818246edb";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -23,12 +23,12 @@ let
|
||||
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "17.01";
|
||||
version = "17.07";
|
||||
name = "ejabberd-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
|
||||
sha256 = "02y9f1zxqvqrhapfay3avkys0llpyjsag6rpz5vfig01zqjqzyky";
|
||||
sha256 = "1p8ppp2czjgnq8xnhyksd82npvvx99fwr0g3rrq1wvnwh2vgb8km";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ fakegit ];
|
||||
@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "0flybfhq6qv1ihsjfg9p7191bffip7gpizg29wdbf1x6qgxhpz5r";
|
||||
outputHash = "1q9yzccn4zf5i4hibq1r0i34q4986a93ph4792l1ph07aiisc8p7";
|
||||
};
|
||||
|
||||
configureFlags =
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "virtualgl-lib-${version}";
|
||||
version = "2.5.1";
|
||||
version = "2.5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
|
||||
sha256 = "0n9ngwji9k0hqy81ridndf7z4lwq5dzmqw66r6vxfz15aw0jwd6s";
|
||||
sha256 = "0f1jp7r4vajiksbiq08hkxd5bjj0jxlw7dy5750s52djg1v3hhsg";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo.out}/lib/libturbojpeg.so" ];
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user