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

Merge branch 'master' into oracle-jdk-remove-redundand-asserts

Browse Source
This commit is contained in:
volth 2017-12-13 07:02:42 +00:00 committed by GitHub
commit 45121d9dfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
593 changed files with 10715 additions and 7480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/CODEOWNERS vendored
View File

@ -84,3 +84,9 @@
# https://github.com/NixOS/nixpkgs/issues/31401 # https://github.com/NixOS/nixpkgs/issues/31401
/lib/maintainers.nix @ghost /lib/maintainers.nix @ghost
/lib/licenses.nix @ghost /lib/licenses.nix @ghost
# Qt / KDE
/pkgs/applications/kde @ttuegel
/pkgs/desktops/plasma-5 @ttuegel
/pkgs/development/libraries/kde-frameworks @ttuegel
/pkgs/development/libraries/qt-5 @ttuegel

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

@ -134,7 +134,7 @@ with
```nix ```nix
with import <nixpkgs> {}; with import <nixpkgs> {};
python35.withPackages (ps: [ps.numpy ps.toolz]) (python35.withPackages (ps: [ps.numpy ps.toolz])).env
``` ```
Executing `nix-shell` gives you again a Nix shell from which you can run Python. Executing `nix-shell` gives you again a Nix shell from which you can run Python.

163
doc/languages-frameworks/rust.md
View File

