Merge branch 'master' into staging
This commit is contained in:
Vladimír Čunát
commit
adab4cd58b
|
|
@ -2,12 +2,12 @@
|
|||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xml:id="chap-packageconfig">
|
||||
|
||||
<title><filename>~/.nixpkgs/config.nix</filename>: global configuration</title>
|
||||
<title>Global configuration</title>
|
||||
|
||||
<para>Nix packages can be configured to allow or deny certain options.</para>
|
||||
|
||||
<para>To apply the configuration edit
|
||||
<filename>~/.nixpkgs/config.nix</filename> and set it like
|
||||
<filename>~/.config/nixpkgs/config.nix</filename> and set it like
|
||||
|
||||
<programlisting>
|
||||
{
|
||||
|
|
@ -89,7 +89,7 @@ packages via <literal>packageOverrides</literal></title>
|
|||
|
||||
<para>You can define a function called
|
||||
<varname>packageOverrides</varname> in your local
|
||||
<filename>~/.nixpkgs/config.nix</filename> to overide nix packages. It
|
||||
<filename>~/.config/nixpkgs/config.nix</filename> to overide nix packages. It
|
||||
must be a function that takes pkgs as an argument and return modified
|
||||
set of packages.
|
||||
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
evaluation-per-function application incurs a performance penalty,
|
||||
which can become a problem if many overrides are used.
|
||||
It is only intended for ad-hoc customisation, such as in
|
||||
<filename>~/.nixpkgs/config.nix</filename>.
|
||||
<filename>~/.config/nixpkgs/config.nix</filename>.
|
||||
</para>
|
||||
</warning>
|
||||
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ its normal core packages:
|
|||
mtl-2.2.1
|
||||
|
||||
This function allows users to define their own development environment by means
|
||||
of an override. After adding the following snippet to `~/.nixpkgs/config.nix`,
|
||||
of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`,
|
||||
|
||||
{
|
||||
packageOverrides = super: let self = super.pkgs; in
|
||||
|
|
@ -522,7 +522,7 @@ file with `cabal2nix`:
|
|||
$ cd ~/src/foo && cabal2nix . >default.nix
|
||||
$ cd ~/src/bar && cabal2nix . >default.nix
|
||||
|
||||
Then edit your `~/.nixpkgs/config.nix` file to register those builds in the
|
||||
Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the
|
||||
default Haskell package set:
|
||||
|
||||
{
|
||||
|
|
@ -554,7 +554,7 @@ Every Haskell package set takes a function called `overrides` that you can use
|
|||
to manipulate the package as much as you please. One useful application of this
|
||||
feature is to replace the default `mkDerivation` function with one that enables
|
||||
library profiling for all packages. To accomplish that, add configure the
|
||||
following snippet in your `~/.nixpkgs/config.nix` file:
|
||||
following snippet in your `~/.config/nixpkgs/config.nix` file:
|
||||
|
||||
{
|
||||
packageOverrides = super: let self = super.pkgs; in
|
||||
|
|
@ -583,7 +583,7 @@ The first step is to generate Nix build instructions with `cabal2nix`:
|
|||
|
||||
$ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix
|
||||
|
||||
Then add the override in `~/.nixpkgs/config.nix`:
|
||||
Then add the override in `~/.config/nixpkgs/config.nix`:
|
||||
|
||||
{
|
||||
packageOverrides = super: let self = super.pkgs; in
|
||||
|
|
|
|||
|
|
@ -781,7 +781,7 @@ If you get the following error:
|
|||
could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
|
||||
Permission denied
|
||||
|
||||
This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools.
|
||||
This is a [known bug](https://github.com/pypa/setuptools/issues/130) in setuptools.
|
||||
Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
|
||||
As workaround install it as an extra `preInstall` step:
|
||||
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ first one present is considered, and all the rest are ignored:
|
|||
|
||||
<listitem>
|
||||
|
||||
<para>In the directory pointed by the environment variable
|
||||
<varname>NIXPKGS_OVERLAYS</varname>.</para>
|
||||
<para>In the directory pointed to by the Nix search path entry
|
||||
<literal><nixpkgs-overlays></literal>.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ packageOverrides = pkgs: {
|
|||
</screen>
|
||||
|
||||
to your Nixpkgs configuration
|
||||
(<filename>~/.nixpkgs/config.nix</filename>) and install it by
|
||||
(<filename>~/.config/nixpkgs/config.nix</filename>) and install it by
|
||||
running <command>nix-env -f '<nixpkgs>' -iA
|
||||
myEclipse</command> and afterward run Eclipse as usual. It is
|
||||
possible to find out which plugins are available for installation
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ rec {
|
|||
the original derivation attributes.
|
||||
|
||||
`overrideDerivation' allows certain "ad-hoc" customisation
|
||||
scenarios (e.g. in ~/.nixpkgs/config.nix). For instance, if you
|
||||
want to "patch" the derivation returned by a package function in
|
||||
Nixpkgs to build another version than what the function itself
|
||||
provides, you can do something like this:
|
||||
scenarios (e.g. in ~/.config/nixpkgs/config.nix). For instance,
|
||||
if you want to "patch" the derivation returned by a package
|
||||
function in Nixpkgs to build another version than what the
|
||||
function itself provides, you can do something like this:
|
||||
|
||||
mySed = overrideDerivation pkgs.gnused (oldAttrs: {
|
||||
name = "sed-4.2.2-pre";
|
||||
|
|
|
|||
|
|
@ -415,6 +415,7 @@
|
|||
roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>";
|
||||
roconnor = "Russell O'Connor <roconnor@theorem.ca>";
|
||||
romildo = "José Romildo Malaquias <malaquias@gmail.com>";
|
||||
rongcuid = "Rongcui Dong <rongcuid@outlook.com>";
|
||||
ronny = "Ronny Pfannschmidt <nixos@ronnypfannschmidt.de>";
|
||||
rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
|
||||
rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
|
||||
|
|
@ -518,6 +519,7 @@
|
|||
wyvie = "Elijah Rum <elijahrum@gmail.com>";
|
||||
yarr = "Dmitry V. <savraz@gmail.com>";
|
||||
yochai = "Yochai <yochai@titat.info>";
|
||||
yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
|
||||
yurrriq = "Eric Bailey <eric@ericb.me>";
|
||||
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
|
||||
zagy = "Christian Zagrodnick <cz@flyingcircus.io>";
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ rec {
|
|||
# Type-check the remaining definitions, and merge them.
|
||||
mergedValue = foldl' (res: def:
|
||||
if type.check def.value then res
|
||||
else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
|
||||
else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.description}.")
|
||||
(type.merge loc defsFinal) defsFinal;
|
||||
|
||||
isDefined = defsFinal != [];
|
||||
|
|
|
|||
|
|
@ -115,6 +115,11 @@ set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-loaOfSub-
|
|||
checkConfigError 'The option .* defined in .* does not exist.' "$@"
|
||||
checkConfigOutput "true" "$@" ./define-module-check.nix
|
||||
|
||||
# Check coerced value.
|
||||
checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
|
||||
checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
|
||||
checkConfigError 'The option value .* in .* is not a string or integer.' config.value ./declare-coerced-value.nix ./define-value-list.nix
|
||||
|
||||
cat <<EOF
|
||||
====== module tests ======
|
||||
$pass Pass
|
||||
|
|
|
|||
10
lib/tests/modules/declare-coerced-value.nix
Normal file
10
lib/tests/modules/declare-coerced-value.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{ lib, ... }:
|
||||
|
||||
{
|
||||
options = {
|
||||
value = lib.mkOption {
|
||||
default = 42;
|
||||
type = lib.types.coercedTo lib.types.int builtins.toString lib.types.str;
|
||||
};
|
||||
};
|
||||
}
|
||||
3
lib/tests/modules/define-value-list.nix
Normal file
3
lib/tests/modules/define-value-list.nix
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
value = [];
|
||||
}
|
||||
3
lib/tests/modules/define-value-string.nix
Normal file
3
lib/tests/modules/define-value-string.nix
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
value = "24";
|
||||
}
|
||||
|
|
@ -352,6 +352,28 @@ rec {
|
|||
functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; };
|
||||
};
|
||||
|
||||
coercedTo = coercedType: coerceFunc: finalType:
|
||||
assert coercedType.getSubModules == null;
|
||||
mkOptionType rec {
|
||||
name = "coercedTo";
|
||||
description = "${finalType.description} or ${coercedType.description}";
|
||||
check = x: finalType.check x || coercedType.check x;
|
||||
merge = loc: defs:
|
||||
let
|
||||
coerceVal = val:
|
||||
if finalType.check val then val
|
||||
else let
|
||||
coerced = coerceFunc val;
|
||||
in assert finalType.check coerced; coerced;
|
||||
|
||||
in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs);
|
||||
getSubOptions = finalType.getSubOptions;
|
||||
getSubModules = finalType.getSubModules;
|
||||
substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m);
|
||||
typeMerge = t1: t2: null;
|
||||
functor = (defaultFunctor name) // { wrapped = finalType; };
|
||||
};
|
||||
|
||||
# Obsolete alternative to configOf. It takes its option
|
||||
# declarations from the ‘options’ attribute of containing option
|
||||
# declaration.
|
||||
|
|
|
|||
|
|
@ -22,5 +22,25 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
|
|||
</programlisting>
|
||||
</para>
|
||||
|
||||
<para>As with IPv4 networking interfaces are automatically configured via
|
||||
DHCPv6. You can configure an interface manually:
|
||||
|
||||
<programlisting>
|
||||
networking.interfaces.eth0.ip6 = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ];
|
||||
</programlisting>
|
||||
</para>
|
||||
|
||||
<para>For configuring a gateway, optionally with explicitly specified interface:
|
||||
|
||||
<programlisting>
|
||||
networking.defaultGateway6 = {
|
||||
address = "fe00::1";
|
||||
interface = "enp0s3";
|
||||
}
|
||||
</programlisting>
|
||||
</para>
|
||||
|
||||
<para>See <xref linkend='sec-ipv4' /> for similar examples and additional information.
|
||||
</para>
|
||||
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -498,7 +498,8 @@
|
|||
./services/security/frandom.nix
|
||||
./services/security/haka.nix
|
||||
./services/security/haveged.nix
|
||||
./services/security/hologram.nix
|
||||
./services/security/hologram-server.nix
|
||||
./services/security/hologram-agent.nix
|
||||
./services/security/munge.nix
|
||||
./services/security/oauth2_proxy.nix
|
||||
./services/security/physlock.nix
|
||||
|
|
|
|||
|
|
@ -316,10 +316,10 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides
|
|||
<para>
|
||||
If you are not on NixOS or want to install this particular
|
||||
Emacs only for yourself, you can do so by adding it to your
|
||||
<filename>~/.nixpkgs/config.nix</filename>
|
||||
<filename>~/.config/nixpkgs/config.nix</filename>
|
||||
(see <link xlink:href="http://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides">Nixpkgs manual</link>):
|
||||
<example>
|
||||
<title>Custom Emacs in <filename>~/.nixpkgs/system.nix</filename></title>
|
||||
<title>Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename></title>
|
||||
<programlisting><![CDATA[
|
||||
{
|
||||
packageOverrides = super: let self = super.pkgs; in {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ let
|
|||
allConfFiles =
|
||||
cfg.confFiles //
|
||||
builtins.listToAttrs (map (x: { name = x;
|
||||
value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); })
|
||||
value = builtins.readFile (cfg.package + "/etc/asterisk/" + x); })
|
||||
defaultConfFiles);
|
||||
|
||||
asteriskEtc = pkgs.stdenv.mkDerivation
|
||||
|
|
@ -38,7 +38,7 @@ let
|
|||
asteriskConf = ''
|
||||
[directories]
|
||||
astetcdir => /etc/asterisk
|
||||
astmoddir => ${pkgs.asterisk}/lib/asterisk/modules
|
||||
astmoddir => ${cfg.package}/lib/asterisk/modules
|
||||
astvarlibdir => /var/lib/asterisk
|
||||
astdbdir => /var/lib/asterisk
|
||||
astkeydir => /var/lib/asterisk
|
||||
|
|
@ -47,7 +47,7 @@ let
|
|||
astspooldir => /var/spool/asterisk
|
||||
astrundir => /var/run/asterisk
|
||||
astlogdir => /var/log/asterisk
|
||||
astsbindir => ${pkgs.asterisk}/sbin
|
||||
astsbindir => ${cfg.package}/sbin
|
||||
'';
|
||||
extraConf = cfg.extraConfig;
|
||||
|
||||
|
|
@ -197,11 +197,17 @@ in
|
|||
Additional command line arguments to pass to Asterisk.
|
||||
'';
|
||||
};
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.asterisk;
|
||||
defaultText = "pkgs.asterisk";
|
||||
description = "The Asterisk package to use.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = [ pkgs.asterisk ];
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
|
||||
environment.etc.asterisk.source = asteriskEtc;
|
||||
|
||||
|
|
@ -234,7 +240,7 @@ in
|
|||
# TODO: Make exceptions for /var directories that likely should be updated
|
||||
if [ ! -e "$d" ]; then
|
||||
mkdir -p "$d"
|
||||
cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/
|
||||
cp --recursive ${cfg.package}/"$d"/* "$d"/
|
||||
chown --recursive ${asteriskUser}:${asteriskGroup} "$d"
|
||||
find "$d" -type d | xargs chmod 0755
|
||||
fi
|
||||
|
|
@ -247,8 +253,8 @@ in
|
|||
# FIXME: This doesn't account for arguments with spaces
|
||||
argString = concatStringsSep " " cfg.extraArguments;
|
||||
in
|
||||
"${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F";
|
||||
ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload"
|
||||
"${cfg.package}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F";
|
||||
ExecReload = ''${cfg.package}/bin/asterisk -x "core reload"
|
||||
'';
|
||||
Type = "forking";
|
||||
PIDFile = "/var/run/asterisk/asterisk.pid";
|
||||
|
|
|
|||
57
nixos/modules/services/security/hologram-agent.nix
Normal file
57
nixos/modules/services/security/hologram-agent.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{pkgs, config, lib, ...}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.hologram-agent;
|
||||
|
||||
cfgFile = pkgs.writeText "hologram-agent.json" (builtins.toJSON {
|
||||
host = cfg.dialAddress;
|
||||
});
|
||||
in {
|
||||
options = {
|
||||
services.hologram-agent = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Whether to enable the Hologram agent for AWS instance credentials";
|
||||
};
|
||||
|
||||
dialAddress = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost:3100";
|
||||
description = "Hologram server and port.";
|
||||
};
|
||||
|
||||
httpPort = mkOption {
|
||||
type = types.str;
|
||||
default = "80";
|
||||
description = "Port for metadata service to listen on.";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
networking.interfaces.dummy0 = {
|
||||
ipAddress = "169.254.169.254";
|
||||
prefixLength = 32;
|
||||
};
|
||||
|
||||
systemd.services.hologram-agent = {
|
||||
description = "Provide EC2 instance credentials to machines outside of EC2";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ];
|
||||
preStart = ''
|
||||
/run/current-system/sw/bin/rm -fv /var/run/hologram.sock
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ nand0p ];
|
||||
}
|
||||
|
|
@ -20,8 +20,6 @@ let
|
|||
"<includedir>${d}/etc/dbus-1/session.d</includedir>"
|
||||
]));
|
||||
|
||||
daemonArgs = "--address=systemd: --nofork --nopidfile --systemd-activation";
|
||||
|
||||
configDir = pkgs.runCommand "dbus-conf"
|
||||
{ preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
|
@ -29,11 +27,6 @@ let
|
|||
''
|
||||
mkdir -p $out
|
||||
|
||||
cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out
|
||||
|
||||
# include by full path
|
||||
sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf
|
||||
|
||||
sed '${./dbus-system-local.conf.in}' \
|
||||
-e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
|
||||
-e 's,@extra@,${systemExtraxml},' \
|
||||
|
|
@ -95,6 +88,11 @@ in
|
|||
|
||||
environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ];
|
||||
|
||||
environment.etc = singleton
|
||||
{ source = configDir;
|
||||
target = "dbus-1";
|
||||
};
|
||||
|
||||
users.extraUsers.messagebus = {
|
||||
uid = config.ids.uids.messagebus;
|
||||
description = "D-Bus system message bus daemon user";
|
||||
|
|
@ -125,10 +123,6 @@ in
|
|||
# Don't restart dbus-daemon. Bad things tend to happen if we do.
|
||||
reloadIfChanged = true;
|
||||
restartTriggers = [ configDir ];
|
||||
serviceConfig.ExecStart = [
|
||||
"" # Default dbus.service has two entries, we need to override both.
|
||||
"${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/system.conf ${daemonArgs}"
|
||||
];
|
||||
};
|
||||
|
||||
systemd.user = {
|
||||
|
|
@ -136,18 +130,10 @@ in
|
|||
# Don't restart dbus-daemon. Bad things tend to happen if we do.
|
||||
reloadIfChanged = true;
|
||||
restartTriggers = [ configDir ];
|
||||
serviceConfig.ExecStart = [
|
||||
"" # Default dbus.service has two entries, we need to override both.
|
||||
"${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/session.conf ${daemonArgs}"
|
||||
];
|
||||
};
|
||||
sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ];
|
||||
};
|
||||
|
||||
environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
|
||||
|
||||
system.extraSystemBuilderCmds = ''
|
||||
ln -s ${configDir} $out/dbus
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ with lib;
|
|||
let
|
||||
|
||||
# Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
fullversion = "${version}";
|
||||
|
||||
# Our bare-bones wp-config.php file using the above settings
|
||||
|
|
@ -75,7 +75,7 @@ let
|
|||
owner = "WordPress";
|
||||
repo = "WordPress";
|
||||
rev = "${fullversion}";
|
||||
sha256 = "1wb4f4zn55d23qi0whsfpbpcd4sjvzswgmni6f5rzrmlawq9ssgr";
|
||||
sha256 = "0vph12708drf8ww0xd05hpdvbyy7n5gj9ca598lhdhy2i1j6wy32";
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
|
|
|||
|
|
@ -64,7 +64,10 @@ in
|
|||
|
||||
security.setuidPrograms = [ "e_freqset" ];
|
||||
|
||||
services.xserver.exportConfiguration = true;
|
||||
environment.etc = singleton
|
||||
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
|
||||
target = "X11/xkb";
|
||||
};
|
||||
|
||||
fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ];
|
||||
|
||||
|
|
|
|||
|
|
@ -183,7 +183,10 @@ in
|
|||
GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
|
||||
};
|
||||
|
||||
services.xserver.exportConfiguration = true;
|
||||
environment.etc = singleton
|
||||
{ source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
|
||||
target = "X11/xkb";
|
||||
};
|
||||
|
||||
# Enable helpful DBus services.
|
||||
services.udisks2.enable = true;
|
||||
|
|
|
|||
|
|
@ -199,7 +199,10 @@ in
|
|||
|
||||
environment.pathsToLink = [ "/share" ];
|
||||
|
||||
services.xserver.exportConfiguration = true;
|
||||
environment.etc = singleton {
|
||||
source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
|
||||
target = "X11/xkb";
|
||||
};
|
||||
|
||||
environment.variables =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -465,15 +465,23 @@ in
|
|||
}
|
||||
];
|
||||
|
||||
environment.etc = mkMerge [
|
||||
(mkIf cfg.exportConfiguration {
|
||||
"X11/xorg.conf".source = configFile;
|
||||
"X11/xkb".source = cfg.xkbDir;
|
||||
})
|
||||
environment.etc =
|
||||
(optionals cfg.exportConfiguration
|
||||
[ { source = "${configFile}";
|
||||
target = "X11/xorg.conf";
|
||||
}
|
||||
# -xkbdir command line option does not seems to be passed to xkbcomp.
|
||||
{ source = "${cfg.xkbDir}";
|
||||
target = "X11/xkb";
|
||||
}
|
||||
])
|
||||
# Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5
|
||||
(let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in
|
||||
{ "${cfgPath}".source = xorg.xf86inputevdev.out + "/share" + cfgPath; })
|
||||
];
|
||||
++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in
|
||||
[{
|
||||
source = xorg.xf86inputevdev.out + "/share" + cfgPath;
|
||||
target = cfgPath;
|
||||
}]
|
||||
);
|
||||
|
||||
environment.systemPackages =
|
||||
[ xorg.xorgserver.out
|
||||
|
|
|
|||
|
|
@ -102,17 +102,21 @@ in
|
|||
EOF
|
||||
|
||||
# Set the default gateway.
|
||||
${optionalString (cfg.defaultGateway != null && cfg.defaultGateway != "") ''
|
||||
${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''
|
||||
# FIXME: get rid of "|| true" (necessary to make it idempotent).
|
||||
ip route add default via "${cfg.defaultGateway}" ${
|
||||
ip route add default via "${cfg.defaultGateway.address}" ${
|
||||
optionalString (cfg.defaultGatewayWindowSize != null)
|
||||
"window ${toString cfg.defaultGatewayWindowSize}"} || true
|
||||
"window ${toString cfg.defaultGatewayWindowSize}"} ${
|
||||
optionalString (cfg.defaultGateway.interface != null)
|
||||
"dev ${cfg.defaultGateway.interface}"}|| true
|
||||
''}
|
||||
${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") ''
|
||||
${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''
|
||||
# FIXME: get rid of "|| true" (necessary to make it idempotent).
|
||||
ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${
|
||||
ip -6 route add ::/0 via "${cfg.defaultGateway6.address}" ${
|
||||
optionalString (cfg.defaultGatewayWindowSize != null)
|
||||
"window ${toString cfg.defaultGatewayWindowSize}"} || true
|
||||
"window ${toString cfg.defaultGatewayWindowSize}"} ${
|
||||
optionalString (cfg.defaultGateway6.interface != null)
|
||||
"dev ${cfg.defaultGateway6.interface}"} || true
|
||||
''}
|
||||
'';
|
||||
};
|
||||
|
|
|
|||
|
|
@ -38,6 +38,12 @@ in
|
|||
} {
|
||||
assertion = cfg.vswitches == {};
|
||||
message = "networking.vswichtes are not supported by networkd.";
|
||||
} {
|
||||
assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null;
|
||||
message = "networking.defaultGateway.interface is not supported by networkd.";
|
||||
} {
|
||||
assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null;
|
||||
message = "networking.defaultGateway6.interface is not supported by networkd.";
|
||||
} ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: {
|
||||
assertion = !rstp;
|
||||
message = "networking.bridges.${n}.rstp is not supported by networkd.";
|
||||
|
|
|
|||
|
|
@ -116,6 +116,28 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
gatewayCoerce = address: { inherit address; };
|
||||
|
||||
gatewayOpts = { ... }: {
|
||||
|
||||
options = {
|
||||
|
||||
address = mkOption {
|
||||
type = types.str;
|
||||
description = "The default gateway address.";
|
||||
};
|
||||
|
||||
interface = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
example = "enp0s3";
|
||||
description = "The default gateway interface.";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
interfaceOpts = { name, ... }: {
|
||||
|
||||
options = {
|
||||
|
|
@ -327,19 +349,27 @@ in
|
|||
|
||||
networking.defaultGateway = mkOption {
|
||||
default = null;
|
||||
example = "131.211.84.1";
|
||||
type = types.nullOr types.str;
|
||||
example = {
|
||||
address = "131.211.84.1";
|
||||
device = "enp3s0";
|
||||
};
|
||||
type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
|
||||
description = ''
|
||||
The default gateway. It can be left empty if it is auto-detected through DHCP.
|
||||
The default gateway. It can be left empty if it is auto-detected through DHCP.
|
||||
It can be specified as a string or an option set along with a network interface.
|
||||
'';
|
||||
};
|
||||
|
||||
networking.defaultGateway6 = mkOption {
|
||||
default = null;
|
||||
example = "2001:4d0:1e04:895::1";
|
||||
type = types.nullOr types.str;
|
||||
example = {
|
||||
address = "2001:4d0:1e04:895::1";
|
||||
device = "enp3s0";
|
||||
};
|
||||
type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
|
||||
description = ''
|
||||
The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP.
|
||||
The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP.
|
||||
It can be specified as a string or an option set along with a network interface.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1021,10 +1021,10 @@
|
|||
}) {};
|
||||
let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
|
||||
pname = "let-alist";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/let-alist-1.0.4.el";
|
||||
sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x";
|
||||
url = "https://elpa.gnu.org/packages/let-alist-1.0.5.el";
|
||||
sha256 = "0r7b9jni50la1m79kklml11syg8d2fmdlr83pv005sv1wh02jszw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1377,10 +1377,10 @@
|
|||
}) {};
|
||||
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "org";
|
||||
version = "20161224";
|
||||
version = "20170124";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-20161224.tar";
|
||||
sha256 = "0b10bjypn0w5ja776f8sxl1qpvb61iyz1n3c74jx6fqwypv7dmgi";
|
||||
url = "https://elpa.gnu.org/packages/org-20170124.tar";
|
||||
sha256 = "0mcnjwvily0xv1xl11dj18lg38llvrxja2j9mwn6vql8n5y1srxi";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -1468,6 +1468,19 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
|
||||
pname = "psgml";
|
||||
version = "1.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar";
|
||||
sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/psgml.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "python";
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1795,12 +1795,12 @@
|
|||
auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
|
||||
melpaBuild {
|
||||
pname = "auto-compile";
|
||||
version = "1.3.2";
|
||||
version = "1.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarsius";
|
||||
repo = "auto-compile";
|
||||
rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96";
|
||||
sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva";
|
||||
rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
|
||||
sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
|
||||
|
|
@ -4731,12 +4731,12 @@
|
|||
company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "company-ngram";
|
||||
version = "0.7.9";
|
||||
version = "0.8.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kshramt";
|
||||
repo = "company-ngram";
|
||||
rev = "98491c830d0867c211b773818610ace51f243640";
|
||||
sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw";
|
||||
rev = "d15182df3eac72b29772802759b77c9eafef5066";
|
||||
sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
|
||||
|
|
@ -4842,12 +4842,12 @@
|
|||
company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
|
||||
melpaBuild {
|
||||
pname = "company-sourcekit";
|
||||
version = "0.1.7";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nathankot";
|
||||
repo = "company-sourcekit";
|
||||
rev = "14d503d96fe595a688a3f162ae5739e4b08da24b";
|
||||
sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m";
|
||||
rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
|
||||
sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit";
|
||||
|
|
@ -4965,22 +4965,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
|
||||
composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
|
||||
melpaBuild {
|
||||
pname = "composer";
|
||||
version = "0.0.7";
|
||||
version = "0.0.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "zonuexe";
|
||||
repo = "composer.el";
|
||||
rev = "47d840e03412da5db13ae2b962576f0166517581";
|
||||
sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008";
|
||||
rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1";
|
||||
sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
|
||||
sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza";
|
||||
name = "composer";
|
||||
};
|
||||
packageRequires = [ emacs f request s ];
|
||||
packageRequires = [ emacs f request s seq ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/composer";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -7847,12 +7847,12 @@
|
|||
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "elfeed";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elfeed";
|
||||
rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
|
||||
sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
|
||||
rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192";
|
||||
sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
|
||||
|
|
@ -7868,12 +7868,12 @@
|
|||
elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
|
||||
melpaBuild {
|
||||
pname = "elfeed-web";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "skeeto";
|
||||
repo = "elfeed";
|
||||
rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef";
|
||||
sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i";
|
||||
rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192";
|
||||
sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
|
||||
|
|
@ -8096,15 +8096,15 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
|
||||
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
|
||||
melpaBuild {
|
||||
pname = "elpy";
|
||||
version = "1.13.0";
|
||||
version = "1.14.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jorgenschaefer";
|
||||
repo = "elpy";
|
||||
rev = "5c900ff6b5524e216247f52ed4085734d815dacb";
|
||||
sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik";
|
||||
rev = "9afc370f7044d4e5c5a47e7080b43468ff2a4e28";
|
||||
sha256 = "1ynranqi0lv9nhap4ydqns3znpqpc0q69qyb22i93pkd505ryyf8";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
|
||||
|
|
@ -8116,6 +8116,7 @@
|
|||
find-file-in-project
|
||||
highlight-indentation
|
||||
pyvenv
|
||||
s
|
||||
yasnippet
|
||||
];
|
||||
meta = {
|
||||
|
|
@ -8772,12 +8773,12 @@
|
|||
eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "eopengrok";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "youngker";
|
||||
repo = "eopengrok.el";
|
||||
rev = "0bf07c636f8d29a98e9776243ec9496875ddff51";
|
||||
sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x";
|
||||
rev = "11c99f7e1e2c1c7d70cbda496cb5b6c7f6e4082a";
|
||||
sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok";
|
||||
|
|
@ -8814,12 +8815,12 @@
|
|||
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "epkg";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacscollective";
|
||||
repo = "epkg";
|
||||
rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d";
|
||||
sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0";
|
||||
rev = "f2daeceb98766914548bf9a3c8206ae64850e395";
|
||||
sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
|
||||
|
|
@ -9044,12 +9045,12 @@
|
|||
erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "erlang";
|
||||
version = "19.2.1";
|
||||
version = "19.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "erlang";
|
||||
repo = "otp";
|
||||
rev = "bca5bf5a2d68a0e9ca681363a8943809c4751950";
|
||||
sha256 = "1bxksxp2ggzskmrzh4k66w27ckh77jjjriq85xfz52n963al9crr";
|
||||
rev = "51faafa9a20c4afa7944b8089b26f22c774bed19";
|
||||
sha256 = "0shy3ckxw9scsg3j8brzk5r3p0rdpfbr9ys7akmdp2pq88d867i9";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
|
||||
|
|
@ -10303,12 +10304,12 @@
|
|||
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "eziam-theme";
|
||||
version = "0.1.1";
|
||||
version = "0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "thblt";
|
||||
repo = "eziam-theme-emacs";
|
||||
rev = "794ff00f27c31c7b43b7dc62da6295cd9db36ad4";
|
||||
sha256 = "0j94k3bhynhrigk127b40ljqcdqsqa5gix5ds3b0hb38wfcq8byk";
|
||||
rev = "e0ca54afdec6eeaf275fa5130a90ed77b0b72277";
|
||||
sha256 = "1m64clhwcwwry76imqcwbsz1bm8blpqynzmpqwcsmhsjqp0yb620";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
|
||||
|
|
@ -12353,12 +12354,12 @@
|
|||
fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "fxrd-mode";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "msherry";
|
||||
repo = "fxrd-mode";
|
||||
rev = "f53240c92f80760fbfb2e0dcf2e68064145cec33";
|
||||
sha256 = "0yx4p081960zwgjlw9yiq4jkc7czfvwbsc8z20pg394lx9nkrgr5";
|
||||
rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d";
|
||||
sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
|
||||
|
|
@ -12605,12 +12606,12 @@
|
|||
ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ghc";
|
||||
version = "5.6.0.0";
|
||||
version = "5.7.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielG";
|
||||
repo = "ghc-mod";
|
||||
rev = "deef7036d06072fbccb6c17369ac7e28ad341482";
|
||||
sha256 = "1kq3ynnjs57pgs99a2m4hh6nc692lf8j9ydmn5wync75r2pyh0jc";
|
||||
rev = "c3d0a681a19261817cf928685f7b96878fe51e91";
|
||||
sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
|
||||
|
|
@ -12794,12 +12795,12 @@
|
|||
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
|
||||
melpaBuild {
|
||||
pname = "git-commit";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "magit";
|
||||
rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
|
||||
sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
|
||||
rev = "acba806a823977108bae60438466da71f773a7c8";
|
||||
sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
|
||||
|
|
@ -13508,12 +13509,12 @@
|
|||
go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "go-impl";
|
||||
version = "0.13";
|
||||
version = "0.14";
|
||||
src = fetchFromGitHub {
|
||||
owner = "syohex";
|
||||
repo = "emacs-go-impl";
|
||||
rev = "1827d2efe1f6023cf3954c0056aaa531124c41c1";
|
||||
sha256 = "1rcqrsvw74lrzs03bg9zslmkf5ka4a3h06b5hhdgiv4iimapz5sq";
|
||||
rev = "69f0d0ef05771487e15abec500cd06befd171abf";
|
||||
sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl";
|
||||
|
|
@ -13550,12 +13551,12 @@
|
|||
go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "go-playground";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafov";
|
||||
repo = "go-playground";
|
||||
rev = "97be0b3a19d7b8476663c9b16148c4dfd9783cfe";
|
||||
sha256 = "0wz79iwcfql8kfq5q9b0fccj9590giqlzd2kzjaj0fl89n0sx9gq";
|
||||
rev = "eebb1fec2177bc85b746b948beac873a77bea4a2";
|
||||
sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
|
||||
|
|
@ -14333,6 +14334,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
hacker-typer = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "hacker-typer";
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "therockmandolinist";
|
||||
repo = "emacs-hacker-typer";
|
||||
rev = "de208bb6d69f6f45eca8522d41012c7f729b8c9f";
|
||||
sha256 = "0lhsj9j17sd43w96zk84ssfvk5q518znbp1zkb5znl2q7ky8cwrg";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer";
|
||||
sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9";
|
||||
name = "hacker-typer";
|
||||
};
|
||||
packageRequires = [ async ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/hacker-typer";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "hackernews";
|
||||
|
|
@ -14671,12 +14693,12 @@
|
|||
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
|
||||
melpaBuild {
|
||||
pname = "helm";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-helm";
|
||||
repo = "helm";
|
||||
rev = "bbdf2c18edc75478e2c7e8ee39b5c30dbb7bf42e";
|
||||
sha256 = "1qqyrqhsy7xacckg5faj45pvs0vpg242sp2073i5grvgb3l9lvqj";
|
||||
rev = "b54d937634986dbebe97c0283137bcde07ed2275";
|
||||
sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
|
||||
|
|
@ -14920,6 +14942,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "helm-codesearch";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "youngker";
|
||||
repo = "helm-codesearch.el";
|
||||
rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116";
|
||||
sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch";
|
||||
sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
|
||||
name = "helm-codesearch";
|
||||
};
|
||||
packageRequires = [ cl-lib dash helm s ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/helm-codesearch";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-commandlinefu";
|
||||
|
|
@ -14944,12 +14987,12 @@
|
|||
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "helm-core";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "emacs-helm";
|
||||
repo = "helm";
|
||||
rev = "bbdf2c18edc75478e2c7e8ee39b5c30dbb7bf42e";
|
||||
sha256 = "1qqyrqhsy7xacckg5faj45pvs0vpg242sp2073i5grvgb3l9lvqj";
|
||||
rev = "b54d937634986dbebe97c0283137bcde07ed2275";
|
||||
sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
|
||||
|
|
@ -19484,12 +19527,12 @@
|
|||
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "live-py-mode";
|
||||
version = "2.13.0";
|
||||
version = "2.14.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "donkirkby";
|
||||
repo = "live-py-plugin";
|
||||
rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a";
|
||||
sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d";
|
||||
rev = "51b1e177f115ab527cc47baf98abe09d43d9a95f";
|
||||
sha256 = "0rcxrq3r4vbr9zb844andy1zj246gs8s1ksqp1f092fiiyqpllnx";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
|
||||
|
|
@ -19778,12 +19821,12 @@
|
|||
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
|
||||
melpaBuild {
|
||||
pname = "magit";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "magit";
|
||||
rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
|
||||
sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
|
||||
rev = "acba806a823977108bae60438466da71f773a7c8";
|
||||
sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
|
||||
|
|
@ -19932,12 +19975,12 @@
|
|||
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "magit-popup";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "magit";
|
||||
rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59";
|
||||
sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn";
|
||||
rev = "acba806a823977108bae60438466da71f773a7c8";
|
||||
sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
|
||||
|
|
@ -20538,22 +20581,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
|
||||
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
|
||||
melpaBuild {
|
||||
pname = "meghanada";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mopemope";
|
||||
repo = "meghanada-emacs";
|
||||
rev = "04112dc5db30a98d2ec1dae41d8c6ed1c7aff0be";
|
||||
sha256 = "0f14b1h6zv0v8hn99bqmidndh36mrsckmcirrrffm591ksf4l0zd";
|
||||
rev = "6b1b514ca3424c08301325f99608510130365cd1";
|
||||
sha256 = "1pl65186k696mx6lm6lnn2jm86kwky780rph97cqb1dy506qpqxf";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
|
||||
sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4";
|
||||
name = "meghanada";
|
||||
};
|
||||
packageRequires = [ cl-lib company emacs flycheck yasnippet ];
|
||||
packageRequires = [ company emacs flycheck yasnippet ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/meghanada";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -21968,12 +22011,12 @@
|
|||
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "no-littering";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarsius";
|
||||
repo = "no-littering";
|
||||
rev = "e161c328d248f861bb56991492182f20e60b6b41";
|
||||
sha256 = "0ka7gbiarhc1r8rynxq2vf0k5p4044bm1jc92ca1hav34mqfg2xp";
|
||||
rev = "87fffa1973376bd1837fcf84277cd16db9c96957";
|
||||
sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
|
||||
|
|
@ -23065,12 +23108,12 @@
|
|||
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "org-journal";
|
||||
version = "1.11.2";
|
||||
version = "1.12.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bastibe";
|
||||
repo = "org-journal";
|
||||
rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b";
|
||||
sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z";
|
||||
rev = "24313870fa682a53e7f3f916b0e853a731868886";
|
||||
sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
|
||||
|
|
@ -24214,12 +24257,12 @@
|
|||
packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "packed";
|
||||
version = "1.0.0";
|
||||
version = "2.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarsius";
|
||||
repo = "packed";
|
||||
rev = "765cd52712f0daf40c45d169cc062b6bc94aa807";
|
||||
sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl";
|
||||
rev = "d2f01bffc987b226f618dda0663a1e233161518d";
|
||||
sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
|
||||
|
|
@ -25047,22 +25090,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
php-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "php-mode";
|
||||
version = "1.17.0";
|
||||
version = "1.18.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ejmr";
|
||||
repo = "php-mode";
|
||||
rev = "f3201eebfebf1757cf6a636fe3c7a3b810ab6612";
|
||||
sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3";
|
||||
rev = "349b85c1a9c79505d218b43940470c862dcdff32";
|
||||
sha256 = "15mlzk7mvv3wfz73k30a7syb274myls6d44nibwg00r794drr57g";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
|
||||
sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
|
||||
name = "php-mode";
|
||||
};
|
||||
packageRequires = [];
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/php-mode";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -26034,12 +26077,12 @@
|
|||
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "protobuf-mode";
|
||||
version = "3.2.0pre2";
|
||||
version = "3.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "protobuf";
|
||||
rev = "6eeb5c7d0fc84c9c5d562ae54b3bdc088ec62129";
|
||||
sha256 = "15mb2ybam1pnyig60zlspw0cn9wl5iwywp35fx67qvg9nadln11d";
|
||||
rev = "593e917c176b5bc5aafa57bf9f6030d749d91cd5";
|
||||
sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
|
||||
|
|
@ -26622,12 +26665,12 @@
|
|||
railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "railscasts-reloaded-theme";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeorgeous";
|
||||
repo = "railscasts-reloaded-theme";
|
||||
rev = "de3fea4fdd32db6cbea124dfeb2fa4f213d79063";
|
||||
sha256 = "1kl3wn35pcyslggy5wxm81bjjsj3smzjsf54iy4y844iyf4mgp5j";
|
||||
rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f";
|
||||
sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
|
||||
|
|
@ -27249,22 +27292,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "request";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tkf";
|
||||
repo = "emacs-request";
|
||||
rev = "efbe231346f368a3079bf185ce25997ac6104d9c";
|
||||
sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401";
|
||||
rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
|
||||
sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request";
|
||||
sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji";
|
||||
name = "request";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/request";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -27273,12 +27316,12 @@
|
|||
request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
|
||||
melpaBuild {
|
||||
pname = "request-deferred";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tkf";
|
||||
repo = "emacs-request";
|
||||
rev = "efbe231346f368a3079bf185ce25997ac6104d9c";
|
||||
sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401";
|
||||
rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8";
|
||||
sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred";
|
||||
|
|
@ -27312,22 +27355,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "resize-window";
|
||||
version = "0.2.0";
|
||||
version = "0.4.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "dpsutton";
|
||||
repo = "resize-window";
|
||||
rev = "dec035ff44fdb743bb2dc82274114dc6ea1851f9";
|
||||
sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj";
|
||||
rev = "27364959798de0f019da799975027842c07e7829";
|
||||
sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
|
||||
sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
|
||||
name = "resize-window";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/resize-window";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -28075,8 +28118,8 @@
|
|||
src = fetchFromGitHub {
|
||||
owner = "ensime";
|
||||
repo = "emacs-scala-mode";
|
||||
rev = "7e6300231143133252e6ed1f3d5c86ea4e625e33";
|
||||
sha256 = "081bw6gkrww7bqi7pwj4sifmqscr5sbpl3zl1rw86npv5fpyjq9j";
|
||||
rev = "730e16d254478d6f63f62cb04d47c137c9002f2d";
|
||||
sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
|
||||
|
|
@ -29347,6 +29390,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
socyl = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
|
||||
melpaBuild {
|
||||
pname = "socyl";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlamirault";
|
||||
repo = "socyl";
|
||||
rev = "09ea9d1ea02060ccdb17b80ad88f912c08045c5b";
|
||||
sha256 = "09zdknrg4ar38nbhvz4407x78i3lngmnrcijr7a4x1ybs5x61zis";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl";
|
||||
sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz";
|
||||
name = "socyl";
|
||||
};
|
||||
packageRequires = [ dash pkg-info s ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/socyl";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "solarized-theme";
|
||||
|
|
@ -29452,22 +29516,22 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
|
||||
melpaBuild {
|
||||
pname = "sourcekit";
|
||||
version = "0.1.7";
|
||||
version = "0.2.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nathankot";
|
||||
repo = "company-sourcekit";
|
||||
rev = "14d503d96fe595a688a3f162ae5739e4b08da24b";
|
||||
sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m";
|
||||
rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b";
|
||||
sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit";
|
||||
sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
|
||||
name = "sourcekit";
|
||||
};
|
||||
packageRequires = [ dash dash-functional emacs ];
|
||||
packageRequires = [ dash dash-functional emacs request ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/sourcekit";
|
||||
license = lib.licenses.free;
|
||||
|
|
@ -30313,12 +30377,12 @@
|
|||
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "swift-mode";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "chrisbarrett";
|
||||
repo = "swift-mode";
|
||||
rev = "6cd2948589771d926e545d8cbe054705eebce18f";
|
||||
sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6";
|
||||
rev = "42669da0b68bba2d12f9d5fc38f30def118bb999";
|
||||
sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
|
||||
|
|
@ -31257,12 +31321,12 @@
|
|||
toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "toc-org";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "snosov1";
|
||||
repo = "toc-org";
|
||||
rev = "114dcc9813e2d8784b8c21165c95408c1b26d86e";
|
||||
sha256 = "084nqdrpzgg1qpbqgvi893iglmz9dk3r0vwqxjkyxa3z3a0f5v17";
|
||||
rev = "a0e8ca05e806e5074b8603985da7f18b92c15856";
|
||||
sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
|
||||
|
|
@ -31442,27 +31506,6 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "ttrss";
|
||||
version = "1.7.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pedros";
|
||||
repo = "ttrss.el";
|
||||
rev = "3b1e34518294a1fa6fa29355fd4e141f3fcaf3b6";
|
||||
sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/d918a5aa26c890fd138323ac6a446c0722e8b4c6/recipes/ttrss";
|
||||
sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
|
||||
name = "ttrss";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/ttrss";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "tuareg";
|
||||
|
|
@ -32204,6 +32247,27 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
|
||||
melpaBuild {
|
||||
pname = "virtualenvwrapper";
|
||||
version = "0.1.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "porterjamesj";
|
||||
repo = "virtualenvwrapper.el";
|
||||
rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb";
|
||||
sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper";
|
||||
sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
|
||||
name = "virtualenvwrapper";
|
||||
};
|
||||
packageRequires = [ dash s ];
|
||||
meta = {
|
||||
homepage = "https://melpa.org/#/virtualenvwrapper";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "visible-mark";
|
||||
|
|
@ -33046,12 +33110,12 @@
|
|||
with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
|
||||
melpaBuild {
|
||||
pname = "with-editor";
|
||||
version = "2.5.9";
|
||||
version = "2.5.10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "magit";
|
||||
repo = "with-editor";
|
||||
rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0";
|
||||
sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n";
|
||||
rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0";
|
||||
sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn";
|
||||
};
|
||||
recipeFile = fetchurl {
|
||||
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
|
||||
|
|
|
|||
|
|
@ -2,21 +2,21 @@
|
|||
makeWrapper, libXScrnSaver }:
|
||||
|
||||
let
|
||||
version = "1.8.1";
|
||||
rev = "ee428b0eead68bf0fb99ab5fdc4439be227b6281";
|
||||
version = "1.9.0";
|
||||
rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d";
|
||||
channel = "stable";
|
||||
|
||||
sha256 = if stdenv.system == "i686-linux" then "f48c2eb302de0742612f6c5e4ec4842fa474a85c1bcf421456526c9472d4641f"
|
||||
else if stdenv.system == "x86_64-linux" then "99bd463707f3a21bc949eec3e857c80aafef8f66e06a295148c1c23875244760"
|
||||
else if stdenv.system == "x86_64-darwin" then "9202c85669853b07d1cbac9e6bcb01e7c08e13fd2a2b759dd53994e0fa51e7a1"
|
||||
sha256 = if stdenv.system == "i686-linux" then "05f1sk2lq2skp8fxq6q229kf89vi2sq3zz6lywq7nk81pwvp8jap"
|
||||
else if stdenv.system == "x86_64-linux" then "0wj17lwq8f88xvfa6wfbqm580kp0470ib2yxn15j9mv0iw7nzqry"
|
||||
else if stdenv.system == "x86_64-darwin" then "1k067h099j6fv820nn6h4i8ax35yvd1h8f4h5216dm66cpikv7nd"
|
||||
else throw "Unsupported system: ${stdenv.system}";
|
||||
|
||||
urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/";
|
||||
|
||||
urlStr = if stdenv.system == "i686-linux" then
|
||||
urlBase + "code-${channel}-code_${version}-1482159060_i386.tar.gz"
|
||||
urlBase + "code-${channel}-code_${version}-1486024310_i386.tar.gz"
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
urlBase + "code-${channel}-code_${version}-1482158209_amd64.tar.gz"
|
||||
urlBase + "code-${channel}-code_${version}-1486023356_amd64.tar.gz"
|
||||
else if stdenv.system == "x86_64-darwin" then
|
||||
urlBase + "VSCode-darwin-${channel}.zip"
|
||||
else throw "Unsupported system: ${stdenv.system}";
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ let
|
|||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "7.0.4-0";
|
||||
sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds";
|
||||
version = "7.0.4-6";
|
||||
sha256 = "1nm0hjijwhcp6rzcn7zksp2820dxvj4lmblj7kzpzd3s1ds09q0y";
|
||||
patches = [];
|
||||
};
|
||||
in
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ let
|
|||
else throw "ImageMagick is not supported on this platform.";
|
||||
|
||||
cfg = {
|
||||
version = "6.9.7-0";
|
||||
sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx";
|
||||
version = "6.9.7-6";
|
||||
sha256 = "17pc3xz8srb9g5a5gkk6q9sjiss77fgm0wxxfmb5qya4rqivjpzn";
|
||||
patches = [];
|
||||
}
|
||||
# Freeze version on mingw so we don't need to port the patch too often.
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
assert stdenv ? glibc;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.2.1";
|
||||
version = "2.2.3";
|
||||
name = "darktable-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
|
||||
sha256 = "da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc";
|
||||
sha256 = "1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
enableParallelBuilding = true;
|
||||
|
||||
patchPhase = ''
|
||||
sed -e 's#/usr/share/applications#$out/share/applications#' -i src/core/CMakeLists.txt
|
||||
substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "keepassx-reboot-${version}";
|
||||
version = "2.0.3";
|
||||
name = "keepassx-community-${version}";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "keepassxreboot";
|
||||
repo = "keepassx";
|
||||
rev = "${version}-http";
|
||||
sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv";
|
||||
repo = "keepassxc";
|
||||
rev = "${version}";
|
||||
sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
|
||||
|
||||
meta = {
|
||||
description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
|
||||
homepage = https://github.com/keepassxreboot/keepassx;
|
||||
homepage = https://github.com/keepassxreboot/keepassxc;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "moonlight-embedded-${version}";
|
||||
version = "2.2.1";
|
||||
version = "2.2.3";
|
||||
|
||||
# fetchgit used to ensure submodules are available
|
||||
src = fetchgit {
|
||||
|
|
|
|||
|
|
@ -3,31 +3,20 @@
|
|||
, libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.9a";
|
||||
version = "1.10a";
|
||||
name = "mupdf-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
|
||||
sha256 = "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0";
|
||||
sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# http://www.openwall.com/lists/oss-security/2016/08/03/2
|
||||
(fetchpatch {
|
||||
name = "mupdf-fix-CVE-2016-6525.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958";
|
||||
sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "mupdf-696941-fix-use-after-free.patch";
|
||||
url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958";
|
||||
sha256 = "02j9b6my1h3rb0sz9yp6gi7c4ldi3mz0z9s5i8g9cl0arxyzys5h";
|
||||
})
|
||||
# Compatibility with new openjpeg
|
||||
(fetchpatch {
|
||||
name = "mupdf-1.9a-openjpeg-2.1.1.patch";
|
||||
url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=9083dac2a398bfe694d31a0c6a0a839c5a756e53";
|
||||
sha256 = "14ndgy3w1sl25km9bcc2zfcxrcihqjw1sdzkpcw5g1mi7gcgxp3g";
|
||||
url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099";
|
||||
sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,24 +2,18 @@
|
|||
, libjpeg, jbig2dec, openjpeg, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
name = "zathura-pdf-mupdf-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz";
|
||||
sha256 = "1j3j3wbp49walb19f0966qsnlqbd26wnsjpcxfbf021dav8vk327";
|
||||
sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr";
|
||||
};
|
||||
|
||||
buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
|
||||
|
||||
patches = [(fetchpatch {
|
||||
name = "mupdf-1.9.patch";
|
||||
url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.9.patch?h=packages/zathura-pdf-mupdf&id=385ad96261b7297fdebbee6f4b22ec20dda8d65e";
|
||||
sha256 = "185wgg0z4b0z5aybcnnyvbs50h43imn5xz3nqmya4rk4v5bwy49y";
|
||||
})];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = http://pwmt.org/projects/zathura/;
|
||||
description = "A zathura PDF plugin (mupdf)";
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
# This file is autogenerated from update.sh in the same directory.
|
||||
{
|
||||
beta = {
|
||||
sha256 = "00mq90h5kjj3x7asclp97x5mqy6pvcj0vqxcf77djlyjmsy1q10i";
|
||||
sha256bin64 = "1prmj546sp627crnjfj2sxprr6ahb59ajgqp8jwy4wiy1x5c3j88";
|
||||
version = "56.0.2924.28";
|
||||
sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g";
|
||||
sha256bin64 = "13hfkkgqywjapz01q3cy0i3ick1s24qhpl40by21c38nwbqplivw";
|
||||
version = "56.0.2924.76";
|
||||
};
|
||||
dev = {
|
||||
sha256 = "1dnqqlhdxawwy4zdk2p8zn6vg0cpi3hqpl9rf3j0xylvm3knr9a1";
|
||||
sha256bin64 = "1hnmca8jqvammsb3y847p2n9hm93129li5zfi5pacqizqlakmv3z";
|
||||
version = "57.0.2950.4";
|
||||
sha256 = "0vw9l66412b9zd8v5l0i518mvfwf313gvh1ywxkf48lpjpi03qwh";
|
||||
sha256bin64 = "1iagza9qjlr61149g6cmiak82898xrrhvk516xrssap2qkb6kyzp";
|
||||
version = "57.0.2987.19";
|
||||
};
|
||||
stable = {
|
||||
sha256 = "0n0sp3f3cmac2lblzn3mjkkhm8p6vy34dafr0kpdz14w1lad66z8";
|
||||
sha256bin64 = "1cvp9fvdpd8qrl48lzs7f6k43bqd43gp0sbzz6h7yrpzw1c49r0m";
|
||||
version = "55.0.2883.87";
|
||||
sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g";
|
||||
sha256bin64 = "1zy11y649nxs03xldcq8jcpwj0nb3sklmyh3cxw7fajzi739p2y3";
|
||||
version = "56.0.2924.76";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "machine-${version}";
|
||||
version = "0.8.1";
|
||||
version = "0.9.0";
|
||||
|
||||
goPackagePath = "github.com/docker/machine";
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ buildGoPackage rec {
|
|||
rev = "v${version}";
|
||||
owner = "docker";
|
||||
repo = "machine";
|
||||
sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7";
|
||||
sha256 = "1kl30ylgdsyr9vkdms6caypnixxjv9a322wx416x6266c8lal6k4";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "nomad-${version}";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/hashicorp/nomad";
|
||||
|
|
@ -12,7 +12,7 @@ buildGoPackage rec {
|
|||
owner = "hashicorp";
|
||||
repo = "nomad";
|
||||
inherit rev;
|
||||
sha256 = "06s4irjz7k5qp895hvwv68xmr6mdq8bv91vhgh6rmx58my8jb68b";
|
||||
sha256 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -20,6 +20,6 @@ buildGoPackage rec {
|
|||
description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mpl20;
|
||||
maintainers = with maintainers; [ rushmorem ];
|
||||
maintainers = with maintainers; [ rushmorem pradeepchhetri ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mcabber-${version}";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
|
||||
sha256 = "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3";
|
||||
sha256 = "0ixdzk5b3s31a4bdfqgqrsiq7vbgdzhqr49p9pz9cq9bgn0h1wm0";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
|
||||
|
|
|
|||
|
|
@ -32,19 +32,11 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "claws-mail-${version}";
|
||||
version = "3.14.0";
|
||||
|
||||
meta = {
|
||||
description = "The user-friendly, lightweight, and fast email client";
|
||||
homepage = http://www.claws-mail.org/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ khumba fpletz ];
|
||||
};
|
||||
version = "3.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
|
||||
sha256 = "0nfchgga3ir91s8rky0a0vnz8cgj2f6h716wh3cmb466a01xfss6";
|
||||
sha256 = "0df34gj4r5cbb92834hph19gnh7ih9rgmmw47rliyg8b9z01v6mp";
|
||||
};
|
||||
|
||||
patches = [ ./mime.patch ];
|
||||
|
|
@ -99,4 +91,12 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p $out/share/applications
|
||||
cp claws-mail.desktop $out/share/applications
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "The user-friendly, lightweight, and fast email client";
|
||||
homepage = http://www.claws-mail.org/;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ khumba fpletz globin ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ngspice-25";
|
||||
name = "ngspice-26";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz";
|
||||
sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h";
|
||||
url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz";
|
||||
sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
|
||||
};
|
||||
|
||||
buildInputs = [ readline libX11 bison libICE libXaw libXext ];
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation {
|
|||
description = "The Next Generation Spice (Electronic Circuit Simulator)";
|
||||
homepage = "http://ngspice.sourceforge.net";
|
||||
license = with licenses; [ "BSD" gpl2 ];
|
||||
maintainers = with maintainers; [ viric ];
|
||||
maintainers = with maintainers; [ viric rongcuid ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "veriT-${version}";
|
||||
version = "201506";
|
||||
version = "2016";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.verit-solver.org/distrib/${name}.tar.gz";
|
||||
sha256 = "1cc9gcspw3namkdfypkians2j5dn224dsw6xx95qicad6033bsgk";
|
||||
url = "http://www.verit-solver.org/distrib/veriT-stable2016.tar.gz";
|
||||
sha256 = "0gvp4diz0qjg0y5ry0p1z7dkdkxw8l7jb8cdhvcnhl06jx977v4b";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook flex bison ];
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "geogebra-${version}";
|
||||
version = "5.0.271.0";
|
||||
version = "5-0-320-0";
|
||||
|
||||
preferLocalBuild = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
|
||||
sha256 = "5dd5be1cde27c9b567f79c38048045864064b69c0d2b469ae93e1fca5f543475";
|
||||
sha256 = "039mrjwgkj3z51zq4xpchzr4msz5xgscgmp36dr1wms1kl42vibk";
|
||||
};
|
||||
|
||||
srcIcon = fetchurl {
|
||||
url = "http://static.geogebra.org/images/geogebra-logo.svg";
|
||||
sha256 = "55ded6b5ec9ad382494f858d8ab5def0ed6c7d529481cd212863b2edde3b5e07";
|
||||
sha256 = "01sy7ggfvck350hwv0cla9ynrvghvssqm3c59x4q5lwsxjsxdpjm";
|
||||
};
|
||||
|
||||
desktopItem = makeDesktopItem {
|
||||
|
|
|
|||
|
|
@ -1,19 +1,23 @@
|
|||
{ stdenv, fetchurl, qt, cmake }:
|
||||
{ stdenv, fetchgit, cmake, qtbase, qttools }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "speedcrunch-${version}";
|
||||
version = "0.11";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://bitbucket.org/heldercorreia/speedcrunch/get/${version}.tar.gz";
|
||||
sha256 = "0phba14z9jmbmax99klbxnffwzv3awlzyhpcwr1c9lmyqnbcsnkd";
|
||||
src = fetchgit {
|
||||
# the tagging is not standard, so you probably need to check this when updating
|
||||
rev = "refs/tags/release-${version}";
|
||||
url = "https://bitbucket.org/heldercorreia/speedcrunch";
|
||||
sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
|
||||
};
|
||||
|
||||
buildInputs = [cmake qt];
|
||||
buildInputs = [ qtbase qttools ];
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeDir = "src";
|
||||
preConfigure = ''
|
||||
cd src
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://speedcrunch.org;
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ rec {
|
|||
inherit (darwin) Security;
|
||||
};
|
||||
|
||||
qgit = callPackage ./qgit { };
|
||||
qgit = qt5.callPackage ./qgit { };
|
||||
|
||||
stgit = callPackage ./stgit {
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,27 +1,22 @@
|
|||
{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11 }:
|
||||
{ stdenv, fetchurl, cmake, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qgit-2.5";
|
||||
name = "qgit-2.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz";
|
||||
sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499";
|
||||
url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz";
|
||||
sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
buildInputs = [ qt4 libXext libX11 ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
|
||||
installPhase = ''
|
||||
install -s -D -m 755 bin/qgit "$out/bin/qgit"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit";
|
||||
meta = with stdenv.lib; {
|
||||
license = licenses.gpl2;
|
||||
homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit;
|
||||
description = "Graphical front-end to Git";
|
||||
inherit (qt4.meta) platforms;
|
||||
maintainer = with maintainers; [ peterhoeg ];
|
||||
inherit (qtbase.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, fetchurl, makeWrapper
|
||||
, pkgconfig, cmake, gnumake, yasm, python2
|
||||
, boost, avahi, libdvdcss, lame, autoreconfHook
|
||||
, boost, avahi, libdvdcss, libdvdnav, libdvdread, lame, autoreconfHook
|
||||
, gettext, pcre-cpp, yajl, fribidi, which
|
||||
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre
|
||||
, libX11, xproto, inputproto, libxml2
|
||||
|
|
@ -38,18 +38,18 @@ assert pulseSupport -> libpulseaudio != null;
|
|||
assert rtmpSupport -> rtmpdump != null;
|
||||
|
||||
let
|
||||
rel = "Jarvis";
|
||||
ffmpeg_2_8_6 = fetchurl {
|
||||
url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.1.tar.gz";
|
||||
sha256 = "1qp8b97298l2pnhhcp7xczdfwr7q7ibxlk4vp8pfmxli2h272wan";
|
||||
rel = "Krypton";
|
||||
ffmpeg_3_1_6 = fetchurl {
|
||||
url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz";
|
||||
sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "kodi-" + version;
|
||||
version = "16.1";
|
||||
version = "17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
|
||||
sha256 = "047xpmz78k3d6nhk1x9s8z0bw1b1w9kca46zxkg86p3iyapwi0kx";
|
||||
sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -90,7 +90,10 @@ in stdenv.mkDerivation rec {
|
|||
--replace 'usr/share/zoneinfo' 'etc/zoneinfo'
|
||||
substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
|
||||
--replace "/bin/bash" "${bash}/bin/bash -ex"
|
||||
cp ${ffmpeg_2_8_6} tools/depends/target/ffmpeg/ffmpeg-2.8.6-${rel}-16.0.tar.gz
|
||||
cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz
|
||||
ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
|
||||
ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
|
||||
ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml, unzip }:
|
||||
{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib
|
||||
, unzip, cmake, kodi, steam, libcec_platform, tinyxml }:
|
||||
|
||||
let
|
||||
|
||||
|
|
@ -6,22 +7,22 @@ let
|
|||
|
||||
kodi-platform = stdenv.mkDerivation rec {
|
||||
project = "kodi-platform";
|
||||
version = "15.2";
|
||||
version = "17.1";
|
||||
name = "${project}-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xbmc";
|
||||
repo = project;
|
||||
rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1";
|
||||
sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi";
|
||||
rev = "c8188d82678fec6b784597db69a68e74ff4986b5";
|
||||
sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake kodi libcec_platform tinyxml ];
|
||||
};
|
||||
|
||||
mkKodiPlugin = { plugin, namespace, version, src, meta, ... }:
|
||||
mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }:
|
||||
stdenv.lib.makeOverridable stdenv.mkDerivation rec {
|
||||
inherit src meta;
|
||||
inherit src meta sourceDir;
|
||||
name = "kodi-plugin-${plugin}-${version}";
|
||||
passthru = {
|
||||
kodiPlugin = pluginDir;
|
||||
|
|
@ -29,6 +30,7 @@ let
|
|||
};
|
||||
dontStrip = true;
|
||||
installPhase = ''
|
||||
${if isNull sourceDir then "" else "cd $src/$sourceDir"}
|
||||
d=$out${pluginDir}/${namespace}
|
||||
mkdir -p $d
|
||||
sauce="."
|
||||
|
|
@ -70,34 +72,69 @@ in
|
|||
|
||||
};
|
||||
|
||||
genesis = (mkKodiPlugin rec {
|
||||
controllers = let
|
||||
pname = "game-controller";
|
||||
version = "1.0.3";
|
||||
|
||||
plugin = "genesis";
|
||||
namespace = "plugin.video.genesis";
|
||||
version = "5.1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://offshoregit.com/lambda81/lambda-repo/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "0b0pdzgg42mgxgkb6sb83rldh4k19c3l9z7g2wnvxm3s2p6rjy3v";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-game";
|
||||
repo = "kodi-game-controllers";
|
||||
rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18";
|
||||
sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-kodi-addons";
|
||||
description = "The origins of streaming";
|
||||
description = "Add support for different gaming controllers.";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
|
||||
mkController = controller: {
|
||||
"${controller}" = mkKodiPlugin rec {
|
||||
plugin = pname + "-" + controller;
|
||||
namespace = "game.controller." + controller;
|
||||
sourceDir = "addons/" + namespace;
|
||||
inherit version src meta;
|
||||
};
|
||||
};
|
||||
in (mkController "default")
|
||||
// (mkController "dreamcast")
|
||||
// (mkController "gba")
|
||||
// (mkController "genesis")
|
||||
// (mkController "mouse")
|
||||
// (mkController "n64")
|
||||
// (mkController "nes")
|
||||
// (mkController "ps")
|
||||
// (mkController "snes");
|
||||
|
||||
exodus = (mkKodiPlugin rec {
|
||||
|
||||
plugin = "exodus";
|
||||
namespace = "plugin.video.exodus";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip";
|
||||
sha256 = "02cdyvyxay6jiw9xj8hqnkp5w6drqj67pkh243znrsc06f26qkql";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A streaming plugin for Kodi";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
|
||||
}).override { buildInputs = [ unzip ]; };
|
||||
|
||||
hyper-launcher = let
|
||||
pname = "hyper-launcher";
|
||||
version = "1.2.0";
|
||||
version = "1.5.2";
|
||||
src = fetchFromGitHub rec {
|
||||
name = pname + "-" + version + ".tar.gz";
|
||||
owner = "teeedubb";
|
||||
repo = owner + "-xbmc-repo";
|
||||
rev = "9bd170407436e736d2d709f8af9968238594669c";
|
||||
sha256 = "019nqf7kixicnrzkg671x4yq723igjkhfl8hz5bifi9gx2qcy8hy";
|
||||
rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6";
|
||||
sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5";
|
||||
};
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://forum.kodi.tv/showthread.php?tid=258159;
|
||||
|
|
@ -107,8 +144,9 @@ in
|
|||
in {
|
||||
service = mkKodiPlugin {
|
||||
plugin = pname + "-service";
|
||||
version = "1.2.1";
|
||||
namespace = "service.hyper.launcher";
|
||||
inherit version src meta;
|
||||
inherit src meta;
|
||||
};
|
||||
plugin = mkKodiPlugin {
|
||||
plugin = pname;
|
||||
|
|
@ -117,39 +155,18 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
salts = mkKodiPlugin rec {
|
||||
|
||||
plugin = "salts";
|
||||
namespace = "plugin.video.salts";
|
||||
version = "2.0.19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = plugin + "-" + version + ".tar.gz";
|
||||
owner = "tknorris";
|
||||
repo = plugin;
|
||||
rev = "9c1882bad35cab9e62687847e097c37a576b900d";
|
||||
sha256 = "0saq578xsxvyg1v8jg2m3131hfrr95gv74b2npxr7g715yyx5bjq";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/tknorris/salts";
|
||||
description = "Stream All The Sources";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
};
|
||||
|
||||
svtplay = mkKodiPlugin rec {
|
||||
|
||||
plugin = "svtplay";
|
||||
namespace = "plugin.video.svtplay";
|
||||
version = "4.0.24";
|
||||
version = "4.0.42";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = plugin + "-" + version + ".tar.gz";
|
||||
owner = "nilzen";
|
||||
repo = "xbmc-" + plugin;
|
||||
rev = "e66e2af6529e3ffd030ad486c849894a9ffdeb45";
|
||||
sha256 = "01nq6gac83q6ayhqcj1whvk58pzrm1haw801s321f4vc8gswag56";
|
||||
rev = "83cb52b949930a1b6d2e51a7a0faf9bd69c7fb7d";
|
||||
sha256 = "0ync2ya4lwmfn6ngg8v0z6bng45whwg280irsn4bam5ca88383iy";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -219,13 +236,13 @@ in
|
|||
pvr-hts = (mkKodiPlugin rec {
|
||||
plugin = "pvr-hts";
|
||||
namespace = "pvr.hts";
|
||||
version = "2.2.13";
|
||||
version = "3.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kodi-pvr";
|
||||
repo = "pvr.hts";
|
||||
rev = "3274354511e970e2101c2aa437001b2f245f80da";
|
||||
sha256 = "0i7cb61pjv6vbj3x96cm1n4w91mvc8z6lxa8ykjasrrbi95ph7ld";
|
||||
rev = "343ca980982d87c778696e42e52eff763cadee4a";
|
||||
sha256 = "03jk45nk1c5j7zwj6l8s8jyf6ijhisp1r16xg6n5561bm3cfk0b9";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -248,48 +265,4 @@ in
|
|||
ln -s $out/lib/addons/pvr.hts/pvr.hts.so* $out/share/kodi/addons/pvr.hts
|
||||
'';
|
||||
};
|
||||
|
||||
t0mm0-common = mkKodiPlugin rec {
|
||||
|
||||
plugin = "t0mm0-common";
|
||||
namespace = "script.module.t0mm0.common";
|
||||
version = "0.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = plugin + "-" + version + ".tar.gz";
|
||||
owner = "t0mm0";
|
||||
repo = "xbmc-urlresolver";
|
||||
rev = "ab16933a996a9e77b572953c45e70900c723d6e1";
|
||||
sha256 = "1yd00md8iirizzaiqy6fv1n2snydcpqvp2f9irzfzxxi3i9asb93";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/t0mm0/xbmc-urlresolver/";
|
||||
description = "t0mm0's common stuff";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
};
|
||||
|
||||
urlresolver = (mkKodiPlugin rec {
|
||||
|
||||
plugin = "urlresolver";
|
||||
namespace = "script.module.urlresolver";
|
||||
version = "2.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = plugin + "-" + version + ".tar.gz";
|
||||
owner = "Eldorados";
|
||||
repo = namespace;
|
||||
rev = "72b9d978d90d54bb7a0224a1fd2407143e592984";
|
||||
sha256 = "0r5glfvgy9ri3ar9zdkvix8lalr1kfp22fap2pqp739b6k2iqir6";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/Eldorados/urlresolver";
|
||||
description = "Resolve common video host URL's to be playable in XBMC/Kodi";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
};
|
||||
}).override {
|
||||
postPatch = "sed -i -e 's,settings_file = os.path.join(addon_path,settings_file = os.path.join(profile_path,g' lib/urlresolver/common.py";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ qmakeHook, makeQtWrapper }:
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "shotcut-${version}";
|
||||
version = "17.01";
|
||||
version = "17.02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz";
|
||||
sha256 = "1f3276q58rvw1brxfnm9z3v99fx63wml6j02sgmpzazw3172lnpg";
|
||||
sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr";
|
||||
};
|
||||
|
||||
buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit
|
||||
|
|
|
|||
48
pkgs/applications/video/vokoscreen/default.nix
Normal file
48
pkgs/applications/video/vokoscreen/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ stdenv, fetchgit
|
||||
, pkgconfig, qt5, alsaLib, libv4l, xorg
|
||||
, ffmpeg
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "vokoscreen-2.5.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/vkohaupt/vokoscreen.git";
|
||||
rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f";
|
||||
sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
alsaLib.dev
|
||||
libv4l.dev
|
||||
pkgconfig
|
||||
qt5.full
|
||||
qt5.qmakeHook
|
||||
qt5.qtx11extras
|
||||
xorg.libXrandr.dev
|
||||
];
|
||||
|
||||
patches = [
|
||||
./ffmpeg-out-of-box.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's/lrelease-qt5/lrelease/g' vokoscreen.pro
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Simple GUI screencast recorder, using ffmpeg";
|
||||
homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html";
|
||||
longDescription = ''
|
||||
vokoscreen is an easy to use screencast creator to record
|
||||
educational videos, live recordings of browser, installation,
|
||||
videoconferences, etc.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [maintainers.league];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
31
pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
Normal file
31
pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp
|
||||
index bbf2abf..187efad 100644
|
||||
--- a/settings/QvkSettings.cpp
|
||||
+++ b/settings/QvkSettings.cpp
|
||||
@@ -56,17 +56,8 @@ void QvkSettings::readAll()
|
||||
GIFPlayer = settings.value( "GIFplayer" ).toString();
|
||||
Minimized = settings.value( "Minimized", 0 ).toUInt();
|
||||
Countdown = settings.value( "Countdown", 0 ).toUInt();
|
||||
- QFile file;
|
||||
- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true )
|
||||
- {
|
||||
- vokoscreenWithLibs = true;
|
||||
- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" );
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- vokoscreenWithLibs = false;
|
||||
- Recorder = settings.value( "Recorder", "ffmpeg" ).toString();
|
||||
- }
|
||||
+ vokoscreenWithLibs = true;
|
||||
+ Recorder = settings.value( "Recorder", "@ffmpeg@/bin/ffmpeg" ).toString();
|
||||
settings.endGroup();
|
||||
|
||||
settings.beginGroup( "Videooptions" );
|
||||
@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime()
|
||||
int QvkSettings::getShowKeyOnOff()
|
||||
{
|
||||
return showKeyOnOff;
|
||||
-}
|
||||
\ No newline at end of file
|
||||
+}
|
||||
|
|
@ -18,10 +18,10 @@ let
|
|||
python = python2;
|
||||
buildType = "release";
|
||||
|
||||
extpack = "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5";
|
||||
extpackRev = 112026;
|
||||
main = "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40";
|
||||
version = "5.1.10";
|
||||
extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85";
|
||||
extpackRev = 112924;
|
||||
main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a";
|
||||
version = "5.1.14";
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/672 for details
|
||||
extensionPack = requireFile rec {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
|||
|
||||
src = fetchurl {
|
||||
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
|
||||
sha256 = "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41";
|
||||
sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a";
|
||||
};
|
||||
|
||||
KERN_DIR = "${kernel.dev}/lib/modules/*/build";
|
||||
|
|
|
|||
|
|
@ -12,6 +12,15 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
|
||||
|
||||
# Make sure that Python 2 is first in $PATH because gnome3.gnome_shell
|
||||
# propagates python3Packages.python. If we do not do this, autoconf will use
|
||||
# Python 3 instead which gnome-tweak-tool does not support at this time. See:
|
||||
# https://github.com/NixOS/nixpkgs/issues/21851
|
||||
# https://github.com/NixOS/nixpkgs/pull/22370
|
||||
preConfigure = ''
|
||||
PATH="${python}/bin:$PATH"
|
||||
'';
|
||||
|
||||
makeFlags = [ "DESTDIR=/" ];
|
||||
|
||||
buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ let
|
|||
khelpcenter = callPackage ./khelpcenter.nix {};
|
||||
kio-extras = callPackage ./kio-extras.nix {};
|
||||
kmime = callPackage ./kmime.nix {};
|
||||
kmix = callPackage ./kmix.nix {};
|
||||
kompare = callPackage ./kompare.nix {};
|
||||
konsole = callPackage ./konsole.nix {};
|
||||
kwalletmanager = callPackage ./kwalletmanager.nix {};
|
||||
|
|
|
|||
30
pkgs/desktops/kde-5/applications/kmix.nix
Normal file
30
pkgs/desktops/kde-5/applications/kmix.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{
|
||||
kdeApp, lib, kdeWrapper,
|
||||
ecm, kdoctools,
|
||||
kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
|
||||
plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
|
||||
}:
|
||||
|
||||
let
|
||||
unwrapped =
|
||||
kdeApp {
|
||||
name = "kmix";
|
||||
meta = {
|
||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||
maintainers = [ lib.maintainers.rongcuid ];
|
||||
};
|
||||
nativeBuildInputs = [ ecm kdoctools ];
|
||||
buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
|
||||
propagatedBuildInputs = [
|
||||
kglobalaccel kxmlgui kcoreaddons kdelibs4support
|
||||
plasma-framework
|
||||
];
|
||||
cmakeFlags = [
|
||||
"-DKMIX_KF5_BUILD=1"
|
||||
];
|
||||
};
|
||||
in
|
||||
kdeWrapper {
|
||||
inherit unwrapped;
|
||||
targets = [ "bin/kmix" ];
|
||||
}
|
||||
|
|
@ -9,11 +9,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sbcl-${version}";
|
||||
version = "1.3.13";
|
||||
version = "1.3.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
|
||||
sha256 = "1k3nij1pchkard02p51mbbsn4rrj116v1apjjpd3f9h2m7j3asac";
|
||||
sha256 = "1jnwsv8bdkrrg1w0gkjx9nb8sw3if38sna40davrx0rxadc3v5mz";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -162,6 +162,7 @@ self: super: {
|
|||
shakespeare-js = dontHaddock super.shakespeare-js;
|
||||
shakespeare-text = dontHaddock super.shakespeare-text;
|
||||
swagger = dontHaddock super.swagger; # http://hydra.cryp.to/build/2035868/nixlog/1/raw
|
||||
swagger2 = dontHaddock super.swagger2;
|
||||
wai-test = dontHaddock super.wai-test;
|
||||
zlib-conduit = dontHaddock super.zlib-conduit;
|
||||
|
||||
|
|
@ -621,6 +622,14 @@ self: super: {
|
|||
# https://github.com/haskell/haddock/issues/378
|
||||
haddock-library = dontCheck super.haddock-library;
|
||||
|
||||
# https://github.com/haskell/haddock/issues/571
|
||||
haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch {
|
||||
url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch";
|
||||
sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m";
|
||||
stripLen = 2;
|
||||
addPrefixes = true;
|
||||
});
|
||||
|
||||
# https://github.com/anton-k/csound-expression-dynamic/issues/1
|
||||
csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
|
||||
|
||||
|
|
@ -865,7 +874,17 @@ self: super: {
|
|||
|
||||
# https://github.com/yesodweb/Shelly.hs/issues/106
|
||||
# https://github.com/yesodweb/Shelly.hs/issues/108
|
||||
shelly = dontCheck super.shelly;
|
||||
# https://github.com/yesodweb/Shelly.hs/issues/130
|
||||
shelly =
|
||||
let drv = appendPatch (dontCheck (doJailbreak super.shelly)) (pkgs.fetchpatch {
|
||||
url = "https://github.com/k0001/Shelly.hs/commit/32a1e290961755e7b2379f59faa49b13d03dfef6.patch";
|
||||
sha256 = "0ccq0qly8bxxv64dk97a44ng6hb01j6ajs0sp3f2nn0hf5j3xv69";
|
||||
});
|
||||
in overrideCabal drv (drv : {
|
||||
# doJailbreak doesn't seem to work for build-depends inside an
|
||||
# if-then-else block so we have to do it manually.
|
||||
postPatch = "sed -i 's/base >=4\.6 \&\& <4\.9\.1/base -any/' shelly.cabal";
|
||||
});
|
||||
|
||||
# https://github.com/bos/configurator/issues/22
|
||||
configurator = dontCheck super.configurator;
|
||||
|
|
@ -1097,13 +1116,13 @@ self: super: {
|
|||
http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5;
|
||||
|
||||
# Fix build for latest versions of servant and servant-client.
|
||||
servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: {
|
||||
servant_0_10 = super.servant_0_10.overrideScope (self: super: {
|
||||
http-api-data = self.http-api-data_0_3_5;
|
||||
});
|
||||
servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: {
|
||||
servant-client_0_10 = super.servant-client_0_10.overrideScope (self: super: {
|
||||
http-api-data = self.http-api-data_0_3_5;
|
||||
servant-server = self.servant-server_0_9_1_1;
|
||||
servant = self.servant_0_9_1_1;
|
||||
servant-server = self.servant-server_0_10;
|
||||
servant = self.servant_0_10;
|
||||
});
|
||||
|
||||
# build servant docs from the repository
|
||||
|
|
|
|||
|
|
@ -2042,8 +2042,8 @@ extra-packages:
|
|||
|
||||
package-maintainers:
|
||||
peti:
|
||||
- cabal2nix
|
||||
- cabal-install
|
||||
- cabal2nix
|
||||
- funcmp
|
||||
- git-annex
|
||||
- hackage-db
|
||||
|
|
@ -2062,6 +2062,8 @@ package-maintainers:
|
|||
- pandoc
|
||||
- stack
|
||||
- streamproc
|
||||
- structured-haskell-mode
|
||||
- titlecase
|
||||
gebner:
|
||||
- hledger-diff
|
||||
gridaphobe:
|
||||
|
|
@ -7111,7 +7113,6 @@ dont-distribute-packages:
|
|||
stripe: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
structs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
structured-haskell-mode: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
structures: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
stunts: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -7139,7 +7140,6 @@ dont-distribute-packages:
|
|||
svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
svndump: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
swagger2: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
swagger: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
swapper: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
@ -7358,7 +7358,6 @@ dont-distribute-packages:
|
|||
tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
Titim: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
titlecase: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
tld: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, ghc, pkgconfig, glibcLocales }:
|
||||
{ stdenv, ghc, pkgconfig, glibcLocales, cacert }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,7 @@
|
|||
# This function provides specific bits for building a flit-based Python package.
|
||||
|
||||
{ flit
|
||||
{ python
|
||||
, flit
|
||||
}:
|
||||
|
||||
{ ... } @ attrs:
|
||||
|
|
@ -13,7 +14,9 @@ attrs // {
|
|||
runHook postBuild
|
||||
'';
|
||||
|
||||
# Flit packages do not come with tests.
|
||||
installCheckPhase = attrs.checkPhase or ":";
|
||||
doCheck = attrs.doCheck or false;
|
||||
# Flit packages, like setuptools packages, might have tests.
|
||||
installCheckPhase = attrs.checkPhase or ''
|
||||
${python.interpreter} -m unittest discover
|
||||
'';
|
||||
doCheck = attrs.doCheck or true;
|
||||
}
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
let
|
||||
setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; };
|
||||
flit-specific = import ./build-python-package-flit.nix { inherit flit; };
|
||||
flit-specific = import ./build-python-package-flit.nix { inherit python flit; };
|
||||
wheel-specific = import ./build-python-package-wheel.nix { };
|
||||
common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
|
||||
in
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "SDL2-${version}";
|
||||
version = "2.0.4";
|
||||
version = "2.0.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.libsdl.org/release/${name}.tar.gz";
|
||||
sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs";
|
||||
sha256 = "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
|
|
|||
|
|
@ -5,15 +5,22 @@
|
|||
customMemoryManagement ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
loaderVar =
|
||||
if stdenv.isLinux
|
||||
then "LD_LIBRARY_PATH"
|
||||
else if stdenv.isDarwin
|
||||
then "DYLD_LIBRARY_PATH"
|
||||
else throw "Unsupported system!";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "aws-sdk-cpp-${version}";
|
||||
version = "1.0.48";
|
||||
version = "1.0.60";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "awslabs";
|
||||
repo = "aws-sdk-cpp";
|
||||
rev = version;
|
||||
sha256 = "1k73ir1w6457y9mdv2xnk8cr1y1xxhzzd4095rzvn2y7fr3zgz01";
|
||||
sha256 = "0k6jv70l4xhkf2rna6zaxkxgd7xh7cc1ghzska637h5d2v6h8nzk";
|
||||
};
|
||||
|
||||
# FIXME: might be nice to put different APIs in different outputs
|
||||
|
|
@ -29,11 +36,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Behold the escaping nightmare below on loaderVar o.O
|
||||
preBuild =
|
||||
''
|
||||
# Ensure that the unit tests can find the *.so files.
|
||||
for i in testing-resources aws-cpp-sdk-*; do
|
||||
export LD_LIBRARY_PATH=$(pwd)/$i:$LD_LIBRARY_PATH
|
||||
export ${loaderVar}=$(pwd)/$i:''${${loaderVar}}
|
||||
done
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
callPackage ./generic.nix (args // {
|
||||
baseVersion = "1.10";
|
||||
revision = "14";
|
||||
sha256 = "072czy26vfjcqjww4qccsd29fzkb6mb8czamr4x76rdi9lwhpv8h";
|
||||
revision = "15";
|
||||
sha256 = "1zkhmggzxjla2iwaiyrx5161yxckrzszmy9yghjlpnhg8zyqzk60";
|
||||
extraConfigureFlags = "--with-gnump";
|
||||
postPatch = ''
|
||||
sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
|
||||
|
|
|
|||
|
|
@ -3,20 +3,20 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "catch-${version}";
|
||||
version = "1.5.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "philsquared";
|
||||
repo = "Catch";
|
||||
rev = "v" + version;
|
||||
sha256 = "1ag8siafg7fmb50qdqznryrg3lvv56f09nvqwqqn2rlk83zjnaw0";
|
||||
rev = "v." + version;
|
||||
sha256 = "0harki6irc4mqipjc24zyy0jimidr5ng3ss29bnpzbbwhrnkyrgm";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
buildPhase = ''
|
||||
cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON
|
||||
cmake . -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON
|
||||
cd Build
|
||||
make
|
||||
cd ..
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
}@args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}.4";
|
||||
version = "${branch}.6";
|
||||
branch = "3.1";
|
||||
sha256 = "1ynb1f0py5jb6hs78ypynpwc3jlqrw51vl8y1wnd44nwlisxz6bw";
|
||||
sha256 = "0c9g9zhrnvbfwwcca35jis7f7njskhzrwa7n7wpd1618cms2kjvx";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ fetchurl, stdenv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "glpk-4.56";
|
||||
name = "glpk-4.61";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/glpk/${name}.tar.gz";
|
||||
sha256 = "0syzix6qvpn0fzp08c84c8snansf1cam5vd0dk2w91mz2c85d18h";
|
||||
sha256 = "1adbvwiaqrv9pql9ry3lhn2vfsxnff2vh4fs477d90kpfx0xwrlq";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
|
||||
|
||||
let version = "3.0.1"; in
|
||||
let version = "3.1.0"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libcec-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
|
||||
sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky";
|
||||
sha256 = "08gr4rhx7qh8ajkry9j0sqw11i74y802dla1wg4l4gxhl4hrs409";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake pkgconfig udev libcec_platform ];
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ stdenv, fetchurl, cmake }:
|
||||
|
||||
let version = "1.0.10"; in
|
||||
let version = "2.0.1"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "libcec-${version}";
|
||||
name = "p8-platform-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz";
|
||||
sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb";
|
||||
url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz";
|
||||
sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
|||
meta = with stdenv.lib; {
|
||||
description = "Platform library for libcec and Kodi addons";
|
||||
homepage = "https://github.com/Pulse-Eight/platform";
|
||||
repositories.git = "https://github.com/Pulse-Eight/libcec.git";
|
||||
repositories.git = "https://github.com/Pulse-Eight/platform.git";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.titanous ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "gphoto";
|
||||
repo = "libgphoto2";
|
||||
rev = "${meta.tag}";
|
||||
sha256 = "01nirw0xb8fjjv0jz88bmddv26bgg82w1wg65q51iblmy9z8azfh";
|
||||
sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am";
|
||||
};
|
||||
|
||||
patches = [];
|
||||
|
|
@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
|
|||
MTP, and other vendor specific protocols for controlling and transferring data
|
||||
from digital cameras.
|
||||
'';
|
||||
version = "2.5.11";
|
||||
tag = "libgphoto2-2_5_11-release";
|
||||
version = "2.5.12";
|
||||
tag = "libgphoto2-2_5_12-release";
|
||||
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
|
||||
license = stdenv.lib.licenses.lgpl21Plus;
|
||||
platforms = with stdenv.lib.platforms; unix;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libressl-${version}";
|
||||
version = "2.4.4";
|
||||
version = "2.4.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
|
||||
sha256 = "1ldzxqc0bds9mwnirrckhx42y3k0v5cx997nnbfa2gkk6ilszkvg";
|
||||
sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libressl-${version}";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
|
||||
sha256 = "1bkfvapi4z826slycmicvs7hwgk4l82gd8w6nqvznldbammvyll6";
|
||||
sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, perl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mbedtls-1.3.17";
|
||||
name = "mbedtls-1.3.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://tls.mbed.org/download/${name}-gpl.tgz";
|
||||
sha256 = "10nviv3d8w6sp3kn3yzdpssvzqxdbr4kg38g7rg930q2hlzb9gpm";
|
||||
sha256 = "188fjm0zzggxrjxnqc7zv7zz8pvys6yp1jx3xdyq8970h9qj2ad2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nlohmann_json-${version}";
|
||||
version = "2.0.7";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlohmann";
|
||||
repo = "json";
|
||||
rev = "v${version}";
|
||||
sha256 = "03jklvlcsms09p79qz9piqrdy2vhn4rkwidwfgq6cpxm6anqyqjh";
|
||||
sha256 = "116309lx77m31x4krln0g7mra900g0knk9lbkxbpxnmamkagjyl9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
|
|||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
crossAttrs = {
|
||||
cmakeFlags = "-DBuildTests=OFF";
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ let
|
|||
s = # Generated upstream information
|
||||
rec {
|
||||
baseName="asdf";
|
||||
version="3.1.7";
|
||||
version="3.2.0";
|
||||
name="${baseName}-${version}";
|
||||
hash="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-3.1.7.tar.gz";
|
||||
sha256="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn";
|
||||
hash="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a";
|
||||
url="http://common-lisp.net/project/asdf/archives/asdf-3.2.0.tar.gz";
|
||||
sha256="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a";
|
||||
};
|
||||
buildInputs = [
|
||||
texinfo texLive perl
|
||||
|
|
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
|||
src = fetchurl {
|
||||
inherit (s) url sha256;
|
||||
};
|
||||
sourceRoot = ".";
|
||||
|
||||
buildPhase = ''
|
||||
make build/asdf.lisp
|
||||
make -C doc asdf.info asdf.html
|
||||
|
|
|
|||
|
|
@ -7,6 +7,10 @@ let param = {
|
|||
"4.03.0" = {
|
||||
version = "5.0+4.03.0";
|
||||
sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; };
|
||||
"4.04.0" = {
|
||||
version = "unstable-20161114";
|
||||
rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac";
|
||||
sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; };
|
||||
}."${ocaml.version}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
@ -14,7 +18,7 @@ in
|
|||
src = fetchFromGitHub {
|
||||
owner = "alainfrisch";
|
||||
repo = "ppx_tools";
|
||||
rev = param.version;
|
||||
rev = if param ? rev then param.rev else param.version;
|
||||
inherit (param) sha256;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, ocaml, findlib, opam, topkg
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
|
||||
, uchar, result, gg, uutf, otfm, js_of_ocaml,
|
||||
pdfBackend ? true, # depends on uutf and otfm
|
||||
htmlcBackend ? true # depends on js_of_ocaml
|
||||
|
|
@ -17,14 +17,14 @@ assert versionAtLeast ocaml.version "4.02.0";
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "ocaml-${pname}-${version}";
|
||||
name = "ocaml${ocaml.version}-${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${webpage}/releases/${pname}-${version}.tbz";
|
||||
sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml findlib opam topkg ];
|
||||
buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
|
||||
|
||||
propagatedBuildInputs = [ uchar result gg ]
|
||||
++ optionals pdfBackend [ uutf otfm ]
|
||||
|
|
|
|||
|
|
@ -13,7 +13,18 @@
|
|||
, pywinrm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
jinja = jinja2.override rec {
|
||||
pname = "Jinja2";
|
||||
version = "2.8.1";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
|
||||
sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891";
|
||||
};
|
||||
};
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "ansible";
|
||||
version = "2.1.4.0";
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -34,7 +45,7 @@ buildPythonPackage rec {
|
|||
dontPatchShebangs = false;
|
||||
windowsSupport = true;
|
||||
|
||||
propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
|
||||
propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
|
||||
boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,19 @@
|
|||
, pywinrm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
let
|
||||
# Shouldn't be needed anymore in next version
|
||||
# https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521
|
||||
jinja = (jinja2.override rec {
|
||||
pname = "Jinja2";
|
||||
version = "2.8.1";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
|
||||
sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891";
|
||||
};
|
||||
});
|
||||
in buildPythonPackage rec {
|
||||
pname = "ansible";
|
||||
version = "2.2.1.0";
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -34,7 +46,7 @@ buildPythonPackage rec {
|
|||
dontPatchShebangs = false;
|
||||
windowsSupport = true;
|
||||
|
||||
propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
|
||||
propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
|
||||
boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
34
pkgs/development/python-modules/docker.nix
Normal file
34
pkgs/development/python-modules/docker.nix
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
{ stdenv, buildPythonPackage, fetchurl
|
||||
, six, requests2, websocket_client
|
||||
, ipaddress, backports_ssl_match_hostname, docker_pycreds
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
name = "docker-${version}";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/d/docker/${name}.tar.gz";
|
||||
sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
requests2
|
||||
websocket_client
|
||||
ipaddress
|
||||
backports_ssl_match_hostname
|
||||
docker_pycreds
|
||||
];
|
||||
|
||||
# Flake8 version conflict
|
||||
doCheck = false;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "An API client for docker written in Python";
|
||||
homepage = https://github.com/docker/docker-py;
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
jgeerds
|
||||
];
|
||||
};
|
||||
}
|
||||
46
pkgs/development/python-modules/docker_compose.nix
Normal file
46
pkgs/development/python-modules/docker_compose.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ stdenv, buildPythonApplication, fetchurl, pythonOlder
|
||||
, mock, pytest, nose
|
||||
, pyyaml, backports_ssl_match_hostname, colorama, docopt
|
||||
, dockerpty, docker, ipaddress, jsonschema, requests2
|
||||
, six, texttable, websocket_client, cached-property
|
||||
, enum34, functools32
|
||||
}:
|
||||
buildPythonApplication rec {
|
||||
version = "1.10.0";
|
||||
name = "docker-compose-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
|
||||
sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z";
|
||||
};
|
||||
|
||||
# lots of networking and other fails
|
||||
doCheck = false;
|
||||
buildInputs = [ mock pytest nose ];
|
||||
propagatedBuildInputs = [
|
||||
pyyaml backports_ssl_match_hostname colorama dockerpty docker
|
||||
ipaddress jsonschema requests2 six texttable websocket_client
|
||||
docopt cached-property
|
||||
] ++
|
||||
stdenv.lib.optional (pythonOlder "3.4") enum34 ++
|
||||
stdenv.lib.optional (pythonOlder "3.2") functools32;
|
||||
|
||||
patchPhase = ''
|
||||
sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/bash-completion/completions/
|
||||
cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://docs.docker.com/compose/";
|
||||
description = "Multi-container orchestration for Docker";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
jgeerds
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ R packages
|
|||
## Installation
|
||||
|
||||
Define an environment for R that contains all the libraries that you'd like to
|
||||
use by adding the following snippet to your $HOME/.nixpkgs/config.nix file:
|
||||
use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
|
||||
|
||||
```nix
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
|
||||
|
||||
let
|
||||
version = "1.10.0";
|
||||
version = "1.10.4";
|
||||
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
|
||||
docker_x86_64 = fetchurl {
|
||||
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
|
||||
sha256 = "1fv4sv92ng4gx53pbpagb6kv2hdab04lf2chsflf10xgzqw5l521";
|
||||
sha256 = "0csaacghcdnkrpxiwsg8166nmdpnddf77c619i558vj0wdglq45k";
|
||||
};
|
||||
|
||||
docker_arm = fetchurl {
|
||||
url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
|
||||
sha256 = "153dbgk6fvl73d5qhainqr9hzicsryc6ynlryi9si40ld82flrsr";
|
||||
sha256 = "1lsdp4v92v406qiwr435ym4f3zbc1vq6ipwrp7li640frhr2jqpk";
|
||||
};
|
||||
in
|
||||
buildGoPackage rec {
|
||||
|
|
@ -29,7 +29,7 @@ buildGoPackage rec {
|
|||
owner = "gitlab-org";
|
||||
repo = "gitlab-ci-multi-runner";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ma6b6624c8218cz4gg5pr077li7nbs0v3mpgr1hxq7v465spa7j";
|
||||
sha256 = "0r8f1m9f544ikcknvq1500kfjxbikgqlv7wdayfpazvj6s1zlswg";
|
||||
};
|
||||
|
||||
buildInputs = [ go-bindata ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jenkins-${version}";
|
||||
version = "2.33";
|
||||
version = "2.44";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
|
||||
sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy";
|
||||
sha256 = "01v9p0p27czwsk7ljv1879b5qcrhgy7zan6dj8klr9rci1id8x0d";
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
|
|
|
|||
|
|
@ -1,74 +1,56 @@
|
|||
{ stdenv, fetchurl, bash, buildFHSUserEnv, makeWrapper, writeTextFile
|
||||
{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub
|
||||
, nodejs-6_x, postgresql, ruby }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
version = "3.43.12";
|
||||
bin_ver = "5.4.7-8dc2c80";
|
||||
cli = buildGoPackage rec {
|
||||
name = "cli-${version}";
|
||||
version = "5.6.14";
|
||||
|
||||
arch = {
|
||||
"x86_64-linux" = "linux-amd64";
|
||||
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
|
||||
goPackagePath = "github.com/heroku/cli";
|
||||
|
||||
sha256 = {
|
||||
"x86_64-linux" = "0iqjxkdw53dvy54ahmr9yijlxrp5nbikh9z7iss93z753cgxdl06";
|
||||
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
|
||||
|
||||
fhsEnv = buildFHSUserEnv {
|
||||
name = "heroku-fhs-env";
|
||||
src = fetchFromGitHub {
|
||||
owner = "heroku";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "11jccham1vkmh5284l6i30na4a4y7b1jhi2ci2z2wwx8m3gkypq9";
|
||||
};
|
||||
};
|
||||
|
||||
heroku = stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "heroku";
|
||||
|
||||
meta = {
|
||||
homepage = "https://toolbelt.heroku.com";
|
||||
description = "Everything you need to get started using Heroku";
|
||||
maintainers = with maintainers; [ aflatter mirdhyn ];
|
||||
license = licenses.mit;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
|
||||
sha256 = "1z7z8sl2hkrc8rdvx3h00fbcrxs827xlfp6fji0ap97a6jc0v9x4";
|
||||
};
|
||||
|
||||
bin = fetchurl {
|
||||
url = "https://cli-assets.heroku.com/branches/stable/${bin_ver}/heroku-v${bin_ver}-${arch}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
cli=$out/share/heroku/cli
|
||||
mkdir -p $cli
|
||||
|
||||
tar xzf $src -C $out --strip-components=1
|
||||
tar xzf $bin -C $cli --strip-components=1
|
||||
|
||||
wrapProgram $out/bin/heroku \
|
||||
--set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
|
||||
--set XDG_DATA_HOME $out/share \
|
||||
--set XDG_DATA_DIRS $out/share
|
||||
|
||||
# When https://github.com/NixOS/patchelf/issues/66 is fixed, reinstate this and dump the fhsuserenv
|
||||
#patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
|
||||
# $cli/bin/heroku
|
||||
'';
|
||||
|
||||
buildInputs = [ fhsEnv ruby postgresql makeWrapper ];
|
||||
|
||||
doUnpack = false;
|
||||
};
|
||||
|
||||
in writeTextFile {
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "heroku-${version}";
|
||||
destination = "/bin/heroku";
|
||||
executable = true;
|
||||
text = ''
|
||||
#!${bash}/bin/bash -e
|
||||
${fhsEnv}/bin/heroku-fhs-env ${heroku}/bin/heroku
|
||||
version = "3.43.16";
|
||||
|
||||
meta = {
|
||||
homepage = "https://toolbelt.heroku.com";
|
||||
description = "Everything you need to get started using Heroku";
|
||||
maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ];
|
||||
license = licenses.mit;
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
|
||||
binPath = lib.makeBinPath [ postgresql ruby ];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
doUnpack = false;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz";
|
||||
sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
|
||||
tar xzf $src -C $out --strip-components=1
|
||||
install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku
|
||||
|
||||
wrapProgram $out/bin/heroku \
|
||||
--set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \
|
||||
--set XDG_DATA_HOME $out/share \
|
||||
--set XDG_DATA_DIRS $out/share \
|
||||
--prefix PATH : ${binPath}
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "strace-${version}";
|
||||
version = "4.14";
|
||||
version = "4.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/strace/${name}.tar.xz";
|
||||
sha256 = "0bvicjkqk3c09zyxgkakymiqr3618sa2dfpd9f3fdp23n8853vav";
|
||||
sha256 = "1a9wb2nzfqgwazd0yrlbk48awlfn898n1bdayvdxj7qlssac1kf0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "omake-${version}";
|
||||
version = "0.10.1";
|
||||
version = "0.10.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.camlcity.org/download/${name}.tar.gz";
|
||||
sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj";
|
||||
sha256 = "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml ncurses ];
|
||||
|
|
|
|||
|
|
@ -1,33 +1,38 @@
|
|||
{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis
|
||||
{ stdenv, fetchFromGitHub, cmake, SDL2, mesa, zlib, libjpeg, libogg, libvorbis
|
||||
, openal, curl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b";
|
||||
name = "dhewm3-20130113-${hash}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dhewm/dhewm3/zipball/${hash}";
|
||||
sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd";
|
||||
name = "dhewm3-${version}";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhewm";
|
||||
repo = "dhewm3";
|
||||
rev = version;
|
||||
sha256 = "1s64xr1ir4d2z01fhldy577b0x80nd1k6my7y1hxp57lggr8dy5y";
|
||||
};
|
||||
|
||||
# Add mesa linking
|
||||
patchPhase = ''
|
||||
sed -i 's/\<idlib\()\?\)$/idlib GL\1/' CMakeLists.txt
|
||||
sed -i 's/\<idlib\()\?\)$/idlib GL\1/' neo/CMakeLists.txt
|
||||
'';
|
||||
|
||||
unpackPhase = ''
|
||||
unzip ${src}
|
||||
cd */neo
|
||||
preConfigure = ''
|
||||
cd "$(ls -d dhewm3-*.src)"/neo
|
||||
'';
|
||||
|
||||
buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openal
|
||||
curl ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ SDL2 mesa zlib libjpeg libogg libvorbis openal curl ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/dhewm/dhewm3;
|
||||
description = "Doom 3 port to SDL";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with maintainers; [ MP2E ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, zdoom
|
||||
{ stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper
|
||||
, openal, fluidsynth, soundfont-fluid, mesa_noglu, SDL2
|
||||
, bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gzdoom-${version}";
|
||||
version = "2.2.0";
|
||||
version = "2.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coelckers";
|
||||
repo = "gzdoom";
|
||||
rev = "g${version}";
|
||||
sha256 = "0xxgd8fa29pcdir1xah5cvx41bfy76p4dydpp13mf44p9pr29hrb";
|
||||
sha256 = "1ys7wl4ygvm2lm49qjpql6c5i8gydmbg4f436bcpkywf5srr6xrd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake makeWrapper ];
|
||||
buildInputs = [
|
||||
SDL2 mesa_noglu openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123
|
||||
game-music-emu
|
||||
|
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
|||
install -Dm644 "$i" "$out/lib/gzdoom/$i"
|
||||
done
|
||||
mkdir $out/bin
|
||||
ln -s $out/lib/gzdoom/gzdoom $out/bin/gzdoom
|
||||
makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ assert ((config.planetary_annihilation or null).url or null) != null;
|
|||
assert ((config.planetary_annihilation or null).sha256 or null) != null;
|
||||
|
||||
/* to setup:
|
||||
$ cat ~/.nixpkgs/config.nix
|
||||
$ cat ~/.config/nixpkgs/config.nix
|
||||
{
|
||||
planetary_annihilation = {
|
||||
url = "file:///home/user/PA_Linux_62857.tar.bz2";
|
||||
|
|
|
|||
|
|
@ -1,25 +1,30 @@
|
|||
{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "urbanterror-${version}";
|
||||
version = "4.2.023";
|
||||
version = "4.3.1";
|
||||
|
||||
srcs =
|
||||
[ (fetchurl {
|
||||
url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full023.zip";
|
||||
sha256 = "e287e2a17432b81551f5c16e431d752484ce9be10508e756542f653757a29090";
|
||||
url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror431_full.zip";
|
||||
sha256 = "1dfnyb2grf2fxxphwj7p2ff721j2l0gwrj76jzympr32sim5a6cw";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.023.tar.gz";
|
||||
sha256 = "03zrrx5b96c1srf2p24ca7zygq84byvrmcgh42d8bh5ds579ziqp";
|
||||
url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.3.1.zip";
|
||||
sha256 = "1rbiqa1ki73649np3af96cilavkgv66a0b6p0a5x26cxvpgg128k";
|
||||
})
|
||||
];
|
||||
buildInputs = [ unzip SDL mesa openal curl libXxf86vm];
|
||||
sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.023";
|
||||
|
||||
buildInputs = [ unzip SDL mesa openal curl libXxf86vm ];
|
||||
sourceRoot = "ioq3-for-UrbanTerror-4-release-4.3.1";
|
||||
|
||||
configurePhase = ''
|
||||
echo "USE_OPENAL = 1" > Makefile.local
|
||||
echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local
|
||||
echo "USE_CURL = 1" >> Makefile.local
|
||||
echo "USE_CURL_DLOPEN = 0" >> Makefile.local
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
destDir="$out/opt/urbanterror"
|
||||
mkdir -p "$destDir"
|
||||
|
|
@ -28,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
"$destDir/Quake3-UrT"
|
||||
cp -v build/release-linux-*/Quake3-UrT-Ded.* \
|
||||
"$destDir/Quake3-UrT-Ded"
|
||||
cp -rv ../UrbanTerror42/q3ut4 "$destDir"
|
||||
cp -rv ../UrbanTerror43/q3ut4 "$destDir"
|
||||
cat << EOF > "$out/bin/urbanterror"
|
||||
#! ${stdenv.shell}
|
||||
cd "$destDir"
|
||||
|
|
@ -42,11 +47,15 @@ stdenv.mkDerivation rec {
|
|||
EOF
|
||||
chmod +x "$out/bin/urbanterror-ded"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
p=$out/opt/urbanterror/Quake3-UrT
|
||||
cur_rpath=$(patchelf --print-rpath $p)
|
||||
patchelf --set-rpath $cur_rpath:${mesa}/lib $p
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A multiplayer tactical FPS on top of Quake 3 engine";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mgba-${version}";
|
||||
version = "0.5.1";
|
||||
version = "0.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mgba-emu";
|
||||
repo = "mgba";
|
||||
rev = version;
|
||||
sha256 = "1ysxyy888qdwjbgsh3xdzsx8f3a5yd1gqx54xvndpv9v3zqgr2jf";
|
||||
sha256 = "1cpxiwzbywnjs3lrqa3bc9bj68plypx0br3lssd6p68c4wh01fyp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig cmake ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue