From 4939188964916d3d71645fdf7075012957e9ef27 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Thu, 17 Dec 2020 07:31:51 -0800 Subject: [PATCH 01/17] libmodulemd: Enable darwin support. --- pkgs/development/libraries/libmodulemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index f79bc104fc8..a0d32f5178a 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fedora-modularity/libmodulemd"; license = licenses.mit; maintainers = with maintainers; [ ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin ; }; } From 5d2a20c93aeb45dd6de3cbc522692499ff161c34 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 29 Nov 2020 16:23:00 +0000 Subject: [PATCH 02/17] buildRustCrateTests: Move to tests.buildRustCrate I think it is preferable to separate the tests from the "real" packages. --- pkgs/test/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 8746f065b1b..f45e981cff0 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -39,6 +39,7 @@ with pkgs; cross = callPackage ./cross {}; rustCustomSysroot = callPackage ./rust-sysroot {}; + buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; nixos-functions = callPackage ./nixos-functions {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3937ae566e6..5c464236602 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10071,7 +10071,6 @@ in buildRustCrate = callPackage ../build-support/rust/build-rust-crate { }; 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 { }; cargo-web = callPackage ../development/tools/cargo-web { From ddeef0d3221ea182b5411c9084b59373883d0edb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 29 Nov 2020 16:28:12 +0000 Subject: [PATCH 03/17] tests.buildRustCrate: Fix after hashing method change As @lopsided98 points out in #105305, since the hashes are now target sensative, and until we find reason to actually care to test what they are exactly, we are best just normalizing them away in the tests. --- .../rust/build-rust-crate/test/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index f6cd54c4ee3..65c8880b134 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -146,12 +146,18 @@ let }; in runCommand "assert-outputs-${name}" { - } '' + } ('' local actualFiles=$(mktemp) cd "${crateOutput}" - find . -type f | sort >$actualFiles - diff -q ${expectedFilesFile} $actualFiles >/dev/null || { + find . -type f \ + | 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 === Got: sed -e 's/^/ /' $actualFiles @@ -164,7 +170,7 @@ let exit 1 } touch $out - '' + '') ; in rec { @@ -594,7 +600,7 @@ let }; expectedFiles = [ "./nix-support/propagated-build-inputs" - "./lib/libtest_lib-042a1fdbef.rlib" + "./lib/libtest_lib-HASH.rlib" "./lib/link" ]; }; @@ -611,7 +617,7 @@ let }; expectedFiles = [ "./nix-support/propagated-build-inputs" - "./lib/libtest_lib-042a1fdbef.rlib" + "./lib/libtest_lib-HASH.rlib" "./lib/link" ]; }; From baa11a519eb9a49d583a83180c0e639e3f66974f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 19 Dec 2020 19:14:40 +0000 Subject: [PATCH 04/17] qbittorrent: restore comments from before e569d6b9 --- pkgs/applications/networking/p2p/qbittorrent/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index cdd96d04aff..ac671729392 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig , boost, libtorrentRasterbar, qtbase, qttools, qtsvg , debugSupport ? false -, guiSupport ? true, dbus ? null # GUI OR headless +, guiSupport ? true, dbus ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI , trackerSearch ? true, python3 ? null }: @@ -21,6 +21,7 @@ mkDerivation rec { sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38"; }; + # NOTE: 2018-05-31: CMake is working but it is not officially supported nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] From c3cd2be2e2f504a0e054275b705bd09c39e3038a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 19 Dec 2020 19:03:08 +0000 Subject: [PATCH 05/17] musescore: build with Qt 5.14 With Qt 5.15 it starts but does not show any palettes (in the View->Palettes view). --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3937ae566e6..2a90c00e115 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22940,7 +22940,7 @@ in if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt5.callPackage ../applications/audio/musescore { }; + libsForQt514.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; From 8718533c22ae51ae687ea24389a4bd20fd53dc0e Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Thu, 17 Dec 2020 07:43:09 -0800 Subject: [PATCH 06/17] librepo: add darwin support --- pkgs/tools/package-management/librepo/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 0e2cec68520..f636560844b 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -35,11 +35,12 @@ stdenv.mkDerivation rec { libxml2 glib openssl - zchunk curl check 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 propagatedBuildInputs = [ @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DPYTHON_DESIRED=${stdenv.lib.substring 0 1 python.pythonVersion}" - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin "-DWITH_ZCHUNK=OFF"; postFixup = '' 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"; homepage = "https://rpm-software-management.github.io/librepo/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ copumpkin ]; }; } From b5a1da1665c2a54ca4dbc58683bd5f6e3c7712e5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 19 Dec 2020 21:00:39 +0100 Subject: [PATCH 07/17] lf: 17 -> 18 --- pkgs/tools/misc/lf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index da6fa0a338e..c3cb3200e06 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lf"; - version = "17"; + version = "18"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - sha256 = "0hs70hbbwz9kbbf13l2v32yv70n4aw8sz7rky82qdcqcpnpisjq8"; + sha256 = "1xzy85lz99kwzvpkkaqlylynn57nhn76dff3cxy304d23y3r26w6"; }; - vendorSha256 = "1xjanlq67b6n07pha6ljgnl3n2ks4x3albvca317l68cvjiw3shs"; + vendorSha256 = "12njqs39ympi2mqal1cdn0smp80yzcs8xmca1iih8pbmxv51r2gg"; nativeBuildInputs = [ installShellFiles ]; From dc8f4337d228511685c6338cbb2369477f9831e8 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 19 Dec 2020 20:54:51 +0100 Subject: [PATCH 08/17] ugrep: 3.0.6 -> 3.1.0 Signed-off-by: Matthias Beyer --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 353d85931ad..84dc21aba3e 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.0.6"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "1s8glpk7li45rcf2xi21qv65dldl8sd3mmalf54pbzfcjri5fwz6"; + sha256 = "08pq759f2vvdbig64y3k9kicvgr2d5x8ara7b182dcm3slbpib3l"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; From 40262d4559bde29914feebe729f39323be58acdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 19 Dec 2020 21:11:21 +0100 Subject: [PATCH 09/17] xonotic: fix desktop item The desktop item was referring to "$out/bin/xonotic" as executable, but since it's built in its own derivation now, "$out" did not contain the xonotic wrapper. Since it seems to be common practise to use a relative path, I changed it to do that here as well. --- pkgs/games/xonotic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 60ebdcf8eeb..6f7ee6962bf 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -45,7 +45,7 @@ let desktopItem = makeDesktopItem { name = "xonotic"; - exec = "$out/bin/xonotic"; + exec = "xonotic"; comment = meta.description; desktopName = "Xonotic"; categories = "Game;Shooter;"; From 7d6cb4e614984285bfb0beb0acf7bdda027c329e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 19 Dec 2020 22:00:25 +0100 Subject: [PATCH 10/17] frogatto: update to latest master and fix build --- pkgs/games/frogatto/data.nix | 6 +++--- pkgs/games/frogatto/default.nix | 2 +- pkgs/games/frogatto/engine.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index ab5bbe2dd9f..3313f156ed2 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "frogatto"; repo = "frogatto"; - # master branch as of 2018-12-18 - rev = "8f261b5d3fca3c88e6a534316a28378cf687d3e5"; - sha256 = "0nyfwfyy5gxp61ydna299nq9p5wra9mk0bf1drdngg6bwws1hrqx"; + # master branch as of 2020-12-17 + rev = "c1d0813b3b755a4e232369b6791397ad058efc16"; + sha256 = "1fhaidd35392zzavp93r6ihyansgkc3m1ilz71ia1zl4n3fbsxjg"; }; installPhase = '' diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index f6d4789c30b..ee3803617dc 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -14,7 +14,7 @@ let genericName = "frogatto"; categories = "Game;ArcadeGame;"; }; - version = "unstable-2018-12-18"; + version = "unstable-2020-12-04"; in buildEnv { name = "frogatto-${version}"; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index d51cfcb8f20..94c2a038d92 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { owner = "anura-engine"; repo = "anura"; # trunk branch as of 2018-11-28 - rev = "8070111467802dc772c0a6c7806ecd16b0bcdaa9"; - sha256 = "0xbqwfmws69n7iiz17n93h4jiw39cwyf7hxw0qi2c8cccr37b1nr"; + rev = "a05f413f255d2854019134be817c253a03da3d9f"; + sha256 = "1hd57q8gbn1zdpibnqd3ma0z1ycayc2f4r9j4m2m9kc6yf4v7w7b"; fetchSubmodules = true; }; From c8c598e20c48f214274015ce4fdf238fcc92efb8 Mon Sep 17 00:00:00 2001 From: Christian Luetke Stetzkamp Date: Sat, 19 Dec 2020 23:03:14 +0100 Subject: [PATCH 11/17] i3lock-color: reenable all platforms It was restricted in 40b347f2051b158e4d077eb95eff02df8a65524f due to its need for the SSE2 instruction set. However the upstream issue is now resolved [1], so reenable support for all platforms. [1] https://github.com/chrjguill/i3lock-color/issues/44 --- pkgs/applications/window-managers/i3/lock-color.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index a64e5ea3369..f07a1926f6e 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -55,8 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ malyn ]; license = licenses.bsd3; - # Needs the SSE2 instruction set. See upstream issue - # https://github.com/chrjguill/i3lock-color/issues/44 - platforms = platforms.x86; + platforms = platforms.all; }; } From b75cb8a97ddaa2fa3b9c76ef97d69157273f83a7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 19 Dec 2020 18:33:55 +0100 Subject: [PATCH 12/17] ocamlPackages.ppxlib: fix evaluation --- pkgs/development/ocaml-modules/ppxlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 822c30daf26..d5b09b1ddc2 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -21,7 +21,7 @@ let param = { if param ? max_version && lib.versionAtLeast ocaml.version param.max_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 buildDunePackage rec { From 657b567eaf87ef9ea1155252df24dd7a7bf5224e Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 6 Dec 2020 12:46:33 +0100 Subject: [PATCH 13/17] jetbrains: updates --- .../editors/jetbrains/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 78e6ad30b71..b4f0d6e4da2 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -268,12 +268,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */ + sha256 = "0kqja2c5pz0f9idc52mv7iy2pqq2kfcx4q4x1ywfn3gq3d8n5j7z"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -294,12 +294,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */ + sha256 = "0hj1xm3c71y2z1jyv7j3xf2lcj2y0kyvsxd3jjyyhs31w1f3394j"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -346,12 +346,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */ + sha256 = "1d5rx7p7lvjzgp57n980f2bfrj14p1f4hxmyvx5pzzd86q7hrcbq"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +359,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */ + sha256 = "1c2izsqx27g4jy46iskx5zg00pd8jaf9x1p0vya4l2v5r49dk4jb"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +372,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */ + sha256 = "1kzgy90zcligwa9r6r11kx99z0zm93mrzy700y2jwslyzapd16d0"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; From 83bd601310500321999234a7b88d5465b14aae40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 19 Dec 2020 23:06:33 +0100 Subject: [PATCH 14/17] jetbrains.clion: address minor globchange --- pkgs/applications/editors/jetbrains/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b4f0d6e4da2..5348901bbfe 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -48,7 +48,7 @@ let patchelf \ --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 \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \ From e3c8f10cbb58b225f2a5c96a49c6c2b745f6e38a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 19 Dec 2020 23:14:02 +0100 Subject: [PATCH 15/17] jetbrains: configurable vmoptions All products are now configurable through `config.jetbrains.vmoptions` Closes #107032 --- pkgs/applications/editors/jetbrains/common.nix | 13 +++++++++++-- pkgs/applications/editors/jetbrains/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 07776bebe42..43dbd137f78 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText , coreutils, gnugrep, which, git, unzip, libsecret, libnotify +, vmopts ? null }: { name, product, version, src, wmClass, jdk, meta }: @@ -9,6 +10,11 @@ with stdenv.lib; let loName = toLower product; hiName = toUpper product; execName = concatStringsSep "-" (init (splitString "-" name)); + vmoptsName = loName + + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) + then "" + else "64" ) + + ".vmoptions"; in 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 ]; patchPhase = lib.optionalString (!stdenv.isDarwin) '' @@ -72,7 +80,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$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 ''; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 5348901bbfe..9638bea60c9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -2,12 +2,13 @@ , python , jdk, cmake, libxml2, zlib, python3, ncurses5 , dotnet-sdk_3 +, vmopts ? null }: with stdenv.lib; let - mkJetBrainsProduct = callPackage ./common.nix { }; + mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d5766b7c65..4cdf4ec1650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21648,6 +21648,7 @@ in }; jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains { + vmopts = config.jetbrains.vmopts or null; jdk = jetbrains.jdk; }) // { jdk = callPackage ../development/compilers/jetbrains-jdk { }; From 2b0fc36c9005006d6170f56e4a0e006ce00ed44c Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 7 Dec 2020 00:42:51 +0100 Subject: [PATCH 16/17] ocamlPackages.js_of_ocaml*: 3.7.0 -> 3.8.0 ocamlPackages.js_of_ocaml*: use buildDunePackage to fix installation ocamlPackages.js_of_ocaml*: fix style for editorconfig Closes #106343 --- .../tools/ocaml/js_of_ocaml/camlp4.nix | 26 +++++++-------- .../tools/ocaml/js_of_ocaml/compiler.nix | 32 +++++++++---------- .../tools/ocaml/js_of_ocaml/default.nix | 17 ++++------ .../tools/ocaml/js_of_ocaml/lwt.nix | 15 ++++----- .../tools/ocaml/js_of_ocaml/ocamlbuild.nix | 14 +++----- .../tools/ocaml/js_of_ocaml/ppx.nix | 14 ++++---- .../ocaml/js_of_ocaml/ppx_deriving_json.nix | 18 +++-------- .../tools/ocaml/js_of_ocaml/tyxml.nix | 16 ++++------ 8 files changed, 64 insertions(+), 88 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index e9e7f9d279e..a08aaac832e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler +{ buildDunePackage, fetchFromGitHub, js_of_ocaml-compiler , camlp4, ocsigen_deriving }: -stdenv.mkDerivation rec { - version = "3.2.1"; - pname = "js_of_ocaml-camlp4"; +buildDunePackage rec { + version = "3.2.1"; + pname = "js_of_ocaml-camlp4"; - src = fetchFromGitHub { - owner = "ocsigen"; - repo = "js_of_ocaml"; - rev = version; - sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; - }; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "js_of_ocaml"; + rev = version; + sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; + }; - inherit (js_of_ocaml-compiler) installPhase meta; + inherit (js_of_ocaml-compiler) meta; - buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ]; - - buildPhase = "dune build -p js_of_ocaml-camlp4"; + buildInputs = [ camlp4 ocsigen_deriving ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 6bad201cc4c..f1398c2f7c7 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,28 +1,28 @@ { lib, fetchurl, buildDunePackage -, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree +, cmdliner, cppo, yojson, ppxlib , menhir }: buildDunePackage rec { - pname = "js_of_ocaml-compiler"; - version = "3.7.1"; - useDune2 = true; + pname = "js_of_ocaml-compiler"; + version = "3.8.0"; + useDune2 = true; - src = fetchurl { - url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "0i0smhvsfx2ydmbyg5ai5cgqsfnng8rkcvys4i3fa55cw24aknrn"; - }; + src = fetchurl { + url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; + sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy"; + }; - nativeBuildInputs = [ ocaml findlib dune_2 cppo menhir ]; + nativeBuildInputs = [ cppo menhir ]; buildInputs = [ cmdliner ]; configurePlatforms = []; - propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ]; + propagatedBuildInputs = [ yojson ppxlib ]; - meta = { - description = "Compiler from OCaml bytecode to Javascript"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://ocsigen.org/js_of_ocaml/"; - }; + meta = { + description = "Compiler from OCaml bytecode to Javascript"; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://ocsigen.org/js_of_ocaml/"; + }; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 9a57b590d6c..25826e94eb3 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -1,16 +1,13 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler -, ocaml-migrate-parsetree, ppx_tools_versioned, uchar +{ buildDunePackage, js_of_ocaml-compiler +, ppxlib, uchar }: -stdenv.mkDerivation { - pname = "js_of_ocaml"; +buildDunePackage { + 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 ]; - nativeBuildInputs = [ ocaml findlib dune_2 ]; + buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; - - buildPhase = "dune build -p js_of_ocaml"; + propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 2ad8578894f..81b1a41614b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -1,16 +1,13 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx -, ocaml-migrate-parsetree, ppx_tools_versioned +{ buildDunePackage, js_of_ocaml-compiler, js_of_ocaml-ppx , js_of_ocaml, ocaml_lwt, lwt_log }: -stdenv.mkDerivation { - pname = "js_of_ocaml-lwt"; +buildDunePackage { + 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 ]; - - buildPhase = "dune build -p js_of_ocaml-lwt"; + propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 50bcd69eb66..6abb1ac1b3a 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -1,15 +1,11 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler +{ buildDunePackage, js_of_ocaml-compiler , ocamlbuild }: -stdenv.mkDerivation { - pname = "js_of_ocaml-ocamlbuild"; +buildDunePackage { + 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 ]; - - buildPhase = "dune build -p js_of_ocaml-ocamlbuild"; + propagatedBuildInputs = [ ocamlbuild ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 69783c7eada..b29ef435e46 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -1,14 +1,12 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler -, ocaml-migrate-parsetree, ppx_tools_versioned +{ buildDunePackage, js_of_ocaml-compiler +, ppxlib , js_of_ocaml }: -stdenv.mkDerivation { - pname = "js_of_ocaml-ppx"; +buildDunePackage { + 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 ]; - - buildPhase = "dune build -p js_of_ocaml-ppx"; + buildInputs = [ ppxlib js_of_ocaml ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 8cf05c2a98d..d862d4bc67b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -1,19 +1,11 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler +{ buildDunePackage, js_of_ocaml-compiler , js_of_ocaml, ppxlib }: -if !stdenv.lib.versionAtLeast ppxlib.version "0.14" -then throw "js_of_ocaml-ppx_deriving_json is not compatible with ppxlib ${ppxlib.version}" -else +buildDunePackage { + pname = "js_of_ocaml-ppx_deriving_json"; -stdenv.mkDerivation { - pname = "js_of_ocaml-ppx_deriving_json"; + inherit (js_of_ocaml-compiler) version src meta useDune2; - inherit (js_of_ocaml-compiler) version src installPhase meta; - - buildInputs = [ ocaml findlib dune_2 ]; - - propagatedBuildInputs = [ js_of_ocaml ppxlib ]; - - buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json"; + propagatedBuildInputs = [ js_of_ocaml ppxlib ]; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index fcfeeaf8d99..7082e4b86c9 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -1,16 +1,14 @@ -{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler -, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned +{ buildDunePackage, js_of_ocaml-compiler +, js_of_ocaml-ppx , js_of_ocaml, reactivedata, tyxml }: -stdenv.mkDerivation { - pname = "js_of_ocaml-tyxml"; +buildDunePackage { + 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 ]; - - buildPhase = "dune build -p js_of_ocaml-tyxml"; + propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; } From 3c6445b97e971a723999dbd5b2005eb0f149f69c Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Fri, 18 Dec 2020 10:20:04 -0500 Subject: [PATCH 17/17] bluejeans: 2.17.0 -> 2.19.0 --- .../networking/instant-messengers/bluejeans/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 8b634834058..5e3f0bdb5d6 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.17.0"; - buildNumber = "11"; + version = "2.19.0"; + buildNumber = "61"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm"; - sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68"; + sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr"; }; nativeBuildInputs = [ rpmextract makeWrapper ];