JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk 2017-08-13 09:50:47 +02:00
commit 2a8cd14d5f
338 changed files with 6621 additions and 7254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -3,7 +3,7 @@
###### Things done
Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.
<!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
- [ ] Tested using sandboxing
([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,

6
doc/languages-frameworks/python.md
View File

@ -547,7 +547,7 @@ All parameters from `mkDerivation` function are still supported.
##### Overriding Python packages
The `buildPythonPackage` function has a `overridePythonPackage` method that
The `buildPythonPackage` function has a `overridePythonAttrs` method that
can be used to override the package. In the following example we create an
environment where we have the `blaze` package using an older version of `pandas`.
We override first the Python interpreter and pass
@ -559,7 +559,7 @@ with import <nixpkgs> {};
(let
python = let
packageOverrides = self: super: {
pandas = super.pandas.overridePythonPackage(old: rec {
pandas = super.pandas.overridePythonAttrs(old: rec {
version = "0.19.1";
name = "pandas-${version}";
src = super.fetchPypi {
@ -786,7 +786,7 @@ with import <nixpkgs> {};
(let
python = let
packageOverrides = self: super: {
pandas = super.pandas.overridePythonPackage(old: {name="foo";});
pandas = super.pandas.overridePythonAttrs(old: {name="foo";});
};
in pkgs.python35.override {inherit packageOverrides;};

42
lib/deprecated.nix
View File

@ -309,48 +309,6 @@ rec {
mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; };
mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"];
# merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults
#
# This function is best explained by an example:
#
# {version ? "2.x"}:
#
# mkDerivation (mergeAttrsByVersion "package-name" version
# { # version specific settings
# "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; };
# "2.x" = { src = ..; };
# }
# { // shared settings
# buildInputs = [ common build inputs ];
# meta = { .. }
# }
# )
#
# Please note that e.g. Eelco Dolstra usually prefers having one file for
# each version. On the other hand there are valuable additional design goals
# - readability
# - do it once only
# - try to avoid duplication
#
# Marc Weber and Michael Raskin sometimes prefer keeping older
# versions around for testing and regression tests - as long as its cheap to
# do so.
#
# Very often it just happens that the "shared" code is the bigger part.
# Then using this function might be appropriate.
#
# Be aware that its easy to cause recompilations in all versions when using
# this function - also if derivations get too complex splitting into multiple
# files is the way to go.
#
# See misc.nix -> versionedDerivation
# discussion: nixpkgs: pull/310
mergeAttrsByVersion = name: version: attrsByVersion: base:
mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; }
base
(maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion)
];
# sane defaults (same name as attr name so that inherit can be used)
mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; }
listToAttrs (map (n: nameValuePair n lib.concat)

1
lib/maintainers.nix
View File

@ -508,6 +508,7 @@
ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>";
ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>";
ryantm = "Ryan Mulligan <ryan@ryantm.com>";
rybern = "Ryan Bernstein <ryan.bernstein@columbia.edu>";
rycee = "Robert Helgesson <robert@rycee.net>";
ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>";

10
nixos/lib/make-disk-image.nix
View File

@ -39,6 +39,12 @@
with lib;
let
extensions = {
qcow2 = "qcow2";
vpc = "vhd";
raw = "img";
};
# Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix
# TODO: factor out more cleanly
@ -142,8 +148,8 @@ in pkgs.vmTools.runInLinuxVM (
mv $diskImage $out/nixos.img
diskImage=$out/nixos.img
'' else ''
${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2
diskImage=$out/nixos.qcow2
${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/nixos.${extensions.${format}}
diskImage=$out/nixos.${extensions.${format}}
''}
${postVM}
'';

18
nixos/maintainers/scripts/ec2/amazon-image.nix
View File

@ -22,15 +22,26 @@ in {
generated image. Glob patterns work.
'';
};
sizeMB = mkOption {
type = types.int;
default = if config.ec2.hvm then 2048 else 8192;
description = "The size in MB of the image";
};
format = mkOption {
type = types.enum [ "raw" "qcow2" "vpc" ];
default = "qcow2";
description = "The image format to output";
};
};
config.system.build.amazonImage = import ../../../lib/make-disk-image.nix {
inherit lib config;
inherit (cfg) contents;
inherit (cfg) contents format;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
partitioned = config.ec2.hvm;
diskSize = if config.ec2.hvm then 2048 else 8192;
format = "qcow2";
diskSize = cfg.sizeMB;
configFile = pkgs.writeText "configuration.nix"
''
{
@ -41,5 +52,4 @@ in {
}
'';
};
}

4
nixos/modules/misc/ids.nix
View File

@ -214,7 +214,7 @@
plex = 193;
grafana = 196;
skydns = 197;
ripple-rest = 198;
# ripple-rest = 198; # unused, removed 2017-08-12
nix-serve = 199;
tvheadend = 200;
uwsgi = 201;
@ -489,7 +489,7 @@
sabnzbd = 194;
#grafana = 196; #unused
#skydns = 197; #unused
#ripple-rest = 198; #unused
# ripple-rest = 198; # unused, removed 2017-08-12
#nix-serve = 199; #unused
#tvheadend = 200; #unused
uwsgi = 201;

1
nixos/modules/module-list.nix
View File

@ -323,7 +323,6 @@
./services/misc/radarr.nix
./services/misc/redmine.nix
./services/misc/rippled.nix
./services/misc/ripple-rest.nix
./services/misc/ripple-data-api.nix
./services/misc/rogue.nix
./services/misc/siproxd.nix

3
nixos/modules/services/databases/influxdb.nix
View File

@ -68,7 +68,7 @@ let
collectd = [{
enabled = false;
typesdb = "${pkgs.collectd}/share/collectd/types.db";
typesdb = "${pkgs.collectd-data}/share/collectd/types.db";
database = "collectd_db";
bind-address = ":25826";
}];
@ -149,7 +149,6 @@ in
type = types.attrs;
};
};
};

24
nixos/modules/services/logging/graylog.nix
View File

@ -11,9 +11,7 @@ let
password_secret = ${cfg.passwordSecret}
root_username = ${cfg.rootUsername}
root_password_sha2 = ${cfg.rootPasswordSha2}
elasticsearch_cluster_name = ${cfg.elasticsearchClusterName}
elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled}
elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts}
elasticsearch_hosts = ${concatStringsSep "," cfg.elasticsearchHosts}
message_journal_dir = ${cfg.messageJournalDir}
mongodb_uri = ${cfg.mongodbUri}
plugin_dir = /var/lib/graylog/plugins
@ -91,22 +89,10 @@ in
'';
};
elasticsearchClusterName = mkOption {
type = types.str;
example = "graylog";
description = "This must be the same as for your Elasticsearch cluster";
};
elasticsearchDiscoveryZenPingMulticastEnabled = mkOption {
type = types.bool;
default = false;
description = "Whether to use elasticsearch multicast discovery";
};
elasticsearchDiscoveryZenPingUnicastHosts = mkOption {
type = types.str;
default = "127.0.0.1:9300";
description = "Tells Graylogs Elasticsearch client how to find other cluster members. See Elasticsearch documentation for details";
elasticsearchHosts = mkOption {
type = types.listOf types.str;
example = literalExample ''[ "http://node1:9200" "http://user:password@node2:19200" ]'';
description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication";
};
messageJournalDir = mkOption {

4
nixos/modules/services/mail/postfix.nix
View File

@ -213,8 +213,8 @@ let
wakeupDefined = options.wakeup.isDefined;
wakeupUCDefined = options.wakeupUnusedComponent.isDefined;
finalValue = toString config.wakeup
+ optionalString (!config.wakeupUnusedComponent) "?";
in if wakeupDefined && wakeupUCDefined then finalValue else "-";
+ optionalString (wakeupUCDefined && !config.wakeupUnusedComponent) "?";
in if wakeupDefined then finalValue else "-";
in [
config.name

110
nixos/modules/services/misc/ripple-rest.nix
View File

@ -1,110 +0,0 @@
{ config, pkgs, lib, ... }:
with lib;
let
cfg = config.services.rippleRest;
configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON {
config_version = "2.0.3";
debug = cfg.debug;
port = cfg.port;
host = cfg.host;
ssl_enabled = cfg.ssl.enable;
ssl = {
key_path = cfg.ssl.keyPath;
cert_path = cfg.ssl.certPath;
reject_unathorized = cfg.ssl.rejectUnathorized;
};
db_path = cfg.dbPath;
max_transaction_fee = cfg.maxTransactionFee;
rippled_servers = cfg.rippleds;
});
in {
options.services.rippleRest = {
enable = mkEnableOption "ripple rest";
debug = mkEnableOption "debug for ripple-rest";
host = mkOption {
description = "Ripple rest host.";
default = "localhost";
type = types.str;
};
port = mkOption {
description = "Ripple rest port.";
default = 5990;
type = types.int;
};
ssl = {
enable = mkEnableOption "ssl";
keyPath = mkOption {
description = "Path to the ripple rest key file.";
default = null;
type = types.nullOr types.path;
};
certPath = mkOption {
description = "Path to the ripple rest cert file.";
default = null;
type = types.nullOr types.path;
};
rejectUnathorized = mkOption {
description = "Whether to reject unatohroized.";
default = true;
type = types.bool;
};
};
dbPath = mkOption {
description = "Ripple rest database path.";
default = "${cfg.dataDir}/ripple-rest.db";
type = types.path;
};
maxTransactionFee = mkOption {
description = "Ripple rest max transaction fee.";
default = 1000000;
type = types.int;
};
rippleds = mkOption {
description = "List of rippled servers.";
default = [
"wss://s1.ripple.com:443"
];
type = types.listOf types.str;
};
dataDir = mkOption {
description = "Ripple rest data directory.";
default = "/var/lib/ripple-rest";
type = types.path;
};
};
config = mkIf (cfg.enable) {
systemd.services.ripple-rest = {
wantedBy = [ "multi-user.target"];
after = ["network.target" ];
environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules";
serviceConfig = {
ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}";
User = "ripple-rest";
};
};
users.extraUsers.postgres = {
name = "ripple-rest";
uid = config.ids.uids.ripple-rest;
createHome = true;
home = cfg.dataDir;
};
};
}

4
nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
View File

@ -57,8 +57,8 @@ in {
AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
ExecStart = ''
${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
-web.listen-address :${toString cfg.port} \
-config.file ${cfg.configFile} \
--web.listen-address :${toString cfg.port} \
--config.file ${cfg.configFile} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

52
nixos/modules/services/network-filesystems/rsyncd.nix
View File

@ -8,22 +8,21 @@ let
motdFile = builtins.toFile "rsyncd-motd" cfg.motd;
moduleConfig = name:
let module = getAttr name cfg.modules; in
"[${name}]\n " + (toString (
map
(key: "${key} = ${toString (getAttr key module)}\n")
(attrNames module)
));
foreach = attrs: f:
concatStringsSep "\n" (mapAttrsToList f attrs);
cfgFile = builtins.toFile "rsyncd.conf"
''
cfgFile = ''
${optionalString (cfg.motd != "") "motd file = ${motdFile}"}
${optionalString (cfg.address != "") "address = ${cfg.address}"}
${optionalString (cfg.port != 873) "port = ${toString cfg.port}"}
${cfg.extraConfig}
${toString (map moduleConfig (attrNames cfg.modules))}
'';
${foreach cfg.modules (name: module: ''
[${name}]
${foreach module (k: v:
"${k} = ${v}"
)}
'')}
'';
in
{
@ -84,6 +83,24 @@ in
};
};
user = mkOption {
type = types.str;
default = "root";
description = ''
The user to run the daemon as.
By default the daemon runs as root.
'';
};
group = mkOption {
type = types.str;
default = "root";
description = ''
The group to run the daemon as.
By default the daemon runs as root.
'';
};
};
};
@ -91,16 +108,17 @@ in
config = mkIf cfg.enable {
environment.etc = singleton {
source = cfgFile;
target = "rsyncd.conf";
};
environment.etc."rsyncd.conf".text = cfgFile;
systemd.services.rsyncd = {
description = "Rsync daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach";
restartTriggers = [ config.environment.etc."rsyncd.conf".source ];
serviceConfig = {
ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach";
User = cfg.user;
Group = cfg.group;
};
};
};
}

2
nixos/modules/services/network-filesystems/samba.nix
View File

@ -243,7 +243,7 @@ in
};
};
security.pam.services.sambda = {};
security.pam.services.samba = {};
})
];

