mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
Merge branch 'master' into staging
This commit is contained in:
Vladimír Čunát
commit
145d3ea81c
77 changed files with 1669 additions and 930 deletions
|
|
@ -133,7 +133,7 @@
|
|||
<varname>stdenv.mkDerivation</varname>, are defined using this
|
||||
function, which means most packages in the nixpkgs expression,
|
||||
<varname>pkgs</varname>, have this function.
|
||||
</para>
|
||||
</para>
|
||||
|
||||
<para>
|
||||
Example usage:
|
||||
|
|
@ -228,7 +228,7 @@
|
|||
] name)</code> from the <literal>INI</literal> generator. It gets the name
|
||||
of a section and returns a sanitized name. The default
|
||||
<literal>mkSectionName</literal> escapes <literal>[</literal> and
|
||||
<literal>]</literal> with a backslash.
|
||||
<literal>]</literal> with a backslash.
|
||||
</para>
|
||||
|
||||
<note><para>Nix store paths can be converted to strings by enclosing a
|
||||
|
|
@ -524,6 +524,22 @@
|
|||
using its <varname>buildArgs</varname> attribute.
|
||||
</para>
|
||||
|
||||
|
||||
|
||||
<note>
|
||||
<para>
|
||||
If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal>
|
||||
you may need to add <literal>pkgs.iana_etc</literal> to <varname>contents</varname>.
|
||||
</para>
|
||||
</note>
|
||||
|
||||
<note>
|
||||
<para>
|
||||
If you see errors similar to <literal>Error_Protocol ("certificate has unknown CA",True,UnknownCa)</literal>
|
||||
you may need to add <literal>pkgs.cacert</literal> to <varname>contents</varname>.
|
||||
</para>
|
||||
</note>
|
||||
|
||||
</section>
|
||||
|
||||
<section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
|
||||
|
|
|
|||
|
|
@ -860,7 +860,8 @@ folder and not downloaded again.
|
|||
|
||||
Following rules are desired to be respected:
|
||||
|
||||
* Make sure package builds for all python interpreters. Use `disabled` argument to `buildPythonPackage` to set unsupported interpreters.
|
||||
* If tests need to be disabled for a package, make sure you leave a comment about reasoning.
|
||||
* Packages in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
|
||||
* Python libraries are supposed to be in `python-packages.nix` and packaged with `buildPythonPackage`. Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
|
||||
* Python libraries are supposed to be called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules/<name>/default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
|
||||
* Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
|
||||
* Make sure libraries build for all Python interpreters.
|
||||
* By default we enable tests. Make sure the tests are found and, in the case of libraries, are passing for all interpreters. If certain tests fail they can be disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why.
|
||||
* Commit names of Python libraries should include `pythonPackages`, for example `pythonPackages.numpy: 1.11 -> 1.12`.
|
||||
|
|
|
|||
|
|
@ -478,6 +478,7 @@
|
|||
sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
|
||||
taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
|
||||
tailhook = "Paul Colomiets <paul@colomiets.name>";
|
||||
takikawa = "Asumu Takikawa <asumu@igalia.com>";
|
||||
taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
|
||||
tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
|
||||
teh = "Tom Hunger <tehunger@gmail.com>";
|
||||
|
|
|
|||
|
|
@ -27,7 +27,11 @@ users.extraUsers.youruser.extraGroups = [ "networkmanager" ];
|
|||
<para>NetworkManager is controlled using either <command>nmcli</command> or
|
||||
<command>nmtui</command> (curses-based terminal user interface). See their
|
||||
manual pages for details on their usage. Some desktop environments (GNOME, KDE)
|
||||
have their own configuration tools for NetworkManager.</para>
|
||||
have their own configuration tools for NetworkManager. On XFCE, there is no
|
||||
configuration tool for NetworkManager by default: by adding
|
||||
<code>networkmanagerapplet</code> to the list of system packages, the graphical
|
||||
applet will be installed and will launch automatically when XFCE is starting
|
||||
(and will show in the status tray).</para>
|
||||
|
||||
<note><para><code>networking.networkmanager</code> and
|
||||
<code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same
|
||||
|
|
|
|||
|
|
@ -27,17 +27,21 @@ the following lines:
|
|||
<programlisting>
|
||||
services.xserver.desktopManager.kde5.enable = true;
|
||||
services.xserver.desktopManager.xfce.enable = true;
|
||||
services.xserver.desktopManager.gnome3.enable = true;
|
||||
services.xserver.windowManager.xmonad.enable = true;
|
||||
services.xserver.windowManager.twm.enable = true;
|
||||
services.xserver.windowManager.icewm.enable = true;
|
||||
services.xserver.windowManager.i3.enable = true;
|
||||
</programlisting>
|
||||
</para>
|
||||
|
||||
<para>NixOS’s default <emphasis>display manager</emphasis> (the
|
||||
program that provides a graphical login prompt and manages the X
|
||||
server) is SLiM. You can select KDE’s <command>sddm</command> instead:
|
||||
server) is SLiM. You can select an alternative one by picking one
|
||||
of the following lines:
|
||||
<programlisting>
|
||||
services.xserver.displayManager.sddm.enable = true;
|
||||
services.xserver.displayManager.lightdm.enable = true;
|
||||
</programlisting>
|
||||
</para>
|
||||
|
||||
|
|
|
|||
|
|
@ -217,6 +217,18 @@ following incompatible changes:</para>
|
|||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>
|
||||
Iputils no longer provide ping6 and traceroute6. The functionality of
|
||||
these tools have been integrated into ping and traceroute respectively. To
|
||||
enforce an address family the new flags <literal>-4</literal> and
|
||||
<literal>-6</literal> have been added. One notable incompatibility is that
|
||||
specifying an interface (for link-local IPv6 for instance) is no longer done
|
||||
with the <literal>-I</literal> flag, but by encoding the interface into the
|
||||
address (<literal>ping fe80::1%eth0</literal>).
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
</itemizedlist>
|
||||
|
||||
|
||||
|
|
|
|||
26
nixos/modules/hardware/usb-wwan.nix
Normal file
26
nixos/modules/hardware/usb-wwan.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
###### interface
|
||||
|
||||
options = {
|
||||
|
||||
hardware.usbWwan = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable this option to support USB WWAN adapters.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
###### implementation
|
||||
|
||||
config = mkIf config.hardware.usbWwan.enable {
|
||||
services.udev.packages = with pkgs; [ usb-modeswitch-data ];
|
||||
};
|
||||
}
|
||||
|
|
@ -38,6 +38,7 @@
|
|||
./hardware/network/rtl8192c.nix
|
||||
./hardware/opengl.nix
|
||||
./hardware/pcmcia.nix
|
||||
./hardware/usb-wwan.nix
|
||||
./hardware/video/amdgpu.nix
|
||||
./hardware/video/amdgpu-pro.nix
|
||||
./hardware/video/ati.nix
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ let
|
|||
|
||||
inherit (config.security) wrapperDir wrappers;
|
||||
|
||||
parentWrapperDir = dirOf wrapperDir;
|
||||
|
||||
programs =
|
||||
(lib.mapAttrsToList
|
||||
(n: v: (if v ? "program" then v else v // {program=n;}))
|
||||
|
|
@ -15,8 +17,7 @@ let
|
|||
hardeningEnable = [ "pie" ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
parentWrapperDir=$(dirname ${wrapperDir})
|
||||
gcc -Wall -O2 -DWRAPPER_DIR=\"$parentWrapperDir\" \
|
||||
gcc -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \
|
||||
-lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper
|
||||
'';
|
||||
};
|
||||
|
|
@ -156,6 +157,11 @@ in
|
|||
|
||||
security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount";
|
||||
|
||||
boot.specialFileSystems.${parentWrapperDir} = {
|
||||
fsType = "tmpfs";
|
||||
options = [ "nodev" ];
|
||||
};
|
||||
|
||||
# Make sure our wrapperDir exports to the PATH env variable when
|
||||
# initializing the shell
|
||||
environment.extraInit = ''
|
||||
|
|
@ -183,19 +189,15 @@ in
|
|||
# Remove the old /run/setuid-wrappers-dir path from the
|
||||
# system as well...
|
||||
#
|
||||
# TDOO: this is only necessary for ugprades 16.09 => 17.x;
|
||||
# TODO: this is only necessary for ugprades 16.09 => 17.x;
|
||||
# this conditional removal block needs to be removed after
|
||||
# the release.
|
||||
if [ -d /run/setuid-wrapper-dirs ]; then
|
||||
rm -rf /run/setuid-wrapper-dirs
|
||||
fi
|
||||
|
||||
# Get the "/run/wrappers" path, we want to place the tmpdirs
|
||||
# for the wrappers there
|
||||
parentWrapperDir="$(dirname ${wrapperDir})"
|
||||
|
||||
mkdir -p "$parentWrapperDir"
|
||||
wrapperDir=$(mktemp --directory --tmpdir="$parentWrapperDir" wrappers.XXXXXXXXXX)
|
||||
# We want to place the tmpdirs for the wrappers to the parent dir.
|
||||
wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
|
||||
chmod a+rx $wrapperDir
|
||||
|
||||
${lib.concatStringsSep "\n" mkWrappedPrograms}
|
||||
|
|
@ -207,13 +209,6 @@ in
|
|||
ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp
|
||||
mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir}
|
||||
rm --force --recursive $old
|
||||
elif [ -d ${wrapperDir} ]; then
|
||||
# Compatibility with old state, just remove the folder and symlink
|
||||
rm -f ${wrapperDir}/*
|
||||
# if it happens to be a tmpfs
|
||||
${pkgs.utillinux}/bin/umount ${wrapperDir} || true
|
||||
rm -d ${wrapperDir}
|
||||
ln -d --symbolic $wrapperDir ${wrapperDir}
|
||||
else
|
||||
# For initial setup
|
||||
ln --symbolic $wrapperDir ${wrapperDir}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ in {
|
|||
preStart = "chmod 755 /var/lib/vnstat";
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.vnstat}/bin/vnstatd -n";
|
||||
ExecReload = "kill -HUP $MAINPID";
|
||||
ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID";
|
||||
ProtectHome = true;
|
||||
PrivateDevices = true;
|
||||
PrivateTmp = true;
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@ let
|
|||
${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)}
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
pidFile = "/run/openntpd.pid";
|
||||
|
||||
in
|
||||
{
|
||||
###### interface
|
||||
|
|
@ -67,7 +70,11 @@ in
|
|||
wants = [ "network-online.target" "time-sync.target" ];
|
||||
before = [ "time-sync.target" ];
|
||||
after = [ "dnsmasq.service" "bind.service" "network-online.target" ];
|
||||
serviceConfig.ExecStart = "${package}/sbin/ntpd -d -f ${cfgFile} ${cfg.extraOptions}";
|
||||
serviceConfig = {
|
||||
ExecStart = "${package}/sbin/ntpd -f ${cfgFile} -p ${pidFile} ${cfg.extraOptions}";
|
||||
Type = "forking";
|
||||
PIDFile = pidFile;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,15 +8,30 @@ in
|
|||
|
||||
{
|
||||
options = {
|
||||
services.xserver.windowManager.herbstluftwm.enable = mkEnableOption "herbstluftwm";
|
||||
services.xserver.windowManager.herbstluftwm = {
|
||||
enable = mkEnableOption "herbstluftwm";
|
||||
|
||||
configFile = mkOption {
|
||||
default = null;
|
||||
type = with types; nullOr path;
|
||||
description = ''
|
||||
Path to the herbstluftwm configuration file. If left at the
|
||||
default value, $XDG_CONFIG_HOME/herbstluftwm/autostart will
|
||||
be used.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.xserver.windowManager.session = singleton {
|
||||
name = "herbstluftwm";
|
||||
start = "
|
||||
${pkgs.herbstluftwm}/bin/herbstluftwm
|
||||
";
|
||||
start =
|
||||
let configFileClause = optionalString
|
||||
(cfg.configFile != null)
|
||||
''-c "${cfg.configFile}"''
|
||||
;
|
||||
in "${pkgs.herbstluftwm}/bin/herbstluftwm ${configFileClause}";
|
||||
};
|
||||
environment.systemPackages = [ pkgs.herbstluftwm ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -383,6 +383,10 @@ system("@systemd@/bin/systemctl", "reset-failed");
|
|||
# Make systemd reload its units.
|
||||
system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
|
||||
|
||||
# Set the new tmpfiles
|
||||
print STDERR "setting up tmpfiles\n";
|
||||
system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3;
|
||||
|
||||
# Reload units that need it. This includes remounting changed mount
|
||||
# units.
|
||||
if (scalar(keys %unitsToReload) > 0) {
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ let
|
|||
${let env = cfg.globalEnvironment // def.environment;
|
||||
in concatMapStrings (n:
|
||||
let s = optionalString (env."${n}" != null)
|
||||
"Environment=\"${n}=${env.${n}}\"\n";
|
||||
"Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";
|
||||
in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
|
||||
${if def.reloadIfChanged then ''
|
||||
X-ReloadIfChanged=true
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ in
|
|||
# Sync mount options with systemd's src/core/mount-setup.c: mount_table.
|
||||
boot.specialFileSystems = {
|
||||
"/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; };
|
||||
"/run" = { fsType = "tmpfs"; options = [ "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; };
|
||||
"/run" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; };
|
||||
"/dev" = { fsType = "devtmpfs"; options = [ "nosuid" "strictatime" "mode=755" "size=${config.boot.devSize}" ]; };
|
||||
"/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; };
|
||||
"/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "gid=${toString config.ids.gids.tty}" ]; };
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ in
|
|||
default = null;
|
||||
example = {
|
||||
address = "131.211.84.1";
|
||||
device = "enp3s0";
|
||||
interface = "enp3s0";
|
||||
};
|
||||
type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
|
||||
description = ''
|
||||
|
|
@ -371,7 +371,7 @@ in
|
|||
default = null;
|
||||
example = {
|
||||
address = "2001:4d0:1e04:895::1";
|
||||
device = "enp3s0";
|
||||
interface = "enp3s0";
|
||||
};
|
||||
type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
|
||||
description = ''
|
||||
|
|
@ -960,14 +960,8 @@ in
|
|||
source = "${pkgs.iputils.out}/bin/ping";
|
||||
capabilities = "cap_net_raw+p";
|
||||
};
|
||||
|
||||
ping6 = {
|
||||
source = "${pkgs.iputils.out}/bin/ping6";
|
||||
capabilities = "cap_net_raw+p";
|
||||
};
|
||||
} else {
|
||||
ping.source = "${pkgs.iputils.out}/bin/ping";
|
||||
"ping6".source = "${pkgs.iputils.out}/bin/ping6";
|
||||
};
|
||||
|
||||
# Set the host and domain names in the activation script. Don't
|
||||
|
|
|
|||
|
|
@ -13,6 +13,9 @@ let
|
|||
auth_unix_rw = "none"
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
qemuConfigFile = pkgs.writeText "qemu.conf" ''
|
||||
${cfg.qemuVerbatimConfig}
|
||||
'';
|
||||
|
||||
in {
|
||||
|
||||
|
|
@ -48,6 +51,18 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
virtualisation.libvirtd.qemuVerbatimConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = ''
|
||||
namespaces = []
|
||||
'';
|
||||
description = ''
|
||||
Contents written to the qemu configuration file, qemu.conf.
|
||||
Make sure to include a proper namespace configuration when
|
||||
supplying custom configuration.
|
||||
'';
|
||||
};
|
||||
|
||||
virtualisation.libvirtd.extraOptions = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ ];
|
||||
|
|
@ -119,6 +134,9 @@ in {
|
|||
cp -npd ${pkgs.libvirt}/var/lib/$i /var/lib/$i
|
||||
done
|
||||
|
||||
# Copy generated qemu config to libvirt directory
|
||||
cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf
|
||||
|
||||
# libvirtd puts the full path of the emulator binary in the machine
|
||||
# config file. But this path can unfortunately be garbage collected
|
||||
# while still being used by the virtual machine. So update the
|
||||
|
|
|
|||
|
|
@ -3,11 +3,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# We're being booted using pv-grub, which means that we need to
|
||||
# generate a GRUB 1 menu without actually installing GRUB.
|
||||
boot.loader.grub.version = 1;
|
||||
boot.loader.grub.version = 2;
|
||||
boot.loader.grub.device = "nodev";
|
||||
boot.loader.grub.extraPerEntryConfig = "root (hd0)";
|
||||
|
||||
boot.initrd.kernelModules =
|
||||
[ "xen-blkfront" "xen-tpmfront" "xen-kbdfront" "xen-fbfront"
|
||||
|
|
|
|||
|
|
@ -109,14 +109,14 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||
|
||||
# ping a few times each to let the routing table establish itself
|
||||
|
||||
$alice->succeed("ping6 -c 4 $carolIp6");
|
||||
$bob->succeed("ping6 -c 4 $carolIp6");
|
||||
$alice->succeed("ping -c 4 $carolIp6");
|
||||
$bob->succeed("ping -c 4 $carolIp6");
|
||||
|
||||
$carol->succeed("ping6 -c 4 $aliceIp6");
|
||||
$carol->succeed("ping6 -c 4 $bobIp6");
|
||||
$carol->succeed("ping -c 4 $aliceIp6");
|
||||
$carol->succeed("ping -c 4 $bobIp6");
|
||||
|
||||
$alice->succeed("ping6 -c 4 $bobIp6");
|
||||
$bob->succeed("ping6 -c 4 $aliceIp6");
|
||||
$alice->succeed("ping -c 4 $bobIp6");
|
||||
$bob->succeed("ping -c 4 $aliceIp6");
|
||||
|
||||
$alice->waitForUnit("httpd.service");
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||
"${containerIp6}" =~ /([^\/]+)\/([0-9+])/;
|
||||
my $ip6 = $1;
|
||||
chomp $ip6;
|
||||
$machine->succeed("ping6 -n -c 1 $ip6");
|
||||
$machine->succeed("ping -n -c 1 $ip6");
|
||||
$machine->succeed("curl --fail http://[$ip6]/ > /dev/null");
|
||||
|
||||
# Stop the container.
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||
|
||||
# Ping on main veth
|
||||
$machine->succeed("ping -n -c 1 192.168.0.100");
|
||||
$machine->succeed("ping6 -n -c 1 fc00::2");
|
||||
$machine->succeed("ping -n -c 1 fc00::2");
|
||||
|
||||
# Ping on the first extra veth
|
||||
$machine->succeed("ping -n -c 1 192.168.1.100 >&2");
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||
# multi-user.target, we should now be able to access it.
|
||||
my $ip = "${localIp}";
|
||||
chomp $ip;
|
||||
$machine->succeed("ping6 -n -c 1 $ip");
|
||||
$machine->succeed("ping -n -c 1 $ip");
|
||||
$machine->succeed("curl --fail http://[$ip]/ > /dev/null");
|
||||
|
||||
# Stop the container.
|
||||
|
|
|
|||
|
|
@ -54,22 +54,22 @@ import ./make-test.nix ({ pkgs, ...} : {
|
|||
}
|
||||
|
||||
subtest "loopback address", sub {
|
||||
$client->succeed("ping6 -c 1 ::1 >&2");
|
||||
$client->fail("ping6 -c 1 ::2 >&2");
|
||||
$client->succeed("ping -c 1 ::1 >&2");
|
||||
$client->fail("ping -c 1 ::2 >&2");
|
||||
};
|
||||
|
||||
subtest "local link addressing", sub {
|
||||
my $clientIp = waitForAddress $client, "eth1", "link";
|
||||
my $serverIp = waitForAddress $server, "eth1", "link";
|
||||
$client->succeed("ping6 -c 1 -I eth1 $clientIp >&2");
|
||||
$client->succeed("ping6 -c 1 -I eth1 $serverIp >&2");
|
||||
$client->succeed("ping -c 1 $clientIp%eth1 >&2");
|
||||
$client->succeed("ping -c 1 $serverIp%eth1 >&2");
|
||||
};
|
||||
|
||||
subtest "global addressing", sub {
|
||||
my $clientIp = waitForAddress $client, "eth1", "global";
|
||||
my $serverIp = waitForAddress $server, "eth1", "global";
|
||||
$client->succeed("ping6 -c 1 $clientIp >&2");
|
||||
$client->succeed("ping6 -c 1 $serverIp >&2");
|
||||
$client->succeed("ping -c 1 $clientIp >&2");
|
||||
$client->succeed("ping -c 1 $serverIp >&2");
|
||||
$client->succeed("curl --fail -g http://[$serverIp]");
|
||||
$client->fail("curl --fail -g http://[$clientIp]");
|
||||
};
|
||||
|
|
|
|||
|
|
@ -166,24 +166,24 @@ let
|
|||
# Test vlan 1
|
||||
$client->waitUntilSucceeds("ping -c 1 192.168.1.1");
|
||||
$client->waitUntilSucceeds("ping -c 1 192.168.1.2");
|
||||
$client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1");
|
||||
$client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2");
|
||||
$client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
|
||||
$client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2");
|
||||
|
||||
$router->waitUntilSucceeds("ping -c 1 192.168.1.1");
|
||||
$router->waitUntilSucceeds("ping -c 1 192.168.1.2");
|
||||
$router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1");
|
||||
$router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2");
|
||||
$router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
|
||||
$router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2");
|
||||
|
||||
# Test vlan 2
|
||||
$client->waitUntilSucceeds("ping -c 1 192.168.2.1");
|
||||
$client->waitUntilSucceeds("ping -c 1 192.168.2.2");
|
||||
$client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1");
|
||||
$client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2");
|
||||
$client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1");
|
||||
$client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2");
|
||||
|
||||
$router->waitUntilSucceeds("ping -c 1 192.168.2.1");
|
||||
$router->waitUntilSucceeds("ping -c 1 192.168.2.2");
|
||||
$router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1");
|
||||
$router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2");
|
||||
$router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1");
|
||||
$router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2");
|
||||
'';
|
||||
};
|
||||
dhcpOneIf = {
|
||||
|
|
@ -390,11 +390,11 @@ let
|
|||
$client2->succeed("ip addr >&2");
|
||||
|
||||
# Test ipv6
|
||||
$client1->waitUntilSucceeds("ping6 -c 1 fc00::1");
|
||||
$client1->waitUntilSucceeds("ping6 -c 1 fc00::2");
|
||||
$client1->waitUntilSucceeds("ping -c 1 fc00::1");
|
||||
$client1->waitUntilSucceeds("ping -c 1 fc00::2");
|
||||
|
||||
$client2->waitUntilSucceeds("ping6 -c 1 fc00::1");
|
||||
$client2->waitUntilSucceeds("ping6 -c 1 fc00::2");
|
||||
$client2->waitUntilSucceeds("ping -c 1 fc00::1");
|
||||
$client2->waitUntilSucceeds("ping -c 1 fc00::2");
|
||||
'';
|
||||
};
|
||||
vlan = let
|
||||
|
|
|
|||
|
|
@ -484,10 +484,10 @@
|
|||
debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
version = "0.12";
|
||||
version = "0.14";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.12.tar";
|
||||
sha256 = "1swi4d7fhahimid9j12cypmkz7dlqgffrnhfxy5ra44y3j2b35ph";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.14.tar";
|
||||
sha256 = "07wgcvg038l88gxvjr0gjpjhyk743w22x1rqghz3gkmif0g70say";
|
||||
};
|
||||
packageRequires = [ cl-lib soap-client ];
|
||||
meta = {
|
||||
|
|
@ -822,10 +822,10 @@
|
|||
gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }:
|
||||
elpaBuild {
|
||||
pname = "gnugo";
|
||||
version = "3.0.2";
|
||||
version = "3.1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnugo-3.0.2.tar";
|
||||
sha256 = "12xm960awsn2k8ph1yibhrxdg8iz1icifdqimysg3qxljmhmnb3k";
|
||||
url = "https://elpa.gnu.org/packages/gnugo-3.1.0.tar";
|
||||
sha256 = "0xpjvs250gg71qwapdsb1hlc61gs0gpkjds01srf784fvyxx2gf1";
|
||||
};
|
||||
packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
|
||||
meta = {
|
||||
|
|
@ -2101,10 +2101,10 @@
|
|||
}) {};
|
||||
xpm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "xpm";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xpm-1.0.3.tar";
|
||||
sha256 = "0qckb93xwzcg8iwiv4bd08r60jn0n853czmilz0hyyb1lfi82lp4";
|
||||
url = "https://elpa.gnu.org/packages/xpm-1.0.4.tar";
|
||||
sha256 = "075miyashh9cm3b0gk6ngld3rm8bfgnh4qxnhxmmvjgzf6a64grh";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1124,12 +1124,12 @@
|
|||
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
|
||||
melpaBuild {
|
||||
pname = "anaconda-mode";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "proofit404";
|
||||
repo = "anaconda-mode";
|
||||
rev = "3f473150009f86dac68edb02e2f22850788289a5";
|
||||
sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7";
|
||||
rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059";
|
||||
sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
|
||||
|
|
@ -5178,7 +5178,7 @@
|
|||
corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "corral";
|
||||
version = "0.3";
|
||||
version = "0.3.20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nivekuil";
|
||||
repo = "corral";
|
||||
|
|
@ -6992,8 +6992,8 @@
|
|||
version = "0.7";
|
||||
src = fetchhg {
|
||||
url = "https://bitbucket.com/harsman/dyalog-mode";
|
||||
rev = "9ae0c786e1e7";
|
||||
sha256 = "1a498jkj15vhf2x4an6raghjf9fszrkw0zl617m8pibcn3yrnv62";
|
||||
rev = "c4f10d72febc";
|
||||
sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
|
||||
|
|
@ -7048,22 +7048,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
|
||||
melpaBuild {
|
||||
pname = "e2wm";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwanami";
|
||||
repo = "emacs-window-manager";
|
||||
rev = "397cb6c110c9337cfc1a25ea7fddad00f168613c";
|
||||
sha256 = "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl";
|
||||
rev = "4353d3394c77a49f8f0291c239858c8c5e877549";
|
||||
sha256 = "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/8da85815c39f58552a968ae68ee07c08c53b0f61/recipes/e2wm";
|
||||
sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
|
||||
name = "e2wm";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ window-layout ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/e2wm";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -9781,14 +9781,14 @@
|
|||
pname = "evil-magit";
|
||||
version = "0.4.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "justbur";
|
||||
owner = "emacs-evil";
|
||||
repo = "evil-magit";
|
||||
rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62";
|
||||
sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit";
|
||||
sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
|
||||
sha256 = "02ncki7qrl22804576h76xl4d5lvvk32lzn9gvxn63hb19r0s980";
|
||||
name = "evil-magit";
|
||||
};
|
||||
packageRequires = [ evil magit ];
|
||||
|
|
@ -11022,6 +11022,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flycheck-checkpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "flycheck-checkpatch";
|
||||
version = "0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zpp0";
|
||||
repo = "flycheck-checkpatch";
|
||||
rev = "aca98ea79f8b26a95f9dbdd4142b01fdd2def866";
|
||||
sha256 = "0bs36dp1jy2z9zfq4mnrin9ik0ffl7023h6dx3qbfya1gcxs07py";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/193aaae5640434559cd479df1463ee44eab14d86/recipes/flycheck-checkpatch";
|
||||
sha256 = "1apjn26n663rjddv5iagfs65fdf22049ykmzggybbnprvnmasf55";
|
||||
name = "flycheck-checkpatch";
|
||||
};
|
||||
packageRequires = [ emacs flycheck ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/flycheck-checkpatch";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "flycheck-clojure";
|
||||
|
|
@ -11442,6 +11463,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "flycheck-title";
|
||||
version = "1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Wilfred";
|
||||
repo = "flycheck-title";
|
||||
rev = "2b7a11c39420e517a07d0c95126455c1617f2c61";
|
||||
sha256 = "07p3bwf4mvsdxvqwl9zd35rm6ax6ywqiy8gsh1ag3ygqbmd94cwy";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title";
|
||||
sha256 = "1cxid9qmzy8pl8qkvr6kgvfqm05pjw8cxpz66x619hbkw2vr7sza";
|
||||
name = "flycheck-title";
|
||||
};
|
||||
packageRequires = [ emacs flycheck ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/flycheck-title";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
|
||||
melpaBuild {
|
||||
pname = "flycheck-ycmd";
|
||||
|
|
@ -12879,12 +12921,12 @@
|
|||
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
|
||||
melpaBuild {
|
||||
pname = "git-commit";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "magit";
|
||||
rev = "acba806a823977108bae60438466da71f773a7c8";
|
||||
sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
|
||||
rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
|
||||
sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
|
||||
|
|
@ -13803,12 +13845,12 @@
|
|||
gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "gotham-theme";
|
||||
version = "1.1.6";
|
||||
version = "1.1.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wasamasa";
|
||||
repo = "gotham-theme";
|
||||
rev = "ba781db5c0e6e8e5d20bdc0f623f6b187daf0d9f";
|
||||
sha256 = "1lgljlfxs3gwxr072bvpl55r0b4z78wiww2g093sy7dgxgzgzmq6";
|
||||
rev = "d9b00bd93ab3fed0e7fff99b0dc8773584f5207d";
|
||||
sha256 = "0vrz97w9yzkxl8pc9jmxkxvj5nagpnzqq9pvavwmvlh68wrh58gi";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
|
||||
|
|
@ -15782,22 +15824,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm-projectile, lib, melpaBuild, perspeen }:
|
||||
helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }:
|
||||
melpaBuild {
|
||||
pname = "helm-perspeen";
|
||||
version = "0.1.0";
|
||||
version = "0.1.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jimo1001";
|
||||
repo = "helm-perspeen";
|
||||
rev = "28c91e4e8a43921457f047a548366dd799c07f69";
|
||||
sha256 = "1zn7k0v734d9qcp79p3ajz6kr4hdxqiwi82i2rplg7y4ylikq0jq";
|
||||
rev = "aec145d5196aed1689563d138a2aa37b139e1759";
|
||||
sha256 = "1wv13mvm9149nl9p93znl3d2yfnq4rph440ja07w804cd61qjhq9";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen";
|
||||
sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y";
|
||||
name = "helm-perspeen";
|
||||
};
|
||||
packageRequires = [ helm-projectile perspeen ];
|
||||
packageRequires = [ helm perspeen ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/helm-perspeen";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -17381,12 +17423,12 @@
|
|||
imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "imenu-list";
|
||||
version = "0.5";
|
||||
version = "0.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bmag";
|
||||
repo = "imenu-list";
|
||||
rev = "a68d596b437ce1c125d8bd5414467ca1ff55bdcc";
|
||||
sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
|
||||
rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f";
|
||||
sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
|
||||
|
|
@ -17989,12 +18031,12 @@
|
|||
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ivy-erlang-complete";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "s-kostyaev";
|
||||
repo = "ivy-erlang-complete";
|
||||
rev = "f5bee7c5368d55be4ebca30610b73c33978830cf";
|
||||
sha256 = "0lcydjg8kyxdv5bbly0jf4d5wl4z7s63i536gvnlz0wfgj5swp5v";
|
||||
rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af";
|
||||
sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
|
||||
|
|
@ -18094,12 +18136,12 @@
|
|||
ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
|
||||
melpaBuild {
|
||||
pname = "ivy-youtube";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "squiter";
|
||||
repo = "ivy-youtube";
|
||||
rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e";
|
||||
sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b";
|
||||
rev = "32f609f1d1a3718739be5797e020d6266d8340d2";
|
||||
sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube";
|
||||
|
|
@ -19968,12 +20010,12 @@
|
|||
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
|
||||
melpaBuild {
|
||||
pname = "magit";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "magit";
|
||||
rev = "acba806a823977108bae60438466da71f773a7c8";
|
||||
sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
|
||||
rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
|
||||
sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
|
||||
|
|
@ -20122,12 +20164,12 @@
|
|||
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "magit-popup";
|
||||
version = "2.10.1";
|
||||
version = "2.10.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "magit";
|
||||
rev = "acba806a823977108bae60438466da71f773a7c8";
|
||||
sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
|
||||
rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
|
||||
sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
|
||||
|
|
@ -20287,27 +20329,6 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
malabar-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "malabar-mode";
|
||||
version = "20140303.946";
|
||||
src = fetchFromGitHub {
|
||||
owner = "m0smith";
|
||||
repo = "malabar-mode";
|
||||
rev = "4c5fde559f518509763a55040fdb0e4b6b04856a";
|
||||
sha256 = "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/29bbefd1e3cc5726584c89244fb5d8ecd18200c3/recipes/malabar-mode";
|
||||
sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
|
||||
name = "malabar-mode";
|
||||
};
|
||||
packageRequires = [ fringe-helper ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/malabar-mode";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
|
||||
melpaBuild {
|
||||
pname = "malinka";
|
||||
|
|
@ -20738,12 +20759,12 @@
|
|||
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
|
||||
melpaBuild {
|
||||
pname = "meghanada";
|
||||
version = "0.6.0";
|
||||
version = "0.6.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopemope";
|
||||
repo = "meghanada-emacs";
|
||||
rev = "9f73f1b0656a6a2ea55bbacf7659ffd3b35cdd9d";
|
||||
sha256 = "0hnhzkkggv035x0qkxmw64migq6v6jpg8m6ayfc95avimyf1j67r";
|
||||
rev = "bcbd1701745c2dc0b161fdf428f3db3887dfa48a";
|
||||
sha256 = "1zs9b8ijwj7b61m3az4k5ch89siz4hy74adz9k4amaab9s6chzcf";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
|
||||
|
|
@ -22476,12 +22497,12 @@
|
|||
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "ob-http";
|
||||
version = "0.0.5";
|
||||
version = "0.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zweifisch";
|
||||
repo = "ob-http";
|
||||
rev = "47a7b367314f6051715882e46a0e40477bda20a2";
|
||||
sha256 = "1y5izm9yxa556536mnpc8dp0nzm8wzr778qycpk4l9xfyp4xybaw";
|
||||
rev = "9155a413e41d918042e9839399e3940aa0f8499c";
|
||||
sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
|
||||
|
|
@ -22795,8 +22816,8 @@
|
|||
src = fetchFromGitHub {
|
||||
owner = "OmniSharp";
|
||||
repo = "omnisharp-emacs";
|
||||
rev = "e7eaa1202486f996121cc0ef17a8d72b915c8165";
|
||||
sha256 = "1f66k2l996vzf5rm2scyz4bv1cyn365a8yfh1cfq13vrmvah57xb";
|
||||
rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367";
|
||||
sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
|
||||
|
|
@ -23342,22 +23363,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "org-mime";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "org-mime";
|
||||
repo = "org-mime";
|
||||
rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8";
|
||||
sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn";
|
||||
rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481";
|
||||
sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
|
||||
sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6";
|
||||
name = "org-mime";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/org-mime";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -26861,12 +26882,12 @@
|
|||
railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "railscasts-reloaded-theme";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeorgeous";
|
||||
repo = "railscasts-reloaded-theme";
|
||||
rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f";
|
||||
sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk";
|
||||
rev = "077af9cb791d9eba4c561cd7cb3b10d2fcfc39d2";
|
||||
sha256 = "1wd6j7m3w81rks6q8mrq5n6p6in0bc93szksds7sx2j2rz6vhfkn";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
|
||||
|
|
@ -28476,12 +28497,12 @@
|
|||
selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "selectric-mode";
|
||||
version = "1.4";
|
||||
version = "1.4.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rbanffy";
|
||||
repo = "selectric-mode";
|
||||
rev = "e60703d9a6c9944270d77bc829dae3a8b092346f";
|
||||
sha256 = "04i5rrn93hzcf8zzfli2ams927lm83hl4q6w2azcg24lhldaqf8p";
|
||||
rev = "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e";
|
||||
sha256 = "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
|
||||
|
|
@ -31202,12 +31223,12 @@
|
|||
tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "tern";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ternjs";
|
||||
repo = "tern";
|
||||
rev = "459b6705bada72027fbb922f4097b4dcf0ab305d";
|
||||
sha256 = "1b95sw2fmnyfsw6c25a2nhkxcwqypgpnnw7yn1wfry6i81p8j8kg";
|
||||
rev = "e6a7777f273050098fa7074577ac196bae59d80b";
|
||||
sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
|
||||
|
|
@ -31223,12 +31244,12 @@
|
|||
tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
|
||||
melpaBuild {
|
||||
pname = "tern-auto-complete";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ternjs";
|
||||
repo = "tern";
|
||||
rev = "459b6705bada72027fbb922f4097b4dcf0ab305d";
|
||||
sha256 = "1b95sw2fmnyfsw6c25a2nhkxcwqypgpnnw7yn1wfry6i81p8j8kg";
|
||||
rev = "e6a7777f273050098fa7074577ac196bae59d80b";
|
||||
sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
|
||||
|
|
@ -33181,12 +33202,12 @@
|
|||
window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "window-layout";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwanami";
|
||||
repo = "emacs-window-layout";
|
||||
rev = "9caf5be4ff1b5d1e141783d7133dab7a46424fef";
|
||||
sha256 = "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif";
|
||||
rev = "cd2e4f967b610c2bbef53182829e47250d027056";
|
||||
sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b17efdf8b7306eadf37e331fc1d585b42f37b09/recipes/window-layout";
|
||||
|
|
@ -33870,6 +33891,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "yankpad";
|
||||
version = "1.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kungsgeten";
|
||||
repo = "yankpad";
|
||||
rev = "d2ea6920a2444f1ce6f53947640446b8e16f84b7";
|
||||
sha256 = "1lw2d25rwszk35bi3gm3bg0cb30b8c2bf3p32b89shnsmwylw52m";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
|
||||
sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4";
|
||||
name = "yankpad";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/yankpad";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "yascroll";
|
||||
|
|
|
|||
|
|
@ -172,12 +172,12 @@ in
|
|||
|
||||
idea-community = buildIdea rec {
|
||||
name = "idea-community-${version}";
|
||||
version = "2016.3.3";
|
||||
version = "2016.3.4";
|
||||
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
src = fetchurl {
|
||||
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
|
||||
sha256 = "1v9rzfj84fyz3m3b6bh45jns8wcil9n8f8mfha0x8m8534r6w368";
|
||||
sha256 = "712dccd726b43e2187e8025a6effb711d35310b36d553dbf7bf85400ec1cec15";
|
||||
};
|
||||
wmClass = "jetbrains-idea-ce";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
From beb9ad0149adfe448acfa650fb3e171d5fdd7e27 Mon Sep 17 00:00:00 2001
|
||||
From: Moritz Ulrich <moritz@tarn-vedra.de>
|
||||
Date: Wed, 22 Feb 2017 15:28:11 +0100
|
||||
Subject: [PATCH] Disable `-fno-operator-names`
|
||||
|
||||
---
|
||||
core/CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
|
||||
index 89e06827e6..01d0c88ea9 100644
|
||||
--- a/core/CMakeLists.txt
|
||||
+++ b/core/CMakeLists.txt
|
||||
@@ -98,6 +98,8 @@ include(MacroOpenCV)
|
||||
include(MacroJPEG)
|
||||
include(MacroBoolTo01)
|
||||
|
||||
+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||
+
|
||||
# ==================================================================================================
|
||||
|
||||
option(ENABLE_OPENCV3 "Build digiKam with OpenCV3 instead OpenCV2 (default=OFF)" OFF)
|
||||
--
|
||||
2.11.1
|
||||
|
||||
|
|
@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ cmake ecm makeQtWrapper ];
|
||||
|
||||
patches = [ ./0001-Disable-fno-operator-names.patch ];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtxmlpatterns
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "albert-${version}";
|
||||
version = "0.8.11";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manuelschneid3r";
|
||||
repo = "albert";
|
||||
rev = "v${version}";
|
||||
sha256 = "12ag30l3dd05hg0d08ax4c8dvp24lgd677szkq445xzvvhggxr37";
|
||||
sha256 = "026vcnx893wrggx0v07x66vc179mpil2p90lzb16n070qn3jb58n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake makeQtWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "marathon-${version}";
|
||||
version = "1.3.6";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
|
||||
sha256 = "12a6ah6qsx1ap6y7sps4vwkq8lyc08k1qnak2mnsa04ifrx9z0dy";
|
||||
sha256 = "1wpzsvvmk19qrwzwj7k12rngry1qriiqnjzq2q2pbpv5w0zb1fz5";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper jdk mesos ];
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
homepage = https://mesosphere.github.io/marathon;
|
||||
description = "Cluster-wide init and control system for services in cgroups or Docker containers";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ rushmorem kamilchm kevincox ];
|
||||
maintainers = with maintainers; [ rushmorem kamilchm kevincox pradeepchhetri ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "terragrunt-${version}";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
goPackagePath = "github.com/gruntwork-io/terragrunt";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
rev = "v${version}";
|
||||
owner = "gruntwork-io";
|
||||
repo = "terragrunt";
|
||||
sha256 = "04q9wm8dnbm1pcy9i3c7ral49k3z10a7gx7h6h4bsvjy1sdf58vz";
|
||||
sha256 = "0xbg8kirdd4na7g1fk2xwh3rk07jrlmral6yhzzblpdyr4v26vlg";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/aws/aws-sdk-go";
|
||||
rev = "f85f603a3e5b4d0eb9516dddb33778918f3b45c6";
|
||||
sha256 = "10frgavkbsqpfninrlgwh64qjx9rwyjzbdfrikciv75v1gljh6zv";
|
||||
rev = "3d7773ac930d57ef4a59e0d10c5f65a0cfa5acd6";
|
||||
sha256 = "0jgyybih4vhlja76x5wjsvdbvq3v14yllzfi36f2527bby18g1hc";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -50,8 +50,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/hashicorp/hcl";
|
||||
rev = "372e8ddaa16fd67e371e9323807d056b799360af";
|
||||
sha256 = "1hv8p1858k1b99p3yc2jj6h77bl0iv9ziyzyp4w3xlcci2s13hnr";
|
||||
rev = "630949a3c5fa3c613328e1b8256052cbc2327c9b";
|
||||
sha256 = "00lalg0gz7218gnw6zgn28gfizpcl8zw8jpkghn681vj7lfah5dh";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "utox-${version}";
|
||||
version = "0.12.2";
|
||||
# > 0.13 should have unit tests and dbus support
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uTox";
|
||||
repo = "uTox";
|
||||
rev = "v${version}";
|
||||
sha256 = "1y26dpx0qc01mhv2f325ymyc3r7ihayrr10rp25p1bs24010azwn";
|
||||
sha256 = "0hdcbhmjwxhs3mr72w6x6yfnk8b0drsqyj40grg8dc0gb1x8y82j";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -24,8 +25,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = false;
|
||||
|
||||
makeFlags = "PREFIX=$(out)";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Lightweight Tox client";
|
||||
license = licenses.gpl3;
|
||||
|
|
|
|||
|
|
@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
|
|||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
||||
version = "2.0.70790.1031";
|
||||
version = "2.0.81497.0116";
|
||||
src = fetchurl {
|
||||
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
|
||||
sha256 = "0kkg3bqv8zwhpxgrssa7ds00dxhdimnq2vfklgrdqn5qzbij31hd";
|
||||
sha256 = "1lq59l5vxirjgcsrl6r4nqgvjr519gkn69alffv1f1fwq5vzif7j";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
|
|
|||
|
|
@ -31,7 +31,13 @@ in stdenv.mkDerivation {
|
|||
++ optionals stdenv.isLinux [ libcap libnl ]
|
||||
++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
|
||||
|
||||
patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
|
||||
patches = [ ./wireshark-lookup-dumpcap-in-path.patch
|
||||
(fetchurl {
|
||||
url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=c7042bedbb3b12c5f4e19e59e52da370d4ffe62f;hp=bc2b135677110d8065ba1174f09bc7f5ba73b9e9";
|
||||
sha256 = "1m70akywf2r52lhlvzr720vl1i7ng9cqbzaiif8s81xs4g4nn2rz";
|
||||
name = "wireshark-CVE-2017-6014.patch";
|
||||
})
|
||||
];
|
||||
|
||||
postInstall = optionalString (withQt || withGtk) ''
|
||||
${optionalString withGtk ''
|
||||
|
|
|
|||
49
pkgs/applications/office/trytond/default.nix
Normal file
49
pkgs/applications/office/trytond/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ stdenv, fetchurl, python2Packages
|
||||
, withPostgresql ? true }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
name = "trytond-${version}";
|
||||
version = "4.2.1";
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/t/trytond/${name}.tar.gz";
|
||||
sha256 = "1ijjpbsf3s0s7ksbi7xgzss4jgr14q5hqsyf6d68l8hwardrwpj7";
|
||||
};
|
||||
|
||||
# Tells the tests which database to use
|
||||
DB_NAME = ":memory:";
|
||||
|
||||
buildInputs = with python2Packages; [
|
||||
mock
|
||||
];
|
||||
propagatedBuildInputs = with python2Packages; ([
|
||||
dateutil
|
||||
lxml
|
||||
polib
|
||||
python-sql
|
||||
relatorio
|
||||
werkzeug
|
||||
wrapt
|
||||
|
||||
# extra dependencies
|
||||
bcrypt
|
||||
pydot
|
||||
python-Levenshtein
|
||||
simplejson
|
||||
] ++ stdenv.lib.optional withPostgresql psycopg2);
|
||||
meta = {
|
||||
description = "The server of the Tryton application platform";
|
||||
longDescription = ''
|
||||
The server for Tryton, a three-tier high-level general purpose
|
||||
application platform under the license GPL-3 written in Python and using
|
||||
PostgreSQL as database engine.
|
||||
|
||||
It is the core base of a complete business solution providing
|
||||
modularity, scalability and security.
|
||||
'';
|
||||
homepage = http://www.tryton.org/;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ maintainers.johbo ];
|
||||
};
|
||||
}
|
||||
25
pkgs/applications/science/chemistry/pymol/default.nix
Normal file
25
pkgs/applications/science/chemistry/pymol/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ stdenv, fetchurl, python27Packages, glew, freeglut, libpng, libxml2, tk, freetype }:
|
||||
|
||||
let
|
||||
version = "1.8.4.0";
|
||||
in
|
||||
python27Packages.buildPythonApplication {
|
||||
name = "pymol-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/pymol/pymol/1.8/pymol-v1.8.4.0.tar.bz2";
|
||||
sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n";
|
||||
};
|
||||
|
||||
buildInputs = [ python27Packages.numpy glew freeglut libpng libxml2 tk freetype ];
|
||||
NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
|
||||
|
||||
installPhase = ''
|
||||
python setup.py install --home=$out
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Python-enhanced molecular graphics tool";
|
||||
homepage = "https://www.pymol.org/";
|
||||
license = licenses.psfl;
|
||||
};
|
||||
}
|
||||
|
|
@ -22,7 +22,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gitlab-${version}";
|
||||
version = "8.16.4";
|
||||
version = "8.16.6";
|
||||
|
||||
buildInputs = [ env ruby bundler tzdata git nodejs procps ];
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "gitlabhq";
|
||||
repo = "gitlabhq";
|
||||
rev = "v${version}";
|
||||
sha256 = "118p3c9i9r2acc0yv5jzw9p7hql5pbp37k54qzrfgrs8vjjxi14i";
|
||||
sha256 = "03rzms2frwx4c09l2rig1amlxj965s2iq421i52j8wj2khb7pd7g";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
{ stdenv, fetchdarcs, rustPlatform, openssl, libssh }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
name = "pijul-${version}";
|
||||
version = "0.2-6ab9ba";
|
||||
|
||||
src = fetchdarcs {
|
||||
url = "http://pijul.org/";
|
||||
context = ./pijul.org.context;
|
||||
sha256 = "1cgkcr5wdkwj7s0rda90bfchbwmchgi60w5d637894w20hkplsr4";
|
||||
};
|
||||
|
||||
sourceRoot = "fetchdarcs/pijul";
|
||||
|
||||
depsSha256 = "110bj2lava1xs75z6k34aip7zb7rcmnxk5hmiyi32i9hs0ddsdrz";
|
||||
|
||||
cargoUpdateHook = ''
|
||||
cp -r ../libpijul src/
|
||||
'';
|
||||
|
||||
setSourceRoot = ''
|
||||
chmod -R u+w "$sourceRoot"
|
||||
cp -r "$sourceRoot"/../libpijul "$sourceRoot"/src/
|
||||
'';
|
||||
|
||||
buildInputs = [ openssl libssh ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://pijul.org/;
|
||||
description = "Fast DVCS based on a categorical theory of patches";
|
||||
license = licenses.gpl3;
|
||||
platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb
|
||||
maintainers = with maintainers; [ puffnfresh ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
|
||||
Context:
|
||||
|
||||
[+libpijul/Cargo.lock
|
||||
pe@pijul.org**20160212063509
|
||||
Ignore-this: e5a696b13850b36668a41aedb7bd1b74
|
||||
]
|
||||
|
||||
[+pijul/Cargo.lock
|
||||
pe@pijul.org**20160212063451
|
||||
Ignore-this: a621a502d1701cb63e6b5c8fd0afbde8
|
||||
]
|
||||
|
||||
[Error detection, gnupg messages
|
||||
pe@pijul.org**20160210101417
|
||||
Ignore-this: 3c517e122c1eca1df9520aed8fd3b0ea
|
||||
]
|
||||
|
||||
[Login command
|
||||
pe@pijul.org**20160210055826
|
||||
Ignore-this: 7be5618dc418554a82c5f8a68cc8f515
|
||||
]
|
||||
|
||||
[Extra functions for the nest
|
||||
pe@pijul.org**20160208205519
|
||||
Ignore-this: 39c8cbed5517b31bc846493e6ffefc76
|
||||
]
|
||||
|
||||
[Timestamp in RFC3339
|
||||
pe@pijul.org**20160208145551
|
||||
Ignore-this: dd114fe418052570572d73e443683d85
|
||||
]
|
||||
|
||||
[Combined external_hash and contents in libpijul (makes it easier to print patches)
|
||||
pe@pijul.org**20160208145450
|
||||
Ignore-this: 69f588e1bab551bffd719fa05ad7080a
|
||||
]
|
||||
|
||||
[disentangle output in libpijul
|
||||
florent.becker@ens-lyon.org**20160208094544
|
||||
Ignore-this: 2dc35255cf48d77eb0c4ba2dde6d4f98
|
||||
]
|
||||
|
||||
[Disentangle libpijul::Repository::local_diff
|
||||
florent.becker@ens-lyon.org**20160207104631
|
||||
Ignore-this: 65b119358afa95eb013e84c0d7a250d9
|
||||
]
|
||||
|
||||
[remove redundant import
|
||||
florent.becker@ens-lyon.org**20160207104613
|
||||
Ignore-this: e3f7873ec678f62f4129be61238c2c0d
|
||||
]
|
||||
|
||||
[Disentangle add_lines and delete_lines in diff
|
||||
florent.becker@ens-lyon.org**20160207102456
|
||||
Ignore-this: 5e89908adf7a519bbe2b2ab399cf0a2
|
||||
]
|
||||
|
||||
[Disentangle libpijul::rec_delete
|
||||
florent.becker@ens-lyon.org**20160206214730
|
||||
Ignore-this: fb6a70c298a38724665c3d6452577649
|
||||
]
|
||||
|
||||
[Make InternalKey type be an array rather than a reference
|
||||
florent.becker@ens-lyon.org**20160205195638
|
||||
Ignore-this: f9b5d15049358b2d8e93322d25a50e58
|
||||
]
|
||||
|
||||
[Ask ssh known_hosts, and new file format
|
||||
pe@pijul.org**20160207120834
|
||||
Ignore-this: f7a7f2ae672a3f6f40a2ac85139d6e10
|
||||
]
|
||||
|
||||
[Handling HTTP errors (when cloning from HTTP)
|
||||
pe@pijul.org**20160204182444
|
||||
Ignore-this: 1805ae8d3b8a4ca49da06e18dd37b151
|
||||
]
|
||||
|
||||
[Small debugging assertions
|
||||
pe@pijul.org**20160203143007
|
||||
Ignore-this: e3d3dddc72511166d606e1751b19411b
|
||||
]
|
||||
|
||||
[Two unused functions back (used in the nest)
|
||||
pe@pijul.org**20160202075743
|
||||
Ignore-this: 8c6904b122c8a78bfa0b9cc5416c943
|
||||
]
|
||||
|
||||
[TAG 0.2
|
||||
pe@pijul.org**20160202073939
|
||||
Ignore-this: 1e9d04d5ffe231ffaccaf9c4ccb684d3
|
||||
]
|
||||
|
|
@ -12,7 +12,7 @@ let
|
|||
stage1Dir = "lib/rkt/stage1-images";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "1.24.0";
|
||||
version = "1.25.0";
|
||||
name = "rkt-${version}";
|
||||
BUILDDIR="build-${name}";
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "coreos";
|
||||
repo = "rkt";
|
||||
rev = "v${version}";
|
||||
sha256 = "11vp3pm00xsksdgdv67sgvrrpj3ayp7sx1wprn4aa579vbbr83bd";
|
||||
sha256 = "0lcnhyaxq8z0ndwqg0svcc1gg0ahhcprxlf9gifm4mpxqimhaz8j";
|
||||
};
|
||||
|
||||
stage1BaseImage = fetchurl {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,20 @@ let
|
|||
rev = "refs/tags/qemu-xen-${version}";
|
||||
sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2";
|
||||
};
|
||||
patches = [
|
||||
(xsaPatch {
|
||||
name = "197-4.5-qemuu";
|
||||
sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "208-qemuu-4.7";
|
||||
sha256 = "0z9b1whr8rp2riwq7wndzcnd7vw1ckwx0vbk098k2pcflrzppgrb";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "209-qemuu";
|
||||
sha256 = "05df4165by6pzxrnizkw86n2f77k9i1g4fqqpws81ycb9ng4jzin";
|
||||
})
|
||||
];
|
||||
}
|
||||
{ git = { name = "qemu-xen-traditional";
|
||||
url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
|
||||
|
|
@ -48,6 +62,24 @@ let
|
|||
rev = "refs/tags/xen-${version}";
|
||||
sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r";
|
||||
};
|
||||
patches = [
|
||||
(xsaPatch {
|
||||
name = "197-4.5-qemut";
|
||||
sha256 = "17l7npw00gyhqzzaqamwm9cawfvzm90zh6jjyy95dmqbh7smvy79";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "199-trad";
|
||||
sha256 = "0dfw6ciycw9a9s97sbnilnzhipnzmdm9f7xcfngdjfic8cqdcv42";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "208-qemut";
|
||||
sha256 = "0960vhchixp60j9h2lawgbgzf6mpcdk440kblk25a37bd6172l54";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "209-qemut";
|
||||
sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r";
|
||||
})
|
||||
];
|
||||
}
|
||||
{ git = { name = "xen-libhvm";
|
||||
url = https://github.com/ts468/xen-libhvm;
|
||||
|
|
@ -63,12 +95,6 @@ let
|
|||
}
|
||||
];
|
||||
|
||||
# Note this lacks patches for:
|
||||
# XSA-201
|
||||
# XSA-199
|
||||
# XSA-197
|
||||
# they didn't apply, and there are plenty of other patches here
|
||||
# to get this deployed as-is.
|
||||
xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
|
||||
./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
|
||||
./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
|
||||
|
|
@ -116,6 +142,10 @@ let
|
|||
name = "204-4.5";
|
||||
sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
|
||||
})
|
||||
(xsaPatch {
|
||||
name = "207";
|
||||
sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -242,6 +242,14 @@ rec {
|
|||
|
||||
eval "$preVM"
|
||||
|
||||
if [ "$enableParallelBuilding" = 1 ]; then
|
||||
if [ ''${NIX_BUILD_CORES:-0} = 0 ]; then
|
||||
QEMU_OPTS+=" -smp cpus=$(nproc)"
|
||||
else
|
||||
QEMU_OPTS+=" -smp cpus=$NIX_BUILD_CORES"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Write the command to start the VM to a file so that the user can
|
||||
# debug inside the VM if the build fails (when Nix is called with
|
||||
# the -K option to preserve the temporary build directory).
|
||||
|
|
@ -1154,6 +1162,32 @@ rec {
|
|||
unifiedSystemDir = true;
|
||||
};
|
||||
|
||||
fedora25i386 = {
|
||||
name = "fedora-25-i386";
|
||||
fullName = "Fedora 25 (i386)";
|
||||
packagesList = fetchurl rec {
|
||||
url = "mirror://fedora/linux/releases/25/Everything/i386/os/repodata/${sha256}-primary.xml.gz";
|
||||
sha256 = "4d399e5eebb8d543d50e2da274348280fae07a6efcc469491784582b39d73bba";
|
||||
};
|
||||
urlPrefix = mirror://fedora/linux/releases/25/Everything/i386/os;
|
||||
archs = ["noarch" "i386" "i586" "i686"];
|
||||
packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
|
||||
unifiedSystemDir = true;
|
||||
};
|
||||
|
||||
fedora25x86_64 = {
|
||||
name = "fedora-25-x86_64";
|
||||
fullName = "Fedora 25 (x86_64)";
|
||||
packagesList = fetchurl rec {
|
||||
url = "mirror://fedora/linux/releases/25/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz";
|
||||
sha256 = "eaea04bff7327c49d90240992dff2be6d451a1758ef83e94825f23d4ff27e868";
|
||||
};
|
||||
urlPrefix = mirror://fedora/linux/releases/25/Everything/x86_64/os;
|
||||
archs = ["noarch" "x86_64"];
|
||||
packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
|
||||
unifiedSystemDir = true;
|
||||
};
|
||||
|
||||
opensuse103i386 = {
|
||||
name = "opensuse-10.3-i586";
|
||||
fullName = "openSUSE 10.3 (i586)";
|
||||
|
|
@ -1793,6 +1827,40 @@ rec {
|
|||
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
|
||||
};
|
||||
|
||||
ubuntu1610i386 = {
|
||||
name = "ubuntu-16.10-yakkety-i386";
|
||||
fullName = "Ubuntu 16.10 Yakkety (i386)";
|
||||
packagesLists =
|
||||
[ (fetchurl {
|
||||
url = mirror://ubuntu/dists/yakkety/main/binary-i386/Packages.xz;
|
||||
sha256 = "da811f582779a969f738f2366c17e075cf0da3c4f2a4ed1926093a2355fd72ba";
|
||||
})
|
||||
(fetchurl {
|
||||
url = mirror://ubuntu/dists/yakkety/universe/binary-i386/Packages.xz;
|
||||
sha256 = "5162b0a87173cd5dea7ce2273788befe36f38089d44a2379ed9dd92f76c6b2aa";
|
||||
})
|
||||
];
|
||||
urlPrefix = mirror://ubuntu;
|
||||
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
|
||||
};
|
||||
|
||||
ubuntu1610x86_64 = {
|
||||
name = "ubuntu-16.10-yakkety-amd64";
|
||||
fullName = "Ubuntu 16.10 Yakkety (amd64)";
|
||||
packagesList =
|
||||
[ (fetchurl {
|
||||
url = mirror://ubuntu/dists/yakkety/main/binary-amd64/Packages.xz;
|
||||
sha256 = "356c4cfab0d7f77b75c473cd78b22ee7288f63b24c9739049924dc081dd2e3d1";
|
||||
})
|
||||
(fetchurl {
|
||||
url = mirror://ubuntu/dists/yakkety/universe/binary-amd64/Packages.xz;
|
||||
sha256 = "a72660f8feffd6978e3b9328c6259b5387ac0b4f33d1029e4a17091ceb5057e6";
|
||||
})
|
||||
];
|
||||
urlPrefix = mirror://ubuntu;
|
||||
packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
|
||||
};
|
||||
|
||||
debian40i386 = {
|
||||
name = "debian-4.0r9-etch-i386";
|
||||
fullName = "Debian 4.0r9 Etch (i386)";
|
||||
|
|
|
|||
28
pkgs/data/fonts/stix-two/default.nix
Normal file
28
pkgs/data/fonts/stix-two/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchurl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "stix-two-${version}";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip";
|
||||
sha256 = "0f6rcg0p2dhnks523nywgkjk56bjajz3gnwsrap932674xxjkb3g";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip ];
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/fonts/opentype
|
||||
cp -v "Fonts/OTF/"*.otf $out/share/fonts/opentype
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.stixfonts.org/;
|
||||
description = "Fonts for Scientific and Technical Information eXchange";
|
||||
license = licenses.ofl;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.rycee ];
|
||||
};
|
||||
}
|
||||
|
|
@ -70,6 +70,7 @@ let
|
|||
kdf = callPackage ./kdf.nix {};
|
||||
kgpg = callPackage ./kgpg.nix {};
|
||||
khelpcenter = callPackage ./khelpcenter.nix {};
|
||||
kig = callPackage ./kig.nix {};
|
||||
kio-extras = callPackage ./kio-extras.nix {};
|
||||
kmime = callPackage ./kmime.nix {};
|
||||
kmix = callPackage ./kmix.nix {};
|
||||
|
|
|
|||
26
pkgs/desktops/kde-5/applications/kig.nix
Normal file
26
pkgs/desktops/kde-5/applications/kig.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
kdeApp, lib, kdeWrapper
|
||||
, ecm, kdoctools, kparts
|
||||
, qtsvg, qtxmlpatterns, ktexteditor, boost
|
||||
}:
|
||||
|
||||
let
|
||||
unwrapped =
|
||||
kdeApp {
|
||||
name = "kig";
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 ];
|
||||
maintainers = with lib.maintainers; [ raskin ];
|
||||
};
|
||||
nativeBuildInputs = [ ecm kdoctools ];
|
||||
buildInputs = [
|
||||
kparts qtsvg qtxmlpatterns ktexteditor boost
|
||||
];
|
||||
};
|
||||
in
|
||||
kdeWrapper {
|
||||
inherit unwrapped;
|
||||
targets = [ "bin/kig" ];
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -724,7 +724,7 @@ self: super: {
|
|||
});
|
||||
|
||||
# test suite cannot find its own "idris" binary
|
||||
idris = dontCheck super.idris;
|
||||
idris = doJailbreak (dontCheck super.idris);
|
||||
|
||||
# https://github.com/bos/math-functions/issues/25
|
||||
math-functions = dontCheck super.math-functions;
|
||||
|
|
|
|||
28
pkgs/development/libraries/fstrm/default.nix
Normal file
28
pkgs/development/libraries/fstrm/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "fstrm-${version}";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "farsightsec";
|
||||
repo = "fstrm";
|
||||
rev = "v${version}";
|
||||
sha256 = "1n8hpywjgkzm0xh0hvryf5r6v2sbpgr3qy0grxq9yha7kqcam4f3";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
buildInputs = [ libevent ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Frame Streams implementation in C";
|
||||
homepage = https://github.com/farsightsec/fstrm;
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
30
pkgs/development/libraries/ndpi/default.nix
Normal file
30
pkgs/development/libraries/ndpi/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }:
|
||||
|
||||
let version = "1.8"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ndpi-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ntop";
|
||||
repo = "nDPI";
|
||||
rev = "${version}";
|
||||
sha256 = "0kxp9dv4d1nmr2cxv6zsfy2j14wyb0q6am0qyxg0npjb08p7njf4";
|
||||
};
|
||||
|
||||
configureScript = "./autogen.sh";
|
||||
|
||||
nativeBuildInputs = [which autoconf automake libtool];
|
||||
buildInputs = [libpcap];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A library for deep-packet inspection";
|
||||
longDescription = ''
|
||||
nDPI is a library for deep-packet inspection based on OpenDPI.
|
||||
'';
|
||||
homepage = http://www.ntop.org/products/deep-packet-inspection/ndpi/;
|
||||
license = with licenses; lgpl3;
|
||||
maintainers = with maintainers; [ takikawa ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -13,13 +13,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rocksdb-${version}";
|
||||
version = "4.13";
|
||||
version = "5.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "rocksdb";
|
||||
rev = "v${version}";
|
||||
sha256 = "1bxyykj13mw48yk108bkmxlfrp6bd95f27bysayax4lqxkgx0zzw";
|
||||
sha256 = "1smahz67gcd86nkdqaml78lci89dza131mlj5472r4sxjdxsx277";
|
||||
};
|
||||
|
||||
buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "wolfssl-${version}";
|
||||
version = "3.9.10b";
|
||||
version = "3.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wolfSSL";
|
||||
repo = "wolfssl";
|
||||
rev = "v${version}";
|
||||
sha256 = "1hx543kxi4fpxww0y2c05kaav99zmnxm81rq7v7d87qzmvw2g4gx";
|
||||
sha256 = "05j3sg4vdzir89qy6y566wyfpqaz3mn53fiqg7ia4r7wjwhzbzrw";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" "lib" ];
|
||||
|
|
|
|||
16
pkgs/development/python-modules/python-sql/default.nix
Normal file
16
pkgs/development/python-modules/python-sql/default.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ lib, fetchurl, buildPythonPackage }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "python-sql-${version}";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/p/python-sql/${name}.tar.gz";
|
||||
sha256 = "0xik939sxqfqqbpgcsnfjnws692bjip32khgwhq1ycphfy7df3h2";
|
||||
};
|
||||
meta = {
|
||||
homepage = http://python-sql.tryton.org/;
|
||||
description = "A library to write SQL queries in a pythonic way";
|
||||
maintainers = with lib.maintainers; [ johbo ];
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
20
pkgs/development/python-modules/relatorio/default.nix
Normal file
20
pkgs/development/python-modules/relatorio/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{ lib, fetchurl, buildPythonPackage, genshi, lxml }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "relatorio-${version}";
|
||||
version = "0.6.4";
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/r/relatorio/${name}.tar.gz";
|
||||
sha256 = "0lincq79mzgazwd9gh41dybjh9c3n87r83pl8nk3j79aihyfk84z";
|
||||
};
|
||||
propagatedBuildInputs = [
|
||||
genshi
|
||||
lxml
|
||||
];
|
||||
meta = {
|
||||
homepage = http://relatorio.tryton.org/;
|
||||
description = "A templating library able to output odt and pdf files";
|
||||
maintainers = with lib.maintainers; [ johbo ];
|
||||
license = lib.licenses.gpl3;
|
||||
};
|
||||
}
|
||||
22
pkgs/development/python-modules/snakeviz/default.nix
Normal file
22
pkgs/development/python-modules/snakeviz/default.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ stdenv, fetchurl, buildPythonPackage, tornado }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "snakeviz-${version}";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/s/snakeviz/${name}.tar.gz";
|
||||
sha256 = "18vsaw1wmf903fg21zkk6a9b49gj47g52jm5h52g4iygngjhpx79";
|
||||
};
|
||||
|
||||
# Upstream doesn't run tests from setup.py
|
||||
doCheck = false;
|
||||
propagatedBuildInputs = [ tornado ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Browser based viewer for profiling data";
|
||||
homepage = "https://jiffyclub.github.io/snakeviz";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ nixy ];
|
||||
};
|
||||
}
|
||||
32
pkgs/development/python-modules/vowpalwabbit/default.nix
Normal file
32
pkgs/development/python-modules/vowpalwabbit/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ fetchurl, boost, zlib, clang, ncurses, pythonPackages, lib }:
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
name = "vowpalwabbit-${version}";
|
||||
version = "8.3.2";
|
||||
|
||||
src = fetchurl{
|
||||
url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz";
|
||||
sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7";
|
||||
};
|
||||
# vw tries to write some explicit things to home
|
||||
# python installed: The directory '/homeless-shelter/.cache/pip/http'
|
||||
preInstall = ''
|
||||
export HOME=$PWD
|
||||
'';
|
||||
|
||||
buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
|
||||
propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ];
|
||||
|
||||
checkPhase = ''
|
||||
# check-manifest requires a git clone, not a tarball
|
||||
# check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
|
||||
python setup.py check -mrs
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
|
||||
homepage = https://github.com/JohnLangford/vowpal_wabbit;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ teh ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -52,12 +52,12 @@ rec {
|
|||
};
|
||||
|
||||
gradle_latest = gradleGen rec {
|
||||
name = "gradle-3.3";
|
||||
nativeVersion = "0.12";
|
||||
name = "gradle-3.4";
|
||||
nativeVersion = "0.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "14m2m5f5s2cpp6w0x3lkq6lyx5cd7jp0hldnrab0dkyqg31511n5";
|
||||
sha256 = "0192yz1j59mvn6d3sch0yjx6i2fg4nyppkdpbqbbxqymrm6wvl3j";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{ stdenv, fetchFromGitHub, qt4, sqlite, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.9.1";
|
||||
version = "3.8.0";
|
||||
name = "sqlitebrowser-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "sqlitebrowser";
|
||||
owner = "sqlitebrowser";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150";
|
||||
sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 sqlite cmake ];
|
||||
|
|
|
|||
|
|
@ -1,29 +1,27 @@
|
|||
{ stdenv, fetchurl, pkgconfig, libusb1, usb-modeswitch }:
|
||||
|
||||
let
|
||||
version = "20160112";
|
||||
in
|
||||
{ stdenv, fetchurl, pkgconfig, libusb1, tcl, usb-modeswitch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "usb-modeswitch-data-${version}";
|
||||
version = "20170205";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
|
||||
sha256 = "19yzqv0592b9mwgdi7apzw881q70ajyx5d56zr1z5ldi915a8yfn";
|
||||
};
|
||||
url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
|
||||
sha256 = "1l9q4xk02zd0l50bqhyk906wbcs26ji7259q0f7qv3cj52fzvp72";
|
||||
};
|
||||
|
||||
inherit (usb-modeswitch) makeFlags;
|
||||
|
||||
# make clean: we always build from source. It should be necessary on x86_64 only
|
||||
prePatch = ''
|
||||
sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules
|
||||
sed -i "1 i\DESTDIR=$out" Makefile
|
||||
'';
|
||||
|
||||
buildInputs = [ pkgconfig libusb1 usb-modeswitch ];
|
||||
buildInputs = [ libusb1 usb-modeswitch ];
|
||||
# we add tcl here so we can patch in support for new devices by dropping config into
|
||||
# the usb_modeswitch.d directory
|
||||
nativeBuildInputs = [ pkgconfig tcl ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Device database and the rules file for 'multi-mode' USB devices";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (usb-modeswitch.meta) license maintainers platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,31 +1,32 @@
|
|||
{ stdenv, fetchurl, pkgconfig, libusb1 }:
|
||||
|
||||
let
|
||||
version = "2.3.0";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "usb-modeswitch-${version}";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
|
||||
sha256 = "1jqih1g0y78w03rchpw7fjvzwjfakak61qjp7hbr1m5nnsh2dn9p";
|
||||
url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
|
||||
sha256 = "0cvnd16n2sp3w46fy507nl29q39jxxdk5qqbvk1rxaa91llbxh1i";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
"DESTDIR=$(out)"
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
# make clean: we always build from source. It should be necessary on x86_64 only
|
||||
preConfigure = ''
|
||||
find -type f | xargs sed 's@/bin/rm@rm@g' -i
|
||||
make clean
|
||||
mkdir -p $out/{etc,lib/udev,share/man/man1}
|
||||
makeFlags="DESTDIR=$out PREFIX=$out"
|
||||
'';
|
||||
|
||||
buildInputs = [ pkgconfig libusb1 ];
|
||||
buildInputs = [ libusb1 ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A mode switching tool for controlling 'multi-mode' USB devices";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.marcweber ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ marcweber peterhoeg ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
buildGoPackage rec {
|
||||
name = "packer-${version}";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
|
||||
goPackagePath = "github.com/mitchellh/packer";
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
owner = "mitchellh";
|
||||
repo = "packer";
|
||||
rev = "v${version}";
|
||||
sha256 = "05wd8xf4nahpg96wzligk5av10p0xd2msnb3imk67qgbffrlvmvi";
|
||||
sha256 = "1li141y7rfbn021h33dnryhms5xwzqz8d92djnprbh7ba9ff02zm";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
38
pkgs/development/tools/vim-vint/default.nix
Normal file
38
pkgs/development/tools/vim-vint/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ fetchFromGitHub, lib, python3Packages, stdenv }:
|
||||
|
||||
with python3Packages;
|
||||
|
||||
buildPythonApplication rec {
|
||||
name = "vim-vint-${version}";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kuniwak";
|
||||
repo = "vint";
|
||||
rev = "v${version}";
|
||||
sha256 = "0xl166xs7sm404f1qz2s0xcry7fr1hgyvhqhyj1qj0dql9i3xx8v";
|
||||
};
|
||||
|
||||
# For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails.
|
||||
disabled = ! pythonAtLeast "3.5";
|
||||
|
||||
# Prevent setup.py from adding dependencies in run-time and insisting on specific package versions
|
||||
patchPhase = ''
|
||||
substituteInPlace setup.py --replace "return requires" "return []"
|
||||
'';
|
||||
buildInputs = [ coverage pytest pytestcov ];
|
||||
propagatedBuildInputs = [ ansicolor chardet pyyaml ] ;
|
||||
|
||||
# The acceptance tests check for stdout and location of binary files, which fails in nix-build.
|
||||
checkPhase = ''
|
||||
py.test -k "not acceptance"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Fast and Highly Extensible Vim script Language Lint implemented by Python";
|
||||
homepage = "https://github.com/Kuniwak/vint";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ andsild ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -17,6 +17,17 @@ vim-with-plugins in PATH:
|
|||
set hidden
|
||||
'';
|
||||
|
||||
# store your plugins in Vim packages
|
||||
vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
|
||||
# loaded on launch
|
||||
start = [ youcompleteme fugitive ];
|
||||
# manually loadable by calling `:packadd $plugin-name`
|
||||
opt = [ phpCompletion elm-vim ];
|
||||
# To automatically load a plugin when opening a filetype, add vimrc lines like:
|
||||
# autocmd FileType php :packadd phpCompletion
|
||||
};
|
||||
|
||||
# plugins can also be managed by VAM
|
||||
vimrcConfig.vam.knownPlugins = pkgs.vimPlugins; # optional
|
||||
vimrcConfig.vam.pluginDictionaries = [
|
||||
# load always
|
||||
|
|
@ -154,6 +165,7 @@ let
|
|||
in lib.uniqList { inputList = recurseNames [] names; };
|
||||
|
||||
vimrcFile = {
|
||||
packages ? null,
|
||||
vam ? null,
|
||||
pathogen ? null,
|
||||
customRC ? ""
|
||||
|
|
@ -253,6 +265,31 @@ let
|
|||
call vam#Scripts(l, {})
|
||||
'');
|
||||
|
||||
nativeImpl = lib.optionalString (packages != null)
|
||||
(let
|
||||
link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}");
|
||||
packageLinks = (packageName: {start ? [], opt ? []}:
|
||||
["mkdir -p $out/pack/${packageName}/start"]
|
||||
++ (builtins.map (link packageName "start") start)
|
||||
++ ["mkdir -p $out/pack/${packageName}/opt"]
|
||||
++ (builtins.map (link packageName "opt") opt)
|
||||
);
|
||||
packDir = (packages:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "vim-pack-dir";
|
||||
src = ./.;
|
||||
installPhase = lib.concatStringsSep
|
||||
"\n"
|
||||
(lib.flatten (lib.mapAttrsToList packageLinks packages));
|
||||
}
|
||||
);
|
||||
in
|
||||
''
|
||||
set packpath-=~/.vim/after
|
||||
set packpath+=${packDir packages}
|
||||
set packpath+=~/.vim/after
|
||||
'');
|
||||
|
||||
# somebody else could provide these implementations
|
||||
vundleImpl = "";
|
||||
|
||||
|
|
@ -267,6 +304,7 @@ let
|
|||
${pathogenImpl}
|
||||
${vundleImpl}
|
||||
${neobundleImpl}
|
||||
${nativeImpl}
|
||||
|
||||
filetype indent plugin on | syn on
|
||||
|
||||
|
|
@ -385,4 +423,9 @@ rec {
|
|||
vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ];
|
||||
};
|
||||
|
||||
test_vim_with_vim_addon_nix = vim_configurable.customize {
|
||||
name = "vim-with-vim-addon-nix";
|
||||
vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-addon-nix ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap, sp, docbook_sgml_dtd_31
|
||||
{ stdenv, fetchurl
|
||||
, libsysfs, gnutls, openssl
|
||||
, libcap, sp, docbook_sgml_dtd_31
|
||||
, libidn, nettle
|
||||
, SGMLSpm, libgcrypt }:
|
||||
|
||||
assert stdenv ? glibc;
|
||||
|
||||
let
|
||||
time = "20151218";
|
||||
time = "20161105";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "iputils-${time}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.skbuff.net/iputils/iputils-s${time}.tar.bz2";
|
||||
sha256 = "189592jlkhxdgy8jc07m4bsl41ik9r6i6aaqb532prai37bmi7sl";
|
||||
url = "https://github.com/iputils/iputils/archive/s${time}.tar.gz";
|
||||
sha256 = "12mdmh4qbf5610csaw3rkzhpzf6djndi4jsl4gyr8wni0cphj4zq";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
|
@ -21,27 +24,24 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = "USE_GNUTLS=no";
|
||||
|
||||
buildInputs = [
|
||||
libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt
|
||||
libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle
|
||||
];
|
||||
|
||||
buildFlags = "man all ninfod";
|
||||
|
||||
installPhase =
|
||||
''
|
||||
mkdir -p $out/sbin $out/bin
|
||||
cp -p ping ping6 tracepath tracepath6 traceroute6 $out/bin/
|
||||
cp -p clockdiff arping rdisc ninfod/ninfod $out/sbin/
|
||||
mkdir -p $out/bin
|
||||
cp -p ping tracepath clockdiff arping rdisc ninfod/ninfod $out/bin/
|
||||
|
||||
mkdir -p $out/share/man/man8
|
||||
cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \
|
||||
doc/tracepath.8 doc/ninfod.8 doc/traceroute6.8 \
|
||||
cp -p \
|
||||
doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/tracepath.8 doc/ninfod.8 \
|
||||
$out/share/man/man8
|
||||
ln -s $out/share/man/man8/{ping,ping6}.8
|
||||
ln -s $out/share/man/man8/{tracepath,tracepath6}.8
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://www.skbuff.net/iputils/;
|
||||
homepage = https://github.com/iputils/iputils;
|
||||
description = "A set of small useful utilities for Linux networking";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
|
|
|
|||
32
pkgs/os-specific/linux/sch_cake/default.nix
Normal file
32
pkgs/os-specific/linux/sch_cake/default.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ stdenv, lib, fetchFromGitHub, kernel }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "sch_cake-2017-01-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtaht";
|
||||
repo = "sch_cake";
|
||||
rev = "9789742cfc596d48583ba4cdbc8f38d026121fa6";
|
||||
sha256 = "03xgkqrv8d9q8rr21awbld0kvwglyinpm71nk16gvm4rd37c5h76";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "pic" ];
|
||||
|
||||
makeFlags = [
|
||||
"KERNEL_VERSION=${kernel.version}"
|
||||
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -v -m 644 -D sch_cake.ko \
|
||||
$out/lib/modules/${kernel.modDirVersion}/kernel/net/sched/sch_cake.ko
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "The cake qdisc scheduler";
|
||||
homepage = "https://www.bufferbloat.net/projects/codel/wiki/Cake/";
|
||||
license = with licenses; [ bsd3 gpl2 ];
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
|
|||
# configured on the build machine).
|
||||
preConfigure= "
|
||||
configureFlagsArray=(
|
||||
--with-ping-command='/run/wrappers/bin/ping -n -U -w %d -c %d %s'
|
||||
--with-ping6-command='/run/wrappers/bin/ping6 -n -U -w %d -c %d %s'
|
||||
--with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'
|
||||
--with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'
|
||||
)
|
||||
";
|
||||
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
{ stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2017-01-15";
|
||||
version = "2017-02-20";
|
||||
name = "oh-my-zsh-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/robbyrussell/oh-my-zsh";
|
||||
rev = "d2725d44fce59ea7060b4d712c5739512a56882d";
|
||||
sha256 = "064q10yc0n71nqh621nk88ch4wjwwq68wlaaacl5q3llcb4b5pff";
|
||||
rev = "98d8d3429f8b9fc2c4c109fb199a31c8d1735699";
|
||||
sha256 = "1zdjb5dsbr8n7jfmib4a6rhcx9wrp5lw4b8b9xrh164s97hza2d0";
|
||||
};
|
||||
|
||||
pathsToLink = [ "/share/oh-my-zsh" ];
|
||||
|
|
|
|||
|
|
@ -1,23 +1,20 @@
|
|||
{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
|
||||
|
||||
let version = "1.6.0";
|
||||
let version = "1.6.1";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nitrogen-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
|
||||
sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr";
|
||||
sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
buildInputs = [ glib gtkmm2 ];
|
||||
|
||||
NIX_CXXFLAGS_COMPILE = "-std=c++11";
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace data/Makefile.in --replace /usr/share $out/share
|
||||
patchShebangs data/icon-theme-installer
|
||||
'';
|
||||
|
||||
|
|
|
|||
11
pkgs/tools/graphics/bins/cp-dash-f.patch
Normal file
11
pkgs/tools/graphics/bins/cp-dash-f.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/bins 2016-05-18 20:45:49.513330005 -0400
|
||||
+++ b/bins 2016-05-18 20:58:58.957830874 -0400
|
||||
@@ -1332,7 +1332,7 @@
|
||||
mkdir $destDir, 0755
|
||||
or die("\nCannot create $destDir: $?");
|
||||
}
|
||||
- system("cp", "-R", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
|
||||
+ system("cp", "-Rf", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
|
||||
or die("\nCannot copy $staticDir directory content to $destDir: $?");
|
||||
} else {
|
||||
beVerboseN(" Cannot find any static template directory.", 4);
|
||||
|
|
@ -23,7 +23,8 @@ stdenv.mkDerivation {
|
|||
DateTimeFormatDateParse ]; #TODO need Gtk (not Gtk2?) for bins-edit-gui
|
||||
|
||||
patches = [ ./bins_edit-isa.patch
|
||||
./hashref.patch ];
|
||||
./hashref.patch
|
||||
./cp-dash-f.patch ];
|
||||
|
||||
installPhase = ''
|
||||
export DESTDIR=$out;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "antimicro-${version}";
|
||||
version = "2.22";
|
||||
version = "2.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AntiMicro";
|
||||
repo = "antimicro";
|
||||
rev = "${version}";
|
||||
sha256 = "102fh9ysd2dmfc6b73bj88m064jhlglqrz2gd7k9jccadxpbp3mq";
|
||||
sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "efivar-${version}";
|
||||
version = "27";
|
||||
version = "31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rhinstaller";
|
||||
repo = "efivar";
|
||||
rev = version;
|
||||
sha256 = "1vz3hzs9k7bjg2r5bsw1irnfq77lmq9819sg9a7w6w528bvzr4lx";
|
||||
sha256 = "0dhycikylm87jmds4ii5ygwq59g4sa5sv9mzryjzgqlgppw5arli";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
|
|||
|
|
@ -4134,6 +4134,8 @@ with pkgs;
|
|||
|
||||
tryton = callPackage ../applications/office/tryton { };
|
||||
|
||||
trytond = callPackage ../applications/office/trytond { };
|
||||
|
||||
omapd = callPackage ../tools/security/omapd { };
|
||||
|
||||
ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
|
||||
|
|
@ -4226,6 +4228,8 @@ with pkgs;
|
|||
inherit (gnome3) gexiv2;
|
||||
};
|
||||
|
||||
vim-vint = callPackage ../development/tools/vim-vint { };
|
||||
|
||||
vit = callPackage ../applications/misc/vit { };
|
||||
|
||||
vnc2flv = callPackage ../tools/video/vnc2flv {};
|
||||
|
|
@ -7277,6 +7281,8 @@ with pkgs;
|
|||
|
||||
freetts = callPackage ../development/libraries/freetts { };
|
||||
|
||||
fstrm = callPackage ../development/libraries/fstrm { };
|
||||
|
||||
cfitsio = callPackage ../development/libraries/cfitsio { };
|
||||
|
||||
fontconfig_210 = callPackage ../development/libraries/fontconfig/2.10.nix { };
|
||||
|
|
@ -8927,6 +8933,8 @@ with pkgs;
|
|||
|
||||
nanomsg = callPackage ../development/libraries/nanomsg { };
|
||||
|
||||
ndpi = callPackage ../development/libraries/ndpi { };
|
||||
|
||||
notify-sharp = callPackage ../development/libraries/notify-sharp { };
|
||||
|
||||
ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; };
|
||||
|
|
@ -10572,7 +10580,7 @@ with pkgs;
|
|||
|
||||
mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
|
||||
|
||||
riak = callPackage ../servers/nosql/riak/2.1.1.nix { };
|
||||
riak = callPackage ../servers/nosql/riak/2.2.0.nix { };
|
||||
|
||||
riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix {
|
||||
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
|
||||
|
|
@ -10865,7 +10873,8 @@ with pkgs;
|
|||
python = python2; # Incompatible with Python 3x
|
||||
udev = if stdenv.isLinux then udev else null;
|
||||
libdrm = if stdenv.isLinux then libdrm else null;
|
||||
abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override`
|
||||
abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
|
||||
or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
|
||||
} // { inherit xlibsWrapper; } );
|
||||
|
||||
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
|
||||
|
|
@ -11477,6 +11486,8 @@ with pkgs;
|
|||
|
||||
seturgent = callPackage ../os-specific/linux/seturgent { };
|
||||
|
||||
sch_cake = callPackage ../os-specific/linux/sch_cake { };
|
||||
|
||||
inherit (callPackage ../os-specific/linux/spl {
|
||||
configFile = "kernel";
|
||||
inherit kernel;
|
||||
|
|
@ -12331,6 +12342,8 @@ with pkgs;
|
|||
|
||||
stix-otf = callPackage ../data/fonts/stix-otf { };
|
||||
|
||||
stix-two = callPackage ../data/fonts/stix-two { };
|
||||
|
||||
inherit (callPackages ../data/fonts/gdouros { })
|
||||
symbola aegyptus akkadian anatolian maya unidings musica analecta;
|
||||
|
||||
|
|
@ -14420,8 +14433,6 @@ with pkgs;
|
|||
|
||||
pig = callPackage ../applications/networking/cluster/pig { };
|
||||
|
||||
pijul = callPackage ../applications/version-management/pijul { };
|
||||
|
||||
planner = callPackage ../applications/office/planner { };
|
||||
|
||||
playonlinux = callPackage ../applications/misc/playonlinux {
|
||||
|
|
@ -14765,6 +14776,8 @@ with pkgs;
|
|||
|
||||
puremapping = callPackage ../applications/audio/pd-plugins/puremapping { };
|
||||
|
||||
pymol = callPackage ../applications/science/chemistry/pymol { };
|
||||
|
||||
pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { };
|
||||
|
||||
pythonmagick = callPackage ../applications/graphics/PythonMagick { };
|
||||
|
|
|
|||
|
|
@ -3928,10 +3928,10 @@ let self = _self // overrides; _self = with self; {
|
|||
};
|
||||
|
||||
DigestCRC = buildPerlPackage rec {
|
||||
name = "Digest-CRC-0.21";
|
||||
name = "Digest-CRC-0.22.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/O/OL/OLIMAUL/${name}.tar.gz";
|
||||
sha256 = "79a0ef8081767c324edb9da39f80835910ed7c5b0539ed106caf7f2467d1958f";
|
||||
sha256 = "112b50f7fbc6f6baf5d4584ee97f542ced6c9ec03a3147f7902c84b8b26778cb";
|
||||
};
|
||||
meta = {
|
||||
description = "Module that calculates CRC sums of all sorts";
|
||||
|
|
|
|||
|
|
@ -71,6 +71,8 @@ in {
|
|||
|
||||
setuptools = callPackage ../development/python-modules/setuptools { };
|
||||
|
||||
vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; };
|
||||
|
||||
acoustics = buildPythonPackage rec {
|
||||
pname = "acoustics";
|
||||
version = "0.1.2";
|
||||
|
|
@ -332,6 +334,8 @@ in {
|
|||
|
||||
pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
|
||||
|
||||
python-sql = callPackage ../development/python-modules/python-sql { };
|
||||
|
||||
pytimeparse = buildPythonPackage rec {
|
||||
pname = "pytimeparse";
|
||||
version = "1.1.6";
|
||||
|
|
@ -354,6 +358,8 @@ in {
|
|||
|
||||
pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}";
|
||||
|
||||
relatorio = callPackage ../development/python-modules/relatorio { };
|
||||
|
||||
rhpl = if !isPy3k then callPackage ../development/python-modules/rhpl {} else throw "rhpl not supported for interpreter ${python.executable}";
|
||||
|
||||
sip = callPackage ../development/python-modules/sip { };
|
||||
|
|
@ -6762,18 +6768,18 @@ in {
|
|||
};
|
||||
|
||||
evdev = buildPythonPackage rec {
|
||||
version = "0.4.7";
|
||||
version = "0.6.4";
|
||||
name = "evdev-${version}";
|
||||
disabled = isPy34; # see http://bugs.python.org/issue21121
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/e/evdev/${name}.tar.gz";
|
||||
sha256 = "1mz8cfncpxc1wbk2nj7apl0ssqc0vfndysxchq3wabd9vzx5p71k";
|
||||
sha256 = "1wkag91s8j0f45jx5n619z354n8pz8in9krn81hp7hlkhi6p8s2j";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ pkgs.linuxHeaders ];
|
||||
|
||||
patchPhase = "sed -e 's#/usr/include/linux/input.h#${pkgs.linuxHeaders}/include/linux/input.h#' -i setup.py";
|
||||
patchPhase = "sed -e 's#/usr/include/linux/#${pkgs.linuxHeaders}/include/linux/#g' -i setup.py";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -22667,18 +22673,15 @@ in {
|
|||
};
|
||||
|
||||
robotframework = buildPythonPackage rec {
|
||||
version = "2.8.7";
|
||||
version = "3.0.2";
|
||||
name = "robotframework-${version}";
|
||||
disabled = isPy3k;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "mirror://pypi/r/robotframework/${name}.tar.gz";
|
||||
sha256 = "0mfd0s989j3jrpl8q0lb4wsjy1x280chfr9r74m2dyi9c7rxzc58";
|
||||
sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610";
|
||||
};
|
||||
|
||||
# error: invalid command 'test'
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Generic test automation framework";
|
||||
homepage = http://robotframework.org/;
|
||||
|
|
@ -22785,6 +22788,24 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
robotframework-requests = buildPythonPackage rec {
|
||||
version = "0.4.6";
|
||||
name = "robotframework-requests-${version}";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://pypi.python.org/packages/ad/da/51359b11d2005ff425984205677890fafaf270a71b03df22c255501bc99d/robotframework-requests-0.4.6.tar.gz";
|
||||
sha256 = "0416rxg7g0pfg77akljnkass0xz0id26v4saag2q2h1fgwrm7n4q";
|
||||
};
|
||||
|
||||
buildInputs = with self; [ unittest2 ];
|
||||
propagatedBuildInputs = with self; [ robotframework lxml requests2 ];
|
||||
|
||||
meta = {
|
||||
description = "Robot Framework keyword library wrapper around the HTTP client library requests";
|
||||
homepage = https://github.com/bulkan/robotframework-requests;
|
||||
};
|
||||
};
|
||||
|
||||
rootpy = buildPythonPackage rec {
|
||||
version = "0.8.3";
|
||||
name = "rootpy-${version}";
|
||||
|
|
@ -32067,6 +32088,8 @@ EOF
|
|||
|
||||
treq = callPackage ../development/python-modules/treq { };
|
||||
|
||||
snakeviz = callPackage ../development/python-modules/snakeviz { };
|
||||
|
||||
});
|
||||
|
||||
in fix' (extends overrides packages)
|
||||
|
|
|
|||
Loading…
Reference in a new issue