Merge branch 'master' into gcc-7

A few thousand rebuilds.
Hydra: ?compare=1433915
This commit is contained in:
Vladimír Čunát 2018-02-17 10:27:21 +01:00
commit 7a1462c04a
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
136 changed files with 3882 additions and 1954 deletions

View file

@ -327,6 +327,7 @@
jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
jlesquembre = "José Luis Lafuente <jl@lafuente.me>";
jluttine = "Jaakko Luttinen <jaakko.luttinen@iki.fi>";
Jo = "Joachim Ernst <0x4A6F@shackspace.de>";
joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
joamaki = "Jussi Maki <joamaki@gmail.com>";
joelmo = "Joel Moberg <joel.moberg@gmail.com>";
@ -661,6 +662,7 @@
sternenseemann = "Lukas Epple <post@lukasepple.de>";
stesie = "Stefan Siegl <stesie@brokenpipe.de>";
steveej = "Stefan Junker <mail@stefanjunker.de>";
StijnDW = "Stijn DW <stekke@airmail.cc>";
StillerHarpo = "Florian Engel <florianengel39@gmail.com>";
stumoss = "Stuart Moss <samoss@gmail.com>";
SuprDewd = "Bjarki Ágúst Guðmundsson <suprdewd@gmail.com>";
@ -670,6 +672,7 @@
symphorien = "Guillaume Girol <symphorien_nixpkgs@xlumurb.eu>";
szczyp = "Szczyp <qb@szczyp.com>";
sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
tadfisher = "Tad Fisher <tadfisher@gmail.com>";
taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
tailhook = "Paul Colomiets <paul@colomiets.name>";
taketwo = "Sergey Alexandrov <alexandrov88@gmail.com>";

View file

@ -75,6 +75,7 @@
./programs/cdemu.nix
./programs/chromium.nix
./programs/command-not-found/command-not-found.nix
./programs/criu.nix
./programs/dconf.nix
./programs/environment.nix
./programs/fish.nix
@ -92,6 +93,7 @@
./programs/nano.nix
./programs/npm.nix
./programs/oblogout.nix
./programs/plotinus.nix
./programs/qt5ct.nix
./programs/rootston.nix
./programs/screen.nix
@ -102,6 +104,7 @@
./programs/ssh.nix
./programs/ssmtp.nix
./programs/sysdig.nix
./programs/systemtap.nix
./programs/sway.nix
./programs/thefuck.nix
./programs/tmux.nix

View file

@ -0,0 +1,26 @@
{ config, lib, pkgs, ... }:
with lib;
let cfg = config.programs.criu;
in {
options = {
programs.criu = {
enable = mkOption {
default = false;
description = ''
Install <command>criu</command> along with necessary kernel options.
'';
};
};
};
config = mkIf cfg.enable {
system.requiredKernelConfig = with config.lib.kernelConfig; [
(isYes "CHECKPOINT_RESTORE")
];
boot.kernel.features.criu = true;
environment.systemPackages = [ pkgs.criu ];
};
}

View file

@ -0,0 +1,36 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.plotinus;
in
{
meta = {
maintainers = pkgs.plotinus.meta.maintainers;
doc = ./plotinus.xml;
};
###### interface
options = {
programs.plotinus = {
enable = mkOption {
default = false;
description = ''
Whether to enable the Plotinus GTK+3 plugin. Plotinus provides a
popup (triggered by Ctrl-Shift-P) to search the menus of a
compatible application.
'';
type = types.bool;
};
};
};
###### implementation
config = mkIf cfg.enable {
environment.variables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ];
environment.variables.GTK3_MODULES = [ "${pkgs.plotinus}/lib/libplotinus.so" ];
};
}

View file

@ -0,0 +1,25 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="module-program-plotinus">
<title>Plotinus</title>
<para><emphasis>Source:</emphasis> <filename>modules/programs/plotinus.nix</filename></para>
<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/p-e-w/plotinus"/></para>
<para>Plotinus is a searchable command palette in every modern GTK+ application.</para>
<para>When in a GTK+3 application and Plotinus is enabled, you can press <literal>Ctrl+Shift+P</literal> to open the command palette. The command palette provides a searchable list of of all menu items in the application.</para>
<para>To enable Plotinus, add the following to your <filename>configuration.nix</filename>:
<programlisting>
programs.plotinus.enable = true;
</programlisting>
</para>
</chapter>

View file

@ -0,0 +1,28 @@
{ config, lib, pkgs, ... }:
with lib;
let cfg = config.programs.systemtap;
in {
options = {
programs.systemtap = {
enable = mkOption {
default = false;
description = ''
Install <command>systemtap</command> along with necessary kernel options.
'';
};
};
};
config = mkIf cfg.enable {
system.requiredKernelConfig = with config.lib.kernelConfig; [
(isYes "DEBUG")
];
boot.kernel.features.debug = true;
environment.systemPackages = [
config.boot.kernelPackages.systemtap
];
};
}

View file

@ -6,12 +6,12 @@ let
cfg = config.services.kubernetes.addons.dashboard;
name = "gcr.io/google_containers/kubernetes-dashboard-amd64";
version = "v1.6.3";
version = "v1.8.2";
image = pkgs.dockerTools.pullImage {
imageName = name;
imageTag = version;
sha256 = "1sf54d96nkgic9hir9c6p14gw24ns1k5d5a0r1sg414kjrvic0b4";
sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad";
};
in {
options.services.kubernetes.addons.dashboard = {

View file

@ -301,8 +301,8 @@ in {
Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
<link xlink:href="http://kubernetes.io/docs/admin/authorization.html"/>
'';
default = ["RBAC"];
type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC"]);
default = ["RBAC" "Node"];
type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]);
};
authorizationPolicy = mkOption {
@ -344,7 +344,7 @@ in {
Kubernetes admission control plugins to use. See
<link xlink:href="http://kubernetes.io/docs/admin/admission-controllers/"/>
'';
default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds"];
default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"];
example = [
"NamespaceLifecycle" "NamespaceExists" "LimitRanger"
"SecurityContextDeny" "ServiceAccount" "ResourceQuota"

View file

@ -87,4 +87,8 @@ in {
"d /var/lib/fwupd 0755 root root -"
];
};
meta = {
maintainers = pkgs.fwupd.maintainers;
};
}

View file

@ -52,6 +52,15 @@ in {
'';
};
extraFlags = mkOption {
type = with types; listOf string;
default = [ ];
example = [ "--nodnsproxy" ];
description = ''
Extra flags to pass to connmand
'';
};
};
};
@ -81,7 +90,7 @@ in {
Type = "dbus";
BusName = "net.connman";
Restart = "on-failure";
ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon";
ExecStart = "${pkgs.connman}/sbin/connmand --config=${configFile} --nodaemon ${toString cfg.extraFlags}";
StandardOutput = "null";
};
};

View file

@ -179,6 +179,19 @@ in
description = "Whether to enable the prosody server";
};
package = mkOption {
type = types.package;
description = "Prosody package to use";
default = pkgs.prosody;
defaultText = "pkgs.prosody";
example = literalExample ''
pkgs.prosody.override {
withExtraLibs = [ pkgs.luaPackages.lpty ];
withCommunityModules = [ "auth_external" ];
};
'';
};
allowRegistration = mkOption {
type = types.bool;
default = false;
@ -306,7 +319,7 @@ in
User = "prosody";
Type = "forking";
PIDFile = "/var/lib/prosody/prosody.pid";
ExecStart = "${pkgs.prosody}/bin/prosodyctl start";
ExecStart = "${cfg.package}/bin/prosodyctl start";
};
};

View file

@ -5,7 +5,7 @@ with lib;
let
inherit (config.boot) kernelPatches;
inherit (config.boot.kernel) features;
inherit (config.boot.kernelPackages) kernel;
kernelModulesConf = pkgs.writeText "nixos.conf"
@ -21,11 +21,25 @@ in
options = {
boot.kernel.features = mkOption {
default = {};
example = literalExample "{ debug = true; }";
internal = true;
description = ''
This option allows to enable or disable certain kernel features.
It's not API, because it's about kernel feature sets, that
make sense for specific use cases. Mostly along with programs,
which would have separate nixos options.
`grep features pkgs/os-specific/linux/kernel/common-config.nix`
'';
};
boot.kernelPackages = mkOption {
default = pkgs.linuxPackages;
apply = kernelPackages: kernelPackages.extend (self: super: {
kernel = super.kernel.override {
kernelPatches = super.kernel.kernelPatches ++ kernelPatches;
features = lib.recursiveUpdate super.kernel.features features;
};
});
# We don't want to evaluate all of linuxPackages for the manual

View file

@ -167,6 +167,7 @@ done
# Load the required kernel modules.
mkdir -p /lib
ln -s @modulesClosure@/lib/modules /lib/modules
ln -s @modulesClosure@/lib/firmware /lib/firmware
echo @extraUtils@/bin/modprobe > /proc/sys/kernel/modprobe
for i in @kernelModules@; do
echo "loading module $(basename $i)..."

View file

@ -13,12 +13,14 @@ let
kernelPackages = config.boot.kernelPackages;
modulesTree = config.system.modulesTree;
firmware = config.hardware.firmware;
# Determine the set of modules that we need to mount the root FS.
modulesClosure = pkgs.makeModulesClosure {
rootModules = config.boot.initrd.availableKernelModules ++ config.boot.initrd.kernelModules;
kernel = modulesTree;
firmware = firmware;
allowMissing = true;
};

View file

@ -258,8 +258,10 @@ in rec {
tests.firefox = callTest tests/firefox.nix {};
tests.firewall = callTest tests/firewall.nix {};
tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {};
#tests.fwupd = callTest tests/fwupd.nix {}; # build during evaluation
#tests.gitlab = callTest tests/gitlab.nix {};
tests.gitolite = callTest tests/gitolite.nix {};
tests.gjs = callTest tests/gjs.nix {};
tests.gocd-agent = callTest tests/gocd-agent.nix {};
tests.gocd-server = callTest tests/gocd-server.nix {};
tests.gnome3 = callTest tests/gnome3.nix {};
@ -277,6 +279,7 @@ in rec {
tests.ipv6 = callTest tests/ipv6.nix {};
tests.jenkins = callTest tests/jenkins.nix {};
tests.plasma5 = callTest tests/plasma5.nix {};
tests.plotinus = callTest tests/plotinus.nix {};
tests.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.nix {};
tests.kafka_0_9 = callTest tests/kafka_0_9.nix {};

19
nixos/tests/fwupd.nix Normal file
View file

@ -0,0 +1,19 @@
# run installed tests
import ./make-test.nix ({ pkgs, ... }: {
name = "fwupd";
meta = {
maintainers = pkgs.fwupd.meta.maintainers;
};
machine = { config, pkgs, ... }: {
services.fwupd.enable = true;
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ];
virtualisation.memorySize = 768;
};
testScript = ''
$machine->succeed("gnome-desktop-testing-runner");
'';
})

19
nixos/tests/gjs.nix Normal file
View file

@ -0,0 +1,19 @@
# run installed tests
import ./make-test.nix ({ pkgs, ... }: {
name = "gjs";
meta = {
maintainers = pkgs.gnome3.gjs.meta.maintainers;
};
machine = { pkgs, ... }: {
imports = [ ./common/x11.nix ];
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gjs.installedTests}/share" ];
};
testScript = ''
$machine->waitForX;
$machine->succeed("gnome-desktop-testing-runner");
'';
})

View file

@ -7,7 +7,7 @@ let
mkKubernetesBaseTest =
{ name, domain ? "my.zyx", test, machines
, pkgs ? import <nixpkgs> { inherit system; }
, certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; }
, certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; kubelets = attrNames machines; }
, extraConfiguration ? null }:
let
masterName = head (filter (machineName: any (role: role == "master") machines.${machineName}.roles) (attrNames machines));

View file

@ -2,7 +2,8 @@
pkgs ? import <nixpkgs> {},
internalDomain ? "cloud.yourdomain.net",
externalDomain ? "myawesomecluster.cluster.yourdomain.net",
serviceClusterIp ? "10.0.0.1"
serviceClusterIp ? "10.0.0.1",
kubelets
}:
let
runWithCFSSL = name: cmd:
@ -123,9 +124,10 @@ let
};
apiserver-client = {
kubelet = createClientCertKey {
kubelet = hostname: createClientCertKey {
inherit ca;
cn = "apiserver-client-kubelet";
name = "apiserver-client-kubelet-${hostname}";
cn = "system:node:${hostname}.${externalDomain}";
groups = ["system:nodes"];
};
@ -175,10 +177,9 @@ in {
paths = [
(writeCFSSL (noKey ca))
(writeCFSSL kubelet)
(writeCFSSL apiserver-client.kubelet)
(writeCFSSL apiserver-client.kube-proxy)
(writeCFSSL etcd-client)
];
] ++ map (hostname: writeCFSSL (apiserver-client.kubelet hostname)) kubelets;
};
admin = writeCFSSL apiserver-client.admin;

View file

@ -3,7 +3,7 @@ with import ./base.nix { inherit system; };
let
domain = "my.zyx";
certs = import ./certs.nix { externalDomain = domain; };
certs = import ./certs.nix { externalDomain = domain; kubelets = [ "machine1" "machine2" ]; };
redisPod = pkgs.writeText "redis-pod.json" (builtins.toJSON {
kind = "Pod";

View file

@ -29,8 +29,8 @@ let
tlsKeyFile = "${certs.worker}/kubelet-key.pem";
hostname = "${config.networking.hostName}.${config.networking.domain}";
kubeconfig = {
certFile = "${certs.worker}/apiserver-client-kubelet.pem";
keyFile = "${certs.worker}/apiserver-client-kubelet-key.pem";
certFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}.pem";
keyFile = "${certs.worker}/apiserver-client-kubelet-${config.networking.hostName}-key.pem";
};
};
controllerManager = {

27
nixos/tests/plotinus.nix Normal file
View file

@ -0,0 +1,27 @@
import ./make-test.nix ({ pkgs, ... }: {
name = "plotinus";
meta = {
maintainers = pkgs.plotinus.meta.maintainers;
};
machine =
{ config, pkgs, ... }:
{ imports = [ ./common/x11.nix ];
programs.plotinus.enable = true;
environment.systemPackages = [ pkgs.gnome3.gnome-calculator pkgs.xdotool ];
};
testScript =
''
$machine->waitForX;
$machine->execute("xterm -e 'gnome-calculator' &");
$machine->waitForWindow(qr/Calculator/);
$machine->execute("xdotool key ctrl+shift+p");
$machine->sleep(1); # wait for the popup
$machine->execute("xdotool key p r e f e r e n c e s Return");
$machine->waitForWindow(qr/Preferences/);
$machine->screenshot("screen");
'';
})

View file

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
version = "3.2.6";
name = "mp3blaster-${version}";
src = fetchFromGitHub {
owner = "stragulus";
repo = "mp3blaster";
rev = "v${version}";
sha256 = "0pzwml3yhysn8vyffw9q9p9rs8gixqkmg4n715vm23ib6wxbliqs";
};
buildInputs = [ ncurses ];
buildFlags = [ "CXXFLAGS=-Wno-narrowing" ];
meta = with stdenv.lib; {
description = "An audio player for the text console";
homepage = http://www.mp3blaster.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ earldouglas ];
platforms = platforms.all;
};
}

View file

@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkgconfig }:
stdenv.mkDerivation rec {
name = "ncpamixer-${version}";
version = "1.2";
src = fetchFromGitHub {
owner = "fulhax";
repo = "ncpamixer";
rev = version;
sha256 = "01kvd0pg5yraymlln5xdzqj1r6adxfvvza84wxn2481kcxfral54";
};
buildInputs = [ ncurses libpulseaudio ];
nativeBuildInputs = [ cmake pkgconfig ];
configurePhase = ''
make PREFIX=$out build/Makefile
'';
buildPhase = ''
make build
'';
meta = with stdenv.lib; {
description = "An ncurses mixer for PulseAudio inspired by pavucontrol";
homepage = https://github.com/fulhax/ncpamixer;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ StijnDW ];
};
}

View file

@ -4,12 +4,12 @@
stdenv.mkDerivation rec {
name = "non-${version}";
version = "2017-03-29";
version = "2018-02-15";
src = fetchFromGitHub {
owner = "original-male";
repo = "non";
rev = "10c31e57291b6e42be53371567a722b62b32d220";
sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx";
rev = "5ae43bb27c42387052a73e5ffc5d33efb9d946a9";
sha256 = "1cljkkyi9dxqpqhx8y6l2ja4zjmlya26m26kqxml8gx08vyvddhx";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm
{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm
, dbus_glib, GConf, gconfmm, intltool }:
stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716";
};
buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ];
buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus_glib gconfmm ];
nativeBuildInputs = [ pkgconfig intltool ];

View file

@ -6,6 +6,7 @@ let
};
};
in rec {
# linux-bundle
stable = mkStudio {
pname = "android-studio";
version = "3.0.1.0"; # "Android Studio 3.0.1"
@ -25,11 +26,12 @@ in rec {
};
};
# linux-beta-bundle
preview = mkStudio {
pname = "android-studio-preview";
version = "3.1.0.10"; # "Android Studio 3.1 Beta 2"
build = "173.4580418";
sha256Hash = "0s56vbyq6b1q75ss6pqvhzwqzb6xbp6841f3y5cwhrch2xalxjkc";
version = "3.1.0.11"; # "Android Studio 3.1 Beta 3"
build = "173.4595152";
sha256Hash = "0106ggrf4mkxx3a2dn02km8rdq23sf15ifysykcay29skgdmq6wx";
meta = stable.meta // {
description = "The Official IDE for Android (preview version)";

View file

@ -3,13 +3,13 @@
mkDerivation rec {
name = "albert-${version}";
version = "0.14.14";
version = "0.14.15";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${version}";
sha256 = "1skh709f4y4p0vqabvvysn6fgws2yq8izbwkib7rfjc357chhmi7";
sha256 = "1rjp0bmzs8b9blbxz3sfcanyhgmds882pf1g3jx5qp85y64j8507";
fetchSubmodules = true;
};

View file

@ -6,7 +6,7 @@ with stdenv.lib;
assert imagePreviewSupport -> w3m != null;
pythonPackages.buildPythonApplication rec {
name = "ranger-v${version}";
name = "ranger-${version}";
version = "1.9.0";
src = fetchFromGitHub {

View file

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu }:
boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu,
glew, eigen }:
let
AlienWxWidgets = perlPackages.buildPerlPackage rec {
name = "Alien-wxWidgets-0.69";
@ -34,10 +35,14 @@ stdenv.mkDerivation rec {
name = "slic3r-prusa-edition-${version}";
version = "1.38.7";
enableParallelBuilding = true;
buildInputs = [
cmake
perl
makeWrapper
eigen
glew
tbb
which
Wx

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig
, gtk, girara, ncurses, gettext, docutils
, file, sqlite, glib, texlive
, synctexSupport ? true
, file, sqlite, glib, texlive, libintlOrEmpty
, gtk-mac-integration, synctexSupport ? true
}:
assert synctexSupport -> texlive != null;
@ -19,12 +19,17 @@ stdenv.mkDerivation rec {
icon = ./icon.xpm;
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [
pkgconfig
] ++ optional stdenv.isDarwin [ libintlOrEmpty ];
buildInputs = [
file gtk girara
gettext makeWrapper sqlite glib
] ++ optional synctexSupport texlive.bin.core;
] ++ optional synctexSupport texlive.bin.core
++ optional stdenv.isDarwin [ gtk-mac-integration ];
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
makeFlags = [
@ -50,7 +55,7 @@ stdenv.mkDerivation rec {
homepage = http://pwmt.org/projects/zathura/;
description = "A core component for zathura PDF viewer";
license = licenses.zlib;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ garbas ];
};
}

View file

@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
patches = [ ./gtkflags.patch ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
echo "''${makefileC1/$string1/$string2}" > Makefile
'';
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
meta = with stdenv.lib; {
@ -23,7 +30,7 @@ stdenv.mkDerivation rec {
djvulibre library.
'';
license = licenses.zlib;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ garbas ];
};
}

View file

@ -1,5 +1,6 @@
{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl
, libjpeg, jbig2dec, openjpeg, fetchpatch }:
{ stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk,
gtk-mac-integration, girara, mupdf, openssl , libjpeg, jbig2dec,
openjpeg, fetchpatch }:
stdenv.mkDerivation rec {
version = "0.3.2";
@ -11,7 +12,19 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
buildInputs = [
zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg
] ++ stdenv.lib.optional stdenv.isDarwin [
gtk-mac-integration
];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
echo "''${makefileC1/$string1/$string2}" > Makefile
'';
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
@ -23,7 +36,7 @@ stdenv.mkDerivation rec {
using the mupdf rendering library.
'';
license = licenses.zlib;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan ];
};
}

View file

@ -9,11 +9,18 @@ stdenv.mkDerivation rec {
sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ poppler zathura_core girara ];
nativeBuildInputs = [ pkgconfig zathura_core ];
buildInputs = [ poppler girara ];
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
echo "''${makefileC1/$string1/$string2}" > Makefile
'';
meta = with lib; {
homepage = http://pwmt.org/projects/zathura/;
description = "A zathura PDF plugin (poppler)";
@ -22,7 +29,7 @@ stdenv.mkDerivation rec {
using the poppler rendering library.
'';
license = licenses.zlib;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan garbas ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
{ stdenv, lib, fetchurl, pkgconfig, gtk2, zathura_core, girara, libspectre, gettext }:
stdenv.mkDerivation rec {
name = "zathura-ps-0.2.5";
@ -9,10 +9,17 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libspectre gettext zathura_core gtk girara ];
buildInputs = [ libspectre gettext zathura_core gtk2 girara ];
patches = [ ./gtkflags.patch ];
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
makefileC2=$(echo "$makefileC1" | sed 's|-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}|-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}|g' )
echo "$makefileC2" > Makefile
echo "$makefileC2"
'';
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
meta = with lib; {
@ -23,7 +30,7 @@ stdenv.mkDerivation rec {
libspectre library.
'';
license = licenses.zlib;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers; [ cstrahan garbas ];
};
}

View file

@ -11,8 +11,7 @@ in symlinkJoin {
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/zathura \
--add-flags --plugins-dir=${pluginsPath}
wrapProgram $out/bin/zathura --add-flags --plugins-dir=${pluginsPath}
'';
meta = with lib; {
@ -25,7 +24,7 @@ in symlinkJoin {
as well as an easy usage that mainly focuses on keyboard interaction.
'';
license = licenses.zlib;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = with maintainers;[ garbas smironov ];
};
}

View file

@ -144,9 +144,16 @@ let
# for updated patches and hints about build flags
# (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
] ++ optionals (versionRange "64" "65") [
] ++ optionals (versionRange "64" "65") [
(gentooPatch "chromium-cups-r0.patch" "0hyjlfh062c8h54j4b27y4dq5yzd4w6mxzywk3s02yf6cj3cbkrl")
(gentooPatch "chromium-angle-r0.patch" "0izdrqwsyr48117dhvwdsk8c6dkrnq2njida1q4mb1lagvwbz7gc")
] ++ optionals (versionRange "65" "66") [
#(gentooPatch "chromium-gcc-r0.patch" "127xdwabizn5gz8rf1qsw62i7m0b5bsfjqxv4kdbsnizmjanddf8")
#(gentooPatch "chromium-memcpy-r0.patch" "1d3vra59wjg2lva7ddv55ff6l57mk9k50llsplr0b7vxk0lh0ps5")
(gentooPatch "chromium-webrtc-r0.patch" "0qj5b4w9kav51ylpdf38vm5w7p2gx4qp8p45vrfggp7miicg9cmw")
#(gentooPatch "chromium-vulkan-r0.patch" "1wphsbc6kyck5qanbc4bv14iw2s67fvp1c0kwz29a2avzkz19s84")
#(gentooPatch "chromium-ffmpeg-r0.patch" "0j58g24j6n6vpy6v9wwv34x0dd43m52wg0xcrfkzp72km9wiahff")
#(gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
] ++ optional enableWideVine ./patches/widevine.patch;
postPatch = ''

View file

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl";
sha256bin64 = "0i1g0hv2vji8jx9c973x8nr1ynzsvqjaqcncxj77x6vj9wp0v41p";
version = "64.0.3282.140";
sha256 = "1ggj1a7v2n4v34kb8gx2hcswlayryr9g62zqlry26bwmvz6qzsx9";
sha256bin64 = "1ah8088d8p674dj5bijk5maapmiq9iap1w2i81dl0hhpyqxx3h3i";
version = "65.0.3325.73";
};
dev = {
sha256 = "1b3gyj55xyqsb439szisfn8c4mnpws3pfzrndrl5kgdd239qrfqz";
sha256bin64 = "1hmkinzn4gpikjfd8c9j30px3i0x6y8dddn9pyvjzsk6dzfcvknz";
version = "65.0.3325.31";
sha256 = "13klppyl6rbkd3ffp8y8d95l4mc72gmj45y34wynyfap6b4z1lmh";
sha256bin64 = "0w1ipy858p9lbpcrjhs44kncgw7c5qv1929h0w65ybgsggjqh0gz";
version = "66.0.3343.3";
};
stable = {
sha256 = "1ki9ii3r9iv6k7df2zr14ysm6w3fkvhvcwaw3qjm4b4q6ymznshl";
sha256bin64 = "1zsgcnilip9rxbs51xvnchp87gh4fmgxzrcf9dhfrnldhji17ikj";
version = "64.0.3282.140";
sha256 = "0mf4qjmrjnxs7mx9c5pymavmib7l2a2kxiy0kqk3mma1y90qnc7k";
sha256bin64 = "0idij274g53lzvgz9h5xxi8l841vvvr78hp25ndbmpv4a2p1d83b";
version = "64.0.3282.167";
};
}

View file

@ -12,12 +12,23 @@ rec {
sha512 = "ff748780492fc66b3e44c7e7641f16206e4c09514224c62d37efac2c59877bdf428a3670bfb50407166d7b505d4e2ea020626fd776b87f6abb6bc5d2e54c773f";
};
patches =
[ ./no-buildconfig.patch ./env_var_for_system_dir.patch ]
++ lib.optional stdenv.isi686 (fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
});
patches = [
./no-buildconfig.patch
./env_var_for_system_dir.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=1430274
# Scheduled for firefox 59
(fetchpatch {
url = "https://bug1430274.bmoattachments.org/attachment.cgi?id=8943426";
sha256 = "12yfss3k61yilrb337dh2rffy5hh83d2f16gqrf5i56r9c33f7hf";
})
# https://bugzilla.mozilla.org/show_bug.cgi?id=1388981
# Should have been fixed in firefox 57
] ++ lib.optional stdenv.isi686 (fetchpatch {
url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
});
meta = {
description = "A web browser built from Firefox source tree";

View file

@ -1,6 +1,6 @@
{ lib, buildGoPackage, fetchFromGitHub, ... }:
let version = "0.5.0"; in
let version = "0.6.0"; in
buildGoPackage {
name = "kubecfg-${version}";
@ -9,7 +9,7 @@ buildGoPackage {
owner = "ksonnet";
repo = "kubecfg";
rev = "v${version}";
sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93";
sha256 = "12kv1p707kdxjx5l8rcikd1gjwp5xjxdmmyvlpnvyagrphgrwpsf";
};
goPackagePath = "github.com/ksonnet/kubecfg";

View file

@ -8,8 +8,6 @@
"cmd/kube-controller-manager"
"cmd/kube-proxy"
"plugin/cmd/kube-scheduler"
"federation/cmd/federation-apiserver"
"federation/cmd/federation-controller-manager"
"test/e2e/e2e.test"
]
}:
@ -18,13 +16,13 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
version = "1.7.9";
version = "1.9.1";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi";
sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];

View file

@ -14,12 +14,30 @@ buildPythonApplication rec {
sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5";
};
postInstall = ''
install -Dm 644 r2e.1 $out/share/man/man1/r2e.1
# an alias for better finding the manpage
ln -s -T r2e.1 $out/share/man/man1/rss2email.1
outputs = [ "out" "man" "doc" ];
postPatch = ''
# sendmail executable is called from PATH instead of sbin by default
sed -e 's|/usr/sbin/sendmail|sendmail|' \
-i rss2email/config.py
'';
postInstall = ''
install -Dm 644 r2e.1 $man/share/man/man1/r2e.1
# an alias for better finding the manpage
ln -s -T r2e.1 $man/share/man/man1/rss2email.1
# copy documentation
mkdir -p $doc/share/doc/rss2email
cp AUTHORS COPYING CHANGELOG README $doc/share/doc/rss2email/
'';
# The tests currently fail, see
# https://github.com/rss2email/rss2email/issues/14
# postCheck = ''
# env PYTHONPATH=.:$PYTHONPATH python ./test/test.py
# '';
meta = with lib; {
description = "A tool that converts RSS/Atom newsfeeds to email.";
homepage = https://pypi.python.org/pypi/rss2email;

View file

@ -4,6 +4,16 @@
let
pythonPackages = python3Packages;
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
(oldAttrs:
rec {
pname = "aiohttp";
version = "2.3.10";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
};
}));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs:
rec {
@ -14,6 +24,10 @@ let
inherit pname version;
sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
};
propagatedBuildInputs = [ aiohttp ]
++ stdenv.lib.optional
(pythonPackages.pythonOlder "3.5")
pythonPackages.typing;
}));
in pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";

View file

@ -0,0 +1,68 @@
{ stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
let
fullPath = stdenv.lib.makeLibraryPath [
alsaLib
atk
cairo
cups
dbus
expat
fontconfig
freetype
gdk_pixbuf
glib
gnome2.GConf
gnome2.gtk
nspr
nss
pango
udev
xorg.libX11
xorg.libXScrnSaver
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrandr
xorg.libXrender
xorg.libXtst
xorg.libxcb
] + ":${stdenv.cc.cc.lib}/lib64";
in
stdenv.mkDerivation rec {
version = "1.8.18";
name = "stride-${version}";
src = fetchurl {
url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb";
sha256 = "0hpj3i3xbvckxm7fphqqb3scb31w2cg4riwp593y0gnbivpc0hym";
};
dontBuild = true;
dontFixup = true;
buildInputs = [ dpkg ];
unpackPhase = ''
dpkg-deb -x ${src} ./
'';
installPhase =''
mkdir "$out"
mv usr/* "$out/"
patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${fullPath}:\$ORIGIN" \
"$out/bin/stride"
'';
meta = with stdenv.lib; {
description = "Desktop client for Atlassian Stride";
homepage = https://www.stride.com/;
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ puffnfresh ];
};
}

View file

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
stdenv.mkDerivation rec {
version = "1.1.0";
version = "1.1.1";
name = "irssi-${version}";
src = fetchurl {
url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
sha256 = "0y362v6ncgs77q5axv7vgjm6vcxiaj5chsxj1ha07jaxsr1z7285";
sha256 = "09a9p1yfg0m3w7n2a4axvn8874002ly8x0b543sxihzqk29radpa";
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, which, autoreconfHook, makeWrapper, writeScript,
ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl,
lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }:
{ stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }:
let
muttWrapper = writeScript "mutt" ''
@ -15,14 +15,14 @@ let
'';
in stdenv.mkDerivation rec {
version = "20171208";
version = "20171215";
name = "neomutt-${version}";
src = fetchFromGitHub {
owner = "neomutt";
repo = "neomutt";
rev = "neomutt-${version}";
sha256 = "1fn28q4akfz0nq3ysp8n53j8yqp2mx6yhbvb59c4zm6zgd4qzgp1";
sha256 = "1c7vjl5cl0k41vrxp6l1sj72idz70r2rgaxa2m1yir6zb6qsrsd8";
};
buildInputs = [
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
];
nativeBuildInputs = [
autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which makeWrapper
docbook_xsl docbook_xml_dtd_42 gettext libxslt.bin makeWrapper tcl which
];
enableParallelBuilding = true;
@ -51,18 +51,14 @@ in stdenv.mkDerivation rec {
'';
configureFlags = [
"--enable-debug"
"--enable-gpgme"
"--enable-notmuch"
"--with-curses"
"--with-gss"
"--gpgme"
"--gss"
"--lmdb"
"--notmuch"
"--ssl"
"--sasl"
"--with-homespool=mailbox"
"--with-idn"
"--with-lmdb"
"--with-mailpath="
"--with-sasl"
"--with-ssl"
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
"ac_cv_path_SENDMAIL=sendmail"
];

View file

@ -0,0 +1,17 @@
diff --git i/build.go w/build.go
index 7d400d6f..1b5e1d25 100644
--- i/build.go
+++ w/build.go
@@ -175,6 +175,12 @@ var targets = map[string]target{
{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
},
},
+ "stcli": {
+ name: "stcli",
+ description: "Syncthing CLI",
+ buildPkg: "github.com/syncthing/syncthing/cmd/stcli",
+ binaryName: "stcli", // .exe will be added automatically for Windows builds
+ },
}
func init() {

View file

@ -1,57 +1,103 @@
{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
{ stdenv, lib, go, procps, removeReferencesTo, fetchFromGitHub }:
stdenv.mkDerivation rec {
version = "0.14.44";
name = "syncthing-${version}";
let
common = { stname, target, patches ? [], postInstall ? "" }:
stdenv.mkDerivation rec {
version = "0.14.44";
name = "${stname}-${version}";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "1gdkx6lbzmdz2hqc9slbq41rwgkxmdisnj0iywx4mppmc2b4v6wh";
src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
sha256 = "1gdkx6lbzmdz2hqc9slbq41rwgkxmdisnj0iywx4mppmc2b4v6wh";
};
inherit patches;
buildInputs = [ go ];
nativeBuildInputs = [ removeReferencesTo ];
buildPhase = ''
# Syncthing expects that it is checked out in $GOPATH, if that variable is
# set. Since this isn't true when we're fetching source, we can explicitly
# unset it and force Syncthing to set up a temporary one for us.
env GOPATH= BUILD_USER=nix BUILD_HOST=nix go run build.go -no-upgrade -version v${version} build ${target}
'';
installPhase = ''
install -Dm755 ${target} $out/bin/${target}
runHook postInstall
'';
inherit postInstall;
preFixup = ''
find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
'';
meta = with lib; {
homepage = https://www.syncthing.net/;
description = "Open Source Continuous File Synchronization";
license = licenses.mpl20;
maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ];
platforms = platforms.unix;
};
};
in {
syncthing = common {
stname = "syncthing";
target = "syncthing";
postInstall = ''
# This installs man pages in the correct directory according to the suffix
# on the filename
for mf in man/*.[1-9]; do
mantype="$(echo "$mf" | awk -F"." '{print $NF}')"
mandir="$out/share/man/man$mantype"
install -Dm644 "$mf" "$mandir/$(basename "$mf")"
done
'' + lib.optionalString (stdenv.isLinux) ''
mkdir -p $out/lib/systemd/{system,user}
substitute etc/linux-systemd/system/syncthing-resume.service \
$out/lib/systemd/system/syncthing-resume.service \
--replace /usr/bin/pkill ${procps}/bin/pkill
substitute etc/linux-systemd/system/syncthing@.service \
$out/lib/systemd/system/syncthing@.service \
--replace /usr/bin/syncthing $out/bin/syncthing
substitute etc/linux-systemd/user/syncthing.service \
$out/lib/systemd/user/syncthing.service \
--replace /usr/bin/syncthing $out/bin/syncthing
'';
};
buildInputs = [ go removeReferencesTo ];
syncthing-cli = common {
stname = "syncthing-cli";
buildPhase = ''
mkdir -p src/github.com/syncthing
ln -s $(pwd) src/github.com/syncthing/syncthing
export GOPATH=$(pwd)
patches = [ ./add-stcli-target.patch ];
target = "stcli";
};
# Syncthing's build.go script expects this working directory
cd src/github.com/syncthing/syncthing
syncthing-discovery = common {
stname = "syncthing-discovery";
target = "stdiscosrv";
};
go run build.go -no-upgrade -version v${version} build
'';
syncthing-relay = common {
stname = "syncthing-relay";
target = "strelaysrv";
installPhase = ''
mkdir -p $out/lib/systemd/{system,user}
postInstall = lib.optionalString (stdenv.isLinux) ''
mkdir -p $out/lib/systemd/system
install -Dm755 syncthing $out/bin/syncthing
'' + lib.optionalString (stdenv.isLinux) ''
substitute etc/linux-systemd/system/syncthing-resume.service \
$out/lib/systemd/system/syncthing-resume.service \
--replace /usr/bin/pkill ${procps}/bin/pkill
substitute etc/linux-systemd/system/syncthing@.service \
$out/lib/systemd/system/syncthing@.service \
--replace /usr/bin/syncthing $out/bin/syncthing
substitute etc/linux-systemd/user/syncthing.service \
$out/lib/systemd/user/syncthing.service \
--replace /usr/bin/syncthing $out/bin/syncthing
'';
preFixup = ''
find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
'';
meta = with stdenv.lib; {
homepage = https://www.syncthing.net/;
description = "Open Source Continuous File Synchronization";
license = licenses.mpl20;
maintainers = with maintainers; [ pshendry joko peterhoeg ];
platforms = platforms.unix;
substitute cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
$out/lib/systemd/system/strelaysrv.service \
--replace /usr/bin/strelaysrv $out/bin/strelaysrv
'';
};
}

View file

@ -21,6 +21,7 @@ let
"8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
"8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
"8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
"8.7.2" = "0a0657xby8wdq4aqb2xsxp3n7pmc2w4yxjmrb2l4kccs1aqvaj4w";
}."${version}";
coq-version = builtins.substring 0 3 version;
camlp5 = ocamlPackages.camlp5_strict;

View file

@ -1,4 +1,5 @@
{ stdenv, fetchurl, which }:
stdenv.mkDerivation rec {
name = "eprover-${version}";
version = "2.0";
@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ which ];
preConfigure = ''
sed -e 's/ *CC *= gcc$//' -i Makefile.vars
sed -e 's/ *CC *= *gcc$//' -i Makefile.vars
'';
configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man";

View file

@ -3,13 +3,13 @@
# the modules identified by `rootModules', plus their dependencies.
# Also generate an appropriate modules.dep.
{ stdenvNoCC, kernel, nukeReferences, rootModules
{ stdenvNoCC, kernel, firmware, nukeReferences, rootModules
, kmod, allowMissing ? false }:
stdenvNoCC.mkDerivation {
name = kernel.name + "-shrunk";
builder = ./modules-closure.sh;
buildInputs = [ nukeReferences kmod ];
inherit kernel rootModules allowMissing;
inherit kernel firmware rootModules allowMissing;
allowedReferences = ["out"];
}

View file

@ -33,4 +33,13 @@ for module in $closure; do
echo $target >> $out/insmod-list
done
mkdir -p $out/lib/firmware
for module in $closure; do
for i in $(modinfo -F firmware $module); do
mkdir -p "$out/lib/firmware/$(dirname "$i")"
echo "firmware for $module: $i"
cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi
done
done
depmod -b $out -a $version

View file

@ -26,6 +26,7 @@ rec {
modulesClosure = makeModulesClosure {
inherit kernel rootModules;
firmware = kernel;
};

View file

@ -0,0 +1,90 @@
{ stdenv, fetchzip }:
let
mkVariant = variant: { displayName, version, abbreviation, sha256, outputHash }: stdenv.mkDerivation {
name = "tex-gyre-${variant}-${version}";
inherit version;
src = fetchzip {
url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/${variant}/${abbreviation}${version}otf.zip";
stripRoot = false;
inherit sha256;
};
installPhase = ''
mkdir -p $out/share/fonts/opentype/
cp -v *.otf $out/share/fonts/opentype/
'';
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = outputHash;
meta = with stdenv.lib; {
homepage = http://www.gust.org.pl/projects/e-foundry/tex-gyre;
# "The TeX Gyre fonts are licensed under the GUST Font License (GFL),
# which is a free license, legally equivalent to the LaTeX Project Public
# License (LPPL), version 1.3c or later." - GUST website
license = licenses.lppl13c;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.all;
};
};
in stdenv.lib.mapAttrs mkVariant {
adventor = {
displayName = "Adventor";
version = "2.003";
sha256 = "13wnb04z9f766ij30x8bpkn4xzv7n466g07dlbimx7qvglxl605g";
outputHash = "1cz0lkk2a5fg8r8175h454va499hzln3s99dadxhh147nx1914pm";
abbreviation = "qag";
};
bonum = {
displayName = "Bonum";
version = "2.004";
sha256 = "0qbrs98knx4h0b297c5n3vav4mkal1a95ai2dzmdc10pghfzl8vv";
outputHash = "0bid8gzwz50ylmm8jyqf9s4nfvy6cp1x34wbyrh4gyk1ki6hf3z1";
abbreviation = "qbk";
};
chorus = {
displayName = "Chorus";
version = "2.003";
sha256 = "1b0zak27fzmapwbf2jasvsd95vhnqyc92n985d1lc1ivwja1zgfa";
outputHash = "0fqifd45c1ys6y98b66lmldfbv7wjb2414fs9swicv4n7xvl3cp1";
abbreviation = "qzc";
};
cursor = {
displayName = "Cursor";
version = "2.004";
sha256 = "0ck3jm33bk2xsxp5d2irzd3j24zb49f0gnjvd1nikg1ivk8w85ng";
outputHash = "0i76835xqlkrnlx303mx63m0f4899j056c2ag2fl6p9qk8s4rskp";
abbreviation = "qcr";
};
heros = {
displayName = "Heros";
version = "2.004";
sha256 = "1fj2srxxf6ap913y5yd3dn4jzg828j7381gifs39nm5lnzmgw78y";
outputHash = "16y76ab46fxm9k8wfmwx4w0cl96yrmjywz587lyr08s0agp1v3kf";
abbreviation = "qhv";
};
pagella = {
displayName = "Pagella";
version ="2.004";
sha256 = "0b2pjhw1ihnl951slln6d6vafjd3i6p4i947lwybvg8081qfvd9z";
outputHash = "0c6s0r14qax3b4amvm9nffwzby8mm4p7r2hfb8yv9jzhjwa5z8rd";
abbreviation = "qpl";
};
schola = {
displayName = "Schola";
version = "2.005";
sha256 = "05z3gk4mm0sa7wwjcv31j2xlzqhwhcncpamn0kn9y0221cdknyp8";
outputHash = "1yqq1ngcylhldrh1v35l439k72szq9m4gx6g0wh235fk65chb2bm";
abbreviation = "qcs";
};
termes = {
displayName = "Termes";
version = "2.004";
sha256 = "1aq3yqbgkc3z20dkcqyhicsyq0afbgg4l397z96sd8a16jyz2x8k";
outputHash = "1igw821m601h8937pix6yish4d8fxmz3h4j9hripf41bxsiafzzg";
abbreviation = "qtm";
};
}

View file

@ -1,21 +1,41 @@
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
, spidermonkey_52, pango, readline, glib, libxml2, dbus }:
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobjectIntrospection
, spidermonkey_52, pango, readline, glib, libxml2, dbus, gdk_pixbuf
, makeWrapper }:
stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src;
nativeBuildInputs = [ pkgconfig ];
outputs = [ "out" "installedTests" ];
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ];
propagatedBuildInputs = [ spidermonkey_52 ];
configureFlags = [
"--enable-installed-tests"
];
postPatch = ''
for f in installed-tests/*.test.in; do
substituteInPlace "$f" --subst-var-by pkglibexecdir "$installedTests/libexec/gjs"
done
'';
postInstall = ''
sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
moveToOutput "share/installed-tests" "$installedTests"
moveToOutput "libexec/gjs/installed-tests" "$installedTests"
wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
--prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk_pixbuf ]}:$installedTests/libexec/gjs/installed-tests"
'';
meta = with stdenv.lib; {
description = "JavaScript bindings for GNOME";
maintainers = gnome3.maintainers;
platforms = platforms.linux;
license = licenses.lgpl2Plus;
};
}

View file

@ -1,10 +1,10 @@
# Autogenerated by maintainers/scripts/gnome.sh update
fetchurl: {
name = "gjs-1.50.2";
name = "gjs-1.50.4";
src = fetchurl {
url = mirror://gnome/sources/gjs/1.50/gjs-1.50.2.tar.xz;
sha256 = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3";
url = mirror://gnome/sources/gjs/1.50/gjs-1.50.4.tar.xz;
sha256 = "b336e8709347e3c94245f6cbc3465f9a49f3ae491a25f49f8a97268f5235b93a";
};
}

View file

@ -0,0 +1,33 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "gnome-shell-extension-appindicator-${version}";
version = "22";
src = fetchFromGitHub {
owner = "Ubuntu";
repo = "gnome-shell-extension-appindicator";
rev = "v${version}";
sha256 = "1gqw54d55hxjj2hh04p0dx2j40bhi4ck9hgwlz8f7j4v7r37z0qw";
};
# This package has a Makefile, but it's used for building a zip for
# publication to extensions.gnome.org. Disable the build phase so
# installing doesn't build an unnecessary release.
dontBuild = true;
uuid = "appindicatorsupport@rgcjonas.gmail.com";
installPhase = ''
mkdir -p $out/share/gnome-shell/extensions/${uuid}
cp *.js $out/share/gnome-shell/extensions/${uuid}
cp -r interfaces-xml $out/share/gnome-shell/extensions/${uuid}
cp metadata.json $out/share/gnome-shell/extensions/${uuid}
'';
meta = with stdenv.lib; {
description = "AppIndicator/KStatusNotifierItem support for GNOME Shell";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jonafato ];
homepage = https://github.com/Ubuntu/gnome-shell-extension-appindicator;
};
}

View file

@ -8,11 +8,11 @@ let
majorVersion = "0.12";
in
stdenv.mkDerivation rec {
name = "geary-${majorVersion}.0";
name = "geary-${majorVersion}.1";
src = fetchurl {
url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
sha256 = "0ii4qaqfqx90kvqwg0g9jahygkir4mb03ja55fa55yyx6cq0kwff";
sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6";
};
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];

View file

@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postPatch = ''
sed -i -e 's/8\.6\.1|8\.7\.0|8\.7\.1)/8.6.1|8.7.0|8.7.1|8.7.2)/' configure
'';
configurePhase = ''
substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +

View file

@ -1,19 +1,20 @@
{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs }:
{ stdenv, fetchurl, fetchgit, git, openssl, autoconf, pkgs, makeStaticLibraries }:
# TODO: distinct packages for gambit-release and gambit-devel
stdenv.mkDerivation rec {
name = "gambit-${version}";
version = "4.8.8-427-g37b111a5";
version = "4.8.8-435-gd1991ba7";
bootstrap = import ./bootstrap.nix ( pkgs );
src = fetchgit {
url = "https://github.com/feeley/gambit.git";
rev = "37b111a5ca3aeff9dc6cb8be470277a8c1e80f24";
sha256 = "14l7jql9nh7bjs6c822a17rcp9583l6bb5kiq95allgyf229vy50";
rev = "d1991ba7e90ed0149964320f7cafa1a8289e61f0";
sha256 = "02harwcsqxxcxgn2yc1y9kyxdp32mampyvnbxrzg2jzfmnp5g6cm";
};
buildInputs = [ openssl git autoconf bootstrap ];
# Use makeStaticLibraries to enable creation of statically linked binaries
buildInputs = [ git autoconf bootstrap openssl (makeStaticLibraries openssl)];
configurePhase = ''
options=(

View file

@ -1,24 +1,26 @@
{ stdenv, fetchurl, fetchgit, gambit,
{ stdenv, lib, fetchurl, fetchgit, makeStaticLibraries, gambit,
coreutils, rsync, bash,
openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb }:
openssl, zlib, sqlite, libxml2, libyaml, mysql, lmdb, leveldb, postgresql }:
# TODO: distinct packages for gerbil-release and gerbil-devel
# TODO: make static compilation work
stdenv.mkDerivation rec {
name = "gerbil-${version}";
version = "0.12-DEV-1030-gbbed3bc";
version = "0.12-DEV-1404-g0a266db";
src = fetchgit {
url = "https://github.com/vyzo/gerbil.git";
rev = "bbed3bc4cf7bcaa64eaabdf097192bfcc2bfc928";
sha256 = "1dc0j143j860yq72lfjp71fin7hpsy1426azz7rl1szxvjfb7h4r";
rev = "0a266db5e2e241272711bc150cc2607204bf2b78";
sha256 = "1lvawqn8havfyxkkgfqffc213zq2pgm179l42yj49fy3fhpzia4m";
};
buildInputs = [
gambit
coreutils rsync bash
openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb
];
# Use makeStaticLibraries to enable creation of statically linked binaries
buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml mysql.connector-c lmdb leveldb postgresql ];
buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries;
buildInputs = [ gambit coreutils rsync bash ]
++ buildInputs_libraries ++ buildInputs_staticLibraries;
NIX_CFLAGS_COMPILE = [ "-I${mysql.connector-c}/include/mysql" "-L${mysql.connector-c}/lib/mysql" ];
@ -30,6 +32,18 @@ stdenv.mkDerivation rec {
find . -type f -executable -print0 | while IFS= read -r -d ''$'\0' f; do
substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env'
done
cat > etc/gerbil_static_libraries.sh <<EOF
#OPENSSL_LIBCRYPTO=${makeStaticLibraries openssl}/lib/libcrypto.a # MISSING!
#OPENSSL_LIBSSL=${makeStaticLibraries openssl}/lib/libssl.a # MISSING!
ZLIB=${makeStaticLibraries zlib}/lib/libz.a
# SQLITE=${makeStaticLibraries sqlite}/lib/sqlite.a # MISSING!
# LIBXML2=${makeStaticLibraries libxml2}/lib/libxml2.a # MISSING!
# YAML=${makeStaticLibraries libyaml}/lib/libyaml.a # MISSING!
MYSQL=${makeStaticLibraries mysql.connector-c}/lib/mariadb/libmariadb.a
# LMDB=${makeStaticLibraries lmdb}/lib/mysql/libmysqlclient_r.a # MISSING!
LEVELDB=${makeStaticLibraries lmdb}/lib/libleveldb.a
EOF
'';
buildPhase = ''

View file

@ -607,7 +607,7 @@ self: super: {
};
# Need newer versions of their dependencies than the ones we have in LTS-10.x.
cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_25_0; };
cabal2nix = super.cabal2nix.override { hpack = self.hpack_0_27_0; };
hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_20_1; });
# https://github.com/bos/configurator/issues/22
@ -1000,21 +1000,13 @@ self: super: {
'';
});
# Add a flag to enable building against GHC with D4388 applied (the
# deterministic profiling symbols patch). The flag is disabled by
# default, so we can apply this patch globally.
#
# https://github.com/ucsd-progsys/liquidhaskell/pull/1233
liquidhaskell =
let patch = pkgs.fetchpatch
{ url = https://github.com/ucsd-progsys/liquidhaskell/commit/1aeef1871760b2be46cc1cabd51311997d1d0bc0.patch;
sha256 = "0i55n6p3x9as648as0lvxy2alqb1n7c10xv9gp15cvq7zx6c8ydg";
};
in appendPatch super.liquidhaskell patch;
# https://github.com/nick8325/twee/pull/1
twee-lib = dontHaddock super.twee-lib;
# Needs older hlint
hpio = dontCheck super.hpio;
# https://github.com/ucsd-progsys/liquidhaskell/issues/1238
liquidhaskell = dontHaddock super.liquidhaskell;
}

View file

@ -104,13 +104,6 @@ self: super: {
## hspec-discover ==2.4.7
hspec-discover = super.hspec-discover_2_4_8;
## Needs bump to a versioned attribute
##
## • No instance for (Semigroup Metadatas)
## arising from the superclasses of an instance declaration
## • In the instance declaration for Monoid Metadatas
JuicyPixels = super.JuicyPixels_3_2_9_4;
## Needs bump to a versioned attribute
##
## • Could not deduce (Semigroup (a :->: b))
@ -135,16 +128,7 @@ self: super: {
## • Could not deduce (Semigroup (Traversal f))
## arising from the superclasses of an instance declaration
## from the context: Applicative f
tasty = super.tasty_1_0_0_1;
## Needs bump to a versioned attribute
##
## Setup: Encountered missing dependencies:
## template-haskell >=2.4 && <2.13
## builder for /nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv failed with exit code 1
## error: build of /nix/store/sq6cc33h4zk1wns2fsyv8cj6clcf6hwi-th-lift-0.7.7.drv failed
th-lift = super.th-lift_0_7_8;
tasty = super.tasty_1_0_1;
## On Hackage:

View file

@ -191,7 +191,7 @@ assert allPkgconfigDepends != [] -> pkgconfig != null;
stdenv.mkDerivation ({
name = "${pname}-${version}";
outputs = if (args ? outputs) then args.outputs else ([ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc"));
outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") ++ (optional enableSeparateDocOutput "doc");
setOutputFlags = false;
pos = builtins.unsafeGetAttrPos "pname" args;

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
# Build one of the packages that come with idris
# Build one of the packages that comes with idris
# name: The name of the package
# deps: The dependencies of the package
{ idris, build-idris-package, lib }: name: deps:
@ -6,20 +6,16 @@ let
inherit (builtins.parseDrvName idris.name) version;
in
build-idris-package {
name = "${name}-${version}";
propagatedBuildInputs = deps;
inherit name version;
inherit (idris) src;
idrisDeps = deps;
postUnpack = ''
sourceRoot=$sourceRoot/libs/${name}
'';
postPatch = ''
sed -i ${name}.ipkg -e "/^opts/ s|-i \\.\\./|-i $IDRIS_LIBRARY_PATH/|g"
'';
meta = idris.meta // {
description = "${name} builtin Idris library";
};

View file

@ -1,23 +1,46 @@
# Build an idris package
#
# args: Additional arguments to pass to mkDerivation. Generally should include at least
# name and src.
{ stdenv, idris, gmp }: args: stdenv.mkDerivation ({
buildPhase = ''
idris --build *.ipkg
{ stdenv, idrisPackages, gmp }:
{ idrisDeps ? []
, name
, version
, src
, meta
, extraBuildInputs ? []
, postUnpack ? ""
, doCheck ? true
}:
let
idris-with-packages = idrisPackages.with-packages idrisDeps;
in
stdenv.mkDerivation ({
name = "${name}-${version}";
inherit postUnpack src doCheck meta;
# Some packages use the style
# opts = -i ../../path/to/package
# rather than the declarative pkgs attribute so we have to rewrite the path.
postPatch = ''
sed -i *.ipkg -e "/^opts/ s|-i \\.\\./|-i ${idris-with-packages}/libs/|g"
'';
doCheck = true;
buildPhase = ''
${idris-with-packages}/bin/idris --build *.ipkg
'';
checkPhase = ''
if grep -q test *.ipkg; then
idris --testpkg *.ipkg
${idris-with-packages}/bin/idris --testpkg *.ipkg
fi
'';
installPhase = ''
idris --install *.ipkg --ibcsubdir $IBCSUBDIR
${idris-with-packages}/bin/idris --install *.ipkg --ibcsubdir $out/libs
'';
buildInputs = [ gmp idris ];
} // args)
buildInputs = [ gmp ] ++ extraBuildInputs;
propagatedBuildInputs = idrisDeps;
})

View file

@ -25,14 +25,8 @@
pruviloj = [ self.prelude self.base ];
};
files = builtins.filter (n: n != "default") (pkgs.lib.mapAttrsToList (name: type: let
m = builtins.match "(.*)\\.nix" name;
in if m == null then "default" else builtins.head m) (builtins.readDir ./.));
in (builtins.listToAttrs (map (name: {
inherit name;
value = callPackage (./. + "/${name}.nix") {};
}) files)) // {
in
{
inherit idris-no-deps callPackage;
# See #10450 about why we have to wrap the executable
idris =
@ -40,7 +34,28 @@
idris-no-deps
{ path = [ pkgs.gcc ]; lib = [pkgs.gmp]; };
with-packages = callPackage ./with-packages.nix {} ;
build-builtin-package = callPackage ./build-builtin-package.nix {};
build-idris-package = callPackage ./build-idris-package.nix {};
# Libraries
# A list of all of the libraries that come with idris
builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_;
httpclient = callPackage ./httpclient.nix {};
lightyear = callPackage ./lightyear.nix {};
optparse = callPackage ./optparse.nix {};
wl-pprint = callPackage ./wl-pprint.nix {};
specdris = callPackage ./specdris.nix {};
} // builtins_;
in fix' (extends overrides idrisPackages)

View file

@ -1,17 +1,20 @@
{ pkgs
{ curl
, build-idris-package
, fetchFromGitHub
, lightyear
, contrib
, effects
, prelude
, base
, lib
, idris
}:
let
date = "2016-12-20";
in
build-idris-package {
name = "httpclient-${date}";
name = "httpclient";
version = "2016-12-20";
src = fetchFromGitHub {
owner = "justjoheinz";
@ -20,11 +23,14 @@ build-idris-package {
sha256 = "0sy0q7gri9lwbqdmx9720pby3w1470w7wzn62bf2rir532219hhl";
};
propagatedBuildInputs = [ pkgs.curl lightyear contrib ];
idrisDeps = [ prelude base effects lightyear contrib ];
extraBuildInputs = [ curl ];
meta = {
description = "HTTP Client for Idris";
homepage = https://github.com/justjoheinz/idris-httpclient;
inherit (idris.meta) platforms;
broken = true;
};
}

View file

@ -10,8 +10,5 @@ symlinkJoin {
wrapProgram $out/bin/idris \
--suffix PATH : ${ stdenv.lib.makeBinPath path } \
--suffix LIBRARY_PATH : ${stdenv.lib.makeLibraryPath lib}
mkdir -p $out/nix-support
substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
'';
}

View file

@ -10,8 +10,11 @@
let
date = "2017-09-10";
in
build-idris-package {
name = "lightyear-${date}";
build-idris-package {
name = "lightyear";
version = date;
idrisDeps = [ prelude base effects ];
src = fetchFromGitHub {
owner = "ziman";
@ -20,8 +23,6 @@ build-idris-package {
sha256 = "05x66abhpbdm6yr0afbwfk6w04ysdk78gylj5alhgwhy4jqakv29";
};
propagatedBuildInputs = [ prelude base effects ];
meta = {
description = "Parser combinators for Idris";
homepage = https://github.com/ziman/lightyear;

View file

@ -1,16 +0,0 @@
# Library import path
export IDRIS_LIBRARY_PATH=$PWD/idris-libs
mkdir -p $IDRIS_LIBRARY_PATH
# Library install path
export IBCSUBDIR=$out/lib/@name@
mkdir -p $IBCSUBDIR
addIdrisLibs () {
if [ -d $1/lib/@name@ ]; then
ln -sv $1/lib/@name@/* $IDRIS_LIBRARY_PATH
fi
}
# All run-time deps
addEnvHooks 1 addIdrisLibs

View file

@ -11,7 +11,8 @@ let
date = "2017-11-11";
in
build-idris-package {
name = "specdris-${date}";
name = "specdris";
version = date;
src = fetchgit {
url = "https://github.com/pheymann/specdris";
@ -19,21 +20,10 @@ build-idris-package {
sha256 = "4813c4be1d4c3dd1dad35964b085f83cf9fb44b16824257c72b468d4bafd0e4f";
};
propagatedBuildInputs = [ prelude base effects ];
idrisDeps = [ prelude base effects idris ];
buildPhase = ''
${idris}/bin/idris --build specdris.ipkg
'';
checkPhase = ''
cd test/
${idris}/bin/idris --testpkg test.ipkg
cd ../
'';
installPhase = ''
${idris}/bin/idris --install specdris.ipkg --ibcsubdir $IBCSUBDIR
'';
# The tests attribute is very strange as the tests are a different ipkg
doCheck = false;
meta = {
description = "A testing library for Idris";

View file

@ -1,46 +1,20 @@
# Build a version of idris with a set of packages visible
# packages: The packages visible to idris
{ stdenv, idris }: packages: stdenv.mkDerivation {
inherit (idris) name;
{ stdenv, idris, symlinkJoin, makeWrapper }: packages:
buildInputs = packages;
let paths = stdenv.lib.closePropagation packages;
in
symlinkJoin {
preHook = ''
mkdir -p $out/lib/${idris.name}
name = idris.name + "-with-packages";
installIdrisLib () {
if [ -d $1/lib/${idris.name} ]; then
ln -fsv $1/lib/${idris.name}/* $out/lib/${idris.name}
fi
}
paths = paths ++ [idris] ;
envHostTargetHooks+=(installIdrisLib)
'';
buildInputs = [ makeWrapper ];
unpackPhase = ''
cat >idris.c <<EOF
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
postBuild = ''
wrapProgram $out/bin/idris \
--set IDRIS_LIBRARY_PATH $out/libs
'';
int main (int argc, char ** argv) {
/* idris currently only supports a single library path, so respect it if the user set it */
setenv("IDRIS_LIBRARY_PATH", "$out/lib/${idris.name}", 0);
execv("${idris}/bin/idris", argv);
perror("executing ${idris}/bin/idris");
return 127;
}
EOF
'';
buildPhase = ''
$CC -O3 -o idris idris.c
'';
installPhase = ''
mkdir -p $out/bin
mv idris $out/bin
'';
stripAllList = [ "bin" ];
}

View file

@ -6,7 +6,8 @@
, idris
}:
build-idris-package {
name = "wl-pprint-2016-09-28";
pkName = "wl-pprint";
version = "2016-09-28";
src = fetchFromGitHub {
owner = "shayan-najd";
@ -19,7 +20,7 @@ build-idris-package {
# updating this package again.
doCheck = false;
propagatedBuildInputs = [ prelude base ];
idrisDeps = [ prelude base ];
meta = {
description = "Wadler-Leijen pretty-printing library";

View file

@ -1,16 +1,16 @@
{ stdenv, fetchurl, jdk, makeWrapper }:
{ stdenv, fetchurl, jdk, rlwrap, makeWrapper }:
let version = "1.9.0.273"; in
let version = "1.9.0.326"; in
stdenv.mkDerivation {
name = "clojure-${version}";
src = fetchurl {
url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
sha256 = "0xmrq3xvr002jgq8m1j0y5ld0rcr49608g3gqxgyxzjqswacglb4";
sha256 = "0sf8gy39iz4jxj2wic1lbdwdwbj90k3awhr0kq76gr1z1dwbj6s9";
};
buildInputs = [ jdk makeWrapper ];
buildInputs = [ makeWrapper ];
installPhase = ''
pwd
@ -20,6 +20,9 @@ stdenv.mkDerivation {
cp -f clojure-tools-${version}.jar $out/libexec
sed -i -e "s@PREFIX@$out@g" clojure
cp -f clj clojure $out/bin
for program in $out/bin/{clojure,clj}; do
wrapProgram $program --suffix PATH : $out/bin:${jdk.jre}/bin:${rlwrap}/bin
done
'';
meta = with stdenv.lib; {

View file

@ -20,13 +20,14 @@ stdenv.mkDerivation rec {
sed -e '/^\/\//d' -i include/acl.h
'';
configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip ECHO=echo SED=sed AWK=gawk";
configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ZIP=gzip" "ECHO=echo" "SED=sed" "AWK=gawk" ];
installTargets = "install install-lib install-dev";
installTargets = [ "install" "install-lib" "install-dev" ];
meta = {
homepage = http://savannah.nongnu.org/projects/acl;
meta = with stdenv.lib; {
homepage = "http://savannah.nongnu.org/projects/acl";
description = "Library and tools for manipulating access control lists";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}

View file

@ -1,30 +1,49 @@
{ stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, glib
, gtk_doc, libarchive, gobjectIntrospection
, sqlite, libsoup, gcab, attr, acl, docbook_xsl
{ stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
, gtk_doc, libarchive, gobjectIntrospection, libxslt, pngquant
, sqlite, libsoup, gcab, attr, acl, docbook_xsl, docbook_xml_dtd_42
, libuuid, json_glib, meson, gperf, ninja
}:
stdenv.mkDerivation rec {
name = "appstream-glib-0.7.2";
name = "appstream-glib-0.7.6";
outputs = [ "out" "dev" "man" ];
outputBin = "dev";
src = fetchFromGitHub {
owner = "hughsie";
repo = "appstream-glib";
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
sha256 = "1jvwfida12d2snc8p9lpbpqzrixw2naaiwfmsrldwkrxsj3i19pl";
sha256 = "1nzm6w9n7fb2m06w88gwszaqf74bnip87ay0ca59wajq6y4mpfgv";
};
nativeBuildInputs = [ meson pkgconfig ninja ];
buildInputs = [ glib gtk_doc gettext sqlite libsoup
gcab attr acl docbook_xsl libuuid json_glib
libarchive gobjectIntrospection gperf ];
nativeBuildInputs = [
meson pkgconfig ninja gtk_doc libxslt docbook_xsl docbook_xml_dtd_42
];
buildInputs = [
glib gettext sqlite libsoup
gcab attr acl libuuid json_glib
libarchive gobjectIntrospection gperf
];
propagatedBuildInputs = [ gtk3 ];
mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ];
patches = [
(substituteAll {
src = ./paths.patch;
pngquant= "${pngquant}/bin/pngquant";
})
];
mesonFlags = [
"-Drpm=false"
"-Dstemmer=false"
"-Ddep11=false"
];
meta = with stdenv.lib; {
description = "Objects and helper methods to read and write AppStream metadata";
homepage = https://github.com/hughsie/appstream-glib;
license = licenses.lgpl21Plus;
platforms = platforms.linux;
homepage = https://people.freedesktop.org/~hughsient/appstream-glib/;
license = licenses.lgpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ lethalman matthewbauer ];
};
}

View file

@ -0,0 +1,11 @@
--- a/libappstream-builder/asb-utils.c
+++ b/libappstream-builder/asb-utils.c
@@ -294,7 +294,7 @@
{
g_autofree gchar *standard_error = NULL;
gint exit_status = 0;
- const gchar *argv[] = { "/usr/bin/pngquant", "--skip-if-larger",
+ const gchar *argv[] = { "@pngquant@", "--skip-if-larger",
"--strip", "--ext", ".png",
"--force", "--speed", "1", filename, NULL };
if (!g_file_test (argv[0], G_FILE_TEST_IS_EXECUTABLE))

View file

@ -12,15 +12,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext ];
configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk";
configureFlags = [ "MAKE=make" "MSGFMT=msgfmt" "MSGMERGE=msgmerge" "XGETTEXT=xgettext" "ECHO=echo" "SED=sed" "AWK=gawk" ];
installTargets = "install install-lib install-dev";
installTargets = [ "install" "install-lib" "install-dev" ];
patches = if (hostPlatform.libc == "musl") then [ ./fix-headers-musl.patch ] else null;
meta = {
homepage = http://savannah.nongnu.org/projects/attr/;
meta = with stdenv.lib; {
homepage = "http://savannah.nongnu.org/projects/attr/";
description = "Library and tools for manipulating extended attributes";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
license = licenses.gpl2Plus;
};
}

View file

@ -1,16 +1,24 @@
{ stdenv, fetchurl, intltool, gobjectIntrospection, pkgconfig }:
{ stdenv, fetchurl, gettext, gobjectIntrospection, pkgconfig, meson, ninja, glibcLocales, git, vala, glib, zlib }:
stdenv.mkDerivation rec {
name = "gcab-${version}";
version = "0.7";
version = "1.1";
LC_ALL = "en_US.UTF-8";
src = fetchurl {
url = "mirror://gnome/sources/gcab/${version}/${name}.tar.xz";
sha256 = "1vxdsiky3492zlyrym02sdwf09y19rl2z5h5iin7qm0wizw5wvm1";
sha256 = "0l19sr6pg0cfcddmi5n79d08mjjbhn427ip5jlsy9zddq9r24aqr";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool gobjectIntrospection ];
nativeBuildInputs = [ meson ninja glibcLocales git pkgconfig vala gettext gobjectIntrospection ];
buildInputs = [ glib zlib ];
mesonFlags = [
"-Ddocs=false"
"-Dtests=false"
];
meta = with stdenv.lib; {
platforms = platforms.linux;

View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.42/ -A '*.tar.xz' )
WGET_ARGS=( https://download.kde.org/stable/frameworks/5.43/ -A '*.tar.xz' )

View file

@ -13,8 +13,4 @@ mkDerivation {
qtx11extras
];
propagatedBuildInputs = [ qtbase ];
postPatch = ''
sed -i src/runtime/org.kde.kglobalaccel.service.in \
-e "s|@CMAKE_INSTALL_PREFIX@|''${!outputBin}|"
'';
}

View file

@ -4,7 +4,7 @@
kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio,
knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui,
qtbase, qtdeclarative, qtscript, qtx11extras, kirigami2
qtbase, qtdeclarative, qtscript, qtx11extras, kirigami2, qtquickcontrols2
}:
mkDerivation {
@ -15,6 +15,7 @@ mkDerivation {
kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras kirigami2
qtquickcontrols2
];
propagatedBuildInputs = [ kpackage kservice qtbase ];
}

View file

@ -3,611 +3,627 @@
{
attica = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/attica-5.42.0.tar.xz";
sha256 = "0icjsk5sbri6nwybb2301wc6ysc1h4p35rxqp0adifyksq8akyxd";
name = "attica-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/attica-5.43.0.tar.xz";
sha256 = "1vvf5d0dnfm69gahrhndy9jqxk7hkh5vj6z9pyprpl3zp5z1ki1a";
name = "attica-5.43.0.tar.xz";
};
};
baloo = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/baloo-5.42.0.tar.xz";
sha256 = "18yknkcls1ypsp8n5l254bhlffiq4as5w1wgcjzhnf49cacys8nl";
name = "baloo-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/baloo-5.43.0.tar.xz";
sha256 = "095z6w5qyq4z2hkdxq0vizfgv1v6g9w960wrh78b6bi1bf4ig2np";
name = "baloo-5.43.0.tar.xz";
};
};
bluez-qt = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/bluez-qt-5.42.0.tar.xz";
sha256 = "0pbb0nn70hbsnp9q8jvqr3s85gh4bnnh1mp8xfkia2hp4c63ws9f";
name = "bluez-qt-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/bluez-qt-5.43.0.tar.xz";
sha256 = "04bsrp0biyn7b630hywk82rwn8kl8c2rwh8iwhjz35b51jjqm2b5";
name = "bluez-qt-5.43.0.tar.xz";
};
};
breeze-icons = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/breeze-icons-5.42.0.tar.xz";
sha256 = "0mrj0b022yfy669qqby09k4ij6aqyky23gpnjcp85df9saq0x44r";
name = "breeze-icons-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/breeze-icons-5.43.0.tar.xz";
sha256 = "19yy6pcqjfbjxlkkf4g1hcgl3lv4m640sl26nblrydn9qyj5iniy";
name = "breeze-icons-5.43.0.tar.xz";
};
};
extra-cmake-modules = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz";
sha256 = "1ml6s3ssr5izm3vnzlg5gn2nkcbz5l5nmapvyr4ml7n0089b43a3";
name = "extra-cmake-modules-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/extra-cmake-modules-5.43.0.tar.xz";
sha256 = "1zgzjh5q1ppgfzj4mhprgd4848iwjnzqsnilb0dk5rgdrvfsamsp";
name = "extra-cmake-modules-5.43.0.tar.xz";
};
};
frameworkintegration = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/frameworkintegration-5.42.0.tar.xz";
sha256 = "17fyny3c5chv7bipr19ayfjmd1amp2nms4ba5r7mwjp97xkphry7";
name = "frameworkintegration-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/frameworkintegration-5.43.0.tar.xz";
sha256 = "0qjpk4lslpxqj5aisczm5kl201g4z3grgjhx38r1ih4hyp805vw0";
name = "frameworkintegration-5.43.0.tar.xz";
};
};
kactivities = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kactivities-5.42.0.tar.xz";
sha256 = "0z0ac426npq99s1b8yzrqkjjjc34nbxlpw8pw388yj7fa41hw21r";
name = "kactivities-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kactivities-5.43.0.tar.xz";
sha256 = "0rmmyjfgz8ybvdgpbqndsn0gxizxpmwhvglnnl8ia1s4sna6sjby";
name = "kactivities-5.43.0.tar.xz";
};
};
kactivities-stats = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kactivities-stats-5.42.0.tar.xz";
sha256 = "0si70hayf4brr83jzdjdsfvp8nc1sb7vdk0q532liafhf8hw9mq8";
name = "kactivities-stats-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kactivities-stats-5.43.0.tar.xz";
sha256 = "1rrn1dxsiyvyf3pa5fyxa0sfbamv5c6g95s4f144xwrx2b130rh1";
name = "kactivities-stats-5.43.0.tar.xz";
};
};
kapidox = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kapidox-5.42.0.tar.xz";
sha256 = "0izyd66p5403gl09l7irzy97mb9b14n4zyjrwap800zjlpwh41pz";
name = "kapidox-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kapidox-5.43.0.tar.xz";
sha256 = "0c358ply0qzg269vxyg6py6l8z5j8l4h6apqcynyql4dbbbm8941";
name = "kapidox-5.43.0.tar.xz";
};
};
karchive = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/karchive-5.42.0.tar.xz";
sha256 = "1vq2ngdxmdl6hzjwdcrv66ban8v9s5jiqwy1mgdqv4ak14l31qbi";
name = "karchive-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/karchive-5.43.0.tar.xz";
sha256 = "1f3pqhpdgn00ni05iflyydkmsf3vd403ma5f42zj00kh30l9lqqf";
name = "karchive-5.43.0.tar.xz";
};
};
kauth = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kauth-5.42.0.tar.xz";
sha256 = "04kqb2hhr9lkpkxiaqlnyk0kmk6p89z5fgp5i5g83hsi8maz7swi";
name = "kauth-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kauth-5.43.0.tar.xz";
sha256 = "05w8vx45mrf32kzcyjmay1k9dw3j8axbrrp6infg0hhfsgk04w1f";
name = "kauth-5.43.0.tar.xz";
};
};
kbookmarks = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kbookmarks-5.42.0.tar.xz";
sha256 = "08q413mr5ib04gwnqznvm9vkkfmnh16rgf6rqdvclnci9w7ml5x2";
name = "kbookmarks-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kbookmarks-5.43.0.tar.xz";
sha256 = "0i7rfahn32m6xpbwra5m5nnpgq8l56jm0ijsq6f80cx8ww3nkcq5";
name = "kbookmarks-5.43.0.tar.xz";
};
};
kcmutils = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kcmutils-5.42.0.tar.xz";
sha256 = "1q67b0m6w3xvm22kq8b0b0rib1jzf25gf6dz7h286987zfbbs5n7";
name = "kcmutils-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kcmutils-5.43.0.tar.xz";
sha256 = "1dshx859k64yp00s5xx7z6x0wlawxyq41rg795nqizhk2s76agr2";
name = "kcmutils-5.43.0.tar.xz";
};
};
kcodecs = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kcodecs-5.42.0.tar.xz";
sha256 = "0b19z432r9dnyjknvwffhcmrg969yhydjvy4qrkrf22026f4smwc";
name = "kcodecs-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kcodecs-5.43.0.tar.xz";
sha256 = "0ncrzxvy2l324yvlzha9hkyp5qq75wfb9cbnxb5mygispxhrgh2v";
name = "kcodecs-5.43.0.tar.xz";
};
};
kcompletion = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kcompletion-5.42.0.tar.xz";
sha256 = "0yqci2v0dk5v1mz4n3gca599a7mpihy563zc6sl8hsa30ld8li0f";
name = "kcompletion-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kcompletion-5.43.0.tar.xz";
sha256 = "065nzw26ps367lf3m1j6x95swk0f6grap71wjjv688gablcaz699";
name = "kcompletion-5.43.0.tar.xz";
};
};
kconfig = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kconfig-5.42.0.tar.xz";
sha256 = "08gg0d20c09j7hyxm8ydpzk2yf30c87g9ag7a9nfykrmi6cqirdq";
name = "kconfig-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kconfig-5.43.0.tar.xz";
sha256 = "1na1b2dsajl9b9rn2990fd8cqqaj2iwddrxjacbf0ib5mray1sr2";
name = "kconfig-5.43.0.tar.xz";
};
};
kconfigwidgets = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kconfigwidgets-5.42.0.tar.xz";
sha256 = "191zm24q2n001b65hcnfh2639k4iqhxwdmgdw29php3n2648xq4z";
name = "kconfigwidgets-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kconfigwidgets-5.43.0.tar.xz";
sha256 = "1qxv8m614y0j687gwcsqqkwcdwsbbwc7ivwx6l9djll4r7r1d43w";
name = "kconfigwidgets-5.43.0.tar.xz";
};
};
kcoreaddons = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kcoreaddons-5.42.0.tar.xz";
sha256 = "17qv7r6z72mm9a0hyx5dgk90ikhhgm41bkvnq2hjal0py2lsnrs9";
name = "kcoreaddons-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kcoreaddons-5.43.0.tar.xz";
sha256 = "10pgja1v2x5q6jyajld3yq116g1m90djnbf6p35i6n9ng65h0zy6";
name = "kcoreaddons-5.43.0.tar.xz";
};
};
kcrash = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kcrash-5.42.0.tar.xz";
sha256 = "049y0xdyw37y0qid3d3plj8szfys5gw98j7lhcakiini8mn5cins";
name = "kcrash-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kcrash-5.43.0.tar.xz";
sha256 = "1hvfhr3s0igc1n37w5fxx0jivsgvcdvpa5iywnkk4g1r1l6snx1b";
name = "kcrash-5.43.0.tar.xz";
};
};
kdbusaddons = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kdbusaddons-5.42.0.tar.xz";
sha256 = "1613pc3r70jnzvpwm1xjdbdsmcpx28jwvcs2qq9swlywr5qr9hbd";
name = "kdbusaddons-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kdbusaddons-5.43.0.tar.xz";
sha256 = "1h4m6ra1cangvqyzmkxkh1fld4rlvxnzz8wny53drgbyrsq2xxv5";
name = "kdbusaddons-5.43.0.tar.xz";
};
};
kdeclarative = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kdeclarative-5.42.0.tar.xz";
sha256 = "1w604jy6vg2247vggz0ivl7wy2h5iapkz2z86mah3aw99f7dqa22";
name = "kdeclarative-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kdeclarative-5.43.0.tar.xz";
sha256 = "0jbm2ih9hzpnfaqc867fvwr414q78f9jjk6yyf1cjgq8vx8rmjq1";
name = "kdeclarative-5.43.0.tar.xz";
};
};
kded = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kded-5.42.0.tar.xz";
sha256 = "0w25dl4pnvby28gz0yvij32vi9n3p8si4nm4x45j7zsi2cb70j4l";
name = "kded-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kded-5.43.0.tar.xz";
sha256 = "1kfli2f4hxc9a0hk75kgln3x374y4av6hfajhncwyq37zd4wxq3r";
name = "kded-5.43.0.tar.xz";
};
};
kdelibs4support = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/portingAids/kdelibs4support-5.42.0.tar.xz";
sha256 = "0aiig8akn6bdxrqdl96xjjy2pxw8hhfrsalbkkzyhh06j794snfb";
name = "kdelibs4support-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/portingAids/kdelibs4support-5.43.0.tar.xz";
sha256 = "1rwk436vpny3sq12bjqwapjicc3inyrq6dn34a6mr6gjcd5p2mch";
name = "kdelibs4support-5.43.0.tar.xz";
};
};
kdesignerplugin = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kdesignerplugin-5.42.0.tar.xz";
sha256 = "004axa1fkj954d65x7l9z8dmw04209hb368rwa4gjzb8naf13ib6";
name = "kdesignerplugin-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kdesignerplugin-5.43.0.tar.xz";
sha256 = "0pk95vsgj67jw0qaalcrfvzkr9flxh6shkkmlaxclrz6yhnf9axz";
name = "kdesignerplugin-5.43.0.tar.xz";
};
};
kdesu = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kdesu-5.42.0.tar.xz";
sha256 = "0402p1h7wifk6sppg7ca9w0zfjllbhc1j5gsxj7ypq55g94np7hx";
name = "kdesu-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kdesu-5.43.0.tar.xz";
sha256 = "1mll18ms5zk7i4lpkj6qdcxwaf0h52h9mi47y882hzqkvvbnk4d6";
name = "kdesu-5.43.0.tar.xz";
};
};
kdewebkit = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kdewebkit-5.42.0.tar.xz";
sha256 = "1csd4p996im7ygxc5rfdkzgdpngjgzyqakj12rl9rnfbsd15i8kb";
name = "kdewebkit-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kdewebkit-5.43.0.tar.xz";
sha256 = "0yi7dv77flz7z1yjzlvrfvlybp7knz808hpfbr6hxgrp1gwi7h6b";
name = "kdewebkit-5.43.0.tar.xz";
};
};
kdnssd = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kdnssd-5.42.0.tar.xz";
sha256 = "1k1rz62h3mafliik5n0k98dc56b5v2v6qyqj40696mcyc2d1yvll";
name = "kdnssd-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kdnssd-5.43.0.tar.xz";
sha256 = "0d58aaii1r2x3nmw9s2hnk178sr54yvrqi22ry3xm3v7yvx9jr3b";
name = "kdnssd-5.43.0.tar.xz";
};
};
kdoctools = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kdoctools-5.42.0.tar.xz";
sha256 = "1bby3avdllch1mji0mxzcix8q5yir5a0i6wpjs5lwckv1glh6kmz";
name = "kdoctools-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kdoctools-5.43.0.tar.xz";
sha256 = "1llif166p17ffjwsgvb0n9lq8ip3if0hqma9zm9jpghm5j21q1jh";
name = "kdoctools-5.43.0.tar.xz";
};
};
kemoticons = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kemoticons-5.42.0.tar.xz";
sha256 = "0f6an1bwxnga41a2b35b2pdcni4p0hh76k4jvanl3g046v07f2wr";
name = "kemoticons-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kemoticons-5.43.0.tar.xz";
sha256 = "161n9xg82gxvl4a4by328llxz0x4w643vcxi88414zg1bm1z1cfb";
name = "kemoticons-5.43.0.tar.xz";
};
};
kfilemetadata = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kfilemetadata-5.42.0.tar.xz";
sha256 = "03wk38q3sq354ykz9dwbgykn73ldf94ryx6hxvpr66bq3a59jmwz";
name = "kfilemetadata-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kfilemetadata-5.43.0.tar.xz";
sha256 = "1lxbj8fnaf6sybxgyq6h1qnic65l0mdhhxlw1djd16c7ih7ghrnq";
name = "kfilemetadata-5.43.0.tar.xz";
};
};
kglobalaccel = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kglobalaccel-5.42.0.tar.xz";
sha256 = "0nlza73i0qd79yhwhpnvgbh2xa9lvd1n2xg25p3bvfzwidcfdxg6";
name = "kglobalaccel-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kglobalaccel-5.43.0.tar.xz";
sha256 = "00ygkszkklaz7k4hkshcb5gfynha8rncwvj7z9jvhd9chmwkiffc";
name = "kglobalaccel-5.43.0.tar.xz";
};
};
kguiaddons = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kguiaddons-5.42.0.tar.xz";
sha256 = "193i8b4f13dkgp88m3pk9wzi0dhx7qmsnmpizxia3457gg016wn7";
name = "kguiaddons-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kguiaddons-5.43.0.tar.xz";
sha256 = "0z6sf4pr4ykhlzdckyfap2f41y2chrl2kwlrb4djflfxf7q2xcqr";
name = "kguiaddons-5.43.0.tar.xz";
};
};
kholidays = {
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.43/kholidays-5.43.0.tar.xz";
sha256 = "0zkjh7y0gdwakil6dj0z8yi2zzczzvdfhmnsd54s5yn0fvv37xbk";
name = "kholidays-5.43.0.tar.xz";
};
};
khtml = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/portingAids/khtml-5.42.0.tar.xz";
sha256 = "1bfslndxvad0zgzr22w2mz1xwavix9bh5qrrv8dpshlh043bwr3l";
name = "khtml-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/portingAids/khtml-5.43.0.tar.xz";
sha256 = "034aycdi7i6pvwkwz632nzk3vp8040hlvmzpp38nsy4idl4klh46";
name = "khtml-5.43.0.tar.xz";
};
};
ki18n = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/ki18n-5.42.0.tar.xz";
sha256 = "1rpriflb2a48j94zxgh63l6rzq4nlnlkvy89ns1vkdw42bnqrjx9";
name = "ki18n-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/ki18n-5.43.0.tar.xz";
sha256 = "1zspxv6z4a3rarrn9n38g7rp0gc48bl4kih91m3r2nkap83jb04a";
name = "ki18n-5.43.0.tar.xz";
};
};
kiconthemes = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kiconthemes-5.42.0.tar.xz";
sha256 = "1nbxxpf8bv835xl35b17rk8s3zs110bh31078kqqh7dhvwzlxic7";
name = "kiconthemes-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kiconthemes-5.43.0.tar.xz";
sha256 = "105c892d4np4lshmd5f5x74m1ib3fbmvwgjzf6j317mq261r3rsw";
name = "kiconthemes-5.43.0.tar.xz";
};
};
kidletime = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kidletime-5.42.0.tar.xz";
sha256 = "019r41r28pcrcn1kwxsll53za705jkc9n23b6sr2lplgjk05bcxh";
name = "kidletime-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kidletime-5.43.0.tar.xz";
sha256 = "1jm2rdbzffnw0fv1pzfyz5lvzaa3x2pfp12zm9kl7skyj39z5vbj";
name = "kidletime-5.43.0.tar.xz";
};
};
kimageformats = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kimageformats-5.42.0.tar.xz";
sha256 = "1k67yrmszx7azjzrg478rimbz991lghx4d6dmg22p6dknajd78a6";
name = "kimageformats-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kimageformats-5.43.0.tar.xz";
sha256 = "1bn4rx5xx68m101n3ba774pd8qddaw3bwf2bc7zp7gi6d8bprh9i";
name = "kimageformats-5.43.0.tar.xz";
};
};
kinit = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kinit-5.42.0.tar.xz";
sha256 = "05vpac41pw1n8y58l2z08vyknzv950x8dxxw66dnymm2v31w07ia";
name = "kinit-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kinit-5.43.0.tar.xz";
sha256 = "1jrzr4kv84rvf214wszd2zdnvlx2qxvr1ah9f564h23vvdrg79gd";
name = "kinit-5.43.0.tar.xz";
};
};
kio = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kio-5.42.0.tar.xz";
sha256 = "1526a89x11ank55dp3rfp7xd04w8x7prjg3y6i7n2q9nabwhw7gc";
name = "kio-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kio-5.43.0.tar.xz";
sha256 = "1mbjld1kh5hhslfm4rx9nddghkcgrxbw2pf39c7niq0r1llx5v76";
name = "kio-5.43.0.tar.xz";
};
};
kirigami2 = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kirigami2-5.42.0.tar.xz";
sha256 = "11gqn7amp0r9bgh8ldgisfc2lrkzkn5mq2a1madf24nvjbkvqnqv";
name = "kirigami2-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kirigami2-5.43.0.tar.xz";
sha256 = "0vshabb1q5pjscw0g57l7lpaal69g1mdpf01w0yskmbiqnzzpjl0";
name = "kirigami2-5.43.0.tar.xz";
};
};
kitemmodels = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kitemmodels-5.42.0.tar.xz";
sha256 = "0mcdzdqwmvf9pwirsrnjbhrgqphnfmanbl9zij4qsmin8n866mhc";
name = "kitemmodels-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kitemmodels-5.43.0.tar.xz";
sha256 = "1yw7h7g0knlljizsf9cir196v22cqhlaazmrbm6jqz198g47sqdd";
name = "kitemmodels-5.43.0.tar.xz";
};
};
kitemviews = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kitemviews-5.42.0.tar.xz";
sha256 = "1j1q0b08f8mnfc3r2a7rplyb2nv9f0aq5a3fxskinvg70c6y248w";
name = "kitemviews-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kitemviews-5.43.0.tar.xz";
sha256 = "19w6xhhxr7w40baw6i6lfq0fd7bahxfzr7pj10mrwb5i6bcbsk1h";
name = "kitemviews-5.43.0.tar.xz";
};
};
kjobwidgets = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kjobwidgets-5.42.0.tar.xz";
sha256 = "1m3csdl7wh18ywv5p0qpbjpixvflgjcq3yvk3vlvh0sxxlwcz8k4";
name = "kjobwidgets-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kjobwidgets-5.43.0.tar.xz";
sha256 = "1kri6z737abwsglh29bh4kckbf1ici8n162lcyvw8b3w91l4dyc6";
name = "kjobwidgets-5.43.0.tar.xz";
};
};
kjs = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/portingAids/kjs-5.42.0.tar.xz";
sha256 = "1m26sb2qyrcgmpkw76k2yv5my2pkhld96vw6aaqm77q90faw734g";
name = "kjs-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/portingAids/kjs-5.43.0.tar.xz";
sha256 = "1jdqdy1kxarv6k31yd0k280jyfy7y3qwgd9c7is7aya1ns46nx59";
name = "kjs-5.43.0.tar.xz";
};
};
kjsembed = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/portingAids/kjsembed-5.42.0.tar.xz";
sha256 = "10w4w4ncwr245bv1ii4sh154w91ghfz0l60k89j50lsydpcqcp3a";
name = "kjsembed-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/portingAids/kjsembed-5.43.0.tar.xz";
sha256 = "11hcwwhkrl7sns4s36nxnp550n9xvky1rkrissm0mqh76309g6hy";
name = "kjsembed-5.43.0.tar.xz";
};
};
kmediaplayer = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/portingAids/kmediaplayer-5.42.0.tar.xz";
sha256 = "1k1pjc0cz36gs0pl2pxw8f9f82xkbqyy320nfyhan5waxbl1qd5n";
name = "kmediaplayer-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/portingAids/kmediaplayer-5.43.0.tar.xz";
sha256 = "1q1s5v3fqnmxx58ixgdhkhrgkrdxy8mq8hg4ll7l6038lgycfsxf";
name = "kmediaplayer-5.43.0.tar.xz";
};
};
knewstuff = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/knewstuff-5.42.0.tar.xz";
sha256 = "0i2gmyp67xzf2m5wnv7v574q3gsp1yxfflv1jgl0wy57vchwn9g6";
name = "knewstuff-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/knewstuff-5.43.0.tar.xz";
sha256 = "1v3wzydi1jqb9an2bnxzfhwxhlb2lj8l735mdhym4859njj8x7w7";
name = "knewstuff-5.43.0.tar.xz";
};
};
knotifications = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/knotifications-5.42.0.tar.xz";
sha256 = "0awmwypmd104vhaj2v9k83niflxj26d4mbl6mzfcj75lgka6kffc";
name = "knotifications-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/knotifications-5.43.0.tar.xz";
sha256 = "0kgn5h38z9xd5a210w989j3z0khs4l9ahf19lqfara1ziwl4gaiv";
name = "knotifications-5.43.0.tar.xz";
};
};
knotifyconfig = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/knotifyconfig-5.42.0.tar.xz";
sha256 = "1h07bjj71611v6912m5ajli6qszh9w925zqbk3vih8rn6pd2s3mc";
name = "knotifyconfig-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/knotifyconfig-5.43.0.tar.xz";
sha256 = "0nrjxs263sp64h9pmrmr7fjkbpkalzr6crpyq0aqclciwfjpj326";
name = "knotifyconfig-5.43.0.tar.xz";
};
};
kpackage = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kpackage-5.42.0.tar.xz";
sha256 = "10amhh07x8d0jkyylb19cyzjs71k8dq1y8isfahqzb2kd43vijqa";
name = "kpackage-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kpackage-5.43.0.tar.xz";
sha256 = "1nr7zkqp7zbvyrhc7iqznyqnfhmnqhhaqs30ig4gwsagq3x2a02b";
name = "kpackage-5.43.0.tar.xz";
};
};
kparts = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kparts-5.42.0.tar.xz";
sha256 = "1mb5gp2ckmmrb4ym7cqvyl81wnp7cryk85gmizl7cnn69svlf40h";
name = "kparts-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kparts-5.43.0.tar.xz";
sha256 = "09i2ds6xgkbm9k9nd9yj1p3qw9xl3a25lh97ln9c39ccx32i32wd";
name = "kparts-5.43.0.tar.xz";
};
};
kpeople = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kpeople-5.42.0.tar.xz";
sha256 = "050km3rpx58acx2341si46lxc2hywa59m8rwd849c2dnsxw3w1hm";
name = "kpeople-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kpeople-5.43.0.tar.xz";
sha256 = "0xi6sxprqvmjc30cw1rfpryahid9dswql6b1wrdv5wsmci8k4xmq";
name = "kpeople-5.43.0.tar.xz";
};
};
kplotting = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kplotting-5.42.0.tar.xz";
sha256 = "109b9grshrwralyp8ilkbf1k0akaggygqh6wafqdf0ris0ps13l9";
name = "kplotting-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kplotting-5.43.0.tar.xz";
sha256 = "0d5mf5xaysw837ninvdx1hfra8qjaxd9lcm28fyjfm506iq8v09f";
name = "kplotting-5.43.0.tar.xz";
};
};
kpty = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kpty-5.42.0.tar.xz";
sha256 = "07s16zxs03ixy7yxy9fda83yqhcgqzx42gnvwjwkyc8q05njmma6";
name = "kpty-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kpty-5.43.0.tar.xz";
sha256 = "09m02ramzk6jc9scnsvcm2sgnia2vmnnfgmjsddspc2kp1aj2km8";
name = "kpty-5.43.0.tar.xz";
};
};
kross = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/portingAids/kross-5.42.0.tar.xz";
sha256 = "1aqqwby6jslimpvx42d4n6gjsjc8l82gmsq5ajpv9zkkk91dqfqi";
name = "kross-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/portingAids/kross-5.43.0.tar.xz";
sha256 = "05px64msss6as0pbrpl6l4y2n97kayphxqhwfilgsj9yjmyhm46h";
name = "kross-5.43.0.tar.xz";
};
};
krunner = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/krunner-5.42.0.tar.xz";
sha256 = "0xh9kss67l09am1ilsr9zyx1yhlmaq3g9x60hw0sx7h7wrl6zsw6";
name = "krunner-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/krunner-5.43.0.tar.xz";
sha256 = "1wiaaz7wc2ls0gxyyws7cw6gmphkzayhdz1xxsyn4bzrc1h3z7dw";
name = "krunner-5.43.0.tar.xz";
};
};
kservice = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kservice-5.42.0.tar.xz";
sha256 = "0z8zfpd00ndvkm1klp8l4mrcksshhyg280zgmg3gffz5rgh3gwri";
name = "kservice-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kservice-5.43.0.tar.xz";
sha256 = "1mdxd8kxawlhrsnd9lrx6cx9p8gvvsr9mx2d1s0bi90kapfqyqi3";
name = "kservice-5.43.0.tar.xz";
};
};
ktexteditor = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/ktexteditor-5.42.0.tar.xz";
sha256 = "020y3j6vm15sfpiwainr3qsx9i93j15mrvq523wmbmdj1z36yrh2";
name = "ktexteditor-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/ktexteditor-5.43.0.tar.xz";
sha256 = "1rhw1y0js2vjjp7c9f539lvqvci4nrgdicaypw3p5ndg8vsw2xag";
name = "ktexteditor-5.43.0.tar.xz";
};
};
ktextwidgets = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/ktextwidgets-5.42.0.tar.xz";
sha256 = "088azbv95ycwxmxxw4l63i2l14fmn8l473pb4djh2mvz1ypfqayk";
name = "ktextwidgets-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/ktextwidgets-5.43.0.tar.xz";
sha256 = "0h5bxf1a9mik2p2xhnm7nnr0r54s6zf4cby4qd8nlwl292dyf8gy";
name = "ktextwidgets-5.43.0.tar.xz";
};
};
kunitconversion = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kunitconversion-5.42.0.tar.xz";
sha256 = "0219pna4l3vvhyf5acsc87n48jzdnws6kwyhaiy3hy1pzrilv32l";
name = "kunitconversion-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kunitconversion-5.43.0.tar.xz";
sha256 = "14syfc9vybmaais740xmb79g7ffpyanwkb2blar88zm810dpshqd";
name = "kunitconversion-5.43.0.tar.xz";
};
};
kwallet = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kwallet-5.42.0.tar.xz";
sha256 = "1kv3v7593srfn0wd7qp4rhvb30rxp7d2qmlwi0n4nc9s6v59pabn";
name = "kwallet-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kwallet-5.43.0.tar.xz";
sha256 = "01mxl06nbpgkp6dva1kvqcbhjahgjqkbql6rhwgdyhb4asabnsmj";
name = "kwallet-5.43.0.tar.xz";
};
};
kwayland = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kwayland-5.42.0.tar.xz";
sha256 = "0wr6ygppahxsx3dh71h2wmybv7z7iyqdv7wn80cxb0mp4zpyinh7";
name = "kwayland-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kwayland-5.43.0.tar.xz";
sha256 = "0glp9bnv53jjycwni0ywd7apr0jps3j0hpzs14y2v9bp4mwjgaji";
name = "kwayland-5.43.0.tar.xz";
};
};
kwidgetsaddons = {
version = "5.42.1";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kwidgetsaddons-5.42.1.tar.xz";
sha256 = "0h0vfrfl5zi01fpvmd825kazzlyawz3i66qrfkymdrnvqmfzcmlg";
name = "kwidgetsaddons-5.42.1.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kwidgetsaddons-5.43.0.tar.xz";
sha256 = "15x7k953jj6vqmb2bbw4wad2n10akkg4i5n0gmkj4fsaiag359sr";
name = "kwidgetsaddons-5.43.0.tar.xz";
};
};
kwindowsystem = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kwindowsystem-5.42.0.tar.xz";
sha256 = "15k6x0f93qxka3mz7qfzak2ibdd88q77pz6akil8s3g41zsg2dqv";
name = "kwindowsystem-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kwindowsystem-5.43.0.tar.xz";
sha256 = "0zcrls3m9np2a9r5n7fry03ll6vrj36abjh2sajm531z657xmxjd";
name = "kwindowsystem-5.43.0.tar.xz";
};
};
kxmlgui = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kxmlgui-5.42.0.tar.xz";
sha256 = "0kfxjx8wrhkys5bydnv84nqxc2jqvv92zb2l6zpi0km5ggmia5y0";
name = "kxmlgui-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kxmlgui-5.43.0.tar.xz";
sha256 = "1jncpyfvanyl02zx8zi2mmwbx86yaq9k7k40vh716dswbh2idzd3";
name = "kxmlgui-5.43.0.tar.xz";
};
};
kxmlrpcclient = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/kxmlrpcclient-5.42.0.tar.xz";
sha256 = "0ciip27ilsfk9s3gslpbi06v8i6ipdbmcig2jf43z3amsxpq0ncn";
name = "kxmlrpcclient-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/kxmlrpcclient-5.43.0.tar.xz";
sha256 = "0c99wq7kqaqvafppcai47q8w9n21ncfmrc562cvhyqnx9qr9n5vn";
name = "kxmlrpcclient-5.43.0.tar.xz";
};
};
modemmanager-qt = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/modemmanager-qt-5.42.0.tar.xz";
sha256 = "0q6qzn60z55h0gyc9xwdfaq45mjpk3zrr6d4qqjjfkqsr3866sfx";
name = "modemmanager-qt-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/modemmanager-qt-5.43.0.tar.xz";
sha256 = "16h8af046jlhn31dg1y3ajpniidkijf0wy0qa7z6bpqw01vj4l6w";
name = "modemmanager-qt-5.43.0.tar.xz";
};
};
networkmanager-qt = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/networkmanager-qt-5.42.0.tar.xz";
sha256 = "03hhvx8d52mfgbhd4gn0vhsk9k1fv1pvq24ixxdgs2mw44v884xq";
name = "networkmanager-qt-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/networkmanager-qt-5.43.0.tar.xz";
sha256 = "0pkm02bg201xcxyn2cbw1w3gag9ig4g5yz4wbd2db6qzvficmfqc";
name = "networkmanager-qt-5.43.0.tar.xz";
};
};
oxygen-icons5 = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/oxygen-icons5-5.42.0.tar.xz";
sha256 = "0pnav9h0xmvbaamzpcyznjjv25slz8maszshx7sj7h07b5a23x46";
name = "oxygen-icons5-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/oxygen-icons5-5.43.0.tar.xz";
sha256 = "13c80jnc6h2z9bbwwzq1b8jsn80n4bs0zzr2xsbzsfbl5sw0hwpc";
name = "oxygen-icons5-5.43.0.tar.xz";
};
};
plasma-framework = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/plasma-framework-5.42.0.tar.xz";
sha256 = "079c8h0lmbkfr3srj5m8a40b50kyrxbgmy1n66329l8js9xrvaah";
name = "plasma-framework-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/plasma-framework-5.43.0.tar.xz";
sha256 = "1v7far0jz0b0rvx4jzqsq2pp1diny5c2qz67jyxnqlfgsba8y466";
name = "plasma-framework-5.43.0.tar.xz";
};
};
prison = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/prison-5.42.0.tar.xz";
sha256 = "0bhg2fjdwsv7mk16jh1nc3miwggz1dl9l99l2f20xvi75hn7rryg";
name = "prison-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/prison-5.43.0.tar.xz";
sha256 = "018kj3xgl5wr3nhrasxmwvk6fh63fdwlz78z1rzyd78jx95wpaqc";
name = "prison-5.43.0.tar.xz";
};
};
purpose = {
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.43/purpose-5.43.0.tar.xz";
sha256 = "1vk796f3w2arqaql16yy012211vxgz6awa8kg0p1zrxbid43x757";
name = "purpose-5.43.0.tar.xz";
};
};
qqc2-desktop-style = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/qqc2-desktop-style-5.42.0.tar.xz";
sha256 = "1arlfhcshfs11pgf87jzjgln1p711zlx0v0q014740mbzb9g5wnk";
name = "qqc2-desktop-style-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/qqc2-desktop-style-5.43.0.tar.xz";
sha256 = "0q6v1si1c8dlvq5f303dd4n1qqrn9kw0r51dl37px6rvy2n16d0w";
name = "qqc2-desktop-style-5.43.0.tar.xz";
};
};
solid = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/solid-5.42.0.tar.xz";
sha256 = "10lr8paaq6vaiqn833kzcdc3kkyv8j9fdchy7h8pvi9ajjjwq0lq";
name = "solid-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/solid-5.43.0.tar.xz";
sha256 = "0q62z23dml6rndgmkg6r09gsi0in8c4gbgv66dw47v02spsnp7v9";
name = "solid-5.43.0.tar.xz";
};
};
sonnet = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/sonnet-5.42.0.tar.xz";
sha256 = "1r3amddmy0nm8klw0jzvb8bl1l9hkrx50d8j0zq2lbjy36h3yliw";
name = "sonnet-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/sonnet-5.43.0.tar.xz";
sha256 = "0i5vxaw124093fi7fi8gjyi08xgxpkpb68lrpsxqdikadvx6nwaa";
name = "sonnet-5.43.0.tar.xz";
};
};
syntax-highlighting = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/syntax-highlighting-5.42.0.tar.xz";
sha256 = "1iwiym50859jki4x41rfdmbd14jiq5lr2hdg46pjkyw17njdjd60";
name = "syntax-highlighting-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/syntax-highlighting-5.43.0.tar.xz";
sha256 = "0a1xrpk3wavcq6d3cld33l05g5xlhz635vwcc6i1092gsgdns7k1";
name = "syntax-highlighting-5.43.0.tar.xz";
};
};
threadweaver = {
version = "5.42.0";
version = "5.43.0";
src = fetchurl {
url = "${mirror}/stable/frameworks/5.42/threadweaver-5.42.0.tar.xz";
sha256 = "1isqlpnfxzxyz7mdm7yfrafgnx09mcndicdgdw3mi4r4misbrrbn";
name = "threadweaver-5.42.0.tar.xz";
url = "${mirror}/stable/frameworks/5.43/threadweaver-5.43.0.tar.xz";
sha256 = "0mmnf6lirvqwlrijpn5vqd8l9pk74dpsbr81y6kyfmx31mj36jjx";
name = "threadweaver-5.43.0.tar.xz";
};
};
}