9
nixos/modules/services/networking/firefox/sync-server.nix
View File

@ -119,12 +119,13 @@ in
config = mkIf cfg.enable {
systemd.services.syncserver = {
systemd.services.syncserver = let
syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]);
in {
after = [ "network.target" ];
description = "Firefox Sync Server";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.pythonPackages.pasteScript pkgs.coreutils ];
environment.PYTHONPATH = "${pkgs.pythonPackages.syncserver}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
path = [ pkgs.coreutils syncServerEnv ];
preStart = ''
if ! test -e ${cfg.privateConfig}; then
umask u=rwx,g=x,o=x
@ -133,7 +134,7 @@ in
echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
fi
'';
serviceConfig.ExecStart = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}";
serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
};
};

4
nixos/modules/services/networking/mosquitto.nix
View File

@ -125,8 +125,8 @@ in
description = ''
Specifies the hashed password for the MQTT User.
<option>hashedPassword</option> overrides <option>password</option>.
To generate hashed password install <literal>mkpasswd</literal>
package and run <literal>mkpasswd -m sha-512</literal>.
To generate hashed password install <literal>mosquitto</literal>
package and use <literal>mosquitto_passwd</literal>.
'';
};

1
nixos/modules/services/networking/tinc.nix
View File

@ -166,7 +166,6 @@ in
path = [ data.package ];
serviceConfig = {
Type = "simple";
PIDFile = "/run/tinc.${network}.pid";
Restart = "always";
RestartSec = "3";
};

18
nixos/modules/services/networking/wireguard.nix
View File

@ -79,6 +79,16 @@ let
description = "A list of commands called after shutting down the interface.";
};
table = mkOption {
default = "main";
type = types.str;
description = ''The kernel routing table to add this interface's
associated routes to. Setting this is useful for e.g. policy routing
("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric
table IDs and table names (/etc/rt_tables) can be used. Defaults to
"main".'';
};
peers = mkOption {
default = [];
description = "Peers linked to the interface.";
@ -207,9 +217,11 @@ let
"${ipCommand} link set up dev ${name}"
(map (peer: (map (ip:
"${ipCommand} route replace ${ip} dev ${name}"
) peer.allowedIPs)) values.peers)
(map (peer:
(map (allowedIP:
"${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}"
) peer.allowedIPs)
) values.peers)
values.postSetup
]);

104
nixos/modules/services/security/tor.nix
View File

@ -46,8 +46,20 @@ let
ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed
''}
''
+ hiddenServices
+ cfg.extraConfig;
hiddenServices = concatStrings (mapAttrsToList (hiddenServiceDir: hs:
let
hsports = concatStringsSep "\n" (map mkHiddenServicePort hs.hiddenServicePorts);
in
"HiddenServiceDir ${hiddenServiceDir}\n${hsports}\n${hs.extraConfig}\n"
) cfg.hiddenServices);
mkHiddenServicePort = hsport: let
trgt = optionalString (hsport.target != null) (" " + hsport.target);
in "HiddenServicePort ${toString hsport.virtualPort}${trgt}";
torRcFile = pkgs.writeText "torrc" torRc;
in
{
@ -229,11 +241,11 @@ in
default = null;
example = "450 GBytes";
description = ''
Specify maximum bandwidth allowed during an accounting
period. This allows you to limit overall tor bandwidth
over some time period. See the
<literal>AccountingMax</literal> option by looking at the
tor manual (<literal>man tor</literal>) for more.
Specify maximum bandwidth allowed during an accounting period. This
allows you to limit overall tor bandwidth over some time period.
See the <literal>AccountingMax</literal> option by looking at the
tor manual <citerefentry><refentrytitle>tor</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> for more.
Note this limit applies individually to upload and
download; if you specify <literal>"500 GBytes"</literal>
@ -247,10 +259,11 @@ in
default = null;
example = "month 1 1:00";
description = ''
Specify length of an accounting period. This allows you to
limit overall tor bandwidth over some time period. See the
<literal>AccountingStart</literal> option by looking at
the tor manual (<literal>man tor</literal>) for more.
Specify length of an accounting period. This allows you to limit
overall tor bandwidth over some time period. See the
<literal>AccountingStart</literal> option by looking at the tor
manual <citerefentry><refentrytitle>tor</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> for more.
'';
};
@ -279,9 +292,10 @@ in
type = types.str;
example = "143";
description = ''
What port to advertise for Tor connections. This corresponds
to the <literal>ORPort</literal> section in the Tor manual; see
<literal>man tor</literal> for more details.
What port to advertise for Tor connections. This corresponds to the
<literal>ORPort</literal> section in the Tor manual; see
<citerefentry><refentrytitle>tor</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> for more details.
At a minimum, you should just specify the port for the
relay to listen on; a common one like 143, 22, 80, or 443
@ -314,6 +328,72 @@ in
'';
};
};
hiddenServices = mkOption {
type = types.attrsOf (types.submodule ({
options = {
hiddenServicePorts = mkOption {
type = types.listOf (types.submodule {
options = {
virtualPort = mkOption {
type = types.int;
example = 80;
description = "Virtual port.";
};
target = mkOption {
type = types.nullOr types.str;
default = null;
example = "127.0.0.1:8080";
description = ''
Target virtual Port shall be mapped to.
You may override the target port, address, or both by
specifying a target of addr, port, addr:port, or
unix:path. (You can specify an IPv6 target as
[addr]:port. Unix paths may be quoted, and may use
standard C escapes.)
'';
};
};
});
example = [ { virtualPort = 80; target = "127.0.0.1:8080"; } { virtualPort = 6667; } ];
description = ''
If target is <literal>null</literal> the virtual port is mapped
to the same port on 127.0.0.1 over TCP. You may use
<literal>target</literal> to overwrite this behaviour (see
description of target).
This corresponds to the <literal>HiddenServicePort VIRTPORT
[TARGET]</literal> option by looking at the tor manual
<citerefentry><refentrytitle>tor</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> for more information.
'';
};
extraConfig = mkOption {
type = types.str;
default = "";
description = ''
Extra configuration. Contents will be added in the current
hidden service context.
'';
};
};
}));
default = {};
example = {
"/var/lib/tor/webserver" = {
hiddenServicePorts = [ { virtualPort = 80; } ];
};
};
description = ''
Configure hidden services.
Please consult the tor manual
<citerefentry><refentrytitle>tor</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> for a more detailed
explanation. (search for 'HIDDEN').
'';
};
};
};

40
nixos/modules/virtualisation/libvirtd.nix
View File

