Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
7863aae5b2
|
|
@ -47,6 +47,9 @@
|
|||
/nixos/doc/manual/man-nixos-option.xml @nbp
|
||||
/nixos/modules/installer/tools/nixos-option.sh @nbp
|
||||
|
||||
# NixOS modules
|
||||
/nixos/modules @Infinisil
|
||||
|
||||
# Python-related code and docs
|
||||
/maintainers/scripts/update-python-libraries @FRidh
|
||||
/pkgs/top-level/python-packages.nix @FRidh
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ and in this case the `python35` interpreter is automatically used.
|
|||
### Interpreters
|
||||
|
||||
Versions 2.7, 3.5, 3.6 and 3.7 of the CPython interpreter are available as
|
||||
respectively `python27`, `python35`, `python36` and `python37`. The PyPy
|
||||
respectively `python27`, `python35`, `python36`, and `python37`. The PyPy
|
||||
interpreter is available as `pypy`. The aliases `python2` and `python3`
|
||||
correspond to respectively `python27` and `python37`. The default interpreter,
|
||||
`python`, maps to `python2`. The Nix expressions for the interpreters can be
|
||||
|
|
|
|||
|
|
@ -169,6 +169,9 @@ rec {
|
|||
# s32 = sign 32 4294967296;
|
||||
};
|
||||
|
||||
# Alias of u16 for a port number
|
||||
port = ints.u16;
|
||||
|
||||
float = mkOptionType rec {
|
||||
name = "float";
|
||||
description = "floating point number";
|
||||
|
|
|
|||
|
|
@ -1754,6 +1754,11 @@
|
|||
email = "t@larkery.com";
|
||||
name = "Tom Hinton";
|
||||
};
|
||||
hlolli = {
|
||||
email = "hlolli@gmail.com";
|
||||
github = "hlolli";
|
||||
name = "Hlodver Sigurdsson";
|
||||
};
|
||||
hodapp = {
|
||||
email = "hodapp87@gmail.com";
|
||||
github = "Hodapp87";
|
||||
|
|
@ -2686,6 +2691,11 @@
|
|||
github = "melsigl";
|
||||
name = "Melanie B. Sigl";
|
||||
};
|
||||
melkor333 = {
|
||||
email = "samuel@ton-kunst.ch";
|
||||
github = "melkor333";
|
||||
name = "Samuel Ruprecht";
|
||||
};
|
||||
metabar = {
|
||||
email = "softs@metabarcoding.org";
|
||||
name = "Celine Mercier";
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<varlistentry xml:id='types.ints.ux'>
|
||||
<term>
|
||||
<varname>types.ints.{u8, u16, u32}</varname>
|
||||
</term>
|
||||
|
|
@ -131,6 +131,17 @@
|
|||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<varname>types.port</varname>
|
||||
</term>
|
||||
<listitem>
|
||||
<para>
|
||||
A port number. This type is an alias to
|
||||
<link linkend='types.ints.ux'><varname>types.ints.u16</varname></link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -431,6 +431,7 @@
|
|||
./services/monitoring/dd-agent/dd-agent.nix
|
||||
./services/monitoring/fusion-inventory.nix
|
||||
./services/monitoring/grafana.nix
|
||||
./services/monitoring/grafana-reporter.nix
|
||||
./services/monitoring/graphite.nix
|
||||
./services/monitoring/hdaps.nix
|
||||
./services/monitoring/heapster.nix
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
{ options, config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.grafana_reporter;
|
||||
|
||||
in {
|
||||
options.services.grafana_reporter = {
|
||||
enable = mkEnableOption "grafana_reporter";
|
||||
|
||||
grafana = {
|
||||
protocol = mkOption {
|
||||
description = "Grafana protocol.";
|
||||
default = "http";
|
||||
type = types.enum ["http" "https"];
|
||||
};
|
||||
addr = mkOption {
|
||||
description = "Grafana address.";
|
||||
default = "127.0.0.1";
|
||||
type = types.str;
|
||||
};
|
||||
port = mkOption {
|
||||
description = "Grafana port.";
|
||||
default = 3000;
|
||||
type = types.int;
|
||||
};
|
||||
|
||||
};
|
||||
addr = mkOption {
|
||||
description = "Listening address.";
|
||||
default = "127.0.0.1";
|
||||
type = types.str;
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
description = "Listening port.";
|
||||
default = 8686;
|
||||
type = types.int;
|
||||
};
|
||||
|
||||
templateDir = mkOption {
|
||||
description = "Optional template directory to use custom tex templates";
|
||||
default = "${pkgs.grafana_reporter}";
|
||||
type = types.str;
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
systemd.services.grafana_reporter = {
|
||||
description = "Grafana Reporter Service Daemon";
|
||||
wantedBy = ["multi-user.target"];
|
||||
after = ["network.target"];
|
||||
serviceConfig = let
|
||||
args = lib.concatSepString " " [
|
||||
"-proto ${cfg.grafana.protocol}://"
|
||||
"-ip ${cfg.grafana.addr}:${toString cfg.grafana.port}"
|
||||
"-port :${toString cfg.port}"
|
||||
"-templates ${cfg.templateDir}"
|
||||
];
|
||||
in {
|
||||
ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,33 +1,30 @@
|
|||
# Monit system watcher
|
||||
# http://mmonit.org/monit/
|
||||
|
||||
{config, pkgs, lib, ...}:
|
||||
|
||||
let inherit (lib) mkOption mkIf;
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.monit;
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.monit = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to run Monit system watcher.
|
||||
'';
|
||||
};
|
||||
config = mkOption {
|
||||
default = "";
|
||||
description = "monitrc content";
|
||||
};
|
||||
options.services.monit = {
|
||||
|
||||
enable = mkEnableOption "Monit";
|
||||
|
||||
config = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
description = "monitrc content";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf config.services.monit.enable {
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
environment.systemPackages = [ pkgs.monit ];
|
||||
|
||||
environment.etc."monitrc" = {
|
||||
text = config.services.monit.config;
|
||||
text = cfg.config;
|
||||
mode = "0400";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -198,6 +198,9 @@ in
|
|||
install -m 0755 -d /var/log/glusterfs
|
||||
'';
|
||||
|
||||
# glustereventsd uses the `gluster` executable
|
||||
path = [ glusterfs ];
|
||||
|
||||
serviceConfig = {
|
||||
Type="simple";
|
||||
Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages";
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ in
|
|||
};
|
||||
|
||||
ports = mkOption {
|
||||
type = types.listOf types.int;
|
||||
type = types.listOf types.port;
|
||||
default = [22];
|
||||
description = ''
|
||||
Specifies on which ports the SSH daemon listens.
|
||||
|
|
|
|||
|
|
@ -171,7 +171,12 @@ in {
|
|||
dbhost = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = "localhost";
|
||||
description = "Database host.";
|
||||
description = ''
|
||||
Database host.
|
||||
|
||||
Note: for using Unix authentication with PostgreSQL, this should be
|
||||
set to <literal>/tmp</literal>.
|
||||
'';
|
||||
};
|
||||
dbport = mkOption {
|
||||
type = with types; nullOr (either int str);
|
||||
|
|
|
|||
|
|
@ -336,6 +336,7 @@ in rec {
|
|||
tests.plasma5 = callTest tests/plasma5.nix {};
|
||||
tests.plotinus = callTest tests/plotinus.nix {};
|
||||
tests.keymap = callSubTests tests/keymap.nix {};
|
||||
tests.incron = callTest tests/incron.nix {};
|
||||
tests.initrdNetwork = callTest tests/initrd-network.nix {};
|
||||
tests.kafka = callSubTests tests/kafka.nix {};
|
||||
tests.kernel-latest = callTest tests/kernel-latest.nix {};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
import ./make-test.nix ({ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
name = "incron";
|
||||
meta.maintainers = [ lib.maintainers.aanderse ];
|
||||
|
||||
machine =
|
||||
{ ... }:
|
||||
{ services.incron.enable = true;
|
||||
services.incron.extraPackages = [ pkgs.coreutils ];
|
||||
services.incron.systab = ''
|
||||
/test IN_CREATE,IN_MODIFY,IN_CLOSE_WRITE,IN_MOVED_FROM,IN_MOVED_TO echo "$@/$# $%" >> /root/incron.log
|
||||
'';
|
||||
|
||||
# ensure the directory to be monitored exists before incron is started
|
||||
system.activationScripts.incronTest = ''
|
||||
mkdir /test
|
||||
'';
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
startAll;
|
||||
|
||||
$machine->waitForUnit("multi-user.target");
|
||||
$machine->waitForUnit("incron.service");
|
||||
|
||||
$machine->succeed("test -d /test");
|
||||
# create some activity for incron to monitor
|
||||
$machine->succeed("touch /test/file");
|
||||
$machine->succeed("echo foo >> /test/file");
|
||||
$machine->succeed("mv /test/file /root");
|
||||
$machine->succeed("mv /root/file /test");
|
||||
|
||||
$machine->sleep(1);
|
||||
|
||||
# touch /test/file
|
||||
$machine->succeed("grep '/test/file IN_CREATE' /root/incron.log");
|
||||
|
||||
# echo foo >> /test/file
|
||||
$machine->succeed("grep '/test/file IN_MODIFY' /root/incron.log");
|
||||
$machine->succeed("grep '/test/file IN_CLOSE_WRITE' /root/incron.log");
|
||||
|
||||
# mv /test/file /root
|
||||
$machine->succeed("grep '/test/file IN_MOVED_FROM' /root/incron.log");
|
||||
|
||||
# mv /root/file /test
|
||||
$machine->succeed("grep '/test/file IN_MOVED_TO' /root/incron.log");
|
||||
|
||||
# ensure something unexpected is not present
|
||||
$machine->fail("grep 'IN_OPEN' /root/incron.log");
|
||||
'';
|
||||
})
|
||||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bs1770gain-${version}";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
|
||||
sha256 = "0vd7320k7s2zcn2vganclxbr1vav18ghld27rcwskvcc3dm8prii";
|
||||
sha256 = "0r4fbajgfmnwgl63hcm56f1j8m5f135q6j5jkzdvrrhpcj39yx06";
|
||||
};
|
||||
|
||||
buildInputs = [ ffmpeg sox ];
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "csound-${version}";
|
||||
version = "6.11.0";
|
||||
version = "6.12.0";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "csound";
|
||||
repo = "csound";
|
||||
rev = version;
|
||||
sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18";
|
||||
sha256 = "0pv4s54cayvavdp6y30n3r1l5x83x9whyyd2v24y0dh224v3hbxi";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flacon-${version}";
|
||||
version = "4.1.0";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flacon";
|
||||
repo = "flacon";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sw2v2w3s79lbzhkf96m8lwvag824am7rwfzzsi8bz6sa6krmj0m";
|
||||
sha256 = "0pglqm2z7mp5igqmfnmvrgjhfbfrj8q5jvd0a0g2dzv3rqwfw4vc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
|
||||
}:
|
||||
let
|
||||
version = "7.1";
|
||||
version = "7.2";
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gradio-${version}";
|
||||
|
|
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
|
|||
owner = "haecker-felix";
|
||||
repo = "gradio";
|
||||
rev = "v${version}";
|
||||
sha256 = "0x0hmcjvpgvsm64ywcc71srlwqybfhadn5nkwycq0lh7r49d89kx";
|
||||
sha256 = "0c4vlrfl0ljkiwarpwa8wcfmmihh6a5j4pi4yr0qshyl9xxvxiv3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mixxx-${version}";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mixxxdj";
|
||||
repo = "mixxx";
|
||||
rev = "release-${version}";
|
||||
sha256 = "1q1px4033marraprvgr5yq9jlz943kcc10fdkn7py2ma8cfgnipq";
|
||||
sha256 = "0h14pwglz03sdmgzviypv1qa1xfjclrnhyqaq5nd60j47h4z39dr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
pythonPackages.buildPythonApplication rec {
|
||||
pname = "Mopidy-Iris";
|
||||
version = "3.28.1";
|
||||
version = "3.29.2";
|
||||
|
||||
src = pythonPackages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0yph01z8lw0r5bw3aa14w0l7z1ymxvpmb131gbaw3ib0srssgz64";
|
||||
sha256 = "1v767a2j6lzp5yppfjna0ifv8psj60pphzd7njcdkx71dvpswpi2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
|
||||
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
|
||||
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
|
||||
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
|
||||
, alsaLib, cairo, acl, gpm, cf-private, AppKit, GSS, ImageIO
|
||||
, withX ? !stdenv.isDarwin
|
||||
, withGTK2 ? false, gtk2 ? null
|
||||
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
|
||||
|
|
@ -61,9 +61,12 @@ stdenv.mkDerivation rec {
|
|||
++ lib.optional (withX && withGTK2) gtk2
|
||||
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
|
||||
++ lib.optional (stdenv.isDarwin && withX) cairo
|
||||
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ];
|
||||
|
||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
|
||||
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
AppKit GSS ImageIO
|
||||
# Needed for CFNotificationCenterAddObserver symbols.
|
||||
cf-private
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake
|
||||
, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
|
||||
, cf-private, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
|
||||
, ImageCaptureCore, GSS, ImageIO # These may be optional
|
||||
}:
|
||||
|
||||
|
|
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ ncurses libxml2 gnutls texinfo gettext
|
||||
AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
|
||||
ImageCaptureCore GSS ImageIO # may be optional
|
||||
# Needed for CFNotificationCenterAddObserver symbols.
|
||||
cf-private
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "kakoune-unstable-${version}";
|
||||
version = "2018.09.04";
|
||||
version = "2018.10.27";
|
||||
src = fetchFromGitHub {
|
||||
repo = "kakoune";
|
||||
owner = "mawww";
|
||||
rev = "v${version}";
|
||||
sha256 = "08v55hh7whm6hx6a047gszh0h5g35k3r8r52aggv7r2ybzrrw6w1";
|
||||
sha256 = "1w7jmq57h8gxxbzg0n3lgd6cci77xb9mziy6lr8330nzqc85zp9p";
|
||||
};
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ let
|
|||
inherit (python2Packages) pygtk wrapPython python;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gimp-${version}";
|
||||
version = "2.10.6";
|
||||
version = "2.10.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
|
||||
sha256 = "07qh2ljbza2mph1gh8sicn27qihhj8hx3ivvry2874cfh8ghgj2f";
|
||||
sha256 = "16sb4kslwin2jbgdb4nhks78pd0af8mvj8g5hap3hj946p7w2jfq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "krop";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arminstraub";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0y8z9xr10wbzmi1dg1zpcsf3ihnxrnvlaf72821x3390s3qsnydf";
|
||||
sha256 = "0b1zqpks4vzq7sfhf7r9qrshr77f1ncj18x7d0fa3g29rxa42dcr";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "openimageio-${version}";
|
||||
version = "1.8.15";
|
||||
version = "1.8.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenImageIO";
|
||||
repo = "oiio";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "0fbl5rzmip5q155lfsr07n65dnhww1kw97masps1i1x40gq15czx";
|
||||
sha256 = "0isx137c6anvs1xfxi0z35v1cw855xvnq2ca0pakqqpdh0yivrps";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
libGL,
|
||||
xclip,
|
||||
# Darwin Frameworks
|
||||
cf-private,
|
||||
AppKit,
|
||||
CoreFoundation,
|
||||
CoreGraphics,
|
||||
|
|
@ -40,15 +41,6 @@ let
|
|||
libGL
|
||||
libXi
|
||||
];
|
||||
darwinFrameworks = [
|
||||
AppKit
|
||||
CoreFoundation
|
||||
CoreGraphics
|
||||
CoreServices
|
||||
CoreText
|
||||
Foundation
|
||||
OpenGL
|
||||
];
|
||||
in buildRustPackage rec {
|
||||
name = "alacritty-unstable-${version}";
|
||||
version = "0.2.1";
|
||||
|
|
@ -71,7 +63,11 @@ in buildRustPackage rec {
|
|||
];
|
||||
|
||||
buildInputs = rpathLibs
|
||||
++ lib.optionals stdenv.isDarwin darwinFrameworks;
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL
|
||||
# Needed for CFURLResourceIsReachable symbols.
|
||||
cf-private
|
||||
];
|
||||
|
||||
outputs = [ "out" "terminfo" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ with python3Packages;
|
|||
buildPythonApplication rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "cheat";
|
||||
version = "2.2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
propagatedBuildInputs = [ docopt pygments ];
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ buildPythonApplication rec {
|
|||
owner = "chrisallenlane";
|
||||
repo = "cheat";
|
||||
rev = version;
|
||||
sha256 = "1p9a54fax3b1ilqcwdlccy08ww3igwsyzcyikqivaxj5p6mqq6wl";
|
||||
sha256 = "1dcpjvbv648r8325qjf30m8b4cyrrjbzc2kvh40zy2mbjsa755zr";
|
||||
};
|
||||
# no tests available
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "chirp-daily-${version}";
|
||||
version = "20181009";
|
||||
version = "20181018";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
|
||||
sha256 = "1h7i8skdjkz7n6dz3q9pzg1k31nh1ivy2mx3864bjvpkc7m6yyd9";
|
||||
sha256 = "0jd7xi6q09b3djn1k7pj1sbqvw24kn7dcp9r6abvxily4pc1xhdr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "CopyQ-${version}";
|
||||
version = "3.6.1";
|
||||
version = "3.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hluk";
|
||||
repo = "CopyQ";
|
||||
rev = "v${version}";
|
||||
sha256 = "0drhafnr1d595wa8zwvmgmrrqb86navdk4iw6ly6gmh0i800wz0z";
|
||||
sha256 = "1dm02l1ry7ndn283774nzmg89wy1933f4iyf6n02p152zgx4llyf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gImageReader-${version}";
|
||||
version = "3.2.99";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner= "manisandro";
|
||||
repo = "gImageReader";
|
||||
rev = "v${version}";
|
||||
sha256 = "19dbxq83j77lbvi10a8x0xxgw5hbsqyc852c196zzvmwk3km6pnc";
|
||||
sha256 = "0pjk4kr7bc5q4hi1xf7na2zln9fyqdazgzq62r3bg41nzy7fakcz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DGFlags_ROOT_DIR=${google-gflags}/lib"
|
||||
"-DGLOG_INCLUDE_DIR=${glog}/include"
|
||||
"-DENABLE_UNIT_TESTING=OFF"
|
||||
|
||||
# gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as
|
||||
# armadillo is built using both, so skip checking for them.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildPythonApplication
|
||||
, isPy3k
|
||||
, fetchFromGitHub
|
||||
, manuel
|
||||
, setuptools
|
||||
, docutils
|
||||
, lxml
|
||||
, svg-path
|
||||
, pygments
|
||||
, watchdog
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "hovercraft";
|
||||
version = "2.6";
|
||||
disabled = ! isPy3k;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "regebro";
|
||||
repo = "hovercraft";
|
||||
rev = version;
|
||||
sha256 = "150sn6kvqi2s89di1akl5i0g81fasji2ipr12zq5s4dcnhw4r5wp";
|
||||
};
|
||||
|
||||
checkInputs = [ manuel ];
|
||||
propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Makes impress.js presentations from reStructuredText";
|
||||
homepage = https://github.com/regebro/hovercraft;
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ goibhniu makefu ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, buildEnv, fetchurl, mono }:
|
||||
|
||||
let
|
||||
version = "1.7.3.1";
|
||||
version = "1.8.0";
|
||||
drv = stdenv.mkDerivation {
|
||||
name = "keepassrpc-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/kee-org/keepassrpc/releases/download/v${version}/KeePassRPC.plgx";
|
||||
sha256 = "1y9b35qg27caj3pbaqqzrqpk61hbbd8617ziwdc9vl799i786m9k";
|
||||
sha256 = "1dclfpia559cqf78qw29zz235h1df5md4kgjv3bbi8y41wwmx7cd";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
@ -14,7 +14,7 @@ let
|
|||
homepage = https://github.com/kee-org/keepassrpc;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ mjanczyk svsdep ];
|
||||
maintainers = with maintainers; [ mjanczyk svsdep mgregoire ];
|
||||
};
|
||||
|
||||
pluginFilename = "KeePassRPC.plgx";
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencpn-${version}";
|
||||
version = "4.8.4";
|
||||
version = "4.8.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenCPN";
|
||||
repo = "OpenCPN";
|
||||
rev = "v${version}";
|
||||
sha256 = "0v4klprzddmpq7w8h2pm69sgbshirdmjrlzhz62b606gbr58fazf";
|
||||
sha256 = "1z9xfc5fgbdslzak3iqg9nx6wggxwv8qwfxfhvfblkyg6kjw30dg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "A concise ChartPlotter/Navigator";
|
||||
maintainers = [ stdenv.lib.maintainers.kragniz ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
homepage = https://opencpn.org/;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
|
||||
, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet }:
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
|
||||
, libpthreadstubs, libxcb, libXdmcp
|
||||
, qtsvg, qttools, qtwebengine, qtx11extras
|
||||
, qtwayland
|
||||
, kwallet
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "falkon-${version}";
|
||||
|
|
@ -21,9 +25,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libpthreadstubs libxcb libXdmcp
|
||||
qtsvg qttools qtwebengine qtx11extras
|
||||
kwallet
|
||||
qtsvg qtwebengine qtx11extras
|
||||
];
|
||||
] ++ lib.optionals stdenv.isLinux [ qtwayland ];
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ];
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-alicloud";
|
||||
version = "1.21.0";
|
||||
sha256 = "17853l2s5z1y2g24wdkapdp26hw0sx5w73y118h0px85fiwhkq79";
|
||||
version = "1.22.0";
|
||||
sha256 = "19qn7q280ppsg7hjlmyagbhgb7qw365mk6c4avs0apvpq6n64rn3";
|
||||
};
|
||||
archive =
|
||||
{
|
||||
|
|
@ -39,15 +39,15 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-aws";
|
||||
version = "1.42.0";
|
||||
sha256 = "1wi1m7i6vq53p36x1prax4yaz400834024q494zg0ckk4rvngfp6";
|
||||
version = "1.43.1";
|
||||
sha256 = "0fhw07kqcykfzlfhqh3wdz43kkhz3c63xkymnpw68kqx2vxx8ncv";
|
||||
};
|
||||
azurerm =
|
||||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-azurerm";
|
||||
version = "1.17.0";
|
||||
sha256 = "03sjlqkwy0qa382sjwi21g6h2fz1mpsiqcd4naj5zh76fkp8aslw";
|
||||
version = "1.18.0";
|
||||
sha256 = "03vkpk9kl9zvfrprhqqn739klr9gpps5d6zq5r3qa56k588zcg4p";
|
||||
};
|
||||
azurestack =
|
||||
{
|
||||
|
|
@ -102,8 +102,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-cloudflare";
|
||||
version = "1.7.0";
|
||||
sha256 = "0sqq6miwyh6z86b3wq2bhkaj4x39g2nqq784py8nm8gvs06gcm5a";
|
||||
version = "1.8.0";
|
||||
sha256 = "1hsqxi27mwr96k8yn8f1nxwvs1jaq7nr8plxi7y4lqsv6s7mghjk";
|
||||
};
|
||||
cloudscale =
|
||||
{
|
||||
|
|
@ -137,8 +137,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-datadog";
|
||||
version = "1.4.0";
|
||||
sha256 = "06ik2k0jkm4200d8njpsidwfjl12ikn5ciqkmlxfwr3b8s1w8kpa";
|
||||
version = "1.5.0";
|
||||
sha256 = "0wr44rqmg0hffgb2g4h03lk4pg9i244c13kyrc3m89b3biwdcydz";
|
||||
};
|
||||
digitalocean =
|
||||
{
|
||||
|
|
@ -305,8 +305,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-linode";
|
||||
version = "1.1.0";
|
||||
sha256 = "19c269w8jjx04a8rhm4x7bg2xad3y0s74wgis446mwaw7mhla3l3";
|
||||
version = "1.2.0";
|
||||
sha256 = "1wnl48qi8lhrxnrdgnhw7cb7mqv6141g4i648wb7cni5vlqy3i5l";
|
||||
};
|
||||
local =
|
||||
{
|
||||
|
|
@ -340,8 +340,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-mysql";
|
||||
version = "1.1.0";
|
||||
sha256 = "06alk5vd20wzf493dw8hb80q0sx0kw4j8g1sd0193fhni0k4rflw";
|
||||
version = "1.5.0";
|
||||
sha256 = "1fsqfqz1db1pv8agr5zgqqyhizd7647n6rznf24iwapy1q0wkvmi";
|
||||
};
|
||||
netlify =
|
||||
{
|
||||
|
|
@ -354,8 +354,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-newrelic";
|
||||
version = "1.1.0";
|
||||
sha256 = "040pxbr4xp0h6s0njdwy0phlkblnk5p3xrcms2gkwyzkqpd82s8b";
|
||||
version = "1.2.0";
|
||||
sha256 = "1dh2i7qps7nr876y54jrjb414vdjhd8c7m1zwdiny93ggvl8f5j2";
|
||||
};
|
||||
nomad =
|
||||
{
|
||||
|
|
@ -396,8 +396,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-oci";
|
||||
version = "3.5.0";
|
||||
sha256 = "0f4m6rahis1n62w0h0amg8sjs5bb3ifnrfzq1dys7r01k5411wcf";
|
||||
version = "3.6.0";
|
||||
sha256 = "0ilg52j6js6bvw9wng5rbcv2n9kp926x4f2q340qwyyna59r5s5l";
|
||||
};
|
||||
oneandone =
|
||||
{
|
||||
|
|
@ -424,8 +424,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-opentelekomcloud";
|
||||
version = "1.2.0";
|
||||
sha256 = "05w899l18gmdywfhakjvaxqxxzd9cxga3s932ljfibr0ssipkhh9";
|
||||
version = "1.3.0";
|
||||
sha256 = "07rmav271wgjp1sby88s2ghh8w5hnkdy6rsc8pj69zy332i7n6wk";
|
||||
};
|
||||
opsgenie =
|
||||
{
|
||||
|
|
@ -620,8 +620,8 @@
|
|||
{
|
||||
owner = "terraform-providers";
|
||||
repo = "terraform-provider-vault";
|
||||
version = "1.2.0";
|
||||
sha256 = "1z92dcr5b665l69gxs1hw1rizc5znvf0ck1lksphd301l2ywk97b";
|
||||
version = "1.3.1";
|
||||
sha256 = "1rhwq45g6jggmxf953w5lckqzngdr15g5ncwwl2mjhz2xakn44lh";
|
||||
};
|
||||
vcd =
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
name = "terragrunt-${version}";
|
||||
version = "0.16.6";
|
||||
version = "0.17.2";
|
||||
|
||||
goPackagePath = "github.com/gruntwork-io/terragrunt";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "gruntwork-io";
|
||||
repo = "terragrunt";
|
||||
rev = "v${version}";
|
||||
sha256 = "0fzn2ymk8x0lzwfqlvnry8s6wf3q0sqn76lfardjyz6wgxl8011i";
|
||||
sha256 = "069l9ynyl96rfs9zw6w6n1yzjjin27731nj1ajr9jsyc8rhd84wv";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ let
|
|||
in {
|
||||
stable = mkTelegram stableVersion;
|
||||
preview = mkTelegram (stableVersion // {
|
||||
version = "1.4.4";
|
||||
sha256Hash = "1m1j485r3vzpglzfn8l4cqskysvkx8l3pqaw3fgp66jfajbxynf0";
|
||||
version = "1.4.7";
|
||||
sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp";
|
||||
stable = false;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -97,7 +97,9 @@ mkDerivation rec {
|
|||
sed -i Telegram/ThirdParty/libtgvoip/libtgvoip.gyp \
|
||||
-e "/-msse2/d"
|
||||
|
||||
gyp \
|
||||
gyp ${lib.optionalString (!stable) ''
|
||||
-Dapi_id=17349 \
|
||||
-Dapi_hash=344583e45741c457fe1862106095a5eb ''}\
|
||||
-Dbuild_defines=${GYP_DEFINES} \
|
||||
-Gconfig=Release \
|
||||
--depth=Telegram/gyp \
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchurl, python2Packages }:
|
||||
{ stdenv, fetchurl, python3Packages }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "syncplay-${version}";
|
||||
version = "1.5.5";
|
||||
version = "1.6.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = https://github.com/Syncplay/syncplay/archive/v1.5.5.tar.gz;
|
||||
sha256 = "0g12hm84c48fjrmwljl0ii62f55vm6fk2mv8vna7fadabmk6dwhr";
|
||||
url = https://github.com/Syncplay/syncplay/archive/v1.6.0.tar.gz;
|
||||
sha256 = "19x7b694p8b3qp578qk8q4g0pybhfjd4zk8rgrggz40s1yyfnwy5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python2Packages; [ pyside twisted ];
|
||||
propagatedBuildInputs = with python3Packages; [ pyside twisted ];
|
||||
|
||||
makeFlags = [ "DESTDIR=" "PREFIX=$(out)" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calc-${version}";
|
||||
version = "2.12.6.8";
|
||||
version = "2.12.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"
|
||||
"http://www.isthe.com/chongo/src/calc/${name}.tar.bz2"
|
||||
];
|
||||
sha256 = "144am0pra3hh7635fmi7kqynba8z246dx1dzclm9qx965p3xb4hb";
|
||||
sha256 = "0k58vv8m26kq74b8p784d749mzir0pi6g48hch1f6680d3fwa7gb";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
, granite
|
||||
, gnome3
|
||||
, cmake
|
||||
, ninja
|
||||
, vala_0_40
|
||||
, libqalculate
|
||||
, gobjectIntrospection
|
||||
|
|
@ -14,24 +13,28 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "nasc-${version}";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parnold-x";
|
||||
repo = "nasc";
|
||||
rev = version;
|
||||
sha256 = "1rrp3djsv7lrgsqjn7x50msv0c5ffhz90lj1v11di0kp05m6q9j9";
|
||||
sha256 = "13y5fnm7g3xgdxmdydlgly73nigh8maqbf9d6c9bpyzxkxq1csy5";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# libqalculatenasc.so is not installed, and nasc fails to start
|
||||
substituteInPlace libqalculatenasc/CMakeLists.txt --replace SHARED STATIC
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
wrapGAppsHook
|
||||
vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
|
||||
cmake
|
||||
ninja
|
||||
gobjectIntrospection # for setup-hook
|
||||
];
|
||||
|
||||
|
||||
buildInputs = [
|
||||
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
|
||||
gnome3.gtksourceview
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "qalculate-gtk-${version}";
|
||||
version = "2.6.2";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qalculate";
|
||||
repo = "qalculate-gtk";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yzw6avhka7bbi071z9d8cipcghyjq2bg9x3arv1cf395xlnrmb9";
|
||||
sha256 = "029yq9db2rm4fy83c11aynxjsd6vvi7ffamaf9zvkkamqqj1sjlf";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -136,9 +136,9 @@ rec {
|
|||
--prefix PATH : "$out/libexec/docker:$extraPath"
|
||||
|
||||
# docker uses containerd now
|
||||
ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd
|
||||
ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim
|
||||
ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc
|
||||
ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/containerd
|
||||
ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/containerd-shim
|
||||
ln -s ${docker-runc}/bin/runc $out/libexec/docker/runc
|
||||
ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy
|
||||
ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init
|
||||
|
||||
|
|
|
|||
|
|
@ -3,19 +3,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
name = "dwm-status-${version}";
|
||||
version = "1.1.2";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gerschtli";
|
||||
repo = "dwm-status";
|
||||
rev = version;
|
||||
sha256 = "1nyi0p9snx9hddb4hliihskj4gdp933xs0f8kydyiprckikwiyjk";
|
||||
sha256 = "0bv1jkqkf509akg3dvdy8b2q1kh8i75vw4n6a9rjvslx9s9nh6ca";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
||||
buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
|
||||
|
||||
cargoSha256 = "1ngdzzxnv4y6xprmkawf6s2696zgwiwgb6ykj5adb4knlx5c634d";
|
||||
cargoSha256 = "0wbbbk99hxxlrkm389iqni9aqvw2laarwk6hhwsr4ph3y278qhi8";
|
||||
|
||||
postInstall = lib.optionalString enableAlsaUtils ''
|
||||
wrapProgram $out/bin/dwm-status \
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
i3.overrideAttrs (oldAttrs : rec {
|
||||
|
||||
name = "i3-gaps-${version}";
|
||||
version = "4.15.0.1";
|
||||
version = "4.16";
|
||||
releaseDate = "2018-03-13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Airblader/i3/archive/${version}.tar.gz";
|
||||
sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
|
||||
sha256 = "16d215y9g27b75rifm1cgznxg73fmg5ksigi0gbj7pfd6x6bqcy9";
|
||||
};
|
||||
|
||||
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator }:
|
||||
{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
|||
sed -i -e 's:/share/gocode:/share/go:' Makefile
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Generates static DBus bindings for Golang and QML at build-time";
|
||||
homepage = https://github.com/linuxdeepin/dbus-factory;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
|
||||
go-gir-generator, glib, gtk3, poppler, librsvg, pulseaudio, alsaLib,
|
||||
libcanberra, gnome3, deepin-gettext-tools, go }:
|
||||
deepin-gettext-tools, go-dbus-factory, go-gir-generator, go-lib,
|
||||
alsaLib, glib, gtk3, libcanberra, libgudev, librsvg, poppler,
|
||||
pulseaudio, go, deepin }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-api";
|
||||
version = "3.1.30";
|
||||
version = "3.5.0";
|
||||
|
||||
goPackagePath = "pkg.deepin.io/dde/api";
|
||||
|
||||
|
|
@ -13,29 +14,32 @@ buildGoPackage rec {
|
|||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0piw6ka2xcbd5vi7m33d1afdjbb7nycxvmai530ka6r2xjabrkir";
|
||||
sha256 = "1g3s0i5wa6qyv00yksz4r4cy2vhiknq8v0yx7aribvwm3gxf7jw3";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
go-gir-generator
|
||||
deepin-gettext-tools
|
||||
go-dbus-factory
|
||||
go-gir-generator
|
||||
go-lib
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
glib
|
||||
gtk3
|
||||
poppler
|
||||
librsvg
|
||||
pulseaudio
|
||||
alsaLib
|
||||
libcanberra
|
||||
gnome3.libgudev
|
||||
libgudev
|
||||
librsvg
|
||||
poppler
|
||||
pulseaudio
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
sed -i -e "s|/var|$bin/var|" Makefile
|
||||
'';
|
||||
|
||||
|
|
@ -50,6 +54,8 @@ buildGoPackage rec {
|
|||
remove-references-to -t ${go} $bin/bin/* $bin/lib/deepin-api/*
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Go-lang bindings for dde-daemon";
|
||||
homepage = https://github.com/linuxdeepin/dde-api;
|
||||
|
|
|
|||
|
|
@ -32,35 +32,26 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/disintegration/imaging";
|
||||
rev = "32df9565b4e0c1460f1915d53f6ff198d9a41af2";
|
||||
sha256 = "1nkmaav375fv4610g8i9bam33pv4aa4fy2n4nypprhc7vq0svwkm";
|
||||
rev = "9458da53d1e65e098d48467a4317c403327e4424";
|
||||
sha256 = "1b0ma9if8s892qfx5b1vjinxn00ah9vsyxijs8knkilrhf5vqcx4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kr/pretty";
|
||||
goPackagePath = "github.com/fogleman/gg";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/pretty";
|
||||
rev = "73f6ac0b30a98e433b289500d779f50c1a6f0712";
|
||||
sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
|
||||
url = "https://github.com/fogleman/gg";
|
||||
rev = "0e0ff3ade7039063fe954cc1b45fad6cd4ac80db";
|
||||
sha256 = "06gvsngfwizdxin90nldix5503fqgnwqmqvxzrz0xg5hfazwfra5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kr/text";
|
||||
goPackagePath = "github.com/golang/freetype";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/text";
|
||||
rev = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f";
|
||||
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/linuxdeepin/go-dbus-factory";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/linuxdeepin/go-dbus-factory";
|
||||
rev = "2a30fc6fb47b70b8879855df8e29c8f581c419aa";
|
||||
sha256 = "0b0j47n3bb5fd04p01jla6k9vz2ck8l8512ga0xsn78177yb2z0w";
|
||||
url = "https://github.com/golang/freetype";
|
||||
rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4";
|
||||
sha256 = "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -68,8 +59,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/linuxdeepin/go-x11-client";
|
||||
rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3";
|
||||
sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d";
|
||||
rev = "03541136501cab4910ad8852fe749ef8e18907ca";
|
||||
sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -86,8 +77,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/image";
|
||||
rev = "991ec62608f3c0da01d400756917825d1e2fd528";
|
||||
sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019";
|
||||
rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
|
||||
sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -95,8 +86,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "146acd28ed5894421fb5aac80ca93bc1b1f46f87";
|
||||
sha256 = "0d177474z85nvxz8ch6y9wjqz288844wwx8q9za3x2njnk4jbgxj";
|
||||
rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
|
||||
sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -108,22 +99,4 @@
|
|||
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/check.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/check.v1";
|
||||
rev = "788fd78401277ebd861206a03c884797c6ec5541";
|
||||
sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "pkg.deepin.io/lib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/linuxdeepin/go-lib.git";
|
||||
rev = "f09dcc32fc5a36b53ff7760e5a06e7f8f97b81f9";
|
||||
sha256 = "1z4iw7h6lknm9jrna2c73icg1a1mxvzrqdhgjvaiww89mql1jzb4";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools,
|
||||
deepin-gettext-tools, dtkcore, dtkwidget
|
||||
deepin-gettext-tools, dtkcore, dtkwidget, deepin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
|
|||
-e "s,/usr,$out,"
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Calendar for Deepin Desktop Environment";
|
||||
homepage = https://github.com/linuxdeepin/dde-calendar;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
dbus-factory, go-dbus-factory, go-gir-generator, go-lib,
|
||||
deepin-gettext-tools, dde-api, alsaLib, glib, gtk3, libinput, libnl,
|
||||
librsvg, linux-pam, networkmanager, pulseaudio, xorg, gnome3,
|
||||
python3Packages, hicolor-icon-theme, go }:
|
||||
python3Packages, hicolor-icon-theme, go, deepin }:
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-daemon";
|
||||
version = "3.2.24.7";
|
||||
version = "3.6.0";
|
||||
|
||||
goPackagePath = "pkg.deepin.io/dde/daemon";
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ buildGoPackage rec {
|
|||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "17dvhqrw0dqy3d0wd9ailb18y2rg7575g3ffy0d5rg9m3y65y1y6";
|
||||
sha256 = "0gn2zp34wg79lvzdfla6yb4gs3f9ll83kj765zvig1wpx51nq1aj";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -80,6 +80,8 @@ buildGoPackage rec {
|
|||
remove-references-to -t ${go} $out/lib/deepin-daemon/*
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Daemon for handling Deepin Desktop Environment session settings";
|
||||
homepage = https://github.com/linuxdeepin/dde-daemon;
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/linuxdeepin/go-x11-client";
|
||||
rev = "8f12fd35ff10b391f0321aa41b94db6acd951ea3";
|
||||
sha256 = "1axxzzhbiwvi76d19bix3zm5wv3qmlq0wgji9mwjbmkb4bvp0v3d";
|
||||
rev = "03541136501cab4910ad8852fe749ef8e18907ca";
|
||||
sha256 = "1iiw8qclpklim81hz1sdjp2ajw0ljvjz19n9jly86nbw6m8x4gkp";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -68,8 +68,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/image";
|
||||
rev = "991ec62608f3c0da01d400756917825d1e2fd528";
|
||||
sha256 = "0jipi9czjczi6hlqb5kchgml8r6h6qyb4gqrb0nnb63m25510019";
|
||||
rev = "69cc3646b96e61de0b417f4815b86c36e65783ee";
|
||||
sha256 = "0nkywb3r0qvwkmykpswnf0svxi463ycn293y5jjididzxv9qxdp9";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -77,8 +77,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/net";
|
||||
rev = "04a2e542c03f1d053ab3e4d6e5abcd4b66e2be8e";
|
||||
sha256 = "040i9f6ymj4z25957h20id9kfmlrcp35y4sfd99hngw9li50ihql";
|
||||
rev = "c44066c5c816ec500d459a2a324a753f78531ae0";
|
||||
sha256 = "0mgww74bl15d0jvsh4f3qr1ckjzb8icb8hn0mgs5ppa0b2fgpc4f";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -86,8 +86,8 @@
|
|||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "4d1c5fb19474adfe9562c9847ba425e7da817e81";
|
||||
sha256 = "1y4rf9cmjyf8r56khr1sz0chbq1v0ynaj63i2z1mq6k6h6ww45da";
|
||||
rev = "6f44c5a2ea40ee3593d98cdcc905cc1fdaa660e2";
|
||||
sha256 = "00mwzxly5isgf0glz7k3k2dkyqkjfc4z55qxajx4lgcp3h8xn9xj";
|
||||
};
|
||||
}
|
||||
{
|
||||
|
|
@ -99,4 +99,13 @@
|
|||
sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "pkg.deepin.io/lib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/linuxdeepin/go-lib.git";
|
||||
rev = "b199d0dc96e979398ea3985334ccf9c20236d1a7";
|
||||
sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt,
|
||||
dtkcore, dtkwidget, dde-qt-dbus-factory }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-polkit-agent";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n3hys5hhhd99ycpx4im6ihy53vl9c28z7ls7smn117h3ca4c8wc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
qmake
|
||||
qttools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dde-qt-dbus-factory
|
||||
dtkcore
|
||||
dtkwidget
|
||||
polkit-qt
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
sed -i dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop \
|
||||
-e "s,/usr,$out,"
|
||||
|
||||
sed -i pluginmanager.cpp \
|
||||
-e "s,/usr/lib/polkit-1-dde/plugins,/run/current-system/sw/lib/polkit-1-dde/plugins,"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "PolicyKit agent for Deepin Desktop Environment";
|
||||
homepage = https://github.com/linuxdeepin/dde-polkit-agent;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, python }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, python, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-qt-dbus-factory";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0j0f57byzlz2ixgj6qr1pda83bpwn2q8kxv4i2jv99n6g0qw4nmw";
|
||||
sha256 = "0cz55hsbhy1ab1mndv0sp6xnqrhz2y66w7pcxy8v9k87ii32czf8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Qt DBus interface library for Deepin software";
|
||||
homepage = https://github.com/linuxdeepin/dde-qt-dbus-factory;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtsvg, qttools,
|
||||
qtx11extras, xkeyboard_config, xorg, lightdm_qt, gsettings-qt,
|
||||
dde-qt-dbus-factory, deepin-gettext-tools, dtkcore, dtkwidget,
|
||||
hicolor-icon-theme }:
|
||||
hicolor-icon-theme, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dde-session-ui";
|
||||
version = "4.5.1.10";
|
||||
version = "4.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0cr3g9jbgpp8k41i86lr4pg88gn690nzili7ah745vf1kdwvi1w0";
|
||||
sha256 = "190dgrwr5ji2bjndg2bmggpyccdz6pa3acx86yqmxfmirx669w92";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -45,11 +45,13 @@ stdenv.mkDerivation rec {
|
|||
find -type f -exec sed -i -e "s,Exec=/usr,Exec=$out," {} +
|
||||
find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} +
|
||||
sed -i global_util/xkbparser.h -e "s,/usr/share/X11/xkb/rules/base.xml,${xkeyboard_config}/share/X11/xkb/rules/base.xml,"
|
||||
sed -i lightdm-deepin-greeter/Scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter,"
|
||||
sed -i lightdm-deepin-greeter/scripts/lightdm-deepin-greeter -e "s,/usr/bin/lightdm-deepin-greeter,$out/bin/lightdm-deepin-greeter,"
|
||||
# fix default background url
|
||||
sed -i widgets/*.cpp boxframe/*.cpp -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,'
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin desktop-environment - Session UI module";
|
||||
homepage = https://github.com/linuxdeepin/dde-session-ui;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchFromGitHub, deepin-wallpapers }:
|
||||
{ stdenv, fetchFromGitHub, deepin-wallpapers, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-desktop-base";
|
||||
version = "2018.7.23";
|
||||
version = "2018.10.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n1bjkvhgq138jcg3zkwg55r41056x91mh191mirlpvpic574ydc";
|
||||
sha256 = "0l2zb7rpag2q36lqsgvirhjgmj7w243nsi1rywkypf2xm7g2v235";
|
||||
};
|
||||
|
||||
buildInputs = [ deepin-wallpapers ];
|
||||
|
|
@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
|
|||
ln -s ../lib/deepin/desktop-version $out/etc/deepin-version
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Base assets and definitions for Deepin Desktop Environment";
|
||||
homepage = https://github.com/linuxdeepin/deepin-desktop-base;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{ stdenv, fetchFromGitHub, python, deepin-gtk-theme,
|
||||
deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3 }:
|
||||
deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, gnome3,
|
||||
deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-desktop-schemas";
|
||||
version = "3.2.18.7";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1siv28wbfjydr3s9k9i5b9fin39yr8ys90f3wi7b8rfm3cr5yy6j";
|
||||
sha256 = "10x0rh9z925yzyp8h0vgmg4313smvran06lvr12c3931qkmkzwgq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -33,6 +34,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GSettings deepin desktop-wide schemas";
|
||||
homepage = https://github.com/linuxdeepin/deepin-desktop-schemas;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages }:
|
||||
{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
|
|||
wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin Internationalization utilities";
|
||||
homepage = https://github.com/linuxdeepin/deepin-gettext-tools;
|
||||
|
|
|
|||
|
|
@ -1,20 +1,23 @@
|
|||
{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
|
||||
{ stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "deepin-gtk-theme-${version}";
|
||||
version = "17.10.9";
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-gtk-theme";
|
||||
version = "17.10.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "deepin-gtk-theme";
|
||||
rev = version;
|
||||
sha256 = "02yn76h007hlmrd7syd82f0mz1c79rlkz3gy1w17zxfy0gdvagz3";
|
||||
sha256 = "0vwly24cvjwhvda7g3l595vpf99d2z7b2zr0q5kna4df4iql7vn4";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin GTK Theme";
|
||||
homepage = https://github.com/linuxdeepin/deepin-gtk-theme;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }:
|
||||
{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-icon-theme";
|
||||
version = "15.12.59";
|
||||
version = "15.12.64";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1qkxhqx6a7pahkjhf6m9lm16lw9v9grk0d4j449h9622zwfjkxlq";
|
||||
sha256 = "0z1yrp6yg2hb67azrbd9ac743jjh83vxdf2j0mmv2lfpd4fqw8qc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 papirus-icon-theme ];
|
||||
|
|
@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
|
|||
sed -i -e 's|\(-rm -f .*/icon-theme.cache\)|# \1|g' Makefile
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Icons for the Deepin Desktop Environment";
|
||||
homepage = https://github.com/linuxdeepin/deepin-icon-theme;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg,
|
||||
qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw,
|
||||
libexif
|
||||
libexif, deepin
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-image-viewer";
|
||||
version = "1.2.23";
|
||||
version = "1.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n1b3j65in6v7q5bxgkiam8qy56kjn9prld3sjrbc2mqzff8sm3q";
|
||||
sha256 = "0dxdvm6hzj6izfxka35za8y7vacd06nksfgzx6xsv7ywzagri4k5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,11 +41,14 @@ stdenv.mkDerivation rec {
|
|||
-e "s,/usr,$out,"
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Image Viewer for Deepin Desktop Environment";
|
||||
homepage = https://github.com/linuxdeepin/deepin-image-viewer;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
|
||||
qt5integration }:
|
||||
qt5integration, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin menu service";
|
||||
homepage = https://github.com/linuxdeepin/deepin-menu;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, bamf,
|
||||
json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification,
|
||||
deepin-wallpapers, deepin-desktop-schemas }:
|
||||
deepin-wallpapers, deepin-desktop-schemas, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "2D window manager for Deepin";
|
||||
homepage = https://github.com/linuxdeepin/deepin-metacity;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras,
|
||||
dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio,
|
||||
libdvdnav, libdvdread, xorg }:
|
||||
libdvdnav, libdvdread, xorg, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-movie-reborn";
|
||||
version = "3.2.10";
|
||||
version = "3.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0lqmbvl9yyxgkiipd9r8mgmxl2sm34l3gr3hkwlc7r2l6kc32933";
|
||||
sha256 = "1i9sdg2p6qp57rqzrnjbxnqj3mg1qggzyq3yykw271vs8h85a707";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
|
|||
sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,'
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin movie player";
|
||||
homepage = https://github.com/linuxdeepin/deepin-movie-reborn;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, xorg,
|
||||
libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
|
||||
libstartup_notification, libinput, cogl, clutter, systemd
|
||||
}:
|
||||
libstartup_notification, libinput, cogl, clutter, systemd, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-mutter";
|
||||
version = "3.20.34";
|
||||
version = "3.20.35";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0s427fmj806ljpdg6jdvpfislk5m1xvxpnnyrq3l8b7pkhjvp8wd";
|
||||
sha256 = "0mwk06kgw8qp8rg1j6px1zlya4x5rr9llax0qks59j56b3m9yim7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -51,6 +50,8 @@ stdenv.mkDerivation rec {
|
|||
NOCONFIGURE=1 ./autogen.sh
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Base window manager for deepin, fork of gnome mutter";
|
||||
homepage = https://github.com/linuxdeepin/deepin-mutter;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget,
|
||||
qt5integration
|
||||
}:
|
||||
qt5integration, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -27,6 +26,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Pop-up shortcut viewer for Deepin applications";
|
||||
homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchFromGitHub, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "deepin-sound-theme-${version}";
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-sound-theme";
|
||||
version = "15.10.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -13,6 +14,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin sound theme";
|
||||
homepage = https://github.com/linuxdeepin/deepin-sound-theme;
|
||||
|
|
|
|||
|
|
@ -1,55 +1,61 @@
|
|||
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, gtk3, vala, cmake,
|
||||
ninja, vte, libgee, wnck, zssh, gettext, librsvg, libsecret,
|
||||
json-glib, gobjectIntrospection, deepin-menu, deepin-shortcut-viewer
|
||||
}:
|
||||
{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, cmake, ninja, vala,
|
||||
gettext, gobjectIntrospection, at-spi2-core, dbus, epoxy, expect,
|
||||
gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg,
|
||||
libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck,
|
||||
deepin-menu, deepin-shortcut-viewer, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "deepin-terminal-${version}";
|
||||
version = "3.0.3";
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-terminal";
|
||||
version = "3.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = "deepin-terminal";
|
||||
rev = version;
|
||||
sha256 = "04yvim97a4j8fq5lq2g6svs8qs79np9m4nl6x83iv02wkb9b7gqa";
|
||||
sha256 = "1jrzx0igq2csb25k4ak5hj81gpvb7zwbg4i64p4mln4vl7x27i5q";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Do not build vendored zssh and vte
|
||||
(fetchurl {
|
||||
name = "remove-vendor.patch";
|
||||
url = https://git.archlinux.org/svntogit/community.git/plain/trunk/remove-vendor.patch?h=packages/deepin-terminal&id=de701614c19c273b98b60fd6790795ff7d8a157e;
|
||||
sha256 = "0g7hhvr7ay9g0cgc6qqvzhbcwvbzvrrilbn8w46ypfzj7w5hlkqv";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ssh_login.sh --replace /usr/lib/deepin-terminal/zssh "${zssh}/bin/zssh"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
vala
|
||||
cmake
|
||||
ninja
|
||||
vala
|
||||
gettext
|
||||
gobjectIntrospection # For setup hook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
vte
|
||||
libgee
|
||||
wnck
|
||||
librsvg
|
||||
libsecret
|
||||
json-glib
|
||||
at-spi2-core
|
||||
dbus
|
||||
deepin-menu
|
||||
deepin-shortcut-viewer
|
||||
epoxy
|
||||
expect
|
||||
gtk3
|
||||
json-glib
|
||||
libXdmcp
|
||||
libgee
|
||||
libpthreadstubs
|
||||
librsvg
|
||||
libsecret
|
||||
libtasn1
|
||||
libxcb
|
||||
libxkbcommon
|
||||
p11-kit
|
||||
pcre
|
||||
vte
|
||||
wnck
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "The default terminal emulation for Deepin";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, fetchFromGitHub, dde-api }:
|
||||
{ stdenv, fetchFromGitHub, dde-api, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "deepin-wallpapers-${version}";
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-wallpapers";
|
||||
version = "1.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
|
|||
$out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Wallpapers for Deepin Desktop Environment";
|
||||
homepage = https://github.com/linuxdeepin/deepin-wallpapers;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3,
|
||||
bamf, clutter-gtk, granite, libcanberra-gtk3, libwnck3,
|
||||
deepin-mutter, deepin-wallpapers, deepin-desktop-schemas,
|
||||
hicolor-icon-theme }:
|
||||
hicolor-icon-theme, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "deepin-wm";
|
||||
version = "1.9.32";
|
||||
version = "1.9.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02vwbkfpxcwv01vqa70pg7dm0lhm1lwhdqhk057r147a9cjb3ssc";
|
||||
sha256 = "01l2np31g7fnh61fgq927h7a6xrmdvagqd41vr29a6cc3q9q9rzv";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin Window Manager";
|
||||
homepage = https://github.com/linuxdeepin/deepin-wm;
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
packages = self: with self; {
|
||||
updateScript = callPackage ./update.nix { };
|
||||
|
||||
dbus-factory = callPackage ./dbus-factory { };
|
||||
dde-api = callPackage ./dde-api { };
|
||||
dde-calendar = callPackage ./dde-calendar { };
|
||||
dde-daemon = callPackage ./dde-daemon { };
|
||||
dde-polkit-agent = callPackage ./dde-polkit-agent { };
|
||||
dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { };
|
||||
dde-session-ui = callPackage ./dde-session-ui { };
|
||||
deepin-desktop-base = callPackage ./deepin-desktop-base { };
|
||||
|
|
@ -28,7 +28,6 @@ let
|
|||
};
|
||||
deepin-wallpapers = callPackage ./deepin-wallpapers { };
|
||||
deepin-wm = callPackage ./deepin-wm { };
|
||||
dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { };
|
||||
dtkcore = callPackage ./dtkcore { };
|
||||
dtkwm = callPackage ./dtkwm { };
|
||||
dtkwidget = callPackage ./dtkwidget { };
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, dde-polkit-agent }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dpa-ext-gnomekeyring";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgconfig
|
||||
qmake
|
||||
qttools
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dde-polkit-agent
|
||||
gnome3.libgnome-keyring
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
|
||||
sed -i dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp \
|
||||
-e "s,/usr,$out,"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GNOME keyring extension for dde-polkit-agent";
|
||||
homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring;
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dtkcore";
|
||||
version = "2.0.9.4";
|
||||
version = "2.0.9.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "184yg1501hvv7n1c7r0fl2y4d4nhif368rrbrd1phwzfvh6x1ji4";
|
||||
sha256 = "06jj5gpy2qbmc21nf0fnbvgw7nbjjgvzx7m2vg9byw5il8l4g22h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +42,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin tool kit core modules";
|
||||
homepage = https://github.com/linuxdeepin/dtkcore;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia,
|
||||
qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt,
|
||||
dde-qt-dbus-factory, dtkcore
|
||||
}:
|
||||
dde-qt-dbus-factory, dtkcore, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "dtkwidget";
|
||||
version = "2.0.9.4";
|
||||
version = "2.0.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "06iyb3ryxrqkwxdazpv8cgabqa4djldgm3q5icsa2grqrgy8vw5m";
|
||||
sha256 = "1h4vm6a4lb6w6nkx2ns7a526mqyi9hqi7j5lqafd7ycwxlrc64nb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -41,6 +40,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin graphical user interface library";
|
||||
homepage = https://github.com/linuxdeepin/dtkwidget;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore,
|
||||
deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -29,6 +30,8 @@ stdenv.mkDerivation rec {
|
|||
LIB_INSTALL_DIR=$out/lib"
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Deepin graphical user interface library";
|
||||
homepage = https://github.com/linuxdeepin/dtkwm;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
{ stdenv, fetchFromGitHub, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
|
|||
sed -i -e 's:/share/gocode:/share/go:' Makefile
|
||||
'';
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GoLang DBus factory for the Deepin Desktop Environment";
|
||||
homepage = https://github.com/linuxdeepin/go-dbus-factory;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchFromGitHub, go, go-lib }:
|
||||
{ stdenv, fetchFromGitHub, go, go-lib, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
|
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
|||
"GOCACHE=off"
|
||||
];
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Convert dbus interfaces to go-lang or qml wrapper code";
|
||||
homepage = https://github.com/linuxdeepin/go-dbus-generator;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection, libgudev }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, go, gobjectIntrospection,
|
||||
libgudev, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "go-gir-generator";
|
||||
version = "1.0.4";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0yi3lsgkxi8ghz2c7msf2df20jxkvzj8s47slvpzz4m57i82vgzl";
|
||||
sha256 = "0grp4ffy3vmlknzmymnxq1spwshff2ylqsw82pj4y2v2fcvnqfvb";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
|
|||
"GOCACHE=off"
|
||||
];
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Generate static golang bindings for GObject";
|
||||
homepage = https://github.com/linuxdeepin/go-gir-generator;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
{ stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio,
|
||||
mobile-broadband-provider-info
|
||||
}:
|
||||
mobile-broadband-provider-info, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "go-lib";
|
||||
version = "1.2.16.3";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0dk6k53in3ffwwvkr0sazfk83rf4fyc6rvb6k8fi2n3qj4gp8xd2";
|
||||
sha256 = "0g84v1adnnyqc1mv45n3wlvnivkm1fi8ywszzgwx8irl3iddfvxv";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -27,6 +26,8 @@ stdenv.mkDerivation rec {
|
|||
"GOSITE_DIR=$(out)/share/go"
|
||||
];
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Go bindings for Deepin Desktop Environment development";
|
||||
homepage = https://github.com/linuxdeepin/go-lib;
|
||||
|
|
|
|||
|
|
@ -1,15 +1,16 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, mtdev, cairo }:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM,
|
||||
mtdev, cairo, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "qt5dxcb-plugin";
|
||||
version = "1.1.11";
|
||||
version = "1.1.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "157p2cqs9fvd4n4fmxj6mh4cxlc35bkl4rnf832wk2gvjnxdfrfy";
|
||||
sha256 = "12lvh3agw3qdviqf32brmzba5kscnj5al5jhc08lq69a9kmip05x";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Qt platform theme integration plugin for DDE";
|
||||
homepage = https://github.com/linuxdeepin/qt5dxcb-plugin;
|
||||
|
|
|
|||
|
|
@ -1,18 +1,17 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt
|
||||
, lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype
|
||||
, qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget
|
||||
}:
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, qmake, mtdev, gsettings-qt ,
|
||||
lxqt, qtx11extras, qtmultimedia, qtsvg, fontconfig, freetype ,
|
||||
qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "qt5integration";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxdeepin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0qf9ndsg8pz2n68y68a30d1hxr3ri8k4j00dxlbcf5cn5mbnny1b";
|
||||
sha256 = "1v9whlqn07c5c8xnaiicdshj9n88a667gfbn8y8bk5bfylilfzcy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -42,6 +41,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru.updateScript = deepin.updateScript { inherit name; };
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Qt platform theme integration plugins for DDE";
|
||||
homepage = https://github.com/linuxdeepin/qt5integration;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
{ lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }:
|
||||
{ name, ignored-versions ? "^2014\\.|^v[0-9]+" }:
|
||||
|
||||
let
|
||||
nameAndVersion = builtins.parseDrvName name;
|
||||
packageVersion = nameAndVersion.version;
|
||||
packageName = nameAndVersion.name;
|
||||
attrPath = "deepin.${packageName}";
|
||||
in
|
||||
|
||||
writeScript "update-${packageName}" ''
|
||||
set -o errexit
|
||||
set -x
|
||||
|
||||
# search for the latest version of the package on github
|
||||
PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]}
|
||||
tags=$(curl -s https://api.github.com/repos/linuxdeepin/${packageName}/tags)
|
||||
tags=$(echo "$tags" | jq -r '.[] | .name')
|
||||
echo "# ${name}" >> git-commits.txt
|
||||
echo "# available tags:" >> git-commits.txt
|
||||
echo "$tags" | ${gnused}/bin/sed -e 's/^/# /' >> git-commits.txt
|
||||
if [ -n "${ignored-versions}" ]; then
|
||||
tags=$(echo "$tags" | grep -vE "${ignored-versions}")
|
||||
fi
|
||||
latest_tag=$(echo "$tags" | sort --version-sort | tail -1)
|
||||
|
||||
# generate commands to commit the changes
|
||||
if [ "${packageVersion}" != "$latest_tag" ]; then
|
||||
pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. ${attrPath})
|
||||
echo " git add $pfile " >> git-commits.txt
|
||||
echo " git commit -m \"${attrPath}: ${packageVersion} -> $latest_tag\"" >> git-commits.txt
|
||||
fi
|
||||
|
||||
# update the nix expression
|
||||
update-source-version "${attrPath}" "$latest_tag"
|
||||
echo "" >> git-commits.txt
|
||||
''
|
||||
|
|
@ -0,0 +1,257 @@
|
|||
{ stdenv, lib, fetchurl, clojure,
|
||||
nodejs, jre, unzip, nodePackages,
|
||||
python, openssl }:
|
||||
|
||||
let # packageJSON=./package.json;
|
||||
version = "1.9.0";
|
||||
nodeVersion = "10.9.0";
|
||||
nodeSources = fetchurl {
|
||||
url="https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz";
|
||||
sha256="0wgawq3wzw07pir73bxz13dggcc1fj0538y7y69n3cc0a2kiplqy";
|
||||
};
|
||||
lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH";
|
||||
|
||||
# as found in cljs/snapshot/lumo/repl.cljs
|
||||
requireDeps = '' \
|
||||
cljs.analyzer \
|
||||
cljs.compiler \
|
||||
cljs.env \
|
||||
cljs.js \
|
||||
cljs.reader \
|
||||
cljs.repl \
|
||||
cljs.source-map \
|
||||
cljs.source-map.base64 \
|
||||
cljs.source-map.base64-vlq \
|
||||
cljs.spec.alpha \
|
||||
cljs.spec.gen.alpha \
|
||||
cljs.tagged-literals \
|
||||
cljs.tools.reader \
|
||||
cljs.tools.reader.reader-types \
|
||||
cljs.tools.reader.impl.commons \
|
||||
cljs.tools.reader.impl.utils \
|
||||
clojure.core.rrb-vector \
|
||||
clojure.core.rrb-vector.interop \
|
||||
clojure.core.rrb-vector.nodes \
|
||||
clojure.core.rrb-vector.protocols \
|
||||
clojure.core.rrb-vector.rrbt \
|
||||
clojure.core.rrb-vector.transients \
|
||||
clojure.core.rrb-vector.trees \
|
||||
clojure.string \
|
||||
clojure.set \
|
||||
clojure.walk \
|
||||
cognitect.transit \
|
||||
fipp.visit \
|
||||
fipp.engine \
|
||||
fipp.deque \
|
||||
lazy-map.core \
|
||||
lumo.pprint.data \
|
||||
lumo.repl \
|
||||
lumo.repl-resources \
|
||||
lumo.js-deps \
|
||||
lumo.common '';
|
||||
|
||||
compileClojurescript = (simple: ''
|
||||
(require '[cljs.build.api :as cljs])
|
||||
(cljs/build \"src/cljs/snapshot\"
|
||||
{:optimizations ${if simple then ":simple" else ":none"}
|
||||
:main 'lumo.core
|
||||
:cache-analysis true
|
||||
:source-map false
|
||||
:dump-core false
|
||||
:static-fns true
|
||||
:optimize-constants false
|
||||
:npm-deps false
|
||||
:verbose true
|
||||
:closure-defines {'cljs.core/*target* \"nodejs\"
|
||||
'lumo.core/*lumo-version* \"${version}\"}
|
||||
:compiler-stats true
|
||||
:process-shim false
|
||||
:fn-invoke-direct true
|
||||
:parallel-build false
|
||||
:browser-repl false
|
||||
:target :nodejs
|
||||
:hashbang false
|
||||
;; :libs [ \"src/cljs/bundled\" \"src/js\" ]
|
||||
:output-dir ${if simple
|
||||
then ''\"cljstmp\"''
|
||||
else ''\"target\"''}
|
||||
:output-to ${if simple
|
||||
then ''\"cljstmp/main.js\"''
|
||||
else ''\"target/deleteme.js\"'' }})
|
||||
'');
|
||||
|
||||
|
||||
cacheToJsons = ''
|
||||
(import [java.io ByteArrayOutputStream FileInputStream])
|
||||
(require '[cognitect.transit :as transit]
|
||||
'[clojure.edn :as edn]
|
||||
'[clojure.string :as str])
|
||||
|
||||
(defn write-transit-json [cache]
|
||||
(let [out (ByteArrayOutputStream. 1000000)
|
||||
writer (transit/writer out :json)]
|
||||
(transit/write writer cache)
|
||||
(.toString out)))
|
||||
|
||||
(defn process-caches []
|
||||
(let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\"
|
||||
cache-aot-edn (edn/read-string (slurp cache-aot-path))
|
||||
cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\"
|
||||
cache-macros-stream (FileInputStream. cache-macros-path)
|
||||
cache-macros-edn (transit/read (transit/reader cache-macros-stream :json))
|
||||
caches [[cache-aot-path cache-aot-edn]
|
||||
[cache-macros-path cache-macros-edn]]]
|
||||
(doseq [[path cache-edn] caches]
|
||||
(doseq [key (keys cache-edn)]
|
||||
(let [out-path (str/replace path #\"(\.json|\.edn)\$\"
|
||||
(str \".\" (munge key) \".json\"))
|
||||
tr-json (write-transit-json (key cache-edn))]
|
||||
(spit out-path tr-json))))))
|
||||
|
||||
(process-caches)
|
||||
'';
|
||||
|
||||
trimMainJsEnd = ''
|
||||
(let [string (slurp \"target/main.js\")]
|
||||
(spit \"target/main.js\"
|
||||
(subs string 0 (.indexOf string \"cljs.nodejs={};\"))))
|
||||
'';
|
||||
|
||||
|
||||
cljdeps = import ./deps.nix;
|
||||
cljpaths = cljdeps.makePaths {};
|
||||
classp = cljdeps.makeClasspaths {
|
||||
extraClasspaths=["src/js" "src/cljs/bundled" "src/cljs/snapshot"];
|
||||
};
|
||||
|
||||
|
||||
getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
inherit version;
|
||||
name = "lumo-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/anmonteiro/lumo/archive/${version}.tar.gz";
|
||||
sha256 = "1mr3zjslznhv7y3mzvg1pmmvzn10d6di26izz4x8p4nfnshacwgw";
|
||||
};
|
||||
|
||||
|
||||
buildInputs = [ nodejs clojure jre unzip python openssl
|
||||
nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" ];
|
||||
|
||||
buildPhase = ''
|
||||
# Copy over lumo-build-deps environment
|
||||
rm yarn.lock
|
||||
cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./
|
||||
|
||||
# configure clojure-cli
|
||||
mkdir ./.cpcache
|
||||
export CLJ_CONFIG=`pwd`
|
||||
export CLJ_CACHE=`pwd`/.cpcache
|
||||
|
||||
# require more namespaces for cljs-bundle
|
||||
sed -i "s!ns lumo.core! \
|
||||
ns lumo.core \
|
||||
(:require ${requireDeps}) \
|
||||
(:require-macros [clojure.template :as temp] \
|
||||
[cljs.test :as test])!g" \
|
||||
./src/cljs/snapshot/lumo/core.cljs
|
||||
|
||||
# Step 1: compile clojurescript with :none and :simple
|
||||
${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}"
|
||||
${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript false}"
|
||||
cp -f cljstmp/main.js target/main.js
|
||||
${clojure}/bin/clojure -Scp ${classp} -e "${trimMainJsEnd}"
|
||||
|
||||
# Step 2: sift files
|
||||
unzip -o ${getJarPath "org.clojure/clojurescript"} -d ./target
|
||||
unzip -j ${getJarPath "org.clojure/clojure"} "clojure/template.clj" -d ./target/clojure
|
||||
unzip -o ${getJarPath "org.clojure/google-closure-library"} -d ./target
|
||||
unzip -o ${getJarPath "org.clojure/google-closure-library-third-party"} -d ./target
|
||||
unzip -o ${getJarPath "org.clojure/tools.reader"} -d ./target
|
||||
unzip -o ${getJarPath "org.clojure/test.check"} -d ./target
|
||||
cp -rf ./src/cljs/bundled/lumo/* ./target/lumo/
|
||||
cp -rf ./src/cljs/snapshot/lumo/repl.clj ./target/lumo/
|
||||
# cleanup
|
||||
mv ./target/main.js ./target/main
|
||||
rm ./target/*\.js
|
||||
mv ./target/main ./target/main.js
|
||||
rm ./target/AUTHORS
|
||||
rm ./target/LICENSE
|
||||
rm ./target/*.edn
|
||||
rm ./target/*.md
|
||||
rm -rf ./target/css
|
||||
rm -rf ./target/META-INF
|
||||
rm -rf ./target/com
|
||||
rm -rf ./target/cljs/build
|
||||
rm -rf ./target/cljs/repl
|
||||
rm ./target/cljs/core\.cljs\.cache.aot\.json
|
||||
rm ./target/cljs/source_map\.clj
|
||||
rm ./target/cljs/repl\.cljc
|
||||
rm ./target/cljs/externs\.clj
|
||||
rm ./target/cljs/closure\.clj
|
||||
rm ./target/cljs/util\.cljc
|
||||
rm ./target/cljs/js_deps\.cljc
|
||||
rm ./target/cljs/analyzer/utils\.clj
|
||||
rm ./target/cljs/core/macros\.clj
|
||||
rm ./target/cljs/compiler/api.clj
|
||||
rm ./target/goog/test_module*
|
||||
rm ./target/goog/transpile\.js
|
||||
rm ./target/goog/base_*
|
||||
find ./target -type f -name '*.class' -delete
|
||||
find ./target -type d -empty -delete
|
||||
|
||||
# Step 3: generate munged cache jsons
|
||||
${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}"
|
||||
rm ./target/cljs/core\$macros\.cljc\.cache\.json
|
||||
|
||||
|
||||
# Step 4: Bunde javascript
|
||||
NODE_ENV=production node scripts/bundle.js
|
||||
node scripts/bundleForeign.js
|
||||
|
||||
# Step 5: Backup resources
|
||||
cp -R target resources_bak
|
||||
|
||||
# Step 6: Package executeable 1st time
|
||||
# fetch node sources and copy to palce that nexe will find
|
||||
mkdir -p tmp/${nodeVersion}
|
||||
cp ${nodeSources} tmp/${nodeVersion}/node-${nodeVersion}.tar.gz
|
||||
tar -C ./tmp/${nodeVersion} -xf ${nodeSources}
|
||||
mv ./tmp/${nodeVersion}/node-v${nodeVersion}/* ./tmp/${nodeVersion}/
|
||||
rm -rf ${lumo-internal-classpath}
|
||||
mv target ${lumo-internal-classpath}
|
||||
node scripts/package.js ${nodeVersion}
|
||||
rm -rf ${lumo-internal-classpath}
|
||||
|
||||
# Step 7: AOT Macros
|
||||
sh scripts/aot-bundle-macros.sh
|
||||
|
||||
# Step 8: Package executeable 2nd time
|
||||
rm -rf ${lumo-internal-classpath}
|
||||
mv target ${lumo-internal-classpath}
|
||||
node scripts/package.js ${nodeVersion}
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp build/lumo $out/bin
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Fast, cross-platform, standalone ClojureScript environment";
|
||||
longDescription = ''
|
||||
Lumo is a fast, standalone ClojureScript REPL that runs on Node.js and V8.
|
||||
Thanks to V8's custom startup snapshots, Lumo starts up instantaneously,
|
||||
making it the fastest Clojure REPL in existence.
|
||||
'';
|
||||
homepage = https://github.com/anmonteiro/lumo;
|
||||
license = stdenv.lib.licenses.epl10;
|
||||
maintainers = [ stdenv.lib.maintainers.hlolli ];
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{:deps
|
||||
{org.clojure/clojure {:mvn/version "1.10.0-beta5"}
|
||||
org.clojure/clojurescript {:mvn/version "1.10.439"}
|
||||
org.clojure/test.check {:mvn/version "0.10.0-alpha3"}
|
||||
org.clojure/tools.reader {:mvn/version "1.3.2"
|
||||
:exclusions [org.clojure/clojure org.clojure/clojurescript]}
|
||||
com.cognitect/transit-cljs {:mvn/version "0.8.256"
|
||||
:exclusions [org.clojure/clojure org.clojure/clojurescript]}
|
||||
malabarba/lazy-map {:mvn/version "1.3"
|
||||
:exclusions [org.clojure/clojure org.clojure/clojurescript]}
|
||||
fipp {:mvn/version "0.6.14"
|
||||
:exclusions [org.clojure/clojure org.clojure/clojurescript]}}}
|
||||
|
|
@ -0,0 +1,392 @@
|
|||
# generated by clj2nix
|
||||
let repos = [
|
||||
"https://repo.clojars.org/"
|
||||
"https://repo1.maven.org/"
|
||||
"http://central.maven.org/maven2/"
|
||||
"http://oss.sonatype.org/content/repositories/releases/"
|
||||
"http://oss.sonatype.org/content/repositories/public/"
|
||||
"http://repo.typesafe.com/typesafe/releases/"
|
||||
];
|
||||
pkgs = import <nixpkgs> {};
|
||||
in rec {
|
||||
makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths;
|
||||
makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;});
|
||||
|
||||
packages = [
|
||||
{
|
||||
name = "com.cognitect/transit-java";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "transit-java";
|
||||
groupId = "com.cognitect";
|
||||
sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708";
|
||||
version = "0.8.332";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/data.json";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "data.json";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6";
|
||||
version = "0.2.6";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/clojure";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "clojure";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "f7a6b207b1bcbb6523d32ecfdd3c8c25d4d0b0a59c78baf06cdc69ba3c21c5e96b5dac8e9efcb331efd94e10bccbb9b54fca62a4312309db65a1f9d89d9da3f4";
|
||||
version = "1.10.0-beta5";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "commons-codec/commons-codec";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "commons-codec";
|
||||
groupId = "commons-codec";
|
||||
sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3";
|
||||
version = "1.10";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.errorprone/error_prone_annotations";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "error_prone_annotations";
|
||||
groupId = "com.google.errorprone";
|
||||
sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b";
|
||||
version = "2.1.3";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/core.specs.alpha";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "core.specs.alpha";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4";
|
||||
version = "0.2.44";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/spec.alpha";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "spec.alpha";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd";
|
||||
version = "0.2.176";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.codehaus.mojo/animal-sniffer-annotations";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "animal-sniffer-annotations";
|
||||
groupId = "org.codehaus.mojo";
|
||||
sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136";
|
||||
version = "1.14";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.googlecode.json-simple/json-simple";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "json-simple";
|
||||
groupId = "com.googlecode.json-simple";
|
||||
sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742";
|
||||
version = "1.1.1";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.cognitect/transit-cljs";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "transit-cljs";
|
||||
groupId = "com.cognitect";
|
||||
sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd";
|
||||
version = "0.8.256";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/google-closure-library";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "google-closure-library";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a";
|
||||
version = "0.0-20170809-b9c14c6b";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "fipp";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "fipp";
|
||||
groupId = "fipp";
|
||||
sha512 = "155b5bb7045ac7c3a75c638e65464ca1fc90e5b4692328fc2da73b26792178fdbce5ab01ba0397e1986b6162b06b8904712d2c366f32ea43ea5fa2b454a526a5";
|
||||
version = "0.6.14";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/clojurescript";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "clojurescript";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "4aec5abdd48aaf95f7a729e11d225a99d02caa3a4ddff3e9e4f8db80dea83ab70a4440691cb372562c8c16e73c2850b22806a2851df3849c852fddd49b57fc58";
|
||||
version = "1.10.439";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.jsinterop/jsinterop-annotations";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "jsinterop-annotations";
|
||||
groupId = "com.google.jsinterop";
|
||||
sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d";
|
||||
version = "1.0.0";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.fasterxml.jackson.core/jackson-core";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "jackson-core";
|
||||
groupId = "com.fasterxml.jackson.core";
|
||||
sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64";
|
||||
version = "2.8.7";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "malabarba/lazy-map";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "lazy-map";
|
||||
groupId = "malabarba";
|
||||
sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f";
|
||||
version = "1.3";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.cognitect/transit-js";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "transit-js";
|
||||
groupId = "com.cognitect";
|
||||
sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623";
|
||||
version = "0.8.846";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.mozilla/rhino";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "rhino";
|
||||
groupId = "org.mozilla";
|
||||
sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc";
|
||||
version = "1.7R5";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/google-closure-library-third-party";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "google-closure-library-third-party";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35";
|
||||
version = "0.0-20170809-b9c14c6b";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.javascript/closure-compiler-externs";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "closure-compiler-externs";
|
||||
groupId = "com.google.javascript";
|
||||
sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82";
|
||||
version = "v20180805";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.javassist/javassist";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "javassist";
|
||||
groupId = "org.javassist";
|
||||
sha512 = "ad65ee383ed83bedecc2073118cb3780b68b18d5fb79a1b2b665ff8529df02446ad11e68f9faaf4f2e980065f5946761a59ada379312cbb22d002625abed6a4f";
|
||||
version = "3.18.1-GA";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.guava/guava";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "guava";
|
||||
groupId = "com.google.guava";
|
||||
sha512 = "429ceeec0350ba98e2b089b8b70ded2ec570c3a684894a7545d10592c1c7be42dacd1fad8b2cb9123aa3612575ce1b56e1bb54923443fc293f8e9adeac2762ee";
|
||||
version = "25.1-jre";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.msgpack/msgpack";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "msgpack";
|
||||
groupId = "org.msgpack";
|
||||
sha512 = "a2741bed01f9c37ba3dbe6a7ab9ce936d36d4da97c35e215250ac89ac0851fc5948d83975ea6257d5dce1d43b6b5147254ecfb4b33f9bbdc489500b3ff060449";
|
||||
version = "0.6.12";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.j2objc/j2objc-annotations";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "j2objc-annotations";
|
||||
groupId = "com.google.j2objc";
|
||||
sha512 = "a4a0b58ffc2d9f9b516f571bcd0ac14e4d3eec15aacd6320a4a1a12045acce8c6081e8ce922c4e882221cedb2cc266399ab468487ae9a08124d65edc07ae30f0";
|
||||
version = "1.1";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.cognitect/transit-clj";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "transit-clj";
|
||||
groupId = "com.cognitect";
|
||||
sha512 = "ad838d9e5688c8cebe54972ad0c9a6db428ec1cece8c8b078e8e8d4b0c7870b328239d2bc9dd8fcbedcba56ca0de9afb5a0a843ff5f630dc039118de7eb45eba";
|
||||
version = "0.8.309";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "args4j/args4j";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "args4j";
|
||||
groupId = "args4j";
|
||||
sha512 = "5f0651234c8f8b130fddb39fa832c6da47d3e21bc3434307554314c47e672c28d005c64e9effe85d552190cfc27966b1f005740ffd40b4e1bec2cb257d7feedb";
|
||||
version = "2.0.26";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/core.rrb-vector";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "core.rrb-vector";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "5f737bf3ca3acf567b2b5c14b5761c8c38e94e1f6168f8cba9f46d2ae41334ae3d68d2c00663827a6214094d96b9767f6803f66ab44b0012c6f2e3c2997b1796";
|
||||
version = "0.0.13";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.checkerframework/checker-qual";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "checker-qual";
|
||||
groupId = "org.checkerframework";
|
||||
sha512 = "3c38b0b9e0bde464268cff5fdb1894a048240b039093ee3abe5b32976a22737d26b355f8793f630a7f0b319fdb019a6fcd9ee1d5219676f0f10c0b0f496b61b7";
|
||||
version = "2.0.0";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/tools.reader";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "tools.reader";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "290a2d98b2eec08a8affc2952006f43c0459c7e5467dc454f5fb5670ea7934fa974e6be19f7e7c91dadcfed62082d0fbcc7788455b7446a2c9c5af02f7fc52b6";
|
||||
version = "1.3.2";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.javascript/closure-compiler-unshaded";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "closure-compiler-unshaded";
|
||||
groupId = "com.google.javascript";
|
||||
sha512 = "4fa7029aabd9ff84255d56004707486726db9c770f43cb10dc44fb53a3254d588a0f47f937f55401d7f319267ec2362c87f5ea709bcfa06f12a66fe22cb8c53d";
|
||||
version = "v20180805";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "org.clojure/test.check";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "test.check";
|
||||
groupId = "org.clojure";
|
||||
sha512 = "bf57571a9d31d50cf15b38134f4d7c34d03eb458bc62b30c7a1dbf233e300c67f1fda6673dbd1584a0497cf8875f972e6697e7f13d0c3e70e4254697b1b75cc6";
|
||||
version = "0.10.0-alpha3";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.protobuf/protobuf-java";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "protobuf-java";
|
||||
groupId = "com.google.protobuf";
|
||||
sha512 = "230fc4360b8b2ee10eb73d756c58478b6c779433aa4ca91938404bbfd0ada516d3215664dbe953c96649e33bbef293958e4ad4616671f0c246883196ece92998";
|
||||
version = "3.0.2";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.code.findbugs/jsr305";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "jsr305";
|
||||
groupId = "com.google.code.findbugs";
|
||||
sha512 = "bb09db62919a50fa5b55906013be6ca4fc7acb2e87455fac5eaf9ede2e41ce8bbafc0e5a385a561264ea4cd71bbbd3ef5a45e02d63277a201d06a0ae1636f804";
|
||||
version = "3.0.2";
|
||||
};
|
||||
}
|
||||
|
||||
{
|
||||
name = "com.google.code.gson/gson";
|
||||
path = pkgs.fetchMavenArtifact {
|
||||
inherit repos;
|
||||
artifactId = "gson";
|
||||
groupId = "com.google.code.gson";
|
||||
sha512 = "c3cdaf66a99e6336abc80ff23374f6b62ac95ab2ae874c9075805e91d849b18e3f620cc202b4978fc92b73d98de96089c8714b1dd096b2ae1958cfa085715f7a";
|
||||
version = "2.7";
|
||||
};
|
||||
}
|
||||
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
{
|
||||
"name": "lumo-build-deps",
|
||||
"version": "1.9.0",
|
||||
"dependencies": {
|
||||
"@babel/core": "^7.1.5",
|
||||
"@babel/plugin-external-helpers": "7.0.0",
|
||||
"@babel/plugin-proposal-class-properties": "^7.1.0",
|
||||
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
|
||||
"@babel/plugin-transform-runtime": "^7.1.0",
|
||||
"@babel/preset-env": "^7.1.5",
|
||||
"@babel/preset-stage-2": "7.0.0",
|
||||
"@babel/runtime": "^7.1.5",
|
||||
"async-retry": "^1.2.3",
|
||||
"babel-core": "^7.0.0-bridge.0",
|
||||
"babel-eslint": "10.0.1",
|
||||
"babel-jest": "^23.6.0",
|
||||
"babel-loader": "^8.0.4",
|
||||
"babel-plugin-transform-flow-strip-types": "6.22.0",
|
||||
"chalk": "^2.4.1",
|
||||
"cross-env": "5.2.0",
|
||||
"death": "^1.1.0",
|
||||
"flow-bin": "0.85.0",
|
||||
"google-closure-compiler-js": "20170910.0.1",
|
||||
"jszip": "github:anmonteiro/jszip#patch-1",
|
||||
"nexe": "3.0.0-beta.7",
|
||||
"node-fetch": "^2.2.1",
|
||||
"paredit.js": "0.3.4",
|
||||
"posix-getopt": "github:anmonteiro/node-getopt#master",
|
||||
"prettier": "1.15.1",
|
||||
"progress": "^2.0.0",
|
||||
"read-pkg": "^4.0.1",
|
||||
"rollup": "0.67.0",
|
||||
"rollup-plugin-babel": "4.0.3",
|
||||
"rollup-plugin-babel-minify": "6.1.1",
|
||||
"rollup-plugin-commonjs": "9.2.0",
|
||||
"rollup-plugin-node-resolve": "3.4.0",
|
||||
"rollup-plugin-replace": "2.1.0",
|
||||
"webpack": "^4.25.1",
|
||||
"webpack-cli": "^3.1.2",
|
||||
"which-promise": "^1.0.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, SDL, libvorbis, flac, libmikmod }:
|
||||
{ stdenv, lib, fetchurl, SDL, libvorbis, flac, libmikmod }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "SDL_sound-${version}";
|
||||
|
|
@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ SDL libvorbis flac libmikmod ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
|
||||
|
||||
meta = with lib; {
|
||||
description = "SDL sound library";
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21;
|
||||
homepage = https://www.icculus.org/SDL_sound/;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, libuuid, json-glib, meson, gperf, ninja
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
name = "appstream-glib-0.7.13";
|
||||
name = "appstream-glib-0.7.14";
|
||||
|
||||
outputs = [ "out" "dev" "man" "installedTests" ];
|
||||
outputBin = "dev";
|
||||
|
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "hughsie";
|
||||
repo = "appstream-glib";
|
||||
rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
|
||||
sha256 = "0r1gb806p68axspzwvpn1ygmd6pfc17mncg3i6yazk3n10k5cl06";
|
||||
sha256 = "1908ilra1l0m2a224azmj6p4yglzdwwk41rr6rhby959sgw3iaky";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "appstream-${version}";
|
||||
version = "0.12.2";
|
||||
version = "0.12.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ximion";
|
||||
repo = "appstream";
|
||||
rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
|
||||
sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb";
|
||||
sha256 = "154yfn10vm5v7vwa2jz60bgpcznzm3nkjg31g92rm9b39rd2y1ja";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "9.100.5";
|
||||
version = "9.200.4";
|
||||
name = "armadillo-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
|
||||
sha256 = "1ka1vd9fcmvp12qkcm4888dkfqwnalvv00x04wy29f3nx3qwczby";
|
||||
sha256 = "0rkry405vacvlvkc7xdkzh20zf7yni9hsp65v0dby91na0wcrl8h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "babl-0.1.58";
|
||||
name = "babl-0.1.60";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
|
||||
sha256 = "0mgdii9v89ay0nra36cz9i0q7cqv8wi8hk01jsc4bf0rc1bsxjbr";
|
||||
sha256 = "0kv0y12j4k9khrxqa7rryfb4ikcnrax6x4nwi70wnz05nv6fxld3";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "actor-framework-${version}";
|
||||
version = "0.16.0";
|
||||
version = "0.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actor-framework";
|
||||
repo = "actor-framework";
|
||||
rev = "${version}";
|
||||
sha256 = "01i6sclxwa7k91ngi7jw9vlss8wjpv1hz4y5934jq0lx8hdf7s02";
|
||||
sha256 = "0sdr9mrrkrj9nfwqbznz3pkqfsnsi8kanfy99x01js1spqihy1s3";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cpp-hocon-${version}";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "084vsn080z8mp5s54jaq0qdwlx0p62nbw1i0rffkag477h8vq68i";
|
||||
sha256 = "0ar7q3rp46m01wvfa289bxnk9xma3ydc67by7i4nrpz8vamvhwc3";
|
||||
rev = version;
|
||||
repo = "cpp-hocon";
|
||||
owner = "puppetlabs";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
|
||||
, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng
|
||||
, darwin, libtiff, freetype
|
||||
, libtiff, freetype, cf-private, Cocoa, AGL, GLUT
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -35,7 +35,7 @@ in stdenv.mkDerivation {
|
|||
|
||||
propagatedBuildInputs = [ inputproto ]
|
||||
++ (if stdenv.isDarwin
|
||||
then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff])
|
||||
then [ Cocoa AGL GLUT freetype libtiff cf-private /* Needed for NSDefaultRunLoopMode */ ]
|
||||
else [ xlibsWrapper libXi freeglut ]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, fetchurl, autoreconfHook, pkgconfig
|
||||
, openssl
|
||||
, odbcSupport ? false, unixODBC ? null }:
|
||||
, odbcSupport ? true, unixODBC ? null }:
|
||||
|
||||
assert odbcSupport -> unixODBC != null;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv, fetchurl, cmake, vtk }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.8.7";
|
||||
version = "2.8.8";
|
||||
name = "gdcm-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gdcm/${name}.tar.bz2";
|
||||
sha256 = "1psl4r0i3hfhjjm9y8q5ml9lnlal4212bm8df21087dddi9nfl62";
|
||||
sha256 = "1iwfrk04sd22wkr1ivbg8gixl34fv9zfzwnfqvrq121nadb0s29b";
|
||||
};
|
||||
|
||||
dontUseCmakeBuildDir = true;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, libwebp, gnome3, libintl }:
|
||||
|
||||
let
|
||||
version = "0.4.8";
|
||||
version = "0.4.12";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "gegl-${version}";
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
|
||||
sha256 = "0jdfhf8wikba4h68k505x0br3gisiwivc33aca8v3ibaqpp6i53i";
|
||||
sha256 = "0ljqxc4iyy2hrj31pxcy1xp4xm5zbx1nigqisphmg4p8mcz2jrz9";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11
|
||||
, darwin, fixDarwinDylibNames
|
||||
, cf-private, Cocoa, Kernel, fixDarwinDylibNames
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -21,7 +21,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libX11 libXrandr libXinerama libXcursor
|
||||
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa Kernel fixDarwinDylibNames ]);
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
Cocoa Kernel fixDarwinDylibNames
|
||||
# Needed for NSDefaultRunLoopMode symbols.
|
||||
cf-private
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv, fetchurl, libelf }:
|
||||
|
||||
let
|
||||
version = "20180809";
|
||||
version = "20181024";
|
||||
src = fetchurl {
|
||||
url = "https://www.prevanders.net/libdwarf-${version}.tar.gz";
|
||||
# Upstream displays this hash broken into three parts:
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
|
||||
verbs = rec {
|
||||
version = "1.1.8";
|
||||
name = "libibverbs-${version}";
|
||||
url = "http://downloads.openfabrics.org/verbs/${name}.tar.gz";
|
||||
sha256 = "13w2j5lrrqxxxvhpxbqb70x7wy0h8g329inzgfrvqv8ykrknwxkw";
|
||||
};
|
||||
|
||||
drivers = {
|
||||
libmlx4 = rec {
|
||||
version = "1.0.6";
|
||||
name = "libmlx4-${version}";
|
||||
url = "http://downloads.openfabrics.org/mlx4/${name}.tar.gz";
|
||||
sha256 = "f680ecbb60b01ad893490c158b4ce8028a3014bb8194c2754df508d53aa848a8";
|
||||
};
|
||||
libmthca = rec {
|
||||
version = "1.0.6";
|
||||
name = "libmthca-${version}";
|
||||
url = "http://downloads.openfabrics.org/mthca/${name}.tar.gz";
|
||||
sha256 = "cc8ea3091135d68233d53004e82b5b510009c821820494a3624e89e0bdfc855c";
|
||||
};
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
|
||||
inherit (verbs) name version ;
|
||||
|
||||
srcs = [
|
||||
( fetchurl { inherit (verbs) url sha256 ; } )
|
||||
( fetchurl { inherit (drivers.libmlx4) url sha256 ; } )
|
||||
( fetchurl { inherit (drivers.libmthca) url sha256 ; } )
|
||||
];
|
||||
|
||||
sourceRoot = name;
|
||||
|
||||
# Install userspace drivers
|
||||
postInstall = ''
|
||||
for dir in ${drivers.libmlx4.name} ${drivers.libmthca.name} ; do
|
||||
cd ../$dir
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/include"
|
||||
export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS -L$out/lib"
|
||||
./configure $configureFlags
|
||||
make -j$NIX_BUILD_CORES
|
||||
make install
|
||||
done
|
||||
|
||||
mkdir -p $out/lib/pkgconfig
|
||||
cat >$out/lib/pkgconfig/ibverbs.pc <<EOF
|
||||
prefix=$out
|
||||
exec_prefix=\''${prefix}
|
||||
libdir=\''${exec_prefix}/lib
|
||||
includedir=\''${prefix}/include
|
||||
|
||||
Name: IB verbs
|
||||
Version: ${version}
|
||||
Description: Library for direct userspace use of RDMA (InfiniBand/iWARP)
|
||||
Libs: -L\''${libdir} -libverbs
|
||||
Cflags: -I\''${includedir}
|
||||
EOF
|
||||
'';
|
||||
|
||||
# Re-add the libibverbs path into runpath of the library
|
||||
# to enable plugins to be found by dlopen
|
||||
postFixup = ''
|
||||
RPATH=$(patchelf --print-rpath $out/lib/libibverbs.so)
|
||||
patchelf --set-rpath $RPATH:$out/lib $out/lib/libibverbs.so.1.0.0
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://www.openfabrics.org/;
|
||||
license = licenses.bsd2;
|
||||
platforms = with platforms; linux ++ freebsd;
|
||||
maintainers = with maintainers; [ wkennington bzizou ];
|
||||
};
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue