Merge master into staging-next
This commit is contained in:
commit
d491b49037
|
@ -1,5 +1,6 @@
|
||||||
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf
|
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText
|
||||||
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
|
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
|
||||||
|
, vmopts ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{ name, product, version, src, wmClass, jdk, meta }:
|
{ name, product, version, src, wmClass, jdk, meta }:
|
||||||
|
@ -9,6 +10,11 @@ with stdenv.lib;
|
||||||
let loName = toLower product;
|
let loName = toLower product;
|
||||||
hiName = toUpper product;
|
hiName = toUpper product;
|
||||||
execName = concatStringsSep "-" (init (splitString "-" name));
|
execName = concatStringsSep "-" (init (splitString "-" name));
|
||||||
|
vmoptsName = loName
|
||||||
|
+ ( if (with stdenv.hostPlatform; (is32bit || isDarwin))
|
||||||
|
then ""
|
||||||
|
else "64" )
|
||||||
|
+ ".vmoptions";
|
||||||
in
|
in
|
||||||
|
|
||||||
with stdenv; lib.makeOverridable mkDerivation rec {
|
with stdenv; lib.makeOverridable mkDerivation rec {
|
||||||
|
@ -26,6 +32,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts);
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper patchelf unzip ];
|
nativeBuildInputs = [ makeWrapper patchelf unzip ];
|
||||||
|
|
||||||
patchPhase = lib.optionalString (!stdenv.isDarwin) ''
|
patchPhase = lib.optionalString (!stdenv.isDarwin) ''
|
||||||
|
@ -72,7 +80,8 @@ with stdenv; lib.makeOverridable mkDerivation rec {
|
||||||
--set JDK_HOME "$jdk" \
|
--set JDK_HOME "$jdk" \
|
||||||
--set ${hiName}_JDK "$jdk" \
|
--set ${hiName}_JDK "$jdk" \
|
||||||
--set ANDROID_JAVA_HOME "$jdk" \
|
--set ANDROID_JAVA_HOME "$jdk" \
|
||||||
--set JAVA_HOME "$jdk"
|
--set JAVA_HOME "$jdk" \
|
||||||
|
--set ${hiName}_VM_OPTIONS ${vmoptsFile}
|
||||||
|
|
||||||
ln -s "$item/share/applications" $out/share
|
ln -s "$item/share/applications" $out/share
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -2,12 +2,13 @@
|
||||||
, python
|
, python
|
||||||
, jdk, cmake, libxml2, zlib, python3, ncurses5
|
, jdk, cmake, libxml2, zlib, python3, ncurses5
|
||||||
, dotnet-sdk_3
|
, dotnet-sdk_3
|
||||||
|
, vmopts ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
mkJetBrainsProduct = callPackage ./common.nix { };
|
mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; };
|
||||||
# Sorted alphabetically
|
# Sorted alphabetically
|
||||||
|
|
||||||
buildClion = { name, version, src, license, description, wmClass, ... }:
|
buildClion = { name, version, src, license, description, wmClass, ... }:
|
||||||
|
@ -48,7 +49,7 @@ let
|
||||||
|
|
||||||
patchelf \
|
patchelf \
|
||||||
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
|
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \
|
||||||
bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so
|
bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so
|
||||||
|
|
||||||
patchelf \
|
patchelf \
|
||||||
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
|
--set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \
|
||||||
|
@ -268,12 +269,12 @@ in
|
||||||
|
|
||||||
clion = buildClion rec {
|
clion = buildClion rec {
|
||||||
name = "clion-${version}";
|
name = "clion-${version}";
|
||||||
version = "2020.2.5"; /* updated by script */
|
version = "2020.3"; /* updated by script */
|
||||||
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
description = "C/C++ IDE. New. Intelligent. Cross-platform";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
|
||||||
sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */
|
sha256 = "0kqja2c5pz0f9idc52mv7iy2pqq2kfcx4q4x1ywfn3gq3d8n5j7z"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-clion";
|
wmClass = "jetbrains-clion";
|
||||||
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
|
||||||
|
@ -294,12 +295,12 @@ in
|
||||||
|
|
||||||
goland = buildGoland rec {
|
goland = buildGoland rec {
|
||||||
name = "goland-${version}";
|
name = "goland-${version}";
|
||||||
version = "2020.2.3"; /* updated by script */
|
version = "2020.3"; /* updated by script */
|
||||||
description = "Up and Coming Go IDE";
|
description = "Up and Coming Go IDE";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
url = "https://download.jetbrains.com/go/${name}.tar.gz";
|
||||||
sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */
|
sha256 = "0hj1xm3c71y2z1jyv7j3xf2lcj2y0kyvsxd3jjyyhs31w1f3394j"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-goland";
|
wmClass = "jetbrains-goland";
|
||||||
update-channel = "GoLand RELEASE";
|
update-channel = "GoLand RELEASE";
|
||||||
|
@ -346,12 +347,12 @@ in
|
||||||
|
|
||||||
phpstorm = buildPhpStorm rec {
|
phpstorm = buildPhpStorm rec {
|
||||||
name = "phpstorm-${version}";
|
name = "phpstorm-${version}";
|
||||||
version = "2020.2.4"; /* updated by script */
|
version = "2020.3"; /* updated by script */
|
||||||
description = "Professional IDE for Web and PHP developers";
|
description = "Professional IDE for Web and PHP developers";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
|
||||||
sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */
|
sha256 = "1d5rx7p7lvjzgp57n980f2bfrj14p1f4hxmyvx5pzzd86q7hrcbq"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-phpstorm";
|
wmClass = "jetbrains-phpstorm";
|
||||||
update-channel = "PhpStorm RELEASE";
|
update-channel = "PhpStorm RELEASE";
|
||||||
|
@ -359,12 +360,12 @@ in
|
||||||
|
|
||||||
pycharm-community = buildPycharm rec {
|
pycharm-community = buildPycharm rec {
|
||||||
name = "pycharm-community-${version}";
|
name = "pycharm-community-${version}";
|
||||||
version = "2020.2.5"; /* updated by script */
|
version = "2020.3"; /* updated by script */
|
||||||
description = "PyCharm Community Edition";
|
description = "PyCharm Community Edition";
|
||||||
license = stdenv.lib.licenses.asl20;
|
license = stdenv.lib.licenses.asl20;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||||
sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */
|
sha256 = "1c2izsqx27g4jy46iskx5zg00pd8jaf9x1p0vya4l2v5r49dk4jb"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-pycharm-ce";
|
wmClass = "jetbrains-pycharm-ce";
|
||||||
update-channel = "PyCharm RELEASE";
|
update-channel = "PyCharm RELEASE";
|
||||||
|
@ -372,12 +373,12 @@ in
|
||||||
|
|
||||||
pycharm-professional = buildPycharm rec {
|
pycharm-professional = buildPycharm rec {
|
||||||
name = "pycharm-professional-${version}";
|
name = "pycharm-professional-${version}";
|
||||||
version = "2020.2.5"; /* updated by script */
|
version = "2020.3"; /* updated by script */
|
||||||
description = "PyCharm Professional Edition";
|
description = "PyCharm Professional Edition";
|
||||||
license = stdenv.lib.licenses.unfree;
|
license = stdenv.lib.licenses.unfree;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
url = "https://download.jetbrains.com/python/${name}.tar.gz";
|
||||||
sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */
|
sha256 = "1kzgy90zcligwa9r6r11kx99z0zm93mrzy700y2jwslyzapd16d0"; /* updated by script */
|
||||||
};
|
};
|
||||||
wmClass = "jetbrains-pycharm";
|
wmClass = "jetbrains-pycharm";
|
||||||
update-channel = "PyCharm RELEASE";
|
update-channel = "PyCharm RELEASE";
|
||||||
|
|
|
@ -39,12 +39,12 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "bluejeans";
|
pname = "bluejeans";
|
||||||
version = "2.17.0";
|
version = "2.19.0";
|
||||||
buildNumber = "11";
|
buildNumber = "61";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm";
|
url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm";
|
||||||
sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68";
|
sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ rpmextract makeWrapper ];
|
nativeBuildInputs = [ rpmextract makeWrapper ];
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig
|
{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig
|
||||||
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
|
, boost, libtorrentRasterbar, qtbase, qttools, qtsvg
|
||||||
, debugSupport ? false
|
, debugSupport ? false
|
||||||
, guiSupport ? true, dbus ? null # GUI OR headless
|
, guiSupport ? true, dbus ? null # GUI (disable to run headless)
|
||||||
, webuiSupport ? true # WebUI
|
, webuiSupport ? true # WebUI
|
||||||
, trackerSearch ? true, python3 ? null
|
, trackerSearch ? true, python3 ? null
|
||||||
}:
|
}:
|
||||||
|
@ -21,6 +21,7 @@ mkDerivation rec {
|
||||||
sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38";
|
sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# NOTE: 2018-05-31: CMake is working but it is not officially supported
|
||||||
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
nativeBuildInputs = [ makeWrapper pkgconfig ];
|
||||||
|
|
||||||
buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ]
|
buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ]
|
||||||
|
|
|
@ -55,8 +55,6 @@ stdenv.mkDerivation rec {
|
||||||
maintainers = with maintainers; [ malyn ];
|
maintainers = with maintainers; [ malyn ];
|
||||||
license = licenses.bsd3;
|
license = licenses.bsd3;
|
||||||
|
|
||||||
# Needs the SSE2 instruction set. See upstream issue
|
platforms = platforms.all;
|
||||||
# https://github.com/chrjguill/i3lock-color/issues/44
|
|
||||||
platforms = platforms.x86;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -146,12 +146,18 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
runCommand "assert-outputs-${name}" {
|
runCommand "assert-outputs-${name}" {
|
||||||
} ''
|
} (''
|
||||||
local actualFiles=$(mktemp)
|
local actualFiles=$(mktemp)
|
||||||
|
|
||||||
cd "${crateOutput}"
|
cd "${crateOutput}"
|
||||||
find . -type f | sort >$actualFiles
|
find . -type f \
|
||||||
diff -q ${expectedFilesFile} $actualFiles >/dev/null || {
|
| sort \
|
||||||
|
''
|
||||||
|
# sed out the hash because it differs per platform
|
||||||
|
+ ''
|
||||||
|
| sed -E -e 's/-[0-9a-fA-F]{10}\.rlib/-HASH.rlib/g' \
|
||||||
|
> "$actualFiles"
|
||||||
|
diff -q ${expectedFilesFile} "$actualFiles" > /dev/null || {
|
||||||
echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2
|
echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2
|
||||||
echo === Got:
|
echo === Got:
|
||||||
sed -e 's/^/ /' $actualFiles
|
sed -e 's/^/ /' $actualFiles
|
||||||
|
@ -164,7 +170,7 @@ let
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
touch $out
|
touch $out
|
||||||
''
|
'')
|
||||||
;
|
;
|
||||||
|
|
||||||
in rec {
|
in rec {
|
||||||
|
@ -594,7 +600,7 @@ let
|
||||||
};
|
};
|
||||||
expectedFiles = [
|
expectedFiles = [
|
||||||
"./nix-support/propagated-build-inputs"
|
"./nix-support/propagated-build-inputs"
|
||||||
"./lib/libtest_lib-042a1fdbef.rlib"
|
"./lib/libtest_lib-HASH.rlib"
|
||||||
"./lib/link"
|
"./lib/link"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -611,7 +617,7 @@ let
|
||||||
};
|
};
|
||||||
expectedFiles = [
|
expectedFiles = [
|
||||||
"./nix-support/propagated-build-inputs"
|
"./nix-support/propagated-build-inputs"
|
||||||
"./lib/libtest_lib-042a1fdbef.rlib"
|
"./lib/libtest_lib-HASH.rlib"
|
||||||
"./lib/link"
|
"./lib/link"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
|
||||||
homepage = "https://github.com/fedora-modularity/libmodulemd";
|
homepage = "https://github.com/fedora-modularity/libmodulemd";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ ];
|
maintainers = with maintainers; [ ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux ++ platforms.darwin ;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ let param = {
|
||||||
|
|
||||||
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
|
if param ? max_version && lib.versionAtLeast ocaml.version param.max_version
|
||||||
|| param ? min_version && !lib.versionAtLeast ocaml.version param.min_version
|
|| param ? min_version && !lib.versionAtLeast ocaml.version param.min_version
|
||||||
then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}"
|
then throw "ppxlib-${version} is not available for OCaml ${ocaml.version}"
|
||||||
else
|
else
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
|
|
|
@ -1,21 +1,19 @@
|
||||||
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler
|
{ buildDunePackage, fetchFromGitHub, js_of_ocaml-compiler
|
||||||
, camlp4, ocsigen_deriving
|
, camlp4, ocsigen_deriving
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
buildDunePackage rec {
|
||||||
version = "3.2.1";
|
version = "3.2.1";
|
||||||
pname = "js_of_ocaml-camlp4";
|
pname = "js_of_ocaml-camlp4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ocsigen";
|
owner = "ocsigen";
|
||||||
repo = "js_of_ocaml";
|
repo = "js_of_ocaml";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
|
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit (js_of_ocaml-compiler) installPhase meta;
|
inherit (js_of_ocaml-compiler) meta;
|
||||||
|
|
||||||
buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
|
buildInputs = [ camlp4 ocsigen_deriving ];
|
||||||
|
|
||||||
buildPhase = "dune build -p js_of_ocaml-camlp4";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,28 +1,28 @@
|
||||||
{ lib, fetchurl, buildDunePackage
|
{ lib, fetchurl, buildDunePackage
|
||||||
, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree
|
, cmdliner, cppo, yojson, ppxlib
|
||||||
, menhir
|
, menhir
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "js_of_ocaml-compiler";
|
pname = "js_of_ocaml-compiler";
|
||||||
version = "3.7.1";
|
version = "3.8.0";
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
|
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
|
||||||
sha256 = "0i0smhvsfx2ydmbyg5ai5cgqsfnng8rkcvys4i3fa55cw24aknrn";
|
sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ ocaml findlib dune_2 cppo menhir ];
|
nativeBuildInputs = [ cppo menhir ];
|
||||||
buildInputs = [ cmdliner ];
|
buildInputs = [ cmdliner ];
|
||||||
|
|
||||||
configurePlatforms = [];
|
configurePlatforms = [];
|
||||||
propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ];
|
propagatedBuildInputs = [ yojson ppxlib ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Compiler from OCaml bytecode to Javascript";
|
description = "Compiler from OCaml bytecode to Javascript";
|
||||||
license = lib.licenses.gpl2;
|
license = lib.licenses.gpl2;
|
||||||
maintainers = [ lib.maintainers.vbgl ];
|
maintainers = [ lib.maintainers.vbgl ];
|
||||||
homepage = "https://ocsigen.org/js_of_ocaml/";
|
homepage = "https://ocsigen.org/js_of_ocaml/";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,13 @@
|
||||||
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
|
{ buildDunePackage, js_of_ocaml-compiler
|
||||||
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
|
, ppxlib, uchar
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
buildDunePackage {
|
||||||
pname = "js_of_ocaml";
|
pname = "js_of_ocaml";
|
||||||
|
|
||||||
inherit (js_of_ocaml-compiler) version src installPhase meta;
|
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||||
|
|
||||||
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
|
buildInputs = [ ppxlib ];
|
||||||
nativeBuildInputs = [ ocaml findlib dune_2 ];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
|
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
|
||||||
|
|
||||||
buildPhase = "dune build -p js_of_ocaml";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,13 @@
|
||||||
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx
|
{ buildDunePackage, js_of_ocaml-compiler, js_of_ocaml-ppx
|
||||||
, ocaml-migrate-parsetree, ppx_tools_versioned
|
|
||||||
, js_of_ocaml, ocaml_lwt, lwt_log
|
, js_of_ocaml, ocaml_lwt, lwt_log
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
buildDunePackage {
|
||||||
pname = "js_of_ocaml-lwt";
|
pname = "js_of_ocaml-lwt";
|
||||||
|
|
||||||
inherit (js_of_ocaml-compiler) version src installPhase meta;
|
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||||
|
|
||||||
buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
|
buildInputs = [ js_of_ocaml-ppx ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
|
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
|
||||||
|
|
||||||
buildPhase = "dune build -p js_of_ocaml-lwt";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,11 @@
|
||||||
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
|
{ buildDunePackage, js_of_ocaml-compiler
|
||||||
, ocamlbuild
|
, ocamlbuild
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
buildDunePackage {
|
||||||
pname = "js_of_ocaml-ocamlbuild";
|
pname = "js_of_ocaml-ocamlbuild";
|
||||||
|
|
||||||
inherit (js_of_ocaml-compiler) version src installPhase meta;
|
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||||
|
|
||||||
buildInputs = [ ocaml findlib dune_2 ];
|
propagatedBuildInputs = [ ocamlbuild ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ ocamlbuild ];
|
|
||||||
|
|
||||||
buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
|
{ buildDunePackage, js_of_ocaml-compiler
|
||||||
, ocaml-migrate-parsetree, ppx_tools_versioned
|
, ppxlib
|
||||||
, js_of_ocaml
|
, js_of_ocaml
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
buildDunePackage {
|
||||||
pname = "js_of_ocaml-ppx";
|
pname = "js_of_ocaml-ppx";
|
||||||
|
|
||||||
inherit (js_of_ocaml-compiler) version src installPhase meta;
|
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||||
|
|
||||||
buildInputs = [ ocaml findlib dune_2 ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
|
buildInputs = [ ppxlib js_of_ocaml ];
|
||||||
|
|
||||||
buildPhase = "dune build -p js_of_ocaml-ppx";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +1,11 @@
|
||||||
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
|
{ buildDunePackage, js_of_ocaml-compiler
|
||||||
, js_of_ocaml, ppxlib
|
, js_of_ocaml, ppxlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
if !stdenv.lib.versionAtLeast ppxlib.version "0.14"
|
buildDunePackage {
|
||||||
then throw "js_of_ocaml-ppx_deriving_json is not compatible with ppxlib ${ppxlib.version}"
|
pname = "js_of_ocaml-ppx_deriving_json";
|
||||||
else
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||||
pname = "js_of_ocaml-ppx_deriving_json";
|
|
||||||
|
|
||||||
inherit (js_of_ocaml-compiler) version src installPhase meta;
|
propagatedBuildInputs = [ js_of_ocaml ppxlib ];
|
||||||
|
|
||||||
buildInputs = [ ocaml findlib dune_2 ];
|
|
||||||
|
|
||||||
propagatedBuildInputs = [ js_of_ocaml ppxlib ];
|
|
||||||
|
|
||||||
buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,14 @@
|
||||||
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
|
{ buildDunePackage, js_of_ocaml-compiler
|
||||||
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
|
, js_of_ocaml-ppx
|
||||||
, js_of_ocaml, reactivedata, tyxml
|
, js_of_ocaml, reactivedata, tyxml
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
buildDunePackage {
|
||||||
pname = "js_of_ocaml-tyxml";
|
pname = "js_of_ocaml-tyxml";
|
||||||
|
|
||||||
inherit (js_of_ocaml-compiler) version src installPhase meta;
|
inherit (js_of_ocaml-compiler) version src meta useDune2;
|
||||||
|
|
||||||
buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
|
buildInputs = [ js_of_ocaml-ppx ];
|
||||||
|
|
||||||
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
|
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
|
||||||
|
|
||||||
buildPhase = "dune build -p js_of_ocaml-tyxml";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,9 +7,9 @@ stdenv.mkDerivation {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "frogatto";
|
owner = "frogatto";
|
||||||
repo = "frogatto";
|
repo = "frogatto";
|
||||||
# master branch as of 2018-12-18
|
# master branch as of 2020-12-17
|
||||||
rev = "8f261b5d3fca3c88e6a534316a28378cf687d3e5";
|
rev = "c1d0813b3b755a4e232369b6791397ad058efc16";
|
||||||
sha256 = "0nyfwfyy5gxp61ydna299nq9p5wra9mk0bf1drdngg6bwws1hrqx";
|
sha256 = "1fhaidd35392zzavp93r6ihyansgkc3m1ilz71ia1zl4n3fbsxjg";
|
||||||
};
|
};
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
|
|
@ -14,7 +14,7 @@ let
|
||||||
genericName = "frogatto";
|
genericName = "frogatto";
|
||||||
categories = "Game;ArcadeGame;";
|
categories = "Game;ArcadeGame;";
|
||||||
};
|
};
|
||||||
version = "unstable-2018-12-18";
|
version = "unstable-2020-12-04";
|
||||||
in buildEnv {
|
in buildEnv {
|
||||||
name = "frogatto-${version}";
|
name = "frogatto-${version}";
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,8 @@ stdenv.mkDerivation {
|
||||||
owner = "anura-engine";
|
owner = "anura-engine";
|
||||||
repo = "anura";
|
repo = "anura";
|
||||||
# trunk branch as of 2018-11-28
|
# trunk branch as of 2018-11-28
|
||||||
rev = "8070111467802dc772c0a6c7806ecd16b0bcdaa9";
|
rev = "a05f413f255d2854019134be817c253a03da3d9f";
|
||||||
sha256 = "0xbqwfmws69n7iiz17n93h4jiw39cwyf7hxw0qi2c8cccr37b1nr";
|
sha256 = "1hd57q8gbn1zdpibnqd3ma0z1ycayc2f4r9j4m2m9kc6yf4v7w7b";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ let
|
||||||
|
|
||||||
desktopItem = makeDesktopItem {
|
desktopItem = makeDesktopItem {
|
||||||
name = "xonotic";
|
name = "xonotic";
|
||||||
exec = "$out/bin/xonotic";
|
exec = "xonotic";
|
||||||
comment = meta.description;
|
comment = meta.description;
|
||||||
desktopName = "Xonotic";
|
desktopName = "Xonotic";
|
||||||
categories = "Game;Shooter;";
|
categories = "Game;Shooter;";
|
||||||
|
|
|
@ -39,6 +39,7 @@ with pkgs;
|
||||||
cross = callPackage ./cross {};
|
cross = callPackage ./cross {};
|
||||||
|
|
||||||
rustCustomSysroot = callPackage ./rust-sysroot {};
|
rustCustomSysroot = callPackage ./rust-sysroot {};
|
||||||
|
buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { };
|
||||||
|
|
||||||
nixos-functions = callPackage ./nixos-functions {};
|
nixos-functions = callPackage ./nixos-functions {};
|
||||||
|
|
||||||
|
|
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "lf";
|
pname = "lf";
|
||||||
version = "17";
|
version = "18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "gokcehan";
|
owner = "gokcehan";
|
||||||
repo = "lf";
|
repo = "lf";
|
||||||
rev = "r${version}";
|
rev = "r${version}";
|
||||||
sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8";
|
sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs";
|
vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
|
|
||||||
|
|
|
@ -35,11 +35,12 @@ stdenv.mkDerivation rec {
|
||||||
libxml2
|
libxml2
|
||||||
glib
|
glib
|
||||||
openssl
|
openssl
|
||||||
zchunk
|
|
||||||
curl
|
curl
|
||||||
check
|
check
|
||||||
gpgme
|
gpgme
|
||||||
];
|
]
|
||||||
|
# zchunk currently has issues compiling in darwin, fine in linux
|
||||||
|
++ stdenv.lib.optional stdenv.isLinux zchunk;
|
||||||
|
|
||||||
# librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
|
# librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"
|
"-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}"
|
||||||
];
|
] ++ stdenv.lib.optional stdenv.isDarwin "-DWITH_ZCHUNK=OFF";
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
moveToOutput "lib/${python.libPrefix}" "$py"
|
moveToOutput "lib/${python.libPrefix}" "$py"
|
||||||
|
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
|
||||||
description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
|
description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
|
||||||
homepage = "https://rpm-software-management.github.io/librepo/";
|
homepage = "https://rpm-software-management.github.io/librepo/";
|
||||||
license = licenses.lgpl2Plus;
|
license = licenses.lgpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux ++ platforms.darwin;
|
||||||
maintainers = with maintainers; [ copumpkin ];
|
maintainers = with maintainers; [ copumpkin ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ugrep";
|
pname = "ugrep";
|
||||||
version = "3.0.6";
|
version = "3.1.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Genivia";
|
owner = "Genivia";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1s8glpk7li45rcf2xi21qv65dldl8sd3mmalf54pbzfcjri5fwz6";
|
sha256 = "08pq759f2vvdbig64y3k9kicvgr2d5x8ara7b182dcm3slbpib3l";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];
|
buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ];
|
||||||
|
|
|
@ -10067,7 +10067,6 @@ in
|
||||||
|
|
||||||
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
|
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
|
||||||
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
|
buildRustCrateHelpers = callPackage ../build-support/rust/build-rust-crate/helpers.nix { };
|
||||||
buildRustCrateTests = recurseIntoAttrs (callPackage ../build-support/rust/build-rust-crate/test { });
|
|
||||||
cratesIO = callPackage ../build-support/rust/crates-io.nix { };
|
cratesIO = callPackage ../build-support/rust/crates-io.nix { };
|
||||||
|
|
||||||
cargo-web = callPackage ../development/tools/cargo-web {
|
cargo-web = callPackage ../development/tools/cargo-web {
|
||||||
|
@ -21645,6 +21644,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
|
jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
|
||||||
|
vmopts = config.jetbrains.vmopts or null;
|
||||||
jdk = jetbrains.jdk;
|
jdk = jetbrains.jdk;
|
||||||
}) // {
|
}) // {
|
||||||
jdk = callPackage ../development/compilers/jetbrains-jdk { };
|
jdk = callPackage ../development/compilers/jetbrains-jdk { };
|
||||||
|
@ -22936,7 +22936,7 @@ in
|
||||||
if stdenv.isDarwin then
|
if stdenv.isDarwin then
|
||||||
callPackage ../applications/audio/musescore/darwin.nix { }
|
callPackage ../applications/audio/musescore/darwin.nix { }
|
||||||
else
|
else
|
||||||
libsForQt5.callPackage ../applications/audio/musescore { };
|
libsForQt514.callPackage ../applications/audio/musescore { };
|
||||||
|
|
||||||
mmh = callPackage ../applications/networking/mailreaders/mmh { };
|
mmh = callPackage ../applications/networking/mailreaders/mmh { };
|
||||||
mutt = callPackage ../applications/networking/mailreaders/mutt { };
|
mutt = callPackage ../applications/networking/mailreaders/mutt { };
|
||||||
|
|
Loading…
Reference in a new issue