From d753ffac205762e8d6a010ae1c01ef66788a8ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 4 May 2022 20:42:39 +1000 Subject: [PATCH 01/18] exoscale-cli: add man pages and completions --- pkgs/tools/admin/exoscale-cli/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index a745c693305..c8efae5fdb8 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "exoscale-cli"; @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - excludedPackages = [ "./completion" "./docs" ]; + nativeBuildInputs = [ installShellFiles ]; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; @@ -21,6 +21,19 @@ buildGoModule rec { # because these are passed to "go install" which does not recognize -o postBuild = '' mv $GOPATH/bin/cli $GOPATH/bin/exo + + mkdir -p manpage + $GOPATH/bin/docs --man-page + rm $GOPATH/bin/docs + + $GOPATH/bin/completion bash + $GOPATH/bin/completion zsh + rm $GOPATH/bin/completion + ''; + + postInstall = '' + installManPage manpage/* + installShellCompletion --cmd exo --bash bash_completion --zsh zsh_completion ''; meta = { From 940c886a0b4fa368d51b7a66f3f67e3243c54038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Wed, 4 May 2022 20:43:10 +1000 Subject: [PATCH 02/18] exoscale-cli: add self as maintainer --- pkgs/tools/admin/exoscale-cli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index c8efae5fdb8..6a093710151 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -40,7 +40,7 @@ buildGoModule rec { description = "Command-line tool for everything at Exoscale: compute, storage, dns"; homepage = "https://github.com/exoscale/cli"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dramaturg ]; + maintainers = with lib.maintainers; [ dramaturg viraptor ]; mainProgram = "exo"; }; } From fa78bd440e338cfc2fd54d2e499760ceadf597f8 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 9 May 2022 15:43:57 +0800 Subject: [PATCH 03/18] uxplay: 1.50 -> 1.52 --- pkgs/servers/uxplay/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/uxplay/default.nix b/pkgs/servers/uxplay/default.nix index d013a5a59e4..54adab9b109 100644 --- a/pkgs/servers/uxplay/default.nix +++ b/pkgs/servers/uxplay/default.nix @@ -2,7 +2,6 @@ , stdenv , pkg-config , fetchFromGitHub -, fetchpatch , cmake , wrapGAppsHook , avahi @@ -14,23 +13,15 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.50"; + version = "1.52"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-43BCpYh0XtsnI064/ddcz2/Imj399g+bxLlT0BpqLMI="; + sha256 = "sha256-2wPUG50fbXLg6w2Rni3NyeiCyUNPcOvxvqopD9QZJaQ="; }; - patches = [ - # https://github.com/FDH2/UxPlay/issues/91 - (fetchpatch { - url = "https://github.com/FDH2/UxPlay/commit/f373fb2edcfb1f4c279e5796cf21e4a865800a71.patch"; - sha256 = "sha256-ENT/sMyPjDdZ4gdxiatYJ/UxuCl+ekk0iQOn8ELDAKQ="; - }) - ]; - nativeBuildInputs = [ cmake openssl From dcb178bff97a36d405662b358424e8e4ea02ed6a Mon Sep 17 00:00:00 2001 From: Lana Black Date: Mon, 9 May 2022 12:05:53 +0000 Subject: [PATCH 04/18] whalebird: 4.5.2 -> 4.5.4 --- pkgs/applications/misc/whalebird/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/whalebird/default.nix b/pkgs/applications/misc/whalebird/default.nix index 3920a3a8655..9b8a7f0a348 100644 --- a/pkgs/applications/misc/whalebird/default.nix +++ b/pkgs/applications/misc/whalebird/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: +, nodePackages, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { url = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}/Whalebird-${version}-linux-x64.deb"; - sha256 = "sha256-4ksKXVeUGICHfx014s5g9mapS751dbexBjzyqNvk02M="; + sha256 = "048c2hpnlzjli8r1lcm7hd32qfsq4p9vkimrgc049yw9f15ndjpr"; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nodePackages.asar ]; - buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; + buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; dontConfigure = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ca2700bb3f..d6d64bfd2bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30510,9 +30510,7 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { }; - whalebird = callPackage ../applications/misc/whalebird { - electron = electron_14; - }; + whalebird = callPackage ../applications/misc/whalebird { }; wio = callPackage ../applications/window-managers/wio { wlroots = wlroots_0_14; From 52310fb50cc308d60fd64762bed78fb987b09b9c Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 9 May 2022 11:03:10 +0200 Subject: [PATCH 05/18] thedesk: update electron Signed-off-by: Florian Brandes --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 329531aa2bc..eeaa4541043 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10827,9 +10827,7 @@ with pkgs; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; - thedesk = callPackage ../applications/misc/thedesk { - electron = electron_14; - }; + thedesk = callPackage ../applications/misc/thedesk { }; theharvester = callPackage ../tools/security/theharvester { }; From 1905c075b014add9485aefb808dcebd362a07d16 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Mon, 9 May 2022 08:29:33 -0600 Subject: [PATCH 06/18] raven-reader: init at 1.0.72 --- .../newsreaders/raven-reader/default.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/networking/newsreaders/raven-reader/default.nix diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix new file mode 100644 index 00000000000..0858b4690bb --- /dev/null +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "raven-reader"; + version = "1.0.72"; + src = fetchurl { + url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; + sha256 = "sha256-Sx02VMAgmncT9f5Hvs0LugzhD6Z8cWXHx4kn8IG9seU="; + }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/locales $out/share/${pname} + cp -a ${appimageContents}/resources $out/share/${pname} + + install -m 444 -D ${appimageContents}/raven-reader.desktop -t $out/share/applications + + cp -a ${appimageContents}/usr/share/icons $out/share/ + + substituteInPlace $out/share/applications/raven-reader.desktop \ + --replace 'Exec=AppRun' 'Exec=raven-reader' + ''; + + meta = with lib; { + description = "Open source desktop news reader with flexible settings to optimize your experience"; + homepage = "https://ravenreader.app/"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce04e52db14..908a9f2f6b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4250,6 +4250,8 @@ with pkgs; rav1e = callPackage ../tools/video/rav1e { }; + raven-reader = callPackage ../applications/networking/newsreaders/raven-reader { }; + razergenie = libsForQt5.callPackage ../applications/misc/razergenie { }; replay-sorcery = callPackage ../tools/video/replay-sorcery { }; From ed6499826a7f401c536ae6262c52fc636a4f3851 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 9 May 2022 23:42:31 +0200 Subject: [PATCH 07/18] python3Packages.nbclient: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/nbclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index 6579185861f..7311384229a 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -15,14 +15,14 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.6.2"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs="; + hash = "sha256-uAcm/B+4mg6Pi+HnfijQAmsejtkLwUPIoMdiLk+M3Z4="; }; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; From 14d0c3f3a17fda1e1ad7f8ea3cddb2615d095d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hl=C3=B6=C3=B0ver=20Sigur=C3=B0sson?= Date: Tue, 10 May 2022 12:34:33 +0200 Subject: [PATCH 08/18] csound: darwin support --- pkgs/applications/audio/csound/default.nix | 20 ++++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index ebcdb8f4290..4da3efbffe4 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -1,4 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, libsndfile, libsamplerate, flex, bison, boost, gettext +, Accelerate +, AudioUnit +, CoreAudio +, CoreMIDI , alsa-lib ? null , libpulseaudio ? null , libjack2 ? null @@ -26,21 +30,29 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp + ++ lib.optional stdenv.isDarwin "-DCS_FRAMEWORK_DEST=${placeholder "out"}/lib" ++ lib.optional (libjack2 != null) "-DJACK_HEADER=${libjack2}/include/jack/jack.h"; nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] - ++ builtins.filter (optional: optional != null) [ + ++ lib.optionals stdenv.isDarwin [ + Accelerate AudioUnit CoreAudio CoreMIDI + ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen - curl tcltk fltk ]; + curl tcltk fltk + ]); + + postInstall = lib.optional stdenv.isDarwin '' + mkdir -p $out/Library/Frameworks + ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks + ''; meta = with lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; homepage = "https://csound.com/"; license = licenses.lgpl21Plus; maintainers = [maintainers.marcweber]; - platforms = platforms.linux; + platforms = platforms.unix; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f4adeab534..cf59c3dc7c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25602,7 +25602,9 @@ with pkgs; csa = callPackage ../applications/audio/csa { }; - csound = callPackage ../applications/audio/csound { }; + csound = callPackage ../applications/audio/csound { + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AudioUnit CoreAudio CoreMIDI; + }; csound-manual = callPackage ../applications/audio/csound/csound-manual { python = python27; From 96e5ab89864c50037842880890d52a7c4a9b8570 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 30 Apr 2022 11:28:31 -0400 Subject: [PATCH 09/18] python3Packages.ibis-framework: allow setting features for backend deps --- .../python-modules/ibis-framework/default.nix | 52 ++++++++++++------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index dee63fb0856..cf018e8b7cc 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -5,37 +5,45 @@ , pytestCheckHook , atpublic , cached-property -, clickhouse-driver , click +, clickhouse-cityhash +, clickhouse-driver , dask , datafusion , duckdb , duckdb-engine +, geoalchemy2 +, geopandas , graphviz , importlib-metadata +, lz4 , multipledispatch , numpy +, packaging , pandas , parsy , poetry-core , poetry-dynamic-versioning +, psycopg2 , pyarrow , pydantic +, pymysql +, pyspark , pytest-benchmark +, pytest-randomly , pytest-mock , pytest-xdist , python , pytz , regex -, requests +, shapely , sqlalchemy , sqlite , tabulate , toolz }: let - # ignore tests for which dependencies are not available - backends = [ + testBackends = [ "dask" "datafusion" "duckdb" @@ -70,24 +78,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic cached-property - clickhouse-driver - dask - datafusion - duckdb - duckdb-engine - graphviz importlib-metadata multipledispatch numpy + packaging pandas parsy poetry-dynamic-versioning - pyarrow pydantic pytz regex - requests - sqlalchemy tabulate toolz ]; @@ -97,9 +97,9 @@ buildPythonPackage rec { click pytest-benchmark pytest-mock + pytest-randomly pytest-xdist - sqlite - ]; + ] ++ lib.concatMap (name: passthru.extras-require.${name}) testBackends; preBuild = '' # setup.py exists only for developer convenience and is automatically generated @@ -109,7 +109,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--dist=loadgroup" "-m" - "'${lib.concatStringsSep " or " backends} or core'" + "'${lib.concatStringsSep " or " testBackends} or core'" ]; preCheck = '' @@ -125,7 +125,7 @@ buildPythonPackage rec { find "$IBIS_TEST_DATA_DIRECTORY" -type f -exec chmod u+rw {} + # load data - for backend in ${lib.concatStringsSep " " backends}; do + for backend in ${lib.concatStringsSep " " testBackends}; do ${python.interpreter} ci/datamgr.py load "$backend" done ''; @@ -136,7 +136,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "ibis" - ] ++ (map (backend: "ibis.backends.${backend}") backends); + ] ++ map (backend: "ibis.backends.${backend}") testBackends; + + passthru = { + extras-require = { + clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 ]; + dask = [ dask pyarrow ]; + datafusion = [ datafusion ]; + duckdb = [ duckdb duckdb-engine sqlalchemy ]; + geospatial = [ geoalchemy2 geopandas shapely ]; + mysql = [ pymysql sqlalchemy ]; + pandas = [ ]; + postgres = [ psycopg2 sqlalchemy ]; + pyspark = [ pyarrow pyspark ]; + sqlite = [ sqlalchemy sqlite ]; + visualization = [ graphviz-nox ]; + }; + }; meta = with lib; { description = "Productivity-centric Python Big Data Framework"; From 7bfe1e3b52944e520109ca94c1df3d1f2826a128 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Tue, 3 May 2022 05:17:13 -0400 Subject: [PATCH 10/18] python3Packages.ibis-framework: depend on graphviz-nox instead of graphviz --- pkgs/development/python-modules/ibis-framework/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index cf018e8b7cc..c5dfcc13e5c 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -14,7 +14,7 @@ , duckdb-engine , geoalchemy2 , geopandas -, graphviz +, graphviz-nox , importlib-metadata , lz4 , multipledispatch From fd8414512baac8b96fbd245b6903afaa956de3d3 Mon Sep 17 00:00:00 2001 From: bb2020 Date: Wed, 24 Nov 2021 20:57:47 +0300 Subject: [PATCH 11/18] gimx: fix build --- pkgs/games/gimx/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 132169b711d..2728afe2c49 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 -, ncurses5, bluez, libmhash, gimxPDP ? false }: +, ncurses5, bluez, libmhash, gimxPdpGamepad ? false }: let gimx-config = fetchFromGitHub { @@ -11,14 +11,14 @@ let in stdenv.mkDerivation rec { pname = "gimx"; - version = "8.0"; + version = "unstable-2021-08-31"; src = fetchFromGitHub { owner = "matlo"; repo = "GIMX"; - rev = "v${version}"; + rev = "58d2098dce75ed4c90ae649460d3a7a150f4ef0a"; fetchSubmodules = true; - sha256 = "0265gg6q7ymg76fb4pjrfdwjd280b3zzry96qy92w0h411slph85"; + sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz"; }; patches = [ ./conf.patch ]; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { xorg.libX11 xorg.libXi xorg.libXext ]; - postPatch = lib.optionals gimxPDP '' + postPatch = lib.optionals gimxPdpGamepad '' substituteInPlace ./shared/gimxcontroller/include/x360.h \ --replace "0x045e" "0x0e6f" --replace "0x028e" "0x0213" substituteInPlace ./loader/firmware/EMU360.hex \ @@ -60,10 +60,6 @@ in stdenv.mkDerivation rec { cp -r ${./custom} $out/share/custom makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4 \ - --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ - --add-flags "-c $out/share/config/Dualshock4.xml" - - makeWrapper $out/bin/gimx $out/bin/gimx-dualshock4-noff \ --set GIMXCONF 1 --add-flags "--nograb" --add-flags "-p /dev/ttyUSB0" \ --add-flags "-c $out/share/custom/Dualshock4.xml" From 98a2cf221dfe7bbf2e13691f3255481e6a63b20a Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Mon, 25 Apr 2022 10:25:26 -0500 Subject: [PATCH 12/18] lumo: remove --- .../clojurescript/lumo/default.nix | 287 ------------- .../interpreters/clojurescript/lumo/deps.edn | 12 - .../interpreters/clojurescript/lumo/deps.nix | 392 ------------------ .../clojurescript/lumo/mkdir_promise.patch | 20 - .../clojurescript/lumo/no_mangle.patch | 13 - .../clojurescript/lumo/package.json | 51 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 8 files changed, 1 insertion(+), 779 deletions(-) delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/default.nix delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/deps.edn delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/deps.nix delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch delete mode 100644 pkgs/development/interpreters/clojurescript/lumo/package.json diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix deleted file mode 100644 index d8fa630c30d..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ /dev/null @@ -1,287 +0,0 @@ -{ stdenv -, lib -, fetchurl -, clojure -, gnutar -, nodejs -, jre -, unzip -, nodePackages -, xcbuild -, python2 -, openssl -, pkgs -, fetchgit -, darwin -}: -let - version = "1.10.1"; - nodeVersion = "11.13.0"; - nodeSources = fetchurl { - url = "https://nodejs.org/dist/v${nodeVersion}/node-v${nodeVersion}.tar.gz"; - sha256 = "1cjzjbshxnysxkvbf41p3m8298cnhs9kfvdczgvvvlp6w16x4aac"; - }; - lumo-internal-classpath = "LUMO__INTERNAL__CLASSPATH"; - - # as found in cljs/snapshot/lumo/repl.cljs - requireDeps = '' \ - cljs.analyzer \ - cljs.compiler \ - cljs.env \ - cljs.js \ - cljs.reader \ - cljs.repl \ - cljs.source-map \ - cljs.source-map.base64 \ - cljs.source-map.base64-vlq \ - cljs.spec.alpha \ - cljs.spec.gen.alpha \ - cljs.tagged-literals \ - cljs.tools.reader \ - cljs.tools.reader.reader-types \ - cljs.tools.reader.impl.commons \ - cljs.tools.reader.impl.utils \ - clojure.core.rrb-vector \ - clojure.core.rrb-vector.interop \ - clojure.core.rrb-vector.nodes \ - clojure.core.rrb-vector.protocols \ - clojure.core.rrb-vector.rrbt \ - clojure.core.rrb-vector.transients \ - clojure.core.rrb-vector.trees \ - clojure.string \ - clojure.set \ - clojure.walk \ - cognitect.transit \ - fipp.visit \ - fipp.engine \ - fipp.deque \ - lazy-map.core \ - lumo.pprint.data \ - lumo.repl \ - lumo.repl-resources \ - lumo.js-deps \ - lumo.common ''; - - compileClojurescript = (simple: '' - (require '[cljs.build.api :as cljs]) - (cljs/build \"src/cljs/snapshot\" - {:optimizations ${if simple then ":simple" else ":none"} - :main 'lumo.core - :cache-analysis true - :source-map false - :dump-core false - :static-fns true - :optimize-constants false - :npm-deps false - :verbose true - :closure-defines {'cljs.core/*target* \"nodejs\" - 'lumo.core/*lumo-version* \"${version}\"} - :compiler-stats true - :process-shim false - :fn-invoke-direct true - :parallel-build false - :browser-repl false - :target :nodejs - :hashbang false - ;; :libs [ \"src/cljs/bundled\" \"src/js\" ] - :output-dir ${if simple - then ''\"cljstmp\"'' - else ''\"target\"''} - :output-to ${if simple - then ''\"cljstmp/main.js\"'' - else ''\"target/deleteme.js\"'' }}) - '' - ); - - - cacheToJsons = '' - (import [java.io ByteArrayOutputStream FileInputStream]) - (require '[cognitect.transit :as transit] - '[clojure.edn :as edn] - '[clojure.string :as str]) - - (defn write-transit-json [cache] - (let [out (ByteArrayOutputStream. 1000000) - writer (transit/writer out :json)] - (transit/write writer cache) - (.toString out))) - - (defn process-caches [] - (let [cache-aot-path \"target/cljs/core.cljs.cache.aot.edn\" - cache-aot-edn (edn/read-string (slurp cache-aot-path)) - cache-macros-path \"target/cljs/core\$macros.cljc.cache.json\" - cache-macros-stream (FileInputStream. cache-macros-path) - cache-macros-edn (transit/read (transit/reader cache-macros-stream :json)) - caches [[cache-aot-path cache-aot-edn] - [cache-macros-path cache-macros-edn]]] - (doseq [[path cache-edn] caches] - (doseq [key (keys cache-edn)] - (let [out-path (str/replace path #\"(\.json|\.edn)\$\" - (str \".\" (munge key) \".json\")) - tr-json (write-transit-json (key cache-edn))] - (spit out-path tr-json)))))) - - (process-caches) - ''; - - trimMainJsEnd = '' - (let [string (slurp \"target/main.js\")] - (spit \"target/main.js\" - (subs string 0 (.indexOf string \"cljs.nodejs={};\")))) - ''; - - - cljdeps = import ./deps.nix { inherit pkgs; }; - classp = cljdeps.makeClasspaths { - extraClasspaths = [ "src/js" "src/cljs/bundled" "src/cljs/snapshot" ]; - }; - - - getJarPath = jarName: (lib.findFirst (p: p.name == jarName) null cljdeps.packages).path.jar; -in -stdenv.mkDerivation { - inherit version; - pname = "lumo"; - - src = fetchgit { - url = "https://github.com/anmonteiro/lumo.git"; - rev = version; - sha256 = "12agi6bacqic2wq6q3l28283badzamspajmajzqm7fbdl2aq1a4p"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ - nodejs - clojure - jre - python2 - openssl - gnutar - nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo" - ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - xcbuild - ] - ); - - patches = [ ./no_mangle.patch ./mkdir_promise.patch ]; - - postPatch = '' - substituteInPlace $NIX_BUILD_TOP/lumo/vendor/nexe/exe.js \ - --replace 'glob.sync(dir + "/*")' 'glob.sync(dir + "/../*")' - ''; - - buildPhase = '' - # Copy over lumo-build-deps environment - rm yarn.lock - cp -rf ${nodePackages."lumo-build-deps-../interpreters/clojurescript/lumo"}/lib/node_modules/lumo-build-deps/* ./ - - # configure clojure-cli - mkdir ./.cpcache - export CLJ_CONFIG=`pwd` - export CLJ_CACHE=`pwd`/.cpcache - - # require more namespaces for cljs-bundle - sed -i "s!ns lumo.core! \ - ns lumo.core \ - (:require ${requireDeps}) \ - (:require-macros [clojure.template :as temp] \ - [cljs.test :as test])!g" \ - ./src/cljs/snapshot/lumo/core.cljs - - # Step 1: compile clojurescript with :none and :simple - ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript true}" - ${clojure}/bin/clojure -Scp ${classp} -e "${compileClojurescript false}" - cp -f cljstmp/main.js target/main.js - ${clojure}/bin/clojure -Scp ${classp} -e "${trimMainJsEnd}" - - # Step 2: sift files - unzip -o ${getJarPath "org.clojure/clojurescript"} -d ./target - unzip -j ${getJarPath "org.clojure/clojure"} "clojure/template.clj" -d ./target/clojure - unzip -o ${getJarPath "org.clojure/google-closure-library"} -d ./target - unzip -o ${getJarPath "org.clojure/google-closure-library-third-party"} -d ./target - unzip -o ${getJarPath "org.clojure/tools.reader"} -d ./target - unzip -o ${getJarPath "org.clojure/test.check"} -d ./target - cp -rf ./src/cljs/bundled/lumo/* ./target/lumo/ - cp -rf ./src/cljs/snapshot/lumo/repl.clj ./target/lumo/ - # cleanup - mv ./target/main.js ./target/main - rm ./target/*\.js - mv ./target/main ./target/main.js - rm ./target/AUTHORS - rm ./target/LICENSE - rm ./target/*.edn - rm ./target/*.md - rm -rf ./target/css - rm -rf ./target/META-INF - rm -rf ./target/com - rm -rf ./target/cljs/build - rm -rf ./target/cljs/repl - rm ./target/cljs/core\.cljs\.cache.aot\.json - rm ./target/cljs/source_map\.clj - rm ./target/cljs/repl\.cljc - rm ./target/cljs/externs\.clj - rm ./target/cljs/closure\.clj - rm ./target/cljs/util\.cljc - rm ./target/cljs/js_deps\.cljc - rm ./target/cljs/analyzer/utils\.clj - rm ./target/cljs/core/macros\.clj - rm ./target/cljs/compiler/api.clj - rm ./target/goog/test_module* - rm ./target/goog/transpile\.js - rm ./target/goog/base_* - find ./target -type f -name '*.class' -delete - find ./target -type d -empty -delete - - # Step 3: generate munged cache jsons - ${clojure}/bin/clojure -Scp ${classp} -e "${cacheToJsons}" - rm ./target/cljs/core\$macros\.cljc\.cache\.json - - - # Step 4: Bunde javascript - NODE_ENV=production node scripts/bundle.js - node scripts/bundleForeign.js - - # Step 5: Backup resources - cp -R target resources_bak - - # Step 6: Package executeable 1st time - # fetch node sources and copy to palce that nexe will find - mkdir -p tmp/node/${nodeVersion} - cp ${nodeSources} tmp/node/${nodeVersion}/node-${nodeVersion}.tar.gz - tar -C ./tmp/node/${nodeVersion} -xf ${nodeSources} --warning=no-unknown-keyword - mv ./tmp/node/${nodeVersion}/node-v${nodeVersion}/* ./tmp/node/${nodeVersion}/ - rm -rf ${lumo-internal-classpath} - cp -rf target ${lumo-internal-classpath} - node scripts/package.js ${nodeVersion} - rm -rf target - mv ${lumo-internal-classpath} target - - # Step 7: AOT Macros - sh scripts/aot-bundle-macros.sh - - # Step 8: Package executeable 2nd time - node scripts/package.js ${nodeVersion} - ''; - - dontStrip = true; - - installPhase = '' - mkdir -p $out/bin - cp build/lumo $out/bin - ''; - - meta = { - description = "Fast, cross-platform, standalone ClojureScript environment"; - longDescription = '' - Lumo is a fast, standalone ClojureScript REPL that runs on Node.js and V8. - Thanks to V8's custom startup snapshots, Lumo starts up instantaneously, - making it the fastest Clojure REPL in existence. - ''; - homepage = "https://github.com/anmonteiro/lumo"; - license = lib.licenses.epl10; - maintainers = [ lib.maintainers.hlolli ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - }; -} diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.edn b/pkgs/development/interpreters/clojurescript/lumo/deps.edn deleted file mode 100644 index 7a2faee1d7a..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.edn +++ /dev/null @@ -1,12 +0,0 @@ -{:deps - {org.clojure/clojure {:mvn/version "1.10.1"} - org.clojure/clojurescript {:mvn/version "1.10.520"} - org.clojure/test.check {:mvn/version "0.10.0-alpha4"} - org.clojure/tools.reader {:mvn/version "1.3.2" - :exclusions [org.clojure/clojure org.clojure/clojurescript]} - com.cognitect/transit-cljs {:mvn/version "0.8.256" - :exclusions [org.clojure/clojure org.clojure/clojurescript]} - malabarba/lazy-map {:mvn/version "1.3" - :exclusions [org.clojure/clojure org.clojure/clojurescript]} - fipp {:mvn/version "0.6.17" - :exclusions [org.clojure/clojure org.clojure/clojurescript]}}} diff --git a/pkgs/development/interpreters/clojurescript/lumo/deps.nix b/pkgs/development/interpreters/clojurescript/lumo/deps.nix deleted file mode 100644 index 50f1c4af211..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/deps.nix +++ /dev/null @@ -1,392 +0,0 @@ -# generated by clj2nix-1.0.4 -{ pkgs }: - -let repos = [ - "https://repo.clojars.org/" - "https://repo1.maven.org/" - "https://oss.sonatype.org/content/repositories/releases/" - "https://oss.sonatype.org/content/repositories/public/" - "https://repo.typesafe.com/typesafe/releases/" - ]; - -in rec { - makePaths = {extraClasspaths ? []}: (builtins.map (dep: if builtins.hasAttr "jar" dep.path then dep.path.jar else dep.path) packages) ++ extraClasspaths; - makeClasspaths = {extraClasspaths ? []}: builtins.concatStringsSep ":" (makePaths {inherit extraClasspaths;}); - - packages = [ - { - name = "com.cognitect/transit-java"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-java"; - groupId = "com.cognitect"; - sha512 = "80365a4f244e052b6c4fdfd2fd3b91288835599cb4dd88e0e0dae19883dcda39afee83966810ed81beff342111c3a45a66f5601c443f3ad49904908c43631708"; - version = "0.8.332"; - }; - } - - { - name = "org.clojure/data.json"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "data.json"; - groupId = "org.clojure"; - sha512 = "ce526bef01bedd31b772954d921a61832ae60af06121f29080853f7932326438b33d183240a9cffbe57e00dc3744700220753948da26b8973ee21c30e84227a6"; - version = "0.2.6"; - }; - } - - { - name = "org.clojure/clojure"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clojure"; - groupId = "org.clojure"; - sha512 = "f28178179483531862afae13e246386f8fda081afa523d3c4ea3a083ab607d23575d38ecb9ec0ee7f4d65cbe39a119f680e6de4669bc9cf593aa92be0c61562b"; - version = "1.10.1"; - }; - } - - { - name = "commons-codec/commons-codec"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "commons-codec"; - groupId = "commons-codec"; - sha512 = "8edecc0faf38e8620460909d8191837f34e2bb2ce853677c486c5e79bb79e88d043c3aed69c11f1365c4884827052ee4e1c18ca56e38d1a5bc0ce15c57daeee3"; - version = "1.10"; - }; - } - - { - name = "com.google.errorprone/error_prone_annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "error_prone_annotations"; - groupId = "com.google.errorprone"; - sha512 = "bd2135cc9eb2c652658a2814ec9c565fa3e071d4cff590cbe17b853885c78c9f84c1b7b24ba736f4f30ed8cec60a6af983827fcbed61ff142f27ac808e97fc6b"; - version = "2.1.3"; - }; - } - - { - name = "org.clojure/core.specs.alpha"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "core.specs.alpha"; - groupId = "org.clojure"; - sha512 = "348c0ea0911bc0dcb08655e61b97ba040649b4b46c32a62aa84d0c29c245a8af5c16d44a4fa5455d6ab076f4bb5bbbe1ad3064a7befe583f13aeb9e32a169bf4"; - version = "0.2.44"; - }; - } - - { - name = "org.clojure/spec.alpha"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "spec.alpha"; - groupId = "org.clojure"; - sha512 = "18c97fb2b74c0bc2ff4f6dc722a3edec539f882ee85d0addf22bbf7e6fe02605d63f40c2b8a2905868ccd6f96cfc36a65f5fb70ddac31c6ec93da228a456edbd"; - version = "0.2.176"; - }; - } - - { - name = "org.codehaus.mojo/animal-sniffer-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "animal-sniffer-annotations"; - groupId = "org.codehaus.mojo"; - sha512 = "9e5e3ea9e06e0ac9463869fd0e08ed38f7042784995a7b50c9bfd7f692a53f0e1430b9e1367dc772d0d4eafe5fd2beabbcc60da5008bd792f9e7ec8436c0f136"; - version = "1.14"; - }; - } - - { - name = "com.googlecode.json-simple/json-simple"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "json-simple"; - groupId = "com.googlecode.json-simple"; - sha512 = "f8798bfbcc8ab8001baf90ce47ec2264234dc1da2d4aa97fdcdc0990472a6b5a5a32f828e776140777d598a99d8a0c0f51c6d0767ae1a829690ab9200ae35742"; - version = "1.1.1"; - }; - } - - { - name = "com.cognitect/transit-cljs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-cljs"; - groupId = "com.cognitect"; - sha512 = "318b98ddd63629f37b334bb90e625bc31ab6abcf0b1fa80d8e097551658f2d9219b5ee35869a31f2976d7d385da83bea0c07b0d097babcae241ecbd0fe8a7ecd"; - version = "0.8.256"; - }; - } - - { - name = "org.clojure/google-closure-library"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "google-closure-library"; - groupId = "org.clojure"; - sha512 = "75631182ef12f21723fe3eba1003d8cf9b8348a51512961e4e1b87bc24d8f3abb14a70c856f08cdaa5588a2d7c2b1b0c03aeaa3c4c5f2ed745a85f59ceeab83a"; - version = "0.0-20170809-b9c14c6b"; - }; - } - - { - name = "fipp"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "fipp"; - groupId = "fipp"; - sha512 = "d844ab63d28cb5e31657cc38e574bbc7072a78419c997f25445ac6ea4a719904a4f4844b37e3f664a8d2e49bd38ff1006a9e8c6e63fb4e2f0a2322d6c2638275"; - version = "0.6.17"; - }; - } - - { - name = "org.clojure/clojurescript"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "clojurescript"; - groupId = "org.clojure"; - sha512 = "b241959d6bd2ab659920965d301508226e26b3edcee469e4cd516cd4ed014b1a6b132c17ee7d96a8e66fe27fd01a74813ac8b85958d260f9fdbbeb4348d57ff1"; - version = "1.10.520"; - }; - } - - { - name = "com.google.jsinterop/jsinterop-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jsinterop-annotations"; - groupId = "com.google.jsinterop"; - sha512 = "b6fd98a9167d031f6bff571567d4658fda62c132dc74d47ca85e02c9bb3ce8812b1012c67f4c81501ab0cbd9ccd9cda5dcf32d306e04368ace7a173cecae975d"; - version = "1.0.0"; - }; - } - - { - name = "com.fasterxml.jackson.core/jackson-core"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jackson-core"; - groupId = "com.fasterxml.jackson.core"; - sha512 = "a1bd6c264b9ab07aad3d0f26b65757e35ff47904ab895bb7f997e3e1fd063129c177ad6f69876907b04ff8a43c6b1770a26f53a811633a29e66a5dce57194f64"; - version = "2.8.7"; - }; - } - - { - name = "malabarba/lazy-map"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "lazy-map"; - groupId = "malabarba"; - sha512 = "ce56d6f03ac344579e15f062cdd4c477c0323da716d4d4106c4edb746959699e0b294b25aacf8ecf1579a6bdd5556a60f4bcb1648d22832984c069a0431c840f"; - version = "1.3"; - }; - } - - { - name = "com.cognitect/transit-js"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-js"; - groupId = "com.cognitect"; - sha512 = "6ca0978e633e41b45ff5a76df79099ba7c4900a8ca9f6acd2a903e4ab10a1ec0c83d4127009df9dac1337debaba01f7ff1d5cced1c2159c05ef94845f73f0623"; - version = "0.8.846"; - }; - } - - { - name = "org.mozilla/rhino"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "rhino"; - groupId = "org.mozilla"; - sha512 = "466e7a76303ea191802b5e7adb3dff64c1d6283a25ce87447296b693b87b166f4cdd191ef7dc130a5739bfa0e4a81b08550f607c84eec167406d9be2225562dc"; - version = "1.7R5"; - }; - } - - { - name = "org.clojure/google-closure-library-third-party"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "google-closure-library-third-party"; - groupId = "org.clojure"; - sha512 = "57fa84fbbca3eb9e612d2842e4476b74f64d13dd076ffca6c9d9e15c4ca8a2f2c56cc19307bcad0ab5b4f9cb0c3e7900ccc845bd570ebc92e2633885ab621f35"; - version = "0.0-20170809-b9c14c6b"; - }; - } - - { - name = "com.google.javascript/closure-compiler-externs"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "closure-compiler-externs"; - groupId = "com.google.javascript"; - sha512 = "1a47c8559144095c0b23a8e40acd7185625cea5a4c103eb75fbacd32d5809d087bfb60aaf57066329649c6017ec5f993756024e767a5b8f84926371ba6183a82"; - version = "v20180805"; - }; - } - - { - name = "org.javassist/javassist"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "javassist"; - groupId = "org.javassist"; - sha512 = "ad65ee383ed83bedecc2073118cb3780b68b18d5fb79a1b2b665ff8529df02446ad11e68f9faaf4f2e980065f5946761a59ada379312cbb22d002625abed6a4f"; - version = "3.18.1-GA"; - }; - } - - { - name = "com.google.guava/guava"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "guava"; - groupId = "com.google.guava"; - sha512 = "429ceeec0350ba98e2b089b8b70ded2ec570c3a684894a7545d10592c1c7be42dacd1fad8b2cb9123aa3612575ce1b56e1bb54923443fc293f8e9adeac2762ee"; - version = "25.1-jre"; - }; - } - - { - name = "org.msgpack/msgpack"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "msgpack"; - groupId = "org.msgpack"; - sha512 = "a2741bed01f9c37ba3dbe6a7ab9ce936d36d4da97c35e215250ac89ac0851fc5948d83975ea6257d5dce1d43b6b5147254ecfb4b33f9bbdc489500b3ff060449"; - version = "0.6.12"; - }; - } - - { - name = "com.google.j2objc/j2objc-annotations"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "j2objc-annotations"; - groupId = "com.google.j2objc"; - sha512 = "a4a0b58ffc2d9f9b516f571bcd0ac14e4d3eec15aacd6320a4a1a12045acce8c6081e8ce922c4e882221cedb2cc266399ab468487ae9a08124d65edc07ae30f0"; - version = "1.1"; - }; - } - - { - name = "com.cognitect/transit-clj"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "transit-clj"; - groupId = "com.cognitect"; - sha512 = "ad838d9e5688c8cebe54972ad0c9a6db428ec1cece8c8b078e8e8d4b0c7870b328239d2bc9dd8fcbedcba56ca0de9afb5a0a843ff5f630dc039118de7eb45eba"; - version = "0.8.309"; - }; - } - - { - name = "args4j/args4j"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "args4j"; - groupId = "args4j"; - sha512 = "5f0651234c8f8b130fddb39fa832c6da47d3e21bc3434307554314c47e672c28d005c64e9effe85d552190cfc27966b1f005740ffd40b4e1bec2cb257d7feedb"; - version = "2.0.26"; - }; - } - - { - name = "org.clojure/core.rrb-vector"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "core.rrb-vector"; - groupId = "org.clojure"; - sha512 = "4e410c4a90a869e98d5d69a8a6dd6427e9d77b70e1a2b54cf24baf23389f22e7a208375783c2fdc5c1a5acfb8511a5c5ed57ad1a946d5bffd203f453d90a6155"; - version = "0.0.14"; - }; - } - - { - name = "org.checkerframework/checker-qual"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "checker-qual"; - groupId = "org.checkerframework"; - sha512 = "3c38b0b9e0bde464268cff5fdb1894a048240b039093ee3abe5b32976a22737d26b355f8793f630a7f0b319fdb019a6fcd9ee1d5219676f0f10c0b0f496b61b7"; - version = "2.0.0"; - }; - } - - { - name = "org.clojure/tools.reader"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "tools.reader"; - groupId = "org.clojure"; - sha512 = "290a2d98b2eec08a8affc2952006f43c0459c7e5467dc454f5fb5670ea7934fa974e6be19f7e7c91dadcfed62082d0fbcc7788455b7446a2c9c5af02f7fc52b6"; - version = "1.3.2"; - }; - } - - { - name = "com.google.javascript/closure-compiler-unshaded"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "closure-compiler-unshaded"; - groupId = "com.google.javascript"; - sha512 = "4fa7029aabd9ff84255d56004707486726db9c770f43cb10dc44fb53a3254d588a0f47f937f55401d7f319267ec2362c87f5ea709bcfa06f12a66fe22cb8c53d"; - version = "v20180805"; - }; - } - - { - name = "org.clojure/test.check"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "test.check"; - groupId = "org.clojure"; - sha512 = "60fa3bd38c32cf193c573f1bd47c6abd7e7a5bb2fc7f7f9f97aa9dcd54d5e2eab9e351f5f83b01bb96b32811a9f2f5ab384c6b7b7ebbb6c86d1ad4f2789351bf"; - version = "0.10.0-alpha4"; - }; - } - - { - name = "com.google.protobuf/protobuf-java"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "protobuf-java"; - groupId = "com.google.protobuf"; - sha512 = "230fc4360b8b2ee10eb73d756c58478b6c779433aa4ca91938404bbfd0ada516d3215664dbe953c96649e33bbef293958e4ad4616671f0c246883196ece92998"; - version = "3.0.2"; - }; - } - - { - name = "com.google.code.findbugs/jsr305"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "jsr305"; - groupId = "com.google.code.findbugs"; - sha512 = "bb09db62919a50fa5b55906013be6ca4fc7acb2e87455fac5eaf9ede2e41ce8bbafc0e5a385a561264ea4cd71bbbd3ef5a45e02d63277a201d06a0ae1636f804"; - version = "3.0.2"; - }; - } - - { - name = "com.google.code.gson/gson"; - path = pkgs.fetchMavenArtifact { - inherit repos; - artifactId = "gson"; - groupId = "com.google.code.gson"; - sha512 = "c3cdaf66a99e6336abc80ff23374f6b62ac95ab2ae874c9075805e91d849b18e3f620cc202b4978fc92b73d98de96089c8714b1dd096b2ae1958cfa085715f7a"; - version = "2.7"; - }; - } - - ]; - } diff --git a/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch b/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch deleted file mode 100644 index e9504bb5c1a..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/mkdir_promise.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/vendor/nexe/exe.js b/vendor/nexe/exe.js -index 21e78bb..ecbfca4 100644 ---- a/vendor/nexe/exe.js -+++ b/vendor/nexe/exe.js -@@ -254,9 +254,7 @@ return initModule._compile(${JSON.stringify(source)}, process.execPath); - */ - - function makeOutputDirectory(next) { -- mkdirp(path.dirname(options.output), function() { -- next(); -- }); -+ mkdirp(path.dirname(options.output)).then(() => next()); - }, - - /** -@@ -1107,4 +1105,3 @@ exports.package = function(path, options) { - - return obj; - } -- diff --git a/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch b/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch deleted file mode 100644 index 9af22341195..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/no_mangle.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/bundle.js b/scripts/bundle.js -index 16425a4..0d510fc 100644 ---- a/scripts/bundle.js -+++ b/scripts/bundle.js -@@ -73,6 +73,8 @@ const plugins = [ - if (!isDevBuild) { - plugins.push( - babelMinify({ -+ evaluate: false, -+ mangle: false, - comments: false, - removeConsole: true, - removeDebugger: true, diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json deleted file mode 100644 index acfd5c4ed49..00000000000 --- a/pkgs/development/interpreters/clojurescript/lumo/package.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "name": "lumo-build-deps", - "version": "1.10.1", - "dependencies": { - "@babel/core": "^7.1.5", - "@babel/plugin-external-helpers": "7.8.3", - "@babel/plugin-proposal-class-properties": "^7.1.0", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/plugin-transform-runtime": "^7.1.0", - "@babel/preset-env": "^7.1.5", - "@babel/preset-stage-2": "7.8.3", - "@babel/runtime": "^7.1.5", - "async": "^3.1.1", - "async-retry": "^1.2.3", - "babel-core": "^7.0.0-bridge.0", - "babel-eslint": "10.0.3", - "babel-jest": "^25.1.0", - "babel-loader": "^8.0.4", - "babel-plugin-transform-flow-strip-types": "6.22.0", - "browserify": "^16.2.3", - "chalk": "^3.0.0", - "colors": "^1.3.3", - "cross-env": "7.0.0", - "death": "^1.1.0", - "flow-bin": "0.118.0", - "google-closure-compiler-js": "20170910.0.1", - "glob": "^7.1.3", - "gunzip-maybe": "^1.4.1", - "insert-module-globals": "^7.2.0", - "jszip": "2.x", - "mkdirp": "^1.0.3", - "ncp": "^2.0.0", - "node-fetch": "^2.2.1", - "paredit.js": "0.3.6", - "posix-getopt": "github:anmonteiro/node-getopt#master", - "prettier": "1.19.1", - "progress": "^2.0.0", - "read-pkg": "^5.2.0", - "request": "^2.88.0", - "rollup": "^1.9.0", - "rollup-plugin-babel": "^4.3.2", - "rollup-plugin-babel-minify": "^9.1.1", - "rollup-plugin-commonjs": "^10.0.0", - "rollup-plugin-node-resolve": "^5.0.0", - "rollup-plugin-replace": "^2.1.1", - "tar-stream": "^2.0.1", - "webpack": "^4.25.1", - "webpack-cli": "^3.2.3", - "which-promise": "^1.0.0" - } -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7c89161495..4723c9bbce4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -776,6 +776,7 @@ mapAliases ({ lua5_1_sockets = throw "'lua5_1_sockets' has been renamed to/replaced by 'lua51Packages.luasocket'"; # Converted to throw 2022-02-22 lua5_expat = throw "'lua5_expat' has been renamed to/replaced by 'luaPackages.luaexpat'"; # Converted to throw 2022-02-22 lua5_sec = throw "'lua5_sec' has been renamed to/replaced by 'luaPackages.luasec'"; # Converted to throw 2022-02-22 + lumo = throw "lumo has been removed: abandoned by upstream"; # Added 2022-04-25 lumpy = throw "lumpy has been removed from nixpkgs, as it is stuck on python2"; # Added 2022-01-12 lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # Added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2ec4e7668d..c2a271badb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14252,10 +14252,6 @@ with pkgs; kanif = callPackage ../applications/networking/cluster/kanif { }; - lumo = callPackage ../development/interpreters/clojurescript/lumo { - nodejs = nodejs_latest; - }; - kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; From 5c8ab091771fb27e1ee792639c197fe4185ba99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 May 2022 23:03:36 +0200 Subject: [PATCH 13/18] python310Packages.ujson: adopt, update meta data --- pkgs/development/python-modules/ujson/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 0d7faf93f93..987347c8695 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ujson"; version = "5.1.0"; - disabled = isPyPy || pythonOlder "3.5"; + disabled = isPyPy || pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -28,9 +28,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "ujson" ]; meta = with lib; { - description = "Ultra fast JSON encoder and decoder for Python"; - homepage = "https://pypi.python.org/pypi/ujson"; + description = "Ultra fast JSON encoder and decoder"; + homepage = "https://github.com/ultrajson/ultrajson"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From db9c0e88530942ae8f6ae94bae08939fb06b673b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 May 2022 23:25:43 +0200 Subject: [PATCH 14/18] python310Packages.pyopenssl: mark broken on aarch64-darwin --- pkgs/development/python-modules/pyopenssl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index d629d97637f..1b847100a95 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -74,5 +74,7 @@ buildPythonPackage rec { homepage = "https://github.com/pyca/pyopenssl"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; + # https://github.com/pyca/pyopenssl/issues/873 + broken = stdenv.isDarwin && stdenv.isAarch64; }; } From e65476950bcf766354c2f336adbb900786a44679 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Tue, 10 May 2022 12:29:32 +0200 Subject: [PATCH 15/18] terraform-providers.cloudamqp: 1.15.3 -> 1.16.0 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8e5db378ffb..8e8fd811e43 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -212,10 +212,10 @@ "owner": "cloudamqp", "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.15.3", - "sha256": "sha256-aQVv/4shdh3AQFTbw1iayNBSGuwDAQ7WUixMeUvAJ0U=", - "vendorSha256": "sha256-Anrcj23MvAk5m3LrGTANBhY6zB46U0st6vMZy2g7Gag=", - "version": "1.15.3" + "rev": "v1.16.0", + "sha256": "sha256-swE4Nr1cQzNQOq8q6o0nZhhYRtgAwTfx6Epm76Jjjqg=", + "vendorSha256": "sha256-oPeldPn30uS5Yl6IfXVPy2R7/wsAdZsEbbhVnVHQVwk=", + "version": "1.16.0" }, "cloudflare": { "owner": "cloudflare", From f15e339ab0c8dff0d09a0c6a8d8fd273e7fc44af Mon Sep 17 00:00:00 2001 From: arcnmx Date: Fri, 22 Apr 2022 12:55:16 -0700 Subject: [PATCH 16/18] terraform-providers.googleworkspace: init at 0.6.0 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8e8fd811e43..82e0d6ff851 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -454,6 +454,15 @@ "vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=", "version": "4.20.0" }, + "googleworkspace": { + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/googleworkspace", + "repo": "terraform-provider-googleworkspace", + "rev": "v0.6.0", + "sha256": "06cbwkrqrsshnv8ccsnl424l2sq0shi18kxwvrnwg88xvm8qpcfi", + "vendorSha256": "1zid2f8c9yfl6zwqiacngaf2rvvgs4w9phqjamgzibz41ijk6655", + "version": "0.6.0" + }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", From fe66cf22fdf55eab2b2ed8c0ad86bf4fa61602f8 Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Wed, 11 May 2022 00:51:42 +0200 Subject: [PATCH 17/18] gnome.pomodoro: 20.0 -> 21.1 (#172147) --- pkgs/desktops/gnome/misc/pomodoro/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix index 245a5229343..b37e96bb3a2 100644 --- a/pkgs/desktops/gnome/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitHub , substituteAll -, fetchpatch , meson , ninja , pkg-config @@ -17,6 +16,7 @@ , libxml2 , glib , gobject-introspection +, json-glib , libpeas , gsettings-desktop-schemas , gettext @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.20.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "gnome-pomodoro"; repo = "gnome-pomodoro"; rev = version; - sha256 = "sha256-USzLHoBM0QbBPtbTzJJY02cOSDtmlxPGYhMj7M1FJic="; + sha256 = "sha256-47gZsL1Hg30wtq6NeZdi8gbLHUZJ34KLzxvIg5DqyUk="; }; patches = [ @@ -40,13 +40,6 @@ stdenv.mkDerivation rec { src = ./fix-schema-path.patch; inherit pname version; }) - - # Fix error reporting code. - # https://github.com/gnome-pomodoro/gnome-pomodoro/pull/591 - (fetchpatch { - url = "https://github.com/gnome-pomodoro/gnome-pomodoro/commit/133bd62f15653856d9705b66188b42c20d81719e.patch"; - sha256 = "A20K+57A6/lYH2Buri2+wrCQgz6EGBdYg2xQbHPSkYc="; - }) ]; nativeBuildInputs = [ @@ -69,6 +62,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good gst_all_1.gstreamer gtk3 + json-glib libcanberra libpeas sqlite From 288c3c6fbcc10eb6fde316ae03c56937fb828c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20NICOLE?= Date: Tue, 10 May 2022 15:55:06 -0700 Subject: [PATCH 18/18] waylandpp: 0.2.10 -> 1.0.0 (#172097) --- .../libraries/waylandpp/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 30976e46bf1..c0b48ea17c6 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake +, makeFontsConf , pkg-config , pugixml , wayland @@ -8,22 +9,19 @@ , libffi , buildPackages , docSupport ? true -, doxygen ? null -, graphviz ? null +, doxygen +, graphviz }: -assert docSupport -> doxygen != null; - -with lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.10"; + version = "1.0.0"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "sha256-5/u6tp7/E4tjSfX+QJFmcUYdnyOgl9rB79PDE/SJH1o="; + hash = "sha256-Dw2RnLLyhykikHps1in+euHksO+ERbATbfmbUFOJklg="; }; cmakeFlags = [ @@ -32,15 +30,23 @@ stdenv.mkDerivation rec { "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" ]; - nativeBuildInputs = [ cmake pkg-config ] ++ optionals docSupport [ doxygen graphviz ]; + # Complains about not being able to find the fontconfig config file otherwise + FONTCONFIG_FILE = lib.optional docSupport (makeFontsConf { fontDirectories = [ ]; }); + + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals docSupport [ doxygen graphviz ]; buildInputs = [ pugixml wayland libGL libffi ]; - outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; + outputs = [ "bin" "dev" "lib" "out" ] ++ lib.optionals docSupport [ "doc" "devman" ]; + + # Resolves the warning "Fontconfig error: No writable cache directories" + preBuild = '' + export XDG_CACHE_HOME="$(mktemp -d)" + ''; meta = with lib; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; - license = with licenses; [ bsd2 hpnd ]; - maintainers = with maintainers; [ minijackson ]; + license = with lib.licenses; [ bsd2 hpnd ]; + maintainers = with lib.maintainers; [ minijackson ]; }; }