@ -20,7 +20,7 @@ For daily builds (beta and nightly) use either rustup from
nixpkgs or use the [Rust nightlies nixpkgs or use the [Rust nightlies
overlay](#using-the-rust-nightlies-overlay). overlay](#using-the-rust-nightlies-overlay).
## Packaging Rust applications ## Compiling Rust applications with Cargo
Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`: Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
@ -56,6 +56,167 @@ checksum can be then take from the failed build.
To install crates with nix there is also an experimental project called To install crates with nix there is also an experimental project called
[nixcrates](https://github.com/fractalide/nixcrates). [nixcrates](https://github.com/fractalide/nixcrates).
## Compiling Rust crates using Nix instead of Cargo
When run, `cargo build` produces a file called `Cargo.lock`,
containing pinned versions of all dependencies. Nixpkgs contains a
tool called `carnix` (`nix-env -iA nixos.carnix`), which can be used
to turn a `Cargo.lock` into a Nix expression.
That Nix expression calls `rustc` directly (hence bypassing Cargo),
and can be used to compile a crate and all its dependencies. Here is
an example for a minimal `hello` crate:
$ cargo new hello
$ cd hello
$ cargo build
Compiling hello v0.1.0 (file:///tmp/hello)
Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
$ carnix -o hello.nix --src ./. Cargo.lock --standalone
$ nix-build hello.nix
Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
```
with import <nixpkgs> {};
let kernel = buildPlatform.parsed.kernel.name;
# ... (content skipped)
hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "hello";
version = "0.1.0";
authors = [ "Authorname <user@example.com>" ];
src = ./.;
inherit dependencies buildDependencies features;
};
in
rec {
hello_0_1_0 = hello_0_1_0_ rec {};
}
```
In particular, note that the argument given as `--src` is copied
verbatim to the source. If we look at a more complicated
dependencies, for instance by adding a single line `libc="*"` to our
`Cargo.toml`, we first need to run `cargo build` to update the
`Cargo.lock`. Then, `carnix` needs to be run again, and produces the
following nix file:
```
with import <nixpkgs> {};
let kernel = buildPlatform.parsed.kernel.name;
# ... (content skipped)
hello_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "hello";
version = "0.1.0";
authors = [ "Jörg Thalheim <joerg@thalheim.io>" ];
src = ./.;
inherit dependencies buildDependencies features;
};
libc_0_2_34_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
crateName = "libc";
version = "0.2.34";
authors = [ "The Rust Project Developers" ];
sha256 = "11jmqdxmv0ka10ay0l8nzx0nl7s2lc3dbrnh1mgbr2grzwdyxi2s";
inherit dependencies buildDependencies features;
};
in
rec {
hello_0_1_0 = hello_0_1_0_ rec {
dependencies = [ libc_0_2_34 ];
};
libc_0_2_34_features."default".from_hello_0_1_0__default = true;
libc_0_2_34 = libc_0_2_34_ rec {
features = mkFeatures libc_0_2_34_features;
};
libc_0_2_34_features."use_std".self_default = hasDefault libc_0_2_34_features;
}
```
Here, the `libc` crate has no `src` attribute, so `buildRustCrate`
will fetch it from [crates.io](https://crates.io). A `sha256`
attribute is still needed for Nix purity.
Some crates require external libraries. For crates from
[crates.io](https://crates.io), such libraries can be specified in
`defaultCrateOverrides` package in nixpkgs itself.
Starting from that file, one can add more overrides, to add features
or build inputs by overriding the hello crate in a seperate file.
```
with import <nixpkgs> {};
(import ./hello.nix).hello_0_1_0.override {
crateOverrides = defaultCrateOverrides // {
hello = attrs: { buildInputs = [ openssl ]; };
};
}
```
Here, `crateOverrides` is expected to be a attribute set, where the
key is the crate name without version number and the value a function.
The function gets all attributes passed to `buildRustCrate` as first
argument and returns a set that contains all attribute that should be
overwritten.
For more complicated cases, such as when parts of the crate's
derivation depend on the the crate's version, the `attrs` argument of
the override above can be read, as in the following example, which
patches the derivation:
```
with import <nixpkgs> {};
(import ./hello.nix).hello_0_1_0.override {
crateOverrides = defaultCrateOverrides // {
hello = attrs: lib.optionalAttrs (lib.versionAtLeast attrs.version "1.0") {
postPatch = ''
substituteInPlace lib/zoneinfo.rs \
--replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
'';
};
};
}
```
Another situation is when we want to override a nested
dependency. This actually works in the exact same way, since the
`crateOverrides` parameter is forwarded to the crate's
dependencies. For instance, to override the build inputs for crate
`libc` in the example above, where `libc` is a dependency of the main
crate, we could do:
```
with import <nixpkgs> {};
(import hello.nix).hello_0_1_0.override {
crateOverrides = defaultCrateOverrides // {
libc = attrs: { buildInputs = []; };
};
}
```
Three more parameters can be overridden:
- The version of rustc used to compile the crate:
```
hello_0_1_0.override { rust = pkgs.rust; };
```
- Whether to build in release mode or debug mode (release mode by
default):
```
hello_0_1_0.override { release = false; };
```
- Whether to print the commands sent to rustc when building
(equivalent to `--verbose` in cargo:
```
hello_0_1_0.override { verbose = false; };
```
## Using the Rust nightlies overlay ## Using the Rust nightlies overlay
Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope. Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.

15
doc/stdenv.xml
View File

@ -251,10 +251,17 @@ genericBuild
<varlistentry> <varlistentry>
<term><varname>enableParallelBuilding</varname></term> <term><varname>enableParallelBuilding</varname></term>
<listitem><para>If set, <literal>stdenv</literal> will pass specific <listitem>
flags to <literal>make</literal> and other build tools to enable <para>If set to <literal>true</literal>, <literal>stdenv</literal> will
parallel building with up to <literal>build-cores</literal> pass specific flags to <literal>make</literal> and other build tools to
workers.</para></listitem> enable parallel building with up to <literal>build-cores</literal>
workers.</para>
<para>Unless set to <literal>false</literal>, some build systems with good
support for parallel building including <literal>cmake</literal>,
<literal>meson</literal>, and <literal>qmake</literal> will set it to
<literal>true</literal>.</para>
</listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>

6
lib/maintainers.nix
View File

@ -205,6 +205,7 @@
elijahcaine = "Elijah Caine <elijahcainemv@gmail.com>"; elijahcaine = "Elijah Caine <elijahcainemv@gmail.com>";
elitak = "Eric Litak <elitak@gmail.com>"; elitak = "Eric Litak <elitak@gmail.com>";
ellis = "Ellis Whitehead <nixos@ellisw.net>"; ellis = "Ellis Whitehead <nixos@ellisw.net>";
enzime = "Michael Hoang <enzime@users.noreply.github.com>";
eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>"; eperuffo = "Emanuele Peruffo <info@emanueleperuffo.com>";
epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>"; epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
eqyiel = "Ruben Maher <r@rkm.id.au>"; eqyiel = "Ruben Maher <r@rkm.id.au>";
@ -289,6 +290,7 @@
ironpinguin = "Michele Catalano <michele@catalano.de>"; ironpinguin = "Michele Catalano <michele@catalano.de>";
ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>"; ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>";
ixmatus = "Parnell Springmeyer <parnell@digitalmentat.com>"; ixmatus = "Parnell Springmeyer <parnell@digitalmentat.com>";
izorkin = "Yurii Izorkin <Izorkin@gmail.com>";
j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>"; j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>"; jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
jammerful = "jammerful <jammerful@gmail.com>"; jammerful = "jammerful <jammerful@gmail.com>";
@ -390,6 +392,7 @@
manveru = "Michael Fellinger <m.fellinger@gmail.com>"; manveru = "Michael Fellinger <m.fellinger@gmail.com>";
marcweber = "Marc Weber <marco-oweber@gmx.de>"; marcweber = "Marc Weber <marco-oweber@gmx.de>";
markus1189 = "Markus Hauck <markus1189@gmail.com>"; markus1189 = "Markus Hauck <markus1189@gmail.com>";
markuskowa = "Markus Kowalewski <markus.kowalewski@gmail.com>";
markWot = "Markus Wotringer <markus@wotringer.de>"; markWot = "Markus Wotringer <markus@wotringer.de>";
martijnvermaat = "Martijn Vermaat <martijn@vermaat.name>"; martijnvermaat = "Martijn Vermaat <martijn@vermaat.name>";
martingms = "Martin Gammelsæter <martin@mg.am>"; martingms = "Martin Gammelsæter <martin@mg.am>";
@ -401,6 +404,7 @@
mbakke = "Marius Bakke <mbakke@fastmail.com>"; mbakke = "Marius Bakke <mbakke@fastmail.com>";
mbbx6spp = "Susan Potter <me@susanpotter.net>"; mbbx6spp = "Susan Potter <me@susanpotter.net>";
mbe = "Brandon Edens <brandonedens@gmail.com>"; mbe = "Brandon Edens <brandonedens@gmail.com>";
mbode = "Maximilian Bode <maxbode@gmail.com>";
mboes = "Mathieu Boespflug <mboes@tweag.net>"; mboes = "Mathieu Boespflug <mboes@tweag.net>";
mbrgm = "Marius Bergmann <marius@yeai.de>"; mbrgm = "Marius Bergmann <marius@yeai.de>";
mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>"; mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
@ -430,6 +434,7 @@
mog = "Matthew O'Gorman <mog-lists@rldn.net>"; mog = "Matthew O'Gorman <mog-lists@rldn.net>";
montag451 = "montag451 <montag451@laposte.net>"; montag451 = "montag451 <montag451@laposte.net>";
moosingin3space = "Nathan Moos <moosingin3space@gmail.com>"; moosingin3space = "Nathan Moos <moosingin3space@gmail.com>";
moredread = "André-Patrick Bubel <code@apb.name>";
moretea = "Maarten Hoogendoorn <maarten@moretea.nl>"; moretea = "Maarten Hoogendoorn <maarten@moretea.nl>";
mornfall = "Petr Ročkai <me@mornfall.net>"; mornfall = "Petr Ročkai <me@mornfall.net>";
MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>"; MostAwesomeDude = "Corbin Simpson <cds@corbinsimpson.com>";
@ -513,6 +518,7 @@
plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>"; plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>";
plumps = "Maksim Bronsky <maks.bronsky@web.de"; plumps = "Maksim Bronsky <maks.bronsky@web.de";
pmahoney = "Patrick Mahoney <pat@polycrystal.org>"; pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
pmeunier = "Pierre-Étienne Meunier <pierre-etienne.meunier@inria.fr>";
pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>"; pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
polyrod = "Maurizio Di Pietro <dc1mdp@gmail.com>"; polyrod = "Maurizio Di Pietro <dc1mdp@gmail.com>";
pradeepchhetri = "Pradeep Chhetri <pradeep.chhetri89@gmail.com>"; pradeepchhetri = "Pradeep Chhetri <pradeep.chhetri89@gmail.com>";

11
lib/systems/examples.nix
View File

@ -18,7 +18,6 @@ rec {
libc = "glibc"; libc = "glibc";
platform = platforms.sheevaplug; platform = platforms.sheevaplug;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc;
}; };
raspberryPi = rec { raspberryPi = rec {
@ -31,7 +30,6 @@ rec {
libc = "glibc"; libc = "glibc";
platform = platforms.raspberrypi; platform = platforms.raspberrypi;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc;
}; };
armv7l-hf-multiplatform = rec { armv7l-hf-multiplatform = rec {
@ -44,7 +42,6 @@ rec {
libc = "glibc"; libc = "glibc";
platform = platforms.armv7l-hf-multiplatform; platform = platforms.armv7l-hf-multiplatform;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc;
}; };
aarch64-multiplatform = rec { aarch64-multiplatform = rec {
@ -54,23 +51,20 @@ rec {
withTLS = true; withTLS = true;
libc = "glibc"; libc = "glibc";
platform = platforms.aarch64-multiplatform; platform = platforms.aarch64-multiplatform;
inherit (platform) gcc;
}; };
scaleway-c1 = armv7l-hf-multiplatform // rec { scaleway-c1 = armv7l-hf-multiplatform // rec {
platform = platforms.scaleway-c1; platform = platforms.scaleway-c1;
inherit (platform) gcc; inherit (platform.gcc) fpu;
inherit (gcc) fpu;
}; };
pogoplug4 = rec { pogoplug4 = rec {
arch = "armv5tel"; arch = "armv5tel";
config = "armv5tel-softfloat-linux-gnueabi"; config = "armv5tel-unknown-linux-gnueabi";
float = "soft"; float = "soft";
platform = platforms.pogoplug4; platform = platforms.pogoplug4;
inherit (platform) gcc;
libc = "glibc"; libc = "glibc";
withTLS = true; withTLS = true;
@ -86,7 +80,6 @@ rec {
libc = "glibc"; libc = "glibc";
platform = platforms.fuloong2f_n32; platform = platforms.fuloong2f_n32;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc;
}; };
# #

6
nixos/doc/manual/release-notes/rl-1803.xml
View File

@ -131,6 +131,12 @@ following incompatible changes:</para>
must be set to true. must be set to true.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The option <option>services.logstash.listenAddress</option> is now <literal>127.0.0.1</literal> by default.
Previously the default behaviour was to listen on all interfaces.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

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

@ -150,8 +150,6 @@ in pkgs.vmTools.runInLinuxVM (
} }
'' ''
${if partitioned then '' ${if partitioned then ''
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
rootDisk=/dev/vda1 rootDisk=/dev/vda1
'' else '' '' else ''
rootDisk=/dev/vda rootDisk=/dev/vda

19
nixos/modules/installer/netboot/netboot.nix
View File

@ -18,17 +18,17 @@ with lib;
}; };
config = { config = rec {
boot.loader.grub.version = 2;
# Don't build the GRUB menu builder script, since we don't need it # Don't build the GRUB menu builder script, since we don't need it
# here and it causes a cyclic dependency. # here and it causes a cyclic dependency.
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
# !!! Hack - attributes expected by other modules. # !!! Hack - attributes expected by other modules.
system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2_efi ]
environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; ++ (if pkgs.stdenv.system == "aarch64-linux"
then []
else [ pkgs.grub2 pkgs.syslinux ]);
system.boot.loader.kernelFile = pkgs.stdenv.platform.kernelTarget;
fileSystems."/" = fileSystems."/" =
{ fsType = "tmpfs"; { fsType = "tmpfs";
@ -84,7 +84,12 @@ with lib;
]; ];
}; };
system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" "#!ipxe\nkernel bzImage init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}\ninitrd initrd\nboot"; system.build.netbootIpxeScript = pkgs.writeTextDir "netboot.ipxe" ''
#!ipxe
kernel ${pkgs.stdenv.platform.kernelTarget} init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
initrd initrd
boot
'';
boot.loader.timeout = 10; boot.loader.timeout = 10;

7
nixos/modules/installer/tools/nix-fallback-paths.nix
View File

@ -1,5 +1,6 @@
{ {
x86_64-linux = "/nix/store/b4s1gxiis1ryvybnjhdjvgc5sr1nq0ys-nix-1.11.15"; x86_64-linux = "/nix/store/gy4yv67gv3j6in0lalw37j353zdmfcwm-nix-1.11.16";
i686-linux = "/nix/store/kgb5hs7qw13bvb6icramv1ry9dard3h9-nix-1.11.15"; i686-linux = "/nix/store/ifmyq5ryfxhhrzh62hiq65xyz1fwffga-nix-1.11.16";
x86_64-darwin = "/nix/store/dgwz3dxdzs2wwd7pg7cdhvl8rv0qpnbj-nix-1.11.15"; aarch64-linux = "/nix/store/y9mfv3sx75mbfibf1zna1kq9v98fk2nb-nix-1.11.16";
x86_64-darwin = "/nix/store/hwpp7kia2f0in5ns2hiw41q38k30jpj2-nix-1.11.16";
} }

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

@ -329,6 +329,7 @@
./services/misc/nix-ssh-serve.nix ./services/misc/nix-ssh-serve.nix
./services/misc/nzbget.nix ./services/misc/nzbget.nix
./services/misc/octoprint.nix ./services/misc/octoprint.nix
./services/misc/osrm.nix
./services/misc/packagekit.nix ./services/misc/packagekit.nix
./services/misc/parsoid.nix ./services/misc/parsoid.nix
./services/misc/phd.nix ./services/misc/phd.nix

7
nixos/modules/programs/bash/bash.nix
View File

@ -14,13 +14,16 @@ let
bashCompletion = optionalString cfg.enableCompletion '' bashCompletion = optionalString cfg.enableCompletion ''
# Check whether we're running a version of Bash that has support for # Check whether we're running a version of Bash that has support for
# programmable completion. If we do, enable all modules installed in # programmable completion. If we do, enable all modules installed in
# the system (and user profile). # the system and user profile in obsolete /etc/bash_completion.d/
# directories. Bash loads completions in all
# $XDG_DATA_DIRS/share/bash-completion/completions/
# on demand, so they do not need to be sourced here.
if shopt -q progcomp &>/dev/null; then if shopt -q progcomp &>/dev/null; then
. "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh" . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh"
nullglobStatus=$(shopt -p nullglob) nullglobStatus=$(shopt -p nullglob)
shopt -s nullglob shopt -s nullglob
for p in $NIX_PROFILES; do for p in $NIX_PROFILES; do
for m in "$p/etc/bash_completion.d/"* "$p/share/bash-completion/completions/"*; do for m in "$p/etc/bash_completion.d/"*; do
. $m . $m
done done
done done

13
nixos/modules/services/desktops/gnome3/at-spi2-core.nix
View File

@ -28,14 +28,15 @@ with lib;
###### implementation ###### implementation
config = mkIf config.services.gnome3.at-spi2-core.enable { config = mkMerge [
(mkIf config.services.gnome3.at-spi2-core.enable {
environment.systemPackages = [ pkgs.at_spi2_core ]; environment.systemPackages = [ pkgs.at_spi2_core ];
services.dbus.packages = [ pkgs.at_spi2_core ]; services.dbus.packages = [ pkgs.at_spi2_core ];
systemd.packages = [ pkgs.at_spi2_core ]; systemd.packages = [ pkgs.at_spi2_core ];
})
}; (mkIf (!config.services.gnome3.at-spi2-core.enable) {
environment.variables.NO_AT_BRIDGE = "1";
})
];
} }

2
nixos/modules/services/logging/logstash.nix
View File

@ -103,7 +103,7 @@ in
listenAddress = mkOption { listenAddress = mkOption {
type = types.str; type = types.str;
default = "0.0.0.0"; default = "127.0.0.1";
description = "Address on which to start webserver."; description = "Address on which to start webserver.";
}; };

14
nixos/modules/services/misc/gollum.nix
View File

@ -38,6 +38,18 @@ in
description = "Enable support for math rendering using MathJax"; description = "Enable support for math rendering using MathJax";
}; };
allowUploads = mkOption {
type = types.nullOr (types.enum [ "dir" "page" ]);
default = null;
description = "Enable uploads of external files";
};
emoji = mkOption {
type = types.bool;
default = false;
description = "Parse and interpret emoji tags";
};
branch = mkOption { branch = mkOption {
type = types.str; type = types.str;
default = "master"; default = "master";
@ -91,6 +103,8 @@ in
--config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \ --config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
--ref ${cfg.branch} \ --ref ${cfg.branch} \
${optionalString cfg.mathjax "--mathjax"} \ ${optionalString cfg.mathjax "--mathjax"} \
${optionalString cfg.emoji "--emoji"} \
${optionalString (cfg.allowUploads != null) "--allow-uploads ${cfg.allowUploads}"} \
${cfg.stateDir} ${cfg.stateDir}
''; '';
}; };

85
nixos/modules/services/misc/osrm.nix Normal file
View File

@ -0,0 +1,85 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.osrm;
in
{
options.services.osrm = {
enable = mkOption {
type = types.bool;
default = false;
description = "Enable the OSRM service.";
};
address = mkOption {
type = types.str;
default = "0.0.0.0";
description = "IP address on which the web server will listen.";
};
port = mkOption {
type = types.int;
default = 5000;
description = "Port on which the web server will run.";
};
threads = mkOption {
type = types.int;
default = 4;
description = "Number of threads to use.";
};
algorithm = mkOption {
type = types.enum [ "CH" "CoreCH" "MLD" ];
default = "MLD";
description = "Algorithm to use for the data. Must be one of CH, CoreCH, MLD";
};
extraFlags = mkOption {
type = types.listOf types.str;
default = [];
example = [ "--max-table-size 1000" "--max-matching-size 1000" ];
description = "Extra command line arguments passed to osrm-routed";
};
dataFile = mkOption {
type = types.path;
example = "/var/lib/osrm/berlin-latest.osrm";
description = "Data file location";
};
};
config = mkIf cfg.enable {
users.users.osrm = {
group = config.users.users.osrm.name;
description = "OSRM user";
createHome = false;
};
users.groups.osrm = { };
systemd.services.osrm = {
description = "OSRM service";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
User = config.users.extraUsers.osrm.name;
ExecStart = ''
${pkgs.osrm-backend}/bin/osrm-routed \
--ip ${cfg.address} \
--port ${toString cfg.port} \
--threads ${toString cfg.threads} \
--algorithm ${cfg.algorithm} \
${toString cfg.extraFlags} \
${cfg.dataFile}
'';
};
};
};
}

23
nixos/modules/services/networking/networkmanager.nix
View File

@ -241,6 +241,19 @@ in {
A list of scripts which will be executed in response to network events. A list of scripts which will be executed in response to network events.
''; '';
}; };
enableStrongSwan = mkOption {
type = types.bool;
default = false;
description = ''
Enable the StrongSwan plugin.
</para><para>
If you enable this option the
<literal>networkmanager_strongswan</literal> plugin will be added to
the <option>networking.networkmanager.packages</option> option
so you don't need to to that yourself.
'';
};
}; };
}; };
@ -333,13 +346,13 @@ in {
wireless.enable = lib.mkDefault false; wireless.enable = lib.mkDefault false;
}; };
powerManagement.resumeCommands = ''
${config.systemd.package}/bin/systemctl restart network-manager
'';
security.polkit.extraConfig = polkitConf; security.polkit.extraConfig = polkitConf;
services.dbus.packages = cfg.packages; networking.networkmanager.packages =
mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ];
services.dbus.packages =
optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
services.udev.packages = cfg.packages; services.udev.packages = cfg.packages;
}; };

76
nixos/modules/services/networking/prosody.nix
View File

@ -10,98 +10,126 @@ let
options = { options = {
# TODO: require attribute
key = mkOption { key = mkOption {
type = types.str; type = types.path;
description = "Path to the key file"; description = "Path to the key file.";
}; };
# TODO: require attribute
cert = mkOption { cert = mkOption {
type = types.str; type = types.path;
description = "Path to the certificate file"; description = "Path to the certificate file.";
}; };
extraOptions = mkOption {
type = types.attrs;
default = {};
description = "Extra SSL configuration options.";
};
}; };
}; };
moduleOpts = { moduleOpts = {
roster = mkOption { roster = mkOption {
type = types.bool;
default = true; default = true;
description = "Allow users to have a roster"; description = "Allow users to have a roster";
}; };
saslauth = mkOption { saslauth = mkOption {
type = types.bool;
default = true; default = true;
description = "Authentication for clients and servers. Recommended if you want to log in."; description = "Authentication for clients and servers. Recommended if you want to log in.";
}; };
tls = mkOption { tls = mkOption {
type = types.bool;
default = true; default = true;
description = "Add support for secure TLS on c2s/s2s connections"; description = "Add support for secure TLS on c2s/s2s connections";
}; };
dialback = mkOption { dialback = mkOption {
type = types.bool;
default = true; default = true;
description = "s2s dialback support"; description = "s2s dialback support";
}; };
disco = mkOption { disco = mkOption {
type = types.bool;
default = true; default = true;
description = "Service discovery"; description = "Service discovery";
}; };
legacyauth = mkOption { legacyauth = mkOption {
type = types.bool;
default = true; default = true;
description = "Legacy authentication. Only used by some old clients and bots"; description = "Legacy authentication. Only used by some old clients and bots";
}; };
version = mkOption { version = mkOption {
type = types.bool;
default = true; default = true;
description = "Replies to server version requests"; description = "Replies to server version requests";
}; };
uptime = mkOption { uptime = mkOption {
type = types.bool;
default = true; default = true;
description = "Report how long server has been running"; description = "Report how long server has been running";
}; };
time = mkOption { time = mkOption {
type = types.bool;
default = true; default = true;
description = "Let others know the time here on this server"; description = "Let others know the time here on this server";
}; };
ping = mkOption { ping = mkOption {
type = types.bool;
default = true; default = true;
description = "Replies to XMPP pings with pongs"; description = "Replies to XMPP pings with pongs";
}; };
console = mkOption { console = mkOption {
type = types.bool;
default = false; default = false;
description = "telnet to port 5582"; description = "telnet to port 5582";
}; };
bosh = mkOption { bosh = mkOption {
type = types.bool;
default = false; default = false;
description = "Enable BOSH clients, aka 'Jabber over HTTP'"; description = "Enable BOSH clients, aka 'Jabber over HTTP'";
}; };
httpserver = mkOption { httpserver = mkOption {
type = types.bool;
default = false; default = false;
description = "Serve static files from a directory over HTTP"; description = "Serve static files from a directory over HTTP";
}; };
websocket = mkOption { websocket = mkOption {
type = types.bool;
default = false; default = false;
description = "Enable WebSocket support"; description = "Enable WebSocket support";
}; };
}; };
createSSLOptsStr = o: toLua = x:
if o ? key && o ? cert then if builtins.isString x then ''"${x}"''
''ssl = { key = "${o.key}"; certificate = "${o.cert}"; };'' else if builtins.isBool x then toString x
else ""; else if builtins.isInt x then toString x
else throw "Invalid Lua value";
createSSLOptsStr = o: ''
ssl = {
key = "${o.key}";
certificate = "${o.cert}";
${concatStringsSep "\n" (mapAttrsToList (name: value: "${name} = ${toLua value};") o.extraOptions)}
};
'';
vHostOpts = { ... }: { vHostOpts = { ... }: {
@ -114,18 +142,20 @@ let
}; };
enabled = mkOption { enabled = mkOption {
type = types.bool;
default = false; default = false;
description = "Whether to enable the virtual host"; description = "Whether to enable the virtual host";
}; };
ssl = mkOption { ssl = mkOption {
description = "Paths to SSL files"; type = types.nullOr (types.submodule sslOpts);
default = null; default = null;
options = [ sslOpts ]; description = "Paths to SSL files";
}; };
extraConfig = mkOption { extraConfig = mkOption {
default = ''''; type = types.lines;
default = "";
description = "Additional virtual host specific configuration"; description = "Additional virtual host specific configuration";
}; };
@ -144,11 +174,13 @@ in
services.prosody = { services.prosody = {
enable = mkOption { enable = mkOption {
type = types.bool;
default = false; default = false;
description = "Whether to enable the prosody server"; description = "Whether to enable the prosody server";
}; };
allowRegistration = mkOption { allowRegistration = mkOption {
type = types.bool;
default = false; default = false;
description = "Allow account creation"; description = "Allow account creation";
}; };
@ -156,8 +188,9 @@ in
modules = moduleOpts; modules = moduleOpts;
extraModules = mkOption { extraModules = mkOption {
description = "Enable custom modules"; type = types.listOf types.str;
default = []; default = [];
description = "Enable custom modules";
}; };
virtualHosts = mkOption { virtualHosts = mkOption {
@ -183,20 +216,21 @@ in
}; };
ssl = mkOption { ssl = mkOption {
description = "Paths to SSL files"; type = types.nullOr (types.submodule sslOpts);
default = null; default = null;
options = [ sslOpts ]; description = "Paths to SSL files";
}; };
admins = mkOption { admins = mkOption {
description = "List of administrators of the current host"; type = types.listOf types.str;
example = [ "admin1@example.com" "admin2@example.com" ];
default = []; default = [];
example = [ "admin1@example.com" "admin2@example.com" ];
description = "List of administrators of the current host";
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.lines; type = types.lines;
default = ''''; default = "";
description = "Additional prosody configuration"; description = "Additional prosody configuration";
}; };
@ -263,17 +297,17 @@ in
}; };
systemd.services.prosody = { systemd.services.prosody = {
description = "Prosody XMPP server"; description = "Prosody XMPP server";
after = [ "network-online.target" ]; after = [ "network-online.target" ];
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
restartTriggers = [ config.environment.etc."prosody/prosody.cfg.lua".source ];
serviceConfig = { serviceConfig = {
User = "prosody"; User = "prosody";
Type = "forking";
PIDFile = "/var/lib/prosody/prosody.pid"; PIDFile = "/var/lib/prosody/prosody.pid";
ExecStart = "${pkgs.prosody}/bin/prosodyctl start"; ExecStart = "${pkgs.prosody}/bin/prosodyctl start";
}; };
}; };
}; };

2
nixos/modules/testing/test-instrumentation.nix
View File

@ -128,7 +128,7 @@ in
# Make it easy to log in as root when running the test interactively. # Make it easy to log in as root when running the test interactively.
users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
services.xserver.displayManager.logToJournal = true; services.xserver.displayManager.job.logToJournal = true;
}; };
} }

5
nixos/modules/virtualisation/containers.nix
View File

@ -726,6 +726,11 @@ in
networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ];
services.udev.extraRules = optionalString config.networking.networkmanager.enable ''
# Don't manage interfaces created by nixos-container.
ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1"
'';
environment.systemPackages = [ pkgs.nixos-container ]; environment.systemPackages = [ pkgs.nixos-container ];
}); });
} }

2
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -18,7 +18,7 @@ let
"i686-linux" = "${qemu}/bin/qemu-kvm"; "i686-linux" = "${qemu}/bin/qemu-kvm";
"x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64"; "x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64";
"armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; "armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
"aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt -cpu host"; "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
}.${pkgs.stdenv.system}; }.${pkgs.stdenv.system};
# FIXME: figure out a common place for this instead of copy pasting # FIXME: figure out a common place for this instead of copy pasting

49
nixos/release.nix
View File

@ -1,6 +1,6 @@
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; } { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false , stableBranch ? false
, supportedSystems ? [ "x86_64-linux" ] , supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
}: }:
with import ../lib; with import ../lib;
@ -89,6 +89,27 @@ let
}); });
}).config)); }).config));
makeNetboot = config:
let
config_evaled = import lib/eval-config.nix config;
build = config_evaled.config.system.build;
kernelTarget = config_evaled.pkgs.stdenv.platform.kernelTarget;
in
pkgs.symlinkJoin {
name="netboot";
paths=[
build.netbootRamdisk
build.kernel
build.netbootIpxeScript
];
postBuild = ''
mkdir -p $out/nix-support
echo "file ${kernelTarget} $out/${kernelTarget}" >> $out/nix-support/hydra-build-products
echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
'';
};
in rec { in rec {
@ -103,28 +124,22 @@ in rec {
# Build the initial ramdisk so Hydra can keep track of its size over time. # Build the initial ramdisk so Hydra can keep track of its size over time.
initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);
netboot.x86_64-linux = let build = (import lib/eval-config.nix { netboot = {
x86_64-linux = makeNetboot {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./modules/installer/netboot/netboot-minimal.nix ./modules/installer/netboot/netboot-minimal.nix
versionModule versionModule
]; ];
}).config.system.build;
in
pkgs.symlinkJoin {
name="netboot";
paths=[
build.netbootRamdisk
build.kernel
build.netbootIpxeScript
];
postBuild = ''
mkdir -p $out/nix-support
echo "file bzImage $out/bzImage" >> $out/nix-support/hydra-build-products
echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products
echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products
'';
}; };
} // (optionalAttrs (elem "aarch64-linux" supportedSystems) {
aarch64-linux = makeNetboot {
system = "aarch64-linux";
modules = [
./modules/installer/netboot/netboot-minimal.nix
versionModule
];
};});
iso_minimal = forAllSystems (system: makeIso { iso_minimal = forAllSystems (system: makeIso {
module = ./modules/installer/cd-dvd/installation-cd-minimal.nix; module = ./modules/installer/cd-dvd/installation-cd-minimal.nix;

2
nixos/tests/printing.nix
View File

@ -39,7 +39,7 @@ import ./make-test.nix ({pkgs, ... }: {
$client->waitForUnit("cups.service"); $client->waitForUnit("cups.service");
$client->sleep(10); # wait until cups is fully initialized $client->sleep(10); # wait until cups is fully initialized
$client->succeed("lpstat -r") =~ /scheduler is running/ or die; $client->succeed("lpstat -r") =~ /scheduler is running/ or die;
$client->succeed("lpstat -H") =~ "/var/run/cups/cups.sock" or die; $client->succeed("lpstat -H") =~ "localhost:631" or die;
$client->succeed("curl --fail http://localhost:631/"); $client->succeed("curl --fail http://localhost:631/");
$client->succeed("curl --fail http://server:631/"); $client->succeed("curl --fail http://server:631/");
$server->fail("curl --fail --connect-timeout 2 http://client:631/"); $server->fail("curl --fail --connect-timeout 2 http://client:631/");

2
nixos/tests/radicale.nix
View File

@ -20,7 +20,7 @@ let
''; '';
}; };
# WARNING: DON'T DO THIS IN PRODUCTION! # WARNING: DON'T DO THIS IN PRODUCTION!
# This puts secrets (albeit hashed) directly into the Nix store for ease of testing. # This puts unhashed secrets directly into the Nix store for ease of testing.
environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} '' environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} ''
${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password} ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password}
''; '';

13
pkgs/applications/altcoins/cryptop/default.nix
View File

@ -1,16 +1,15 @@
{ lib, python2}: { lib, buildPythonApplication, fetchPypi, requests, requests-cache }:
python2.pkgs.buildPythonApplication rec { buildPythonApplication rec {
pname = "cryptop"; pname = "cryptop";
version = "0.1.0"; version = "0.2.0";
name = "${pname}-${version}";
src = python2.pkgs.fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh"; sha256 = "0akrrz735vjfrm78plwyg84vabj0x3qficq9xxmy9kr40fhdkzpb";
}; };
propagatedBuildInputs = [ python2.pkgs.requests ]; propagatedBuildInputs = [ requests requests-cache ];
# No tests in archive # No tests in archive
doCheck = false; doCheck = false;

4
pkgs/applications/altcoins/default.nix
View File

@ -1,4 +1,4 @@
{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2 }: { callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }:
rec { rec {
@ -20,6 +20,8 @@ rec {
btc1 = callPackage ./btc1.nix { withGui = true; }; btc1 = callPackage ./btc1.nix { withGui = true; };
btc1d = callPackage ./btc1.nix { withGui = false; }; btc1d = callPackage ./btc1.nix { withGui = false; };
cryptop = python3.pkgs.callPackage ./cryptop { };
dashpay = callPackage ./dashpay.nix { }; dashpay = callPackage ./dashpay.nix { };
dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoin = callPackage ./dogecoin.nix { withGui = true; };

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

@ -31,6 +31,10 @@ stdenv.mkDerivation rec{
then "install -D bitcoin-qt $out/bin/memorycoin-qt" then "install -D bitcoin-qt $out/bin/memorycoin-qt"
else "install -D bitcoind $out/bin/memorycoind"; else "install -D bitcoind $out/bin/memorycoind";
# `make build/version.o`:
# make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop.
enableParallelBuilding = false;
meta = { meta = {
description = "Peer-to-peer, CPU-based electronic cash system"; description = "Peer-to-peer, CPU-based electronic cash system";
longDescription= '' longDescription= ''

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

@ -31,6 +31,10 @@ stdenv.mkDerivation rec{
then "install -D bitcoin-qt $out/bin/primecoin-qt" then "install -D bitcoin-qt $out/bin/primecoin-qt"
else "install -D bitcoind $out/bin/primecoind"; else "install -D bitcoind $out/bin/primecoind";
# `make build/version.o`:
# make: *** No rule to make target 'build/build.h', needed by 'build/version.o'. Stop.
enableParallelBuilding = false;
meta = { meta = {
description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers"; description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers";
longDescription= '' longDescription= ''

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

@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }: { stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "15.12"; version = "16.06";
name = "mma-${version}"; name = "mma-${version}";
src = fetchurl { src = fetchurl {
url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz"; url = "http://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
sha256 = "0k37kcrfaxmwjb8xb1cbqinrkx3g50dbvwqbvwl3l762j4vr8jgx"; sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww";
}; };
buildInputs = [ makeWrapper python alsaUtils timidity ]; buildInputs = [ makeWrapper python alsaUtils timidity ];

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

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calf-${version}"; name = "calf-${version}";
version = "0.0.60"; version = "0.90.0";
src = fetchurl { src = fetchurl {
url = "http://calf-studio-gear.org/files/${name}.tar.gz"; url = "http://calf-studio-gear.org/files/${name}.tar.gz";
sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"; sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib";
}; };
buildInputs = [ buildInputs = [

16
pkgs/applications/audio/dfasma/default.nix
View File

@ -6,7 +6,7 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc"; sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc";
rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16"; rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16";
repo = "reaper"; repo = "REAPER";
owner = "gillesdegottex"; owner = "gillesdegottex";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -16,8 +16,8 @@ let
libqaudioextra = { libqaudioextra = {
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "17pvlij8cc4lwzf6f1cnygj3m3ci6xfa3lv5bgcr5i1gzyjxqpq1"; sha256 = "0m6x1qm7lbjplqasr2jhnd2ndi0y6z9ybbiiixnlwfm23sp15wci";
rev = "b7d187cd9a1fd76ea94151e2e02453508d0151d3"; rev = "9ae051989a8fed0b2f8194b1501151909a821a89";
repo = "libqaudioextra"; repo = "libqaudioextra";
owner = "gillesdegottex"; owner = "gillesdegottex";
}; };
@ -28,10 +28,10 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "dfasma-${version}"; name = "dfasma-${version}";
version = "1.2.5"; version = "1.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d"; sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
rev = "v${version}"; rev = "v${version}";
repo = "dfasma"; repo = "dfasma";
owner = "gillesdegottex"; owner = "gillesdegottex";
@ -42,13 +42,9 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
postPatch = '' postPatch = ''
substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
cp -Rv "${reaperFork.src}"/* external/REAPER cp -Rv "${reaperFork.src}"/* external/REAPER
cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra cp -Rv "${libqaudioextra.src}"/* external/libqaudioextra
''; substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
preConfigure = ''
qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

16
pkgs/applications/audio/distrho/default.nix
View File

@ -2,12 +2,12 @@
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }: , libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "distrho-ports-unstable-2017-08-04"; name = "distrho-ports-unstable-2017-10-10";
src = fetchgit { src = fetchgit {
url = "https://github.com/DISTRHO/DISTRHO-Ports.git"; url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
rev = "f591a1066cd3929536699bb516caa4b5efd9d025"; rev = "e11e2b204c14b8e370a0bf5beafa5f162fedb8e9";
sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9"; sha256 = "1nd542iian9kr2ldaf7fkkgf900ryzqigks999d1jhms6p0amvfv";
}; };
patchPhase = '' patchPhase = ''
@ -38,11 +38,11 @@ stdenv.mkDerivation rec {
longDescription = '' longDescription = ''
Includes: Includes:
Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger Dexed drowaudio-distortion drowaudio-distortionshaper drowaudio-flanger
drowaudio-reverb drowaudio-tremolo drumsynt EasySSP eqinox drowaudio-reverb drowaudio-tremolo drumsynth EasySSP eqinox HiReSam
JuceDemoPlugin klangfalter LUFSMeter luftikus obxd pitchedDelay JuceDemoPlugin KlangFalter LUFSMeter LUFSMeterMulti Luftikus Obxd
stereosourceseparation TAL-Dub-3 TAL-Filter TAL-Filter-2 TAL-NoiseMaker PitchedDelay ReFine StereoSourceSeparation TAL-Dub-3 TAL-Filter
TAL-Reverb TAL-Reverb-2 TAL-Reverb-3 TAL-Vocoder-2 TheFunction TAL-Filter-2 TAL-NoiseMaker TAL-Reverb TAL-Reverb-2 TAL-Reverb-3
ThePilgrim Vex Wolpertinger TAL-Vocoder-2 TheFunction ThePilgrim Vex Wolpertinger
''; '';
maintainers = [ maintainers.goibhniu ]; maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux; platforms = platforms.linux;

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "drumkv1-${version}"; name = "drumkv1-${version}";
version = "0.8.4"; version = "0.8.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
sha256 = "0qqpklzy4wgw9jy0v2810j06712q90bwc69fp7da82536ba058a9"; sha256 = "06xqqm1ylmpp2s7xk7xav325gc50kxlvh9vf1343b0n3i8xkgjfg";
}; };
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];

37
pkgs/applications/audio/fluidsynth/default.nix
View File

@ -1,34 +1,31 @@
{ stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig { stdenv, lib, fetchFromGitHub, pkgconfig, cmake
, libpulseaudio, CoreServices, CoreAudio, AudioUnit }: , alsaLib, glib, libjack2, libsndfile, libpulseaudio
, AudioUnit, CoreAudio, CoreMIDI, CoreServices
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fluidsynth-${version}"; name = "fluidsynth-${version}";
version = "1.1.6"; version = "1.1.8";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/fluidsynth/${name}.tar.bz2"; owner = "FluidSynth";
sha256 = "00gn93bx4cz9bfwf3a8xyj2by7w23nca4zxf09ll53kzpzglg2yj"; repo = "fluidsynth";
rev = "v${version}";
sha256 = "12q7hv0zvgylsdj1ipssv5zr7ap2y410dxsd63dz22y05fa2hwwd";
}; };
preBuild = stdenv.lib.optionalString stdenv.isDarwin '' nativeBuildInputs = [ pkgconfig cmake ];
sed -i '40 i\
#include <CoreAudio/AudioHardware.h>\
#include <CoreAudio/AudioHardwareDeprecated.h>' \
src/drivers/fluid_coreaudio.c
'';
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreAudio -framework CoreServices";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libsndfile ] buildInputs = [ glib libsndfile ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ] ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ]; ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
meta = with stdenv.lib; { cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off";
meta = with lib; {
description = "Real-time software synthesizer based on the SoundFont 2 specifications"; description = "Real-time software synthesizer based on the SoundFont 2 specifications";
homepage = http://www.fluidsynth.org; homepage = http://www.fluidsynth.org;
license = licenses.lgpl2; license = licenses.lgpl21Plus;
maintainers = with maintainers; [ goibhniu lovek323 ]; maintainers = with maintainers; [ goibhniu lovek323 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };

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

@ -11,10 +11,10 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fmit-${version}"; name = "fmit-${version}";
version = "1.1.11"; version = "1.1.13";
src = fetchFromGitHub { src = fetchFromGitHub {
sha256 = "1w492lf8n2sjkr53z8cvkgywzn0w53cf78hz93zaw6dwwv36lwdp"; sha256 = "1p374gf7iksrlyvddm3w4qk3l0rxsiyymz5s8dmc447yvin8ykfq";
rev = "v${version}"; rev = "v${version}";
repo = "fmit"; repo = "fmit";
owner = "gillesdegottex"; owner = "gillesdegottex";

30
pkgs/applications/audio/gigedit/default.nix
View File

@ -1,25 +1,25 @@
{ stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45 { stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, which
, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt , docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt
, pkgconfig }: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gigedit-svn-${version}"; name = "gigedit-${version}";
version = "2342"; version = "1.1.0";
src = fetchsvn { src = fetchurl {
url = "https://svn.linuxsampler.org/svn/gigedit/trunk"; url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
rev = "${version}"; sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni";
sha256 = "0wi94gymj0ns5ck9lq1d970gb4gnzrq4b57j5j7k3d6185yg2gjs";
}; };
patchPhase = "sed -e 's/which/type -P/g' -i Makefile.cvs"; patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ];
preConfigure = "make -f Makefile.cvs"; preConfigure = "make -f Makefile.svn";
buildInputs = [ nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ];
autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool
libgig libsndfile libtool libxslt pkgconfig buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ];
];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org; homepage = http://www.linuxsampler.org;

15
pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch Normal file
View File

@ -0,0 +1,15 @@
--- a/src/gigedit/wrapLabel.cc
+++ b/src/gigedit/wrapLabel.cc
@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text
: mWrapWidth(0),
mWrapHeight(0)
{
- // pangomm >= 2.35.1
-#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1)))
- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR);
-#else
get_layout()->set_wrap(Pango::WRAP_WORD_CHAR);
-#endif
set_alignment(0.0, 0.0);
set_text(text);
}

2
pkgs/applications/audio/google-play-music-desktop-player/default.nix
View File

@ -74,6 +74,6 @@ stdenv.mkDerivation {
description = "A beautiful cross platform Desktop Player for Google Play Music"; description = "A beautiful cross platform Desktop Player for Google Play Music";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
maintainers = stdenv.lib.maintainers.SuprDewd; maintainers = [ stdenv.lib.maintainers.SuprDewd ];
}; };
} }

2
pkgs/applications/audio/ladspa-sdk/default.nix
View File

@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
name = "ladspa-sdk-${version}"; name = "ladspa-sdk-${version}";
version = "1.13"; version = "1.13";
src = fetchurl { src = fetchurl {
url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz"; url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
}; };

2
pkgs/applications/audio/ladspa-sdk/ladspah.nix
View File

@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
name = "ladspa.h-${version}"; name = "ladspa.h-${version}";
version = "1.13"; version = "1.13";
src = fetchurl { src = fetchurl {
url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz"; url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm"; sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
}; };

33
pkgs/applications/audio/linuxsampler/default.nix
View File

@ -1,31 +1,24 @@
{ stdenv, fetchsvn, alsaLib, asio, autoconf, automake, bison { stdenv, fetchurl, autoconf, automake, bison, libtool, pkgconfig, which
, libjack2, libgig, libsndfile, libtool, lv2, pkgconfig }: , alsaLib, asio, libjack2, libgig, libsndfile, lv2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "linuxsampler-svn-${version}"; name = "linuxsampler-${version}";
version = "2340"; version = "2.1.0";
src = fetchsvn { src = fetchurl {
url = "https://svn.linuxsampler.org/svn/linuxsampler/trunk"; url = "http://download.linuxsampler.org/packages/${name}.tar.bz2";
rev = "${version}"; sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf";
sha256 = "0zsrvs9dwwhjx733m45vfi11yjkqv33z8qxn2i9qriq5zs1f0kd7";
}; };
patches = ./linuxsampler_lv2_sfz_fix.diff;
# It fails to compile without this option. I'm not sure what the bug
# is, but everything works OK for me (goibhniu).
configureFlags = [ "--disable-nptl-bug-check" ];
preConfigure = '' preConfigure = ''
sed -e 's/which/type -P/g' -i scripts/generate_parser.sh make -f Makefile.svn
make -f Makefile.cvs
''; '';
buildInputs = [ nativeBuildInputs = [ autoconf automake bison libtool pkgconfig which ];
alsaLib asio autoconf automake bison libjack2 libgig libsndfile
libtool lv2 pkgconfig buildInputs = [ alsaLib asio libjack2 libgig libsndfile lv2 ];
];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org; homepage = http://www.linuxsampler.org;

50
pkgs/applications/audio/linuxsampler/linuxsampler_lv2_sfz_fix.diff
View File

@ -1,50 +0,0 @@
Index: linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp
===================================================================
--- linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (revision 2359)
+++ linuxsampler-r2359/src/hostplugins/lv2/PluginLv2.cpp (working copy)
@@ -18,6 +18,8 @@
* MA 02110-1301 USA *
***************************************************************************/
+#define _BSD_SOURCE 1 /* for realpath() */
+
#include <algorithm>
#include <cassert>
#include <cstdio>
@@ -118,6 +120,23 @@
dmsg(2, ("linuxsampler: Deactivate\n"));
}
+ static String RealPath(const String& path)
+ {
+ String out = path;
+ char* cpath = NULL;
+#ifdef _WIN32
+ cpath = (char*)malloc(MAX_PATH);
+ GetFullPathName(path.c_str(), MAX_PATH, cpath, NULL);
+#else
+ cpath = realpath(path.c_str(), NULL);
+#endif
+ if (cpath) {
+ out = cpath;
+ free(cpath);
+ }
+ return out;
+ }
+
String PluginLv2::PathToState(const String& path) {
if (MapPath) {
char* cstr = MapPath->abstract_path(MapPath->handle, path.c_str());
@@ -131,9 +150,10 @@
String PluginLv2::PathFromState(const String& path) {
if (MapPath) {
char* cstr = MapPath->absolute_path(MapPath->handle, path.c_str());
- const String abstract_path(cstr);
+ // Resolve symbolic links so SFZ sample paths load correctly
+ const String absolute_path(RealPath(cstr));
free(cstr);
- return abstract_path;
+ return absolute_path;
}
return path;
}

10
pkgs/applications/audio/mod-distortion/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchFromGitHub, lv2 }: { stdenv, fetchFromGitHub, lv2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mod-distortion-${version}"; name = "mod-distortion-git-${version}";
version = "git-2015-05-18"; version = "2016-08-19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "portalmod"; owner = "portalmod";
repo = "mod-distortion"; repo = "mod-distortion";
rev = "0cdf186abc2a9275890b57057faf5c3f6d86d84a"; rev = "e672d5feb9d631798e3d56eb96e8958c3d2c6821";
sha256 = "1wmxgpcdcy9m7j78yq85824if0wz49wv7mw13bj3sw2s87dcmw19"; sha256 = "005wdkbhn9dgjqv019cwnziqg86yryc5vh7j5qayrzh9v446dw34";
}; };
buildInputs = [ lv2 ]; buildInputs = [ lv2 ];
installFlags = [ "LV2_PATH=$(out)/lib/lv2" ]; installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/portalmod/mod-distortion; homepage = https://github.com/portalmod/mod-distortion;

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "padthv1-${version}"; name = "padthv1-${version}";
version = "0.8.4"; version = "0.8.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/padthv1/${name}.tar.gz"; url = "mirror://sourceforge/padthv1/${name}.tar.gz";
sha256 = "1p6wfgh90h7gj1j3hlvwik3zj07xamkxbya85va2lsj6fkkkk20r"; sha256 = "0dyrllxgd74nknixjcz6n7m4gw70v246s8z1qss7zfl5yllhb712";
}; };
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];

17
pkgs/applications/audio/puredata/default.nix
View File

@ -1,30 +1,31 @@
{ stdenv, fetchurl, autoreconfHook, gettext, makeWrapper { stdenv, fetchurl, autoreconfHook, gettext, makeWrapper
, alsaLib, libjack2, tk , alsaLib, libjack2, tk, fftw
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "puredata-${version}"; name = "puredata-${version}";
version = "0.47-1"; version = "0.48-0";
src = fetchurl { src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
sha256 = "0k5s949kqd7yw97h3m8z81bjz32bis9m4ih8df1z0ymipnafca67"; sha256 = "0wy9kl2v00fl27x4mfzhbca415hpaisp6ls8a6mkl01qbw20krny";
}; };
patchPhase = ''
rm portaudio/configure.in
'';
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];
buildInputs = [ alsaLib libjack2 ]; buildInputs = [ alsaLib libjack2 fftw ];
configureFlags = '' configureFlags = ''
--enable-alsa --enable-alsa
--enable-jack --enable-jack
--enable-fftw
--disable-portaudio --disable-portaudio
''; '';
# https://github.com/pure-data/pure-data/issues/188
# --disable-oss
postInstall = '' postInstall = ''
wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin
''; '';

21
pkgs/applications/audio/qsampler/default.nix
View File

@ -1,21 +1,22 @@
{ stdenv, fetchsvn, autoconf, automake, liblscp, libtool, pkgconfig { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, qttools
, qt4 }: , liblscp, libgig, qtbase }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qsampler-svn-${version}"; name = "qsampler-${version}";
version = "2342"; version = "0.4.3";
src = fetchsvn { src = fetchurl {
url = "https://svn.linuxsampler.org/svn/qsampler/trunk"; url = "mirror://sourceforge/qsampler/${name}.tar.gz";
rev = "${version}"; sha256 = "1wg19022gyzy8rk9npfav9kz9z2qicqwwb2x5jz5hshzf3npx1fi";
sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];
buildInputs = [ autoconf automake liblscp libtool qt4 ]; buildInputs = [ liblscp libgig qtbase ];
preConfigure = "make -f Makefile.svn"; preConfigure = "make -f Makefile.svn";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.linuxsampler.org; homepage = http://www.linuxsampler.org;
description = "Graphical frontend to LinuxSampler"; description = "Graphical frontend to LinuxSampler";

10
pkgs/applications/audio/qsynth/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qt4 }: { stdenv, fetchurl, alsaLib, fluidsynth, libjack2, qtbase, qttools, qtx11extras, cmake, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qsynth-${version}"; name = "qsynth-${version}";
version = "0.3.9"; version = "0.4.4";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qsynth/${name}.tar.gz"; url = "mirror://sourceforge/qsynth/${name}.tar.gz";
sha256 = "08kyn6cl755l9i1grzjx8yi3f8mgiz4gx0hgqad1n0d8yz85087b"; sha256 = "0qhfnikx3xcllkvs60kj6vcf2rwwzh31y41qkk6kwfhzgd219y8f";
}; };
buildInputs = [ alsaLib fluidsynth libjack2 qt4 ]; nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ alsaLib fluidsynth libjack2 qtbase qttools qtx11extras ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Fluidsynth GUI"; description = "Fluidsynth GUI";

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "samplv1-${version}"; name = "samplv1-${version}";
version = "0.8.4"; version = "0.8.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz"; url = "mirror://sourceforge/samplv1/${name}.tar.gz";
sha256 = "107p2xsj066q2bil0xcgqrrn7lawp02wzf7qmlajcbnd79jhsi6i"; sha256 = "1gscwybsbaqbnylmgf2baf71cm2g7a0pd11rqmk3cz9hi3lyjric";
}; };
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];

2
pkgs/applications/audio/soundscape-renderer/default.nix
View File

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
homepage = http://spatialaudio.net/ssr/; homepage = http://spatialaudio.net/ssr/;
description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction";
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
maintainer = stdenv.lib.maintainers.fridh; maintainers = [ stdenv.lib.maintainers.fridh ];
}; };
} }

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

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "synthv1-${version}"; name = "synthv1-${version}";
version = "0.8.4"; version = "0.8.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz"; url = "mirror://sourceforge/synthv1/${name}.tar.gz";
sha256 = "0awk2zx0xa6vl6ah24zz0k2mwsx50hh5g1rh32mp790fp4x7l5s8"; sha256 = "0mvrqk6jy7h2wg442ixwm49w7x15rs4066c2ljrz4kvxlzp5z69i";
}; };
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ]; buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];

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

@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "yoshimi-${version}"; name = "yoshimi-${version}";
version = "1.5.3"; version = "1.5.4.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
sha256 = "0sns35pyw2f74xrv1fxiyf9g9415kvh2rrbdjd60hsiv584nlari"; sha256 = "1r5mgjlxyabm3nd3vcnfwywk46531vy2j3k8pjbfwadjkvp52vj6";
}; };
buildInputs = [ buildInputs = [

7
pkgs/applications/display-managers/lightdm/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit , intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils
, qt4 ? null , qt4 ? null
, withQt5 ? false, qtbase , withQt5 ? false, qtbase
}: }:
@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"
]; ];
prePatch = ''
substituteInPlace src/shared-data-manager.c \
--replace /bin/rm ${coreutils}/bin/rm
'';
meta = { meta = {
homepage = https://launchpad.net/lightdm; homepage = https://launchpad.net/lightdm;
platforms = platforms.linux; platforms = platforms.linux;

5
pkgs/applications/display-managers/sddm/default.nix
View File

@ -4,8 +4,7 @@
}: }:
let let
version = "0.17.0";
version = "0.16.0";
in mkDerivation rec { in mkDerivation rec {
name = "sddm-${version}"; name = "sddm-${version}";
@ -14,7 +13,7 @@ in mkDerivation rec {
owner = "sddm"; owner = "sddm";
repo = "sddm"; repo = "sddm";
rev = "v${version}"; rev = "v${version}";
sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; sha256 = "1m35ly6miwy8ivsln3j1bfv0nxbc4gyqnj7f847zzp53jsqrm3mq";
}; };
patches = [ ./sddm-ignore-config-mtime.patch ]; patches = [ ./sddm-ignore-config-mtime.patch ];

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

@ -27,9 +27,9 @@ in rec {
preview = mkStudio { preview = mkStudio {
pname = "android-studio-preview"; pname = "android-studio-preview";
version = "3.1.0.3"; # "Android Studio 3.1 Canary 4" version = "3.1.0.4"; # "Android Studio 3.1 Canary 5"
build = "171.4444016"; build = "171.4474551";
sha256Hash = "0qgd0hd3i3p1adv0xqa0409r5injw3ygs50lajzi99s33j6vdc6s"; sha256Hash = "0rgz1p67ra4q0jjb343xqm7c3yrpk1mly8r80cvpqqqq4xgfwa20";
meta = stable.meta // { meta = stable.meta // {
description = "The Official IDE for Android (preview version)"; description = "The Official IDE for Android (preview version)";

20
pkgs/applications/editors/ed/default.nix
View File

@ -11,27 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm"; sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
}; };
unpackCmd = "tar --lzip -xf";
nativeBuildInputs = [ lzip ]; nativeBuildInputs = [ lzip ];
/* FIXME: Tests currently fail on Darwin: doCheck = hostPlatform == buildPlatform;
building test scripts for ed-1.5...
testing ed-1.5...
*** Output e1.o of script e1.ed is incorrect ***
*** Output r3.o of script r3.ed is incorrect ***
make: *** [check] Error 127
*/
doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
installFlags = [ "DESTDIR=$(out)" ];
configureFlags = [
"--exec-prefix=${stdenv.cc.targetPrefix}"
"CC=${stdenv.cc.targetPrefix}cc"
];
meta = { meta = {
description = "An implementation of the standard Unix editor"; description = "An implementation of the standard Unix editor";

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

@ -175,10 +175,10 @@
}) {}; }) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex"; pname = "auctex";
version = "11.91.0"; version = "11.92.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar"; url = "https://elpa.gnu.org/packages/auctex-11.92.0.tar";
sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3"; sha256 = "147xfb64jxpl4262xrn4cxm6h86ybgr3aa1qq6vs6isnqczh7491";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -483,10 +483,10 @@
}) {}; }) {};
csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "csv-mode"; pname = "csv-mode";
version = "1.6"; version = "1.7";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/csv-mode-1.6.el"; url = "https://elpa.gnu.org/packages/csv-mode-1.7.el";
sha256 = "1v86qna1ypnr55spf6kjiqybplfbb8ak5gnnifh9vghsgb5jkb6a"; sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -755,10 +755,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild { elpaBuild {
pname = "el-search"; pname = "el-search";
version = "1.4.0.4"; version = "1.4.0.8";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.4.0.4.tar"; url = "https://elpa.gnu.org/packages/el-search-1.4.0.8.tar";
sha256 = "1l3wb0g6ipyi8yimxah0z6r83376l22pb2s9ba6kxfmhsq5wyc8a"; sha256 = "1gk42n04f1h2vc8sp86gvi795qgnvnh4cyyqfvy6sz1pfix76kfl";
}; };
packageRequires = [ emacs stream ]; packageRequires = [ emacs stream ];
meta = { meta = {
@ -959,10 +959,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "gnorb"; pname = "gnorb";
version = "1.3.2"; version = "1.3.4";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.3.2.tar"; url = "https://elpa.gnu.org/packages/gnorb-1.3.4.tar";
sha256 = "054z6bnfkf7qkgc9xynhzy9xrz780x4csj1r206jhslygjrlf1sj"; sha256 = "0yw46bzv80awd2zirwqc28bl70q1x431lqan71lm6qwli0bha2w0";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {
@ -1106,10 +1106,10 @@
}) {}; }) {};
ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "ivy"; pname = "ivy";
version = "0.9.1"; version = "0.10.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-0.9.1.tar"; url = "https://elpa.gnu.org/packages/ivy-0.10.0.tar";
sha256 = "1jfc3zf6ln7i8pp5j0fpsai2w847v5g77b5fzlxbgvj80g3v5887"; sha256 = "01m58inpd8jbfvzqsrwigzjfld9a66nf36cbya26dmdy7vwdm8xm";
}; };
packageRequires = [ emacs ]; packageRequires = [ emacs ];
meta = { meta = {
@ -1584,10 +1584,10 @@
}) {}; }) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20171127"; version = "20171205";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20171127.tar"; url = "https://elpa.gnu.org/packages/org-20171205.tar";
sha256 = "18a77yzfkx7x1pckc9c274b2fpswrcqz19nansvbqdr1harzvd20"; sha256 = "0a1rm94ci47jf5579sxscily680ysmy3hnxjcs073n45nk76za04";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -1986,6 +1986,19 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
sql-indent = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "sql-indent";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/sql-indent-1.0.tar";
sha256 = "02cmi96mqk3bfmdh0xv5s0qx310cirs6kq0jqwk1ga41rpp596vl";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/sql-indent.html";
license = lib.licenses.free;
};
}) {};
stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "stream"; pname = "stream";
version = "2.2.4"; version = "2.2.4";

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

File diff suppressed because it is too large Load Diff

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

@ -233,12 +233,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild { melpaBuild {
pname = "ac-clang"; pname = "ac-clang";
version = "1.9.2"; version = "2.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yaruopooner"; owner = "yaruopooner";
repo = "ac-clang"; repo = "ac-clang";
rev = "ee692f7cde535f317e440a132b8e60b7c5e34dfd"; rev = "d14b0898f88c9f2911ebf68c1cbaae09e28b534a";
sha256 = "0zg39brrpgdakb6hbylala6ajja09nhbzqf4xl9nzwc7gzpgfl57"; sha256 = "02f8avxvcpr3ns4f0dw72jfx9c89aib5c2j54qcfz66fhka9jnvq";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@ -548,12 +548,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild { melpaBuild {
pname = "ac-php"; pname = "ac-php";
version = "1.9"; version = "2.0pre";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "16e6647115d848085a99e77a21a3db51bec4a288"; rev = "67585f13841b70da298f2cfbf7d0343c4ceb41f1";
sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a"; sha256 = "09n833dcqv776vr5k5r0y7fgywhmminxshiy0l5l5xvm1yhxr77a";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@ -569,12 +569,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild { melpaBuild {
pname = "ac-php-core"; pname = "ac-php-core";
version = "1.9"; version = "2.0pre";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "16e6647115d848085a99e77a21a3db51bec4a288"; rev = "67585f13841b70da298f2cfbf7d0343c4ceb41f1";
sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a"; sha256 = "09n833dcqv776vr5k5r0y7fgywhmminxshiy0l5l5xvm1yhxr77a";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@ -5234,12 +5234,12 @@
company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "company-eshell-autosuggest"; pname = "company-eshell-autosuggest";
version = "1.0.1"; version = "1.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dieggsy"; owner = "dieggsy";
repo = "company-eshell-autosuggest"; repo = "company-eshell-autosuggest";
rev = "a1de14ae79c720fa681fafa000b2650c42cf5050"; rev = "3fed7c38aca0d94185d6787e26a02f324f1d8870";
sha256 = "1l4fc6crkm1yhbcidrdi19dirnyhjdfdyyz67s6va1i0v3gx0w6w"; sha256 = "17wxac9cj6564c70415vqb805kmk0pk35c1xgyma78gmr3ra8i80";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest";
@ -5444,12 +5444,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "company-php"; pname = "company-php";
version = "1.9"; version = "2.0pre";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "16e6647115d848085a99e77a21a3db51bec4a288"; rev = "67585f13841b70da298f2cfbf7d0343c4ceb41f1";
sha256 = "1i75wm063z9wsmwqqkk6nscspy06p301zm304cd9fyy2cyjbk81a"; sha256 = "09n833dcqv776vr5k5r0y7fgywhmminxshiy0l5l5xvm1yhxr77a";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@ -5954,12 +5954,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild { melpaBuild {
pname = "counsel"; pname = "counsel";
version = "0.9.1"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "abo-abo"; owner = "abo-abo";
repo = "swiper"; repo = "swiper";
rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@ -5972,22 +5972,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "counsel-bbdb"; pname = "counsel-bbdb";
version = "0.0.2"; version = "0.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "redguardtoo"; owner = "redguardtoo";
repo = "counsel-bbdb"; repo = "counsel-bbdb";
rev = "f95e4812cd17e5f8069c9209241396780d414680"; rev = "c86f4b9ef99c9db0b2c4196a300d61300dc2d0c1";
sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73"; sha256 = "1dchyg8cs7n0zbj6mr2z840yi06b2wja65k04idlcs6ngy1vc3sr";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb"; url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp"; sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
name = "counsel-bbdb"; name = "counsel-bbdb";
}; };
packageRequires = []; packageRequires = [ emacs ivy ];
meta = { meta = {
homepage = "https://melpa.org/#/counsel-bbdb"; homepage = "https://melpa.org/#/counsel-bbdb";
license = lib.licenses.free; license = lib.licenses.free;
@ -7022,6 +7022,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
difflib = callPackage ({ cl-generic, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "difflib";
version = "0.3.7";
src = fetchFromGitHub {
owner = "dieggsy";
repo = "difflib.el";
rev = "56032966934dae5ac04764d2580d3dbadb0345ef";
sha256 = "18m67w0ly4wlm417l3hrkqb7jzd4zbzr9sasg01gpyhvxv73hh9m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3/recipes/difflib";
sha256 = "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6";
name = "difflib";
};
packageRequires = [ cl-generic emacs ht s ];
meta = {
homepage = "https://melpa.org/#/difflib";
license = lib.licenses.free;
};
}) {};
diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "diffview"; pname = "diffview";
@ -7746,12 +7767,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "doom-themes"; pname = "doom-themes";
version = "1.2.5"; version = "2.0.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hlissner"; owner = "hlissner";
repo = "emacs-doom-themes"; repo = "emacs-doom-themes";
rev = "d04875c9c7ce21d5f51dfc541a5d03efddac7728"; rev = "8ff86e456b22ab4c28605c44e544b3ef0b4b4637";
sha256 = "0lfldrsfldrnw9g59dnsmyyp7j3v3kqv0d39h4kzs9dhm5v9dpbr"; sha256 = "0zfr6487hvn08dc9hhwf2snhd3ds4kfaglribxddx38dhd87hk73";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@ -8207,12 +8228,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "easy-hugo"; pname = "easy-hugo";
version = "2.3.18"; version = "2.4.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "masasam"; owner = "masasam";
repo = "emacs-easy-hugo"; repo = "emacs-easy-hugo";
rev = "e4dc1057b02b6736221936e66c188cf71c01916d"; rev = "18f72a16972d105dcff2d9e723a50d2a3385d0a6";
sha256 = "0knld86pl2im9mjy4s7mxxibdyc4sq9vhxg4jrndyrmldpjya4my"; sha256 = "0qpbb9hr9d0bvjphnbz9v82mdkjaiychy99agcc5i0wr5ylqh593";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -8225,6 +8246,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-jekyll";
version = "1.2.10";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-jekyll";
rev = "8060e6e37abf67bad262c3064cecead22e9a5e4f";
sha256 = "12wwgv0kddkx8bs45c8xhxvjb7qzv7y2mskz5v0d3mip67c7iagz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
sha256 = "16jj70fr23z5qsaijv4d4xfiiypny2cama8rsaci9fk9haq19lxv";
name = "easy-jekyll";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/easy-jekyll";
license = lib.licenses.free;
};
}) {};
easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "easy-kill"; pname = "easy-kill";
@ -10754,6 +10796,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
melpaBuild {
pname = "eterm-256color";
version = "0.3.10";
src = fetchFromGitHub {
owner = "dieggsy";
repo = "eterm-256color";
rev = "bfcba21f45163361f54779c81bc1799f7a270857";
sha256 = "16f9fmg15khwca0fgm1sl85jarqlimc6mwrc7az8ga79153nlcb3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
sha256 = "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b";
name = "eterm-256color";
};
packageRequires = [ emacs f xterm-color ];
meta = {
homepage = "https://melpa.org/#/eterm-256color";
license = lib.licenses.free;
};
}) {};
ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ethan-wspace"; pname = "ethan-wspace";
@ -11156,12 +11219,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "evil-nerd-commenter"; pname = "evil-nerd-commenter";
version = "3.1.2"; version = "3.1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "redguardtoo"; owner = "redguardtoo";
repo = "evil-nerd-commenter"; repo = "evil-nerd-commenter";
rev = "76fd0c5692e9852a2d6fc6c0ce0e782792c28ddd"; rev = "41d43709210711c07de69497c5f7db646b7e7a96";
sha256 = "1bydqdk52q8777m234jxp03y2zz23204r1fyq39ks9h9bpglc561"; sha256 = "04xjbsgydfb3mi2jg5fkkvp0rvjpx3mdx8anxzjqzdry7nir3m14";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@ -11366,12 +11429,12 @@
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "evil-surround"; pname = "evil-surround";
version = "1.0.0"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emacs-evil"; owner = "emacs-evil";
repo = "evil-surround"; repo = "evil-surround";
rev = "7a0358ce3eb9ed01744170fa8a1e12d98f8b8839"; rev = "f6162a7b5a65a297c8ebb8a81ce6e1278f958bbc";
sha256 = "1smv7sqhm1l2bi9fmispnlmjssidblwkmiiycj1n3ag54q27z031"; sha256 = "0kqkji4yn4khfrgghwkzgbh687fs3p07lj61x4i7w1ay1416lvn9";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@ -12926,12 +12989,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "flycheck-pycheckers"; pname = "flycheck-pycheckers";
version = "0.4"; version = "0.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "msherry"; owner = "msherry";
repo = "flycheck-pycheckers"; repo = "flycheck-pycheckers";
rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e"; rev = "6f7c6d7db4d3209897c4b15511bfaed4562ac5e4";
sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k"; sha256 = "0mg2165zsrkn8w7anjyrfgkr66ynhm1fv43f5p8wg6g0afss9763";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@ -14467,12 +14530,12 @@
ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ghub"; pname = "ghub";
version = "1.2.0"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "magit"; owner = "magit";
repo = "ghub"; repo = "ghub";
rev = "da60fa2316bf829cab18676afd5a43088ac06b60"; rev = "d8ec78184ec82d363fb0ac5bab724f390ee71d3d";
sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs"; sha256 = "194nf5kjkxgxqjmxlr9q6r4p9kxcsm9qx8pcagxbhvmfyh6km71h";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub"; url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
@ -16074,12 +16137,12 @@
green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "green-screen-theme"; pname = "green-screen-theme";
version = "1.0.0.1"; version = "1.0.24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rbanffy"; owner = "rbanffy";
repo = "green-screen-emacs"; repo = "green-screen-emacs";
rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e"; rev = "c348ea0adf0e6ae99294a05be183a7b425a4bab0";
sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn"; sha256 = "1rqhac5j06gpc9gp44g4r3zdkw1baskwrz3bw1n1haw4a1k0657q";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@ -18315,22 +18378,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild { melpaBuild {
pname = "helpful"; pname = "helpful";
version = "0.2"; version = "0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Wilfred"; owner = "Wilfred";
repo = "helpful"; repo = "helpful";
rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050"; rev = "51717041e5cec6f5ce695c32323efc8dd86fbe88";
sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm"; sha256 = "1zy7q3f12c159h4f1jf73ffchjfwmjb76wligpaih7ay7x6hh9mn";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2"; sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
name = "helpful"; name = "helpful";
}; };
packageRequires = [ dash elisp-refs emacs s ]; packageRequires = [ dash elisp-refs emacs s shut-up ];
meta = { meta = {
homepage = "https://melpa.org/#/helpful"; homepage = "https://melpa.org/#/helpful";
license = lib.licenses.free; license = lib.licenses.free;
@ -20228,12 +20291,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ivy"; pname = "ivy";
version = "0.9.1"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "abo-abo"; owner = "abo-abo";
repo = "swiper"; repo = "swiper";
rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@ -20333,12 +20396,12 @@
ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ivy-hydra"; pname = "ivy-hydra";
version = "0.9.1"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "abo-abo"; owner = "abo-abo";
repo = "swiper"; repo = "swiper";
rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@ -20790,22 +20853,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: js-comint = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "js-comint"; pname = "js-comint";
version = "1.1.0"; version = "1.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "redguardtoo"; owner = "redguardtoo";
repo = "js-comint"; repo = "js-comint";
rev = "2c19fafed953ea0972ff086614f86614f4d5dc13"; rev = "83e932e4a83d1a69098ee87e0ab911d299368e60";
sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp"; sha256 = "1r2fwsdfkbqnm4n4dwlp7gc267ghj4vd0naj431w7pl529dmrb6x";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
name = "js-comint"; name = "js-comint";
}; };
packageRequires = []; packageRequires = [ emacs ];
meta = { meta = {
homepage = "https://melpa.org/#/js-comint"; homepage = "https://melpa.org/#/js-comint";
license = lib.licenses.free; license = lib.licenses.free;
@ -21213,12 +21276,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "kaolin-themes"; pname = "kaolin-themes";
version = "1.0.5"; version = "1.0.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ogdenwebb"; owner = "ogdenwebb";
repo = "emacs-kaolin-themes"; repo = "emacs-kaolin-themes";
rev = "08e13adfab07c9cf7b0df313c77eac8fb393b284"; rev = "acf37448ffe25464e39730939091c70be305f811";
sha256 = "0wijf5493wmp219ypbvhp0c4q76igrxijzdalbgkyp2gf8xvq6b4"; sha256 = "1b28mf5z594dxv3a5073syqdgl5hc63xcy8irqjj7x94xjpb9qis";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@ -22207,12 +22270,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "live-py-mode"; pname = "live-py-mode";
version = "2.19.1"; version = "2.19.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "donkirkby"; owner = "donkirkby";
repo = "live-py-plugin"; repo = "live-py-plugin";
rev = "b6627fdd25fe6d866fe5a53c8bf7923ffd8ab9f9"; rev = "2a3b716056aad04ef8668856323a4b8678173fab";
sha256 = "1z17z58rp65qln6lv2l390df2bf6dpnrqdh0q352r4wqzzki8gqn"; sha256 = "1dbx9wn7xca02sf72y76s31b5sjcmmargjhn90ygiqzbxapm0xcb";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@ -23417,12 +23480,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild { melpaBuild {
pname = "meghanada"; pname = "meghanada";
version = "0.8.3"; version = "0.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mopemope"; owner = "mopemope";
repo = "meghanada-emacs"; repo = "meghanada-emacs";
rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5"; rev = "555b8b9ea8ef56dda645ea605b38501cb4222b12";
sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8"; sha256 = "1z3vvasah4gq6byq4ibkihy5mbch5zzxnn0gy86jldapwi1z74sq";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@ -24172,12 +24235,12 @@
mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "mowedline"; pname = "mowedline";
version = "3.2.0"; version = "3.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "retroj"; owner = "retroj";
repo = "mowedline"; repo = "mowedline";
rev = "832e81b7f90f6c2e753f89737c0b57a260544424"; rev = "7a572c0d87098336777efde5abdeaf2bcd11b95e";
sha256 = "1ll0ywrzpc5ignddgri8xakf93q1rg8zf7h23hfv8jiiwv3240w5"; sha256 = "1vky6sa1667pc4db8j2a4f26kwwc2ql40qhvpvp81a6wikyzf2py";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@ -24277,12 +24340,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "msvc"; pname = "msvc";
version = "1.3.5"; version = "1.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yaruopooner"; owner = "yaruopooner";
repo = "msvc"; repo = "msvc";
rev = "bb9af3aee0e82d6a78a49a9af61ce47fab32d577"; rev = "093f6d4eecfbfc67650644ebb637a4f1c31c08fa";
sha256 = "1vxgdc19jiamymrazikdikdrhw5vmzanzr326s3rx7sbc2nb7lrk"; sha256 = "0pvxrgpbwn748rs25hhvlvxcm83vrysk7wf8lpm6ly8xm07yj14i";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@ -25635,22 +25698,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "olivetti"; pname = "olivetti";
version = "1.5.8"; version = "1.5.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rnkn"; owner = "rnkn";
repo = "olivetti"; repo = "olivetti";
rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674"; rev = "35d275d8bdfc5107c25db5a4995b65ba936f1d56";
sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn"; sha256 = "00havcpsbk54xfcys9lhm9sv1d753jk3cmvssa2c52pp5frpxz3i";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd"; sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
name = "olivetti"; name = "olivetti";
}; };
packageRequires = []; packageRequires = [ emacs ];
meta = { meta = {
homepage = "https://melpa.org/#/olivetti"; homepage = "https://melpa.org/#/olivetti";
license = lib.licenses.free; license = lib.licenses.free;
@ -28604,12 +28667,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "php-mode"; pname = "php-mode";
version = "1.18.2"; version = "1.18.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ejmr"; owner = "ejmr";
repo = "php-mode"; repo = "php-mode";
rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3"; rev = "ad7d1092e1d66602482c5b54ed0609c6171dcae1";
sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr"; sha256 = "03yp07dxmxmhm8p5qcxsfdidhvnrpls20nr234cz6yamjl5zszh6";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@ -29681,12 +29744,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "protobuf-mode"; pname = "protobuf-mode";
version = "3.5.0"; version = "3.5.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "protobuf"; repo = "protobuf";
rev = "2761122b810fe8861004ae785cc3ab39f384d342"; rev = "457f6a607ce167132b833c049b0eaf3a9c4b3f5f";
sha256 = "01z3p947hyzi3p42fiqnx6lskz4inqw89lp2agqj9wfyfvag3369"; sha256 = "10pchdarigxrgy9akv2vdkkmjlxcly88ybycvbkwljpr98xg9xjp";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@ -34487,12 +34550,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild { melpaBuild {
pname = "swift-mode"; pname = "swift-mode";
version = "3.0"; version = "4.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "chrisbarrett"; owner = "chrisbarrett";
repo = "swift-mode"; repo = "swift-mode";
rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; rev = "18c3dc47dfece59640ad501266f2e47b918f2a14";
sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; sha256 = "0qk962xzxm8si1h5p7vdnqw7xcaxdjxsaz1yad11pvn9l2b2zpzq";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@ -34529,12 +34592,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "swiper"; pname = "swiper";
version = "0.9.1"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "abo-abo"; owner = "abo-abo";
repo = "swiper"; repo = "swiper";
rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa"; rev = "4a2cee03519f98cf95b29905dec2566a39ff717e";
sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf"; sha256 = "14vnigqb5c3yi4q9ysw1fiwdqyqwyklqpb9wnjf81chm7s2mshnr";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@ -35410,12 +35473,12 @@
thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "thrift"; pname = "thrift";
version = "0.10.0"; version = "0.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "apache"; owner = "apache";
repo = "thrift"; repo = "thrift";
rev = "b2a4d4ae21c789b689dd162deb819665567f481c"; rev = "327ebb6c2b6df8bf075da02ef45a2a034e9b79ba";
sha256 = "1b1fnzhy5qagbzhphgjxysad64kcq9ggcvp0wb7c7plrps72xfjh"; sha256 = "1scv403g5a2081awg5za5d3parj1lg63llnnac11d6fn7j7ms99p";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@ -35452,12 +35515,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild { melpaBuild {
pname = "tide"; pname = "tide";
version = "2.6.1"; version = "2.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ananthakumaran"; owner = "ananthakumaran";
repo = "tide"; repo = "tide";
rev = "e7ffcdcf9f68205d1498137e84a731c7ffb86263"; rev = "1ee2e6e5f6e22b180af08264e5654b26599f96fe";
sha256 = "0lym5jb2fxv4zjhik4q5miazrsi96pljl6fw5jjh0i9p8xs0yp4x"; sha256 = "0gd149vlf3297lm595xw3hc9jd45wisbrpbr505qhkffrj60q1lq";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@ -36347,8 +36410,8 @@
sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang"; sha256 = "14x01dg7fgj4icf8l8w90pksazc0sn6qrrd0k3xjr2zg1wzdcang";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; url = "https://raw.githubusercontent.com/milkypostman/melpa/51a19a251c879a566d4ae451d94fcb35e38a478b/recipes/use-package";
sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8"; sha256 = "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp";
name = "use-package"; name = "use-package";
}; };
packageRequires = [ bind-key diminish ]; packageRequires = [ bind-key diminish ];

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

@ -1,10 +1,10 @@
{ callPackage }: { { callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20171127"; version = "20171205";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-20171127.tar"; url = "http://orgmode.org/elpa/org-20171205.tar";
sha256 = "0q9mbkyridz6zxkpcm7yk76iyliij1wy5sqqpcd8s6y5zy52zqwl"; sha256 = "0n8v5x50p8p52wwszzhf5y39ll2aaackvi64ldchnj06lqy3ni88";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -14,10 +14,10 @@
}) {}; }) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib"; pname = "org-plus-contrib";
version = "20171127"; version = "20171205";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20171127.tar"; url = "http://orgmode.org/elpa/org-plus-contrib-20171205.tar";
sha256 = "0759g1lnwm9fz130cigvq5y4gigbk3wdc5yvz34blnl57ghir2k8"; sha256 = "1y61csa284gy8l0fj0mv67mkm4fsi4lz401987qp6a6z260df4n5";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

7
pkgs/applications/gis/qgis/default.nix
View File

@ -5,7 +5,7 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qgis-2.18.14"; name = "qgis-2.18.15";
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
# `make -f src/providers/wms/CMakeFiles/wmsprovider_a.dir/build.make src/providers/wms/CMakeFiles/wmsprovider_a.dir/qgswmssourceselect.cpp.o`:
# fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
#enableParallelBuilding = true; enableParallelBuilding = false;
# To handle the lack of 'local' RPATH; required, as they call one of # To handle the lack of 'local' RPATH; required, as they call one of
# their built binaries requiring their libs, in the build process. # their built binaries requiring their libs, in the build process.
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2"; url = "http://qgis.org/downloads/${name}.tar.bz2";
sha256 = "199nc539kd8fxbfny61s4sv8bvrhlxw59dmvw6m70gnff6mpc8fq"; sha256 = "1jpprkk91s2wwx0iiqlnsngxnn52zs32bad799fjai58nrsh8b7b";
}; };
cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";

4
pkgs/applications/graphics/ImageMagick/7.0.nix
View File

@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform."; else throw "ImageMagick is not supported on this platform.";
cfg = { cfg = {
version = "7.0.7-9"; version = "7.0.7-14";
sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w"; sha256 = "04hpc9i6fp09iy0xkidlfhfqr7zg45izqqj5fx93n3dxalq65xqw";
patches = []; patches = [];
}; };
in in

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@ -14,8 +14,8 @@ let
else throw "ImageMagick is not supported on this platform."; else throw "ImageMagick is not supported on this platform.";
cfg = { cfg = {
version = "6.9.9-23"; version = "6.9.9-26";
sha256 = "0cd6zcbcfvznf0i3q4xz1c4wm4cfplg4zc466lvlb1w8qbn25948"; sha256 = "10rcq7b9hhz50m4yqnm4g3iai7lr9jkglb7sm49ycw59arrkmwnw";
patches = []; patches = [];
} }
# Freeze version on mingw so we don't need to port the patch too often. # Freeze version on mingw so we don't need to port the patch too often.

5
pkgs/applications/graphics/awesomebump/default.nix
View File

@ -15,6 +15,7 @@ let
name = "qtnproperty"; name = "qtnproperty";
inherit src; inherit src;
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
patches = [ ./qtnproperty-parallel-building.patch ];
buildInputs = [ qtscript qtbase qtdeclarative ]; buildInputs = [ qtscript qtbase qtdeclarative ];
nativeBuildInputs = [ qmake flex bison ]; nativeBuildInputs = [ qmake flex bison ];
postInstall = '' postInstall = ''
@ -46,6 +47,10 @@ in stdenv.mkDerivation rec {
--run "cd $d" --run "cd $d"
''; '';
# $ cd Sources; qmake; make ../workdir/linux-g++-dgb-gl4/obj/glwidget.o
# fatal error: properties/ImageProperties.peg.h: No such file or directory
enableParallelBuilding = false;
meta = { meta = {
homepage = https://github.com/kmkolasinski/AwesomeBump; homepage = https://github.com/kmkolasinski/AwesomeBump;
description = "A program to generate normal, height, specular or ambient occlusion textures from a single image"; description = "A program to generate normal, height, specular or ambient occlusion textures from a single image";

9
pkgs/applications/graphics/awesomebump/qtnproperty-parallel-building.patch Normal file
View File

@ -0,0 +1,9 @@
--- a/PEG/Flex.pri
+++ b/PEG/Flex.pri
@@ -1,5 +1,6 @@
flex.name = Flex ${QMAKE_FILE_IN}
flex.input = FLEX_SOURCES
+flex.depends = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.parser.cpp
flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp
win32:flex.commands = win_flex --wincompat -o ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}

6
pkgs/applications/graphics/digikam/default.nix
View File

@ -99,8 +99,6 @@ mkDerivation rec {
threadweaver threadweaver
]; ];
enableParallelBuilding = true;
cmakeFlags = [ cmakeFlags = [
"-DENABLE_MYSQLSUPPORT=1" "-DENABLE_MYSQLSUPPORT=1"
"-DENABLE_INTERNALMYSQL=1" "-DENABLE_INTERNALMYSQL=1"
@ -124,6 +122,10 @@ mkDerivation rec {
patchFlags = "-d core -p1"; patchFlags = "-d core -p1";
# `en make -f core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/build.make core/utilities/assistants/expoblending/CMakeFiles/expoblending_src.dir/manager/expoblendingthread.cpp.o`:
# digikam_version.h:37:24: fatal error: gitversion.h: No such file or directory
enableParallelBuilding = false;
meta = with lib; { meta = with lib; {
description = "Photo Management Program"; description = "Photo Management Program";
license = licenses.gpl2; license = licenses.gpl2;

4
pkgs/applications/graphics/graphicsmagick/default.nix
View File

@ -2,14 +2,14 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
, libwebp, quantumdepth ? 8, fixDarwinDylibNames }: , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
let version = "1.3.26"; in let version = "1.3.27"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "graphicsmagick-${version}"; name = "graphicsmagick-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
sha256 = "122zgs96dqrys62mnh8x5yvfff6km4d3yrnvaxzg3mg5sprib87v"; sha256 = "0rq35p3rml10cxz2z4s7xcfsilhhk19mmy094g3ivz0fg797hcnh";
}; };
patches = [ patches = [

66
pkgs/applications/graphics/meshlab/default.nix
View File

@ -1,51 +1,65 @@
{ stdenv, fetchurl, qt4, bzip2, lib3ds, levmar, muparser, unzip, vcg }: { stdenv, fetchFromGitHub, mesa_glu, qtbase, qtscript, qtxmlpatterns }:
stdenv.mkDerivation rec { let
name = "meshlab-1.3.3"; meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662";
vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803";
in stdenv.mkDerivation {
name = "meshlab-2016.12";
src = fetchurl { srcs =
url = "mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.3/MeshLabSrc_AllInc_v133.tgz"; [
sha256 = "03wqaibfbfag2w1zi1a5z6h546r9d7pg2sjl5pwg24w7yp8rr0n9"; (fetchFromGitHub {
}; owner = "cnr-isti-vclab";
repo = "meshlab";
rev = meshlabRev;
sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc";
name = "meshlab-${meshlabRev}";
})
(fetchFromGitHub {
owner = "cnr-isti-vclab";
repo = "vcglib";
rev = vcglibRev;
sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f";
name = "vcglib-${vcglibRev}";
})
];
# I don't know why I need this; without this, the rpath set at the beginning of the sourceRoot = "meshlab-${meshlabRev}";
# buildPhase gets removed from the 'meshlab' binary
dontPatchELF = true;
patches = [ ./include-unistd.diff ]; patches = [ ./fix-2016.02.patch ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
enableParallelBuilding = true;
buildPhase = '' buildPhase = ''
mkdir -p "$out/include" # MeshLab has ../vcglib hardcoded everywhere, so move the source dir
mv ../vcglib-${vcglibRev} ../vcglib
cd src
export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS"
cd meshlab/src
pushd external pushd external
qmake -recursive external.pro qmake -recursive external.pro
make buildPhase
popd popd
qmake -recursive meshlab_full.pro qmake -recursive meshlab_full.pro
make buildPhase
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/opt/meshlab $out/bin $out/lib mkdir -p $out/opt/meshlab $out/bin
pushd distrib cp -Rv distrib/* $out/opt/meshlab
cp -R * $out/opt/meshlab
popd
ln -s $out/opt/meshlab/meshlab $out/bin/meshlab ln -s $out/opt/meshlab/meshlab $out/bin/meshlab
ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver
''; '';
sourceRoot = "."; buildInputs = [ mesa_glu qtbase qtscript qtxmlpatterns ];
buildInputs = [ qt4 unzip vcg ];
meta = { meta = {
description = "System for the processing and editing of unstructured 3D triangular meshes"; description = "A system for processing and editing 3D triangular meshes.";
homepage = http://meshlab.sourceforge.net/; homepage = http://www.meshlab.net/;
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
broken = true;
}; };
} }

88
pkgs/applications/graphics/meshlab/fix-2016.02.patch Normal file
View File

@ -0,0 +1,88 @@
From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001
From: Marco Callieri <callieri@isti.cnr.it>
Date: Mon, 9 Jan 2017 16:06:14 +0100
Subject: [PATCH 1/3] resolved ambiguity for abs overloads
diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp
index 364d53bf..ef3d4a2d 100644
--- a/src/meshlabplugins/edit_quality/eqhandle.cpp
+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp
@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
setCursor(Qt::OpenHandCursor);
QPointF newPos = event->scenePos();
- qreal handleOffset = abs(newPos.x()-pos().x());
+ qreal handleOffset = std::fabs(newPos.x()-pos().x());
if (handleOffset >= std::numeric_limits<float>::epsilon())
{
--
2.15.0
From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001
From: Marco Callieri <callieri@isti.cnr.it>
Date: Tue, 10 Jan 2017 10:05:05 +0100
Subject: [PATCH 2/3] again, fabs ambiguity
diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp
index ef3d4a2d..d29f8c45 100644
--- a/src/meshlabplugins/edit_quality/eqhandle.cpp
+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp
@@ -30,6 +30,7 @@ FIRST RELEASE
#include "eqhandle.h"
#include <QMouseEvent>
#include <QGraphicsSceneMouseEvent>
+#include <math.h>
EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position,
EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox,
@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
setCursor(Qt::OpenHandCursor);
QPointF newPos = event->scenePos();
- qreal handleOffset = std::fabs(newPos.x()-pos().x());
+ qreal handleOffset = fabs(newPos.x()-pos().x());
if (handleOffset >= std::numeric_limits<float>::epsilon())
{
--
2.15.0
From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001
From: Patrick Chilton <chpatrick@gmail.com>
Date: Mon, 4 Dec 2017 21:27:23 +0100
Subject: [PATCH 3/3] io_TXT -> io_txt
diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro
index 6ea7f1db..2a95c127 100644
--- a/src/meshlab_full.pro
+++ b/src/meshlab_full.pro
@@ -16,7 +16,7 @@ SUBDIRS = common \
meshlabplugins/io_x3d \
meshlabplugins/io_expe \
meshlabplugins/io_pdb \
- plugins_experimental/io_TXT \
+ plugins_experimental/io_txt \
# Filter plugins
meshlabplugins/filter_aging \
meshlabplugins/filter_ao \
diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp
similarity index 100%
rename from src/plugins_experimental/io_TXT/io_txt.cpp
rename to src/plugins_experimental/io_txt/io_txt.cpp
diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h
similarity index 100%
rename from src/plugins_experimental/io_TXT/io_txt.h
rename to src/plugins_experimental/io_txt/io_txt.h
diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro
similarity index 100%
rename from src/plugins_experimental/io_TXT/io_txt.pro
rename to src/plugins_experimental/io_txt/io_txt.pro
--
2.15.0

13
pkgs/applications/graphics/meshlab/include-unistd.diff
View File

@ -1,13 +0,0 @@
*** old/vcglib/wrap/ply/plystuff.h 2013-02-09 00:00:04.110705851 -0500
--- new/vcglib/wrap/ply/plystuff.h 2013-02-09 15:20:53.482205183 -0500
***************
*** 75,80 ****
--- 75,81 ----
#define pb_close _close
#define DIR_SEP "\\"
#else
+ #include <unistd.h>
#define pb_mkdir(n) mkdir(n,0755)
#define pb_access access
#define pb_stat stat

6
pkgs/applications/graphics/pinta/default.nix
View File

@ -56,9 +56,9 @@ buildDotnetPackage rec {
''; '';
makeWrapperArgs = [ makeWrapperArgs = [
''--prefix MONO_GAC_PREFIX ':' "${gtksharp}"'' ''--prefix MONO_GAC_PREFIX : ${gtksharp}''
''--prefix LD_LIBRARY_PATH ':' "${gtksharp}/lib"'' ''--prefix LD_LIBRARY_PATH : ${gtksharp}/lib''
''--prefix LD_LIBRARY_PATH ':' "${gtksharp.gtk.out}/lib"'' ''--prefix LD_LIBRARY_PATH : ${gtksharp.gtk.out}/lib''
]; ];
postInstall = '' postInstall = ''

4
pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake
View File

@ -1,4 +0,0 @@
set(GIT_BRANCH master)
set(GIT_VERSION 4.2.1115)
set(GIT_CHANGESET 0821eea7b6a4ac2fce1fcf644e06078e161e41e3)
set(GIT_TAGDISTANCE 1115)

4
pkgs/applications/graphics/rawtherapee/default.nix
View File

@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7"; sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
buildInputs = [ buildInputs = [
cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp pixman libpthreadstubs gtkmm3 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun
]; ];

37
pkgs/applications/graphics/rawtherapee/dev.nix
View File

@ -1,37 +0,0 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
}:
stdenv.mkDerivation rec {
name = "rawtherapee-git-2016-10-10";
src = fetchFromGitHub {
owner = "Beep6581";
repo = "RawTherapee";
rev = "0821eea7b6a4ac2fce1fcf644e06078e161e41e3";
sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ];
NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
# Copy generated ReleaseInfo.cmake so we don't need git. File was
# generated manually using `./tools/generateReleaseInfo` in the
# source folder. Make sure to regenerate it when updating.
preConfigure = ''
cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake
'';
enableParallelBuilding = true;
meta = {
description = "RAW converter and digital photo processing software";
homepage = http://www.rawtherapee.com/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ];
platforms = with stdenv.lib.platforms; linux;
};
}

23
pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch
View File

@ -1,23 +0,0 @@
From ca0afa8d5f3cc7d09b6bab32d155a87c550f0d7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=B6ssie?= <floessie.mail@gmail.com>
Date: Sat, 1 Oct 2016 12:38:24 +0200
Subject: [PATCH] Fix incompatibility with glibmm 2.50 (#3440)
Kudos to @Hombre57 for the suggestion.
---
rtgui/dirbrowser.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc
index d3fc8bf..6f25f0f 100644
--- a/rtgui/dirbrowser.cc
+++ b/rtgui/dirbrowser.cc
@@ -59,7 +59,7 @@ std::vector<Glib::ustring> listSubDirs (const Glib::RefPtr<Gio::File>& dir, bool
} catch (const Glib::Exception& exception) {
if (options.rtSettings.verbose) {
- std::cerr << "Failed to list subdirectories of \"" << dir << "\": " << exception.what () << std::endl;
+ std::cerr << "Failed to list subdirectories of \"" << dir->get_basename() << "\": " << exception.what () << std::endl;
}
}

15
pkgs/applications/graphics/solvespace/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre , json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre
, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "solvespace-2.3-20170808"; name = "solvespace-2.3-20170808";
@ -11,9 +12,11 @@ stdenv.mkDerivation rec {
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [
pkgconfig cmake wrapGAppsHook
];
buildInputs = [ buildInputs = [
cmake zlib libpng cairo freetype zlib libpng cairo freetype
json_c fontconfig gtkmm3 pangomm glew mesa_glu json_c fontconfig gtkmm3 pangomm glew mesa_glu
xlibs.libpthreadstubs xlibs.libXdmcp pcre xlibs.libpthreadstubs xlibs.libXdmcp pcre
]; ];
@ -38,11 +41,11 @@ stdenv.mkDerivation rec {
--replace /usr/bin/ $out/bin/ --replace /usr/bin/ $out/bin/
''; '';
meta = { meta = with stdenv.lib; {
description = "A parametric 3d CAD program"; description = "A parametric 3d CAD program";
license = stdenv.lib.licenses.gpl3; license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ edef ]; maintainers = [ maintainers.edef ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
homepage = http://solvespace.com; homepage = http://solvespace.com;
}; };
} }

2
pkgs/applications/graphics/unigine-valley/default.nix
View File

@ -22,7 +22,7 @@ let
else if stdenv.system == "i686-linux" then else if stdenv.system == "i686-linux" then
"x86" "x86"
else else
abort "Unsupported platform"; throw "Unsupported platform ${stdenv.system}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

31
pkgs/applications/misc/airspy/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub
, cmake , pkgconfig, libusb
}:
let
version = "1.0.9";
in
stdenv.mkDerivation {
name = "airspy-${version}";
src = fetchFromGitHub {
owner = "airspy";
repo = "airspyone_host";
rev = "v${version}";
sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libusb ];
cmakeFlags = [ "-DINSTALL_UDEV_RULES=OFF" ];
meta = with stdenv.lib; {
homepage = http://github.com/airspy/airspyone_host;
description = "Host tools and driver library for the AirSpy SDR";
license = licenses.free;
platforms = platforms.linux;
maintainer = with maintainers; [ markuskowa ];
};
}

2
pkgs/applications/misc/bb/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
homepage = http://aa-project.sourceforge.net/bb; homepage = http://aa-project.sourceforge.net/bb;
description = "AA-lib demo"; description = "AA-lib demo";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = maintainers.rnhmjoj; maintainers = [ maintainers.rnhmjoj ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

2
pkgs/applications/misc/calibre/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
poppler_utils libpng imagemagick libjpeg poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
] ++ (with python2Packages; [ ] ++ (with python2Packages; [
apsw cssselect cssutils dateutil dns html5-parser lxml mechanize netifaces pillow apsw cssselect cssutils dateutil dnspython html5-parser lxml mechanize netifaces pillow
python pyqt5 sip python pyqt5 sip
regex msgpack regex msgpack
# the following are distributed with calibre, but we use upstream instead # the following are distributed with calibre, but we use upstream instead

6
pkgs/applications/misc/dmensamenu/default.nix
View File

@ -2,7 +2,7 @@
buildPythonApplication rec { buildPythonApplication rec {
name = "dmensamenu-${version}"; name = "dmensamenu-${version}";
version = "1.0.0"; version = "1.1.0";
propagatedBuildInputs = [ propagatedBuildInputs = [
requests requests
@ -12,8 +12,8 @@ buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dotlambda"; owner = "dotlambda";
repo = "dmensamenu"; repo = "dmensamenu";
rev = "v${version}"; rev = version;
sha256 = "05wbpmgjpm0ik9pcydj7r9w7i7bfpcij24bc4jljdwl9ilw62ixp"; sha256 = "126gidid53blrpfq1vd85iim338qrk7n8r4nyhh2hvsi7cfaab1y";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/applications/misc/electron-cash/default.nix
View File

@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec {
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [
dns dnspython
ecdsa ecdsa
jsonrpclib jsonrpclib
pbkdf2 pbkdf2

2
pkgs/applications/misc/electrum-dash/default.nix
View File

@ -10,7 +10,7 @@ python2Packages.buildPythonApplication rec {
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python2Packages; [
dns dnspython
ecdsa ecdsa
pbkdf2 pbkdf2
protobuf protobuf

2
pkgs/applications/misc/electrum-ltc/default.nix
View File

@ -21,7 +21,7 @@ python2Packages.buildPythonApplication rec {
qrcode qrcode
ltc_scrypt ltc_scrypt
protobuf protobuf
dns dnspython
jsonrpclib jsonrpclib
]; ];

24
pkgs/applications/misc/electrum/default.nix
View File

@ -1,24 +1,24 @@
{ stdenv, fetchurl, python2Packages }: { stdenv, fetchurl, python3, python3Packages }:
python2Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "electrum-${version}"; name = "electrum-${version}";
version = "2.9.3"; version = "3.0.3";
src = fetchurl { src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2"; sha256 = "09h3s1mbkliwh8758prbdk3sm19bnma7wy3k10pl9q9fkarbhp75";
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with python3Packages; [
dns dnspython
ecdsa ecdsa
jsonrpclib jsonrpclib-pelix
matplotlib matplotlib
pbkdf2 pbkdf2
protobuf protobuf
pyaes pyaes
pycrypto pycrypto
pyqt4 pyqt5
pysocks pysocks
qrcode qrcode
requests requests
@ -35,7 +35,7 @@ python2Packages.buildPythonApplication rec {
preBuild = '' preBuild = ''
sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
pyrcc4 icons.qrc -o gui/qt/icons_rc.py pyrcc5 icons.qrc -o gui/qt/icons_rc.py
# Recording the creation timestamps introduces indeterminism to the build # Recording the creation timestamps introduces indeterminism to the build
sed -i '/Created: .*/d' gui/qt/icons_rc.py sed -i '/Created: .*/d' gui/qt/icons_rc.py
''; '';
@ -43,13 +43,15 @@ python2Packages.buildPythonApplication rec {
postInstall = '' postInstall = ''
# Despite setting usr_share above, these files are installed under # Despite setting usr_share above, these files are installed under
# $out/nix ... # $out/nix ...
mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out mv $out/${python3.sitePackages}/nix/store"/"*/share $out
rm -rf $out/lib/python2.7/site-packages/nix rm -rf $out/${python3.sitePackages}/nix
substituteInPlace $out/share/applications/electrum.desktop \ substituteInPlace $out/share/applications/electrum.desktop \
--replace "Exec=electrum %u" "Exec=$out/bin/electrum %u" --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u"
''; '';
doCheck = false;
doInstallCheck = true; doInstallCheck = true;
installCheckPhase = '' installCheckPhase = ''
$out/bin/electrum help >/dev/null $out/bin/electrum help >/dev/null

5
pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
View File

@ -77,8 +77,8 @@ index 0000000..1bd9bb5
+ <block start="/(\()/" end="/(\))/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/> + <block start="/(\()/" end="/(\))/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
+ <block start="/(\[)/" end="/(\])/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/> + <block start="/(\[)/" end="/(\])/" scheme="NixExpression" region00="Symbol" region01="PairStart" region10="Symbol" region11="PairEnd"/>
+ +
+ <regexp match="/(\.\.|\.|\~|)\/[\w\d.+=?-]+(\/[\w\d.+=?-]+)*/" region0="Path"/> + <regexp match="/[\w\d.+=?~-]*(\/[\w\d.+=?~-]+)+/" region0="Path"/>
+ <regexp match="/&lt;[\w\d\/.-]+&gt;/" region0="Path"/> + <regexp match="/&lt;[\w\d\/.+=?~-]+&gt;/" region0="Path"/>
+ <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/" region0="URL"/> + <regexp match="/(ftp|mirror|http|https|git):\/\/[\w\d\/:?=&amp;.~-]+/" region0="URL"/>
+ <block start="/(&quot;)/" end="/(&quot;)/" scheme="String" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/> + <block start="/(&quot;)/" end="/(&quot;)/" scheme="String" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
+ <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/> + <block start="/(&apos;&apos;)/" end="/(&apos;&apos;)/" scheme="BlockString" region="String" region00="def:StringEdge" region01="def:PairStart" region10="def:StringEdge" region11="def:PairEnd"/>
@ -91,6 +91,7 @@ index 0000000..1bd9bb5
+ <word name="inherit"/> + <word name="inherit"/>
+ <word name="import"/> + <word name="import"/>
+ <word name="let"/> + <word name="let"/>
+ <word name="or"/>
+ <word name="rec"/> + <word name="rec"/>
+ <word name="then"/> + <word name="then"/>
+ <word name="throw"/> + <word name="throw"/>

8
pkgs/applications/misc/far2l/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26"; rev = "192dace49c2e5456ca235833ee9877e4b8b491cc";
build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}"; build = "unstable-2017-10-08.git${builtins.substring 0 7 rev}";
name = "far2l-2.1.${build}"; name = "far2l-2.1.${build}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "elfmz"; owner = "elfmz";
repo = "far2l"; repo = "far2l";
rev = rev; rev = rev;
sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05"; sha256 = "1l1sf5zlr99xrmjlpzfk3snxqw13xgvnqilw4n7051b8km0snrbl";
}; };
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];

29
pkgs/applications/misc/gcal/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, pkgconfig, ncurses }:
stdenv.mkDerivation rec {
name = "gcal-${version}";
version = "4.1";
src = fetchurl {
url = "mirror://gnu/gcal/${name}.tar.xz";
sha256 = "1av11zkfirbixn05hyq4xvilin0ncddfjqzc4zd9pviyp506rdci";
};
enableParallelBuilding = true;
buildInputs = [ ncurses ];
meta = {
description = "Program for calculating and printing calendars";
longDescription = ''
Gcal is the GNU version of the trusty old cal(1). Gcal is a
program for calculating and printing calendars. Gcal displays
hybrid and proleptic Julian and Gregorian calendar sheets. It
also displays holiday lists for many countries around the globe.
'';
homepage = https://www.gnu.org/software/gcal/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ];
};
}

4
pkgs/applications/misc/gnuradio-osmosdr/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd { stdenv, fetchgit, cmake, pkgconfig, boost, gnuradio, rtl-sdr, uhd
, makeWrapper, hackrf , makeWrapper, hackrf, airspy
, pythonSupport ? true, python, swig , pythonSupport ? true, python, swig
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf airspy
] ++ stdenv.lib.optionals pythonSupport [ python swig ]; ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = '' postInstall = ''

4
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -30,6 +30,10 @@ stdenv.mkDerivation rec {
runHook postInstall runHook postInstall
''; '';
# RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'
enableParallelBuilding = false;
meta = { meta = {
description = "Performance software for cyclists, runners and triathletes"; description = "Performance software for cyclists, runners and triathletes";
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;

2
pkgs/applications/misc/googleearth/default.nix
View File

@ -6,7 +6,7 @@ let
arch = arch =
if stdenv.system == "x86_64-linux" then "amd64" if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "i686-linux" then "i386"
else abort "Unsupported architecture"; else throw "Unsupported system ${stdenv.system}";
sha256 = sha256 =
if arch == "amd64" if arch == "amd64"
then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6" then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"

2
pkgs/applications/misc/j4-dmenu-desktop/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "A wrapper for dmenu that recognize .desktop files"; description = "A wrapper for dmenu that recognize .desktop files";
homepage = "https://github.com/enkore/j4-dmenu-desktop"; homepage = "https://github.com/enkore/j4-dmenu-desktop";
license = licenses.gpl3; license = licenses.gpl3;
maintainer = with maintainers; [ ericsagnes ]; maintainers = with maintainers; [ ericsagnes ];
platforms = with platforms; unix; platforms = with platforms; unix;
}; };
} }

16
pkgs/applications/misc/k2pdfopt/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig { stdenv, fetchzip, fetchurl, fetchpatch, cmake, pkgconfig
, zlib, libpng , zlib, libpng, openjpeg
, enableGSL ? true, gsl , enableGSL ? true, gsl
, enableGhostScript ? true, ghostscript , enableGhostScript ? true, ghostscript
, enableMuPDF ? true, mupdf , enableMuPDF ? true, mupdf
@ -40,11 +40,7 @@ stdenv.mkDerivation rec {
# Patches from previous 1.10a version in nixpkgs # Patches from previous 1.10a version in nixpkgs
patches = [ patches = [
# Compatibility with new openjpeg # Compatibility with new openjpeg
(fetchpatch { ./load-jpx.patch
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=5a28ad0a8999a9234aa7848096041992cc988099";
sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75";
})
(fetchurl { (fetchurl {
name = "CVE-2017-5896.patch"; name = "CVE-2017-5896.patch";
@ -64,6 +60,14 @@ stdenv.mkDerivation rec {
# Don't remove mujs because upstream version is incompatible # Don't remove mujs because upstream version is incompatible
rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib} rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
''; '';
postPatch = let
# OpenJPEG version is hardcoded in package source
openJpegVersion = with stdenv;
lib.concatStringsSep "." (lib.lists.take 2
(lib.splitString "." (lib.getVersion openjpeg)));
in ''
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
'';
}); });
leptonica_modded = leptonica.overrideAttrs (attrs: { leptonica_modded = leptonica.overrideAttrs (attrs: {
prePatch = '' prePatch = ''

29
pkgs/applications/misc/k2pdfopt/load-jpx.patch Normal file
View File

@ -0,0 +1,29 @@
--- a/source/fitz/load-jpx.c
+++ b/source/fitz/load-jpx.c
@@ -484,12 +484,16 @@
/* Without the definition of OPJ_STATIC, compilation fails on windows
* due to the use of __stdcall. We believe it is required on some
* linux toolchains too. */
+#ifdef __cplusplus
+extern "C"
+{
#define OPJ_STATIC
#ifndef _MSC_VER
#define OPJ_HAVE_STDINT_H
#endif
+#endif
-#include <openjpeg.h>
+#include <openjpeg-__OPENJPEG__VERSION__/openjpeg.h>
/* OpenJPEG does not provide a safe mechanism to intercept
* allocations. In the latest version all allocations go
@@ -971,4 +975,8 @@
fz_drop_pixmap(ctx, img);
}
+#ifdef __cplusplus
+}
+#endif
+
#endif /* HAVE_LURATECH */

2
pkgs/applications/misc/metamorphose2/default.nix
View File

@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
description = "a graphical mass renaming program for files and folders"; description = "a graphical mass renaming program for files and folders";
homepage = "https://github.com/metamorphose/metamorphose2"; homepage = "https://github.com/metamorphose/metamorphose2";
license = with licenses; gpl3Plus; license = with licenses; gpl3Plus;
maintainer = with maintainers; [ ramkromberg ]; maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };
} }

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

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A framework for controlling entertainment lighting equipment."; description = "A framework for controlling entertainment lighting equipment.";
maintainers = [ maintainers.globin ]; maintainers = [ maintainers.globin ];
licenses = with licenses; [ lgpl21 gpl2Plus ]; license = with licenses; [ lgpl21 gpl2Plus ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

2
pkgs/applications/misc/oneko/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.daidouji.com/oneko/"; homepage = "http://www.daidouji.com/oneko/";
license = licenses.publicDomain; license = licenses.publicDomain;
maintainers = [ maintainers.xaverdh ]; maintainers = [ maintainers.xaverdh ];
meta.platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/applications/misc/playonlinux/default.nix
View File

@ -48,7 +48,7 @@ let
ld32 = ld32 =
if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker" else if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
else abort "Unsupported platform for PlayOnLinux: ${stdenv.system}"; else throw "Unsupported platform for PlayOnLinux: ${stdenv.system}";
ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ]; libs = pkgs: stdenv.lib.makeLibraryPath [ pkgs.xlibs.libX11 ];

2
pkgs/applications/misc/ptask/default.nix
View File

@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
homepage = http://wpitchoune.net/ptask/; homepage = http://wpitchoune.net/ptask/;
description = "GTK-based GUI for taskwarrior"; description = "GTK-based GUI for taskwarrior";
license = licenses.gpl2; license = licenses.gpl2;
maintainer = [ maintainers.spacefrogg ]; maintainers = [ maintainers.spacefrogg ];
}; };
} }

2
pkgs/applications/misc/qmapshack/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home; homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
description = "Plan your next outdoor trip"; description = "Plan your next outdoor trip";
license = licenses.gpl3; license = licenses.gpl3;
maintainter = with maintainers; [ dotlambda ]; maintainers = with maintainers; [ dotlambda ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };
} }

2
pkgs/applications/misc/qmetro/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "Worldwide transit maps viewer"; description = "Worldwide transit maps viewer";
license = licenses.gpl3; license = licenses.gpl3;
maintainter = with maintainers; [ orivej ]; maintainers = with maintainers; [ orivej ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

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