@ -15,7 +15,7 @@ let
'';
qemuConfigFile = pkgs.writeText "qemu.conf" ''
${optionalString cfg.qemuOvmf ''
nvram = ["${pkgs.OVMF.fd}/FV/OVMF_CODE.fd:${pkgs.OVMF.fd}/FV/OVMF_VARS.fd"]
nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"]
''}
${cfg.qemuVerbatimConfig}
'';
@ -102,9 +102,7 @@ in {
config = mkIf cfg.enable {
environment.systemPackages = with pkgs;
[ libvirt netcat-openbsd ]
++ optional cfg.enableKVM qemu_kvm;
environment.systemPackages = with pkgs; [ libvirt netcat-openbsd ];
boot.kernelModules = [ "tun" ];
@ -129,7 +127,6 @@ in {
dnsmasq
ebtables
]
++ optional cfg.enableKVM qemu_kvm
++ optional vswitch.enable vswitch.package;
preStart = ''
@ -155,34 +152,31 @@ in {
# Copy generated qemu config to libvirt directory
cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf
# libvirtd puts the full path of the emulator binary in the machine
# config file. But this path can unfortunately be garbage collected
# while still being used by the virtual machine. So update the
# emulator path on each startup to something valid (re-scan $PATH).
for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do
test -f "$file" || continue
# get (old) emulator path from config file
emulator=$("${pkgs.xmlstarlet}/bin/xmlstarlet" select --template --value-of "/domain/devices/emulator" "$file")
# get a (definitely) working emulator path by re-scanning $PATH
new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator"))
# write back
"${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/devices/emulator" -v "$new_emulator" "$file"
# stable (not GC'able as in /nix/store) paths for using in <emulator> section of xml configs
mkdir -p /run/libvirt/nix-emulators
ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/
${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"}
${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"}
# Also refresh the OVMF path. Files with no matches are ignored.
"${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/os/loader" -v "${pkgs.OVMF.fd}/FV/OVMF_CODE.fd" "$file"
done
''; # */
${optionalString cfg.qemuOvmf ''
mkdir -p /run/libvirt/nix-ovmf
ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/libvirt/nix-ovmf/
ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/libvirt/nix-ovmf/
''}
'';
serviceConfig = {
Type = "notify";
KillMode = "process"; # when stopping, leave the VMs alone
Restart = "on-failure";
Restart = "no";
};
restartIfChanged = false;
};
systemd.services.libvirt-guests = {
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ coreutils libvirt gawk ];
restartIfChanged = false;
};
systemd.sockets.virtlogd = {
@ -194,6 +188,7 @@ in {
systemd.services.virtlogd = {
description = "Virtual machine log manager";
serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlogd virtlogd";
restartIfChanged = false;
};
systemd.sockets.virtlockd = {
@ -205,6 +200,7 @@ in {
systemd.services.virtlockd = {
description = "Virtual machine lock manager";
serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd";
restartIfChanged = false;
};
};
}

2
nixos/tests/nginx.nix
View File

@ -3,7 +3,7 @@
# generated virtual hosts config.
import ./make-test.nix ({ pkgs, ...} : {
name = "jenkins";
name = "nginx";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mbbx6spp ];
};

15
nixos/tests/plasma5.nix
View File

@ -16,17 +16,10 @@ import ./make-test.nix ({ pkgs, ...} :
# fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why.
nixpkgs.config.packageOverrides = superPkgs: {
fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs
(_attrs: rec {
version = "0.3.3";
name = "fontconfig-penultimate-${version}";
src = pkgs.fetchFromGitHub {
owner = "ttuegel";
repo = "fontconfig-penultimate";
rev = version;
sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
};
});
fontconfig-penultimate = superPkgs.fontconfig-penultimate.override {
version = "0.3.3";
sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9";
};
};
};

2
pkgs/applications/altcoins/freicoin.nix
View File

@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
# I think that openssl and zlib are required, but come through other
# packages
preBuild = "unset AR";
installPhase = ''
mkdir -p $out/bin
cp freicoin-qt $out/bin

3
pkgs/applications/altcoins/memorycoin.nix
View File

@ -22,7 +22,8 @@ stdenv.mkDerivation rec{
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
preBuild = "unset AR;"
+ (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
installPhase =
if withGui

3
pkgs/applications/altcoins/primecoin.nix
View File

@ -22,7 +22,8 @@ stdenv.mkDerivation rec{
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
preBuild = "unset AR;"
+ (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
installPhase =
if withGui

2
pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn";
};
phases = ["unpackPhase" "installPhase"];
dontBuild = true;
installPhase = ''
mkdir -p $out/include

4
pkgs/applications/audio/mopidy-iris/default.nix
View File

@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec {
name = "mopidy-iris-${version}";
version = "3.0.5";
version = "3.1.3";
src = pythonPackages.fetchPypi {
inherit version;
pname = "Mopidy-Iris";
sha256 = "0rabpzmiis13z4qz3vqlsfc9xjkwracafckahnq2cq97qawyq9y9";
sha256 = "144q83cfgdwlj5gv9wyi902xfjybsaa9n7d5azs14jpbnmmbj61f";
};
propagatedBuildInputs = [

4
pkgs/applications/audio/zynaddsubfx/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "zynaddsubfx-${version}";
version = "3.0.1";
version = "3.0.2";
src = fetchurl {
url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8";
sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm";
};
buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];

6
pkgs/applications/editors/android-studio/packages.nix
View File

@ -27,9 +27,9 @@ in rec {
preview = mkStudio rec {
pname = "android-studio-preview";
version = "3.0.0.9"; # This is actually "Android Studio 3.0 Beta 1"
build = "171.4243858";
sha256Hash = "137jd4146srjigyzcfds8pf7b185q1qdkb0zp2yqc8g6bv4ccb22";
version = "3.0.0.10"; # "Android Studio 3.0 Beta 2"
build = "171.4263559";
sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w";
meta = stable.meta // {
description = "The Official IDE for Android (preview version)";

4
pkgs/applications/editors/atom/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
version = "1.18.0";
version = "1.19.0";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6";
sha256 = "1gdasqpmbyasd05p5920aw6bf8j58crs51gxjslsgbl1azi4yfh2";
name = "${name}.deb";
};

12
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -752,10 +752,10 @@
}) {};
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
pname = "exwm";
version = "0.14";
version = "0.15";
src = fetchurl {
url = "https://elpa.gnu.org/packages/exwm-0.14.tar";
sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx";
url = "https://elpa.gnu.org/packages/exwm-0.15.tar";
sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg";
};
packageRequires = [ xelb ];
meta = {
@ -1446,10 +1446,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20170731";
version = "20170807";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20170731.tar";
sha256 = "1vf91r4ifnjg5r82l5ikq0bwsxd5dsbgywzmwaspm6ckx49nksnl";
url = "https://elpa.gnu.org/packages/org-20170807.tar";
sha256 = "185pyc0v4vwzvkygqhpld14lk62ygvfb9ycz609n99m0wqlamwz3";
};
packageRequires = [];
meta = {

2106
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

483
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

@ -86,12 +86,12 @@
abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "abyss-theme";
version = "0.5";
version = "0.7";
src = fetchFromGitHub {
owner = "mgrbyte";
repo = "emacs-abyss-theme";
rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc";
sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14";
sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme";
@ -1136,12 +1136,12 @@
alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alda-mode";
version = "0.1.0";
version = "0.2.0";
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
rev = "921b1d39ee1122c0f6935598dc17aaa904e74819";
sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f";
rev = "97c20b1fd9ad3f138e1100e3a837d05108c4c564";
sha256 = "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@ -1981,27 +1981,6 @@
license = lib.licenses.free;
};
}) {};
aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aurora-config-mode";
version = "0.0.2";
src = fetchFromGitHub {
owner = "bdd";
repo = "aurora-config-mode.el";
rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode";
sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
name = "aurora-config-mode";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/aurora-config-mode";
license = lib.licenses.free;
};
}) {};
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
melpaBuild {
pname = "auth-password-store";
@ -2028,14 +2007,14 @@
pname = "auto-compile";
version = "1.4.0";
src = fetchFromGitHub {
owner = "tarsius";
owner = "emacscollective";
repo = "auto-compile";
rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf";
name = "auto-compile";
};
packageRequires = [ dash emacs packed ];
@ -3124,12 +3103,12 @@
bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bshell";
version = "0.1";
version = "0.2";
src = fetchFromGitHub {
owner = "plandes";
repo = "bshell";
rev = "0abd93439895851c1ad3037b0df7443e577ed1ba";
sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw";
rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68";
sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@ -3166,12 +3145,12 @@
buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-manage";
version = "0.1";
version = "0.2";
src = fetchFromGitHub {
owner = "plandes";
repo = "buffer-manage";
rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af";
sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma";
rev = "1110217973afa1329c47a1f7e6962aad36a90134";
sha256 = "0hb75npk1d9bdqpgdrin8vvfn64arhgq0h69xgvhwcdlm7xjg1bf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
@ -5152,12 +5131,12 @@
company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
melpaBuild {
pname = "company-math";
version = "1.2";
version = "1.3";
src = fetchFromGitHub {
owner = "vspinu";
repo = "company-math";
rev = "2cb03c48f44a5b3cbbbbe05e9841b2c61bd8ed81";
sha256 = "1i13w1pziv8c1d9gi6pg50v60z7jyx2grpamrbnazvd6rci88paf";
rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4";
sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@ -6541,17 +6520,19 @@
license = lib.licenses.free;
};
}) {};
deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "deft";
version = "0.7";
src = fetchgit {
url = "git://jblevins.org/git/deft.git";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "deft";
rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40";
sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft";
sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp";
name = "deft";
};
packageRequires = [];
@ -7284,16 +7265,16 @@
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "docker-compose-mode";
version = "0.2.1";
version = "0.2.2";
src = fetchFromGitHub {
owner = "meqif";
repo = "docker-compose-mode";
rev = "a38b64aecd037556c91d9aef29f1d04496295f2b";
sha256 = "140rbh5n1mqckjy652bp7mj08ylk8q1hr3ajl1cpyc00rniqwfds";
rev = "e4cce60d4e6c6b517cb786c14fbf9ed8a13f530c";
sha256 = "0fn8b9dmz911sqqlq2f6vd84qg39j2ban3ixh0wblcxbrd5wli2v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74905aa52aa78bdc8e96aa3b791c3d2a70965f/recipes/docker-compose-mode";
sha256 = "094r2mqxmll5dqbjhhdfg60xs9m74qn22lz475692k48ma5a7gd0";
url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g";
name = "docker-compose-mode";
};
packageRequires = [ dash emacs yaml-mode ];
@ -7808,12 +7789,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
version = "1.5.5";
version = "1.5.7";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
rev = "b656f1e3e1eaef01990b6c946a6f522538f76d19";
sha256 = "0bni2j8kcad85h2rgv8nmp5xv2mz32d5nwbmg0v9dy5m12g452md";
rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c";
sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -7889,22 +7870,22 @@
license = lib.licenses.free;
};
}) {};
ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
version = "0.2.1";
version = "0.3.0";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1";
sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q";
rev = "7bc6c5a5e504353282848cd2d0f7c73b4bccda83";
sha256 = "06pn4srx00l63lkk6kyd68svlyajxkpxd9mpjlvdpgbydzh914xl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
name = "ebal";
};
packageRequires = [ emacs f ido-completing-read-plus ];
packageRequires = [ emacs f ];
meta = {
homepage = "https://melpa.org/#/ebal";
license = lib.licenses.free;
@ -8970,14 +8951,14 @@
pname = "elx";
version = "1.1.0";
src = fetchFromGitHub {
owner = "tarsius";
owner = "emacscollective";
repo = "elx";
rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx";
sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz";
name = "elx";
};
packageRequires = [ emacs ];
@ -11802,12 +11783,12 @@
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
version = "1.9.1";
version = "1.9.2";
src = fetchFromGitHub {
owner = "Floobits";
repo = "floobits-emacs";
rev = "76c869f439c2d13028d1fe8cae486e0ef018e4b0";
sha256 = "0f0i5zzl8njrwspir1wnfyrv9q8syl2izhyn2j9j9w8wyf5w7l1b";
rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@ -12324,6 +12305,27 @@
license = lib.licenses.free;
};
}) {};
flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
melpaBuild {
pname = "flycheck-popup-tip";
version = "0.12.1";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-popup-tip";
rev = "6a857d43a1fa136e5b6715421d1b44a72170be0c";
sha256 = "1hglfhf1vrvrp2vf1p4b226mpab7m2napjw6w0qlw3dj72787pqw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx";
name = "flycheck-popup-tip";
};
packageRequires = [ emacs flycheck popup ];
meta = {
homepage = "https://melpa.org/#/flycheck-popup-tip";
license = lib.licenses.free;
};
}) {};
flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "flycheck-pos-tip";
@ -13424,25 +13426,6 @@
license = lib.licenses.free;
};
}) {};
fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "fuel";
version = "0.96";
src = fetchgit {
url = "git://factorcode.org/git/factor.git";
rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
name = "fuel";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/fuel";
license = lib.licenses.free;
};
}) {};
full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "full-ack";
@ -16163,12 +16146,12 @@
helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-backup";
version = "0.2.2";
version = "1.0.0";
src = fetchFromGitHub {
owner = "antham";
repo = "helm-backup";
rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4";
sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg";
rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@ -18512,22 +18495,22 @@
license = lib.licenses.free;
};
}) {};
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ido-completing-read-plus";
version = "3.16";
version = "4.3";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-ubiquitous";
rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
repo = "ido-completing-read-plus";
rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
name = "ido-completing-read-plus";
};
packageRequires = [ cl-lib emacs ];
packageRequires = [ cl-lib emacs s ];
meta = {
homepage = "https://melpa.org/#/ido-completing-read+";
license = lib.licenses.free;
@ -18620,16 +18603,16 @@
ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-ubiquitous";
version = "3.16";
version = "4.3";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-ubiquitous";
rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
repo = "ido-completing-read-plus";
rev = "1a1f695eb8e7d4ae2035e506ea3ff5bd4e2d0533";
sha256 = "15m8x3dp9m0brpap4l9hsbc47s4fgax3lppxz5v6rcwm625s0ac9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
name = "ido-ubiquitous";
};
packageRequires = [ cl-lib emacs ido-completing-read-plus ];
@ -18872,12 +18855,12 @@
imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imenu-anywhere";
version = "1.1.3";
version = "1.1.4";
src = fetchFromGitHub {
owner = "vspinu";
repo = "imenu-anywhere";
rev = "94bab9136e1264e98a10d9325ad53d735307f8f3";
sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j";
rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3";
sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere";
@ -19040,12 +19023,12 @@
importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "importmagic";
version = "1.0";
version = "1.1";
src = fetchFromGitHub {
owner = "anachronic";
repo = "importmagic.el";
rev = "135e049d763ceb4cabd0bab068c4c71452459065";
sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq";
rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5";
sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@ -20675,12 +20658,12 @@
kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kill-or-bury-alive";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "kill-or-bury-alive";
rev = "b488c3dbba657bbd524402f48fde16ab6b1211db";
sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5";
rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041";
sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@ -21459,11 +21442,11 @@
lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lms";
version = "0.6";
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/inigoserna/lms.el";
rev = "5f20620f62a1";
sha256 = "04wi14x2y2cb8ps3nzq4g0ryvqm40jh727jm44knlqfrx15imkw9";
rev = "f07ac3678e27";
sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
@ -21692,13 +21675,13 @@
version = "2.1";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "osx-pseudo-daemon";
repo = "mac-pseudo-daemon";
rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/mac-pseudo-daemon";
sha256 = "1kf677j6n7ykw8v5xsvbnnhm3hgjicl8fnf6yz9qw4whd0snrhn6";
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon";
sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0";
name = "mac-pseudo-daemon";
};
packageRequires = [ cl-lib ];
@ -21924,6 +21907,27 @@
license = lib.licenses.free;
};
}) {};
magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-imerge";
version = "0.2.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-imerge";
rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c";
sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4";
name = "magit-imerge";
};
packageRequires = [ emacs magit ];
meta = {
homepage = "https://melpa.org/#/magit-imerge";
license = lib.licenses.free;
};
}) {};
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
@ -22050,22 +22054,22 @@
license = lib.licenses.free;
};
}) {};
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
melpaBuild {
pname = "magithub";
version = "0.1.2";
version = "0.1.3";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
rev = "283bde94b3fe5cd8f4634887812c58eaf55aef60";
sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7";
rev = "959e7b259697c79ccf46b95827575d3e15e83d30";
sha256 = "19m7qmp5pi5l3mak1j475qxgnpr4kc4dm7qj80qc4m844bkacc4h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
name = "magithub";
};
packageRequires = [ emacs git-commit magit s with-editor ];
packageRequires = [ emacs ghub-plus magit s ];
meta = {
homepage = "https://melpa.org/#/magithub";
license = lib.licenses.free;
@ -22669,12 +22673,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
version = "3.0.1";
version = "3.0.2";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
rev = "803dfd048c97f9fc16148d6b8ca116a281e8b537";
sha256 = "10ba2zrivllzp5rl77hsd06pgw7s42s7hsvfdvx01482xf22b7lb";
rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@ -24119,14 +24123,14 @@
pname = "no-littering";
version = "0.5.9";
src = fetchFromGitHub {
owner = "tarsius";
owner = "emacscollective";
repo = "no-littering";
rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82";
sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l";
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh";
name = "no-littering";
};
packageRequires = [ cl-lib ];
@ -24638,12 +24642,12 @@
obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "obfusurl";
version = "2.0";
version = "2.1";
src = fetchFromGitHub {
owner = "davep";
repo = "obfusurl.el";
rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e";
sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961";
rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5";
sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
@ -24680,12 +24684,12 @@
ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ocp-indent";
version = "1.6.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-indent";
rev = "032599b162624a4b65c82c20be06433f24b00e8f";
sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c";
sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@ -24743,12 +24747,12 @@
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
version = "1.5.6";
version = "1.5.7";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef";
sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2";
rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8";
sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@ -24873,8 +24877,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
rev = "ad147956b936fd528d26ca88158a8af96ff5827a";
sha256 = "04vkhdp3kxba1h5mjd9jblhapb5h2x709ldz4pc078qgyh5g1kpm";
rev = "bf0edf7c74ddcd9976753543481a61a5607eec4e";
sha256 = "1x7bvpy2lx51j58grbc45l99mzf55wlx657icc7q5rf2vgb56k01";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@ -26299,13 +26303,13 @@
version = "2.1";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "osx-pseudo-daemon";
repo = "mac-pseudo-daemon";
rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e89752e595c7cec9488e755c30af18f5f6fc1698/recipes/osx-pseudo-daemon";
sha256 = "013h2n27r4rvj8ych5cglj8qprkdxmmmsfi51fggqqvmv7qmr2hw";
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon";
sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z";
name = "osx-pseudo-daemon";
};
packageRequires = [];
@ -26655,14 +26659,14 @@
pname = "packed";
version = "2.0.1";
src = fetchFromGitHub {
owner = "tarsius";
owner = "emacscollective";
repo = "packed";
rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed";
sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd";
name = "packed";
};
packageRequires = [ dash emacs ];
@ -27277,6 +27281,26 @@
license = lib.licenses.free;
};
}) {};
pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pelican-mode";
version = "20170808";
src = fetchgit {
url = "https://git.korewanetadesu.com/pelican-mode.git";
rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c";
sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi";
name = "pelican-mode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/pelican-mode";
license = lib.licenses.free;
};
}) {};
per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "per-buffer-theme";
@ -28599,12 +28623,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
version = "3.3.2";
version = "3.4.0pre1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
rev = "5532abc15b97f3489183b266b41844306052a3fa";
sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4";
rev = "3afcded28a6aa9c44adf801ca5bff2133fcf3030";
sha256 = "03m1fprfz6cwxijp5fls502g6g3svyz760bwwwnbvyx4carwzmsp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@ -29583,6 +29607,27 @@
license = lib.licenses.free;
};
}) {};
react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "react-snippets";
version = "0.1";
src = fetchFromGitHub {
owner = "johnmastro";
repo = "react-snippets.el";
rev = "bfc4b68b81374a6a080240592641091a7e8a6d61";
sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets";
sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
name = "react-snippets";
};
packageRequires = [ yasnippet ];
meta = {
homepage = "https://melpa.org/#/react-snippets";
license = lib.licenses.free;
};
}) {};
real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "real-auto-save";
@ -30237,12 +30282,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
version = "0.1.4";
version = "0.2.0";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
rev = "4a24c86a1873289538134fe431e544fa3e12e788";
sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@ -30447,12 +30492,12 @@
ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-electric";
version = "2.2.3";
version = "2.3.0";
src = fetchFromGitHub {
owner = "knu";
repo = "ruby-electric.el";
rev = "dfb4b448a63ae749c74edf6415ad569d52cab904";
sha256 = "0z3whvjmxbyk7lrxl3z2lj1skacwd050b5jvpnw6gcdm2hr8mfbs";
rev = "d04313dbee42c0d1009558a7c9424e4ae8611908";
sha256 = "03g6m2xjfjjm06v5gid1vxivzb6lnsdc65d1p2wjaz32j1rmb6gm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
@ -30871,8 +30916,8 @@
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf";
sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw";
rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379";
sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@ -30991,12 +31036,12 @@
sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "sekka";
version = "1.7.1";
version = "1.8.0";
src = fetchFromGitHub {
owner = "kiyoka";
repo = "sekka";
rev = "b9b2ba5aca378ad12cb9e0f0ac537d695bd39937";
sha256 = "1karh4pa190xmjbw1ai2f594i8nf9qa0lxybn3syif7r50ciym3c";
rev = "d1fd5d47aacba723631d5d374169a45ff2051c41";
sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@ -31558,12 +31603,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
version = "0.0.8";
version = "0.0.9";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2";
sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd";
rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@ -31663,12 +31708,12 @@
simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simpleclip";
version = "1.0.2";
version = "1.0.4";
src = fetchFromGitHub {
owner = "rolandwalker";
repo = "simpleclip";
rev = "7deff873b79910496b4baf647cdb8dd5de63465a";
sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz";
rev = "d461c462c237cd896553adb468cd77499d0d26ad";
sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@ -33256,12 +33301,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
version = "0.3";
version = "0.4";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
rev = "26e8b0615def4f0531682b8a849f55d330616ac1";
sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np";
rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f";
sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@ -34514,12 +34559,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
version = "0.10";
version = "0.11";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8";
sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89";
rev = "541f73c779e72eb6ebcc6814a75771e91679875a";
sha256 = "1rjxn5pfryxbxsgfmmzidcs83azvzvzq0nnphbxmlxybp97wzimx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@ -34556,12 +34601,12 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
version = "1.8";
version = "1.8.5";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4";
sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk";
rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4";
sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
@ -34577,12 +34622,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
version = "1.8";
version = "1.8.5";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
rev = "56007723b5eeb2d01be80e4b9df471747bb0b7f4";
sha256 = "00fq88wgbj9lji4pjc2bk34d584kiirh03ydiwz8pc2f2smv61pk";
rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4";
sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@ -35315,6 +35360,27 @@
license = lib.licenses.free;
};
}) {};
vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "vc-msg";
version = "0.0.4";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "vc-msg";
rev = "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee";
sha256 = "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg";
sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9";
name = "vc-msg";
};
packageRequires = [ emacs popup ];
meta = {
homepage = "https://melpa.org/#/vc-msg";
license = lib.licenses.free;
};
}) {};
vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vcomp";
@ -36451,12 +36517,12 @@
with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "with-simulated-input";
version = "2.0";
version = "2.2";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "with-simulated-input";
rev = "568bfb8e1d59a19cb309fd72a7ab0e9e51229e31";
sha256 = "1aa8ya5yzsijra7cf9rm80ffddv520kzm9rggw3nr3dj2sk03p8c";
rev = "9efeb236c8f6887a8591d6241962c37266d8e726";
sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@ -36532,6 +36598,27 @@
license = lib.licenses.free;
};
}) {};
wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wordgen";
version = "0.1.4";
src = fetchFromGitHub {
owner = "Fanael";
repo = "wordgen.el";
rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d";
sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen";
sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m";
name = "wordgen";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/wordgen";
license = lib.licenses.free;
};
}) {};
wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wordsmith-mode";
@ -37015,6 +37102,27 @@
license = lib.licenses.free;
};
}) {};
yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yarn-mode";
version = "1.0";
src = fetchFromGitHub {
owner = "anachronic";
repo = "yarn-mode";
rev = "99891000efe31214b065fa9446cd5e68c5c42ed8";
sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode";
sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg";
name = "yarn-mode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/yarn-mode";
license = lib.licenses.free;
};
}) {};
yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yascroll";
@ -37254,6 +37362,27 @@
license = lib.licenses.free;
};
}) {};
zephir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zephir-mode";
version = "0.3.3";
src = fetchFromGitHub {
owner = "sergeyklay";
repo = "zephir-mode";
rev = "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c";
sha256 = "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j";
name = "zephir-mode";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/zephir-mode";
license = lib.licenses.free;
};
}) {};
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View File

