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

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-21 12:44:13 +00:00 committed by GitHub
commit 7d80106978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
72 changed files with 659 additions and 650 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/configuration/x-windows.xml
View File

@ -186,7 +186,7 @@
The driver has many options (see <xref linkend="ch-options"/>). For The driver has many options (see <xref linkend="ch-options"/>). For
instance, the following disables tap-to-click behavior: instance, the following disables tap-to-click behavior:
<programlisting> <programlisting>
<xref linkend="opt-services.xserver.libinput.tapping"/> = false; <xref linkend="opt-services.xserver.libinput.touchpad.tapping"/> = false;
</programlisting> </programlisting>
Note: the use of <literal>services.xserver.synaptics</literal> is deprecated Note: the use of <literal>services.xserver.synaptics</literal> is deprecated
since NixOS 17.09. since NixOS 17.09.

11
nixos/doc/manual/release-notes/rl-2103.xml
View File

@ -430,6 +430,17 @@ http://some.json-exporter.host:7979/probe?target=https://example.com/some/json/e
dynamically allocated uid. dynamically allocated uid.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The libinput module has been updated with the ability to configure mouse and touchpad settings separately.
The options in <literal>services.xserver.libinput</literal> have been renamed to <literal>services.xserver.libinput.touchpad</literal>,
while there is a new <literal>services.xserver.libinput.mouse</literal> for mouse related configuration.
</para>
<para>
Since touchpad options no longer apply to all devices, you may want to replicate your touchpad configuration in
mouse section.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

96
nixos/modules/services/x11/hardware/libinput.nix
View File

