Merge branch 'master' into bugfix/staging/stdenv
This commit is contained in:
Thomas Tuegel
commit
6a004bf9c8
@ -1,5 +1,5 @@
|
||||
{
|
||||
x86_64-linux = "/nix/store/2y3cn6siixhr7pbsz2grry89jzchkxyd-nix-1.11.12";
|
||||
i686-linux = "/nix/store/sbz8z995lysxja8brnxmw7hgi6ljigrq-nix-1.11.12";
|
||||
x86_64-darwin = "/nix/store/gs2z548x41ah2h8fqnbn87syzazrlsb8-nix-1.11.12";
|
||||
x86_64-linux = "/nix/store/avwiw7hb1qckag864sc6ixfxr8qmf94w-nix-1.11.13";
|
||||
i686-linux = "/nix/store/8wv3ms0afw95hzsz4lxzv0nj4w3614z9-nix-1.11.13";
|
||||
x86_64-darwin = "/nix/store/z21lvakv1l7lhasmv5fvaz8mlzxia8k9-nix-1.11.13";
|
||||
}
|
||||
|
||||
@ -243,6 +243,7 @@
|
||||
./services/logging/graylog.nix
|
||||
./services/logging/heartbeat.nix
|
||||
./services/logging/journalbeat.nix
|
||||
./services/logging/journalwatch.nix
|
||||
./services/logging/klogd.nix
|
||||
./services/logging/logcheck.nix
|
||||
./services/logging/logrotate.nix
|
||||
|
||||
@ -77,7 +77,7 @@ in
|
||||
|
||||
systemd.packages = [ pkgs.gnupg ];
|
||||
|
||||
environment.interactiveShellInit = ''
|
||||
environment.extraInit = ''
|
||||
# Bind gpg-agent to this TTY if gpg commands are used.
|
||||
export GPG_TTY=$(tty)
|
||||
|
||||
|
||||
246
nixos/modules/services/logging/journalwatch.nix
Normal file
246
nixos/modules/services/logging/journalwatch.nix
Normal file
@ -0,0 +1,246 @@
|
||||
{ config, lib, pkgs, services, ... }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.journalwatch;
|
||||
user = "journalwatch";
|
||||
dataDir = "/var/lib/${user}";
|
||||
|
||||
journalwatchConfig = pkgs.writeText "config" (''
|
||||
# (File Generated by NixOS journalwatch module.)
|
||||
[DEFAULT]
|
||||
mail_binary = ${cfg.mailBinary}
|
||||
priority = ${toString cfg.priority}
|
||||
mail_from = ${cfg.mailFrom}
|
||||
''
|
||||
+ optionalString (cfg.mailTo != null) ''
|
||||
mail_to = ${cfg.mailTo}
|
||||
''
|
||||
+ cfg.extraConfig);
|
||||
|
||||
journalwatchPatterns = pkgs.writeText "patterns" ''
|
||||
# (File Generated by NixOS journalwatch module.)
|
||||
|
||||
${mkPatterns cfg.filterBlocks}
|
||||
'';
|
||||
|
||||
# empty line at the end needed to to separate the blocks
|
||||
mkPatterns = filterBlocks: concatStringsSep "\n" (map (block: ''
|
||||
${block.match}
|
||||
${block.filters}
|
||||
|
||||
'') filterBlocks);
|
||||
|
||||
|
||||
in {
|
||||
options = {
|
||||
services.journalwatch = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
If enabled, periodically check the journal with journalwatch and report the results by mail.
|
||||
'';
|
||||
};
|
||||
|
||||
priority = mkOption {
|
||||
type = types.int;
|
||||
default = 6;
|
||||
description = ''
|
||||
Lowest priority of message to be considered.
|
||||
A value between 7 ("debug"), and 0 ("emerg"). Defaults to 6 ("info").
|
||||
If you don't care about anything with "info" priority, you can reduce
|
||||
this to e.g. 5 ("notice") to considerably reduce the amount of
|
||||
messages without needing many <option>filterBlocks</option>.
|
||||
'';
|
||||
};
|
||||
|
||||
# HACK: this is a workaround for journalwatch's usage of socket.getfqdn() which always returns localhost if
|
||||
# there's an alias for the localhost on a separate line in /etc/hosts, or take for ages if it's not present and
|
||||
# then return something right-ish in the direction of /etc/hostname. Just bypass it completely.
|
||||
mailFrom = mkOption {
|
||||
type = types.str;
|
||||
default = "journalwatch@${config.networking.hostName}";
|
||||
description = ''
|
||||
Mail address to send journalwatch reports from.
|
||||
'';
|
||||
};
|
||||
|
||||
mailTo = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = ''
|
||||
Mail address to send journalwatch reports to.
|
||||
'';
|
||||
};
|
||||
|
||||
mailBinary = mkOption {
|
||||
type = types.path;
|
||||
default = "/run/wrappers/bin/sendmail";
|
||||
description = ''
|
||||
Sendmail-compatible binary to be used to send the messages.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.str;
|
||||
default = "";
|
||||
description = ''
|
||||
Extra lines to be added verbatim to the journalwatch/config configuration file.
|
||||
You can add any commandline argument to the config, without the '--'.
|
||||
See <literal>journalwatch --help</literal> for all arguments and their description.
|
||||
'';
|
||||
};
|
||||
|
||||
filterBlocks = mkOption {
|
||||
type = types.listOf (types.submodule {
|
||||
options = {
|
||||
match = mkOption {
|
||||
type = types.str;
|
||||
example = "SYSLOG_IDENTIFIER = systemd";
|
||||
description = ''
|
||||
Syntax: <literal>field = value</literal>
|
||||
Specifies the log entry <literal>field</literal> this block should apply to.
|
||||
If the <literal>field</literal> of a message matches this <literal>value</literal>,
|
||||
this patternBlock's <option>filters</option> are applied.
|
||||
If <literal>value</literal> starts and ends with a slash, it is interpreted as
|
||||
an extended python regular expression, if not, it's an exact match.
|
||||
The journal fields are explained in systemd.journal-fields(7).
|
||||
'';
|
||||
};
|
||||
|
||||
filters = mkOption {
|
||||
type = types.str;
|
||||
example = ''
|
||||
(Stopped|Stopping|Starting|Started) .*
|
||||
(Reached target|Stopped target) .*
|
||||
'';
|
||||
description = ''
|
||||
The filters to apply on all messages which satisfy <option>match</option>.
|
||||
Any of those messages that match any specified filter will be removed from journalwatch's output.
|
||||
Each filter is an extended Python regular expression.
|
||||
You can specify multiple filters and separate them by newlines.
|
||||
Lines starting with '#' are comments. Inline-comments are not permitted.
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
|
||||
example = [
|
||||
# examples taken from upstream
|
||||
{
|
||||
match = "_SYSTEMD_UNIT = systemd-logind.service";
|
||||
filters = ''
|
||||
New session [a-z]?\d+ of user \w+\.
|
||||
Removed session [a-z]?\d+\.
|
||||
'';
|
||||
}
|
||||
|
||||
{
|
||||
match = "SYSLOG_IDENTIFIER = /(CROND|crond)/";
|
||||
filters = ''
|
||||
pam_unix\(crond:session\): session (opened|closed) for user \w+
|
||||
\(\w+\) CMD .*
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
# another example from upstream.
|
||||
# very useful on priority = 6, and required as journalwatch throws an error when no pattern is defined at all.
|
||||
default = [
|
||||
{
|
||||
match = "SYSLOG_IDENTIFIER = systemd";
|
||||
filters = ''
|
||||
(Stopped|Stopping|Starting|Started) .*
|
||||
(Created slice|Removed slice) user-\d*\.slice\.
|
||||
Received SIGRTMIN\+24 from PID .*
|
||||
(Reached target|Stopped target) .*
|
||||
Startup finished in \d*ms\.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
description = ''
|
||||
filterBlocks can be defined to blacklist journal messages which are not errors.
|
||||
Each block matches on a log entry field, and the filters in that block then are matched
|
||||
against all messages with a matching log entry field.
|
||||
|
||||
All messages whose PRIORITY is at least 6 (INFO) are processed by journalwatch.
|
||||
If you don't specify any filterBlocks, PRIORITY is reduced to 5 (NOTICE) by default.
|
||||
|
||||
All regular expressions are extended Python regular expressions, for details
|
||||
see: http://doc.pyschools.com/html/regex.html
|
||||
'';
|
||||
};
|
||||
|
||||
interval = mkOption {
|
||||
type = types.str;
|
||||
default = "hourly";
|
||||
description = ''
|
||||
How often to run journalwatch.
|
||||
|
||||
The format is described in systemd.time(7).
|
||||
'';
|
||||
};
|
||||
accuracy = mkOption {
|
||||
type = types.str;
|
||||
default = "10min";
|
||||
description = ''
|
||||
The time window around the interval in which the journalwatch run will be scheduled.
|
||||
|
||||
The format is described in systemd.time(7).
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
users.extraUsers.${user} = {
|
||||
isSystemUser = true;
|
||||
createHome = true;
|
||||
home = dataDir;
|
||||
# for journal access
|
||||
group = "systemd-journal";
|
||||
};
|
||||
|
||||
systemd.services.journalwatch = {
|
||||
environment = {
|
||||
XDG_DATA_HOME = "${dataDir}/share";
|
||||
XDG_CONFIG_HOME = "${dataDir}/config";
|
||||
};
|
||||
serviceConfig = {
|
||||
User = user;
|
||||
Type = "oneshot";
|
||||
PermissionsStartOnly = true;
|
||||
ExecStart = "${pkgs.python3Packages.journalwatch}/bin/journalwatch mail";
|
||||
# lowest CPU and IO priority, but both still in best-effort class to prevent starvation
|
||||
Nice=19;
|
||||
IOSchedulingPriority=7;
|
||||
};
|
||||
preStart = ''
|
||||
chown -R ${user}:systemd-journal ${dataDir}
|
||||
chmod -R u+rwX,go-w ${dataDir}
|
||||
mkdir -p ${dataDir}/config/journalwatch
|
||||
ln -sf ${journalwatchConfig} ${dataDir}/config/journalwatch/config
|
||||
ln -sf ${journalwatchPatterns} ${dataDir}/config/journalwatch/patterns
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.timers.journalwatch = {
|
||||
description = "Periodic journalwatch run";
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = cfg.interval;
|
||||
AccuracySec = cfg.accuracy;
|
||||
Persistent = true;
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = with stdenv.lib.maintainers; [ florianjacob ];
|
||||
};
|
||||
}
|
||||
@ -7,6 +7,10 @@ let
|
||||
cfg = config.services.bitlbee;
|
||||
bitlbeeUid = config.ids.uids.bitlbee;
|
||||
|
||||
bitlbeePkg = if cfg.libpurple_plugins == []
|
||||
then pkgs.bitlbee
|
||||
else pkgs.bitlbee.override { enableLibPurple = true; };
|
||||
|
||||
bitlbeeConfig = pkgs.writeText "bitlbee.conf"
|
||||
''
|
||||
[settings]
|
||||
@ -25,6 +29,12 @@ let
|
||||
${cfg.extraDefaults}
|
||||
'';
|
||||
|
||||
purple_plugin_path =
|
||||
lib.concatMapStringsSep ":"
|
||||
(plugin: "${plugin}/lib/pidgin/")
|
||||
cfg.libpurple_plugins
|
||||
;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
@ -90,6 +100,15 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
libpurple_plugins = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = [];
|
||||
example = literalExample "[ pkgs.purple-matrix ]";
|
||||
description = ''
|
||||
The list of libpurple plugins to install.
|
||||
'';
|
||||
};
|
||||
|
||||
configDir = mkOption {
|
||||
default = "/var/lib/bitlbee";
|
||||
type = types.path;
|
||||
@ -144,14 +163,16 @@ in
|
||||
};
|
||||
|
||||
systemd.services.bitlbee =
|
||||
{ description = "BitlBee IRC to other chat networks gateway";
|
||||
{
|
||||
environment.PURPLE_PLUGIN_PATH = purple_plugin_path;
|
||||
description = "BitlBee IRC to other chat networks gateway";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig.User = "bitlbee";
|
||||
serviceConfig.ExecStart = "${pkgs.bitlbee}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
|
||||
serviceConfig.ExecStart = "${bitlbeePkg}/sbin/bitlbee -F -n -c ${bitlbeeConfig}";
|
||||
};
|
||||
|
||||
environment.systemPackages = [ pkgs.bitlbee ];
|
||||
environment.systemPackages = [ bitlbeePkg ];
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -120,7 +120,7 @@ in
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux
|
||||
wants = [ "keys.target" ];
|
||||
after = [ "network.target" "keys.target" ];
|
||||
after = [ "network-online.target" "keys.target" ];
|
||||
environment = {
|
||||
STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; };
|
||||
};
|
||||
|
||||
@ -23,8 +23,23 @@ let
|
||||
|
||||
privateKey = mkOption {
|
||||
example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk=";
|
||||
type = types.str;
|
||||
description = "Base64 private key generated by wg genkey.";
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Base64 private key generated by wg genkey.
|
||||
|
||||
Warning: Consider using privateKeyFile instead if you do not
|
||||
want to store the key in the world-readable Nix store.
|
||||
'';
|
||||
};
|
||||
|
||||
privateKeyFile = mkOption {
|
||||
example = "/private/wireguard_key";
|
||||
type = with types; nullOr str;
|
||||
default = null;
|
||||
description = ''
|
||||
Private key file as generated by wg genkey.
|
||||
'';
|
||||
};
|
||||
|
||||
listenPort = mkOption {
|
||||
@ -91,7 +106,22 @@ let
|
||||
example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I=";
|
||||
type = with types; nullOr str;
|
||||
description = ''
|
||||
base64 preshared key generated by wg genpsk. Optional,
|
||||
Base64 preshared key generated by wg genpsk. Optional,
|
||||
and may be omitted. This option adds an additional layer of
|
||||
symmetric-key cryptography to be mixed into the already existing
|
||||
public-key cryptography, for post-quantum resistance.
|
||||
|
||||
Warning: Consider using presharedKeyFile instead if you do not
|
||||
want to store the key in the world-readable Nix store.
|
||||
'';
|
||||
};
|
||||
|
||||
presharedKeyFile = mkOption {
|
||||
default = null;
|
||||
example = "/private/wireguard_psk";
|
||||
type = with types; nullOr str;
|
||||
description = ''
|
||||
File pointing to preshared key as generated by wg pensk. Optional,
|
||||
and may be omitted. This option adds an additional layer of
|
||||
symmetric-key cryptography to be mixed into the already existing
|
||||
public-key cryptography, for post-quantum resistance.
|
||||
@ -134,54 +164,59 @@ let
|
||||
|
||||
};
|
||||
|
||||
generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" ''
|
||||
[Interface]
|
||||
PrivateKey = ${values.privateKey}
|
||||
${optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}"}
|
||||
|
||||
${concatStringsSep "\n\n" (map (peer: ''
|
||||
[Peer]
|
||||
PublicKey = ${peer.publicKey}
|
||||
${optionalString (peer.presharedKey != null) "PresharedKey = ${peer.presharedKey}"}
|
||||
${optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep ", " peer.allowedIPs}"}
|
||||
${optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}"}
|
||||
${optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}"}
|
||||
'') values.peers)}
|
||||
'';
|
||||
|
||||
ipCommand = "${pkgs.iproute}/bin/ip";
|
||||
wgCommand = "${pkgs.wireguard}/bin/wg";
|
||||
|
||||
generateUnit = name: values:
|
||||
# exactly one way to specify the private key must be set
|
||||
assert (values.privateKey != null) != (values.privateKeyFile != null);
|
||||
let privKey = if values.privateKeyFile != null then values.privateKeyFile else pkgs.writeText "wg-key" values.privateKey;
|
||||
in
|
||||
nameValuePair "wireguard-${name}"
|
||||
{
|
||||
description = "WireGuard Tunnel - ${name}";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = lib.flatten([
|
||||
ExecStart = flatten([
|
||||
values.preSetup
|
||||
|
||||
"-${ipCommand} link del dev ${name}"
|
||||
"${ipCommand} link add dev ${name} type wireguard"
|
||||
"${wgCommand} setconf ${name} ${generateConf name values}"
|
||||
|
||||
(map (ip:
|
||||
''${ipCommand} address add ${ip} dev ${name}''
|
||||
"${ipCommand} address add ${ip} dev ${name}"
|
||||
) values.ips)
|
||||
|
||||
("${wgCommand} set ${name} private-key ${privKey}" +
|
||||
optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}")
|
||||
|
||||
(map (peer:
|
||||
assert (peer.presharedKeyFile == null) || (peer.presharedKey == null); # at most one of the two must be set
|
||||
let psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile;
|
||||
in
|
||||
"${wgCommand} set ${name} peer ${peer.publicKey}" +
|
||||
optionalString (psk != null) " preshared-key ${psk}" +
|
||||
optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" +
|
||||
optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" +
|
||||
optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}"
|
||||
) values.peers)
|
||||
|
||||
"${ipCommand} link set up dev ${name}"
|
||||
|
||||
(flatten (map (peer: (map (ip:
|
||||
(map (peer: (map (ip:
|
||||
"${ipCommand} route add ${ip} dev ${name}"
|
||||
) peer.allowedIPs)) values.peers))
|
||||
) peer.allowedIPs)) values.peers)
|
||||
|
||||
values.postSetup
|
||||
]);
|
||||
|
||||
ExecStop = [ ''${ipCommand} link del dev "${name}"'' ] ++ values.postShutdown;
|
||||
ExecStop = flatten([
|
||||
"${ipCommand} link del dev ${name}"
|
||||
values.postShutdown
|
||||
]);
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -65,6 +65,7 @@ let
|
||||
gzip_proxied any;
|
||||
gzip_comp_level 9;
|
||||
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
|
||||
gzip_vary on;
|
||||
''}
|
||||
|
||||
${optionalString (cfg.recommendedProxySettings) ''
|
||||
|
||||
5
nixos/modules/virtualisation/azure-images.nix
Normal file
5
nixos/modules/virtualisation/azure-images.nix
Normal file
@ -0,0 +1,5 @@
|
||||
let self = {
|
||||
"16.09" = "https://nixos.blob.core.windows.net/images/nixos-image-16.09.1694.019dcc3-x86_64-linux.vhd";
|
||||
|
||||
latest = self."16.09";
|
||||
}; in self
|
||||
8
nixos/modules/virtualisation/gce-images.nix
Normal file
8
nixos/modules/virtualisation/gce-images.nix
Normal file
@ -0,0 +1,8 @@
|
||||
let self = {
|
||||
"14.12" = "gs://nixos-cloud-images/nixos-14.12.471.1f09b77-x86_64-linux.raw.tar.gz";
|
||||
"15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz";
|
||||
"16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz";
|
||||
"17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
|
||||
|
||||
latest = self."17.03";
|
||||
}; in self
|
||||
33
pkgs/applications/altcoins/dapp.nix
Normal file
33
pkgs/applications/altcoins/dapp.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{ lib, stdenv, fetchFromGitHub, makeWrapper
|
||||
, seth, git, solc, shellcheck, nodejs, hsevm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "dapp";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dapphub";
|
||||
repo = "dapp";
|
||||
rev = "v${version}";
|
||||
sha256 = "1529ml5r1l5g6xcak7k3h3ih214mgnk87jsxyk0rvk245jkard1y";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [makeWrapper shellcheck];
|
||||
buildPhase = "true";
|
||||
doCheck = false;
|
||||
checkPhase = "make test";
|
||||
makeFlags = ["prefix=$(out)"];
|
||||
postInstall = let path = lib.makeBinPath [
|
||||
nodejs solc git seth hsevm
|
||||
]; in ''
|
||||
wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Simple tool for creating Ethereum-based dapps";
|
||||
homepage = https://github.com/dapphub/dapp/;
|
||||
maintainers = [stdenv.lib.maintainers.dbrock];
|
||||
license = lib.licenses.gpl3;
|
||||
inherit version;
|
||||
};
|
||||
}
|
||||
@ -38,6 +38,7 @@ rec {
|
||||
ethabi = callPackage ./ethabi.nix { };
|
||||
ethrun = callPackage ./ethrun.nix { };
|
||||
seth = callPackage ./seth.nix { };
|
||||
dapp = callPackage ./dapp.nix { };
|
||||
|
||||
hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {});
|
||||
|
||||
|
||||
@ -28,10 +28,10 @@
|
||||
ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
|
||||
elpaBuild {
|
||||
pname = "ada-mode";
|
||||
version = "5.2.1";
|
||||
version = "5.2.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-5.2.1.tar";
|
||||
sha256 = "099c8vm6jvwypff981vbs77y6hqq31fn6s8gwqkmncq04mk3vw34";
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-5.2.2.tar";
|
||||
sha256 = "0c0lrj4vgsbawyshqbfb7gvndf0yb97wybqb0b34z7kan7q0xgvd";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs wisi ];
|
||||
meta = {
|
||||
@ -319,14 +319,15 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
cobol-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "cobol-mode";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el";
|
||||
sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/cobol-mode.html";
|
||||
license = lib.licenses.free;
|
||||
@ -360,10 +361,10 @@
|
||||
}) {};
|
||||
company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
|
||||
pname = "company";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.3.tar";
|
||||
sha256 = "1b38najmah4s2smxslik6wbdvb0x77rm6fv45pcq5x5aaiplh5ap";
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.4.tar";
|
||||
sha256 = "1wm2nzjfn9cmjb6f5yvawrss7pg1r0swwwqqx602wg8hjrsiabay";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -821,10 +822,10 @@
|
||||
gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gited";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gited-0.3.1.tar";
|
||||
sha256 = "14ng63hxd6l76r8m54gzqq9j66cqz48ad1zaamn100h4b2rzf2q8";
|
||||
url = "https://elpa.gnu.org/packages/gited-0.3.2.tar";
|
||||
sha256 = "1y40zn1w5m2srrqffkpvvzk3j5zzq21smsqychyx2diggn4c0hgi";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1445,10 +1446,10 @@
|
||||
}) {};
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20170703";
|
||||
version = "20170717";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-20170703.tar";
|
||||
sha256 = "04rg2fldbsxizq84xl6613s8xnwyp8iwmxm167v69bc85xaf7s9s";
|
||||
url = "https://elpa.gnu.org/packages/org-20170717.tar";
|
||||
sha256 = "0jrkfclwlbfcdkf56awnmvyw5vb9qwbfyyf2z4ilwx29zps9mxnh";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1472,10 +1473,10 @@
|
||||
other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "other-frame-window";
|
||||
version = "1.0.3";
|
||||
version = "1.0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/other-frame-window-1.0.3.el";
|
||||
sha256 = "0vq1zfsdnxdjvmb7lkjyax27kfv0rw0141rd5fjnl6ap9yjwpxkv";
|
||||
url = "https://elpa.gnu.org/packages/other-frame-window-1.0.4.el";
|
||||
sha256 = "0hg82j8zjh0ann6bf56r0p8s0y3a016zny8byp80mcvkw63wrn5i";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -1784,10 +1785,10 @@
|
||||
}) {};
|
||||
sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "sokoban";
|
||||
version = "1.4";
|
||||
version = "1.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/sokoban-1.4.tar";
|
||||
sha256 = "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1";
|
||||
url = "https://elpa.gnu.org/packages/sokoban-1.4.2.tar";
|
||||
sha256 = "0sciv7rl1p1ar1jris1py2slrd8kr4q6a4plmb0jq6lv9dlqyvc6";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2130,10 +2131,10 @@
|
||||
wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "wisi";
|
||||
version = "1.1.4";
|
||||
version = "1.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/wisi-1.1.4.tar";
|
||||
sha256 = "1n0bq77vspbxpzs54r0rigb2fhj5a5vm8qxwgdnqdawanmq72l4r";
|
||||
url = "https://elpa.gnu.org/packages/wisi-1.1.5.tar";
|
||||
sha256 = "1q0dbykh9gvh0355vc1lwpriwlqq07jaydqx8zdrs6s0zyffx3a4";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1178,12 +1178,12 @@
|
||||
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
|
||||
melpaBuild {
|
||||
pname = "all-the-icons";
|
||||
version = "2.6.4";
|
||||
version = "3.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "domtronn";
|
||||
repo = "all-the-icons.el";
|
||||
rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a";
|
||||
sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x";
|
||||
rev = "bb69345ead914345faad582723a2b61618f13289";
|
||||
sha256 = "0h8a2jvn2wfi3bqd35scmhm8wh20mlk09sy68m1whi9binzkm8rf";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
|
||||
@ -1606,12 +1606,12 @@
|
||||
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "anything-tramp";
|
||||
version = "0.4.3";
|
||||
version = "0.5.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "masasam";
|
||||
repo = "emacs-anything-tramp";
|
||||
rev = "c4629201a63047f9094be0d9150f201dd5be18ad";
|
||||
sha256 = "0fr4brysc7sk89jp1ggl68r3r6ikrhipb2h5kc1b2a8vz7i05bq9";
|
||||
rev = "c6d0e9bfa0f71c7c0bb75f6df0c82dd81c486f43";
|
||||
sha256 = "08ffw4y14c99jypl1nhiq2k3lbmv3lgw2dgmhkb8lpc1szkjg57m";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
|
||||
@ -1648,12 +1648,12 @@
|
||||
apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "apache-mode";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zonuexe";
|
||||
repo = "apache-mode";
|
||||
rev = "7e79a6602da77b5c3a11dab93d46fef26abc860d";
|
||||
sha256 = "0i4kmw0qbnnfbfih7iwfpihv5d6kh1l9k2b062dvc5mx1vvlr8k8";
|
||||
rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
|
||||
sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
|
||||
@ -1750,6 +1750,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "apropospriate-theme";
|
||||
version = "0.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "waymondo";
|
||||
repo = "apropospriate-theme";
|
||||
rev = "0d918da74a7a225fe5a586e26f5d834e579c5323";
|
||||
sha256 = "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
|
||||
sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
|
||||
name = "apropospriate-theme";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/apropospriate-theme";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "artbollocks-mode";
|
||||
@ -2173,12 +2194,12 @@
|
||||
auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "auto-minor-mode";
|
||||
version = "20170620";
|
||||
version = "20170716";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joewreschnig";
|
||||
repo = "auto-minor-mode";
|
||||
rev = "c91c566cbaf8eac1fff0c7d9eef88308a566cc43";
|
||||
sha256 = "0nq95k2wmq17awjz0kvzwnhpnda0813gdyjzlqpzpqb56092sbif";
|
||||
rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2";
|
||||
sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
|
||||
@ -2662,12 +2683,12 @@
|
||||
beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "beginend";
|
||||
version = "1.1.0";
|
||||
version = "2.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DamienCassou";
|
||||
repo = "beginend";
|
||||
rev = "9c6ad190ecc71373f6ac7485c924f1ef3dce6fc4";
|
||||
sha256 = "05z23amn1s1692y3wzwmbzpnm5m6qskq53aqp47wiyyxn3dq2kdj";
|
||||
rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd";
|
||||
sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
|
||||
@ -3468,8 +3489,8 @@
|
||||
sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw";
|
||||
sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw";
|
||||
sha256 = "0am1nafc16zax8082gjlz0pi85lryjhrx0v80nzgr23iybj5mfx4";
|
||||
name = "calfw";
|
||||
};
|
||||
packageRequires = [];
|
||||
@ -3478,6 +3499,90 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
calfw-cal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "calfw-cal";
|
||||
version = "1.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwanami";
|
||||
repo = "emacs-calfw";
|
||||
rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
|
||||
sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-cal";
|
||||
sha256 = "1wylkd7jl1ifq56jj04l5b9wfrjkhwncxzrjgnbgg1cl2klf6v4m";
|
||||
name = "calfw-cal";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/calfw-cal";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
calfw-howm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "calfw-howm";
|
||||
version = "1.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwanami";
|
||||
repo = "emacs-calfw";
|
||||
rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
|
||||
sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-howm";
|
||||
sha256 = "08cv16cq211sy2v1i0gk7d81f0gyywv0i9szmamnrbjif3rrv2m0";
|
||||
name = "calfw-howm";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/calfw-howm";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
calfw-ical = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "calfw-ical";
|
||||
version = "1.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwanami";
|
||||
repo = "emacs-calfw";
|
||||
rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
|
||||
sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-ical";
|
||||
sha256 = "1bh9ahwp9b5knjxph79kl19fgs48x3w7dga299l0xvbxq2jhs95q";
|
||||
name = "calfw-ical";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/calfw-ical";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
calfw-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "calfw-org";
|
||||
version = "1.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwanami";
|
||||
repo = "emacs-calfw";
|
||||
rev = "c538d3746449b4f0e16b16aad3073d4f7379d805";
|
||||
sha256 = "0r42cagvmvvib76kd15nd9ix55ys6i549vxnls4z16s864695zpa";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cc64274abdc7c8fb904b43d2d036aac98e738131/recipes/calfw-org";
|
||||
sha256 = "1cfpjh08djz3k067w3580yb15p1csks3gzch9c4cbrbcjvg8inh5";
|
||||
name = "calfw-org";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/calfw-org";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
|
||||
melpaBuild {
|
||||
pname = "camcorder";
|
||||
@ -4501,12 +4606,12 @@
|
||||
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "cmake-mode";
|
||||
version = "3.9.0pre5";
|
||||
version = "3.9.0pre6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kitware";
|
||||
repo = "CMake";
|
||||
rev = "372de3f8039f69b3a2edcf7120083ec4097f8bd3";
|
||||
sha256 = "0yvh65b2fz4fpd2rx0q1c3gcidika5zx3nrm2rp4v6z69n2xgd13";
|
||||
rev = "25b72e9097260d1faf254155a1199886c808a58f";
|
||||
sha256 = "0rzy8fpagsqfln1x27mq89dh819jc8h2dlf7axmxq63g830c029q";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
|
||||
@ -4753,12 +4858,12 @@
|
||||
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "company";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "company-mode";
|
||||
repo = "company-mode";
|
||||
rev = "f1499404163d8148e7a6303a8598f9c0f696d1cb";
|
||||
sha256 = "1ncfvf6ndqnn95m02ij66l7674h7chzgwg2r9biymqadzxjxim9i";
|
||||
rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56";
|
||||
sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
|
||||
@ -5869,6 +5974,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
|
||||
melpaBuild {
|
||||
pname = "csound-mode";
|
||||
version = "0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hlolli";
|
||||
repo = "csound-mode";
|
||||
rev = "b0e74f149a15118e8d85bf073b2ff5e0dd3cba7f";
|
||||
sha256 = "0c73xjhqgp1f7bplm47cgpssm8kpj3vda9n0fqcyq5i38ncfqwva";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
|
||||
sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
|
||||
name = "csound-mode";
|
||||
};
|
||||
packageRequires = [ emacs multi shut-up ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/csound-mode";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
csv = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "csv";
|
||||
@ -6040,12 +6166,12 @@
|
||||
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "cython-mode";
|
||||
version = "0.26alpha0";
|
||||
version = "0.26pre1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cython";
|
||||
repo = "cython";
|
||||
rev = "5528995cc6d138456be9b9d42a422a3c5de7800a";
|
||||
sha256 = "1fd3335f2ay24nhicncmy1sz0mcdrminphsv630wkifmykarz9zh";
|
||||
rev = "85a2dfe76a2bc28d4c8c1a760ef04e614f61be73";
|
||||
sha256 = "0gcdwzw952kddvxxgzsj93rqlvh2gs8bghz605zgm97baadvrizy";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
|
||||
@ -7428,6 +7554,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "dtrt-indent";
|
||||
version = "0.2.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jscheid";
|
||||
repo = "dtrt-indent";
|
||||
rev = "a54871bedadabede505b3913ee1039f5ab36cad2";
|
||||
sha256 = "0ylch7q8lh2r10qzrb41bnrpnznvj5fjszazmxfcvj6ss8yrxjzi";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
|
||||
sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
|
||||
name = "dtrt-indent";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/dtrt-indent";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ducpel";
|
||||
@ -7661,12 +7808,12 @@
|
||||
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "easy-hugo";
|
||||
version = "0.9.9";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "masasam";
|
||||
repo = "emacs-easy-hugo";
|
||||
rev = "451a37fb2e1f36d85a85973d4c41c7a249263f62";
|
||||
sha256 = "1s89qs13bnyqmsm7rfzk69hvnh170v2hpbh5adjiicwg3my05dis";
|
||||
rev = "226fa5c661391c7f8317a24c9f757396e1900371";
|
||||
sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
|
||||
@ -7787,12 +7934,12 @@
|
||||
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
|
||||
melpaBuild {
|
||||
pname = "ebib";
|
||||
version = "2.11.3";
|
||||
version = "2.11.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joostkremers";
|
||||
repo = "ebib";
|
||||
rev = "ee28c043492a550c68ca2f465042cd51ef150b9e";
|
||||
sha256 = "0jzw313hn7srr9mhwygl56iibx0wxra4php6pk9isbl338cw3gv0";
|
||||
rev = "9e5f3377a5e9c6956300de3872c89cd902c2cfc6";
|
||||
sha256 = "0rklwdz3d2b065yhhiz7bhyfb3fsg9rcqi6d4rhk7wb8w849vf20";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
|
||||
@ -8436,12 +8583,12 @@
|
||||
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "elfeed";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elfeed";
|
||||
rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
|
||||
sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
|
||||
rev = "79077efc34aad25bb43cf46a28a69a308196c972";
|
||||
sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
|
||||
@ -8457,12 +8604,12 @@
|
||||
elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
|
||||
melpaBuild {
|
||||
pname = "elfeed-web";
|
||||
version = "2.1.1";
|
||||
version = "2.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elfeed";
|
||||
rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
|
||||
sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
|
||||
rev = "79077efc34aad25bb43cf46a28a69a308196c972";
|
||||
sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
|
||||
@ -8800,12 +8947,12 @@
|
||||
elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "elx";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarsius";
|
||||
repo = "elx";
|
||||
rev = "84c9cd5721be9594de743330e7abcec092d2838c";
|
||||
sha256 = "0z2xgy8n3gwh71129pk53nrm13h2x51n61vz7xjqmhm6c11vgrq4";
|
||||
rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
|
||||
sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx";
|
||||
@ -9746,8 +9893,8 @@
|
||||
sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
|
||||
sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
|
||||
sha256 = "0zp84k5idqkrvc9qci49ains0b86kpk97lk1jcwyj75s4xsfyp1y";
|
||||
name = "es-mode";
|
||||
};
|
||||
packageRequires = [ cl-lib dash spark ];
|
||||
@ -9798,6 +9945,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "esh-help";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tom-tan";
|
||||
repo = "esh-help";
|
||||
rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695";
|
||||
sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
|
||||
sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
|
||||
name = "esh-help";
|
||||
};
|
||||
packageRequires = [ dash ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/esh-help";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "eshell-autojump";
|
||||
@ -10187,8 +10355,8 @@
|
||||
sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
|
||||
sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb";
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
|
||||
sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39";
|
||||
name = "evil";
|
||||
};
|
||||
packageRequires = [ goto-chg undo-tree ];
|
||||
@ -10431,12 +10599,12 @@
|
||||
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "evil-matchit";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "redguardtoo";
|
||||
repo = "evil-matchit";
|
||||
rev = "e9f77f7d6a14434a8ca3280d721b96c0984fa7eb";
|
||||
sha256 = "11mhgw0xa8kn73svgvzpmvvnkj2ja4mxs030vlzkh4scvlfa98dl";
|
||||
rev = "0b0e6d61a6462fc6fff7000b739ce5b31acd0d4c";
|
||||
sha256 = "13qxsbvmi0dkzmf59j0xyjwwcspyhymm6swsagqy4b57ypis5hxh";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
|
||||
@ -11018,12 +11186,12 @@
|
||||
exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
|
||||
melpaBuild {
|
||||
pname = "exwm-x";
|
||||
version = "1.6.4";
|
||||
version = "1.7.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tumashu";
|
||||
repo = "exwm-x";
|
||||
rev = "6e6c4c3ce5f65c71ba08565edbec2dfb0cf64e0c";
|
||||
sha256 = "1r6d6sb9ylfqidcbrr7f75m68s1cpm220pnb4hl0qv5n6hr8h5gi";
|
||||
rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5";
|
||||
sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
|
||||
@ -14304,6 +14472,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
gl-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "gl-conf-mode";
|
||||
version = "0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llloret";
|
||||
repo = "gitolite-emacs";
|
||||
rev = "1a53e548277eb9c669bbeda4bee9be32be7a82ec";
|
||||
sha256 = "059m30vvp71y630pcam6qfv5bxc35ygj26wcg28p56pccxxyj3q9";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3117e62d429e44506f7d82fc64252d41bc1a4b6/recipes/gl-conf-mode";
|
||||
sha256 = "0lf8xmq309aqyf16ymqlr8gj2qawlsqagbdndj0kgj72dnnw4cfm";
|
||||
name = "gl-conf-mode";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/gl-conf-mode";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "glab";
|
||||
@ -14790,12 +14979,12 @@
|
||||
google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "google-translate";
|
||||
version = "0.11.13";
|
||||
version = "0.11.14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "atykhonov";
|
||||
repo = "google-translate";
|
||||
rev = "c859592c3fda01594b270e388414a79373b5587b";
|
||||
sha256 = "1arwq4nld3capjj2b3ask1pwy89fz25f550fb7cnhiv5rhqr51iw";
|
||||
rev = "486c63bbfa0338589589f628703c38112035a5b2";
|
||||
sha256 = "08b4lxnwy9iqxacbjjljybvvdkl9g2dy6vga6hw7h7h32qra8w2j";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate";
|
||||
@ -15345,12 +15534,12 @@
|
||||
gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "gscholar-bibtex";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cute-jumper";
|
||||
repo = "gscholar-bibtex";
|
||||
rev = "00b32521de3aa689bc58516ae10ba7f3ef1b6c92";
|
||||
sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
|
||||
rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b";
|
||||
sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
|
||||
@ -15827,12 +16016,12 @@
|
||||
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
|
||||
melpaBuild {
|
||||
pname = "helm";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-helm";
|
||||
repo = "helm";
|
||||
rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d";
|
||||
sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil";
|
||||
rev = "c695a697461a48840f567bd5339909d4a80fa99f";
|
||||
sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
|
||||
@ -16163,12 +16352,12 @@
|
||||
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-core";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-helm";
|
||||
repo = "helm";
|
||||
rev = "70651b7bb2ec750ba408fb704953b3a36f4ca81d";
|
||||
sha256 = "0qdfvwdvb5axkx8klwvm3v0jjsf9w595jb6dv0ijdyd5qi2rwyil";
|
||||
rev = "c695a697461a48840f567bd5339909d4a80fa99f";
|
||||
sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
|
||||
@ -16244,6 +16433,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-directory = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-directory";
|
||||
version = "0.6.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "masasam";
|
||||
repo = "emacs-helm-directory";
|
||||
rev = "2c6d45404506ba744888dcdb65e9f63878f2da16";
|
||||
sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory";
|
||||
sha256 = "01c5a08v6rd867kdyrfwdvj05z4srzj9g6xy4scirlbwbff0q76n";
|
||||
name = "helm-directory";
|
||||
};
|
||||
packageRequires = [ emacs helm ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/helm-directory";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-dired-history";
|
||||
@ -17276,12 +17486,12 @@
|
||||
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-tramp";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "masasam";
|
||||
repo = "emacs-helm-tramp";
|
||||
rev = "89a7564edc6b23ffba52b02353528b9b6285c729";
|
||||
sha256 = "1fqyhx6cnigh40bgzm745cx47zc6mm8rwrz2ym0vpb5bnng6j4m1";
|
||||
rev = "9480ee2d5a9cc190e48a04ffac33ca6403fd12e1";
|
||||
sha256 = "0jh9vbbsdzgxd41x5ykvb4b5ww248bc7lrzfjn4jmckgjmqq8v1y";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
|
||||
@ -19141,6 +19351,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
inverse-acme-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "inverse-acme-theme";
|
||||
version = "1.12.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dcjohnson";
|
||||
repo = "inverse-acme-theme";
|
||||
rev = "e57f494fd94e49321a6396f530b8a13bae8b57df";
|
||||
sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme";
|
||||
sha256 = "03g6h8dpn42qnr593ryhj22lj1h2nx4rdr1knhkvxygfv3c4lgh5";
|
||||
name = "inverse-acme-theme";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/inverse-acme-theme";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "iplayer";
|
||||
@ -23740,12 +23971,12 @@
|
||||
nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "nix-mode";
|
||||
version = "1.11.11";
|
||||
version = "1.11.12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NixOS";
|
||||
repo = "nix";
|
||||
rev = "026f4f9ae881d9196422981f1f85fa3137525014";
|
||||
sha256 = "016c0ghqw7wmgdk47biqc0i4bav2igd5ayh6wr9bygrik81n126z";
|
||||
rev = "04e071a5e4cdf7f5396a0e36874e0a023b7af232";
|
||||
sha256 = "1hzp70sm4bwlbqnd7mmzan10wsgb03a1zfiqmwxnc61jgjxd5jva";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
|
||||
@ -23884,11 +24115,11 @@
|
||||
}) {};
|
||||
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
|
||||
pname = "notmuch";
|
||||
version = "0.24.2";
|
||||
version = "0.25pre0";
|
||||
src = fetchgit {
|
||||
url = "git://git.notmuchmail.org/git/notmuch";
|
||||
rev = "2e86a4da55c29e0751d950839cdcbe40234ca8ba";
|
||||
sha256 = "1g75k365cdl0670bs38bvf391hsiv7rwxbmwz53x03fyz4gl58by";
|
||||
rev = "952a0f0cda7d1a12432d1c9ad71b41401cb1615c";
|
||||
sha256 = "1mj3946sg2lxamcz16jkys88scx1fyhky3amwxnl5iszd15lhvxz";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
|
||||
@ -24027,6 +24258,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "numbers";
|
||||
version = "1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "davep";
|
||||
repo = "numbers.el";
|
||||
rev = "74be68b94143f042ce461b2a69202f515acaf20c";
|
||||
sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers";
|
||||
sha256 = "02cx19fi34yvc0icajnwrmb8lr2g8y08kis08v9xxalfxz06kb3h";
|
||||
name = "numbers";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/numbers";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "nvm";
|
||||
@ -24517,8 +24769,8 @@
|
||||
src = fetchFromGitHub {
|
||||
owner = "OmniSharp";
|
||||
repo = "omnisharp-emacs";
|
||||
rev = "d16b03158778fad4e3329e4f260f1604ddfa3c35";
|
||||
sha256 = "0ikf2dpbaflzvpnf9lvs4cya6l4pbbnc700j24zv3mxawjxk1nr5";
|
||||
rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
|
||||
sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
|
||||
@ -26547,12 +26799,12 @@
|
||||
pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
|
||||
melpaBuild {
|
||||
pname = "pass";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NicolasPetton";
|
||||
repo = "pass";
|
||||
rev = "b4c3bd9130044c4e106bac5ba73a50822865e258";
|
||||
sha256 = "0na895x91a37wmdpqp545qvjh34d0vfq4dyxji7casdrdhx3bg16";
|
||||
rev = "2ccf4f68fa4d2aab7efbdc26ebdc45ac1ef1819c";
|
||||
sha256 = "11b8c0qihgkl46hjqx6g1p1ifd7lc3q7jhqds3gr41zsrnlyi3p8";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
|
||||
@ -29713,7 +29965,7 @@
|
||||
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "rjsx-mode";
|
||||
version = "0.1.2";
|
||||
version = "0.1.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "felipeochoa";
|
||||
repo = "rjsx-mode";
|
||||
@ -30004,6 +30256,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "rufo";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "danielma";
|
||||
repo = "rufo.el";
|
||||
rev = "4e7413fafd0320f30190ae9835ab021cf7a9ebdc";
|
||||
sha256 = "10gwr479q4kd6ndp9r2nzj7rzap21q3f0l3icrviah9l5xzdx2x0";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo";
|
||||
sha256 = "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239";
|
||||
name = "rufo";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/rufo";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "runner";
|
||||
@ -30992,12 +31265,12 @@
|
||||
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "shx";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "riscy";
|
||||
repo = "shx-for-emacs";
|
||||
rev = "3adbfe7c03d509538a6e43bafda27ea290298a14";
|
||||
sha256 = "17r5gaxqn91iylg3llg13kqrxy12cvi34rvi26wyzlysdfrfxl9k";
|
||||
rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2";
|
||||
sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
|
||||
@ -31202,12 +31475,12 @@
|
||||
skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
|
||||
melpaBuild {
|
||||
pname = "skewer-mode";
|
||||
version = "1.6.2";
|
||||
version = "1.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "skewer-mode";
|
||||
rev = "8a3a22ef4fe4d9d0831e82fde08c6355d0b19ed4";
|
||||
sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv";
|
||||
rev = "51f3bbeafea6701de78190a395f6376a9974f1e5";
|
||||
sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
|
||||
@ -31958,12 +32231,12 @@
|
||||
spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
|
||||
melpaBuild {
|
||||
pname = "spaceline-all-the-icons";
|
||||
version = "1.3.3";
|
||||
version = "1.3.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "domtronn";
|
||||
repo = "spaceline-all-the-icons.el";
|
||||
rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
|
||||
sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
|
||||
rev = "255e89303bb706b42057504e72caeb2764f3d413";
|
||||
sha256 = "0y3gv664crng4vibbh0pfh9w0ys9m5gny2b1mrqb7ma6xa78xiv2";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
|
||||
@ -32795,12 +33068,12 @@
|
||||
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "swift-mode";
|
||||
version = "2.2.4";
|
||||
version = "2.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisbarrett";
|
||||
repo = "swift-mode";
|
||||
rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a";
|
||||
sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl";
|
||||
rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9";
|
||||
sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
|
||||
@ -34029,6 +34302,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "try";
|
||||
version = "0.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "larstvei";
|
||||
repo = "Try";
|
||||
rev = "271b0a362cadf44d0694628b9e213f54516ef913";
|
||||
sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try";
|
||||
sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
|
||||
name = "try";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/try";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }:
|
||||
melpaBuild {
|
||||
pname = "tss";
|
||||
@ -34323,6 +34617,27 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "underline-with-char";
|
||||
version = "3.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "marcowahl";
|
||||
repo = "underline-with-char";
|
||||
rev = "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9";
|
||||
sha256 = "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
|
||||
sha256 = "0la24nvyqinla40c2f3f4a63mjjsg58096hyw3pvp0mwiff7rxyd";
|
||||
name = "underline-with-char";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/underline-with-char";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "underwater-theme";
|
||||
@ -36586,12 +36901,12 @@
|
||||
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "zerodark-theme";
|
||||
version = "4.4";
|
||||
version = "4.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "NicolasPetton";
|
||||
repo = "zerodark-theme";
|
||||
rev = "60615d101769694038b17a2c75bb31c26f36a042";
|
||||
sha256 = "09fpyhprmavv1fa97wa7lf182nhiw0797rh73xbhf7xhn1c22gbj";
|
||||
rev = "ceb46240636865e86f3fe26906957943ba7bd73c";
|
||||
sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ callPackage }: {
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20170703";
|
||||
version = "20170717";
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/elpa/org-20170703.tar";
|
||||
sha256 = "0l590ygknlbz3r0w9zzljwqn8vasz5w82wsivi9bi60lf0d0hx58";
|
||||
url = "http://orgmode.org/elpa/org-20170717.tar";
|
||||
sha256 = "1cbk01awnyan1jap184v2bxsk97k0p2qn19z7gnid6wiblybgs89";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -14,10 +14,10 @@
|
||||
}) {};
|
||||
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
version = "20170703";
|
||||
version = "20170717";
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/elpa/org-plus-contrib-20170703.tar";
|
||||
sha256 = "0l7hsz6rbq1zw6wdlm3ryxb60md44rvx0waii98hww89zpdi0gmw";
|
||||
url = "http://orgmode.org/elpa/org-plus-contrib-20170717.tar";
|
||||
sha256 = "0710ba6gq04cg8d87b5wi7bz9gq9yqvqmkmgscawfm2ynfw2q8sa";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
@ -13,8 +13,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "7.0.6-0";
|
||||
sha256 = "1vl9mkdp5pskl4lxd1p79ayv1k3gxpa8iz992d302qyllhm7wn1i";
|
||||
version = "7.0.6-1";
|
||||
sha256 = "1i3gsc0ps7cbvfmnk6fbi5hng18jwh4x4dqbz90a45x85023w9vs";
|
||||
patches = [];
|
||||
};
|
||||
in
|
||||
|
||||
@ -13,8 +13,8 @@ let
|
||||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "6.9.8-10";
|
||||
sha256 = "040qs7nwcm84bjd9wryvd58zqfykbmn3y3qfc90lnldww7v6ihlg";
|
||||
version = "6.9.9-0";
|
||||
sha256 = "02xnvgjnmz2d4yv4iy1kh7an5w631p1s319jw23c8zpmqhfhk2ha";
|
||||
patches = [];
|
||||
}
|
||||
# Freeze version on mingw so we don't need to port the patch too often.
|
||||
|
||||
@ -32,6 +32,11 @@ stdenv.mkDerivation rec {
|
||||
EOF
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/applications/solvespace.desktop \
|
||||
--replace /usr/bin/ $out/bin/ \
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A parametric 3d CAD program";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
|
||||
61
pkgs/applications/misc/alacritty/default.nix
Normal file
61
pkgs/applications/misc/alacritty/default.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ stdenv,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
cmake,
|
||||
makeWrapper,
|
||||
expat,
|
||||
pkgconfig,
|
||||
freetype,
|
||||
fontconfig,
|
||||
libX11,
|
||||
gperf,
|
||||
libXcursor,
|
||||
libXxf86vm,
|
||||
libXi,
|
||||
xclip }:
|
||||
|
||||
with rustPlatform;
|
||||
|
||||
buildRustPackage rec {
|
||||
name = "alacritty-unstable-2017-07-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwilm";
|
||||
repo = "alacritty";
|
||||
rev = "94849c4f2a19bd49337f5cf090f94ac6a940c414";
|
||||
sha256 = "0cawrq0787pcfifn5awccq29a1ag85wfbmx1ccz7m33prk3ry9jp";
|
||||
};
|
||||
|
||||
depsSha256 = "0lb83aan6lgdsdcrd6zdrxhz5bi96cw4ygqqlpm43w42chwzz0xj";
|
||||
|
||||
buildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
freetype
|
||||
fontconfig
|
||||
xclip
|
||||
pkgconfig
|
||||
expat
|
||||
libX11
|
||||
libXcursor
|
||||
libXxf86vm
|
||||
libXi
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
for f in $(find target/release -maxdepth 1 -type f); do
|
||||
cp $f $out/bin
|
||||
done;
|
||||
wrapProgram $out/bin/alacritty --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath buildInputs}"
|
||||
'';
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GPU-accelerated terminal emulator";
|
||||
homepage = https://github.com/jwilm/alacritty;
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Remove unneeded files and libs
|
||||
rm -rf resources/calibre-portable.* \
|
||||
src/{chardet,cherrypy,odf,routes}
|
||||
src/{chardet,cherrypy,html5lib,odf,routes}
|
||||
'';
|
||||
|
||||
dontUseQmakeConfigure = true;
|
||||
@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
|
||||
poppler_utils libpng imagemagick libjpeg
|
||||
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
|
||||
] ++ (with python2Packages; [
|
||||
html5lib_0_9999999 # needs to be before mechanize ?
|
||||
apsw cssselect cssutils dateutil lxml mechanize netifaces pillow
|
||||
python pyqt5 sip
|
||||
regex msgpack
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch,
|
||||
cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales
|
||||
cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror, glibcLocales, libyubikey, yubikey-personalization, libXi, qtx11extras
|
||||
, withKeePassHTTP ? true
|
||||
}:
|
||||
|
||||
@ -16,7 +16,11 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DWITH_GUI_TESTS=ON" ] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON");
|
||||
cmakeFlags = [
|
||||
"-DWITH_GUI_TESTS=ON"
|
||||
"-DWITH_XC_AUTOTYPE=ON"
|
||||
"-DWITH_XC_YUBIKEY=ON"
|
||||
] ++ (optional withKeePassHTTP "-DWITH_XC_HTTP=ON");
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
make test ARGS+="-E testgui --output-on-failure"
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales ];
|
||||
buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror glibcLocales libyubikey yubikey-personalization libXi qtx11extras ];
|
||||
|
||||
meta = {
|
||||
description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
|
||||
|
||||
@ -1,63 +1,254 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
Version: GnuPG v1
|
||||
Version: SKS 1.1.5
|
||||
Comment: Hostname: keyserver.mozilla.org
|
||||
|
||||
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
|
||||
=D+jC
|
||||
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
|
||||
MuTo71rAVDLtxerc+GNq0GI=
|
||||
=YjV6
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "nomad-${version}";
|
||||
version = "0.5.5";
|
||||
version = "0.5.6";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/nomad";
|
||||
@ -12,7 +12,7 @@ buildGoPackage rec {
|
||||
owner = "hashicorp";
|
||||
repo = "nomad";
|
||||
inherit rev;
|
||||
sha256 = "17xq88ymm77b6y27l4v49i9hm6yjyrk61rdb2v7nvn8fa4bn6b65";
|
||||
sha256 = "1ivxsrg8s5fcyhngf8wlrqw6j7s2iggbf9xkr8jnd80cxbcpnksl";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf gnome3.gspell glib_networking
|
||||
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
|
||||
] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good (gst-plugins-bad.override { gtkSupport = true; }) gst-libav ]);
|
||||
|
||||
meta = {
|
||||
description = "Native Gtk+ Twitter client for the Linux desktop";
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python }:
|
||||
{ fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python,
|
||||
enableLibPurple ? false, pidgin ? null }:
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
@ -11,20 +12,25 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check;
|
||||
|
||||
buildInputs = [ gnutls glib libotr python ];
|
||||
buildInputs = [ gnutls glib libotr python ]
|
||||
++ optional enableLibPurple pidgin;
|
||||
|
||||
preConfigure = optionalString enableLibPurple
|
||||
"export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${pidgin}/lib/pkgconfig";
|
||||
|
||||
configureFlags = [
|
||||
"--gcov=1"
|
||||
"--otr=1"
|
||||
"--ssl=gnutls"
|
||||
"--pidfile=/var/lib/bitlbee/bitlbee.pid"
|
||||
];
|
||||
]
|
||||
++ optional enableLibPurple "--purple=1";
|
||||
|
||||
buildPhase = ''
|
||||
buildPhase = optionalString (!enableLibPurple) ''
|
||||
make install-dev
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
doCheck = !enableLibPurple; # Checks fail with libpurple for some reason
|
||||
|
||||
meta = {
|
||||
description = "IRC instant messaging gateway";
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
name = "qtox-${version}";
|
||||
version = "1.10.2";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tux3";
|
||||
repo = "qTox";
|
||||
rev = "v${version}";
|
||||
sha256 = "0c2633rc9l73q9qs9hybn11hmlqbwsvih3sf6jk1jp4151k5wp1y";
|
||||
sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
{ stdenv, fetchurl, ocaml, eprover }:
|
||||
{ stdenv, fetchurl, ocaml, eprover, zlib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "iprover-${version}";
|
||||
version = "0.8.1";
|
||||
version = "2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://iprover.googlecode.com/files/iprover_v${version}.tar.gz";
|
||||
sha256 = "15qn523w4l296np5rnkwi50a5x2xqz0kaza7bsh9bkazph7jma7w";
|
||||
url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover-v${version}.tar.gz";
|
||||
sha256 = "1mbxjczp6nqw0p33glqmw973c268yzy4gxflk1lfiyiihrjdhinb";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml eprover ];
|
||||
buildInputs = [ ocaml eprover zlib ];
|
||||
|
||||
preConfigure = ''patchShebangs .'';
|
||||
|
||||
@ -25,12 +25,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An automated first-order logic theorem prover";
|
||||
maintainers = with maintainers;
|
||||
[
|
||||
raskin
|
||||
];
|
||||
homepage = http://www.cs.man.ac.uk/~korovink/iprover/;
|
||||
maintainers = with maintainers; [ raskin gebner ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3;
|
||||
downloadPage = "http://code.google.com/p/iprover/downloads/list";
|
||||
};
|
||||
}
|
||||
|
||||
@ -12,9 +12,15 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
patches =
|
||||
[ (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch";
|
||||
sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k";
|
||||
})
|
||||
[
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/222.patch";
|
||||
sha256 = "0grdbiwq04x5qj0a1yd9a78g5v28dxhwl6mwxvgvvmzs6k5wnl3k";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/RichiH/vcsh/pull/228.patch";
|
||||
sha256 = "0sdn4mzrhaynw85knia2iw5b6rgy0l1rd6dwh0lwspnh668wqgam";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ which git ronn perl ShellCommand TestMost ];
|
||||
|
||||
@ -16,6 +16,7 @@ mounts = { '/' => 'host',
|
||||
# Propagate environment variables
|
||||
envvars = [ 'TERM',
|
||||
'DISPLAY',
|
||||
'XAUTHORITY',
|
||||
'HOME',
|
||||
'XDG_RUNTIME_DIR',
|
||||
'LANG',
|
||||
|
||||
@ -5,11 +5,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gexiv2-${version}";
|
||||
version = "${majorVersion}.4";
|
||||
version = "${majorVersion}.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
|
||||
sha256 = "190www3b61spfgwx42jw8h5hsz2996jcxky48k63468avjpk33dd";
|
||||
sha256 = "09aqsnpah71p9gx0ap2px2dyanrs7jmkkar6q114n9b7js8qh9qk";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
configurePhase = ''
|
||||
substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
|
||||
./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
|
||||
(if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
|
||||
(if stdenv.isDarwin then "x86_64-macosx" else "x86_64-linux");
|
||||
|
||||
installTargets = "documentation install";
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
mkdir -p $lib/share/doc/compcert
|
||||
mv doc/html $lib/share/doc/compcert/
|
||||
mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
|
||||
mv backend cfrontend common cparser driver flocq x86 x86_32 lib \
|
||||
mv backend cfrontend common cparser driver flocq x86 x86_64 lib \
|
||||
$lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
|
||||
'';
|
||||
|
||||
|
||||
@ -116,11 +116,11 @@ in stdenv.mkDerivation rec {
|
||||
+ stdenv.lib.optionalString enableSharedLibraries ''
|
||||
moveToOutput "lib/libLLVM-*" "$lib"
|
||||
moveToOutput "lib/libLLVM.${shlib}" "$lib"
|
||||
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
|
||||
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
|
||||
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
|
||||
''
|
||||
+ stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
|
||||
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
|
||||
substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
|
||||
--replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
|
||||
install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
|
||||
install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config
|
||||
|
||||
@ -873,4 +873,7 @@ self: super: {
|
||||
postInstall = "rm $out/bin/mkReadme && rmdir $out/bin";
|
||||
});
|
||||
|
||||
# Needs a newer version of hsyslog than lts-8.x provides.
|
||||
logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5_0_1; };
|
||||
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ core-packages:
|
||||
- ghcjs-base-0
|
||||
|
||||
default-package-overrides:
|
||||
# LTS Haskell 8.21
|
||||
# LTS Haskell 8.23
|
||||
- abstract-deque ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
- AC-Vector ==2.3.2
|
||||
@ -177,10 +177,11 @@ default-package-overrides:
|
||||
- asn1-encoding ==0.9.5
|
||||
- asn1-parse ==0.9.4
|
||||
- asn1-types ==0.3.2
|
||||
- astro ==0.4.2.0
|
||||
- async ==2.1.1.1
|
||||
- async-dejafu ==0.1.3.0
|
||||
- async-extra ==0.1.0.0
|
||||
- async-refresh ==0.2.0
|
||||
- async-refresh ==0.2.0.2
|
||||
- async-refresh-tokens ==0.1.0
|
||||
- atom-basic ==0.2.5
|
||||
- atom-conduit ==0.4.0.1
|
||||
@ -201,7 +202,7 @@ default-package-overrides:
|
||||
- avers-api-docs ==0.0.18.0
|
||||
- avers-server ==0.0.18.0
|
||||
- avwx ==0.3.0.2
|
||||
- b9 ==0.5.31
|
||||
- b9 ==0.5.32
|
||||
- backprop ==0.0.3.0
|
||||
- bake ==0.5
|
||||
- bank-holidays-england ==0.1.0.5
|
||||
@ -375,7 +376,7 @@ default-package-overrides:
|
||||
- clckwrks-theme-bootstrap ==0.4.2.1
|
||||
- cli ==0.1.2
|
||||
- clientsession ==0.9.1.2
|
||||
- Clipboard ==2.3.1.0
|
||||
- Clipboard ==2.3.2.0
|
||||
- clock ==0.7.2
|
||||
- clock-extras ==0.1.0.2
|
||||
- clumpiness ==0.17.0.0
|
||||
@ -529,7 +530,7 @@ default-package-overrides:
|
||||
- diagrams-lib ==1.4.1.2
|
||||
- diagrams-postscript ==1.4
|
||||
- diagrams-rasterific ==1.4
|
||||
- diagrams-solve ==0.1.0.1
|
||||
- diagrams-solve ==0.1.1
|
||||
- diagrams-svg ==1.4.1
|
||||
- dice ==0.1
|
||||
- dictionaries ==0.1.0.1
|
||||
@ -538,7 +539,7 @@ default-package-overrides:
|
||||
- digest ==0.0.1.2
|
||||
- digits ==0.3.1
|
||||
- dimensional ==1.0.1.3
|
||||
- direct-sqlite ==2.3.19
|
||||
- direct-sqlite ==2.3.20
|
||||
- directory-tree ==0.12.1
|
||||
- discount ==0.1.1
|
||||
- disk-free-space ==0.1.0.1
|
||||
@ -576,7 +577,7 @@ default-package-overrides:
|
||||
- drifter ==0.2.2
|
||||
- drifter-postgresql ==0.1.0
|
||||
- dsp ==0.2.3.1
|
||||
- dual-tree ==0.2.0.9
|
||||
- dual-tree ==0.2.1
|
||||
- dvorak ==0.1.0.0
|
||||
- dynamic-state ==0.2.2.0
|
||||
- dyre ==0.8.12
|
||||
@ -647,7 +648,7 @@ default-package-overrides:
|
||||
- expiring-cache-map ==0.0.6.1
|
||||
- explicit-exception ==0.1.9
|
||||
- extensible ==0.3.7
|
||||
- extensible-effects ==1.11.0.4
|
||||
- extensible-effects ==1.11.1.0
|
||||
- extensible-exceptions ==0.1.1.4
|
||||
- extra ==1.5.3
|
||||
- extract-dependencies ==0.2.0.1
|
||||
@ -699,13 +700,13 @@ default-package-overrides:
|
||||
- foldl ==1.2.5
|
||||
- foldl-statistics ==0.1.4.6
|
||||
- folds ==0.7.3
|
||||
- FontyFruity ==0.5.3.2
|
||||
- FontyFruity ==0.5.3.3
|
||||
- force-layout ==0.4.0.6
|
||||
- foreign-store ==0.2
|
||||
- format-numbers ==0.1.0.0
|
||||
- formatting ==6.2.4
|
||||
- fortran-src ==0.1.0.4
|
||||
- foundation ==0.0.12
|
||||
- foundation ==0.0.13
|
||||
- Frames ==0.1.9
|
||||
- free ==4.12.4
|
||||
- free-vl ==0.1.4
|
||||
@ -944,7 +945,7 @@ default-package-overrides:
|
||||
- haskeline ==0.7.4.0
|
||||
- haskell-gi ==0.20.2
|
||||
- haskell-gi-base ==0.20.3
|
||||
- haskell-import-graph ==1.0.1
|
||||
- haskell-import-graph ==1.0.2
|
||||
- haskell-lexer ==1.0.1
|
||||
- haskell-names ==0.8.0
|
||||
- haskell-neo4j-client ==0.3.2.4
|
||||
@ -1106,7 +1107,7 @@ default-package-overrides:
|
||||
- http-client-openssl ==0.2.0.5
|
||||
- http-client-tls ==0.3.5.1
|
||||
- http-common ==0.8.2.0
|
||||
- http-conduit ==2.2.3.1
|
||||
- http-conduit ==2.2.3.2
|
||||
- http-date ==0.0.6.1
|
||||
- http-link-header ==1.0.3
|
||||
- http-media ==0.6.4
|
||||
@ -1249,7 +1250,7 @@ default-package-overrides:
|
||||
- language-c ==0.5.0
|
||||
- language-c-quote ==0.11.7.3
|
||||
- language-dockerfile ==0.3.6.0
|
||||
- language-ecmascript ==0.17.1.0
|
||||
- language-ecmascript ==0.17.2.0
|
||||
- language-fortran ==0.5.1
|
||||
- language-glsl ==0.2.0
|
||||
- language-haskell-extract ==0.2.4
|
||||
@ -1356,7 +1357,7 @@ default-package-overrides:
|
||||
- mega-sdist ==0.3.0.2
|
||||
- megaparsec ==5.2.0
|
||||
- memory ==0.14.6
|
||||
- MemoTrie ==0.6.7
|
||||
- MemoTrie ==0.6.8
|
||||
- mersenne-random ==1.0.0.1
|
||||
- mersenne-random-pure64 ==0.2.2.0
|
||||
- messagepack ==0.5.4
|
||||
@ -1385,12 +1386,13 @@ default-package-overrides:
|
||||
- missing-foreign ==0.1.1
|
||||
- MissingH ==1.4.0.1
|
||||
- mixed-types-num ==0.1.0.1
|
||||
- mltool ==0.1.0.2
|
||||
- mmap ==0.5.9
|
||||
- mmorph ==1.0.9
|
||||
- mnist-idx ==0.1.2.8
|
||||
- mockery ==0.3.5
|
||||
- modify-fasta ==0.8.2.3
|
||||
- monad-control ==1.0.2.0
|
||||
- monad-control ==1.0.2.1
|
||||
- monad-coroutine ==0.9.0.3
|
||||
- monad-extras ==0.6.0
|
||||
- monad-http ==0.1.0.0
|
||||
@ -1516,6 +1518,7 @@ default-package-overrides:
|
||||
- once ==0.2
|
||||
- one-liner ==0.9.1
|
||||
- OneTuple ==0.2.1
|
||||
- Only ==0.1
|
||||
- oo-prototypes ==0.1.0.0
|
||||
- opaleye ==0.5.3.0
|
||||
- opaleye-trans ==0.3.5
|
||||
@ -1588,13 +1591,13 @@ default-package-overrides:
|
||||
- phantom-state ==0.2.1.2
|
||||
- picedit ==0.2.3.0
|
||||
- picoparsec ==0.1.2.3
|
||||
- pid1 ==0.1.0.1
|
||||
- pid1 ==0.1.2.0
|
||||
- pinboard ==0.9.12.4
|
||||
- pinch ==0.3.2.0
|
||||
- pinchot ==0.24.0.0
|
||||
- pipes ==4.3.4
|
||||
- pipes-attoparsec ==0.5.1.5
|
||||
- pipes-bytestring ==2.1.5
|
||||
- pipes-bytestring ==2.1.6
|
||||
- pipes-cacophony ==0.4.1
|
||||
- pipes-category ==0.2.0.1
|
||||
- pipes-concurrency ==2.0.7
|
||||
@ -1653,6 +1656,11 @@ default-package-overrides:
|
||||
- pretty-simple ==2.0.0.0
|
||||
- pretty-types ==0.2.3.1
|
||||
- prettyclass ==1.0.0.0
|
||||
- prettyprinter ==1.1
|
||||
- prettyprinter-ansi-terminal ==1.1
|
||||
- prettyprinter-compat-annotated-wl-pprint ==1
|
||||
- prettyprinter-compat-ansi-wl-pprint ==1.0.1
|
||||
- prettyprinter-compat-wl-pprint ==1.0.0.1
|
||||
- primes ==0.2.1.0
|
||||
- primitive ==0.6.1.0
|
||||
- printcess ==0.1.0.3
|
||||
@ -1675,13 +1683,13 @@ default-package-overrides:
|
||||
- proto-lens-protoc ==0.2.1.0
|
||||
- protobuf ==0.2.1.1
|
||||
- protobuf-simple ==0.1.0.4
|
||||
- protocol-buffers ==2.4.0
|
||||
- protocol-buffers-descriptor ==2.4.0
|
||||
- protocol-buffers ==2.4.2
|
||||
- protocol-buffers-descriptor ==2.4.2
|
||||
- protolude ==0.1.10
|
||||
- proxied ==0.2
|
||||
- psql-helpers ==0.1.0.0
|
||||
- PSQueue ==1.1
|
||||
- psqueues ==0.2.2.3
|
||||
- psqueues ==0.2.3.0
|
||||
- publicsuffix ==0.20170109
|
||||
- pure-cdb ==0.1.2
|
||||
- pure-io ==0.2.1
|
||||
@ -1698,7 +1706,7 @@ default-package-overrides:
|
||||
- quickcheck-assertions ==0.3.0
|
||||
- quickcheck-instances ==0.3.12
|
||||
- quickcheck-io ==0.1.4
|
||||
- quickcheck-simple ==0.1.0.1
|
||||
- quickcheck-simple ==0.1.0.2
|
||||
- quickcheck-special ==0.1.0.5
|
||||
- quickcheck-text ==0.1.2.1
|
||||
- quickcheck-unicode ==1.0.1.0
|
||||
@ -1805,7 +1813,7 @@ default-package-overrides:
|
||||
- rvar ==0.2.0.3
|
||||
- s3-signer ==0.3.0.0
|
||||
- safe ==0.3.15
|
||||
- safe-exceptions ==0.1.5.0
|
||||
- safe-exceptions ==0.1.6.0
|
||||
- safe-exceptions-checked ==0.1.0
|
||||
- safecopy ==0.9.3.2
|
||||
- SafeSemaphore ==0.10.1
|
||||
@ -1819,7 +1827,7 @@ default-package-overrides:
|
||||
- scalpel ==0.5.1
|
||||
- scalpel-core ==0.5.1
|
||||
- scanner ==0.2
|
||||
- scientific ==0.3.4.15
|
||||
- scientific ==0.3.5.1
|
||||
- scotty ==0.11.0
|
||||
- scrape-changes ==0.1.0.5
|
||||
- scrypt ==0.5.0
|
||||
@ -1849,7 +1857,7 @@ default-package-overrides:
|
||||
- servant-elm ==0.4.0.1
|
||||
- servant-foreign ==0.9.1.1
|
||||
- servant-js ==0.9.3
|
||||
- servant-JuicyPixels ==0.3.0.2
|
||||
- servant-JuicyPixels ==0.3.0.3
|
||||
- servant-lucid ==0.7.1
|
||||
- servant-mock ==0.8.1.1
|
||||
- servant-purescript ==0.6.0.0
|
||||
@ -1935,16 +1943,16 @@ default-package-overrides:
|
||||
- Spock-worker ==0.3.1.0
|
||||
- spool ==0.1
|
||||
- spoon ==0.3.1
|
||||
- spreadsheet ==0.1.3.4
|
||||
- spreadsheet ==0.1.3.5
|
||||
- sql-words ==0.1.5.0
|
||||
- sqlite-simple ==0.4.13.0
|
||||
- sqlite-simple ==0.4.14.0
|
||||
- sqlite-simple-errors ==0.6.0.0
|
||||
- srcloc ==0.5.1.1
|
||||
- stache ==0.2.2
|
||||
- stack-run-auto ==0.1.1.4
|
||||
- stack-type ==0.1.0.0
|
||||
- stackage-curator ==0.14.5
|
||||
- stackage-query ==0.1.0
|
||||
- stackage-query ==0.1.1
|
||||
- stackage-types ==1.2.0
|
||||
- state-plus ==0.1.3
|
||||
- stateref ==0.3
|
||||
@ -1975,7 +1983,7 @@ default-package-overrides:
|
||||
- store ==0.4.3.1
|
||||
- store-core ==0.4.1
|
||||
- Strafunski-StrategyLib ==5.0.0.10
|
||||
- stratosphere ==0.4.3
|
||||
- stratosphere ==0.4.4
|
||||
- streaming ==0.1.4.5
|
||||
- streaming-bytestring ==0.1.4.6
|
||||
- streaming-commons ==0.1.17
|
||||
@ -2006,7 +2014,7 @@ default-package-overrides:
|
||||
- svg-tree ==0.6.1
|
||||
- SVGFonts ==1.6.0.1
|
||||
- swagger ==0.3.0
|
||||
- swagger2 ==2.1.4
|
||||
- swagger2 ==2.1.4.1
|
||||
- syb ==0.6
|
||||
- syb-with-class ==0.6.1.7
|
||||
- symbol ==0.2.4
|
||||
@ -2029,7 +2037,7 @@ default-package-overrides:
|
||||
- tar ==0.5.0.3
|
||||
- tar-conduit ==0.1.1
|
||||
- tardis ==0.4.1.0
|
||||
- tasty ==0.11.2.1
|
||||
- tasty ==0.11.2.2
|
||||
- tasty-ant-xml ==1.0.5
|
||||
- tasty-auto ==0.1.0.2
|
||||
- tasty-dejafu ==0.3.0.2
|
||||
@ -2073,7 +2081,7 @@ default-package-overrides:
|
||||
- test-invariant ==0.4.5.0
|
||||
- test-simple ==0.1.9
|
||||
- testing-feat ==0.4.0.3
|
||||
- texmath ==0.9.4
|
||||
- texmath ==0.9.4.1
|
||||
- text ==1.2.2.1
|
||||
- text-all ==0.3.1.0
|
||||
- text-binary ==0.2.1.1
|
||||
@ -2095,14 +2103,14 @@ default-package-overrides:
|
||||
- tf-random ==0.5
|
||||
- tfp ==1.0.0.2
|
||||
- th-abstraction ==0.2.3.0
|
||||
- th-data-compat ==0.0.2.2
|
||||
- th-data-compat ==0.0.2.4
|
||||
- th-desugar ==1.6
|
||||
- th-expand-syns ==0.4.3.0
|
||||
- th-extras ==0.0.0.4
|
||||
- th-lift ==0.7.7
|
||||
- th-lift-instances ==0.1.11
|
||||
- th-orphans ==0.13.3
|
||||
- th-reify-compat ==0.0.1.1
|
||||
- th-reify-compat ==0.0.1.2
|
||||
- th-reify-many ==0.1.7
|
||||
- th-to-exp ==0.0.1.0
|
||||
- th-utilities ==0.2.0.1
|
||||
@ -2132,6 +2140,7 @@ default-package-overrides:
|
||||
- titlecase ==0.1.0.3
|
||||
- tls ==1.3.11
|
||||
- tls-debug ==0.4.4
|
||||
- tls-session-manager ==0.0.0.0
|
||||
- token-bucket ==0.1.0.1
|
||||
- tostring ==0.2.1.1
|
||||
- tracy ==0.1.4.0
|
||||
@ -2173,7 +2182,7 @@ default-package-overrides:
|
||||
- typography-geometry ==1.0.0.1
|
||||
- tz ==0.1.2.1
|
||||
- tzdata ==0.1.20161123.0
|
||||
- ua-parser ==0.7.3
|
||||
- ua-parser ==0.7.4
|
||||
- uglymemo ==0.1.0.1
|
||||
- unagi-chan ==0.4.0.0
|
||||
- unbound ==0.5.1
|
||||
@ -2262,7 +2271,7 @@ default-package-overrides:
|
||||
- wai-extra ==3.0.20.0
|
||||
- wai-handler-launch ==3.0.2.2
|
||||
- wai-logger ==2.3.0
|
||||
- wai-middleware-auth ==0.1.2.0
|
||||
- wai-middleware-auth ==0.1.2.1
|
||||
- wai-middleware-caching ==0.1.0.2
|
||||
- wai-middleware-caching-lru ==0.1.0.0
|
||||
- wai-middleware-caching-redis ==0.2.0.0
|
||||
@ -2284,13 +2293,13 @@ default-package-overrides:
|
||||
- wai-transformers ==0.0.7
|
||||
- wai-websockets ==3.0.1.1
|
||||
- waitra ==0.0.4.0
|
||||
- warp ==3.2.12
|
||||
- warp-tls ==3.2.3
|
||||
- warp ==3.2.13
|
||||
- warp-tls ==3.2.4
|
||||
- wave ==0.1.5
|
||||
- wavefront ==0.7.1
|
||||
- wavefront-obj ==0.1.0.1
|
||||
- web-plugins ==0.2.9
|
||||
- web-routes ==0.27.11
|
||||
- web-routes ==0.27.12
|
||||
- web-routes-boomerang ==0.28.4.2
|
||||
- web-routes-happstack ==0.23.10
|
||||
- web-routes-hsp ==0.24.6.1
|
||||
@ -2373,7 +2382,7 @@ default-package-overrides:
|
||||
- xss-sanitize ==0.3.5.7
|
||||
- yackage ==0.8.1
|
||||
- yahoo-finance-api ==0.2.0.2
|
||||
- yaml ==0.8.23.1
|
||||
- yaml ==0.8.23.3
|
||||
- Yampa ==0.10.6
|
||||
- YampaSynth ==0.2
|
||||
- yes-precure5-command ==5.5.3
|
||||
|
||||
@ -467,10 +467,4 @@ self: super: builtins.intersectAttrs super {
|
||||
# Without this override, the builds lacks pkg-config.
|
||||
opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; });
|
||||
|
||||
# Needs a newer version of brick than lts-8.x provides.
|
||||
hledger-iadd = super.hledger-iadd.override { brick = self.brick_0_19; };
|
||||
|
||||
# Needs a newer version of hsyslog than lts-8.x provides.
|
||||
logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5; };
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "expat-2.2.1";
|
||||
name = "expat-2.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/expat/${name}.tar.bz2";
|
||||
sha256 = "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q";
|
||||
sha256 = "0ik0r39ala9c6hj4kxrk933klgwkzlkbrfhvhaykx8l1rwgr2xj3";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ]; # TODO: fix referrers
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, fetchurl, pkgconfig, python, gst-plugins-base, orc
|
||||
, faacSupport ? false, faac ? null
|
||||
, gtkSupport ? false, gtk3 ? null
|
||||
, faad2, libass, libkate, libmms
|
||||
, libmodplug, mpeg2dec, mpg123
|
||||
, openjpeg, libopus, librsvg
|
||||
@ -10,6 +11,7 @@
|
||||
}:
|
||||
|
||||
assert faacSupport -> faac != null;
|
||||
assert gtkSupport -> gtk3 != null;
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionalString;
|
||||
@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gst-plugins-base orc
|
||||
faad2 libass libkate libmms
|
||||
faad2 gtk3 libass libkate libmms
|
||||
libmodplug mpeg2dec mpg123
|
||||
openjpeg libopus librsvg
|
||||
fluidsynth libvdpau
|
||||
@ -50,6 +52,8 @@ stdenv.mkDerivation rec {
|
||||
]
|
||||
++ libintlOrEmpty
|
||||
++ optional faacSupport faac
|
||||
# for gtksink
|
||||
++ optional gtkSupport gtk3
|
||||
++ optional stdenv.isLinux wayland
|
||||
# wildmidi requires apple's OpenAL
|
||||
# TODO: package apple's OpenAL, fix wildmidi, include on Darwin
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
{ mkDerivation, lib, extra-cmake-modules, qtsvg }:
|
||||
{ mkDerivation, lib, extra-cmake-modules, gtk3, qtsvg }:
|
||||
|
||||
mkDerivation {
|
||||
name = "breeze-icons";
|
||||
meta = { maintainers = [ lib.maintainers.ttuegel ]; };
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
nativeBuildInputs = [ extra-cmake-modules gtk3 ];
|
||||
buildInputs = [ qtsvg ];
|
||||
outputs = [ "out" ]; # only runtime outputs
|
||||
postInstall = ''
|
||||
gtk-update-icon-cache "''${out:?}/share/icons/breeze"
|
||||
gtk-update-icon-cache "''${out:?}/share/icons/breeze-dark"
|
||||
'';
|
||||
}
|
||||
|
||||
43
pkgs/development/python-modules/pytorch/default.nix
Normal file
43
pkgs/development/python-modules/pytorch/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ buildPythonPackage, fetchFromGitHub, lib, numpy, pyyaml, cffi, cmake,
|
||||
git, stdenv }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.1.12";
|
||||
pname = "pytorch";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "pytorch";
|
||||
rev = "v${version}";
|
||||
sha256 = "0r8mf4xya76gz83y5z3hfxh0rydkydafhipl8g7d0bfrgw961jy9";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
${stdenv.shell} test/run_test.sh
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
cmake
|
||||
git
|
||||
numpy.blas
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
numpy
|
||||
pyyaml
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export NO_CUDA=1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration.";
|
||||
homepage = http://pytorch.org/;
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ teh ];
|
||||
};
|
||||
}
|
||||
@ -4,138 +4,37 @@ with stdenv.lib;
|
||||
with pythonPackages;
|
||||
|
||||
let
|
||||
# Get rid of this when pants 1.3.0 is released and make 0.5 the default
|
||||
pathspec_0_3_4 = buildPythonApplication rec {
|
||||
pname = "pathspec";
|
||||
version = "0.3.4";
|
||||
name = "${pname}-${version}";
|
||||
version = "1.3.0";
|
||||
in buildPythonApplication rec {
|
||||
inherit version;
|
||||
pname = "pantsbuild.pants";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0a37yrr2jhlg8aiynxivh2xqani7l9j725qxzrm7cm7m4rfcl1bn";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Utility library for gitignore-style pattern matching of file paths";
|
||||
homepage = "https://github.com/cpburnz/python-path-specification";
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
};
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18fcf9047l9k006wz21g525p1w5avyjabmabh0giyz22xnm8g5gp";
|
||||
};
|
||||
|
||||
pants13-version = "1.3.0rc4";
|
||||
|
||||
# TODO: compile the rust native engine ourselves so we don't need to do this shit. We don't use
|
||||
# fetchurl because we don't know the URL ahead of time, even though it's deterministic. So we have
|
||||
# this downloader figure out the URL on the fly and then produce the deterministic result, so we
|
||||
# can still be a fixed-output derivation.
|
||||
pants13-native-engine-info = {
|
||||
"x86_64-darwin" = { prefix = "mac/10.11"; hash = "04kfqp4fcxj7zkyb21rgp1kdrlnmayfvakpg5xips716d7pp6vc7"; };
|
||||
"x86_64-linux" = { prefix = "linux/x86_64"; hash = "0vgmcqxcabryxgvk4wmbclqjn56jbmsaysckgwfzhmif8pxyrfam"; };
|
||||
"i686-linux" = { prefix = "linux/i386"; hash = "1xgma6cwvzg1d07xq6bd3j4rpzp6wn6lz82xqprr6vflyn78qaaw"; };
|
||||
}.${stdenv.system} or (throw "Unsupported system ${stdenv.system}!");
|
||||
|
||||
pants13-native-engine = runCommand "pants-native-${pants13-version}" {
|
||||
buildInputs = [ curl ];
|
||||
outputHashMode = "recursive";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = pants13-native-engine-info.hash;
|
||||
} ''
|
||||
native_version=$(curl -k -L https://raw.githubusercontent.com/pantsbuild/pants/release_${pants13-version}/src/python/pants/engine/subsystem/native_engine_version)
|
||||
curl -kLO "https://dl.bintray.com/pantsbuild/bin/build-support/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/native_engine.so"
|
||||
|
||||
# Ugh it tries to "download" from this prefix so let's just replicate their directory structure for now...
|
||||
mkdir -p $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/
|
||||
|
||||
# These should behave the same way in Nix land and we try not to differentiate between OS revisions...
|
||||
mkdir -p $out/bin/native-engine/mac/
|
||||
ln -s 10.11 $out/bin/native-engine/mac/10.10
|
||||
ln -s 10.11 $out/bin/native-engine/mac/10.12
|
||||
|
||||
cp native_engine.so $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/
|
||||
prePatch = ''
|
||||
sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
|
||||
'';
|
||||
in {
|
||||
pants =
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
pname = "pantsbuild.pants";
|
||||
version = "1.2.1";
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1bnzhhd2acwk7ckv56xzg2d9vxacl3k5bh13bsjxymnq3spm962w";
|
||||
};
|
||||
# Unnecessary, and causes some really weird behavior around .class files, which
|
||||
# this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
|
||||
dontStrip = true;
|
||||
|
||||
prePatch = ''
|
||||
sed -E -i "s/'([[:alnum:].-]+)[=><][^']*'/'\\1'/g" setup.py
|
||||
'';
|
||||
propagatedBuildInputs = [
|
||||
twitter-common-collections setproctitle setuptools six ansicolors
|
||||
packaging pathspec scandir twitter-common-dirutil psutil requests
|
||||
pystache pex docutils markdown pygments twitter-common-confluence
|
||||
fasteners coverage pywatchman futures cffi
|
||||
];
|
||||
|
||||
# Unnecessary, and causes some really weird behavior around .class files, which
|
||||
# this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
|
||||
dontStrip = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ansicolors beautifulsoup4 cffi coverage docutils fasteners futures
|
||||
isort lmdb markdown mock packaging pathspec_0_3_4 pep8 pex psutil pyflakes
|
||||
pygments pystache pytestcov pytest pywatchman requests scandir
|
||||
setproctitle setuptools six thrift wheel twitter-common-dirutil
|
||||
twitter-common-confluence twitter-common-collections
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A build system for software projects in a variety of languages";
|
||||
homepage = "http://www.pantsbuild.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
};
|
||||
|
||||
pants13-pre = buildPythonApplication rec {
|
||||
pname = "pantsbuild.pants";
|
||||
version = pants13-version;
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "03zv3g55x056vjggwjr8lpniixcpb3kfy7xkl1bxsvjp2ih2wj6g";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
|
||||
|
||||
substituteInPlace src/pants/option/global_options.py \
|
||||
--replace "'/etc/pantsrc'" "'$out/etc/pantsrc', '/etc/pantsrc'"
|
||||
'';
|
||||
|
||||
# Unnecessary, and causes some really weird behavior around .class files, which
|
||||
# this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
|
||||
dontStrip = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
twitter-common-collections setproctitle setuptools six ansicolors
|
||||
packaging pathspec scandir twitter-common-dirutil psutil requests
|
||||
pystache pex docutils markdown pygments twitter-common-confluence
|
||||
fasteners coverage pywatchman futures cffi
|
||||
];
|
||||
|
||||
# Teach pants about where its native engine lives.
|
||||
# TODO: there's probably a better way to teach it this without having it "download"
|
||||
# from a local file: URL to its cache, but I don't know how and this seems to work.
|
||||
postFixup = ''
|
||||
mkdir -p $out/etc
|
||||
cat >$out/etc/pantsrc <<EOF
|
||||
[binaries]
|
||||
baseurls: [ 'file://${pants13-native-engine}' ]
|
||||
EOF
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A build system for software projects in a variety of languages";
|
||||
homepage = "http://www.pantsbuild.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
meta = {
|
||||
description = "A build system for software projects in a variety of languages";
|
||||
homepage = "http://www.pantsbuild.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ copumpkin ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@ -41,6 +41,7 @@ in stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
|
||||
license = licenses.mit;
|
||||
platforms = with platforms; unix;
|
||||
broken = true; # Outdated function, not supported upstream. https://github.com/NixOS/nixpkgs/issues/27447
|
||||
};
|
||||
|
||||
binPath = lib.makeBinPath [ postgresql ruby ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "strace-${version}";
|
||||
version = "4.17";
|
||||
version = "4.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/strace/${name}.tar.xz";
|
||||
sha256 = "06bl4dld5fk4a3iiq4pyrkm6sh63599ah8dmds0glg5vbw45pww1";
|
||||
sha256 = "026agy9nq238nx3ynhmi8h3vx96yra4xacfsm2ybs9k23ry8ibc9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "iproute2-${version}";
|
||||
version = "4.11.0";
|
||||
version = "4.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
|
||||
sha256 = "09l0phf09mw17bn3xlzfr80sbhw14mq8xv28iz5x15m6pll10rvj";
|
||||
sha256 = "0zdxdsxyaazl85xhwskvsmpyzwf5qp21cvjsi1lw3xnrc914q2if";
|
||||
};
|
||||
|
||||
patches = lib.optionals enableFan [
|
||||
|
||||
@ -144,7 +144,7 @@ in
|
||||
};
|
||||
zfsUnstable = common {
|
||||
# comment/uncomment if breaking kernel versions are known
|
||||
incompatibleKernelVersion = "4.12";
|
||||
incompatibleKernelVersion = null;
|
||||
|
||||
version = "0.7.0-rc5";
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl } :
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pv-1.6.0";
|
||||
name = "pv-1.6.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2";
|
||||
sha256 = "13gg6r84pkvznpd1l11qw1jw9yna40gkgpni256khyx21m785khf";
|
||||
sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -152,10 +152,10 @@ in rec {
|
||||
nix = nixStable;
|
||||
|
||||
nixStable = (common rec {
|
||||
name = "nix-1.11.12";
|
||||
name = "nix-1.11.13";
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
|
||||
sha256 = "02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2";
|
||||
sha256 = "0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913";
|
||||
};
|
||||
}) // { perl-bindings = nixStable; };
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "kbfs-${version}";
|
||||
version = "20170209.d1db463";
|
||||
version = "20170429.44efa06";
|
||||
|
||||
goPackagePath = "github.com/keybase/kbfs";
|
||||
subPackages = [ "kbfsfuse" ];
|
||||
@ -12,8 +12,8 @@ buildGoPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "keybase";
|
||||
repo = "kbfs";
|
||||
rev = "d1db46315d9271f21ca2700a84ca19767e638296";
|
||||
sha256 = "12i2m370r27mmn37s55krdkhr5k8kpl3x8y3gzg7w5zn2wiw8i1g";
|
||||
rev = "44efa0682d931d8489f5e84542e8d00baeb12592";
|
||||
sha256 = "1q6hklyr6zq3xr1azz1c6rlpsjc036f222cd20vf79m58dn906n5";
|
||||
};
|
||||
|
||||
buildFlags = [ "-tags production" ];
|
||||
@ -22,6 +22,6 @@ buildGoPackage rec {
|
||||
homepage = https://www.keybase.io;
|
||||
description = "The Keybase FS FUSE driver";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
maintainers = with maintainers; [ bennofs np ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
pango
|
||||
systemd
|
||||
xorg.libX11
|
||||
xorg.libXScrnSaver
|
||||
xorg.libxcb
|
||||
xorg.libXcomposite
|
||||
xorg.libXcursor
|
||||
xorg.libXdamage
|
||||
@ -31,15 +31,16 @@ let
|
||||
xorg.libXi
|
||||
xorg.libXrandr
|
||||
xorg.libXrender
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXtst
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "keybase-gui-${version}";
|
||||
version = "1.0.23-20170519175207.d6c5e9e";
|
||||
version = "1.0.25-20170714172717.73f9070";
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb";
|
||||
sha256 = "14nylwpd64ngx1kdb4pk2laghslx9872fb2a9jgkbgbgnan5nkmm";
|
||||
sha256 = "0yrq18rrc30f7ymajvd71r29z1by7h6abyaxx2gmrg648qgc6zv4";
|
||||
};
|
||||
phases = ["unpackPhase" "installPhase" "fixupPhase"];
|
||||
unpackPhase = ''
|
||||
@ -86,6 +87,6 @@ stdenv.mkDerivation rec {
|
||||
homepage = https://www.keybase.io/;
|
||||
description = "The Keybase official GUI.";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ puffnfresh ];
|
||||
maintainers = with maintainers; [ puffnfresh np ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "keybase-${version}";
|
||||
version = "1.0.20";
|
||||
version = "1.0.22";
|
||||
|
||||
goPackagePath = "github.com/keybase/client";
|
||||
subPackages = [ "go/keybase" ];
|
||||
@ -13,7 +13,7 @@ buildGoPackage rec {
|
||||
owner = "keybase";
|
||||
repo = "client";
|
||||
rev = "v${version}";
|
||||
sha256 = "1418x2z1j4bzq29qab8pmqrvg8piycqcabdjmq2inkvlll3s5n3v";
|
||||
sha256 = "1642d11gjgkdklppmm1j3vwc2r3qg9qqw5x07jnqs819i57mr47f";
|
||||
};
|
||||
|
||||
buildFlags = [ "-tags production" ];
|
||||
@ -22,6 +22,6 @@ buildGoPackage rec {
|
||||
homepage = https://www.keybase.io/;
|
||||
description = "The Keybase official command-line utility and service.";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ carlsverre ];
|
||||
maintainers = with maintainers; [ carlsverre np ];
|
||||
};
|
||||
}
|
||||
|
||||
43
pkgs/tools/system/journalwatch/default.nix
Normal file
43
pkgs/tools/system/journalwatch/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ stdenv, buildPythonPackage, fetchurl, fetchgit, pythonOlder, systemd, pytest }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "journalwatch";
|
||||
name = "${pname}-${version}";
|
||||
version = "1.1.0";
|
||||
disabled = pythonOlder "3.3";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/The-Compiler/${pname}/archive/v${version}.tar.gz";
|
||||
sha512 = "3hvbgx95hjfivz9iv0hbhj720wvm32z86vj4a60lji2zdfpbqgr2b428lvg2cpvf71l2xn6ca5v0hzyz57qylgwqzgfrx7hqhl5g38s";
|
||||
};
|
||||
|
||||
# can be removed post 1.1.0
|
||||
postPatch = ''
|
||||
substituteInPlace test_journalwatch.py \
|
||||
--replace "U Thu Jan 1 00:00:00 1970 prio foo [1337]" "U Thu Jan 1 00:00:00 1970 pprio foo [1337]"
|
||||
'';
|
||||
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
pytest test_journalwatch.py
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
pytest
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
systemd
|
||||
];
|
||||
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "journalwatch is a tool to find error messages in the systemd journal.";
|
||||
homepage = "https://github.com/The-Compiler/journalwatch";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ florianjacob ];
|
||||
};
|
||||
}
|
||||
@ -1,18 +1,20 @@
|
||||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, curl, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "html-xml-utils-6.9";
|
||||
name = "html-xml-utils-${version}";
|
||||
version = "7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
|
||||
|
||||
sha256 = "1cpshwz60h7xsw1rvv84jl4bn9zjqii9hb8zvwm7a0fahkf03x4w";
|
||||
sha256 = "0vnmcrbnc7irrszx5h71s3mqlp9wqh19zig519zbnr5qccigs3pc";
|
||||
};
|
||||
|
||||
meta = {
|
||||
buildInputs = [curl libiconv];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Utilities for manipulating HTML and XML files";
|
||||
homepage = http://www.w3.org/Tools/HTML-XML-utils/;
|
||||
license = stdenv.lib.licenses.w3c;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
license = licenses.w3c;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@ -412,6 +412,10 @@ with pkgs;
|
||||
|
||||
albert = libsForQt5.callPackage ../applications/misc/albert {};
|
||||
|
||||
alacritty = callPackage ../applications/misc/alacritty {
|
||||
inherit (xorg) libXcursor libXxf86vm libXi;
|
||||
};
|
||||
|
||||
amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
|
||||
|
||||
ammonite = callPackage ../development/tools/ammonite {};
|
||||
@ -7067,7 +7071,7 @@ with pkgs;
|
||||
|
||||
pahole = callPackage ../development/tools/misc/pahole {};
|
||||
|
||||
inherit (callPackages ../development/tools/build-managers/pants {}) pants pants13-pre;
|
||||
pants = callPackage ../development/tools/build-managers/pants {};
|
||||
|
||||
parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };
|
||||
|
||||
@ -13348,6 +13352,7 @@ with pkgs;
|
||||
ethabi = self.altcoins.ethabi;
|
||||
ethrun = self.altcoins.ethrun;
|
||||
seth = self.altcoins.seth;
|
||||
dapp = self.altcoins.dapp;
|
||||
hsevm = self.altcoins.hsevm;
|
||||
|
||||
stellar-core = self.altcoins.stellar-core;
|
||||
|
||||
@ -7996,7 +7996,6 @@ in {
|
||||
|
||||
# These used to be here but were moved to all-packages, but I'll leave them around for a while.
|
||||
pants = pkgs.pants;
|
||||
pants13-pre = pkgs.pants13-pre;
|
||||
|
||||
paperwork-backend = buildPythonPackage rec {
|
||||
name = "paperwork-backend-${version}";
|
||||
@ -8187,14 +8186,18 @@ in {
|
||||
|
||||
pex = buildPythonPackage rec {
|
||||
name = "pex-${version}";
|
||||
version = "1.2.2";
|
||||
version = "1.2.7";
|
||||
|
||||
src = self.fetchPypi {
|
||||
pname = "pex";
|
||||
sha256 = "1nwrf03cd6jw24lxyaalj59fdm2infr9glabznkpaq65mjzwshl3";
|
||||
sha256 = "1m0gx9182w1dybkyjwwjyd6i87x2dzv252ks2fj8yn6avlcp5z4q";
|
||||
inherit version;
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace setup.py --replace 'SETUPTOOLS_REQUIREMENT,' '"setuptools"'
|
||||
'';
|
||||
|
||||
# A few more dependencies I don't want to handle right now...
|
||||
doCheck = false;
|
||||
|
||||
@ -10768,6 +10771,8 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
pytorch = callPackage ../development/python-modules/pytorch { };
|
||||
|
||||
python_tvrage = buildPythonPackage (rec {
|
||||
version = "0.4.1";
|
||||
name = "tvrage-${version}";
|
||||
@ -12388,6 +12393,9 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
journalwatch = callPackage ../tools/system/journalwatch {
|
||||
inherit (self) systemd pytest;
|
||||
};
|
||||
|
||||
jrnl = buildPythonPackage rec {
|
||||
name = "jrnl-1.9.7";
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
{ stdenv, fetchFromGitHub, git }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "rustRegistry-2017-06-27";
|
||||
name = "rustRegistry-2017-07-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "crates.io-index";
|
||||
rev = "de7301b4aa5a933658ab14dba972cc2cab77da1c";
|
||||
sha256 = "0dyx5n789pkmvk7x876v8rnagzp7xc8r2iysj2b70vcsqdvidnax";
|
||||
rev = "14f1d497ede721229b23ad1e8b6122f34761f1a6";
|
||||
sha256 = "1a9aav9yg7ffrilsnzlbaysxgzfzg455jfdh260n9y6wvpnpfvg9";
|
||||
};
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
installPhase = ''
|
||||
|
||||
Loading…
Reference in New Issue
Block a user