@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
version = "20170731";
version = "20170807";
src = fetchurl {
url = "http://orgmode.org/elpa/org-20170731.tar";
sha256 = "0lphzjxmk5y9g6b9rnacc9z55hbws3xmycsqdvsz56xr3aawx255";
url = "http://orgmode.org/elpa/org-20170807.tar";
sha256 = "0cpkkfw7wmz242r5zzpcnzp7gfsmja90gqqb5h20azxmq96kfzga";
};
packageRequires = [];
meta = {
@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
version = "20170731";
version = "20170807";
src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20170731.tar";
sha256 = "1bba4m9r598f9l8wmr1j670d1qp4fcbbhzp9m4qd2md09rm3nsnw";
url = "http://orgmode.org/elpa/org-plus-contrib-20170807.tar";
sha256 = "145j9g1lx5nj85irdh9ljhh4rhwj9ys8nnca549lyxd9a5yiav5k";
};
packageRequires = [];
meta = {

4
pkgs/applications/editors/jetbrains/default.nix
View File

@ -307,12 +307,12 @@ in
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2017.1.5";
version = "2017.2.1";
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
sha256 = "0gjj2g9fcrbbbp3v4clg0kj48qdw0gqcn9im4h8p3z2zscpg16ag";
sha256 = "0y3r82i229d7lywixyifv4kkrwivixl75flagaqbkzw3j9wklg3k";
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";

6
pkgs/applications/editors/typora/default.nix
View File

@ -3,18 +3,18 @@
stdenv.mkDerivation rec {
name = "typora-${version}";
version = "0.9.29";
version = "0.9.31";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
sha256 = "1d7a02ee603be871d6f8c25b5c11069267ec11644a4f513635c0769ce46a44a7";
sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42";
}
else
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_i386.deb";
sha256 = "79834b0ccd2257c030aec850ebc81fe115f46891b482f1ffa41fcc19c5f29659";
sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1";
}
;

8
pkgs/applications/graphics/inkscape/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge
, libvisio, libcdr, libexif, automake114x, potrace, cmake
, libvisio, libcdr, libexif, potrace, cmake
}:
let
@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
makeWrapper intltool gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif automake114x potrace cmake python2Env
makeWrapper gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace cmake python2Env
];
enableParallelBuilding = true;

87
pkgs/applications/misc/bitcoinarmory/default.nix Normal file
View File