@ -3,23 +3,18 @@
with lib; with lib;
let cfg = config.services.xserver.libinput; let cfg = config.services.xserver.libinput;
xorgBool = v: if v then "on" else "off"; xorgBool = v: if v then "on" else "off";
in {
options = {
services.xserver.libinput = {
enable = mkEnableOption "libinput";
mkConfigForDevice = deviceType: {
dev = mkOption { dev = mkOption {
type = types.nullOr types.str; type = types.nullOr types.str;
default = null; default = null;
example = "/dev/input/event0"; example = "/dev/input/event0";
description = description =
'' ''
Path for touchpad device. Set to null to apply to any Path for ${deviceType} device. Set to null to apply to any
auto-detected touchpad. auto-detected ${deviceType}.
''; '';
}; };
@ -185,14 +180,63 @@ in {
Option "DragLockButtons" "L1 B1 L2 B2" Option "DragLockButtons" "L1 B1 L2 B2"
''; '';
description = '' description = ''
Additional options for libinput touchpad driver. See Additional options for libinput ${deviceType} driver. See
<citerefentry><refentrytitle>libinput</refentrytitle><manvolnum>4</manvolnum></citerefentry> <citerefentry><refentrytitle>libinput</refentrytitle><manvolnum>4</manvolnum></citerefentry>
for available options."; for available options.";
''; '';
}; };
}; };
mkX11ConfigForDevice = deviceType: matchIs: ''
Identifier "libinput ${deviceType} configuration"
MatchDriver "libinput"
MatchIs${matchIs} "${xorgBool true}"
${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''}
Option "AccelProfile" "${cfg.${deviceType}.accelProfile}"
${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''}
${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''}
${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''}
${optionalString (cfg.${deviceType}.clickMethod != null) ''Option "ClickMethod" "${cfg.${deviceType}.clickMethod}"''}
Option "LeftHanded" "${xorgBool cfg.${deviceType}.leftHanded}"
Option "MiddleEmulation" "${xorgBool cfg.${deviceType}.middleEmulation}"
Option "NaturalScrolling" "${xorgBool cfg.${deviceType}.naturalScrolling}"
${optionalString (cfg.${deviceType}.scrollButton != null) ''Option "ScrollButton" "${toString cfg.${deviceType}.scrollButton}"''}
Option "ScrollMethod" "${cfg.${deviceType}.scrollMethod}"
Option "HorizontalScrolling" "${xorgBool cfg.${deviceType}.horizontalScrolling}"
Option "SendEventsMode" "${cfg.${deviceType}.sendEventsMode}"
Option "Tapping" "${xorgBool cfg.${deviceType}.tapping}"
Option "TappingDragLock" "${xorgBool cfg.${deviceType}.tappingDragLock}"
Option "DisableWhileTyping" "${xorgBool cfg.${deviceType}.disableWhileTyping}"
${cfg.${deviceType}.additionalOptions}
'';
in {
imports =
(map (option: mkRenamedOptionModule ([ "services" "xserver" "libinput" option ]) [ "services" "xserver" "libinput" "touchpad" option ]) [
"accelProfile"
"accelSpeed"
"buttonMapping"
"calibrationMatrix"
"clickMethod"
"leftHanded"
"middleEmulation"
"naturalScrolling"
"scrollButton"
"scrollMethod"
"horizontalScrolling"
"sendEventsMode"
"tapping"
"disableWhileTyping"
"additionalOptions"
]);
options = {
services.xserver.libinput = {
enable = mkEnableOption "libinput";
mouse = mkConfigForDevice "mouse";
touchpad = mkConfigForDevice "touchpad";
};
}; };
@ -212,32 +256,10 @@ in {
services.udev.packages = [ pkgs.libinput.out ]; services.udev.packages = [ pkgs.libinput.out ];
services.xserver.config = services.xserver.inputClassSections = [
'' (mkX11ConfigForDevice "mouse" "Pointer")
# General libinput configuration. (mkX11ConfigForDevice "touchpad" "Touchpad")
# See CONFIGURATION DETAILS section of man:libinput(4). ];
Section "InputClass"
Identifier "libinputConfiguration"
MatchDriver "libinput"
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
Option "AccelProfile" "${cfg.accelProfile}"
${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
${optionalString (cfg.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.calibrationMatrix}"''}
${optionalString (cfg.clickMethod != null) ''Option "ClickMethod" "${cfg.clickMethod}"''}
Option "LeftHanded" "${xorgBool cfg.leftHanded}"
Option "MiddleEmulation" "${xorgBool cfg.middleEmulation}"
Option "NaturalScrolling" "${xorgBool cfg.naturalScrolling}"
${optionalString (cfg.scrollButton != null) ''Option "ScrollButton" "${toString cfg.scrollButton}"''}
Option "ScrollMethod" "${cfg.scrollMethod}"
Option "HorizontalScrolling" "${xorgBool cfg.horizontalScrolling}"
Option "SendEventsMode" "${cfg.sendEventsMode}"
Option "Tapping" "${xorgBool cfg.tapping}"
Option "TappingDragLock" "${xorgBool cfg.tappingDragLock}"
Option "DisableWhileTyping" "${xorgBool cfg.disableWhileTyping}"
${cfg.additionalOptions}
EndSection
'';
assertions = [ assertions = [
# already present in synaptics.nix # already present in synaptics.nix

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

@ -1,17 +1,14 @@
{ lib, stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm { lib, stdenv, fetchurl, xlibsWrapper, makeWrapper, libXpm
, libXmu, libXi, libXp, Xaw3d, fig2dev , libXmu, libXi, libXp, Xaw3d, libXaw, fig2dev
}: }:
let stdenv.mkDerivation rec {
version = "3.2.7a";
in stdenv.mkDerivation {
pname = "xfig"; pname = "xfig";
inherit version; version = "3.2.8";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz";
sha256 = "096zgp0bqnxhgxbrv2jjylrjz3pr4da0xxznlk2z7ffxr5pri2fa"; sha256 = "1czamqp0xn0j6qjnasa3fjnrzi072v6qknylr6jrs4gwsfw4ybyw";
}; };
postPatch = '' postPatch = ''
@ -30,7 +27,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d ]; buildInputs = [ xlibsWrapper libXpm libXmu libXi libXp Xaw3d libXaw ];
meta = with lib; { meta = with lib; {
description = "An interactive drawing tool for X11"; description = "An interactive drawing tool for X11";
@ -38,6 +35,6 @@ in stdenv.mkDerivation {
Note that you need to have the <literal>netpbm</literal> tools Note that you need to have the <literal>netpbm</literal> tools
in your path to export bitmaps. in your path to export bitmaps.
''; '';
inherit (fig2dev.meta) license homepage platforms; inherit (fig2dev.meta) license homepage platforms maintainers;
}; };
} }

12
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -31,15 +31,15 @@
} }
}, },
"dev": { "dev": {
"version": "89.0.4385.0", "version": "89.0.4389.9",
"sha256": "0cwfwkaidxi86n80kcn3lxrwz90zp6ra9dib1nd4xnhpgl7vjjjf", "sha256": "12jiy5p1cbrs0gc3kd86walcnh038lzs5gnb9vif45f7kxn3c9pm",
"sha256bin64": "1hvrdvmlqc95qb9gn7iihal4h1kzf6jqrhk9xvv45chsvwl79pmd", "sha256bin64": "1wmidvf5gfm1xkpaj07gsvyk1r8b6jbcv46w5vclydlc1r6wh81s",
"deps": { "deps": {
"gn": { "gn": {
"version": "2020-12-22", "version": "2021-01-07",
"url": "https://gn.googlesource.com/gn", "url": "https://gn.googlesource.com/gn",
"rev": "0d67e272bdb8145f87d238bc0b2cb8bf80ccec90", "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140",
"sha256": "07mrfl9hbjldbgidwwhr482a0s0ppqzwa5j7v5nbqxj18j55iril" "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d"
} }
} }
}, },

4
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -12,7 +12,7 @@
with lib; with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.31"; version = "0.31.3";
pname = "notmuch"; pname = "notmuch";
passthru = { passthru = {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = "https://git.notmuchmail.org/git/notmuch"; url = "https://git.notmuchmail.org/git/notmuch";
sha256 = "0f9d9k9avb46yh2r8fvijvw7bryqwckvyzc68f9phax2g4c99x4x"; sha256 = "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v";
rev = version; rev = version;
}; };

4
pkgs/applications/science/chemistry/marvin/default.nix
View File

@ -4,12 +4,12 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marvin"; pname = "marvin";
version = "20.20.0"; version = "20.21.0";
src = fetchurl { src = fetchurl {
name = "marvin-${version}.deb"; name = "marvin-${version}.deb";
url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb";
sha256 = "1a8b0drb0c95c8arm3aa0z0sbdm9ilj4h1g90i0qyn4g2wk2xsal"; sha256 = "sha256-OMT6t8bNeFRWFlpyg0iKt2SMNfAmIUvVKiW+cfjfBuI=";
}; };
nativeBuildInputs = [ dpkg makeWrapper ]; nativeBuildInputs = [ dpkg makeWrapper ];

4
pkgs/applications/science/logic/acgtk/default.nix
View File

@ -16,7 +16,9 @@ stdenv.mkDerivation {
buildPhase = "dune build"; buildPhase = "dune build";
inherit (dune) installPhase; installPhase = ''
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR
'';
meta = with lib; { meta = with lib; {
homepage = "https://acg.loria.fr/"; homepage = "https://acg.loria.fr/";

7
pkgs/applications/virtualization/conmon/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv { lib
, stdenv
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, glib , glib
@ -9,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "conmon"; pname = "conmon";
version = "2.0.24"; version = "2.0.25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1z6z1bz2rgj15xbqx10kvwn8s64nx5hmn1x52k4z4r20p4f95hkg"; sha256 = "sha256-u22irZ9AC1W2AVJ1OD1gLzTH4NOgRkZekZ78rNKXnps=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

3
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-DENABLE_TESTING=OFF" "-DENABLE_TESTING=OFF"
"-DCURL_HAS_H2=0" "-DCURL_HAS_H2=1"
"-DCURL_HAS_TLS_PROXY=1"
] ++ lib.optional (apis != ["*"]) ] ++ lib.optional (apis != ["*"])
"-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";

3
pkgs/development/libraries/libiscsi/default.nix
View File

@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
# This problem is gone on libiscsi master.
NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "iscsi client library and utilities"; description = "iscsi client library and utilities";
homepage = "https://github.com/sahlberg/libiscsi"; homepage = "https://github.com/sahlberg/libiscsi";

4
pkgs/development/libraries/libmaxminddb/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmaxminddb"; pname = "libmaxminddb";
version = "1.4.3"; version = "1.5.0";
src = fetchurl { src = fetchurl {
url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz"; url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
sha256 = "0fd4a4sxiiwzbd5h74wl1ijnb7xybjyybb7q41vdq3w8nk3zdzd5"; sha256 = "sha256-fFbnkf8qZVIV5+04ZLH/3X00o4g1d57+1WpC8Fa9WKo=";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

34
pkgs/development/ocaml-modules/bos/default.nix
View File

@ -3,24 +3,24 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-bos-${version}"; name = "ocaml${ocaml.version}-bos-${version}";
version = "0.2.0"; version = "0.2.0";
src = fetchurl { src = fetchurl {
url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz"; url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc"; sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
}; };
nativeBuildInputs = [ ocaml findlib ocamlbuild ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg ]; buildInputs = [ findlib topkg ];
propagatedBuildInputs = [ astring fmt fpath logs rresult ]; propagatedBuildInputs = [ astring fmt fpath logs rresult ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = { meta = {
description = "Basic OS interaction for OCaml"; description = "Basic OS interaction for OCaml";
homepage = "https://erratique.ch/software/bos"; homepage = "https://erratique.ch/software/bos";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

30
pkgs/development/ocaml-modules/camomile/default.nix
View File

@ -2,23 +2,23 @@
buildDunePackage rec { buildDunePackage rec {
pname = "camomile"; pname = "camomile";
version = "1.0.2"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "yoriyuki"; owner = "yoriyuki";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad"; sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
}; };
buildInputs = [ cppo ]; buildInputs = [ cppo ];
configurePhase = "ocaml configure.ml --share $out/share/camomile"; configurePhase = "ocaml configure.ml --share $out/share/camomile";
meta = { meta = {
inherit (src.meta) homepage; inherit (src.meta) homepage;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
license = lib.licenses.lgpl21; license = lib.licenses.lgpl21;
description = "A Unicode library for OCaml"; description = "A Unicode library for OCaml";
}; };
} }

24
pkgs/development/ocaml-modules/cohttp/async.nix
View File

@ -2,21 +2,21 @@
, logs, magic-mime }: , logs, magic-mime }:
if !lib.versionAtLeast cohttp.version "0.99" then if !lib.versionAtLeast cohttp.version "0.99" then
cohttp cohttp
else if !lib.versionAtLeast async.version "0.13" then else if !lib.versionAtLeast async.version "0.13" then
throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
else else
buildDunePackage { buildDunePackage {
pname = "cohttp-async"; pname = "cohttp-async";
useDune2 = true; useDune2 = true;
inherit (cohttp) version src; inherit (cohttp) version src;
buildInputs = [ ppx_sexp_conv ]; buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ]; propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
meta = cohttp.meta // { meta = cohttp.meta // {
description = "CoHTTP implementation for the Async concurrency library"; description = "CoHTTP implementation for the Async concurrency library";
}; };
} }

32
pkgs/development/ocaml-modules/cohttp/default.nix
View File

@ -4,26 +4,26 @@
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "cohttp"; pname = "cohttp";
version = "2.5.4"; version = "2.5.4";
useDune2 = true; useDune2 = true;
minimumOCamlVersion = "4.04.1"; minimumOCamlVersion = "4.04.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz"; url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a"; sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
}; };
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ]; buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ]; propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
meta = { meta = {
description = "HTTP(S) library for Lwt, Async and Mirage"; description = "HTTP(S) library for Lwt, Async and Mirage";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/ocaml-cohttp"; homepage = "https://github.com/mirage/ocaml-cohttp";
}; };
} }

10
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
View File

@ -8,12 +8,12 @@ then cohttp-lwt
else else
buildDunePackage { buildDunePackage {
pname = "cohttp-lwt-unix"; pname = "cohttp-lwt-unix";
inherit (cohttp-lwt) version src meta; inherit (cohttp-lwt) version src meta;
useDune2 = true; useDune2 = true;
buildInputs = [ cmdliner ppx_sexp_conv ]; buildInputs = [ cmdliner ppx_sexp_conv ];
propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ]; propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
} }

8
pkgs/development/ocaml-modules/cohttp/lwt.nix
View File

@ -7,10 +7,10 @@ then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_con
else else
buildDunePackage { buildDunePackage {
pname = "cohttp-lwt"; pname = "cohttp-lwt";
inherit (cohttp) version src useDune2 meta; inherit (cohttp) version src useDune2 meta;
buildInputs = [ uri ppx_sexp_conv ]; buildInputs = [ uri ppx_sexp_conv ];
propagatedBuildInputs = [ cohttp ocaml_lwt logs ]; propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
} }

16
pkgs/development/ocaml-modules/conduit/async.nix
View File

@ -5,15 +5,15 @@ then conduit
else else
buildDunePackage { buildDunePackage {
pname = "conduit-async"; pname = "conduit-async";
useDune2 = true; useDune2 = true;
inherit (conduit) version src; inherit (conduit) version src;
buildInputs = [ ppx_sexp_conv ]; buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ async async_ssl conduit ]; propagatedBuildInputs = [ async async_ssl conduit ];
meta = conduit.meta // { meta = conduit.meta // {
description = "A network connection establishment library for Async"; description = "A network connection establishment library for Async";
}; };
} }

18
pkgs/development/ocaml-modules/conduit/lwt-unix.nix
View File

@ -4,17 +4,17 @@
}: }:
buildDunePackage { buildDunePackage {
pname = "conduit-lwt-unix"; pname = "conduit-lwt-unix";
inherit (conduit-lwt) version src minimumOCamlVersion; inherit (conduit-lwt) version src minimumOCamlVersion;
useDune2 = true; useDune2 = true;
buildInputs = [ ppx_sexp_conv ]; buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = propagatedBuildInputs =
[ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ]; [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
meta = conduit-lwt.meta // { meta = conduit-lwt.meta // {
description = "A network connection establishment library for Lwt_unix"; description = "A network connection establishment library for Lwt_unix";
}; };
} }

14
pkgs/development/ocaml-modules/conduit/lwt.nix
View File

@ -1,14 +1,14 @@
{ buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }: { buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
buildDunePackage { buildDunePackage {
pname = "conduit-lwt"; pname = "conduit-lwt";
inherit (conduit) version src useDune2 minimumOCamlVersion; inherit (conduit) version src useDune2 minimumOCamlVersion;
buildInputs = [ ppx_sexp_conv ]; buildInputs = [ ppx_sexp_conv ];
propagatedBuildInputs = [ conduit ocaml_lwt sexplib ]; propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
meta = conduit.meta // { meta = conduit.meta // {
description = "A network connection establishment library for Lwt"; description = "A network connection establishment library for Lwt";
}; };
} }

6
pkgs/development/ocaml-modules/cstruct/lwt.nix
View File

@ -5,10 +5,10 @@ then cstruct
else else
buildDunePackage { buildDunePackage {
pname = "cstruct-lwt"; pname = "cstruct-lwt";
inherit (cstruct) version src useDune2 meta; inherit (cstruct) version src useDune2 meta;
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.02";
propagatedBuildInputs = [ cstruct lwt ]; propagatedBuildInputs = [ cstruct lwt ];
} }

8
pkgs/development/ocaml-modules/cstruct/ppx.nix
View File

@ -5,10 +5,10 @@ then cstruct
else else
buildDunePackage { buildDunePackage {
pname = "ppx_cstruct"; pname = "ppx_cstruct";
inherit (cstruct) version src useDune2 meta; inherit (cstruct) version src useDune2 meta;
minimumOCamlVersion = "4.03"; minimumOCamlVersion = "4.03";
propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ]; propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ];
} }

11
pkgs/development/ocaml-modules/cstruct/sexp.nix
View File

@ -5,12 +5,11 @@ then cstruct
else else
buildDunePackage rec { buildDunePackage rec {
pname = "cstruct-sexp"; pname = "cstruct-sexp";
inherit (cstruct) version src useDune2 meta; inherit (cstruct) version src useDune2 meta;
doCheck = lib.versionAtLeast ocaml.version "4.03"; doCheck = lib.versionAtLeast ocaml.version "4.03";
checkInputs = lib.optional doCheck alcotest; checkInputs = lib.optional doCheck alcotest;
propagatedBuildInputs = [ cstruct sexplib ]; propagatedBuildInputs = [ cstruct sexplib ];
} }

8
pkgs/development/ocaml-modules/cstruct/unix.nix
View File

@ -5,10 +5,10 @@ then cstruct
else else
buildDunePackage { buildDunePackage {
pname = "cstruct-unix"; pname = "cstruct-unix";
inherit (cstruct) version src useDune2 meta; inherit (cstruct) version src useDune2 meta;
minimumOCamlVersion = "4.06"; minimumOCamlVersion = "4.06";
propagatedBuildInputs = [ cstruct ]; propagatedBuildInputs = [ cstruct ];
} }

24
pkgs/development/ocaml-modules/csv/default.nix
View File

@ -2,19 +2,19 @@
buildDunePackage rec { buildDunePackage rec {
pname = "csv"; pname = "csv";
version = "2.4"; version = "2.4";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz"; url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk"; sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
}; };
meta = { meta = {
description = "A pure OCaml library to read and write CSV files"; description = "A pure OCaml library to read and write CSV files";
license = lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/Chris00/ocaml-csv"; homepage = "https://github.com/Chris00/ocaml-csv";
}; };
} }

34
pkgs/development/ocaml-modules/decompress/default.nix
View File