View file

@ -1,5 +1,5 @@
diff --git a/configure.ac b/configure.ac
index c909878..60c540e 100644
index 88ccd91..0857782 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ AS_CASE([$host_os],
@ -31,7 +31,7 @@ index c909878..60c540e 100644
+ os_is_macosx=false
+ nonLinuxOS=false
+ ;;
+esac
+esac
+AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue])
+AM_COND_IF([IS_DARWIN],
+ [AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
@ -58,7 +58,7 @@ index 45b3b15..d0d4043 100644
#include <sys/types.h>
#include <stdint.h>
diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
index 4b69983..8e2ac75 100644
index 4b69983..c75151b 100644
--- a/include/bsd/stdio.h
+++ b/include/bsd/stdio.h
@@ -48,12 +48,16 @@
@ -69,37 +69,60 @@ index 4b69983..8e2ac75 100644
/* XXX: The function requires cooperation from the system libc to store the
* line buffer in the FILE struct itself. */
char *fgetln(FILE *fp, size_t *lenp)
LIBBSD_DEPRECATED("This functions cannot be safely ported, "
"use getline(3) instead, as it is supported "
"by GNU and POSIX.1-2008.");
- LIBBSD_DEPRECATED("This functions cannot be safely ported, "
- "use getline(3) instead, as it is supported "
- "by GNU and POSIX.1-2008.");
+ __attribute__((deprecated("This functions cannot be safely ported, "
+ "use getline(3) instead, as it is supported "
+ "by GNU and POSIX.1-2008.")));
+#else
+char *fgetln(FILE *fp, size_t *lenp);
+#endif
/*
* Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
index ebc9638..6cd7943 100644
--- a/include/bsd/stdlib.h
+++ b/include/bsd/stdlib.h
@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb,
const unsigned char *table, unsigned endbyte);
void *reallocf(void *ptr, size_t size);
-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
+#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if !__GLIBC_PREREQ(2, 26)
void *reallocarray(void *ptr, size_t nmemb, size_t size);
#endif
+#endif
long long strtonum(const char *nptr, long long minval, long long maxval,
const char **errstr);
diff --git a/include/bsd/string.h b/include/bsd/string.h
index ee2f953..a3ab077 100644
index 6798bf6..6baaa14 100644
--- a/include/bsd/string.h
+++ b/include/bsd/string.h
@@ -37,11 +37,14 @@
@@ -37,6 +37,12 @@
#include <sys/types.h>
__BEGIN_DECLS
-size_t strlcpy(char *dst, const char *src, size_t siz);
-size_t strlcat(char *dst, const char *src, size_t siz);
char *strnstr(const char *str, const char *find, size_t str_len);
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+size_t bsd_strlcpy(char *dst, const char *src, size_t siz);
+size_t bsd_strlcat(char *dst, const char *src, size_t siz);
+char *bsd_strnstr(const char *str, const char *find, size_t str_len);
+void bsd_strmode(mode_t mode, char *str);
+#else
void strmode(mode_t mode, char *str);
-
+#endif
size_t strlcpy(char *dst, const char *src, size_t siz);
size_t strlcat(char *dst, const char *src, size_t siz);
char *strnstr(const char *str, const char *find, size_t str_len);
@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str);
#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
void explicit_bzero(void *buf, size_t len);
#endif
+#endif
__END_DECLS
#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index ad83dbf..0f2a7ee 100644
--- a/src/Makefile.am
@ -519,18 +542,17 @@ index 462535a..e7eb46f 100644
+}
#endif
diff --git a/src/funopen.c b/src/funopen.c
index 1e05c7e..ed8ce85 100644
index 1e05c7e..75e61ea 100644
--- a/src/funopen.c
+++ b/src/funopen.c
@@ -137,7 +137,7 @@ funopen(const void *cookie,
return fopencookie(cookiewrap, mode, funcswrap);
}
-#elif defined(__MUSL__)
+#elif defined(__MUSL__) || defined(darwin) || defined(__APPLE__) || defined(MACOSX)
/*
* This is unimplementable on musl based systems, and upstream has stated
@@ -143,6 +143,7 @@ funopen(const void *cookie,
* they will not add the needed support to implement it. Just ignore this
* interface there, as it has never been provided anyway.
*/
+#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX)
#else
#error "Function funopen() needs to be ported or disabled."
#endif
diff --git a/src/getentropy.c b/src/getentropy.c
index 3f11a1e..8a23a07 100644
--- a/src/getentropy.c
@ -563,13 +585,15 @@ index 4f368a1..ab22fc1 100644
#define SHA512_DIGEST_LENGTH 64
diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
index b3c8d5e..4fade0f 100644
index b3c8d5e..f69013d 100644
--- a/src/hash/sha512c.c
+++ b/src/hash/sha512c.c
@@ -25,7 +25,11 @@
@@ -25,7 +25,13 @@
*/
#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+#include <machine/endian.h>
+#else
@ -579,24 +603,25 @@ index b3c8d5e..4fade0f 100644
#include <string.h>
diff --git a/src/nlist.c b/src/nlist.c
index 0932f59..a3ba2be 100644
index 0932f59..598a329 100644
--- a/src/nlist.c
+++ b/src/nlist.c
@@ -27,6 +27,8 @@
@@ -27,6 +27,10 @@
* SUCH DAMAGE.
*/
+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
#include <sys/param.h>
@@ -265,3 +267,5 @@ nlist(const char *name, struct nlist *list)
@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list)
(void)close(fd);
return (n);
}
+
+#endif
+#endif /* _NLIST_DO_ELF */
diff --git a/src/setproctitle.c b/src/setproctitle.c
index 038ac7d..d0ef01b 100644
--- a/src/setproctitle.c

View file

@ -0,0 +1,140 @@
{ stdenv, lib, config, fetchFromGitHub
, cmake
, glog, google-gflags, gtest
, protobuf, snappy
, python, future, six, python-protobuf, numpy, pydot
, eigen3
, doxygen
, useCuda ? (config.cudaSupport or false), cudatoolkit ? null
, useCudnn ? (config.cudnnSupport or false), cudnn ? null
, useOpenmp ? false, openmp ? null
, useOpencv3 ? true, opencv3 ? null
, useLeveldb ? false, leveldb ? null
, useLmdb ? true, lmdb ? null
, useRocksdb ? false, rocksdb ? null
, useZeromq ? false, zeromq ? null
, useMpi ? false, mpi ? null
# TODO: distributed computations
#, useGloo ? false
#, useNccl ? false
#, useNnpack ? false
}:
assert useCuda -> cudatoolkit != null;
assert useCudnn -> (useCuda && cudnn != null);
assert useOpencv3 -> opencv3 != null;
assert useLeveldb -> leveldb != null;
assert useLmdb -> lmdb != null;
assert useRocksdb -> rocksdb != null;
assert useZeromq -> zeromq != null;
assert useMpi -> mpi != null;
let
# Third party modules that caffe2 holds as git submodules.
# Download them and create symlinks from caffe2/third_party.
installExtraSrc = extra: ''
rmdir "third_party/${extra.dst}"
ln -s "${extra.src}" "third_party/${extra.dst}"
'';
cub = {
src = fetchFromGitHub rec {
owner = "NVlabs";
repo = "cub";
rev = "v1.7.4";
sha256 = "0ksd5n1lxqhm5l5cd2lps4cszhjkf6gmzahaycs7nxb06qci8c66";
};
dst = "cub";
};
pybind11 = {
src = fetchFromGitHub {
owner = "pybind";
repo = "pybind11";
rev = "86e2ad4f77442c3350f9a2476650da6bee253c52";
sha256 = "05gi58dirvc8fgm0avpydvidzsbh2zrzgfaq671ym09f6dz0bcgz";
};
dst = "pybind11";
};
in
stdenv.mkDerivation rec {
name = "caffe2-${version}";
version = "0.8.1";
src = fetchFromGitHub {
owner = "caffe2";
repo = "caffe2";
rev = "v${version}";
sha256 = "18y7zjc69j6n5642l9caddl641b0djf3pjn4wacdsc1wk1jiyqk8";
};
nativeBuildInputs = [ cmake doxygen gtest ];
outputs = [ "bin" "out" ];
propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
buildInputs = [ glog google-gflags protobuf snappy eigen3 ]
++ lib.optional useCuda cudatoolkit
++ lib.optional useCudnn cudnn
++ lib.optional useOpenmp openmp
++ lib.optional useOpencv3 opencv3
++ lib.optional useLeveldb leveldb
++ lib.optional useLmdb lmdb
++ lib.optional useRocksdb rocksdb
++ lib.optional useZeromq zeromq
;
propagatedBuildInputs = [ numpy future six python-protobuf pydot ];
patches = lib.optional stdenv.cc.isClang [ ./update_clang_cvtsh_bugfix.patch ];
cmakeFlags = [ ''-DBUILD_TEST=OFF''
''-DBUILD_PYTHON=ON''
''-DUSE_CUDA=${if useCuda then ''ON''else ''OFF''}''
''-DUSE_OPENMP=${if useOpenmp then ''ON''else ''OFF''}''
''-DUSE_OPENCV=${if useOpencv3 then ''ON''else ''OFF''}''
''-DUSE_MPI=${if useMpi then ''ON''else ''OFF''}''
''-DUSE_LEVELDB=${if useLeveldb then ''ON''else ''OFF''}''
''-DUSE_LMDB=${if useLmdb then ''ON''else ''OFF''}''
''-DUSE_ROCKSDB=${if useRocksdb then ''ON''else ''OFF''}''
''-DUSE_ZMQ=${if useZeromq then ''ON''else ''OFF''}''
''-DUSE_GLOO=OFF''
''-DUSE_NNPACK=OFF''
''-DUSE_NCCL=OFF''
''-DUSE_REDIS=OFF''
''-DUSE_FFMPEG=OFF''
]
++ lib.optional useCuda [
''-DCUDA_TOOLKIT_ROOT_DIR=${cudatoolkit}''
''-DCUDA_FAST_MATH=ON''
''-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/gcc''
];
preConfigure = ''
${installExtraSrc cub}
${installExtraSrc pybind11}
# XXX hack
export NIX_CFLAGS_COMPILE="-I ${eigen3}/include/eigen3/ $NIX_CFLAGS_COMPILE"
'';
postInstall = ''
moveToOutput "bin" "$bin"
mkdir -p $out/lib/${python.libPrefix}
ln -s $out/ $out/${python.sitePackages}
'';
doCheck = false;
enableParallelBuilding = true;
meta = {
homepage = https://caffe2.ai/;
description = "A new lightweight, modular, and scalable deep learning framework";
longDescription = ''
Caffe2 aims to provide an easy and straightforward way for you to experiment
with deep learning and leverage community contributions of new models and
algorithms. You can bring your creations to scale using the power of GPUs in the
cloud or to the masses on mobile with Caffe2's cross-platform libraries.
'';
platforms = with stdenv.lib.platforms; linux ++ darwin;
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ yuriaisaka ];
};
}

