Merge master into staging-next

This commit is contained in:
Frederik Rietdijk 2018-07-19 18:24:24 +02:00
commit 8213ff161c
294 changed files with 61697 additions and 32101 deletions

View File

@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation {
# $ nix-shell --run "make clean all"
# otherwise they won't reapply :)
HIGHLIGHTJS = pkgs.documentation-highlighter;
XSL = "${pkgs.docbook5_xsl}/xml/xsl";
XSL = "${pkgs.docbook_xsl_ns}/xml/xsl";
RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf;
xsltFlags = lib.concatStringsSep " " [

View File

@ -143,6 +143,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
free = false;
};
cc-by-nc-40 = spdx {
spdxId = "CC-BY-NC-4.0";
fullName = "Creative Commons Attribution Non Commercial 4.0 International";
free = false;
};
cc-by-nd-30 = spdx {
spdxId = "CC-BY-ND-3.0";
fullName = "Creative Commons Attribution-No Derivative Works v3.00";

View File

@ -4420,6 +4420,11 @@
email = "zef@zef.me";
name = "Zef Hemel";
};
zgrannan = {
email = "zgrannan@gmail.com";
github = "zgrannan";
name = "Zack Grannan";
};
zimbatm = {
email = "zimbatm@zimbatm.com";
github = "zimbatm";

View File

@ -209,13 +209,13 @@ let
--stringparam collect.xref.targets only \
--stringparam targets.filename "$out/manual.db" \
--nonet \
${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \
${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \
${manual-combined}/manual-combined.xml
cat > "$out/olinkdb.xml" <<EOF
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE targetset SYSTEM
"file://${docbook5_xsl}/xml/xsl/docbook/common/targetdatabase.dtd" [
"file://${docbook_xsl_ns}/xml/xsl/docbook/common/targetdatabase.dtd" [
<!ENTITY manualtargets SYSTEM "file://$out/manual.db">
]>
<targetset>
@ -264,11 +264,11 @@ in rec {
${manualXsltprocOptions} \
--stringparam target.database.document "${olinkDB}/olinkdb.xml" \
--nonet --output $dst/ \
${docbook5_xsl}/xml/xsl/docbook/xhtml/chunktoc.xsl \
${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \
${manual-combined}/manual-combined.xml
mkdir -p $dst/images/callouts
cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/
cp ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/
cp ${../../../doc/style.css} $dst/style.css
cp ${../../../doc/overrides.css} $dst/overrides.css
@ -292,11 +292,11 @@ in rec {
${manualXsltprocOptions} \
--stringparam target.database.document "${olinkDB}/olinkdb.xml" \
--nonet --xinclude --output $dst/epub/ \
${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \
${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \
${manual-combined}/manual-combined.xml
mkdir -p $dst/epub/OEBPS/images/callouts
cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */
cp -r ${docbook_xsl_ns}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */
echo "application/epub+zip" > mimetype
manual="$dst/nixos-manual.epub"
zip -0Xq "$manual" mimetype
@ -324,7 +324,7 @@ in rec {
--param man.endnotes.are.numbered 0 \
--param man.break.after.slash 1 \
--stringparam target.database.document "${olinkDB}/olinkdb.xml" \
${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \
${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \
${manual-combined}/man-pages-combined.xml
'';

View File

@ -322,6 +322,7 @@
hdfs = 295;
mapred = 296;
hadoop = 297;
hydron = 298;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -604,6 +605,7 @@
hdfs = 295;
mapred = 296;
hadoop = 297;
hydron = 298;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal

View File

@ -676,12 +676,12 @@
./services/web-servers/caddy.nix
./services/web-servers/fcgiwrap.nix
./services/web-servers/hitch/default.nix
./services/web-servers/hydron.nix
./services/web-servers/jboss/default.nix
./services/web-servers/lighttpd/cgit.nix
./services/web-servers/lighttpd/collectd.nix
./services/web-servers/lighttpd/default.nix
./services/web-servers/lighttpd/gitweb.nix
./services/web-servers/lighttpd/inginious.nix
./services/web-servers/meguca.nix
./services/web-servers/mighttpd2.nix
./services/web-servers/minio.nix

View File

@ -10,8 +10,8 @@ in {
rbac = mkOption {
description = "Role-based access control (RBAC) options";
default = {};
type = types.submodule {
options = {
enable = mkOption {
description = "Whether to enable role based access control is enabled for kubernetes dashboard";
@ -24,7 +24,6 @@ in {
type = types.bool;
default = false;
};
};
};
};

View File

@ -1116,6 +1116,7 @@ in {
wantedBy = [ "kubernetes.target" ];
after = [ "kube-apiserver.service" ];
environment.ADDON_PATH = "/etc/kubernetes/addons/";
path = [ pkgs.gawk ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = "${cfg.package}/bin/kube-addons";

View File

@ -65,7 +65,7 @@ in
serviceConfig = {
# Trigger the udev rule manually. This doesn't require replugging the
# device when first enabling the option to get it to work
ExecStartPre = "${pkgs.libudev}/bin/udevadm trigger -s usb -a idVendor=${apple}";
ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}";
ExecStart = "${pkgs.usbmuxd}/bin/usbmuxd -U ${cfg.user} -f";
};
};

View File

@ -0,0 +1,105 @@
{ config, lib, pkgs, ... }:
let cfg = config.services.hydron;
in with lib; {
options.services.hydron = {
enable = mkEnableOption "hydron";
dataDir = mkOption {
type = types.path;
default = "/var/lib/hydron";
example = "/home/okina/hydron";
description = "Location where hydron runs and stores data.";
};
interval = mkOption {
type = types.str;
default = "hourly";
example = "06:00";
description = ''
How often we run hydron import and possibly fetch tags. Runs by default every hour.
The format is described in
<citerefentry><refentrytitle>systemd.time</refentrytitle>
<manvolnum>7</manvolnum></citerefentry>.
'';
};
listenAddress = mkOption {
type = types.nullOr types.str;
default = null;
example = "127.0.0.1:8010";
description = "Listen on a specific IP address and port.";
};
importPaths = mkOption {
type = types.listOf types.path;
default = [];
example = [ "/home/okina/Pictures" ];
description = "Paths that hydron will recursively import.";
};
fetchTags = mkOption {
type = types.bool;
default = true;
description = "Fetch tags for imported images and webm from gelbooru.";
};
};
config = mkIf cfg.enable {
systemd.services.hydron = {
description = "hydron";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
# Ensure folder exists and permissions are correct
mkdir -p ${escapeShellArg cfg.dataDir}/images
chmod 750 ${escapeShellArg cfg.dataDir}
chown -R hydron:hydron ${escapeShellArg cfg.dataDir}
'';
serviceConfig = {
PermissionsStartOnly = true;
User = "hydron";
Group = "hydron";
ExecStart = "${pkgs.hydron}/bin/hydron serve"
+ optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}";
};
};
systemd.services.hydron-fetch = {
description = "Import paths into hydron and possibly fetch tags";
serviceConfig = {
Type = "oneshot";
User = "hydron";
Group = "hydron";
ExecStart = "${pkgs.hydron}/bin/hydron import "
+ optionalString cfg.fetchTags "-f "
+ (escapeShellArg cfg.dataDir) + "/images " + (escapeShellArgs cfg.importPaths);
};
};
systemd.timers.hydron-fetch = {
description = "Automatically import paths into hydron and possibly fetch tags";
after = [ "network.target" ];
wantedBy = [ "timers.target" ];
timerConfig.OnCalendar = cfg.interval;
};
users = {
groups.hydron.gid = config.ids.gids.hydron;
users.hydron = {
description = "hydron server service user";
home = cfg.dataDir;
createHome = true;
group = "hydron";
uid = config.ids.uids.hydron;
};
};
};
meta.maintainers = with maintainers; [ chiiruno ];
}

View File

@ -1,261 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.lighttpd.inginious;
inginious = pkgs.inginious;
execName = "inginious-${if cfg.useLTI then "lti" else "webapp"}";
inginiousConfigFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "inginious.yaml" ''
# Backend; can be:
# - "local" (run containers on the same machine)
# - "remote" (connect to distant docker daemon and auto start agents) (choose this if you use boot2docker)
# - "remote_manual" (connect to distant and manually installed agents)
backend: "${cfg.backendType}"
## TODO (maybe): Add an option for the "remote" backend in this NixOS module.
# List of remote docker daemon to which the backend will try
# to connect (backend: remote only)
#docker_daemons:
# - # Host of the docker daemon *from the webapp*
# remote_host: "some.remote.server"
# # Port of the distant docker daemon *from the webapp*
# remote_docker_port: "2375"
# # A mandatory port used by the backend and the agent that will be automatically started.
# # Needs to be available on the remote host, and to be open in the firewall.
# remote_agent_port: "63456"
# # Does the remote docker requires tls? Defaults to false.
# # Parameter can be set to true or path to the certificates
# #use_tls: false
# # Link to the docker daemon *from the host that runs the docker daemon*. Defaults to:
# #local_location: "unix:///var/run/docker.sock"
# # Path to the cgroups "mount" *from the host that runs the docker daemon*. Defaults to:
# #cgroups_location: "/sys/fs/cgroup"
# # Name that will be used to reference the agent
# #"agent_name": "inginious-agent"
# List of remote agents to which the backend will try
# to connect (backend: remote_manual only)
# Example:
#agents:
# - host: "192.168.59.103"
# port: 5001
agents:
${lib.concatMapStrings (agent:
" - host: \"${agent.host}\"\n" +
" port: ${agent.port}\n"
) cfg.remoteAgents}
# Location of the task directory
tasks_directory: "${cfg.tasksDirectory}"
# Super admins: list of user names that can do everything in the backend
superadmins:
${lib.concatMapStrings (x: " - \"${x}\"\n") cfg.superadmins}
# Aliases for containers
# Only containers listed here can be used by tasks
containers:
${lib.concatStrings (lib.mapAttrsToList (name: fullname:
" ${name}: \"${fullname}\"\n"
) cfg.containers)}
# Use single minified javascript file (production) or multiple files (dev) ?
use_minified_js: true
## TODO (maybe): Add NixOS options for these parameters.
# MongoDB options
#mongo_opt:
# host: localhost
# database: INGInious
# Disable INGInious?
#maintenance: false
#smtp:
# sendername: 'INGInious <no-reply@inginious.org>'
# host: 'smtp.gmail.com'
# port: 587
# username: 'configme@gmail.com'
# password: 'secret'
# starttls: True
## NixOS extra config
${cfg.extraConfig}
'';
in
{
options.services.lighttpd.inginious = {
enable = mkEnableOption "INGInious, an automated code testing and grading system.";
configFile = mkOption {
type = types.nullOr types.path;
default = null;
example = literalExample ''pkgs.writeText "configuration.yaml" "# custom config options ...";'';
description = ''The path to an INGInious configuration file.'';
};
extraConfig = mkOption {
type = types.lines;
default = "";
example = ''
# Load the dummy auth plugin.
plugins:
- plugin_module: inginious.frontend.webapp.plugins.auth.demo_auth
users:
# register the user "test" with the password "someverycomplexpassword"
test: someverycomplexpassword
'';
description = ''Extra option in YaML format, to be appended to the config file.'';
};
tasksDirectory = mkOption {
type = types.path;
example = "/var/lib/INGInious/tasks";
description = ''
Path to the tasks folder.
Defaults to the provided test tasks folder (readonly).
'';
};
useLTI = mkOption {
type = types.bool;
default = false;
description = ''Whether to start the LTI frontend in place of the webapp.'';
};
superadmins = mkOption {
type = types.uniq (types.listOf types.str);
default = [ "admin" ];
example = [ "john" "pepe" "emilia" ];
description = ''List of user logins allowed to administrate the whole server.'';
};
containers = mkOption {
type = types.attrsOf types.str;
default = {
default = "ingi/inginious-c-default";
};
example = {
default = "ingi/inginious-c-default";
sekexe = "ingi/inginious-c-sekexe";
java = "ingi/inginious-c-java";
oz = "ingi/inginious-c-oz";
pythia1compat = "ingi/inginious-c-pythia1compat";
};
description = ''
An attrset describing the required containers
These containers will be available in INGInious using their short name (key)
and will be automatically downloaded before INGInious starts.
'';
};
hostPattern = mkOption {
type = types.str;
default = "^inginious.";
example = "^inginious.mydomain.xyz$";
description = ''
The domain that serves INGInious.
INGInious uses absolute paths which makes it difficult to relocate in its own subdir.
The default configuration will serve INGInious when the server is accessed with a hostname starting with "inginious.".
If left blank, INGInious will take the precedence over all the other lighttpd sites, which is probably not what you want.
'';
};
backendType = mkOption {
type = types.enum [ "local" "remote_manual" ]; # TODO: support backend "remote"
default = "local";
description = ''
Select how INGINious accesses to grading containers.
The default "local" option ensures that Docker is started and provisioned.
Fore more information, see http://inginious.readthedocs.io/en/latest/install_doc/config_reference.html
Not all backends are supported. Use services.inginious.configFile for full flexibility.
'';
};
remoteAgents = mkOption {
type = types.listOf (types.attrsOf types.str);
default = [];
example = [ { host = "192.0.2.25"; port = "1345"; } ];
description = ''A list of remote agents, used only when services.inginious.backendType is "remote_manual".'';
};
};
config = mkIf cfg.enable (
mkMerge [
# For a local install, we need docker.
(mkIf (cfg.backendType == "local") {
virtualisation.docker = {
enable = true;
# We need docker to listen on port 2375.
listenOptions = ["127.0.0.1:2375" "/var/run/docker.sock"];
storageDriver = mkDefault "overlay";
};
users.users."lighttpd".extraGroups = [ "docker" ];
# Ensure that docker has pulled the required images.
systemd.services.inginious-prefetch = {
script = let
images = lib.unique (
[ "centos" "ingi/inginious-agent" ]
++ lib.mapAttrsToList (_: image: image) cfg.containers
);
in lib.concatMapStrings (image: ''
${pkgs.docker}/bin/docker pull ${image}
'') images;
serviceConfig.Type = "oneshot";
wants = [ "docker.service" ];
after = [ "docker.service" ];
wantedBy = [ "lighttpd.service" ];
before = [ "lighttpd.service" ];
};
})
# Common
{
services.lighttpd.inginious.tasksDirectory = mkDefault "${inginious}/lib/python2.7/site-packages/inginious/tasks";
# To access inginous tools (like inginious-test-task)
environment.systemPackages = [ inginious ];
services.mongodb.enable = true;
services.lighttpd.enable = true;
services.lighttpd.enableModules = [ "mod_access" "mod_alias" "mod_fastcgi" "mod_redirect" "mod_rewrite" ];
services.lighttpd.extraConfig = ''
$HTTP["host"] =~ "${cfg.hostPattern}" {
fastcgi.server = ( "/${execName}" =>
((
"socket" => "/run/lighttpd/inginious-fastcgi.socket",
"bin-path" => "${inginious}/bin/${execName} --config=${inginiousConfigFile}",
"max-procs" => 1,
"bin-environment" => ( "REAL_SCRIPT_NAME" => "" ),
"check-local" => "disable"
))
)
url.rewrite-once = (
"^/.well-known/.*" => "$0",
"^/static/.*" => "$0",
"^/.*$" => "/${execName}$0",
"^/favicon.ico$" => "/static/common/favicon.ico",
)
alias.url += (
"/static/webapp/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/webapp/static/",
"/static/common/" => "${inginious}/lib/python2.7/site-packages/inginious/frontend/common/static/"
)
}
'';
systemd.services.lighttpd.preStart = ''
mkdir -p /run/lighttpd
chown lighttpd.lighttpd /run/lighttpd
'';
systemd.services.lighttpd.wants = [ "mongodb.service" "docker.service" ];
systemd.services.lighttpd.after = [ "mongodb.service" "docker.service" ];
}
]);
}

View File

@ -515,7 +515,7 @@ in
};
systemd.globalEnvironment = mkOption {
type = with types; attrsOf (nullOr (either str package));
type = with types; attrsOf (nullOr (either str (either path package)));
default = {};
example = { TZ = "CET"; };
description = ''

View File

@ -237,7 +237,7 @@ let
libxml2.bin
libxslt.bin
docbook5
docbook5_xsl
docbook_xsl_ns
unionfs-fuse
ntp
nixos-artwork.wallpapers.gnome-dark

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper
, shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain
, shntool, flac, opusTools, vorbis-tools, mp3gain, lame, wavpack, vorbisgain
, gtk3
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/flacon \
--suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
--prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools
--prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbis-tools
mp3gain lame wavpack vorbisgain ]}"
'';

View File

@ -3,14 +3,14 @@
, python36Packages, gnome3, glib, gst_all_1 }:
stdenv.mkDerivation rec {
version = "0.9.519";
version = "0.9.521";
name = "lollypop-${version}";
src = fetchgit {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
sha256 = "1v4p59w4yf86djk7xv1xwbximpjm64wn42il090w7q1wy04my6fl";
sha256 = "1iwv0fj50h0xynv152anisbq29jfbmb9hpm60kaa9a9hdiypskcc";
};
nativeBuildInputs = with python36Packages; [

View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, makeWrapper
, bc, dbus, gawk, gnused, libnotify, pulseaudioLight }:
, bc, dbus, gawk, gnused, libnotify, pulseaudio }:
let
path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ];
path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudio ];
pname = "pulseaudio-ctl";
in stdenv.mkDerivation rec {

View File

@ -0,0 +1,79 @@
{ stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig
, alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi
, libzip, rtaudio, rtmidi, speex }:
let
glfw-git = glfw.overrideAttrs (oldAttrs: {
name = "glfw-git-20180529";
src = fetchFromGitHub {
owner = "glfw";
repo = "glfw";
rev = "0be4f3f75aebd9d24583ee86590a38e741db0904";
sha256 = "0zbcjgc7ks25yi949k0wjknfl00a4dqmz45mhp00k62vlq2sj0i5";
};
buildInputs = oldAttrs.buildInputs ++ [ libXext libXi ];
});
pfft-source = fetchFromBitbucket {
owner = "jpommier";
repo = "pffft";
rev = "29e4f76ac53bef048938754f32231d7836401f79";
sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1";
};
in
with stdenv.lib; stdenv.mkDerivation rec {
name = "VCV-Rack-${version}";
version = "0.6.2b";
src = fetchFromGitHub {
owner = "VCVRack";
repo = "Rack";
rev = "v${version}";
sha256 = "17ynhxcci6dyn1yi871fd8yli4924fh12pmk510djwkcj5crhas6";
fetchSubmodules = true;
};
prePatch = ''
ln -s ${pfft-source} dep/jpommier-pffft-source
mkdir -p dep/include
cp dep/jpommier-pffft-source/*.h dep/include
cp dep/nanosvg/src/*.h dep/include
cp dep/nanovg/src/*.h dep/include
cp dep/osdialog/*.h dep/include
cp dep/oui-blendish/*.h dep/include
substituteInPlace include/audio.hpp --replace "<RtAudio.h>" "<rtaudio/RtAudio.h>"
substituteInPlace compile.mk --replace "-march=nocona" ""
substituteInPlace Makefile \
--replace "-Wl,-Bstatic" "" \
--replace "-lglfw3" "-lglfw"
'';
enableParallelBuilding = true;
nativeBuildInputs = [ makeWrapper pkgconfig ];
buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex ];
buildFlags = "Rack";
installPhase = ''
install -D -m755 -t $out/bin Rack
cp -r res $out/
mkdir -p $out/share/rack
cp LICENSE.txt LICENSE-dist.txt $out/share/rack
# Override the default global resource file directory
wrapProgram $out/bin/Rack --add-flags "-g $out"
'';
meta = with stdenv.lib; {
description = "Open-source virtual modular synthesizer";
homepage = http://vcvrack.com/;
# The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or unfree
license = [ licenses.bsd3 licenses.cc-by-nc-40 licenses.unfree ];
maintainers = with maintainers; [ moredread ];
platforms = platforms.linux;
};
}

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, libudev,
libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
{ stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
maxRam ? "1024m" }:
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
rev = "1512021600670_4503";
pname = "CrashPlanSmb";
name = "${pname}_${version}_${rev}";
src = fetchurl {
url = "https://web-eam-msp.crashplanpro.com/client/installers/${name}_Linux.tgz";
sha256 = "0f7ykfxaqjlvv4hv12yc5z8y1vjsysdblv53byml7i1fy1r0q26q";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
vardir = "/var/lib/crashplan";
manifestdir = "${vardir}/manifest";
postPatch = ''
# patch scripts/CrashPlanEngine
substituteInPlace scripts/CrashPlanEngine \
@ -85,10 +85,10 @@ stdenv.mkDerivation rec {
postFixup = ''
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
fontconfig dbus gconf nss nspr alsaLib cups expat libudev
libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
fontconfig dbus gconf nss nspr alsaLib cups expat udev
libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
libXext libXfixes libXrender libXtst libXScrnSaver]}"
'';

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, coreutils
, intltool, xlibsWrapper, libxklavier, libgcrypt, audit, coreutils
, qt4 ? null
, withQt5 ? false, qtbase
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
qt4 libaudit
qt4 audit
] ++ optional withQt5 qtbase;
configureFlags = [

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, xorg, libjpeg, libpng
, fontconfig, freetype, pam, dbus_libs, makeWrapper }:
, fontconfig, freetype, pam, dbus, makeWrapper }:
stdenv.mkDerivation rec {
name = "slim-1.3.6";
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ cmake pkgconfig libjpeg libpng fontconfig freetype
pam dbus_libs
pam dbus
xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
];

View File

@ -43,9 +43,9 @@ in rec {
beta = mkStudio (latestVersion // {
pname = "android-studio-preview";
#pname = "android-studio-beta"; # TODO: Rename and provide symlink
version = "3.2.0.20"; # "Android Studio 3.2 Beta 3"
build = "181.4868252";
sha256Hash = "17r7gvy317vh2r56yvhnn7dym0q6gs8r04fdr7hx53s9rb79sd1j";
version = "3.2.0.21"; # "Android Studio 3.2 Beta 4"
build = "181.4886486";
sha256Hash = "1n4lcy0ng87fv45qjlpdb2zn3zl5lg6jwkbaijhbsm2rh4ljisr3";
meta = stable.meta // {
description = "The Official IDE for Android (beta channel)";

View File

@ -61,8 +61,8 @@ let
};
in stdenv.lib.mapAttrs common {
atom = {
version = "1.28.1";
sha256 = "03phnbsc45i0r799ni9br7s4qjy05fczbca64jd0sr4jhzi7qmlx";
version = "1.28.2";
sha256 = "07lz4lj07dbfz952l3q9vplvg41pxl1cx89gzy8bzzr3ay7kn6za";
};
atom-beta = {

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,7 @@ melpaBuild {
name = "filesets+.el";
};
recipeFile = fetchurl {
recipe = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets-plus+";
sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
name = "filesets-plus";

View File

@ -10,7 +10,7 @@ melpaBuild {
name = "font-lock+.el";
};
recipeFile = fetchurl {
recipe = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
name = "font-lock-plus";

View File

@ -10,7 +10,7 @@ melpaBuild {
name = "header2.el";
};
recipeFile = fetchurl {
recipe = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/header2";
sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
name = "header2";

View File

@ -10,7 +10,7 @@ melpaBuild {
name = "hexrgb.el";
};
recipeFile = fetchurl {
recipe = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hexrgb";
sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
name = "hexrgb";

View File

@ -10,7 +10,7 @@ melpaBuild {
name = "lib-requires.el";
};
recipeFile = fetchurl {
recipe = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/lib-requires";
sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
name = "lib-requires";

File diff suppressed because it is too large Load Diff

View File

@ -124,11 +124,16 @@ self:
# upstream issue: missing file header
maxframe = markBroken super.maxframe;
# version of magit-popup needs to match magit
# https://github.com/magit/magit/issues/3286
magit = super.magit.override {
inherit (self.melpaPackages) magit-popup;
};
magit =
(super.magit.override {
# version of magit-popup needs to match magit
# https://github.com/magit/magit/issues/3286
inherit (self.melpaPackages) magit-popup;
}).overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
# missing OCaml
merlin = markBroken super.merlin;

File diff suppressed because it is too large Load Diff

View File

@ -13,7 +13,7 @@ To update the list of packages from MELPA,
*/
{ lib }:
{ lib, external }:
self:
@ -132,6 +132,17 @@ self:
# upstream issue: missing file header
maxframe = markBroken super.maxframe;
magit =
(super.magit.override {
# version of magit-popup needs to match magit
# https://github.com/magit/magit/issues/3286
inherit (self.melpaStablePackages) magit-popup;
}).overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
# missing OCaml
merlin = markBroken super.merlin;

View File

@ -1,10 +1,12 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
{ callPackage }:
{
org = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "org";
version = "20180416";
version = "20180716";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20180416.tar";
sha256 = "05rbkrs93zd9kvldwvypb8fwwaysajy5n7b2k9c8xm2cx2nayv8m";
url = "http://orgmode.org/elpa/org-20180716.tar";
sha256 = "0gr57nfdncnxrxxzw87ni5i6zjh1mdxl9h8pw96msh1c47xhpk2d";
};
packageRequires = [];
meta = {
@ -12,12 +14,13 @@
license = lib.licenses.free;
};
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "org-plus-contrib";
version = "20180416";
version = "20180716";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20180416.tar";
sha256 = "1f5zdfsa1fcf66hk3w57wh5385069yg0b86h57jgkcbmxkcmj6ij";
url = "http://orgmode.org/elpa/org-plus-contrib-20180716.tar";
sha256 = "0j4r3bcy96kcaab7cv2a5qd0mv8ddkr1qlihijk79l9nhsh2y4hm";
};
packageRequires = [];
meta = {

View File

@ -10,7 +10,7 @@ melpaBuild {
name = "thingatpt+.el";
};
recipeFile = fetchurl {
recipe = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
name = "thingatpt-plus";

View File

@ -1,7 +1,7 @@
{ config, stdenv, fetchgit, makeWrapper, gnome3, at-spi2-core, libcxx,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }:
with stdenv.lib;
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [
dbus_libs
dbus
openssl
libxml2
gnome3.gtksourceview

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qt5, poppler_qt5, zlib, pkgconfig}:
{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}:
stdenv.mkDerivation rec {
pname = "texstudio";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ qt5.qmake pkgconfig ];
buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler_qt5 zlib ];
buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ];
qmakeFlags = [ "NO_APPDATA=True" ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
dbus, alsaLib, cups, fontconfig, glib, icu, libpng12,
xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
libXrender, libXcomposite }:
@ -71,7 +71,7 @@ stdenv.mkDerivation {
};
libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
dbus alsaLib cups.lib fontconfig glib icu libpng12
xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
libXcursor libXrandr libxcb libXi libSM libICE libXrender
libXcomposite ];

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }:
{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }:
stdenv.mkDerivation {
name ="openexr_viewers-2.2.1";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openexr fltk libGLU_combined openexr_ctl ];
buildInputs = [ openexr fltk libGLU_combined ctl ];
meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }:
{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }:
# Warning: You will also need a working pdflatex installation containing
# at least auctex and pgf.
@ -64,8 +64,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gettext qt5.full poppler_qt5 ];
buildInputs = [ gettext qt5.full poppler ];
enableParallelBuilding = true;
}

View File

@ -4,46 +4,23 @@
stdenv.mkDerivation rec {
name = "scantailor-advanced-${version}";
version = "1.0.15";
version = "1.0.16";
src = fetchFromGitHub {
owner = "4lex4";
repo = "scantailor-advanced";
rev = "v${version}";
sha256 = "031jqk64ig6lmscl5yg5lp116zwn0jl7xs9rlniqf6a8g4wfbjk9";
sha256 = "0lc9lzbpiy5hgimyhl4s4q67pb9gacpy985gl6iy8pl79zxhmcyp";
};
nativeBuildInputs = [ cmake qttools ];
buildInputs = [ libjpeg libpng libtiff boost qtbase ];
postInstall = ''
mkdir -p $out/share/icons/hicolor/scalable/apps
cp $src/resources/appicon.svg $out/share/icons/hicolor/scalable/apps/scantailor.svg
mkdir -p $out/share/applications
cp $desktopItem/share/applications/* $out/share/applications/
for entry in $out/share/applications/*.desktop; do
substituteAllInPlace $entry
done
'';
desktopItem = makeDesktopItem {
name = "scantailor-advanced";
exec = "scantailor %f";
icon = "scantailor";
comment = meta.description;
desktopName = "Scan Tailor Advanced";
genericName = "Scan Processing Software";
mimeType = "image/png;image/tif;image/jpeg;";
categories = "Graphics;";
startupNotify = "true";
};
meta = with stdenv.lib; {
homepage = https://github.com/4lex4/scantailor-advanced;
description = "Interactive post-processing tool for scanned pages";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ jfrankenau ];
platforms = platforms.gnu ++ platforms.linux;
platforms = with platforms; gnu ++ linux ++ darwin;
};
}

View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/applications/18.04.2/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/applications/18.04.3/ -A '*.tar.xz' )

View File

@ -1,7 +1,7 @@
{
mkDerivation, copyPathsToStore, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
grantlee, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
}:
mkDerivation {
@ -14,7 +14,7 @@ mkDerivation {
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase
grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
];
propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ];
propagatedBuildInputs = [ grantlee kiconthemes knewstuff ];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
grantlee, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
kidentitymanagement, kpimtextedit,
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
grantlee kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
kidentitymanagement kpimtextedit
];
outputs = [ "out" "dev" ];

View File

@ -4,7 +4,7 @@
akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison
libksieve, mailcommon, mailimporter, messagelib, poppler, prison
}:
mkDerivation {
@ -18,6 +18,6 @@ mkDerivation {
akonadi-import-wizard akonadi-notes calendarsupport eventviews
incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
libksieve mailcommon mailimporter messagelib poppler_qt5 prison
libksieve mailcommon mailimporter messagelib poppler prison
];
}

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
}:
@ -13,7 +13,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
grantlee kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
sonnet syntax-highlighting qttools
];
propagatedBuildInputs = [ ktextwidgets ];

View File

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5,
akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
@ -16,7 +16,7 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs
akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit
syntax-highlighting

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
, fetchFromGitHub
, cmake
, jsoncpp
, libjson_rpc_cpp
, libjson-rpc-cpp
, curl
, boost
, leveldb
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
buildInputs = [
cmake
jsoncpp
libjson_rpc_cpp
libjson-rpc-cpp
curl
boost
leveldb

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler_qt5 }:
{ stdenv, fetchurl, fetchpatch, qmake, qttools, qtbase, poppler }:
stdenv.mkDerivation rec {
version = "2.1.3";
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtbase poppler_qt5 ];
buildInputs = [ qtbase poppler ];
preConfigure = ''
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler_qt5.dev}
substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev}
lrelease diffpdf.pro
'';

View File

@ -7,7 +7,7 @@
, libevent
, libtool
, libqrencode
, libudev
, udev
, libusb
, makeWrapper
, pkgconfig
@ -67,12 +67,12 @@ in stdenv.mkDerivation rec {
qttools
];
buildInputs = with stdenv.lib; [
buildInputs = [
# TODO: remove libcap when pruneLibtoolFiles applies to pulseaudio.
libcap
libevent
libtool
libudev
udev
libusb
libqrencode

View File

@ -84,8 +84,9 @@ in
mv $out/usr/bin/glava $out/bin/.glava-unwrapped
rm -rf $out/usr
patchelf $out/bin/.glava-unwrapped \
patchelf \
--set-rpath "$(patchelf --print-rpath $out/bin/.glava-unwrapped):${makeLibraryPath [ libGL ]}" \
$out/bin/.glava-unwrapped
substitute ${wrapperScript} $out/bin/glava --subst-var out
chmod +x $out/bin/glava

View File

@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
, libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
];
in
stdenv.mkDerivation rec {

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
version = "13996";
version = "14026";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf";
sha256 = "1ysi23j2yj5b6cn3xdsrl4xp56klpw4xa7c4gv90z2dllx06mqli";
};
buildInputs = [ jre10 makeWrapper ];

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte
, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs
, libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs
}:
let version = "0.3.1"; in
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
automake autoconf intltool pkgconfig
libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs
libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs
];
buildInputs = [ gtk3 vte ];

View File

@ -1,4 +1,4 @@
{ fetchFromGitHub, ag, tree, man, stdenv,
{ fetchFromGitHub, silver-searcher, tree, man, stdenv,
pandocSupport ? true, pandoc ? null
, ... }:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
in ''
mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
substituteInPlace memo \
--replace "ack_cmd=ack" "ack_cmd=${ag}/bin/ag" \
--replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \
--replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \
--replace "man_cmd=man" "man_cmd=${man}/bin/man" \
--replace "pandoc_cmd=pandoc" "${pandocReplacement}"

View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, perl
, alsaLib, libevdev, libopus, libudev, SDL2
, alsaLib, libevdev, libopus, udev, SDL2
, ffmpeg, pkgconfig, xorg, libvdpau, libpulseaudio, libcec
, curl, expat, avahi, enet, libuuid
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake perl ];
buildInputs = [
alsaLib libevdev libopus libudev SDL2
alsaLib libevdev libopus udev SDL2
ffmpeg pkgconfig xorg.libxcb libvdpau libpulseaudio libcec
xorg.libpthreadstubs curl expat avahi enet libuuid
];

View File

@ -1,4 +1,5 @@
{ stdenv, mkDerivation, fetchFromGitHub, boost, qtbase, qtwebkit, poppler_qt5, qmake, hunspell, html-tidy}:
{ stdenv, mkDerivation, fetchFromGitHub, boost
, qtbase, qtwebkit, poppler, qmake, hunspell, html-tidy}:
mkDerivation rec {
name = "nixnote2-${version}";
@ -11,7 +12,7 @@ mkDerivation rec {
sha256 = "0cfq95mxvcgby66r61gclm1a2c6zck5aln04xmg2q8kg6p9d31fr";
};
buildInputs = [ boost qtbase qtwebkit poppler_qt5 hunspell ];
buildInputs = [ boost qtbase qtwebkit poppler hunspell ];
enableParallelBuilding = true;
@ -28,7 +29,7 @@ mkDerivation rec {
substituteInPlace nixnote.cpp --replace 'tidyProcess.start("tidy' 'tidyProcess.start("${html-tidy}/bin/tidy'
'';
postInstal = ''
cp images/windowIcon.png $out/share/pixmaps/nixnote2.png
'';

View File

@ -16,7 +16,7 @@
, intltool
, isocodes
, libcanberra-gtk3
, libudev
, udev
, libxkbcommon
, pkgconfig
, procps
@ -79,7 +79,7 @@ in python3.pkgs.buildPythonApplication rec {
hunspell
isocodes
libcanberra-gtk3
libudev
udev
libxkbcommon
wrapGAppsHook
xorg.libXtst

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xorg, x11 }:
{ stdenv, fetchurl, xorg, xlibsWrapper }:
stdenv.mkDerivation rec {
version = "1.2.sakura.5";
@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
};
buildInputs = [ xorg.imake xorg.gccmakedep x11 ];
buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ];
configurePhase = "xmkmf";
installPhase = ''
@ -31,4 +31,3 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
};
}

View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups
{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups
, file, ghostscript
}:
let
@ -12,7 +12,7 @@ let
};
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [
qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript
qtbase qtsvg poppler djvulibre libspectre cups file ghostscript
];
in
stdenv.mkDerivation {

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus-glib, expat, gettext
{ stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat, gettext
, gsettings-desktop-schemas, gdk_pixbuf, gtk2, gtk3, hicolor-icon-theme
, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
, pkgconfig, python, pythonPackages, vte
@ -22,13 +22,13 @@ in stdenv.mkDerivation rec {
buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
makeWrapper python pythonPackages.lockfile dbus_libs dbus-glib
makeWrapper python pythonPackages.lockfile dbus dbus-glib
gdk_pixbuf gsettings-desktop-schemas gtk3
hicolor-icon-theme vte ];
NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
"-I${dbus_libs.dev}/include/dbus-1.0"
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
"-I${dbus.dev}/include/dbus-1.0"
"-I${dbus.lib}/lib/dbus-1.0/include" ];
# Fix up python path so the lockfile library is on it.
PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" python.sitePackages [

View File

@ -1,14 +1,15 @@
{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo
{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, makeWrapper, nodejs
, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }:
# FIXME: gnome3.gconf was unavailable when merging master into staging-next
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat libudev libpulseaudio
libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat systemd libpulseaudio
];
in
stdenv.mkDerivation rec {

View File

@ -40,7 +40,7 @@ library, use the 'NOGUI' parameter:
$ make NOGUI=1
*/
{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, devicemapper,
{ fetchurl, stdenv, pkgconfig, nasm, fuse, wxGTK, lvm2,
wxGUI ? true
}:
@ -86,7 +86,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ fuse devicemapper wxGTK nasm ];
buildInputs = [ fuse lvm2 wxGTK nasm ];
meta = {
description = "Free Open-Source filesystem on-the-fly encryption";

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, devicemapper, makeself,
{ fetchurl, stdenv, pkgconfig, yasm, fuse, wxGTK30, lvm2, makeself,
wxGUI ? true
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ makeself yasm pkgconfig ];
buildInputs = [ fuse devicemapper ]
buildInputs = [ fuse lvm2 ]
++ optional wxGUI wxGTK30;
makeFlags = optionalString (!wxGUI) "NOGUI=1";

View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }:
stdenv.mkDerivation rec {
name = "xlog-${version}";
version = "2.0.15";
src = fetchurl {
url = "http://download.savannah.gnu.org/releases/xlog/${name}.tar.gz";
sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j";
};
buildInputs = [ glib pkgconfig gtk2 hamlib ];
meta = with stdenv.lib; {
description = "An amateur radio logging program";
longDescription =
'' Xlog is an amateur radio logging program.
It supports cabrillo, ADIF, trlog (format also used by tlf),
and EDI (ARRL VHF/UHF contest format) and can import twlog, editest and OH1AA logbook files.
Xlog is able to do DXCC lookups and will display country information, CQ and ITU zone,
location in latitude and longitude and distance and heading in kilometers or miles,
both for short and long path.
'';
homepage = http://www.nongnu.org/xlog;
maintainers = [ maintainers.mafo ];
license = licenses.gpl3;
platforms = platforms.unix;
};
}

View File

@ -5,7 +5,7 @@
, curl
, cups
, dbus-glib
, dbus_libs
, dbus
, fontconfig
, freetype
, gconf
@ -93,7 +93,7 @@ stdenv.mkDerivation {
curl
cups
dbus-glib
dbus_libs
dbus
fontconfig
freetype
gconf

View File

@ -8,7 +8,7 @@
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, esteidfirefoxplugin
, browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration
, libudev
, udev
, kerberos
}:
@ -66,7 +66,7 @@ let
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
++ extraNativeMessagingHosts
);
libs = [ libudev ]
libs = lib.optional stdenv.isLinux udev
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional gssSupport kerberos
++ lib.optionals (cfg.enableQuakeLive or false)

View File

@ -4,7 +4,7 @@
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
, alsaLib, libXdamage, libXtst, libXrandr, expat, cups
, dbus_libs, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk
, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk
, kerberos
# command line arguments which are always set e.g "--disable-gpu"
@ -52,7 +52,7 @@ let
glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
alsaLib libXdamage libXtst libXrandr expat cups
dbus_libs gdk_pixbuf gcc-unwrapped.lib
dbus gdk_pixbuf gcc-unwrapped.lib
systemd
libexif
liberation_ttf curl utillinux xdg_utils wget

View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE
, libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr
, alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd
, alsaLib, dbus, cups, libexif, ffmpeg, systemd
, freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
, libuuid, xz
, gstreamer, gst-plugins-base, libxml2
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
atk at-spi2-atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;

View File

@ -0,0 +1,23 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
buildGoPackage rec {
version = "0.11.0";
name = "ksonnet-${version}";
src = fetchFromGitHub {
owner = "ksonnet";
repo = "ksonnet";
rev = "v${version}";
sha256 = "0z7gkgcsiclm72bznmzv5jcgx5rblndcsiqc0r2mwhxhmv19bs04";
};
goPackagePath = "github.com/ksonnet/ksonnet";
meta = {
description = "A CLI-supported framework that streamlines writing and deployment of Kubernetes configurations to multiple clusters";
homepage = https://github.com/ksonnet/ksonnet;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ flokli ];
platforms = lib.platforms.unix;
};
}

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, stfl, sqlite, curl, gettext, pkgconfig, libxml2, json_c, ncurses
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xml_xslt, libiconv, makeWrapper }:
, asciidoc, docbook_xml_dtd_45, libxslt, docbook_xsl, libiconv, makeWrapper }:
stdenv.mkDerivation rec {
name = "newsboat-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
--replace "ncurses5.4" "ncurses"
'';
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xml_xslt ]
nativeBuildInputs = [ pkgconfig asciidoc docbook_xml_dtd_45 libxslt docbook_xsl ]
++ stdenv.lib.optional stdenv.isDarwin [ makeWrapper libiconv ];
buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ];

View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk
# Optional, Jitsi still runs without, but you may pass null:
, alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg
, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg
}:
stdenv.mkDerivation rec {
@ -25,13 +25,11 @@ stdenv.mkDerivation rec {
libPath = lib.makeLibraryPath ([
stdenv.cc.cc # For libstdc++.
] ++ lib.filter (x: x != null) [
alsaLib
dbus_libs
dbus
gtk2
libpulseaudio
openssl
] ++ lib.optionals (xorg != null) [
xorg.libX11
xorg.libXext
xorg.libXScrnSaver

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }:
{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }:
stdenv.mkDerivation rec {
name = "purple-discord-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json_glib ];
buildInputs = [ pidgin json-glib ];
makeFlags = [
"DESTDIR=$(out)"

View File

@ -40,11 +40,11 @@ let
in stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.14.1";
version = "1.14.2";
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "1f54azqdfqa2yrzlp9b7pz7nswl5n3pgln38yxcvb3y5k6x0ljqp";
sha256 = "0szc7ynl26hqvvwk3sx02ym4abyz78akx0sp6cvif3bb4m8brz1c";
};
phases = [ "unpackPhase" "installPhase" ];

View File

@ -4,11 +4,11 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = {
stable = true;
version = "1.3.7";
sha256Hash = "1rwnqgla061icvyvw8gxqd7qki1jnq0f46hvyffp74ng5r1b6wjg";
version = "1.3.10";
sha256Hash = "0i1lzks8pf627658w6p7dz87d6cl4g98031qm166npkc40f89bpr";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "310557";
archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";
archPatchesRevision = "359861";
archPatchesHash = "15xybfs9k6dww747if8z6m9sh7anvqi76zsx2gxyna2j1z36i0r0";
};
in {
stable = mkTelegram stableVersion;

View File

@ -0,0 +1,68 @@
Date: Tue, 17 Jul 2018 20:29:49 +0200
---
Telegram/SourceFiles/export/data/export_data_types.cpp | 9 ++++++---
Telegram/SourceFiles/export/export_api_wrap.cpp | 6 ++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index f835dc2f9..e811c27e8 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -221,7 +221,8 @@ Image ParseMaxImage(
result.width = data.vw.v;
result.height = data.vh.v;
result.file.location = ParseLocation(data.vlocation);
- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
+ constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>();
+ if constexpr (condition) {
result.file.content = data.vbytes.v;
result.file.size = result.file.content.size();
} else {
@@ -409,7 +410,8 @@ Document ParseDocument(
result.width = data.vw.v;
result.height = data.vh.v;
result.file.location = ParseLocation(data.vlocation);
- if constexpr (MTPDphotoCachedSize::Is<decltype(data)>()) {
+ constexpr bool condition = MTPDphotoCachedSize::Is<decltype(data)>();
+ if constexpr (condition) {
result.file.content = data.vbytes.v;
result.file.size = result.file.content.size();
} else {
@@ -1017,7 +1019,8 @@ Message ParseMessage(
auto result = Message();
data.match([&](const auto &data) {
result.id = data.vid.v;
- if constexpr (!MTPDmessageEmpty::Is<decltype(data)>()) {
+ constexpr bool condition = !MTPDmessageEmpty::Is<decltype(data)>();
+ if constexpr (condition) {
result.toId = ParsePeerId(data.vto_id);
const auto peerId = (!data.is_out()
&& data.has_from_id()
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index b618937f6..bb98647dd 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -709,7 +709,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) {
Expects(_userpicsProcess != nullptr);
result.match([&](const auto &data) {
- if constexpr (MTPDphotos_photos::Is<decltype(data)>()) {
+ constexpr bool condition = MTPDphotos_photos::Is<decltype(data)>();
+ if constexpr (condition) {
_userpicsProcess->lastSlice = true;
}
loadUserpicsFiles(Data::ParseUserpicsSlice(
@@ -1141,7 +1142,8 @@ void ApiWrap::requestMessagesSlice() {
result.match([&](const MTPDmessages_messagesNotModified &data) {
error("Unexpected messagesNotModified received.");
}, [&](const auto &data) {
- if constexpr (MTPDmessages_messages::Is<decltype(data)>()) {
+ constexpr bool condition = MTPDmessages_messages::Is<decltype(data)>();
+ if constexpr (condition) {
_chatProcess->lastSlice = true;
}
loadMessagesFiles(Data::ParseMessagesSlice(
--
2.16.3

View File

@ -28,7 +28,10 @@ mkDerivation rec {
};
# TODO: libtgvoip.patch no-gtk2.patch
patches = [ "${archPatches}/tdesktop.patch" ];
patches = [ "${archPatches}/tdesktop.patch" ]
# TODO: Only required to work around a compiler bug.
# This should be fixed in GCC 7.3.1 (or later?)
++ [ ./fix-internal-compiler-error.patch ];
postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus_daemon
{ stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus
, sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec {
@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig libxslt ];
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]
++ stdenv.lib.optional doCheck dbus_daemon;
buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ];
checkInputs = [ dbus.daemon ];
configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig
, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus_libs }:
, gnome3, makeWrapper, intltool, libxslt, gobjectIntrospection, dbus }:
stdenv.mkDerivation rec {
project = "telepathy-logger";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
dbus-glib libxml2 sqlite telepathy-glib
dbus_libs telepathy-glib.python
dbus telepathy-glib.python
];
configureFlags = "--enable-call";

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }:
{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt }:
stdenv.mkDerivation rec {
name = "linssid-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ qtbase qtsvg boost qwt6 ];
buildInputs = [ qtbase qtsvg boost qwt ];
patches = [ ./0001-unbundled-qwt.patch ];

View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, binutils, patchelf, makeWrapper, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, libudev }:
{ stdenv, fetchurl, binutils, patchelf, makeWrapper
, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
, fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
stdenv.mkDerivation rec {
name = "inboxer-${version}";
@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
expat
stdenv.cc.cc.lib
libpulseaudio
libudev
udev
];
in ''
patchelf \
@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
patchelf \
--set-rpath "$out/opt/Inboxer:${lpath}" \
$out/opt/Inboxer/libffmpeg.so
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/opt/Inboxer:${lpath}" \
@ -70,7 +72,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/opt/Inboxer/inboxer --set LD_LIBRARY_PATH "${xorg.libxkbfile}/lib:${lpath}"
'';
installPhase = ''
mkdir -p $out/bin
cp -R usr/share opt $out/

View File

@ -7,7 +7,7 @@
, cups
, curl
, dbus-glib
, dbus_libs
, dbus
, fontconfig
, freetype
, gdk_pixbuf
@ -86,7 +86,7 @@ stdenv.mkDerivation {
cups
curl
dbus-glib
dbus_libs
dbus
fontconfig
freetype
gdk_pixbuf

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync,
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }:
asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }:
stdenv.mkDerivation rec {
name = "lsyncd-${version}";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [
rsync
cmake lua pkgconfig
asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt
asciidoc libxml2 docbook_xml_dtd_45 docbook_xsl libxslt
];
meta = with stdenv.lib; {

View File

@ -2,7 +2,7 @@
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp
, oceSupport ? true, opencascade_oce
, oceSupport ? true, opencascade
, ngspiceSupport ? true, libngspice
, scriptingSupport ? true, swig, python, wxPython
}:
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
cmakeFlags =
optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade_oce}" ]
optionals (oceSupport) [ "-DKICAD_USE_OCE=ON" "-DOCE_DIR=${opencascade}" ]
++ optional (ngspiceSupport) "-DKICAD_SPICE=ON"
++ optionals (scriptingSupport) [
"-DKICAD_SCRIPTING=ON"
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost
] ++ optional (oceSupport) opencascade_oce
] ++ optional (oceSupport) opencascade
++ optional (ngspiceSupport) libngspice
++ optionals (scriptingSupport) [ swig python wxPython ];

View File

@ -1,8 +1,6 @@
{ stdenv
, bash
, gnused
, fetchFromGitHub
, gettext
, fetchpatch
, pkgconfig
, gtk3
, granite
@ -11,23 +9,30 @@
, ninja
, vala
, libqalculate
, elementary-cmake-modules
, gobjectIntrospection
, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "nasc-${version}";
version = "0.4.6";
version = "0.4.7";
src = fetchFromGitHub {
owner = "parnold-x";
repo = "nasc";
rev = version;
sha256 = "01n4ldj5phrsv97vb04qvs9c1ip6v8wygx9llj704hly1il9fb54";
sha256 = "0p74953pdgsijvqj3msssqiwm6sc1hzp68dlmjamqrqirwgqv5aa";
};
XDG_DATA_DIRS = stdenv.lib.concatStringsSep ":" [
"${granite}/share"
"${gnome3.libgee}/share"
patches = [
# Install libqalculatenasc.so
(fetchpatch {
url = https://github.com/parnold-x/nasc/commit/93a799f9afb3e32f3f1a54e056b59570aae2e437.patch;
sha256 = "1m32w2zaswzxnzbr7p3lf8s6fac4mjvfhm8v9k59b4jyzmvrl631";
})
(fetchpatch {
url = https://github.com/parnold-x/nasc/commit/570b49169326de154af2cf43c5f12268fff1dc6d.patch;
sha256 = "1y3w6rxn0453iscx2xg427wy1bd5kv4z1c41hhbjmg614ycp6bka";
})
];
nativeBuildInputs = [
@ -35,7 +40,8 @@ stdenv.mkDerivation rec {
wrapGAppsHook
vala
cmake
gettext
ninja
gobjectIntrospection # for setup-hook
];
buildInputs = [
libqalculate
@ -46,14 +52,6 @@ stdenv.mkDerivation rec {
gnome3.gtksourceview
];
prePatch = ''
substituteInPlace ./libqalculatenasc/libtool \
--replace "/bin/bash" "${bash}/bin/bash" \
--replace "/bin/sed" "${gnused}/bin/sed"
substituteInPlace ./libqalculatenasc/configure.inc \
--replace 'ac_default_path="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"' 'ac_default_path=$PATH'
'';
meta = with stdenv.lib; {
description = "Do maths like a normal person";
longDescription = ''

View File

@ -26,7 +26,7 @@ let
pybrial = self.callPackage ./pybrial.nix {};
sagelib = self.callPackage ./sagelib.nix {
inherit flint ecl pari glpk eclib;
inherit flint ecl pari glpk eclib ntl arb;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
linbox = nixpkgs.linbox.override { withSage = true; };
};
@ -47,13 +47,13 @@ let
};
sage-env = self.callPackage ./sage-env.nix {
inherit sage-src python rWrapper openblas-cblas-pc glpk ecl singular eclib pari palp flint pynac pythonEnv;
inherit sage-src python rWrapper openblas-cblas-pc glpk ecl singular eclib pari palp flint pynac pythonEnv giac ntl;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
};
sage-with-env = self.callPackage ./sage-with-env.nix {
inherit pari eclib pythonEnv;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular;
inherit pari eclib pythonEnv ntl;
inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular giac;
pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig
three = nodePackages_8_x.three;
};
@ -108,10 +108,23 @@ let
});
};
# https://trac.sagemath.org/ticket/25532
ntl = nixpkgs.ntl.overrideAttrs (oldAttrs: rec {
name = "ntl-10.5.0";
sourceRoot = "${name}/src";
src = fetchurl {
url = "http://www.shoup.net/ntl/${name}.tar.gz";
sha256 = "1lmldaldgfr2b2a6585m3np5ds8bq1bis2s1ajycjm49vp4kc2xr";
};
});
giac = nixpkgs.giac.override { inherit ntl; };
arb = nixpkgs.arb.override { inherit flint; };
# update causes issues
# https://groups.google.com/forum/#!topic/sage-packaging/cS3v05Q0zso
# https://trac.sagemath.org/ticket/24735
singular = nixpkgs.singular.overrideAttrs (oldAttrs: {
singular = (nixpkgs.singular.override { inherit ntl flint; }).overrideAttrs (oldAttrs: {
name = "singular-4.1.0p3";
src = fetchurl {
url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-1-0/singular-4.1.0p3.tar.gz";
@ -121,15 +134,15 @@ let
# *not* to confuse with the python package "pynac"
# https://trac.sagemath.org/ticket/24838 (depends on arb update)
pynac = nixpkgs.pynac.override { inherit singular; };
pynac = nixpkgs.pynac.override { inherit singular flint; };
eclib = nixpkgs.eclib.override { inherit pari; };
eclib = nixpkgs.eclib.override { inherit pari ntl; };
# With openblas (64 bit), the tests fail the same way as when sage is build with
# openblas instead of openblasCompat. Apparently other packages somehow use flints
# blas when it is available. Alternative would be to override flint to use
# openblasCompat.
flint = nixpkgs.flint.override { withBlas = false; };
flint = nixpkgs.flint.override { withBlas = false; inherit ntl; };
# Multiple palp dimensions need to be available and sage expects them all to be
# in the same folder.

View File

@ -1,14 +0,0 @@
reverted:
--- b/src/sage/geometry/polyhedron/backend_cdd.py
+++ a/src/sage/geometry/polyhedron/backend_cdd.py
@@ -154,7 +154,9 @@
... [0.62, -1.38, 0.38],[0.144, -1.04, 0.04],
... [0.1309090909, -1.0290909091, 0.04]]
sage: Polyhedron(point_list)
+ Traceback (most recent call last):
+ ...
+ ValueError: *Error: Numerical inconsistency is found. Use the GMP exact arithmetic.
- A 3-dimensional polyhedron in RDF^3 defined as the convex hull of 14 vertices
sage: Polyhedron(point_list, base_ring=QQ)
A 3-dimensional polyhedron in QQ^3 defined as the convex hull of 14 vertices
"""

View File

@ -156,7 +156,12 @@ stdenv.mkDerivation rec {
sha256 = "0fmw7pzbaxs2dshky6iw9pr8i23p9ih2y2lw661qypdrxh5xw03k";
stripLen = 1;
})
./patches/revert-269c1e1551285.patch
(fetchpatch {
name = "revert-cddlib-doctest-changes.patch";
url = "https://git.sagemath.org/sage.git/patch/?id=269c1e1551285566b8ba7a2b890989e5590e9f11";
sha256 = "12bcjhq7hm2pmmj2bgjvcffjyls2x7q61ivlnaj5v5bsvhc183iy";
revert = true;
})
# Only formatting changes.

View File

@ -5,7 +5,8 @@
, pythonPackages, utillinux
# these deps are hidden; cmake doesn't catch them
, gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11
, gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4
, xlibsWrapper
, withIgnitionTransport ? true
, libav, withLibAvSupport ? true
, openal, withAudioSupport ? false
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
# TODO: add these hidden deps to cmake configuration & submit upstream
curl
tinyxml
x11
xlibsWrapper
qt4
] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h
++ optional withDocs doxygen

View File

@ -1,5 +1,5 @@
{stdenv, fetchurl, makeWrapper, flex, bison,
asciidoc, docbook_xml_dtd_45, docbook_xml_xslt,
asciidoc, docbook_xml_dtd_45, docbook_xsl,
libxml2, libxslt,
python27, rcs, cvs, git,
coreutils, rsync}:
@ -21,7 +21,7 @@ mkDerivation rec {
};
buildInputs = [
flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt
flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
python27 rcs cvs git makeWrapper
];
@ -29,7 +29,7 @@ mkDerivation rec {
preBuild = ''
makeFlagsArray=(
XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
LIBS=""
prefix="$out"
)

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xml_xslt, pkgconfig, luajit
, docbook_xsl, pkgconfig, luajit
, gzip, bzip2, xz
, python, wrapPython, pygments, markdown
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
buildInputs = [
openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit
openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
];
pythonPath = [ pygments markdown ];

View File

@ -1,7 +1,7 @@
/* All git-relates tools live here, in a separate attribute set so that users
* can get a fast overview over what's available.
*/
args @ {pkgs}: with args; with pkgs;
args @ {config, lib, pkgs}: with args; with pkgs;
let
gitBase = callPackage ./git {
texinfo = texinfo5;
@ -17,8 +17,7 @@ let
];
};
in
rec {
self = rec {
# Try to keep this generally alphabetized
bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { };
@ -48,7 +47,6 @@ rec {
}));
git-annex = pkgs.haskellPackages.git-annex;
gitAnnex = git-annex;
git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui {
inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
@ -132,6 +130,10 @@ rec {
transcrypt = callPackage ./transcrypt { };
} // lib.optionalAttrs (config.allowAliases or true) (with self; {
# aliases
gitAnnex = git-annex;
svn_all_fast_export = svn-all-fast-export;
}
});
in
self

View File

@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hub-${version}";
version = "2.4.0";
version = "2.5.0";
goPackagePath = "github.com/github/hub";
@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "github";
repo = "hub";
rev = "v${version}";
sha256 = "1lr6vg0zhg2air9bnzcl811g97jraxq05l3cs46wqqflwy57xpz2";
sha256 = "03nj3b17m700l3pib9jlzxz2vh8w54srv6x63l53sb4dff3izfsz";
};
buildInputs = [ groff ronn ruby utillinux ] ++

View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, python27Packages, git
, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto
, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto
, bazaar ? null, cvs ? null, darcs ? null, fossil ? null
, mercurial ? null, monotone ? null, rcs ? null, src ? null
, subversion ? null, cvs_fast_export ? null }:
@ -24,16 +24,16 @@ in mkDerivation rec {
};
# See https://gitlab.com/esr/reposurgeon/issues/17
patches = [ ./fix-preserve-type.patch ];
patches = [ ./fix-preserve-type.patch ];
buildInputs =
[ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++
[ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++
optional (cython != null) cython
;
preBuild = ''
makeFlagsArray=(
XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml"
prefix="$out"
pyinclude="-I${python}/include/python2.7"
pylib="-L${python}/lib -lpython2.7"
@ -64,5 +64,5 @@ in mkDerivation rec {
--prefix PYTHONPATH : "${pythonpath}"
done
''
;
;
}

View File

@ -6,7 +6,7 @@
, cdrtools, dvdauthor, dvdplusrwtools
, dvdisasterSupport ? true, dvdisaster ? null
, thumbnailSupport ? true, libgnomeui ? null
, udevSupport ? true, libudev ? null
, udevSupport ? true, udev ? null
, dbusSupport ? true, dbus ? null
, makeWrapper }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "0lwc0hn94m9r8fi07sjqz3fr618l6lnw3zsakxw7nlgnxbjsk7pi";
};
nativeBuildInputs =
nativeBuildInputs =
[ pkgconfig ];
packagesToBinPath =
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
docbook5 zip makeWrapper ]
++ packagesToBinPath
++ optionals dvdisasterSupport [ dvdisaster ]
++ optionals udevSupport [ libudev ]
++ optionals udevSupport [ udev ]
++ optionals dbusSupport [ dbus ]
++ optionals thumbnailSupport [ libgnomeui ];

View File

@ -19,7 +19,7 @@
, libcrossguid, libmicrohttpd
, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp
, libplist, p11-kit, zlib
, dbusSupport ? true, dbus_libs ? null
, dbusSupport ? true, dbus ? null
, joystickSupport ? true, cwiid ? null
, nfsSupport ? true, libnfs ? null
, pulseSupport ? true, libpulseaudio ? null
@ -30,7 +30,7 @@
, vdpauSupport ? true, libvdpau ? null
}:
assert dbusSupport -> dbus_libs != null;
assert dbusSupport -> dbus != null;
assert nfsSupport -> libnfs != null;
assert pulseSupport -> libpulseaudio != null;
assert rtmpSupport -> rtmpdump != null;
@ -139,7 +139,7 @@ in stdenv.mkDerivation rec {
ffmpeg
# libdvdcss libdvdnav libdvdread
]
++ lib.optional dbusSupport dbus_libs
++ lib.optional dbusSupport dbus
++ lib.optionals joystickSupport [ cwiid ]
++ lib.optional nfsSupport libnfs
++ lib.optional pulseSupport libpulseaudio

View File

@ -38,9 +38,6 @@
, vapoursynthSupport ? false, vapoursynth ? null
, archiveSupport ? false, libarchive ? null
, jackaudioSupport ? false, libjack2 ? null
# scripts you want to be loaded by default
, scripts ? []
}:
with stdenv.lib;
@ -180,7 +177,6 @@ in stdenv.mkDerivation rec {
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
# Ensure youtube-dl is available in $PATH for MPV
wrapProgram $out/bin/mpv \
--add-flags "--scripts=${concatStringsSep "," scripts}" \
--prefix LUA_PATH : "${luaPath}" \
--prefix LUA_CPATH : "${luaCPath}" \
'' + optionalString youtubeSupport ''

View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, pkgconfig, gobjectIntrospection, mpv }:
stdenv.mkDerivation rec {
name = "mpv-mpris-${version}.so";
version = "0.1";
src = fetchFromGitHub {
owner = "hoyon";
repo = "mpv-mpris";
rev = "v${version}";
sha256 = "0rsbrbv5q7vki59wdlx4cdkd0vvd79qgbjvdb3fn3li7aznvjwiy";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gobjectIntrospection mpv ];
installPhase = ''
cp mpris.so $out
'';
meta = with stdenv.lib; {
description = "MPRIS plugin for mpv";
homepage = https://github.com/hoyon/mpv-mpris;
license = licenses.mit;
maintainers = with maintainers; [ jfrankenau ];
};
}

View File

@ -0,0 +1,14 @@
{ stdenv, symlinkJoin, makeWrapper, mpv, scripts ? [] }:
symlinkJoin {
name = "mpv-with-scripts-${mpv.version}";
paths = [ mpv ];
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/mpv \
--add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=" + x) scripts}"
'';
}

View File

@ -10,7 +10,7 @@
, libXtst
, wrapGAppsHook
, defaultIconTheme
, hicolor_icon_theme
, hicolor-icon-theme
}:
buildPythonApplication rec {
pname = "screenkey";
@ -40,7 +40,7 @@ buildPythonApplication rec {
buildInputs = [
defaultIconTheme
hicolor_icon_theme
hicolor-icon-theme
];
propagatedBuildInputs = [

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