@ -4,25 +4,25 @@
}: }:
buildDunePackage rec { buildDunePackage rec {
version = "0.9.0"; version = "0.9.0";
pname = "decompress"; pname = "decompress";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh"; sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
}; };
buildInputs = [ cmdliner ]; buildInputs = [ cmdliner ];
propagatedBuildInputs = [ checkseum ]; propagatedBuildInputs = [ checkseum ];
checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ]; checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
doCheck = true; doCheck = true;
meta = { meta = {
description = "Pure OCaml implementation of Zlib"; description = "Pure OCaml implementation of Zlib";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/decompress"; homepage = "https://github.com/mirage/decompress";
}; };
} }

38
pkgs/development/ocaml-modules/dolmen/default.nix
View File

@ -1,27 +1,27 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-dolmen-${version}"; name = "ocaml${ocaml.version}-dolmen-${version}";
version = "0.2"; version = "0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Gbury"; owner = "Gbury";
repo = "dolmen"; repo = "dolmen";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf"; sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf";
}; };
buildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhir ];
makeFlags = [ "-C" "src" ]; makeFlags = [ "-C" "src" ];
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {
description = "An OCaml library providing clean and flexible parsers for input languages"; description = "An OCaml library providing clean and flexible parsers for input languages";
license = lib.licenses.bsd2; license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

44
pkgs/development/ocaml-modules/expat/default.nix
View File

@ -1,32 +1,32 @@
{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }: { stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-expat-${version}"; name = "ocaml${ocaml.version}-expat-${version}";
version = "1.1.0"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "whitequark"; owner = "whitequark";
repo = "ocaml-expat"; repo = "ocaml-expat";
rev = "v${version}"; rev = "v${version}";
sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q"; sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q";
}; };
prePatch = '' prePatch = ''
substituteInPlace Makefile --replace "gcc" "\$(CC)" substituteInPlace Makefile --replace "gcc" "\$(CC)"
''; '';
buildInputs = [ ocaml findlib expat ounit ]; buildInputs = [ ocaml findlib expat ounit ];
doCheck = !lib.versionAtLeast ocaml.version "4.06"; doCheck = !lib.versionAtLeast ocaml.version "4.06";
checkTarget = "testall"; checkTarget = "testall";
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {
description = "OCaml wrapper for the Expat XML parsing library"; description = "OCaml wrapper for the Expat XML parsing library";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

16
pkgs/development/ocaml-modules/git-http/default.nix
View File

@ -1,15 +1,15 @@
{ buildDunePackage, git, cohttp, cohttp-lwt }: { buildDunePackage, git, cohttp, cohttp-lwt }:
buildDunePackage { buildDunePackage {
pname = "git-http"; pname = "git-http";
inherit (git) version src minimumOCamlVersion; inherit (git) version src minimumOCamlVersion;
useDune2 = true; useDune2 = true;
propagatedBuildInputs = [ git cohttp cohttp-lwt ]; propagatedBuildInputs = [ git cohttp cohttp-lwt ];
meta = { meta = {
description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml"; description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
inherit (git.meta) homepage license maintainers; inherit (git.meta) homepage license maintainers;
}; };
} }

20
pkgs/development/ocaml-modules/git-unix/default.nix
View File

@ -4,17 +4,17 @@
}: }:
buildDunePackage { buildDunePackage {
pname = "git-unix"; pname = "git-unix";
inherit (git-http) version src minimumOCamlVersion; inherit (git-http) version src minimumOCamlVersion;
useDune2 = true; useDune2 = true;
propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ]; propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ];
checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ]; checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ];
doCheck = !stdenv.isAarch64; doCheck = !stdenv.isAarch64;
meta = { meta = {
description = "Unix backend for the Git protocol(s)"; description = "Unix backend for the Git protocol(s)";
inherit (git-http.meta) homepage license maintainers; inherit (git-http.meta) homepage license maintainers;
}; };
} }

40
pkgs/development/ocaml-modules/git/default.nix
View File

@ -6,28 +6,28 @@
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "git"; pname = "git";
version = "2.1.3"; version = "2.1.3";
minimumOCamlVersion = "4.07"; minimumOCamlVersion = "4.07";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax"; sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims
]; ];
checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
doCheck = !stdenv.isAarch64; doCheck = !stdenv.isAarch64;
meta = { meta = {
description = "Git format and protocol in pure OCaml"; description = "Git format and protocol in pure OCaml";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/mirage/ocaml-git"; homepage = "https://github.com/mirage/ocaml-git";
}; };
} }

10
pkgs/development/ocaml-modules/hmap/default.nix
View File

@ -13,7 +13,7 @@ in
assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version; assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hmap"; pname = "hmap";
version = "0.8.1"; version = "0.8.1";
name = "ocaml${ocaml.version}-${pname}-${version}"; name = "ocaml${ocaml.version}-${pname}-${version}";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a"; sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a";
}; };
buildInputs = [ ocaml ocamlbuild findlib topkg ]; buildInputs = [ ocaml ocamlbuild findlib topkg ];
inherit (topkg) installPhase; inherit (topkg) installPhase;
@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
checkPhase = "${topkg.run} test"; checkPhase = "${topkg.run} test";
meta = { meta = {
description = "Heterogeneous value maps for OCaml"; description = "Heterogeneous value maps for OCaml";
homepage = "https://erratique.ch/software/hmap"; homepage = "https://erratique.ch/software/hmap";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.pmahoney ]; maintainers = [ lib.maintainers.pmahoney ];
}; };
} }

36
pkgs/development/ocaml-modules/inifiles/default.nix
View File

@ -1,28 +1,28 @@
{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: { stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml${ocaml.version}-inifiles-1.2"; name = "ocaml${ocaml.version}-inifiles-1.2";
src = fetchurl { src = fetchurl {
url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz"; url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns"; sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
}; };
patches = [ (fetchpatch { patches = [ (fetchpatch {
url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff"; url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff";
sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn";
})]; })];
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ ocaml_pcre ]; propagatedBuildInputs = [ ocaml_pcre ];
buildFlags = [ "all" "opt" ]; buildFlags = [ "all" "opt" ];
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {
description = "A small OCaml library to read and write .ini files"; description = "A small OCaml library to read and write .ini files";
license = lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

58
pkgs/development/ocaml-modules/inotify/default.nix
View File

@ -4,41 +4,41 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.3"; version = "2.3";
name = "ocaml${ocaml.version}-inotify-${version}"; name = "ocaml${ocaml.version}-inotify-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "whitequark"; owner = "whitequark";
repo = "ocaml-inotify"; repo = "ocaml-inotify";
rev = "v${version}"; rev = "v${version}";
sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y"; sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y";
}; };
patches = [ (fetchpatch { patches = [ (fetchpatch {
url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch"; url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch";
sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k"; sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k";
}) ]; }) ];
buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ]; buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ];
checkInputs = [ ounit fileutils ]; checkInputs = [ ounit fileutils ];
configureFlags = [ "--enable-lwt" configureFlags = [ "--enable-lwt"
(lib.optionalString doCheck "--enable-tests") ]; (lib.optionalString doCheck "--enable-tests") ];
postConfigure = lib.optionalString doCheck '' postConfigure = lib.optionalString doCheck ''
echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
''; '';
doCheck = true; doCheck = true;
checkTarget = "test"; checkTarget = "test";
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {
description = "Bindings for Linux’s filesystem monitoring interface, inotify"; description = "Bindings for Linux’s filesystem monitoring interface, inotify";
license = lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

24
pkgs/development/ocaml-modules/integers/default.nix
View File

@ -1,18 +1,18 @@
{ lib, fetchzip, buildDunePackage }: { lib, fetchzip, buildDunePackage }:
buildDunePackage rec { buildDunePackage rec {
pname = "integers"; pname = "integers";
version = "0.4.0"; version = "0.4.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
}; };
meta = { meta = {
description = "Various signed and unsigned integer types for OCaml"; description = "Various signed and unsigned integer types for OCaml";
license = lib.licenses.mit; license = lib.licenses.mit;
homepage = "https://github.com/ocamllabs/ocaml-integers"; homepage = "https://github.com/ocamllabs/ocaml-integers";
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
}; };
} }

7
pkgs/development/ocaml-modules/lua-ml/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, opaline }:
if !lib.versionAtLeast ocaml.version "4.07" if !lib.versionAtLeast ocaml.version "4.07"
then throw "lua-ml is not available for OCaml ${ocaml.version}" then throw "lua-ml is not available for OCaml ${ocaml.version}"
@ -16,11 +16,14 @@ stdenv.mkDerivation rec {
sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044";
}; };
nativeBuildInputs = [ opaline ];
buildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml findlib ocamlbuild ];
buildFlags = [ "lib" ]; buildFlags = [ "lib" ];
inherit (dune) installPhase; installPhase = ''
opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
'';
meta = { meta = {
description = "An embeddable Lua 2.5 interpreter implemented in OCaml"; description = "An embeddable Lua 2.5 interpreter implemented in OCaml";

26
pkgs/development/ocaml-modules/lwt_react/default.nix
View File

@ -1,22 +1,22 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }: { stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.1"; version = "1.0.1";
name = "ocaml${ocaml.version}-lwt_react-${version}"; name = "ocaml${ocaml.version}-lwt_react-${version}";
src = fetchzip { src = fetchzip {
url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz"; url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
}; };
buildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ ocaml findlib ocamlbuild ];
propagatedBuildInputs = [ lwt react ]; propagatedBuildInputs = [ lwt react ];
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {
description = "Helpers for using React with Lwt"; description = "Helpers for using React with Lwt";
inherit (lwt.meta) homepage license maintainers; inherit (lwt.meta) homepage license maintainers;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

42
pkgs/development/ocaml-modules/num/default.nix
View File

@ -1,31 +1,31 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }: { stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1"; version = "1.1";
name = "ocaml${ocaml.version}-num-${version}"; name = "ocaml${ocaml.version}-num-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocaml"; owner = "ocaml";
repo = "num"; repo = "num";
rev = "v${version}"; rev = "v${version}";
sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0"; sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
}; };
patches = [ (fetchpatch { patches = [ (fetchpatch {
url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch"; url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b"; sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
}) })
] ++ lib.optional withStatic ./enable-static.patch; ] ++ lib.optional withStatic ./enable-static.patch;
nativeBuildInputs = [ ocaml findlib ]; nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {
description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
license = lib.licenses.lgpl21; license = lib.licenses.lgpl21;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
inherit (src.meta) homepage; inherit (src.meta) homepage;
}; };
} }

38
pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
View File

@ -5,26 +5,26 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
else else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocp-ocamlres-${version}"; name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
version = "0.4"; version = "0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OCamlPro"; owner = "OCamlPro";
repo = "ocp-ocamlres"; repo = "ocp-ocamlres";
rev = "v${version}"; rev = "v${version}";
sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn"; sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
}; };
buildInputs = [ ocaml findlib astring pprint ]; buildInputs = [ ocaml findlib astring pprint ];
createFindlibDestdir = true; createFindlibDestdir = true;
installFlags = [ "BINDIR=$(out)/bin" ]; installFlags = [ "BINDIR=$(out)/bin" ];
preInstall = "mkdir -p $out/bin"; preInstall = "mkdir -p $out/bin";
meta = { meta = {
description = "A simple tool and library to embed files and directories inside OCaml executables"; description = "A simple tool and library to embed files and directories inside OCaml executables";
license = lib.licenses.lgpl3Plus; license = lib.licenses.lgpl3Plus;
homepage = "https://www.typerex.org/ocp-ocamlres.html"; homepage = "https://www.typerex.org/ocp-ocamlres.html";
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

32
pkgs/development/ocaml-modules/ocplib-json-typed/default.nix
View File

@ -1,22 +1,22 @@
{ lib, buildDunePackage, fetchFromGitHub, uri }: { lib, buildDunePackage, fetchFromGitHub, uri }:
buildDunePackage rec { buildDunePackage rec {
pname = "ocplib-json-typed"; pname = "ocplib-json-typed";
version = "0.7.1"; version = "0.7.1";
useDune2 = true; useDune2 = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OCamlPro"; owner = "OCamlPro";
repo = "ocplib-json-typed"; repo = "ocplib-json-typed";
rev = "v${version}"; rev = "v${version}";
sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q"; sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
}; };
propagatedBuildInputs = [ uri ]; propagatedBuildInputs = [ uri ];
meta = { meta = {
description = "A collection of type-aware JSON utilities for OCaml"; description = "A collection of type-aware JSON utilities for OCaml";
license = lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
}; };
} }

28
pkgs/development/ocaml-modules/octavius/default.nix
View File

@ -4,21 +4,21 @@ if !lib.versionAtLeast ocaml.version "4.03"
then throw "octavius is not available for OCaml ${ocaml.version}" else then throw "octavius is not available for OCaml ${ocaml.version}" else
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml${ocaml.version}-octavius-0.2.0"; name = "ocaml${ocaml.version}-octavius-0.2.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz"; url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = { meta = {
description = "Ocamldoc comment syntax parser"; description = "Ocamldoc comment syntax parser";
homepage = "https://github.com/ocaml-doc/octavius"; homepage = "https://github.com/ocaml-doc/octavius";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

8
pkgs/development/ocaml-modules/opium/default.nix
View File

@ -14,19 +14,19 @@
}: }:
buildDunePackage { buildDunePackage {
pname = "opium"; pname = "opium";
inherit (opium_kernel) version src meta minimumOCamlVersion; inherit (opium_kernel) version src meta minimumOCamlVersion;
useDune2 = true; useDune2 = true;
doCheck = true; doCheck = true;
buildInputs = [ buildInputs = [
ppx_sexp_conv ppx_fields_conv ppx_sexp_conv ppx_fields_conv
alcotest alcotest
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext
]; ];
} }

28
pkgs/development/ocaml-modules/ppx_derivers/default.nix
View File

@ -1,22 +1,22 @@
{ lib, fetchFromGitHub, buildDunePackage }: { lib, fetchFromGitHub, buildDunePackage }:
buildDunePackage rec { buildDunePackage rec {
pname = "ppx_derivers"; pname = "ppx_derivers";
version = "1.2.1"; version = "1.2.1";
minimumOCamlVersion = "4.02"; minimumOCamlVersion = "4.02";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "diml"; owner = "diml";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn"; sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
}; };
meta = { meta = {
description = "Shared [@@deriving] plugin registry"; description = "Shared [@@deriving] plugin registry";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
}; };
} }

21
pkgs/development/ocaml-modules/ppx_tools/default.nix
View File

@ -1,9 +1,11 @@
{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }: { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:
let param = let param =
let v6_2 = { let v6_3 = {
version = "6.2"; version = "6.3";
sha256 = "0qf4fwnn4hhk52kjw9frv21v23azqnn4mjvwf1hs0nxf7q4kacb5"; sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6";
useDune2 = lib.versionAtLeast ocaml.version "4.12";
buildInputs = [cppo];
}; in }; in
{ {
"4.02" = { "4.02" = {
@ -25,10 +27,11 @@ let param =
"4.07" = { "4.07" = {
version = "5.1+4.06.0"; version = "5.1+4.06.0";
sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
"4.08" = v6_2; "4.08" = v6_3;
"4.09" = v6_2; "4.09" = v6_3;
"4.10" = v6_2; "4.10" = v6_3;
"4.11" = v6_2; "4.11" = v6_3;
"4.12" = v6_3;
}.${ocaml.meta.branch}; }.${ocaml.meta.branch};
in in
@ -50,7 +53,7 @@ if lib.versionAtLeast param.version "6.0"
then then
buildDunePackage { buildDunePackage {
inherit pname src meta; inherit pname src meta;
inherit (param) version; inherit (param) version useDune2 buildInputs;
} }
else else
stdenv.mkDerivation { stdenv.mkDerivation {

30
pkgs/development/ocaml-modules/ppxfind/default.nix
View File

@ -1,27 +1,27 @@
{ stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }: { stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }:
buildDunePackage (rec { buildDunePackage (rec {
pname = "ppxfind"; pname = "ppxfind";
version = "1.4"; version = "1.4";
src = fetchurl { src = fetchurl {
url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz"; url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq"; sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq";
}; };
minimumOCamlVersion = "4.03"; minimumOCamlVersion = "4.03";
useDune2 = true; useDune2 = true;
buildInputs = [ ocaml-migrate-parsetree ]; buildInputs = [ ocaml-migrate-parsetree ];
# Don't run the native `strip' when cross-compiling. # Don't run the native `strip' when cross-compiling.
dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
meta = { meta = {
homepage = "https://github.com/diml/ppxfind"; homepage = "https://github.com/diml/ppxfind";
description = "ocamlfind ppx tool"; description = "ocamlfind ppx tool";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
}; };
} // ( } // (
if lib.versions.majorMinor ocaml.version == "4.04" then { if lib.versions.majorMinor ocaml.version == "4.04" then {
dontStrip = true; dontStrip = true;

4
pkgs/development/ocaml-modules/rope/default.nix
View File

@ -9,7 +9,9 @@ let param =
buildInputs = [ dune ]; buildInputs = [ dune ];
extra = { extra = {
buildPhase = "dune build -p rope"; buildPhase = "dune build -p rope";
inherit (dune) installPhase; installPhase = ''
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR rope
'';
}; };
} else { } else {
version = "0.5"; version = "0.5";

30
pkgs/development/ocaml-modules/rresult/default.nix
View File

@ -1,24 +1,24 @@
{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }: { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-rresult-${version}"; name = "ocaml${ocaml.version}-rresult-${version}";
version = "0.6.0"; version = "0.6.0";
src = fetchurl { src = fetchurl {
url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86";
}; };
buildInputs = [ ocaml findlib ocamlbuild topkg ]; buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = { meta = {
license = lib.licenses.isc; license = lib.licenses.isc;
homepage = "https://erratique.ch/software/rresult"; homepage = "https://erratique.ch/software/rresult";
description = "Result value combinators for OCaml"; description = "Result value combinators for OCaml";
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

34
pkgs/development/ocaml-modules/webbrowser/default.nix
View File

@ -3,24 +3,24 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-webbrowser-${version}"; name = "ocaml${ocaml.version}-webbrowser-${version}";
version = "0.6.1"; version = "0.6.1";
src = fetchurl { src = fetchurl {
url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3"; sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
}; };
nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
buildInputs = []; buildInputs = [];
propagatedBuildInputs = [ astring bos cmdliner rresult ]; propagatedBuildInputs = [ astring bos cmdliner rresult ];
inherit (topkg) buildPhase installPhase; inherit (topkg) buildPhase installPhase;
meta = { meta = {
description = "Open and reload URIs in browsers from OCaml"; description = "Open and reload URIs in browsers from OCaml";
homepage = "https://erratique.ch/software/webbrowser"; homepage = "https://erratique.ch/software/webbrowser";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

6
pkgs/development/ocaml-modules/yojson/default.nix
View File

@ -7,7 +7,11 @@ let
url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz";
sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd"; sha256 = "08llz96if8bcgnaishf18si76cv11zbkni0aldb54k3cn7ipiqvd";
nativeBuildInputs = [ dune ]; nativeBuildInputs = [ dune ];
extra = { inherit (dune) installPhase; }; extra = {
installPhase = ''
dune install --prefix $out --libdir $OCAMLFIND_DESTDIR ${pname}
'';
};
} else rec { } else rec {
version = "1.2.3"; version = "1.2.3";
url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz"; url = "https://github.com/ocaml-community/yojson/archive/v${version}.tar.gz";

4
pkgs/development/php-packages/php-cs-fixer/default.nix
View File

@ -1,14 +1,14 @@
{ mkDerivation, fetchurl, pkgs, lib, php }: { mkDerivation, fetchurl, pkgs, lib, php }:
let let
pname = "php-cs-fixer"; pname = "php-cs-fixer";
version = "2.17.0"; version = "2.18.0";
in in
mkDerivation { mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
sha256 = "163wz5y5ik7g1p7n0v3ckyawqjhg8d18cwx8a5c6fr1fkwb4mb12"; sha256 = "sha256-euvk/Rs6fZIJVWprzKiTVNPlGOsCN6t58DzvwYh3wDA=";
}; };
phases = [ "installPhase" ]; phases = [ "installPhase" ];

4
pkgs/development/php-packages/yaml/default.nix
View File

@ -3,8 +3,8 @@
buildPecl { buildPecl {
pname = "yaml"; pname = "yaml";
version = "2.2.0"; version = "2.2.1";
sha256 = "1d65cf5vnr7brhxmy1pi2axjiyvdhmpcnq0qlx5spwlgkv6hnyml"; sha256 = "sha256-4XrQTnUuJf0Jm93S350m3+8YPI0AxBebydei4cl9eBk=";
configureFlags = [ "--with-yaml=${pkgs.libyaml}" ]; configureFlags = [ "--with-yaml=${pkgs.libyaml}" ];

4
pkgs/development/python-modules/cliff/default.nix
View File

@ -16,11 +16,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cliff"; pname = "cliff";
version = "3.5.0"; version = "3.6.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "5bfb684b5fcdff0afaaccd1298a376c0e62e644c46b7e9abc034595b41fe1759"; sha256 = "a3f4fa67eeafbcfa7cf9fe4b1755d410876528e1d0d115740db00b50a1250272";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/development/python-modules/django_treebeard/default.nix
View File

@ -7,11 +7,11 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-treebeard"; pname = "django-treebeard";
version = "4.3.1"; version = "4.4";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "83aebc34a9f06de7daaec330d858d1c47887e81be3da77e3541fe7368196dd8a"; sha256 = "f50e4eea146f7af6702decf7ef198ac1eee1fb9bb4af2c5dba276c3c48f76623";
}; };
buildInputs = [ pytest ]; buildInputs = [ pytest ];

4
pkgs/development/python-modules/elementpath/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 }: { lib, buildPythonPackage, fetchFromGitHub, isPy27 }:
buildPythonPackage rec { buildPythonPackage rec {
version = "2.1.0"; version = "2.1.1";
pname = "elementpath"; pname = "elementpath";
disabled = isPy27; # uses incompatible class syntax disabled = isPy27; # uses incompatible class syntax
@ -9,7 +9,7 @@ buildPythonPackage rec {
owner = "sissaschool"; owner = "sissaschool";
repo = "elementpath"; repo = "elementpath";
rev = "v${version}"; rev = "v${version}";
sha256 = "17a0gcwmv87kikirgkgr305f5c7wz34hf7djssx4xbk9lfq9m2lg"; sha256 = "1h910v8f0648nqnk40bxgdim3623m07yg4xdfwcips2h55d19rk2";
}; };
# avoid circular dependency with xmlschema which directly depends on this # avoid circular dependency with xmlschema which directly depends on this

4
pkgs/development/python-modules/mergedeep/default.nix
View File

@ -2,7 +2,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "mergedeep"; pname = "mergedeep";
version = "1.3.0"; version = "1.3.1";
disabled = isPy27; disabled = isPy27;
# PyPI tarball doesn't include tests directory # PyPI tarball doesn't include tests directory
@ -10,7 +10,7 @@ buildPythonPackage rec {
owner = "clarketm"; owner = "clarketm";
repo = "mergedeep"; repo = "mergedeep";
rev = "v${version}"; rev = "v${version}";
sha256 = "1a0y26a04limiggjwqyyqpryxiylbqya74nq1bij75zhz42sa02b"; sha256 = "1ryccb64hg438y1wsjlfp4ciq05q4c6khwhllwdnndm8cbkbrgph";
}; };
checkInputs = [ pytest ]; checkInputs = [ pytest ];

2
pkgs/development/python-modules/nidaqmx/default.nix
View File

@ -43,7 +43,7 @@ buildPythonPackage rec {
# Fixture "x_series_device" called directly. Fixtures are not meant to be called directly # Fixture "x_series_device" called directly. Fixtures are not meant to be called directly
doCheck = false; doCheck = false;
pythonCheckImports = [ pythonImportsCheck = [
"nidaqmx.task" "nidaqmx.task"
]; ];

8
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }: { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let let
version = "13.7.0"; version = "13.8.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl { docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "0hbzvw6bdy31yqnri7379gpm8n5nv6ayr1idg02c9zqgcsgm34jf"; sha256 = "15pf6mxma8gkzyxkzm1rjwa514p7gzabn3c474lcvsjpmp76wv68";
}; };
docker_arm = fetchurl { docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "036drxlkmm35mdl0f5k79hnmwvf8gadgsxx71jprn1fjjzk3cxmz"; sha256 = "1c4lpy7nc62rqk8bfwiy5pcgvcwx70qkz3lv9w512fr3n5hjd4c0";
}; };
in in
buildGoPackage rec { buildGoPackage rec {
@ -30,7 +30,7 @@ buildGoPackage rec {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-runner"; repo = "gitlab-runner";
rev = "v${version}"; rev = "v${version}";
sha256 = "0v2wcalvs7gsbi33jm35k01cqv2iqz3k3yfjjw08dssg358d0vfp"; sha256 = "0v0iqpllzaabkahlc5pidzzw0bjlli984pdna3f3bbg67lm5a421";
}; };
patches = [ ./fix-shell-path.patch ]; patches = [ ./fix-shell-path.patch ];

6
pkgs/development/tools/go-tools/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "go-tools"; pname = "go-tools";
version = "2020.2"; version = "2020.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dominikh"; owner = "dominikh";
repo = "go-tools"; repo = "go-tools";
rev = version; rev = version;
sha256 = "1qqpr481rx6n75xp1racsjjyn2fa8f28pcb0r9kd56qq890h3qgj"; sha256 = "0a1a4dhz33grwg892436bjhgp8sygrg8yhdhy8dh6i3l6n9dalfh";
}; };
vendorSha256 = "1axci0l7pymy66j6lilm49ksrwp7dvnj5krai2kvy96n3arcnsvq"; vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak";
doCheck = false; doCheck = false;

20
pkgs/development/tools/ocaml/dune/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, ocaml, findlib, opaline }: { stdenv, lib, fetchurl, ocaml, findlib }:
if !stdenv.lib.versionAtLeast ocaml.version "4.02" if !lib.versionAtLeast ocaml.version "4.02"
then throw "dune is not available for OCaml ${ocaml.version}" then throw "dune is not available for OCaml ${ocaml.version}"
else else
@ -15,20 +15,18 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib ]; buildInputs = [ ocaml findlib ];
buildFlags = [ "release" ]; buildFlags = [ "release" ];
makeFlags = [
"PREFIX=${placeholder "out"}"
"LIBDIR=$(OCAMLFIND_DESTDIR)"
];
dontAddPrefix = true; dontAddPrefix = true;
installPhase = '' meta = with lib; {
runHook preInstall
${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
runHook postInstall
'';
meta = {
homepage = "https://dune.build/"; homepage = "https://dune.build/";
description = "A composable build system"; description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl stdenv.lib.maintainers.marsam ]; maintainers = [ maintainers.vbgl maintainers.marsam ];
license = stdenv.lib.licenses.mit; license = licenses.mit;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

4
pkgs/development/tools/open-policy-agent/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "open-policy-agent"; pname = "open-policy-agent";
version = "0.25.2"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "open-policy-agent"; owner = "open-policy-agent";
repo = "opa"; repo = "opa";
rev = "v${version}"; rev = "v${version}";
sha256 = "0y4jd1dpq7cy9nfacpf5jbh705gmky44j78q32kq5v566lzrsvvp"; sha256 = "sha256-bkWfRmcUPNYeUucrbh9xAqmLg7RxEEQGa2DQdN2S6Po=";
}; };
vendorSha256 = null; vendorSha256 = null;

6
pkgs/misc/emulators/dolphin-emu/master.nix
View File

@ -21,13 +21,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "dolphin-emu"; pname = "dolphin-emu";
version = "5.0-12716"; version = "5.0-13178";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dolphin-emu"; owner = "dolphin-emu";
repo = "dolphin"; repo = "dolphin";
rev = "31524288e3b2450eaefff8202c6d26c4ba3f7333"; rev = "a34823df61df65168aa40ef5e82e44defd4a0138";
sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg"; sha256 = "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1";
}; };
nativeBuildInputs = [ cmake pkg-config ] nativeBuildInputs = [ cmake pkg-config ]

6
pkgs/os-specific/linux/compsize/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "compsize"; pname = "compsize";
version = "1.3"; version = "1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kilobyte"; owner = "kilobyte";
repo = "compsize"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "1c69whla844nwis30jxbj00zkpiw3ccndhkmzjii8av5358mjn43"; sha256 = "0gk2vibfl9fh7biznlbr3dwknrwbm5q5602q95jbjvk185g9z126";
}; };
buildInputs = [ btrfs-progs ]; buildInputs = [ btrfs-progs ];

84
pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
View File

@ -1,84 +0,0 @@
From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 27 Dec 2020 13:03:12 +0100
Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH
This allows running the unit tests in environments where `dbus-daemon`
isn't in /usr/bin, but in $PATH.
Signed-off-by: Florian Klink <flokli@flokli.de>
---
unit/test-dbus-message-fds.c | 4 ++--
unit/test-dbus-properties.c | 4 ++--
unit/test-dbus.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c
index 6f68bae..4b5662e 100644
--- a/unit/test-dbus-message-fds.c
+++ b/unit/test-dbus-message-fds.c
@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c
index b435062..049f0f4 100644
--- a/unit/test-dbus-properties.c
+++ b/unit/test-dbus-properties.c
@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
diff --git a/unit/test-dbus.c b/unit/test-dbus.c
index 67f0a7b..582847e 100644
--- a/unit/test-dbus.c
+++ b/unit/test-dbus.c
@@ -45,7 +45,7 @@ static void start_dbus_daemon(void)
char *prg_envp[1];
pid_t pid;
- prg_argv[0] = "/usr/bin/dbus-daemon";
+ prg_argv[0] = "dbus-daemon";
prg_argv[1] = "--nopidfile";
prg_argv[2] = "--nofork";
prg_argv[3] = "--config-file=" UNITDIR "dbus.conf";
@@ -62,7 +62,7 @@ static void start_dbus_daemon(void)
}
if (pid == 0) {
- execve(prg_argv[0], prg_argv, prg_envp);
+ execvpe(prg_argv[0], prg_argv, prg_envp);
exit(EXIT_SUCCESS);
}
--
2.29.2

9
pkgs/os-specific/linux/ell/default.nix
View File

@ -7,21 +7,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ell"; pname = "ell";
version = "0.35"; version = "0.36";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchgit { src = fetchgit {
url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git";
rev = version; rev = version;
sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk"; sha256 = "0w7v2hihwwmnqd56bsmbjsiw8yyadr7zbdssjamqxx0pyl3dnrda";
}; };
patches = [
# Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/
./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
autoreconfHook autoreconfHook

4
pkgs/os-specific/linux/iwd/default.nix
View File

@ -13,12 +13,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "iwd"; pname = "iwd";
version = "1.10"; version = "1.11";
src = fetchgit { src = fetchgit {
url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
rev = version; rev = version;
sha256 = "0gzpdgfwzlqj2n3amf2zhi2hlpa412878yphgx79y6b5gn1y1lm2"; sha256 = "0wnyg0f1swi7gvvgf5kzbiz44g2wscf5d5bp320iwyfwnlbqb1bn";
}; };
outputs = [ "out" "man" ] outputs = [ "out" "man" ]

6
pkgs/tools/graphics/oxipng/default.nix
View File

@ -1,15 +1,15 @@
{ lib, stdenv, fetchCrate, rustPlatform }: { lib, stdenv, fetchCrate, rustPlatform }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
version = "4.0.2"; version = "4.0.3";
pname = "oxipng"; pname = "oxipng";
src = fetchCrate { src = fetchCrate {
inherit version pname; inherit version pname;
sha256 = "0m36af9w1l6pc71fjbgyzcsszizwayvcv5d750zz2bnj23c77m69"; sha256 = "sha256-lvVgoAZMIqmbS6yMul9Hf9PtneEVy+jDs3kU1jSBL2w=";
}; };
cargoSha256 = "16fby8ncdq0dyg9r0glrqwi04sja34br306c5sj22cq1dm3bb64q"; cargoSha256 = "sha256-v0A8/b/OPAtnaNlMX7QNXTGGH6kg67WBo/2ChOPDZdQ=";
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;

6
pkgs/tools/misc/broot/default.nix
View File

@ -11,14 +11,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "broot"; pname = "broot";
version = "1.1.10"; version = "1.2.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "04nidx43w4nnccgbrw30wg9ai8p7hbklxpn1gc6gr2325yhqvwhl"; sha256 = "1mqaynrqaas82f5957lx31x80v74zwmwmjxxlbywajb61vh00d38";
}; };
cargoHash = "sha256-4F9HIQ1BQx4EikyH0DwlDAkYIeUJJbMsj7ZX23QD+K8="; cargoHash = "sha256-ffFS1myFjoQ6768D4zUytN6F9paWeJJFPFugCrfh4iU=";
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper

43
pkgs/tools/security/gitjacker/default.nix Normal file
View File

@ -0,0 +1,43 @@
{ lib
, buildGoModule
, fetchFromGitHub
, git
, stdenv
}:
buildGoModule rec {
pname = "gitjacker";
version = "0.0.2";
src = fetchFromGitHub {
owner = "liamg";
repo = "gitjacker";
rev = "v${version}";
sha256 = "0fg95i2y8sj7dsvqj8mx0k5pps7d0h1i4a3lk85l8jjab4kxx8h9";
};
vendorSha256 = null;
propagatedBuildInputs = [ git ];
checkInputs = [ git ];
doCheck = !stdenv.isDarwin;
preCheck = ''
export PATH=$TMPDIR/usr/bin:$PATH
'';
meta = with lib; {
description = "Leak git repositories from misconfigured websites";
longDescription = ''
Gitjacker downloads git repositories and extracts their contents
from sites where the .git directory has been mistakenly uploaded.
It will still manage to recover a significant portion of a repository
even where directory listings are disabled.
'';
homepage = "https://github.com/liamg/gitjacker";
license = with licenses; [ unlicense ];
maintainers = with maintainers; [ fab ];
};
}

4
pkgs/tools/security/signify/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signify"; pname = "signify";
version = "25"; version = "30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aperezdc"; owner = "aperezdc";
repo = "signify"; repo = "signify";
rev = "v${version}"; rev = "v${version}";
sha256 = "0zg0rffxwj2a71s1bllhrn491xsmirg9sshpq8f3vl25lv4c2cnq"; sha256 = "02xh6x6rszkvk3rf6zai7n3ivchmw0d8mwllpinjxc7k6sd415c3";
}; };
doCheck = true; doCheck = true;

13
pkgs/tools/system/gdu/default.nix
View File

@ -2,23 +2,30 @@
, stdenv , stdenv
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, installShellFiles
}: }:
buildGoModule rec { buildGoModule rec {
pname = "gdu"; pname = "gdu";
version = "3.0.0"; version = "4.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dundee"; owner = "dundee";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0sfb8bxvdd8r05d0bgfcaw6dpbky7f4fgf0dbly7k7sgl29hkafy"; sha256 = "0ppsz7ys08lmg5s7lszqc2zcp2vjm54aai3yr3sb4jf3knbmyg5g";
}; };
vendorSha256 = "0w3k23kly8g9mf8a300xz6bv7g1m2nlp5f112k4viyi9zy6vqbv0"; vendorSha256 = "058h71gmgi3n4b697myi5890arzw8fkzmxlm1aiwzyfh3k9iv0wh";
buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/dundee/gdu/build.Version=${version}" ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installManPage gdu.1
'';
# tests fail if the version is set # tests fail if the version is set
doCheck = false; doCheck = false;

2
pkgs/top-level/all-packages.nix
View File

@ -2307,6 +2307,8 @@ in
gist = callPackage ../tools/text/gist { }; gist = callPackage ../tools/text/gist { };
gitjacker = callPackage ../tools/security/gitjacker { };
gixy = callPackage ../tools/admin/gixy { }; gixy = callPackage ../tools/admin/gixy { };
glpaper = callPackage ../development/tools/glpaper { }; glpaper = callPackage ../development/tools/glpaper { };