View file

@ -0,0 +1,55 @@
diff --git a/caffe2/perfkernels/cvtsh_ss_bugfix.h b/caffe2/perfkernels/cvtsh_ss_bugfix.h
index bd06681..00172b7 100644
--- a/caffe2/perfkernels/cvtsh_ss_bugfix.h
+++ b/caffe2/perfkernels/cvtsh_ss_bugfix.h
@@ -1,10 +1,36 @@
+/**
+ * Copyright (c) 2016-present, Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
#pragma once
-#if defined(__APPLE__) && (__clang_major__ < 8)
+// Apple clang was fixed in 8.1
+#if defined(__apple_build_version__) && ((__clang_major__ < 8) || ((__clang_major__ == 8) && (__clang_minor__ < 1)))
+#define __APPLE_NEED_FIX 1
+#endif
+
+// Regular clang was fixed in 3.9
+#if defined(__clang__) && (__clang_major__ < 4) && (__clang_minor__ < 9)
+#define __CLANG_NEED_FIX 1
+#endif
+
+#if __APPLE_NEED_FIX || __CLANG_NEED_FIX
#include <emmintrin.h>
-// This version of apple clang has a bug that _cvtsh_ss is not defined, see
+// This version of clang has a bug that _cvtsh_ss is not defined, see
// https://reviews.llvm.org/D16177
static __inline float
__attribute__((__always_inline__, __nodebug__, __target__("f16c")))
@@ -15,7 +41,10 @@ _cvtsh_ss(unsigned short a)
return r[0];
}
-#endif // defined(__APPLE__) && (__clang_major__ < 8)
+#endif // __APPLE_NEED_FIX || __CLANG_NEED_FIX
+
+#undef __APPLE_NEED_FIX
+#undef __CLANG_NEED_FIX
#ifdef _MSC_VER

View file

@ -0,0 +1,22 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k }:
buildPythonPackage rec {
pname = "JPype1";
version = "0.6.2";
src = fetchPypi {
inherit pname version;
sha256 = "09bzmnzkjbrf60h39wapxc1l8mb3r9km486cly0mm78bv096884r";
};
patches = [ ./set-compiler-language.patch ];
# Test loader complains about non-test module on python3.
doCheck = !isPy3k;
meta = {
homepage = "https://github.com/originell/jpype/";
license = "License :: OSI Approved :: Apache Software License";
description = "A Python to Java bridge.";
};
}

View file

@ -0,0 +1,12 @@
diff -Naur a/setup.py b/setup.py
--- a/setup.py 2017-01-12 19:08:44.000000000 -0500
+++ b/setup.py 2018-02-15 12:28:16.000000000 -0500
@@ -123,7 +123,7 @@
# extra compile args
copt = {'msvc': ['/EHsc'],
- 'unix' : ['-ggdb'],
+ 'unix' : ['-ggdb', '-x', 'c++'],
'mingw32' : [],
}
# extra link args

View file

@ -0,0 +1,16 @@
{ lib, buildPythonPackage, fetchPypi, JPype1 }:
buildPythonPackage rec {
pname = "JayDeBeApi";
version = "1.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "0a189xs9zw81jvwwglvf2qyqnk6ra0biljssx9n4ffayqn9glbds";
};
propagatedBuildInputs = [ JPype1 ];
meta = {
homepage = "https://github.com/baztian/jaydebeapi";
license = lib.licenses.lgpl2;
description = "Use JDBC database drivers from Python 2/3 or Jython with a DB-API.";
};
}

View file

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchPypi
, pythonOlder
, attrs
, chardet
, multidict
, async-timeout
@ -14,24 +15,24 @@
buildPythonPackage rec {
pname = "aiohttp";
version = "2.3.10";
version = "3.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
sha256 = "7aee5c0750584946fde40da70f0b28fe769f85182f1171acef18a35fd8ecd221";
};
disabled = pythonOlder "3.4";
checkInputs = [ pytest gunicorn pytest-mock ];
propagatedBuildInputs = [ async-timeout chardet multidict yarl ]
propagatedBuildInputs = [ attrs chardet multidict async-timeout yarl ]
++ lib.optional (pythonOlder "3.7") idna-ssl;
meta = with lib; {
description = "Asynchronous HTTP Client/Server for Python and asyncio";
license = licenses.asl20;
homepage = https://github.com/KeepSafe/aiohttp/;
homepage = https://github.com/aio-libs/aiohttp;
maintainers = with maintainers; [ dotlambda ];
};
}

View file

@ -1,22 +1,32 @@
{ stdenv, fetchurl, buildPythonPackage, isPy3k, isPyPy }:
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, isPyPy
, matplotlib, pycrypto, ecdsa
# Python3: pyx
}:
buildPythonPackage rec {
pname = "scapy";
version = "2.2.0";
version = "2.3.3";
name = pname + "-" + version;
disabled = isPy3k || isPyPy;
src = fetchurl {
url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz";
sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5";
src = fetchFromGitHub {
owner = "secdev";
repo = "scapy";
rev = "v${version}";
sha256 = "1c22407vhksnhc0rwrslnp9zy05qmk2zmdm2imm3iw7g6kx7gak1";
};
# Temporary workaround, only needed for 2.3.3
patches = [ ./fix-version-1.patch ./fix-version-2.patch ];
propagatedBuildInputs = [ matplotlib pycrypto ecdsa ];
meta = with stdenv.lib; {
description = "Powerful interactive network packet manipulation program";
homepage = http://www.secdev.org/projects/scapy/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ bjornfor ];
maintainers = with maintainers; [ primeos bjornfor ];
};
}

View file

@ -0,0 +1,11 @@
--- a/setup.py 2018-02-15 22:14:08.531591678 +0100
+++ b/setup.py 2018-02-15 22:14:57.947703737 +0100
@@ -47,7 +47,7 @@
setup(
name='scapy',
- version=__import__('scapy').VERSION,
+ version='2.3.3',
packages=[
'scapy',
'scapy/arch',

View file

@ -0,0 +1,11 @@
--- a/scapy/__init__.py 2017-12-29 18:57:35.315472160 +0100
+++ b/scapy/__init__.py 2018-02-15 22:36:43.102132489 +0100
@@ -73,7 +73,7 @@
tag = f.read()
return tag
except:
- return 'unknown.version'
+ return '2.3.3'
VERSION = _version()

View file

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
version = "0.9.0";
version = "0.10.1";
meta = with stdenv.lib; {
homepage = "https://github.com/bazelbuild/bazel/";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "0aiifrp6g1d3ilhg8111wdhsrjy41x8gcmq67rjyxypw9znqzcpg";
sha256 = "0rz6zvkzyglf0mmc178avf52zynz487m4v0089ilsbrgv7v4i0kh";
};
sourceRoot = ".";

View file

@ -0,0 +1,11 @@
{ emacsPackagesNg, writeScriptBin }:
let
emacs = emacsPackagesNg.emacsWithPackages (epkgs: [ epkgs.cask-package-toolset ]);
cpt = emacsPackagesNg.cask-package-toolset;
in writeScriptBin "cask" ''
#!/bin/sh
exec ${emacs}/bin/emacs --script ${cpt}/share/emacs/site-lisp/elpa/cask-package-toolset-${cpt.version}/cask-package-toolset.el -- "$@"
''

View file

@ -21,7 +21,7 @@ buildGoPackage rec {
homepage = https://github.com/golang/dep;
description = "Go dependency management tool";
license = licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.all;
maintainers = [ maintainers.carlsverre ];
};
}

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