@ -0,0 +1,87 @@
{ stdenv, fetchFromGitHub, pythonPackages
, pkgconfig, autoreconfHook, rsync
, swig, qt4, fcgi
, bitcoin, procps, utillinux
}:
let
version = "0.96.1";
sitePackages = pythonPackages.python.sitePackages;
inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted;
in mkPythonDerivation {
name = "bitcoinarmory-${version}";
src = fetchFromGitHub {
owner = "goatpig";
repo = "BitcoinArmory";
rev = "v${version}";
#sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2";
sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true;
};
# FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that.
#patches = [ ./shutdown-fix.patch ];
buildInputs = [
pkgconfig
autoreconfHook
swig
qt4
fcgi
rsync # used by silly install script (TODO patch upstream)
];
propagatedBuildInputs = [
pyqt4
psutil
twisted
];
makeFlags = [ "PREFIX=$(out)" ];
makeWrapperArgs = [
"--prefix PATH : ${bitcoin}/bin" # for `bitcoind`
"--prefix PATH : ${procps}/bin" # for `free`
"--prefix PATH : ${utillinux}/bin" # for `whereis`
"--suffix LD_LIBRARY_PATH : $out/lib" # for python bindings built as .so files
"--run cd\\ $out/lib/armory" # so that GUI resources can be loaded
];
# auditTmpdir runs during fixupPhase, so patchelf before that
preFixup = ''
newRpath=$(patchelf --print-rpath $out/bin/ArmoryDB | sed -r 's|(.*)(/tmp/nix-build-.*libfcgi/.libs:?)(.*)|\1\3|')
patchelf --set-rpath $out/lib:$newRpath $out/bin/ArmoryDB
'';
# fixupPhase of mkPythonDerivation wraps $out/bin/*, so this needs to come after
postFixup = ''
wrapPythonProgramsIn $out/lib/armory "$out $pythonPath"
ln -sf $out/lib/armory/ArmoryQt.py $out/bin/armory
'';
meta = {
description = "Bitcoin wallet with cold storage and multi-signature support";
longDescription = ''
Armory is the most secure and full featured solution available for users
and institutions to generate and store Bitcoin private keys. This means
users never have to trust the Armory team and can use it with the Glacier
Protocol. Satoshi would be proud!
Users are empowered with multiple encrypted Bitcoin wallets and permanent
one-time ‘paper backups’. Armory pioneered cold storage and distributed
multi-signature. Bitcoin cold storage is a system for securely storing
Bitcoins on a completely air-gapped offline computer.
Maintainer's note: The original authors at https://bitcoinarmory.com/
discontinued development. I elected instead to package GitHub user
@goatpig's fork, as it's the most active, at time of this writing.
'';
homepage = https://github.com/goatpig/BitcoinArmory;
license = stdenv.lib.licenses.agpl3Plus;
maintainers = with stdenv.lib.maintainers; [ elitak ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

26
pkgs/applications/misc/gollum/Gemfile.lock
View File

@ -3,43 +3,43 @@ GEM
specs:
charlock_holmes (0.7.3)
diff-lcs (1.3)
gemojione (3.2.0)
gemojione (3.3.0)
json
github-markup (1.6.0)
github-markup (1.6.1)
gitlab-grit (2.8.1)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
gollum (4.1.1)
gollum (4.1.2)
gemojione (~> 3.2)
gollum-lib (~> 4.0, >= 4.0.1)
gollum-lib (>= 4.2.7)
kramdown (~> 1.9.0)
mustache (>= 0.99.5, < 1.0.0)
sinatra (~> 1.4, >= 1.4.4)
useragent (~> 0.16.2)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gollum-lib (4.2.5)
gollum-lib (4.2.7)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
nokogiri (~> 1.6.4)
rouge (~> 2.0)
nokogiri (>= 1.6.1, < 2.0)
rouge (~> 2.1)
sanitize (~> 2.1)
stringex (~> 2.6)
json (2.1.0)
kramdown (1.9.0)
mime-types (2.99.3)
mini_portile2 (2.1.0)
mini_portile2 (2.2.0)
mustache (0.99.8)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
posix-spawn (0.3.13)
rack (1.6.8)
rack-protection (1.5.3)
rack
rouge (2.0.7)
rouge (2.1.1)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sinatra (1.4.8)
@ -47,7 +47,7 @@ GEM
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
stringex (2.7.1)
tilt (2.0.7)
tilt (2.0.8)
useragent (0.16.8)
PLATFORMS
@ -57,4 +57,4 @@ DEPENDENCIES
gollum
BUNDLED WITH
1.15.0
1.15.3

41
pkgs/applications/misc/gollum/gemset.nix
View File

@ -16,22 +16,24 @@
version = "1.3";
};
gemojione = {
dependencies = ["json"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik";
sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
type = "gem";
};
version = "3.2.0";
version = "3.3.0";
};
github-markup = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9";
sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
type = "gem";
};
version = "1.6.0";
version = "1.6.1";
};
gitlab-grit = {
dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
@ -40,14 +42,16 @@
version = "2.8.1";
};
gollum = {
dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s";
sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a";
type = "gem";
};
version = "4.1.1";
version = "4.1.2";
};
gollum-grit_adapter = {
dependencies = ["gitlab-grit"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
@ -56,12 +60,13 @@
version = "1.0.1";
};
gollum-lib = {
dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z";
sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
type = "gem";
};
version = "4.2.5";
version = "4.2.7";
};
json = {
source = {
@ -90,10 +95,10 @@
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
type = "gem";
};
version = "2.1.0";
version = "2.2.0";
};
mustache = {
source = {
@ -104,12 +109,13 @@
version = "0.99.8";
};
nokogiri = {
dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj";
sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
type = "gem";
};
version = "1.6.8.1";
version = "1.8.0";
};
posix-spawn = {
source = {
@ -128,6 +134,7 @@
version = "1.6.8";
};
rack-protection = {
dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
@ -138,12 +145,13 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p";
type = "gem";
};
version = "2.0.7";
version = "2.1.1";
};
sanitize = {
dependencies = ["nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
@ -152,6 +160,7 @@
version = "2.1.0";
};
sinatra = {
dependencies = ["rack" "rack-protection" "tilt"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
@ -170,10 +179,10 @@
tilt = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b";
sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
type = "gem";
};
version = "2.0.7";
version = "2.0.8";
};
useragent = {
source = {

4
pkgs/applications/misc/gpg-mdp/default.nix
View File

@ -19,11 +19,11 @@ in stdenv.mkDerivation {
--replace "alias echo=/bin/echo" ""
substituteInPlace ./src/config.c \
--replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" \
--replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \
--replace "/usr/bin/vi" "vi"
substituteInPlace ./mdp.1 \
--replace "/usr/bin/gpg" "${gnupg}/bin/gpg2"
--replace "/usr/bin/gpg" "${gnupg}/bin/gpg"
'';
# we add symlinks to the binary and man page with the name 'gpg-mdp', in case
# the completely unrelated program also named 'mdp' is already installed.

4
pkgs/applications/misc/hugo/default.nix
View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hugo-${version}";
version = "0.25.1";
version = "0.26";
goPackagePath = "github.com/gohugoio/hugo";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz";
sha256 = "1g2brxhc6lyl2qa41lrqw2hadl601inmshsxlpmv99ax67sa19d1";
};
goDeps = ./deps.nix;

127
pkgs/applications/misc/hugo/deps.nix
View File

@ -4,8 +4,8 @@
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab";
sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg";
rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
{
@ -35,15 +35,6 @@
sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami";
};
}
{
goPackagePath = "github.com/bep/inflect";
fetch = {
type = "git";
url = "https://github.com/bep/inflect";
rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69";
sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3";
};
}
{
goPackagePath = "github.com/chaseadamsio/goorgeous";
fetch = {
@ -76,8 +67,8 @@
fetch = {
type = "git";
url = "https://github.com/eknkc/amber";
rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5";
sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq";
rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448";
sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a";
};
}
{
@ -85,8 +76,8 @@
fetch = {
type = "git";
url = "https://github.com/fortytw2/leaktest";
rev = "7dad53304f9614c1c365755c1176a8e876fee3e8";
sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m";
rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513";
sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz";
};
}
{
@ -103,8 +94,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";
sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";
rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf";
sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi";
};
}
{
@ -112,8 +103,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-immutable-radix";
rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc";
sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb";
rev = "8aac2701530899b64bdea735a1de8da899815220";
sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6";
};
}
{
@ -143,6 +134,15 @@
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
{
goPackagePath = "github.com/jdkato/prose";
fetch = {
type = "git";
url = "https://github.com/jdkato/prose";
rev = "c24611cae00c16858e611ef77226dd2f7502759f";
sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1";
};
}
{
goPackagePath = "github.com/kardianos/osext";
fetch = {
@ -152,15 +152,6 @@
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
};
}
{
goPackagePath = "github.com/kr/fs";
fetch = {
type = "git";
url = "https://github.com/kr/fs";
rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
};
}
{
goPackagePath = "github.com/kyokomi/emoji";
fetch = {
@ -175,8 +166,17 @@
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
rev = "51463bfca2576e06c62a8504b5c0f06d61312647";
sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288";
rev = "be5ece7dd465ab0765a9682137865547526d1dfb";
sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8";
};
}
{
goPackagePath = "github.com/markbates/inflect";
fetch = {
type = "git";
url = "https://github.com/markbates/inflect";
rev = "6cacb66d100482ef7cc366289ccb156020e57e76";
sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2";
};
}
{
@ -184,8 +184,8 @@
fetch = {
type = "git";
url = "https://github.com/miekg/mmark";
rev = "f809cc9d384e2f7f3985a28a899237b892f35719";
sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd";
rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f";
sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
};
}
{
@ -220,26 +220,8 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286";
sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6";
};
}
{
goPackagePath = "github.com/pkg/errors";
fetch = {
type = "git";
url = "https://github.com/pkg/errors";
rev = "c605e284fe17294bda444b34710735b29d1a9d90";
sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6";
};
}
{
goPackagePath = "github.com/pkg/sftp";
fetch = {
type = "git";
url = "https://github.com/pkg/sftp";
rev = "a5f8514e29e90a859e93871b1582e5c81f466f82";
sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd";
rev = "69d355db5304c0f7f809a2edc054553e7142f016";
sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm";
};
}
{
@ -247,8 +229,8 @@
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae";
sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137";
rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c";
sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4";
};
}
{
@ -283,8 +265,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37";
sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx";
rev = "34594c771f2c18301dc152640ad40ece28795373";
sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38";
};
}
{
@ -328,8 +310,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
rev = "c1de95864d73a5465492829d7cb2dd422b19ac96";
sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm";
rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7";
sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3";
};
}
{
@ -337,8 +319,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a";
sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9";
rev = "05e8a0eda380579888eb53c394909df027f06991";
sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
};
}
{
@ -350,15 +332,6 @@
sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "850760c427c516be930bc91280636328f1a62286";
sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz";
};
}
{
goPackagePath = "golang.org/x/image";
fetch = {
@ -373,8 +346,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd";
sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8";
rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f";
sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k";
};
}
{
@ -382,8 +355,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a";
sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj";
rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695";
sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n";
};
}
{
@ -391,8 +364,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735";
sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh";
rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720";
sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1";
};
}
{
@ -400,8 +373,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b";
sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
};
}
]

4
pkgs/applications/misc/ola/default.nix
View File

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "ola-${version}";
version = "0.10.4";
version = "0.10.5";
src = fetchFromGitHub {
owner = "OpenLightingProject";
repo = "ola";
rev = version;
sha256 = "1skb3dwpmsfdr8mp3rs80jmsr1bf78270d9bnd8h0pv8bkb8zvim";
sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al";
};
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];

13
pkgs/applications/misc/pcmanfm/default.nix
View File

@ -1,5 +1,11 @@
{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }:
{ stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig
, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }:
let
libfm' = libfm.override { inherit withGtk3; };
gtk = if withGtk3 then gtk3 else gtk2;
inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec {
name = "pcmanfm-1.2.5";
src = fetchurl {
@ -7,7 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc";
};
buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];
buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
configureFlags = optional withGtk3 "--with-gtk=3";
meta = with stdenv.lib; {
homepage = http://blog.lxde.org/?cat=28/;

4
pkgs/applications/misc/pcmanx-gtk2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }:
{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }:
stdenv.mkDerivation {
name = "pcmanx-gtk2-1.3";
@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302";
};
buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ];
buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ];
preConfigure = ''
./autogen.sh

4
pkgs/applications/misc/urlview/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, automake111x, autoreconfHook }:
{ stdenv, fetchurl, ncurses, autoreconfHook }:
stdenv.mkDerivation rec {
version = "0.9";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42";
};
buildInputs = [ ncurses automake111x autoreconfHook ];
buildInputs = [ ncurses autoreconfHook ];
preAutoreconf = ''
touch NEWS

23
pkgs/applications/misc/xastir/default.nix
View File

@ -4,11 +4,9 @@
, perl, proj, rastermagick, shapelib
}:
let
stdenv.mkDerivation rec {
name = "xastir-${version}";
version = "208";
in
stdenv.mkDerivation {
name = "xastir-"+version;
src = fetchFromGitHub {
owner = "Xastir";
@ -17,15 +15,16 @@ stdenv.mkDerivation {
sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl";
};
buildInputs =
[ autoreconfHook
curl db gdal libgeotiff
libXpm libXt motif pcre
perl proj rastermagick shapelib
];
buildInputs = [
autoreconfHook
curl db gdal libgeotiff
libXpm libXt motif pcre
perl proj rastermagick shapelib
];
configureFlags =
[ "--with-motif-includes=${motif}/include" ];
configureFlags = [ "--with-motif-includes=${motif}/include" ];
postPatch = "patchShebangs .";
meta = with stdenv.lib; {
description = "Graphical APRS client";

25
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -60,7 +60,10 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [
"ffmpeg" "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "snappy" # "libpng" "libjpeg"
"flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766
];
opusWithCustomModes = libopus.override {
@ -73,7 +76,7 @@ let
libpng libcap
xdg_utils yasm minizip libwebp
libusb1 re2 zlib
ffmpeg harfbuzz libxslt harfbuzz-icu libxml2
ffmpeg harfbuzz-icu libxslt libxml2
];
# build paths and release info
@ -104,23 +107,22 @@ let
nspr nss systemd
utillinux alsaLib
bison gperf kerberos
glib gtk2 dbus_glib
glib gtk2 gtk3 dbus_glib
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage
] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
++ optional pulseSupport libpulseaudio
++ optional (versionAtLeast version "56.0.0.0") gtk3;
++ optional pulseSupport libpulseaudio;
patches = [
./patches/nix_plugin_paths_52.patch
./patches/chromium-gn-bootstrap-r8.patch
# To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
# Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
./patches/fix_network_api_crash.patch
./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
++ optional enableWideVine ./patches/widevine.patch;
] ++ optional enableWideVine ./patches/widevine.patch;
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
@ -183,9 +185,14 @@ let
enable_hotwording = enableHotwording;
enable_widevine = enableWideVine;
use_cups = cupsSupport;
} // {
treat_warnings_as_errors = false;
is_clang = false;
clang_use_chrome_plugins = false;
remove_webcore_debug_symbols = true;
use_gtk3 = true;
enable_swiftshader = false;
fieldtrial_testing_like_official_build = true;
# Google API keys, see:
# http://www.chromium.org/developers/how-tos/api-keys

9
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -1,5 +1,5 @@
{ newScope, stdenv, makeWrapper, makeDesktopItem, ed
, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas
, glib, gtk3, gnome3, gsettings_desktop_schemas
# package customization
, channel ? "stable"
@ -67,9 +67,6 @@ let
inherit (stdenv.lib) versionAtLeast;
gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
in stdenv.mkDerivation {
name = "chromium${suffix}-${version}";
inherit version;
@ -78,10 +75,10 @@ in stdenv.mkDerivation {
makeWrapper ed
# needed for GSETTINGS_SCHEMAS_PATH
gsettings_desktop_schemas glib gtk
gsettings_desktop_schemas glib gtk3
# needed for XDG_ICON_DIRS
gnome.defaultIconTheme
gnome3.defaultIconTheme
];
outputs = ["out" "sandbox"];

63
pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
View File

@ -1,63 +0,0 @@
Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
Date: 2017-06-25
Initial Package Version: 57.0.2987.110
Upstream Status: Not submitted
Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
Description: Allows building with system provided ffmpeg. Rediffed
for chromium-59.0.3071.109.
diff -Naurp chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h
--- chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h 2017-06-20 17:03:19.000000000 -0500
+++ chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h 2017-06-23 00:21:10.551912699 -0500
@@ -23,10 +23,6 @@
// Include FFmpeg header files.
extern "C" {
-// Disable deprecated features which result in spammy compile warnings. This
-// list of defines must mirror those in the 'defines' section of FFmpeg's
-// BUILD.gn file or the headers below will generate different structures!
-#define FF_API_CONVERGENCE_DURATION 0
// Upstream libavcodec/utils.c still uses the deprecated
// av_dup_packet(), causing deprecation warnings.
// The normal fix for such things is to disable the feature as below,
@@ -40,7 +36,6 @@ extern "C" {
MSVC_PUSH_DISABLE_WARNING(4244);
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
-#include <libavformat/internal.h>
#include <libavformat/avio.h>
#include <libavutil/avutil.h>
#include <libavutil/imgutils.h>
diff -Naurp chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc
--- chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc 2017-06-20 17:03:19.000000000 -0500
+++ chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc 2017-06-23 00:22:56.289311692 -0500
@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
// If no estimate is found, the stream entry will be kInfiniteDuration.
std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
kInfiniteDuration);
- const AVFormatInternal* internal = format_context->internal;
- if (internal && internal->packet_buffer &&
- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- struct AVPacketList* packet_buffer = internal->packet_buffer;
- while (packet_buffer != internal->packet_buffer_end) {
- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index),
- start_time_estimates.size());
- const AVStream* stream =
- format_context->streams[packet_buffer->pkt.stream_index];
- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) {
- const base::TimeDelta packet_pts =
- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
- // We ignore kNoTimestamp here since -int64_t::min() is possible; see
- // https://crbug.com/700501. Technically this is a valid value, but in
- // practice shouldn't occur, so just ignore it when estimating.
- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
- packet_pts < start_time_estimates[stream->index]) {
- start_time_estimates[stream->index] = packet_pts;
- }
- }
- packet_buffer = packet_buffer->next;
- }
- }
std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());

13
pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch Normal file
View File

@ -0,0 +1,13 @@
Index: tools/gn/bootstrap/bootstrap.py
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options):
'base/sys_info.cc',
'base/task_runner.cc',
'base/task_scheduler/delayed_task_manager.cc',
+ 'base/task_scheduler/environment_config.cc',
'base/task_scheduler/post_task.cc',
'base/task_scheduler/priority_queue.cc',
'base/task_scheduler/scheduler_lock_impl.cc',

14
pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch
View File

@ -1,14 +0,0 @@
--- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200
+++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200
@@ -41,6 +41,11 @@
#include <errno.h>
#include <sys/mman.h>
+#if OS(LINUX) && defined(MADV_FREE)
+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
+#undef MADV_FREE
+#endif
+
#ifndef MADV_FREE
#define MADV_FREE MADV_DONTNEED
#endif

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -94,12 +94,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "26.0.0.137";
version = "26.0.0.151";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "0zmslmy7i7ywb2frckg5afkmfqb2lm2mahq0qs8msjzcx9jk4pyx";
sha256 = "0l15k2ws3256zyvbfx66j8p1liqv4k2m8hhw2jz8nzza7q6il35p";
stripRoot = false;
};

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2";
sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n";
version = "60.0.3112.66";
sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8";
sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m";
version = "60.0.3112.78";
};
dev = {
sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g";
sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv";
version = "61.0.3153.4";
sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq";
sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1";
version = "61.0.3163.25";
};
stable = {
sha256 = "0w1i4q7w5lcajc18jrchrhhm00x0jzm846l5x7a5rcp3baawkjrp";
sha256bin64 = "1naq20508qjm9hlwlpj686a0lawca58rnr35ws2gh2gsyxrxnmx1";
version = "59.0.3071.115";
sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl";
sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk";
version = "60.0.3112.90";
};
}

764
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox-bin/update.nix
View File

@ -22,7 +22,7 @@ in writeScript "update-${name}" ''
pushd ${basePath}
HOME=`mktemp -d`
cat ${./firefox.key} | gpg2 --import
cat ${./firefox.key} | gpg --import
tmpfile=`mktemp`
url=${baseUrl}
@ -47,7 +47,7 @@ in writeScript "update-${name}" ''
curl --silent -o $HOME/shasums "$url$version/SHA512SUMS"
curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc"
gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
# this is a list of sha512 and tarballs for both arches
shasums=`cat $HOME/shasums`

15
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, fetchurl, fetchFromGitHub }:
{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch }:
let common = opts: callPackage (import ./common.nix opts); in
@ -6,12 +6,17 @@ rec {
firefox = common rec {
pname = "firefox";
version = "54.0.1";
version = "55.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2";
sha512 = "2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47";
};
patches = lib.optional stdenv.isi686 (fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
});
meta = {
description = "A web browser built from Firefox source tree";
homepage = http://www.mozilla.com/en-US/firefox/;
@ -25,10 +30,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
version = "52.2.1esr";
version = "52.3.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3";
sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9";
};
meta = firefox.meta // {

2
pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
View File

@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2";
};
phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
installPhase =

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "26.0.0.137";
version = "26.0.0.151";
src = fetchurl {
url =
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z"
"0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8"
else
"1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl"
"0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d"
else
if arch == "x86_64" then
"0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls"
"1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l"
else
"1fm6p91c63pyr0lra29vcq2dplb2c7a5114nm4r9rrrzjxakqw5w";
"1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "26.0.0.137";
version = "26.0.0.151";
src = fetchurl {
url =
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"095457h83zs6cvdyyrh01069kgg8cnhgs1by6s9xpdxgc851n8gp"
"0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb"
else
"1zw3f612cfb8lr331hwqzlpd0gn3r0139bq76pbbbahh2chq99f8";
"0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8";
};
nativeBuildInputs = [ unzip ];

4
pkgs/applications/networking/browsers/vivaldi/default.nix
View File

@ -13,11 +13,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi";
version = "1.10.867.48-1";
version = "1.11.917.39-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
sha256 = "1han45swvv0y2i2kg7xhml1wj5zyrf2c2hc5b07kqsjkfg9iz1lc";
sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6";
};
unpackPhase = ''

8
pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
View File

@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi-ffmpeg-codecs";
version = "59.0.3071.104";
version = "60.0.3112.90";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
sha512 = "419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf";
sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5";
};
buildInputs = [ ];
@ -20,6 +20,10 @@ stdenv.mkDerivation rec {
python2 xdg_utils
];
patches = [
../chromium/patches/chromium-gn-bootstrap-r8.patch
];
configurePhase = ''
runHook preConfigure

4
pkgs/applications/networking/cluster/docker-machine/default.nix
View File

@ -3,7 +3,7 @@
buildGoPackage rec {
name = "machine-${version}";
version = "0.12.0";
version = "0.12.2";
goPackagePath = "github.com/docker/machine";
@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "docker";
repo = "machine";
sha256 = "08y87d0whag9sy1q5s84xrz95k12c9crh3zmdcr1ylrwqnszrn2y";
sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf";
};
postInstall = ''

4
pkgs/applications/networking/cluster/mesos/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
, ethtool, coreutils, which, iptables
@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
makeWrapper autoconf automake115x libtool curl sasl jdk maven
makeWrapper autoconf automake libtool curl sasl jdk maven
python wrapPython boto setuptools leveldb
subversion apr glog openssl libevent
] ++ lib.optionals stdenv.isLinux [

45
pkgs/applications/networking/dropbox/default.nix
View File

@ -24,30 +24,27 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
version = "31.4.25";
sha256 =
{
"x86_64-linux" = "02qla89gf7zawfk0kxd3xzr7vb91khj3p83bvh456ap51h0z5wzv";
"i686-linux" = "0sfh24qyc91q6ssn8lrzfdsv4jjy0hvgizcq3y3fk46zaa7jjxr2";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
version = "32.4.23";
sha256 = {
"x86_64-linux" = "11jh3cyax652crhvjshi8gnvb8mpp7hfbgwqjx5n1q3j1rswm3d1";
"i686-linux" = "0xf0in3ywgd53v19h0v2sg69b6y2lbvr5y6jz10x3cighzr31qfp";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
{
"x86_64-linux" = "x86_64";
"i686-linux" = "x86";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch = {
"x86_64-linux" = "x86_64";
"i686-linux" = "x86";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
# relative location where the dropbox libraries are stored
appdir = "opt/dropbox";
libs =
[
dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
ncurses zlib
libs = [
dbus_libs fontconfig freetype gcc.cc glib libdrm libffi libICE libSM
libX11 libXcomposite libXext libXmu libXrender libxcb libxml2 libxslt
ncurses zlib
qtbase qtdeclarative qtwebkit
];
qtbase qtdeclarative qtwebkit
];
ldpath = stdenv.lib.makeLibraryPath libs;
desktopItem = makeDesktopItem {
@ -99,10 +96,10 @@ in mkDerivation {
mkdir -p "$out/bin"
RPATH="${ldpath}:$out/${appdir}"
chmod 755 $out/${appdir}/dropbox
makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
--prefix LD_LIBRARY_PATH : "$RPATH"
chmod 755 $out/${appdir}/dropbox
rm $out/${appdir}/wmctrl
ln -s ${wmctrl}/bin/wmctrl $out/${appdir}/wmctrl
@ -141,11 +138,11 @@ in mkDerivation {
paxmark m $out/${appdir}/dropbox
'';
meta = {
homepage = http://www.dropbox.com;
meta = with lib; {
description = "Online stored folders (daemon version)";
maintainers = with lib.maintainers; [ ttuegel ];
platforms = [ "i686-linux" "x86_64-linux" ];
license = lib.licenses.unfree;
homepage = http://www.dropbox.com;
maintainers = with maintainers; [ ttuegel ];
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" ];
};
}

8
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
find test -type f -exec \
sed -i \
-e "1s|#!/usr/bin/env bash|#!${bash}/bin/bash|" \
-e "s|gpg |${gnupg}/bin/gpg2 |" \
-e "s| gpg| ${gnupg}/bin/gpg2|" \
-e "s|gpg |${gnupg}/bin/gpg |" \
-e "s| gpg| ${gnupg}/bin/gpg|" \
-e "s|gpgsm |${gnupg}/bin/gpgsm |" \
-e "s| gpgsm| ${gnupg}/bin/gpgsm|" \
-e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg2|" \
-e "s|crypto.gpg_path=gpg|crypto.gpg_path=${gnupg}/bin/gpg|" \
"{}" ";"
for src in \
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
emacs/notmuch-crypto.el
do
substituteInPlace "$src" \
--replace \"gpg\" \"${gnupg}/bin/gpg2\"
--replace \"gpg\" \"${gnupg}/bin/gpg\"
done
'';

31
pkgs/applications/science/chemistry/gwyddion/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchurl, gtk2, pkgconfig }:
with stdenv.lib;
stdenv.mkDerivation {
name = "gwyddion";
version = "2.48";
src = fetchurl {
url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz";
sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx";
};
buildInputs = [ gtk2 pkgconfig ];
meta = {
homepage = http://gwyddion.net/;
description = "Scanning probe microscopy data visualization and analysis";
longDescription = ''
A modular program for SPM (scanning probe microscopy) data
visualization and analysis. Primarily it is intended for the
analysis of height fields obtained by scanning probe microscopy
techniques (AFM, MFM, STM, SNOM/NSOM) and it supports a lot of
SPM data formats. However, it can be used for general height
field and (greyscale) image processing, for instance for the
analysis of profilometry data or thickness maps from imaging
spectrophotometry.
'';
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
}

6
pkgs/applications/science/logic/yices/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yices-${version}";
version = "2.5.1";
version = "2.5.2";
src = fetchurl {
url = "http://yices.csl.sri.com/cgi-bin/yices2-newnewdownload.cgi?file=${name}-src.tar.gz&accept=I+Agree";
name = "${name}-src.tar.gz";
sha256 = "1wfq6hcm54h0mqmbs1ip63i0ywlwnciav86sbzk3gafxyzg1nd0c";
sha256 = "18mjnwg0pwc0fx4f99l7hxsi10mb5skkzk0k1m3xv5kx3qfnghs0";
};
patchPhase = ''patchShebangs tests/regress/check.sh'';
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
# only installing the libyices.so.2.5.1 file.
installPhase = ''
make install LDCONFIG=true
(cd $out/lib && ln -s -f libyices.so.2.5.1 libyices.so.2.5)
(cd $out/lib && ln -s -f libyices.so.2.5.2 libyices.so.2.5)
'';
meta = with stdenv.lib; {

6
pkgs/applications/version-management/git-and-tools/git-radar/default.nix
View File

@ -4,10 +4,6 @@ stdenv.mkDerivation rec {
name = "git-radar-${version}";
version = "0.5";
phases = [ "unpackPhase" "installPhase" ];
dontInstallSrc = true;
src = fetchFromGitHub {
owner = "michaeldfallen";
repo = "git-radar";
@ -15,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1915aqx8bfc4xmvhx2gfxv72p969a6rn436kii9w4yi38hibmqv9";
};
dontBuild = true;
installPhase = ''
mkdir -p $out/bin
cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -12,7 +12,7 @@
}:
let
version = "2.14.0";
version = "2.14.1";
svn = subversionClient.override { perlBindings = true; };
in
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0xarcp0m7jbncic0g3ahz8l2d6b27h0g9ndgrhy9abkx61m6wgpr";
sha256 = "1iic3wiihxp3l3k6d4z886v3869c3dzgddjxnd5124wy1rnlqwkg";
};
hardeningDisable = [ "format" ];

4
pkgs/applications/version-management/mercurial/default.nix
View File

@ -4,7 +4,7 @@
let
# if you bump version, update pkgs.tortoisehg too or ping maintainer
version = "4.1.1";
version = "4.3.1";
name = "mercurial-${version}";
inherit (python2Packages) docutils hg-git dulwich python;
in python2Packages.buildPythonApplication {
@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
src = fetchurl {
url = "https://mercurial-scm.org/release/${name}.tar.gz";
sha256 = "17imsf4haqgw364p1z9i416jinmfxfia537b84hcg0rg43hinmv3";
sha256 = "18hq6vvjsrjsnbs15bvyyfrss35bgc0hgw4wxksdyaj578pg04ib";
};
inherit python; # pass it so that the same version can be used in hg2git

8
pkgs/applications/version-management/subversion/default.nix
View File

@ -104,12 +104,12 @@ let
in {
subversion18 = common {
version = "1.8.17";
sha256 = "1450fkj1jmxyphqn6cd95z1ykwsabajm9jw4i412qpwss8w9a4fy";
version = "1.8.18";
sha256 = "19lpqdrl86mjfdpayhn3f9rkmpb6zs2iny38cnxq6wcj7snh0sz5";
};
subversion19 = common {
version = "1.9.5";
sha256 = "1ramwly6p74jhb2rdm5ygxjri7jds940cilyvnsdq60xzy5cckwa";
version = "1.9.6";
sha256 = "06dfram53lyfyyqgz1r7c5323qqc6mjcpwi1j402y21lnqgwbjyv";
};
}

4
pkgs/applications/video/mkvtoolnix/default.nix
View File

@ -10,13 +10,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mkvtoolnix-${version}";
version = "13.0.0";
version = "14.0.0";
src = fetchFromGitHub {
owner = "mbunkus";
repo = "mkvtoolnix";
rev = "release-${version}";
sha256 = "0dz86fzv19wknd8p31nnx2imj80v7m944ssapp8fmq9hkc36m777";
sha256 = "1ygc2qrd074vz2yw4iqml5ir31kkvkv7pz3hcfy423p9s06xi1k2";
};
nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];

4
pkgs/applications/video/obs-studio/default.nix
View File

@ -26,13 +26,13 @@ let
optional = stdenv.lib.optional;
in stdenv.mkDerivation rec {
name = "obs-studio-${version}";
version = "19.0.3";
version = "20.0.0";
src = fetchFromGitHub {
owner = "jp9000";
repo = "obs-studio";
rev = "${version}";
sha256 = "1qh69bw848l61fmh6n5q86yl3djmvzh76ln044ngi2k69a9bl94b";
sha256 = "07xjrr86722b05f88z77hzcrkkdlcz3pndaw600ip5xqhsyjy330";
};
patches = [ ./find-xcb.patch ];

4
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -9,12 +9,12 @@ with stdenv.lib;
python2Packages.buildPythonApplication rec {
name = "virt-manager-${version}";
version = "1.4.1";
version = "1.4.2";
namePrefix = "";
src = fetchurl {
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
sha256 = "0x6mnqw8bng3r69pvmnq9q6yyhicxg22yz62b6dzbb4z16xl1r23";
};
nativeBuildInputs = [ wrapGAppsHook intltool file ];

2
pkgs/applications/virtualization/xen/4.8.nix
View File

@ -53,7 +53,7 @@ callPackage (import ./generic.nix (rec {
patches = [
(xsaPatch {
name = "216-qemuu";
sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5ma1";
sha256 = "06w2iw1r5gip2bpbg19cziws965h9in0f6np74cr31f76yy30yxn";
})
];
meta.description = "Xen's fork of upstream Qemu";

4
pkgs/data/documentation/man-pages/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "man-pages-${version}";
version = "4.11";
version = "4.12";
src = fetchurl {
url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
sha256 = "097m0gsbaz0gf9ir4lmph3h5jj6wmydk1rglfz82dysybx4q1pmd";
sha256 = "6f6d79d991fed04e16e7c7a15705304b0b9d51de772c51c57428555039fbe093";
};
makeFlags = [ "MANDIR=$(out)/share/man" ];

20
pkgs/data/fonts/andagii/default.nix
View File

@ -1,22 +1,18 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "andagii-${version}";
let
version = "1.0.2";
in fetchzip {
name = "andagii-${version}";
src = fetchzip {
url = http://www.i18nguy.com/unicode/andagii.zip;
sha256 = "0a0c43y1fd5ksj50axhng7p00kgga0i15p136g68p35wj7kh5g2k";
stripRoot = false;
curlOpts = "--user-agent 'Mozilla/5.0'";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
url = http://www.i18nguy.com/unicode/andagii.zip;
curlOpts = "--user-agent 'Mozilla/5.0'";
postFetch = ''
unzip $downloadedFile
mkdir -p $out/share/fonts/truetype
cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf
'';
sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2";
# There are multiple claims that the font is GPL, so I include the
# package; but I cannot find the original source, so use it on your

26
pkgs/data/fonts/anonymous-pro/default.nix
View File

@ -1,23 +1,17 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "anonymousPro-${version}";
let
version = "1.002";
in fetchzip rec {
name = "anonymousPro-${version}";
src = fetchurl {
url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip";
sha256 = "1asj6lykvxh46czbal7ymy2k861zlcdqpz8x3s5bbpqwlm3mhrl6";
};
nativeBuildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out/share/fonts/truetype
mkdir -p $out/share/doc/${name}
find . -name "*.ttf" -exec cp -v {} $out/share/fonts/truetype \;
find . -name "*.txt" -exec cp -v {} $out/share/doc/${name} \;
url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip";
postFetch = ''
mkdir -p $out/share/{doc,fonts}
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}"
'';
sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f";
meta = with stdenv.lib; {
homepage = http://www.marksimonson.com/fonts/view/anonymous-pro;

28
pkgs/data/fonts/arkpandora/default.nix
View File

@ -1,21 +1,23 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "arkpandora-${version}";
{ stdenv, fetchurl, unzip }:
let
version = "2.04";
in fetchurl {
name = "arkpandora-${version}";
src = fetchurl {
urls = [
"ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
"http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz"
"http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz"
];
sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51";
};
installPhase = ''
urls = [
"http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz"
"ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
"http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz"
];
downloadToTemp = true;
recursiveHash = true;
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
'';
sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k";
meta = {
description = "Font, metrically identical to Arial and Times New Roman";

50
pkgs/data/fonts/arphic/default.nix
View File

@ -1,27 +1,23 @@
{ stdenv, fetchurl, mkfontscale, mkfontdir }:
{ stdenv, fetchzip, mkfontscale, mkfontdir }:
{
arphic-ukai = stdenv.mkDerivation rec {
let
version = "0.2.20080216.2";
in {
arphic-ukai = fetchzip {
name = "arphic-ukai-${version}";
version = "0.2.20080216.2";
url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
src = fetchurl {
url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
sha256 = "1lp3i9m6x5wrqjkh1a8vpyhmsrhvsa2znj2mx13qfkwza5rqv5ml";
};
buildInputs = [ mkfontscale mkfontdir ];
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
postFetch = ''
tar -xjvf $downloadedFile --strip-components=1
install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc
cd $out/share/fonts
mkfontdir
mkfontscale
${mkfontdir}/bin/mkfontdir
${mkfontscale}/bin/mkfontscale
'';
sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl";
meta = with stdenv.lib; {
description = "CJK Unicode font Kai style";
homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;
@ -32,27 +28,21 @@
};
};
arphic-uming = stdenv.mkDerivation rec {
arphic-uming = fetchzip {
name = "arphic-uming-${version}";
version = "0.2.20080216.2";
url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
src = fetchurl {
url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
sha256 = "1ny11n380vn7sryvy1g3a83y3ll4h0jf9wgnrx55nmksx829xhg3";
};
buildInputs = [ mkfontscale mkfontdir ];
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
postFetch = ''
tar -xjvf $downloadedFile --strip-components=1
install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc
cd $out/share/fonts
mkfontdir
mkfontscale
${mkfontdir}/bin/mkfontdir
${mkfontscale}/bin/mkfontscale
'';
sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d";
meta = with stdenv.lib; {
description = "CJK Unicode font Ming style";
homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/;

21
pkgs/data/fonts/aurulent-sans/default.nix
View File

@ -1,21 +1,14 @@
{stdenv, fetchgit}:
{stdenv, fetchzip}:
stdenv.mkDerivation rec {
fetchzip rec {
name = "aurulent-sans-0.1";
src = fetchgit {
url = "https://github.com/deepfire/hartke-aurulent-sans.git";
rev = "refs/tags/${name}";
sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk";
};
dontBuild = true;
installPhase = ''
fontDir=$out/share/fonts/opentype
mkdir -p $fontDir
cp *.otf $fontDir
url = "https://github.com/deepfire/hartke-aurulent-sans/archive/${name}.zip";
postFetch = ''
mkdir -p $out/share/fonts
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
'';
sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li";
meta = {
description = "Aurulent Sans";

22
pkgs/data/fonts/babelstone-han/default.nix
View File

@ -1,22 +1,16 @@
{stdenv, fetchurl, unzip}:
{stdenv, fetchzip}:
stdenv.mkDerivation rec {
let
version = "10.0.0";
in fetchzip {
name = "babelstone-han-${version}";
version = "9.0.2";
src = fetchurl {
url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip";
sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha";
};
buildInputs = [ unzip ];
sourceRoot = ".";
installPhase = ''
url = http://www.babelstone.co.uk/Fonts/0816/BabelStoneHan.zip;
postFetch = ''
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype
unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype
'';
sha256 = "0648hv5c1hq3bq7mlk7bnmflzzqj4wh137bjqyrwj5hy3nqzvl5r";
meta = with stdenv.lib; {
description = "Unicode CJK font with over 32600 Han characters";

26
pkgs/data/fonts/baekmuk-ttf/default.nix
View File

@ -1,24 +1,16 @@
{ stdenv, fetchurl }:
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
fetchzip rec {
name = "baekmuk-ttf-2.2";
src = fetchurl {
url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
sha256 = "10hqspl70h141ywz1smlzdanlx9vwgsp1qrcjk68fn2xnpzpvaq8";
};
dontBuild = true;
installPhase = let
fonts_dir = "$out/share/fonts";
doc_dir = "$out/share/doc/${name}";
in ''
mkdir -pv ${fonts_dir}
mkdir -pv ${doc_dir}
cp ttf/*.ttf ${fonts_dir}
cp COPYRIGHT* ${doc_dir}
url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts $out/share/doc/${name}
cp ttf/*.ttf $out/share/fonts
cp COPYRIGHT* $out/share/doc/${name}
'';
sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g";
meta = {
description = "Korean font";

16
pkgs/data/fonts/bakoma-ttf/default.nix
View File

@ -1,20 +1,18 @@
{stdenv, fetchurl}:
{stdenv, fetchzip}:
stdenv.mkDerivation {
fetchzip {
name = "bakoma-ttf";
src = fetchurl {
url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2;
sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
};
url = http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km;
dontBuild = true;
installPhase = ''
postFetch = ''
tar xjvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/truetype
cp ttf/*.ttf $out/share/fonts/truetype
'';
sha256 = "0g7i723n00cqx2va05z1h6v3a2ar69gqw4hy6pjj7m0ml906rngc";
meta = {
description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/;

22
pkgs/data/fonts/cabin/default.nix
View File

@ -1,22 +1,18 @@
{ stdenv, fetchFromGitHub }:
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
fetchzip rec {
name = "cabin-1.005";
src = fetchFromGitHub {
owner = "impallari";
repo = "Cabin";
rev = "982839c790e9dc57c343972aa34c51ed3b3677fd";
sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn";
};
url = https://github.com/impallari/Cabin/archive/982839c790e9dc57c343972aa34c51ed3b3677fd.zip;
installPhase = ''
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/doc/${name}
cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/
cp -v README.md FONTLOG.txt $out/share/doc/${name}
postFetch = ''
mkdir -p $out/share/{doc,fonts}
unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}"
'';
sha256 = "1ax5c2iab48qsk9zn3gjvqaib2lnlm25f1wr0aysf5ngw0y0jkrd";
meta = with stdenv.lib; {
description = "A humanist sans with 4 weights and true italics";
longDescription = ''

19
pkgs/data/fonts/caladea/default.nix
View File

@ -1,22 +1,19 @@
{stdenv, fetchurl}:
{stdenv, fetchzip}:
stdenv.mkDerivation rec {
name = "caladea-${version}";
let
version = "20130214";
in fetchzip rec {
name = "caladea-${version}";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz";
sha256 = "02addvvkbvf3bn21kfyj10j9w1c8hdxxld4wjmnc1j8ksqpir3f4";
};
phases = ["unpackPhase" "installPhase"];
installPhase = ''
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
mkdir -p $out/etc/fonts/conf.d
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype
cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf
'';
sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z";
meta = with stdenv.lib; {
# This font doesn't appear to have any official web site but this

23
pkgs/data/fonts/camingo-code/default.nix
View File

@ -1,22 +1,19 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "camingo-code-${version}";
let
version = "1.0";
in fetchzip rec {
name = "camingo-code-${version}";
src = fetchurl {
url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip;
sha256 = "1gbpfa5mqyhi5yrb6dl708pggiwp002b532fn3axiagb0cxxf02s";
};
buildInputs = [ unzip ];
installPhase = ''
url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip;
postFetch = ''
unzip $downloadedFile
mkdir -p $out/share/fonts/truetype
mkdir -p $out/share/doc/${name}
cp -v camingo-code/*.ttf $out/share/fonts/truetype/
cp -v camingo-code/*.txt $out/share/doc/${name}/
cp -v fonts/camingo-code/*.ttf $out/share/fonts/truetype/
cp -v fonts/camingo-code/*.txt $out/share/doc/${name}/
'';
sha256 = "035z2k6lwwy2bysw27pirn3vjxnj2h23nyx8jr213rb2bl0m21x1";
meta = with stdenv.lib; {
homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/;

4
pkgs/data/fonts/cantarell-fonts/default.nix
View File

@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl";
};
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2";
meta = {
description = "Default typeface used in the user interface of GNOME since version 3.0";
platforms = stdenv.lib.platforms.all;

19
pkgs/data/fonts/carlito/default.nix
View File

@ -1,23 +1,22 @@
{stdenv, fetchurl}:
{stdenv, fetchzip}:
stdenv.mkDerivation rec {
name = "carlito-${version}";
let
version = "20130920";
in fetchzip rec {
name = "carlito-${version}";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
sha256 = "0nmgzp6gdvv4dipswrw0l1bfjp4jbic2qvm7dpqiq71jpin2plab";
};
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
phases = ["unpackPhase" "installPhase"];
installPhase = ''
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
mkdir -p $out/etc/fonts/conf.d
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype
cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf
'';
sha256 = "0d72zy6kdmxgpi63r3yvi3jh1hb7lvlgv8hgd4ag0x10dz18mbzv";
meta = with stdenv.lib; {
# This font doesn't appear to have any official web site but this
# one provides some good information and samples.

4
pkgs/data/fonts/clearlyU/default.nix
View File

@ -18,6 +18,10 @@ stdenv.mkDerivation {
mkfontdir
mkfontscale
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "127zrg65s90ksj99kr9hxny40rbxvpai62mf5nqk853hcd1bzpr6";
meta = {
description = "A Unicode font";

19
pkgs/data/fonts/cm-unicode/default.nix
View File

@ -1,23 +1,22 @@
{ stdenv, fetchurl }:
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "cm-unicode-${version}";
let
version = "0.7.0";
in fetchzip rec {
name = "cm-unicode-${version}";
src = fetchurl {
url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz";
sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl";
};
url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz";
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
postFetch = ''
tar -xJvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/doc/${name}
cp -v *.otf $out/share/fonts/opentype/
cp -v README FontLog.txt $out/share/doc/${name}
'';
sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn";
meta = with stdenv.lib; {
homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/;
description = "Computer Modern Unicode fonts";

29
pkgs/data/fonts/comfortaa/default.nix
View File

@ -1,25 +1,18 @@
{stdenv, fetchurl, unzip}:
{stdenv, fetchzip}:
stdenv.mkDerivation rec {
name = "comfortaa-${version}";
let
version = "2.004";
in fetchzip rec {
name = "comfortaa-${version}";
src = fetchurl {
url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip";
sha256 = "0js0kk5g6b7xrq92b68gz5ipbiv1havnbgnfqzvlw3k3nllwnl9z";
};
phases = ["unpackPhase" "installPhase"];
buildInputs = [unzip];
installPhase = ''
mkdir -p $out/share/fonts/truetype
mkdir -p $out/share/doc/${name}
cp -v *.ttf $out/share/fonts/truetype/
cp -v FONTLOG.txt $out/share/doc/${name}/
cp -v donate.html $out/share/doc/${name}/
url = "http://openfontlibrary.org/assets/downloads/comfortaa/38318a69b56162733bf82bc0170b7521/comfortaa.zip";
postFetch = ''
mkdir -p $out/share/fonts $out/share/doc
unzip -l $downloadedFile
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile \*/FONTLOG.txt \*/donate.html -d $out/share/doc/${name}
'';
sha256 = "1gnscf3kw9p5gbc5594a22cc6nmiir9mhp1nl3mkbzd4v1jfbh2h";
meta = with stdenv.lib; {
homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949;

35
pkgs/data/fonts/comic-neue/default.nix
View File

@ -1,29 +1,24 @@
{ stdenv, fetchurl
, unzip }:
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "comic-neue-${version}";
let
version = "2.2";
in fetchzip rec {
name = "comic-neue-${version}";
src = fetchurl {
url = "http://comicneue.com/${name}.zip";
sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n";
};
url = "http://comicneue.com/${name}.zip";
buildInputs = [ unzip ];
phases = [ "unpackPhase" "installPhase" ];
sourceRoot = name;
installPhase = ''
mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name}
cp -v OTF/*.otf $out/share/fonts/opentype
cp -v Web/*.ttf $out/share/fonts/truetype
cp -v Web/*.eot $out/share/fonts/EOT
cp -v Web/*.woff $out/share/fonts/WOFF
cp -v Web/*.woff2 $out/share/fonts/WOFF2
cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name}
postFetch = ''
mkdir -vp $out/share/{doc,fonts}
unzip -j $downloadedFile comic-neue-2.2/\*.otf -d $out/share/fonts/opentype
unzip -j $downloadedFile comic-neue-2.2/\*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile comic-neue-2.2/\*.eot -d $out/share/fonts/EOT
unzip -j $downloadedFile comic-neue-2.2/\*.woff -d $out/share/fonts/WOFF
unzip -j $downloadedFile comic-neue-2.2/\*.woff2 -d $out/share/fonts/WOFF2
unzip -j $downloadedFile comic-neue-2.2/\*.pdf comic-neue-2.2/FONTLOG.txt comic-neue-2.2/OFL-FAQ.txt comic-neue-2.2/SIL-License.txt -d $out/share/doc/${name}
'';
sha256 = "1yypq5aqqzv3q1c6vx5130mi2iwihzzvrawhwqpwsfjl0p25sq9q";
meta = with stdenv.lib; {
homepage = http://comicneue.com/;
description = "A casual type face: Make your lemonade stand look like a fortune 500 company";

31
pkgs/data/fonts/comic-relief/default.nix
View File

@ -1,32 +1,23 @@
{stdenv, fetchurl, unzip}:
{stdenv, fetchzip}:
stdenv.mkDerivation rec {
name = "comic-relief-${version}";
let
version = "1.1";
in fetchzip rec {
name = "comic-relief-${version}";
src = fetchurl {
url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip";
sha256 = "0wpf10m9zmcfvcxgc7dxzdm3syam7d7qxlfabgr1nxzq299kh8ch";
};
url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip";
buildInputs = [unzip];
phases = ["unpackPhase" "installPhase"];
unpackCmd = ''
mkdir -p ${name}
unzip -qq -d ${name} $src
'';
installPhase = ''
postFetch = ''
mkdir -p $out/etc/fonts/conf.d
mkdir -p $out/share/doc/${name}
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype
cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf
cp -v FONTLOG.txt $out/share/doc/${name}
cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf
unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype
unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name}
'';
sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff";
meta = with stdenv.lib; {
homepage = http://loudifier.com/comic-relief/;
description = "A font metric-compatible with Microsoft Comic Sans";

4
pkgs/data/fonts/corefonts/default.nix
View File

@ -59,6 +59,10 @@ stdenv.mkDerivation {
done
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx";
meta = with stdenv.lib; {
homepage = http://corefonts.sourceforge.net/;
description = "Microsoft's TrueType core fonts for the Web";

18
pkgs/data/fonts/crimson/default.nix
View File

@ -1,23 +1,23 @@
{stdenv, fetchurl}:
{stdenv, fetchzip}:
stdenv.mkDerivation rec {
name = "crimson-${version}";
let
version = "2014.10";
in fetchzip rec {
name = "crimson-${version}";
src = fetchurl {
url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz";
sha256 = "0qyihrhqb89vwg9cfpaf5xqmcjvs4r4614bxy634vmqv9v1bzn5b";
};
url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz";
phases = ["unpackPhase" "installPhase"];
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
installPhase = ''
mkdir -p $out/share/fonts/opentype
mkdir -p $out/share/doc/${name}
cp -v "Desktop Fonts/OTF/"*.otf $out/share/fonts/opentype
cp -v README.md $out/share/doc/${name}
'';
sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842";
meta = with stdenv.lib; {
homepage = https://aldusleaf.org/crimson.html;
description = "A font family inspired by beautiful oldstyle typefaces";

21
pkgs/data/fonts/culmus/default.nix
View File

@ -1,19 +1,20 @@
{ stdenv, fetchurl }:
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
name = "culmus-${version}";
let
version = "0.130";
in fetchzip {
name = "culmus-${version}";
src = fetchurl {
url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
sha256 = "908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1";
};
installPhase = ''
url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz";
postFetch = ''
tar -xzvf $downloadedFile --strip-components=1
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype/
'';
sha256 = "0v5vm8j2bxnw2qn0640kyibn4h8ck8cidhx2pixi5xsayr0ij1n6";
meta = {
description = "Culmus Hebrew fonts";
longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows.";

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